blallo
/
Signal-Android
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Add dialog transitions to group manager.

master
Alan Evans 2020-10-07 14:02:11 -03:00 committed by Greyson Parrelli
parent 26404ff5d7
commit ed0be6fc9a
3 changed files with 17 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/src/main/java/org/thoughtcrime/securesms/recipients/ui/notifications/CustomNotificationsDialogFragment.java
View File

@ -71,9 +71,9 @@ public class CustomNotificationsDialogFragment extends DialogFragment {
public void onCreate(@Nullable Bundle savedInstanceState) { public void onCreate(@Nullable Bundle savedInstanceState) {
super.onCreate(savedInstanceState); super.onCreate(savedInstanceState);
if (ThemeUtil.isDarkTheme(requireActivity())) { if (ThemeUtil.isDarkTheme(requireActivity())) {
setStyle(STYLE_NO_FRAME, R.style.TextSecure_DarkTheme); setStyle(STYLE_NO_FRAME, R.style.TextSecure_DarkTheme_AnimatedDialog);
} else { } else {
setStyle(STYLE_NO_FRAME, R.style.TextSecure_LightTheme); setStyle(STYLE_NO_FRAME, R.style.TextSecure_LightTheme_AnimatedDialog);
} }
} }

4
app/src/main/java/org/thoughtcrime/securesms/recipients/ui/sharablegrouplink/ShareableGroupLinkDialogFragment.java
View File

@ -44,8 +44,8 @@ public final class ShareableGroupLinkDialogFragment extends DialogFragment {
public void onCreate(@Nullable Bundle savedInstanceState) { public void onCreate(@Nullable Bundle savedInstanceState) {
super.onCreate(savedInstanceState); super.onCreate(savedInstanceState);
setStyle(STYLE_NO_FRAME, ThemeUtil.isDarkTheme(requireActivity()) ? R.style.TextSecure_DarkTheme setStyle(STYLE_NO_FRAME, ThemeUtil.isDarkTheme(requireActivity()) ? R.style.TextSecure_DarkTheme_AnimatedDialog
: R.style.TextSecure_LightTheme); : R.style.TextSecure_LightTheme_AnimatedDialog);
} }
@Override @Override

13
app/src/main/res/values/themes.xml
View File

@ -132,6 +132,11 @@
<item name="android:windowExitAnimation">@anim/slide_to_top</item> <item name="android:windowExitAnimation">@anim/slide_to_top</item>
</style> </style>
<style name="FadeScale" parent="@android:style/Animation">
<item name="android:windowEnterAnimation">@anim/fade_scale_in</item>
<item name="android:windowExitAnimation">@anim/fade_scale_out</item>
</style>
<style name="StickerPopupAnimation" parent="@android:style/Animation"> <style name="StickerPopupAnimation" parent="@android:style/Animation">
<item name="android:windowEnterAnimation">@anim/fade_in</item> <item name="android:windowEnterAnimation">@anim/fade_in</item>
<item name="android:windowExitAnimation">@anim/fade_out</item> <item name="android:windowExitAnimation">@anim/fade_out</item>
@ -913,6 +918,14 @@
<item name="shapeAppearanceOverlay">@style/ShapeAppearanceOverlay.Signal.BottomSheet.Rounded</item> <item name="shapeAppearanceOverlay">@style/ShapeAppearanceOverlay.Signal.BottomSheet.Rounded</item>
</style> </style>
<style name="TextSecure.DarkTheme.AnimatedDialog">
<item name="android:windowAnimationStyle">@style/FadeScale</item>
</style>
<style name="TextSecure.LightTheme.AnimatedDialog">
<item name="android:windowAnimationStyle">@style/FadeScale</item>
</style>
<style name="Widget.Signal.BottomSheet.ReactWithAny" parent="Widget.MaterialComponents.BottomSheet"> <style name="Widget.Signal.BottomSheet.ReactWithAny" parent="Widget.MaterialComponents.BottomSheet">
<item name="backgroundTint">@color/core_grey_75</item> <item name="backgroundTint">@color/core_grey_75</item>
<item name="behavior_peekHeight">@dimen/react_with_any_emoji_bottom_sheet_dialog_fragment_min_height</item> <item name="behavior_peekHeight">@dimen/react_with_any_emoji_bottom_sheet_dialog_fragment_min_height</item>