Skip to content

Commit 8933a43

Browse files
MihaiCristianCondreaMihaiCristianCondrea
committed
Refactor: Move styles from themes.xml to styles.xml
This commit moves all widget styles, text appearances, shape appearances, and other style definitions from `themes.xml` into a new, dedicated `styles.xml` file. This improves organization by separating style resources from theme definitions.
1 parent 9ab9ffb commit 8933a43

File tree

2 files changed

+74
-69
lines changed

2 files changed

+74
-69
lines changed

‎app/src/main/res/values/styles.xml‎

Lines changed: 74 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,74 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<resources>
3+
4+
<!-- Emphasized text appearances -->
5+
<style name="TextAppearance.TitleLargeEmphasized" parent="TextAppearance.Material3.TitleLarge">
6+
<item name="android:textStyle">bold</item>
7+
</style>
8+
9+
<style name="TextAppearance.BodyLargeEmphasized" parent="TextAppearance.Material3.BodyLarge">
10+
<item name="android:textStyle">bold</item>
11+
</style>
12+
13+
<!-- Widget styles using Material 3 shape tokens -->
14+
<style name="Widget.App.Toolbar.Clover" parent="@style/Widget.Material3.Toolbar">
15+
<item name="shapeAppearanceOverlay">@style/ShapeTokens.Clover</item>
16+
</style>
17+
18+
<style name="Widget.App.CardView.Clover" parent="@style/Widget.Material3.CardView.Outlined">
19+
<item name="shapeAppearanceOverlay">@style/ShapeTokens.Clover</item>
20+
</style>
21+
22+
<style name="Widget.App.Button.Clover" parent="@style/Widget.Material3.Button">
23+
<item name="shapeAppearance">@style/ShapeTokens.Clover</item>
24+
</style>
25+
26+
<style name="ShapeAppearanceOverlay.CardView" parent="">
27+
<item name="cornerFamily">rounded</item>
28+
<item name="cornerSizeTopRight">24dp</item>
29+
<item name="cornerSizeTopLeft">24dp</item>
30+
<item name="cornerSizeBottomRight">0dp</item>
31+
<item name="cornerSizeBottomLeft">0dp</item>
32+
</style>
33+
34+
<style name="ShapeAppearanceOverlay.CardViewTopRoundedOutlined" parent="Widget.Material3.CardView.Outlined">
35+
<item name="cornerFamily">rounded</item>
36+
<item name="cornerSizeTopRight">24dp</item>
37+
<item name="cornerSizeTopLeft">24dp</item>
38+
<item name="cornerSizeBottomRight">4dp</item>
39+
<item name="cornerSizeBottomLeft">4dp</item>
40+
</style>
41+
42+
<style name="ShapeAppearanceOverlay.CardViewBottomRoundedOutlined" parent="Widget.Material3.CardView.Outlined">
43+
<item name="cornerFamily">rounded</item>
44+
<item name="cornerSizeTopRight">4dp</item>
45+
<item name="cornerSizeTopLeft">4dp</item>
46+
<item name="cornerSizeBottomRight">24dp</item>
47+
<item name="cornerSizeBottomLeft">24dp</item>
48+
</style>
49+
50+
<style name="ShapeAppearanceOverlay.CardViewTopRoundedFilled" parent="Widget.Material3.CardView.Filled">
51+
<item name="cornerFamily">rounded</item>
52+
<item name="cornerSizeTopRight">24dp</item>
53+
<item name="cornerSizeTopLeft">24dp</item>
54+
<item name="cornerSizeBottomRight">4dp</item>
55+
<item name="cornerSizeBottomLeft">4dp</item>
56+
</style>
57+
58+
<style name="ShapeAppearanceOverlay.CardViewBottomRoundedFilled" parent="Widget.Material3.CardView.Filled">
59+
<item name="cornerFamily">rounded</item>
60+
<item name="cornerSizeTopRight">4dp</item>
61+
<item name="cornerSizeTopLeft">4dp</item>
62+
<item name="cornerSizeBottomRight">24dp</item>
63+
<item name="cornerSizeBottomLeft">24dp</item>
64+
</style>
65+
66+
<style name="actionBarStyle" parent="@style/Widget.Material3.ActionBar.Solid">
67+
<item name="background">@android:color/transparent</item>
68+
</style>
69+
70+
<style name="switchPreferenceCompatStyle" parent="@style/Preference.SwitchPreferenceCompat.Material">
71+
<item name="widgetLayout">@layout/widget_preference_switch</item>
72+
</style>
73+
74+
</resources>

‎app/src/main/res/values/themes.xml‎

Lines changed: 0 additions & 69 deletions
Original file line numberDiff line numberDiff line change
@@ -41,73 +41,4 @@
4141
<item name="android:fitsSystemWindows">true</item>
4242
</style>
4343

44-
<!-- Emphasized text appearances -->
45-
<style name="TextAppearance.TitleLargeEmphasized" parent="TextAppearance.Material3.TitleLarge">
46-
<item name="android:textStyle">bold</item>
47-
</style>
48-
49-
<style name="TextAppearance.BodyLargeEmphasized" parent="TextAppearance.Material3.BodyLarge">
50-
<item name="android:textStyle">bold</item>
51-
</style>
52-
53-
<!-- Widget styles using Material 3 shape tokens -->
54-
<style name="Widget.App.Toolbar.Clover" parent="@style/Widget.Material3.Toolbar">
55-
<item name="shapeAppearanceOverlay">@style/ShapeTokens.Clover</item>
56-
</style>
57-
58-
<style name="Widget.App.CardView.Clover" parent="@style/Widget.Material3.CardView.Outlined">
59-
<item name="shapeAppearanceOverlay">@style/ShapeTokens.Clover</item>
60-
</style>
61-
62-
<style name="Widget.App.Button.Clover" parent="@style/Widget.Material3.Button">
63-
<item name="shapeAppearance">@style/ShapeTokens.Clover</item>
64-
</style>
65-
66-
<style name="ShapeAppearanceOverlay.CardView" parent="">
67-
<item name="cornerFamily">rounded</item>
68-
<item name="cornerSizeTopRight">24dp</item>
69-
<item name="cornerSizeTopLeft">24dp</item>
70-
<item name="cornerSizeBottomRight">0dp</item>
71-
<item name="cornerSizeBottomLeft">0dp</item>
72-
</style>
73-
74-
<style name="ShapeAppearanceOverlay.CardViewTopRoundedOutlined" parent="Widget.Material3.CardView.Outlined">
75-
<item name="cornerFamily">rounded</item>
76-
<item name="cornerSizeTopRight">24dp</item>
77-
<item name="cornerSizeTopLeft">24dp</item>
78-
<item name="cornerSizeBottomRight">4dp</item>
79-
<item name="cornerSizeBottomLeft">4dp</item>
80-
</style>
81-
82-
<style name="ShapeAppearanceOverlay.CardViewBottomRoundedOutlined" parent="Widget.Material3.CardView.Outlined">
83-
<item name="cornerFamily">rounded</item>
84-
<item name="cornerSizeTopRight">4dp</item>
85-
<item name="cornerSizeTopLeft">4dp</item>
86-
<item name="cornerSizeBottomRight">24dp</item>
87-
<item name="cornerSizeBottomLeft">24dp</item>
88-
</style>
89-
90-
<style name="ShapeAppearanceOverlay.CardViewTopRoundedFilled" parent="Widget.Material3.CardView.Filled">
91-
<item name="cornerFamily">rounded</item>
92-
<item name="cornerSizeTopRight">24dp</item>
93-
<item name="cornerSizeTopLeft">24dp</item>
94-
<item name="cornerSizeBottomRight">4dp</item>
95-
<item name="cornerSizeBottomLeft">4dp</item>
96-
</style>
97-
98-
<style name="ShapeAppearanceOverlay.CardViewBottomRoundedFilled" parent="Widget.Material3.CardView.Filled">
99-
<item name="cornerFamily">rounded</item>
100-
<item name="cornerSizeTopRight">4dp</item>
101-
<item name="cornerSizeTopLeft">4dp</item>
102-
<item name="cornerSizeBottomRight">24dp</item>
103-
<item name="cornerSizeBottomLeft">24dp</item>
104-
</style>
105-
106-
<style name="actionBarStyle" parent="@style/Widget.Material3.ActionBar.Solid">
107-
<item name="background">@android:color/transparent</item>
108-
</style>
109-
110-
<style name="switchPreferenceCompatStyle" parent="@style/Preference.SwitchPreferenceCompat.Material">
111-
<item name="widgetLayout">@layout/widget_preference_switch</item>
112-
</style>
11344
</resources>

0 commit comments

Comments
 (0)