qwe/keepass2android
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #2514 from PhilippC/1942--fix-text-color-not-themed

Browse Source 
Fix bad text color on autofill target preference dialog
This commit is contained in:
PhilippC
2024-01-15 12:30:50 +01:00
committed by GitHub
parent fdcd4321e0 dfd9c32251
commit a5ef4ccc7a
1 changed files with 21 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/keepass2android/settings/AutofillDisabledQueriesPreference.cs
View File

@@ -6,8 +6,10 @@ using Android.App;
using Android.Content; using Android.Content;
using Android.Content.PM; using Android.Content.PM;
using Android.Content.Res; using Android.Content.Res;
using Android.Graphics;
using Android.Preferences; using Android.Preferences;
using Android.Runtime; using Android.Runtime;
using Android.Support.V4.Content;
using Android.Util; using Android.Util;
using Android.Views; using Android.Views;
using Android.Widget; using Android.Widget;
@@ -30,10 +32,12 @@ namespace keepass2android
public Dictionary<string, bool> DisabledQueriesValues = new Dictionary<string, bool>(); public Dictionary<string, bool> DisabledQueriesValues = new Dictionary<string, bool>();
private readonly AutofillDisabledQueriesPreference _pref; private readonly AutofillDisabledQueriesPreference _pref;
private readonly Context _context;
public DisabledQueryPreferenceScreenAdapter(AutofillDisabledQueriesPreference pref, Context context) public DisabledQueryPreferenceScreenAdapter(AutofillDisabledQueriesPreference pref, Context context)
{ {
_pref = pref; _pref = pref;
_context = context;
} }
@@ -41,11 +45,25 @@ namespace keepass2android
{ {
private TextView text = null; private TextView text = null;
private CheckBox checkbox = null; private CheckBox checkbox = null;
public CustomHolder(View row, int position, AutofillDisabledQueriesPreference pref) public CustomHolder(View row, int position, AutofillDisabledQueriesPreference pref, Context context)
{ {
text = (TextView) row.FindViewById(Resource.Id.disabled_query_text); text = (TextView) row.FindViewById(Resource.Id.disabled_query_text);
text.Text = pref.DisabledQueries[position].DisplayName; text.Text = pref.DisabledQueries[position].DisplayName;
TypedValue typedValue = new TypedValue();
Resources.Theme theme = context.Theme;
if (theme != null)
{
theme.ResolveAttribute(Android.Resource.Attribute.TextColorPrimary, typedValue, true);
using (TypedArray arr = context.ObtainStyledAttributes(typedValue.Data, new int[] { Android.Resource.Attribute.TextColorPrimary }))
{
var primaryColor = arr.GetColorStateList(0);
text.SetTextColor(primaryColor);
}
}
checkbox = (CheckBox) row.FindViewById(Resource.Id.disabled_query_checkbox); checkbox = (CheckBox) row.FindViewById(Resource.Id.disabled_query_checkbox);
checkbox.Id = position; checkbox.Id = position;
@@ -79,7 +97,7 @@ namespace keepass2android
int p = position; int p = position;
row = LayoutInflater.From(_pref.Context) row = LayoutInflater.From(_pref.Context)
.Inflate(Resource.Layout.disabled_queries_preference_row, parent, false); .Inflate(Resource.Layout.disabled_queries_preference_row, parent, false);
holder = new CustomHolder(row, position, _pref); holder = new CustomHolder(row, position, _pref, _context);
row.Tag = holder; row.Tag = holder;