Clear some uses of old color utils

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

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:38cfcd97d2'
+    implementation 'com.github.nextcloud.android-common:ui:1f2547e'
 }
 
 configurations.all {

app/src/main/java/com/nextcloud/client/jobs/BackgroundJobFactory.kt

@@ -40,7 +40,6 @@ import com.nextcloud.client.preferences.AppPreferences
 import com.owncloud.android.datamodel.ArbitraryDataProvider
 import com.owncloud.android.datamodel.SyncedFolderProvider
 import com.owncloud.android.datamodel.UploadsStorageManager
-import com.owncloud.android.utils.theme.ThemeColorUtils
 import com.owncloud.android.utils.theme.newm3.ViewThemeUtils
 import org.greenrobot.eventbus.EventBus
 import javax.inject.Inject
@@ -66,7 +65,6 @@ class BackgroundJobFactory @Inject constructor(
     private val notificationManager: NotificationManager,
     private val eventBus: EventBus,
     private val deckApi: DeckApi,
-    private val themeColorUtils: ThemeColorUtils,
     private val viewThemeUtils: Provider<ViewThemeUtils>
 ) : WorkerFactory() {
 
@@ -111,7 +109,7 @@ class BackgroundJobFactory @Inject constructor(
             context,
             accountManager.user,
             contentResolver,
-            themeColorUtils,
+            viewThemeUtils.get(),
             params
         )
     }
@@ -210,7 +208,6 @@ class BackgroundJobFactory @Inject constructor(
             accountManager,
             preferences,
             clock,
-            themeColorUtils,
             viewThemeUtils.get()
         )
     }
@@ -222,7 +219,7 @@ class BackgroundJobFactory @Inject constructor(
             notificationManager,
             accountManager,
             deckApi,
-            themeColorUtils
+            viewThemeUtils.get()
         )
     }
 

app/src/main/java/com/nextcloud/client/jobs/FilesExportWork.kt

@@ -44,14 +44,14 @@ import com.owncloud.android.ui.dialog.SendShareDialog
 import com.owncloud.android.ui.notifications.NotificationUtils
 import com.owncloud.android.utils.FileExportUtils
 import com.owncloud.android.utils.FileStorageUtils
-import com.owncloud.android.utils.theme.ThemeColorUtils
+import com.owncloud.android.utils.theme.newm3.ViewThemeUtils
 import java.security.SecureRandom
 
 class FilesExportWork(
     private val appContext: Context,
     private val user: User,
     private val contentResolver: ContentResolver,
-    private val themeColorUtils: ThemeColorUtils,
+    private val viewThemeUtils: ViewThemeUtils,
     params: WorkerParameters
 ) : Worker(appContext, params) {
 
@@ -153,11 +153,12 @@ class FilesExportWork(
         )
             .setSmallIcon(R.drawable.notification_icon)
             .setLargeIcon(BitmapFactory.decodeResource(appContext.resources, R.drawable.notification_icon))
-            .setColor(themeColorUtils.primaryColor(appContext, false))
             .setSubText(user.accountName)
             .setContentText(message)
             .setAutoCancel(true)
 
+        viewThemeUtils.androidx.themeNotificationCompatBuilder(appContext, notificationBuilder)
+
         val actionIntent = Intent(DownloadManager.ACTION_VIEW_DOWNLOADS).apply {
             flags = FLAG_ACTIVITY_NEW_TASK
         }

app/src/main/java/com/nextcloud/client/jobs/MediaFoldersDetectionWork.kt

@@ -55,7 +55,6 @@ import com.owncloud.android.ui.activity.ManageAccountsActivity.PENDING_FOR_REMOV
 import com.owncloud.android.ui.activity.SyncedFoldersActivity
 import com.owncloud.android.ui.notifications.NotificationUtils
 import com.owncloud.android.utils.SyncedFolderUtils
-import com.owncloud.android.utils.theme.ThemeColorUtils
 import com.owncloud.android.utils.theme.newm3.ViewThemeUtils
 import java.util.Random
 
@@ -68,7 +67,6 @@ class MediaFoldersDetectionWork constructor(
     private val userAccountManager: UserAccountManager,
     private val preferences: AppPreferences,
     private val clock: Clock,
-    private val themeColorUtils: ThemeColorUtils,
     private val viewThemeUtils: ViewThemeUtils
 ) : Worker(context, params) {
 
@@ -220,13 +218,15 @@ class MediaFoldersDetectionWork constructor(
         )
             .setSmallIcon(R.drawable.notification_icon)
             .setLargeIcon(BitmapFactory.decodeResource(context.resources, R.drawable.notification_icon))
-            .setColor(themeColorUtils.primaryColor(context, false))
             .setSubText(user.accountName)
             .setContentTitle(contentTitle)
             .setContentText(subtitle)
             .setSound(RingtoneManager.getDefaultUri(RingtoneManager.TYPE_NOTIFICATION))
             .setAutoCancel(true)
             .setContentIntent(pendingIntent)
+
+        viewThemeUtils.androidx.themeNotificationCompatBuilder(context, notificationBuilder)
+
         val disableDetection = Intent(context, NotificationReceiver::class.java)
         disableDetection.putExtra(NOTIFICATION_ID, notificationId)
         disableDetection.action = DISABLE_DETECTION_CLICK

app/src/main/java/com/nextcloud/client/jobs/NotificationWork.kt

@@ -54,7 +54,7 @@ import com.owncloud.android.ui.activity.FileDisplayActivity
 import com.owncloud.android.ui.activity.NotificationsActivity
 import com.owncloud.android.ui.notifications.NotificationUtils
 import com.owncloud.android.utils.PushUtils
-import com.owncloud.android.utils.theme.ThemeColorUtils
+import com.owncloud.android.utils.theme.newm3.ViewThemeUtils
 import dagger.android.AndroidInjection
 import org.apache.commons.httpclient.HttpMethod
 import org.apache.commons.httpclient.HttpStatus
@@ -76,7 +76,7 @@ class NotificationWork constructor(
     private val notificationManager: NotificationManager,
     private val accountManager: UserAccountManager,
     private val deckApi: DeckApi,
-    private val themeColorUtils: ThemeColorUtils
+    private val viewThemeUtils: ViewThemeUtils
 ) : Worker(context, params) {
 
     companion object {
@@ -168,7 +168,6 @@ class NotificationWork constructor(
         val notificationBuilder = NotificationCompat.Builder(context, NotificationUtils.NOTIFICATION_CHANNEL_PUSH)
             .setSmallIcon(R.drawable.notification_icon)
             .setLargeIcon(BitmapFactory.decodeResource(context.resources, R.drawable.notification_icon))
-            .setColor(themeColorUtils.primaryColor(user.toPlatformAccount(), false, context))
             .setShowWhen(true)
             .setSubText(user.accountName)
             .setContentTitle(notification.getSubject())
@@ -177,6 +176,9 @@ class NotificationWork constructor(
             .setAutoCancel(true)
             .setVisibility(NotificationCompat.VISIBILITY_PRIVATE)
             .setContentIntent(pendingIntent)
+
+        viewThemeUtils.androidx.themeNotificationCompatBuilder(context, notificationBuilder)
+
         // Remove
         if (notification.getActions().isEmpty()) {
             val disableDetection = Intent(context, NotificationReceiver::class.java)
@@ -223,14 +225,17 @@ class NotificationWork constructor(
             NotificationCompat.Builder(context, NotificationUtils.NOTIFICATION_CHANNEL_PUSH)
                 .setSmallIcon(R.drawable.notification_icon)
                 .setLargeIcon(BitmapFactory.decodeResource(context.resources, R.drawable.notification_icon))
-                .setColor(themeColorUtils.primaryColor(user.toPlatformAccount(), false, context))
                 .setShowWhen(true)
                 .setSubText(user.accountName)
                 .setContentTitle(context.getString(R.string.new_notification))
                 .setSound(RingtoneManager.getDefaultUri(RingtoneManager.TYPE_NOTIFICATION))
                 .setAutoCancel(true)
                 .setVisibility(NotificationCompat.VISIBILITY_PUBLIC)
-                .setContentIntent(pendingIntent).build()
+                .setContentIntent(pendingIntent)
+                .also {
+                    viewThemeUtils.androidx.themeNotificationCompatBuilder(context, it)
+                }
+                .build()
         )
         val notificationManager = NotificationManagerCompat.from(context)
         notificationManager.notify(notification.getNotificationId(), notificationBuilder.build())

app/src/main/java/com/nextcloud/client/media/PlayerService.kt

@@ -33,7 +33,7 @@ import com.nextcloud.client.network.ClientFactory
 import com.owncloud.android.R
 import com.owncloud.android.datamodel.OCFile
 import com.owncloud.android.ui.notifications.NotificationUtils
-import com.owncloud.android.utils.theme.ThemeColorUtils
+import com.owncloud.android.utils.theme.newm3.ViewThemeUtils
 import dagger.android.AndroidInjection
 import java.util.Locale
 import javax.inject.Inject
@@ -90,7 +90,7 @@ class PlayerService : Service() {
     protected lateinit var clientFactory: ClientFactory
 
     @Inject
-    protected lateinit var themeColorUtils: ThemeColorUtils
+    lateinit var viewThemeUtils: ViewThemeUtils
 
     private lateinit var player: Player
     private lateinit var notificationBuilder: NotificationCompat.Builder
@@ -101,7 +101,7 @@ class PlayerService : Service() {
         AndroidInjection.inject(this)
         player = Player(applicationContext, clientFactory, playerListener, audioManager)
         notificationBuilder = NotificationCompat.Builder(this)
-        notificationBuilder.color = themeColorUtils.primaryColor(this, false)
+        viewThemeUtils.androidx.themeNotificationCompatBuilder(this, notificationBuilder)
 
         val stop = Intent(this, PlayerService::class.java)
         stop.action = ACTION_STOP

app/src/main/java/com/owncloud/android/authentication/DeepLinkLoginActivity.java

@@ -7,13 +7,8 @@ import android.widget.Toast;
 
 import com.nextcloud.client.di.Injectable;
 import com.owncloud.android.R;
-import com.owncloud.android.utils.theme.ThemeColorUtils;
-
-import javax.inject.Inject;
 
 public class DeepLinkLoginActivity extends AuthenticatorActivity implements Injectable {
-    @Inject
-    public ThemeColorUtils themeColorUtils;
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
@@ -35,7 +30,6 @@ public class DeepLinkLoginActivity extends AuthenticatorActivity implements Inje
                 LoginUrlInfo loginUrlInfo = parseLoginDataUrl(prefix, data.toString());
 
                 TextView loginText = findViewById(R.id.loginInfo);
-                loginText.setTextColor(themeColorUtils.fontColor(this));
                 loginText.setText(String.format("Login with %1$s to %2$s", loginUrlInfo.username,
                                                 loginUrlInfo.serverAddress));
             } catch (IllegalArgumentException e) {

app/src/main/java/com/owncloud/android/files/services/FileDownloader.java

@@ -69,6 +69,7 @@ import com.owncloud.android.ui.preview.PreviewImageFragment;
 import com.owncloud.android.utils.ErrorMessageAdapter;
 import com.owncloud.android.utils.MimeTypeUtil;
 import com.owncloud.android.utils.theme.ThemeColorUtils;
+import com.owncloud.android.utils.theme.newm3.ViewThemeUtils;
 
 import java.io.File;
 import java.security.SecureRandom;
@@ -127,7 +128,7 @@ public class FileDownloader extends Service
     @Inject UserAccountManager accountManager;
     @Inject UploadsStorageManager uploadsStorageManager;
     @Inject LocalBroadcastManager localBroadcastManager;
-    @Inject ThemeColorUtils themeColorUtils;
+    @Inject ViewThemeUtils viewThemeUtils;
 
     public static String getDownloadAddedMessage() {
         return FileDownloader.class.getName() + DOWNLOAD_ADDED_MESSAGE;
@@ -152,12 +153,12 @@ public class FileDownloader extends Service
         mServiceHandler = new ServiceHandler(mServiceLooper, this);
         mBinder = new FileDownloaderBinder();
 
-        NotificationCompat.Builder builder = new NotificationCompat.Builder(this).setContentTitle(
+        NotificationCompat.Builder builder = NotificationUtils.newNotificationBuilder(this, viewThemeUtils).setContentTitle(
             getApplicationContext().getResources().getString(R.string.app_name))
             .setContentText(getApplicationContext().getResources().getString(R.string.foreground_service_download))
             .setSmallIcon(R.drawable.notification_icon)
-            .setLargeIcon(BitmapFactory.decodeResource(getResources(), R.drawable.notification_icon))
-            .setColor(themeColorUtils.primaryColor(getApplicationContext(), true));
+            .setLargeIcon(BitmapFactory.decodeResource(getResources(), R.drawable.notification_icon));
+
 
         if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.O) {
             builder.setChannelId(NotificationUtils.NOTIFICATION_CHANNEL_DOWNLOAD);
@@ -544,7 +545,7 @@ public class FileDownloader extends Service
     private void notifyDownloadStart(DownloadFileOperation download) {
         /// create status notification with a progress bar
         mLastPercent = 0;
-        mNotificationBuilder = NotificationUtils.newNotificationBuilder(this, themeColorUtils);
+        mNotificationBuilder = NotificationUtils.newNotificationBuilder(this, viewThemeUtils);
         mNotificationBuilder
             .setSmallIcon(R.drawable.notification_icon)
             .setTicker(getString(R.string.downloader_download_in_progress_ticker))

app/src/main/java/com/owncloud/android/files/services/FileUploader.java

@@ -78,7 +78,7 @@ import com.owncloud.android.ui.activity.ConflictsResolveActivity;
 import com.owncloud.android.ui.activity.UploadListActivity;
 import com.owncloud.android.ui.notifications.NotificationUtils;
 import com.owncloud.android.utils.ErrorMessageAdapter;
-import com.owncloud.android.utils.theme.ThemeColorUtils;
+import com.owncloud.android.utils.theme.newm3.ViewThemeUtils;
 
 import java.io.File;
 import java.security.SecureRandom;
@@ -201,7 +201,7 @@ public class FileUploader extends Service
     @Inject ConnectivityService connectivityService;
     @Inject PowerManagementService powerManagementService;
     @Inject LocalBroadcastManager localBroadcastManager;
-    @Inject ThemeColorUtils themeColorUtils;
+    @Inject ViewThemeUtils viewThemeUtils;
 
     private IndexedForest<UploadFileOperation> mPendingUploads = new IndexedForest<>();
 
@@ -237,12 +237,11 @@ public class FileUploader extends Service
         mServiceHandler = new ServiceHandler(mServiceLooper, this);
         mBinder = new FileUploaderBinder();
 
-        NotificationCompat.Builder builder = new NotificationCompat.Builder(this).setContentTitle(
-            getApplicationContext().getResources().getString(R.string.app_name))
+        NotificationCompat.Builder builder = NotificationUtils.newNotificationBuilder(this, viewThemeUtils).setContentTitle(
+                getApplicationContext().getResources().getString(R.string.app_name))
             .setContentText(getApplicationContext().getResources().getString(R.string.foreground_service_upload))
             .setSmallIcon(R.drawable.notification_icon)
-            .setLargeIcon(BitmapFactory.decodeResource(getResources(), R.drawable.notification_icon))
-            .setColor(themeColorUtils.primaryColor(getApplicationContext(), true));
+            .setLargeIcon(BitmapFactory.decodeResource(getResources(), R.drawable.notification_icon));
 
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
             builder.setChannelId(NotificationUtils.NOTIFICATION_CHANNEL_UPLOAD);
@@ -689,7 +688,7 @@ public class FileUploader extends Service
     private void notifyUploadStart(UploadFileOperation upload) {
         // / create status notification with a progress bar
         mLastPercent = 0;
-        mNotificationBuilder = NotificationUtils.newNotificationBuilder(this, themeColorUtils);
+        mNotificationBuilder = NotificationUtils.newNotificationBuilder(this, viewThemeUtils);
         mNotificationBuilder
             .setOngoing(true)
             .setSmallIcon(R.drawable.notification_icon)

app/src/main/java/com/owncloud/android/syncadapter/FileSyncAdapter.java

@@ -49,6 +49,7 @@ import com.owncloud.android.ui.activity.ErrorsWhileCopyingHandlerActivity;
 import com.owncloud.android.ui.notifications.NotificationUtils;
 import com.owncloud.android.utils.DataHolderUtil;
 import com.owncloud.android.utils.theme.ThemeColorUtils;
+import com.owncloud.android.utils.theme.newm3.ViewThemeUtils;
 
 import org.apache.jackrabbit.webdav.DavException;
 
@@ -122,7 +123,7 @@ public class FileSyncAdapter extends AbstractOwnCloudSyncAdapter {
      */
     private SyncResult mSyncResult;
 
-    private final ThemeColorUtils themeColorUtils;
+    private final ViewThemeUtils viewThemeUtils;
 
     /**
      * Creates a {@link FileSyncAdapter}
@@ -132,9 +133,9 @@ public class FileSyncAdapter extends AbstractOwnCloudSyncAdapter {
     public FileSyncAdapter(Context context,
                            boolean autoInitialize,
                            UserAccountManager userAccountManager,
-                           ThemeColorUtils themeColorUtils) {
+                           final ViewThemeUtils viewThemeUtils) {
         super(context, autoInitialize, userAccountManager);
-        this.themeColorUtils = themeColorUtils;
+        this.viewThemeUtils = viewThemeUtils;
     }
 
     /**
@@ -146,9 +147,9 @@ public class FileSyncAdapter extends AbstractOwnCloudSyncAdapter {
                            boolean autoInitialize,
                            boolean allowParallelSyncs,
                            UserAccountManager userAccountManager,
-                           ThemeColorUtils themeColorUtils) {
+                           final ViewThemeUtils viewThemeUtils) {
         super(context, autoInitialize, allowParallelSyncs, userAccountManager);
-        this.themeColorUtils = themeColorUtils;
+        this.viewThemeUtils = viewThemeUtils;
     }
 
 
@@ -524,7 +525,7 @@ public class FileSyncAdapter extends AbstractOwnCloudSyncAdapter {
     private NotificationCompat.Builder createNotificationBuilder() {
         NotificationCompat.Builder notificationBuilder = new NotificationCompat.Builder(getContext());
         notificationBuilder.setSmallIcon(R.drawable.notification_icon).setAutoCancel(true);
-        notificationBuilder.setColor(themeColorUtils.primaryColor(getContext(), true));
+        viewThemeUtils.androidx.themeNotificationCompatBuilder(getContext(), notificationBuilder);
         return notificationBuilder;
     }
 

app/src/main/java/com/owncloud/android/syncadapter/FileSyncService.java

@@ -26,6 +26,7 @@ import android.os.IBinder;
 
 import com.nextcloud.client.account.UserAccountManager;
 import com.owncloud.android.utils.theme.ThemeColorUtils;
+import com.owncloud.android.utils.theme.newm3.ViewThemeUtils;
 
 import javax.inject.Inject;
 
@@ -44,7 +45,7 @@ public class FileSyncService extends Service {
     private static final Object syncAdapterLock = new Object();
 
     @Inject UserAccountManager userAccountManager;
-    @Inject ThemeColorUtils themeColorUtils;
+    @Inject ViewThemeUtils viewThemeUtils;
 
     /*
      * {@inheritDoc}
@@ -54,7 +55,7 @@ public class FileSyncService extends Service {
         AndroidInjection.inject(this);
         synchronized (syncAdapterLock) {
             if (syncAdapter == null) {
-                syncAdapter = new FileSyncAdapter(getApplicationContext(), true, userAccountManager, themeColorUtils);
+                syncAdapter = new FileSyncAdapter(getApplicationContext(), true, userAccountManager, viewThemeUtils);
             }
         }
     }

app/src/main/java/com/owncloud/android/ui/dialog/ChooseRichDocumentsTemplateDialogFragment.java

@@ -60,7 +60,6 @@ import com.owncloud.android.ui.adapter.RichDocumentsTemplateAdapter;
 import com.owncloud.android.utils.DisplayUtils;
 import com.owncloud.android.utils.FileStorageUtils;
 import com.owncloud.android.utils.NextcloudServer;
-import com.owncloud.android.utils.theme.ThemeColorUtils;
 import com.owncloud.android.utils.theme.newm3.ViewThemeUtils;
 
 import java.lang.ref.WeakReference;
@@ -89,7 +88,6 @@ public class ChooseRichDocumentsTemplateDialogFragment extends DialogFragment im
 
     @Inject CurrentAccountProvider currentAccount;
     @Inject ClientFactory clientFactory;
-    @Inject ThemeColorUtils themeColorUtils;
     @Inject ViewThemeUtils viewThemeUtils;
     @Inject FileDataStorageManager fileDataStorageManager;
     private RichDocumentsTemplateAdapter adapter;

app/src/main/java/com/owncloud/android/ui/dialog/ChooseTemplateDialogFragment.kt

@@ -59,8 +59,6 @@ import com.owncloud.android.ui.activity.TextEditorWebView
 import com.owncloud.android.ui.adapter.TemplateAdapter
 import com.owncloud.android.utils.DisplayUtils
 import com.owncloud.android.utils.FileStorageUtils
-import com.owncloud.android.utils.theme.ThemeColorUtils
-import com.owncloud.android.utils.theme.ThemeDrawableUtils
 import com.owncloud.android.utils.theme.newm3.ViewThemeUtils
 import java.lang.ref.WeakReference
 import javax.inject.Inject
@@ -78,12 +76,6 @@ class ChooseTemplateDialogFragment : DialogFragment(), View.OnClickListener, Tem
     @Inject
     lateinit var currentAccount: CurrentAccountProvider
 
-    @Inject
-    lateinit var themeColorUtils: ThemeColorUtils
-
-    @Inject
-    lateinit var themeDrawableUtils: ThemeDrawableUtils
-
     @Inject
     lateinit var fileDataStorageManager: FileDataStorageManager
 

app/src/main/java/com/owncloud/android/ui/dialog/SendShareDialog.java

@@ -3,7 +3,6 @@ package com.owncloud.android.ui.dialog;
 import android.content.ComponentName;
 import android.content.Intent;
 import android.content.pm.ResolveInfo;
-import android.graphics.PorterDuff;
 import android.graphics.drawable.Drawable;
 import android.os.Bundle;
 import android.view.LayoutInflater;
@@ -28,7 +27,6 @@ import com.owncloud.android.ui.adapter.SendButtonAdapter;
 import com.owncloud.android.ui.components.SendButtonData;
 import com.owncloud.android.ui.helpers.FileOperationsHelper;
 import com.owncloud.android.utils.MimeTypeUtil;
-import com.owncloud.android.utils.theme.ThemeColorUtils;
 import com.owncloud.android.utils.theme.newm3.ViewThemeUtils;
 
 import java.util.ArrayList;
@@ -79,7 +77,6 @@ public class SendShareDialog extends BottomSheetDialogFragment implements Inject
     private boolean sharingPublicPasswordEnforced;
     private boolean sharingPublicAskForPassword;
     private FileOperationsHelper fileOperationsHelper;
-    @Inject ThemeColorUtils themeColorUtils;
     @Inject ViewThemeUtils viewThemeUtils;
 
     public static SendShareDialog newInstance(OCFile file, boolean hideNcSharingOptions, OCCapability capability) {

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

@@ -68,7 +68,6 @@ import com.owncloud.android.ui.activity.UploadFilesActivity;
 import com.owncloud.android.ui.adapter.LocalFileListAdapter;
 import com.owncloud.android.ui.adapter.OCFileListAdapter;
 import com.owncloud.android.ui.events.SearchEvent;
-import com.owncloud.android.utils.theme.ThemeColorUtils;
 import com.owncloud.android.utils.theme.ThemeDrawableUtils;
 import com.owncloud.android.utils.theme.ThemeToolbarUtils;
 import com.owncloud.android.utils.theme.newm3.ViewThemeUtils;
@@ -116,7 +115,6 @@ public class ExtendedListFragment extends Fragment implements
 
     @Inject AppPreferences preferences;
     @Inject UserAccountManager accountManager;
-    @Inject ThemeColorUtils themeColorUtils;
     @Inject ThemeToolbarUtils themeToolbarUtils;
     @Inject ThemeDrawableUtils themeDrawableUtils;
     @Inject ViewThemeUtils viewThemeUtils;

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

@@ -54,8 +54,6 @@ import com.owncloud.android.ui.unifiedsearch.ProviderID
 import com.owncloud.android.ui.unifiedsearch.UnifiedSearchSection
 import com.owncloud.android.ui.unifiedsearch.UnifiedSearchViewModel
 import com.owncloud.android.utils.DisplayUtils
-import com.owncloud.android.utils.theme.ThemeColorUtils
-import com.owncloud.android.utils.theme.ThemeDrawableUtils
 import com.owncloud.android.utils.theme.newm3.ViewThemeUtils
 import javax.inject.Inject
 
@@ -84,15 +82,9 @@ class UnifiedSearchFragment : Fragment(), Injectable, UnifiedSearchListInterface
     @Inject
     lateinit var clientFactory: ClientFactory
 
-    @Inject
-    lateinit var themeColorUtils: ThemeColorUtils
-
     @Inject
     lateinit var viewThemeUtils: ViewThemeUtils
 
-    @Inject
-    lateinit var themeDrawableUtils: ThemeDrawableUtils
-
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         vm = ViewModelProvider(this, vmFactory).get(UnifiedSearchViewModel::class.java)

app/src/main/java/com/owncloud/android/ui/fragment/contactsbackup/BackupFragment.java

@@ -52,7 +52,6 @@ import com.owncloud.android.ui.fragment.FileFragment;
 import com.owncloud.android.utils.DisplayUtils;
 import com.owncloud.android.utils.MimeTypeUtil;
 import com.owncloud.android.utils.PermissionUtil;
-import com.owncloud.android.utils.theme.ThemeColorUtils;
 import com.owncloud.android.utils.theme.ThemeUtils;
 import com.owncloud.android.utils.theme.newm3.ViewThemeUtils;
 
@@ -88,7 +87,6 @@ public class BackupFragment extends FileFragment implements DatePickerDialog.OnD
     private BackupFragmentBinding binding;
 
     @Inject BackgroundJobManager backgroundJobManager;
-    @Inject ThemeColorUtils themeColorUtils;
     @Inject ThemeUtils themeUtils;
 
     @Inject ArbitraryDataProvider arbitraryDataProvider;
@@ -199,9 +197,8 @@ public class BackupFragment extends FileFragment implements DatePickerDialog.OnD
         viewThemeUtils.material.colorMaterialButtonPrimaryFilled(binding.backupNow);
         viewThemeUtils.material.colorMaterialButtonPrimaryOutlined(binding.contactsDatepicker);
 
-        int primaryAccentColor = themeColorUtils.primaryAccentColor(getContext());
-        binding.dataToBackUpTitle.setTextColor(primaryAccentColor);
-        binding.backupSettingsTitle.setTextColor(primaryAccentColor);
+        viewThemeUtils.platform.colorTextView(binding.dataToBackUpTitle);
+        viewThemeUtils.platform.colorTextView(binding.backupSettingsTitle);
 
         return view;
     }

app/src/main/java/com/owncloud/android/ui/fragment/contactsbackup/BackupListFragment.java

@@ -54,7 +54,6 @@ import com.owncloud.android.ui.events.VCardToggleEvent;
 import com.owncloud.android.ui.fragment.FileFragment;
 import com.owncloud.android.utils.MimeTypeUtil;
 import com.owncloud.android.utils.PermissionUtil;
-import com.owncloud.android.utils.theme.ThemeColorUtils;
 import com.owncloud.android.utils.theme.newm3.ViewThemeUtils;
 
 import org.greenrobot.eventbus.EventBus;
@@ -94,7 +93,6 @@ public class BackupListFragment extends FileFragment implements Injectable {
     @Inject UserAccountManager accountManager;
     @Inject ClientFactory clientFactory;
     @Inject BackgroundJobManager backgroundJobManager;
-    @Inject ThemeColorUtils themeColorUtils;
     @Inject ViewThemeUtils viewThemeUtils;
     private TransferManagerConnection fileDownloader;
     private LoadContactsTask loadContactsTask = null;

app/src/main/java/com/owncloud/android/ui/notifications/NotificationUtils.java

@@ -25,7 +25,7 @@ import android.os.Handler;
 import android.os.HandlerThread;
 import android.os.Process;
 
-import com.owncloud.android.utils.theme.ThemeColorUtils;
+import com.owncloud.android.utils.theme.newm3.ViewThemeUtils;
 
 import java.security.SecureRandom;
 
@@ -61,8 +61,10 @@ public final class NotificationUtils {
      * @param context       Context that will use the builder to create notifications
      * @return An instance of the regular {@link NotificationCompat.Builder}.
      */
-    public static NotificationCompat.Builder newNotificationBuilder(Context context, ThemeColorUtils themeColorUtils) {
-        return new NotificationCompat.Builder(context).setColor(themeColorUtils.primaryColor(context, false));
+    public static NotificationCompat.Builder newNotificationBuilder(Context context, final ViewThemeUtils viewThemeUtils) {
+        final NotificationCompat.Builder builder = new NotificationCompat.Builder(context);
+        viewThemeUtils.androidx.themeNotificationCompatBuilder(context, builder);
+        return builder;
     }
 
     @SuppressFBWarnings("DMI")

app/src/test/java/com/nextcloud/client/jobs/BackgroundJobFactoryTest.kt

@@ -35,7 +35,6 @@ import com.nextcloud.client.network.ConnectivityService
 import com.nextcloud.client.preferences.AppPreferences
 import com.owncloud.android.datamodel.ArbitraryDataProvider
 import com.owncloud.android.datamodel.UploadsStorageManager
-import com.owncloud.android.utils.theme.ThemeColorUtils
 import com.owncloud.android.utils.theme.newm3.ViewThemeUtils
 import org.greenrobot.eventbus.EventBus
 import org.junit.Assert.assertNotNull
@@ -99,9 +98,6 @@ class BackgroundJobFactoryTest {
     @Mock
     private lateinit var deckApi: DeckApi
 
-    @Mock
-    private lateinit var themeColorUtils: ThemeColorUtils
-
     @Mock
     private lateinit var viewThemeUtils: ViewThemeUtils
 
@@ -126,7 +122,6 @@ class BackgroundJobFactoryTest {
             notificationManager,
             eventBus,
             deckApi,
-            themeColorUtils,
             { viewThemeUtils }
         )
     }