Merge branch 'release/v9.13.0.0' into dev

Aptoide · Feb 4, 2020 · 249b420 · 249b420
2 parents b83a6fa + 800bb09
commit 249b420
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 2 deletions.
diff --git a/app/src/main/java/cm/aptoide/pt/autoupdate/AutoUpdateDialogFragment.kt b/app/src/main/java/cm/aptoide/pt/autoupdate/AutoUpdateDialogFragment.kt
@@ -46,4 +46,8 @@ class AutoUpdateDialogFragment : BaseDialogView(), AutoUpdateDialogView {
   override fun dismissDialog() {
     dismiss()
   }
+
+  override fun shouldUseDefaultDialogStyle(): Boolean {
+    return false
+  }
 }
diff --git a/app/src/main/java/cm/aptoide/pt/view/fragment/BaseDialogFragment.java b/app/src/main/java/cm/aptoide/pt/view/fragment/BaseDialogFragment.java
@@ -27,7 +27,7 @@ public class BaseDialogFragment extends RxDialogFragment {
     ((MainActivity) getContext()).getActivityComponent()
         .inject(this);
 
-    if (this.getActivity() != null) {
+    if (this.getActivity() != null && shouldUseDefaultDialogStyle()) {
       setStyle(DialogFragment.STYLE_NO_TITLE,
           themeManager.getAttributeForTheme(getDialogStyle()).resourceId);
     }
@@ -48,6 +48,10 @@ public class BaseDialogFragment extends RxDialogFragment {
     return R.attr.dialogsTheme;
   }
 
+  public boolean shouldUseDefaultDialogStyle() {
+    return true;
+  }
+
   public FragmentComponent getFragmentComponent(Bundle savedInstanceState) {
     if (fragmentComponent == null) {
       AptoideApplication aptoideApplication =

diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
@@ -84,7 +84,7 @@
   </style>
 
   <style name="AppBaseThemeDark.DialogTheme" parent="Aptoide.DialogTheme">
-    <item name="android:windowBackground">@color/grey_900</item>
+    <item name="android:background">@color/grey_900</item>
   </style>
 
   <style name="AppBaseThemeDark.DialogTheme.Rounded">