mirrors/nextcloud-android
1
0
Fork 0
mirror of https://github.com/nextcloud/android.git synced 2024-11-26 23:28:42 +03:00
Code Issues Projects Releases Packages Wiki Activity

Move alert dialog to material variant and setting the correct accent color for the button texts via styles

Browse source
This commit is contained in:
Andy Scherzinger 2015-08-06 16:27:56 +02:00
parent 270fea6a33
commit 1ce7d79ff0
2 changed files with 9 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
res/values/styles.xml
View file

@ -62,7 +62,9 @@
</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 -->
@ -125,8 +127,9 @@
</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>

5
src/com/owncloud/android/ui/dialog/ConfirmationDialogFragment.java
View file

@ -20,12 +20,13 @@
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 com.owncloud.android.R;
import com.owncloud.android.lib.common.utils.Log_OC;
@ -81,7 +82,7 @@ public class ConfirmationDialogFragment extends DialogFragment {
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);