Skip to content

Commit 9dfd269

Browse files
WSTxdaWSTxda
committed
Switch to Material3Expressive theme style
1 parent 5088a66 commit 9dfd269

File tree

8 files changed

+28
-27
lines changed

8 files changed

+28
-27
lines changed

‎build.gradle‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ buildscript {
1414
ext.fragmentVersion = '1.8.6'
1515
ext.lifecycleVersion = '2.8.7'
1616
ext.loaderVersion = '1.1.0'
17-
ext.materialVersion = '1.12.0'
17+
ext.materialVersion = '1.13.0-alpha13'
1818
ext.mediarouterVersion = '1.7.0'
1919
ext.multidexVersion = '2.0.1'
2020
ext.navigationVersion = '2.8.9'

‎play-services-core/microg-ui-tools/src/main/res/layout/about_root.xml‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -67,16 +67,15 @@
6767
android:textAppearance="?attr/textAppearanceBodyLarge"
6868
android:textColor="?android:textColorSecondary" />
6969

70-
<Button
70+
<com.google.android.material.button.MaterialButton
7171
android:id="@+id/btnCheckUpdates"
72-
style="@style/Widget.Material3.Button.TonalButton.Icon"
72+
style="@style/Widget.Material3Expressive.Button.TonalButton"
7373
android:layout_width="wrap_content"
7474
android:layout_height="wrap_content"
7575
android:layout_gravity="bottom|center"
7676
android:layout_marginTop="12dp"
7777
android:text="@string/check_updates"
78-
app:icon="@drawable/ic_update"
79-
app:iconPadding="8dp" />
78+
app:icon="@drawable/ic_update" />
8079
</LinearLayout>
8180
</com.google.android.material.card.MaterialCardView>
8281

‎play-services-core/src/main/res/layout-land/dialog_remove_account.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525

2626
<com.google.android.material.button.MaterialButton
2727
android:id="@+id/negative_button"
28-
style="@style/Widget.Material3.Button.TonalButton"
28+
style="@style/Widget.Material3Expressive.Button.TonalButton"
2929
android:layout_width="0dp"
3030
android:layout_height="wrap_content"
3131
android:layout_marginEnd="12dp"
@@ -61,7 +61,7 @@
6161

6262
<com.google.android.material.button.MaterialButton
6363
android:id="@+id/positive_button"
64-
style="@style/Widget.Material3.Button"
64+
style="@style/Widget.Material3Expressive.Button"
6565
android:layout_width="0dp"
6666
android:layout_height="wrap_content"
6767
android:layout_marginStart="12dp"

‎play-services-core/src/main/res/layout-land/login_assistant.xml‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -46,37 +46,36 @@
4646
android:id="@+id/illustration_view"
4747
android:layout_width="0dp"
4848
android:layout_height="wrap_content"
49+
android:layout_marginEnd="16dp"
4950
android:adjustViewBounds="true"
5051
android:importantForAccessibility="no"
5152
android:src="@drawable/auth_illustration"
52-
android:layout_marginEnd="16dp"
53-
app:layout_constraintStart_toStartOf="parent"
53+
app:layout_constraintBottom_toBottomOf="parent"
5454
app:layout_constraintEnd_toStartOf="@+id/guideline"
55+
app:layout_constraintStart_toStartOf="parent"
5556
app:layout_constraintTop_toTopOf="parent"
56-
app:layout_constraintBottom_toBottomOf="parent"
57-
app:layout_constraintVertical_bias="0"
58-
/>
57+
app:layout_constraintVertical_bias="0" />
5958

6059
<com.google.android.material.imageview.ShapeableImageView
6160
android:id="@+id/logo_view"
6261
android:layout_width="100dp"
6362
android:layout_height="wrap_content"
63+
android:layout_marginStart="16dp"
6464
android:adjustViewBounds="true"
6565
android:importantForAccessibility="no"
6666
android:src="@drawable/microg_logo"
67-
android:layout_marginStart="16dp"
6867
app:layout_constraintStart_toEndOf="@+id/guideline"
6968
app:layout_constraintTop_toTopOf="parent" />
7069

7170
<com.google.android.material.textview.MaterialTextView
7271
android:id="@+id/title"
7372
android:layout_width="0dp"
7473
android:layout_height="wrap_content"
74+
android:layout_marginStart="16dp"
7575
android:layout_marginTop="8dp"
7676
android:textAppearance="?attr/textAppearanceDisplayMedium"
7777
android:textColor="?android:textColorPrimary"
7878
android:textStyle="bold"
79-
android:layout_marginStart="16dp"
8079
app:layout_constraintEnd_toEndOf="parent"
8180
app:layout_constraintStart_toEndOf="@+id/guideline"
8281
app:layout_constraintTop_toBottomOf="@+id/logo_view"
@@ -86,10 +85,10 @@
8685
android:id="@+id/description_text"
8786
android:layout_width="0dp"
8887
android:layout_height="wrap_content"
88+
android:layout_marginStart="16dp"
8989
android:layout_marginTop="24dp"
9090
android:textAppearance="?attr/textAppearanceTitleMedium"
9191
android:textColor="?android:textColorPrimary"
92-
android:layout_marginStart="16dp"
9392
app:layout_constraintEnd_toEndOf="parent"
9493
app:layout_constraintStart_toEndOf="@+id/guideline"
9594
app:layout_constraintTop_toBottomOf="@+id/title"
@@ -99,8 +98,8 @@
9998
android:id="@+id/auth_content"
10099
android:layout_width="0dp"
101100
android:layout_height="wrap_content"
102-
android:layout_marginTop="16dp"
103101
android:layout_marginStart="16dp"
102+
android:layout_marginTop="16dp"
104103
app:layout_constraintEnd_toEndOf="parent"
105104
app:layout_constraintStart_toEndOf="@+id/guideline"
106105
app:layout_constraintTop_toBottomOf="@+id/description_text" />
@@ -136,18 +135,19 @@
136135

137136
<com.google.android.material.button.MaterialButton
138137
android:id="@+id/spoof_button"
139-
style="@style/Widget.Material3.Button.TonalButton"
138+
style="@style/Widget.Material3Expressive.Button.TonalButton"
140139
android:layout_width="0dp"
141-
android:layout_marginEnd="12dp"
142140
android:layout_height="wrap_content"
141+
android:layout_marginEnd="12dp"
143142
android:layout_weight="1"
144143
tools:text="@string/brand_spoof_button" />
145144

146145
<com.google.android.material.button.MaterialButton
147146
android:id="@+id/next_button"
147+
style="@style/Widget.Material3Expressive.Button"
148148
android:layout_width="0dp"
149-
android:layout_marginStart="12dp"
150149
android:layout_height="wrap_content"
150+
android:layout_marginStart="12dp"
151151
android:layout_weight="1"
152152
tools:text="@string/auth_sign_in" />
153153
</LinearLayout>

‎play-services-core/src/main/res/layout-sw600dp/login_assistant.xml‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -83,11 +83,11 @@
8383

8484
<com.google.android.material.imageview.ShapeableImageView
8585
android:id="@+id/logo_view"
86-
android:paddingTop="32dp"
8786
android:layout_width="150dp"
8887
android:layout_height="wrap_content"
8988
android:adjustViewBounds="true"
9089
android:importantForAccessibility="no"
90+
android:paddingTop="32dp"
9191
android:src="@drawable/microg_logo"
9292
app:layout_constraintStart_toStartOf="parent"
9393
app:layout_constraintTop_toTopOf="parent" />
@@ -153,7 +153,7 @@
153153

154154
<com.google.android.material.button.MaterialButton
155155
android:id="@+id/spoof_button"
156-
style="@style/Widget.Material3.Button.TonalButton"
156+
style="@style/Widget.Material3Expressive.Button.TonalButton"
157157
android:layout_width="0dp"
158158
android:layout_height="56dp"
159159
android:layout_marginEnd="8dp"
@@ -163,6 +163,7 @@
163163

164164
<com.google.android.material.button.MaterialButton
165165
android:id="@+id/next_button"
166+
style="@style/Widget.Material3Expressive.Button"
166167
android:layout_width="0dp"
167168
android:layout_height="56dp"
168169
android:layout_marginStart="8dp"

‎play-services-core/src/main/res/layout/dialog_remove_account.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@
5050

5151
<com.google.android.material.button.MaterialButton
5252
android:id="@+id/negative_button"
53-
style="@style/Widget.Material3.Button.TonalButton"
53+
style="@style/Widget.Material3Expressive.Button.TonalButton"
5454
android:layout_width="0dp"
5555
android:layout_height="wrap_content"
5656
android:layout_marginEnd="8dp"
@@ -59,7 +59,7 @@
5959

6060
<com.google.android.material.button.MaterialButton
6161
android:id="@+id/positive_button"
62-
style="@style/Widget.Material3.Button"
62+
style="@style/Widget.Material3Expressive.Button"
6363
android:layout_width="0dp"
6464
android:layout_height="wrap_content"
6565
android:layout_weight="1"

‎play-services-core/src/main/res/layout/login_assistant.xml‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -119,18 +119,19 @@
119119

120120
<com.google.android.material.button.MaterialButton
121121
android:id="@+id/spoof_button"
122-
style="@style/Widget.Material3.Button.TonalButton"
122+
style="@style/Widget.Material3Expressive.Button.TonalButton"
123123
android:layout_width="0dp"
124-
android:layout_marginEnd="12dp"
125124
android:layout_height="wrap_content"
125+
android:layout_marginEnd="12dp"
126126
android:layout_weight="1"
127127
tools:text="@string/brand_spoof_button" />
128128

129129
<com.google.android.material.button.MaterialButton
130130
android:id="@+id/next_button"
131+
style="@style/Widget.Material3Expressive.Button"
131132
android:layout_width="0dp"
132-
android:layout_marginStart="12dp"
133133
android:layout_height="wrap_content"
134+
android:layout_marginStart="12dp"
134135
android:layout_weight="1"
135136
tools:text="@string/auth_sign_in" />
136137
</LinearLayout>

‎play-services-core/src/main/res/values/themes.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88

99
<!-- Base application theme -->
1010

11-
<style name="Theme.Base" parent="Theme.Material3.DynamicColors.DayNight">
11+
<style name="Theme.Base" parent="Theme.Material3Expressive.DynamicColors.DayNight">
1212
<item name="preferenceTheme">@style/Theme.Base.PreferenceThemeOverlay</item>
1313
</style>
1414

0 commit comments

Comments
 (0)