Browse Source

Remove title theming of modal dialog

Resolves #6429

Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
Andy Scherzinger 4 years ago
parent
commit
27fc8c6540

+ 7 - 5
src/main/java/com/owncloud/android/ui/activity/SettingsActivity.java

@@ -858,11 +858,13 @@ public class SettingsActivity extends ThemedPreferenceActivity
                     int accentColor = ThemeUtils.primaryAccentColor(this);
 
                     AlertDialog.Builder builder = new AlertDialog.Builder(this, R.style.FallbackTheming_Dialog);
-                    builder.setTitle(ThemeUtils.getColoredTitle(getString(R.string.prefs_e2e_mnemonic), accentColor));
-                    builder.setMessage(mnemonic);
-                    builder.setPositiveButton(ThemeUtils.getColoredTitle(getString(R.string.common_ok), accentColor),
-                        (dialog, which) -> dialog.dismiss());
-                    builder.show();
+                    AlertDialog alertDialog = builder.setTitle(R.string.prefs_e2e_mnemonic)
+                        .setMessage(mnemonic)
+                        .setPositiveButton(R.string.common_ok, (dialog, which) -> dialog.dismiss())
+                        .create();
+
+                    alertDialog.getButton(AlertDialog.BUTTON_POSITIVE).setTextColor(accentColor);
+                    alertDialog.show();
                 }
             }
         }

+ 1 - 2
src/main/java/com/owncloud/android/ui/activity/SyncedFoldersActivity.java

@@ -226,8 +226,7 @@ public class SyncedFoldersActivity extends FileActivity implements SyncedFolderA
         AlertDialog alertDialog = new AlertDialog.Builder(this)
             .setView(findViewById(R.id.root_layout))
             .setPositiveButton(R.string.common_ok, (dialog, which) -> dialog.dismiss())
-            .setTitle(ThemeUtils.getColoredTitle(getResources().getString(R.string.autoupload_disable_power_save_check),
-                                                 ThemeUtils.primaryAccentColor(this)))
+            .setTitle(R.string.autoupload_disable_power_save_check)
             .setMessage(getString(R.string.power_save_check_dialog_message))
             .show();
 

+ 1 - 1
src/main/java/com/owncloud/android/ui/dialog/ChooseRichDocumentsTemplateDialogFragment.java

@@ -171,7 +171,7 @@ public class ChooseRichDocumentsTemplateDialogFragment extends DialogFragment im
         AlertDialog.Builder builder = new AlertDialog.Builder(activity);
         builder.setView(view)
             .setNegativeButton(R.string.common_cancel, this)
-            .setTitle(ThemeUtils.getColoredTitle(getResources().getString(R.string.select_template), accentColor));
+            .setTitle(R.string.select_template);
         Dialog dialog = builder.create();
 
         Window window = dialog.getWindow();

+ 1 - 1
src/main/java/com/owncloud/android/ui/dialog/ChooseTemplateDialogFragment.java

@@ -169,7 +169,7 @@ public class ChooseTemplateDialogFragment extends DialogFragment implements Dial
         AlertDialog.Builder builder = new AlertDialog.Builder(activity);
         builder.setView(view)
             .setNegativeButton(R.string.common_cancel, this)
-            .setTitle(ThemeUtils.getColoredTitle(getResources().getString(R.string.select_template), accentColor));
+            .setTitle(R.string.select_template);
         Dialog dialog = builder.create();
 
         Window window = dialog.getWindow();

+ 1 - 3
src/main/java/com/owncloud/android/ui/dialog/ConflictsResolveDialog.java

@@ -146,7 +146,6 @@ public class ConflictsResolveDialog extends DialogFragment {
     public Dialog onCreateDialog(Bundle savedInstanceState) {
         // Inflate the layout for the dialog
         binding = ConflictResolveDialogBinding.inflate(requireActivity().getLayoutInflater());
-        int accentColor = ThemeUtils.primaryAccentColor(getContext());
 
         ThemeUtils.tintCheckbox(binding.newCheckbox, ThemeUtils.primaryColor(getContext()));
         ThemeUtils.tintCheckbox(binding.existingCheckbox, ThemeUtils.primaryColor(getContext()));
@@ -170,8 +169,7 @@ public class ConflictsResolveDialog extends DialogFragment {
                     listener.conflictDecisionMade(Decision.CANCEL);
                 }
             })
-            .setTitle(ThemeUtils.getColoredTitle(getResources().getString(R.string.conflict_message_headline),
-                                                 accentColor));
+            .setTitle(R.string.conflict_message_headline);
 
         // set info for new file
         binding.newSize.setText(DisplayUtils.bytesToHumanReadable(newFile.length()));

+ 2 - 3
src/main/java/com/owncloud/android/ui/dialog/CreateFolderDialogFragment.java

@@ -106,9 +106,8 @@ public class CreateFolderDialogFragment
         builder.setView(v)
                 .setPositiveButton(R.string.folder_confirm_create, this)
                 .setNegativeButton(R.string.common_cancel, this)
-                .setTitle(ThemeUtils.getColoredTitle(getResources().getString(R.string.uploader_info_dirname),
-                        accentColor));
-        Dialog d = builder.create();
+                .setTitle(R.string.uploader_info_dirname);
+        AlertDialog d = builder.create();
 
         Window window = d.getWindow();
         if (window != null) {

+ 1 - 2
src/main/java/com/owncloud/android/ui/dialog/LocalStoragePathPickerDialogFragment.java

@@ -115,8 +115,7 @@ public class LocalStoragePathPickerDialogFragment extends DialogFragment
         AlertDialog.Builder builder = new AlertDialog.Builder(requireActivity());
         builder.setView(view)
             .setNegativeButton(R.string.common_cancel, this)
-            .setTitle(ThemeUtils.getColoredTitle(getResources().getString(R.string.storage_choose_location),
-                accentColor));
+            .setTitle(R.string.storage_choose_location);
 
         return builder.create();
     }

+ 1 - 2
src/main/java/com/owncloud/android/ui/dialog/MultipleAccountsDialog.java

@@ -93,8 +93,7 @@ public class MultipleAccountsDialog extends DialogFragment implements Injectable
         listView.setLayoutManager(new LinearLayoutManager(activity));
         listView.setAdapter(adapter);
 
-        builder.setView(view)
-            .setTitle(ThemeUtils.getColoredTitle(getResources().getString(R.string.common_choose_account), accentColor));
+        builder.setView(view).setTitle(R.string.common_choose_account);
         Dialog dialog = builder.create();
 
         Window window = dialog.getWindow();

+ 1 - 2
src/main/java/com/owncloud/android/ui/dialog/NoteDialogFragment.java

@@ -118,8 +118,7 @@ public class NoteDialogFragment extends DialogFragment implements DialogInterfac
         builder.setView(view)
             .setPositiveButton(R.string.note_confirm, this)
             .setNegativeButton(R.string.common_cancel, this)
-            .setTitle(ThemeUtils.getColoredTitle(getResources().getString(R.string.send_note),
-                accentColor));
+            .setTitle(R.string.send_note);
         Dialog dialog = builder.create();
 
         Window window = dialog.getWindow();

+ 1 - 2
src/main/java/com/owncloud/android/ui/dialog/RenameFileDialogFragment.java

@@ -121,8 +121,7 @@ public class RenameFileDialogFragment
         builder.setView(view)
             .setPositiveButton(R.string.file_rename, this)
             .setNegativeButton(R.string.common_cancel, this)
-            .setTitle(ThemeUtils.getColoredTitle(getResources().getString(R.string.rename_dialog_title),
-                                                 accentColor));
+            .setTitle(R.string.rename_dialog_title);
         Dialog d = builder.create();
 
         Window window = d.getWindow();

+ 1 - 2
src/main/java/com/owncloud/android/ui/dialog/RenamePublicShareDialogFragment.java

@@ -102,8 +102,7 @@ public class RenamePublicShareDialogFragment
         builder.setView(view)
             .setPositiveButton(R.string.file_rename, this)
             .setNegativeButton(R.string.common_cancel, this)
-            .setTitle(ThemeUtils.getColoredTitle(getResources().getString(R.string.public_share_name),
-                                                 accentColor));
+            .setTitle(R.string.public_share_name);
         Dialog dialog = builder.create();
 
         Window window = dialog.getWindow();

+ 4 - 10
src/main/java/com/owncloud/android/ui/dialog/SetupEncryptionDialogFragment.java

@@ -20,7 +20,6 @@
  */
 package com.owncloud.android.ui.dialog;
 
-import android.accounts.Account;
 import android.accounts.AccountManager;
 import android.app.Dialog;
 import android.content.DialogInterface;
@@ -152,7 +151,7 @@ public class SetupEncryptionDialogFragment extends DialogFragment {
         AlertDialog.Builder builder = new AlertDialog.Builder(getActivity());
         builder.setView(v).setPositiveButton(R.string.common_ok, null)
                 .setNegativeButton(R.string.common_cancel, null)
-                .setTitle(ThemeUtils.getColoredTitle(getString(R.string.end_to_end_encryption_title), accentColor));
+                .setTitle(R.string.end_to_end_encryption_title);
 
         Dialog dialog = builder.create();
         dialog.setCanceledOnTouchOutside(false);
@@ -218,9 +217,7 @@ public class SetupEncryptionDialogFragment extends DialogFragment {
                                 passphraseTextView.setVisibility(View.GONE);
                                 positiveButton.setVisibility(View.GONE);
                                 negativeButton.setVisibility(View.GONE);
-                                getDialog().setTitle(ThemeUtils.getColoredTitle(getString(
-                                        R.string.end_to_end_encryption_storing_keys),
-                                        ThemeUtils.primaryColor(getContext())));
+                                getDialog().setTitle(R.string.end_to_end_encryption_storing_keys);
 
                                 GenerateNewKeysAsyncTask newKeysTask = new GenerateNewKeysAsyncTask();
                                 newKeysTask.execute();
@@ -289,9 +286,7 @@ public class SetupEncryptionDialogFragment extends DialogFragment {
                 try {
                     keyWords = EncryptionUtils.getRandomWords(12, getContext());
 
-                    getDialog().setTitle(ThemeUtils.getColoredTitle(
-                            getString(R.string.end_to_end_encryption_passphrase_title),
-                            ThemeUtils.primaryColor(getContext())));
+                    getDialog().setTitle(R.string.end_to_end_encryption_passphrase_title);
 
                     textView.setText(R.string.end_to_end_encryption_keywords_description);
 
@@ -393,8 +388,7 @@ public class SetupEncryptionDialogFragment extends DialogFragment {
             if (s.isEmpty()) {
                 keyResult = KEY_FAILED;
 
-                getDialog().setTitle(ThemeUtils.getColoredTitle(
-                        getString(R.string.common_error), ThemeUtils.primaryColor(getContext())));
+                getDialog().setTitle(R.string.common_error);
                 textView.setText(R.string.end_to_end_encryption_unsuccessful);
                 positiveButton.setText(R.string.end_to_end_encryption_dialog_close);
                 positiveButton.setVisibility(View.VISIBLE);

+ 2 - 6
src/main/java/com/owncloud/android/ui/dialog/SyncedFolderPreferencesDialogFragment.java

@@ -451,9 +451,7 @@ public class SyncedFolderPreferencesDialogFragment extends DialogFragment {
 
     private void showBehaviourDialog() {
         AlertDialog.Builder builder = new AlertDialog.Builder(getActivity());
-        builder.setTitle(ThemeUtils.getColoredTitle(
-                getResources().getString(R.string.prefs_instant_behaviour_dialogTitle),
-                ThemeUtils.primaryAccentColor(getContext())))
+        builder.setTitle(R.string.prefs_instant_behaviour_dialogTitle)
                 .setSingleChoiceItems(getResources().getTextArray(R.array.pref_behaviour_entries),
                         mSyncedFolder.getUploadActionInteger(),
                         new
@@ -482,9 +480,7 @@ public class SyncedFolderPreferencesDialogFragment extends DialogFragment {
     private void showNameCollisionPolicyDialog() {
         AlertDialog.Builder builder = new AlertDialog.Builder(getActivity());
 
-        builder.setTitle(ThemeUtils.getColoredTitle(
-                getResources().getString(R.string.pref_instant_name_collision_policy_dialogTitle),
-                ThemeUtils.primaryAccentColor(getContext())))
+        builder.setTitle(R.string.pref_instant_name_collision_policy_dialogTitle)
             .setSingleChoiceItems(getResources().getTextArray(R.array.pref_name_collision_policy_entries),
                                   getSelectionIndexForNameCollisionPolicy(mSyncedFolder.getNameCollisionPolicy()),
                                   new OnNameCollisionDialogClickListener())