Skip to content

Commit 5228135

Browse files
committed
Fix various UI issues
1 parent b3a1527 commit 5228135

File tree

8 files changed

+50
-233
lines changed

8 files changed

+50
-233
lines changed

app/src/main/java/app/simple/positional/dialogs/app/MapSearch.kt

Lines changed: 0 additions & 192 deletions
This file was deleted.

app/src/main/res/layout/dialog_app_corner.xml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,7 @@
5454
android:layout_marginEnd="@dimen/options_item_padding"
5555
android:background="@drawable/ripple_btn"
5656
android:text="@string/button_cancel"
57+
android:fontFamily="@font/bold"
5758
android:textColor="@color/textSecondary" />
5859

5960
<app.simple.positional.decorations.ripple.DynamicRippleButton
@@ -63,6 +64,7 @@
6364
android:layout_height="wrap_content"
6465
android:background="@drawable/ripple_btn"
6566
android:text="@string/button_set"
67+
android:fontFamily="@font/bold"
6668
android:textColor="@color/textSecondary" />
6769

6870
</LinearLayout>

app/src/main/res/layout/dialog_custom_location_shortcut.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -74,9 +74,9 @@
7474
android:layout_gravity="end"
7575
android:layout_marginTop="10dp"
7676
android:textColor="?attr/colorAppAccent"
77-
android:fontFamily="@font/medium"
77+
android:fontFamily="@font/bold"
7878
android:text="@string/share" />
7979

8080
</app.simple.positional.decorations.corners.DynamicCornerLinearLayout>
8181

82-
</FrameLayout>
82+
</FrameLayout>

app/src/main/res/layout/dialog_measure_add.xml

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,10 @@
1111
<LinearLayout
1212
android:layout_width="match_parent"
1313
android:layout_height="wrap_content"
14-
android:orientation="vertical"
15-
android:clipToPadding="false"
14+
android:layout_marginBottom="@dimen/popup_padding"
1615
android:clipChildren="false"
17-
android:layout_marginBottom="@dimen/popup_padding">
16+
android:clipToPadding="false"
17+
android:orientation="vertical">
1818

1919
<TextView
2020
android:layout_width="match_parent"
@@ -35,8 +35,8 @@
3535
android:inputType="text"
3636
android:maxLength="40"
3737
android:maxLines="1"
38-
android:paddingHorizontal="@dimen/popup_padding"
3938
android:minHeight="50dp"
39+
android:paddingHorizontal="@dimen/popup_padding"
4040
android:saveEnabled="true"
4141
android:textColor="@color/textSecondary"
4242
android:textColorHighlight="?attr/colorAppAccentLight"
@@ -47,9 +47,9 @@
4747
<TextView
4848
android:layout_width="match_parent"
4949
android:layout_height="wrap_content"
50+
android:layout_marginTop="@dimen/popup_padding"
5051
android:fontFamily="@font/medium"
5152
android:text="@string/note"
52-
android:layout_marginTop="@dimen/popup_padding"
5353
android:textColor="@color/textTertiary"
5454
android:textSize="@dimen/description_text_size" />
5555

@@ -58,13 +58,13 @@
5858
android:layout_width="match_parent"
5959
android:layout_height="wrap_content"
6060
android:layout_marginTop="2dp"
61+
android:background="@drawable/text_field"
6162
android:fontFamily="@font/regular"
6263
android:gravity="top"
63-
android:background="@drawable/text_field"
64-
android:padding="@dimen/popup_padding"
6564
android:importantForAutofill="no"
6665
android:maxHeight="300dp"
6766
android:minHeight="100dp"
67+
android:padding="@dimen/popup_padding"
6868
android:saveEnabled="true"
6969
android:textColor="@color/textSecondary"
7070
android:textColorHighlight="?attr/colorAppAccentLight"
@@ -83,16 +83,18 @@
8383
<app.simple.positional.decorations.ripple.DynamicRippleButton
8484
android:id="@+id/cancel"
8585
android:layout_width="wrap_content"
86-
android:layout_height="@dimen/app_button_size"
86+
android:layout_height="wrap_content"
8787
android:layout_gravity="center_vertical"
88+
android:fontFamily="@font/bold"
8889
android:text="@string/button_cancel"
8990
android:textColor="?attr/colorAppAccent" />
9091

9192
<app.simple.positional.decorations.ripple.DynamicRippleButton
9293
android:id="@+id/save"
9394
android:layout_width="wrap_content"
94-
android:layout_height="@dimen/app_button_size"
95+
android:layout_height="wrap_content"
9596
android:layout_gravity="center_vertical"
97+
android:fontFamily="@font/bold"
9698
android:text="@string/save"
9799
android:textColor="?attr/colorAppAccent"
98100
android:visibility="gone" />

app/src/main/res/layout/dialog_on_trail_add.xml

Lines changed: 18 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,9 @@
1111
<LinearLayout
1212
android:layout_width="match_parent"
1313
android:layout_height="wrap_content"
14+
android:layout_marginBottom="@dimen/popup_padding"
1415
android:backgroundTint="@color/editTextBackground"
15-
android:orientation="vertical"
16-
android:layout_marginBottom="@dimen/popup_padding">
16+
android:orientation="vertical">
1717

1818
<TextView
1919
android:layout_width="match_parent"
@@ -28,14 +28,14 @@
2828
android:layout_width="match_parent"
2929
android:layout_height="wrap_content"
3030
android:layout_marginTop="2dp"
31+
android:background="@drawable/text_field"
3132
android:fontFamily="@font/regular"
32-
android:maxLines="1"
33+
android:importantForAutofill="no"
3334
android:maxLength="60"
35+
android:maxLines="1"
36+
android:minHeight="50dp"
3437
android:paddingHorizontal="@dimen/popup_padding"
35-
android:background="@drawable/text_field"
36-
android:importantForAutofill="no"
3738
android:saveEnabled="true"
38-
android:minHeight="50dp"
3939
android:textColor="@color/textSecondary"
4040
android:textColorHighlight="?attr/colorAppAccentLight"
4141
android:textColorHint="@color/textTertiary"
@@ -56,13 +56,13 @@
5656
android:layout_width="match_parent"
5757
android:layout_height="wrap_content"
5858
android:layout_marginTop="2dp"
59+
android:background="@drawable/text_field"
5960
android:fontFamily="@font/regular"
6061
android:gravity="top"
61-
android:background="@drawable/text_field"
62-
android:padding="@dimen/popup_padding"
6362
android:importantForAutofill="no"
6463
android:maxHeight="300dp"
6564
android:minHeight="100dp"
65+
android:padding="@dimen/popup_padding"
6666
android:saveEnabled="true"
6767
android:textColor="@color/textSecondary"
6868
android:textColorHighlight="?attr/colorAppAccentLight"
@@ -72,7 +72,7 @@
7272

7373
</LinearLayout>
7474

75-
<RelativeLayout
75+
<LinearLayout
7676
android:layout_width="match_parent"
7777
android:layout_height="wrap_content"
7878
android:animateLayoutChanges="true"
@@ -82,26 +82,29 @@
8282
android:id="@+id/icon"
8383
android:layout_width="@dimen/app_button_size"
8484
android:layout_height="@dimen/app_button_size"
85-
android:layout_alignParentStart="true" />
85+
android:layout_gravity="center_vertical" />
86+
87+
<Space
88+
android:layout_width="0dp"
89+
android:layout_height="wrap_content"
90+
android:layout_weight="1" />
8691

8792
<app.simple.positional.decorations.ripple.DynamicRippleButton
8893
android:id="@+id/cancel"
8994
android:layout_width="wrap_content"
90-
android:layout_height="@dimen/app_button_size"
95+
android:layout_height="wrap_content"
9196
android:layout_gravity="end"
92-
android:layout_toStartOf="@id/save"
9397
android:text="@string/button_cancel"
9498
android:textColor="@color/textPrimary"
9599
tools:ignore="RelativeOverlap" />
96100

97101
<app.simple.positional.decorations.ripple.DynamicRippleButton
98102
android:id="@+id/save"
99103
android:layout_width="wrap_content"
100-
android:layout_height="@dimen/app_button_size"
101-
android:layout_alignParentEnd="true"
104+
android:layout_height="wrap_content"
102105
android:text="@string/save"
103106
android:textColor="@color/textPrimary" />
104107

105-
</RelativeLayout>
108+
</LinearLayout>
106109

107110
</app.simple.positional.decorations.corners.DynamicCornerLinearLayout>

0 commit comments

Comments
 (0)