empathicqubit/Signal-Android
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

Consolidate AnimatedDialog themes to single DayNight theme.

Browse source
This commit is contained in:
Alex Hart 2020-11-11 10:52:54 -04:00 • committed by Cody Henthorne
parent cd58c09be3
commit f5b46f7356
3 changed files with 3 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
app/src/main/java/org/thoughtcrime/securesms/recipients/ui/notifications/CustomNotificationsDialogFragment.java
View file

@ -70,11 +70,7 @@ public class CustomNotificationsDialogFragment extends DialogFragment {
@Override @Override
public void onCreate(@Nullable Bundle savedInstanceState) { public void onCreate(@Nullable Bundle savedInstanceState) {
super.onCreate(savedInstanceState); super.onCreate(savedInstanceState);
if (ThemeUtil.isDarkTheme(requireActivity())) { setStyle(STYLE_NO_FRAME, R.style.Signal_DayNight_Dialog_Animated);
setStyle(STYLE_NO_FRAME, R.style.TextSecure_DarkTheme_AnimatedDialog);
} else {
setStyle(STYLE_NO_FRAME, R.style.TextSecure_LightTheme_AnimatedDialog);
}
} }
@Override @Override

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

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

6
app/src/main/res/values/themes.xml
View file

@ -300,11 +300,7 @@
<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"> <style name="Signal.DayNight.Dialog.Animated" parent="Signal.DayNight">
<item name="android:windowAnimationStyle">@style/FadeScale</item>
</style>
<style name="TextSecure.LightTheme.AnimatedDialog">
<item name="android:windowAnimationStyle">@style/FadeScale</item> <item name="android:windowAnimationStyle">@style/FadeScale</item>
</style> </style>