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

get rid of the Loc* classes -- will be transforming xml at buildtime as with menus

Browse source
This commit is contained in:
Eric House 2014-04-08 05:20:22 -07:00
parent aad4872f68
commit dfb3ea842b
4 changed files with 39 additions and 43 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
xwords4/android/XWords4/res/layout/game_list_item.xml
View file

@ -14,16 +14,15 @@
android:background="@android:drawable/list_selector_background" android:background="@android:drawable/list_selector_background"
> >
<org.eehouse.android.xw4.loc.LocTextView <TextView android:id="@+id/view_unloaded"
android:id="@+id/view_unloaded" android:layout_width="fill_parent"
android:layout_width="fill_parent" android:layout_height="wrap_content"
android:layout_height="wrap_content" android:textAppearance="?android:attr/textAppearanceLarge"
android:textAppearance="?android:attr/textAppearanceLarge" android:gravity="center"
android:gravity="center" android:paddingTop="10dp"
android:paddingTop="10dp" android:paddingBottom="10dp"
android:paddingBottom="10dp" custom:strid="@string/game_list_tmp"
custom:strid="@string/game_list_tmp" />
/>
<LinearLayout android:id="@+id/view_loaded" <LinearLayout android:id="@+id/view_loaded"
android:orientation="horizontal" android:orientation="horizontal"

4
xwords4/android/XWords4/res/layout/loc_list_item.xml
View file

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<org.eehouse.android.xw4.loc.LocListItem <ListItem
xmlns:android="http://schemas.android.com/apk/res/android" xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:custom="http://schemas.android.com/apk/res/org.eehouse.android.xw4" xmlns:custom="http://schemas.android.com/apk/res/org.eehouse.android.xw4"
android:orientation="horizontal" android:orientation="horizontal"
@ -15,4 +15,4 @@
style="@style/evenly_spaced_horizontal" style="@style/evenly_spaced_horizontal"
/> />
</org.eehouse.android.xw4.loc.LocListItem> </ListItem>

7
xwords4/android/XWords4/res/layout/loc_main.xml
View file

@ -40,10 +40,9 @@
android:text="@string/loc_main_english" android:text="@string/loc_main_english"
/> />
<org.eehouse.android.xw4.loc.LocTextView <TextView style="@style/evenly_spaced_horizontal"
style="@style/evenly_spaced_horizontal" custom:strid="@string/loc_main_yourlang"
custom:strid="@string/loc_main_yourlang" />
/>
</LinearLayout> </LinearLayout>

52
xwords4/android/XWords4/res/layout/new_game.xml
View file

@ -26,7 +26,7 @@
> >
<!-- local game --> <!-- local game -->
<org.eehouse.android.xw4.loc.LocTextView <TextView
style="@style/config_separator" style="@style/config_separator"
android:textAppearance="?android:attr/textAppearanceMedium" android:textAppearance="?android:attr/textAppearanceMedium"
custom:strid="@string/newgame_local_header" custom:strid="@string/newgame_local_header"
@ -52,18 +52,18 @@
android:layout_width="fill_parent" android:layout_width="fill_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
> >
<org.eehouse.android.xw4.loc.LocButton android:id="@+id/newgame_local" <Button android:id="@+id/newgame_local"
custom:strid="@string/newgame_local" custom:strid="@string/newgame_local"
style="@style/evenly_spaced_horizontal" style="@style/evenly_spaced_horizontal"
/> />
<org.eehouse.android.xw4.loc.LocButton android:id="@+id/newgame_local_config" <Button android:id="@+id/newgame_local_config"
custom:strid="@string/newgame_local_config" custom:strid="@string/newgame_local_config"
style="@style/evenly_spaced_horizontal" style="@style/evenly_spaced_horizontal"
/> />
</LinearLayout> </LinearLayout>
<!-- networked game --> <!-- networked game -->
<org.eehouse.android.xw4.loc.LocTextView style="@style/config_separator" <TextView style="@style/config_separator"
android:layout_marginTop="10dip" android:layout_marginTop="10dip"
android:textAppearance="?android:attr/textAppearanceMedium" android:textAppearance="?android:attr/textAppearanceMedium"
custom:strid="@string/newgame_networked_header" custom:strid="@string/newgame_networked_header"
@ -81,7 +81,7 @@
android:layout_weight="0" android:layout_weight="0"
android:layout_gravity="center_vertical|center_horizontal" android:layout_gravity="center_vertical|center_horizontal"
/> />
<org.eehouse.android.xw4.loc.LocTextView custom:strid="@string/newgame_networked_desc" <TextView custom:strid="@string/newgame_networked_desc"
style="@style/relay_explain" style="@style/relay_explain"
/> />
</LinearLayout> </LinearLayout>
@ -90,19 +90,19 @@
android:layout_width="fill_parent" android:layout_width="fill_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
> >
<org.eehouse.android.xw4.loc.LocButton android:id="@+id/newgame_invite_net" <Button android:id="@+id/newgame_invite_net"
custom:strid="@string/newgame_invite" custom:strid="@string/newgame_invite"
style="@style/evenly_spaced_horizontal" style="@style/evenly_spaced_horizontal"
/> />
<org.eehouse.android.xw4.loc.LocButton android:id="@+id/newgame_net_config" <Button android:id="@+id/newgame_net_config"
custom:strid="@string/newgame_net_config" custom:strid="@string/newgame_net_config"
style="@style/evenly_spaced_horizontal" style="@style/evenly_spaced_horizontal"
/> />
</LinearLayout> </LinearLayout>
<!-- SMS game --> <!-- SMS game -->
<org.eehouse.android.xw4.loc.LocTextView android:id="@+id/sms_separator" <TextView android:id="@+id/sms_separator"
style="@style/config_separator" style="@style/config_separator"
android:layout_marginTop="10dip" android:layout_marginTop="10dip"
android:textAppearance="?android:attr/textAppearanceMedium" android:textAppearance="?android:attr/textAppearanceMedium"
@ -116,10 +116,10 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:visibility="gone" android:visibility="gone"
> >
<org.eehouse.android.xw4.loc.LocTextView custom:strid="@string/sms_disabled" <TextView custom:strid="@string/sms_disabled"
style="@style/relay_explain" style="@style/relay_explain"
/> />
<org.eehouse.android.xw4.loc.LocButton android:id="@+id/newgame_enable_sms" <Button android:id="@+id/newgame_enable_sms"
android:layout_width="fill_parent" android:layout_width="fill_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
custom:strid="@string/newgame_enable_sms" custom:strid="@string/newgame_enable_sms"
@ -144,7 +144,7 @@
android:layout_weight="0" android:layout_weight="0"
android:layout_gravity="center_vertical|center_horizontal" android:layout_gravity="center_vertical|center_horizontal"
/> />
<org.eehouse.android.xw4.loc.LocTextView custom:strid="@string/sms_networked_desc" <TextView custom:strid="@string/sms_networked_desc"
style="@style/relay_explain" style="@style/relay_explain"
/> />
</LinearLayout> </LinearLayout>
@ -153,12 +153,12 @@
android:layout_width="fill_parent" android:layout_width="fill_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
> >
<org.eehouse.android.xw4.loc.LocButton android:id="@+id/newgame_invite_sms" <Button android:id="@+id/newgame_invite_sms"
custom:strid="@string/newgame_invite" custom:strid="@string/newgame_invite"
style="@style/evenly_spaced_horizontal" style="@style/evenly_spaced_horizontal"
/> />
<org.eehouse.android.xw4.loc.LocButton android:id="@+id/newgame_sms_config" <Button android:id="@+id/newgame_sms_config"
custom:strid="@string/newgame_net_config" custom:strid="@string/newgame_net_config"
style="@style/evenly_spaced_horizontal" style="@style/evenly_spaced_horizontal"
/> />
@ -166,7 +166,7 @@
</LinearLayout> </LinearLayout>
<!-- Bluetooth --> <!-- Bluetooth -->
<org.eehouse.android.xw4.loc.LocTextView android:id="@+id/bt_separator" <TextView android:id="@+id/bt_separator"
style="@style/config_separator" style="@style/config_separator"
android:layout_marginTop="10dip" android:layout_marginTop="10dip"
android:textAppearance="?android:attr/textAppearanceMedium" android:textAppearance="?android:attr/textAppearanceMedium"
@ -180,10 +180,10 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:visibility="gone" android:visibility="gone"
> >
<org.eehouse.android.xw4.loc.LocTextView custom:strid="@string/bt_disabled" <TextView custom:strid="@string/bt_disabled"
style="@style/relay_explain" style="@style/relay_explain"
/> />
<org.eehouse.android.xw4.loc.LocButton android:id="@+id/newgame_enable_bt" <Button android:id="@+id/newgame_enable_bt"
android:layout_width="fill_parent" android:layout_width="fill_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
custom:strid="@string/newgame_enable_bt" custom:strid="@string/newgame_enable_bt"
@ -208,7 +208,7 @@
android:layout_weight="0" android:layout_weight="0"
android:layout_gravity="center_vertical|center_horizontal" android:layout_gravity="center_vertical|center_horizontal"
/> />
<org.eehouse.android.xw4.loc.LocTextView custom:strid="@string/bt_networked_desc" <TextView custom:strid="@string/bt_networked_desc"
style="@style/relay_explain" style="@style/relay_explain"
/> />
</LinearLayout> </LinearLayout>
@ -217,17 +217,15 @@
android:layout_width="fill_parent" android:layout_width="fill_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
> >
<org.eehouse.android.xw4.loc.LocButton <Button android:id="@+id/newgame_invite_bt"
android:id="@+id/newgame_invite_bt" custom:strid="@string/newgame_invite"
custom:strid="@string/newgame_invite" style="@style/evenly_spaced_horizontal"
style="@style/evenly_spaced_horizontal" />
/>
<org.eehouse.android.xw4.loc.LocButton <Button android:id="@+id/newgame_bt_config"
android:id="@+id/newgame_bt_config" custom:strid="@string/newgame_net_config"
custom:strid="@string/newgame_net_config" style="@style/evenly_spaced_horizontal"
style="@style/evenly_spaced_horizontal" />
/>
</LinearLayout> </LinearLayout>
</LinearLayout> </LinearLayout>
</LinearLayout> </LinearLayout>