Merge branch 'ui-tweaks'

4 files changed, 15 insertions, 14 deletions

diff --git a/android/src/main/res/layout/connect.xml b/android/src/main/res/layout/connect.xml
index 38298d2882..5b05e4c2f3 100644
--- a/android/src/main/res/layout/connect.xml
+++ b/android/src/main/res/layout/connect.xml
@@ -11,13 +11,14 @@
             android:layout_weight="0"
             android:orientation="horizontal"
             android:gravity="center_vertical"
-            android:padding="12dp"
             android:background="@color/red"
             android:elevation="0.5dp"
             >
         <ImageView
                 android:layout_width="49dp"
                 android:layout_height="50dp"
+                android:layout_marginLeft="12dp"
+                android:layout_marginVertical="12dp"
                 android:src="@drawable/logo_icon"
                 android:layout_weight="0"
                 />
@@ -25,6 +26,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginHorizontal="8dp"
+                android:layout_marginVertical="12dp"
                 android:textColor="@color/white60"
                 android:textSize="24sp"
                 android:textStyle="bold"
@@ -38,8 +40,9 @@
                 android:layout_weight="1"
                 />
         <ImageButton android:id="@+id/settings"
-                android:layout_width="24dp"
-                android:layout_height="24dp"
+                android:layout_width="wrap_content"
+                android:layout_height="match_parent"
+                android:paddingHorizontal="12dp"
                 android:background="?android:attr/selectableItemBackground"
                 android:src="@drawable/icon_settings"
                 android:layout_weight="0"
diff --git a/android/src/main/res/layout/relay_list_item.xml b/android/src/main/res/layout/relay_list_item.xml
index 29ebf56762..95f87886ba 100644
--- a/android/src/main/res/layout/relay_list_item.xml
+++ b/android/src/main/res/layout/relay_list_item.xml
@@ -4,8 +4,6 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:paddingLeft="@dimen/country_row_padding"
-        android:paddingRight="24dp"
-        android:paddingVertical="16dp"
         android:background="@color/blue"
         android:orientation="horizontal"
         android:gravity="center"
@@ -14,18 +12,17 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_weight="0"
-            android:gravity="center"
+            android:layout_marginVertical="16dp"
             >
         <ImageView android:id="@+id/relay_active"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_weight="0"
+                android:layout_gravity="center"
                 android:src="@drawable/icon_relay_active"
                 />
         <ImageView android:id="@+id/selected"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_weight="0"
                 android:src="@drawable/icon_tick"
                 android:visibility="invisible"
                 />
@@ -35,6 +32,7 @@
             android:layout_height="wrap_content"
             android:layout_weight="1"
             android:layout_marginHorizontal="8dp"
+            android:layout_marginVertical="16dp"
             android:textColor="@color/white"
             android:textSize="20sp"
             android:textStyle="bold"
@@ -44,6 +42,8 @@
             android:layout_width="wrap_content"
             android:layout_height="match_parent"
             android:layout_weight="0"
+            android:paddingRight="24dp"
+            android:paddingLeft="24dp"
             android:background="?android:attr/selectableItemBackground"
             android:src="@drawable/icon_chevron_expand"
             />
diff --git a/android/src/main/res/layout/select_location.xml b/android/src/main/res/layout/select_location.xml
index 3a07326b48..18a22c73e8 100644
--- a/android/src/main/res/layout/select_location.xml
+++ b/android/src/main/res/layout/select_location.xml
@@ -12,7 +12,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_weight="0"
-            android:layout_margin="12dp"
+            android:padding="12dp"
             android:background="?android:attr/selectableItemBackground"
             android:src="@drawable/icon_close"
             />
diff --git a/android/src/main/res/layout/settings.xml b/android/src/main/res/layout/settings.xml
index 84c94dcf95..0be7a8087e 100644
--- a/android/src/main/res/layout/settings.xml
+++ b/android/src/main/res/layout/settings.xml
@@ -8,11 +8,9 @@
         android:elevation="1dp"
         >
     <ImageButton android:id="@+id/close"
-            android:layout_width="24dp"
-            android:layout_height="24dp"
-            android:layout_marginTop="12dp"
-            android:layout_marginLeft="12dp"
-            android:layout_marginBottom="12dp"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:padding="12dp"
             android:background="?android:attr/selectableItemBackground"
             android:src="@drawable/icon_close"
             />