Fabio/Auxio
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

style: Use colorControlHighlight everywhere

Browse source 
Change most of the external layout/drawable code to use
colorControlHighlight instead of selection_color so that control
over which kind of selection color is used is more fine-grained.
This commit is contained in:
OxygenCobalt 2021-05-24 18:07:02 -06:00
parent 55dfc681ad
commit 9974bd32eb
No known key found for this signature in database
GPG key ID: 37DBE3621FE9AD47
7 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
app/src/main/res/drawable/ui_background_ripple.xml
View file

@ -6,10 +6,10 @@
</shape> </shape>
</item> </item>
<item> <item>
<ripple android:color="@color/selection_color"> <ripple android:color="?attr/colorControlHighlight">
<item android:id="@android:id/mask"> <item android:id="@android:id/mask">
<shape android:shape="rectangle"> <shape android:shape="rectangle">
<solid android:color="@color/selection_color" /> <solid android:color="?attr/colorControlHighlight" />
</shape> </shape>
</item> </item>
</ripple> </ripple>

2
app/src/main/res/drawable/ui_circle_ripple.xml
View file

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<ripple xmlns:android="http://schemas.android.com/apk/res/android" <ripple xmlns:android="http://schemas.android.com/apk/res/android"
android:color="@color/selection_color"> android:color="?attr/colorControlHighlight">
<item> <item>
<shape android:shape="oval"> <shape android:shape="oval">
<solid android:color="@android:color/white" /> <solid android:color="@android:color/white" />

2
app/src/main/res/drawable/ui_small_unbounded_ripple.xml
View file

@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<ripple xmlns:android="http://schemas.android.com/apk/res/android" <ripple xmlns:android="http://schemas.android.com/apk/res/android"
android:color="@color/selection_color" android:color="?attr/colorControlHighlight"
android:radius="@dimen/size_small_unb_ripple" /> android:radius="@dimen/size_small_unb_ripple" />

2
app/src/main/res/drawable/ui_unbounded_ripple.xml
View file

@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<ripple xmlns:android="http://schemas.android.com/apk/res/android" <ripple xmlns:android="http://schemas.android.com/apk/res/android"
android:color="@color/selection_color" android:color="?attr/colorControlHighlight"
android:radius="@dimen/size_unb_ripple" /> android:radius="@dimen/size_unb_ripple" />

2
app/src/main/res/layout/fragment_detail.xml
View file

@ -26,7 +26,7 @@
android:id="@+id/detail_recycler" android:id="@+id/detail_recycler"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_marginTop="?attr/actionBarSize" app:layout_behavior="com.google.android.material.appbar.AppBarLayout$ScrollingViewBehavior"
app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
tools:listitem="@layout/item_artist_header" /> tools:listitem="@layout/item_artist_header" />

2
app/src/main/res/values-large/styles.xml
View file

@ -6,7 +6,7 @@
<item name="android:layout_height">wrap_content</item> <item name="android:layout_height">wrap_content</item>
<item name="android:clickable">true</item> <item name="android:clickable">true</item>
<item name="android:focusable">true</item> <item name="android:focusable">true</item>
<item name="rippleColor">@color/selection_color</item> <item name="rippleColor">?attr/colorControlHighlight</item>
<item name="fontFamily">@font/inter_semibold</item> <item name="fontFamily">@font/inter_semibold</item>
<item name="textAllCaps">false</item> <item name="textAllCaps">false</item>
<item name="cornerRadius">0dp</item> <item name="cornerRadius">0dp</item>

4
app/src/main/res/values/styles.xml
View file

@ -218,7 +218,7 @@
<item name="android:layout_height">wrap_content</item> <item name="android:layout_height">wrap_content</item>
<item name="android:clickable">true</item> <item name="android:clickable">true</item>
<item name="android:focusable">true</item> <item name="android:focusable">true</item>
<item name="rippleColor">@color/selection_color</item> <item name="rippleColor">?attr/colorControlHighlight</item>
<item name="fontFamily">@font/inter_semibold</item> <item name="fontFamily">@font/inter_semibold</item>
<item name="textAllCaps">false</item> <item name="textAllCaps">false</item>
<item name="cornerRadius">0dp</item> <item name="cornerRadius">0dp</item>
@ -237,7 +237,7 @@
<style name="Widget.MaterialComponents.Button.Highlighted" parent="@style/Widget.MaterialComponents.Button.Base"> <style name="Widget.MaterialComponents.Button.Highlighted" parent="@style/Widget.MaterialComponents.Button.Base">
<item name="android:layout_marginStart">@dimen/spacing_small</item> <item name="android:layout_marginStart">@dimen/spacing_small</item>
<item name="android:layout_marginEnd">@dimen/spacing_medium</item> <item name="android:layout_marginEnd">@dimen/spacing_medium</item>
<item name="rippleColor">@color/selection_color</item> <item name="rippleColor">?attr/colorControlHighlight</item>
<item name="fontFamily">@font/inter_semibold</item> <item name="fontFamily">@font/inter_semibold</item>
<item name="textAllCaps">false</item> <item name="textAllCaps">false</item>
<item name="android:textColor">@color/background</item> <item name="android:textColor">@color/background</item>