diff --git a/app/src/main/java/code/name/monkey/retromusic/App.kt b/app/src/main/java/code/name/monkey/retromusic/App.kt
index a141fa069..35479e7ec 100644
--- a/app/src/main/java/code/name/monkey/retromusic/App.kt
+++ b/app/src/main/java/code/name/monkey/retromusic/App.kt
@@ -43,7 +43,7 @@ class App : MultiDexApplication() {
// default theme
if (!ThemeStore.isConfigured(this, 3)) {
ThemeStore.editTheme(this)
- .accentColorRes(R.color.md_green_A200)
+ .accentColorRes(R.color.md_deep_purple_A200)
.coloredNavigationBar(true)
.commit()
}
diff --git a/app/src/main/java/code/name/monkey/retromusic/util/RippleUtils.java b/app/src/main/java/code/name/monkey/retromusic/util/RippleUtils.java
new file mode 100644
index 000000000..6a61c5dba
--- /dev/null
+++ b/app/src/main/java/code/name/monkey/retromusic/util/RippleUtils.java
@@ -0,0 +1,146 @@
+package code.name.monkey.retromusic.util;
+
+import android.annotation.TargetApi;
+import android.content.res.ColorStateList;
+import android.graphics.Color;
+import android.os.Build;
+import android.util.StateSet;
+
+import androidx.annotation.ColorInt;
+import androidx.annotation.Nullable;
+import androidx.core.graphics.ColorUtils;
+
+public class RippleUtils {
+ public static final boolean USE_FRAMEWORK_RIPPLE = Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP;
+ private static final int[] PRESSED_STATE_SET = {
+ android.R.attr.state_pressed,
+ };
+ private static final int[] HOVERED_FOCUSED_STATE_SET = {
+ android.R.attr.state_hovered, android.R.attr.state_focused,
+ };
+ private static final int[] FOCUSED_STATE_SET = {
+ android.R.attr.state_focused,
+ };
+ private static final int[] HOVERED_STATE_SET = {
+ android.R.attr.state_hovered,
+ };
+
+ private static final int[] SELECTED_PRESSED_STATE_SET = {
+ android.R.attr.state_selected, android.R.attr.state_pressed,
+ };
+ private static final int[] SELECTED_HOVERED_FOCUSED_STATE_SET = {
+ android.R.attr.state_selected, android.R.attr.state_hovered, android.R.attr.state_focused,
+ };
+ private static final int[] SELECTED_FOCUSED_STATE_SET = {
+ android.R.attr.state_selected, android.R.attr.state_focused,
+ };
+ private static final int[] SELECTED_HOVERED_STATE_SET = {
+ android.R.attr.state_selected, android.R.attr.state_hovered,
+ };
+ private static final int[] SELECTED_STATE_SET = {
+ android.R.attr.state_selected,
+ };
+
+ private static final int[] ENABLED_PRESSED_STATE_SET = {
+ android.R.attr.state_enabled, android.R.attr.state_pressed
+ };
+
+ public static ColorStateList convertToRippleDrawableColor(@Nullable ColorStateList rippleColor) {
+ if (USE_FRAMEWORK_RIPPLE) {
+ int size = 2;
+
+ final int[][] states = new int[size][];
+ final int[] colors = new int[size];
+ int i = 0;
+
+ // Ideally we would define a different composite color for each state, but that causes the
+ // ripple animation to abort prematurely.
+ // So we only allow two base states: selected, and non-selected. For each base state, we only
+ // base the ripple composite on its pressed state.
+
+ // Selected base state.
+ states[i] = SELECTED_STATE_SET;
+ colors[i] = getColorForState(rippleColor, SELECTED_PRESSED_STATE_SET);
+ i++;
+
+ // Non-selected base state.
+ states[i] = StateSet.NOTHING;
+ colors[i] = getColorForState(rippleColor, PRESSED_STATE_SET);
+ i++;
+
+ return new ColorStateList(states, colors);
+ } else {
+ int size = 10;
+
+ final int[][] states = new int[size][];
+ final int[] colors = new int[size];
+ int i = 0;
+
+ states[i] = SELECTED_PRESSED_STATE_SET;
+ colors[i] = getColorForState(rippleColor, SELECTED_PRESSED_STATE_SET);
+ i++;
+
+ states[i] = SELECTED_HOVERED_FOCUSED_STATE_SET;
+ colors[i] = getColorForState(rippleColor, SELECTED_HOVERED_FOCUSED_STATE_SET);
+ i++;
+
+ states[i] = SELECTED_FOCUSED_STATE_SET;
+ colors[i] = getColorForState(rippleColor, SELECTED_FOCUSED_STATE_SET);
+ i++;
+
+ states[i] = SELECTED_HOVERED_STATE_SET;
+ colors[i] = getColorForState(rippleColor, SELECTED_HOVERED_STATE_SET);
+ i++;
+
+ // Checked state.
+ states[i] = SELECTED_STATE_SET;
+ colors[i] = Color.TRANSPARENT;
+ i++;
+
+ states[i] = PRESSED_STATE_SET;
+ colors[i] = getColorForState(rippleColor, PRESSED_STATE_SET);
+ i++;
+
+ states[i] = HOVERED_FOCUSED_STATE_SET;
+ colors[i] = getColorForState(rippleColor, HOVERED_FOCUSED_STATE_SET);
+ i++;
+
+ states[i] = FOCUSED_STATE_SET;
+ colors[i] = getColorForState(rippleColor, FOCUSED_STATE_SET);
+ i++;
+
+ states[i] = HOVERED_STATE_SET;
+ colors[i] = getColorForState(rippleColor, HOVERED_STATE_SET);
+ i++;
+
+ // Default state.
+ states[i] = StateSet.NOTHING;
+ colors[i] = Color.TRANSPARENT;
+ i++;
+
+ return new ColorStateList(states, colors);
+ }
+ }
+
+ @ColorInt
+ private static int getColorForState(@Nullable ColorStateList rippleColor, int[] state) {
+ int color;
+ if (rippleColor != null) {
+ color = rippleColor.getColorForState(state, rippleColor.getDefaultColor());
+ } else {
+ color = Color.TRANSPARENT;
+ }
+ return USE_FRAMEWORK_RIPPLE ? doubleAlpha(color) : color;
+ }
+
+ /**
+ * On API 21+, the framework composites a ripple color onto the display at about 50% opacity.
+ * Since we are providing precise ripple colors, cancel that out by doubling the opacity here.
+ */
+ @ColorInt
+ @TargetApi(Build.VERSION_CODES.LOLLIPOP)
+ private static int doubleAlpha(@ColorInt int color) {
+ int alpha = Math.min(2 * Color.alpha(color), 255);
+ return ColorUtils.setAlphaComponent(color, alpha);
+ }
+}
diff --git a/app/src/main/java/code/name/monkey/retromusic/views/BottomNavigationBarTinted.kt b/app/src/main/java/code/name/monkey/retromusic/views/BottomNavigationBarTinted.kt
index 1d4701c94..6df828631 100644
--- a/app/src/main/java/code/name/monkey/retromusic/views/BottomNavigationBarTinted.kt
+++ b/app/src/main/java/code/name/monkey/retromusic/views/BottomNavigationBarTinted.kt
@@ -15,13 +15,17 @@
package code.name.monkey.retromusic.views
import android.content.Context
+import android.content.res.ColorStateList
+import android.graphics.drawable.RippleDrawable
import android.util.AttributeSet
+import androidx.core.content.ContextCompat
import code.name.monkey.appthemehelper.ThemeStore
import code.name.monkey.appthemehelper.util.ATHUtil
import code.name.monkey.appthemehelper.util.ColorUtil
import code.name.monkey.appthemehelper.util.NavigationViewUtil
import code.name.monkey.retromusic.R
import code.name.monkey.retromusic.util.PreferenceUtil
+import code.name.monkey.retromusic.util.RippleUtils
import com.google.android.material.bottomnavigation.BottomNavigationView
class BottomNavigationBarTinted @JvmOverloads constructor(
@@ -38,7 +42,11 @@ class BottomNavigationBarTinted @JvmOverloads constructor(
val accentColor = ThemeStore.accentColor(context)
NavigationViewUtil.setItemIconColors(this, ColorUtil.withAlpha(iconColor, 0.5f), accentColor)
NavigationViewUtil.setItemTextColors(this, ColorUtil.withAlpha(iconColor, 0.5f), accentColor)
-
+ itemBackground = RippleDrawable(RippleUtils.convertToRippleDrawableColor(ColorStateList.valueOf(ThemeStore.accentColor(context).addAlpha())), ContextCompat.getDrawable(context, R.drawable.bottom_navigation_item_background), null)
setOnApplyWindowInsetsListener(null)
}
-}
\ No newline at end of file
+}
+
+private fun Int.addAlpha(): Int {
+ return ColorUtil.withAlpha(this, 0.12f)
+}
diff --git a/app/src/main/res/drawable-xxhdpi/bottom_navigation_item_background_ripple.xml b/app/src/main/res/drawable-xxhdpi/bottom_navigation_item_background_ripple.xml
new file mode 100644
index 000000000..8aff4a1e4
--- /dev/null
+++ b/app/src/main/res/drawable-xxhdpi/bottom_navigation_item_background_ripple.xml
@@ -0,0 +1,11 @@
+
+
+ -
+
+
+
+
+
+