Replace ThemeBarUtils with common themeutils

Signed-off-by: Álvaro Brey <alvaro.brey@nextcloud.com>

Author: AlvaroBrey

app/build.gradle

@@ -347,7 +347,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:feature/more-theming-files-SNAPSHOT'
+    implementation 'com.github.nextcloud.android-common:ui:9bad101de67c312731b7f170b23a4e4cf81633a6'
 }
 
 configurations.all {

app/src/main/java/com/nextcloud/client/account/UserAccountManagerImpl.java

@@ -145,6 +145,7 @@ public boolean exists(Account account) {
     @Override
     @Nullable
     public Account getCurrentAccount() {
+        Log_OC.d(TAG, "getCurrentAccount"); // TODO debug only, remove
         Account[] ocAccounts = getAccounts();
         Account defaultAccount = null;
 

app/src/main/java/com/nextcloud/client/di/ThemeModule.kt

@@ -23,7 +23,6 @@ package com.nextcloud.client.di
 import android.content.Context
 import com.nextcloud.android.common.ui.theme.MaterialSchemes
 import com.owncloud.android.utils.theme.ThemeAvatarUtils
-import com.owncloud.android.utils.theme.ThemeBarUtils
 import com.owncloud.android.utils.theme.ThemeButtonUtils
 import com.owncloud.android.utils.theme.ThemeCheckableUtils
 import com.owncloud.android.utils.theme.ThemeColorUtils
@@ -115,12 +114,6 @@ internal abstract class ThemeModule {
             return ThemeButtonUtils()
         }
 
-        @Provides
-        @Singleton
-        fun themeBarUtils(): ThemeBarUtils {
-            return ThemeBarUtils()
-        }
-
         @Provides
         @Singleton
         fun themeTextInputUtils(): ThemeTextInputUtils {

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

@@ -33,15 +33,17 @@ import com.nextcloud.client.di.ViewModelFactory
 import com.owncloud.android.R
 import com.owncloud.android.databinding.LogsActivityBinding
 import com.owncloud.android.ui.activity.ToolbarActivity
-import com.owncloud.android.utils.theme.ThemeBarUtils
+import com.owncloud.android.utils.theme.newm3.ViewThemeUtils
 import javax.inject.Inject
 
 class LogsActivity : ToolbarActivity() {
 
     @Inject
     protected lateinit var viewModelFactory: ViewModelFactory
+
     @Inject
-    protected lateinit var themeBarUtils: ThemeBarUtils
+    lateinit var viewThemeUtils: ViewThemeUtils
+
     private lateinit var vm: LogsViewModel
     private lateinit var binding: LogsActivityBinding
     private lateinit var logsAdapter: LogsAdapter
@@ -66,7 +68,7 @@ class LogsActivity : ToolbarActivity() {
         }
 
         findViewById<ProgressBar>(R.id.logs_loading_progress).apply {
-            themeBarUtils.themeProgressBar(context, this, themeColorUtils)
+            viewThemeUtils.platform.themeHorizontalProgressBar(this)
         }
 
         logsAdapter = LogsAdapter(this)

app/src/main/java/com/owncloud/android/media/MediaControlView.java

@@ -41,8 +41,8 @@
 import com.owncloud.android.MainApp;
 import com.owncloud.android.R;
 import com.owncloud.android.lib.common.utils.Log_OC;
-import com.owncloud.android.utils.theme.ThemeBarUtils;
 import com.owncloud.android.utils.theme.ThemeColorUtils;
+import com.owncloud.android.utils.theme.newm3.ViewThemeUtils;
 
 import java.util.Formatter;
 import java.util.Locale;
@@ -74,7 +74,7 @@ public class MediaControlView extends FrameLayout implements OnClickListener, On
     @Inject
     ThemeColorUtils themeColorUtils;
     @Inject
-    ThemeBarUtils themeBarUtils;
+    ViewThemeUtils viewThemeUtils;
 
 
     public MediaControlView(Context context,
@@ -137,10 +137,10 @@ private void initControllerView(View v) {
         if (progressBar != null) {
             if (progressBar instanceof SeekBar) {
                 SeekBar seeker = (SeekBar) progressBar;
-                themeBarUtils.colorHorizontalSeekBar(seeker, getContext(), themeColorUtils);
+                viewThemeUtils.platform.themeHorizontalSeekBar(seeker);
                 seeker.setOnSeekBarChangeListener(this);
             } else {
-                themeBarUtils.colorHorizontalProgressBar(progressBar, themeColorUtils.primaryAccentColor(getContext()));
+                viewThemeUtils.platform.themeHorizontalProgressBar(progressBar);
             }
             progressBar.setMax(1000);
         }

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

@@ -113,8 +113,8 @@
 import com.owncloud.android.utils.svg.SvgOrImageBitmapTranscoder;
 import com.owncloud.android.utils.svg.SvgOrImageDecoder;
 import com.owncloud.android.utils.theme.CapabilityUtils;
-import com.owncloud.android.utils.theme.ThemeBarUtils;
 import com.owncloud.android.utils.theme.ThemeMenuUtils;
+import com.owncloud.android.utils.theme.newm3.ViewThemeUtils;
 
 import org.greenrobot.eventbus.EventBus;
 import org.greenrobot.eventbus.Subscribe;
@@ -214,7 +214,7 @@ public abstract class DrawerActivity extends ToolbarActivity
     ThemeMenuUtils themeMenuUtils;
 
     @Inject
-    ThemeBarUtils themeBarUtils;
+    ViewThemeUtils viewThemeUtils;
 
     /**
      * Initializes the drawer, its content and highlights the menu item with the given id. This method needs to be
@@ -300,7 +300,7 @@ private void setupQuotaElement() {
         mQuotaProgressBar = (ProgressBar) findQuotaViewById(R.id.drawer_quota_ProgressBar);
         mQuotaTextPercentage = (TextView) findQuotaViewById(R.id.drawer_quota_percentage);
         mQuotaTextLink = (TextView) findQuotaViewById(R.id.drawer_quota_link);
-        themeBarUtils.colorProgressBar(mQuotaProgressBar, themeColorUtils.primaryColor(this));
+        viewThemeUtils.platform.themeHorizontalProgressBar(mQuotaProgressBar);
     }
 
     public void updateHeader() {
@@ -702,9 +702,10 @@ private void setQuotaInformation(long usedSpace, long totalSpace, int relative,
 
         mQuotaProgressBar.setProgress(relative);
 
-        themeBarUtils.colorProgressBar(mQuotaProgressBar, DisplayUtils.getRelativeInfoColor(this,
-                                                                                            relative,
-                                                                                            themeColorUtils));
+        final int color = DisplayUtils.getRelativeInfoColor(this,
+                                                                        relative,
+                                                                        themeColorUtils);
+        viewThemeUtils.platform.themeHorizontalProgressBar(mQuotaProgressBar, color);
 
         updateQuotaLink();
         showQuota(true);

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

@@ -56,6 +56,7 @@
 import com.owncloud.android.ui.adapter.UploadListAdapter;
 import com.owncloud.android.ui.decoration.MediaGridItemDecoration;
 import com.owncloud.android.utils.FilesSyncHelper;
+import com.owncloud.android.utils.theme.newm3.ViewThemeUtils;
 
 import javax.inject.Inject;
 
@@ -99,6 +100,9 @@ public class UploadListActivity extends FileActivity {
     @Inject
     LocalBroadcastManager localBroadcastManager;
 
+    @Inject
+    ViewThemeUtils viewThemeUtils;
+
     private UploadListLayoutBinding binding;
 
     public static Intent createIntent(OCFile file, User user, Integer flag, Context context) {
@@ -157,7 +161,7 @@ private void setupContent() {
                                                   clock,
                                                   themeColorUtils,
                                                   themeDrawableUtils,
-                                                  themeBarUtils);
+                                                  viewThemeUtils);
 
         final GridLayoutManager lm = new GridLayoutManager(this, 1);
         uploadListAdapter.setLayoutManager(lm);

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

@@ -24,7 +24,6 @@
 
 package com.owncloud.android.ui.adapter;
 
-import android.accounts.Account;
 import android.content.ActivityNotFoundException;
 import android.content.Context;
 import android.content.Intent;
@@ -65,9 +64,9 @@
 import com.owncloud.android.ui.activity.FileActivity;
 import com.owncloud.android.utils.DisplayUtils;
 import com.owncloud.android.utils.MimeTypeUtil;
-import com.owncloud.android.utils.theme.ThemeBarUtils;
 import com.owncloud.android.utils.theme.ThemeColorUtils;
 import com.owncloud.android.utils.theme.ThemeDrawableUtils;
+import com.owncloud.android.utils.theme.newm3.ViewThemeUtils;
 
 import java.io.File;
 import java.util.Arrays;
@@ -92,7 +91,7 @@ public class UploadListAdapter extends SectionedRecyclerViewAdapter<SectionedVie
     private boolean showUser;
     private ThemeColorUtils themeColorUtils;
     private ThemeDrawableUtils themeDrawableUtils;
-    private ThemeBarUtils themeBarUtils;
+    private final  ViewThemeUtils viewThemeUtils;
 
     @Override
     public int getSectionCount() {
@@ -174,7 +173,7 @@ public UploadListAdapter(final FileActivity fileActivity,
                              final Clock clock,
                              final ThemeColorUtils themeColorUtils,
                              final ThemeDrawableUtils themeDrawableUtils,
-                             final ThemeBarUtils themeBarUtils) {
+                             final ViewThemeUtils viewThemeUtils) {
         Log_OC.d(TAG, "UploadListAdapter");
         this.parentActivity = fileActivity;
         this.uploadsStorageManager = uploadsStorageManager;
@@ -185,7 +184,7 @@ public UploadListAdapter(final FileActivity fileActivity,
         this.clock = clock;
         this.themeColorUtils = themeColorUtils;
         this.themeDrawableUtils = themeDrawableUtils;
-        this.themeBarUtils = themeBarUtils;
+        this.viewThemeUtils = viewThemeUtils;
 
         uploadGroups = new UploadGroup[3];
 
@@ -280,8 +279,7 @@ public void onBindViewHolder(SectionedViewHolder holder, int section, int relati
         String status = getStatusText(item);
         switch (item.getUploadStatus()) {
             case UPLOAD_IN_PROGRESS:
-                themeBarUtils.colorHorizontalProgressBar(itemViewHolder.binding.uploadProgressBar,
-                                                         themeColorUtils.primaryAccentColor(parentActivity));
+                viewThemeUtils.platform.themeHorizontalProgressBar(itemViewHolder.binding.uploadProgressBar);
                 itemViewHolder.binding.uploadProgressBar.setProgress(0);
                 itemViewHolder.binding.uploadProgressBar.setVisibility(View.VISIBLE);
 

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

@@ -72,9 +72,9 @@
 import com.owncloud.android.ui.events.FavoriteEvent;
 import com.owncloud.android.utils.DisplayUtils;
 import com.owncloud.android.utils.MimeTypeUtil;
-import com.owncloud.android.utils.theme.ThemeBarUtils;
 import com.owncloud.android.utils.theme.ThemeColorUtils;
 import com.owncloud.android.utils.theme.ThemeLayoutUtils;
+import com.owncloud.android.utils.theme.newm3.ViewThemeUtils;
 
 import org.greenrobot.eventbus.EventBus;
 import org.greenrobot.eventbus.Subscribe;
@@ -118,7 +118,7 @@ public class FileDetailFragment extends FileFragment implements OnClickListener,
     @Inject FileDataStorageManager storageManager;
     @Inject ThemeColorUtils themeColorUtils;
     @Inject ThemeLayoutUtils themeLayoutUtils;
-    @Inject ThemeBarUtils themeBarUtils;
+    @Inject ViewThemeUtils viewThemeUtils;
     @Inject BackgroundJobManager backgroundJobManager;
 
     /**
@@ -233,7 +233,7 @@ public View onCreateView(@NonNull LayoutInflater inflater, ViewGroup container,
     @Override
     public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceState) {
         if (getFile() != null && user != null) {
-            themeBarUtils.colorHorizontalProgressBar(binding.progressBar, themeColorUtils.primaryAccentColor(getContext()));
+            viewThemeUtils.platform.themeHorizontalProgressBar(binding.progressBar);
             progressListener = new ProgressListener(binding.progressBar);
             binding.cancelBtn.setOnClickListener(this);
             binding.favorite.setOnClickListener(this);

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

@@ -34,8 +34,8 @@
 import com.owncloud.android.lib.common.network.OnDatatransferProgressListener;
 import com.owncloud.android.lib.common.utils.Log_OC;
 import com.owncloud.android.ui.fragment.FileFragment;
-import com.owncloud.android.utils.theme.ThemeBarUtils;
 import com.owncloud.android.utils.theme.ThemeColorUtils;
+import com.owncloud.android.utils.theme.newm3.ViewThemeUtils;
 
 import java.lang.ref.WeakReference;
 
@@ -63,7 +63,7 @@ public class FileDownloadFragment extends FileFragment implements OnClickListene
     private User user;
 
     @Inject ThemeColorUtils themeColorUtils;
-    @Inject ThemeBarUtils themeBarUtils;
+    @Inject ViewThemeUtils viewThemeUtils;
     public ProgressListener mProgressListener;
     private boolean mListening;
 
@@ -145,7 +145,7 @@ public View onCreateView(LayoutInflater inflater, ViewGroup container,
         mView = inflater.inflate(R.layout.file_download_fragment, container, false);
 
         ProgressBar progressBar = mView.findViewById(R.id.progressBar);
-        themeBarUtils.colorHorizontalProgressBar(progressBar, themeColorUtils.primaryAccentColor(getContext()));
+        viewThemeUtils.platform.themeHorizontalProgressBar(progressBar);
         mProgressListener = new ProgressListener(progressBar);
 
         (mView.findViewById(R.id.cancelBtn)).setOnClickListener(this);