mirror of
git://xwords.git.sourceforge.net/gitroot/xwords/xwords
synced 2024-12-27 09:58:45 +01:00
hide relay-related stuff when relay communication not enabled; remove
sms status stuff altogether.
This commit is contained in:
Eric House
parent
d035396371
commit
306c9ef4b6
3 changed files with 163 additions and 212 deletions
|
|
@ -83,163 +83,162 @@ public final class R {
|
|||
public static final int about_xlator=0x7f090001;
|
||||
public static final int add_player=0x7f09002f;
|
||||
public static final int advertise_new_room_check=0x7f090036;
|
||||
public static final int blessed_label=0x7f090058;
|
||||
public static final int board_menu_chat=0x7f09009e;
|
||||
public static final int board_menu_dict=0x7f09009a;
|
||||
public static final int board_menu_done=0x7f090085;
|
||||
public static final int board_menu_file_about=0x7f090093;
|
||||
public static final int board_menu_file_prefs=0x7f090092;
|
||||
public static final int board_menu_flip=0x7f09009c;
|
||||
public static final int board_menu_game_counts=0x7f09008b;
|
||||
public static final int board_menu_game_history=0x7f09008d;
|
||||
public static final int board_menu_game_left=0x7f09008c;
|
||||
public static final int board_menu_game_netstats=0x7f090094;
|
||||
public static final int board_menu_game_resend=0x7f09008f;
|
||||
public static final int board_menu_game_resign=0x7f09008e;
|
||||
public static final int board_menu_hint_next=0x7f090098;
|
||||
public static final int board_menu_hint_prev=0x7f090097;
|
||||
public static final int board_menu_invite=0x7f090084;
|
||||
public static final int board_menu_juggle=0x7f09009b;
|
||||
public static final int board_menu_toggle=0x7f09009f;
|
||||
public static final int board_menu_trade=0x7f090086;
|
||||
public static final int board_menu_trade_cancel=0x7f090087;
|
||||
public static final int board_menu_trade_commit=0x7f090088;
|
||||
public static final int board_menu_tray=0x7f09008a;
|
||||
public static final int board_menu_undo_current=0x7f090099;
|
||||
public static final int board_menu_undo_last=0x7f090089;
|
||||
public static final int board_menu_zoom=0x7f09009d;
|
||||
public static final int blessed_label=0x7f090056;
|
||||
public static final int board_menu_chat=0x7f09009c;
|
||||
public static final int board_menu_dict=0x7f090098;
|
||||
public static final int board_menu_done=0x7f090083;
|
||||
public static final int board_menu_file_about=0x7f090091;
|
||||
public static final int board_menu_file_prefs=0x7f090090;
|
||||
public static final int board_menu_flip=0x7f09009a;
|
||||
public static final int board_menu_game_counts=0x7f090089;
|
||||
public static final int board_menu_game_history=0x7f09008b;
|
||||
public static final int board_menu_game_left=0x7f09008a;
|
||||
public static final int board_menu_game_netstats=0x7f090092;
|
||||
public static final int board_menu_game_resend=0x7f09008d;
|
||||
public static final int board_menu_game_resign=0x7f09008c;
|
||||
public static final int board_menu_hint_next=0x7f090096;
|
||||
public static final int board_menu_hint_prev=0x7f090095;
|
||||
public static final int board_menu_invite=0x7f090082;
|
||||
public static final int board_menu_juggle=0x7f090099;
|
||||
public static final int board_menu_toggle=0x7f09009d;
|
||||
public static final int board_menu_trade=0x7f090084;
|
||||
public static final int board_menu_trade_cancel=0x7f090085;
|
||||
public static final int board_menu_trade_commit=0x7f090086;
|
||||
public static final int board_menu_tray=0x7f090088;
|
||||
public static final int board_menu_undo_current=0x7f090097;
|
||||
public static final int board_menu_undo_last=0x7f090087;
|
||||
public static final int board_menu_zoom=0x7f09009b;
|
||||
public static final int board_root=0x7f090002;
|
||||
public static final int board_view=0x7f090003;
|
||||
public static final int boardsize_spinner=0x7f090044;
|
||||
public static final int button_add=0x7f090073;
|
||||
public static final int boardsize_spinner=0x7f090042;
|
||||
public static final int button_add=0x7f090071;
|
||||
public static final int button_clear=0x7f09000b;
|
||||
public static final int button_done=0x7f090063;
|
||||
public static final int button_done=0x7f090061;
|
||||
public static final int button_invite=0x7f09000c;
|
||||
public static final int button_newgame_multi=0x7f090046;
|
||||
public static final int button_newgame_solo=0x7f090045;
|
||||
public static final int button_newgame_multi=0x7f090044;
|
||||
public static final int button_newgame_solo=0x7f090043;
|
||||
public static final int button_rescan=0x7f09000a;
|
||||
public static final int button_study=0x7f090062;
|
||||
public static final int button_study=0x7f090060;
|
||||
public static final int change_connection=0x7f09003a;
|
||||
public static final int chat_button=0x7f09007f;
|
||||
public static final int chat_button=0x7f09007d;
|
||||
public static final int chat_edit=0x7f090010;
|
||||
public static final int chat_history=0x7f09000f;
|
||||
public static final int chat_menu_clear=0x7f0900a0;
|
||||
public static final int checkbox=0x7f090052;
|
||||
public static final int chat_menu_clear=0x7f09009e;
|
||||
public static final int checkbox=0x7f090050;
|
||||
public static final int color_display_sample=0x7f090012;
|
||||
public static final int color_edit_sample=0x7f090013;
|
||||
public static final int confirm_sms_reasons=0x7f09001a;
|
||||
public static final int conn_types=0x7f09001b;
|
||||
public static final int connect_set_relay=0x7f090031;
|
||||
public static final int connect_set_sms=0x7f09003b;
|
||||
public static final int conns_label=0x7f090032;
|
||||
public static final int del=0x7f090055;
|
||||
public static final int connect_set_relay=0x7f090032;
|
||||
public static final int conns_label=0x7f090031;
|
||||
public static final int del=0x7f090053;
|
||||
public static final int desc=0x7f09001e;
|
||||
public static final int details=0x7f090070;
|
||||
public static final int dict_label=0x7f090068;
|
||||
public static final int details=0x7f09006e;
|
||||
public static final int dict_label=0x7f090066;
|
||||
public static final int dict_spinner=0x7f09002c;
|
||||
public static final int dictlist_button=0x7f09007e;
|
||||
public static final int dicts_delete=0x7f0900a3;
|
||||
public static final int dicts_deselect_all=0x7f0900a2;
|
||||
public static final int dicts_download=0x7f0900a1;
|
||||
public static final int dicts_move=0x7f0900a4;
|
||||
public static final int dicts_select=0x7f0900a5;
|
||||
public static final int dictlist_button=0x7f09007c;
|
||||
public static final int dicts_delete=0x7f0900a1;
|
||||
public static final int dicts_deselect_all=0x7f0900a0;
|
||||
public static final int dicts_download=0x7f09009f;
|
||||
public static final int dicts_move=0x7f0900a2;
|
||||
public static final int dicts_select=0x7f0900a3;
|
||||
public static final int divider=0x7f090023;
|
||||
public static final int download_button=0x7f090071;
|
||||
public static final int dwnld_message=0x7f090050;
|
||||
public static final int edit=0x7f090064;
|
||||
public static final int download_button=0x7f09006f;
|
||||
public static final int dwnld_message=0x7f09004e;
|
||||
public static final int edit=0x7f090062;
|
||||
public static final int edit_blue=0x7f090019;
|
||||
public static final int edit_green=0x7f090017;
|
||||
public static final int edit_red=0x7f090015;
|
||||
public static final int english_label=0x7f090056;
|
||||
public static final int english_view=0x7f090057;
|
||||
public static final int english_label=0x7f090054;
|
||||
public static final int english_view=0x7f090055;
|
||||
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=0x7f090025;
|
||||
public static final int filters=0x7f09005d;
|
||||
public static final int flip_button=0x7f090081;
|
||||
public static final int filters=0x7f09005b;
|
||||
public static final int flip_button=0x7f09007f;
|
||||
public static final int game_locked_check=0x7f090027;
|
||||
public static final int game_name=0x7f090047;
|
||||
public static final int gamel_menu_checkmoves=0x7f090091;
|
||||
public static final int games_game_config=0x7f0900b1;
|
||||
public static final int games_game_copy=0x7f0900b6;
|
||||
public static final int games_game_delete=0x7f0900b0;
|
||||
public static final int games_game_move=0x7f0900b2;
|
||||
public static final int games_game_new_from=0x7f0900b4;
|
||||
public static final int games_game_rename=0x7f0900b5;
|
||||
public static final int games_game_reset=0x7f0900b3;
|
||||
public static final int games_group_default=0x7f0900ba;
|
||||
public static final int games_group_delete=0x7f0900b9;
|
||||
public static final int games_group_movedown=0x7f0900b8;
|
||||
public static final int games_group_moveup=0x7f0900b7;
|
||||
public static final int games_group_rename=0x7f0900bb;
|
||||
public static final int games_menu_about=0x7f0900ad;
|
||||
public static final int games_menu_checkmoves=0x7f0900af;
|
||||
public static final int games_menu_checkupdates=0x7f0900bc;
|
||||
public static final int games_menu_dicts=0x7f0900ab;
|
||||
public static final int games_menu_email=0x7f0900ac;
|
||||
public static final int games_menu_loaddb=0x7f0900be;
|
||||
public static final int games_menu_newgame_net=0x7f0900a7;
|
||||
public static final int games_menu_newgame_solo=0x7f0900a6;
|
||||
public static final int games_menu_newgroup=0x7f0900a8;
|
||||
public static final int games_menu_prefs=0x7f0900a9;
|
||||
public static final int games_menu_rateme=0x7f0900aa;
|
||||
public static final int games_menu_resend=0x7f0900ae;
|
||||
public static final int games_menu_storedb=0x7f0900bd;
|
||||
public static final int games_menu_study=0x7f090090;
|
||||
public static final int group_done=0x7f090083;
|
||||
public static final int group_exchange=0x7f090095;
|
||||
public static final int group_hint=0x7f090096;
|
||||
public static final int hideable=0x7f09004c;
|
||||
public static final int hints_allowed=0x7f09003d;
|
||||
public static final int game_name=0x7f090045;
|
||||
public static final int gamel_menu_checkmoves=0x7f09008f;
|
||||
public static final int games_game_config=0x7f0900af;
|
||||
public static final int games_game_copy=0x7f0900b4;
|
||||
public static final int games_game_delete=0x7f0900ae;
|
||||
public static final int games_game_move=0x7f0900b0;
|
||||
public static final int games_game_new_from=0x7f0900b2;
|
||||
public static final int games_game_rename=0x7f0900b3;
|
||||
public static final int games_game_reset=0x7f0900b1;
|
||||
public static final int games_group_default=0x7f0900b8;
|
||||
public static final int games_group_delete=0x7f0900b7;
|
||||
public static final int games_group_movedown=0x7f0900b6;
|
||||
public static final int games_group_moveup=0x7f0900b5;
|
||||
public static final int games_group_rename=0x7f0900b9;
|
||||
public static final int games_menu_about=0x7f0900ab;
|
||||
public static final int games_menu_checkmoves=0x7f0900ad;
|
||||
public static final int games_menu_checkupdates=0x7f0900ba;
|
||||
public static final int games_menu_dicts=0x7f0900a9;
|
||||
public static final int games_menu_email=0x7f0900aa;
|
||||
public static final int games_menu_loaddb=0x7f0900bc;
|
||||
public static final int games_menu_newgame_net=0x7f0900a5;
|
||||
public static final int games_menu_newgame_solo=0x7f0900a4;
|
||||
public static final int games_menu_newgroup=0x7f0900a6;
|
||||
public static final int games_menu_prefs=0x7f0900a7;
|
||||
public static final int games_menu_rateme=0x7f0900a8;
|
||||
public static final int games_menu_resend=0x7f0900ac;
|
||||
public static final int games_menu_storedb=0x7f0900bb;
|
||||
public static final int games_menu_study=0x7f09008e;
|
||||
public static final int group_done=0x7f090081;
|
||||
public static final int group_exchange=0x7f090093;
|
||||
public static final int group_hint=0x7f090094;
|
||||
public static final int hideable=0x7f09004a;
|
||||
public static final int hints_allowed=0x7f09003b;
|
||||
public static final int invite_desc=0x7f090009;
|
||||
public static final int inviter_check=0x7f09000d;
|
||||
public static final int item_name=0x7f09006c;
|
||||
public static final int item_score=0x7f09006d;
|
||||
public static final int item_name=0x7f09006a;
|
||||
public static final int item_score=0x7f09006b;
|
||||
public static final int join_public_room_check=0x7f090033;
|
||||
public static final int juggle_players=0x7f090030;
|
||||
public static final int label=0x7f090024;
|
||||
public static final int lang_separator=0x7f09002a;
|
||||
public static final int lang_spinner=0x7f09002b;
|
||||
public static final int loc_item_check=0x7f0900c0;
|
||||
public static final int loc_item_clear=0x7f0900bf;
|
||||
public static final int loc_item_copy_bless=0x7f0900c2;
|
||||
public static final int loc_item_copy_eng=0x7f0900c1;
|
||||
public static final int loc_search_button=0x7f09005f;
|
||||
public static final int loc_search_field=0x7f09005e;
|
||||
public static final int local_label=0x7f09005a;
|
||||
public static final int local_player_set=0x7f090066;
|
||||
public static final int manual_add_button=0x7f090074;
|
||||
public static final int modtime=0x7f09004d;
|
||||
public static final int msg_marker=0x7f09004a;
|
||||
public static final int name=0x7f090075;
|
||||
public static final int loc_item_check=0x7f0900be;
|
||||
public static final int loc_item_clear=0x7f0900bd;
|
||||
public static final int loc_item_copy_bless=0x7f0900c0;
|
||||
public static final int loc_item_copy_eng=0x7f0900bf;
|
||||
public static final int loc_search_button=0x7f09005d;
|
||||
public static final int loc_search_field=0x7f09005c;
|
||||
public static final int local_label=0x7f090058;
|
||||
public static final int local_player_set=0x7f090064;
|
||||
public static final int manual_add_button=0x7f090072;
|
||||
public static final int modtime=0x7f09004b;
|
||||
public static final int msg_marker=0x7f090048;
|
||||
public static final int name=0x7f090073;
|
||||
public static final int name_edit=0x7f09001c;
|
||||
public static final int name_label=0x7f090072;
|
||||
public static final int nexthint_button=0x7f09007b;
|
||||
public static final int name_label=0x7f090070;
|
||||
public static final int nexthint_button=0x7f090079;
|
||||
public static final int nperdev_spinner=0x7f09000e;
|
||||
public static final int number=0x7f090076;
|
||||
public static final int other_lang=0x7f090060;
|
||||
public static final int password_edit=0x7f09006b;
|
||||
public static final int password_set=0x7f09006a;
|
||||
public static final int phonies_spinner=0x7f090042;
|
||||
public static final int pick_faceup=0x7f090043;
|
||||
public static final int pick_lang=0x7f090077;
|
||||
public static final int pick_lang_spinner=0x7f090078;
|
||||
public static final int number=0x7f090074;
|
||||
public static final int other_lang=0x7f09005e;
|
||||
public static final int password_edit=0x7f090069;
|
||||
public static final int password_set=0x7f090068;
|
||||
public static final int phonies_spinner=0x7f090040;
|
||||
public static final int pick_faceup=0x7f090041;
|
||||
public static final int pick_lang=0x7f090075;
|
||||
public static final int pick_lang_spinner=0x7f090076;
|
||||
public static final int play_button=0x7f090028;
|
||||
public static final int player_list=0x7f09002e;
|
||||
public static final int player_name_edit=0x7f090067;
|
||||
public static final int player_name_edit=0x7f090065;
|
||||
public static final int players=0x7f090026;
|
||||
public static final int players_label=0x7f09002d;
|
||||
public static final int prevhint_button=0x7f09007a;
|
||||
public static final int prevhint_button=0x7f090078;
|
||||
public static final int private_rooms_set=0x7f090034;
|
||||
public static final int progress_bar=0x7f090051;
|
||||
public static final int progress_bar=0x7f09004f;
|
||||
public static final int public_rooms_set=0x7f090037;
|
||||
public static final int refresh_button=0x7f090039;
|
||||
public static final int remote_check=0x7f090065;
|
||||
public static final int revert_all=0x7f09006f;
|
||||
public static final int revert_colors=0x7f09006e;
|
||||
public static final int robot_check=0x7f090069;
|
||||
public static final int role=0x7f09004f;
|
||||
public static final int remote_check=0x7f090063;
|
||||
public static final int revert_all=0x7f09006d;
|
||||
public static final int revert_colors=0x7f09006c;
|
||||
public static final int robot_check=0x7f090067;
|
||||
public static final int role=0x7f09004d;
|
||||
public static final int room_edit=0x7f090035;
|
||||
public static final int room_spinner=0x7f090038;
|
||||
public static final int screen=0x7f090029;
|
||||
|
|
@ -249,37 +248,36 @@ public final class R {
|
|||
public static final int seek_red=0x7f090014;
|
||||
public static final int send_button=0x7f090011;
|
||||
public static final int show_remote=0x7f09001d;
|
||||
public static final int shuffle_button=0x7f09007c;
|
||||
public static final int slmenu_clear_sel=0x7f0900c7;
|
||||
public static final int slmenu_copy_sel=0x7f0900c6;
|
||||
public static final int slmenu_deselect_all=0x7f0900c5;
|
||||
public static final int slmenu_lookup_sel=0x7f0900c3;
|
||||
public static final int slmenu_select_all=0x7f0900c4;
|
||||
public static final int smart_robot=0x7f090041;
|
||||
public static final int sms_phones=0x7f09003c;
|
||||
public static final int state=0x7f09004e;
|
||||
public static final int summary=0x7f090061;
|
||||
public static final int shuffle_button=0x7f09007a;
|
||||
public static final int slmenu_clear_sel=0x7f0900c5;
|
||||
public static final int slmenu_copy_sel=0x7f0900c4;
|
||||
public static final int slmenu_deselect_all=0x7f0900c3;
|
||||
public static final int slmenu_lookup_sel=0x7f0900c1;
|
||||
public static final int slmenu_select_all=0x7f0900c2;
|
||||
public static final int smart_robot=0x7f09003f;
|
||||
public static final int state=0x7f09004c;
|
||||
public static final int summary=0x7f09005f;
|
||||
public static final int tbar_parent_hor=0x7f090007;
|
||||
public static final int tbar_parent_vert=0x7f090008;
|
||||
public static final int text_item=0x7f090053;
|
||||
public static final int text_item2=0x7f090054;
|
||||
public static final int thumbnail=0x7f09004b;
|
||||
public static final int timer_minutes_edit=0x7f090040;
|
||||
public static final int timer_set=0x7f09003f;
|
||||
public static final int toolbar=0x7f090079;
|
||||
public static final int undo_button=0x7f09007d;
|
||||
public static final int use_timer=0x7f09003e;
|
||||
public static final int values_button=0x7f090080;
|
||||
public static final int text_item=0x7f090051;
|
||||
public static final int text_item2=0x7f090052;
|
||||
public static final int thumbnail=0x7f090049;
|
||||
public static final int timer_minutes_edit=0x7f09003e;
|
||||
public static final int timer_set=0x7f09003d;
|
||||
public static final int toolbar=0x7f090077;
|
||||
public static final int undo_button=0x7f09007b;
|
||||
public static final int use_timer=0x7f09003c;
|
||||
public static final int values_button=0x7f09007e;
|
||||
public static final int version_string=0x7f090000;
|
||||
public static final int view_loaded=0x7f090049;
|
||||
public static final int view_unloaded=0x7f090048;
|
||||
public static final int view_loaded=0x7f090047;
|
||||
public static final int view_unloaded=0x7f090046;
|
||||
public static final int word_edit=0x7f09001f;
|
||||
public static final int wordlen_max=0x7f090022;
|
||||
public static final int wordlen_min=0x7f090021;
|
||||
public static final int xlated_view=0x7f09005c;
|
||||
public static final int xlated_view_blessed=0x7f090059;
|
||||
public static final int xlated_view_local=0x7f09005b;
|
||||
public static final int zoom_button=0x7f090082;
|
||||
public static final int xlated_view=0x7f09005a;
|
||||
public static final int xlated_view_blessed=0x7f090057;
|
||||
public static final int xlated_view_local=0x7f090059;
|
||||
public static final int zoom_button=0x7f090080;
|
||||
}
|
||||
public static final class layout {
|
||||
public static final int about_dlg=0x7f030000;
|
||||
|
|
|
|||
|
|
@ -96,17 +96,17 @@
|
|||
/>
|
||||
</LinearLayout>
|
||||
|
||||
<!-- text added via code -->
|
||||
<TextView android:id="@+id/conns_label"
|
||||
style="@style/config_separator"
|
||||
android:layout_marginTop="15dp"
|
||||
/>
|
||||
|
||||
<LinearLayout android:id="@+id/connect_set_relay"
|
||||
android:layout_width="fill_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:orientation="vertical"
|
||||
>
|
||||
<!-- text added via code -->
|
||||
<TextView android:id="@+id/conns_label"
|
||||
style="@style/config_separator"
|
||||
android:layout_marginTop="15dp"
|
||||
/>
|
||||
|
||||
<!-- We'll use either the spinner or simple edit text
|
||||
depending on whether user is naming room or picking from
|
||||
a set one. -->
|
||||
|
|
@ -162,38 +162,14 @@
|
|||
android:layout_weight="0"
|
||||
/>
|
||||
</LinearLayout>
|
||||
|
||||
<Button android:id="@+id/change_connection"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:text="@string/connection_via_label"
|
||||
android:layout_gravity="bottom|center"
|
||||
/>
|
||||
</LinearLayout> <!--connect_set_relay-->
|
||||
|
||||
<LinearLayout android:id="@+id/connect_set_sms"
|
||||
android:layout_width="fill_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:orientation="vertical"
|
||||
>
|
||||
<TextView style="@style/config_separator"
|
||||
android:text="@string/connect_label_sms"
|
||||
android:layout_marginTop="15dp"
|
||||
/>
|
||||
<TextView android:layout_height="wrap_content"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_marginLeft="20dip"
|
||||
android:layout_marginRight="20dip"
|
||||
android:text="@string/phone_label"
|
||||
android:gravity="left"
|
||||
android:textAppearance="?android:attr/textAppearanceMedium"
|
||||
/>
|
||||
<LinearLayout android:id="@+id/sms_phones"
|
||||
android:layout_width="fill_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:orientation="vertical"
|
||||
/>
|
||||
</LinearLayout> <!--connect_set_sms-->
|
||||
<Button android:id="@+id/change_connection"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:text="@string/connection_via_label"
|
||||
android:layout_gravity="bottom|center"
|
||||
/>
|
||||
|
||||
<TextView style="@style/config_separator"
|
||||
android:text="@string/settings_label"
|
||||
|
|
|
|||
|
|
@ -287,6 +287,7 @@ public class GameConfigDelegate extends DelegateBase
|
|||
public void onClick( DialogInterface dlg, int button ) {
|
||||
m_conTypes = curSet;
|
||||
setConnLabel();
|
||||
showHideRelayStuff();
|
||||
}
|
||||
};
|
||||
|
||||
|
|
@ -437,11 +438,7 @@ public class GameConfigDelegate extends DelegateBase
|
|||
m_rowid = intent.getLongExtra( GameUtils.INTENT_KEY_ROWID, -1 );
|
||||
m_forResult = intent.getBooleanExtra( INTENT_FORRESULT_ROWID, false );
|
||||
|
||||
m_connectSetRelay = findViewById(R.id.connect_set_relay);
|
||||
m_connectSetSMS = findViewById(R.id.connect_set_sms);
|
||||
if ( !XWApp.SMSSUPPORTED ) {
|
||||
m_connectSetSMS.setVisibility( View.GONE );
|
||||
}
|
||||
m_connectSetRelay = findViewById( R.id.connect_set_relay );
|
||||
|
||||
m_addPlayerButton = (Button)findViewById(R.id.add_player);
|
||||
m_addPlayerButton.setOnClickListener( this );
|
||||
|
|
@ -587,8 +584,6 @@ public class GameConfigDelegate extends DelegateBase
|
|||
loadPlayersList();
|
||||
configLangSpinner();
|
||||
|
||||
loadPhones();
|
||||
|
||||
m_phoniesSpinner.setSelection( m_gi.phoniesAction.ordinal() );
|
||||
|
||||
setSmartnessSpinner();
|
||||
|
|
@ -763,15 +758,8 @@ public class GameConfigDelegate extends DelegateBase
|
|||
m_jugglePlayersButton
|
||||
.setVisibility( names.length <= 1 ?
|
||||
View.GONE : View.VISIBLE );
|
||||
|
||||
m_connectSetRelay.
|
||||
setVisibility( m_conTypes.contains( CommsConnType.COMMS_CONN_RELAY ) ?
|
||||
View.VISIBLE : View.GONE );
|
||||
if ( XWApp.SMSSUPPORTED ) {
|
||||
m_connectSetSMS.
|
||||
setVisibility( m_conTypes.contains( CommsConnType.COMMS_CONN_SMS )?
|
||||
View.VISIBLE : View.GONE );
|
||||
}
|
||||
|
||||
showHideRelayStuff();
|
||||
|
||||
if ( ! localOnlyGame()
|
||||
&& ((0 == m_gi.remoteCount() )
|
||||
|
|
@ -879,23 +867,6 @@ public class GameConfigDelegate extends DelegateBase
|
|||
}
|
||||
}
|
||||
|
||||
private void loadPhones()
|
||||
{
|
||||
if ( XWApp.SMSSUPPORTED && null != m_remoteAddrs ) {
|
||||
LinearLayout phoneList =
|
||||
(LinearLayout)findViewById(R.id.sms_phones);
|
||||
for ( CommsAddrRec addr : m_remoteAddrs ) {
|
||||
XWListItem item = XWListItem.inflate( m_activity, null );
|
||||
item.setText( addr.sms_phone );
|
||||
String name = Utils.phoneToContact( m_activity, addr.sms_phone,
|
||||
false );
|
||||
item.setComment( name );
|
||||
item.setEnabled( false );
|
||||
phoneList.addView( item );
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
private void setSmartnessSpinner()
|
||||
{
|
||||
int setting = -1;
|
||||
|
|
@ -1203,4 +1174,10 @@ public class GameConfigDelegate extends DelegateBase
|
|||
String connString = m_conTypes.toString( m_activity );
|
||||
m_connLabel.setText( getString( R.string.connect_label_fmt, connString ) );
|
||||
}
|
||||
|
||||
private void showHideRelayStuff()
|
||||
{
|
||||
boolean show = m_conTypes.contains( CommsConnType.COMMS_CONN_RELAY );
|
||||
m_connectSetRelay.setVisibility( show ? View.VISIBLE : View.GONE );
|
||||
}
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in a new issue