Skip to content

Commit e21f356

Browse files
committed
Share UI issue fix.
1 parent c34316f commit e21f356

File tree

3 files changed

+14
-14
lines changed

3 files changed

+14
-14
lines changed

app/src/main/java/com/owncloud/android/ui/adapter/OCFileListDelegate.kt

Lines changed: 8 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -353,30 +353,26 @@ class OCFileListDelegate(
353353
sharedMessageView?.setTextColor(sharedWithMeColor)
354354
}
355355
file.isSharedWithSharee -> {
356-
val shareIcon = viewThemeUtils.platform.tintDrawable(
357-
context,
358-
AppCompatResources.getDrawable(context, R.drawable.ic_shared)!!
356+
val shareIcon = viewThemeUtils.platform.colorDrawable(
357+
AppCompatResources.getDrawable(context, R.drawable.ic_shared)!!,
358+
context.resources.getColor(R.color.primary, null)
359359
)
360360
sharedIconView.setImageDrawable(shareIcon)
361361
sharedIconView.contentDescription = context.getString(R.string.shared_icon_shared)
362362
//Added Code For Message Text
363363
sharedMessageView?.text = context.resources.getString(R.string.placeholder_sharedMessage)
364-
sharedMessageView?.let{
365-
viewThemeUtils.platform.colorTextView(it)
366-
}
364+
sharedMessageView?.setTextColor(context.resources.getColor(R.color.primary, null))
367365
}
368366
file.isSharedViaLink -> {
369-
val shareIcon = viewThemeUtils.platform.tintDrawable(
370-
context,
371-
AppCompatResources.getDrawable(context, R.drawable.ic_shared)!!
367+
val shareIcon = viewThemeUtils.platform.colorDrawable(
368+
AppCompatResources.getDrawable(context, R.drawable.ic_shared)!!,
369+
context.resources.getColor(R.color.primary, null)
372370
)
373371
sharedIconView.setImageDrawable(shareIcon)
374372
sharedIconView.contentDescription = context.getString(R.string.shared_icon_shared_via_link)
375373
//Added Code For Message Text
376374
sharedMessageView?.text = context.resources.getString(R.string.placeholder_sharedMessage)
377-
sharedMessageView?.let{
378-
viewThemeUtils.platform.colorTextView(it)
379-
}
375+
sharedMessageView?.setTextColor(context.resources.getColor(R.color.primary, null))
380376
}
381377
file.isEncrypted -> {
382378
sharedIconView.visibility = View.GONE

app/src/main/java/com/owncloud/android/ui/adapter/QuickSharingPermissionsAdapter.kt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,6 @@ class QuickSharingPermissionsAdapter(
6262
fun bindData(quickPermissionModel: QuickPermissionModel) {
6363
binding.tvQuickShareName.text = quickPermissionModel.permissionName
6464
if (quickPermissionModel.isSelected) {
65-
viewThemeUtils.platform.colorImageView(binding.tvQuickShareCheckIcon)
6665
binding.tvQuickShareCheckIcon.visibility = View.VISIBLE
6766
} else {
6867
binding.tvQuickShareCheckIcon.visibility = View.INVISIBLE

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

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
import android.content.ComponentName;
44
import android.content.Intent;
55
import android.content.pm.ResolveInfo;
6+
import android.graphics.PorterDuff;
67
import android.graphics.drawable.Drawable;
78
import android.os.Bundle;
89
import android.view.LayoutInflater;
@@ -27,6 +28,7 @@
2728
import com.owncloud.android.ui.components.SendButtonData;
2829
import com.owncloud.android.ui.helpers.FileOperationsHelper;
2930
import com.owncloud.android.utils.MimeTypeUtil;
31+
import com.owncloud.android.utils.theme.ThemeColorUtils;
3032
import com.owncloud.android.utils.theme.ViewThemeUtils;
3133

3234
import java.util.ArrayList;
@@ -204,7 +206,10 @@ private void requestPasswordForShareViaLink() {
204206
}
205207

206208
private void themeShareButtonImage(ImageView shareImageView) {
207-
viewThemeUtils.files.themeAvatarButton(shareImageView);
209+
shareImageView.getBackground().setColorFilter(requireContext().getResources().getColor(R.color.primary, null),
210+
PorterDuff.Mode.SRC_IN);
211+
shareImageView.getDrawable().mutate().setColorFilter(requireContext().getResources().getColor(R.color.white, null),
212+
PorterDuff.Mode.SRC_IN);
208213
}
209214

210215
private void showResharingNotAllowedSnackbar() {

0 commit comments

Comments
 (0)