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

Browse Source
This commit is contained in:
J-Jamet
2022-01-23 12:38:35 +01:00
parent 1b734051d5
commit 59b6deb7be
3 changed files with 14 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
app/src/main/java/com/kunzisoft/keepass/adapters/NodesAdapter.kt
View File

@@ -26,7 +26,6 @@ import android.view.LayoutInflater
import android.view.View import android.view.View
import android.view.ViewGroup import android.view.ViewGroup
import android.widget.ImageView import android.widget.ImageView
import android.widget.ProgressBar
import android.widget.TextView import android.widget.TextView
import android.widget.Toast import android.widget.Toast
import androidx.annotation.ColorInt import androidx.annotation.ColorInt
@@ -98,7 +97,7 @@ class NodesAdapter (private val context: Context,
@ColorInt @ColorInt
private val mColorAccentLight: Int private val mColorAccentLight: Int
@ColorInt @ColorInt
private val mTextColorInverse: Int private val mTextColorSelected: Int
/** /**
* Determine if the adapter contains or not any element * Determine if the adapter contains or not any element
@@ -134,8 +133,8 @@ class NodesAdapter (private val context: Context,
this.mColorAccentLight = taSelectionColor.getColor(0, Color.GRAY) this.mColorAccentLight = taSelectionColor.getColor(0, Color.GRAY)
taSelectionColor.recycle() taSelectionColor.recycle()
// To get text color for selection // To get text color for selection
val taSelectionTextColor = context.theme.obtainStyledAttributes(intArrayOf(R.attr.textColorInverse)) val taSelectionTextColor = context.theme.obtainStyledAttributes(intArrayOf(R.attr.colorOnAccentColor))
this.mTextColorInverse = taSelectionTextColor.getColor(0, Color.WHITE) this.mTextColorSelected = taSelectionTextColor.getColor(0, Color.WHITE)
taSelectionTextColor.recycle() taSelectionTextColor.recycle()
} }
@@ -472,12 +471,12 @@ class NodesAdapter (private val context: Context,
holder.meta.setTextColor(mTextColor) holder.meta.setTextColor(mTextColor)
} }
} else { } else {
holder.text.setTextColor(mTextColorInverse) holder.text.setTextColor(mTextColorSelected)
holder.subText?.setTextColor(mTextColorInverse) holder.subText?.setTextColor(mTextColorSelected)
holder.otpToken?.setTextColor(mTextColorInverse) holder.otpToken?.setTextColor(mTextColorSelected)
holder.otpProgress?.setIndicatorColor(mTextColorInverse) holder.otpProgress?.setIndicatorColor(mTextColorSelected)
holder.attachmentIcon?.setColorFilter(mTextColorInverse) holder.attachmentIcon?.setColorFilter(mTextColorSelected)
holder.meta.setTextColor(mTextColorInverse) holder.meta.setTextColor(mTextColorSelected)
} }
database.stopManageEntry(entry) database.stopManageEntry(entry)

1
app/src/main/res/values/attrs.xml
View File

@@ -27,6 +27,7 @@
<attr name="cardBackgroundTransparentColor" format="reference|color" /> <attr name="cardBackgroundTransparentColor" format="reference|color" />
<attr name="iconPreferenceColor" format="reference|color" /> <attr name="iconPreferenceColor" format="reference|color" />
<attr name="textColorInverse" format="reference|color" /> <attr name="textColorInverse" format="reference|color" />
<attr name="colorOnAccentColor" format="reference|color" />
<attr name="toolbarColorControl" format="reference|color" /> <attr name="toolbarColorControl" format="reference|color" />
<attr name="educationCircleColor" format="reference|color" /> <attr name="educationCircleColor" format="reference|color" />

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

@@ -69,6 +69,8 @@
<item name="iconPreferenceColor">@color/text_color_secondary_light</item> <item name="iconPreferenceColor">@color/text_color_secondary_light</item>
<item name="colorOnAccentColor">@color/white</item>
<!-- Dialog --> <!-- Dialog -->
<item name="android:alertDialogTheme">@style/KeepassDXStyle.Light.Dialog</item> <item name="android:alertDialogTheme">@style/KeepassDXStyle.Light.Dialog</item>
<item name="alertDialogTheme">@style/KeepassDXStyle.Light.Dialog</item> <item name="alertDialogTheme">@style/KeepassDXStyle.Light.Dialog</item>
@@ -133,6 +135,8 @@
<item name="iconPreferenceColor">@color/text_color_secondary_night</item> <item name="iconPreferenceColor">@color/text_color_secondary_night</item>
<item name="colorOnAccentColor">@color/white</item>
<!-- Dialog --> <!-- Dialog -->
<item name="android:alertDialogTheme">@style/KeepassDXStyle.Night.Dialog</item> <item name="android:alertDialogTheme">@style/KeepassDXStyle.Night.Dialog</item>
<item name="alertDialogTheme">@style/KeepassDXStyle.Night.Dialog</item> <item name="alertDialogTheme">@style/KeepassDXStyle.Night.Dialog</item>