Share UI issue fix.

nextmcloud · May 19, 2023 · e21f356 · e21f356
1 parent c34316f
commit e21f356
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 14 deletions.
diff --git a/app/src/main/java/com/owncloud/android/ui/adapter/OCFileListDelegate.kt b/app/src/main/java/com/owncloud/android/ui/adapter/OCFileListDelegate.kt
@@ -353,30 +353,26 @@ class OCFileListDelegate(
                     sharedMessageView?.setTextColor(sharedWithMeColor)
                 }
                 file.isSharedWithSharee -> {
-                    val shareIcon = viewThemeUtils.platform.tintDrawable(
-                        context,
-                        AppCompatResources.getDrawable(context, R.drawable.ic_shared)!!
+                    val shareIcon = viewThemeUtils.platform.colorDrawable(
+                        AppCompatResources.getDrawable(context, R.drawable.ic_shared)!!,
+                        context.resources.getColor(R.color.primary, null)
                     )
                     sharedIconView.setImageDrawable(shareIcon)
                     sharedIconView.contentDescription = context.getString(R.string.shared_icon_shared)
                     //Added Code For Message Text
                     sharedMessageView?.text = context.resources.getString(R.string.placeholder_sharedMessage)
-                    sharedMessageView?.let{
-                        viewThemeUtils.platform.colorTextView(it)
-                    }
+                    sharedMessageView?.setTextColor(context.resources.getColor(R.color.primary, null))
                 }
                 file.isSharedViaLink -> {
-                    val shareIcon = viewThemeUtils.platform.tintDrawable(
-                        context,
-                        AppCompatResources.getDrawable(context, R.drawable.ic_shared)!!
+                    val shareIcon = viewThemeUtils.platform.colorDrawable(
+                        AppCompatResources.getDrawable(context, R.drawable.ic_shared)!!,
+                        context.resources.getColor(R.color.primary, null)
                     )
                     sharedIconView.setImageDrawable(shareIcon)
                     sharedIconView.contentDescription = context.getString(R.string.shared_icon_shared_via_link)
                     //Added Code For Message Text
                     sharedMessageView?.text = context.resources.getString(R.string.placeholder_sharedMessage)
-                    sharedMessageView?.let{
-                        viewThemeUtils.platform.colorTextView(it)
-                    }
+                    sharedMessageView?.setTextColor(context.resources.getColor(R.color.primary, null))
                 }
                 file.isEncrypted -> {
                     sharedIconView.visibility = View.GONE

diff --git a/app/src/main/java/com/owncloud/android/ui/adapter/QuickSharingPermissionsAdapter.kt b/app/src/main/java/com/owncloud/android/ui/adapter/QuickSharingPermissionsAdapter.kt
@@ -62,7 +62,6 @@ class QuickSharingPermissionsAdapter(
         fun bindData(quickPermissionModel: QuickPermissionModel) {
             binding.tvQuickShareName.text = quickPermissionModel.permissionName
             if (quickPermissionModel.isSelected) {
-                viewThemeUtils.platform.colorImageView(binding.tvQuickShareCheckIcon)
                 binding.tvQuickShareCheckIcon.visibility = View.VISIBLE
             } else {
                 binding.tvQuickShareCheckIcon.visibility = View.INVISIBLE

diff --git a/app/src/main/java/com/owncloud/android/ui/dialog/SendShareDialog.java b/app/src/main/java/com/owncloud/android/ui/dialog/SendShareDialog.java
@@ -3,6 +3,7 @@
 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;
@@ -27,6 +28,7 @@
 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.ViewThemeUtils;
 
 import java.util.ArrayList;
@@ -204,7 +206,10 @@ private void requestPasswordForShareViaLink() {
     }
 
     private void themeShareButtonImage(ImageView shareImageView) {
-        viewThemeUtils.files.themeAvatarButton(shareImageView);
+        shareImageView.getBackground().setColorFilter(requireContext().getResources().getColor(R.color.primary, null),
+                                                      PorterDuff.Mode.SRC_IN);
+        shareImageView.getDrawable().mutate().setColorFilter(requireContext().getResources().getColor(R.color.white, null),
+                                                             PorterDuff.Mode.SRC_IN);
     }
 
     private void showResharingNotAllowedSnackbar() {