Remove a bunch of unused injections and parameters for old theme utils

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

app/src/main/java/com/nextcloud/ui/SetStatusDialogFragment.kt

@@ -57,7 +57,6 @@ import com.owncloud.android.ui.activity.BaseActivity
 import com.owncloud.android.ui.adapter.PredefinedStatusClickListener
 import com.owncloud.android.ui.adapter.PredefinedStatusListAdapter
 import com.owncloud.android.utils.DisplayUtils
-import com.owncloud.android.utils.theme.ThemeColorUtils
 import com.owncloud.android.utils.theme.newm3.ViewThemeUtils
 import com.vanniktech.emoji.EmojiManager
 import com.vanniktech.emoji.EmojiPopup
@@ -112,9 +111,6 @@ class SetStatusDialogFragment :
     @Inject
     lateinit var clientFactory: ClientFactory
 
-    @Inject
-    lateinit var themeColorUtils: ThemeColorUtils
-
     @Inject
     lateinit var viewThemeUtils: ViewThemeUtils
 

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

@@ -41,7 +41,6 @@ import android.widget.TextView;
 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.ThemeColorUtils;
 import com.owncloud.android.utils.theme.newm3.ViewThemeUtils;
 
 import java.util.Formatter;
@@ -71,8 +70,6 @@ public class MediaControlView extends FrameLayout implements OnClickListener, On
     private ImageButton forwardButton;
     private ImageButton rewindButton;
 
-    @Inject
-    ThemeColorUtils themeColorUtils;
     @Inject
     ViewThemeUtils viewThemeUtils;
 

app/src/main/java/com/owncloud/android/ui/ThemeableSwitchPreference.java

@@ -42,6 +42,7 @@ import androidx.core.graphics.drawable.DrawableCompat;
 /**
  * Themeable switch preference TODO Migrate to androidx
  */
+// TODO use ViewThemeUtils to theme SwitchPreference directly and remove this class
 public class ThemeableSwitchPreference extends SwitchPreference {
     @Inject
     ThemeColorUtils themeColorUtils;

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

@@ -93,7 +93,6 @@ import com.owncloud.android.utils.DisplayUtils;
 import com.owncloud.android.utils.ErrorMessageAdapter;
 import com.owncloud.android.utils.FileSortOrder;
 import com.owncloud.android.utils.MimeType;
-import com.owncloud.android.utils.theme.ThemeColorUtils;
 import com.owncloud.android.utils.theme.newm3.ViewThemeUtils;
 
 import java.io.File;
@@ -331,7 +330,6 @@ public class ReceiveExternalFilesActivity extends FileActivity
 
         private Spinner mSpinner;
         @Inject AppPreferences preferences;
-        @Inject ThemeColorUtils themeColorUtils;
         @Inject ViewThemeUtils viewThemeUtils;
 
         public static DialogInputUploadFilename newInstance(String subjectText, String extraText) {

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

@@ -75,9 +75,6 @@ import com.owncloud.android.utils.DeviceCredentialUtils;
 import com.owncloud.android.utils.DisplayUtils;
 import com.owncloud.android.utils.EncryptionUtils;
 import com.owncloud.android.utils.MimeTypeUtil;
-import com.owncloud.android.utils.theme.ThemeColorUtils;
-import com.owncloud.android.utils.theme.ThemeToolbarUtils;
-import com.owncloud.android.utils.theme.ThemeUtils;
 import com.owncloud.android.utils.theme.newm3.ViewThemeUtils;
 
 import java.util.ArrayList;
@@ -140,9 +137,6 @@ public class SettingsActivity extends PreferenceActivity
     @Inject AppPreferences preferences;
     @Inject UserAccountManager accountManager;
     @Inject ClientFactory clientFactory;
-    @Inject ThemeColorUtils themeColorUtils;
-    @Inject ThemeToolbarUtils themeToolbarUtils;
-    @Inject ThemeUtils themeUtils;
     @Inject ViewThemeUtils viewThemeUtils;
 
 

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

@@ -160,7 +160,6 @@ public class UploadListActivity extends FileActivity {
                                                   powerManagementService,
                                                   clock,
                                                   themeColorUtils,
-                                                  themeDrawableUtils,
                                                   viewThemeUtils);
 
         final GridLayoutManager lm = new GridLayoutManager(this, 1);

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

@@ -71,8 +71,6 @@ public class SyncedFolderAdapter extends SectionedRecyclerViewAdapter<SectionedV
     private static final int VIEW_TYPE_HEADER = 2;
     private static final int VIEW_TYPE_FOOTER = 3;
     private boolean hideItems;
-    private final ThemeColorUtils themeColorUtils;
-    private final ThemeDrawableUtils themeDrawableUtils;
     private final ViewThemeUtils viewThemeUtils;
     private final Executor thumbnailThreadPool;
 
@@ -93,8 +91,6 @@ public class SyncedFolderAdapter extends SectionedRecyclerViewAdapter<SectionedV
         filteredSyncFolderItems = new ArrayList<>();
         this.light = light;
         this.hideItems = true;
-        this.themeColorUtils = themeColorUtils;
-        this.themeDrawableUtils = themeDrawableUtils;
         this.viewThemeUtils = viewThemeUtils;
         this.thumbnailThreadPool = Executors.newCachedThreadPool();
 

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

@@ -90,7 +90,6 @@ public class UploadListAdapter extends SectionedRecyclerViewAdapter<SectionedVie
     private UploadGroup[] uploadGroups;
     private boolean showUser;
     private ThemeColorUtils themeColorUtils;
-    private ThemeDrawableUtils themeDrawableUtils;
     private final  ViewThemeUtils viewThemeUtils;
 
     @Override
@@ -172,7 +171,6 @@ public class UploadListAdapter extends SectionedRecyclerViewAdapter<SectionedVie
                              final PowerManagementService powerManagementService,
                              final Clock clock,
                              final ThemeColorUtils themeColorUtils,
-                             final ThemeDrawableUtils themeDrawableUtils,
                              final ViewThemeUtils viewThemeUtils) {
         Log_OC.d(TAG, "UploadListAdapter");
         this.parentActivity = fileActivity;
@@ -183,7 +181,6 @@ public class UploadListAdapter extends SectionedRecyclerViewAdapter<SectionedVie
         this.powerManagementService = powerManagementService;
         this.clock = clock;
         this.themeColorUtils = themeColorUtils;
-        this.themeDrawableUtils = themeDrawableUtils;
         this.viewThemeUtils = viewThemeUtils;
 
         uploadGroups = new UploadGroup[3];

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

@@ -30,7 +30,6 @@ import com.nextcloud.client.account.User;
 import com.nextcloud.client.di.Injectable;
 import com.nextcloud.client.jobs.BackgroundJobManager;
 import com.owncloud.android.R;
-import com.owncloud.android.utils.theme.ThemeColorUtils;
 import com.owncloud.android.utils.theme.newm3.ViewThemeUtils;
 
 import javax.inject.Inject;
@@ -44,7 +43,6 @@ public class AccountRemovalConfirmationDialog extends DialogFragment implements
     private static final String KEY_USER = "USER";
 
     @Inject BackgroundJobManager backgroundJobManager;
-    @Inject ThemeColorUtils themeColorUtils;
     @Inject ViewThemeUtils viewThemeUtils;
     private User user;
 

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

@@ -23,7 +23,6 @@ import android.os.Bundle;
 import com.google.android.material.dialog.MaterialAlertDialogBuilder;
 import com.nextcloud.client.di.Injectable;
 import com.owncloud.android.R;
-import com.owncloud.android.utils.theme.ThemeColorUtils;
 import com.owncloud.android.utils.theme.newm3.ViewThemeUtils;
 
 import javax.inject.Inject;
@@ -45,7 +44,6 @@ public class ConfirmationDialogFragment extends DialogFragment implements Inject
 
     public static final String FTAG_CONFIRMATION = "CONFIRMATION_FRAGMENT";
 
-    @Inject ThemeColorUtils themeColorUtils;
     @Inject ViewThemeUtils viewThemeUtils;
 
 

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

@@ -40,8 +40,6 @@ import com.owncloud.android.datamodel.ThumbnailsCacheManager;
 import com.owncloud.android.lib.common.utils.Log_OC;
 import com.owncloud.android.ui.adapter.LocalFileListAdapter;
 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 java.io.File;
@@ -72,8 +70,6 @@ public class ConflictsResolveDialog extends DialogFragment implements Injectable
     private User user;
     private final List<ThumbnailsCacheManager.ThumbnailGenerationTask> asyncTasks = new ArrayList<>();
     private Button positiveButton;
-    @Inject ThemeColorUtils themeColorUtils;
-    @Inject ThemeDrawableUtils themeDrawableUtils;
     @Inject ViewThemeUtils viewThemeUtils;
 
     private static final String KEY_NEW_FILE = "file";

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

@@ -43,7 +43,6 @@ import com.owncloud.android.datamodel.OCFile;
 import com.owncloud.android.lib.resources.files.FileUtils;
 import com.owncloud.android.ui.activity.ComponentsGetter;
 import com.owncloud.android.utils.DisplayUtils;
-import com.owncloud.android.utils.theme.ThemeColorUtils;
 import com.owncloud.android.utils.theme.newm3.ViewThemeUtils;
 
 import java.util.List;
@@ -67,7 +66,6 @@ public class CreateFolderDialogFragment
 
     public static final String CREATE_FOLDER_FRAGMENT = "CREATE_FOLDER_FRAGMENT";
 
-    @Inject ThemeColorUtils themeColorUtils;
     @Inject FileDataStorageManager fileDataStorageManager;
     @Inject ViewThemeUtils viewThemeUtils;
 

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

@@ -32,7 +32,6 @@ import android.widget.DatePicker;
 
 import com.nextcloud.client.di.Injectable;
 import com.owncloud.android.R;
-import com.owncloud.android.utils.theme.ThemeColorUtils;
 import com.owncloud.android.utils.theme.newm3.ViewThemeUtils;
 
 import java.util.Calendar;
@@ -40,7 +39,6 @@ import java.util.Calendar;
 import javax.inject.Inject;
 
 import androidx.annotation.NonNull;
-import androidx.appcompat.app.AlertDialog;
 import androidx.fragment.app.DialogFragment;
 
 /**
@@ -56,7 +54,6 @@ public class ExpirationDatePickerDialogFragment
     /** Parameter constant for date chosen initially */
     private static final String ARG_CHOSEN_DATE_IN_MILLIS = "CHOSEN_DATE_IN_MILLIS";
 
-    @Inject ThemeColorUtils themeColorUtils;
     @Inject ViewThemeUtils viewThemeUtils;
     private OnExpiryDateListener onExpiryDateListener;
 

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

@@ -34,7 +34,6 @@ import com.owncloud.android.databinding.StoragePathDialogBinding;
 import com.owncloud.android.ui.adapter.StoragePathAdapter;
 import com.owncloud.android.ui.adapter.StoragePathItem;
 import com.owncloud.android.utils.FileStorageUtils;
-import com.owncloud.android.utils.theme.ThemeColorUtils;
 import com.owncloud.android.utils.theme.newm3.ViewThemeUtils;
 
 import java.io.File;
@@ -61,7 +60,6 @@ public class LocalStoragePathPickerDialogFragment extends DialogFragment
 
     private static Set<String> internalStoragePaths = new HashSet<>();
 
-    @Inject ThemeColorUtils themeColorUtils;
     @Inject ViewThemeUtils viewThemeUtils;
 
     static {

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

@@ -53,7 +53,6 @@ public class NoteDialogFragment extends DialogFragment implements DialogInterfac
 
     private static final String ARG_SHARE = "SHARE";
 
-    @Inject ThemeColorUtils themeColorUtils;
     @Inject ViewThemeUtils viewThemeUtils;
 
     private OCShare share;

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

@@ -28,13 +28,10 @@ import com.owncloud.android.R;
 import com.owncloud.android.datamodel.OCFile;
 import com.owncloud.android.ui.activity.ComponentsGetter;
 import com.owncloud.android.ui.dialog.ConfirmationDialogFragment.ConfirmationDialogFragmentListener;
-import com.owncloud.android.utils.theme.ThemeColorUtils;
 
 import java.util.ArrayList;
 import java.util.Collection;
 
-import javax.inject.Inject;
-
 import androidx.annotation.NonNull;
 import androidx.appcompat.app.AlertDialog;
 
@@ -49,8 +46,6 @@ public class RemoveFilesDialogFragment extends ConfirmationDialogFragment implem
     private static final int SINGLE_SELECTION = 1;
     private static final String ARG_TARGET_FILES = "TARGET_FILES";
 
-    @Inject ThemeColorUtils themeColorUtils;
-
     private Collection<OCFile> mTargetFiles;
     private ActionMode actionMode;
 

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

@@ -48,7 +48,6 @@ import com.owncloud.android.datamodel.OCFile;
 import com.owncloud.android.lib.resources.files.FileUtils;
 import com.owncloud.android.ui.activity.ComponentsGetter;
 import com.owncloud.android.utils.DisplayUtils;
-import com.owncloud.android.utils.theme.ThemeColorUtils;
 import com.owncloud.android.utils.theme.newm3.ViewThemeUtils;
 
 import java.util.List;
@@ -72,7 +71,6 @@ public class RenameFileDialogFragment
     private static final String ARG_TARGET_FILE = "TARGET_FILE";
     private static final String ARG_PARENT_FOLDER = "PARENT_FOLDER";
 
-    @Inject ThemeColorUtils themeColorUtils;
     @Inject ViewThemeUtils viewThemeUtils;
     @Inject FileDataStorageManager fileDataStorageManager;
 

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

@@ -37,7 +37,6 @@ import com.owncloud.android.datamodel.OCFile;
 import com.owncloud.android.lib.resources.shares.OCShare;
 import com.owncloud.android.ui.activity.FileActivity;
 import com.owncloud.android.utils.DisplayUtils;
-import com.owncloud.android.utils.theme.ThemeColorUtils;
 import com.owncloud.android.utils.theme.newm3.ViewThemeUtils;
 
 import javax.inject.Inject;
@@ -59,8 +58,6 @@ public class SharePasswordDialogFragment extends DialogFragment implements Dialo
     private static final String ARG_ASK_FOR_PASSWORD = "ASK_FOR_PASSWORD";
     public static final String PASSWORD_FRAGMENT = "PASSWORD_FRAGMENT";
 
-    @Inject ThemeColorUtils themeColorUtils;
-
     @Inject ViewThemeUtils viewThemeUtils;
 
     private PasswordDialogBinding binding;

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

@@ -34,7 +34,6 @@ import com.owncloud.android.R;
 import com.owncloud.android.databinding.SortingOrderFragmentBinding;
 import com.owncloud.android.lib.common.utils.Log_OC;
 import com.owncloud.android.utils.FileSortOrder;
-import com.owncloud.android.utils.theme.ThemeColorUtils;
 import com.owncloud.android.utils.theme.newm3.ViewThemeUtils;
 
 import javax.inject.Inject;
@@ -56,7 +55,6 @@ public class SortingOrderDialogFragment extends DialogFragment implements Inject
     private View[] mTaggedViews;
     private String mCurrentSortOrderName;
 
-    @Inject ThemeColorUtils themeColorUtils;
 
     @Inject ViewThemeUtils viewThemeUtils;
 

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

@@ -32,7 +32,6 @@ import com.nextcloud.client.di.Injectable
 import com.owncloud.android.R
 import com.owncloud.android.databinding.StoragePermissionDialogBinding
 import com.owncloud.android.ui.dialog.StoragePermissionDialogFragment.Listener
-import com.owncloud.android.utils.theme.ThemeColorUtils
 import com.owncloud.android.utils.theme.newm3.ViewThemeUtils
 import javax.inject.Inject
 
@@ -50,9 +49,6 @@ class StoragePermissionDialogFragment(val listener: Listener, val permissionRequ
     DialogFragment(), Injectable {
     private lateinit var binding: StoragePermissionDialogBinding
 
-    @Inject
-    lateinit var themeColorUtils: ThemeColorUtils
-
     @Inject
     lateinit var viewThemeUtils: ViewThemeUtils
 

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

@@ -59,9 +59,6 @@ import com.owncloud.android.ui.helpers.FileOperationsHelper;
 import com.owncloud.android.ui.interfaces.ActivityListInterface;
 import com.owncloud.android.ui.interfaces.VersionListInterface;
 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.ThemeToolbarUtils;
 import com.owncloud.android.utils.theme.newm3.ViewThemeUtils;
 
 import org.apache.commons.httpclient.HttpStatus;
@@ -113,9 +110,6 @@ public class FileDetailActivitiesFragment extends Fragment implements
     @Inject UserAccountManager accountManager;
     @Inject ClientFactory clientFactory;
     @Inject ContentResolver contentResolver;
-    @Inject ThemeColorUtils themeColorUtils;
-    @Inject ThemeToolbarUtils themeToolbarUtils;
-    @Inject ThemeDrawableUtils themeDrawableUtils;
     @Inject ViewThemeUtils viewThemeUtils;
 
     public static FileDetailActivitiesFragment newInstance(OCFile file, User user) {

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

@@ -72,7 +72,6 @@ import com.owncloud.android.ui.dialog.RenameFileDialogFragment;
 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.ThemeColorUtils;
 import com.owncloud.android.utils.theme.newm3.ViewThemeUtils;
 
 import org.greenrobot.eventbus.EventBus;
@@ -115,7 +114,6 @@ public class FileDetailFragment extends FileFragment implements OnClickListener,
     @Inject UserAccountManager accountManager;
     @Inject ClientFactory clientFactory;
     @Inject FileDataStorageManager storageManager;
-    @Inject ThemeColorUtils themeColorUtils;
     @Inject ViewThemeUtils viewThemeUtils;
     @Inject BackgroundJobManager backgroundJobManager;
 

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

@@ -29,8 +29,6 @@ import com.nextcloud.client.device.DeviceInfo
 import com.nextcloud.client.di.Injectable
 import com.owncloud.android.datamodel.OCFile
 import com.owncloud.android.ui.activity.FileActivity
-import com.owncloud.android.utils.theme.ThemeColorUtils
-import com.owncloud.android.utils.theme.ThemeDrawableUtils
 import com.owncloud.android.utils.theme.ThemeUtils
 import com.owncloud.android.utils.theme.newm3.ViewThemeUtils
 import javax.inject.Inject
@@ -43,15 +41,9 @@ class OCFileListBottomSheetDialogFragment(
     private val file: OCFile
 ) : DialogFragment(), Injectable {
 
-    @Inject
-    lateinit var themeColorUtils: ThemeColorUtils
-
     @Inject
     lateinit var themeUtils: ThemeUtils
 
-    @Inject
-    lateinit var themeDrawableUtils: ThemeDrawableUtils
-
     @Inject
     lateinit var viewThemeUtils: ViewThemeUtils
 

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

@@ -55,7 +55,7 @@ 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.ThemeToolbarUtils;
+import com.owncloud.android.utils.theme.newm3.ViewThemeUtils;
 
 import org.greenrobot.eventbus.EventBus;
 import org.greenrobot.eventbus.Subscribe;
@@ -95,7 +95,7 @@ public class BackupListFragment extends FileFragment implements Injectable {
     @Inject ClientFactory clientFactory;
     @Inject BackgroundJobManager backgroundJobManager;
     @Inject ThemeColorUtils themeColorUtils;
-    @Inject ThemeToolbarUtils themeToolbarUtils;
+    @Inject ViewThemeUtils viewThemeUtils;
     private TransferManagerConnection fileDownloader;
     private LoadContactsTask loadContactsTask = null;
     private ContactsAccount selectedAccount;
@@ -142,9 +142,7 @@ public class BackupListFragment extends FileFragment implements Injectable {
         if (contactsPreferenceActivity != null) {
             ActionBar actionBar = contactsPreferenceActivity.getSupportActionBar();
             if (actionBar != null) {
-                themeToolbarUtils.setColoredTitle(actionBar,
-                                                  R.string.actionbar_calendar_contacts_restore,
-                                                  getContext());
+                viewThemeUtils.files.themeActionBar(requireContext(), actionBar, R.string.actionbar_calendar_contacts_restore);
                 actionBar.setDisplayHomeAsUpEnabled(true);
             }
             contactsPreferenceActivity.setDrawerIndicatorEnabled(false);

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

@@ -34,7 +34,6 @@ import com.owncloud.android.datamodel.OCFile;
 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.ThemeColorUtils;
 import com.owncloud.android.utils.theme.newm3.ViewThemeUtils;
 
 import java.lang.ref.WeakReference;
@@ -62,7 +61,6 @@ public class FileDownloadFragment extends FileFragment implements OnClickListene
     private View mView;
     private User user;
 
-    @Inject ThemeColorUtils themeColorUtils;
     @Inject ViewThemeUtils viewThemeUtils;
     public ProgressListener mProgressListener;
     private boolean mListening;

app/src/main/java/com/owncloud/android/utils/theme/ThemeToolbarUtils.java

@@ -84,10 +84,6 @@ public class ThemeToolbarUtils {
         }
     }
 
-    public void setColoredTitle(@Nullable ActionBar actionBar, int titleId, Context context) {
-        setColoredTitle(actionBar, context.getString(titleId), context);
-    }
-
     /**
      * Set color of subtitle to white/black depending on background color
      *

app/src/test/java/com/owncloud/android/ui/adapter/GalleryAdapterTest.kt

@@ -30,8 +30,6 @@ import com.owncloud.android.datamodel.GalleryItems
 import com.owncloud.android.datamodel.OCFile
 import com.owncloud.android.ui.activity.ComponentsGetter
 import com.owncloud.android.ui.interfaces.OCFileListFragmentInterface
-import com.owncloud.android.utils.theme.ThemeColorUtils
-import com.owncloud.android.utils.theme.ThemeDrawableUtils
 import com.owncloud.android.utils.theme.newm3.ViewThemeUtils
 import junit.framework.Assert.assertEquals
 import org.junit.After
@@ -61,12 +59,6 @@ class GalleryAdapterTest {
     @Mock
     lateinit var storageManager: FileDataStorageManager
 
-    @Mock
-    lateinit var themeColorUtils: ThemeColorUtils
-
-    @Mock
-    lateinit var themeDrawableUtils: ThemeDrawableUtils
-
     @Mock
     lateinit var viewThemeUtils: ViewThemeUtils