|
11 | 11 | <LinearLayout |
12 | 12 | android:layout_width="match_parent" |
13 | 13 | android:layout_height="wrap_content" |
| 14 | + android:layout_marginBottom="@dimen/popup_padding" |
14 | 15 | android:backgroundTint="@color/editTextBackground" |
15 | | - android:orientation="vertical" |
16 | | - android:layout_marginBottom="@dimen/popup_padding"> |
| 16 | + android:orientation="vertical"> |
17 | 17 |
|
18 | 18 | <TextView |
19 | 19 | android:layout_width="match_parent" |
|
28 | 28 | android:layout_width="match_parent" |
29 | 29 | android:layout_height="wrap_content" |
30 | 30 | android:layout_marginTop="2dp" |
| 31 | + android:background="@drawable/text_field" |
31 | 32 | android:fontFamily="@font/regular" |
32 | | - android:maxLines="1" |
| 33 | + android:importantForAutofill="no" |
33 | 34 | android:maxLength="60" |
| 35 | + android:maxLines="1" |
| 36 | + android:minHeight="50dp" |
34 | 37 | android:paddingHorizontal="@dimen/popup_padding" |
35 | | - android:background="@drawable/text_field" |
36 | | - android:importantForAutofill="no" |
37 | 38 | android:saveEnabled="true" |
38 | | - android:minHeight="50dp" |
39 | 39 | android:textColor="@color/textSecondary" |
40 | 40 | android:textColorHighlight="?attr/colorAppAccentLight" |
41 | 41 | android:textColorHint="@color/textTertiary" |
|
56 | 56 | android:layout_width="match_parent" |
57 | 57 | android:layout_height="wrap_content" |
58 | 58 | android:layout_marginTop="2dp" |
| 59 | + android:background="@drawable/text_field" |
59 | 60 | android:fontFamily="@font/regular" |
60 | 61 | android:gravity="top" |
61 | | - android:background="@drawable/text_field" |
62 | | - android:padding="@dimen/popup_padding" |
63 | 62 | android:importantForAutofill="no" |
64 | 63 | android:maxHeight="300dp" |
65 | 64 | android:minHeight="100dp" |
| 65 | + android:padding="@dimen/popup_padding" |
66 | 66 | android:saveEnabled="true" |
67 | 67 | android:textColor="@color/textSecondary" |
68 | 68 | android:textColorHighlight="?attr/colorAppAccentLight" |
|
72 | 72 |
|
73 | 73 | </LinearLayout> |
74 | 74 |
|
75 | | - <RelativeLayout |
| 75 | + <LinearLayout |
76 | 76 | android:layout_width="match_parent" |
77 | 77 | android:layout_height="wrap_content" |
78 | 78 | android:animateLayoutChanges="true" |
|
82 | 82 | android:id="@+id/icon" |
83 | 83 | android:layout_width="@dimen/app_button_size" |
84 | 84 | 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" /> |
86 | 91 |
|
87 | 92 | <app.simple.positional.decorations.ripple.DynamicRippleButton |
88 | 93 | android:id="@+id/cancel" |
89 | 94 | android:layout_width="wrap_content" |
90 | | - android:layout_height="@dimen/app_button_size" |
| 95 | + android:layout_height="wrap_content" |
91 | 96 | android:layout_gravity="end" |
92 | | - android:layout_toStartOf="@id/save" |
93 | 97 | android:text="@string/button_cancel" |
94 | 98 | android:textColor="@color/textPrimary" |
95 | 99 | tools:ignore="RelativeOverlap" /> |
96 | 100 |
|
97 | 101 | <app.simple.positional.decorations.ripple.DynamicRippleButton |
98 | 102 | android:id="@+id/save" |
99 | 103 | android:layout_width="wrap_content" |
100 | | - android:layout_height="@dimen/app_button_size" |
101 | | - android:layout_alignParentEnd="true" |
| 104 | + android:layout_height="wrap_content" |
102 | 105 | android:text="@string/save" |
103 | 106 | android:textColor="@color/textPrimary" /> |
104 | 107 |
|
105 | | - </RelativeLayout> |
| 108 | + </LinearLayout> |
106 | 109 |
|
107 | 110 | </app.simple.positional.decorations.corners.DynamicCornerLinearLayout> |
0 commit comments