diff --git a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/DictBrowseDelegate.java b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/DictBrowseDelegate.java index a3c1648c2..3974c8eee 100644 --- a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/DictBrowseDelegate.java +++ b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/DictBrowseDelegate.java @@ -140,7 +140,7 @@ public class DictBrowseDelegate extends DelegateBase private PatTableRow m_rows[] = { null, null, null }; private Spinner m_spinnerMin; private Spinner m_spinnerMax; - private boolean m_newAlertShown; + private boolean m_filterAlertShown; private String m_desc; private Runnable mResetChecker; @@ -779,12 +779,11 @@ public class DictBrowseDelegate extends DelegateBase private void newFeatureAlert() { - if ( ! m_newAlertShown ) { - m_newAlertShown = true; + if ( ! m_filterAlertShown ) { + m_filterAlertShown = true; makeNotAgainBuilder( R.string.new_feature_filter, R.string.key_na_newFeatureFilter ) .setActionPair( Action.SHOW_FAQ, R.string.button_faq ) .setParams( (Object)FAQ_PARAMS ) - .setTitle(R.string.new_feature_title) .show(); } } diff --git a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/jni/CommonPrefs.java b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/jni/CommonPrefs.java index 6519b8606..e66639e06 100644 --- a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/jni/CommonPrefs.java +++ b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/jni/CommonPrefs.java @@ -106,7 +106,7 @@ public class CommonPrefs extends XWPrefs { tvType = TileValueType.values()[ord]; Resources res = context.getResources(); - int strsID = R.array.color_ids_light; + ColorTheme theme = ColorTheme.LIGHT; String which = LocUtils.getString( context, R.string.key_theme_which ); which = sp.getString( which, null ); if ( null != which ) { @@ -116,13 +116,13 @@ public class CommonPrefs extends XWPrefs { // do nothing break; case 1: - strsID = R.array.color_ids_dark; + theme = ColorTheme.DARK; break; case 2: int uiMode = res.getConfiguration().uiMode; if ( Configuration.UI_MODE_NIGHT_YES == (uiMode & Configuration.UI_MODE_NIGHT_MASK) ) { - strsID = R.array.color_ids_dark; + theme = ColorTheme.DARK; } break; default: @@ -133,7 +133,7 @@ public class CommonPrefs extends XWPrefs { Log.ex( TAG, ex ); } } - String[] colorStrIds = res.getStringArray( strsID ); + String[] colorStrIds = res.getStringArray( theme.getArrayID() ); int offset = copyColors( sp, colorStrIds, 0, playerColors, 0 ); offset += copyColors( sp, colorStrIds, offset, bonusColors, 1 ); diff --git a/xwords4/android/app/src/main/res/values/strings.xml b/xwords4/android/app/src/main/res/values/strings.xml index 274216c40..c7fa1c1e6 100644 --- a/xwords4/android/app/src/main/res/values/strings.xml +++ b/xwords4/android/app/src/main/res/values/strings.xml @@ -1656,7 +1656,7 @@ Processing %1$d words - You can now filter wordlists by + You can filter wordlists by what words start with, end with, and/or contain. Access filtering by tapping the Expander Arrow at the upper-right corner of the window.\n\nRead more in the FAQ by tapping the button