Subversion Repositories ES

Compare Revisions

Last modification

Ignore whitespace Rev 6 → Rev 7

/trunk/res/layout/hello_world.xml
File deleted
/trunk/res/layout/dialog_activity.xml
File deleted
/trunk/res/layout/frm_currency.xml
File deleted
/trunk/res/layout/frm_temperatures.xml
File deleted
/trunk/res/layout/custom_dialog_activity.xml
File deleted
/trunk/res/layout/activity_temperatures.xml
New file
0,0 → 1,34
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:orientation="vertical" android:layout_height="fill_parent"
android:layout_width="fill_parent">
 
<TableLayout android:id="@+id/TableLayout01"
android:layout_height="wrap_content" android:layout_width="fill_parent"
android:stretchColumns="1,3" android:shrinkColumns="*"
android:layout_marginTop="10sp">
<TableRow android:layout_height="wrap_content">
<EditText android:layout_column="1"
android:id="@+id/temperatures_edit_value1" android:inputType="numberSigned|numberDecimal" />
<TextView android:layout_column="2" android:text="="
android:gravity="center" android:textSize="25sp" />
<EditText android:layout_column="3"
android:id="@+id/temperatures_edit_value2" android:inputType="numberSigned|numberDecimal" />
</TableRow>
<TableRow android:layout_height="wrap_content">
<Spinner android:layout_column="1"
android:id="@+id/temperatures_spinner_unit1"
android:drawSelectorOnTop="true" android:entries="@array/temperature_units_display"
android:entryValues="@array/temperature_units_values" />
<TextView android:layout_column="2" android:text="" />
<Spinner android:layout_column="3"
android:id="@+id/temperatures_spinner_unit2"
android:drawSelectorOnTop="true" android:entries="@array/temperature_units_display"
android:entryValues="@array/temperature_units_values" />
</TableRow>
</TableLayout>
 
<TextView android:text="@string/temperatures_off_scale"
android:id="@+id/temperatures_text_off_scale" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:visibility="invisible" />
</LinearLayout>
Property changes:
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: layout/activity_currencies.xml
===================================================================
--- layout/activity_currencies.xml (revision 0)
+++ layout/activity_currencies.xml (revision 7)
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+ android:orientation="vertical" android:layout_height="fill_parent"
+ android:layout_width="fill_parent">
+
+ <TableLayout android:id="@+id/TableLayout01"
+ android:layout_height="wrap_content" android:layout_width="fill_parent"
+ android:stretchColumns="1,3" android:shrinkColumns="*"
+ android:layout_marginTop="10sp">
+ <TableRow android:layout_height="wrap_content">
+ <EditText android:layout_column="1"
+ android:id="@+id/currencies_edit_value1" android:inputType="numberDecimal" />
+ <TextView android:layout_column="2" android:text="="
+ android:gravity="center" android:textSize="25sp" />
+ <EditText android:layout_column="3"
+ android:id="@+id/currencies_edit_value2" android:inputType="numberDecimal" />
+ </TableRow>
+ <TableRow android:layout_height="wrap_content">
+ <Spinner android:layout_column="1"
+ android:id="@+id/currencies_spinner_unit1"
+ android:drawSelectorOnTop="true" android:entries="@array/currency_units_display"
+ android:entryValues="@array/currency_units_values" />
+ <TextView android:layout_column="2" android:text="" />
+ <Spinner android:layout_column="3"
+ android:id="@+id/currencies_spinner_unit2"
+ android:drawSelectorOnTop="true" android:entries="@array/currency_units_display"
+ android:entryValues="@array/currency_units_values" />
+ </TableRow>
+ </TableLayout>
+</LinearLayout>
/layout/activity_currencies.xml
Property changes:
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: values/strings.xml
===================================================================
--- values/strings.xml (revision 6)
+++ values/strings.xml (revision 7)
@@ -1,35 +1,15 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<string name="app_name">Converter</string>
- <string name="title">Android Einheiten-Umrechner</string>
+ <string name="title">Android Unit Converter</string>
- <string name="activity_lengths">Längenmasse</string>
- <string name="hello_world"><b>Hello, <i>World!</i></b></string>
+ <string name="activity_lengths">Lengths</string>
- <string name="activity_temperatures">Temperaturen</string>
- <string name="dialog_activity_text">Example of how you can use the
- Theme.Dialog theme to make an activity that looks like a
- dialog.</string>
+ <string name="activity_temperatures">Temperatures</string>
+ <string name="temperatures_off_scale"><sup>*</sup> Value is off the scale</string>
- <string name="activity_currencies">Wechselkurse</string>
- <string name="custom_dialog_activity_text">Example of how you can use a
- custom Theme.Dialog theme to make an activity that looks like a
- customized dialog, here with an ugly frame.</string>
+ <string name="activity_currencies">Currencies</string>
<string name="prompt01">Geben Sie den Betrag der Quellwährung ein:</string>
<string name="prompt02">Geben Sie die Ausgangstemperatur ein:</string>
-
- <string name="title_checkbox_preference">Checkbox preference</string>
- <string name="summary_checkbox_preference">This is a checkbox</string>
-
- <string name="title_edittext_preference">Edit text preference</string>
- <string name="summary_edittext_preference">An example that uses an edit text dialog</string>
- <string name="dialog_title_edittext_preference">Enter your favorite animal</string>
-
- <string name="title_list_preference">List preference</string>
- <string name="summary_list_preference">An example that uses a list dialog</string>
- <string name="dialog_title_list_preference">Choose one</string>
-
- <string name="default_value_list_preference">beta</string>
- <string name="default_value_edittext_preference">Default value</string>
</resources>
/trunk/res/values/arrays.xml
1,57 → 1,39
<?xml version="1.0" encoding="utf-8"?>
 
<resources>
 
<array name="cur_display">
<item>CHF</item>
<item>EUR</item>
<item>DOLLAR</item>
</array>
 
<array name="cur_values">
<item>CHF</item>
<item>EUR</item>
<item>DOL</item>
</array>
<string-array name="length_units_display">
<item>in (inch)</item>
<item>km (kilometer)</item>
<item>m (meter)</item>
<item>mi (mile)</item>
</string-array>
<string-array name="length_units_values">
<!-- TODO: Must not be "in", why? -->
<item>inch</item>
<item>km</item>
<item>m</item>
<item>mi</item>
</string-array>
<array name="tem_display">
<item>Celsius</item>
<item>Fahrenheit</item>
<item>Kelvin</item>
</array>
 
<array name="tem_values">
<item>CEL</item>
<item>FAH</item>
<item>KEL</item>
</array>
 
<string-array name="length_units_display">
<item>in (inch)</item>
<item>m (meter)</item>
<item>mi (mile)</item>
<item>km (kilometer)</item>
<string-array name="temperature_units_display">
<item>°C (Celsius)</item>
<item>°F (Fahrenheit)</item>
<item>K (Kelvin)</item>
</string-array>
 
<string-array name="length_units_values">
<!-- TODO: Must not be "in", why? -->
<item>inch</item>
<item>m</item>
<item>mi</item>
<item>km</item>
<string-array name="temperature_units_values">
<item>C</item>
<item>F</item>
<item>K</item>
</string-array>
<!-- Used in app/menu examples -->
<string-array name="entries_list_preference">
<item>Alpha Option 01</item>
<item>Beta Option 02</item>
<item>Charlie Option 03</item>
</string-array>
 
<!-- Used in app/menu examples -->
<string-array name="entryvalues_list_preference">
<item>alpha</item>
<item>beta</item>
<item>charlie</item>
</string-array>
<string-array name="currency_units_display">
<item>CHF</item>
<item>EUR</item>
<item>USD</item>
</string-array>
<string-array name="currency_units_values">
<item>CHF</item>
<item>EUR</item>
<item>USD</item>
</string-array>
</resources>
/trunk/res/xml/default_values_old.xml
19,26 → 19,6
<PreferenceScreen
xmlns:android="http://schemas.android.com/apk/res/android">
 
<CheckBoxPreference
android:key="default_toggle"
android:defaultValue="true"
android:title="@string/title_checkbox_preference"
android:summary="@string/summary_checkbox_preference" />
 
<EditTextPreference
android:key="default_edittext"
android:defaultValue="@string/default_value_edittext_preference"
android:title="@string/title_edittext_preference"
android:summary="@string/summary_edittext_preference"
android:dialogTitle="@string/dialog_title_edittext_preference" />
<ListPreference
android:key="default_list"
android:defaultValue="@string/default_value_list_preference"
android:title="@string/title_list_preference"
android:summary="@string/summary_list_preference"
android:entries="@array/entries_list_preference"
android:entryValues="@array/entryvalues_list_preference"
android:dialogTitle="@string/dialog_title_list_preference" />
 
</PreferenceScreen>