add search toolbar theming and general overflow menu theming for toolbar activities

Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>

app/build.gradle

@@ -355,7 +355,7 @@ dependencies {
     gplayImplementation "com.google.firebase:firebase-messaging:23.0.7"
 
     // TODO change back to tag before merging
-    implementation 'com.github.nextcloud.android-common:ui:98fe013'
+    implementation 'com.github.nextcloud.android-common:ui:e89149f199'
 }
 
 configurations.all {

app/src/main/java/com/nextcloud/client/logger/ui/LogsActivity.kt

@@ -90,10 +90,11 @@ class LogsActivity : ToolbarActivity() {
 
     override fun onCreateOptionsMenu(menu: Menu): Boolean {
         menuInflater.inflate(R.menu.activity_logs, menu)
+
         (menu.findItem(R.id.action_search).actionView as SearchView).apply {
             setOnQueryTextListener(searchBoxListener)
+            viewThemeUtils.androidx.themeToolbarSearchView(this)
 
-            themeToolbarUtils.themeSearchView(this, context)
         }
         return super.onCreateOptionsMenu(menu)
     }

app/src/main/java/com/owncloud/android/ui/activity/EditorWebView.java

@@ -181,7 +181,6 @@ public abstract class EditorWebView extends ExternalSiteWebView {
             } else {
                 Drawable icon = MimeTypeUtil.getFileTypeIcon(file.getMimeType(),
                                                              file.getFileName(),
-                                                             user,
                                                              getApplicationContext(),
                                                              viewThemeUtils);
                 binding.thumbnail.setImageDrawable(icon);

app/src/main/java/com/owncloud/android/ui/activity/FileDisplayActivity.java

@@ -688,7 +688,7 @@ public class FileDisplayActivity extends FileActivity
             searchView.setIconified(false);
         });
 
-        themeToolbarUtils.themeSearchView(searchView, this);
+        viewThemeUtils.androidx.themeToolbarSearchView(searchView);
 
         // populate list of menu items to show/hide when drawer is opened/closed
         mDrawerMenuItemstoShowHideList = new ArrayList<>(1);

app/src/main/java/com/owncloud/android/ui/activity/ReceiveExternalFilesActivity.java

@@ -1035,7 +1035,7 @@ public class ReceiveExternalFilesActivity extends FileActivity
         newFolderMenuItem.setEnabled(mFile.canWrite());
 
         // hacky as no default way is provided
-        themeToolbarUtils.themeSearchView(searchView, this);
+        viewThemeUtils.androidx.themeToolbarSearchView(searchView);
 
         return true;
     }

app/src/main/java/com/owncloud/android/ui/activity/ShareActivity.java

@@ -84,7 +84,6 @@ public class ShareActivity extends FileActivity {
         } else {
             binding.shareFileIcon.setImageDrawable(MimeTypeUtil.getFileTypeIcon(file.getMimeType(),
                                                                                 file.getFileName(),
-                                                                                optionalUser.get(),
                                                                                 this,
                                                                                 viewThemeUtils));
             if (MimeTypeUtil.isImage(file)) {

app/src/main/java/com/owncloud/android/ui/activity/ToolbarActivity.java

@@ -117,6 +117,7 @@ public abstract class ToolbarActivity extends BaseActivity implements Injectable
         mToolbarSpinner = findViewById(R.id.toolbar_spinner);
 
         viewThemeUtils.material.themeToolbar(mToolbar);
+        viewThemeUtils.material.colorToolbarOverflowIcon(mToolbar);
         viewThemeUtils.platform.themeStatusBar(this);
         viewThemeUtils.material.colorMaterialTextButton(mSwitchAccountButton);
     }

app/src/main/java/com/owncloud/android/ui/activity/UploadFilesActivity.java

@@ -295,7 +295,7 @@ public class UploadFilesActivity extends DrawerActivity implements LocalFileList
         int fontColor = themeColorUtils.appBarPrimaryFontColor(this);
         final MenuItem item = menu.findItem(R.id.action_search);
         mSearchView = (SearchView) MenuItemCompat.getActionView(item);
-        themeToolbarUtils.themeSearchView(mSearchView, this);
+        viewThemeUtils.androidx.themeToolbarSearchView(mSearchView);
         viewThemeUtils.platform.tintTextDrawable(this, menu.findItem(R.id.action_choose_storage_path).getIcon());
 
         mSearchView.setOnSearchClickListener(v -> mToolbarSpinner.setVisibility(View.GONE));

app/src/main/java/com/owncloud/android/ui/adapter/TemplateAdapter.java

@@ -138,7 +138,6 @@ public class TemplateAdapter extends RecyclerView.Adapter<TemplateAdapter.ViewHo
 
             Drawable placeholder = MimeTypeUtil.getFileTypeIcon(mimetype,
                                                                 template.getTitle(),
-                                                                currentAccountProvider.getUser(),
                                                                 context,
                                                                 viewThemeUtils);
 

app/src/main/java/com/owncloud/android/ui/adapter/TrashbinListAdapter.java

@@ -266,7 +266,6 @@ public class TrashbinListAdapter extends RecyclerView.Adapter<RecyclerView.ViewH
             } else {
                 thumbnailView.setImageDrawable(MimeTypeUtil.getFileTypeIcon(file.getMimeType(),
                                                                             file.getFileName(),
-                                                                            user,
                                                                             context,
                                                                             viewThemeUtils));
             }

app/src/main/java/com/owncloud/android/ui/adapter/UploadListAdapter.java

@@ -488,7 +488,6 @@ public class UploadListAdapter extends SectionedRecyclerViewAdapter<SectionedVie
                 final User user = optionalUser.get();
                 final Drawable icon = MimeTypeUtil.getFileTypeIcon(item.getMimeType(),
                                                                    fileName,
-                                                                   user,
                                                                    parentActivity,
                                                                    viewThemeUtils);
                 itemViewHolder.binding.thumbnail.setImageDrawable(icon);

app/src/main/java/com/owncloud/android/ui/adapter/UploaderAdapter.java

@@ -145,7 +145,6 @@ public class UploaderAdapter extends SimpleAdapter {
             } else {
                 final Drawable icon = MimeTypeUtil.getFileTypeIcon(file.getMimeType(),
                                                                    file.getFileName(),
-                                                                   user,
                                                                    mContext,
                                                                    viewThemeUtils);
                 fileIcon.setImageDrawable(icon);

app/src/main/java/com/owncloud/android/ui/fragment/ExtendedListFragment.java

@@ -184,13 +184,10 @@ public class ExtendedListFragment extends Fragment implements
     public void onCreateOptionsMenu(Menu menu, @NonNull MenuInflater inflater) {
         final MenuItem item = menu.findItem(R.id.action_search);
         searchView = (SearchView) MenuItemCompat.getActionView(item);
+        viewThemeUtils.androidx.themeToolbarSearchView(searchView);
         closeButton = searchView.findViewById(androidx.appcompat.R.id.search_close_btn);
         searchView.setOnQueryTextListener(this);
         searchView.setOnCloseListener(this);
-        themeToolbarUtils.themeSearchView(searchView, requireContext());
-
-        SearchView.SearchAutoComplete theTextArea = searchView.findViewById(R.id.search_src_text);
-        theTextArea.setHighlightColor(themeColorUtils.primaryAccentColor(getContext()));
 
         final Handler handler = new Handler();
 

app/src/main/java/com/owncloud/android/ui/fragment/OCFileListBottomSheetDialog.java

@@ -132,7 +132,6 @@ public class OCFileListBottomSheetDialog extends BottomSheetDialog implements In
                     creatorViewBinding.creatorThumbnail.setImageDrawable(
                         MimeTypeUtil.getFileTypeIcon(creator.getMimetype(),
                                                      creator.getExtension(),
-                                                     user,
                                                      creatorViewBinding.creatorThumbnail.getContext(),
                                                      viewThemeUtils));
 

app/src/main/java/com/owncloud/android/ui/fragment/UnifiedSearchFragment.kt

@@ -236,6 +236,7 @@ class UnifiedSearchFragment : Fragment(), Injectable, UnifiedSearchListInterface
     override fun onCreateOptionsMenu(menu: Menu, inflater: MenuInflater) {
         val item = menu.findItem(R.id.action_search)
         val searchView = MenuItemCompat.getActionView(item) as SearchView
+        viewThemeUtils.androidx.themeToolbarSearchView(searchView)
         searchView.setQuery(vm.query.value, false)
         searchView.setOnQueryTextListener(this)
         searchView.isIconified = false

app/src/main/java/com/owncloud/android/ui/preview/PreviewTextFileFragment.java

@@ -42,6 +42,7 @@ import com.owncloud.android.ui.dialog.ConfirmationDialogFragment;
 import com.owncloud.android.ui.dialog.RemoveFilesDialogFragment;
 import com.owncloud.android.utils.DisplayUtils;
 import com.owncloud.android.utils.MimeTypeUtil;
+import com.owncloud.android.utils.theme.newm3.ViewThemeUtils;
 
 import org.mozilla.universalchardet.ReaderFactory;
 
@@ -73,6 +74,7 @@ public class PreviewTextFileFragment extends PreviewTextFragment {
     private User user;
 
     @Inject UserAccountManager accountManager;
+    @Inject ViewThemeUtils viewThemeUtils;
 
     public static PreviewTextFileFragment create(User user, OCFile file, boolean openSearch, String searchQuery) {
         Bundle args = new Bundle();
@@ -260,6 +262,7 @@ public class PreviewTextFileFragment extends PreviewTextFragment {
         menuItem.setVisible(true);
         searchView = (SearchView) MenuItemCompat.getActionView(menuItem);
         searchView.setMaxWidth(Integer.MAX_VALUE);
+        viewThemeUtils.androidx.themeToolbarSearchView(searchView);
 
         if (searchOpen) {
             searchView.setIconified(false);

app/src/main/java/com/owncloud/android/ui/preview/PreviewTextStringFragment.java

@@ -119,6 +119,7 @@ public class PreviewTextStringFragment extends PreviewTextFragment {
         searchView = (SearchView) MenuItemCompat.getActionView(menuItem);
         searchView.setOnQueryTextListener(this);
         searchView.setMaxWidth(Integer.MAX_VALUE);
+        viewThemeUtils.androidx.themeToolbarSearchView(searchView);
 
         if (searchOpen) {
             searchView.setIconified(false);

app/src/main/java/com/owncloud/android/utils/DisplayUtils.java

@@ -898,7 +898,6 @@ public final class DisplayUtils {
                             if (thumbnail == null) {
                                 Drawable drawable = MimeTypeUtil.getFileTypeIcon(file.getMimeType(),
                                                                                  file.getFileName(),
-                                                                                 user,
                                                                                  context,
                                                                                  viewThemeUtils);
                                 if (drawable == null) {
@@ -950,7 +949,6 @@ public final class DisplayUtils {
                 stopShimmer(shimmerThumbnail, thumbnailView);
                 thumbnailView.setImageDrawable(MimeTypeUtil.getFileTypeIcon(file.getMimeType(),
                                                                             file.getFileName(),
-                                                                            user,
                                                                             context,
                                                                             viewThemeUtils));
             }

app/src/main/java/com/owncloud/android/utils/MimeTypeUtil.java

@@ -95,23 +95,6 @@ public final class MimeTypeUtil {
                                            String filename,
                                            Context context,
                                            ViewThemeUtils viewThemeUtils) {
-        return getFileTypeIcon(mimetype, filename, null, context, viewThemeUtils);
-    }
-
-    /**
-     * Returns the Drawable of an image to use as icon associated to a known MIME type.
-     *
-     * @param mimetype MIME type string; if NULL, the method tries to guess it from the extension in filename
-     * @param filename Name, with extension.
-     * @param user     user which color should be used
-     * @return Drawable of an image resource.
-     */
-    @Nullable
-    public static Drawable getFileTypeIcon(String mimetype,
-                                           String filename,
-                                           @Nullable User user,
-                                           Context context,
-                                           ViewThemeUtils viewThemeUtils) {
         if (context != null) {
             int iconId = MimeTypeUtil.getFileTypeIconId(mimetype, filename);
             Drawable icon = ContextCompat.getDrawable(context, iconId);