diff --git a/app/src/main/java/com/hippo/ehviewer/UrlOpener.java b/app/src/main/java/com/hippo/ehviewer/UrlOpener.java index 12a2d78be..7f6492568 100644 --- a/app/src/main/java/com/hippo/ehviewer/UrlOpener.java +++ b/app/src/main/java/com/hippo/ehviewer/UrlOpener.java @@ -92,14 +92,8 @@ public final class UrlOpener { } } - boolean isNight = (context.getResources().getConfiguration().uiMode & Configuration.UI_MODE_NIGHT_YES) > 0; CustomTabsIntent.Builder customTabsIntent = new CustomTabsIntent.Builder(); customTabsIntent.setShowTitle(true); - CustomTabColorSchemeParams params = new CustomTabColorSchemeParams.Builder() - .setToolbarColor(ResourcesKt.resolveColor(context.getTheme(), R.attr.toolbarColor)) - .build(); - customTabsIntent.setDefaultColorSchemeParams(params); - customTabsIntent.setColorScheme(isNight ? CustomTabsIntent.COLOR_SCHEME_DARK : CustomTabsIntent.COLOR_SCHEME_LIGHT); try { customTabsIntent.build().launchUrl(context, uri); } catch (ActivityNotFoundException e) { diff --git a/app/src/main/java/com/hippo/ehviewer/ui/scene/DownloadsScene.java b/app/src/main/java/com/hippo/ehviewer/ui/scene/DownloadsScene.java index 6d63cf3b2..f3742847a 100644 --- a/app/src/main/java/com/hippo/ehviewer/ui/scene/DownloadsScene.java +++ b/app/src/main/java/com/hippo/ehviewer/ui/scene/DownloadsScene.java @@ -383,7 +383,7 @@ public class DownloadsScene extends ToolbarScene mFastScroller.attachToRecyclerView(mRecyclerView); HandlerDrawable handlerDrawable = new HandlerDrawable(); - handlerDrawable.setColor(ResourcesKt.resolveColor(getTheme(), R.attr.widgetColorThemeAccent)); + handlerDrawable.setColor(com.google.android.material.R.color.material_dynamic_neutral100); mFastScroller.setHandlerDrawable(handlerDrawable); mFastScroller.setOnDragHandlerListener(this); diff --git a/app/src/main/java/com/hippo/ehviewer/ui/scene/HistoryScene.java b/app/src/main/java/com/hippo/ehviewer/ui/scene/HistoryScene.java index 2f0cf5798..fdcad1ca8 100644 --- a/app/src/main/java/com/hippo/ehviewer/ui/scene/HistoryScene.java +++ b/app/src/main/java/com/hippo/ehviewer/ui/scene/HistoryScene.java @@ -238,7 +238,7 @@ public class HistoryScene extends ToolbarScene { mFastScroller.attachToRecyclerView(mRecyclerView); HandlerDrawable handlerDrawable = new HandlerDrawable(); - handlerDrawable.setColor(ResourcesKt.resolveColor(getTheme(), R.attr.widgetColorThemeAccent)); + handlerDrawable.setColor(com.google.android.material.R.color.material_dynamic_neutral100); mFastScroller.setHandlerDrawable(handlerDrawable); updateLazyList(); diff --git a/app/src/main/java/com/hippo/widget/ContentLayout.java b/app/src/main/java/com/hippo/widget/ContentLayout.java index 6ed503622..314573550 100644 --- a/app/src/main/java/com/hippo/widget/ContentLayout.java +++ b/app/src/main/java/com/hippo/widget/ContentLayout.java @@ -106,7 +106,7 @@ public class ContentLayout extends FrameLayout { mFastScroller.attachToRecyclerView(mRecyclerView); HandlerDrawable drawable = new HandlerDrawable(); - drawable.setColor(ResourcesKt.resolveColor(context.getTheme(), R.attr.widgetColorThemeAccent)); + drawable.setColor(com.google.android.material.R.color.material_dynamic_neutral100); mFastScroller.setHandlerDrawable(drawable); mRefreshLayout.setColorSchemeResources( diff --git a/app/src/main/java/com/hippo/widget/Slider.java b/app/src/main/java/com/hippo/widget/Slider.java index 289a9217f..436027751 100644 --- a/app/src/main/java/com/hippo/widget/Slider.java +++ b/app/src/main/java/com/hippo/widget/Slider.java @@ -45,6 +45,8 @@ import com.hippo.yorozuya.LayoutUtils; import com.hippo.yorozuya.MathUtils; import com.hippo.yorozuya.SimpleHandler; +import rikka.core.res.ResourcesKt; + public class Slider extends View { private static final char[] CHARACTERS = { @@ -134,10 +136,8 @@ public class Slider extends View { setProgress(a.getInteger(R.styleable.Slider_slider_progress, 0)); mThickness = a.getDimension(R.styleable.Slider_thickness, 2); mRadius = a.getDimension(R.styleable.Slider_radius, 6); - setColor(a.getColor(R.styleable.Slider_color, Color.BLACK)); mBgPaint = new Paint(Paint.ANTI_ALIAS_FLAG); - mBgPaint.setColor(a.getBoolean(R.styleable.Slider_dark, false) ? 0x4dffffff : 0x42000000); a.recycle(); diff --git a/app/src/main/res/drawable/divider_gallery_detail.xml b/app/src/main/res/drawable/divider_gallery_detail.xml deleted file mode 100644 index 1c8f84931..000000000 --- a/app/src/main/res/drawable/divider_gallery_detail.xml +++ /dev/null @@ -1,23 +0,0 @@ - - - - - - - - - diff --git a/app/src/main/res/drawable/divider_gallery_detail_dark.xml b/app/src/main/res/drawable/divider_gallery_detail_dark.xml deleted file mode 100644 index 27be67885..000000000 --- a/app/src/main/res/drawable/divider_gallery_detail_dark.xml +++ /dev/null @@ -1,23 +0,0 @@ - - - - - - - - - diff --git a/app/src/main/res/layout/activity_gallery.xml b/app/src/main/res/layout/activity_gallery.xml index 8a8f7297c..e111e16fa 100644 --- a/app/src/main/res/layout/activity_gallery.xml +++ b/app/src/main/res/layout/activity_gallery.xml @@ -66,7 +66,6 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_gravity="bottom" - android:background="?attr/gallerySliderBackgroundColor" android:orientation="horizontal" android:paddingLeft="16dp" android:paddingRight="16dp" diff --git a/app/src/main/res/layout/drawer_list_rv.xml b/app/src/main/res/layout/drawer_list_rv.xml index 493390608..dc2eab1b9 100644 --- a/app/src/main/res/layout/drawer_list_rv.xml +++ b/app/src/main/res/layout/drawer_list_rv.xml @@ -32,7 +32,6 @@ android:id="@+id/toolbar" android:layout_width="match_parent" android:layout_height="?attr/actionBarSize" - android:background="?attr/toolbarColor" android:elevation="4dp" android:saveEnabled="false" /> diff --git a/app/src/main/res/layout/gallery_detail_content.xml b/app/src/main/res/layout/gallery_detail_content.xml index 27f60e15a..321aed9a3 100644 --- a/app/src/main/res/layout/gallery_detail_content.xml +++ b/app/src/main/res/layout/gallery_detail_content.xml @@ -29,10 +29,7 @@ android:id="@+id/below_header" android:layout_width="match_parent" android:layout_height="wrap_content" - android:divider="?attr/galleryDetailDivider" - android:dividerPadding="@dimen/keyline_margin" - android:orientation="vertical" - android:showDividers="middle"> + android:orientation="vertical"> diff --git a/app/src/main/res/layout/gallery_detail_header.xml b/app/src/main/res/layout/gallery_detail_header.xml index c4ca269ab..c73a3950c 100644 --- a/app/src/main/res/layout/gallery_detail_header.xml +++ b/app/src/main/res/layout/gallery_detail_header.xml @@ -139,10 +139,8 @@ android:layout_width="0dp" android:layout_height="wrap_content" android:layout_weight="1" - android:background="?selectableItemBackgroundBorderless" android:clickable="true" - android:focusable="true" - android:textColor="?attr/textColorThemePrimary" /> + android:focusable="true" /> + android:text="@string/read" /> diff --git a/app/src/main/res/layout/scene_gallery_comments.xml b/app/src/main/res/layout/scene_gallery_comments.xml index 679fa0d62..495479faf 100644 --- a/app/src/main/res/layout/scene_gallery_comments.xml +++ b/app/src/main/res/layout/scene_gallery_comments.xml @@ -47,15 +47,13 @@ \ No newline at end of file diff --git a/app/src/main/res/values-night/styles.xml b/app/src/main/res/values-night/styles.xml deleted file mode 100644 index 3e8295b33..000000000 --- a/app/src/main/res/values-night/styles.xml +++ /dev/null @@ -1,19 +0,0 @@ - - - - - diff --git a/app/src/main/res/values/themes_override.xml b/app/src/main/res/values/themes_override.xml deleted file mode 100644 index a6b67693b..000000000 --- a/app/src/main/res/values/themes_override.xml +++ /dev/null @@ -1,32 +0,0 @@ - - - - - - - - - - - - \ No newline at end of file