Skip to content

Commit ff5ef44

Browse files
WSTxdaWSTxda
committed
Refactor layouts to use ConstraintLayout and update paddings
1 parent afe8a34 commit ff5ef44

17 files changed

Lines changed: 275 additions & 248 deletions

‎app/src/main/res/layout-land/assistant_setup_dialog.xml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@
55
android:layout_height="wrap_content"
66
android:background="?attr/colorSurfaceContainer"
77
android:fitsSystemWindows="false"
8-
android:paddingStart="?dialogPreferredPadding"
9-
android:paddingTop="?dialogPreferredPadding"
10-
android:paddingEnd="?dialogPreferredPadding"
8+
android:paddingStart="?attr/dialogPreferredPadding"
9+
android:paddingTop="?attr/dialogPreferredPadding"
10+
android:paddingEnd="?attr/dialogPreferredPadding"
1111
android:paddingBottom="20dp"
1212
tools:ignore="Overdraw">
1313

‎app/src/main/res/layout-land/list_item_assistant_tutorial.xml‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@
33
xmlns:tools="http://schemas.android.com/tools"
44
android:layout_width="match_parent"
55
android:layout_height="wrap_content"
6-
android:layout_marginStart="?attr/dialogPreferredPadding"
7-
android:layout_marginEnd="?attr/dialogPreferredPadding"
8-
android:layout_marginBottom="36dp">
6+
android:paddingStart="?attr/dialogPreferredPadding"
7+
android:paddingEnd="?attr/dialogPreferredPadding"
8+
android:paddingBottom="?attr/dialogPreferredPadding">
99

1010
<com.google.android.material.card.MaterialCardView
1111
android:id="@+id/tutorial_card"
@@ -51,9 +51,10 @@
5151
style="?attr/textAppearanceBodyMedium"
5252
android:layout_width="0dp"
5353
android:layout_height="wrap_content"
54-
android:layout_marginTop="8dp"
55-
android:ellipsize="end"
54+
android:ellipsize="marquee"
5655
android:maxLines="10"
56+
android:paddingTop="8dp"
57+
android:paddingBottom="8dp"
5758
android:textColor="?android:textColorSecondary"
5859
app:layout_constraintEnd_toEndOf="parent"
5960
app:layout_constraintStart_toStartOf="@id/tutorial_title"

‎app/src/main/res/layout/assistant_setup_dialog.xml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@
55
android:layout_height="wrap_content"
66
android:background="?attr/colorSurfaceContainer"
77
android:fitsSystemWindows="false"
8-
android:paddingStart="?dialogPreferredPadding"
9-
android:paddingTop="?dialogPreferredPadding"
10-
android:paddingEnd="?dialogPreferredPadding"
8+
android:paddingStart="?attr/dialogPreferredPadding"
9+
android:paddingTop="?attr/dialogPreferredPadding"
10+
android:paddingEnd="?attr/dialogPreferredPadding"
1111
android:paddingBottom="20dp"
1212
tools:ignore="Overdraw">
1313

‎app/src/main/res/layout/fragment_assistant_dialog.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
<?xml version="1.0" encoding="utf-8"?>
21
<androidx.appcompat.widget.LinearLayoutCompat xmlns:android="http://schemas.android.com/apk/res/android"
32
xmlns:app="http://schemas.android.com/apk/res-auto"
43
xmlns:tools="http://schemas.android.com/tools"
54
android:layout_width="match_parent"
65
android:layout_height="wrap_content"
6+
android:fitsSystemWindows="false"
77
android:orientation="vertical">
88

99
<com.google.android.material.bottomsheet.BottomSheetDragHandleView

‎app/src/main/res/layout/fragment_tutorial.xml‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
2-
xmlns:tools="http://schemas.android.com/tools"
32
android:id="@+id/tutorial_scroll_view"
43
android:layout_width="match_parent"
54
android:layout_height="match_parent"
@@ -11,6 +10,5 @@
1110
android:id="@+id/tutorial_container"
1211
android:layout_width="match_parent"
1312
android:layout_height="wrap_content"
14-
android:orientation="vertical"
15-
tools:listitem="@layout/list_item_assistant_tutorial" />
13+
android:orientation="vertical" />
1614
</ScrollView>

‎app/src/main/res/layout/fragment_tutorial_dialog.xml‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
xmlns:tools="http://schemas.android.com/tools"
44
android:layout_width="match_parent"
55
android:layout_height="wrap_content"
6+
android:fitsSystemWindows="false"
67
android:orientation="vertical">
78

89
<com.google.android.material.bottomsheet.BottomSheetDragHandleView
@@ -23,7 +24,7 @@
2324
android:id="@+id/divider_top"
2425
style="?attr/materialDividerStyle"
2526
android:layout_width="match_parent"
26-
android:layout_height="match_parent"
27+
android:layout_height="1dp"
2728
app:dividerColor="@color/divider_color"
2829
app:dividerThickness="1dp" />
2930

@@ -39,7 +40,7 @@
3940
android:id="@+id/divider_bottom"
4041
style="?attr/materialDividerStyle"
4142
android:layout_width="match_parent"
42-
android:layout_height="match_parent"
43+
android:layout_height="1dp"
4344
app:dividerColor="@color/divider_color"
4445
app:dividerThickness="1dp" />
4546
</androidx.appcompat.widget.LinearLayoutCompat>

‎app/src/main/res/layout/list_item_assistant_category.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
android:paddingStart="40dp"
77
android:paddingTop="14dp"
88
android:paddingEnd="40dp"
9-
android:paddingBottom="12dp"
9+
android:paddingBottom="14dp"
1010
android:textAppearance="?attr/textAppearanceLabelLarge"
1111
android:textColor="?attr/colorOnSurfaceVariant"
1212
tools:text="@string/assistant_category_recent" />

‎app/src/main/res/layout/list_item_assistant_tutorial.xml‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@
33
xmlns:tools="http://schemas.android.com/tools"
44
android:layout_width="match_parent"
55
android:layout_height="wrap_content"
6-
android:layout_marginStart="?attr/dialogPreferredPadding"
7-
android:layout_marginEnd="?attr/dialogPreferredPadding"
8-
android:layout_marginBottom="36dp">
6+
android:paddingStart="?attr/dialogPreferredPadding"
7+
android:paddingEnd="?attr/dialogPreferredPadding"
8+
android:paddingBottom="?attr/dialogPreferredPadding">
99

1010
<com.google.android.material.card.MaterialCardView
1111
android:id="@+id/tutorial_card"
@@ -50,9 +50,10 @@
5050
style="?attr/textAppearanceBodyMedium"
5151
android:layout_width="0dp"
5252
android:layout_height="wrap_content"
53-
android:ellipsize="end"
53+
android:ellipsize="marquee"
5454
android:maxLines="10"
5555
android:paddingTop="8dp"
56+
android:paddingBottom="16dp"
5657
android:textColor="?android:textColorSecondary"
5758
app:layout_constraintEnd_toEndOf="parent"
5859
app:layout_constraintStart_toStartOf="parent"

‎app/src/main/res/layout/list_item_assistant_view.xml‎

Lines changed: 14 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -11,30 +11,34 @@
1111
app:cardBackgroundColor="?attr/colorSecondaryContainer"
1212
app:cardCornerRadius="18dp">
1313

14-
<androidx.appcompat.widget.LinearLayoutCompat
14+
<androidx.constraintlayout.widget.ConstraintLayout
1515
android:layout_width="match_parent"
1616
android:layout_height="wrap_content"
17-
android:gravity="center_vertical"
18-
android:orientation="horizontal"
19-
android:padding="14dp">
17+
android:padding="16dp">
2018

2119
<com.google.android.material.imageview.ShapeableImageView
2220
android:id="@+id/assistant_icon"
2321
android:layout_width="wrap_content"
2422
android:layout_height="wrap_content"
25-
android:layout_marginEnd="12dp"
2623
android:tint="?attr/colorSecondary"
24+
app:layout_constraintBottom_toBottomOf="parent"
25+
app:layout_constraintStart_toStartOf="parent"
26+
app:layout_constraintTop_toTopOf="parent"
2727
tools:src="@drawable/ic_assistant_chatgpt" />
2828

2929
<com.google.android.material.textview.MaterialTextView
3030
android:id="@+id/assistant_checked_text_view"
3131
android:layout_width="0dp"
3232
android:layout_height="wrap_content"
33-
android:layout_weight="1"
33+
android:layout_marginHorizontal="8dp"
3434
android:ellipsize="marquee"
3535
android:maxLines="2"
3636
android:textAppearance="?attr/textAppearanceTitleMedium"
3737
android:textColor="?attr/colorOnSecondaryContainer"
38+
app:layout_constraintBottom_toBottomOf="@id/assistant_icon"
39+
app:layout_constraintEnd_toStartOf="@id/pin_button"
40+
app:layout_constraintStart_toEndOf="@id/assistant_icon"
41+
app:layout_constraintTop_toTopOf="@id/assistant_icon"
3842
tools:text="@string/chatgpt" />
3943

4044
<com.google.android.material.button.MaterialButton
@@ -49,6 +53,9 @@
4953
app:backgroundTint="?attr/colorPrimaryInverse"
5054
app:iconSize="20dp"
5155
app:iconTint="?attr/colorOnPrimaryContainer"
56+
app:layout_constraintBottom_toBottomOf="@id/assistant_icon"
57+
app:layout_constraintEnd_toEndOf="parent"
58+
app:layout_constraintTop_toTopOf="@id/assistant_icon"
5259
tools:icon="@drawable/ic_pin_filled" />
53-
</androidx.appcompat.widget.LinearLayoutCompat>
60+
</androidx.constraintlayout.widget.ConstraintLayout>
5461
</com.google.android.material.card.MaterialCardView>

‎app/src/main/res/layout/preference_material_assistant_cardview.xml‎

Lines changed: 31 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -4,66 +4,77 @@
44
style="?attr/materialCardViewFilledStyle"
55
android:layout_width="match_parent"
66
android:layout_height="wrap_content"
7-
android:layout_marginStart="17dp"
7+
android:layout_marginStart="?attr/listPreferredItemPaddingStart"
88
android:layout_marginTop="24dp"
9-
android:layout_marginEnd="17dp"
9+
android:layout_marginEnd="?attr/listPreferredItemPaddingEnd"
1010
android:layout_marginBottom="14dp"
11-
android:baselineAligned="true"
1211
android:clickable="true"
1312
app:cardBackgroundColor="?attr/colorPrimaryContainer"
1413
app:cardCornerRadius="18dp">
1514

16-
<androidx.appcompat.widget.LinearLayoutCompat
15+
<androidx.constraintlayout.widget.ConstraintLayout
1716
android:layout_width="match_parent"
1817
android:layout_height="wrap_content"
19-
android:orientation="horizontal">
18+
android:padding="16dp">
2019

2120
<com.google.android.material.imageview.ShapeableImageView
2221
android:id="@android:id/icon"
2322
android:layout_width="wrap_content"
2423
android:layout_height="wrap_content"
25-
android:layout_gravity="start|center_vertical"
26-
android:layout_marginStart="16dp"
2724
android:importantForAccessibility="no"
2825
android:tint="?attr/colorOnPrimaryContainer"
26+
app:layout_constraintBottom_toBottomOf="parent"
27+
app:layout_constraintStart_toStartOf="parent"
28+
app:layout_constraintTop_toTopOf="parent"
2929
tools:src="@drawable/ic_assistant_chatgpt" />
3030

31-
<androidx.appcompat.widget.LinearLayoutCompat
31+
<androidx.constraintlayout.widget.ConstraintLayout
32+
android:id="@+id/text_container"
3233
android:layout_width="0dp"
3334
android:layout_height="wrap_content"
34-
android:layout_gravity="center_vertical"
35-
android:layout_margin="16dp"
36-
android:layout_weight="1"
37-
android:orientation="vertical">
35+
android:layout_marginStart="16dp"
36+
android:layout_marginEnd="16dp"
37+
app:layout_constraintBottom_toBottomOf="@android:id/icon"
38+
app:layout_constraintEnd_toStartOf="@android:id/widget_frame"
39+
app:layout_constraintStart_toEndOf="@android:id/icon"
40+
app:layout_constraintTop_toTopOf="@android:id/icon">
3841

3942
<com.google.android.material.textview.MaterialTextView
4043
android:id="@android:id/title"
41-
android:layout_width="wrap_content"
44+
android:layout_width="0dp"
4245
android:layout_height="wrap_content"
4346
android:ellipsize="marquee"
4447
android:maxLines="2"
45-
android:paddingBottom="4dp"
4648
android:textAppearance="?attr/textAppearanceTitleMedium"
4749
android:textColor="?attr/colorOnPrimaryContainer"
50+
app:layout_constraintEnd_toEndOf="parent"
51+
app:layout_constraintStart_toStartOf="parent"
52+
app:layout_constraintTop_toTopOf="parent"
4853
tools:text="@string/pref_digital_assistant" />
4954

5055
<com.google.android.material.textview.MaterialTextView
5156
android:id="@android:id/summary"
52-
android:layout_width="wrap_content"
57+
android:layout_width="0dp"
5358
android:layout_height="wrap_content"
59+
android:layout_marginTop="2dp"
5460
android:ellipsize="marquee"
5561
android:maxLines="8"
5662
android:textAppearance="?attr/textAppearanceBodyLargeEmphasized"
5763
android:textColor="?attr/colorPrimary"
64+
app:layout_constraintBottom_toBottomOf="parent"
65+
app:layout_constraintEnd_toEndOf="parent"
66+
app:layout_constraintStart_toStartOf="parent"
67+
app:layout_constraintTop_toBottomOf="@android:id/title"
5868
tools:text="@string/chatgpt" />
59-
</androidx.appcompat.widget.LinearLayoutCompat>
69+
</androidx.constraintlayout.widget.ConstraintLayout>
6070

6171
<androidx.appcompat.widget.LinearLayoutCompat
6272
android:id="@android:id/widget_frame"
6373
android:layout_width="wrap_content"
6474
android:layout_height="wrap_content"
65-
android:layout_gravity="center_vertical"
66-
android:layout_marginEnd="16dp"
67-
android:orientation="vertical" />
68-
</androidx.appcompat.widget.LinearLayoutCompat>
75+
android:orientation="vertical"
76+
app:layout_constraintBottom_toBottomOf="@android:id/icon"
77+
app:layout_constraintEnd_toEndOf="parent"
78+
app:layout_constraintTop_toTopOf="@android:id/icon" />
79+
</androidx.constraintlayout.widget.ConstraintLayout>
6980
</com.google.android.material.card.MaterialCardView>

0 commit comments

Comments
 (0)