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 color selection

Browse Source
This commit is contained in:
J-Jamet
2021-02-19 12:20:41 +01:00
parent da956d3bd5
commit 26e961d356
3 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
app/src/main/java/com/kunzisoft/keepass/adapters/NodeAdapter.kt
View File

@@ -28,6 +28,7 @@ import android.view.ViewGroup
import android.widget.ImageView import android.widget.ImageView
import android.widget.TextView import android.widget.TextView
import androidx.annotation.ColorInt import androidx.annotation.ColorInt
import androidx.core.content.ContextCompat
import androidx.recyclerview.widget.RecyclerView import androidx.recyclerview.widget.RecyclerView
import androidx.recyclerview.widget.SortedList import androidx.recyclerview.widget.SortedList
import androidx.recyclerview.widget.SortedListAdapterCallback import androidx.recyclerview.widget.SortedListAdapterCallback
@@ -100,9 +101,7 @@ class NodeAdapter (private val context: Context)
this.mDatabase = Database.getInstance() this.mDatabase = Database.getInstance()
// Color of content selection // Color of content selection
val taContentSelectionColor = context.theme.obtainStyledAttributes(intArrayOf(R.attr.textColorInverse)) this.mContentSelectionColor = ContextCompat.getColor(context, R.color.colorTextInverse)
this.mContentSelectionColor = taContentSelectionColor.getColor(0, Color.WHITE)
taContentSelectionColor.recycle()
// Retrieve the color to tint the icon // Retrieve the color to tint the icon
val taTextColorPrimary = context.theme.obtainStyledAttributes(intArrayOf(android.R.attr.textColorPrimary)) val taTextColorPrimary = context.theme.obtainStyledAttributes(intArrayOf(android.R.attr.textColorPrimary))
this.mIconGroupColor = taTextColorPrimary.getColor(0, Color.BLACK) this.mIconGroupColor = taTextColorPrimary.getColor(0, Color.BLACK)

2
app/src/main/res/layout/view_button_lock.xml
View File

@@ -42,7 +42,7 @@
tools:targetApi="lollipop" tools:targetApi="lollipop"
android:elevation="4dp" android:elevation="4dp"
android:src="@drawable/ic_lock_white_24dp" android:src="@drawable/ic_lock_white_24dp"
android:tint="@color/white" android:tint="@color/colorTextInverse"
android:layout_gravity="bottom|start" android:layout_gravity="bottom|start"
android:contentDescription="@string/menu_lock" /> android:contentDescription="@string/menu_lock" />
</FrameLayout> </FrameLayout>

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

@@ -379,7 +379,7 @@
</style> </style>
<style name="KeepassDXStyle.Special.Button.Stroke" parent="KeepassDXStyle.v21.Button"> <style name="KeepassDXStyle.Special.Button.Stroke" parent="KeepassDXStyle.v21.Button">
<item name="android:background">@drawable/btn_special_start_bottom_stroke</item> <item name="android:background">@drawable/btn_special_start_bottom_stroke</item>
<item name="backgroundTint">@color/white</item> <item name="backgroundTint">@color/colorTextInverse</item>
<item name="backgroundTintMode">src_atop</item> <item name="backgroundTintMode">src_atop</item>
</style> </style>