diff --git a/app/src/main/java/com/hippo/ehviewer/ui/DirPickerActivity.java b/app/src/main/java/com/hippo/ehviewer/ui/DirPickerActivity.java index 59dac07ad..e8a381155 100644 --- a/app/src/main/java/com/hippo/ehviewer/ui/DirPickerActivity.java +++ b/app/src/main/java/com/hippo/ehviewer/ui/DirPickerActivity.java @@ -25,12 +25,11 @@ import android.view.MenuItem; import android.view.View; import android.widget.TextView; import android.widget.Toast; - +import com.hippo.android.resource.AttrResources; import com.hippo.ehviewer.R; import com.hippo.ripple.Ripple; import com.hippo.widget.DirExplorer; import com.hippo.yorozuya.ViewUtils; - import java.io.File; public class DirPickerActivity extends ToolbarActivity @@ -70,7 +69,7 @@ public class DirPickerActivity extends ToolbarActivity mDirExplorer.setCurrentFile(file); mDirExplorer.setOnChangeDirListener(this); - Ripple.addRipple(mOk, false); + Ripple.addRipple(mOk, !AttrResources.getAttrBoolean(this, R.attr.isLightTheme)); mOk.setOnClickListener(this); diff --git a/app/src/main/java/com/hippo/ehviewer/ui/ExcludedLanguagesActivity.java b/app/src/main/java/com/hippo/ehviewer/ui/ExcludedLanguagesActivity.java index bc637baeb..7c08563cc 100644 --- a/app/src/main/java/com/hippo/ehviewer/ui/ExcludedLanguagesActivity.java +++ b/app/src/main/java/com/hippo/ehviewer/ui/ExcludedLanguagesActivity.java @@ -25,7 +25,7 @@ import android.view.MenuItem; import android.view.View; import android.view.ViewGroup; import android.widget.TextView; - +import com.hippo.android.resource.AttrResources; import com.hippo.easyrecyclerview.EasyRecyclerView; import com.hippo.ehviewer.R; import com.hippo.ehviewer.Settings; @@ -164,11 +164,12 @@ public class ExcludedLanguagesActivity extends ToolbarActivity mDeselectAll.setOnClickListener(this); mInvertSelection.setOnClickListener(this); - Ripple.addRipple(mCancel, false); - Ripple.addRipple(mOk, false); - Ripple.addRipple(mSelectAll, false); - Ripple.addRipple(mDeselectAll, false); - Ripple.addRipple(mInvertSelection, false); + boolean isDarkTheme = !AttrResources.getAttrBoolean(this, R.attr.isLightTheme); + Ripple.addRipple(mCancel, isDarkTheme); + Ripple.addRipple(mOk, isDarkTheme); + Ripple.addRipple(mSelectAll, isDarkTheme); + Ripple.addRipple(mDeselectAll, isDarkTheme); + Ripple.addRipple(mInvertSelection, isDarkTheme); } private boolean isDecimal(String str) { diff --git a/app/src/main/java/com/hippo/ehviewer/ui/HostsActivity.java b/app/src/main/java/com/hippo/ehviewer/ui/HostsActivity.java index b73ac83f4..0da88e2eb 100644 --- a/app/src/main/java/com/hippo/ehviewer/ui/HostsActivity.java +++ b/app/src/main/java/com/hippo/ehviewer/ui/HostsActivity.java @@ -86,7 +86,7 @@ public class HostsActivity extends ToolbarActivity LayoutUtils.dp2pix(this, 1)); decoration.setShowLastDivider(true); recyclerView.addItemDecoration(decoration); - recyclerView.setSelector(Ripple.generateRippleDrawable(this, false)); + recyclerView.setSelector(Ripple.generateRippleDrawable(this, !AttrResources.getAttrBoolean(this, R.attr.isLightTheme))); recyclerView.setHasFixedSize(true); recyclerView.setOnItemClickListener(this); recyclerView.setPadding( 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 ddaae1bde..84352c9ef 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 @@ -21,7 +21,7 @@ import android.support.annotation.Nullable; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; - +import com.hippo.android.resource.AttrResources; import com.hippo.ehviewer.Crash; import com.hippo.ehviewer.EhApplication; import com.hippo.ehviewer.R; @@ -70,8 +70,9 @@ public class CrashScene extends SolidScene implements View.OnClickListener { mCancel.setOnClickListener(this); mSend.setOnClickListener(this); - Ripple.addRipple(mCancel, true); - Ripple.addRipple(mSend, true); + boolean isDarkTheme = !AttrResources.getAttrBoolean(getContext2(), R.attr.isLightTheme); + Ripple.addRipple(mCancel, isDarkTheme); + Ripple.addRipple(mSend, isDarkTheme); return view; } 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 ac15e9ecf..0fd12f427 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 @@ -50,11 +50,11 @@ import android.widget.ArrayAdapter; import android.widget.ListView; import android.widget.ProgressBar; import android.widget.TextView; - import com.github.amlcurran.showcaseview.ShowcaseView; import com.github.amlcurran.showcaseview.SimpleShowcaseEventListener; import com.github.amlcurran.showcaseview.targets.PointTarget; import com.github.amlcurran.showcaseview.targets.ViewTarget; +import com.hippo.android.resource.AttrResources; import com.hippo.app.CheckBoxDialogBuilder; import com.hippo.conaco.DataContainer; import com.hippo.conaco.ProgressNotifier; @@ -94,15 +94,13 @@ import com.hippo.yorozuya.ObjectUtils; import com.hippo.yorozuya.ResourcesUtils; import com.hippo.yorozuya.ViewUtils; import com.hippo.yorozuya.collect.LongList; - -import junit.framework.Assert; - import java.io.IOException; import java.io.InputStream; import java.io.OutputStream; import java.util.ArrayList; import java.util.LinkedList; import java.util.List; +import junit.framework.Assert; public class DownloadsScene extends ToolbarScene implements DownloadManager.DownloadInfoListener, @@ -301,7 +299,7 @@ public class DownloadsScene extends ToolbarScene mLayoutManager.setColumnSize(resources.getDimensionPixelOffset(Settings.getDetailSizeResId())); mLayoutManager.setStrategy(AutoStaggeredGridLayoutManager.STRATEGY_MIN_SIZE); mRecyclerView.setLayoutManager(mLayoutManager); - mRecyclerView.setSelector(Ripple.generateRippleDrawable(context, false)); + mRecyclerView.setSelector(Ripple.generateRippleDrawable(context, !AttrResources.getAttrBoolean(context, R.attr.isLightTheme))); mRecyclerView.setDrawSelectorOnTop(true); mRecyclerView.hasFixedSize(); mRecyclerView.setClipToPadding(false); @@ -1085,8 +1083,10 @@ public class DownloadsScene extends ToolbarScene thumb.setOnClickListener(this); start.setOnClickListener(this); stop.setOnClickListener(this); - Ripple.addRipple(start, false); - Ripple.addRipple(stop, false); + + boolean isDarkTheme = !AttrResources.getAttrBoolean(getContext2(), R.attr.isLightTheme); + Ripple.addRipple(start, isDarkTheme); + Ripple.addRipple(stop, isDarkTheme); } @Override 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 cdd35fda7..56c9a9672 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 @@ -260,7 +260,7 @@ public class FavoritesScene extends BaseScene implements contentLayout.getFastScroller().setOnDragHandlerListener(this); mAdapter = new FavoritesAdapter(inflater, resources, mRecyclerView, Settings.getListMode()); - mRecyclerView.setSelector(Ripple.generateRippleDrawable(context, false)); + mRecyclerView.setSelector(Ripple.generateRippleDrawable(context, !AttrResources.getAttrBoolean(context, R.attr.isLightTheme))); mRecyclerView.setDrawSelectorOnTop(true); mRecyclerView.hasFixedSize(); mRecyclerView.setClipToPadding(false); 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 34f6f5eef..cd57309a1 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 @@ -207,7 +207,7 @@ public final class GalleryCommentsScene extends ToolbarScene LayoutUtils.dp2pix(context, 1)); decoration.setShowLastDivider(true); mRecyclerView.addItemDecoration(decoration); - mRecyclerView.setSelector(Ripple.generateRippleDrawable(context, false)); + mRecyclerView.setSelector(Ripple.generateRippleDrawable(context, !AttrResources.getAttrBoolean(context, R.attr.isLightTheme))); mRecyclerView.setHasFixedSize(true); mRecyclerView.setOnItemClickListener(this); mRecyclerView.setPadding(mRecyclerView.getPaddingLeft(), mRecyclerView.getPaddingTop(), @@ -340,7 +340,7 @@ public final class GalleryCommentsScene extends ToolbarScene LayoutUtils.dp2pix(context, 1)); decoration.setPadding(ResourcesUtils.getAttrDimensionPixelOffset(context, R.attr.dialogPreferredPadding)); rv.addItemDecoration(decoration); - rv.setSelector(Ripple.generateRippleDrawable(context, false)); + rv.setSelector(Ripple.generateRippleDrawable(context, !AttrResources.getAttrBoolean(context, R.attr.isLightTheme))); rv.setClipToPadding(false); builder.setView(rv).show(); } 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 e88add884..634480f7b 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 @@ -53,6 +53,7 @@ import android.widget.LinearLayout; import android.widget.ListView; import android.widget.RatingBar; import android.widget.TextView; +import com.hippo.android.resource.AttrResources; import com.hippo.beerbelly.BeerBelly; import com.hippo.drawable.RoundSideRectDrawable; import com.hippo.ehviewer.AppConfig; @@ -428,6 +429,7 @@ public class GalleryDetailScene extends BaseScene implements View.OnClickListene mTip.setCompoundDrawables(null, drawable, null, null); mTip.setOnClickListener(this); + boolean isDarkTheme = !AttrResources.getAttrBoolean(context, R.attr.isLightTheme); mHeader = ViewUtils.$$(mainView, R.id.header); mColorBg = ViewUtils.$$(mHeader, R.id.color_bg); mThumb = (LoadImageView) ViewUtils.$$(mHeader, R.id.thumb); @@ -438,9 +440,9 @@ public class GalleryDetailScene extends BaseScene implements View.OnClickListene mActionGroup = (ViewGroup) ViewUtils.$$(mHeader, R.id.action_card); mDownload = (TextView) ViewUtils.$$(mActionGroup, R.id.download); mRead = ViewUtils.$$(mActionGroup, R.id.read); - Ripple.addRipple(mOtherActions, false); - Ripple.addRipple(mDownload, false); - Ripple.addRipple(mRead, false); + Ripple.addRipple(mOtherActions, isDarkTheme); + Ripple.addRipple(mDownload, isDarkTheme); + Ripple.addRipple(mRead, isDarkTheme); mUploader.setOnClickListener(this); mCategory.setOnClickListener(this); mOtherActions.setOnClickListener(this); @@ -459,7 +461,7 @@ public class GalleryDetailScene extends BaseScene implements View.OnClickListene mSize = (TextView) ViewUtils.$$(mInfo, R.id.size); mPosted = (TextView) ViewUtils.$$(mInfo, R.id.posted); mFavoredTimes = (TextView) ViewUtils.$$(mInfo, R.id.favoredTimes); - Ripple.addRipple(mInfo, false); + Ripple.addRipple(mInfo, isDarkTheme); mInfo.setOnClickListener(this); mActions = ViewUtils.$$(belowHeader, R.id.actions); @@ -474,13 +476,13 @@ public class GalleryDetailScene extends BaseScene implements View.OnClickListene mRate = (TextView) ViewUtils.$$(mActions, R.id.rate); mSimilar = (TextView) ViewUtils.$$(mActions, R.id.similar); mSearchCover = (TextView) ViewUtils.$$(mActions, R.id.search_cover); - Ripple.addRipple(mHeartGroup, false); - Ripple.addRipple(mTorrent, false); - Ripple.addRipple(mArchive, false); - Ripple.addRipple(mShare, false); - Ripple.addRipple(mRate, false); - Ripple.addRipple(mSimilar, false); - Ripple.addRipple(mSearchCover, false); + Ripple.addRipple(mHeartGroup, isDarkTheme); + Ripple.addRipple(mTorrent, isDarkTheme); + Ripple.addRipple(mArchive, isDarkTheme); + Ripple.addRipple(mShare, isDarkTheme); + Ripple.addRipple(mRate, isDarkTheme); + Ripple.addRipple(mSimilar, isDarkTheme); + Ripple.addRipple(mSearchCover, isDarkTheme); mHeartGroup.setOnClickListener(this); mTorrent.setOnClickListener(this); mArchive.setOnClickListener(this); @@ -495,13 +497,13 @@ public class GalleryDetailScene extends BaseScene implements View.OnClickListene mComments = (LinearLayout) ViewUtils.$$(belowHeader, R.id.comments); mCommentsText = (TextView) ViewUtils.$$(mComments, R.id.comments_text); - Ripple.addRipple(mComments, false); + Ripple.addRipple(mComments, isDarkTheme); mComments.setOnClickListener(this); mPreviews = ViewUtils.$$(belowHeader, R.id.previews); mGridLayout = (SimpleGridAutoSpanLayout) ViewUtils.$$(mPreviews, R.id.grid_layout); mPreviewText = (TextView) ViewUtils.$$(mPreviews, R.id.preview_text); - Ripple.addRipple(mPreviews, false); + Ripple.addRipple(mPreviews, isDarkTheme); mPreviews.setOnClickListener(this); mProgress = ViewUtils.$$(mainView, R.id.progress); 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 56fce2210..16926da97 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 @@ -169,7 +169,7 @@ public final class GalleryInfoScene extends ToolbarScene implements EasyRecycler LayoutUtils.dp2pix(context, 1)); decoration.setPadding(context.getResources().getDimensionPixelOffset(R.dimen.keyline_margin)); mRecyclerView.addItemDecoration(decoration); - mRecyclerView.setSelector(Ripple.generateRippleDrawable(context, false)); + mRecyclerView.setSelector(Ripple.generateRippleDrawable(context, !AttrResources.getAttrBoolean(context, R.attr.isLightTheme))); mRecyclerView.setClipToPadding(false); mRecyclerView.setHasFixedSize(true); mRecyclerView.setOnItemClickListener(this); 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 7dd789973..050db6bf3 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 @@ -412,7 +412,7 @@ public final class GalleryListScene extends BaseScene mAdapter = new GalleryListAdapter(inflater, resources, mRecyclerView, Settings.getListMode()); - mRecyclerView.setSelector(Ripple.generateRippleDrawable(context, false)); + mRecyclerView.setSelector(Ripple.generateRippleDrawable(context, !AttrResources.getAttrBoolean(context, R.attr.isLightTheme))); mRecyclerView.setDrawSelectorOnTop(true); mRecyclerView.hasFixedSize(); mRecyclerView.setClipToPadding(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 175962c59..7af927687 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 @@ -31,7 +31,6 @@ import android.view.MenuItem; import android.view.View; import android.view.ViewGroup; import android.widget.TextView; - import com.h6ah4i.android.widget.advrecyclerview.animator.GeneralItemAnimator; import com.h6ah4i.android.widget.advrecyclerview.animator.SwipeDismissItemAnimator; import com.h6ah4i.android.widget.advrecyclerview.swipeable.RecyclerViewSwipeManager; @@ -42,6 +41,7 @@ import com.h6ah4i.android.widget.advrecyclerview.swipeable.action.SwipeResultAct import com.h6ah4i.android.widget.advrecyclerview.swipeable.action.SwipeResultActionRemoveItem; import com.h6ah4i.android.widget.advrecyclerview.touchguard.RecyclerViewTouchActionGuardManager; import com.h6ah4i.android.widget.advrecyclerview.utils.AbstractSwipeableItemViewHolder; +import com.hippo.android.resource.AttrResources; import com.hippo.easyrecyclerview.EasyRecyclerView; import com.hippo.easyrecyclerview.FastScroller; import com.hippo.easyrecyclerview.HandlerDrawable; @@ -66,10 +66,8 @@ import com.hippo.widget.LoadImageView; import com.hippo.widget.recyclerview.AutoStaggeredGridLayoutManager; import com.hippo.yorozuya.ResourcesUtils; import com.hippo.yorozuya.ViewUtils; - -import junit.framework.Assert; - import de.greenrobot.dao.query.LazyList; +import junit.framework.Assert; public class HistoryScene extends ToolbarScene implements EasyRecyclerView.OnItemClickListener, @@ -127,7 +125,7 @@ public class HistoryScene extends ToolbarScene layoutManager.setColumnSize(resources.getDimensionPixelOffset(Settings.getDetailSizeResId())); layoutManager.setStrategy(AutoStaggeredGridLayoutManager.STRATEGY_MIN_SIZE); mRecyclerView.setLayoutManager(layoutManager); - mRecyclerView.setSelector(Ripple.generateRippleDrawable(context, false)); + mRecyclerView.setSelector(Ripple.generateRippleDrawable(context, !AttrResources.getAttrBoolean(context, R.attr.isLightTheme))); mRecyclerView.setDrawSelectorOnTop(true); mRecyclerView.hasFixedSize(); mRecyclerView.setClipToPadding(false); diff --git a/app/src/main/java/com/hippo/ehviewer/widget/SearchLayout.java b/app/src/main/java/com/hippo/ehviewer/widget/SearchLayout.java index 493ac94f1..e76ad7a7e 100644 --- a/app/src/main/java/com/hippo/ehviewer/widget/SearchLayout.java +++ b/app/src/main/java/com/hippo/ehviewer/widget/SearchLayout.java @@ -37,7 +37,7 @@ import android.widget.CompoundButton; import android.widget.FrameLayout; import android.widget.ImageView; import android.widget.TextView; - +import com.hippo.android.resource.AttrResources; import com.hippo.easyrecyclerview.EasyRecyclerView; import com.hippo.easyrecyclerview.MarginItemDecoration; import com.hippo.ehviewer.R; @@ -46,7 +46,6 @@ import com.hippo.ehviewer.client.exception.EhException; import com.hippo.ripple.Ripple; import com.hippo.widget.RadioGridGroup; import com.hippo.yorozuya.ViewUtils; - import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; @@ -139,7 +138,7 @@ public class SearchLayout extends EasyRecyclerView implements CompoundButton.OnC mNormalSearchModeHelp = (ImageView) normalView.findViewById(R.id.normal_search_mode_help); mEnableAdvanceSwitch = (SwitchCompat) normalView.findViewById(R.id.search_enable_advance); mNormalSearchModeHelp.setOnClickListener(this); - Ripple.addRipple(mNormalSearchModeHelp, false); + Ripple.addRipple(mNormalSearchModeHelp, !AttrResources.getAttrBoolean(context, R.attr.isLightTheme)); mEnableAdvanceSwitch.setOnCheckedChangeListener(SearchLayout.this); mEnableAdvanceSwitch.setSwitchPadding(resources.getDimensionPixelSize(R.dimen.switch_padding)); diff --git a/app/src/main/java/com/hippo/widget/DirExplorer.java b/app/src/main/java/com/hippo/widget/DirExplorer.java index 958e7fe0d..fb9515e86 100644 --- a/app/src/main/java/com/hippo/widget/DirExplorer.java +++ b/app/src/main/java/com/hippo/widget/DirExplorer.java @@ -76,7 +76,7 @@ public class DirExplorer extends EasyRecyclerView implements EasyRecyclerView.On LayoutUtils.dp2pix(context, 1)); decoration.setShowLastDivider(true); addItemDecoration(decoration); - setSelector(Ripple.generateRippleDrawable(context, false)); + setSelector(Ripple.generateRippleDrawable(context, !AttrResources.getAttrBoolean(context, R.attr.isLightTheme))); setOnItemClickListener(this); mCurrentFile = Environment.getExternalStorageDirectory();