mirror of
git://xwords.git.sourceforge.net/gitroot/xwords/xwords
synced 2025-01-07 05:24:46 +01:00
use a single toolbar layout inflated from its own xml rather than
hard-coded as part of board
This commit is contained in:
Eric House
parent
9c1b4454eb
commit
454ef51cf1
5 changed files with 292 additions and 344 deletions
|
|
@ -78,224 +78,216 @@ public final class R {
|
||||||
}
|
}
|
||||||
public static final class id {
|
public static final class id {
|
||||||
public static final int about_xlator=0x7f0a0001;
|
public static final int about_xlator=0x7f0a0001;
|
||||||
public static final int add_player=0x7f0a003c;
|
public static final int add_player=0x7f0a002a;
|
||||||
public static final int advertise_new_room_check=0x7f0a0042;
|
public static final int advertise_new_room_check=0x7f0a0030;
|
||||||
public static final int blessed_label=0x7f0a0062;
|
public static final int blessed_label=0x7f0a0050;
|
||||||
public static final int board_menu_chat=0x7f0a00b2;
|
public static final int board_menu_chat=0x7f0a00aa;
|
||||||
public static final int board_menu_dict=0x7f0a00ae;
|
public static final int board_menu_dict=0x7f0a00a6;
|
||||||
public static final int board_menu_done=0x7f0a0099;
|
public static final int board_menu_done=0x7f0a0091;
|
||||||
public static final int board_menu_file_about=0x7f0a00a7;
|
public static final int board_menu_file_about=0x7f0a009f;
|
||||||
public static final int board_menu_file_prefs=0x7f0a00a6;
|
public static final int board_menu_file_prefs=0x7f0a009e;
|
||||||
public static final int board_menu_flip=0x7f0a00b0;
|
public static final int board_menu_flip=0x7f0a00a8;
|
||||||
public static final int board_menu_game_counts=0x7f0a009f;
|
public static final int board_menu_game_counts=0x7f0a0097;
|
||||||
public static final int board_menu_game_history=0x7f0a00a1;
|
public static final int board_menu_game_history=0x7f0a0099;
|
||||||
public static final int board_menu_game_left=0x7f0a00a0;
|
public static final int board_menu_game_left=0x7f0a0098;
|
||||||
public static final int board_menu_game_netstats=0x7f0a00a8;
|
public static final int board_menu_game_netstats=0x7f0a00a0;
|
||||||
public static final int board_menu_game_resend=0x7f0a00a3;
|
public static final int board_menu_game_resend=0x7f0a009b;
|
||||||
public static final int board_menu_game_resign=0x7f0a00a2;
|
public static final int board_menu_game_resign=0x7f0a009a;
|
||||||
public static final int board_menu_hint_next=0x7f0a00ac;
|
public static final int board_menu_hint_next=0x7f0a00a4;
|
||||||
public static final int board_menu_hint_prev=0x7f0a00ab;
|
public static final int board_menu_hint_prev=0x7f0a00a3;
|
||||||
public static final int board_menu_invite=0x7f0a0098;
|
public static final int board_menu_invite=0x7f0a0090;
|
||||||
public static final int board_menu_juggle=0x7f0a00af;
|
public static final int board_menu_juggle=0x7f0a00a7;
|
||||||
public static final int board_menu_toggle=0x7f0a00b3;
|
public static final int board_menu_toggle=0x7f0a00ab;
|
||||||
public static final int board_menu_trade=0x7f0a009a;
|
public static final int board_menu_trade=0x7f0a0092;
|
||||||
public static final int board_menu_trade_cancel=0x7f0a009b;
|
public static final int board_menu_trade_cancel=0x7f0a0093;
|
||||||
public static final int board_menu_trade_commit=0x7f0a009c;
|
public static final int board_menu_trade_commit=0x7f0a0094;
|
||||||
public static final int board_menu_tray=0x7f0a009e;
|
public static final int board_menu_tray=0x7f0a0096;
|
||||||
public static final int board_menu_undo_current=0x7f0a00ad;
|
public static final int board_menu_undo_current=0x7f0a00a5;
|
||||||
public static final int board_menu_undo_last=0x7f0a009d;
|
public static final int board_menu_undo_last=0x7f0a0095;
|
||||||
public static final int board_menu_zoom=0x7f0a00b1;
|
public static final int board_menu_zoom=0x7f0a00a9;
|
||||||
public static final int board_root=0x7f0a0002;
|
public static final int board_root=0x7f0a0002;
|
||||||
public static final int board_view=0x7f0a0003;
|
public static final int board_view=0x7f0a0003;
|
||||||
public static final int boardsize_spinner=0x7f0a004f;
|
public static final int boardsize_spinner=0x7f0a003d;
|
||||||
public static final int bt_disabled=0x7f0a007a;
|
public static final int bt_disabled=0x7f0a0068;
|
||||||
public static final int bt_separator=0x7f0a0079;
|
public static final int bt_separator=0x7f0a0067;
|
||||||
public static final int bt_stuff=0x7f0a007c;
|
public static final int bt_stuff=0x7f0a006a;
|
||||||
public static final int button_add=0x7f0a0091;
|
public static final int button_add=0x7f0a007f;
|
||||||
public static final int button_clear=0x7f0a001d;
|
public static final int button_clear=0x7f0a000b;
|
||||||
public static final int button_done=0x7f0a006d;
|
public static final int button_done=0x7f0a005b;
|
||||||
public static final int button_invite=0x7f0a001e;
|
public static final int button_invite=0x7f0a000c;
|
||||||
public static final int button_rescan=0x7f0a001c;
|
public static final int button_rescan=0x7f0a000a;
|
||||||
public static final int button_study=0x7f0a006c;
|
public static final int button_study=0x7f0a005a;
|
||||||
public static final int chat_button_horizontal=0x7f0a000d;
|
public static final int chat_button=0x7f0a008b;
|
||||||
public static final int chat_button_vertical=0x7f0a0017;
|
public static final int chat_edit=0x7f0a000e;
|
||||||
public static final int chat_edit=0x7f0a0020;
|
public static final int chat_history=0x7f0a000d;
|
||||||
public static final int chat_history=0x7f0a001f;
|
public static final int chat_menu_clear=0x7f0a00ac;
|
||||||
public static final int chat_menu_clear=0x7f0a00b4;
|
public static final int checkbox=0x7f0a004a;
|
||||||
public static final int checkbox=0x7f0a005c;
|
public static final int color_display_sample=0x7f0a0010;
|
||||||
public static final int color_display_sample=0x7f0a0022;
|
public static final int color_edit_sample=0x7f0a0011;
|
||||||
public static final int color_edit_sample=0x7f0a0023;
|
public static final int config_button=0x7f0a007b;
|
||||||
public static final int config_button=0x7f0a008d;
|
public static final int confirm_sms_reasons=0x7f0a0018;
|
||||||
public static final int confirm_sms_reasons=0x7f0a002a;
|
public static final int connect_set_relay=0x7f0a002c;
|
||||||
public static final int connect_set_relay=0x7f0a003e;
|
public static final int connect_set_sms=0x7f0a0034;
|
||||||
public static final int connect_set_sms=0x7f0a0046;
|
public static final int del=0x7f0a004d;
|
||||||
public static final int del=0x7f0a005f;
|
public static final int desc=0x7f0a001b;
|
||||||
public static final int desc=0x7f0a002d;
|
public static final int details=0x7f0a007c;
|
||||||
public static final int details=0x7f0a008e;
|
public static final int dict_label=0x7f0a0071;
|
||||||
public static final int dict_label=0x7f0a0083;
|
public static final int dict_spinner=0x7f0a0027;
|
||||||
public static final int dict_spinner=0x7f0a0039;
|
public static final int dictlist_button=0x7f0a008a;
|
||||||
public static final int dictlist_button_horizontal=0x7f0a000c;
|
public static final int dicts_delete=0x7f0a00af;
|
||||||
public static final int dictlist_button_vertical=0x7f0a0016;
|
public static final int dicts_deselect_all=0x7f0a00ae;
|
||||||
public static final int dicts_delete=0x7f0a00b7;
|
public static final int dicts_download=0x7f0a00ad;
|
||||||
public static final int dicts_deselect_all=0x7f0a00b6;
|
public static final int dicts_move=0x7f0a00b0;
|
||||||
public static final int dicts_download=0x7f0a00b5;
|
public static final int dicts_select=0x7f0a00b1;
|
||||||
public static final int dicts_move=0x7f0a00b8;
|
public static final int divider=0x7f0a0020;
|
||||||
public static final int dicts_select=0x7f0a00b9;
|
public static final int download_button=0x7f0a007d;
|
||||||
public static final int divider=0x7f0a0032;
|
public static final int dwnld_message=0x7f0a0048;
|
||||||
public static final int download_button=0x7f0a008f;
|
public static final int edit=0x7f0a006d;
|
||||||
public static final int dwnld_message=0x7f0a005a;
|
public static final int edit_blue=0x7f0a0017;
|
||||||
public static final int edit=0x7f0a007f;
|
public static final int edit_green=0x7f0a0015;
|
||||||
public static final int edit_blue=0x7f0a0029;
|
public static final int edit_red=0x7f0a0013;
|
||||||
public static final int edit_green=0x7f0a0027;
|
public static final int english_label=0x7f0a004e;
|
||||||
public static final int edit_red=0x7f0a0025;
|
public static final int english_view=0x7f0a004f;
|
||||||
public static final int english_label=0x7f0a0060;
|
|
||||||
public static final int english_view=0x7f0a0061;
|
|
||||||
public static final int exchange_buttons=0x7f0a0004;
|
public static final int exchange_buttons=0x7f0a0004;
|
||||||
public static final int exchange_cancel=0x7f0a0006;
|
public static final int exchange_cancel=0x7f0a0006;
|
||||||
public static final int exchange_commit=0x7f0a0005;
|
public static final int exchange_commit=0x7f0a0005;
|
||||||
public static final int expander=0x7f0a0051;
|
public static final int expander=0x7f0a003f;
|
||||||
public static final int explain=0x7f0a008b;
|
public static final int explain=0x7f0a0079;
|
||||||
public static final int filters=0x7f0a0067;
|
public static final int filters=0x7f0a0055;
|
||||||
public static final int flip_button_horizontal=0x7f0a000f;
|
public static final int flip_button=0x7f0a008d;
|
||||||
public static final int flip_button_vertical=0x7f0a0019;
|
public static final int game_locked_check=0x7f0a0022;
|
||||||
public static final int game_locked_check=0x7f0a0034;
|
public static final int game_name=0x7f0a003e;
|
||||||
public static final int game_name=0x7f0a0050;
|
public static final int gamel_menu_checkmoves=0x7f0a009d;
|
||||||
public static final int gamel_menu_checkmoves=0x7f0a00a5;
|
public static final int games_game_config=0x7f0a00bc;
|
||||||
public static final int games_game_config=0x7f0a00c4;
|
public static final int games_game_copy=0x7f0a00c1;
|
||||||
public static final int games_game_copy=0x7f0a00c9;
|
public static final int games_game_delete=0x7f0a00bb;
|
||||||
public static final int games_game_delete=0x7f0a00c3;
|
public static final int games_game_move=0x7f0a00bd;
|
||||||
public static final int games_game_move=0x7f0a00c5;
|
public static final int games_game_new_from=0x7f0a00bf;
|
||||||
public static final int games_game_new_from=0x7f0a00c7;
|
public static final int games_game_rename=0x7f0a00c0;
|
||||||
public static final int games_game_rename=0x7f0a00c8;
|
public static final int games_game_reset=0x7f0a00be;
|
||||||
public static final int games_game_reset=0x7f0a00c6;
|
public static final int games_group_default=0x7f0a00c5;
|
||||||
public static final int games_group_default=0x7f0a00cd;
|
public static final int games_group_delete=0x7f0a00c4;
|
||||||
public static final int games_group_delete=0x7f0a00cc;
|
public static final int games_group_movedown=0x7f0a00c3;
|
||||||
public static final int games_group_movedown=0x7f0a00cb;
|
public static final int games_group_moveup=0x7f0a00c2;
|
||||||
public static final int games_group_moveup=0x7f0a00ca;
|
public static final int games_group_rename=0x7f0a00c6;
|
||||||
public static final int games_group_rename=0x7f0a00ce;
|
public static final int games_menu_about=0x7f0a00b8;
|
||||||
public static final int games_menu_about=0x7f0a00c0;
|
public static final int games_menu_checkmoves=0x7f0a00ba;
|
||||||
public static final int games_menu_checkmoves=0x7f0a00c2;
|
public static final int games_menu_checkupdates=0x7f0a00c7;
|
||||||
public static final int games_menu_checkupdates=0x7f0a00cf;
|
public static final int games_menu_dicts=0x7f0a00b6;
|
||||||
public static final int games_menu_dicts=0x7f0a00be;
|
public static final int games_menu_email=0x7f0a00b7;
|
||||||
public static final int games_menu_email=0x7f0a00bf;
|
public static final int games_menu_loaddb=0x7f0a00c9;
|
||||||
public static final int games_menu_loaddb=0x7f0a00d1;
|
public static final int games_menu_newgame=0x7f0a00b2;
|
||||||
public static final int games_menu_newgame=0x7f0a00ba;
|
public static final int games_menu_newgroup=0x7f0a00b3;
|
||||||
public static final int games_menu_newgroup=0x7f0a00bb;
|
public static final int games_menu_prefs=0x7f0a00b4;
|
||||||
public static final int games_menu_prefs=0x7f0a00bc;
|
public static final int games_menu_rateme=0x7f0a00b5;
|
||||||
public static final int games_menu_rateme=0x7f0a00bd;
|
public static final int games_menu_resend=0x7f0a00b9;
|
||||||
public static final int games_menu_resend=0x7f0a00c1;
|
public static final int games_menu_storedb=0x7f0a00c8;
|
||||||
public static final int games_menu_storedb=0x7f0a00d0;
|
public static final int games_menu_study=0x7f0a009c;
|
||||||
public static final int games_menu_study=0x7f0a00a4;
|
public static final int group_done=0x7f0a008f;
|
||||||
public static final int group_done=0x7f0a0097;
|
public static final int group_exchange=0x7f0a00a1;
|
||||||
public static final int group_exchange=0x7f0a00a9;
|
public static final int group_hint=0x7f0a00a2;
|
||||||
public static final int group_hint=0x7f0a00aa;
|
public static final int hideable=0x7f0a0044;
|
||||||
public static final int hideable=0x7f0a0056;
|
public static final int hints_allowed=0x7f0a0036;
|
||||||
public static final int hints_allowed=0x7f0a0048;
|
public static final int invite_desc=0x7f0a0009;
|
||||||
public static final int invite_desc=0x7f0a001b;
|
public static final int item_name=0x7f0a0075;
|
||||||
public static final int item_name=0x7f0a0087;
|
public static final int item_score=0x7f0a0076;
|
||||||
public static final int item_score=0x7f0a0088;
|
public static final int join_public_room_check=0x7f0a002d;
|
||||||
public static final int join_public_room_check=0x7f0a003f;
|
public static final int juggle_players=0x7f0a002b;
|
||||||
public static final int juggle_players=0x7f0a003d;
|
public static final int lang_separator=0x7f0a0025;
|
||||||
public static final int lang_separator=0x7f0a0037;
|
public static final int lang_spinner=0x7f0a0026;
|
||||||
public static final int lang_spinner=0x7f0a0038;
|
public static final int loc_item_check=0x7f0a00cb;
|
||||||
public static final int loc_item_check=0x7f0a00d3;
|
public static final int loc_item_clear=0x7f0a00ca;
|
||||||
public static final int loc_item_clear=0x7f0a00d2;
|
public static final int loc_item_copy_bless=0x7f0a00cd;
|
||||||
public static final int loc_item_copy_bless=0x7f0a00d5;
|
public static final int loc_item_copy_eng=0x7f0a00cc;
|
||||||
public static final int loc_item_copy_eng=0x7f0a00d4;
|
public static final int loc_search_button=0x7f0a0057;
|
||||||
public static final int loc_search_button=0x7f0a0069;
|
public static final int loc_search_field=0x7f0a0056;
|
||||||
public static final int loc_search_field=0x7f0a0068;
|
public static final int local_label=0x7f0a0052;
|
||||||
public static final int local_label=0x7f0a0064;
|
public static final int local_name_edit=0x7f0a007a;
|
||||||
public static final int local_name_edit=0x7f0a008c;
|
public static final int local_player_set=0x7f0a006f;
|
||||||
public static final int local_player_set=0x7f0a0081;
|
public static final int manual_add_button=0x7f0a0080;
|
||||||
public static final int manual_add_button=0x7f0a0092;
|
public static final int modtime=0x7f0a0045;
|
||||||
public static final int modtime=0x7f0a0057;
|
public static final int msg_marker=0x7f0a0042;
|
||||||
public static final int msg_marker=0x7f0a0054;
|
public static final int name=0x7f0a0081;
|
||||||
public static final int name=0x7f0a0093;
|
public static final int name_edit=0x7f0a0019;
|
||||||
public static final int name_edit=0x7f0a002b;
|
public static final int name_label=0x7f0a007e;
|
||||||
public static final int name_label=0x7f0a0090;
|
public static final int newgame_bt_config=0x7f0a006c;
|
||||||
public static final int newgame_bt_config=0x7f0a007e;
|
public static final int newgame_enable_bt=0x7f0a0069;
|
||||||
public static final int newgame_enable_bt=0x7f0a007b;
|
public static final int newgame_enable_sms=0x7f0a0063;
|
||||||
public static final int newgame_enable_sms=0x7f0a0075;
|
public static final int newgame_invite_bt=0x7f0a006b;
|
||||||
public static final int newgame_invite_bt=0x7f0a007d;
|
public static final int newgame_invite_net=0x7f0a005f;
|
||||||
public static final int newgame_invite_net=0x7f0a0071;
|
public static final int newgame_invite_sms=0x7f0a0065;
|
||||||
public static final int newgame_invite_sms=0x7f0a0077;
|
public static final int newgame_local=0x7f0a005d;
|
||||||
public static final int newgame_local=0x7f0a006f;
|
public static final int newgame_local_config=0x7f0a005e;
|
||||||
public static final int newgame_local_config=0x7f0a0070;
|
public static final int newgame_local_desc=0x7f0a005c;
|
||||||
public static final int newgame_local_desc=0x7f0a006e;
|
public static final int newgame_net_config=0x7f0a0060;
|
||||||
public static final int newgame_net_config=0x7f0a0072;
|
public static final int newgame_sms_config=0x7f0a0066;
|
||||||
public static final int newgame_sms_config=0x7f0a0078;
|
public static final int nexthint_button=0x7f0a0087;
|
||||||
public static final int nexthint_button_horizontal=0x7f0a0009;
|
public static final int number=0x7f0a0082;
|
||||||
public static final int nexthint_button_vertical=0x7f0a0013;
|
public static final int other_lang=0x7f0a0058;
|
||||||
public static final int number=0x7f0a0094;
|
public static final int password_edit=0x7f0a0074;
|
||||||
public static final int other_lang=0x7f0a006a;
|
public static final int password_set=0x7f0a0073;
|
||||||
public static final int password_edit=0x7f0a0086;
|
public static final int phonies_spinner=0x7f0a003b;
|
||||||
public static final int password_set=0x7f0a0085;
|
public static final int pick_faceup=0x7f0a003c;
|
||||||
public static final int phonies_spinner=0x7f0a004d;
|
public static final int pick_lang=0x7f0a0083;
|
||||||
public static final int pick_faceup=0x7f0a004e;
|
public static final int pick_lang_spinner=0x7f0a0084;
|
||||||
public static final int pick_lang=0x7f0a0095;
|
public static final int play_button=0x7f0a0023;
|
||||||
public static final int pick_lang_spinner=0x7f0a0096;
|
public static final int player_list=0x7f0a0029;
|
||||||
public static final int play_button=0x7f0a0035;
|
public static final int player_name_edit=0x7f0a0070;
|
||||||
public static final int player_list=0x7f0a003b;
|
public static final int players=0x7f0a0021;
|
||||||
public static final int player_name_edit=0x7f0a0082;
|
public static final int players_label=0x7f0a0028;
|
||||||
public static final int players=0x7f0a0033;
|
public static final int prevhint_button=0x7f0a0086;
|
||||||
public static final int players_label=0x7f0a003a;
|
public static final int private_rooms_set=0x7f0a002e;
|
||||||
public static final int prevhint_button_horizontal=0x7f0a0008;
|
public static final int progress_bar=0x7f0a0049;
|
||||||
public static final int prevhint_button_vertical=0x7f0a0012;
|
public static final int public_rooms_set=0x7f0a0031;
|
||||||
public static final int private_rooms_set=0x7f0a0040;
|
public static final int refresh_button=0x7f0a0033;
|
||||||
public static final int progress_bar=0x7f0a005b;
|
public static final int remote_check=0x7f0a006e;
|
||||||
public static final int public_rooms_set=0x7f0a0043;
|
public static final int revert_all=0x7f0a0078;
|
||||||
public static final int refresh_button=0x7f0a0045;
|
public static final int revert_colors=0x7f0a0077;
|
||||||
public static final int remote_check=0x7f0a0080;
|
public static final int robot_check=0x7f0a0072;
|
||||||
public static final int revert_all=0x7f0a008a;
|
public static final int role=0x7f0a0047;
|
||||||
public static final int revert_colors=0x7f0a0089;
|
public static final int room_edit=0x7f0a002f;
|
||||||
public static final int robot_check=0x7f0a0084;
|
public static final int room_spinner=0x7f0a0032;
|
||||||
public static final int role=0x7f0a0059;
|
public static final int screen=0x7f0a0024;
|
||||||
public static final int room_edit=0x7f0a0041;
|
public static final int search_button=0x7f0a001d;
|
||||||
public static final int room_spinner=0x7f0a0044;
|
public static final int seek_blue=0x7f0a0016;
|
||||||
public static final int screen=0x7f0a0036;
|
public static final int seek_green=0x7f0a0014;
|
||||||
public static final int search_button=0x7f0a002f;
|
public static final int seek_red=0x7f0a0012;
|
||||||
public static final int seek_blue=0x7f0a0028;
|
public static final int send_button=0x7f0a000f;
|
||||||
public static final int seek_green=0x7f0a0026;
|
public static final int show_remote=0x7f0a001a;
|
||||||
public static final int seek_red=0x7f0a0024;
|
public static final int shuffle_button=0x7f0a0088;
|
||||||
public static final int send_button=0x7f0a0021;
|
public static final int slmenu_clear_sel=0x7f0a00d2;
|
||||||
public static final int show_remote=0x7f0a002c;
|
public static final int slmenu_copy_sel=0x7f0a00d1;
|
||||||
public static final int shuffle_button_horizontal=0x7f0a000a;
|
public static final int slmenu_deselect_all=0x7f0a00d0;
|
||||||
public static final int shuffle_button_vertical=0x7f0a0014;
|
public static final int slmenu_lookup_sel=0x7f0a00ce;
|
||||||
public static final int slmenu_clear_sel=0x7f0a00da;
|
public static final int slmenu_select_all=0x7f0a00cf;
|
||||||
public static final int slmenu_copy_sel=0x7f0a00d9;
|
public static final int smart_robot=0x7f0a003a;
|
||||||
public static final int slmenu_deselect_all=0x7f0a00d8;
|
public static final int sms_disabled=0x7f0a0062;
|
||||||
public static final int slmenu_lookup_sel=0x7f0a00d6;
|
public static final int sms_phones=0x7f0a0035;
|
||||||
public static final int slmenu_select_all=0x7f0a00d7;
|
public static final int sms_separator=0x7f0a0061;
|
||||||
public static final int smart_robot=0x7f0a004c;
|
public static final int sms_stuff=0x7f0a0064;
|
||||||
public static final int sms_disabled=0x7f0a0074;
|
public static final int state=0x7f0a0046;
|
||||||
public static final int sms_phones=0x7f0a0047;
|
public static final int summary=0x7f0a0059;
|
||||||
public static final int sms_separator=0x7f0a0073;
|
public static final int tbar_parent_hor=0x7f0a0007;
|
||||||
public static final int sms_stuff=0x7f0a0076;
|
public static final int tbar_parent_vert=0x7f0a0008;
|
||||||
public static final int state=0x7f0a0058;
|
public static final int text_item=0x7f0a004b;
|
||||||
public static final int summary=0x7f0a006b;
|
public static final int text_item2=0x7f0a004c;
|
||||||
public static final int text_item=0x7f0a005d;
|
public static final int thumbnail=0x7f0a0043;
|
||||||
public static final int text_item2=0x7f0a005e;
|
public static final int timer_minutes_edit=0x7f0a0039;
|
||||||
public static final int thumbnail=0x7f0a0055;
|
public static final int timer_set=0x7f0a0038;
|
||||||
public static final int timer_minutes_edit=0x7f0a004b;
|
public static final int toolbar=0x7f0a0085;
|
||||||
public static final int timer_set=0x7f0a004a;
|
public static final int undo_button=0x7f0a0089;
|
||||||
public static final int toolbar_horizontal=0x7f0a0007;
|
public static final int use_timer=0x7f0a0037;
|
||||||
public static final int toolbar_vertical=0x7f0a0011;
|
public static final int values_button=0x7f0a008c;
|
||||||
public static final int undo_button_horizontal=0x7f0a000b;
|
|
||||||
public static final int undo_button_vertical=0x7f0a0015;
|
|
||||||
public static final int use_timer=0x7f0a0049;
|
|
||||||
public static final int values_button_horizontal=0x7f0a000e;
|
|
||||||
public static final int values_button_vertical=0x7f0a0018;
|
|
||||||
public static final int version_string=0x7f0a0000;
|
public static final int version_string=0x7f0a0000;
|
||||||
public static final int view_loaded=0x7f0a0053;
|
public static final int view_loaded=0x7f0a0041;
|
||||||
public static final int view_unloaded=0x7f0a0052;
|
public static final int view_unloaded=0x7f0a0040;
|
||||||
public static final int word_edit=0x7f0a002e;
|
public static final int word_edit=0x7f0a001c;
|
||||||
public static final int wordlen_max=0x7f0a0031;
|
public static final int wordlen_max=0x7f0a001f;
|
||||||
public static final int wordlen_min=0x7f0a0030;
|
public static final int wordlen_min=0x7f0a001e;
|
||||||
public static final int xlated_view=0x7f0a0066;
|
public static final int xlated_view=0x7f0a0054;
|
||||||
public static final int xlated_view_blessed=0x7f0a0063;
|
public static final int xlated_view_blessed=0x7f0a0051;
|
||||||
public static final int xlated_view_local=0x7f0a0065;
|
public static final int xlated_view_local=0x7f0a0053;
|
||||||
public static final int zoom_button_horizontal=0x7f0a0010;
|
public static final int zoom_button=0x7f0a008e;
|
||||||
public static final int zoom_button_vertical=0x7f0a001a;
|
|
||||||
}
|
}
|
||||||
public static final class layout {
|
public static final class layout {
|
||||||
public static final int about_dlg=0x7f030000;
|
public static final int about_dlg=0x7f030000;
|
||||||
|
|
@ -336,6 +328,7 @@ public final class R {
|
||||||
public static final int smsinviter=0x7f030023;
|
public static final int smsinviter=0x7f030023;
|
||||||
public static final int smsinviter_item=0x7f030024;
|
public static final int smsinviter_item=0x7f030024;
|
||||||
public static final int studylist=0x7f030025;
|
public static final int studylist=0x7f030025;
|
||||||
|
public static final int toolbar=0x7f030026;
|
||||||
}
|
}
|
||||||
public static final class menu {
|
public static final class menu {
|
||||||
public static final int board_menu=0x7f090000;
|
public static final int board_menu=0x7f090000;
|
||||||
|
|
|
||||||
|
|
@ -40,104 +40,19 @@
|
||||||
/>
|
/>
|
||||||
</LinearLayout>
|
</LinearLayout>
|
||||||
|
|
||||||
<HorizontalScrollView android:orientation="horizontal"
|
<!-- toolbar goes inside me -->
|
||||||
|
<HorizontalScrollView android:id="@+id/tbar_parent_hor"
|
||||||
|
android:orientation="horizontal"
|
||||||
android:layout_width="wrap_content"
|
android:layout_width="wrap_content"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:layout_gravity="center_horizontal"
|
android:layout_gravity="center_horizontal"
|
||||||
>
|
|
||||||
<LinearLayout android:id="@+id/toolbar_horizontal"
|
|
||||||
android:orientation="horizontal"
|
|
||||||
android:layout_width="fill_parent"
|
|
||||||
android:layout_height="wrap_content"
|
|
||||||
android:minHeight="48dp"
|
|
||||||
>
|
|
||||||
|
|
||||||
<ImageButton android:id="@+id/prevhint_button_horizontal"
|
|
||||||
style="@style/toolbar_button"
|
|
||||||
android:src="@drawable/prev_hint"
|
|
||||||
/>
|
|
||||||
<ImageButton android:id="@+id/nexthint_button_horizontal"
|
|
||||||
style="@style/toolbar_button"
|
|
||||||
android:src="@drawable/next_hint"
|
|
||||||
/>
|
|
||||||
<ImageButton android:id="@+id/shuffle_button_horizontal"
|
|
||||||
style="@style/toolbar_button"
|
|
||||||
android:src="@drawable/shuffle"
|
|
||||||
/>
|
|
||||||
<ImageButton android:id="@+id/undo_button_horizontal"
|
|
||||||
style="@style/toolbar_button"
|
|
||||||
android:src="@drawable/undo"
|
|
||||||
/>
|
|
||||||
<ImageButton android:id="@+id/dictlist_button_horizontal"
|
|
||||||
style="@style/toolbar_button"
|
|
||||||
android:src="@drawable/dicticon"
|
|
||||||
/>
|
|
||||||
<ImageButton android:id="@+id/chat_button_horizontal"
|
|
||||||
style="@style/toolbar_button"
|
|
||||||
android:src="@drawable/stat_notify_chat"
|
|
||||||
/>
|
|
||||||
<ImageButton android:id="@+id/values_button_horizontal"
|
|
||||||
style="@style/toolbar_button"
|
|
||||||
android:src="@drawable/values"
|
|
||||||
/>
|
|
||||||
<ImageButton android:id="@+id/flip_button_horizontal"
|
|
||||||
style="@style/toolbar_button"
|
|
||||||
android:src="@drawable/flip"
|
|
||||||
/>
|
|
||||||
<ImageButton android:id="@+id/zoom_button_horizontal"
|
|
||||||
style="@style/toolbar_button"
|
|
||||||
android:src="@drawable/zoom"
|
|
||||||
/>
|
/>
|
||||||
</LinearLayout>
|
</LinearLayout>
|
||||||
</HorizontalScrollView>
|
|
||||||
</LinearLayout>
|
|
||||||
|
|
||||||
<ScrollView android:orientation="horizontal"
|
<!-- toolbar goes inside me -->
|
||||||
|
<ScrollView android:id="@+id/tbar_parent_vert"
|
||||||
android:layout_width="wrap_content"
|
android:layout_width="wrap_content"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:layout_gravity="center_vertical"
|
android:layout_gravity="center_vertical"
|
||||||
>
|
|
||||||
<LinearLayout android:id="@+id/toolbar_vertical"
|
|
||||||
android:orientation="vertical"
|
|
||||||
android:layout_width="wrap_content"
|
|
||||||
android:layout_height="match_parent"
|
|
||||||
>
|
|
||||||
<ImageButton android:id="@+id/prevhint_button_vertical"
|
|
||||||
style="@style/toolbar_button"
|
|
||||||
android:src="@drawable/prev_hint"
|
|
||||||
/>
|
/>
|
||||||
<ImageButton android:id="@+id/nexthint_button_vertical"
|
|
||||||
style="@style/toolbar_button"
|
|
||||||
android:src="@drawable/next_hint"
|
|
||||||
/>
|
|
||||||
<ImageButton android:id="@+id/shuffle_button_vertical"
|
|
||||||
style="@style/toolbar_button"
|
|
||||||
android:src="@drawable/shuffle"
|
|
||||||
/>
|
|
||||||
<ImageButton android:id="@+id/undo_button_vertical"
|
|
||||||
style="@style/toolbar_button"
|
|
||||||
android:src="@drawable/undo"
|
|
||||||
/>
|
|
||||||
<ImageButton android:id="@+id/dictlist_button_vertical"
|
|
||||||
style="@style/toolbar_button"
|
|
||||||
android:src="@drawable/dicticon"
|
|
||||||
/>
|
|
||||||
<ImageButton android:id="@+id/chat_button_vertical"
|
|
||||||
style="@style/toolbar_button"
|
|
||||||
android:src="@drawable/stat_notify_chat"
|
|
||||||
/>
|
|
||||||
<ImageButton android:id="@+id/values_button_vertical"
|
|
||||||
style="@style/toolbar_button"
|
|
||||||
android:src="@drawable/values"
|
|
||||||
/>
|
|
||||||
<ImageButton android:id="@+id/flip_button_vertical"
|
|
||||||
style="@style/toolbar_button"
|
|
||||||
android:src="@drawable/flip"
|
|
||||||
/>
|
|
||||||
<ImageButton android:id="@+id/zoom_button_vertical"
|
|
||||||
style="@style/toolbar_button"
|
|
||||||
android:src="@drawable/zoom"
|
|
||||||
/>
|
|
||||||
</LinearLayout>
|
|
||||||
</ScrollView>
|
|
||||||
</LinearLayout>
|
</LinearLayout>
|
||||||
|
|
|
||||||
45
xwords4/android/XWords4/res/layout/toolbar.xml
Normal file
45
xwords4/android/XWords4/res/layout/toolbar.xml
Normal file
|
|
@ -0,0 +1,45 @@
|
||||||
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
|
|
||||||
|
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
|
||||||
|
android:id="@+id/toolbar"
|
||||||
|
android:orientation="vertical"
|
||||||
|
android:layout_width="wrap_content"
|
||||||
|
android:layout_height="match_parent"
|
||||||
|
>
|
||||||
|
<ImageButton android:id="@+id/prevhint_button"
|
||||||
|
style="@style/toolbar_button"
|
||||||
|
android:src="@drawable/prev_hint"
|
||||||
|
/>
|
||||||
|
<ImageButton android:id="@+id/nexthint_button"
|
||||||
|
style="@style/toolbar_button"
|
||||||
|
android:src="@drawable/next_hint"
|
||||||
|
/>
|
||||||
|
<ImageButton android:id="@+id/shuffle_button"
|
||||||
|
style="@style/toolbar_button"
|
||||||
|
android:src="@drawable/shuffle"
|
||||||
|
/>
|
||||||
|
<ImageButton android:id="@+id/undo_button"
|
||||||
|
style="@style/toolbar_button"
|
||||||
|
android:src="@drawable/undo"
|
||||||
|
/>
|
||||||
|
<ImageButton android:id="@+id/dictlist_button"
|
||||||
|
style="@style/toolbar_button"
|
||||||
|
android:src="@drawable/dicticon"
|
||||||
|
/>
|
||||||
|
<ImageButton android:id="@+id/chat_button"
|
||||||
|
style="@style/toolbar_button"
|
||||||
|
android:src="@drawable/stat_notify_chat"
|
||||||
|
/>
|
||||||
|
<ImageButton android:id="@+id/values_button"
|
||||||
|
style="@style/toolbar_button"
|
||||||
|
android:src="@drawable/values"
|
||||||
|
/>
|
||||||
|
<ImageButton android:id="@+id/flip_button"
|
||||||
|
style="@style/toolbar_button"
|
||||||
|
android:src="@drawable/flip"
|
||||||
|
/>
|
||||||
|
<ImageButton android:id="@+id/zoom_button"
|
||||||
|
style="@style/toolbar_button"
|
||||||
|
android:src="@drawable/zoom"
|
||||||
|
/>
|
||||||
|
</LinearLayout>
|
||||||
|
|
@ -1857,8 +1857,7 @@ public class BoardDelegate extends DelegateBase
|
||||||
|
|
||||||
int orient = m_activity.getResources().getConfiguration().orientation;
|
int orient = m_activity.getResources().getConfiguration().orientation;
|
||||||
boolean isLandscape = Configuration.ORIENTATION_LANDSCAPE == orient;
|
boolean isLandscape = Configuration.ORIENTATION_LANDSCAPE == orient;
|
||||||
m_toolbar = new Toolbar( m_activity, this );
|
m_toolbar = new Toolbar( m_activity, this, isLandscape );
|
||||||
m_toolbar.setIsLandscape( isLandscape );
|
|
||||||
|
|
||||||
populateToolbar();
|
populateToolbar();
|
||||||
adjustTradeVisibility();
|
adjustTradeVisibility();
|
||||||
|
|
|
||||||
|
|
@ -25,6 +25,7 @@ import android.app.Activity;
|
||||||
import android.content.Context;
|
import android.content.Context;
|
||||||
import android.content.DialogInterface;
|
import android.content.DialogInterface;
|
||||||
import android.view.View;
|
import android.view.View;
|
||||||
|
import android.view.ViewGroup;
|
||||||
import android.widget.LinearLayout;
|
import android.widget.LinearLayout;
|
||||||
import android.widget.ImageButton;
|
import android.widget.ImageButton;
|
||||||
|
|
||||||
|
|
@ -33,6 +34,7 @@ import junit.framework.Assert;
|
||||||
import org.eehouse.android.xw4.DlgDelegate.Action;
|
import org.eehouse.android.xw4.DlgDelegate.Action;
|
||||||
import org.eehouse.android.xw4.DlgDelegate.HasDlgDelegate;
|
import org.eehouse.android.xw4.DlgDelegate.HasDlgDelegate;
|
||||||
import org.eehouse.android.xw4.jni.*;
|
import org.eehouse.android.xw4.jni.*;
|
||||||
|
import org.eehouse.android.xw4.loc.LocUtils;
|
||||||
|
|
||||||
public class Toolbar {
|
public class Toolbar {
|
||||||
public static final int BUTTON_BROWSE_DICT = 0;
|
public static final int BUTTON_BROWSE_DICT = 0;
|
||||||
|
|
@ -45,45 +47,42 @@ public class Toolbar {
|
||||||
public static final int BUTTON_CHAT = 7;
|
public static final int BUTTON_CHAT = 7;
|
||||||
public static final int BUTTON_VALUES = 8;
|
public static final int BUTTON_VALUES = 8;
|
||||||
|
|
||||||
private static int[][] s_buttonInfo = {
|
private static int[] s_buttonInfo = {
|
||||||
// BUTTON_BROWSE_DICT
|
// BUTTON_BROWSE_DICT
|
||||||
{ R.id.dictlist_button_horizontal, R.id.dictlist_button_vertical },
|
R.id.dictlist_button,
|
||||||
// BUTTON_HINT_PREV
|
// BUTTON_HINT_PREV
|
||||||
{ R.id.prevhint_button_horizontal, R.id.prevhint_button_vertical },
|
R.id.prevhint_button,
|
||||||
// BUTTON_HINT_NEXT
|
// BUTTON_HINT_NEXT
|
||||||
{ R.id.nexthint_button_horizontal, R.id.nexthint_button_vertical },
|
R.id.nexthint_button,
|
||||||
// BUTTON_FLIP
|
// BUTTON_FLIP
|
||||||
{ R.id.flip_button_horizontal, R.id.flip_button_vertical },
|
R.id.flip_button,
|
||||||
// BUTTON_JUGGLE
|
// BUTTON_JUGGLE
|
||||||
{ R.id.shuffle_button_horizontal, R.id.shuffle_button_vertical },
|
R.id.shuffle_button,
|
||||||
// BUTTON_ZOOM
|
// BUTTON_ZOOM
|
||||||
{ R.id.zoom_button_horizontal, R.id.zoom_button_vertical },
|
R.id.zoom_button,
|
||||||
// BUTTON_UNDO
|
// BUTTON_UNDO
|
||||||
{ R.id.undo_button_horizontal, R.id.undo_button_vertical },
|
R.id.undo_button,
|
||||||
// BUTTON_CHAT
|
// BUTTON_CHAT
|
||||||
{ R.id.chat_button_horizontal, R.id.chat_button_vertical },
|
R.id.chat_button,
|
||||||
// BUTTON_VALUES
|
// BUTTON_VALUES
|
||||||
{ R.id.values_button_horizontal, R.id.values_button_vertical },
|
R.id.values_button,
|
||||||
};
|
};
|
||||||
|
|
||||||
private Activity m_activity;
|
private Activity m_activity;
|
||||||
private DlgDelegate.HasDlgDelegate m_dlgDlgt;
|
private DlgDelegate.HasDlgDelegate m_dlgDlgt;
|
||||||
private View m_horLayout;
|
private LinearLayout m_layout;
|
||||||
private View m_vertLayout;
|
|
||||||
private boolean m_visible;
|
private boolean m_visible;
|
||||||
|
|
||||||
private enum ORIENTATION { ORIENT_UNKNOWN,
|
private enum ORIENTATION { ORIENT_PORTRAIT, ORIENT_LANDSCAPE };
|
||||||
ORIENT_PORTRAIT,
|
private ORIENTATION m_curOrient = null;
|
||||||
ORIENT_LANDSCAPE,
|
|
||||||
};
|
|
||||||
private ORIENTATION m_curOrient = ORIENTATION.ORIENT_UNKNOWN;
|
|
||||||
|
|
||||||
public Toolbar( Activity activity, HasDlgDelegate dlgDlgt )
|
public Toolbar( Activity activity, HasDlgDelegate dlgDlgt,
|
||||||
|
boolean isLandscape )
|
||||||
{
|
{
|
||||||
m_activity = activity;
|
m_activity = activity;
|
||||||
m_dlgDlgt = dlgDlgt;
|
m_dlgDlgt = dlgDlgt;
|
||||||
m_horLayout = activity.findViewById( R.id.toolbar_horizontal );
|
|
||||||
m_vertLayout = activity.findViewById( R.id.toolbar_vertical );
|
setIsLandscape( isLandscape );
|
||||||
}
|
}
|
||||||
|
|
||||||
public void setVisible( boolean visible )
|
public void setVisible( boolean visible )
|
||||||
|
|
@ -96,7 +95,7 @@ public class Toolbar {
|
||||||
|
|
||||||
public ImageButton getViewFor( int index )
|
public ImageButton getViewFor( int index )
|
||||||
{
|
{
|
||||||
int id = idForIndex( index );
|
int id = s_buttonInfo[index];
|
||||||
ImageButton button = (ImageButton)m_activity.findViewById( id );
|
ImageButton button = (ImageButton)m_activity.findViewById( id );
|
||||||
return button;
|
return button;
|
||||||
}
|
}
|
||||||
|
|
@ -124,7 +123,7 @@ public class Toolbar {
|
||||||
setLongClickListener( index, listener );
|
setLongClickListener( index, listener );
|
||||||
}
|
}
|
||||||
|
|
||||||
public void setIsLandscape( boolean landscape )
|
private void setIsLandscape( boolean landscape )
|
||||||
{
|
{
|
||||||
if ( landscape && m_curOrient == ORIENTATION.ORIENT_LANDSCAPE ) {
|
if ( landscape && m_curOrient == ORIENTATION.ORIENT_LANDSCAPE ) {
|
||||||
// do nothing
|
// do nothing
|
||||||
|
|
@ -143,7 +142,7 @@ public class Toolbar {
|
||||||
public void update( int index, boolean enable )
|
public void update( int index, boolean enable )
|
||||||
{
|
{
|
||||||
int vis = enable ? View.VISIBLE : View.GONE;
|
int vis = enable ? View.VISIBLE : View.GONE;
|
||||||
int id = idForIndex( index );
|
int id = s_buttonInfo[index];
|
||||||
ImageButton button = (ImageButton)m_activity.findViewById( id );
|
ImageButton button = (ImageButton)m_activity.findViewById( id );
|
||||||
if ( null != button ) {
|
if ( null != button ) {
|
||||||
button.setVisibility( vis );
|
button.setVisibility( vis );
|
||||||
|
|
@ -152,15 +151,19 @@ public class Toolbar {
|
||||||
|
|
||||||
private void doShowHide()
|
private void doShowHide()
|
||||||
{
|
{
|
||||||
boolean show;
|
Assert.assertTrue( null != m_curOrient );
|
||||||
if ( null != m_horLayout ) {
|
boolean isLandscape = ORIENTATION.ORIENT_LANDSCAPE == m_curOrient;
|
||||||
show = m_visible && ORIENTATION.ORIENT_PORTRAIT == m_curOrient;
|
if ( null == m_layout ) {
|
||||||
m_horLayout.setVisibility( show? View.VISIBLE : View.GONE );
|
m_layout = (LinearLayout)LocUtils.inflate( m_activity, R.layout.toolbar );
|
||||||
}
|
m_layout.setOrientation(ORIENTATION.ORIENT_PORTRAIT == m_curOrient
|
||||||
if ( null != m_vertLayout ) {
|
? LinearLayout.HORIZONTAL : LinearLayout.VERTICAL );
|
||||||
show = m_visible && ORIENTATION.ORIENT_LANDSCAPE == m_curOrient;
|
|
||||||
m_vertLayout.setVisibility( show? View.VISIBLE : View.GONE );
|
int id = isLandscape ? R.id.tbar_parent_vert : R.id.tbar_parent_hor;
|
||||||
|
ViewGroup scroller = (ViewGroup)m_activity.findViewById( id );
|
||||||
|
scroller.addView( m_layout );
|
||||||
}
|
}
|
||||||
|
|
||||||
|
m_layout.setVisibility( m_visible? View.VISIBLE : View.GONE );
|
||||||
}
|
}
|
||||||
|
|
||||||
private void setListener( int index, View.OnClickListener listener )
|
private void setListener( int index, View.OnClickListener listener )
|
||||||
|
|
@ -179,11 +182,4 @@ public class Toolbar {
|
||||||
button.setOnLongClickListener( listener );
|
button.setOnLongClickListener( listener );
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
private int idForIndex( int index )
|
|
||||||
{
|
|
||||||
Assert.assertTrue( ORIENTATION.ORIENT_UNKNOWN != m_curOrient );
|
|
||||||
int indx = ORIENTATION.ORIENT_PORTRAIT == m_curOrient ? 0 : 1;
|
|
||||||
return s_buttonInfo[index][indx];
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue