Fastscroller popup customized.

nextmcloud · May 16, 2023 · 374ed40 · 374ed40
1 parent a3d2e98
commit 374ed40
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 3 deletions.
diff --git a/app/src/main/java/com/owncloud/android/utils/theme/FilesSpecificViewThemeUtils.kt b/app/src/main/java/com/owncloud/android/utils/theme/FilesSpecificViewThemeUtils.kt
@@ -44,6 +44,7 @@ import com.nextcloud.android.common.ui.theme.ViewThemeUtilsBase
 import com.nextcloud.android.common.ui.theme.utils.AndroidViewThemeUtils
 import com.nextcloud.android.common.ui.theme.utils.AndroidXViewThemeUtils
 import com.nextcloud.utils.view.FastScrollPopupBackground
+import com.nmc.android.utils.DrawableThemeUtils
 import com.owncloud.android.R
 import com.owncloud.android.lib.common.utils.Log_OC
 import com.owncloud.android.lib.resources.shares.ShareType
@@ -118,7 +119,8 @@ class FilesSpecificViewThemeUtils @Inject constructor(
                 .setThumbDrawable(getThumbDrawable(context))
                 .setPopupStyle {
                     PopupStyles.MD2.accept(it)
-                    it.background = FastScrollPopupBackground(context, scheme.primary)
+                    //NMC customisation
+                    it.background = FastScrollPopupBackground(context, context.resources.getColor(R.color.primary, null))
                 }
         }
     }
@@ -132,7 +134,8 @@ class FilesSpecificViewThemeUtils @Inject constructor(
                 me.zhanghai.android.fastscroll.R.drawable.afs_md2_thumb,
                 null
             )
-        return androidViewThemeUtils.tintPrimaryDrawable(context, thumbDrawable)!!
+        //NMC customisation
+        return DrawableThemeUtils.tintDrawable(thumbDrawable!!, context.resources.getColor(R.color.primary, null))
     }
 
     private fun getHomeAsUpIcon(isMenu: Boolean): Int {

diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
@@ -37,9 +37,14 @@
     <!-- Colors -->
     <color name="standard_grey">#757575</color>
     <color name="actionbar_shadow">#222222</color>
-    <color name="grey_200">#EEEEEE</color>
+    <color name="dark_grey">#101010</color>
     <color name="grey_0">#F2F2F2</color>
+    <color name="grey_10">#E5E5E5</color>
+    <color name="grey_30">#B2B2B2</color>
+    <color name="grey_60">#666666</color>
+    <color name="grey_70">#4C4C4C</color>
     <color name="grey_80">#333333</color>
+    <color name="grey_200">#EEEEEE</color>
     <color name="grey_400">#BDBDBD</color>
     <color name="grey_600">#666666</color>