Skip to content

Commit 8de79db

Browse files
committed
Add attr references to all AppCompat widget xml styles
1 parent 4936f9e commit 8de79db

File tree

3 files changed

+173
-4
lines changed

3 files changed

+173
-4
lines changed

sample/src/main/java/com/louiscad/splittiessample/main/MainActivity.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ import splitties.views.onClick
4444
class MainActivity : AppCompatActivity() {
4545

4646
override fun onCreate(savedInstanceState: Bundle?) {
47-
theme.applyStyle(R.style.AppCompatStyles_Buttons, false) //TODO: Call it lazily or eagerly? When exactly and where?
47+
theme.applyStyle(R.style.AppCompatStyles_Button, false) //TODO: Call it lazily or eagerly? When exactly and where?
4848
super.onCreate(savedInstanceState)
4949
val ui = MainUi(this)
5050
setContentView(ui)

viewdsl-appcompat-styles/src/main/res/values/attrs.xml

Lines changed: 79 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,31 @@
1515
~ limitations under the License.
1616
-->
1717
<resources xmlns:tools="http://schemas.android.com/tools" tools:ignore="MissingDefaultResource">
18+
19+
<attr name="Widget.AppCompat.ActionMode" format="reference"/>
20+
<attr name="Widget.AppCompat.ActivityChooserView" format="reference"/>
21+
<attr name="Widget.AppCompat.AutoCompleteTextView" format="reference"/>
22+
<attr name="Widget.AppCompat.DrawerArrowToggle" format="reference"/>
23+
<attr name="Widget.AppCompat.DropDownItem.Spinner" format="reference"/>
24+
<attr name="Widget.AppCompat.EditText" format="reference"/>
25+
<attr name="Widget.AppCompat.ImageButton" format="reference"/>
26+
<attr name="Widget.AppCompat.ListMenuView" format="reference"/>
27+
<attr name="Widget.AppCompat.ListPopupWindow" format="reference"/>
28+
<attr name="Widget.AppCompat.PopupMenu" format="reference"/>
29+
<attr name="Widget.AppCompat.PopupMenu.Overflow" format="reference"/>
30+
<attr name="Widget.AppCompat.PopupWindow" format="reference"/>
31+
<attr name="Widget.AppCompat.TextView.SpinnerItem" format="reference"/>
32+
33+
<attr name="Widget.AppCompat.ActionBar" format="reference"/>
34+
<attr name="Widget.AppCompat.ActionBar.Solid" format="reference"/>
35+
<attr name="Widget.AppCompat.ActionBar.TabBar" format="reference"/>
36+
<attr name="Widget.AppCompat.ActionBar.TabText" format="reference"/>
37+
<attr name="Widget.AppCompat.ActionBar.TabView" format="reference"/>
38+
39+
<attr name="Widget.AppCompat.ActionButton" format="reference"/>
40+
<attr name="Widget.AppCompat.ActionButton.CloseMode" format="reference"/>
41+
<attr name="Widget.AppCompat.ActionButton.Overflow" format="reference"/>
42+
1843
<attr name="Widget.AppCompat.Button" format="reference"/>
1944
<attr name="Widget.AppCompat.Button.Borderless" format="reference"/>
2045
<attr name="Widget.AppCompat.Button.Borderless.Colored" format="reference"/>
@@ -23,4 +48,58 @@
2348
<attr name="Widget.AppCompat.Button.Small" format="reference"/>
2449
<attr name="Widget.AppCompat.ButtonBar" format="reference"/>
2550
<attr name="Widget.AppCompat.ButtonBar.AlertDialog" format="reference"/>
51+
52+
<attr name="Widget.AppCompat.CompoundButton.CheckBox" format="reference"/>
53+
<attr name="Widget.AppCompat.CompoundButton.RadioButton" format="reference"/>
54+
<attr name="Widget.AppCompat.CompoundButton.Switch" format="reference"/>
55+
56+
<attr name="Widget.AppCompat.Light.ActionMode.Inverse" format="reference"/>
57+
<attr name="Widget.AppCompat.Light.ActivityChooserView" format="reference"/>
58+
<attr name="Widget.AppCompat.Light.AutoCompleteTextView" format="reference"/>
59+
<attr name="Widget.AppCompat.Light.DropDownItem.Spinner" format="reference"/>
60+
<attr name="Widget.AppCompat.Light.ListPopupWindow" format="reference"/>
61+
<attr name="Widget.AppCompat.Light.ListView.DropDown" format="reference"/>
62+
<attr name="Widget.AppCompat.Light.PopupMenu" format="reference"/>
63+
<attr name="Widget.AppCompat.Light.PopupMenu.Overflow" format="reference"/>
64+
<attr name="Widget.AppCompat.Light.SearchView" format="reference"/>
65+
<attr name="Widget.AppCompat.Light.Spinner.DropDown.ActionBar" format="reference"/>
66+
67+
<attr name="Widget.AppCompat.Light.ActionBar" format="reference"/>
68+
<attr name="Widget.AppCompat.Light.ActionBar.Solid" format="reference"/>
69+
<attr name="Widget.AppCompat.Light.ActionBar.Solid.Inverse" format="reference"/>
70+
<attr name="Widget.AppCompat.Light.ActionBar.TabBar" format="reference"/>
71+
<attr name="Widget.AppCompat.Light.ActionBar.TabBar.Inverse" format="reference"/>
72+
<attr name="Widget.AppCompat.Light.ActionBar.TabText" format="reference"/>
73+
<attr name="Widget.AppCompat.Light.ActionBar.TabText.Inverse" format="reference"/>
74+
<attr name="Widget.AppCompat.Light.ActionBar.TabView" format="reference"/>
75+
<attr name="Widget.AppCompat.Light.ActionBar.TabView.Inverse" format="reference"/>
76+
77+
<attr name="Widget.AppCompat.Light.ActionButton" format="reference"/>
78+
<attr name="Widget.AppCompat.Light.ActionButton.CloseMode" format="reference"/>
79+
<attr name="Widget.AppCompat.Light.ActionButton.Overflow" format="reference"/>
80+
81+
<attr name="Widget.AppCompat.ListView" format="reference"/>
82+
<attr name="Widget.AppCompat.ListView.DropDown" format="reference"/>
83+
<attr name="Widget.AppCompat.ListView.Menu" format="reference"/>
84+
85+
<attr name="Widget.AppCompat.ProgressBar" format="reference"/>
86+
<attr name="Widget.AppCompat.ProgressBar.Horizontal" format="reference"/>
87+
88+
<attr name="Widget.AppCompat.RatingBar" format="reference"/>
89+
<attr name="Widget.AppCompat.RatingBar.Indicator" format="reference"/>
90+
<attr name="Widget.AppCompat.RatingBar.Small" format="reference"/>
91+
92+
<attr name="Widget.AppCompat.SearchView" format="reference"/>
93+
<attr name="Widget.AppCompat.SearchView.ActionBar" format="reference"/>
94+
95+
<attr name="Widget.AppCompat.SeekBar" format="reference"/>
96+
<attr name="Widget.AppCompat.SeekBar.Discrete" format="reference"/>
97+
98+
<attr name="Widget.AppCompat.Spinner" format="reference"/>
99+
<attr name="Widget.AppCompat.Spinner.DropDown" format="reference"/>
100+
<attr name="Widget.AppCompat.Spinner.DropDown.ActionBar" format="reference"/>
101+
<attr name="Widget.AppCompat.Spinner.Underlined" format="reference"/>
102+
103+
<attr name="Widget.AppCompat.Toolbar" format="reference"/>
104+
<attr name="Widget.AppCompat.Toolbar.Button.Navigation" format="reference"/>
26105
</resources>

viewdsl-appcompat-styles/src/main/res/values/styles.xml

Lines changed: 93 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,34 @@
1616
-->
1717
<resources>
1818
<!-- TODO: Move it to viewdsl-appcompat-styles-xml -->
19-
<style name="AppCompatStyles"/>
20-
21-
<style name="AppCompatStyles.Buttons">
19+
<style name="AppCompatStyles">
20+
<item name="Widget.AppCompat.ActionMode">@style/Widget.AppCompat.ActionMode</item>
21+
<item name="Widget.AppCompat.ActivityChooserView">@style/Widget.AppCompat.ActivityChooserView</item>
22+
<item name="Widget.AppCompat.AutoCompleteTextView">@style/Widget.AppCompat.AutoCompleteTextView</item>
23+
<item name="Widget.AppCompat.DrawerArrowToggle">@style/Widget.AppCompat.DrawerArrowToggle</item>
24+
<item name="Widget.AppCompat.DropDownItem.Spinner">@style/Widget.AppCompat.DropDownItem.Spinner</item>
25+
<item name="Widget.AppCompat.EditText">@style/Widget.AppCompat.EditText</item>
26+
<item name="Widget.AppCompat.ImageButton">@style/Widget.AppCompat.ImageButton</item>
27+
<item name="Widget.AppCompat.ListMenuView">@style/Widget.AppCompat.ListMenuView</item>
28+
<item name="Widget.AppCompat.ListPopupWindow">@style/Widget.AppCompat.ListPopupWindow</item>
29+
<item name="Widget.AppCompat.PopupMenu">@style/Widget.AppCompat.PopupMenu</item>
30+
<item name="Widget.AppCompat.PopupMenu.Overflow">@style/Widget.AppCompat.PopupMenu.Overflow</item>
31+
<item name="Widget.AppCompat.PopupWindow">@style/Widget.AppCompat.PopupWindow</item>
32+
<item name="Widget.AppCompat.TextView.SpinnerItem">@style/Widget.AppCompat.TextView.SpinnerItem</item>
33+
</style>
34+
<style name="AppCompatStyles.ActionBar">
35+
<item name="Widget.AppCompat.ActionBar">@style/Widget.AppCompat.ActionBar</item>
36+
<item name="Widget.AppCompat.ActionBar.Solid">@style/Widget.AppCompat.ActionBar.Solid</item>
37+
<item name="Widget.AppCompat.ActionBar.TabBar">@style/Widget.AppCompat.ActionBar.TabBar</item>
38+
<item name="Widget.AppCompat.ActionBar.TabText">@style/Widget.AppCompat.ActionBar.TabText</item>
39+
<item name="Widget.AppCompat.ActionBar.TabView">@style/Widget.AppCompat.ActionBar.TabView</item>
40+
</style>
41+
<style name="AppCompatStyles.ActionButton">
42+
<item name="Widget.AppCompat.ActionButton">@style/Widget.AppCompat.ActionButton</item>
43+
<item name="Widget.AppCompat.ActionButton.CloseMode">@style/Widget.AppCompat.ActionButton.CloseMode</item>
44+
<item name="Widget.AppCompat.ActionButton.Overflow">@style/Widget.AppCompat.ActionButton.Overflow</item>
45+
</style>
46+
<style name="AppCompatStyles.Button">
2247
<item name="Widget.AppCompat.Button">@style/Widget.AppCompat.Button</item>
2348
<item name="Widget.AppCompat.Button.Borderless">@style/Widget.AppCompat.Button.Borderless</item>
2449
<item name="Widget.AppCompat.Button.Borderless.Colored">@style/Widget.AppCompat.Button.Borderless.Colored</item>
@@ -28,4 +53,69 @@
2853
<item name="Widget.AppCompat.ButtonBar">@style/Widget.AppCompat.ButtonBar</item>
2954
<item name="Widget.AppCompat.ButtonBar.AlertDialog">@style/Widget.AppCompat.ButtonBar.AlertDialog</item>
3055
</style>
56+
<style name="AppCompatStyles.CompoundButton">
57+
<item name="Widget.AppCompat.CompoundButton.CheckBox">@style/Widget.AppCompat.CompoundButton.CheckBox</item>
58+
<item name="Widget.AppCompat.CompoundButton.RadioButton">@style/Widget.AppCompat.CompoundButton.RadioButton</item>
59+
<item name="Widget.AppCompat.CompoundButton.Switch">@style/Widget.AppCompat.CompoundButton.Switch</item>
60+
</style>
61+
<style name="AppCompatStyles.Light">
62+
<item name="Widget.AppCompat.Light.ActionMode.Inverse">@style/Widget.AppCompat.Light.ActionMode.Inverse</item>
63+
<item name="Widget.AppCompat.Light.ActivityChooserView">@style/Widget.AppCompat.Light.ActivityChooserView</item>
64+
<item name="Widget.AppCompat.Light.AutoCompleteTextView">@style/Widget.AppCompat.Light.AutoCompleteTextView</item>
65+
<item name="Widget.AppCompat.Light.DropDownItem.Spinner">@style/Widget.AppCompat.Light.DropDownItem.Spinner</item>
66+
<item name="Widget.AppCompat.Light.ListPopupWindow">@style/Widget.AppCompat.Light.ListPopupWindow</item>
67+
<item name="Widget.AppCompat.Light.ListView.DropDown">@style/Widget.AppCompat.Light.ListView.DropDown</item>
68+
<item name="Widget.AppCompat.Light.PopupMenu">@style/Widget.AppCompat.Light.PopupMenu</item>
69+
<item name="Widget.AppCompat.Light.PopupMenu.Overflow">@style/Widget.AppCompat.Light.PopupMenu.Overflow</item>
70+
<item name="Widget.AppCompat.Light.SearchView">@style/Widget.AppCompat.Light.SearchView</item>
71+
<item name="Widget.AppCompat.Light.Spinner.DropDown.ActionBar">@style/Widget.AppCompat.Light.Spinner.DropDown.ActionBar</item>
72+
</style>
73+
<style name="AppCompatStyles.Light.ActionBar">
74+
<item name="Widget.AppCompat.Light.ActionBar">@style/Widget.AppCompat.Light.ActionBar</item>
75+
<item name="Widget.AppCompat.Light.ActionBar.Solid">@style/Widget.AppCompat.Light.ActionBar.Solid</item>
76+
<item name="Widget.AppCompat.Light.ActionBar.Solid.Inverse">@style/Widget.AppCompat.Light.ActionBar.Solid.Inverse</item>
77+
<item name="Widget.AppCompat.Light.ActionBar.TabBar">@style/Widget.AppCompat.Light.ActionBar.TabBar</item>
78+
<item name="Widget.AppCompat.Light.ActionBar.TabBar.Inverse">@style/Widget.AppCompat.Light.ActionBar.TabBar.Inverse</item>
79+
<item name="Widget.AppCompat.Light.ActionBar.TabText">@style/Widget.AppCompat.Light.ActionBar.TabText</item>
80+
<item name="Widget.AppCompat.Light.ActionBar.TabText.Inverse">@style/Widget.AppCompat.Light.ActionBar.TabText.Inverse</item>
81+
<item name="Widget.AppCompat.Light.ActionBar.TabView">@style/Widget.AppCompat.Light.ActionBar.TabView</item>
82+
<item name="Widget.AppCompat.Light.ActionBar.TabView.Inverse">@style/Widget.AppCompat.Light.ActionBar.TabView.Inverse</item>
83+
</style>
84+
<style name="AppCompatStyles.Light.ActionButton">
85+
<item name="Widget.AppCompat.Light.ActionButton">@style/Widget.AppCompat.Light.ActionButton</item>
86+
<item name="Widget.AppCompat.Light.ActionButton.CloseMode">@style/Widget.AppCompat.Light.ActionButton.CloseMode</item>
87+
<item name="Widget.AppCompat.Light.ActionButton.Overflow">@style/Widget.AppCompat.Light.ActionButton.Overflow</item>
88+
</style>
89+
<style name="AppCompatStyles.ListView">
90+
<item name="Widget.AppCompat.ListView">@style/Widget.AppCompat.ListView</item>
91+
<item name="Widget.AppCompat.ListView.DropDown">@style/Widget.AppCompat.ListView.DropDown</item>
92+
<item name="Widget.AppCompat.ListView.Menu">@style/Widget.AppCompat.ListView.Menu</item>
93+
</style>
94+
<style name="AppCompatStyles.ProgressBar">
95+
<item name="Widget.AppCompat.ProgressBar">@style/Widget.AppCompat.ProgressBar</item>
96+
<item name="Widget.AppCompat.ProgressBar.Horizontal">@style/Widget.AppCompat.ProgressBar.Horizontal</item>
97+
</style>
98+
<style name="AppCompatStyles.RatingBar">
99+
<item name="Widget.AppCompat.RatingBar">@style/Widget.AppCompat.RatingBar</item>
100+
<item name="Widget.AppCompat.RatingBar.Indicator">@style/Widget.AppCompat.RatingBar.Indicator</item>
101+
<item name="Widget.AppCompat.RatingBar.Small">@style/Widget.AppCompat.RatingBar.Small</item>
102+
</style>
103+
<style name="AppCompatStyles.SearchView">
104+
<item name="Widget.AppCompat.SearchView">@style/Widget.AppCompat.SearchView</item>
105+
<item name="Widget.AppCompat.SearchView.ActionBar">@style/Widget.AppCompat.SearchView.ActionBar</item>
106+
</style>
107+
<style name="AppCompatStyles.SeekBar">
108+
<item name="Widget.AppCompat.SeekBar">@style/Widget.AppCompat.SeekBar</item>
109+
<item name="Widget.AppCompat.SeekBar.Discrete">@style/Widget.AppCompat.SeekBar.Discrete</item>
110+
</style>
111+
<style name="AppCompatStyles.Spinner">
112+
<item name="Widget.AppCompat.Spinner">@style/Widget.AppCompat.Spinner</item>
113+
<item name="Widget.AppCompat.Spinner.DropDown">@style/Widget.AppCompat.Spinner.DropDown</item>
114+
<item name="Widget.AppCompat.Spinner.DropDown.ActionBar">@style/Widget.AppCompat.Spinner.DropDown.ActionBar</item>
115+
<item name="Widget.AppCompat.Spinner.Underlined">@style/Widget.AppCompat.Spinner.Underlined</item>
116+
</style>
117+
<style name="AppCompatStyles.Toolbar">
118+
<item name="Widget.AppCompat.Toolbar">@style/Widget.AppCompat.Toolbar</item>
119+
<item name="Widget.AppCompat.Toolbar.Button.Navigation">@style/Widget.AppCompat.Toolbar.Button.Navigation</item>
120+
</style>
31121
</resources>

0 commit comments

Comments
 (0)