updates

.gitignore

@@ -2,4 +2,6 @@ bin
 gen
 build
 .metadata
-classes
+classes
+External Plug-in Libraries/
+

.gitignore~

@@ -0,0 +1,5 @@
+bin
+gen
+build
+.metadata
+classes

de.vogella.android.temperature/AndroidManifest.xml

@@ -1,18 +1,20 @@
-<?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="de.vogella.android.temperature"
     android:versionCode="1"
     android:versionName="1.0" >
 
-    <uses-sdk android:minSdkVersion="14" />
+    <uses-sdk
+        android:minSdkVersion="14"
+        android:targetSdkVersion="15" />
 
     <application
         android:icon="@drawable/ic_launcher"
-        android:label="@string/app_name" >
+        android:label="@string/app_name"
+        android:theme="@style/AppTheme" >
         <activity
-            android:label="@string/app_name"
-            android:name=".ConvertActivity" >
-            <intent-filter >
+            android:name=".MainActivity"
+            android:label="@string/title_activity_main" >
+            <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
 
                 <category android:name="android.intent.category.LAUNCHER" />

de.vogella.android.temperature/proguard-project.txt

@@ -0,0 +1,20 @@
+# To enable ProGuard in your project, edit project.properties
+# to define the proguard.config property as described in that file.
+#
+# Add project specific ProGuard rules here.
+# By default, the flags in this file are appended to flags specified
+# in ${sdk.dir}/tools/proguard/proguard-android.txt
+# You can edit the include path and order by changing the ProGuard
+# include property in project.properties.
+#
+# For more details, see
+#   http://developer.android.com/guide/developing/tools/proguard.html
+
+# Add any project specific keep options here:
+
+# If your project uses WebView with JS, uncomment the following
+# and specify the fully qualified class name to the JavaScript interface
+# class:
+#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
+#   public *;
+#}

de.vogella.android.temperature/project.properties

@@ -3,9 +3,12 @@
 #
 # This file must be checked in Version Control Systems.
 #
-# To customize properties used by the Ant build system use,
+# To customize properties used by the Ant build system edit
 # "ant.properties", and override values to adapt the script to your
 # project structure.
+#
+# To enable ProGuard to shrink and obfuscate your code, uncomment this (available properties: sdk.dir, user.home):
+#proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt:proguard-project.txt
 
 # Project target.
-target=android-15
+target=android-16

de.vogella.android.temperature/res/layout/activity_main.xml

@@ -0,0 +1,50 @@
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:background="@color/myColor" >
+
+    <EditText
+        android:id="@+id/editText1"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_alignParentLeft="true"
+        android:layout_alignParentTop="true"
+        android:ems="10"
+        android:inputType="numberSigned|numberDecimal"
+         >
+
+        <requestFocus />
+    </EditText>
+
+    <RadioGroup
+        android:id="@+id/radioGroup1"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_alignParentLeft="true"
+        android:layout_below="@+id/editText1" >
+
+        <RadioButton
+            android:id="@+id/radio0"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:checked="true"
+            android:text="@string/celsius" />
+
+        <RadioButton
+            android:id="@+id/radio1"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="@string/fahrenheit" />
+    </RadioGroup>
+
+    <Button
+        android:id="@+id/button1"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_alignParentLeft="true"
+        android:layout_below="@+id/radioGroup1"
+        android:onClick="onClick"
+        android:text="@string/calc" />
+
+</RelativeLayout>

de.vogella.android.temperature/res/menu/activity_main.xml

@@ -0,0 +1,6 @@
+<menu xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:id="@+id/menu_settings"
+        android:title="@string/menu_settings"
+        android:orderInCategory="100"
+        android:showAsAction="never" />
+</menu>

de.vogella.android.temperature/res/values-v11/styles.xml

@@ -0,0 +1,5 @@
+<resources>
+
+    <style name="AppTheme" parent="android:Theme.Holo.Light" />
+
+</resources>

de.vogella.android.temperature/res/values-v14/styles.xml

@@ -0,0 +1,5 @@
+<resources>
+
+    <style name="AppTheme" parent="android:Theme.Holo.Light.DarkActionBar" />
+
+</resources>

de.vogella.android.temperature/res/values/strings.xml

@@ -1,11 +1,11 @@
-<?xml version="1.0" encoding="utf-8"?>
 <resources>
 
-    <string name="hello">Hello World, ConvertActivity!</string>
-    <string name="app_name">Temparature Converter</string>
-    <color name="myColor">#3399CC</color>
-    <string name="myClickHandler">myClickHandler</string>
-    <string name="celsius">to Celsius</string>
+    <string name="app_name">Temparature Convertor</string>
+    <string name="hello_world">Hello world!</string>
+    <string name="menu_settings">Settings</string>
+    <string name="title_activity_main">Temparature Convertor</string>
+    <color name="myColor">#F5F5F5</color>
+    <string name="celsius" >to Celsius</string>
     <string name="fahrenheit">to Fahrenheit</string>
     <string name="calc">Calculate</string>
 

de.vogella.android.temperature/res/values/styles.xml

@@ -0,0 +1,5 @@
+<resources>
+
+    <style name="AppTheme" parent="android:Theme.Light" />
+
+</resources>

de.vogella.android.temperature/src/de/vogella/android/temperature/ConvertActivity.java → de.vogella.android.temperature/src/de/vogella/android/temperature/MainActivity.java

@@ -7,20 +7,20 @@
 import android.widget.RadioButton;
 import android.widget.Toast;
 
-public class ConvertActivity extends Activity {
+public class MainActivity extends Activity {
 	private EditText text;
 
 	@Override
 	public void onCreate(Bundle savedInstanceState) {
 		super.onCreate(savedInstanceState);
-		setContentView(R.layout.main);
+		setContentView(R.layout.activity_main);
 		text = (EditText) findViewById(R.id.editText1);
 
 	}
 
 	// This method is called at button click because we assigned the name to the
-	// "On Click property" of the button
-	public void myClickHandler(View view) {
+	// "OnClick property" of the button
+	public void onClick(View view) {
 		switch (view.getId()) {
 		case R.id.button1:
 			RadioButton celsiusButton = (RadioButton) findViewById(R.id.radio0);
@@ -56,4 +56,4 @@ private float convertFahrenheitToCelsius(float fahrenheit) {
 	private float convertCelsiusToFahrenheit(float celsius) {
 		return ((celsius * 9) / 5) + 32;
 	}
-}
+}