Browse Source

Merge pull request #6434 from nextcloud/removeDialogTitleTheming

Remove title theming of modal dialog
Tobias Kaminsky 5 years ago
parent
commit
234c8d33ee

+ 1 - 1
scripts/analysis/findbugs-results.txt

@@ -1 +1 @@
-330
+329

+ 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();
 

+ 0 - 1
src/main/java/com/owncloud/android/ui/asynctasks/PhotoSearchTask.java

@@ -97,7 +97,6 @@ public class PhotoSearchTask extends AsyncTask<Void, Void, RemoteOperationResult
     @Override
     protected void onPostExecute(RemoteOperationResult result) {
         if (photoFragmentWeakReference.get() != null) {
-            Boolean loadingStatus = false;
             PhotoFragment photoFragment = photoFragmentWeakReference.get();
 
             if (result.isSuccess() && result.getData() != null && !isCancelled()) {

+ 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 - 4
src/main/java/com/owncloud/android/ui/dialog/LocalStoragePathPickerDialogFragment.java

@@ -99,8 +99,6 @@ public class LocalStoragePathPickerDialogFragment extends DialogFragment
                 "StoragePathAdapter.StoragePathAdapterListener");
         }
 
-        int accentColor = ThemeUtils.primaryAccentColor(getContext());
-
         // Inflate the layout for the dialog
         LayoutInflater inflater = requireActivity().getLayoutInflater();
         @SuppressLint("InflateParams") View view = inflater.inflate(R.layout.storage_path_dialog, null, false);
@@ -115,8 +113,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 - 5
src/main/java/com/owncloud/android/ui/dialog/MultipleAccountsDialog.java

@@ -42,7 +42,6 @@ import com.owncloud.android.R;
 import com.owncloud.android.ui.activity.ReceiveExternalFilesActivity;
 import com.owncloud.android.ui.adapter.UserListAdapter;
 import com.owncloud.android.ui.adapter.UserListItem;
-import com.owncloud.android.utils.ThemeUtils;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -71,8 +70,6 @@ public class MultipleAccountsDialog extends DialogFragment implements Injectable
             throw new IllegalArgumentException("Activity may not be null");
         }
 
-        int accentColor = ThemeUtils.primaryAccentColor(getContext());
-
         // Inflate the layout for the dialog
         LayoutInflater inflater = activity.getLayoutInflater();
         @SuppressLint("InflateParams") View view = inflater.inflate(R.layout.multiple_accounts, null);
@@ -93,8 +90,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())

+ 7 - 3
src/main/java/com/owncloud/android/ui/fragment/contactsbackup/ContactsBackupFragment.java

@@ -449,9 +449,13 @@ public class ContactsBackupFragment extends FileFragment implements DatePickerDi
 
             datePickerDialog.setTitle("");
             datePickerDialog.show();
-            // TODO How do we deal with primary colours that are too light or dark
-            datePickerDialog.getButton(DatePickerDialog.BUTTON_NEGATIVE).setTextColor(ThemeUtils.primaryColor(getContext()));
-            datePickerDialog.getButton(DatePickerDialog.BUTTON_POSITIVE).setTextColor(ThemeUtils.primaryColor(getContext()));
+
+            datePickerDialog.getButton(DatePickerDialog.BUTTON_NEGATIVE).setTextColor(ThemeUtils.primaryColor(getContext(),true));
+            datePickerDialog.getButton(DatePickerDialog.BUTTON_POSITIVE).setTextColor(ThemeUtils.primaryColor(getContext(), true));
+
+            // set background to transparent
+            datePickerDialog.getButton(DatePickerDialog.BUTTON_NEGATIVE).setBackgroundColor(0x00000000);
+            datePickerDialog.getButton(DatePickerDialog.BUTTON_POSITIVE).setBackgroundColor(0x00000000);
         } else {
             DisplayUtils.showSnackMessage(getView().findViewById(R.id.contacts_linear_layout),
                     R.string.contacts_preferences_something_strange_happened);

+ 1 - 0
src/main/res/values-v21/styles.xml

@@ -53,6 +53,7 @@
         <item name="colorAccent">#757575</item>
         <item name="windowNoTitle">false</item>
         <item name="android:windowBackground">@color/bg_default</item>
+        <item name="android:textAllCaps">false</item>
     </style>
 
     <style name="Theme.ownCloud.ToolbarBase" parent="BaseTheme.ownCloud.Toolbar">

+ 2 - 3
src/main/res/values/styles.xml

@@ -72,6 +72,7 @@
 		<item name="colorAccent">#757575</item>
 		<item name="windowNoTitle">false</item>
         <item name="android:windowBackground">@color/bg_default</item>
+        <item name="android:textAllCaps">false</item>
 	</style>
 
 	<!-- separate action bar style for activities without an action bar -->
@@ -108,21 +109,18 @@
 
 	<style name="ownCloud.AlertDialog" parent="Theme.MaterialComponents.DayNight.Dialog.Alert">
 		<item name="colorAccent">@color/color_accent</item>
-		<item name="android:textColorPrimary">@color/primary</item>
 		<item name="searchViewStyle">@style/ownCloud.SearchView</item>
         <item name="android:textAllCaps">false</item>
         <item name="android:windowBackground">@color/bg_default</item>
     </style>
 
 	<style name="ownCloud.Dialog" parent="Theme.MaterialComponents.DayNight.Dialog">
-		<item name="colorAccent">@color/color_accent</item>
 		<item name="searchViewStyle">@style/ownCloud.SearchView</item>
         <item name="android:textAllCaps">false</item>
 	</style>
 
 	<style name="ProgressDialogTheme" parent="ownCloud.Dialog">
 		<item name="colorAccent">@color/color_accent</item>
-		<item name="android:textColorPrimary">@color/primary</item>
 		<item name="android:windowFrame">@color/transparent</item>
 		<item name="android:windowBackground">@color/transparent</item>
 		<item name="android:windowTitleBackgroundStyle">@drawable/process_dialog_background</item>
@@ -230,6 +228,7 @@
 		<item name="windowNoTitle">false</item>
 		<item name="colorAccent">@color/color_accent</item>
         <item name="android:windowBackground">@color/bg_default</item>
+        <item name="android:textAllCaps">false</item>
     </style>
 
 	<style name="Theme.ownCloud.Dialog.NoTitle" parent="@style/Theme.ownCloud.Dialog">