Re-arranged the prev, back, next button to see if my commit works.

RGood · Apr 2, 2014 · d92d5f9 · d92d5f9
1 parent 53d606f
commit d92d5f9
Show file tree

Hide file tree

Showing 17 changed files with 82 additions and 76 deletions.
diff --git a/.classpath b/.classpath
@@ -1,9 +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="src" path="src"/>
+	<classpathentry kind="src" path="gen"/>
 	<classpathentry kind="output" path="bin/classes"/>
 </classpath>
diff --git a/.settings/org.eclipse.jdt.core.prefs b/.settings/org.eclipse.jdt.core.prefs
@@ -0,0 +1,4 @@
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
+org.eclipse.jdt.core.compiler.compliance=1.6
+org.eclipse.jdt.core.compiler.source=1.6
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/login_form.xml b/res/layout/login_form.xml
@@ -12,8 +12,9 @@
      android:layout_alignParentTop="true"
      android:layout_marginRight="14dp"
      android:layout_marginTop="95dp"
-     android:ems="10"
-     android:background="#eeeeee">
+     android:layout_toRightOf="@+id/button_login2"
+     android:background="#eeeeee"
+     android:ems="10" >
 
      <requestFocus />
   </EditText>
@@ -23,11 +24,12 @@
      android:layout_width="wrap_content"
      android:layout_height="wrap_content"
      android:layout_alignLeft="@+id/editText1"
+     android:layout_alignRight="@+id/editText1"
      android:layout_below="@+id/editText1"
      android:layout_marginTop="34dp"
+     android:background="#eeeeee"
      android:ems="10"
-     android:inputType="textPassword" 
-     android:background="#eeeeee"/>
+     android:inputType="textPassword" />
 
  <TextView
      android:id="@+id/textView2"

diff --git a/res/layout/practice.xml b/res/layout/practice.xml
@@ -4,26 +4,6 @@
     android:layout_height="match_parent"
     android:background="@color/background" >
 
-    <Button
-        android:id="@+id/button2"
-        style="?android:attr/buttonStyleSmall"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_alignParentBottom="true"
-        android:layout_centerHorizontal="true"
-        android:background="@color/green"
-        android:text="Back" />
-
-    <Button
-        android:id="@+id/button1"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_above="@+id/button2"
-        android:layout_centerHorizontal="true"
-        android:layout_marginBottom="19dp"
-        android:background="@color/green"
-        android:text="Start" />
-
     <TextView
         android:id="@+id/textView3"
         android:layout_width="wrap_content"
@@ -53,15 +33,35 @@
         android:text="Tables 1 to 6"
         android:textAppearance="?android:attr/textAppearanceLarge" />
 
+    <Button
+        android:id="@+id/button1"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_centerHorizontal="true"
+        android:layout_centerVertical="true"
+        android:background="@color/green"
+        android:text="Start" />
+
     <Button
         android:id="@+id/button3"
         style="?android:attr/buttonStyleSmall"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_below="@+id/textView2"
-        android:layout_marginTop="57dp"
+        android:layout_alignBaseline="@+id/button2"
+        android:layout_alignBottom="@+id/button2"
         android:layout_toRightOf="@+id/button1"
         android:background="@color/green"
         android:text="Next" />
 
+    <Button
+        android:id="@+id/button2"
+        style="?android:attr/buttonStyleSmall"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_alignParentBottom="true"
+        android:layout_marginBottom="54dp"
+        android:layout_toLeftOf="@+id/button1"
+        android:background="@color/green"
+        android:text="Back" />
+
 </RelativeLayout>
diff --git a/res/layout/practice2.xml b/res/layout/practice2.xml
@@ -4,26 +4,6 @@
     android:layout_height="match_parent"
     android:background="@color/background" >
 
-    <Button
-        android:id="@+id/button2"
-        style="?android:attr/buttonStyleSmall"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_alignParentBottom="true"
-        android:layout_centerHorizontal="true"
-        android:background="@color/green"
-        android:text="Back" />
-
-    <Button
-        android:id="@+id/button1"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_above="@+id/button2"
-        android:layout_centerHorizontal="true"
-        android:layout_marginBottom="19dp"
-        android:background="@color/green"
-        android:text="Start" />
-
     <TextView
         android:id="@+id/textView3"
         android:layout_width="wrap_content"
@@ -58,21 +38,41 @@
         style="?android:attr/buttonStyleSmall"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_alignBaseline="@+id/button3"
-        android:layout_alignBottom="@+id/button3"
-        android:layout_toLeftOf="@+id/button1"
+        android:layout_alignParentLeft="true"
+        android:layout_alignParentTop="true"
         android:background="@color/green"
         android:text="Prev" />
 
+    <Button
+        android:id="@+id/button2"
+        style="?android:attr/buttonStyleSmall"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_alignParentBottom="true"
+        android:layout_marginBottom="77dp"
+        android:layout_toLeftOf="@+id/button1"
+        android:background="@color/green"
+        android:text="Back" />
+
     <Button
         android:id="@+id/button3"
         style="?android:attr/buttonStyleSmall"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_below="@+id/textView2"
-        android:layout_marginTop="57dp"
+        android:layout_alignBaseline="@+id/button2"
+        android:layout_alignBottom="@+id/button2"
         android:layout_toRightOf="@+id/button1"
         android:background="@color/green"
         android:text="Next" />
 
+    <Button
+        android:id="@+id/button1"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_below="@+id/textView2"
+        android:layout_centerHorizontal="true"
+        android:layout_marginTop="49dp"
+        android:background="@color/green"
+        android:text="Start" />
+
 </RelativeLayout>
diff --git a/res/layout/practice3.xml b/res/layout/practice3.xml
@@ -4,26 +4,6 @@
     android:layout_height="match_parent"
     android:background="@color/background" >
 
-    <Button
-        android:id="@+id/button2"
-        style="?android:attr/buttonStyleSmall"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_alignParentBottom="true"
-        android:layout_centerHorizontal="true"
-        android:background="@color/green"
-        android:text="Back" />
-
-    <Button
-        android:id="@+id/button1"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_above="@+id/button2"
-        android:layout_centerHorizontal="true"
-        android:layout_marginBottom="19dp"
-        android:background="@color/green"
-        android:text="Start" />
-
     <TextView
         android:id="@+id/textView3"
         android:layout_width="wrap_content"
@@ -58,10 +38,30 @@
         style="?android:attr/buttonStyleSmall"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_alignLeft="@+id/textView2"
-        android:layout_below="@+id/textView2"
-        android:layout_marginTop="58dp"
+        android:layout_alignParentLeft="true"
+        android:layout_alignParentTop="true"
         android:background="@color/green"
         android:text="Prev" />
 
+    <Button
+        android:id="@+id/button1"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_below="@+id/textView2"
+        android:layout_centerHorizontal="true"
+        android:layout_marginTop="61dp"
+        android:background="@color/green"
+        android:text="Start" />
+
+    <Button
+        android:id="@+id/button2"
+        style="?android:attr/buttonStyleSmall"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_below="@+id/button1"
+        android:layout_centerHorizontal="true"
+        android:layout_marginTop="61dp"
+        android:background="@color/green"
+        android:text="Back" />
+
 </RelativeLayout>