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

new separate set of three prefs for thumbnails, and make the first,

Browse source 
enable/disable, work.
This commit is contained in:
Eric House 2013-11-07 19:07:19 -08:00
parent fba7aee83a
commit 41df94af31
7 changed files with 56 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
xwords4/android/XWords4/res/values/common_rsrc.xml
View file

@ -58,6 +58,9 @@
<string name="key_enable_sms">key_enable_sms</string>
<string name="key_keep_screenon">key_keep_screenon</string>
<string name="key_thumbsize">key_thumbsize2</string>
<string name="key_thumb_disabled">key_thumb_disabled</string>
<string name="key_thumb_useactive">key_thumb_useactive</string>
<string name="key_summary_field">key_summary_field</string>
<string name="key_default_loc">key_default_loc</string>
@ -136,7 +139,6 @@
<string name="gamel_menu_storedb">Write DB to SD card</string>
<string name="gamel_menu_loaddb">Load DB from SD card</string>
<string name="game_thumb_off">Off</string>
<string name="game_thumb_third">1/3</string>
<string name="game_thumb_quarter">1/4</string>
<string name="game_thumb_fifth">1/5</string>
@ -289,7 +291,6 @@
</string-array>
<string-array name="game_thumb_values">
<item>@string/game_thumb_off</item>
<item>@string/game_thumb_third</item>
<item>@string/game_thumb_quarter</item>
<item>@string/game_thumb_fifth</item>

17
xwords4/android/XWords4/res/values/strings.xml
View file

@ -1853,7 +1853,7 @@
<!-- -->
<string name="email_body_revf">(If relevant, please include the
version: \"%s\"; and make/model of your phone or
tablet.)"</string>
tablet.)</string>
<string name="newgame_enable_bt">Turn Bluetooth on</string>
@ -2154,8 +2154,17 @@
now clears any selection instead of exiting. Hit it again to exit
the app.</string>
<string name="sel_gamesf">Games: %d"</string>
<string name="sel_groupsf">Groups: %d"</string>
<string name="sel_gamesf">Games: %d</string>
<string name="sel_groupsf">Groups: %d</string>
<string name="summary_thumbsize">Thumbnail size</string>
<string name="sel_dictsf">Wordlists: %d"</string>
<string name="sel_dictsf">Wordlists: %d</string>
<string name="thumb_disabled">Thumb disabled</string>
<string name="summary_thumb_disabled">Summayr thumb disbled</string>
<string name="thumb_useactive">thumb_useactive</string>
<string name="summary_thumb_useactive">summary_thumb_useactive</string>
<string name="prefs_thumb">Thumbnail prefs</string>
<string name="prefs_thumb_summary">prefs_thumb_summary</string>
</resources>

30
xwords4/android/XWords4/res/xml/xwprefs.xml
View file

@ -138,13 +138,29 @@
android:defaultValue="false"
/>
<org.eehouse.android.xw4.XWListPreference
android:key="@string/key_thumbsize"
android:title="@string/summary_thumbsize"
android:entries="@array/game_thumb_values"
android:entryValues="@array/game_thumb_values"
android:defaultValue="@string/game_thumb_quarter"
/>
<PreferenceScreen android:title="@string/prefs_thumb"
android:summary="@string/prefs_thumb_summary"
>
<CheckBoxPreference android:key="@string/key_thumb_disabled"
android:title="@string/thumb_disabled"
android:summary="@string/summary_thumb_disabled"
android:defaultValue="false"
/>
<CheckBoxPreference android:key="@string/key_thumb_useactive"
android:title="@string/thumb_useactive"
android:summary="@string/summary_thumb_useactive"
android:defaultValue="true"
/>
<org.eehouse.android.xw4.XWListPreference
android:key="@string/key_thumbsize"
android:title="@string/summary_thumbsize"
android:entries="@array/game_thumb_values"
android:entryValues="@array/game_thumb_values"
android:defaultValue="@string/game_thumb_quarter"
/>
</PreferenceScreen>
<PreferenceScreen android:title="@string/prefs_colors"
android:summary="@string/prefs_colors_summary"

5
xwords4/android/XWords4/src/org/eehouse/android/xw4/BoardActivity.java
View file

@ -2059,8 +2059,9 @@ public class BoardActivity extends XWActivity
{
if ( GitVersion.THUMBNAIL_SUPPORTED ) {
Bitmap thumb = null;
int scale = XWPrefs.getThumbScale( this );
if ( 0 < scale ) {
if ( XWPrefs.getThumbEnabled( this ) ) {
int scale = XWPrefs.getThumbScale( this );
Assert.assertTrue( 0 < scale );
final int size = 15 * (9 + scale);
thumb = Bitmap.createBitmap( size, size, Bitmap.Config.ARGB_8888 );

5
xwords4/android/XWords4/src/org/eehouse/android/xw4/DBUtils.java
View file

@ -443,7 +443,8 @@ public class DBUtils {
synchronized( s_dbHelper ) {
SQLiteDatabase db = s_dbHelper.getWritableDatabase();
ContentValues values = new ContentValues();
String selection = String.format( ROW_ID_FMT, lock.getRowid() );
long rowid = lock.getRowid();
String selection = String.format( ROW_ID_FMT, rowid );
if ( null == thumb ) {
DbgUtils.logf( "clearing thumbnail" );
@ -459,6 +460,8 @@ public class DBUtils {
Assert.assertTrue( result >= 0 );
db.close();
notifyListeners( rowid, false );
}
}
}

11
xwords4/android/XWords4/src/org/eehouse/android/xw4/GameListItem.java
View file

@ -188,7 +188,9 @@ public class GameListItem extends LinearLayout
R.drawable.expander_ic_minimized);
m_hideable.setVisibility( m_expanded? View.VISIBLE : View.GONE );
if ( GitVersion.THUMBNAIL_SUPPORTED ) {
m_thumb.setVisibility( m_expanded ? View.VISIBLE : View.GONE );
int vis = m_expanded && XWPrefs.getThumbEnabled( m_context )
? View.VISIBLE : View.GONE;
m_thumb.setVisibility( vis );
}
m_name.setBackgroundColor( android.R.color.transparent );
@ -299,12 +301,7 @@ public class GameListItem extends LinearLayout
if ( GitVersion.THUMBNAIL_SUPPORTED ) {
m_thumb = (ImageView)findViewById( R.id.thumbnail );
Bitmap bmp = summary.getThumbnail();
if ( null == bmp ) {
m_thumb.setVisibility( View.GONE );
} else {
m_thumb.setImageBitmap( bmp );
}
m_thumb.setImageBitmap( summary.getThumbnail() );
}
tview = (TextView)findViewById( R.id.role );

9
xwords4/android/XWords4/src/org/eehouse/android/xw4/XWPrefs.java
View file

@ -328,13 +328,16 @@ public class XWPrefs {
return posns;
}
public static boolean getThumbEnabled( Context context )
{
return !getPrefsBoolean( context, R.string.key_thumb_disabled, false );
}
public static int getThumbScale( Context context )
{
String scale = getPrefsString( context, R.string.key_thumbsize );
int result = -1;
if ( context.getString(R.string.game_thumb_off).equals(scale) ) {
result = 0;
} else if ( context.getString(R.string.game_thumb_third).equals(scale) ) {
if ( context.getString(R.string.game_thumb_third).equals(scale) ) {
result = 3;
} else if ( context.getString(R.string.game_thumb_quarter).equals(scale) ) {
result = 4;