From 932c92412c29fe4a8d1410d29a6e77557ad48707 Mon Sep 17 00:00:00 2001 From: Ivan Iskandar <12537387+ivaniskandar@users.noreply.github.com> Date: Sun, 20 Jun 2021 02:45:16 +0700 Subject: [PATCH] More themes cleanup (#5410) * More themes cleanup * Tweak some things * Fix 'Clear History' icon * Split out ripple colored to its own drawable * Tidy up things * Unify background dim amount * Use primaryColor for Account login button * More colored ripples * use colorOnPrimary for selected comfortable library item title Co-authored-by: Soitora --- app/src/main/AndroidManifest.xml | 4 +- .../ui/setting/SettingsController.kt | 9 +- .../tachiyomi/ui/webview/WebViewActivity.kt | 2 +- .../util/system/ContextExtensions.kt | 2 +- .../eu/kanade/tachiyomi/widget/EmptyView.kt | 15 +- .../widget/ThemedSwipeRefreshLayout.kt | 20 +- .../res/color/background_color_chip_state.xml | 7 - .../main/res/color/button_action_selector.xml | 4 +- .../res/color/draggable_card_foreground.xml | 6 + .../res/color/library_item_background.xml | 5 + .../res/color/library_item_foreground.xml | 5 + app/src/main/res/color/nav_selector.xml | 4 +- ...elector_overlay.xml => ripple_colored.xml} | 4 +- .../main/res/color/ripple_toolbar_fainter.xml | 5 + .../color/source_comfortable_item_title.xml | 6 + app/src/main/res/color/tabs_selector.xml | 4 +- .../res/color/tabs_selector_background.xml | 10 - app/src/main/res/color/text_input_stroke.xml | 11 - .../sc_collections_bookmark_48dp.xml | 6 +- .../main/res/drawable-v26/sc_explore_48dp.xml | 4 +- .../main/res/drawable-v26/sc_history_48dp.xml | 4 +- .../res/drawable-v26/sc_new_releases_48dp.xml | 4 +- .../res/drawable/library_item_selector.xml | 48 +- .../library_item_selector_overlay.xml | 23 +- .../main/res/drawable/list_item_selector.xml | 6 +- .../list_item_selector_background.xml | 6 +- .../drawable/reader_seekbar_background.xml | 2 +- .../res/drawable/reader_seekbar_ripple.xml | 2 +- .../main/res/drawable/ripple_background.xml | 5 - app/src/main/res/drawable/ripple_regular.xml | 3 - .../drawable/sc_collections_bookmark_48dp.xml | 6 +- app/src/main/res/drawable/sc_explore_48dp.xml | 4 +- app/src/main/res/drawable/sc_history_48dp.xml | 4 +- .../res/drawable/sc_new_releases_48dp.xml | 4 +- .../drawable/selectable_item_background.xml | 3 - .../main/res/drawable/splash_background.xml | 2 +- app/src/main/res/drawable/tab_indicator.xml | 2 +- .../main/res/layout-sw720dp/main_activity.xml | 4 +- .../res/layout-sw720dp/manga_info_header.xml | 10 +- app/src/main/res/layout/action_toolbar.xml | 2 - app/src/main/res/layout/categories_item.xml | 6 +- .../main/res/layout/chapter_download_view.xml | 2 +- .../main/res/layout/common_spinner_item.xml | 2 +- .../main/res/layout/common_tabbed_sheet.xml | 10 +- app/src/main/res/layout/download_item.xml | 8 +- .../main/res/layout/extension_card_item.xml | 2 +- .../res/layout/extension_detail_header.xml | 3 +- .../layout/global_search_controller_card.xml | 4 +- .../global_search_controller_card_item.xml | 3 +- app/src/main/res/layout/history_item.xml | 6 +- .../main/res/layout/library_controller.xml | 2 +- .../main/res/layout/library_grid_recycler.xml | 2 +- app/src/main/res/layout/main_activity.xml | 7 +- app/src/main/res/layout/main_activity_fab.xml | 6 +- .../main/res/layout/main_activity_toolbar.xml | 3 - .../main/res/layout/manga_chapters_header.xml | 6 +- app/src/main/res/layout/manga_info_header.xml | 10 +- .../res/layout/navigation_view_checkbox.xml | 2 +- .../layout/navigation_view_checkedtext.xml | 2 +- .../main/res/layout/navigation_view_group.xml | 2 +- .../main/res/layout/navigation_view_radio.xml | 2 +- .../res/layout/navigation_view_spinner.xml | 2 +- .../main/res/layout/navigation_view_text.xml | 4 +- .../main/res/layout/pref_account_login.xml | 4 +- app/src/main/res/layout/pref_more_header.xml | 4 +- app/src/main/res/layout/pref_settings.xml | 2 +- app/src/main/res/layout/reader_activity.xml | 28 +- app/src/main/res/layout/reader_page_sheet.xml | 6 +- .../settings_search_controller_card.xml | 2 +- .../layout/source_comfortable_grid_item.xml | 4 +- .../res/layout/source_compact_grid_item.xml | 4 +- .../main/res/layout/source_filter_sheet.xml | 3 +- .../source_main_controller_card_item.xml | 4 +- .../res/layout/source_recycler_autofit.xml | 2 +- .../main/res/layout/spinner_preference.xml | 4 +- app/src/main/res/layout/track_item.xml | 4 +- .../main/res/layout/track_search_dialog.xml | 2 +- app/src/main/res/layout/track_search_item.xml | 2 +- app/src/main/res/layout/webview_activity.xml | 2 - app/src/main/res/menu/browse_extensions.xml | 4 +- app/src/main/res/menu/browse_migrate.xml | 2 +- app/src/main/res/menu/browse_sources.xml | 4 +- app/src/main/res/menu/category_selection.xml | 4 +- app/src/main/res/menu/chapter_selection.xml | 14 +- app/src/main/res/menu/extension_details.xml | 2 +- app/src/main/res/menu/generic_selection.xml | 4 +- app/src/main/res/menu/global_search.xml | 2 +- app/src/main/res/menu/history.xml | 4 +- app/src/main/res/menu/library.xml | 6 +- app/src/main/res/menu/library_selection.xml | 10 +- app/src/main/res/menu/manga.xml | 4 +- app/src/main/res/menu/migration.xml | 2 +- app/src/main/res/menu/reader.xml | 4 +- app/src/main/res/menu/settings_main.xml | 2 +- app/src/main/res/menu/settings_tracking.xml | 2 +- app/src/main/res/menu/source_browse.xml | 8 +- app/src/main/res/menu/updates.xml | 2 +- .../res/menu/updates_chapter_selection.xml | 8 +- app/src/main/res/menu/webview.xml | 4 +- app/src/main/res/values-night/colors.xml | 4 + app/src/main/res/values-night/themes.xml | 15 - app/src/main/res/values-v26/colors.xml | 2 +- app/src/main/res/values-v27/themes.xml | 2 +- app/src/main/res/values/attrs.xml | 15 +- app/src/main/res/values/colors.xml | 112 ++-- app/src/main/res/values/dimens.xml | 3 + app/src/main/res/values/styles.xml | 240 +++------ app/src/main/res/values/themes.xml | 503 +++++++----------- 108 files changed, 556 insertions(+), 882 deletions(-) delete mode 100644 app/src/main/res/color/background_color_chip_state.xml create mode 100644 app/src/main/res/color/draggable_card_foreground.xml create mode 100644 app/src/main/res/color/library_item_background.xml create mode 100644 app/src/main/res/color/library_item_foreground.xml rename app/src/main/res/color/{selector_overlay.xml => ripple_colored.xml} (57%) create mode 100644 app/src/main/res/color/ripple_toolbar_fainter.xml create mode 100644 app/src/main/res/color/source_comfortable_item_title.xml delete mode 100644 app/src/main/res/color/tabs_selector_background.xml delete mode 100644 app/src/main/res/color/text_input_stroke.xml delete mode 100644 app/src/main/res/drawable/ripple_background.xml delete mode 100644 app/src/main/res/drawable/ripple_regular.xml delete mode 100644 app/src/main/res/drawable/selectable_item_background.xml create mode 100644 app/src/main/res/values-night/colors.xml delete mode 100644 app/src/main/res/values-night/themes.xml diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 370e36e322..93c221cddd 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -32,7 +32,7 @@ android:largeHeap="true" android:requestLegacyExternalStorage="true" android:roundIcon="@mipmap/ic_launcher_round" - android:theme="@style/Theme.Base" + android:theme="@style/Theme.Base.Light" android:networkSecurityConfig="@xml/network_security_config"> + android:theme="@style/Theme.Base.Light" /> diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsController.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsController.kt index cc8740b4a2..1eb7245278 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsController.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsController.kt @@ -101,12 +101,13 @@ abstract class SettingsController : PreferenceController() { private fun animatePreferenceHighlight(view: View) { val origBackground = view.background ValueAnimator - .ofObject(ArgbEvaluator(), Color.TRANSPARENT, view.context.getResourceColor(R.attr.rippleColor)) + .ofObject(ArgbEvaluator(), Color.TRANSPARENT, view.context.getResourceColor(R.attr.colorControlHighlight)) .apply { - duration = 500L - repeatCount = 2 + duration = 200L + repeatCount = 5 + repeatMode = ValueAnimator.REVERSE addUpdateListener { animator -> view.setBackgroundColor(animator.animatedValue as Int) } - reverse() + start() } .doOnEnd { // Restore original ripple diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/webview/WebViewActivity.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/webview/WebViewActivity.kt index b1a7e79bf5..83f46f8d6a 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/webview/WebViewActivity.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/webview/WebViewActivity.kt @@ -157,7 +157,7 @@ class WebViewActivity : BaseViewBindingActivity() { backItem?.isEnabled = binding.webview.canGoBack() forwardItem?.isEnabled = binding.webview.canGoForward() - val iconTintColor = getResourceColor(R.attr.colorOnPrimary) + val iconTintColor = getResourceColor(R.attr.colorOnToolbar) val translucentIconTintColor = ColorUtils.setAlphaComponent(iconTintColor, 127) backItem?.icon?.setTint(if (binding.webview.canGoBack()) iconTintColor else translucentIconTintColor) forwardItem?.icon?.setTint(if (binding.webview.canGoForward()) iconTintColor else translucentIconTintColor) diff --git a/app/src/main/java/eu/kanade/tachiyomi/util/system/ContextExtensions.kt b/app/src/main/java/eu/kanade/tachiyomi/util/system/ContextExtensions.kt index 5e87c2c612..0ff872bf1d 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/util/system/ContextExtensions.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/util/system/ContextExtensions.kt @@ -93,7 +93,7 @@ fun Context.copyToClipboard(label: String, content: String) { */ fun Context.notificationBuilder(channelId: String, block: (NotificationCompat.Builder.() -> Unit)? = null): NotificationCompat.Builder { val builder = NotificationCompat.Builder(this, channelId) - .setColor(ContextCompat.getColor(this, R.color.colorPrimary)) + .setColor(ContextCompat.getColor(this, R.color.accent_lightblue)) if (block != null) { builder.block() } diff --git a/app/src/main/java/eu/kanade/tachiyomi/widget/EmptyView.kt b/app/src/main/java/eu/kanade/tachiyomi/widget/EmptyView.kt index 78c39c4a63..fb0ff44fdd 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/widget/EmptyView.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/widget/EmptyView.kt @@ -2,7 +2,6 @@ package eu.kanade.tachiyomi.widget import android.content.Context import android.content.res.ColorStateList -import android.graphics.Color import android.util.AttributeSet import android.view.LayoutInflater import android.widget.LinearLayout @@ -12,6 +11,7 @@ import androidx.annotation.StringRes import androidx.appcompat.view.ContextThemeWrapper import androidx.core.view.isVisible import com.google.android.material.button.MaterialButton +import com.mikepenz.aboutlibraries.util.getThemeColor import eu.kanade.tachiyomi.R import eu.kanade.tachiyomi.databinding.CommonViewEmptyBinding import kotlin.random.Random @@ -42,17 +42,22 @@ class EmptyView @JvmOverloads constructor(context: Context, attrs: AttributeSet? binding.textLabel.text = message binding.actionsContainer.removeAllViews() + val buttonContext = ContextThemeWrapper(context, R.style.Widget_Tachiyomi_Button_ActionButton) + val buttonColor = ColorStateList.valueOf(context.getThemeColor(R.attr.colorOnBackground)) actions?.forEach { - val button = MaterialButton(ContextThemeWrapper(context, R.style.Theme_Widget_Button_Action)).apply { + val button = MaterialButton( + buttonContext, + null, + R.attr.borderlessButtonStyle + ).apply { layoutParams = LinearLayout.LayoutParams( 0, LinearLayout.LayoutParams.WRAP_CONTENT, 1f / actions.size ) - backgroundTintList = ColorStateList.valueOf(Color.TRANSPARENT) - stateListAnimator = null - elevation = 0f + setTextColor(buttonColor) + iconTint = buttonColor setIconResource(it.iconResId) setText(it.stringResId) diff --git a/app/src/main/java/eu/kanade/tachiyomi/widget/ThemedSwipeRefreshLayout.kt b/app/src/main/java/eu/kanade/tachiyomi/widget/ThemedSwipeRefreshLayout.kt index b3fb931ba1..81e1fcef81 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/widget/ThemedSwipeRefreshLayout.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/widget/ThemedSwipeRefreshLayout.kt @@ -2,22 +2,18 @@ package eu.kanade.tachiyomi.widget import android.content.Context import android.util.AttributeSet -import androidx.core.content.ContextCompat import androidx.swiperefreshlayout.widget.SwipeRefreshLayout +import com.mikepenz.aboutlibraries.util.getThemeColor import eu.kanade.tachiyomi.R -class ThemedSwipeRefreshLayout @JvmOverloads constructor(context: Context, attrs: AttributeSet? = null) : - SwipeRefreshLayout(context, attrs) { - +class ThemedSwipeRefreshLayout @JvmOverloads constructor( + context: Context, + attrs: AttributeSet? = null +) : SwipeRefreshLayout(context, attrs) { init { - setColors() - } - - private fun setColors() { - // Background is controlled with "swipeRefreshLayoutProgressSpinnerBackgroundColor" in XML - + // Background + setProgressBackgroundColorSchemeColor(context.getThemeColor(R.attr.colorPrimary)) // This updates the progress arrow color - val white = ContextCompat.getColor(context, R.color.md_white_1000) - setColorSchemeColors(white, white, white) + setColorSchemeColors(context.getThemeColor(R.attr.colorOnPrimary)) } } diff --git a/app/src/main/res/color/background_color_chip_state.xml b/app/src/main/res/color/background_color_chip_state.xml deleted file mode 100644 index 04f3cfb2d0..0000000000 --- a/app/src/main/res/color/background_color_chip_state.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/color/button_action_selector.xml b/app/src/main/res/color/button_action_selector.xml index d844195f11..f8e88896b6 100644 --- a/app/src/main/res/color/button_action_selector.xml +++ b/app/src/main/res/color/button_action_selector.xml @@ -1,5 +1,5 @@ - - + + diff --git a/app/src/main/res/color/draggable_card_foreground.xml b/app/src/main/res/color/draggable_card_foreground.xml new file mode 100644 index 0000000000..32750a3a43 --- /dev/null +++ b/app/src/main/res/color/draggable_card_foreground.xml @@ -0,0 +1,6 @@ + + + + + diff --git a/app/src/main/res/color/library_item_background.xml b/app/src/main/res/color/library_item_background.xml new file mode 100644 index 0000000000..c967f28e90 --- /dev/null +++ b/app/src/main/res/color/library_item_background.xml @@ -0,0 +1,5 @@ + + + + + diff --git a/app/src/main/res/color/library_item_foreground.xml b/app/src/main/res/color/library_item_foreground.xml new file mode 100644 index 0000000000..0a0a946f1b --- /dev/null +++ b/app/src/main/res/color/library_item_foreground.xml @@ -0,0 +1,5 @@ + + + + + diff --git a/app/src/main/res/color/nav_selector.xml b/app/src/main/res/color/nav_selector.xml index 8297b43b4b..264e2becf8 100644 --- a/app/src/main/res/color/nav_selector.xml +++ b/app/src/main/res/color/nav_selector.xml @@ -3,6 +3,6 @@ Based on mtrl_bottom_nav_colored_item_tint --> - - + + diff --git a/app/src/main/res/color/selector_overlay.xml b/app/src/main/res/color/ripple_colored.xml similarity index 57% rename from app/src/main/res/color/selector_overlay.xml rename to app/src/main/res/color/ripple_colored.xml index 69bad1405d..71e20d7242 100644 --- a/app/src/main/res/color/selector_overlay.xml +++ b/app/src/main/res/color/ripple_colored.xml @@ -1,4 +1,4 @@ - - \ No newline at end of file + + diff --git a/app/src/main/res/color/ripple_toolbar_fainter.xml b/app/src/main/res/color/ripple_toolbar_fainter.xml new file mode 100644 index 0000000000..67e2f7f24b --- /dev/null +++ b/app/src/main/res/color/ripple_toolbar_fainter.xml @@ -0,0 +1,5 @@ + + + + + diff --git a/app/src/main/res/color/source_comfortable_item_title.xml b/app/src/main/res/color/source_comfortable_item_title.xml new file mode 100644 index 0000000000..c643506823 --- /dev/null +++ b/app/src/main/res/color/source_comfortable_item_title.xml @@ -0,0 +1,6 @@ + + + + + + diff --git a/app/src/main/res/color/tabs_selector.xml b/app/src/main/res/color/tabs_selector.xml index 4a70bc2f49..7b417175d3 100644 --- a/app/src/main/res/color/tabs_selector.xml +++ b/app/src/main/res/color/tabs_selector.xml @@ -6,6 +6,6 @@ it (i.e. blue themes). --> - - + + diff --git a/app/src/main/res/color/tabs_selector_background.xml b/app/src/main/res/color/tabs_selector_background.xml deleted file mode 100644 index 2824c4f0d8..0000000000 --- a/app/src/main/res/color/tabs_selector_background.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - diff --git a/app/src/main/res/color/text_input_stroke.xml b/app/src/main/res/color/text_input_stroke.xml deleted file mode 100644 index 016705af1d..0000000000 --- a/app/src/main/res/color/text_input_stroke.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - diff --git a/app/src/main/res/drawable-v26/sc_collections_bookmark_48dp.xml b/app/src/main/res/drawable-v26/sc_collections_bookmark_48dp.xml index f2fb02a3e5..5233c9fe83 100644 --- a/app/src/main/res/drawable-v26/sc_collections_bookmark_48dp.xml +++ b/app/src/main/res/drawable-v26/sc_collections_bookmark_48dp.xml @@ -1,6 +1,6 @@ - + diff --git a/app/src/main/res/drawable-v26/sc_explore_48dp.xml b/app/src/main/res/drawable-v26/sc_explore_48dp.xml index 9a574c0644..61f1e9e39a 100644 --- a/app/src/main/res/drawable-v26/sc_explore_48dp.xml +++ b/app/src/main/res/drawable-v26/sc_explore_48dp.xml @@ -1,6 +1,6 @@ - + diff --git a/app/src/main/res/drawable-v26/sc_history_48dp.xml b/app/src/main/res/drawable-v26/sc_history_48dp.xml index 4ce51f848c..3b9cbc93fd 100644 --- a/app/src/main/res/drawable-v26/sc_history_48dp.xml +++ b/app/src/main/res/drawable-v26/sc_history_48dp.xml @@ -1,6 +1,6 @@ - + diff --git a/app/src/main/res/drawable-v26/sc_new_releases_48dp.xml b/app/src/main/res/drawable-v26/sc_new_releases_48dp.xml index 9b8fd1cb61..401d906e50 100644 --- a/app/src/main/res/drawable-v26/sc_new_releases_48dp.xml +++ b/app/src/main/res/drawable-v26/sc_new_releases_48dp.xml @@ -1,6 +1,6 @@ - + diff --git a/app/src/main/res/drawable/library_item_selector.xml b/app/src/main/res/drawable/library_item_selector.xml index 11714e2ee5..074ea244b0 100644 --- a/app/src/main/res/drawable/library_item_selector.xml +++ b/app/src/main/res/drawable/library_item_selector.xml @@ -1,42 +1,16 @@ + android:color="?attr/colorPrimary"> + + + + + + - - - - - - - - - - - - - - - - - - - - - - + + + + diff --git a/app/src/main/res/drawable/library_item_selector_overlay.xml b/app/src/main/res/drawable/library_item_selector_overlay.xml index ac49770e08..4c19540e32 100644 --- a/app/src/main/res/drawable/library_item_selector_overlay.xml +++ b/app/src/main/res/drawable/library_item_selector_overlay.xml @@ -1,21 +1,10 @@ + android:color="?attr/colorPrimary"> - - - - - - - - - - - - - - - + + + + - \ No newline at end of file + diff --git a/app/src/main/res/drawable/list_item_selector.xml b/app/src/main/res/drawable/list_item_selector.xml index 1e25926654..4bdb726006 100644 --- a/app/src/main/res/drawable/list_item_selector.xml +++ b/app/src/main/res/drawable/list_item_selector.xml @@ -1,14 +1,14 @@ + android:color="?attr/colorControlHighlight"> - + - + diff --git a/app/src/main/res/drawable/list_item_selector_background.xml b/app/src/main/res/drawable/list_item_selector_background.xml index e1b1ed5db3..26682873a9 100644 --- a/app/src/main/res/drawable/list_item_selector_background.xml +++ b/app/src/main/res/drawable/list_item_selector_background.xml @@ -1,14 +1,14 @@ + android:color="?attr/colorControlHighlight"> - + - + diff --git a/app/src/main/res/drawable/reader_seekbar_background.xml b/app/src/main/res/drawable/reader_seekbar_background.xml index f3e97c5406..ecb8171f0e 100644 --- a/app/src/main/res/drawable/reader_seekbar_background.xml +++ b/app/src/main/res/drawable/reader_seekbar_background.xml @@ -2,5 +2,5 @@ - + diff --git a/app/src/main/res/drawable/reader_seekbar_ripple.xml b/app/src/main/res/drawable/reader_seekbar_ripple.xml index 0c8c0e16be..982f2361e0 100644 --- a/app/src/main/res/drawable/reader_seekbar_ripple.xml +++ b/app/src/main/res/drawable/reader_seekbar_ripple.xml @@ -1,6 +1,6 @@ + android:color="?attr/colorControlHighlight"> diff --git a/app/src/main/res/drawable/ripple_background.xml b/app/src/main/res/drawable/ripple_background.xml deleted file mode 100644 index 7c51636027..0000000000 --- a/app/src/main/res/drawable/ripple_background.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - diff --git a/app/src/main/res/drawable/ripple_regular.xml b/app/src/main/res/drawable/ripple_regular.xml deleted file mode 100644 index d697f52330..0000000000 --- a/app/src/main/res/drawable/ripple_regular.xml +++ /dev/null @@ -1,3 +0,0 @@ - - diff --git a/app/src/main/res/drawable/sc_collections_bookmark_48dp.xml b/app/src/main/res/drawable/sc_collections_bookmark_48dp.xml index ad99bbb47e..e14bcd139a 100644 --- a/app/src/main/res/drawable/sc_collections_bookmark_48dp.xml +++ b/app/src/main/res/drawable/sc_collections_bookmark_48dp.xml @@ -6,17 +6,17 @@ android:viewportHeight="48"> diff --git a/app/src/main/res/drawable/sc_explore_48dp.xml b/app/src/main/res/drawable/sc_explore_48dp.xml index 1d054fb765..10847d5b72 100644 --- a/app/src/main/res/drawable/sc_explore_48dp.xml +++ b/app/src/main/res/drawable/sc_explore_48dp.xml @@ -6,14 +6,14 @@ android:viewportHeight="48"> diff --git a/app/src/main/res/drawable/sc_history_48dp.xml b/app/src/main/res/drawable/sc_history_48dp.xml index ebf179e4d8..2630973ba3 100644 --- a/app/src/main/res/drawable/sc_history_48dp.xml +++ b/app/src/main/res/drawable/sc_history_48dp.xml @@ -6,14 +6,14 @@ android:viewportHeight="48"> diff --git a/app/src/main/res/drawable/sc_new_releases_48dp.xml b/app/src/main/res/drawable/sc_new_releases_48dp.xml index ac295ee81d..84ee728097 100644 --- a/app/src/main/res/drawable/sc_new_releases_48dp.xml +++ b/app/src/main/res/drawable/sc_new_releases_48dp.xml @@ -6,14 +6,14 @@ android:viewportHeight="48"> diff --git a/app/src/main/res/drawable/selectable_item_background.xml b/app/src/main/res/drawable/selectable_item_background.xml deleted file mode 100644 index dbaebc3253..0000000000 --- a/app/src/main/res/drawable/selectable_item_background.xml +++ /dev/null @@ -1,3 +0,0 @@ - - - \ No newline at end of file diff --git a/app/src/main/res/drawable/splash_background.xml b/app/src/main/res/drawable/splash_background.xml index c62fb2192a..761fbac44b 100644 --- a/app/src/main/res/drawable/splash_background.xml +++ b/app/src/main/res/drawable/splash_background.xml @@ -1,7 +1,7 @@ - + - + diff --git a/app/src/main/res/layout-sw720dp/main_activity.xml b/app/src/main/res/layout-sw720dp/main_activity.xml index 697d50fa24..9e357023b3 100644 --- a/app/src/main/res/layout-sw720dp/main_activity.xml +++ b/app/src/main/res/layout-sw720dp/main_activity.xml @@ -77,7 +77,7 @@ android:layout_height="0dp" app:elevation="0dp" app:itemIconTint="@color/nav_selector" - app:itemRippleColor="?attr/rippleSecondaryColor" + app:itemRippleColor="?attr/colorControlHighlight" app:itemTextColor="@color/nav_selector" app:labelVisibilityMode="labeled" app:layout_constraintBottom_toBottomOf="parent" @@ -87,7 +87,7 @@ diff --git a/app/src/main/res/layout/categories_item.xml b/app/src/main/res/layout/categories_item.xml index a729e8982b..cade6d105d 100644 --- a/app/src/main/res/layout/categories_item.xml +++ b/app/src/main/res/layout/categories_item.xml @@ -6,12 +6,12 @@ android:layout_width="match_parent" android:layout_height="wrap_content" app:cardBackgroundColor="?android:attr/colorBackground" - app:cardElevation="0dp"> + app:cardElevation="0dp" + app:cardForegroundColor="@color/draggable_card_foreground"> + android:layout_height="wrap_content"> + app:tabMode="fixed" /> diff --git a/app/src/main/res/layout/download_item.xml b/app/src/main/res/layout/download_item.xml index b353473cb0..61c222e699 100644 --- a/app/src/main/res/layout/download_item.xml +++ b/app/src/main/res/layout/download_item.xml @@ -7,12 +7,12 @@ android:layout_height="wrap_content" android:layout_marginTop="8dp" app:cardBackgroundColor="?android:attr/colorBackground" - app:cardElevation="0dp"> + app:cardElevation="0dp" + app:cardForegroundColor="@color/draggable_card_foreground"> + android:layout_height="wrap_content"> @@ -98,7 +98,6 @@