Skip to content

Commit 8865e82

Browse files
MihaiCristianCondreaMihaiCristianCondrea
committed
Use Material and AppCompat widgets in layouts
1 parent 588a06d commit 8865e82

18 files changed

+97
-97
lines changed

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
app:layout_constraintStart_toStartOf="parent"
2727
app:layout_constraintTop_toBottomOf="@id/buttonSkip" />
2828

29-
<LinearLayout
29+
<androidx.appcompat.widget.LinearLayoutCompat
3030
android:id="@+id/bottomBar"
3131
android:layout_width="0dp"
3232
android:layout_height="wrap_content"
@@ -71,6 +71,6 @@
7171
app:icon="@drawable/ic_arrow_forward"
7272
app:iconGravity="textEnd" />
7373

74-
</LinearLayout>
74+
</androidx.appcompat.widget.LinearLayoutCompat>
7575

7676
</androidx.constraintlayout.widget.ConstraintLayout>

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
2+
<androidx.appcompat.widget.LinearLayoutCompat xmlns:android="http://schemas.android.com/apk/res/android"
33
android:id="@+id/container"
44
android:layout_width="match_parent"
55
android:layout_height="match_parent"
@@ -9,4 +9,4 @@
99
android:id="@+id/settings"
1010
android:layout_width="match_parent"
1111
android:layout_height="match_parent" />
12-
</LinearLayout>
12+
</androidx.appcompat.widget.LinearLayoutCompat>

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

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
android:layout_marginTop="12dp"
3030
app:cardCornerRadius="24dp">
3131

32-
<LinearLayout
32+
<androidx.appcompat.widget.LinearLayoutCompat
3333
android:layout_width="match_parent"
3434
android:layout_height="wrap_content"
3535
android:gravity="center"
@@ -69,7 +69,7 @@
6969
<com.google.android.material.textview.MaterialTextView
7070
android:layout_width="48dp"
7171
android:layout_height="24dp" />
72-
</LinearLayout>
72+
</androidx.appcompat.widget.LinearLayoutCompat>
7373
</com.google.android.material.card.MaterialCardView>
7474
</TableRow>
7575

@@ -82,7 +82,7 @@
8282
android:layout_marginTop="12dp"
8383
app:cardCornerRadius="24dp">
8484

85-
<LinearLayout
85+
<androidx.appcompat.widget.LinearLayoutCompat
8686
android:layout_width="match_parent"
8787
android:layout_height="wrap_content"
8888
android:gravity="center"
@@ -122,7 +122,7 @@
122122
<com.google.android.material.textview.MaterialTextView
123123
android:layout_width="48dp"
124124
android:layout_height="24dp" />
125-
</LinearLayout>
125+
</androidx.appcompat.widget.LinearLayoutCompat>
126126
</com.google.android.material.card.MaterialCardView>
127127
</TableRow>
128128

@@ -135,7 +135,7 @@
135135
android:layout_marginTop="12dp"
136136
app:cardCornerRadius="24dp">
137137

138-
<LinearLayout
138+
<androidx.appcompat.widget.LinearLayoutCompat
139139
android:layout_width="match_parent"
140140
android:layout_height="wrap_content"
141141
android:gravity="center"
@@ -175,7 +175,7 @@
175175
<com.google.android.material.textview.MaterialTextView
176176
android:layout_width="48dp"
177177
android:layout_height="24dp" />
178-
</LinearLayout>
178+
</androidx.appcompat.widget.LinearLayoutCompat>
179179
</com.google.android.material.card.MaterialCardView>
180180
</TableRow>
181181

@@ -188,7 +188,7 @@
188188
android:layout_marginTop="12dp"
189189
app:cardCornerRadius="24dp">
190190

191-
<LinearLayout
191+
<androidx.appcompat.widget.LinearLayoutCompat
192192
android:layout_width="match_parent"
193193
android:layout_height="wrap_content"
194194
android:gravity="center"
@@ -228,7 +228,7 @@
228228
<com.google.android.material.textview.MaterialTextView
229229
android:layout_width="48dp"
230230
android:layout_height="24dp" />
231-
</LinearLayout>
231+
</androidx.appcompat.widget.LinearLayoutCompat>
232232
</com.google.android.material.card.MaterialCardView>
233233
</TableRow>
234234
</TableLayout>

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
app:cardUseCompatPadding="false"
1515
app:shapeAppearanceOverlay="@style/ShapeAppearanceOverlay.CardViewBottomRounded">
1616

17-
<LinearLayout
17+
<androidx.appcompat.widget.LinearLayoutCompat
1818
android:layout_width="match_parent"
1919
android:layout_height="wrap_content"
2020
android:orientation="vertical"
@@ -44,7 +44,7 @@
4444
android:layout_height="match_parent" />
4545
</com.google.android.material.card.MaterialCardView>
4646

47-
<TextView
47+
<com.google.android.material.textview.MaterialTextView
4848
android:id="@+id/ad_headline"
4949
android:layout_width="0dp"
5050
android:layout_height="wrap_content"
@@ -56,7 +56,7 @@
5656
app:layout_constraintStart_toEndOf="@id/media_card"
5757
app:layout_constraintTop_toTopOf="@id/media_card" />
5858

59-
<TextView
59+
<com.google.android.material.textview.MaterialTextView
6060
android:id="@+id/ad_body"
6161
android:layout_width="0dp"
6262
android:layout_height="wrap_content"
@@ -94,7 +94,7 @@
9494
app:layout_constraintTop_toBottomOf="@id/ad_body" />
9595

9696
</androidx.constraintlayout.widget.ConstraintLayout>
97-
</LinearLayout>
97+
</androidx.appcompat.widget.LinearLayoutCompat>
9898
</com.google.android.material.card.MaterialCardView>
9999
</com.google.android.gms.ads.nativead.NativeAdView>
100100

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

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -12,15 +12,15 @@
1212
android:layout_marginHorizontal="16dp"
1313
app:cardCornerRadius="4dp">
1414

15-
<LinearLayout
15+
<androidx.appcompat.widget.LinearLayoutCompat
1616
android:layout_width="match_parent"
1717
android:layout_height="wrap_content"
1818
android:orientation="vertical"
1919
android:padding="16dp">
2020

2121
<include layout="@layout/ad_attribution" />
2222

23-
<LinearLayout
23+
<androidx.appcompat.widget.LinearLayoutCompat
2424
android:layout_width="match_parent"
2525
android:layout_height="wrap_content"
2626
android:gravity="center_vertical"
@@ -36,26 +36,26 @@
3636
android:layout_width="match_parent"
3737
android:layout_height="match_parent" />
3838

39-
<ImageView
39+
<androidx.appcompat.widget.AppCompatImageView
4040
android:id="@+id/ad_app_icon"
4141
android:layout_width="match_parent"
4242
android:layout_height="match_parent"
4343
android:visibility="gone" />
4444
</FrameLayout>
4545

46-
<LinearLayout
46+
<androidx.appcompat.widget.LinearLayoutCompat
4747
android:layout_width="0dp"
4848
android:layout_height="wrap_content"
4949
android:layout_weight="1"
5050
android:orientation="vertical">
5151

52-
<TextView
52+
<com.google.android.material.textview.MaterialTextView
5353
android:id="@+id/ad_headline"
5454
android:layout_width="wrap_content"
5555
android:layout_height="wrap_content"
5656
android:textAppearance="@style/TextAppearance.Material3.TitleSmall" />
5757

58-
<TextView
58+
<com.google.android.material.textview.MaterialTextView
5959
android:id="@+id/ad_body"
6060
android:layout_width="wrap_content"
6161
android:layout_height="wrap_content"
@@ -69,14 +69,14 @@
6969
android:isIndicator="true"
7070
android:numStars="5"
7171
android:stepSize="0.5" />
72-
</LinearLayout>
72+
</androidx.appcompat.widget.LinearLayoutCompat>
7373

7474
<com.google.android.material.button.MaterialButton
7575
android:id="@+id/ad_call_to_action"
7676
style="@style/Widget.Material3.Button.TextButton"
7777
android:layout_width="wrap_content"
7878
android:layout_height="wrap_content" />
79-
</LinearLayout>
80-
</LinearLayout>
79+
</androidx.appcompat.widget.LinearLayoutCompat>
80+
</androidx.appcompat.widget.LinearLayoutCompat>
8181
</com.google.android.material.card.MaterialCardView>
8282
</com.google.android.gms.ads.nativead.NativeAdView>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<TextView xmlns:android="http://schemas.android.com/apk/res/android"
2+
<com.google.android.material.textview.MaterialTextView xmlns:android="http://schemas.android.com/apk/res/android"
33
android:id="@+id/ad_attribution"
44
android:layout_width="wrap_content"
55
android:layout_height="wrap_content"

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

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
android:layout_width="match_parent"
44
android:layout_height="wrap_content">
55

6-
<LinearLayout
6+
<androidx.appcompat.widget.LinearLayoutCompat
77
android:id="@+id/ad_host"
88
android:layout_width="match_parent"
99
android:layout_height="wrap_content"
@@ -17,7 +17,7 @@
1717
android:layout_height="wrap_content"
1818
android:layout_marginTop="4dp" />
1919

20-
<LinearLayout
20+
<androidx.appcompat.widget.LinearLayoutCompat
2121
android:layout_width="match_parent"
2222
android:layout_height="wrap_content"
2323
android:gravity="center_vertical"
@@ -29,28 +29,28 @@
2929
android:layout_height="32dp"
3030
android:layout_marginEnd="12dp" />
3131

32-
<LinearLayout
32+
<androidx.appcompat.widget.LinearLayoutCompat
3333
android:layout_width="0dp"
3434
android:layout_height="wrap_content"
3535
android:layout_weight="1"
3636
android:orientation="vertical">
3737

38-
<TextView
38+
<com.google.android.material.textview.MaterialTextView
3939
android:id="@+id/ad_headline"
4040
android:layout_width="wrap_content"
4141
android:layout_height="wrap_content"
4242
android:ellipsize="end"
4343
android:maxLines="1"
4444
android:textAppearance="@style/TextAppearance.Material3.BodyMedium" />
4545

46-
<TextView
46+
<com.google.android.material.textview.MaterialTextView
4747
android:id="@+id/ad_body"
4848
android:layout_width="wrap_content"
4949
android:layout_height="wrap_content"
5050
android:ellipsize="end"
5151
android:maxLines="1"
5252
android:textAppearance="@style/TextAppearance.Material3.BodySmall" />
53-
</LinearLayout>
53+
</androidx.appcompat.widget.LinearLayoutCompat>
5454

5555
<com.google.android.material.button.MaterialButton
5656
android:id="@+id/ad_call_to_action"
@@ -60,6 +60,6 @@
6060
android:layout_marginStart="8dp"
6161
android:minWidth="88dp"
6262
android:minHeight="40dp" />
63-
</LinearLayout>
64-
</LinearLayout>
63+
</androidx.appcompat.widget.LinearLayoutCompat>
64+
</androidx.appcompat.widget.LinearLayoutCompat>
6565
</com.google.android.gms.ads.nativead.NativeAdView>

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

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
android:layout_height="wrap_content"
1212
app:cardCornerRadius="24dp">
1313

14-
<LinearLayout
14+
<androidx.appcompat.widget.LinearLayoutCompat
1515
android:layout_width="match_parent"
1616
android:layout_height="wrap_content"
1717
android:layout_margin="16dp"
@@ -34,43 +34,43 @@
3434
android:scaleType="centerCrop" />
3535
</com.google.android.material.card.MaterialCardView>
3636

37-
<LinearLayout
37+
<androidx.appcompat.widget.LinearLayoutCompat
3838
android:layout_width="match_parent"
3939
android:layout_height="wrap_content"
4040
android:layout_marginTop="8dp"
4141
android:gravity="center_vertical"
4242
android:orientation="horizontal">
4343

44-
<LinearLayout
44+
<androidx.appcompat.widget.LinearLayoutCompat
4545
android:layout_width="0dp"
4646
android:layout_height="wrap_content"
4747
android:layout_weight="1"
4848
android:orientation="vertical">
4949

50-
<TextView
50+
<com.google.android.material.textview.MaterialTextView
5151
android:id="@+id/ad_headline"
5252
android:layout_width="match_parent"
5353
android:layout_height="wrap_content"
5454
android:ellipsize="end"
5555
android:maxLines="1"
5656
android:textAppearance="@style/TextAppearance.Material3.TitleMedium" />
5757

58-
<TextView
58+
<com.google.android.material.textview.MaterialTextView
5959
android:id="@+id/ad_body"
6060
android:layout_width="match_parent"
6161
android:layout_height="wrap_content"
6262
android:layout_marginTop="4dp"
6363
android:ellipsize="end"
6464
android:maxLines="1"
6565
android:textAppearance="@style/TextAppearance.Material3.BodySmall" />
66-
</LinearLayout>
66+
</androidx.appcompat.widget.LinearLayoutCompat>
6767

6868
<com.google.android.material.button.MaterialButton
6969
android:id="@+id/ad_call_to_action"
7070
android:layout_width="wrap_content"
7171
android:layout_height="wrap_content"
7272
android:layout_marginStart="8dp" />
73-
</LinearLayout>
74-
</LinearLayout>
73+
</androidx.appcompat.widget.LinearLayoutCompat>
74+
</androidx.appcompat.widget.LinearLayoutCompat>
7575
</com.google.android.material.card.MaterialCardView>
7676
</com.google.android.gms.ads.nativead.NativeAdView>

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

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -14,52 +14,52 @@
1414
android:layout_marginBottom="16dp"
1515
app:shapeAppearanceOverlay="@style/ShapeAppearanceOverlay.CardViewBottomRounded">
1616

17-
<LinearLayout
17+
<androidx.appcompat.widget.LinearLayoutCompat
1818
android:layout_width="match_parent"
1919
android:layout_height="wrap_content"
2020
android:orientation="vertical"
2121
android:padding="16dp">
2222

2323
<include layout="@layout/ad_attribution" />
2424

25-
<LinearLayout
25+
<androidx.appcompat.widget.LinearLayoutCompat
2626
android:layout_width="match_parent"
2727
android:layout_height="wrap_content"
2828
android:layout_marginTop="8dp"
2929
android:gravity="center_vertical"
3030
android:orientation="horizontal">
3131

32-
<ImageView
32+
<androidx.appcompat.widget.AppCompatImageView
3333
android:id="@+id/ad_app_icon"
3434
android:layout_width="40dp"
3535
android:layout_height="40dp"
3636
android:layout_marginEnd="16dp" />
3737

38-
<LinearLayout
38+
<androidx.appcompat.widget.LinearLayoutCompat
3939
android:layout_width="0dp"
4040
android:layout_height="wrap_content"
4141
android:layout_weight="1"
4242
android:orientation="vertical">
4343

44-
<TextView
44+
<com.google.android.material.textview.MaterialTextView
4545
android:id="@+id/ad_headline"
4646
android:layout_width="wrap_content"
4747
android:layout_height="wrap_content"
4848
android:textAppearance="@style/TextAppearance.Material3.TitleMedium" />
4949

50-
<TextView
50+
<com.google.android.material.textview.MaterialTextView
5151
android:id="@+id/ad_body"
5252
android:layout_width="wrap_content"
5353
android:layout_height="wrap_content"
5454
android:textAppearance="@style/TextAppearance.Material3.BodySmall" />
55-
</LinearLayout>
55+
</androidx.appcompat.widget.LinearLayoutCompat>
5656

5757
<com.google.android.material.button.MaterialButton
5858
android:id="@+id/ad_call_to_action"
5959
style="@style/Widget.Material3.Button.TextButton"
6060
android:layout_width="wrap_content"
6161
android:layout_height="wrap_content" />
62-
</LinearLayout>
63-
</LinearLayout>
62+
</androidx.appcompat.widget.LinearLayoutCompat>
63+
</androidx.appcompat.widget.LinearLayoutCompat>
6464
</com.google.android.material.card.MaterialCardView>
6565
</com.google.android.gms.ads.nativead.NativeAdView>

0 commit comments

Comments
 (0)