Skip to content

Commit

Permalink
Rework dialog, popup and other animations
Browse files Browse the repository at this point in the history 
Consider dynamic motion for window animations.
  • Loading branch information
@pranavpandey
pranavpandey committed Mar 30, 2023
1 parent 60af6e5 commit 3bbe4b2
Show file tree
Hide file tree
Showing 17 changed files with 120 additions and 95 deletions.
5 changes: 5 additions & 0 deletions ...src/main/java/com/pranavpandey/android/dynamic/support/dialog/DynamicAlertController.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,7 @@

import com.pranavpandey.android.dynamic.support.Dynamic;
import com.pranavpandey.android.dynamic.support.R;
import com.pranavpandey.android.dynamic.support.motion.DynamicMotion;
import com.pranavpandey.android.dynamic.support.theme.DynamicTheme;
import com.pranavpandey.android.dynamic.support.widget.DynamicListView;
import com.pranavpandey.android.dynamic.support.widget.base.DynamicWidget;
Expand Down Expand Up @@ -521,6 +522,10 @@ private void setupView() {
// Make default drawable transparent as we are using card view as background.
mWindow.setBackgroundDrawableResource(android.R.color.transparent);

if (!DynamicMotion.getInstance().isMotion()) {
mWindow.getAttributes().windowAnimations = 0;
}

if (card instanceof DynamicWidget
&& DynamicTheme.getInstance().get().isBackgroundAware()) {
Dynamic.setColor(card, DynamicTheme.getInstance()
Expand Down
15 changes: 14 additions & 1 deletion ...pport/src/main/java/com/pranavpandey/android/dynamic/support/popup/base/DynamicPopup.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,14 +31,17 @@
import androidx.annotation.ColorInt;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import androidx.annotation.StyleRes;
import androidx.cardview.widget.CardView;
import androidx.core.view.ViewCompat;
import androidx.core.widget.PopupWindowCompat;
import androidx.transition.TransitionManager;

import com.pranavpandey.android.dynamic.support.Dynamic;
import com.pranavpandey.android.dynamic.support.R;
import com.pranavpandey.android.dynamic.support.motion.DynamicMotion;
import com.pranavpandey.android.dynamic.support.theme.DynamicTheme;
import com.pranavpandey.android.dynamic.support.util.DynamicResourceUtils;
import com.pranavpandey.android.dynamic.util.DynamicSdkUtils;
import com.pranavpandey.android.dynamic.util.DynamicViewUtils;
import com.pranavpandey.android.dynamic.util.DynamicWindowUtils;
Expand Down Expand Up @@ -215,6 +218,16 @@ public void setPopupWindowColor(@ColorInt int popupWindowColor) {
*/
protected abstract @NonNull DynamicPopup build();

/**
* Returns the window animation style for the popup.
*
* @return The window animation style for the popup.
*/
protected @StyleRes int getWindowAnimationStyle() {
return DynamicMotion.getInstance().isMotion()
? DynamicResourceUtils.getWindowPopupAnimation() : 0;
}

/**
* Returns the maximum width for the popup.
*
Expand Down Expand Up @@ -355,7 +368,7 @@ public void run() {
PopupWindowCompat.setOverlapAnchor(mPopupWindow, true);
mPopupWindow.setOutsideTouchable(true);
mPopupWindow.setBackgroundDrawable(new ColorDrawable(Color.TRANSPARENT));
mPopupWindow.setAnimationStyle(R.style.Animation_AppCompat_DropDownUp);
mPopupWindow.setAnimationStyle(getWindowAnimationStyle());

if (getMaxWidth() + getSizeOffset()
< DynamicWindowUtils.getAppUsableScreenSize(getAnchor().getContext()).x) {
Expand Down
21 changes: 21 additions & 0 deletions ...ort/src/main/java/com/pranavpandey/android/dynamic/support/util/DynamicResourceUtils.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,7 @@
import androidx.core.graphics.drawable.DrawableCompat;

import com.pranavpandey.android.dynamic.support.Dynamic;
import com.pranavpandey.android.dynamic.support.R;
import com.pranavpandey.android.dynamic.theme.Theme;
import com.pranavpandey.android.dynamic.util.DynamicDrawableUtils;
import com.pranavpandey.android.dynamic.util.DynamicSdkUtils;
Expand Down Expand Up @@ -821,4 +822,24 @@ public static int getResourceIdFromAttributes(@NonNull Context context,

return colors;
}

/**
* Returns the animation for the dialog window according to the dynamic theme style.
*
* @return The animation for the dialog window according to the dynamic theme style.
*/
public static @StyleRes int getWindowDialogAnimation() {
return Dynamic.isLegacyVersion() ? R.style.Animation_Dynamic_Dialog
: R.style.Animation_Dynamic2_Dialog;
}

/**
* Returns the animation for the popup window according to the dynamic theme style.
*
* @return The animation for the popup window according to the dynamic theme style.
*/
public static @StyleRes int getWindowPopupAnimation() {
return Dynamic.isLegacyVersion() ? R.style.Animation_Dynamic_Popup
: R.style.Animation_Dynamic2_Popup;
}
}
14 changes: 6 additions & 8 deletions dynamic-support/src/main/res/anim/ads_dialog_enter.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,19 +18,17 @@

<set
xmlns:android="http://schemas.android.com/apk/res/android"
android:shareInterpolator="false">
android:duration="@integer/ads_config_anim_medium_duration"
android:interpolator="@android:anim/decelerate_interpolator"
android:shareInterpolator="true"
android:ordering="together">

<scale
android:interpolator="@android:anim/accelerate_decelerate_interpolator"
android:fromXScale="0.8" android:toXScale="1.0"
android:fromYScale="0.8" android:toYScale="1.0"
android:pivotX="50%" android:pivotY="50%"
android:duration="@integer/ads_config_anim_medium_duration" />
android:pivotX="50%" android:pivotY="50%" />

<alpha
android:interpolator="@android:anim/accelerate_decelerate_interpolator"
android:fromAlpha="0.0" android:toAlpha="1.0"
android:startOffset="@integer/ads_config_anim_short_duration"
android:duration="@integer/ads_config_anim_medium_duration" />
android:fromAlpha="0.0" android:toAlpha="1.0" />

</set>
13 changes: 6 additions & 7 deletions dynamic-support/src/main/res/anim/ads_dialog_exit.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,18 +18,17 @@

<set
xmlns:android="http://schemas.android.com/apk/res/android"
android:shareInterpolator="false">
android:duration="@integer/ads_config_anim_short_duration"
android:interpolator="@android:anim/accelerate_interpolator"
android:shareInterpolator="true"
android:ordering="together">

<scale
android:interpolator="@android:anim/decelerate_interpolator"
android:fromXScale="1.0" android:toXScale="0.8"
android:fromYScale="1.0" android:toYScale="0.8"
android:pivotX="50%" android:pivotY="50%"
android:duration="@integer/ads_config_anim_short_duration" />
android:pivotX="50%" android:pivotY="50%" />

<alpha
android:interpolator="@android:anim/decelerate_interpolator"
android:fromAlpha="1.0" android:toAlpha="0.0"
android:duration="@integer/ads_config_anim_short_duration" />
android:fromAlpha="1.0" android:toAlpha="0.0" />

</set>
4 changes: 2 additions & 2 deletions dynamic-support/src/main/res/anim/ads_fade_in.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@

<alpha
xmlns:android="http://schemas.android.com/apk/res/android"
android:duration="@integer/ads_config_anim_medium_duration"
android:interpolator="@android:anim/decelerate_interpolator"
android:fromAlpha="0.0" android:toAlpha="1.0"
android:startOffset="@integer/ads_config_anim_short_duration"
android:duration="@integer/ads_config_anim_medium_duration" />
android:startOffset="@integer/ads_config_anim_short_duration" />
4 changes: 2 additions & 2 deletions dynamic-support/src/main/res/anim/ads_fade_out.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,6 @@

<alpha
xmlns:android="http://schemas.android.com/apk/res/android"
android:duration="@integer/ads_config_anim_short_duration"
android:interpolator="@android:anim/accelerate_interpolator"
android:fromAlpha="1.0" android:toAlpha="0.0"
android:duration="@integer/ads_config_anim_medium_duration" />
android:fromAlpha="1.0" android:toAlpha="0.0" />
14 changes: 6 additions & 8 deletions dynamic-support/src/main/res/anim/ads_popup_enter.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,19 +18,17 @@

<set
xmlns:android="http://schemas.android.com/apk/res/android"
android:shareInterpolator="false">
android:duration="@integer/ads_config_anim_short_duration"
android:interpolator="@android:anim/decelerate_interpolator"
android:shareInterpolator="true"
android:ordering="together">

<scale
android:interpolator="@android:anim/accelerate_decelerate_interpolator"
android:fromXScale="0.8" android:toXScale="1.0"
android:fromYScale="0.8" android:toYScale="1.0"
android:pivotX="50%" android:pivotY="50%"
android:duration="@integer/ads_config_anim_medium_duration" />
android:pivotX="50%" android:pivotY="50%" />

<alpha
android:interpolator="@android:anim/accelerate_decelerate_interpolator"
android:fromAlpha="0.0" android:toAlpha="1.0"
android:startOffset="@integer/ads_config_anim_short_duration"
android:duration="@integer/ads_config_anim_medium_duration" />
android:fromAlpha="0.0" android:toAlpha="1.0" />

</set>
13 changes: 6 additions & 7 deletions dynamic-support/src/main/res/anim/ads_popup_exit.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,18 +18,17 @@

<set
xmlns:android="http://schemas.android.com/apk/res/android"
android:shareInterpolator="false">
android:duration="@integer/ads_config_anim_short_duration"
android:interpolator="@android:anim/accelerate_interpolator"
android:shareInterpolator="true"
android:ordering="together">

<scale
android:interpolator="@android:anim/decelerate_interpolator"
android:fromXScale="1.0" android:toXScale="0.8"
android:fromYScale="1.0" android:toYScale="0.8"
android:pivotX="50%" android:pivotY="50%"
android:duration="@integer/ads_config_anim_short_duration" />
android:pivotX="50%" android:pivotY="50%" />

<alpha
android:interpolator="@android:anim/decelerate_interpolator"
android:fromAlpha="1.0" android:toAlpha="0.0"
android:duration="@integer/ads_config_anim_short_duration" />
android:fromAlpha="1.0" android:toAlpha="0.0" />

</set>
15 changes: 6 additions & 9 deletions dynamic-support/src/main/res/anim/ads_slide_in_bottom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,18 +18,15 @@

<set
xmlns:android="http://schemas.android.com/apk/res/android"
android:shareInterpolator="false">
android:duration="@integer/ads_config_anim_medium_duration"
android:interpolator="@android:anim/decelerate_interpolator"
android:shareInterpolator="true"
android:ordering="together">

<translate
android:interpolator="@android:anim/decelerate_interpolator"
android:fromYDelta="50%p" android:toYDelta="0"
android:startOffset="@integer/ads_config_anim_short_duration"
android:duration="@integer/ads_config_anim_medium_duration" />
android:fromYDelta="50%p" android:toYDelta="0" />

<alpha
android:interpolator="@android:anim/decelerate_interpolator"
android:fromAlpha="0.0" android:toAlpha="1.0"
android:startOffset="@integer/ads_config_anim_short_duration"
android:duration="@integer/ads_config_anim_medium_duration" />
android:fromAlpha="0.0" android:toAlpha="1.0" />

</set>
15 changes: 6 additions & 9 deletions dynamic-support/src/main/res/anim/ads_slide_in_start.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,18 +18,15 @@

<set
xmlns:android="http://schemas.android.com/apk/res/android"
android:shareInterpolator="false">
android:duration="@integer/ads_config_anim_medium_duration"
android:interpolator="@android:anim/decelerate_interpolator"
android:shareInterpolator="true"
android:ordering="together">

<translate
android:interpolator="@android:anim/decelerate_interpolator"
android:fromXDelta="-50%p" android:toXDelta="0"
android:startOffset="@integer/ads_config_anim_short_duration"
android:duration="@integer/ads_config_anim_medium_duration" />
android:fromXDelta="-50%p" android:toXDelta="0" />

<alpha
android:interpolator="@android:anim/decelerate_interpolator"
android:fromAlpha="0.0" android:toAlpha="1.0"
android:startOffset="@integer/ads_config_anim_short_duration"
android:duration="@integer/ads_config_anim_medium_duration" />
android:fromAlpha="0.0" android:toAlpha="1.0" />

</set>
13 changes: 6 additions & 7 deletions dynamic-support/src/main/res/anim/ads_slide_out_end.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,16 +18,15 @@

<set
xmlns:android="http://schemas.android.com/apk/res/android"
android:shareInterpolator="false">
android:duration="@integer/ads_config_anim_short_duration"
android:interpolator="@android:anim/accelerate_interpolator"
android:shareInterpolator="true"
android:ordering="together">

<translate
android:interpolator="@android:anim/accelerate_interpolator"
android:fromXDelta="0" android:toXDelta="50%p"
android:duration="@integer/ads_config_anim_medium_duration" />
android:fromXDelta="0" android:toXDelta="50%p" />

<alpha
android:interpolator="@android:anim/accelerate_interpolator"
android:fromAlpha="1.0" android:toAlpha="0.0"
android:duration="@integer/ads_config_anim_medium_duration" />
android:fromAlpha="1.0" android:toAlpha="0.0" />

</set>
13 changes: 6 additions & 7 deletions dynamic-support/src/main/res/anim/ads_slide_out_top.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,16 +18,15 @@

<set
xmlns:android="http://schemas.android.com/apk/res/android"
android:shareInterpolator="false">
android:duration="@integer/ads_config_anim_short_duration"
android:interpolator="@android:anim/accelerate_interpolator"
android:shareInterpolator="true"
android:ordering="together">

<translate
android:interpolator="@android:anim/accelerate_interpolator"
android:fromYDelta="0" android:toYDelta="-50%p"
android:duration="@integer/ads_config_anim_medium_duration" />
android:fromYDelta="0" android:toYDelta="-50%p" />

<alpha
android:interpolator="@android:anim/accelerate_interpolator"
android:fromAlpha="1.0" android:toAlpha="0.0"
android:duration="@integer/ads_config_anim_medium_duration" />
android:fromAlpha="1.0" android:toAlpha="0.0" />

</set>
24 changes: 12 additions & 12 deletions dynamic-support/src/main/res/values/themes.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -927,10 +927,6 @@
<item name="android:windowContentOverlay">@null</item>
<item name="android:windowAnimationStyle">?attr/ads_animationDialog</item>
<item name="android:windowSoftInputMode">stateUnspecified|adjustPan</item>
<item name="windowActionBar">false</item>
<item name="windowActionModeOverlay">true</item>
<item name="listPreferredItemPaddingLeft">24dip</item>
<item name="listPreferredItemPaddingRight">24dip</item>
<item name="android:listDivider">@null</item>
<item name="android:buttonBarStyle">@style/Widget.AppCompat.ButtonBar.AlertDialog</item>
<item name="android:borderlessButtonStyle">@style/Widget.AppCompat.Button.Borderless</item>
Expand All @@ -939,6 +935,10 @@
<item name="android:windowMinWidthMinor">@dimen/ads_dialog_min_width_minor</item>
<item name="windowMinWidthMajor">@dimen/ads_dialog_min_width_major</item>
<item name="windowMinWidthMinor">@dimen/ads_dialog_min_width_minor</item>
<item name="windowActionBar">false</item>
<item name="windowActionModeOverlay">true</item>
<item name="listPreferredItemPaddingLeft">24dip</item>
<item name="listPreferredItemPaddingRight">24dip</item>
</style>

<style name="Base.Dynamic.Light.Dialog">
Expand All @@ -953,10 +953,6 @@
<item name="android:windowContentOverlay">@null</item>
<item name="android:windowAnimationStyle">?attr/ads_animationDialog</item>
<item name="android:windowSoftInputMode">stateUnspecified|adjustPan</item>
<item name="windowActionBar">false</item>
<item name="windowActionModeOverlay">true</item>
<item name="listPreferredItemPaddingLeft">24dip</item>
<item name="listPreferredItemPaddingRight">24dip</item>
<item name="android:listDivider">@null</item>
<item name="android:buttonBarStyle">@style/Widget.AppCompat.ButtonBar.AlertDialog</item>
<item name="android:borderlessButtonStyle">@style/Widget.AppCompat.Button.Borderless</item>
Expand All @@ -965,6 +961,10 @@
<item name="android:windowMinWidthMinor">@dimen/ads_dialog_min_width_minor</item>
<item name="windowMinWidthMajor">@dimen/ads_dialog_min_width_major</item>
<item name="windowMinWidthMinor">@dimen/ads_dialog_min_width_minor</item>
<item name="windowActionBar">false</item>
<item name="windowActionModeOverlay">true</item>
<item name="listPreferredItemPaddingLeft">24dip</item>
<item name="listPreferredItemPaddingRight">24dip</item>
</style>

<style name="Base.Dynamic.DayNight.Dialog">
Expand All @@ -979,10 +979,6 @@
<item name="android:windowContentOverlay">@null</item>
<item name="android:windowAnimationStyle">?attr/ads_animationDialog</item>
<item name="android:windowSoftInputMode">stateUnspecified|adjustPan</item>
<item name="windowActionBar">false</item>
<item name="windowActionModeOverlay">true</item>
<item name="listPreferredItemPaddingLeft">24dip</item>
<item name="listPreferredItemPaddingRight">24dip</item>
<item name="android:listDivider">@null</item>
<item name="android:buttonBarStyle">@style/Widget.AppCompat.ButtonBar.AlertDialog</item>
<item name="android:borderlessButtonStyle">@style/Widget.AppCompat.Button.Borderless</item>
Expand All @@ -991,6 +987,10 @@
<item name="android:windowMinWidthMinor">@dimen/ads_dialog_min_width_minor</item>
<item name="windowMinWidthMajor">@dimen/ads_dialog_min_width_major</item>
<item name="windowMinWidthMinor">@dimen/ads_dialog_min_width_minor</item>
<item name="windowActionBar">false</item>
<item name="windowActionModeOverlay">true</item>
<item name="listPreferredItemPaddingLeft">24dip</item>
<item name="listPreferredItemPaddingRight">24dip</item>
</style>

<style name="Theme.Dynamic.Dialog" parent="Base.Dynamic.Dialog">
Expand Down

0 comments on commit 3bbe4b2

Please sign in to comment.