layout tweaks

ob-f · Oct 7, 2024 · 8de15c7 · 8de15c7
1 parent e598460
commit 8de15c7
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 17 deletions.
diff --git a/android/robot/src/main/res/layout-land/fragment_object_nav.xml b/android/robot/src/main/res/layout-land/fragment_object_nav.xml
@@ -77,8 +77,7 @@
             android:id="@+id/usbToggle"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginStart="8dp"
-            android:layout_marginRight="4dp"
+            android:layout_marginEnd="8dp"
             android:button="@drawable/usb_toggle"
             app:layout_constraintBottom_toBottomOf="@+id/camera_toggle"
             app:layout_constraintEnd_toStartOf="@+id/camera_toggle"
@@ -88,7 +87,7 @@
             android:id="@+id/bleToggle"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginRight="4dp"
+            android:layout_marginEnd="4dp"
             android:button="@drawable/ble_toggle"
             app:layout_constraintBottom_toBottomOf="@+id/camera_toggle"
             app:layout_constraintEnd_toStartOf="@+id/camera_toggle"
@@ -98,24 +97,25 @@
             android:id="@+id/camera_toggle"
             android:layout_width="40dp"
             android:layout_height="40dp"
-            android:layout_marginRight="4dp"
+            android:layout_marginEnd="4dp"
             android:background="@android:color/transparent"
             android:scaleType="center"
             android:src="@drawable/ic_cameraswitch"
             android:text="@string/camera_facing_back"
-            app:layout_constraintTop_toTopOf="@+id/autoLinearLayout"
             app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintEnd_toStartOf="@+id/mirrorControl"
+            app:layout_constraintTop_toTopOf="@+id/autoLinearLayout"
             app:tint="@color/openBotBlue" />
 
         <CheckBox
             android:id="@+id/mirrorControl"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginEnd="8dp"
-            android:button="@drawable/mirror_control"
             android:layout_marginTop="8dp"
-            app:layout_constraintTop_toTopOf="@+id/autoLinearLayout"
-            app:layout_constraintEnd_toEndOf="parent" />
+            android:layout_marginEnd="16dp"
+            android:button="@drawable/mirror_control"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintTop_toTopOf="@+id/autoLinearLayout" />
 
 
         <LinearLayout

diff --git a/android/robot/src/main/res/layout/fragment_object_nav.xml b/android/robot/src/main/res/layout/fragment_object_nav.xml
@@ -36,7 +36,7 @@
             android:id="@+id/autoLinearLayout"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginStart="16dp"
+            android:layout_marginStart="8dp"
             android:layout_marginTop="16dp"
             android:orientation="horizontal"
             app:layout_constraintBottom_toTopOf="@+id/linearLayout"
@@ -98,11 +98,11 @@
             android:id="@+id/mirrorControl"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
+            android:layout_marginTop="8dp"
             android:layout_marginEnd="8dp"
             android:button="@drawable/mirror_control"
-            android:layout_marginTop="8dp"
-            app:layout_constraintTop_toTopOf="@+id/autoLinearLayout"
-            app:layout_constraintEnd_toEndOf="parent" />
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintTop_toTopOf="@+id/autoLinearLayout" />
 
         <LinearLayout
             android:id="@+id/linearLayout"
@@ -122,7 +122,7 @@
                     android:layout_height="match_parent"
                     android:layout_weight="1"
                     android:paddingVertical="12dp"
-                    android:paddingStart="16dp"
+                    android:paddingStart="8dp"
                     android:text="@string/model"
                     android:textColor="@android:color/black" />
 
@@ -148,7 +148,7 @@
                     android:layout_weight="0.7"
                     android:gravity="center_vertical"
                     android:paddingVertical="12dp"
-                    android:paddingStart="16dp"
+                    android:paddingStart="8dp"
                     android:text="@string/inference"
                     android:textColor="@android:color/black" />
 
@@ -197,7 +197,7 @@
                     android:background="@drawable/button_item_background_black"
                     android:backgroundTint="@android:color/white"
                     android:gravity="center_vertical"
-                    android:paddingStart="16dp"
+                    android:paddingStart="8dp"
                     android:text="@string/object"
                     android:textColor="@android:color/black" />
 
@@ -283,7 +283,7 @@
                     android:layout_height="match_parent"
                     android:layout_weight="0.7"
                     android:gravity="center_vertical"
-                    android:paddingStart="16dp"
+                    android:paddingStart="8dp"
                     android:text="@string/device"
                     android:textColor="@android:color/black" />