Skip to content

Commit 2ec8825

Browse files
committed
Add icons for theme preferences
1 parent e3fd50c commit 2ec8825

File tree

5 files changed

+160
-2
lines changed

5 files changed

+160
-2
lines changed

dynamic-support/src/main/res/layout/ads_fragment_theme.xml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -92,6 +92,7 @@
9292
app:ads_title="@string/ads_theme_opacity"
9393
app:ads_summary="@string/ads_theme_opacity_summary"
9494
app:ads_description="@string/ads_theme_entry_auto_default_desc"
95+
app:ads_icons="@array/ads_theme_icons_auto"
9596
app:ads_entries="@array/ads_theme_entries_auto"
9697
app:ads_values="@array/ads_theme_values_auto"
9798
app:ads_min="@integer/adt_opacity_min"
@@ -249,6 +250,7 @@
249250
app:ads_title="@string/ads_theme_style"
250251
app:ads_summary="@string/ads_theme_style_summary"
251252
app:ads_description="@string/ads_theme_entry_auto_default_desc"
253+
app:ads_icons="@array/ads_style_icons"
252254
app:ads_entries="@array/ads_style_entries"
253255
app:ads_values="@array/ads_style_values" />
254256

@@ -262,6 +264,7 @@
262264
app:ads_title="@string/ads_theme_font_scale"
263265
app:ads_summary="@string/ads_theme_font_scale_summary"
264266
app:ads_description="@string/ads_theme_entry_auto_default_desc"
267+
app:ads_icons="@array/ads_theme_icons_auto"
265268
app:ads_entries="@array/ads_theme_entries_auto"
266269
app:ads_values="@array/ads_theme_values_auto"
267270
app:ads_min="@integer/adt_font_scale_min"
@@ -280,6 +283,7 @@
280283
app:ads_title="@string/ads_theme_corner_size"
281284
app:ads_summary="@string/ads_theme_corner_size_summary"
282285
app:ads_description="@string/ads_theme_entry_auto_default_desc"
286+
app:ads_icons="@array/ads_corner_icons"
283287
app:ads_entries="@array/ads_corner_entries"
284288
app:ads_values="@array/ads_corner_values"
285289
app:ads_min="@integer/adt_corner_size_min"
@@ -296,6 +300,7 @@
296300
app:ads_title="@string/ads_theme_background_aware"
297301
app:ads_summary="@string/ads_theme_background_aware_desc"
298302
app:ads_description="@string/ads_theme_entry_auto_default_desc"
303+
app:ads_icons="@array/ads_background_aware_icons"
299304
app:ads_entries="@array/ads_background_aware_entries"
300305
app:ads_values="@array/ads_background_aware_values" />
301306

@@ -309,6 +314,7 @@
309314
app:ads_title="@string/ads_theme_contrast"
310315
app:ads_summary="@string/ads_theme_contrast_summary"
311316
app:ads_description="@string/ads_theme_entry_auto_default_desc"
317+
app:ads_icons="@array/ads_contrast_icons"
312318
app:ads_entries="@array/ads_contrast_entries"
313319
app:ads_values="@array/ads_contrast_values"
314320
app:ads_min="@integer/adt_contrast_min"
@@ -325,6 +331,7 @@
325331
app:ads_title="@string/ads_theme_elevation"
326332
app:ads_summary="@string/ads_theme_elevation_summary"
327333
app:ads_description="@string/ads_theme_entry_auto_default_desc"
334+
app:ads_icons="@array/ads_elevation_icons"
328335
app:ads_entries="@array/ads_elevation_entries"
329336
app:ads_values="@array/ads_elevation_values" />
330337

dynamic-support/src/main/res/layout/ads_fragment_theme_remote.xml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -94,6 +94,7 @@
9494
app:ads_title="@string/ads_theme_opacity"
9595
app:ads_summary="@string/ads_theme_opacity_summary"
9696
app:ads_description="@string/ads_theme_entry_auto_default_desc"
97+
app:ads_icons="@array/ads_theme_icons_auto"
9798
app:ads_entries="@array/ads_theme_entries_auto"
9899
app:ads_values="@array/ads_theme_values_auto"
99100
app:ads_min="@integer/adt_opacity_min"
@@ -255,6 +256,7 @@
255256
app:ads_title="@string/ads_theme_style"
256257
app:ads_summary="@string/ads_theme_style_summary"
257258
app:ads_description="@string/ads_theme_entry_auto_desc"
259+
app:ads_icons="@array/ads_style_icons"
258260
app:ads_entries="@array/ads_style_entries"
259261
app:ads_values="@array/ads_style_values" />
260262

@@ -269,6 +271,7 @@
269271
app:ads_title="@string/ads_theme_font_scale"
270272
app:ads_summary="@string/ads_theme_font_scale_summary"
271273
app:ads_description="@string/ads_theme_entry_auto_desc"
274+
app:ads_icons="@array/ads_theme_icons_auto"
272275
app:ads_entries="@array/ads_theme_entries_auto"
273276
app:ads_values="@array/ads_theme_values_auto"
274277
app:ads_min="@integer/adt_font_scale_min"
@@ -288,6 +291,7 @@
288291
app:ads_title="@string/ads_theme_corner_size"
289292
app:ads_summary="@string/ads_theme_corner_size_summary"
290293
app:ads_description="@string/ads_theme_entry_auto_desc"
294+
app:ads_icons="@array/ads_corner_icons"
291295
app:ads_entries="@array/ads_corner_entries"
292296
app:ads_values="@array/ads_corner_values"
293297
app:ads_min="@integer/adt_corner_size_min"
@@ -304,6 +308,7 @@
304308
app:ads_title="@string/ads_theme_background_aware"
305309
app:ads_summary="@string/ads_theme_background_aware_desc"
306310
app:ads_description="@string/ads_theme_entry_auto_desc"
311+
app:ads_icons="@array/ads_background_aware_icons"
307312
app:ads_entries="@array/ads_background_aware_entries"
308313
app:ads_values="@array/ads_background_aware_values" />
309314

@@ -317,6 +322,7 @@
317322
app:ads_title="@string/ads_theme_contrast"
318323
app:ads_summary="@string/ads_theme_contrast_summary"
319324
app:ads_description="@string/ads_theme_entry_auto_default_desc"
325+
app:ads_icons="@array/ads_contrast_icons"
320326
app:ads_entries="@array/ads_contrast_entries"
321327
app:ads_values="@array/ads_contrast_values"
322328
app:ads_min="@integer/adt_contrast_min"
@@ -334,6 +340,7 @@
334340
app:ads_title="@string/ads_theme_elevation"
335341
app:ads_summary="@string/ads_theme_elevation_summary"
336342
app:ads_description="@string/ads_theme_entry_auto_default_desc"
343+
app:ads_icons="@array/ads_elevation_icons"
337344
app:ads_entries="@array/ads_elevation_entries"
338345
app:ads_values="@array/ads_elevation_values" />
339346

dynamic-support/src/main/res/values-v31/arrays_theme.xml

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,14 @@
1818
<resources
1919
xmlns:tools="http://schemas.android.com/tools">
2020

21+
<!-- Corner radius icons for the app widget. -->
22+
<array name="ads_corner_icons_widget"
23+
tools:ignore="InconsistentArrays">
24+
<item>@drawable/ads_ic_style</item>
25+
<item>@drawable/ads_ic_android</item>
26+
<item>@drawable/ads_ic_tune</item>
27+
</array>
28+
2129
<!-- Corner radius entries for the app widget. -->
2230
<string-array name="ads_corner_entries_widget"
2331
tools:ignore="InconsistentArrays">

dynamic-support/src/main/res/values-v34/arrays_theme.xml

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,30 @@
1818
<resources
1919
xmlns:tools="http://schemas.android.com/tools">
2020

21+
<!-- Contrast ratio icons. -->
22+
<array name="ads_contrast_icons"
23+
tools:ignore="InconsistentArrays">
24+
<item>@drawable/ads_ic_auto_alt</item>
25+
<item>@drawable/ads_ic_android</item>
26+
<item>@drawable/ads_ic_tune</item>
27+
</array>
28+
29+
<!-- Contrast ratio icons. -->
30+
<array name="ads_contrast_icons_alt"
31+
tools:ignore="InconsistentArrays">
32+
<item>@drawable/ads_ic_settings</item>
33+
<item>@drawable/ads_ic_android</item>
34+
<item>@drawable/ads_ic_tune</item>
35+
</array>
36+
37+
<!-- Theme contrast ratio icons. -->
38+
<array name="ads_contrast_icons_theme"
39+
tools:ignore="InconsistentArrays">
40+
<item>@drawable/ads_ic_style</item>
41+
<item>@drawable/ads_ic_android</item>
42+
<item>@drawable/ads_ic_tune</item>
43+
</array>
44+
2145
<!-- Contrast ratio entries. -->
2246
<string-array name="ads_contrast_entries"
2347
tools:ignore="InconsistentArrays">

dynamic-support/src/main/res/values/arrays_theme.xml

Lines changed: 114 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -209,6 +209,24 @@
209209
<item>-3</item>
210210
</string-array>
211211

212+
<!-- Theme icons for auto and custom. -->
213+
<array name="ads_theme_icons_auto">
214+
<item>@drawable/ads_ic_auto_alt</item>
215+
<item>@drawable/ads_ic_tune</item>
216+
</array>
217+
218+
<!-- Theme icons for auto and custom. -->
219+
<array name="ads_theme_icons_auto_alt">
220+
<item>@drawable/ads_ic_settings</item>
221+
<item>@drawable/ads_ic_tune</item>
222+
</array>
223+
224+
<!-- Widget theme icons for auto and custom. -->
225+
<array name="ads_theme_icons_auto_theme">
226+
<item>@drawable/ads_ic_style</item>
227+
<item>@drawable/ads_ic_tune</item>
228+
</array>
229+
212230
<!-- Theme entries for auto and custom. -->
213231
<string-array name="ads_theme_entries_auto">
214232
<item>@string/ads_theme_entry_auto</item>
@@ -250,6 +268,24 @@
250268
<item>1</item>
251269
</string-array>
252270

271+
<!-- Corner radius icons. -->
272+
<array name="ads_corner_icons">
273+
<item>@drawable/ads_ic_auto_alt</item>
274+
<item>@drawable/ads_ic_tune</item>
275+
</array>
276+
277+
<!-- Corner radius icons. -->
278+
<array name="ads_corner_icons_alt">
279+
<item>@drawable/ads_ic_settings</item>
280+
<item>@drawable/ads_ic_tune</item>
281+
</array>
282+
283+
<!-- Theme corner radius icons. -->
284+
<array name="ads_corner_icons_theme">
285+
<item>@drawable/ads_ic_style</item>
286+
<item>@drawable/ads_ic_tune</item>
287+
</array>
288+
253289
<!-- Corner radius entries. -->
254290
<string-array name="ads_corner_entries">
255291
<item>@string/ads_theme_entry_auto</item>
@@ -264,6 +300,13 @@
264300
<item>-2</item>
265301
</string-array>
266302

303+
<!-- Corner radius icons for the app widget. -->
304+
<array name="ads_corner_icons_widget"
305+
tools:ignore="InconsistentArrays">
306+
<item>@drawable/ads_ic_style</item>
307+
<item>@drawable/ads_ic_tune</item>
308+
</array>
309+
267310
<!-- Corner radius entries for the app widget. -->
268311
<string-array name="ads_corner_entries_widget"
269312
tools:ignore="InconsistentArrays">
@@ -280,6 +323,27 @@
280323
<item>-2</item>
281324
</string-array>
282325

326+
<!-- Background aware icons. -->
327+
<array name="ads_background_aware_icons">
328+
<item>@drawable/ads_ic_auto_alt</item>
329+
<item>@drawable/ads_ic_block</item>
330+
<item>@drawable/ads_ic_dynamic</item>
331+
</array>
332+
333+
<!-- Background aware icons. -->
334+
<array name="ads_background_aware_icons_alt">
335+
<item>@drawable/ads_ic_settings</item>
336+
<item>@drawable/ads_ic_block</item>
337+
<item>@drawable/ads_ic_dynamic</item>
338+
</array>
339+
340+
<!-- Theme background aware icons. -->
341+
<array name="ads_background_aware_icons_theme">
342+
<item>@drawable/ads_ic_style</item>
343+
<item>@drawable/ads_ic_block</item>
344+
<item>@drawable/ads_ic_dynamic</item>
345+
</array>
346+
283347
<!-- Background aware entries. -->
284348
<string-array name="ads_background_aware_entries">
285349
<item>@string/ads_theme_entry_auto</item>
@@ -297,6 +361,27 @@
297361
<item>1</item>
298362
</string-array>
299363

364+
<!-- Contrast ratio icons. -->
365+
<array name="ads_contrast_icons"
366+
tools:ignore="InconsistentArrays">
367+
<item>@drawable/ads_ic_auto_alt</item>
368+
<item>@drawable/ads_ic_tune</item>
369+
</array>
370+
371+
<!-- Contrast ratio icons. -->
372+
<array name="ads_contrast_icons_alt"
373+
tools:ignore="InconsistentArrays">
374+
<item>@drawable/ads_ic_settings</item>
375+
<item>@drawable/ads_ic_tune</item>
376+
</array>
377+
378+
<!-- Theme contrast ratio icons. -->
379+
<array name="ads_contrast_icons_theme"
380+
tools:ignore="InconsistentArrays">
381+
<item>@drawable/ads_ic_style</item>
382+
<item>@drawable/ads_ic_tune</item>
383+
</array>
384+
300385
<!-- Contrast ratio entries. -->
301386
<string-array name="ads_contrast_entries"
302387
tools:ignore="InconsistentArrays">
@@ -313,14 +398,35 @@
313398
<item>-2</item>
314399
</string-array>
315400

316-
<!-- Theme elevation entries. -->
401+
<!-- Shadow elevation icons. -->
402+
<array name="ads_elevation_icons">
403+
<item>@drawable/ads_ic_auto_alt</item>
404+
<item>@drawable/ads_ic_block</item>
405+
<item>@drawable/ads_ic_dynamic</item>
406+
</array>
407+
408+
<!-- Shadow elevation icons. -->
409+
<array name="ads_elevation_icons_alt">
410+
<item>@drawable/ads_ic_settings</item>
411+
<item>@drawable/ads_ic_block</item>
412+
<item>@drawable/ads_ic_dynamic</item>
413+
</array>
414+
415+
<!-- Theme shadow elevation icons. -->
416+
<array name="ads_elevation_icons_theme">
417+
<item>@drawable/ads_ic_style</item>
418+
<item>@drawable/ads_ic_block</item>
419+
<item>@drawable/ads_ic_dynamic</item>
420+
</array>
421+
422+
<!-- Shadow elevation entries. -->
317423
<string-array name="ads_elevation_entries">
318424
<item>@string/ads_theme_entry_auto</item>
319425
<item>@string/ads_disable</item>
320426
<item>@string/ads_enable</item>
321427
</string-array>
322428

323-
<!-- Theme elevation values. -->
429+
<!-- Shadow elevation values. -->
324430
<string-array name="ads_elevation_values">
325431
<!-- Auto -->
326432
<item>-3</item>
@@ -330,6 +436,12 @@
330436
<item>1</item>
331437
</string-array>
332438

439+
<!-- Theme style icons. -->
440+
<array name="ads_style_icons">
441+
<item>@drawable/ads_ic_android</item>
442+
<item>@drawable/ads_ic_style</item>
443+
</array>
444+
333445
<!-- Theme style entries. -->
334446
<string-array name="ads_style_entries">
335447
<item>@string/ads_theme_entry_auto</item>

0 commit comments

Comments
 (0)