added layouts for leaderboard and challenge menus

RGood · Apr 2, 2014 · df68ba1 · df68ba1
1 parent 6e76989
commit df68ba1
Show file tree

Hide file tree

Showing 19 changed files with 348 additions and 69 deletions.
diff --git a/.classpath b/.classpath
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="src" path="src"/>
+	<classpathentry kind="src" path="gen"/>
+	<classpathentry kind="con" path="com.android.ide.eclipse.adt.ANDROID_FRAMEWORK"/>
+	<classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.LIBRARIES"/>
+	<classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.DEPENDENCIES"/>
+	<classpathentry kind="output" path="bin/classes"/>
+</classpath>
diff --git a/.project b/.project
@@ -1,11 +1,33 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>UMM-App</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-	</buildSpec>
-	<natures>
-	</natures>
-</projectDescription>
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>UMM-App</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>com.android.ide.eclipse.adt.ResourceManagerBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>com.android.ide.eclipse.adt.PreCompilerBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>com.android.ide.eclipse.adt.ApkBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>com.android.ide.eclipse.adt.AndroidNature</nature>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+	</natures>
+</projectDescription>
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
@@ -1,27 +1,27 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.example.umm_app"
-    android:versionCode="1"
-    android:versionName="1.0" >
-
-    <uses-sdk
-        android:minSdkVersion="8"
-        android:targetSdkVersion="18" />
-
-    <application
-        android:allowBackup="true"
-        android:icon="@drawable/ic_launcher"
-        android:label="@string/app_name"
-        android:theme="@style/AppTheme" >
-        <activity
-            android:name="com.example.umm_app.MainActivity"
-            android:label="@string/app_name" >
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-
-                <category android:name="android.intent.category.LAUNCHER" />
-            </intent-filter>
-        </activity>
-    </application>
-
-</manifest>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="com.example.umm_app"
+    android:versionCode="1"
+    android:versionName="1.0" >
+
+    <uses-sdk
+        android:minSdkVersion="8"
+        android:targetSdkVersion="18" />
+
+    <application
+        android:allowBackup="true"
+        android:icon="@drawable/ic_launcher"
+        android:label="@string/app_name"
+        android:theme="@style/AppTheme" >
+        <activity
+            android:name="com.example.umm_app.MainActivity"
+            android:label="@string/app_name" >
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+
+                <category android:name="android.intent.category.LAUNCHER" />
+            </intent-filter>
+        </activity>
+    </application>
+
+</manifest>
diff --git a/bin/AndroidManifest.xml b/bin/AndroidManifest.xml
@@ -1,27 +1,27 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.example.umm_app"
-    android:versionCode="1"
-    android:versionName="1.0" >
-
-    <uses-sdk
-        android:minSdkVersion="8"
-        android:targetSdkVersion="18" />
-
-    <application
-        android:allowBackup="true"
-        android:icon="@drawable/ic_launcher"
-        android:label="@string/app_name"
-        android:theme="@style/AppTheme" >
-        <activity
-            android:name="com.example.umm_app.MainActivity"
-            android:label="@string/app_name" >
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-
-                <category android:name="android.intent.category.LAUNCHER" />
-            </intent-filter>
-        </activity>
-    </application>
-
-</manifest>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="com.example.umm_app"
+    android:versionCode="1"
+    android:versionName="1.0" >
+
+    <uses-sdk
+        android:minSdkVersion="8"
+        android:targetSdkVersion="18" />
+
+    <application
+        android:allowBackup="true"
+        android:icon="@drawable/ic_launcher"
+        android:label="@string/app_name"
+        android:theme="@style/AppTheme" >
+        <activity
+            android:name="com.example.umm_app.MainActivity"
+            android:label="@string/app_name" >
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+
+                <category android:name="android.intent.category.LAUNCHER" />
+            </intent-filter>
+        </activity>
+    </application>
+
+</manifest>
diff --git a/bin/classes/com/example/umm_app/BuildConfig.class b/bin/classes/com/example/umm_app/BuildConfig.class
diff --git a/bin/classes/com/example/umm_app/MainActivity.class b/bin/classes/com/example/umm_app/MainActivity.class
diff --git a/bin/classes/com/example/umm_app/R$attr.class b/bin/classes/com/example/umm_app/R$attr.class
diff --git a/bin/classes/com/example/umm_app/R$dimen.class b/bin/classes/com/example/umm_app/R$dimen.class
diff --git a/bin/classes/com/example/umm_app/R$drawable.class b/bin/classes/com/example/umm_app/R$drawable.class
diff --git a/bin/classes/com/example/umm_app/R$id.class b/bin/classes/com/example/umm_app/R$id.class
diff --git a/bin/classes/com/example/umm_app/R$layout.class b/bin/classes/com/example/umm_app/R$layout.class
diff --git a/bin/classes/com/example/umm_app/R$menu.class b/bin/classes/com/example/umm_app/R$menu.class
diff --git a/bin/classes/com/example/umm_app/R$string.class b/bin/classes/com/example/umm_app/R$string.class
diff --git a/bin/classes/com/example/umm_app/R$style.class b/bin/classes/com/example/umm_app/R$style.class
diff --git a/bin/classes/com/example/umm_app/R.class b/bin/classes/com/example/umm_app/R.class
diff --git a/res/layout/activity_challenge.xml b/res/layout/activity_challenge.xml
@@ -0,0 +1,106 @@
+<LinearLayout 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/lightblue"
+    android:orientation="vertical" >
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="horizontal" >
+
+        <TextView 
+            android:layout_weight="1"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:gravity="center_horizontal"
+            android:text="@string/challenge_title" 
+            android:textSize="20sp"/>
+
+        <Button 
+            android:id="@+id/challenge_back"
+            android:layout_width="40dp"
+            android:layout_height="40dp" 
+            android:background="@color/red" />            
+
+    </LinearLayout>
+
+    <TextView 
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:gravity="center_horizontal"
+        android:text="@string/challenge_description"
+        android:layout_marginBottom="20dp" />
+
+    <Button 
+        android:id="@+id/diff1"
+        android:layout_width="150dp" 
+        android:layout_height="30dp"
+        android:layout_gravity="center_horizontal"
+        android:text="@string/grade1"
+        android:background="@color/blblue"
+        android:layout_marginBottom="20dp" />
+
+    <Button 
+        android:id="@+id/diff2"
+        android:layout_width="150dp" 
+        android:layout_height="30dp"
+        android:layout_gravity="center_horizontal"
+        android:text="@string/grade2"
+        android:background="@color/blue"
+        android:layout_marginBottom="20dp" />
+
+    <Button 
+        android:id="@+id/diff3"
+        android:layout_width="150dp" 
+        android:layout_height="30dp"
+        android:layout_gravity="center_horizontal"
+        android:text="@string/grade3"
+        android:background="@color/aqua" 
+        android:layout_marginBottom="20dp" />
+
+    <Button 
+        android:id="@+id/diff4"
+        android:layout_width="150dp" 
+        android:layout_height="30dp"
+        android:layout_gravity="center_horizontal"
+        android:text="@string/grade4"
+        android:background="@color/green"
+        android:layout_marginBottom="20dp"/>
+
+    <Button 
+        android:id="@+id/diff5"
+        android:layout_width="150dp" 
+        android:layout_height="30dp"
+        android:layout_gravity="center_horizontal"
+        android:text="@string/grade5"
+        android:background="@color/yellowgreen"
+        android:layout_marginBottom="20dp" />
+
+    <Button 
+        android:id="@+id/diff6"
+        android:layout_width="150dp" 
+        android:layout_height="30dp"
+        android:layout_gravity="center_horizontal"
+        android:text="@string/grade6"
+        android:background="@color/yellow"
+        android:layout_marginBottom="20dp" />
+
+    <Button 
+        android:id="@+id/diff7"
+        android:layout_width="150dp" 
+        android:layout_height="30dp"
+        android:layout_gravity="center_horizontal"
+        android:text="@string/grade7"
+        android:background="@color/orange"
+        android:layout_marginBottom="20dp" />
+
+    <Button 
+        android:id="@+id/diff8"
+        android:layout_width="150dp" 
+        android:layout_height="30dp"
+        android:layout_gravity="center_horizontal"
+        android:text="@string/grade8"
+        android:background="@color/red" />
+</LinearLayout>
diff --git a/res/layout/leaderboard_menu.xml b/res/layout/leaderboard_menu.xml
@@ -0,0 +1,106 @@
+<LinearLayout 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/lightblue"
+    android:orientation="vertical" >
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="horizontal" >
+
+        <TextView 
+            android:layout_weight="1"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:gravity="center_horizontal"
+            android:text="@string/leaderboard_title" 
+            android:textSize="20sp" />
+
+        <Button 
+            android:id="@+id/challenge_back"
+            android:layout_width="40dp"
+            android:layout_height="40dp" 
+            android:background="@color/red" />            
+
+    </LinearLayout>
+
+    <TextView 
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:gravity="center_horizontal"
+        android:text="@string/leaderboard_description"
+        android:layout_marginBottom="20dp" />
+
+    <Button 
+        android:id="@+id/diff1"
+        android:layout_width="150dp" 
+        android:layout_height="30dp"
+        android:layout_gravity="center_horizontal"
+        android:text="@string/grade1"
+        android:background="@color/blblue"
+        android:layout_marginBottom="20dp" />
+
+    <Button 
+        android:id="@+id/diff2"
+        android:layout_width="150dp" 
+        android:layout_height="30dp"
+        android:layout_gravity="center_horizontal"
+        android:text="@string/grade2"
+        android:background="@color/blue"
+        android:layout_marginBottom="20dp" />
+
+    <Button 
+        android:id="@+id/diff3"
+        android:layout_width="150dp" 
+        android:layout_height="30dp"
+        android:layout_gravity="center_horizontal"
+        android:text="@string/grade3"
+        android:background="@color/aqua" 
+        android:layout_marginBottom="20dp" />
+
+    <Button 
+        android:id="@+id/diff4"
+        android:layout_width="150dp" 
+        android:layout_height="30dp"
+        android:layout_gravity="center_horizontal"
+        android:text="@string/grade4"
+        android:background="@color/green"
+        android:layout_marginBottom="20dp"/>
+
+    <Button 
+        android:id="@+id/diff5"
+        android:layout_width="150dp" 
+        android:layout_height="30dp"
+        android:layout_gravity="center_horizontal"
+        android:text="@string/grade5"
+        android:background="@color/yellowgreen"
+        android:layout_marginBottom="20dp" />
+
+    <Button 
+        android:id="@+id/diff6"
+        android:layout_width="150dp" 
+        android:layout_height="30dp"
+        android:layout_gravity="center_horizontal"
+        android:text="@string/grade6"
+        android:background="@color/yellow"
+        android:layout_marginBottom="20dp" />
+
+    <Button 
+        android:id="@+id/diff7"
+        android:layout_width="150dp" 
+        android:layout_height="30dp"
+        android:layout_gravity="center_horizontal"
+        android:text="@string/grade7"
+        android:background="@color/orange"
+        android:layout_marginBottom="20dp" />
+
+    <Button 
+        android:id="@+id/diff8"
+        android:layout_width="150dp" 
+        android:layout_height="30dp"
+        android:layout_gravity="center_horizontal"
+        android:text="@string/grade8"
+        android:background="@color/red" />
+</LinearLayout>
diff --git a/res/menu/challenge.xml b/res/menu/challenge.xml
@@ -0,0 +1,9 @@
+<menu xmlns:android="http://schemas.android.com/apk/res/android" >
+
+    <item
+        android:id="@+id/action_settings"
+        android:orderInCategory="100"
+        android:showAsAction="never"
+        android:title="@string/action_settings"/>
+
+</menu>