rixxc/KeePassDX
1
0
Fork 0
mirror of https://github.com/Kunzisoft/KeePassDX.git synced 2025-12-04 15:49:33 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix: Special toolbar style

Browse Source
This commit is contained in:
J-Jamet
2023-07-28 16:43:08 +02:00
parent e68e4dac46
commit d46f48f317
2 changed files with 7 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
app/src/main/java/com/kunzisoft/keepass/view/ToolbarSpecial.kt
View File

@@ -38,9 +38,9 @@ class ToolbarSpecial @JvmOverloads constructor(context: Context,
init {
ContextCompat.getDrawable(context, R.drawable.ic_arrow_back_white_24dp)?.let { closeDrawable ->
val typedValue = TypedValue()
context.theme.resolveAttribute(R.attr.colorControlNormal, typedValue, true)
@ColorInt val colorControl = typedValue.data
closeDrawable.colorFilter = PorterDuffColorFilter(colorControl, PorterDuff.Mode.SRC_ATOP)
context.theme.resolveAttribute(R.attr.colorOnSurface, typedValue, true)
@ColorInt val colorOnSurface = typedValue.data
closeDrawable.colorFilter = PorterDuffColorFilter(colorOnSurface, PorterDuff.Mode.SRC_ATOP)
navigationIcon = closeDrawable
}
title = resources.getString(R.string.selection_mode)

12
app/src/main/res/values/styles.xml
View File

@@ -224,16 +224,12 @@
</style>
<!-- Special Toolbar Style -->
<style name="KeepassDXStyle.Toolbar.Special" parent="KeepassDXStyle.Toolbar">
<item name="titleTextAppearance">@style/KeepassDXStyle.TextAppearance.Toolbar.Special.Title</item>
<item name="subtitleTextAppearance">@style/KeepassDXStyle.TextAppearance.Toolbar.Special.SubTitle</item>
<item name="titleTextAppearance">@style/KeepassDXStyle.Text</item>
<item name="titleTextColor">?attr/colorOnSurface</item>
<item name="subtitleTextAppearance">@style/KeepassDXStyle.Text.Tiny</item>
<item name="subtitleTextColor">?attr/colorSecondary</item>
<item name="android:background">?attr/colorSurfaceContainer</item>
</style>
<style name="KeepassDXStyle.TextAppearance.Toolbar.Special.Title" parent="KeepassDXStyle.Text">
<item name="android:textColor">?attr/colorOnSurface</item>
</style>
<style name="KeepassDXStyle.TextAppearance.Toolbar.Special.SubTitle" parent="KeepassDXStyle.Text.Tiny">
<item name="android:textColor">?attr/colorOnSurfaceVariant</item>
</style>
<!-- Action Style -->
<style name="KeepassDXStyle.Toolbar.Action" parent="KeepassDXStyle.Toolbar" />