Miroirs/xwords
1
0
Fork 0
mirror of git://xwords.git.sourceforge.net/gitroot/xwords/xwords synced 2025-01-07 05:24:46 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

cleanup: not a new feature any more

Browse source
This commit is contained in:
Eric House 2021-08-13 11:04:45 -07:00
parent 4ed46f6681
commit a8abdaad8c
3 changed files with 8 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
xwords4/android/app/src/main/java/org/eehouse/android/xw4/DictBrowseDelegate.java
View file

@ -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();
}
}

8
xwords4/android/app/src/main/java/org/eehouse/android/xw4/jni/CommonPrefs.java
View file

@ -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 );

2
xwords4/android/app/src/main/res/values/strings.xml
View file

@ -1656,7 +1656,7 @@
<string name="filter_progress_fmt">Processing %1$d words</string>
<!-- Text of alert shown when user first opens wordlist
browser. Shown until not-again checkbox checked. -->
<string name="new_feature_filter">You can now filter wordlists by
<string name="new_feature_filter">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