diff --git a/app/src/main/java/com/hippo/ehviewer/ui/GalleryActivity.java b/app/src/main/java/com/hippo/ehviewer/ui/GalleryActivity.java
index 87054090c..07f061bce 100644
--- a/app/src/main/java/com/hippo/ehviewer/ui/GalleryActivity.java
+++ b/app/src/main/java/com/hippo/ehviewer/ui/GalleryActivity.java
@@ -49,6 +49,7 @@ import android.widget.Spinner;
import android.widget.TextView;
import android.widget.Toast;
+import com.hippo.android.resource.AttrResources;
import com.hippo.ehviewer.AppConfig;
import com.hippo.ehviewer.BuildConfig;
import com.hippo.ehviewer.R;
@@ -301,7 +302,7 @@ public class GalleryActivity extends EhActivity implements SeekBar.OnSeekBarChan
.setScaleMode(Settings.getPageScaling())
.setStartPosition(Settings.getStartPosition())
.setStartPage(startPage)
- .setBackgroundColor(resources.getColor(R.color.gallery_background))
+ .setBackgroundColor(AttrResources.getAttrColor(this, android.R.attr.colorBackground))
.setEdgeColor(primaryColor & 0xffffff | 0x33000000)
.setPagerInterval(Settings.getShowPageInterval() ? resources.getDimensionPixelOffset(R.dimen.gallery_pager_interval) : 0)
.setScrollInterval(Settings.getShowPageInterval() ? resources.getDimensionPixelOffset(R.dimen.gallery_scroll_interval) : 0)
diff --git a/app/src/main/java/com/hippo/ehviewer/widget/GalleryGuideView.java b/app/src/main/java/com/hippo/ehviewer/widget/GalleryGuideView.java
index b65b9f8d3..8b90a5f32 100644
--- a/app/src/main/java/com/hippo/ehviewer/widget/GalleryGuideView.java
+++ b/app/src/main/java/com/hippo/ehviewer/widget/GalleryGuideView.java
@@ -18,15 +18,13 @@ package com.hippo.ehviewer.widget;
import android.content.Context;
import android.graphics.Canvas;
-import android.graphics.Color;
import android.graphics.Paint;
-import android.support.v4.content.ContextCompat;
import android.util.AttributeSet;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
import android.widget.TextView;
-
+import com.hippo.android.resource.AttrResources;
import com.hippo.ehviewer.R;
import com.hippo.ehviewer.Settings;
import com.hippo.yorozuya.ViewUtils;
@@ -60,9 +58,9 @@ public class GalleryGuideView extends ViewGroup implements View.OnClickListener
}
private void init(Context context) {
- mBgColor = ContextCompat.getColor(context, R.color.guide_bg);
+ mBgColor = AttrResources.getAttrColor(context, R.attr.guideBackgroundColor);
mPaint = new Paint();
- mPaint.setColor(Color.WHITE);
+ mPaint.setColor(AttrResources.getAttrColor(context, R.attr.guideTitleColor));
mPaint.setStyle(Paint.Style.STROKE);
mPaint.setStrokeWidth(context.getResources().getDimension(R.dimen.gallery_guide_divider_width));
setOnClickListener(this);
diff --git a/app/src/main/res/layout/activity_gallery.xml b/app/src/main/res/layout/activity_gallery.xml
index 2abe6e831..b77ede285 100644
--- a/app/src/main/res/layout/activity_gallery.xml
+++ b/app/src/main/res/layout/activity_gallery.xml
@@ -63,7 +63,7 @@
android:paddingLeft="16dp"
android:paddingRight="16dp"
android:orientation="horizontal"
- android:background="@color/gallery_slider_background"
+ android:background="?attr/gallerySliderBackgroundColor"
android:fitsSystemWindows="true"
android:visibility="invisible">
diff --git a/app/src/main/res/values/attrs.xml b/app/src/main/res/values/attrs.xml
index 99e98f866..9d502fa0e 100644
--- a/app/src/main/res/values/attrs.xml
+++ b/app/src/main/res/values/attrs.xml
@@ -20,8 +20,10 @@
+
+
@@ -34,16 +36,22 @@
+
+
+
+
+
+
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index 18cb3cc83..e738c90d2 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -119,8 +119,8 @@
#38000000
- #ff212121
- #ff353535
+ @color/grey_800
+ @color/grey_900
#1f000000
diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml
index b0f0f6328..be3012463 100644
--- a/app/src/main/res/values/themes.xml
+++ b/app/src/main/res/values/themes.xml
@@ -149,11 +149,15 @@
-
+
-
+
-
+