mirror of
git://xwords.git.sourceforge.net/gitroot/xwords/xwords
synced 2025-02-14 20:47:54 +01:00
remove words from main games list. People don't read them, and now
there's a '+' in the menubar.
This commit is contained in:
parent
f4160c178d
commit
85382c982c
6 changed files with 1 additions and 120 deletions
|
@ -5,29 +5,6 @@
|
||||||
android:layout_width="fill_parent"
|
android:layout_width="fill_parent"
|
||||||
android:layout_height="fill_parent"
|
android:layout_height="fill_parent"
|
||||||
>
|
>
|
||||||
<LinearLayout android:id="@+id/empty_games_list"
|
|
||||||
android:orientation="vertical"
|
|
||||||
android:layout_width="fill_parent"
|
|
||||||
android:layout_height="wrap_content"
|
|
||||||
>
|
|
||||||
<TextView android:layout_height="wrap_content"
|
|
||||||
android:layout_width="wrap_content"
|
|
||||||
android:text="@string/empty_games_list"
|
|
||||||
android:textAppearance="?android:attr/textAppearanceMedium"
|
|
||||||
android:background="#FF202020"
|
|
||||||
android:gravity="center"
|
|
||||||
android:paddingLeft="8dp"
|
|
||||||
android:paddingRight="8dp"
|
|
||||||
/>
|
|
||||||
<TextView android:layout_height="wrap_content"
|
|
||||||
android:layout_width="wrap_content"
|
|
||||||
android:text="@string/empty_games_list2"
|
|
||||||
android:background="#FF202020"
|
|
||||||
android:gravity="center"
|
|
||||||
android:paddingLeft="8dp"
|
|
||||||
android:paddingRight="8dp"
|
|
||||||
/>
|
|
||||||
</LinearLayout>
|
|
||||||
|
|
||||||
<ExpandableListView android:id="@id/android:list"
|
<ExpandableListView android:id="@id/android:list"
|
||||||
android:layout_width="fill_parent"
|
android:layout_width="fill_parent"
|
||||||
|
@ -35,29 +12,4 @@
|
||||||
android:layout_weight="1"
|
android:layout_weight="1"
|
||||||
android:drawSelectorOnTop="false"
|
android:drawSelectorOnTop="false"
|
||||||
/>
|
/>
|
||||||
<TextView android:id="@+id/empty_list_msg"
|
|
||||||
android:layout_width="fill_parent"
|
|
||||||
android:layout_height="fill_parent"
|
|
||||||
android:layout_weight="1"
|
|
||||||
android:gravity="center_vertical|center_horizontal"
|
|
||||||
android:text="@string/empty_list_msg"
|
|
||||||
/>
|
|
||||||
|
|
||||||
<LinearLayout android:id="@+id/new_buttons"
|
|
||||||
android:orientation="horizontal"
|
|
||||||
android:layout_width="fill_parent"
|
|
||||||
android:layout_height="wrap_content"
|
|
||||||
android:paddingLeft="8dp"
|
|
||||||
android:paddingRight="8dp"
|
|
||||||
>
|
|
||||||
<Button android:id="@+id/new_game"
|
|
||||||
android:text="@string/button_new_game"
|
|
||||||
style="@style/spaced_buttons"
|
|
||||||
/>
|
|
||||||
<Button android:id="@+id/new_group"
|
|
||||||
android:text="@string/button_new_group"
|
|
||||||
style="@style/spaced_buttons"
|
|
||||||
/>
|
|
||||||
</LinearLayout>
|
|
||||||
|
|
||||||
</LinearLayout>
|
</LinearLayout>
|
||||||
|
|
|
@ -56,7 +56,6 @@
|
||||||
<string name="key_notify_sound">key_notify_sound</string>
|
<string name="key_notify_sound">key_notify_sound</string>
|
||||||
<string name="key_notify_vibrate">key_notify_vibrate</string>
|
<string name="key_notify_vibrate">key_notify_vibrate</string>
|
||||||
<string name="key_enable_sms">key_enable_sms</string>
|
<string name="key_enable_sms">key_enable_sms</string>
|
||||||
<string name="key_hide_intro">key_hide_intro</string>
|
|
||||||
<string name="key_keep_screenon">key_keep_screenon</string>
|
<string name="key_keep_screenon">key_keep_screenon</string>
|
||||||
<string name="key_summary_field">key_summary_field</string>
|
<string name="key_summary_field">key_summary_field</string>
|
||||||
<string name="key_default_loc">key_default_loc</string>
|
<string name="key_default_loc">key_default_loc</string>
|
||||||
|
|
|
@ -13,28 +13,11 @@
|
||||||
# This is the first screen you see when you launch Crosswords
|
# This is the first screen you see when you launch Crosswords
|
||||||
############################################################
|
############################################################
|
||||||
-->
|
-->
|
||||||
<!-- These two messages appear at the top of the list of games
|
|
||||||
(unless the hide_intro preferences checkbox is checked.)-->
|
|
||||||
<string name="empty_games_list">Use the button below to create a
|
|
||||||
game. Tap an existing game to play it or long-tap it for other
|
|
||||||
options.</string>
|
|
||||||
<!-- -->
|
|
||||||
<string name="empty_games_list2">You can hide this and the buttons
|
|
||||||
below in the Appearance section of Settings (accessed via your
|
|
||||||
device\'s menu key.)</string>
|
|
||||||
|
|
||||||
<!-- Text of button at bottom of main games-list screen and of
|
<!-- Text of menuitem in main games-list screen's menu -->
|
||||||
menuitem in main games-list screen's menu. (The botton can
|
|
||||||
be hidden in the same way as the above text.) -->
|
|
||||||
<string name="button_new_game">Add game</string>
|
<string name="button_new_game">Add game</string>
|
||||||
<string name="button_new_group">Add group</string>
|
<string name="button_new_group">Add group</string>
|
||||||
|
|
||||||
<!-- When the game list is empty and the above messages and button
|
|
||||||
are hidden via preferences, this text is shown -->
|
|
||||||
<string name="empty_list_msg">Use the menu key to add a
|
|
||||||
game.</string>
|
|
||||||
|
|
||||||
|
|
||||||
<!-- Used to format game name plus some other information as the
|
<!-- Used to format game name plus some other information as the
|
||||||
one-line summary for each game in the main screen. The name
|
one-line summary for each game in the main screen. The name
|
||||||
of the game is substituted for %1$s. Something else
|
of the game is substituted for %1$s. Something else
|
||||||
|
|
|
@ -117,11 +117,6 @@
|
||||||
android:entryValues="@array/game_summary_values"
|
android:entryValues="@array/game_summary_values"
|
||||||
android:defaultValue="@string/game_summary_field_opponents"
|
android:defaultValue="@string/game_summary_field_opponents"
|
||||||
/>
|
/>
|
||||||
<CheckBoxPreference android:key="@string/key_hide_intro"
|
|
||||||
android:title="@string/hide_intro"
|
|
||||||
android:summary="@string/hide_intro_summary"
|
|
||||||
android:defaultValue="false"
|
|
||||||
/>
|
|
||||||
<CheckBoxPreference android:key="@string/key_hide_title"
|
<CheckBoxPreference android:key="@string/key_hide_title"
|
||||||
android:title="@string/hide_title"
|
android:title="@string/hide_title"
|
||||||
android:summary="@string/hide_title_summary"
|
android:summary="@string/hide_title_summary"
|
||||||
|
|
|
@ -352,26 +352,6 @@ public class GamesList extends XWExpandableListActivity
|
||||||
}
|
}
|
||||||
PreferenceManager.setDefaultValues( this, R.xml.xwprefs, isUpgrade );
|
PreferenceManager.setDefaultValues( this, R.xml.xwprefs, isUpgrade );
|
||||||
|
|
||||||
// setDefaultKeyMode(DEFAULT_KEYS_SHORTCUT);
|
|
||||||
|
|
||||||
Button newGameB = (Button)findViewById(R.id.new_game);
|
|
||||||
newGameB.setOnClickListener( new View.OnClickListener() {
|
|
||||||
@Override
|
|
||||||
public void onClick( View v ) {
|
|
||||||
// addGame( false );
|
|
||||||
startNewGameActivity();
|
|
||||||
// showNotAgainDlg( R.string.not_again_newgame,
|
|
||||||
// R.string.key_notagain_newgame );
|
|
||||||
}
|
|
||||||
});
|
|
||||||
newGameB = (Button)findViewById(R.id.new_group);
|
|
||||||
newGameB.setOnClickListener( new View.OnClickListener() {
|
|
||||||
@Override
|
|
||||||
public void onClick( View v ) {
|
|
||||||
showDialog( NEW_GROUP );
|
|
||||||
}
|
|
||||||
});
|
|
||||||
|
|
||||||
String field = CommonPrefs.getSummaryField( this );
|
String field = CommonPrefs.getSummaryField( this );
|
||||||
long[] positions = XWPrefs.getGroupPositions( this );
|
long[] positions = XWPrefs.getGroupPositions( this );
|
||||||
m_adapter = new GameListAdapter( this, getExpandableListView(),
|
m_adapter = new GameListAdapter( this, getExpandableListView(),
|
||||||
|
@ -400,29 +380,6 @@ public class GamesList extends XWExpandableListActivity
|
||||||
tryStartsFromIntent( intent );
|
tryStartsFromIntent( intent );
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
|
||||||
protected void onStart()
|
|
||||||
{
|
|
||||||
super.onStart();
|
|
||||||
|
|
||||||
boolean hide = CommonPrefs.getHideIntro( this );
|
|
||||||
int hereOrGone = hide ? View.GONE : View.VISIBLE;
|
|
||||||
for ( int id : new int[]{ R.id.empty_games_list,
|
|
||||||
R.id.new_buttons } ) {
|
|
||||||
View view = findViewById( id );
|
|
||||||
view.setVisibility( hereOrGone );
|
|
||||||
}
|
|
||||||
View empty = findViewById( R.id.empty_list_msg );
|
|
||||||
empty.setVisibility( hide ? View.VISIBLE : View.GONE );
|
|
||||||
getExpandableListView().setEmptyView( hide? empty : null );
|
|
||||||
|
|
||||||
// TelephonyManager mgr =
|
|
||||||
// (TelephonyManager)getSystemService( Context.TELEPHONY_SERVICE );
|
|
||||||
// m_phoneStateListener = new XWPhoneStateListener();
|
|
||||||
// mgr.listen( m_phoneStateListener,
|
|
||||||
// PhoneStateListener.LISTEN_DATA_CONNECTION_STATE );
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
protected void onStop()
|
protected void onStop()
|
||||||
{
|
{
|
||||||
|
|
|
@ -252,11 +252,6 @@ public class CommonPrefs extends XWPrefs {
|
||||||
return getPrefsBoolean( context, R.string.key_notify_vibrate, false );
|
return getPrefsBoolean( context, R.string.key_notify_vibrate, false );
|
||||||
}
|
}
|
||||||
|
|
||||||
public static boolean getHideIntro( Context context )
|
|
||||||
{
|
|
||||||
return getPrefsBoolean( context, R.string.key_hide_intro, false );
|
|
||||||
}
|
|
||||||
|
|
||||||
public static boolean getKeepScreenOn( Context context )
|
public static boolean getKeepScreenOn( Context context )
|
||||||
{
|
{
|
||||||
return getPrefsBoolean( context, R.string.key_keep_screenon, false );
|
return getPrefsBoolean( context, R.string.key_keep_screenon, false );
|
||||||
|
|
Loading…
Add table
Reference in a new issue