Move alert dialog to material variant and setting the correct accent color for the...

diff --git a/res/values/styles.xml b/res/values/styles.xml
index e41b496..3282a8d 100644 (file)
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -62,7 +62,9 @@
        </style>
 
        <!-- Dialogs -->
        </style>
 
        <!-- Dialogs -->

-       <style name="Theme.ownCloud.Dialog" parent="@android:style/Theme.Dialog">
+       <style name="Theme.ownCloud.Dialog" parent="style/Theme.AppCompat.Light.Dialog.Alert">
+               <item name="windowNoTitle">false</item>
+               <item name="colorAccent">@color/owncloud_blue_accent</item>

        </style>
        
        <!-- PopDownMenu -->
        </style>
        
        <!-- PopDownMenu -->


@@ -125,8 +127,9 @@
                    
     </style>
        
                    
     </style>
        

-       <style name="OAuthDialog" parent="@android:style/Theme.Dialog">
-               <item name="android:windowNoTitle">false</item> 
+       <style name="OAuthDialog" parent="style/Theme.AppCompat.Light.Dialog.Alert">
+               <item name="windowNoTitle">false</item>
+               <item name="colorAccent">@color/owncloud_blue_accent</item>

        </style>    
                
        <color name="setup_text_hint">#777777</color>
        </style>    
                
        <color name="setup_text_hint">#777777</color>

diff --git a/src/com/owncloud/android/ui/dialog/ConfirmationDialogFragment.java b/src/com/owncloud/android/ui/dialog/ConfirmationDialogFragment.java
index e2dbe85..81561b3 100644 (file)
--- a/src/com/owncloud/android/ui/dialog/ConfirmationDialogFragment.java
+++ b/src/com/owncloud/android/ui/dialog/ConfirmationDialogFragment.java
@@ -20,12 +20,13 @@
 
 package com.owncloud.android.ui.dialog;
 
 
 package com.owncloud.android.ui.dialog;
 

-import android.app.AlertDialog;
+import android.support.v7.app.AlertDialog;

 import android.app.Dialog;
 import android.content.DialogInterface;
 import android.os.Bundle;
 import android.support.v4.app.DialogFragment;
 
 import android.app.Dialog;
 import android.content.DialogInterface;
 import android.os.Bundle;
 import android.support.v4.app.DialogFragment;
 

+import com.owncloud.android.R;

 import com.owncloud.android.lib.common.utils.Log_OC;
 
 
 import com.owncloud.android.lib.common.utils.Log_OC;
 
 


@@ -81,7 +82,7 @@ public class ConfirmationDialogFragment extends DialogFragment {
             return null;
         }
 
             return null;
         }
 

-        AlertDialog.Builder builder = new AlertDialog.Builder(getActivity())
+        AlertDialog.Builder builder = new AlertDialog.Builder(getActivity(), R.style.Theme_ownCloud_Dialog)

             .setIcon(android.R.drawable.ic_dialog_alert)
             .setMessage(String.format(getString(resourceId), confirmationTarget))
             .setTitle(android.R.string.dialog_alert_title);
             .setIcon(android.R.drawable.ic_dialog_alert)
             .setMessage(String.format(getString(resourceId), confirmationTarget))
             .setTitle(android.R.string.dialog_alert_title);