From 2465017e4663eb220e4e9b057aebd1c036dd20a4 Mon Sep 17 00:00:00 2001 From: Eric House Date: Sat, 15 Nov 2014 17:59:59 -0800 Subject: [PATCH] add buttons that create new games, bypassing the NewGame activity for a simpler experience. --- xwords4/android/XWords4/archive/R.java | 572 +++++++++--------- .../android/XWords4/res/layout/game_list.xml | 12 + .../android/XWords4/res/values/strings.xml | 18 +- .../XWords4/res_src/values-ba_CK/strings.xml | 14 +- .../XWords4/res_src/values-ca_PS/strings.xml | 10 +- .../android/xw4/ConnStatusHandler.java | 2 +- .../src/org/eehouse/android/xw4/DlgID.java | 1 + .../android/xw4/GameConfigDelegate.java | 4 +- .../org/eehouse/android/xw4/GameUtils.java | 9 + .../android/xw4/GamesListDelegate.java | 90 ++- .../eehouse/android/xw4/jni/CommsAddrRec.java | 7 +- 11 files changed, 436 insertions(+), 303 deletions(-) diff --git a/xwords4/android/XWords4/archive/R.java b/xwords4/android/XWords4/archive/R.java index 404433e87..852cabcf1 100644 --- a/xwords4/android/XWords4/archive/R.java +++ b/xwords4/android/XWords4/archive/R.java @@ -80,168 +80,170 @@ public final class R { public static final int about_xlator=0x7f090001; public static final int add_player=0x7f09002d; public static final int advertise_new_room_check=0x7f090033; - public static final int blessed_label=0x7f090052; - public static final int board_menu_chat=0x7f0900a4; - public static final int board_menu_dict=0x7f0900a0; - public static final int board_menu_done=0x7f09008b; - public static final int board_menu_file_about=0x7f090099; - public static final int board_menu_file_prefs=0x7f090098; - public static final int board_menu_flip=0x7f0900a2; - public static final int board_menu_game_counts=0x7f090091; - public static final int board_menu_game_history=0x7f090093; - public static final int board_menu_game_left=0x7f090092; - public static final int board_menu_game_netstats=0x7f09009a; - public static final int board_menu_game_resend=0x7f090095; - public static final int board_menu_game_resign=0x7f090094; - public static final int board_menu_hint_next=0x7f09009e; - public static final int board_menu_hint_prev=0x7f09009d; - public static final int board_menu_invite=0x7f09008a; - public static final int board_menu_juggle=0x7f0900a1; - public static final int board_menu_toggle=0x7f0900a5; - public static final int board_menu_trade=0x7f09008c; - public static final int board_menu_trade_cancel=0x7f09008d; - public static final int board_menu_trade_commit=0x7f09008e; - public static final int board_menu_tray=0x7f090090; - public static final int board_menu_undo_current=0x7f09009f; - public static final int board_menu_undo_last=0x7f09008f; - public static final int board_menu_zoom=0x7f0900a3; + public static final int blessed_label=0x7f090054; + public static final int board_menu_chat=0x7f0900a6; + public static final int board_menu_dict=0x7f0900a2; + public static final int board_menu_done=0x7f09008d; + public static final int board_menu_file_about=0x7f09009b; + public static final int board_menu_file_prefs=0x7f09009a; + public static final int board_menu_flip=0x7f0900a4; + public static final int board_menu_game_counts=0x7f090093; + public static final int board_menu_game_history=0x7f090095; + public static final int board_menu_game_left=0x7f090094; + public static final int board_menu_game_netstats=0x7f09009c; + public static final int board_menu_game_resend=0x7f090097; + public static final int board_menu_game_resign=0x7f090096; + public static final int board_menu_hint_next=0x7f0900a0; + public static final int board_menu_hint_prev=0x7f09009f; + public static final int board_menu_invite=0x7f09008c; + public static final int board_menu_juggle=0x7f0900a3; + public static final int board_menu_toggle=0x7f0900a7; + public static final int board_menu_trade=0x7f09008e; + public static final int board_menu_trade_cancel=0x7f09008f; + public static final int board_menu_trade_commit=0x7f090090; + public static final int board_menu_tray=0x7f090092; + public static final int board_menu_undo_current=0x7f0900a1; + public static final int board_menu_undo_last=0x7f090091; + public static final int board_menu_zoom=0x7f0900a5; public static final int board_root=0x7f090002; public static final int board_view=0x7f090003; public static final int boardsize_spinner=0x7f090040; - public static final int button_add=0x7f090079; + public static final int button_add=0x7f09007b; public static final int button_clear=0x7f09000b; - public static final int button_done=0x7f09005d; + public static final int button_done=0x7f09005f; public static final int button_invite=0x7f09000c; + public static final int button_newgame_multi=0x7f090042; + public static final int button_newgame_solo=0x7f090041; public static final int button_rescan=0x7f09000a; - public static final int button_study=0x7f09005c; - public static final int chat_button=0x7f090085; + public static final int button_study=0x7f09005e; + public static final int chat_button=0x7f090087; public static final int chat_edit=0x7f09000e; public static final int chat_history=0x7f09000d; - public static final int chat_menu_clear=0x7f0900a6; - public static final int checkbox=0x7f09004c; + public static final int chat_menu_clear=0x7f0900a8; + public static final int checkbox=0x7f09004e; public static final int color_display_sample=0x7f090010; public static final int color_edit_sample=0x7f090011; - public static final int config_button=0x7f090075; + public static final int config_button=0x7f090077; public static final int confirm_sms_reasons=0x7f090018; public static final int conn_types=0x7f090019; public static final int connect_set_relay=0x7f09002f; public static final int connect_set_sms=0x7f090037; - public static final int del=0x7f09004f; + public static final int del=0x7f090051; public static final int desc=0x7f09001c; - public static final int details=0x7f090076; - public static final int dict_label=0x7f09006b; + public static final int details=0x7f090078; + public static final int dict_label=0x7f09006d; public static final int dict_spinner=0x7f09002a; - public static final int dictlist_button=0x7f090084; - public static final int dicts_delete=0x7f0900a9; - public static final int dicts_deselect_all=0x7f0900a8; - public static final int dicts_download=0x7f0900a7; - public static final int dicts_move=0x7f0900aa; - public static final int dicts_select=0x7f0900ab; + public static final int dictlist_button=0x7f090086; + public static final int dicts_delete=0x7f0900ab; + public static final int dicts_deselect_all=0x7f0900aa; + public static final int dicts_download=0x7f0900a9; + public static final int dicts_move=0x7f0900ac; + public static final int dicts_select=0x7f0900ad; public static final int divider=0x7f090021; - public static final int download_button=0x7f090077; - public static final int dwnld_message=0x7f09004a; - public static final int edit=0x7f090067; + public static final int download_button=0x7f090079; + public static final int dwnld_message=0x7f09004c; + public static final int edit=0x7f090069; public static final int edit_blue=0x7f090017; public static final int edit_green=0x7f090015; public static final int edit_red=0x7f090013; - public static final int english_label=0x7f090050; - public static final int english_view=0x7f090051; + public static final int english_label=0x7f090052; + public static final int english_view=0x7f090053; public static final int exchange_buttons=0x7f090004; public static final int exchange_cancel=0x7f090006; public static final int exchange_commit=0x7f090005; public static final int expander=0x7f090023; - public static final int explain=0x7f090073; - public static final int filters=0x7f090057; - public static final int flip_button=0x7f090087; + public static final int explain=0x7f090075; + public static final int filters=0x7f090059; + public static final int flip_button=0x7f090089; public static final int game_locked_check=0x7f090025; - public static final int game_name=0x7f090041; - public static final int gamel_menu_checkmoves=0x7f090097; - public static final int games_game_config=0x7f0900b6; - public static final int games_game_copy=0x7f0900bb; - public static final int games_game_delete=0x7f0900b5; - public static final int games_game_move=0x7f0900b7; - public static final int games_game_new_from=0x7f0900b9; - public static final int games_game_rename=0x7f0900ba; - public static final int games_game_reset=0x7f0900b8; - public static final int games_group_default=0x7f0900bf; - public static final int games_group_delete=0x7f0900be; - public static final int games_group_movedown=0x7f0900bd; - public static final int games_group_moveup=0x7f0900bc; - public static final int games_group_rename=0x7f0900c0; - public static final int games_menu_about=0x7f0900b2; - public static final int games_menu_checkmoves=0x7f0900b4; - public static final int games_menu_checkupdates=0x7f0900c1; - public static final int games_menu_dicts=0x7f0900b0; - public static final int games_menu_email=0x7f0900b1; - public static final int games_menu_loaddb=0x7f0900c3; - public static final int games_menu_newgame=0x7f0900ac; - public static final int games_menu_newgroup=0x7f0900ad; - public static final int games_menu_prefs=0x7f0900ae; - public static final int games_menu_rateme=0x7f0900af; - public static final int games_menu_resend=0x7f0900b3; - public static final int games_menu_storedb=0x7f0900c2; - public static final int games_menu_study=0x7f090096; - public static final int group_done=0x7f090089; - public static final int group_exchange=0x7f09009b; - public static final int group_hint=0x7f09009c; - public static final int hideable=0x7f090046; + public static final int game_name=0x7f090043; + public static final int gamel_menu_checkmoves=0x7f090099; + public static final int games_game_config=0x7f0900b8; + public static final int games_game_copy=0x7f0900bd; + public static final int games_game_delete=0x7f0900b7; + public static final int games_game_move=0x7f0900b9; + public static final int games_game_new_from=0x7f0900bb; + public static final int games_game_rename=0x7f0900bc; + public static final int games_game_reset=0x7f0900ba; + public static final int games_group_default=0x7f0900c1; + public static final int games_group_delete=0x7f0900c0; + public static final int games_group_movedown=0x7f0900bf; + public static final int games_group_moveup=0x7f0900be; + public static final int games_group_rename=0x7f0900c2; + public static final int games_menu_about=0x7f0900b4; + public static final int games_menu_checkmoves=0x7f0900b6; + public static final int games_menu_checkupdates=0x7f0900c3; + public static final int games_menu_dicts=0x7f0900b2; + public static final int games_menu_email=0x7f0900b3; + public static final int games_menu_loaddb=0x7f0900c5; + public static final int games_menu_newgame=0x7f0900ae; + public static final int games_menu_newgroup=0x7f0900af; + public static final int games_menu_prefs=0x7f0900b0; + public static final int games_menu_rateme=0x7f0900b1; + public static final int games_menu_resend=0x7f0900b5; + public static final int games_menu_storedb=0x7f0900c4; + public static final int games_menu_study=0x7f090098; + public static final int group_done=0x7f09008b; + public static final int group_exchange=0x7f09009d; + public static final int group_hint=0x7f09009e; + public static final int hideable=0x7f090048; public static final int hints_allowed=0x7f090039; public static final int invite_desc=0x7f090009; - public static final int item_name=0x7f09006f; - public static final int item_score=0x7f090070; + public static final int item_name=0x7f090071; + public static final int item_score=0x7f090072; public static final int join_public_room_check=0x7f090030; public static final int juggle_players=0x7f09002e; public static final int label=0x7f090022; public static final int lang_separator=0x7f090028; public static final int lang_spinner=0x7f090029; - public static final int loc_item_check=0x7f0900c5; - public static final int loc_item_clear=0x7f0900c4; - public static final int loc_item_copy_bless=0x7f0900c7; - public static final int loc_item_copy_eng=0x7f0900c6; - public static final int loc_search_button=0x7f090059; - public static final int loc_search_field=0x7f090058; - public static final int local_label=0x7f090054; - public static final int local_name_edit=0x7f090074; - public static final int local_player_set=0x7f090069; - public static final int manual_add_button=0x7f09007a; - public static final int modtime=0x7f090047; - public static final int msg_marker=0x7f090044; - public static final int name=0x7f09007b; + public static final int loc_item_check=0x7f0900c7; + public static final int loc_item_clear=0x7f0900c6; + public static final int loc_item_copy_bless=0x7f0900c9; + public static final int loc_item_copy_eng=0x7f0900c8; + public static final int loc_search_button=0x7f09005b; + public static final int loc_search_field=0x7f09005a; + public static final int local_label=0x7f090056; + public static final int local_name_edit=0x7f090076; + public static final int local_player_set=0x7f09006b; + public static final int manual_add_button=0x7f09007c; + public static final int modtime=0x7f090049; + public static final int msg_marker=0x7f090046; + public static final int name=0x7f09007d; public static final int name_edit=0x7f09001a; - public static final int name_label=0x7f090078; - public static final int newgame_local=0x7f090061; - public static final int newgame_local_config=0x7f090062; - public static final int newgame_local_desc=0x7f090060; - public static final int newgame_local_header=0x7f09005e; - public static final int newgame_local_hideable=0x7f09005f; - public static final int newgame_net_config=0x7f090066; - public static final int newgame_net_invite=0x7f090065; - public static final int newgame_networked_hideable=0x7f090064; - public static final int newgame_relay_header=0x7f090063; - public static final int nexthint_button=0x7f090081; - public static final int number=0x7f09007c; - public static final int other_lang=0x7f09005a; - public static final int password_edit=0x7f09006e; - public static final int password_set=0x7f09006d; + public static final int name_label=0x7f09007a; + public static final int newgame_local=0x7f090063; + public static final int newgame_local_config=0x7f090064; + public static final int newgame_local_desc=0x7f090062; + public static final int newgame_local_header=0x7f090060; + public static final int newgame_local_hideable=0x7f090061; + public static final int newgame_net_config=0x7f090068; + public static final int newgame_net_invite=0x7f090067; + public static final int newgame_networked_hideable=0x7f090066; + public static final int newgame_relay_header=0x7f090065; + public static final int nexthint_button=0x7f090083; + public static final int number=0x7f09007e; + public static final int other_lang=0x7f09005c; + public static final int password_edit=0x7f090070; + public static final int password_set=0x7f09006f; public static final int phonies_spinner=0x7f09003e; public static final int pick_faceup=0x7f09003f; - public static final int pick_lang=0x7f09007d; - public static final int pick_lang_spinner=0x7f09007e; + public static final int pick_lang=0x7f09007f; + public static final int pick_lang_spinner=0x7f090080; public static final int play_button=0x7f090026; public static final int player_list=0x7f09002c; - public static final int player_name_edit=0x7f09006a; + public static final int player_name_edit=0x7f09006c; public static final int players=0x7f090024; public static final int players_label=0x7f09002b; - public static final int prevhint_button=0x7f090080; + public static final int prevhint_button=0x7f090082; public static final int private_rooms_set=0x7f090031; - public static final int progress_bar=0x7f09004b; + public static final int progress_bar=0x7f09004d; public static final int public_rooms_set=0x7f090034; public static final int refresh_button=0x7f090036; - public static final int remote_check=0x7f090068; - public static final int revert_all=0x7f090072; - public static final int revert_colors=0x7f090071; - public static final int robot_check=0x7f09006c; - public static final int role=0x7f090049; + public static final int remote_check=0x7f09006a; + public static final int revert_all=0x7f090074; + public static final int revert_colors=0x7f090073; + public static final int robot_check=0x7f09006e; + public static final int role=0x7f09004b; public static final int room_edit=0x7f090032; public static final int room_spinner=0x7f090035; public static final int screen=0x7f090027; @@ -251,37 +253,37 @@ public final class R { public static final int seek_red=0x7f090012; public static final int send_button=0x7f09000f; public static final int show_remote=0x7f09001b; - public static final int shuffle_button=0x7f090082; - public static final int slmenu_clear_sel=0x7f0900cc; - public static final int slmenu_copy_sel=0x7f0900cb; - public static final int slmenu_deselect_all=0x7f0900ca; - public static final int slmenu_lookup_sel=0x7f0900c8; - public static final int slmenu_select_all=0x7f0900c9; + public static final int shuffle_button=0x7f090084; + public static final int slmenu_clear_sel=0x7f0900ce; + public static final int slmenu_copy_sel=0x7f0900cd; + public static final int slmenu_deselect_all=0x7f0900cc; + public static final int slmenu_lookup_sel=0x7f0900ca; + public static final int slmenu_select_all=0x7f0900cb; public static final int smart_robot=0x7f09003d; public static final int sms_phones=0x7f090038; - public static final int state=0x7f090048; - public static final int summary=0x7f09005b; + public static final int state=0x7f09004a; + public static final int summary=0x7f09005d; public static final int tbar_parent_hor=0x7f090007; public static final int tbar_parent_vert=0x7f090008; - public static final int text_item=0x7f09004d; - public static final int text_item2=0x7f09004e; - public static final int thumbnail=0x7f090045; + public static final int text_item=0x7f09004f; + public static final int text_item2=0x7f090050; + public static final int thumbnail=0x7f090047; public static final int timer_minutes_edit=0x7f09003c; public static final int timer_set=0x7f09003b; - public static final int toolbar=0x7f09007f; - public static final int undo_button=0x7f090083; + public static final int toolbar=0x7f090081; + public static final int undo_button=0x7f090085; public static final int use_timer=0x7f09003a; - public static final int values_button=0x7f090086; + public static final int values_button=0x7f090088; public static final int version_string=0x7f090000; - public static final int view_loaded=0x7f090043; - public static final int view_unloaded=0x7f090042; + public static final int view_loaded=0x7f090045; + public static final int view_unloaded=0x7f090044; public static final int word_edit=0x7f09001d; public static final int wordlen_max=0x7f090020; public static final int wordlen_min=0x7f09001f; - public static final int xlated_view=0x7f090056; - public static final int xlated_view_blessed=0x7f090053; - public static final int xlated_view_local=0x7f090055; - public static final int zoom_button=0x7f090088; + public static final int xlated_view=0x7f090058; + public static final int xlated_view_blessed=0x7f090055; + public static final int xlated_view_local=0x7f090057; + public static final int zoom_button=0x7f09008a; } public static final class layout { public static final int about_dlg=0x7f030000; @@ -357,8 +359,8 @@ public final class R { /** Another paragraph in the about dialog */ public static final int about_web=0x7f0501db; - public static final int add_done_fmt=0x7f05028d; - public static final int add_to_study_fmt=0x7f050285; + public static final int add_done_fmt=0x7f05028c; + public static final int add_to_study_fmt=0x7f050284; /** Debugging stuff. No point in localizing it. */ public static final int advanced=0x7f050075; @@ -372,7 +374,7 @@ public final class R { /** The name of the app. Not localized! */ public static final int app_name=0x7f050001; - public static final int app_not_found_fmt=0x7f0502c9; + public static final int app_not_found_fmt=0x7f0502c8; public static final int app_version=0x7f050000; /** the background color of the area outside the board, e.g. between entries in the scoreboard @@ -439,7 +441,7 @@ public final class R { */ public static final int board_menu_game_resend=0x7f05010e; public static final int board_menu_game_resign=0x7f05010d; - public static final int board_menu_invite=0x7f05027d; + public static final int board_menu_invite=0x7f05027c; /** */ public static final int board_menu_pass=0x7f0501e9; @@ -504,14 +506,14 @@ public final class R { /** */ public static final int bt_bad_proto_fmt=0x7f05020b; - public static final int bt_err_count_fmt=0x7f0502c7; + public static final int bt_err_count_fmt=0x7f0502c6; /** */ public static final int bt_fail_fmt=0x7f050210; /** Title of device picker during invitation to a game via Bluetooth */ public static final int bt_invite_title=0x7f050212; - public static final int bt_no_devs=0x7f0502c8; + public static final int bt_no_devs=0x7f0502c7; /** Turn Bluetooth on In the Bluetooth invite device dialog */ @@ -532,7 +534,7 @@ public final class R { /** The only button available when the above message is displayed */ public static final int button_close_game=0x7f0501a7; - public static final int button_decline=0x7f05025a; + public static final int button_decline=0x7f050259; /** */ public static final int button_default_both=0x7f0500b8; @@ -567,7 +569,7 @@ public final class R { /** Text of button displayed when downloading is an option */ public static final int button_download=0x7f0501aa; - public static final int button_go_settings=0x7f05027f; + public static final int button_go_settings=0x7f05027e; /** */ public static final int button_invite=0x7f050211; @@ -620,12 +622,12 @@ public final class R { in many places. */ public static final int button_ok=0x7f0501b1; - public static final int button_reconnect=0x7f05026f; + public static final int button_reconnect=0x7f05026e; /** Button shown in game over dialog triggering creation of new game with the same players and parameters as the one that just ended. */ - public static final int button_rematch=0x7f05026e; + public static final int button_rematch=0x7f05026d; /** When you select the list_item_reset contextual menu, you are asked to confirm. This is the text of the first button ("Cancel" is the second). @@ -682,8 +684,8 @@ public final class R { */ public static final int button_trade_commit=0x7f0500ea; public static final int button_yes=0x7f0501b3; - public static final int cannot_delete_default_group_fmt=0x7f05026c; - public static final int change_group=0x7f050272; + public static final int cannot_delete_default_group_fmt=0x7f05026b; + public static final int change_group=0x7f050271; /** text of button in About Crosswords dialog summoning above dialog */ @@ -729,7 +731,7 @@ public final class R { substituted for %1$s. */ public static final int chat_title_fmt=0x7f05018b; - public static final int checkupdates_none_found=0x7f050249; + public static final int checkupdates_none_found=0x7f050248; /** color of the "crosshairs", lines drawn vertically and horizontally through the square the user is currently touching in order to guide the fat-fingered (most of us) in @@ -773,23 +775,23 @@ public final class R { public static final int confirm_seldeletes_fmt=0x7f0500ab; /** */ - public static final int confirm_sms_expl=0x7f050242; + public static final int confirm_sms_expl=0x7f050241; /** */ - public static final int confirm_sms_leave=0x7f050244; + public static final int confirm_sms_leave=0x7f050243; /** */ - public static final int confirm_sms_prompt=0x7f050243; + public static final int confirm_sms_prompt=0x7f050242; /** */ - public static final int confirm_sms_title=0x7f050241; + public static final int confirm_sms_title=0x7f050240; /** */ - public static final int confirm_sms_unlimited=0x7f050245; + public static final int confirm_sms_unlimited=0x7f050244; /** */ - public static final int confirm_sms_willpay=0x7f050246; - public static final int confirm_studylist_clear_fmt=0x7f05028b; + public static final int confirm_sms_willpay=0x7f050245; + public static final int confirm_studylist_clear_fmt=0x7f05028a; /** text of dialog shown when the menu item board_menu_undo_last is chosen. */ @@ -823,9 +825,6 @@ public final class R { public static final int connect_one_hour=0x7f050171; public static final int connect_six_hours=0x7f050172; public static final int connect_thirty_mins=0x7f050170; - /** - */ - public static final int connstat_bt=0x7f05023e; /** */ public static final int connstat_lastother_succ_fmt=0x7f050238; @@ -865,11 +864,11 @@ public final class R { of each there are are and how many points each is worth. */ public static final int counts_values_title=0x7f0501bc; - public static final int cur_menu_marker_fmt=0x7f05027c; + public static final int cur_menu_marker_fmt=0x7f05027b; /** */ public static final int cur_tiles_fmt=0x7f0501f1; - public static final int data_gsm_only=0x7f05029d; + public static final int data_gsm_only=0x7f05029c; public static final int debug_features=0x7f05007c; public static final int debug_features_summary=0x7f05007d; /** dictionary used by default for human players when creating @@ -881,9 +880,9 @@ public final class R { public static final int default_host=0x7f05006a; /** label within default wordlists in app preferences */ - public static final int default_language=0x7f0502ca; - public static final int default_loc=0x7f05025d; - public static final int default_loc_summary=0x7f05025e; + public static final int default_language=0x7f0502c9; + public static final int default_loc=0x7f05025c; + public static final int default_loc_summary=0x7f05025d; /** Welcome dialog text */ public static final int default_name_message=0x7f0501d8; @@ -911,7 +910,7 @@ public final class R { */ public static final int default_robodict=0x7f050139; public static final int default_update_url=0x7f050074; - public static final int delete_dicts=0x7f0502af; + public static final int delete_dicts=0x7f0502ae; /** */ public static final int dft_name_fmt=0x7f050218; @@ -931,14 +930,14 @@ public final class R { */ public static final int dict_browse_title_fmt=0x7f0501f3; public static final int dict_host=0x7f050079; - public static final int dict_info_fmt=0x7f0502b3; + public static final int dict_info_fmt=0x7f0502b2; /** label for dropdown by which wordlist is chosen that this player will use. The language the game will use (which constrains the choice of wordlists) is substituted in for "%1$s". */ public static final int dict_lang_label_fmt=0x7f0500e6; - public static final int dict_on_server=0x7f0502b5; + public static final int dict_on_server=0x7f0502b4; /** string name="invite_mime">text/plainDisplay snapshots of games */ - public static final int dropped_dupe=0x7f05027b; + public static final int dropped_dupe=0x7f05027a; /** Shown in the main screen when you launch Crosswords from an invitation (received in email or messaging app, say) and there's already a game running that matches that invitation. @@ -1008,13 +1007,13 @@ public final class R { public static final int empty_sms_inviter=0x7f050221; public static final int enable_dupes_summary=0x7f05008a; public static final int enable_dupes_title=0x7f050088; - public static final int enable_nfc=0x7f05027e; + public static final int enable_nfc=0x7f05027d; /** */ - public static final int enable_sms=0x7f05023f; + public static final int enable_sms=0x7f05023e; /** */ - public static final int enable_sms_summary=0x7f050240; + public static final int enable_sms_summary=0x7f05023f; public static final int entering_trade=0x7f0500ec; public static final int expl_update_url=0x7f050073; /** These four strings are displayed as step-by-step @@ -1042,8 +1041,8 @@ public final class R { /** Explanatory text appears in the dialog */ public static final int force_expl=0x7f0500e1; - public static final int force_tablet_summary=0x7f0502ba; - public static final int force_tablet_title=0x7f0502b9; + public static final int force_tablet_summary=0x7f0502b9; + public static final int force_tablet_title=0x7f0502b8; /** ############################################################ # :Dialogs: @@ -1091,7 +1090,7 @@ public final class R { game to make changes */ public static final int game_locked=0x7f0500c0; - public static final int game_name_group_title=0x7f05026b; + public static final int game_name_group_title=0x7f05026a; /** */ public static final int game_rename_title=0x7f0500a9; @@ -1122,7 +1121,7 @@ public final class R { public static final int gamel_menu_checkmoves=0x7f05009c; /** */ - public static final int gamel_menu_checkupdates=0x7f050248; + public static final int gamel_menu_checkupdates=0x7f050247; /** ############################################################ # :Menus: @@ -1137,19 +1136,19 @@ public final class R { public static final int gamel_menu_dicts=0x7f05009a; public static final int gamel_menu_loaddb=0x7f050087; public static final int gamel_menu_storedb=0x7f050086; - public static final int gamel_menu_study=0x7f050288; + public static final int gamel_menu_study=0x7f050287; /** */ public static final int get_sms_number=0x7f050222; - public static final int getinfo=0x7f0502ae; + public static final int getinfo=0x7f0502ad; public static final int git_rev=0x7f05008c; public static final int git_rev_title=0x7f050082; public static final int green=0x7f05015a; - public static final int group_cur_games=0x7f050266; - public static final int group_name_fmt=0x7f05026d; - public static final int group_new_games=0x7f050267; - public static final int groups_confirm_del_fmt=0x7f050268; - public static final int groups_confirm_del_games_fmt=0x7f050269; + public static final int group_cur_games=0x7f050265; + public static final int group_name_fmt=0x7f05026c; + public static final int group_new_games=0x7f050266; + public static final int groups_confirm_del_fmt=0x7f050267; + public static final int groups_confirm_del_games_fmt=0x7f050268; /** Used as the default name for remote players displayed within the Game configure screen */ @@ -1205,12 +1204,12 @@ public final class R { public static final int info_title=0x7f0501b9; /** */ - public static final int inform_dict_diffdict_fmt=0x7f050252; + public static final int inform_dict_diffdict_fmt=0x7f050251; /** */ - public static final int inform_dict_diffversion_fmt=0x7f050250; - public static final int inform_dict_download=0x7f050253; - public static final int inform_dict_title=0x7f050251; + public static final int inform_dict_diffversion_fmt=0x7f05024f; + public static final int inform_dict_download=0x7f050252; + public static final int inform_dict_title=0x7f050250; /** Will new games, on default, randomly rearrange the start order of players. */ @@ -1247,9 +1246,9 @@ public final class R { */ public static final int invite_chooser_fmt=0x7f050187; public static final int invite_chooser_sms=0x7f050189; - public static final int invite_dict_missing_body_fmt=0x7f050258; - public static final int invite_dict_missing_body_noname_fmt=0x7f050259; - public static final int invite_dict_missing_title=0x7f050257; + public static final int invite_dict_missing_body_fmt=0x7f050257; + public static final int invite_dict_missing_body_noname_fmt=0x7f050258; + public static final int invite_dict_missing_title=0x7f050256; public static final int invite_host=0x7f05006c; /** This is the body of the html version of the invitation. A URL is created with parameters describing the game and @@ -1440,14 +1439,14 @@ public final class R { different wordlists.) */ public static final int lang_label=0x7f0500c5; - public static final int lang_name_fmt=0x7f0502b6; - public static final int lang_unknown=0x7f0502b7; + public static final int lang_name_fmt=0x7f0502b5; + public static final int lang_unknown=0x7f0502b6; public static final int langdict_label=0x7f0500c6; - public static final int list_group_default=0x7f050263; - public static final int list_group_delete=0x7f050261; - public static final int list_group_movedown=0x7f050265; - public static final int list_group_moveup=0x7f050264; - public static final int list_group_rename=0x7f050262; + public static final int list_group_default=0x7f050262; + public static final int list_group_delete=0x7f050260; + public static final int list_group_movedown=0x7f050264; + public static final int list_group_moveup=0x7f050263; + public static final int list_group_rename=0x7f050261; /** ############## menu items ############## pulls up dialog to configure the selected game */ @@ -1476,13 +1475,13 @@ public final class R { except for any configuration. */ public static final int list_item_reset=0x7f0500a5; - public static final int lmi_move_fmt=0x7f0502c3; + public static final int lmi_move_fmt=0x7f0502c2; /** formatting for last move summary in notifications */ - public static final int lmi_pass_fmt=0x7f0502c2; - public static final int lmi_phony_fmt=0x7f0502c5; - public static final int lmi_tiles_fmt=0x7f0502c6; - public static final int lmi_trade_fmt=0x7f0502c4; + public static final int lmi_pass_fmt=0x7f0502c1; + public static final int lmi_phony_fmt=0x7f0502c4; + public static final int lmi_tiles_fmt=0x7f0502c5; + public static final int lmi_trade_fmt=0x7f0502c3; /** One of the strings used in the right column of the list of installed wordlists to describe those that are part of Crosswords and that cannot be uninstalled or moved. @@ -1500,33 +1499,33 @@ public final class R { /** */ public static final int loc_external=0x7f0500bb; - public static final int loc_filters_all=0x7f0502a0; - public static final int loc_filters_menu=0x7f0502a2; - public static final int loc_filters_modified=0x7f0502a3; - public static final int loc_filters_prompt=0x7f05029e; - public static final int loc_filters_screen=0x7f0502a1; - public static final int loc_fmts_mismatch=0x7f0502a9; + public static final int loc_filters_all=0x7f05029f; + public static final int loc_filters_menu=0x7f0502a1; + public static final int loc_filters_modified=0x7f0502a2; + public static final int loc_filters_prompt=0x7f05029d; + public static final int loc_filters_screen=0x7f0502a0; + public static final int loc_fmts_mismatch=0x7f0502a8; /** see move_dictf above */ public static final int loc_internal=0x7f0500ba; - public static final int loc_item_check=0x7f0502a6; + public static final int loc_item_check=0x7f0502a5; /** for loc item edit menu */ - public static final int loc_item_clear=0x7f0502a5; - public static final int loc_item_copy_bless=0x7f0502a8; - public static final int loc_item_copy_eng=0x7f0502a7; - public static final int loc_lang_blessed=0x7f050298; - public static final int loc_lang_local=0x7f050299; - public static final int loc_main_english=0x7f0502a4; - public static final int loc_menu_xlate=0x7f050297; - public static final int loc_search_prompt=0x7f05029f; + public static final int loc_item_clear=0x7f0502a4; + public static final int loc_item_copy_bless=0x7f0502a7; + public static final int loc_item_copy_eng=0x7f0502a6; + public static final int loc_lang_blessed=0x7f050297; + public static final int loc_lang_local=0x7f050298; + public static final int loc_main_english=0x7f0502a3; + public static final int loc_menu_xlate=0x7f050296; + public static final int loc_search_prompt=0x7f05029e; /** This is the "hint" printed in light text in the empty player name field */ public static final int local_name_hint=0x7f050195; public static final int logging_on=0x7f05007a; public static final int logging_on_summary=0x7f05007b; - public static final int lookup_title=0x7f050293; + public static final int lookup_title=0x7f050292; /** */ public static final int manual_owner_name=0x7f05021f; @@ -1551,7 +1550,7 @@ public final class R { /** text of menu that brings up the Settings (preferences) dialog */ public static final int menu_prefs=0x7f05009b; - public static final int menu_rateme=0x7f050283; + public static final int menu_rateme=0x7f050282; /** */ public static final int menu_toggle_values=0x7f050230; @@ -1567,11 +1566,11 @@ public final class R { /** body of notification shown when invitation requires a wordslist that's not installed */ - public static final int missing_dict_detail=0x7f050256; + public static final int missing_dict_detail=0x7f050255; /** Title of notification shown when invitation requires a wordslist that's not installed */ - public static final int missing_dict_title=0x7f050255; + public static final int missing_dict_title=0x7f050254; /** Used as a substitute for the names of remote players when they aren't available yet because the connection is not complete. Displayed in the lists of players found in each @@ -1639,22 +1638,22 @@ public final class R { /** Text of progress indicator shown while check is being conducted */ public static final int msgs_progress=0x7f05009d; - public static final int nag_body_fmt=0x7f0502bf; - public static final int nag_days_fmt=0x7f0502be; - public static final int nag_hours_fmt=0x7f0502bd; + public static final int nag_body_fmt=0x7f0502be; + public static final int nag_days_fmt=0x7f0502bd; + public static final int nag_hours_fmt=0x7f0502bc; public static final int nag_intervals=0x7f05008b; /** body of warning notification reminder message. First three are used to build a string based on the length of time that's then inserted in the fourth. E.g "PlayerName moved more than 2 day[s], 4 hour[s] ago." */ - public static final int nag_minutes_fmt=0x7f0502bc; + public static final int nag_minutes_fmt=0x7f0502bb; /** Nagging: title of notification reminder message */ - public static final int nag_title=0x7f0502bb; + public static final int nag_title=0x7f0502ba; /** above is inserted in this the last time I warn */ - public static final int nag_warn_last_fmt=0x7f0502c0; + public static final int nag_warn_last_fmt=0x7f0502bf; public static final int name_dict_fmt=0x7f050085; /** text of checkbox. If this checkbox is checked, games created for network play will by default have the hint feature @@ -1673,10 +1672,10 @@ public final class R { public static final int network_behavior_summary=0x7f05016b; /** */ - public static final int new_app_avail=0x7f05024d; + public static final int new_app_avail=0x7f05024c; /** */ - public static final int new_app_avail_fmt=0x7f05024c; + public static final int new_app_avail_fmt=0x7f05024b; /** */ public static final int new_bt_body_fmt=0x7f05020a; @@ -1688,10 +1687,14 @@ public final class R { public static final int new_btmove_title=0x7f05020c; /** */ - public static final int new_dict_avail=0x7f05024a; + public static final int new_dict_avail=0x7f050249; /** */ - public static final int new_dict_avail_fmt=0x7f05024b; + public static final int new_dict_avail_fmt=0x7f05024a; + public static final int new_game=0x7f0502cb; + public static final int new_game_message=0x7f0502cd; + public static final int new_game_message_net=0x7f0502ce; + public static final int new_game_networked=0x7f0502cc; /** */ public static final int new_move_body=0x7f05020d; @@ -1704,7 +1707,7 @@ public final class R { /** */ public static final int new_sms_title=0x7f05021b; - public static final int new_xlations_fmt=0x7f05029a; + public static final int new_xlations_fmt=0x7f050299; /** ########################################################### # :Dialogs: @@ -1769,7 +1772,7 @@ public final class R { /** */ public static final int newgame_sms_header=0x7f050219; - public static final int newgroup_label=0x7f050260; + public static final int newgroup_label=0x7f05025f; /** Title of dialog for renaming game (triggered by selecting list_item_rename) If you try to copy a networked game you get this error @@ -1815,8 +1818,8 @@ public final class R { you get this error message */ public static final int no_games_to_refresh=0x7f05009e; - public static final int no_hide_titlebar=0x7f050280; - public static final int no_market=0x7f050284; + public static final int no_hide_titlebar=0x7f05027f; + public static final int no_market=0x7f050283; /** displayed when you long-tap a scoreboard entry and there's no most recent score to show */ @@ -1839,7 +1842,7 @@ public final class R { arrow appears. This explains it. */ public static final int not_again_arrow=0x7f0501d4; - public static final int not_again_backclears=0x7f050276; + public static final int not_again_backclears=0x7f050275; /** */ public static final int not_again_browse=0x7f0501f6; @@ -1867,7 +1870,7 @@ public final class R { for games with more than two devices, which are rare. */ public static final int not_again_conndmid=0x7f0501d2; - public static final int not_again_dicts=0x7f0502b8; + public static final int not_again_dicts=0x7f0502b7; /** This is shown when you choose the board_menu_done menu item. It's to let you know that there's a shortcut that does almost the same thing. @@ -1877,7 +1880,7 @@ public final class R { Board screen */ public static final int not_again_flip=0x7f0501ca; - public static final int not_again_fmt_expl=0x7f0502aa; + public static final int not_again_fmt_expl=0x7f0502a9; /** Shown when you tap the next hint button on the toolbar of the main Board screen */ @@ -1901,8 +1904,8 @@ public final class R { /** Shown when you first pick the list_item_new_from menuitem */ public static final int not_again_newfrom=0x7f0501d6; - public static final int not_again_newselect=0x7f050275; - public static final int not_again_studycopy=0x7f050292; + public static final int not_again_newselect=0x7f050274; + public static final int not_again_studycopy=0x7f050291; /** The following strings (all whose names start with "not_again") appear in the New user info dialog. @@ -1937,7 +1940,7 @@ public final class R { the main Board screen */ public static final int not_again_zoom=0x7f0501cb; - public static final int note_none=0x7f0502b4; + public static final int note_none=0x7f0502b3; /** This text is displayed as the "summary" for both of the notify choices above, as extra information. (There could be different strings if it makes more sense in your language.) @@ -1967,13 +1970,13 @@ public final class R { games as well. */ public static final int password_label=0x7f0500e9; - public static final int paste_done_fmt=0x7f05028c; + public static final int paste_done_fmt=0x7f05028b; /** You have NFC enabled. That means that any time a board that\'s missing a player is open, you can tap a nearby person\'s device to invite him/her to play – if he/she is also using NFC. */ - public static final int pct_suffix=0x7f050282; + public static final int pct_suffix=0x7f050281; /** If this preference is checked, tapping on the scoreboard entry for any player reveals that player's tiles and any pending move (after asking for his password if one is set.) @@ -2130,8 +2133,8 @@ public final class R { public static final int prefs_names_summary=0x7f05012f; /** Used when prev player's name can't be looked up */ - public static final int prev_player=0x7f0502c1; - public static final int progress_title=0x7f0502b2; + public static final int prev_player=0x7f0502c0; + public static final int progress_title=0x7f0502b1; /** */ public static final int prompt_max_len=0x7f0501fc; @@ -2176,7 +2179,7 @@ public final class R { problems with the current game. */ public static final int relay_alert=0x7f0500f9; - public static final int relay_alert_title=0x7f050274; + public static final int relay_alert_title=0x7f050273; /** ############################################################ # :Screens: # RelayGameActivity screen @@ -2202,19 +2205,19 @@ public final class R { public static final int relay_port=0x7f050083; /** Shown in toast when relaunching after switching dicts */ - public static final int reload_new_dict_fmt=0x7f050254; - public static final int remote_digesting=0x7f0502ac; - public static final int remote_empty=0x7f0502ab; + public static final int reload_new_dict_fmt=0x7f050253; + public static final int remote_digesting=0x7f0502ab; + public static final int remote_empty=0x7f0502aa; /** checkbox determining of this player is on this device or remote. If remote, then the rest of the fields disappear (since they will be set by the remote device.) */ public static final int remote_label=0x7f0500e4; - public static final int remote_no_net=0x7f0502ad; + public static final int remote_no_net=0x7f0502ac; /** */ public static final int remote_undone=0x7f050228; - public static final int rename_group_label=0x7f05026a; + public static final int rename_group_label=0x7f050269; /** text within rename dialog (triggered by selecting list_item_rename) */ @@ -2251,9 +2254,9 @@ public final class R { /** title for popup of public rooms found on server */ public static final int room_public_prompt=0x7f0500cb; - public static final int sel_games_fmt=0x7f050277; - public static final int sel_groups_fmt=0x7f050278; - public static final int sel_items_fmt=0x7f050296; + public static final int sel_games_fmt=0x7f050276; + public static final int sel_groups_fmt=0x7f050277; + public static final int sel_items_fmt=0x7f050295; /** ############################################################ # :Dialogs: @@ -2276,8 +2279,8 @@ public final class R { /** clarification of above */ public static final int show_arrow_summary=0x7f05014b; - public static final int show_remote=0x7f0502b0; - public static final int show_wordlist_browser=0x7f050273; + public static final int show_remote=0x7f0502af; + public static final int show_wordlist_browser=0x7f050272; /** If this preference is checked, the user will not be asked to confirm after selecting the "Turn done" menu (or tapping the points display at the right end of the tray) @@ -2286,19 +2289,19 @@ public final class R { /** explanation of the above */ public static final int skip_confirm_turn_summary=0x7f050161; - public static final int slmenu_clear_sel=0x7f05028a; - public static final int slmenu_copy_sel=0x7f050289; - public static final int slmenu_deselect_all=0x7f050295; - public static final int slmenu_select_all=0x7f050294; + public static final int slmenu_clear_sel=0x7f050289; + public static final int slmenu_copy_sel=0x7f050288; + public static final int slmenu_deselect_all=0x7f050294; + public static final int slmenu_select_all=0x7f050293; /** Title of phone number picker during invitation to a game via SMS */ public static final int sms_invite_title=0x7f050213; - public static final int sms_ready_text=0x7f050281; + public static final int sms_ready_text=0x7f050280; /** */ public static final int smsname_label=0x7f050215; - public static final int square_tiles=0x7f050270; - public static final int square_tiles_summary=0x7f050271; + public static final int square_tiles=0x7f05026f; + public static final int square_tiles_summary=0x7f050270; /** Used in formatting moves and history */ public static final int str_bonus_all=0x7f050122; @@ -2376,7 +2379,7 @@ public final class R { public static final int str_remote_moved_fmt=0x7f050117; /** Used in formatting final scores display */ - public static final int str_resigned=0x7f05024e; + public static final int str_resigned=0x7f05024d; /** ############################################################ # Board info/error dialog messages @@ -2419,7 +2422,7 @@ public final class R { public static final int str_two_tiles_first_move=0x7f05019a; /** Used in formatting final scores display */ - public static final int str_winner=0x7f05024f; + public static final int str_winner=0x7f05024e; /** Used in formatting game history (not move summaries since information about the current rack is hidden then) */ @@ -2466,10 +2469,10 @@ public final class R { /** Used in formatting exchange move summaries */ public static final int strss_traded_for_fmt=0x7f05011d; - public static final int study_langpick=0x7f05028f; - public static final int study_no_lang_fmt=0x7f050290; - public static final int study_no_lists=0x7f050291; - public static final int studylist_title_fmt=0x7f05028e; + public static final int study_langpick=0x7f05028e; + public static final int study_no_lang_fmt=0x7f05028f; + public static final int study_no_lists=0x7f050290; + public static final int studylist_title_fmt=0x7f05028d; /** If substituting an existing same-language wordlist by choosing button_substdict user gets to choose from a list of wordlists. This is the title of that list. @@ -2519,8 +2522,8 @@ public final class R { /** explanation of the above */ public static final int summary_sort_tiles=0x7f050163; - public static final int summary_studyon=0x7f050287; - public static final int summary_thumbsize=0x7f050279; + public static final int summary_studyon=0x7f050286; + public static final int summary_thumbsize=0x7f050278; /** */ public static final int summary_wait_guest=0x7f050206; @@ -2531,7 +2534,7 @@ public final class R { part of the game and that the user should ignore it. */ public static final int tell_unused=0x7f050135; - public static final int thumb_off=0x7f05027a; + public static final int thumb_off=0x7f050279; /** color of the tiles' background */ public static final int tile_back=0x7f050155; @@ -2550,7 +2553,7 @@ public final class R { /** Title of preference in which you select which addressing modes network games will use to communicate */ - public static final int title_addrs_pref=0x7f0502cb; + public static final int title_addrs_pref=0x7f0502ca; /** ############################################################ # :Screens: @@ -2603,12 +2606,13 @@ public final class R { i.e. after ever move. */ public static final int title_sort_tiles=0x7f050162; - public static final int title_studyon=0x7f050286; + public static final int title_studyon=0x7f050285; /** title of dialog allowing user to pick tiles "face up". (This feature is not yet supported on Android.) */ public static final int title_tile_picker=0x7f0501ba; - public static final int update_dicts_fmt=0x7f0502b1; + public static final int update_dicts_fmt=0x7f0502b0; + public static final int use_defaults=0x7f0502cf; /** text of checkbox controlling whether there's a game timer */ public static final int use_timer=0x7f0500d1; @@ -2621,15 +2625,15 @@ public final class R { public static final int warn_nomobile_fmt=0x7f050220; /** */ - public static final int warn_sms_disabled=0x7f050247; + public static final int warn_sms_disabled=0x7f050246; /** */ public static final int warn_unlimited=0x7f050227; /** */ public static final int word_search_hint=0x7f0501ee; - public static final int xlations_enabled_summary=0x7f05029c; - public static final int xlations_enabled_title=0x7f05029b; + public static final int xlations_enabled_summary=0x7f05029b; + public static final int xlations_enabled_title=0x7f05029a; public static final int xlations_locale=0x7f050089; /** Empty in English, this should contain the name of the translator/creator of the strings.xml file for this diff --git a/xwords4/android/XWords4/res/layout/game_list.xml b/xwords4/android/XWords4/res/layout/game_list.xml index 9b2f54c92..921f55d88 100644 --- a/xwords4/android/XWords4/res/layout/game_list.xml +++ b/xwords4/android/XWords4/res/layout/game_list.xml @@ -12,4 +12,16 @@ android:layout_weight="1" android:drawSelectorOnTop="false" /> + +