Skip to content

Commit 374ed40

Browse files
committed
Fastscroller popup customized.
1 parent a3d2e98 commit 374ed40

File tree

2 files changed

+11
-3
lines changed

2 files changed

+11
-3
lines changed

app/src/main/java/com/owncloud/android/utils/theme/FilesSpecificViewThemeUtils.kt

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,7 @@ import com.nextcloud.android.common.ui.theme.ViewThemeUtilsBase
4444
import com.nextcloud.android.common.ui.theme.utils.AndroidViewThemeUtils
4545
import com.nextcloud.android.common.ui.theme.utils.AndroidXViewThemeUtils
4646
import com.nextcloud.utils.view.FastScrollPopupBackground
47+
import com.nmc.android.utils.DrawableThemeUtils
4748
import com.owncloud.android.R
4849
import com.owncloud.android.lib.common.utils.Log_OC
4950
import com.owncloud.android.lib.resources.shares.ShareType
@@ -118,7 +119,8 @@ class FilesSpecificViewThemeUtils @Inject constructor(
118119
.setThumbDrawable(getThumbDrawable(context))
119120
.setPopupStyle {
120121
PopupStyles.MD2.accept(it)
121-
it.background = FastScrollPopupBackground(context, scheme.primary)
122+
//NMC customisation
123+
it.background = FastScrollPopupBackground(context, context.resources.getColor(R.color.primary, null))
122124
}
123125
}
124126
}
@@ -132,7 +134,8 @@ class FilesSpecificViewThemeUtils @Inject constructor(
132134
me.zhanghai.android.fastscroll.R.drawable.afs_md2_thumb,
133135
null
134136
)
135-
return androidViewThemeUtils.tintPrimaryDrawable(context, thumbDrawable)!!
137+
//NMC customisation
138+
return DrawableThemeUtils.tintDrawable(thumbDrawable!!, context.resources.getColor(R.color.primary, null))
136139
}
137140

138141
private fun getHomeAsUpIcon(isMenu: Boolean): Int {

app/src/main/res/values/colors.xml

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,9 +37,14 @@
3737
<!-- Colors -->
3838
<color name="standard_grey">#757575</color>
3939
<color name="actionbar_shadow">#222222</color>
40-
<color name="grey_200">#EEEEEE</color>
40+
<color name="dark_grey">#101010</color>
4141
<color name="grey_0">#F2F2F2</color>
42+
<color name="grey_10">#E5E5E5</color>
43+
<color name="grey_30">#B2B2B2</color>
44+
<color name="grey_60">#666666</color>
45+
<color name="grey_70">#4C4C4C</color>
4246
<color name="grey_80">#333333</color>
47+
<color name="grey_200">#EEEEEE</color>
4348
<color name="grey_400">#BDBDBD</color>
4449
<color name="grey_600">#666666</color>
4550

0 commit comments

Comments
 (0)