diff --git a/app/src/main/java/com/hippo/ehviewer/ui/scene/AnalyticsScene.java b/app/src/main/java/com/hippo/ehviewer/ui/scene/AnalyticsScene.java
index b74aa7881..bf7c3559d 100644
--- a/app/src/main/java/com/hippo/ehviewer/ui/scene/AnalyticsScene.java
+++ b/app/src/main/java/com/hippo/ehviewer/ui/scene/AnalyticsScene.java
@@ -50,7 +50,7 @@ public class AnalyticsScene extends BaseScene implements View.OnClickListener {
@Nullable
@Override
- public View onCreateView(LayoutInflater inflater, @Nullable ViewGroup container,
+ public View onCreateView2(LayoutInflater inflater, @Nullable ViewGroup container,
@Nullable Bundle savedInstanceState) {
View view = inflater.inflate(R.layout.scene_analytics, container, false);
diff --git a/app/src/main/java/com/hippo/ehviewer/ui/scene/BaseScene.java b/app/src/main/java/com/hippo/ehviewer/ui/scene/BaseScene.java
index 6cf9c03c4..6de6438cc 100644
--- a/app/src/main/java/com/hippo/ehviewer/ui/scene/BaseScene.java
+++ b/app/src/main/java/com/hippo/ehviewer/ui/scene/BaseScene.java
@@ -22,8 +22,10 @@ import android.os.Bundle;
import android.support.annotation.IdRes;
import android.support.annotation.Nullable;
import android.support.annotation.StringRes;
+import android.support.annotation.StyleRes;
import android.support.v4.app.FragmentActivity;
import android.support.v4.widget.DrawerLayout;
+import android.view.ContextThemeWrapper;
import android.view.Gravity;
import android.view.LayoutInflater;
import android.view.View;
@@ -38,7 +40,7 @@ public abstract class BaseScene extends SceneFragment {
public static final int LENGTH_SHORT = 0;
public static final int LENGTH_LONG = 1;
- private boolean mViewCreated;
+ private Context mThemeContext;
public void updateAvatar() {
FragmentActivity activity = getActivity();
@@ -124,10 +126,22 @@ public abstract class BaseScene extends SceneFragment {
public void onDestroyDrawerView() {
}
+ @Nullable
+ @Override
+ public final View onCreateView(LayoutInflater inflater,
+ @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
+ return onCreateView2(LayoutInflater.from(getContext2()), container, savedInstanceState);
+ }
+
+ @Nullable
+ public View onCreateView2(LayoutInflater inflater,
+ @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
+ return null;
+ }
+
@Override
public void onViewCreated(View view, @Nullable Bundle savedInstanceState) {
super.onViewCreated(view, savedInstanceState);
- mViewCreated = true;
// Update left drawer locked state
if (needShowLeftDrawer()) {
@@ -143,19 +157,17 @@ public abstract class BaseScene extends SceneFragment {
ActivityHelper.hideSoftInput(getActivity());
}
- @Override
- public void onDestroyView() {
- mViewCreated = false;
- super.onDestroyView();
+ public void createThemeContext(@StyleRes int style) {
+ mThemeContext = new ContextThemeWrapper(getContext(), style);
}
- public boolean isViewCreated() {
- return mViewCreated;
+ public void destroyThemeContext() {
+ mThemeContext = null;
}
@Nullable
public Context getContext2() {
- return super.getContext();
+ return null != mThemeContext ? mThemeContext : super.getContext();
}
@Nullable
@@ -180,12 +192,7 @@ public abstract class BaseScene extends SceneFragment {
@Nullable
public LayoutInflater getLayoutInflater2() {
- FragmentActivity activity = getActivity();
- if (null != activity) {
- return activity.getLayoutInflater();
- } else {
- return null;
- }
+ return LayoutInflater.from(getContext2());
}
public void hideSoftInput() {
diff --git a/app/src/main/java/com/hippo/ehviewer/ui/scene/CookieSignInScene.java b/app/src/main/java/com/hippo/ehviewer/ui/scene/CookieSignInScene.java
index 5a286fccd..625622e49 100644
--- a/app/src/main/java/com/hippo/ehviewer/ui/scene/CookieSignInScene.java
+++ b/app/src/main/java/com/hippo/ehviewer/ui/scene/CookieSignInScene.java
@@ -65,7 +65,8 @@ public class CookieSignInScene extends BaseScene implements EditText.OnEditorAct
@Nullable
@Override
- public View onCreateView(LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
+ public View onCreateView2(LayoutInflater inflater,
+ @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
View view = inflater.inflate(R.layout.scene_cookie_sign_in, container, false);
mIpbMemberIdLayout = (TextInputLayout) ViewUtils.$$(view, R.id.ipb_member_id_layout);
mIpbMemberId = mIpbMemberIdLayout.getEditText();
diff --git a/app/src/main/java/com/hippo/ehviewer/ui/scene/CrashScene.java b/app/src/main/java/com/hippo/ehviewer/ui/scene/CrashScene.java
index 28d57cda2..1f36983ea 100644
--- a/app/src/main/java/com/hippo/ehviewer/ui/scene/CrashScene.java
+++ b/app/src/main/java/com/hippo/ehviewer/ui/scene/CrashScene.java
@@ -60,7 +60,7 @@ public class CrashScene extends BaseScene implements View.OnClickListener {
@Nullable
@Override
- public View onCreateView(LayoutInflater inflater,
+ public View onCreateView2(LayoutInflater inflater,
@Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
View view = inflater.inflate(R.layout.scene_crash, container, false);
diff --git a/app/src/main/java/com/hippo/ehviewer/ui/scene/DownloadLabelsScene.java b/app/src/main/java/com/hippo/ehviewer/ui/scene/DownloadLabelsScene.java
index 49b2a5e73..ef4d2e7e9 100644
--- a/app/src/main/java/com/hippo/ehviewer/ui/scene/DownloadLabelsScene.java
+++ b/app/src/main/java/com/hippo/ehviewer/ui/scene/DownloadLabelsScene.java
@@ -91,7 +91,7 @@ public class DownloadLabelsScene extends ToolbarScene {
@SuppressWarnings("deprecation")
@Nullable
@Override
- public View onCreateView2(LayoutInflater inflater,
+ public View onCreateView3(LayoutInflater inflater,
@Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
View view = inflater.inflate(R.layout.scene_label_list, container, false);
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 fe7ca6d53..d3aa5e123 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
@@ -265,7 +265,7 @@ public class DownloadsScene extends ToolbarScene
@Nullable
@Override
- public View onCreateView2(LayoutInflater inflater,
+ public View onCreateView3(LayoutInflater inflater,
@Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
View view = inflater.inflate(R.layout.scene_download, container, false);
diff --git a/app/src/main/java/com/hippo/ehviewer/ui/scene/FavoritesScene.java b/app/src/main/java/com/hippo/ehviewer/ui/scene/FavoritesScene.java
index 4a2d0d321..db4d18814 100644
--- a/app/src/main/java/com/hippo/ehviewer/ui/scene/FavoritesScene.java
+++ b/app/src/main/java/com/hippo/ehviewer/ui/scene/FavoritesScene.java
@@ -240,7 +240,7 @@ public class FavoritesScene extends BaseScene implements
@Nullable
@Override
- public View onCreateView(LayoutInflater inflater,
+ public View onCreateView2(LayoutInflater inflater,
@Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
View view = inflater.inflate(R.layout.scene_favorites, container, false);
ContentLayout contentLayout = (ContentLayout) view.findViewById(R.id.content_layout);
diff --git a/app/src/main/java/com/hippo/ehviewer/ui/scene/GalleryCommentsScene.java b/app/src/main/java/com/hippo/ehviewer/ui/scene/GalleryCommentsScene.java
index aded3a277..1cf285dc2 100644
--- a/app/src/main/java/com/hippo/ehviewer/ui/scene/GalleryCommentsScene.java
+++ b/app/src/main/java/com/hippo/ehviewer/ui/scene/GalleryCommentsScene.java
@@ -136,7 +136,7 @@ public final class GalleryCommentsScene extends ToolbarScene
@Nullable
@Override
- public View onCreateView2(LayoutInflater inflater,
+ public View onCreateView3(LayoutInflater inflater,
@Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
View view = inflater.inflate(R.layout.scene_gallery_comments, container, false);
mRecyclerView = (EasyRecyclerView) view.findViewById(R.id.recycler_view);
diff --git a/app/src/main/java/com/hippo/ehviewer/ui/scene/GalleryDetailScene.java b/app/src/main/java/com/hippo/ehviewer/ui/scene/GalleryDetailScene.java
index 8c150f2de..1baade568 100644
--- a/app/src/main/java/com/hippo/ehviewer/ui/scene/GalleryDetailScene.java
+++ b/app/src/main/java/com/hippo/ehviewer/ui/scene/GalleryDetailScene.java
@@ -383,7 +383,7 @@ public class GalleryDetailScene extends BaseScene implements View.OnClickListene
@Nullable
@Override
- public View onCreateView(LayoutInflater inflater, @Nullable ViewGroup container,
+ public View onCreateView2(LayoutInflater inflater, @Nullable ViewGroup container,
@Nullable Bundle savedInstanceState) {
// Get download state
long gid = getGid();
@@ -1291,9 +1291,6 @@ public class GalleryDetailScene extends BaseScene implements View.OnClickListene
break;
}
mGalleryDetail.comments = comments;
- if (!isViewCreated()) {
- break;
- }
bindComments(comments);
break;
default:
@@ -1411,11 +1408,9 @@ public class GalleryDetailScene extends BaseScene implements View.OnClickListene
private void onGetGalleryDetailSuccess(GalleryDetail result) {
mGalleryDetail = result;
- if (isViewCreated()) {
- updateDownloadState();
- adjustViewVisibility(STATE_NORMAL, true);
- bindViewSecond();
- }
+ updateDownloadState();
+ adjustViewVisibility(STATE_NORMAL, true);
+ bindViewSecond();
}
private void onGetGalleryDetailFailure(Exception e) {
diff --git a/app/src/main/java/com/hippo/ehviewer/ui/scene/GalleryInfoScene.java b/app/src/main/java/com/hippo/ehviewer/ui/scene/GalleryInfoScene.java
index 0bc0d0779..056b24595 100644
--- a/app/src/main/java/com/hippo/ehviewer/ui/scene/GalleryInfoScene.java
+++ b/app/src/main/java/com/hippo/ehviewer/ui/scene/GalleryInfoScene.java
@@ -150,7 +150,7 @@ public final class GalleryInfoScene extends ToolbarScene implements EasyRecycler
@SuppressWarnings("deprecation")
@Nullable
@Override
- public View onCreateView2(LayoutInflater inflater,
+ public View onCreateView3(LayoutInflater inflater,
@Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
View view = inflater.inflate(R.layout.scene_gallery_info, container, false);
diff --git a/app/src/main/java/com/hippo/ehviewer/ui/scene/GalleryListScene.java b/app/src/main/java/com/hippo/ehviewer/ui/scene/GalleryListScene.java
index dc1a3d6b4..dfee659cb 100644
--- a/app/src/main/java/com/hippo/ehviewer/ui/scene/GalleryListScene.java
+++ b/app/src/main/java/com/hippo/ehviewer/ui/scene/GalleryListScene.java
@@ -336,7 +336,7 @@ public final class GalleryListScene extends BaseScene
@Nullable
@Override
- public View onCreateView(LayoutInflater inflater, @Nullable ViewGroup container,
+ public View onCreateView2(LayoutInflater inflater, @Nullable ViewGroup container,
@Nullable Bundle savedInstanceState) {
View view = inflater.inflate(R.layout.scene_gallery_list, container, false);
@@ -1096,7 +1096,7 @@ public final class GalleryListScene extends BaseScene
private void onGetGalleryListSuccess(GalleryListParser.Result result, int taskId) {
if (mHelper != null && mSearchBarMover != null &&
- mHelper.isCurrentTask(taskId) && isViewCreated()) {
+ mHelper.isCurrentTask(taskId)) {
mHelper.setPages(taskId, result.pages);
mHelper.onGetPageData(taskId, result.galleryInfoList);
SimpleHandler.getInstance().post(mReturnSearchBarRunnable);
@@ -1105,7 +1105,7 @@ public final class GalleryListScene extends BaseScene
private void onGetGalleryListFailure(Exception e, int taskId) {
if (mHelper != null && mSearchBarMover != null &&
- mHelper.isCurrentTask(taskId) && isViewCreated()) {
+ mHelper.isCurrentTask(taskId)) {
mHelper.onGetException(taskId, e);
}
}
@@ -1121,7 +1121,7 @@ public final class GalleryListScene extends BaseScene
private void onGetWhatsHotFailure(Exception e, int taskId) {
if (mHelper != null && mSearchBarMover != null &&
- mHelper.isCurrentTask(taskId) && isViewCreated()) {
+ mHelper.isCurrentTask(taskId)) {
mHelper.onGetException(taskId, e);
}
}
diff --git a/app/src/main/java/com/hippo/ehviewer/ui/scene/GalleryPreviewsScene.java b/app/src/main/java/com/hippo/ehviewer/ui/scene/GalleryPreviewsScene.java
index 0a92b8cb3..543ad097d 100644
--- a/app/src/main/java/com/hippo/ehviewer/ui/scene/GalleryPreviewsScene.java
+++ b/app/src/main/java/com/hippo/ehviewer/ui/scene/GalleryPreviewsScene.java
@@ -128,7 +128,7 @@ public class GalleryPreviewsScene extends ToolbarScene implements EasyRecyclerVi
@Nullable
@Override
- public View onCreateView2(LayoutInflater inflater,
+ public View onCreateView3(LayoutInflater inflater,
@Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
ContentLayout contentLayout = (ContentLayout) inflater.inflate(
R.layout.scene_gallery_previews, container, false);
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 841216c6b..96e21bf48 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
@@ -91,7 +91,7 @@ public class HistoryScene extends ToolbarScene
@Nullable
@Override
- public View onCreateView2(LayoutInflater inflater,
+ public View onCreateView3(LayoutInflater inflater,
@Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
View view = inflater.inflate(R.layout.scene_history, container, false);
View content = ViewUtils.$$(view, R.id.content);
diff --git a/app/src/main/java/com/hippo/ehviewer/ui/scene/ProgressScene.java b/app/src/main/java/com/hippo/ehviewer/ui/scene/ProgressScene.java
index f62ae7c55..d61e32315 100644
--- a/app/src/main/java/com/hippo/ehviewer/ui/scene/ProgressScene.java
+++ b/app/src/main/java/com/hippo/ehviewer/ui/scene/ProgressScene.java
@@ -162,7 +162,7 @@ public final class ProgressScene extends BaseScene implements View.OnClickListen
@Nullable
@Override
- public View onCreateView(LayoutInflater inflater,
+ public View onCreateView2(LayoutInflater inflater,
@Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
View view = inflater.inflate(R.layout.scene_progress, container, false);
View progress = ViewUtils.$$(view, R.id.progress);
diff --git a/app/src/main/java/com/hippo/ehviewer/ui/scene/QuickSearchScene.java b/app/src/main/java/com/hippo/ehviewer/ui/scene/QuickSearchScene.java
index 739fa7202..17ea6303e 100644
--- a/app/src/main/java/com/hippo/ehviewer/ui/scene/QuickSearchScene.java
+++ b/app/src/main/java/com/hippo/ehviewer/ui/scene/QuickSearchScene.java
@@ -87,7 +87,7 @@ public final class QuickSearchScene extends ToolbarScene {
@SuppressWarnings("deprecation")
@Nullable
@Override
- public View onCreateView2(LayoutInflater inflater,
+ public View onCreateView3(LayoutInflater inflater,
@Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
View view = inflater.inflate(R.layout.scene_label_list, container, false);
diff --git a/app/src/main/java/com/hippo/ehviewer/ui/scene/SecurityScene.java b/app/src/main/java/com/hippo/ehviewer/ui/scene/SecurityScene.java
index 561b374e5..061d004fe 100644
--- a/app/src/main/java/com/hippo/ehviewer/ui/scene/SecurityScene.java
+++ b/app/src/main/java/com/hippo/ehviewer/ui/scene/SecurityScene.java
@@ -110,7 +110,7 @@ public class SecurityScene extends BaseScene implements
@Nullable
@Override
- public View onCreateView(LayoutInflater inflater,
+ public View onCreateView2(LayoutInflater inflater,
@Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
View view = inflater.inflate(R.layout.scene_security, container, false);
diff --git a/app/src/main/java/com/hippo/ehviewer/ui/scene/SelectSiteScene.java b/app/src/main/java/com/hippo/ehviewer/ui/scene/SelectSiteScene.java
index 9f209e700..76fc86d05 100644
--- a/app/src/main/java/com/hippo/ehviewer/ui/scene/SelectSiteScene.java
+++ b/app/src/main/java/com/hippo/ehviewer/ui/scene/SelectSiteScene.java
@@ -42,7 +42,7 @@ public class SelectSiteScene extends BaseScene implements View.OnClickListener {
@Nullable
@Override
- public View onCreateView(LayoutInflater inflater, @Nullable ViewGroup container,
+ public View onCreateView2(LayoutInflater inflater, @Nullable ViewGroup container,
@Nullable Bundle savedInstanceState) {
View view = inflater.inflate(R.layout.scene_select_site, container, false);
diff --git a/app/src/main/java/com/hippo/ehviewer/ui/scene/SignInScene.java b/app/src/main/java/com/hippo/ehviewer/ui/scene/SignInScene.java
index 0d2be639a..0e85fb044 100644
--- a/app/src/main/java/com/hippo/ehviewer/ui/scene/SignInScene.java
+++ b/app/src/main/java/com/hippo/ehviewer/ui/scene/SignInScene.java
@@ -114,7 +114,7 @@ public final class SignInScene extends BaseScene implements EditText.OnEditorAct
@Nullable
@Override
- public View onCreateView(LayoutInflater inflater, @Nullable ViewGroup container,
+ public View onCreateView2(LayoutInflater inflater, @Nullable ViewGroup container,
@Nullable Bundle savedInstanceState) {
View view = inflater.inflate(R.layout.scene_login, container, false);
diff --git a/app/src/main/java/com/hippo/ehviewer/ui/scene/ToolbarScene.java b/app/src/main/java/com/hippo/ehviewer/ui/scene/ToolbarScene.java
index 4bc12cdee..b8f9272ce 100644
--- a/app/src/main/java/com/hippo/ehviewer/ui/scene/ToolbarScene.java
+++ b/app/src/main/java/com/hippo/ehviewer/ui/scene/ToolbarScene.java
@@ -39,20 +39,20 @@ public abstract class ToolbarScene extends BaseScene {
private CharSequence mTempTitle;
@Nullable
- public View onCreateView2(LayoutInflater inflater,
+ public View onCreateView3(LayoutInflater inflater,
@Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
return null;
}
@Nullable
@Override
- public final View onCreateView(LayoutInflater inflater,
+ public final View onCreateView2(LayoutInflater inflater,
@Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
View view = inflater.inflate(R.layout.scene_toolbar, container, false);
Toolbar toolbar = (Toolbar) view.findViewById(R.id.toolbar);
FrameLayout contentPanel = (FrameLayout) view.findViewById(R.id.content_panel);
- View contentView = onCreateView2(inflater, contentPanel, savedInstanceState);
+ View contentView = onCreateView3(inflater, contentPanel, savedInstanceState);
if (contentView == null) {
return null;
} else {
diff --git a/app/src/main/java/com/hippo/ehviewer/ui/scene/WarningScene.java b/app/src/main/java/com/hippo/ehviewer/ui/scene/WarningScene.java
index 466ca8aa9..cd1564c13 100644
--- a/app/src/main/java/com/hippo/ehviewer/ui/scene/WarningScene.java
+++ b/app/src/main/java/com/hippo/ehviewer/ui/scene/WarningScene.java
@@ -47,7 +47,7 @@ public final class WarningScene extends BaseScene implements View.OnClickListene
@Nullable
@Override
- public View onCreateView(LayoutInflater inflater, @Nullable ViewGroup container,
+ public View onCreateView2(LayoutInflater inflater, @Nullable ViewGroup container,
@Nullable Bundle savedInstanceState) {
View view = inflater.inflate(R.layout.scene_warning, container, false);
diff --git a/app/src/main/java/com/hippo/ehviewer/ui/scene/WebViewSignInScene.java b/app/src/main/java/com/hippo/ehviewer/ui/scene/WebViewSignInScene.java
index dc6d7c141..1aff91ab4 100644
--- a/app/src/main/java/com/hippo/ehviewer/ui/scene/WebViewSignInScene.java
+++ b/app/src/main/java/com/hippo/ehviewer/ui/scene/WebViewSignInScene.java
@@ -57,7 +57,7 @@ public class WebViewSignInScene extends BaseScene {
@Override
@SuppressWarnings("deprecation")
@SuppressLint("SetJavaScriptEnabled")
- public View onCreateView(LayoutInflater inflater,
+ public View onCreateView2(LayoutInflater inflater,
@Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
Context context = getContext2();
AssertUtils.assertNotNull(context);
diff --git a/app/src/main/res/layout/gallery_detail_comments.xml b/app/src/main/res/layout/gallery_detail_comments.xml
index 5f201bc5d..87dc973bd 100644
--- a/app/src/main/res/layout/gallery_detail_comments.xml
+++ b/app/src/main/res/layout/gallery_detail_comments.xml
@@ -29,6 +29,6 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal"
- android:textColor="@color/colorAccent"/>
+ android:textColor="?attr/colorAccent"/>
diff --git a/app/src/main/res/layout/gallery_detail_header.xml b/app/src/main/res/layout/gallery_detail_header.xml
index 63ff57255..63235c3b1 100644
--- a/app/src/main/res/layout/gallery_detail_header.xml
+++ b/app/src/main/res/layout/gallery_detail_header.xml
@@ -31,7 +31,7 @@
android:layout_width="match_parent"
android:layout_height="0dp"
android:layout_weight="1"
- android:background="@color/colorPrimary"/>
+ android:background="?attr/colorPrimary"/>
diff --git a/app/src/main/res/layout/gallery_detail_info.xml b/app/src/main/res/layout/gallery_detail_info.xml
index dfd77841e..1524d9d71 100644
--- a/app/src/main/res/layout/gallery_detail_info.xml
+++ b/app/src/main/res/layout/gallery_detail_info.xml
@@ -88,6 +88,6 @@
android:layout_gravity="center_horizontal"
android:layout_marginTop="16dp"
android:text="@string/more_information"
- android:textColor="@color/colorAccent"/>
+ android:textColor="?attr/colorAccent"/>
diff --git a/app/src/main/res/layout/gallery_detail_previews.xml b/app/src/main/res/layout/gallery_detail_previews.xml
index 5fa995d7e..7280ed5c0 100644
--- a/app/src/main/res/layout/gallery_detail_previews.xml
+++ b/app/src/main/res/layout/gallery_detail_previews.xml
@@ -38,6 +38,6 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal"
- android:textColor="@color/colorAccent"/>
+ android:textColor="?attr/colorAccent"/>
diff --git a/app/src/main/res/layout/gallery_detail_tags.xml b/app/src/main/res/layout/gallery_detail_tags.xml
index d0978b155..7722aee59 100644
--- a/app/src/main/res/layout/gallery_detail_tags.xml
+++ b/app/src/main/res/layout/gallery_detail_tags.xml
@@ -28,7 +28,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal"
- android:textColor="@color/colorAccent"
+ android:textColor="?attr/colorAccent"
android:text="@string/no_tags"/>
diff --git a/app/src/main/res/layout/scene_gallery_comments.xml b/app/src/main/res/layout/scene_gallery_comments.xml
index f73a07454..13f5ddc8b 100644
--- a/app/src/main/res/layout/scene_gallery_comments.xml
+++ b/app/src/main/res/layout/scene_gallery_comments.xml
@@ -55,7 +55,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal"
- android:background="@color/colorPrimary">
+ android:background="?attr/colorPrimary">