Remove ViewThemeUtils usage to provide correct folder color

Signed-off-by: Alper Ozturk <alperozturk@lions-macbook.local>
Signed-off-by: alperozturk <alper_ozturk@proton.me>

app/src/main/java/com/nextcloud/utils/ShortcutUtil.kt

@@ -72,7 +72,7 @@ class ShortcutUtil @Inject constructor(private val mContext: Context) {
                 icon = IconCompat.createWithAdaptiveBitmap(thumbnail)
             } else if (file.isFolder) {
                 val isAutoUploadFolder = SyncedFolderProvider.isAutoUploadFolder(syncedFolderProvider, file, user)
-                val drawable = file.getFileLayerDrawable(isAutoUploadFolder, mContext, viewThemeUtils)
+                val drawable = file.getFileLayerDrawable(isAutoUploadFolder, mContext)
                 val bitmapIcon = drawable.toBitmap()
                 icon = IconCompat.createWithBitmap(bitmapIcon)
             } else {

app/src/main/java/com/owncloud/android/datamodel/OCFile.java

@@ -649,9 +649,8 @@ public class OCFile implements Parcelable, Comparable<OCFile>, ServerFileInterfa
         return permissions != null && permissions.contains(PERMISSION_GROUPFOLDER);
     }
 
-    public LayerDrawable getFileLayerDrawable(boolean isAutoUploadFolder, Context context, ViewThemeUtils viewThemeUtils) {
+    public LayerDrawable getFileLayerDrawable(boolean isAutoUploadFolder, Context context) {
         Drawable folderDrawable = ContextCompat.getDrawable(context, R.drawable.folder);
-        viewThemeUtils.platform.tintDrawable(context, folderDrawable, ColorRole.PRIMARY);
 
         int overlayIconId;
         if (WebdavEntry.MountType.GROUP == mountType || isGroupFolder()) {

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

@@ -222,7 +222,7 @@ public abstract class EditorWebView extends ExternalSiteWebView {
         OCFile file = getFile();
         if (file.isFolder()) {
             boolean isAutoUploadFolder = SyncedFolderProvider.isAutoUploadFolder(syncedFolderProvider, file, user);
-            LayerDrawable drawable = file.getFileLayerDrawable(isAutoUploadFolder, this, viewThemeUtils);
+            LayerDrawable drawable = file.getFileLayerDrawable(isAutoUploadFolder, this);
             binding.thumbnail.setImageDrawable(drawable);
         } else {
             if ((MimeTypeUtil.isImage(file) || MimeTypeUtil.isVideo(file)) && file.getRemoteId() != null) {

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

@@ -80,7 +80,7 @@ public class ShareActivity extends FileActivity {
         // Icon
         if (file.isFolder()) {
             boolean isAutoUploadFolder = SyncedFolderProvider.isAutoUploadFolder(syncedFolderProvider, file, optionalUser.get());
-            LayerDrawable drawable = file.getFileLayerDrawable(isAutoUploadFolder, this, viewThemeUtils);
+            LayerDrawable drawable = file.getFileLayerDrawable(isAutoUploadFolder, this);
             binding.shareFileIcon.setImageDrawable(drawable);
         } else {
             binding.shareFileIcon.setImageDrawable(MimeTypeUtil.getFileTypeIcon(file.getMimeType(),

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

@@ -106,7 +106,7 @@ public class UploaderAdapter extends SimpleAdapter {
 
         if (file.isFolder()) {
             boolean isAutoUploadFolder = SyncedFolderProvider.isAutoUploadFolder(syncedFolderProvider, file, user);
-            final LayerDrawable icon = file.getFileLayerDrawable(isAutoUploadFolder, mContext, viewThemeUtils);
+            final LayerDrawable icon = file.getFileLayerDrawable(isAutoUploadFolder, mContext);
             fileIcon.setImageDrawable(icon);
         } else {
             // get Thumbnail if file is image

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

@@ -855,7 +855,7 @@ public final class DisplayUtils {
             stopShimmer(shimmerThumbnail, thumbnailView);
 
             boolean isAutoUploadFolder = SyncedFolderProvider.isAutoUploadFolder(syncedFolderProvider, file, user);
-            LayerDrawable fileIcon = file.getFileLayerDrawable(isAutoUploadFolder, context, viewThemeUtils);
+            LayerDrawable fileIcon = file.getFileLayerDrawable(isAutoUploadFolder, context);
             thumbnailView.setImageDrawable(fileIcon);
         } else {
             if (file.getRemoteId() != null && file.isPreviewAvailable()) {

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

@@ -25,6 +25,7 @@ import android.graphics.drawable.Drawable;
 import android.net.Uri;
 import android.webkit.MimeTypeMap;
 
+import com.nextcloud.android.common.ui.theme.utils.ColorRole;
 import com.owncloud.android.R;
 import com.owncloud.android.datamodel.OCFile;
 import com.owncloud.android.lib.common.network.WebdavEntry;
@@ -133,55 +134,9 @@ public final class MimeTypeUtil {
         return determineIconIdByMimeTypeList(possibleMimeTypes);
     }
 
-    /**
-     * Returns the resource identifier of an image to use as icon associated to a type of folder.
-     *
-     * @param isSharedViaUsers flag if the folder is shared via the users system
-     * @param isSharedViaLink  flag if the folder is publicly shared via link
-     * @param isEncrypted      flag if the folder is encrypted
-     * @return Identifier of an image resource.
-     */
-    public static Drawable getFolderTypeIcon(boolean isSharedViaUsers,
-                                             boolean isSharedViaLink,
-                                             boolean isEncrypted,
-                                             boolean isAutoUploadFolder,
-                                             boolean isGroupFolder,
-                                             WebdavEntry.MountType mountType,
-                                             Context context,
-                                             ViewThemeUtils viewThemeUtils) {
-        int drawableId;
-
-        if (WebdavEntry.MountType.GROUP == mountType || isGroupFolder) {
-            drawableId = R.drawable.folder_group;
-        } else if (isSharedViaLink && !isEncrypted) {
-            drawableId = R.drawable.folder_shared_link;
-        } else if (isSharedViaUsers) {
-            drawableId = R.drawable.folder_shared_users;
-        } else if (isEncrypted) {
-            drawableId = R.drawable.folder_encrypted;
-        } else if (isAutoUploadFolder) {
-            drawableId = R.drawable.folder_auto_upload;
-        } else if (WebdavEntry.MountType.EXTERNAL == mountType) {
-            drawableId = R.drawable.folder_external;
-        } else {
-            drawableId = R.drawable.folder;
-        }
-
-        Drawable drawable = ContextCompat.getDrawable(context, drawableId);
-        viewThemeUtils.platform.tintPrimaryDrawable(context, drawable);
-        return drawable;
-    }
-
     public static Drawable getDefaultFolderIcon(Context context,
                                                 ViewThemeUtils viewThemeUtils) {
-        return getFolderTypeIcon(false,
-                                 false,
-                                 false,
-                                 false,
-                                 false,
-                                 WebdavEntry.MountType.INTERNAL,
-                                 context,
-                                 viewThemeUtils);
+        return ContextCompat.getDrawable(context, R.drawable.folder);
     }
 
     /**