diff --git a/twidere/src/main/java/org/mariotaku/twidere/app/TwidereApplication.java b/twidere/src/main/java/org/mariotaku/twidere/app/TwidereApplication.java index 88178da40..fa741701a 100644 --- a/twidere/src/main/java/org/mariotaku/twidere/app/TwidereApplication.java +++ b/twidere/src/main/java/org/mariotaku/twidere/app/TwidereApplication.java @@ -64,9 +64,11 @@ import org.mariotaku.twidere.util.dagger.ApplicationModule; import org.mariotaku.twidere.util.dagger.DependencyHolder; import org.mariotaku.twidere.util.net.TwidereDns; import org.mariotaku.twidere.util.theme.ActionBarContextViewViewProcessor; +import org.mariotaku.twidere.util.theme.ExtendedSwipeRefreshLayoutViewProcessor; import org.mariotaku.twidere.util.theme.FloatingActionButtonViewProcessor; import org.mariotaku.twidere.util.theme.TabPagerIndicatorViewProcessor; import org.mariotaku.twidere.view.TabPagerIndicator; +import org.mariotaku.twidere.view.themed.ExtendedSwipeRefreshLayout; public class TwidereApplication extends Application implements Constants, OnSharedPreferenceChangeListener { @@ -127,6 +129,7 @@ public class TwidereApplication extends Application implements Constants, ATE.registerViewProcessor(TabPagerIndicator.class, new TabPagerIndicatorViewProcessor()); ATE.registerViewProcessor(FloatingActionButton.class, new FloatingActionButtonViewProcessor()); ATE.registerViewProcessor(ActionBarContextView.class, new ActionBarContextViewViewProcessor()); + ATE.registerViewProcessor(ExtendedSwipeRefreshLayout.class, new ExtendedSwipeRefreshLayoutViewProcessor()); final SharedPreferences preferences = getSharedPreferences(); if (!ATE.config(this, null).isConfigured()) { final int themeColor = preferences.getInt(KEY_THEME_COLOR, ContextCompat.getColor(this, diff --git a/twidere/src/main/java/org/mariotaku/twidere/fragment/support/AbsContentRecyclerViewFragment.java b/twidere/src/main/java/org/mariotaku/twidere/fragment/support/AbsContentRecyclerViewFragment.java index 7aa74dff0..04ef82f16 100644 --- a/twidere/src/main/java/org/mariotaku/twidere/fragment/support/AbsContentRecyclerViewFragment.java +++ b/twidere/src/main/java/org/mariotaku/twidere/fragment/support/AbsContentRecyclerViewFragment.java @@ -49,7 +49,7 @@ import org.mariotaku.twidere.util.TwidereColorUtils; import org.mariotaku.twidere.util.Utils; import org.mariotaku.twidere.view.HeaderDrawerLayout; import org.mariotaku.twidere.view.iface.IExtendedView; -import org.mariotaku.twidere.view.themed.AccentSwipeRefreshLayout; +import org.mariotaku.twidere.view.themed.ExtendedSwipeRefreshLayout; /** * Created by mariotaku on 15/10/26. @@ -225,8 +225,8 @@ public abstract class AbsContentRecyclerViewFragment { + @Override + public void process(@NonNull Context context, String key, ExtendedSwipeRefreshLayout target, Object extra) { + target.setColorSchemeColors(Config.accentColor(context, key)); + } +} diff --git a/twidere/src/main/java/org/mariotaku/twidere/view/themed/AccentSwipeRefreshLayout.java b/twidere/src/main/java/org/mariotaku/twidere/view/themed/ExtendedSwipeRefreshLayout.java similarity index 87% rename from twidere/src/main/java/org/mariotaku/twidere/view/themed/AccentSwipeRefreshLayout.java rename to twidere/src/main/java/org/mariotaku/twidere/view/themed/ExtendedSwipeRefreshLayout.java index e2985e938..d78c5115c 100644 --- a/twidere/src/main/java/org/mariotaku/twidere/view/themed/AccentSwipeRefreshLayout.java +++ b/twidere/src/main/java/org/mariotaku/twidere/view/themed/ExtendedSwipeRefreshLayout.java @@ -20,7 +20,6 @@ package org.mariotaku.twidere.view.themed; import android.content.Context; -import android.content.res.ColorStateList; import android.graphics.Rect; import android.support.annotation.NonNull; import android.support.v4.widget.SwipeRefreshLayout; @@ -28,30 +27,24 @@ import android.util.AttributeSet; import android.view.MotionEvent; import org.mariotaku.twidere.view.iface.IExtendedView; -import org.mariotaku.twidere.view.iface.IThemeAccentView; /** * Created by mariotaku on 15/4/25. */ -public class AccentSwipeRefreshLayout extends SwipeRefreshLayout implements IThemeAccentView, IExtendedView { +public class ExtendedSwipeRefreshLayout extends SwipeRefreshLayout implements IExtendedView { private TouchInterceptor mTouchInterceptor; private OnSizeChangedListener mOnSizeChangedListener; private OnFitSystemWindowsListener mOnFitSystemWindowsListener; - public AccentSwipeRefreshLayout(Context context, AttributeSet attrs) { + public ExtendedSwipeRefreshLayout(Context context, AttributeSet attrs) { super(context, attrs); } - public AccentSwipeRefreshLayout(Context context) { + public ExtendedSwipeRefreshLayout(Context context) { super(context); } - @Override - public void setAccentTintColor(@NonNull ColorStateList color) { - setColorSchemeColors(color.getDefaultColor()); - } - @Override public final boolean dispatchTouchEvent(@NonNull final MotionEvent event) { if (mTouchInterceptor != null) { diff --git a/twidere/src/main/res/layout/fragment_content_listview.xml b/twidere/src/main/res/layout/fragment_content_listview.xml index 9d7950163..8c0e42187 100644 --- a/twidere/src/main/res/layout/fragment_content_listview.xml +++ b/twidere/src/main/res/layout/fragment_content_listview.xml @@ -26,7 +26,7 @@ - - + \ No newline at end of file diff --git a/twidere/src/main/res/layout/fragment_content_recyclerview.xml b/twidere/src/main/res/layout/fragment_content_recyclerview.xml index 1a98670f2..421e17531 100644 --- a/twidere/src/main/res/layout/fragment_content_recyclerview.xml +++ b/twidere/src/main/res/layout/fragment_content_recyclerview.xml @@ -25,7 +25,7 @@ - - + \ No newline at end of file diff --git a/twidere/src/main/res/values/colors.xml b/twidere/src/main/res/values/colors.xml index d7fdbf02f..b09b77dd0 100644 --- a/twidere/src/main/res/values/colors.xml +++ b/twidere/src/main/res/values/colors.xml @@ -33,8 +33,8 @@ @color/material_cyan #40808080 #cc000000 - #303030 - #fafafa + #424242 + #ffffff #212121 #A0000000 #80000000