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

rename style and use it to align table header with columns

Browse source
This commit is contained in:
Eric House 2014-04-05 12:12:00 -07:00
parent 663f4293a9
commit 7dfa042b77
8 changed files with 23 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -28,11 +28,11 @@
> >
<Button android:id="@+id/exchange_commit" <Button android:id="@+id/exchange_commit"
android:text="@string/button_trade_commit" android:text="@string/button_trade_commit"
style="@style/spaced_buttons" style="@style/evenly_spaced_horizontal"
/> />
<Button android:id="@+id/exchange_cancel" <Button android:id="@+id/exchange_cancel"
android:text="@string/button_trade_cancel" android:text="@string/button_trade_cancel"
style="@style/spaced_buttons" style="@style/evenly_spaced_horizontal"
/> />
</LinearLayout> </LinearLayout>

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

@ -26,7 +26,7 @@
> >
<Button android:id="@+id/button_rescan" <Button android:id="@+id/button_rescan"
android:text="@string/bt_pick_rescan_button" android:text="@string/bt_pick_rescan_button"
style="@style/spaced_buttons" style="@style/evenly_spaced_horizontal"
/> />
<!-- <Button android:id="@+id/button_reconfigure" --> <!-- <Button android:id="@+id/button_reconfigure" -->
<!-- android:text="@string/bt_pick_reconfig_button" --> <!-- android:text="@string/bt_pick_reconfig_button" -->
@ -36,7 +36,7 @@
<!-- /> --> <!-- /> -->
<Button android:id="@+id/button_clear" <Button android:id="@+id/button_clear"
android:text="@string/bt_pick_clear_button" android:text="@string/bt_pick_clear_button"
style="@style/spaced_buttons" style="@style/evenly_spaced_horizontal"
/> />
</LinearLayout> </LinearLayout>

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

@ -9,10 +9,10 @@
> >
<TextView android:id="@+id/english_view" <TextView android:id="@+id/english_view"
style="@style/spaced_buttons" style="@style/evenly_spaced_horizontal"
/> />
<EditText android:id="@+id/xlated_view" <EditText android:id="@+id/xlated_view"
style="@style/spaced_buttons" style="@style/evenly_spaced_horizontal"
/> />
</org.eehouse.android.xw4.loc.LocListItem> </org.eehouse.android.xw4.loc.LocListItem>

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

@ -36,18 +36,14 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
> >
<TextView android:layout_width="wrap_content" <TextView style="@style/evenly_spaced_horizontal"
android:layout_height="wrap_content"
android:textAppearance="?android:attr/textAppearanceLarge"
android:text="@string/loc_main_english" android:text="@string/loc_main_english"
/> />
<org.eehouse.android.xw4.loc.LocTextView <org.eehouse.android.xw4.loc.LocTextView
android:layout_width="wrap_content" style="@style/evenly_spaced_horizontal"
android:layout_height="wrap_content" custom:strid="@string/loc_main_yourlang"
android:textAppearance="?android:attr/textAppearanceLarge" />
custom:strid="@string/loc_main_yourlang"
/>
</LinearLayout> </LinearLayout>

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

@ -54,11 +54,11 @@
> >
<org.eehouse.android.xw4.loc.LocButton android:id="@+id/newgame_local" <org.eehouse.android.xw4.loc.LocButton android:id="@+id/newgame_local"
custom:strid="@string/newgame_local" custom:strid="@string/newgame_local"
style="@style/spaced_buttons" style="@style/evenly_spaced_horizontal"
/> />
<org.eehouse.android.xw4.loc.LocButton android:id="@+id/newgame_local_config" <org.eehouse.android.xw4.loc.LocButton android:id="@+id/newgame_local_config"
custom:strid="@string/newgame_local_config" custom:strid="@string/newgame_local_config"
style="@style/spaced_buttons" style="@style/evenly_spaced_horizontal"
/> />
</LinearLayout> </LinearLayout>
@ -92,12 +92,12 @@
> >
<org.eehouse.android.xw4.loc.LocButton android:id="@+id/newgame_invite_net" <org.eehouse.android.xw4.loc.LocButton android:id="@+id/newgame_invite_net"
custom:strid="@string/newgame_invite" custom:strid="@string/newgame_invite"
style="@style/spaced_buttons" style="@style/evenly_spaced_horizontal"
/> />
<org.eehouse.android.xw4.loc.LocButton android:id="@+id/newgame_net_config" <org.eehouse.android.xw4.loc.LocButton android:id="@+id/newgame_net_config"
custom:strid="@string/newgame_net_config" custom:strid="@string/newgame_net_config"
style="@style/spaced_buttons" style="@style/evenly_spaced_horizontal"
/> />
</LinearLayout> </LinearLayout>
@ -155,12 +155,12 @@
> >
<org.eehouse.android.xw4.loc.LocButton android:id="@+id/newgame_invite_sms" <org.eehouse.android.xw4.loc.LocButton android:id="@+id/newgame_invite_sms"
custom:strid="@string/newgame_invite" custom:strid="@string/newgame_invite"
style="@style/spaced_buttons" style="@style/evenly_spaced_horizontal"
/> />
<org.eehouse.android.xw4.loc.LocButton android:id="@+id/newgame_sms_config" <org.eehouse.android.xw4.loc.LocButton android:id="@+id/newgame_sms_config"
custom:strid="@string/newgame_net_config" custom:strid="@string/newgame_net_config"
style="@style/spaced_buttons" style="@style/evenly_spaced_horizontal"
/> />
</LinearLayout> </LinearLayout>
</LinearLayout> </LinearLayout>
@ -220,13 +220,13 @@
<org.eehouse.android.xw4.loc.LocButton <org.eehouse.android.xw4.loc.LocButton
android:id="@+id/newgame_invite_bt" android:id="@+id/newgame_invite_bt"
custom:strid="@string/newgame_invite" custom:strid="@string/newgame_invite"
style="@style/spaced_buttons" style="@style/evenly_spaced_horizontal"
/> />
<org.eehouse.android.xw4.loc.LocButton <org.eehouse.android.xw4.loc.LocButton
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/spaced_buttons" style="@style/evenly_spaced_horizontal"
/> />
</LinearLayout> </LinearLayout>
</LinearLayout> </LinearLayout>

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

@ -21,11 +21,11 @@
> >
<Button android:id="@+id/revert_colors" <Button android:id="@+id/revert_colors"
android:text="@string/button_revert_colors" android:text="@string/button_revert_colors"
style="@style/spaced_buttons" style="@style/evenly_spaced_horizontal"
/> />
<Button android:id="@+id/revert_all" <Button android:id="@+id/revert_all"
android:text="@string/button_revert_all" android:text="@string/button_revert_all"
style="@style/spaced_buttons" style="@style/evenly_spaced_horizontal"
/> />
</LinearLayout> </LinearLayout>
</LinearLayout> </LinearLayout>

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

@ -41,7 +41,7 @@
> >
<Button android:id="@+id/button_add" <Button android:id="@+id/button_add"
android:text="@string/button_sms_add" android:text="@string/button_sms_add"
style="@style/spaced_buttons" style="@style/evenly_spaced_horizontal"
/> />
<ImageButton android:id="@+id/manual_add_button" <ImageButton android:id="@+id/manual_add_button"
android:layout_height="fill_parent" android:layout_height="fill_parent"
@ -51,7 +51,7 @@
/> />
<Button android:id="@+id/button_clear" <Button android:id="@+id/button_clear"
android:text="@string/bt_pick_clear_button" android:text="@string/bt_pick_clear_button"
style="@style/spaced_buttons" style="@style/evenly_spaced_horizontal"
/> />
</LinearLayout> </LinearLayout>

2
xwords4/android/XWords4/res/values/styles.xml
View file

@ -60,7 +60,7 @@
<item name="android:layout_marginBottom">3sp</item> <item name="android:layout_marginBottom">3sp</item>
</style> </style>
<style name="spaced_buttons"> <style name="evenly_spaced_horizontal">
<item name="android:layout_width">fill_parent</item> <item name="android:layout_width">fill_parent</item>
<item name="android:layout_height">wrap_content</item> <item name="android:layout_height">wrap_content</item>
<item name="android:layout_weight">1</item> <item name="android:layout_weight">1</item>