Skip to content

Commit 76423ce

Browse files
msfjarvismsfjarvis
committed
ui: use M3 styles everywhere
Signed-off-by: Harsh Shandilya <[email protected]>
1 parent b37006c commit 76423ce

14 files changed

+40
-52
lines changed

‎ui/src/main/res/layout/add_tunnels_bottom_sheet.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88

99
<com.google.android.material.button.MaterialButton
1010
android:id="@+id/create_from_file"
11-
style="@style/Widget.MaterialComponents.Button.TextButton.Icon"
11+
style="@style/Widget.Material3.Button.TextButton.Icon"
1212
android:layout_width="match_parent"
1313
android:layout_height="@dimen/bottom_sheet_item_height"
1414
android:layout_marginStart="@dimen/normal_margin"
@@ -31,7 +31,7 @@
3131

3232
<com.google.android.material.button.MaterialButton
3333
android:id="@+id/create_from_qrcode"
34-
style="@style/Widget.MaterialComponents.Button.TextButton.Icon"
34+
style="@style/Widget.Material3.Button.TextButton.Icon"
3535
android:layout_width="match_parent"
3636
android:layout_height="@dimen/bottom_sheet_item_height"
3737
android:layout_marginStart="@dimen/normal_margin"
@@ -55,7 +55,7 @@
5555

5656
<com.google.android.material.button.MaterialButton
5757
android:id="@+id/create_empty"
58-
style="@style/Widget.MaterialComponents.Button.TextButton.Icon"
58+
style="@style/Widget.Material3.Button.TextButton.Icon"
5959
android:layout_width="match_parent"
6060
android:layout_height="@dimen/bottom_sheet_item_height"
6161
android:layout_marginStart="@dimen/normal_margin"

‎ui/src/main/res/layout/app_list_dialog_fragment.xml

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

2626
<com.google.android.material.tabs.TabLayout
2727
android:id="@+id/tabs"
28-
style="@style/Widget.MaterialComponents.TabLayout.Colored"
28+
style="@style/Widget.Material3.TabLayout.OnSurface"
2929
android:layout_width="match_parent"
3030
android:layout_height="wrap_content">
3131

‎ui/src/main/res/layout/app_list_item.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,6 @@
3939

4040
<TextView
4141
android:id="@+id/app_name"
42-
style="?android:attr/textAppearanceMedium"
4342
android:layout_width="0dp"
4443
android:layout_height="wrap_content"
4544
android:layout_marginStart="16dp"
@@ -48,6 +47,7 @@
4847
android:ellipsize="end"
4948
android:maxLines="1"
5049
android:text="@{key}"
50+
android:textAppearance="?attr/textAppearanceBodyLarge"
5151
tools:text="@tools:sample/full_names" />
5252

5353
<CheckBox

‎ui/src/main/res/layout/log_viewer_entry.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,9 @@
1212

1313
<com.google.android.material.textview.MaterialTextView
1414
android:id="@+id/log_date"
15-
style="@style/TextAppearance.MaterialComponents.Caption"
1615
android:layout_width="wrap_content"
1716
android:layout_height="wrap_content"
17+
android:textAppearance="?attr/textAppearanceBodySmall"
1818
android:textColor="?android:attr/textColorPrimary"
1919
android:textSize="10sp"
2020
app:layout_constraintStart_toStartOf="parent"
@@ -23,9 +23,9 @@
2323

2424
<com.google.android.material.textview.MaterialTextView
2525
android:id="@+id/log_msg"
26-
style="@style/TextAppearance.MaterialComponents.Caption"
2726
android:layout_width="match_parent"
2827
android:layout_height="wrap_content"
28+
android:textAppearance="?attr/textAppearanceBodySmall"
2929
android:textColor="?android:attr/textColorPrimary"
3030
app:layout_constraintTop_toBottomOf="@id/log_date"
3131
tools:text="FATAL EXCEPTION: Thread-2" />

‎ui/src/main/res/layout/tunnel_detail_fragment.xml

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

5151
<com.google.android.material.textview.MaterialTextView
5252
android:id="@+id/interface_title"
53-
style="@style/SectionText"
5453
android:layout_width="wrap_content"
5554
android:layout_height="wrap_content"
5655
android:text="@string/interface_title"
56+
android:textAppearance="?attr/textAppearanceTitleMedium"
5757
app:layout_constraintStart_toStartOf="parent"
5858
app:layout_constraintTop_toTopOf="parent" />
5959

@@ -81,7 +81,6 @@
8181

8282
<TextView
8383
android:id="@+id/interface_name_text"
84-
style="@style/DetailText"
8584
android:layout_width="match_parent"
8685
android:layout_height="wrap_content"
8786
android:contentDescription="@string/name"
@@ -90,6 +89,7 @@
9089
android:nextFocusForward="@id/public_key_text"
9190
android:onClick="@{ClipboardUtils::copyTextView}"
9291
android:text="@{tunnel.name}"
92+
android:textAppearance="?attr/textAppearanceBodyLarge"
9393
app:layout_constraintStart_toStartOf="parent"
9494
app:layout_constraintTop_toBottomOf="@+id/interface_name_label"
9595
tools:text="wg0" />
@@ -106,7 +106,6 @@
106106

107107
<TextView
108108
android:id="@+id/public_key_text"
109-
style="@style/DetailText"
110109
android:layout_width="match_parent"
111110
android:layout_height="wrap_content"
112111
android:contentDescription="@string/public_key"
@@ -118,6 +117,7 @@
118117
android:onClick="@{ClipboardUtils::copyTextView}"
119118
android:singleLine="true"
120119
android:text="@{config.interface.keyPair.publicKey.toBase64}"
120+
android:textAppearance="?attr/textAppearanceBodyLarge"
121121
app:layout_constraintStart_toStartOf="parent"
122122
app:layout_constraintTop_toBottomOf="@+id/public_key_label"
123123
tools:text="wOs2eguFEohqIZxlSJ1CAT9584tc6ejj9hfGFsoBVkA=" />
@@ -135,7 +135,6 @@
135135

136136
<TextView
137137
android:id="@+id/addresses_text"
138-
style="@style/DetailText"
139138
android:layout_width="match_parent"
140139
android:layout_height="wrap_content"
141140
android:contentDescription="@string/addresses"
@@ -144,6 +143,7 @@
144143
android:nextFocusForward="@id/dns_servers_text"
145144
android:onClick="@{ClipboardUtils::copyTextView}"
146145
android:text="@{config.interface.addresses}"
146+
android:textAppearance="?attr/textAppearanceBodyLarge"
147147
android:visibility="@{config.interface.addresses.isEmpty() ? android.view.View.GONE : android.view.View.VISIBLE}"
148148
app:layout_constraintStart_toStartOf="parent"
149149
app:layout_constraintTop_toBottomOf="@+id/addresses_label"
@@ -162,7 +162,6 @@
162162

163163
<TextView
164164
android:id="@+id/dns_servers_text"
165-
style="@style/DetailText"
166165
android:layout_width="match_parent"
167166
android:layout_height="wrap_content"
168167
android:contentDescription="@string/dns_servers"
@@ -171,6 +170,7 @@
171170
android:nextFocusForward="@id/dns_search_domains_text"
172171
android:onClick="@{ClipboardUtils::copyTextView}"
173172
android:text="@{config.interface.dnsServers}"
173+
android:textAppearance="?attr/textAppearanceBodyLarge"
174174
android:visibility="@{config.interface.dnsServers.isEmpty() ? android.view.View.GONE : android.view.View.VISIBLE}"
175175
app:layout_constraintStart_toStartOf="parent"
176176
app:layout_constraintTop_toBottomOf="@+id/dns_servers_label"
@@ -189,7 +189,6 @@
189189

190190
<TextView
191191
android:id="@+id/dns_search_domains_text"
192-
style="@style/DetailText"
193192
android:layout_width="match_parent"
194193
android:layout_height="wrap_content"
195194
android:contentDescription="@string/dns_search_domains"
@@ -198,6 +197,7 @@
198197
android:nextFocusForward="@id/listen_port_text"
199198
android:onClick="@{ClipboardUtils::copyTextView}"
200199
android:text="@{config.interface.dnsSearchDomains}"
200+
android:textAppearance="?attr/textAppearanceBodyLarge"
201201
android:visibility="@{config.interface.dnsSearchDomains.isEmpty() ? android.view.View.GONE : android.view.View.VISIBLE}"
202202
app:layout_constraintStart_toStartOf="parent"
203203
app:layout_constraintTop_toBottomOf="@+id/dns_search_domains_label"
@@ -218,7 +218,6 @@
218218

219219
<TextView
220220
android:id="@+id/listen_port_text"
221-
style="@style/DetailText"
222221
android:layout_width="0dp"
223222
android:layout_height="wrap_content"
224223
android:contentDescription="@string/listen_port"
@@ -228,6 +227,7 @@
228227
android:nextFocusForward="@id/mtu_text"
229228
android:onClick="@{ClipboardUtils::copyTextView}"
230229
android:text="@{config.interface.listenPort}"
230+
android:textAppearance="?attr/textAppearanceBodyLarge"
231231
android:visibility="@{!config.interface.listenPort.isPresent() ? android.view.View.GONE : android.view.View.VISIBLE}"
232232
app:layout_constraintEnd_toStartOf="@id/mtu_label"
233233
app:layout_constraintHorizontal_weight="0.5"
@@ -251,7 +251,6 @@
251251

252252
<TextView
253253
android:id="@+id/mtu_text"
254-
style="@style/DetailText"
255254
android:layout_width="0dp"
256255
android:layout_height="wrap_content"
257256
android:contentDescription="@string/mtu"
@@ -260,6 +259,7 @@
260259
android:nextFocusForward="@id/applications_text"
261260
android:onClick="@{ClipboardUtils::copyTextView}"
262261
android:text="@{config.interface.mtu}"
262+
android:textAppearance="?attr/textAppearanceBodyLarge"
263263
android:visibility="@{!config.interface.mtu.isPresent() ? android.view.View.GONE : android.view.View.VISIBLE}"
264264
app:layout_constraintEnd_toEndOf="parent"
265265
app:layout_constraintHorizontal_weight="0.5"
@@ -283,12 +283,11 @@
283283
android:labelFor="@+id/applications_text"
284284
android:text="@string/applications"
285285
android:visibility="@{config.interface.includedApplications.isEmpty() &amp;&amp; config.interface.excludedApplications.isEmpty() ? android.view.View.GONE : android.view.View.VISIBLE}"
286-
app:layout_constraintTop_toBottomOf="@+id/listen_port_mtu_barrier"
287-
app:layout_constraintStart_toStartOf="parent" />
286+
app:layout_constraintStart_toStartOf="parent"
287+
app:layout_constraintTop_toBottomOf="@+id/listen_port_mtu_barrier" />
288288

289289
<TextView
290290
android:id="@+id/applications_text"
291-
style="@style/DetailText"
292291
android:layout_width="match_parent"
293292
android:layout_height="wrap_content"
294293
android:contentDescription="@string/applications"
@@ -297,9 +296,10 @@
297296
android:nextFocusForward="@id/peers_layout"
298297
android:onClick="@{ClipboardUtils::copyTextView}"
299298
android:text="@{config.interface.includedApplications.isEmpty() ? @plurals/n_excluded_applications(config.interface.excludedApplications.size(), config.interface.excludedApplications.size()) : @plurals/n_included_applications(config.interface.includedApplications.size(), config.interface.includedApplications.size())}"
299+
android:textAppearance="?attr/textAppearanceBodyLarge"
300300
android:visibility="@{config.interface.includedApplications.isEmpty() &amp;&amp; config.interface.excludedApplications.isEmpty() ? android.view.View.GONE : android.view.View.VISIBLE}"
301-
app:layout_constraintTop_toBottomOf="@+id/applications_label"
302301
app:layout_constraintStart_toStartOf="parent"
302+
app:layout_constraintTop_toBottomOf="@+id/applications_label"
303303
tools:text="8 excluded" />
304304
</androidx.constraintlayout.widget.ConstraintLayout>
305305
</com.google.android.material.card.MaterialCardView>

‎ui/src/main/res/layout/tunnel_detail_peer.xml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -23,10 +23,10 @@
2323

2424
<com.google.android.material.textview.MaterialTextView
2525
android:id="@+id/peer_title"
26-
style="@style/SectionText"
2726
android:layout_width="match_parent"
2827
android:layout_height="wrap_content"
2928
android:text="@string/peer"
29+
android:textAppearance="?attr/textAppearanceTitleMedium"
3030
app:layout_constraintStart_toStartOf="parent"
3131
app:layout_constraintTop_toTopOf="parent" />
3232

@@ -42,7 +42,6 @@
4242

4343
<TextView
4444
android:id="@+id/public_key_text"
45-
style="@style/DetailText"
4645
android:layout_width="match_parent"
4746
android:layout_height="wrap_content"
4847
android:contentDescription="@string/public_key"
@@ -53,6 +52,7 @@
5352
android:onClick="@{ClipboardUtils::copyTextView}"
5453
android:singleLine="true"
5554
android:text="@{item.publicKey.toBase64}"
55+
android:textAppearance="?attr/textAppearanceBodyLarge"
5656
app:layout_constraintStart_toStartOf="parent"
5757
app:layout_constraintTop_toBottomOf="@+id/public_key_label"
5858
tools:text="wOs2eguFEohqIZxlSJ1CAT9584tc6ejj9hfGFsoBVkA=" />
@@ -70,7 +70,6 @@
7070

7171
<TextView
7272
android:id="@+id/pre_shared_key_text"
73-
style="@style/DetailText"
7473
android:layout_width="match_parent"
7574
android:layout_height="wrap_content"
7675
android:contentDescription="@string/pre_shared_key"
@@ -81,6 +80,7 @@
8180
android:nextFocusForward="@id/allowed_ips_text"
8281
android:singleLine="true"
8382
android:text="@string/pre_shared_key_enabled"
83+
android:textAppearance="?attr/textAppearanceBodyLarge"
8484
android:visibility="@{!item.preSharedKey.isPresent() ? android.view.View.GONE : android.view.View.VISIBLE}"
8585
app:layout_constraintStart_toStartOf="parent"
8686
app:layout_constraintTop_toBottomOf="@+id/pre_shared_key_label"
@@ -99,7 +99,6 @@
9999

100100
<TextView
101101
android:id="@+id/allowed_ips_text"
102-
style="@style/DetailText"
103102
android:layout_width="match_parent"
104103
android:layout_height="wrap_content"
105104
android:contentDescription="@string/allowed_ips"
@@ -108,6 +107,7 @@
108107
android:nextFocusForward="@id/endpoint_text"
109108
android:onClick="@{ClipboardUtils::copyTextView}"
110109
android:text="@{item.allowedIps}"
110+
android:textAppearance="?attr/textAppearanceBodyLarge"
111111
android:visibility="@{item.allowedIps.isEmpty() ? android.view.View.GONE : android.view.View.VISIBLE}"
112112
app:layout_constraintStart_toStartOf="parent"
113113
app:layout_constraintTop_toBottomOf="@+id/allowed_ips_label"
@@ -126,7 +126,6 @@
126126

127127
<TextView
128128
android:id="@+id/endpoint_text"
129-
style="@style/DetailText"
130129
android:layout_width="match_parent"
131130
android:layout_height="wrap_content"
132131
android:contentDescription="@string/endpoint"
@@ -135,6 +134,7 @@
135134
android:nextFocusForward="@id/persistent_keepalive_text"
136135
android:onClick="@{ClipboardUtils::copyTextView}"
137136
android:text="@{item.endpoint}"
137+
android:textAppearance="?attr/textAppearanceBodyLarge"
138138
android:visibility="@{!item.endpoint.isPresent() ? android.view.View.GONE : android.view.View.VISIBLE}"
139139
app:layout_constraintStart_toStartOf="parent"
140140
app:layout_constraintTop_toBottomOf="@+id/endpoint_label"
@@ -153,7 +153,6 @@
153153

154154
<TextView
155155
android:id="@+id/persistent_keepalive_text"
156-
style="@style/DetailText"
157156
android:layout_width="match_parent"
158157
android:layout_height="wrap_content"
159158
android:contentDescription="@string/persistent_keepalive"
@@ -162,6 +161,7 @@
162161
android:nextFocusForward="@id/transfer_text"
163162
android:onClick="@{ClipboardUtils::copyTextView}"
164163
android:text="@{@plurals/persistent_keepalive_seconds_unit(item.persistentKeepalive.orElse(0), item.persistentKeepalive.orElse(0))}"
164+
android:textAppearance="?attr/textAppearanceBodyLarge"
165165
android:visibility="@{!item.persistentKeepalive.isPresent() ? android.view.View.GONE : android.view.View.VISIBLE}"
166166
app:layout_constraintStart_toStartOf="parent"
167167
app:layout_constraintTop_toBottomOf="@+id/persistent_keepalive_label"
@@ -182,13 +182,13 @@
182182

183183
<TextView
184184
android:id="@+id/transfer_text"
185-
style="@style/DetailText"
186185
android:layout_width="match_parent"
187186
android:layout_height="wrap_content"
188187
android:layout_below="@+id/transfer_label"
189188
android:contentDescription="@string/transfer"
190189
android:nextFocusUp="@id/persistent_keepalive_text"
191190
android:onClick="@{ClipboardUtils::copyTextView}"
191+
android:textAppearance="?attr/textAppearanceBodyLarge"
192192
android:visibility="gone"
193193
app:layout_constraintStart_toStartOf="parent"
194194
app:layout_constraintTop_toBottomOf="@+id/transfer_label"

‎ui/src/main/res/layout/tunnel_editor_fragment.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -53,12 +53,12 @@
5353

5454
<com.google.android.material.textview.MaterialTextView
5555
android:id="@+id/interface_title"
56-
style="@style/SectionText"
5756
android:layout_width="wrap_content"
5857
android:layout_height="wrap_content"
5958
android:layout_margin="8dp"
6059
android:layout_marginTop="32dp"
6160
android:text="@string/interface_title"
61+
android:textAppearance="?attr/textAppearanceTitleMedium"
6262
app:layout_constraintStart_toStartOf="parent"
6363
app:layout_constraintTop_toTopOf="parent" />
6464

@@ -243,7 +243,7 @@
243243

244244
<com.google.android.material.button.MaterialButton
245245
android:id="@+id/set_excluded_applications"
246-
style="@style/Widget.MaterialComponents.Button.TextButton"
246+
style="@style/Widget.Material3.Button.TextButton"
247247
android:layout_width="0dp"
248248
android:layout_height="wrap_content"
249249
android:layout_margin="4dp"
@@ -275,7 +275,7 @@
275275

276276
<com.google.android.material.button.MaterialButton
277277
android:id="@+id/add_peer_button"
278-
style="@style/Widget.MaterialComponents.Button.TextButton"
278+
style="@style/Widget.Material3.Button.TextButton"
279279
android:layout_width="match_parent"
280280
android:layout_height="wrap_content"
281281
android:layout_gravity="bottom"

0 commit comments

Comments
 (0)