null2264/yokai
1
0
Fork 0
mirror of https://github.com/null2264/yokai.git synced 2025-06-21 10:44:42 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Using color accented ripples

Browse source 
Co-Authored-By: Soitora <simon.mattila@protonmail.com>
This commit is contained in:
Jays2Kings 2021-08-27 16:39:20 -04:00
parent e6ea530532
commit 990d5ebdd7
19 changed files with 51 additions and 45 deletions
Download patch file Download diff file Expand all files Collapse all files

4
app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsController.kt
View file

@ -11,7 +11,6 @@ import android.view.LayoutInflater
import android.view.View
import android.view.ViewGroup
import androidx.appcompat.app.AppCompatActivity
import androidx.core.content.ContextCompat
import androidx.preference.PreferenceController
import androidx.preference.PreferenceGroup
import androidx.preference.PreferenceScreen
@ -21,6 +20,7 @@ import eu.kanade.tachiyomi.R
import eu.kanade.tachiyomi.data.preference.PreferencesHelper
import eu.kanade.tachiyomi.ui.base.controller.BaseController
import eu.kanade.tachiyomi.ui.main.FloatingSearchInterface
import eu.kanade.tachiyomi.util.system.getResourceColor
import eu.kanade.tachiyomi.util.view.scrollViewWith
import kotlinx.coroutines.MainScope
import rx.Observable
@ -88,7 +88,7 @@ abstract class SettingsController : PreferenceController() {
private fun animatePreferenceHighlight(view: View) {
ValueAnimator
.ofObject(ArgbEvaluator(), Color.TRANSPARENT, ContextCompat.getColor(view.context, R.color.fullRippleColor))
.ofObject(ArgbEvaluator(), Color.TRANSPARENT, view.context.getResourceColor(R.attr.colorControlHighlight))
.apply {
duration = 500L
repeatCount = 2

4
app/src/main/res/color/accent_highlight.xml Normal file
View file

@ -0,0 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:alpha="0.12" android:color="?attr/colorAccent" />
</selector>

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

@ -14,7 +14,7 @@
android:shape="rectangle">
<stroke
android:width="1dp"
android:color="@color/fullRippleColor" />
android:color="?colorControlHighlight" />
<solid android:color="#00FFFFFF" />
</shape>

8
app/src/main/res/drawable/card_item_selector.xml
View file

@ -1,17 +1,17 @@
<?xml version="1.0" encoding="utf-8"?>
<ripple xmlns:android="http://schemas.android.com/apk/res/android"
android:color="@color/fullRippleColor">
android:color="?colorControlHighlight">
<item android:id="@android:id/mask">
<color android:color="@color/fullRippleColor" />
<color android:color="?colorControlHighlight" />
</item>
<item>
<selector>
<item android:state_selected="true">
<color android:color="@color/fullRippleColor" />
<color android:color="?colorControlHighlight" />
</item>
<item android:state_activated="true">
<color android:color="@color/fullRippleColor" />
<color android:color="?colorControlHighlight" />
</item>
<item android:id="@android:id/mask">

8
app/src/main/res/drawable/library_compact_grid_selector.xml
View file

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<ripple xmlns:android="http://schemas.android.com/apk/res/android"
android:color="@color/fullRippleColor">
android:color="?colorControlHighlight">
<item android:id="@android:id/mask"
android:top="6dp"
android:bottom="2dp"
@ -8,7 +8,7 @@
android:right="6dp">
<shape android:shape="rectangle">
<corners android:radius="4dp" />
<solid android:color="@color/fullRippleColor" />
<solid android:color="?colorControlHighlight" />
</shape>
</item>
<item
@ -20,14 +20,14 @@
<item android:state_selected="true">
<shape android:shape="rectangle">
<corners android:radius="4dp" />
<solid android:color="@color/fullRippleColor" />
<solid android:color="?colorControlHighlight" />
</shape>
</item>
<item android:state_activated="true">
<shape android:shape="rectangle">
<corners android:radius="4dp" />
<solid android:color="@color/fullRippleColor" />
<solid android:color="?colorControlHighlight" />
</shape>
</item>
</selector>

8
app/src/main/res/drawable/library_item_selector.xml
View file

@ -1,13 +1,13 @@
<?xml version="1.0" encoding="utf-8"?>
<ripple xmlns:android="http://schemas.android.com/apk/res/android"
android:color="@color/fullRippleColor">
android:color="?colorControlHighlight">
<item android:id="@android:id/mask"
android:top="6dp"
android:left="6dp"
android:right="6dp">
<shape android:shape="rectangle">
<corners android:radius="4dp" />
<solid android:color="@color/fullRippleColor" />
<solid android:color="?colorControlHighlight" />
</shape>
</item>
<item
@ -18,14 +18,14 @@
<item android:state_selected="true">
<shape android:shape="rectangle">
<corners android:radius="4dp" />
<solid android:color="@color/fullRippleColor" />
<solid android:color="?colorControlHighlight" />
</shape>
</item>
<item android:state_activated="true">
<shape android:shape="rectangle">
<corners android:radius="4dp" />
<solid android:color="@color/fullRippleColor" />
<solid android:color="?colorControlHighlight" />
</shape>
</item>
</selector>

8
app/src/main/res/drawable/list_item_selector.xml
View file

@ -1,17 +1,17 @@
<?xml version="1.0" encoding="utf-8"?>
<ripple xmlns:android="http://schemas.android.com/apk/res/android"
android:color="@color/fullRippleColor">
android:color="?colorControlHighlight">
<item android:id="@android:id/mask">
<color android:color="@color/fullRippleColor" />
<color android:color="?colorControlHighlight" />
</item>
<item>
<selector>
<item android:state_selected="true">
<color android:color="@color/fullRippleColor" />
<color android:color="?colorControlHighlight" />
</item>
<item android:state_activated="true">
<color android:color="@color/fullRippleColor" />
<color android:color="?colorControlHighlight" />
</item>
<item android:id="@android:id/mask">

8
app/src/main/res/drawable/material_list_item_selector.xml
View file

@ -1,12 +1,12 @@
<?xml version="1.0" encoding="utf-8"?>
<ripple xmlns:android="http://schemas.android.com/apk/res/android"
android:color="@color/fullRippleColor">
android:color="?colorControlHighlight">
<item android:id="@android:id/mask"
android:left="12dp"
android:right="12dp">
<shape android:shape="rectangle">
<corners android:radius="4dp" />
<solid android:color="@color/fullRippleColor" />
<solid android:color="?colorControlHighlight" />
</shape>
</item>
<item
@ -16,14 +16,14 @@
<item android:state_selected="true">
<shape android:shape="rectangle">
<corners android:radius="4dp" />
<solid android:color="@color/rippleColor" />
<solid android:color="?colorControlHighlight" />
</shape>
</item>
<item android:state_activated="true">
<shape android:shape="rectangle">
<corners android:radius="4dp" />
<solid android:color="@color/fullRippleColor" />
<solid android:color="?colorControlHighlight" />
</shape>
</item>

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

@ -1,9 +1,9 @@
<?xml version="1.0" encoding="utf-8"?>
<ripple xmlns:android="http://schemas.android.com/apk/res/android"
android:color="@color/fullRippleColor">
android:color="?colorControlHighlight">
<item android:id="@android:id/mask">
<shape android:shape="rectangle">
<solid android:color="@color/fullRippleColor" />
<solid android:color="?colorControlHighlight" />
</shape>
</item>
</ripple>

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

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

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

@ -3,7 +3,7 @@
android:color="?attr/colorControlHighlight">
<item android:id="@android:id/mask">
<shape>
<solid android:color="@color/fullRippleColor" />
<solid android:color="?colorControlHighlight" />
<corners
android:topLeftRadius="@dimen/rounded_radius"
android:topRightRadius="@dimen/rounded_radius" />

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

@ -1,10 +1,10 @@
<?xml version="1.0" encoding="utf-8"?>
<ripple xmlns:android="http://schemas.android.com/apk/res/android"
android:color="@color/fullRippleColor">
android:color="?colorControlHighlight">
<item android:id="@android:id/mask">
<shape android:shape="rectangle">
<corners android:radius="4dp" />
<solid android:color="@color/fullRippleColor" />
<solid android:color="?colorControlHighlight" />
</shape>
</item>
</ripple>

8
app/src/main/res/drawable/transparent_item_selector.xml
View file

@ -1,17 +1,17 @@
<?xml version="1.0" encoding="utf-8"?>
<ripple xmlns:android="http://schemas.android.com/apk/res/android"
android:color="@color/fullRippleColor">
android:color="?colorControlHighlight">
<item android:id="@android:id/mask">
<color android:color="@color/fullRippleColor" />
<color android:color="?colorControlHighlight" />
</item>
<item>
<selector>
<item android:state_selected="true">
<color android:color="@color/fullRippleColor" />
<color android:color="?colorControlHighlight" />
</item>
<item android:state_activated="true">
<color android:color="@color/fullRippleColor" />
<color android:color="?colorControlHighlight" />
</item>
<item android:id="@android:id/mask">

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

@ -41,7 +41,7 @@
app:layout_constraintHorizontal_bias="1.0"
app:layout_constraintStart_toEndOf="@id/title"
app:layout_constraintTop_toTopOf="@id/title"
app:rippleColor="@color/fullRippleColor"
app:rippleColor="?colorControlHighlight"
android:text="@string/update_all" />
<TextView

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

@ -187,6 +187,6 @@
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintRight_toRightOf="parent"
app:menu="@menu/bottom_navigation"
app:tabRippleColor="@color/rippleColor"
app:tabRippleColor="?colorControlHighlight"
app:tabTextColor="?attr/tabBarIconColor" />
</androidx.constraintlayout.widget.ConstraintLayout>

2
app/src/main/res/values-night/colors.xml
View file

@ -5,8 +5,6 @@
<color name="colorPrimaryDark">#212121</color>
<color name="colorPrimaryInactive">@color/md_white_1000_76</color>
<color name="rippleColor">@color/md_white_1000_20</color>
<color name="fullRippleColor">#707070</color>
<color name="colorAccent">#3399FF</color>
<color name="colorAccentText">#cce5ff</color>
<color name="splashBackground">#212121</color>

2
app/src/main/res/values/colors.xml
View file

@ -6,8 +6,6 @@
<color name="colorPrimaryDark">@color/md_white_1000</color>
<color name="app_color_primary">#54759E</color>
<color name="splashBackground">@color/app_color_primary</color>
<color name="fullRippleColor">#C2C2C2</color>
<color name="rippleColor">@color/md_black_1000_12</color>
<color name="colorAccent">@color/md_blue_A400</color>
<color name="colorAccentText">#184798</color>
<color name="actionModeShadow">@color/md_black_1000_38</color>

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

@ -221,7 +221,7 @@
<item name="tabIndicator">@drawable/tab_indicator</item>
<item name="tabIndicatorColor">?attr/colorAccent</item>
<item name="tabTextColor">@color/tabs_selector</item>
<item name="tabRippleColor">@color/rippleColor</item>
<item name="tabRippleColor">?colorControlHighlight</item>
<item name="tabIndicatorFullWidth">false</item>
<item name="tabInlineLabel">true</item>
<item name="tabMinWidth">75dp</item>
@ -272,14 +272,14 @@
<style name="Theme.Widget.Button.Borderless" parent="Widget.MaterialComponents.Button.TextButton">
<item name="android:textAllCaps">false</item>
<item name="android:textColor">?attr/colorAccent</item>
<item name="rippleColor">@color/fullRippleColor</item>
<item name="rippleColor">?colorControlHighlight</item>
</style>
<style name="Theme.Widget.Button.OutlinedButtonAccent" parent="Widget.MaterialComponents.Button.OutlinedButton">
<item name="strokeColor">@android:color/transparent</item>
<item name="backgroundTint">@color/ext_bg_selector</item>
<item name="android:textColor">@color/ext_button_text_selector</item>
<item name="rippleColor">@color/fullRippleColor</item>
<item name="rippleColor">?colorControlHighlight</item>
</style>
@ -294,7 +294,7 @@
<item name="android:letterSpacing">0.0</item>
<item name="android:layout_height">40dp</item>
<item name="iconTint">?colorAccent</item>
<item name="rippleColor">@color/fullRippleColor</item>
<item name="rippleColor">?colorControlHighlight</item>
<item name="android:textColor">?android:attr/textColorPrimary</item>
<item name="cornerRadius">20dp</item>
</style>
@ -315,7 +315,7 @@
<style name="Theme.Widget.ImageBorderless" parent="Widget.AppCompat.ImageButton">
<item name="android:background">?selectableItemBackgroundBorderless</item>
<item name="android:tint">?colorAccent</item>
<item name="rippleColor">@color/fullRippleColor</item>
<item name="rippleColor">?colorControlHighlight</item>
</style>
<style name="Theme.Widget.CustomImageButton">
@ -325,6 +325,10 @@
<item name="android:tint">?colorAccent</item>
</style>
<style name="PopupMenu" parent="Widget.AppCompat.Light.PopupMenu">
<item name="android:popupBackground">?android:colorBackground</item>
</style>
<style name="Theme.Widget.Chip.Outline" parent="Widget.MaterialComponents.Chip.Action">
<item name="chipBackgroundColor">@color/accent_alpha</item>
<item name="chipMinHeight">28dp</item>

2
app/src/main/res/values/themes.xml
View file

@ -35,6 +35,8 @@
<item name="android:listDivider">@drawable/line_divider</item>
<item name="actionModeStyle">@style/CustomActionModeStyle</item>
<item name="colorOnAccent">@color/md_white_1000</item>
<item name="colorControlHighlight">@color/accent_highlight</item>
<item name="android:colorControlHighlight">@color/accent_highlight</item>
<!-- Themes -->
<item name="windowActionModeOverlay">true</item>