New buttons for AddUserActivity.java (back and save)

Resized buttons in PickUsername.java Reset username when clicking on back button in PickUsername.java New image for "New user" icon in PickUsername.java New binary.
chaosdorf · Oct 30, 2013 · 2a047dc · 2a047dc
1 parent 31c8492
commit 2a047dc
Show file tree

Hide file tree

Showing 29 changed files with 135 additions and 108 deletions.
diff --git a/gfx/add_person.png b/gfx/add_person.png
diff --git a/gfx/add_person.xcf b/gfx/add_person.xcf
diff --git a/meteroid/meteroid-meteroid.apk b/meteroid/meteroid-meteroid.apk
diff --git a/meteroid/src/main/AndroidManifest.xml b/meteroid/src/main/AndroidManifest.xml
@@ -1,15 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="de.chaosdorf.meteroid"
-    android:versionCode="3"
-    android:versionName="1.2">
+          package="de.chaosdorf.meteroid"
+          android:versionCode="4"
+          android:versionName="1.3">
 
     <uses-sdk
         android:minSdkVersion="9"
-        android:targetSdkVersion="18" />
+        android:targetSdkVersion="18"/>
 
-    <uses-permission android:name="android.permission.INTERNET" />
-    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
+    <uses-permission android:name="android.permission.INTERNET"/>
+    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
 
     <application
         android:allowBackup="true"
@@ -21,26 +21,26 @@
             android:name=".MainActivity"
             android:label="@string/app_name">
             <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.LAUNCHER" />
+                <action android:name="android.intent.action.MAIN"/>
+                <category android:name="android.intent.category.LAUNCHER"/>
             </intent-filter>
         </activity>
 
         <activity
             android:name=".SetHostname"
-            android:label="@string/set_hostname_label" />
+            android:label="@string/set_hostname_label"/>
 
         <activity
             android:name=".PickUsername"
-            android:label="@string/pick_username_label" />
+            android:label="@string/pick_username_label"/>
 
         <activity
             android:name=".BuyDrink"
-            android:label="@string/app_name" />
+            android:label="@string/buy_drink_label"/>
 
         <activity
             android:name=".AddUserActivity"
-            android:label="@string/app_name" />
+            android:label="@string/add_user_label"/>
 
     </application>
 

diff --git a/meteroid/src/main/java/de/chaosdorf/meteroid/AddUserActivity.java b/meteroid/src/main/java/de/chaosdorf/meteroid/AddUserActivity.java
@@ -6,7 +6,7 @@
 import android.os.Bundle;
 import android.preference.PreferenceManager;
 import android.view.View;
-import android.widget.Button;
+import android.widget.ImageButton;
 import android.widget.TextView;
 
 import java.util.Date;
@@ -28,13 +28,24 @@ protected void onCreate(Bundle savedInstanceState)
 		super.onCreate(savedInstanceState);
 		activity = this;
 		setContentView(R.layout.activity_add_user);
-		Button addButton = (Button) findViewById(R.id.button_add_user);
 
 		final TextView usernameText = (TextView) findViewById(R.id.username);
 		final TextView emailText = (TextView) findViewById(R.id.email);
 		final TextView balanceText = (TextView) findViewById(R.id.balance);
 		final SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(this);
 
+		final ImageButton backButton = (ImageButton) findViewById(R.id.button_back);
+		backButton.setOnClickListener(new View.OnClickListener()
+		{
+			public void onClick(View view)
+			{
+				Intent intent = new Intent(activity, PickUsername.class);
+				startActivity(intent);
+				finish();
+			}
+		});
+
+		final ImageButton addButton = (ImageButton) findViewById(R.id.button_add_user);
 		addButton.setOnClickListener(new View.OnClickListener()
 		{
 			@Override

diff --git a/meteroid/src/main/java/de/chaosdorf/meteroid/BuyDrink.java b/meteroid/src/main/java/de/chaosdorf/meteroid/BuyDrink.java
@@ -63,6 +63,7 @@ protected void onCreate(Bundle savedInstanceState)
 		{
 			public void onClick(View view)
 			{
+				Utility.resetUsername(activity);
 				Intent intent = new Intent(activity, PickUsername.class);
 				startActivity(intent);
 				finish();

diff --git a/meteroid/src/main/java/de/chaosdorf/meteroid/PickUsername.java b/meteroid/src/main/java/de/chaosdorf/meteroid/PickUsername.java
@@ -212,6 +212,11 @@ public View getView(int position, View convertView, ViewGroup parent)
 			icon.setContentDescription(user.getName());
 			label.setText(user.getName());
 
+			if (user.getId() == NEW_USER_ID)
+			{
+				icon.setImageDrawable(getResources().getDrawable(R.drawable.add_person));
+			}
+
 			return view;
 		}
 	}

diff --git a/...ain/res/drawable-hdpi/navigation_back.png → ...rc/main/res/drawable-hdpi/button_back.png b/...ain/res/drawable-hdpi/navigation_back.png → ...rc/main/res/drawable-hdpi/button_back.png
diff --git a/...n/res/drawable-hdpi/navigation_reload.png → .../main/res/drawable-hdpi/button_reload.png b/...n/res/drawable-hdpi/navigation_reload.png → .../main/res/drawable-hdpi/button_reload.png
diff --git a/meteroid/src/main/res/drawable-hdpi/button_save.png b/meteroid/src/main/res/drawable-hdpi/button_save.png
diff --git a/...ain/res/drawable-mdpi/navigation_back.png → ...rc/main/res/drawable-mdpi/button_back.png b/...ain/res/drawable-mdpi/navigation_back.png → ...rc/main/res/drawable-mdpi/button_back.png
diff --git a/...n/res/drawable-mdpi/navigation_reload.png → .../main/res/drawable-mdpi/button_reload.png b/...n/res/drawable-mdpi/navigation_reload.png → .../main/res/drawable-mdpi/button_reload.png
diff --git a/meteroid/src/main/res/drawable-mdpi/button_save.png b/meteroid/src/main/res/drawable-mdpi/button_save.png
diff --git a/...in/res/drawable-xhdpi/navigation_back.png → ...c/main/res/drawable-xhdpi/button_back.png b/...in/res/drawable-xhdpi/navigation_back.png → ...c/main/res/drawable-xhdpi/button_back.png
diff --git a/.../res/drawable-xhdpi/navigation_reload.png → ...main/res/drawable-xhdpi/button_reload.png b/.../res/drawable-xhdpi/navigation_reload.png → ...main/res/drawable-xhdpi/button_reload.png
diff --git a/meteroid/src/main/res/drawable-xhdpi/button_save.png b/meteroid/src/main/res/drawable-xhdpi/button_save.png
diff --git a/meteroid/src/main/res/drawable/add_person.png b/meteroid/src/main/res/drawable/add_person.png
diff --git a/...src/main/res/drawable/navigation_back.png → ...oid/src/main/res/drawable/button_back.png b/...src/main/res/drawable/navigation_back.png → ...oid/src/main/res/drawable/button_back.png
diff --git a/...c/main/res/drawable/navigation_reload.png → ...d/src/main/res/drawable/button_reload.png b/...c/main/res/drawable/navigation_reload.png → ...d/src/main/res/drawable/button_reload.png
diff --git a/meteroid/src/main/res/drawable/button_save.png b/meteroid/src/main/res/drawable/button_save.png
diff --git a/meteroid/src/main/res/layout/activity_add_user.xml b/meteroid/src/main/res/layout/activity_add_user.xml
@@ -1,29 +1,23 @@
 <?xml version="1.0" encoding="utf-8"?>
 
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="fill_parent"
-    android:layout_height="fill_parent"
-    android:orientation="vertical"
-    android:paddingLeft="@dimen/activity_horizontal_margin"
-    android:paddingRight="@dimen/activity_horizontal_margin"
-    android:paddingTop="@dimen/activity_vertical_margin"
-    android:paddingBottom="@dimen/activity_vertical_margin"
-    tools:context=".AddUserActivity">
-
-    <TextView
-        android:id="@+id/text"
-        android:text="@string/add_user_label"
-        android:layout_height="wrap_content"
-        android:layout_width="wrap_content" />
+              xmlns:tools="http://schemas.android.com/tools"
+              android:layout_width="fill_parent"
+              android:layout_height="fill_parent"
+              android:orientation="vertical"
+              android:paddingLeft="@dimen/activity_horizontal_margin"
+              android:paddingRight="@dimen/activity_horizontal_margin"
+              android:paddingTop="@dimen/activity_vertical_margin"
+              android:paddingBottom="@dimen/activity_vertical_margin"
+              tools:context=".AddUserActivity">
 
     <EditText
         android:id="@+id/username"
         android:hint="@string/add_user_username"
         android:layout_height="wrap_content"
         android:layout_width="fill_parent"
         android:password="false"
-        android:phoneNumber="false" />
+        android:phoneNumber="false"/>
 
     <EditText
         android:id="@+id/email"
@@ -32,7 +26,7 @@
         android:layout_width="fill_parent"
         android:password="false"
         android:phoneNumber="false"
-        android:inputType="textEmailAddress" />
+        android:inputType="textEmailAddress"/>
 
     <EditText
         android:id="@+id/balance"
@@ -41,13 +35,30 @@
         android:layout_width="fill_parent"
         android:password="false"
         android:phoneNumber="false"
-        android:numeric="decimal" />
+        android:numeric="decimal"/>
 
-    <Button
-        android:layout_width="wrap_content"
+    <LinearLayout
         android:layout_height="wrap_content"
-        android:text="@string/button_add"
-        android:id="@+id/button_add_user"
-        android:layout_gravity="center" />
+        android:layout_width="wrap_content"
+        android:orientation="horizontal"
+        android:layout_gravity="right"
+        >
+
+        <ImageButton
+            android:id="@+id/button_back"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="right"
+            android:src="@drawable/button_back"
+            android:contentDescription="@string/button_back"/>
+
+        <ImageButton
+            android:id="@+id/button_add_user"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:src="@drawable/button_save"
+            android:contentDescription="@string/button_save"/>
+
+    </LinearLayout>
 
 </LinearLayout>
diff --git a/meteroid/src/main/res/layout/activity_buy_drink.xml b/meteroid/src/main/res/layout/activity_buy_drink.xml
@@ -1,15 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
 
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="fill_parent"
-    android:layout_height="fill_parent"
-    android:orientation="vertical"
-    android:paddingLeft="@dimen/activity_horizontal_margin"
-    android:paddingRight="@dimen/activity_horizontal_margin"
-    android:paddingTop="@dimen/activity_vertical_margin"
-    android:paddingBottom="@dimen/activity_vertical_margin"
-    tools:context=".BuyDrink">
+              xmlns:tools="http://schemas.android.com/tools"
+              android:layout_width="fill_parent"
+              android:layout_height="fill_parent"
+              android:orientation="vertical"
+              android:paddingLeft="@dimen/activity_horizontal_margin"
+              android:paddingRight="@dimen/activity_horizontal_margin"
+              android:paddingTop="@dimen/activity_vertical_margin"
+              android:paddingBottom="@dimen/activity_vertical_margin"
+              tools:context=".BuyDrink">
 
     <!-- Display user data -->
     <LinearLayout
@@ -21,7 +21,7 @@
             android:id="@+id/icon"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:contentDescription="@string/app_name" />
+            android:contentDescription="@string/app_name"/>
 
         <LinearLayout
             android:orientation="vertical"
@@ -34,32 +34,32 @@
                 android:layout_width="200dp"
                 android:paddingLeft="9dip"
                 android:layout_height="wrap_content"
-                android:textSize="16sp" />
+                android:textSize="16sp"/>
 
             <TextView
                 android:id="@+id/balance"
                 android:layout_width="200dp"
                 android:paddingLeft="9dip"
                 android:layout_height="wrap_content"
-                android:textSize="16sp" />
+                android:textSize="16sp"/>
 
         </LinearLayout>
 
         <ImageButton
             android:id="@+id/button_back"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
+            android:layout_width="50dp"
+            android:layout_height="50dp"
             android:layout_gravity="right"
-            android:src="@drawable/navigation_back"
-            android:contentDescription="@string/button_back" />
+            android:src="@drawable/button_back"
+            android:contentDescription="@string/button_back"/>
 
         <ImageButton
             android:id="@+id/button_reload"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
+            android:layout_width="50dp"
+            android:layout_height="50dp"
             android:layout_gravity="right"
-            android:src="@drawable/navigation_reload"
-            android:contentDescription="@string/button_reload" />
+            android:src="@drawable/button_reload"
+            android:contentDescription="@string/button_reload"/>
 
     </LinearLayout>
 
@@ -69,14 +69,14 @@
         android:layout_height="fill_parent"
         android:textSize="16sp"
         android:visibility="gone"
-        android:text="@string/buy_drink_error" />
+        android:text="@string/buy_drink_error"/>
 
     <!-- Display drinks -->
     <ListView
         android:id="@+id/list_view"
         android:layout_width="fill_parent"
         android:layout_height="wrap_content"
         android:layout_marginTop="@dimen/activity_vertical_margin"
-        android:drawSelectorOnTop="false" />
+        android:drawSelectorOnTop="false"/>
 
 </LinearLayout>
diff --git a/meteroid/src/main/res/layout/activity_buy_drink_item.xml b/meteroid/src/main/res/layout/activity_buy_drink_item.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="fill_parent"
-    android:layout_height="80dip"
-    android:gravity="center_vertical"
-    android:ignoreGravity="@+id/icon">
+                android:layout_width="fill_parent"
+                android:layout_height="80dip"
+                android:gravity="center_vertical"
+                android:ignoreGravity="@+id/icon">
 
     <ImageView
         android:id="@+id/icon"
@@ -13,14 +13,14 @@
         android:layout_alignParentBottom="true"
         android:layout_width="70dp"
         android:layout_height="70dp"
-        android:contentDescription="@string/app_name" />
+        android:contentDescription="@string/app_name"/>
 
     <TextView
         android:id="@+id/label"
         android:paddingLeft="9dip"
         android:layout_width="fill_parent"
         android:layout_height="wrap_content"
         android:layout_toRightOf="@id/icon"
-        android:textSize="16sp" />
+        android:textSize="16sp"/>
 
 </RelativeLayout>
diff --git a/meteroid/src/main/res/layout/activity_pick_username.xml b/meteroid/src/main/res/layout/activity_pick_username.xml
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
 
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="fill_parent"
-    android:layout_height="fill_parent"
-    android:paddingLeft="@dimen/activity_horizontal_margin"
-    android:paddingRight="@dimen/activity_horizontal_margin"
-    android:paddingTop="@dimen/activity_vertical_margin"
-    android:paddingBottom="@dimen/activity_vertical_margin"
-    tools:context=".PickUsername">
+                xmlns:tools="http://schemas.android.com/tools"
+                android:layout_width="fill_parent"
+                android:layout_height="fill_parent"
+                android:paddingLeft="@dimen/activity_horizontal_margin"
+                android:paddingRight="@dimen/activity_horizontal_margin"
+                android:paddingTop="@dimen/activity_vertical_margin"
+                android:paddingBottom="@dimen/activity_vertical_margin"
+                tools:context=".PickUsername">
 
     <LinearLayout
         android:id="@+id/pick_username_error"
@@ -21,7 +21,7 @@
             android:layout_width="fill_parent"
             android:layout_height="wrap_content"
             android:textSize="16sp"
-            android:text="@string/pick_username_error" />
+            android:text="@string/pick_username_error"/>
 
         <LinearLayout
             android:layout_height="wrap_content"
@@ -34,16 +34,16 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_gravity="right"
-                android:src="@drawable/navigation_back"
-                android:contentDescription="@string/button_back" />
+                android:src="@drawable/button_back"
+                android:contentDescription="@string/button_back"/>
 
             <ImageButton
                 android:id="@+id/button_reload"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_gravity="right"
-                android:src="@drawable/navigation_reload"
-                android:contentDescription="@string/button_reload" />
+                android:src="@drawable/button_reload"
+                android:contentDescription="@string/button_reload"/>
 
         </LinearLayout>
     </LinearLayout>
@@ -56,9 +56,9 @@
         android:layout_height="fill_parent"
         android:columnWidth="100dp"
         android:numColumns="auto_fit"
-        android:verticalSpacing="10dp"
+        android:verticalSpacing="12dp"
         android:horizontalSpacing="5dp"
         android:stretchMode="columnWidth"
-        android:gravity="center" />
+        android:gravity="center"/>
 
 </RelativeLayout>