move all text bits to strings.xml so they are translatable

Inline text is not translatable, it is important to heed the lint warnings
about:

Hardcoded string "Swap success!", should use @string resource
This commit is contained in:
Hans-Christoph Steiner 2015-04-14 16:53:48 -04:00
parent 3d203f628f
commit 571e4a18e4
9 changed files with 31 additions and 19 deletions

View File

@ -2,7 +2,7 @@
<TextView <TextView
xmlns:android="http://schemas.android.com/apk/res/android" xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/text_description" android:id="@+id/text_description"
android:text="Tap to select the apps you want to swap." android:text="@string/swap_tap_to_select_apps"
style="@style/SwapTheme.StartSwap.MainText" style="@style/SwapTheme.StartSwap.MainText"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" /> android:layout_height="wrap_content" />

View File

@ -30,13 +30,13 @@
android:id="@+id/wifi_label_public" android:id="@+id/wifi_label_public"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="Public"/> android:text="@string/wifi_ap_public"/>
<TextView <TextView
android:id="@+id/wifi_warning_public" android:id="@+id/wifi_warning_public"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="May work"/> android:text="@string/wifi_warning_public"/>
<ImageView <ImageView
android:id="@+id/wifi_status_public" android:id="@+id/wifi_status_public"
@ -64,13 +64,13 @@
android:id="@+id/wifi_label_private" android:id="@+id/wifi_label_private"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="Private" /> android:text="@string/wifi_ap_private" />
<TextView <TextView
android:id="@+id/wifi_warning_private" android:id="@+id/wifi_warning_private"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="Promising" /> android:text="@string/wifi_warning_private" />
<ImageView <ImageView
android:id="@+id/wifi_status_private" android:id="@+id/wifi_status_private"
@ -99,13 +99,13 @@
android:id="@+id/wifi_label_personal" android:id="@+id/wifi_label_personal"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="Hotspot" /> android:text="@string/wifi_ap_personal" />
<TextView <TextView
android:id="@+id/wifi_warning_personal" android:id="@+id/wifi_warning_personal"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="Best bet" /> android:text="@string/wifi_warning_personal" />
<ImageView <ImageView
android:id="@+id/wifi_status_personal" android:id="@+id/wifi_status_personal"

View File

@ -24,7 +24,7 @@
<CheckBox <CheckBox
android:id="@+id/checkbox_dont_show" android:id="@+id/checkbox_dont_show"
android:text="Don't show this again" android:text="@string/swap_dont_show_again"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_below="@+id/text_description" android:layout_below="@+id/text_description"

View File

@ -7,7 +7,7 @@
<TextView <TextView
android:id="@+id/text_title" android:id="@+id/text_title"
android:text="Swap success!" android:text="@string/swap_success"
style="@style/SwapTheme.AppList.SwapSuccess" style="@style/SwapTheme.AppList.SwapSuccess"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
@ -21,7 +21,7 @@
<TextView <TextView
android:id="@+id/text_description" android:id="@+id/text_description"
android:text="Tap an app for details and to install." android:text="@string/swap_tap_for_details_and_install"
style="@style/SwapTheme.AppList.SwapSuccessDetails" style="@style/SwapTheme.AppList.SwapSuccessDetails"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"

View File

@ -15,7 +15,7 @@
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:id="@+id/textView" android:id="@+id/textView"
android:text="One person needs to scan the code, or type the URL of the other swapper into a browser." android:text="@string/swap_scan_or_type_url"
style="@style/SwapTheme.Wizard.MainText"/> style="@style/SwapTheme.Wizard.MainText"/>
<ImageView <ImageView

View File

@ -2,8 +2,8 @@
<item <item
android:id="@+id/action_next" android:id="@+id/action_next"
android:title="Next" android:title="@string/next"
android:titleCondensed="Next"/> android:titleCondensed="@string/next"/>
<!-- Currently in a style, but that style probably wont work on 8 -> 11 devices --> <!-- Currently in a style, but that style probably wont work on 8 -> 11 devices -->
<!--android:drawable="@drawable/swap_action_button_skin"--> <!--android:drawable="@drawable/swap_action_button_skin"-->

View File

@ -2,13 +2,13 @@
<item <item
android:id="@+id/action_next" android:id="@+id/action_next"
android:title="Next" android:title="@string/next"
android:titleCondensed="Next"/> android:titleCondensed="@string/next"/>
<item <item
android:id="@+id/action_search" android:id="@+id/action_search"
android:icon="@android:drawable/ic_menu_search" android:icon="@android:drawable/ic_menu_search"
android:title="Search" android:title="@string/menu_search"
android:titleCondensed="Search"/> android:titleCondensed="@string/menu_search"/>
</menu> </menu>

View File

@ -2,8 +2,8 @@
<item <item
android:id="@+id/action_next" android:id="@+id/action_next"
android:title="Skip" android:title="@string/skip"
android:titleCondensed="Skip"/> android:titleCondensed="@string/skip"/>
<!-- Currently in a style, but that style probably wont work on 8 -> 11 devices --> <!-- Currently in a style, but that style probably wont work on 8 -> 11 devices -->
<!--android:drawable="@drawable/swap_action_button_skin"--> <!--android:drawable="@drawable/swap_action_button_skin"-->

View File

@ -304,6 +304,7 @@
<string name="menu_swap">Swap apps</string> <string name="menu_swap">Swap apps</string>
<string name="swap">Swap apps</string> <string name="swap">Swap apps</string>
<string name="swap_repo_name">Swap</string> <string name="swap_repo_name">Swap</string>
<string name="swap_success">Swap success!</string>
<string name="swap_no_wifi_network">No network yet</string> <string name="swap_no_wifi_network">No network yet</string>
<string name="swap_view_available_networks">(Tap to open available networks)</string> <string name="swap_view_available_networks">(Tap to open available networks)</string>
<string name="swap_wifi_qr_not_working">It\'s not working</string> <string name="swap_wifi_qr_not_working">It\'s not working</string>
@ -313,4 +314,15 @@
<string name="swap_introduction">Your mobile device becomes an app store with Swap!</string> <string name="swap_introduction">Your mobile device becomes an app store with Swap!</string>
<string name="swap_start">START A SWAP</string> <string name="swap_start">START A SWAP</string>
<string name="swap_reciprocate_failed">An error occurred while attempting to swap with another device. We will still try to get apps from them, but they may not be able to get apps from us.</string> <string name="swap_reciprocate_failed">An error occurred while attempting to swap with another device. We will still try to get apps from them, but they may not be able to get apps from us.</string>
<string name="swap_tap_to_select_apps">Tap to select the apps you want to swap.</string>
<string name="swap_dont_show_again">Don\'t show this again</string>
<string name="swap_tap_for_details_and_install">Tap an app for details and to install.</string>
<string name="swap_scan_or_type_url">One person needs to scan the code, or type the URL of the other swapper into a browser.</string>
<!-- WiFi AP status for Swap flow -->
<string name="wifi_ap_public">Public</string>
<string name="wifi_ap_private">Private</string>
<string name="wifi_ap_personal">Hotspot</string>
<string name="wifi_warning_public">May work</string>
<string name="wifi_warning_private">Promising</string>
<string name="wifi_warning_personal">Best bet</string>
</resources> </resources>