- Added temperature conversion for °C/°F/K - Added currency conversion for CHF/EUR/USD - Clean-up: Removed example strings and arrays
/trunk/AndroidManifest.xml |
---|
3,8 → 3,7 |
package="ch.ffhs.converter" |
android:versionCode="1" |
android:versionName="1.0"> |
<uses-sdk android:minSdkVersion="8" /> |
<uses-permission android:name="android.permission.VIBRATE" /> |
<uses-permission android:name="android.permission.INTERNET" /> |
<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" /> |
12,6 → 11,7 |
<application android:name="ConverterApplication" |
android:label="@string/app_name" |
android:icon="@drawable/icon"> |
<uses-sdk android:minSdkVersion="7" /> |
<activity android:name="MenuActivity" |
android:label="@string/app_name"> |
31,7 → 31,8 |
</activity> |
<activity android:name=".app.TemperaturesActivity" |
android:label="@string/activity_temperatures"> |
android:label="@string/activity_temperatures" |
android:theme="@android:style/Theme.Dialog"> |
<intent-filter> |
<action android:name="android.intent.action.MAIN" /> |
<category android:name="android.intent.category.CONVERTER" /> |
/trunk/src/ch/ffhs/converter/app/LengthsActivity.java |
---|
25,13 → 25,13 |
* Constants for mapping value strings to internal IDs |
*/ |
private static final String VALUE_INCHES = "inch"; //$NON-NLS-1$ |
private static final String VALUE_KILOMETERS = "km"; //$NON-NLS-1$ |
private static final String VALUE_METERS = "m"; //$NON-NLS-1$ |
private static final String VALUE_MILES = "mi"; //$NON-NLS-1$ |
private static final String VALUE_KILOMETERS = "km"; //$NON-NLS-1$ |
private static final int ITEM_INCHES = 0; |
private static final int ITEM_KILOMETERS = 1; |
private static final int ITEM_METERS = 2; |
private static final int ITEM_MILES = 3; |
private static final int ITEM_METERS = 1; |
private static final int ITEM_MILES = 2; |
private static final int ITEM_KILOMETERS = 3; |
/** |
* Maps value strings to internal IDs |
38,22 → 38,23 |
*/ |
private final static HashMap<String, Integer> valueToId = |
new HashMap<String, Integer>(); |
/* Unit spinners (dropdowns) */ |
private Spinner spinnerUnit1; |
private Spinner spinnerUnit2; |
static |
{ |
LengthsActivity.valueToId.put(LengthsActivity.VALUE_INCHES, |
LengthsActivity.ITEM_INCHES); |
LengthsActivity.valueToId.put(LengthsActivity.VALUE_KILOMETERS, |
LengthsActivity.ITEM_KILOMETERS); |
LengthsActivity.valueToId.put(LengthsActivity.VALUE_METERS, |
LengthsActivity.ITEM_METERS); |
LengthsActivity.valueToId.put(LengthsActivity.VALUE_MILES, |
LengthsActivity.ITEM_MILES); |
LengthsActivity.valueToId.put(LengthsActivity.VALUE_KILOMETERS, |
LengthsActivity.ITEM_KILOMETERS); |
} |
/* Unit spinners (dropdowns) */ |
private Spinner spinnerUnit1; |
private Spinner spinnerUnit2; |
/** Called when the activity is first created. */ |
@Override |
71,7 → 72,7 |
{ |
Editable editable1 = ((EditText) v).getText(); |
Double value1; |
double value1; |
try |
{ |
value1 = Double.parseDouble(editable1.toString()); |
78,11 → 79,11 |
} |
catch (NumberFormatException e) |
{ |
value1 = null; |
value1 = -1.0; |
} |
String string2 = ""; //$NON-NLS-1$ |
if (value1 != null) |
if (value1 >= 0.0) |
{ |
string2 = LengthsActivity.this.getConvertedValue(value1, false); |
} |
100,7 → 101,7 |
{ |
Editable editable2 = ((EditText) v).getText(); |
Double value2; |
double value2; |
try |
{ |
value2 = Double.parseDouble(editable2.toString()); |
107,11 → 108,11 |
} |
catch (NumberFormatException e) |
{ |
value2 = null; |
value2 = -1.0; |
} |
String string1 = ""; //$NON-NLS-1$ |
if (value2 != null) |
if (value2 >= 0.0) |
{ |
string1 = LengthsActivity.this.getConvertedValue(value2, true); |
} |
142,7 → 143,6 |
} |
}); |
this.spinnerUnit2.setSelection(1); |
this.spinnerUnit2.setOnItemSelectedListener(new OnItemSelectedListener() { |
@Override |
public void onItemSelected(AdapterView<?> arg0, View arg1, int arg2, |
190,11 → 190,6 |
case ITEM_INCHES: |
switch (itemId2) |
{ |
case ITEM_KILOMETERS: |
/* see ITEM_METERS */ |
newValue = new Double((value * 0.0254) / 1000); |
break; |
case ITEM_METERS: |
newValue = new Double(value * 0.0254); |
break; |
203,24 → 198,11 |
/* 12 in/ft and 5280 ft/mi */ |
newValue = new Double(value / 12 / 5280); |
break; |
} |
break; |
case ITEM_KILOMETERS: |
switch (itemId2) |
{ |
case ITEM_INCHES: |
/* 1 m = 39.370 in */ |
newValue = new Double(value * 1000 * 39.370); |
case ITEM_KILOMETERS: |
/* see ITEM_METERS */ |
newValue = new Double((value * 0.0254) / 1000); |
break; |
case ITEM_METERS: |
newValue = new Double(value * 1000); |
break; |
case ITEM_MILES: |
newValue = new Double(value / 1.609344); |
break; |
} |
break; |
227,15 → 209,15 |
case ITEM_METERS: |
switch (itemId2) |
{ |
case ITEM_KILOMETERS: |
newValue = new Double(value / 1000); |
break; |
case ITEM_INCHES: |
/* 1 m = 39.370 in */ |
newValue = new Double(value * 39.370); |
break; |
case ITEM_KILOMETERS: |
newValue = new Double(value / 1000); |
break; |
case ITEM_MILES: |
/* 1 mi = 1609.344 m */ |
newValue = new Double(value / 1609.344); |
251,15 → 233,32 |
newValue = new Double(value * 5280 * 12); |
break; |
case ITEM_METERS: |
newValue = new Double(value * 1609.344); |
break; |
case ITEM_KILOMETERS: |
newValue = new Double(value * 1.609344); |
break; |
} |
break; |
case ITEM_KILOMETERS: |
switch (itemId2) |
{ |
case ITEM_INCHES: |
/* 1 m = 39.370 in */ |
newValue = new Double(value * 1000 * 39.370); |
break; |
case ITEM_METERS: |
newValue = new Double(value * 1609.344); |
newValue = new Double(value * 1000); |
break; |
case ITEM_MILES: |
newValue = new Double(value / 1.609344); |
break; |
} |
break; |
} |
return newValue.toString(); |
/trunk/src/ch/ffhs/converter/app/CurrenciesActivity.java |
---|
1,232 → 1,51 |
/* |
* Copyright (C) 2008 The Android Open Source Project |
* |
* Licensed under the Apache License, Version 2.0 (the "License"); |
* you may not use this file except in compliance with the License. |
* You may obtain a copy of the License at |
* |
* http://www.apache.org/licenses/LICENSE-2.0 |
* |
* Unless required by applicable law or agreed to in writing, software |
* distributed under the License is distributed on an "AS IS" BASIS, |
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. |
* See the License for the specific language governing permissions and |
* limitations under the License. |
*/ |
package ch.ffhs.converter.app; |
import java.util.HashMap; |
// Need the following import to get access to the app resources, since this |
// class is in a sub-package. |
import android.app.Activity; |
import android.os.Bundle; |
import android.text.Editable; |
import android.view.KeyEvent; |
import android.view.View; |
import android.view.View.OnKeyListener; |
import android.widget.AdapterView; |
import android.widget.AdapterView.OnItemSelectedListener; |
import android.widget.EditText; |
import android.widget.Spinner; |
import ch.ffhs.converter.R; |
/** |
* Activity that implements currency conversion |
* <h3>Dialog Activity</h3> |
* |
* @author pelinux |
* <p> |
* This demonstrates the how to write an activity that looks like a pop-up |
* dialog with a custom theme using a different text color. |
* </p> |
*/ |
public class CurrenciesActivity extends Activity |
{ |
/* |
* Constants for mapping value strings to internal IDs |
*/ |
private static final String VALUE_CHF = "CHF"; //$NON-NLS-1$ |
private static final String VALUE_EUR = "EUR"; //$NON-NLS-1$ |
private static final String VALUE_USD = "USD"; //$NON-NLS-1$ |
private static final int ITEM_CHF = 0; |
private static final int ITEM_EUR = 1; |
private static final int ITEM_USD = 2; |
/** |
* Maps value strings to internal IDs |
* Initialization of the Activity after it is first created. Must at least |
* call {@link android.app.Activity#setContentView setContentView()} to |
* describe what is to be displayed in the screen. |
*/ |
private final static HashMap<String, Integer> valueToId = |
new HashMap<String, Integer>(); |
static |
{ |
CurrenciesActivity.valueToId.put(CurrenciesActivity.VALUE_CHF, |
CurrenciesActivity.ITEM_CHF); |
CurrenciesActivity.valueToId.put(CurrenciesActivity.VALUE_EUR, |
CurrenciesActivity.ITEM_EUR); |
CurrenciesActivity.valueToId.put(CurrenciesActivity.VALUE_USD, |
CurrenciesActivity.ITEM_USD); |
} |
/* Unit spinners (dropdowns) */ |
private Spinner spinnerUnit1; |
private Spinner spinnerUnit2; |
/** Called when the activity is first created. */ |
@Override |
public void onCreate(Bundle savedInstanceState) |
protected void onCreate(Bundle savedInstanceState) |
{ |
// Be sure to call the super class. |
super.onCreate(savedInstanceState); |
this.setContentView(R.layout.activity_currencies); |
final EditText editValue1 = |
(EditText) this.findViewById(R.id.currencies_edit_value1); |
final EditText editValue2 = |
(EditText) this.findViewById(R.id.currencies_edit_value2); |
final OnKeyListener editValue1OnKey = new OnKeyListener() { |
@Override |
public boolean onKey(View v, int keyCode, KeyEvent event) |
{ |
Editable editable1 = ((EditText) v).getText(); |
Double value1; |
try |
{ |
value1 = Double.parseDouble(editable1.toString()); |
} |
catch (NumberFormatException e) |
{ |
value1 = null; |
} |
String string2 = ""; //$NON-NLS-1$ |
if (value1 != null) |
{ |
string2 = CurrenciesActivity.this.getConvertedValue(value1, false); |
} |
editValue2.setText(string2); |
return false; |
} |
}; |
editValue1.setOnKeyListener(editValue1OnKey); |
final OnKeyListener editValue2OnKey = new OnKeyListener() { |
@Override |
public boolean onKey(View v, int keyCode, KeyEvent event) |
{ |
Editable editable2 = ((EditText) v).getText(); |
Double value2; |
try |
{ |
value2 = Double.parseDouble(editable2.toString()); |
} |
catch (NumberFormatException e) |
{ |
value2 = null; |
} |
String string1 = ""; //$NON-NLS-1$ |
if (value2 != null) |
{ |
string1 = CurrenciesActivity.this.getConvertedValue(value2, true); |
} |
editValue1.setText(string1); |
return false; |
} |
}; |
editValue2.setOnKeyListener(editValue2OnKey); |
this.spinnerUnit1 = |
(Spinner) this.findViewById(R.id.currencies_spinner_unit1); |
this.spinnerUnit2 = |
(Spinner) this.findViewById(R.id.currencies_spinner_unit2); |
this.spinnerUnit1.setOnItemSelectedListener(new OnItemSelectedListener() { |
@Override |
public void onItemSelected(AdapterView<?> arg0, View arg1, int arg2, |
long arg3) |
{ |
/* Simulate input in second EditText so that first EditText is updated */ |
editValue2OnKey.onKey(editValue2, 0, null); |
} |
@Override |
public void onNothingSelected(AdapterView<?> arg0) |
{ |
/* no-op */ |
} |
}); |
this.spinnerUnit2.setSelection(1); |
this.spinnerUnit2.setOnItemSelectedListener(new OnItemSelectedListener() { |
@Override |
public void onItemSelected(AdapterView<?> arg0, View arg1, int arg2, |
long arg3) |
{ |
/* Simulate input in first EditText so that second EditText is updated */ |
editValue1OnKey.onKey(editValue1, 0, null); |
} |
@Override |
public void onNothingSelected(AdapterView<?> arg0) |
{ |
/* no-op */ |
} |
}); |
// See assets/res/any/layout/dialog_activity.xml for this |
// view layout definition, which is being set here as |
// the content of our screen. |
this.setContentView(R.layout.custom_dialog_activity); |
} |
/** |
* @param value |
* @return |
*/ |
private String getConvertedValue(double value, boolean reverse) |
{ |
int selectedItemPosition1 = this.spinnerUnit1.getSelectedItemPosition(); |
int selectedItemPosition2 = this.spinnerUnit2.getSelectedItemPosition(); |
String[] itemArray = |
this.getResources().getStringArray(R.array.currency_units_values); |
String selectedItemValue1 = itemArray[selectedItemPosition1]; |
String selectedItemValue2 = itemArray[selectedItemPosition2]; |
if (reverse) |
{ |
String tmp = selectedItemValue1; |
selectedItemValue1 = selectedItemValue2; |
selectedItemValue2 = tmp; |
} |
int itemId1 = CurrenciesActivity.valueToId.get(selectedItemValue1); |
int itemId2 = CurrenciesActivity.valueToId.get(selectedItemValue2); |
Double newValue = value; |
switch (itemId1) |
{ |
case ITEM_CHF: |
switch (itemId2) |
{ |
case ITEM_EUR: |
newValue = new Double(value * 0.767842293); |
break; |
case ITEM_USD: |
newValue = new Double(value * 1.03413); |
break; |
} |
break; |
case ITEM_EUR: |
switch (itemId2) |
{ |
case ITEM_CHF: |
newValue = new Double(value * 1.30235077); |
break; |
case ITEM_USD: |
newValue = new Double(value * 1.3468); |
break; |
} |
break; |
case ITEM_USD: |
switch (itemId2) |
{ |
case ITEM_CHF: |
newValue = new Double(value * 0.966996412); |
break; |
case ITEM_EUR: |
newValue = new Double(value * 0.742500743); |
break; |
} |
break; |
} |
return newValue.toString(); |
} |
} |
/trunk/src/ch/ffhs/converter/app/TemperaturesActivity.java |
---|
1,263 → 1,57 |
/* |
* Copyright (C) 2008 The Android Open Source Project |
* |
* Licensed under the Apache License, Version 2.0 (the "License"); |
* you may not use this file except in compliance with the License. |
* You may obtain a copy of the License at |
* |
* http://www.apache.org/licenses/LICENSE-2.0 |
* |
* Unless required by applicable law or agreed to in writing, software |
* distributed under the License is distributed on an "AS IS" BASIS, |
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. |
* See the License for the specific language governing permissions and |
* limitations under the License. |
*/ |
package ch.ffhs.converter.app; |
import java.util.HashMap; |
// Need the following import to get access to the app resources, since this |
// class is in a sub-package. |
import android.app.Activity; |
import android.os.Bundle; |
import android.text.Editable; |
import android.view.KeyEvent; |
import android.view.View; |
import android.view.View.OnKeyListener; |
import android.widget.AdapterView; |
import android.widget.AdapterView.OnItemSelectedListener; |
import android.widget.EditText; |
import android.widget.Spinner; |
import android.widget.TextView; |
import android.view.Window; |
import ch.ffhs.converter.R; |
/** |
* Activity that implements length conversion |
* <h3>Dialog Activity</h3> |
* |
* @author pelinux |
* <p> |
* This demonstrates the how to write an activity that looks like a pop-up |
* dialog. |
* </p> |
*/ |
public class TemperaturesActivity extends Activity |
{ |
/** |
* |
* Initialization of the Activity after it is first created. Must at least |
* call {@link android.app.Activity#setContentView setContentView()} to |
* describe what is to be displayed in the screen. |
*/ |
private static final String MSG_BELOW_ABS_ZERO = "K must be >= 0"; |
/* |
* Constants for mapping value strings to internal IDs |
*/ |
private static final String VALUE_CELSIUS = "C"; //$NON-NLS-1$ |
private static final String VALUE_FAHRENHEIT = "F"; //$NON-NLS-1$ |
private static final String VALUE_KELVIN = "K"; //$NON-NLS-1$ |
private static final int ITEM_CELSIUS = 0; |
private static final int ITEM_FAHRENHEIT = 1; |
private static final int ITEM_KELVIN = 2; |
/** |
* Maps value strings to internal IDs |
*/ |
private final static HashMap<String, Integer> valueToId = |
new HashMap<String, Integer>(); |
/* Unit spinners (dropdowns) */ |
private Spinner spinnerUnit1; |
private Spinner spinnerUnit2; |
/* Hint that value is off scale */ |
private TextView textOffScale; |
static |
{ |
TemperaturesActivity.valueToId.put(TemperaturesActivity.VALUE_CELSIUS, |
TemperaturesActivity.ITEM_CELSIUS); |
TemperaturesActivity.valueToId.put(TemperaturesActivity.VALUE_FAHRENHEIT, |
TemperaturesActivity.ITEM_FAHRENHEIT); |
TemperaturesActivity.valueToId.put(TemperaturesActivity.VALUE_KELVIN, |
TemperaturesActivity.ITEM_KELVIN); |
} |
/** Called when the activity is first created. */ |
@Override |
public void onCreate(Bundle savedInstanceState) |
protected void onCreate(Bundle savedInstanceState) |
{ |
// Be sure to call the super class. |
super.onCreate(savedInstanceState); |
this.setContentView(R.layout.activity_temperatures); |
this.textOffScale = |
(TextView) this.findViewById(R.id.temperatures_text_off_scale); |
this.requestWindowFeature(Window.FEATURE_LEFT_ICON); |
final EditText editValue1 = |
(EditText) this.findViewById(R.id.temperatures_edit_value1); |
final EditText editValue2 = |
(EditText) this.findViewById(R.id.temperatures_edit_value2); |
// See assets/res/any/layout/dialog_activity.xml for this |
// view layout definition, which is being set here as |
// the content of our screen. |
this.setContentView(R.layout.dialog_activity); |
final OnKeyListener editValue1OnKey = new OnKeyListener() { |
@Override |
public boolean onKey(View v, int keyCode, KeyEvent event) |
{ |
Editable editable1 = ((EditText) v).getText(); |
Double value1; |
try |
{ |
value1 = Double.parseDouble(editable1.toString()); |
} |
catch (NumberFormatException e) |
{ |
value1 = null; |
} |
String string2 = ""; //$NON-NLS-1$ |
if (value1 != null) |
{ |
string2 = TemperaturesActivity.this.getConvertedValue(value1, false); |
} |
editValue2.setText(string2); |
return false; |
} |
}; |
editValue1.setOnKeyListener(editValue1OnKey); |
final OnKeyListener editValue2OnKey = new OnKeyListener() { |
@Override |
public boolean onKey(View v, int keyCode, KeyEvent event) |
{ |
Editable editable2 = ((EditText) v).getText(); |
Double value2; |
try |
{ |
value2 = Double.parseDouble(editable2.toString()); |
} |
catch (NumberFormatException e) |
{ |
value2 = null; |
} |
String string1 = ""; //$NON-NLS-1$ |
if (value2 != null) |
{ |
string1 = TemperaturesActivity.this.getConvertedValue(value2, true); |
} |
editValue1.setText(string1); |
return false; |
} |
}; |
editValue2.setOnKeyListener(editValue2OnKey); |
this.spinnerUnit1 = |
(Spinner) this.findViewById(R.id.temperatures_spinner_unit1); |
this.spinnerUnit2 = |
(Spinner) this.findViewById(R.id.temperatures_spinner_unit2); |
this.spinnerUnit1.setOnItemSelectedListener(new OnItemSelectedListener() { |
@Override |
public void onItemSelected(AdapterView<?> arg0, View arg1, int arg2, |
long arg3) |
{ |
/* Simulate input in second EditText so that first EditText is updated */ |
editValue2OnKey.onKey(editValue2, 0, null); |
} |
@Override |
public void onNothingSelected(AdapterView<?> arg0) |
{ |
/* no-op */ |
} |
}); |
this.spinnerUnit2.setSelection(1); |
this.spinnerUnit2.setOnItemSelectedListener(new OnItemSelectedListener() { |
@Override |
public void onItemSelected(AdapterView<?> arg0, View arg1, int arg2, |
long arg3) |
{ |
/* Simulate input in first EditText so that second EditText is updated */ |
editValue1OnKey.onKey(editValue1, 0, null); |
} |
@Override |
public void onNothingSelected(AdapterView<?> arg0) |
{ |
/* no-op */ |
} |
}); |
this.getWindow().setFeatureDrawableResource(Window.FEATURE_LEFT_ICON, |
android.R.drawable.ic_dialog_alert); |
} |
/** |
* @param value |
* @return |
*/ |
private String getConvertedValue(double value, boolean reverse) |
{ |
int selectedItemPosition1 = this.spinnerUnit1.getSelectedItemPosition(); |
int selectedItemPosition2 = this.spinnerUnit2.getSelectedItemPosition(); |
String[] itemArray = |
this.getResources().getStringArray(R.array.temperature_units_values); |
String selectedItemValue1 = itemArray[selectedItemPosition1]; |
String selectedItemValue2 = itemArray[selectedItemPosition2]; |
if (reverse) |
{ |
String tmp = selectedItemValue1; |
selectedItemValue1 = selectedItemValue2; |
selectedItemValue2 = tmp; |
} |
int itemId1 = TemperaturesActivity.valueToId.get(selectedItemValue1); |
int itemId2 = TemperaturesActivity.valueToId.get(selectedItemValue2); |
Double newValue = value; |
this.textOffScale.setVisibility(View.INVISIBLE); |
switch (itemId1) |
{ |
case ITEM_CELSIUS: |
switch (itemId2) |
{ |
case ITEM_FAHRENHEIT: |
newValue = new Double(value * 9.0 / 5 + 32); |
break; |
case ITEM_KELVIN: |
newValue = new Double(value + 273.15); |
if (newValue < 0.0) |
{ |
this.textOffScale.setVisibility(View.VISIBLE); |
return "*" + newValue.toString(); |
} |
break; |
} |
break; |
case ITEM_FAHRENHEIT: |
switch (itemId2) |
{ |
case ITEM_CELSIUS: |
newValue = new Double((value - 32) * 5.0 / 9); |
break; |
case ITEM_KELVIN: |
newValue = new Double((value + 459.67) * 5.0 / 9); |
if (newValue < 0.0) |
{ |
this.textOffScale.setVisibility(View.VISIBLE); |
return "*" + newValue.toString(); |
} |
break; |
} |
break; |
case ITEM_KELVIN: |
if (value < 0.0) |
{ |
return TemperaturesActivity.MSG_BELOW_ABS_ZERO; |
} |
switch (itemId2) |
{ |
case ITEM_CELSIUS: |
newValue = new Double(value - 273.15); |
break; |
case ITEM_FAHRENHEIT: |
newValue = new Double(value * 9.0 / 5 - 459.67); |
break; |
} |
break; |
} |
return newValue.toString(); |
} |
} |
/trunk/bin/FFHS-Converter.apk |
---|
Cannot display: file marked as a binary type. |
svn:mime-type = application/octet-stream |
/trunk/bin/resources.ap_ |
---|
Cannot display: file marked as a binary type. |
svn:mime-type = application/octet-stream |
/trunk/bin/ch/ffhs/converter/R$string.class |
---|
Cannot display: file marked as a binary type. |
svn:mime-type = application/octet-stream |
/trunk/bin/ch/ffhs/converter/app/TemperaturesActivity.class |
---|
Cannot display: file marked as a binary type. |
svn:mime-type = application/octet-stream |
Property changes: |
Added: svn:mime-type |
## -0,0 +1 ## |
+application/octet-stream |
\ No newline at end of property |
Index: bin/ch/ffhs/converter/app/CurrenciesActivity.class |
=================================================================== |
Cannot display: file marked as a binary type. |
svn:mime-type = application/octet-stream |
/bin/ch/ffhs/converter/app/CurrenciesActivity.class |
---|
Property changes: |
Added: svn:mime-type |
## -0,0 +1 ## |
+application/octet-stream |
\ No newline at end of property |
Index: bin/ch/ffhs/converter/app/LengthsActivity.class |
=================================================================== |
Cannot display: file marked as a binary type. |
svn:mime-type = application/octet-stream |
Index: bin/ch/ffhs/converter/R$raw.class |
=================================================================== |
Cannot display: file marked as a binary type. |
svn:mime-type = application/octet-stream |
Index: bin/ch/ffhs/converter/R$id.class |
=================================================================== |
Cannot display: file marked as a binary type. |
svn:mime-type = application/octet-stream |
Index: bin/ch/ffhs/converter/R$layout.class |
=================================================================== |
Cannot display: file marked as a binary type. |
svn:mime-type = application/octet-stream |
Index: bin/ch/ffhs/converter/R$array.class |
=================================================================== |
Cannot display: file marked as a binary type. |
svn:mime-type = application/octet-stream |
Index: bin/ch/ffhs/converter/R$xml.class |
=================================================================== |
Cannot display: file marked as a binary type. |
svn:mime-type = application/octet-stream |
Index: bin/ch/ffhs/converter/R$attr.class |
=================================================================== |
Cannot display: file marked as a binary type. |
svn:mime-type = application/octet-stream |
Index: bin/ch/ffhs/converter/R$drawable.class |
=================================================================== |
Cannot display: file marked as a binary type. |
svn:mime-type = application/octet-stream |
Index: bin/classes.dex |
=================================================================== |
Cannot display: file marked as a binary type. |
svn:mime-type = application/octet-stream |
Index: res/values/arrays.xml |
=================================================================== |
--- res/values/arrays.xml (revision 7) |
+++ res/values/arrays.xml (revision 6) |
@@ -1,39 +1,57 @@ |
<?xml version="1.0" encoding="utf-8"?> |
<resources> |
- <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="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="temperature_units_display"> |
- <item>°C (Celsius)</item> |
- <item>°F (Fahrenheit)</item> |
- <item>K (Kelvin)</item> |
+ <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> |
- <string-array name="temperature_units_values"> |
- <item>C</item> |
- <item>F</item> |
- <item>K</item> |
+ |
+ <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> |
- <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> |
+ <!-- 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> |
</resources> |
/trunk/res/values/strings.xml |
---|
1,15 → 1,35 |
<?xml version="1.0" encoding="utf-8"?> |
<resources> |
<string name="app_name">Converter</string> |
<string name="title">Android Unit Converter</string> |
<string name="title">Android Einheiten-Umrechner</string> |
<string name="activity_lengths">Lengths</string> |
<string name="activity_lengths">Längenmasse</string> |
<string name="hello_world"><b>Hello, <i>World!</i></b></string> |
<string name="activity_temperatures">Temperatures</string> |
<string name="temperatures_off_scale"><sup>*</sup> Value is off the scale</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_currencies">Currencies</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="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/xml/default_values_old.xml |
---|
19,6 → 19,26 |
<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> |
/trunk/res/layout/activity_currencies.xml |
---|
File deleted |
Property changes: |
Deleted: svn:mime-type |
## -1 +0,0 ## |
-text/plain |
\ No newline at end of property |
Index: res/layout/activity_temperatures.xml |
=================================================================== |
--- res/layout/activity_temperatures.xml (revision 7) |
+++ res/layout/activity_temperatures.xml (nonexistent) |
@@ -1,34 +0,0 @@ |
-<?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> |
/res/layout/activity_temperatures.xml |
---|
Property changes: |
Deleted: svn:mime-type |
## -1 +0,0 ## |
-text/plain |
\ No newline at end of property |
Index: res/layout/frm_temperatures.xml |
=================================================================== |
--- res/layout/frm_temperatures.xml (nonexistent) |
+++ res/layout/frm_temperatures.xml (revision 6) |
@@ -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_width="wrap_content" |
+ android:layout_height="wrap_content"> |
+ |
+<TextView |
+ android:layout_width="fill_parent" |
+ android:layout_height="wrap_content" |
+ android:text="@string/prompt02" |
+ /> |
+ |
+<EditText android:id="@+id/et_temperatur" |
+ android:layout_width="fill_parent" |
+ android:layout_height="wrap_content" |
+ android:inputType="numberDecimal" /> |
+ |
+<Spinner android:id="@+id/sp_s_tunit" |
+ android:layout_width="fill_parent" |
+ android:layout_height="wrap_content" |
+ android:drawSelectorOnTop="true" |
+ android:entries="@array/tem_display" |
+ android:entryValues="@array/tem_values" /> |
+ |
+<Spinner android:id="@+id/sp_t_tunit" |
+ android:layout_width="fill_parent" |
+ android:layout_height="wrap_content" |
+ android:drawSelectorOnTop="true" |
+ android:entries="@array/tem_display" |
+ android:entryValues="@array/tem_values" /> |
+ |
+ |
+</LinearLayout> |
/res/layout/frm_temperatures.xml |
---|
Property changes: |
Added: svn:mime-type |
## -0,0 +1 ## |
+text/plain |
\ No newline at end of property |
Index: res/layout/custom_dialog_activity.xml |
=================================================================== |
--- res/layout/custom_dialog_activity.xml (nonexistent) |
+++ res/layout/custom_dialog_activity.xml (revision 6) |
@@ -0,0 +1,24 @@ |
+<?xml version="1.0" encoding="utf-8"?> |
+<!-- Copyright (C) 2008 The Android Open Source Project |
+ |
+ Licensed under the Apache License, Version 2.0 (the "License"); |
+ you may not use this file except in compliance with the License. |
+ You may obtain a copy of the License at |
+ |
+ http://www.apache.org/licenses/LICENSE-2.0 |
+ |
+ Unless required by applicable law or agreed to in writing, software |
+ distributed under the License is distributed on an "AS IS" BASIS, |
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. |
+ See the License for the specific language governing permissions and |
+ limitations under the License. |
+--> |
+ |
+<!-- Demonstrates an activity with a custom dialog theme. |
+ See corresponding Java code com.android.sdk.app.CustomDialogActivity.java. --> |
+ |
+<!-- This screen consists of a single text field that displays some text. --> |
+<TextView xmlns:android="http://schemas.android.com/apk/res/android" android:id="@+id/text" |
+ android:layout_width="match_parent" android:layout_height="match_parent" |
+ android:gravity="center_vertical|center_horizontal" |
+ android:text="@string/custom_dialog_activity_text"/> |
/res/layout/custom_dialog_activity.xml |
---|
Property changes: |
Added: svn:mime-type |
## -0,0 +1 ## |
+text/plain |
\ No newline at end of property |
Index: res/layout/hello_world.xml |
=================================================================== |
--- res/layout/hello_world.xml (nonexistent) |
+++ res/layout/hello_world.xml (revision 6) |
@@ -0,0 +1,25 @@ |
+<?xml version="1.0" encoding="utf-8"?> |
+<!-- Copyright (C) 2007 The Android Open Source Project |
+ |
+ Licensed under the Apache License, Version 2.0 (the "License"); |
+ you may not use this file except in compliance with the License. |
+ You may obtain a copy of the License at |
+ |
+ http://www.apache.org/licenses/LICENSE-2.0 |
+ |
+ Unless required by applicable law or agreed to in writing, software |
+ distributed under the License is distributed on an "AS IS" BASIS, |
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. |
+ See the License for the specific language governing permissions and |
+ limitations under the License. |
+--> |
+ |
+<!-- Demonstrates basic application screen. |
+ See corresponding Java code com.android.sdk.app.HelloWorld.java. --> |
+ |
+<!-- This screen consists of a single text field that |
+ displays our "Hello, World!" text. --> |
+<TextView xmlns:android="http://schemas.android.com/apk/res/android" android:id="@+id/text" |
+ android:layout_width="match_parent" android:layout_height="match_parent" |
+ android:gravity="center_vertical|center_horizontal" |
+ android:text="@string/hello_world"/> |
/res/layout/hello_world.xml |
---|
Property changes: |
Added: svn:mime-type |
## -0,0 +1 ## |
+text/plain |
\ No newline at end of property |
Index: res/layout/dialog_activity.xml |
=================================================================== |
--- res/layout/dialog_activity.xml (nonexistent) |
+++ res/layout/dialog_activity.xml (revision 6) |
@@ -0,0 +1,24 @@ |
+<?xml version="1.0" encoding="utf-8"?> |
+<!-- Copyright (C) 2008 The Android Open Source Project |
+ |
+ Licensed under the Apache License, Version 2.0 (the "License"); |
+ you may not use this file except in compliance with the License. |
+ You may obtain a copy of the License at |
+ |
+ http://www.apache.org/licenses/LICENSE-2.0 |
+ |
+ Unless required by applicable law or agreed to in writing, software |
+ distributed under the License is distributed on an "AS IS" BASIS, |
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. |
+ See the License for the specific language governing permissions and |
+ limitations under the License. |
+--> |
+ |
+<!-- Demonstrates an activity with a dialog theme. |
+ See corresponding Java code com.android.sdk.app.DialogActivity.java. --> |
+ |
+<!-- This screen consists of a single text field that displays some text. --> |
+<TextView xmlns:android="http://schemas.android.com/apk/res/android" android:id="@+id/text" |
+ android:layout_width="match_parent" android:layout_height="match_parent" |
+ android:gravity="center_vertical|center_horizontal" |
+ android:text="@string/dialog_activity_text"/> |
/res/layout/dialog_activity.xml |
---|
Property changes: |
Added: svn:mime-type |
## -0,0 +1 ## |
+text/plain |
\ No newline at end of property |
Index: res/layout/frm_currency.xml |
=================================================================== |
--- res/layout/frm_currency.xml (nonexistent) |
+++ res/layout/frm_currency.xml (revision 6) |
@@ -0,0 +1,33 @@ |
+<?xml version="1.0" encoding="utf-8"?> |
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" |
+ android:orientation="vertical" |
+ android:layout_width="fill_parent" |
+ android:layout_height="fill_parent" |
+ > |
+ |
+<TextView |
+ android:layout_width="fill_parent" |
+ android:layout_height="wrap_content" |
+ android:text="@string/prompt01" |
+ /> |
+ |
+<EditText android:id="@+id/et_amount" |
+ android:layout_width="fill_parent" |
+ android:layout_height="wrap_content" |
+ android:inputType="numberDecimal" /> |
+ |
+<Spinner android:id="@+id/sp_s_currencies" |
+ android:layout_width="fill_parent" |
+ android:layout_height="wrap_content" |
+ android:drawSelectorOnTop="true" |
+ android:entries="@array/cur_display" |
+ android:entryValues="@array/cur_values" /> |
+ |
+<Spinner android:id="@+id/sp_t_currencies" |
+ android:layout_width="fill_parent" |
+ android:layout_height="wrap_content" |
+ android:drawSelectorOnTop="true" |
+ android:entries="@array/cur_display" |
+ android:entryValues="@array/cur_values" /> |
+ |
+</LinearLayout> |
/res/layout/frm_currency.xml |
---|
Property changes: |
Added: svn:mime-type |
## -0,0 +1 ## |
+text/plain |
\ No newline at end of property |