Fix various UI issues

Hamza417 · Oct 13, 2024 · 5228135 · 5228135
1 parent b3a1527
commit 5228135
Show file tree

Hide file tree

Showing 8 changed files with 50 additions and 233 deletions.
diff --git a/app/src/main/java/app/simple/positional/dialogs/app/MapSearch.kt b/app/src/main/java/app/simple/positional/dialogs/app/MapSearch.kt
diff --git a/app/src/main/res/layout/dialog_app_corner.xml b/app/src/main/res/layout/dialog_app_corner.xml
@@ -54,6 +54,7 @@
                 android:layout_marginEnd="@dimen/options_item_padding"
                 android:background="@drawable/ripple_btn"
                 android:text="@string/button_cancel"
+                android:fontFamily="@font/bold"
                 android:textColor="@color/textSecondary" />
 
             <app.simple.positional.decorations.ripple.DynamicRippleButton
@@ -63,6 +64,7 @@
                 android:layout_height="wrap_content"
                 android:background="@drawable/ripple_btn"
                 android:text="@string/button_set"
+                android:fontFamily="@font/bold"
                 android:textColor="@color/textSecondary" />
 
         </LinearLayout>

diff --git a/app/src/main/res/layout/dialog_custom_location_shortcut.xml b/app/src/main/res/layout/dialog_custom_location_shortcut.xml
@@ -74,9 +74,9 @@
             android:layout_gravity="end"
             android:layout_marginTop="10dp"
             android:textColor="?attr/colorAppAccent"
-            android:fontFamily="@font/medium"
+            android:fontFamily="@font/bold"
             android:text="@string/share" />
 
     </app.simple.positional.decorations.corners.DynamicCornerLinearLayout>
 
-</FrameLayout>
+</FrameLayout>
diff --git a/app/src/main/res/layout/dialog_measure_add.xml b/app/src/main/res/layout/dialog_measure_add.xml
@@ -11,10 +11,10 @@
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:orientation="vertical"
-        android:clipToPadding="false"
+        android:layout_marginBottom="@dimen/popup_padding"
         android:clipChildren="false"
-        android:layout_marginBottom="@dimen/popup_padding">
+        android:clipToPadding="false"
+        android:orientation="vertical">
 
         <TextView
             android:layout_width="match_parent"
@@ -35,8 +35,8 @@
             android:inputType="text"
             android:maxLength="40"
             android:maxLines="1"
-            android:paddingHorizontal="@dimen/popup_padding"
             android:minHeight="50dp"
+            android:paddingHorizontal="@dimen/popup_padding"
             android:saveEnabled="true"
             android:textColor="@color/textSecondary"
             android:textColorHighlight="?attr/colorAppAccentLight"
@@ -47,9 +47,9 @@
         <TextView
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
+            android:layout_marginTop="@dimen/popup_padding"
             android:fontFamily="@font/medium"
             android:text="@string/note"
-            android:layout_marginTop="@dimen/popup_padding"
             android:textColor="@color/textTertiary"
             android:textSize="@dimen/description_text_size" />
 
@@ -58,13 +58,13 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_marginTop="2dp"
+            android:background="@drawable/text_field"
             android:fontFamily="@font/regular"
             android:gravity="top"
-            android:background="@drawable/text_field"
-            android:padding="@dimen/popup_padding"
             android:importantForAutofill="no"
             android:maxHeight="300dp"
             android:minHeight="100dp"
+            android:padding="@dimen/popup_padding"
             android:saveEnabled="true"
             android:textColor="@color/textSecondary"
             android:textColorHighlight="?attr/colorAppAccentLight"
@@ -83,16 +83,18 @@
         <app.simple.positional.decorations.ripple.DynamicRippleButton
             android:id="@+id/cancel"
             android:layout_width="wrap_content"
-            android:layout_height="@dimen/app_button_size"
+            android:layout_height="wrap_content"
             android:layout_gravity="center_vertical"
+            android:fontFamily="@font/bold"
             android:text="@string/button_cancel"
             android:textColor="?attr/colorAppAccent" />
 
         <app.simple.positional.decorations.ripple.DynamicRippleButton
             android:id="@+id/save"
             android:layout_width="wrap_content"
-            android:layout_height="@dimen/app_button_size"
+            android:layout_height="wrap_content"
             android:layout_gravity="center_vertical"
+            android:fontFamily="@font/bold"
             android:text="@string/save"
             android:textColor="?attr/colorAppAccent"
             android:visibility="gone" />

diff --git a/app/src/main/res/layout/dialog_on_trail_add.xml b/app/src/main/res/layout/dialog_on_trail_add.xml
@@ -11,9 +11,9 @@
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
+        android:layout_marginBottom="@dimen/popup_padding"
         android:backgroundTint="@color/editTextBackground"
-        android:orientation="vertical"
-        android:layout_marginBottom="@dimen/popup_padding">
+        android:orientation="vertical">
 
         <TextView
             android:layout_width="match_parent"
@@ -28,14 +28,14 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_marginTop="2dp"
+            android:background="@drawable/text_field"
             android:fontFamily="@font/regular"
-            android:maxLines="1"
+            android:importantForAutofill="no"
             android:maxLength="60"
+            android:maxLines="1"
+            android:minHeight="50dp"
             android:paddingHorizontal="@dimen/popup_padding"
-            android:background="@drawable/text_field"
-            android:importantForAutofill="no"
             android:saveEnabled="true"
-            android:minHeight="50dp"
             android:textColor="@color/textSecondary"
             android:textColorHighlight="?attr/colorAppAccentLight"
             android:textColorHint="@color/textTertiary"
@@ -56,13 +56,13 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_marginTop="2dp"
+            android:background="@drawable/text_field"
             android:fontFamily="@font/regular"
             android:gravity="top"
-            android:background="@drawable/text_field"
-            android:padding="@dimen/popup_padding"
             android:importantForAutofill="no"
             android:maxHeight="300dp"
             android:minHeight="100dp"
+            android:padding="@dimen/popup_padding"
             android:saveEnabled="true"
             android:textColor="@color/textSecondary"
             android:textColorHighlight="?attr/colorAppAccentLight"
@@ -72,7 +72,7 @@
 
     </LinearLayout>
 
-    <RelativeLayout
+    <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:animateLayoutChanges="true"
@@ -82,26 +82,29 @@
             android:id="@+id/icon"
             android:layout_width="@dimen/app_button_size"
             android:layout_height="@dimen/app_button_size"
-            android:layout_alignParentStart="true" />
+            android:layout_gravity="center_vertical" />
+
+        <Space
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_weight="1" />
 
         <app.simple.positional.decorations.ripple.DynamicRippleButton
             android:id="@+id/cancel"
             android:layout_width="wrap_content"
-            android:layout_height="@dimen/app_button_size"
+            android:layout_height="wrap_content"
             android:layout_gravity="end"
-            android:layout_toStartOf="@id/save"
             android:text="@string/button_cancel"
             android:textColor="@color/textPrimary"
             tools:ignore="RelativeOverlap" />
 
         <app.simple.positional.decorations.ripple.DynamicRippleButton
             android:id="@+id/save"
             android:layout_width="wrap_content"
-            android:layout_height="@dimen/app_button_size"
-            android:layout_alignParentEnd="true"
+            android:layout_height="wrap_content"
             android:text="@string/save"
             android:textColor="@color/textPrimary" />
 
-    </RelativeLayout>
+    </LinearLayout>
 
 </app.simple.positional.decorations.corners.DynamicCornerLinearLayout>