Merge pull request #15 from hareshkh/develop

UI changes due to changed minimum API
hareshkh · Feb 17, 2016 · e60eadd · e60eadd
2 parents 7daa9c4 + 816ab07
commit e60eadd
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 2 deletions.
diff --git a/app/src/main/res/layout/activity_bluetooth.xml b/app/src/main/res/layout/activity_bluetooth.xml
@@ -18,14 +18,17 @@
         android:onClick="onToggleClicked"
         android:background="#FFA726"
         android:textColor="#FFFFFF"
-        android:textOff="Bluetooth OFF"
-        android:textOn="Bluetooth ON"
+        android:textOff="Start"
+        android:textOn="Stop"
         android:textSize="20dp" />
     <ListView
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:id="@+id/listView"
+        android:layout_marginTop="15dp"
         android:layout_below="@+id/toggleButton"
+        android:layout_alignParentRight="true"
         android:layout_alignParentEnd="true"/>
 
+
 </RelativeLayout>
diff --git a/app/src/main/res/layout/activity_highscores2p.xml b/app/src/main/res/layout/activity_highscores2p.xml
@@ -49,6 +49,7 @@
         android:text="CLEAR"
         android:id="@+id/clear"
         android:layout_alignParentBottom="true"
+        android:layout_alignParentLeft="true"
         android:layout_alignParentStart="true"
         android:background="#FFA726"
         android:textColor="#FFFFFF"

diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
@@ -20,6 +20,7 @@
         android:textColor="#ffffff"
         android:textSize="20dp"
         android:layout_alignParentTop="true"
+        android:layout_alignLeft="@+id/b2"
         android:layout_alignStart="@+id/b2"
         android:layout_marginTop="83dp" />
 
@@ -43,6 +44,7 @@
         android:background="#FFA726"
         android:textSize="20dp"
         android:layout_alignParentBottom="true"
+        android:layout_alignLeft="@+id/b2"
         android:layout_alignStart="@+id/b2"
         android:layout_marginBottom="83dp" />
 

diff --git a/app/src/main/res/layout/activity_two_player_selector.xml b/app/src/main/res/layout/activity_two_player_selector.xml
@@ -42,6 +42,7 @@
         android:textColor="#FFFFFF"
         android:textSize="20dp"
         android:layout_alignParentBottom="true"
+        android:layout_alignLeft="@id/doubleplay2p"
         android:layout_alignStart="@+id/doubleplay2p"
         android:layout_marginBottom="83dp" />
 </RelativeLayout>