diff options
| author | Alex Ning <chineseperson5@gmail.com> | 2020-02-27 08:58:15 +0000 |
|---|---|---|
| committer | Alex Ning <chineseperson5@gmail.com> | 2020-02-27 08:58:15 +0000 |
| commit | e1ce1af47a7eb5fd92570460122cd3c2aea11905 (patch) | |
| tree | 206dee76245a37cdb32c5fadf4d20fa75d42c157 /app/src | |
| parent | 0f36ad4e1db8789fb012a54b8b6f81dbca49e828 (diff) | |
| download | infinity-for-reddit-e1ce1af47a7eb5fd92570460122cd3c2aea11905.tar infinity-for-reddit-e1ce1af47a7eb5fd92570460122cd3c2aea11905.tar.gz infinity-for-reddit-e1ce1af47a7eb5fd92570460122cd3c2aea11905.tar.bz2 infinity-for-reddit-e1ce1af47a7eb5fd92570460122cd3c2aea11905.tar.lz infinity-for-reddit-e1ce1af47a7eb5fd92570460122cd3c2aea11905.tar.xz infinity-for-reddit-e1ce1af47a7eb5fd92570460122cd3c2aea11905.tar.zst infinity-for-reddit-e1ce1af47a7eb5fd92570460122cd3c2aea11905.zip | |
Still prepare to add different themes.
Diffstat (limited to '')
74 files changed, 488 insertions, 371 deletions
diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/Activity/BaseActivity.java b/app/src/main/java/ml/docilealligator/infinityforreddit/Activity/BaseActivity.java index c7a2abf2..0902a493 100644 --- a/app/src/main/java/ml/docilealligator/infinityforreddit/Activity/BaseActivity.java +++ b/app/src/main/java/ml/docilealligator/infinityforreddit/Activity/BaseActivity.java @@ -34,7 +34,7 @@ public abstract class BaseActivity extends AppCompatActivity { switch (themeType) { case 0: AppCompatDelegate.setDefaultNightMode(MODE_NIGHT_NO); - getTheme().applyStyle(R.style.Theme_Default, true); + getTheme().applyStyle(R.style.Theme_Purple, true); break; case 1: AppCompatDelegate.setDefaultNightMode(MODE_NIGHT_YES); @@ -51,7 +51,7 @@ public abstract class BaseActivity extends AppCompatActivity { AppCompatDelegate.setDefaultNightMode(MODE_NIGHT_AUTO_BATTERY); } if((getResources().getConfiguration().uiMode & Configuration.UI_MODE_NIGHT_MASK) == Configuration.UI_MODE_NIGHT_NO) { - getTheme().applyStyle(R.style.Theme_Default, true); + getTheme().applyStyle(R.style.Theme_Purple, true); } else { if(mSharedPreferences.getBoolean(SharedPreferencesUtils.AMOLED_DARK_KEY, false)) { getTheme().applyStyle(R.style.Theme_Default_AmoledDark, true); diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/Activity/CommentActivity.java b/app/src/main/java/ml/docilealligator/infinityforreddit/Activity/CommentActivity.java index 5faaa174..84f68c4d 100644 --- a/app/src/main/java/ml/docilealligator/infinityforreddit/Activity/CommentActivity.java +++ b/app/src/main/java/ml/docilealligator/infinityforreddit/Activity/CommentActivity.java @@ -20,7 +20,6 @@ import androidx.annotation.NonNull; import androidx.annotation.Nullable; import androidx.appcompat.widget.Toolbar; import androidx.coordinatorlayout.widget.CoordinatorLayout; -import androidx.core.content.ContextCompat; import androidx.recyclerview.widget.LinearLayoutManager; import androidx.recyclerview.widget.RecyclerView; @@ -53,6 +52,7 @@ import ml.docilealligator.infinityforreddit.Infinity; import ml.docilealligator.infinityforreddit.R; import ml.docilealligator.infinityforreddit.RedditDataRoomDatabase; import ml.docilealligator.infinityforreddit.SendComment; +import ml.docilealligator.infinityforreddit.Utils.Utils; import retrofit2.Retrofit; public class CommentActivity extends BaseActivity { @@ -146,7 +146,7 @@ public class CommentActivity extends BaseActivity { if (parentBody != null && !parentBody.equals("")) { contentMarkdownRecyclerView.setVisibility(View.VISIBLE); contentMarkdownRecyclerView.setNestedScrollingEnabled(false); - int markdownColor = ContextCompat.getColor(this, R.color.defaultTextColor); + int markdownColor = Utils.getAttributeColor(this, R.attr.secondaryTextColor); Markwon postBodyMarkwon = Markwon.builder(this) .usePlugin(new AbstractMarkwonPlugin() { @Override diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/Activity/LinkResolverActivity.java b/app/src/main/java/ml/docilealligator/infinityforreddit/Activity/LinkResolverActivity.java index d5c9fff1..0a2553de 100644 --- a/app/src/main/java/ml/docilealligator/infinityforreddit/Activity/LinkResolverActivity.java +++ b/app/src/main/java/ml/docilealligator/infinityforreddit/Activity/LinkResolverActivity.java @@ -22,6 +22,7 @@ import javax.inject.Inject; import ml.docilealligator.infinityforreddit.Infinity; import ml.docilealligator.infinityforreddit.R; import ml.docilealligator.infinityforreddit.Utils.SharedPreferencesUtils; +import ml.docilealligator.infinityforreddit.Utils.Utils; import static androidx.appcompat.app.AppCompatDelegate.MODE_NIGHT_AUTO_BATTERY; import static androidx.appcompat.app.AppCompatDelegate.MODE_NIGHT_FOLLOW_SYSTEM; @@ -234,7 +235,7 @@ public class LinkResolverActivity extends AppCompatActivity { CustomTabsIntent.Builder builder = new CustomTabsIntent.Builder(); // add share action to menu list builder.addDefaultShareMenuItem(); - builder.setToolbarColor(getResources().getColor(R.color.colorPrimary)); + builder.setToolbarColor(Utils.getAttributeColor(this, R.attr.colorPrimary)); CustomTabsIntent customTabsIntent = builder.build(); customTabsIntent.intent.setPackage(resolveInfos.get(0).activityInfo.packageName); if (uri.getScheme() == null) { diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/Activity/MultiRedditListingActivity.java b/app/src/main/java/ml/docilealligator/infinityforreddit/Activity/MultiRedditListingActivity.java index 5ac8e9de..8ad32af2 100644 --- a/app/src/main/java/ml/docilealligator/infinityforreddit/Activity/MultiRedditListingActivity.java +++ b/app/src/main/java/ml/docilealligator/infinityforreddit/Activity/MultiRedditListingActivity.java @@ -6,7 +6,6 @@ import android.content.res.Configuration; import android.content.res.Resources; import android.os.Build; import android.os.Bundle; -import android.util.TypedValue; import android.view.MenuItem; import android.view.View; import android.view.ViewGroup; @@ -47,6 +46,7 @@ import ml.docilealligator.infinityforreddit.MultiReddit.MultiRedditViewModel; import ml.docilealligator.infinityforreddit.R; import ml.docilealligator.infinityforreddit.RedditDataRoomDatabase; import ml.docilealligator.infinityforreddit.Utils.SharedPreferencesUtils; +import ml.docilealligator.infinityforreddit.Utils.Utils; import retrofit2.Retrofit; public class MultiRedditListingActivity extends BaseActivity { @@ -147,11 +147,8 @@ public class MultiRedditListingActivity extends BaseActivity { getSupportActionBar().setDisplayHomeAsUpEnabled(true); mSwipeRefreshLayout.setOnRefreshListener(this::loadMultiReddits); - - TypedValue typedValue = new TypedValue(); - getTheme().resolveAttribute(R.attr.cardViewBackgroundColor, typedValue, true); - mSwipeRefreshLayout.setProgressBackgroundColorSchemeColor(typedValue.data); - mSwipeRefreshLayout.setColorSchemeResources(R.color.colorAccent); + mSwipeRefreshLayout.setProgressBackgroundColorSchemeColor(Utils.getAttributeColor(this, R.attr.cardViewBackgroundColor)); + mSwipeRefreshLayout.setColorSchemeColors(Utils.getAttributeColor(this, R.attr.colorAccent)); if (savedInstanceState != null) { mInsertSuccess = savedInstanceState.getBoolean(INSERT_MULTI_REDDIT_STATE); diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/Activity/PostImageActivity.java b/app/src/main/java/ml/docilealligator/infinityforreddit/Activity/PostImageActivity.java index ee68d38d..b5babcf2 100644 --- a/app/src/main/java/ml/docilealligator/infinityforreddit/Activity/PostImageActivity.java +++ b/app/src/main/java/ml/docilealligator/infinityforreddit/Activity/PostImageActivity.java @@ -130,6 +130,7 @@ public class PostImageActivity extends BaseActivity implements FlairBottomSheetF private boolean loadSubredditIconSuccessful = true; private boolean isPosting; private Uri imageUri; + private int primaryTextColor; private int flairColor; private int spoilerColor; private int nsfwColor; @@ -161,6 +162,7 @@ public class PostImageActivity extends BaseActivity implements FlairBottomSheetF mPostingSnackbar = Snackbar.make(coordinatorLayout, R.string.posting, Snackbar.LENGTH_INDEFINITE); + primaryTextColor = Utils.getAttributeColor(this, R.attr.primaryTextColor); flairColor = Utils.getAttributeColor(this, R.attr.flairColor); spoilerColor = Utils.getAttributeColor(this, R.attr.spoilerColor); nsfwColor = Utils.getAttributeColor(this, R.attr.nsfwColor); @@ -192,7 +194,7 @@ public class PostImageActivity extends BaseActivity implements FlairBottomSheetF } if (subredditName != null) { - subredditNameTextView.setTextColor(resources.getColor(R.color.primaryTextColor)); + subredditNameTextView.setTextColor(primaryTextColor); subredditNameTextView.setText(subredditName); flairTextView.setVisibility(View.VISIBLE); if (!loadSubredditIconSuccessful) { @@ -224,7 +226,7 @@ public class PostImageActivity extends BaseActivity implements FlairBottomSheetF loadSubredditIconSuccessful = false; subredditName = getIntent().getStringExtra(EXTRA_SUBREDDIT_NAME); subredditSelected = true; - subredditNameTextView.setTextColor(resources.getColor(R.color.primaryTextColor)); + subredditNameTextView.setTextColor(primaryTextColor); subredditNameTextView.setText(subredditName); loadSubredditIcon(); } else { @@ -507,7 +509,7 @@ public class PostImageActivity extends BaseActivity implements FlairBottomSheetF subredditSelected = true; subredditIsUser = data.getExtras().getBoolean(SubredditSelectionActivity.EXTRA_RETURN_SUBREDDIT_IS_USER); - subredditNameTextView.setTextColor(resources.getColor(R.color.primaryTextColor)); + subredditNameTextView.setTextColor(primaryTextColor); subredditNameTextView.setText(subredditName); displaySubredditIcon(); diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/Activity/PostLinkActivity.java b/app/src/main/java/ml/docilealligator/infinityforreddit/Activity/PostLinkActivity.java index 094a7757..d2ed17f9 100644 --- a/app/src/main/java/ml/docilealligator/infinityforreddit/Activity/PostLinkActivity.java +++ b/app/src/main/java/ml/docilealligator/infinityforreddit/Activity/PostLinkActivity.java @@ -104,6 +104,7 @@ public class PostLinkActivity extends BaseActivity implements FlairBottomSheetFr private boolean subredditIsUser; private boolean loadSubredditIconSuccessful = true; private boolean isPosting; + private int primaryTextColor; private int flairColor; private int spoilerColor; private int nsfwColor; @@ -135,6 +136,7 @@ public class PostLinkActivity extends BaseActivity implements FlairBottomSheetFr mPostingSnackbar = Snackbar.make(coordinatorLayout, R.string.posting, Snackbar.LENGTH_INDEFINITE); + primaryTextColor = Utils.getAttributeColor(this, R.attr.primaryTextColor); flairColor = Utils.getAttributeColor(this, R.attr.flairColor); spoilerColor = Utils.getAttributeColor(this, R.attr.spoilerColor); nsfwColor = Utils.getAttributeColor(this, R.attr.nsfwColor); @@ -160,7 +162,7 @@ public class PostLinkActivity extends BaseActivity implements FlairBottomSheetFr isNSFW = savedInstanceState.getBoolean(IS_NSFW_STATE); if (subredditName != null) { - subredditNameTextView.setTextColor(resources.getColor(R.color.primaryTextColor)); + subredditNameTextView.setTextColor(primaryTextColor); subredditNameTextView.setText(subredditName); flairTextView.setVisibility(View.VISIBLE); if (!loadSubredditIconSuccessful) { @@ -192,7 +194,7 @@ public class PostLinkActivity extends BaseActivity implements FlairBottomSheetFr loadSubredditIconSuccessful = false; subredditName = getIntent().getStringExtra(EXTRA_SUBREDDIT_NAME); subredditSelected = true; - subredditNameTextView.setTextColor(resources.getColor(R.color.primaryTextColor)); + subredditNameTextView.setTextColor(primaryTextColor); subredditNameTextView.setText(subredditName); flairTextView.setVisibility(View.VISIBLE); loadSubredditIcon(); @@ -427,7 +429,7 @@ public class PostLinkActivity extends BaseActivity implements FlairBottomSheetFr subredditSelected = true; subredditIsUser = data.getExtras().getBoolean(SubredditSelectionActivity.EXTRA_RETURN_SUBREDDIT_IS_USER); - subredditNameTextView.setTextColor(resources.getColor(R.color.primaryTextColor)); + subredditNameTextView.setTextColor(primaryTextColor); subredditNameTextView.setText(subredditName); displaySubredditIcon(); diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/Activity/PostTextActivity.java b/app/src/main/java/ml/docilealligator/infinityforreddit/Activity/PostTextActivity.java index 4f10e848..c2f5f9a0 100644 --- a/app/src/main/java/ml/docilealligator/infinityforreddit/Activity/PostTextActivity.java +++ b/app/src/main/java/ml/docilealligator/infinityforreddit/Activity/PostTextActivity.java @@ -104,6 +104,7 @@ public class PostTextActivity extends BaseActivity implements FlairBottomSheetFr private boolean subredditIsUser; private boolean loadSubredditIconSuccessful = true; private boolean isPosting; + private int primaryTextColor; private int flairColor; private int spoilerColor; private int nsfwColor; @@ -135,6 +136,7 @@ public class PostTextActivity extends BaseActivity implements FlairBottomSheetFr mPostingSnackbar = Snackbar.make(coordinatorLayout, R.string.posting, Snackbar.LENGTH_INDEFINITE); + primaryTextColor = Utils.getAttributeColor(this, R.attr.primaryTextColor); flairColor = Utils.getAttributeColor(this, R.attr.flairColor); spoilerColor = Utils.getAttributeColor(this, R.attr.spoilerColor); nsfwColor = Utils.getAttributeColor(this, R.attr.nsfwColor); @@ -160,7 +162,7 @@ public class PostTextActivity extends BaseActivity implements FlairBottomSheetFr isNSFW = savedInstanceState.getBoolean(IS_NSFW_STATE); if (subredditName != null) { - subredditNameTextView.setTextColor(resources.getColor(R.color.primaryTextColor)); + subredditNameTextView.setTextColor(primaryTextColor); subredditNameTextView.setText(subredditName); flairTextView.setVisibility(View.VISIBLE); if (!loadSubredditIconSuccessful) { @@ -192,7 +194,7 @@ public class PostTextActivity extends BaseActivity implements FlairBottomSheetFr loadSubredditIconSuccessful = false; subredditName = getIntent().getStringExtra(EXTRA_SUBREDDIT_NAME); subredditSelected = true; - subredditNameTextView.setTextColor(resources.getColor(R.color.primaryTextColor)); + subredditNameTextView.setTextColor(primaryTextColor); subredditNameTextView.setText(subredditName); flairTextView.setVisibility(View.VISIBLE); loadSubredditIcon(); @@ -427,7 +429,7 @@ public class PostTextActivity extends BaseActivity implements FlairBottomSheetFr subredditSelected = true; subredditIsUser = data.getExtras().getBoolean(SubredditSelectionActivity.EXTRA_RETURN_SUBREDDIT_IS_USER); - subredditNameTextView.setTextColor(resources.getColor(R.color.primaryTextColor)); + subredditNameTextView.setTextColor(primaryTextColor); subredditNameTextView.setText(subredditName); displaySubredditIcon(); diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/Activity/PostVideoActivity.java b/app/src/main/java/ml/docilealligator/infinityforreddit/Activity/PostVideoActivity.java index 91ea4157..7b887f20 100644 --- a/app/src/main/java/ml/docilealligator/infinityforreddit/Activity/PostVideoActivity.java +++ b/app/src/main/java/ml/docilealligator/infinityforreddit/Activity/PostVideoActivity.java @@ -136,6 +136,7 @@ public class PostVideoActivity extends BaseActivity implements FlairBottomSheetF private boolean loadSubredditIconSuccessful = true; private boolean isPosting; private boolean wasPlaying; + private int primaryTextColor; private int flairColor; private int spoilerColor; private int nsfwColor; @@ -175,6 +176,7 @@ public class PostVideoActivity extends BaseActivity implements FlairBottomSheetF mPostingSnackbar = Snackbar.make(coordinatorLayout, R.string.posting, Snackbar.LENGTH_INDEFINITE); + primaryTextColor = Utils.getAttributeColor(this, R.attr.primaryTextColor); flairColor = Utils.getAttributeColor(this, R.attr.flairColor); spoilerColor = Utils.getAttributeColor(this, R.attr.spoilerColor); nsfwColor = Utils.getAttributeColor(this, R.attr.nsfwColor); @@ -205,7 +207,7 @@ public class PostVideoActivity extends BaseActivity implements FlairBottomSheetF } if (subredditName != null) { - subredditNameTextView.setTextColor(resources.getColor(R.color.primaryTextColor)); + subredditNameTextView.setTextColor(primaryTextColor); subredditNameTextView.setText(subredditName); flairTextView.setVisibility(View.VISIBLE); if (!loadSubredditIconSuccessful) { @@ -237,7 +239,7 @@ public class PostVideoActivity extends BaseActivity implements FlairBottomSheetF loadSubredditIconSuccessful = false; subredditName = getIntent().getStringExtra(EXTRA_SUBREDDIT_NAME); subredditSelected = true; - subredditNameTextView.setTextColor(resources.getColor(R.color.primaryTextColor)); + subredditNameTextView.setTextColor(primaryTextColor); subredditNameTextView.setText(subredditName); loadSubredditIcon(); } else { @@ -528,7 +530,7 @@ public class PostVideoActivity extends BaseActivity implements FlairBottomSheetF subredditSelected = true; subredditIsUser = data.getBooleanExtra(SubredditSelectionActivity.EXTRA_RETURN_SUBREDDIT_IS_USER, false); - subredditNameTextView.setTextColor(resources.getColor(R.color.primaryTextColor)); + subredditNameTextView.setTextColor(primaryTextColor); subredditNameTextView.setText(subredditName); displaySubredditIcon(); diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/Activity/ViewMessageActivity.java b/app/src/main/java/ml/docilealligator/infinityforreddit/Activity/ViewMessageActivity.java index 9007e810..92450d0c 100644 --- a/app/src/main/java/ml/docilealligator/infinityforreddit/Activity/ViewMessageActivity.java +++ b/app/src/main/java/ml/docilealligator/infinityforreddit/Activity/ViewMessageActivity.java @@ -5,7 +5,6 @@ import android.content.res.Configuration; import android.content.res.Resources; import android.os.Build; import android.os.Bundle; -import android.util.TypedValue; import android.view.Menu; import android.view.MenuItem; import android.view.View; @@ -50,6 +49,7 @@ import ml.docilealligator.infinityforreddit.NetworkState; import ml.docilealligator.infinityforreddit.R; import ml.docilealligator.infinityforreddit.RedditDataRoomDatabase; import ml.docilealligator.infinityforreddit.Utils.SharedPreferencesUtils; +import ml.docilealligator.infinityforreddit.Utils.Utils; import retrofit2.Retrofit; public class ViewMessageActivity extends BaseActivity { @@ -255,11 +255,8 @@ public class ViewMessageActivity extends BaseActivity { }); mSwipeRefreshLayout.setOnRefreshListener(this::onRefresh); - - TypedValue typedValue = new TypedValue(); - getTheme().resolveAttribute(R.attr.cardViewBackgroundColor, typedValue, true); - mSwipeRefreshLayout.setProgressBackgroundColorSchemeColor(typedValue.data); - mSwipeRefreshLayout.setColorSchemeResources(R.color.colorAccent); + mSwipeRefreshLayout.setProgressBackgroundColorSchemeColor(Utils.getAttributeColor(this, R.attr.cardViewBackgroundColor)); + mSwipeRefreshLayout.setColorSchemeColors(Utils.getAttributeColor(this, R.attr.colorAccent)); } private void showErrorView(int stringResId) { diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/Activity/ViewPostDetailActivity.java b/app/src/main/java/ml/docilealligator/infinityforreddit/Activity/ViewPostDetailActivity.java index 4d118525..1842a59d 100644 --- a/app/src/main/java/ml/docilealligator/infinityforreddit/Activity/ViewPostDetailActivity.java +++ b/app/src/main/java/ml/docilealligator/infinityforreddit/Activity/ViewPostDetailActivity.java @@ -6,7 +6,6 @@ import android.content.res.Configuration; import android.content.res.Resources; import android.os.Build; import android.os.Bundle; -import android.util.TypedValue; import android.view.KeyEvent; import android.view.Menu; import android.view.MenuItem; @@ -82,6 +81,7 @@ import ml.docilealligator.infinityforreddit.SortType; import ml.docilealligator.infinityforreddit.SortTypeSelectionCallback; import ml.docilealligator.infinityforreddit.Utils.RedditUtils; import ml.docilealligator.infinityforreddit.Utils.SharedPreferencesUtils; +import ml.docilealligator.infinityforreddit.Utils.Utils; import retrofit2.Call; import retrofit2.Callback; import retrofit2.Response; @@ -353,11 +353,8 @@ public class ViewPostDetailActivity extends BaseActivity implements FlairBottomS } mSwipeRefreshLayout.setOnRefreshListener(() -> refresh(true, true)); - - TypedValue typedValue = new TypedValue(); - getTheme().resolveAttribute(R.attr.cardViewBackgroundColor, typedValue, true); - mSwipeRefreshLayout.setProgressBackgroundColorSchemeColor(typedValue.data); - mSwipeRefreshLayout.setColorSchemeResources(R.color.colorAccent); + mSwipeRefreshLayout.setProgressBackgroundColorSchemeColor(Utils.getAttributeColor(this, R.attr.cardViewBackgroundColor)); + mSwipeRefreshLayout.setColorSchemeColors(Utils.getAttributeColor(this, R.attr.colorAccent)); mSmoothScroller = new LinearSmoothScroller(this) { @Override diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/Activity/ViewSidebarActivity.java b/app/src/main/java/ml/docilealligator/infinityforreddit/Activity/ViewSidebarActivity.java index 8f9d9fc4..cb11bbcc 100644 --- a/app/src/main/java/ml/docilealligator/infinityforreddit/Activity/ViewSidebarActivity.java +++ b/app/src/main/java/ml/docilealligator/infinityforreddit/Activity/ViewSidebarActivity.java @@ -22,7 +22,6 @@ import android.widget.Toast; import androidx.annotation.NonNull; import androidx.appcompat.widget.Toolbar; -import androidx.core.content.ContextCompat; import androidx.lifecycle.ViewModelProvider; import androidx.recyclerview.widget.LinearLayoutManager; import androidx.recyclerview.widget.RecyclerView; @@ -56,6 +55,7 @@ import ml.docilealligator.infinityforreddit.RedditDataRoomDatabase; import ml.docilealligator.infinityforreddit.SubredditDatabase.SubredditData; import ml.docilealligator.infinityforreddit.SubredditDatabase.SubredditViewModel; import ml.docilealligator.infinityforreddit.Utils.SharedPreferencesUtils; +import ml.docilealligator.infinityforreddit.Utils.Utils; import retrofit2.Retrofit; public class ViewSidebarActivity extends BaseActivity { @@ -66,7 +66,7 @@ public class ViewSidebarActivity extends BaseActivity { @BindView(R.id.toolbar_view_sidebar_activity) Toolbar toolbar; @BindView(R.id.swipe_refresh_layout_view_sidebar_activity) - SwipeRefreshLayout swipeRefreshLayout; + SwipeRefreshLayout mSwipeRefreshLayout; @BindView(R.id.markdown_recycler_view_view_sidebar_activity) RecyclerView markdownRecyclerView; @Inject @@ -151,7 +151,7 @@ public class ViewSidebarActivity extends BaseActivity { setSupportActionBar(toolbar); getSupportActionBar().setDisplayHomeAsUpEnabled(true); - int markdownColor = ContextCompat.getColor(this, R.color.defaultTextColor); + int markdownColor = Utils.getAttributeColor(this, R.attr.secondaryTextColor); Markwon markwon = Markwon.builder(this) .usePlugin(new AbstractMarkwonPlugin() { @Override @@ -204,25 +204,23 @@ public class ViewSidebarActivity extends BaseActivity { } }); - TypedValue typedValue = new TypedValue(); - getTheme().resolveAttribute(R.attr.cardViewBackgroundColor, typedValue, true); - swipeRefreshLayout.setProgressBackgroundColorSchemeColor(typedValue.data); - swipeRefreshLayout.setColorSchemeResources(R.color.colorAccent); - swipeRefreshLayout.setOnRefreshListener(this::fetchSubredditData); + mSwipeRefreshLayout.setOnRefreshListener(this::fetchSubredditData); + mSwipeRefreshLayout.setProgressBackgroundColorSchemeColor(Utils.getAttributeColor(this, R.attr.cardViewBackgroundColor)); + mSwipeRefreshLayout.setColorSchemeColors(Utils.getAttributeColor(this, R.attr.colorAccent)); } private void fetchSubredditData() { - swipeRefreshLayout.setRefreshing(true); + mSwipeRefreshLayout.setRefreshing(true); FetchSubredditData.fetchSubredditData(mRetrofit, subredditName, new FetchSubredditData.FetchSubredditDataListener() { @Override public void onFetchSubredditDataSuccess(SubredditData subredditData, int nCurrentOnlineSubscribers) { - swipeRefreshLayout.setRefreshing(false); - new InsertSubredditDataAsyncTask(mRedditDataRoomDatabase, subredditData, () -> swipeRefreshLayout.setRefreshing(false)).execute(); + mSwipeRefreshLayout.setRefreshing(false); + new InsertSubredditDataAsyncTask(mRedditDataRoomDatabase, subredditData, () -> mSwipeRefreshLayout.setRefreshing(false)).execute(); } @Override public void onFetchSubredditDataFail() { - swipeRefreshLayout.setRefreshing(false); + mSwipeRefreshLayout.setRefreshing(false); Toast.makeText(ViewSidebarActivity.this, R.string.cannot_fetch_sidebar, Toast.LENGTH_SHORT).show(); } }); @@ -240,7 +238,7 @@ public class ViewSidebarActivity extends BaseActivity { finish(); return true; } else if (item.getItemId() == R.id.action_refresh_view_sidebar_activity) { - if (!swipeRefreshLayout.isRefreshing()) { + if (!mSwipeRefreshLayout.isRefreshing()) { fetchSubredditData(); } return true; diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/Adapter/CommentAndPostRecyclerViewAdapter.java b/app/src/main/java/ml/docilealligator/infinityforreddit/Adapter/CommentAndPostRecyclerViewAdapter.java index 7aa282f1..ab7c0b21 100644 --- a/app/src/main/java/ml/docilealligator/infinityforreddit/Adapter/CommentAndPostRecyclerViewAdapter.java +++ b/app/src/main/java/ml/docilealligator/infinityforreddit/Adapter/CommentAndPostRecyclerViewAdapter.java @@ -26,7 +26,6 @@ import androidx.annotation.Nullable; import androidx.appcompat.app.AppCompatActivity; import androidx.constraintlayout.widget.ConstraintLayout; import androidx.constraintlayout.widget.ConstraintSet; -import androidx.core.content.ContextCompat; import androidx.recyclerview.widget.LinearLayoutManager; import androidx.recyclerview.widget.RecyclerView; @@ -129,12 +128,22 @@ public class CommentAndPostRecyclerViewAdapter extends RecyclerView.Adapter<Recy private boolean isInitiallyLoadingFailed; private boolean mHasMoreComments; private boolean loadMoreCommentsFailed; + private int mSecondaryTextColor; private int mCommentBackgroundColor; private int mUsernameColor; private int mSubmitterColor; private int mModeratorColor; private int mUpvotedColor; private int mDownvotedColor; + private int mCommentVerticalBarColor1; + private int mCommentVerticalBarColor2; + private int mCommentVerticalBarColor3; + private int mCommentVerticalBarColor4; + private int mCommentVerticalBarColor5; + private int mCommentVerticalBarColor6; + private int mCommentVerticalBarColor7; + private int mSingleCommentThreadBackgroundColor; + private int mVoteAndReplyUnavailableVoteButtonColor; private float mScale; private ShareLinkBottomSheetFragment mShareLinkBottomSheetFragment; @@ -153,7 +162,8 @@ public class CommentAndPostRecyclerViewAdapter extends RecyclerView.Adapter<Recy mOauthRetrofit = oauthRetrofit; mRedditDataRoomDatabase = redditDataRoomDatabase; mGlide = glide; - int markdownColor = ContextCompat.getColor(activity, R.color.defaultTextColor); + mSecondaryTextColor = Utils.getAttributeColor(activity, R.attr.secondaryTextColor); + int markdownColor = mSecondaryTextColor; mPostDetailMarkwon = Markwon.builder(mActivity) .usePlugin(new AbstractMarkwonPlugin() { @Override @@ -250,6 +260,15 @@ public class CommentAndPostRecyclerViewAdapter extends RecyclerView.Adapter<Recy mUsernameColor = Utils.getAttributeColor(activity, R.attr.username); mUpvotedColor = Utils.getAttributeColor(activity, R.attr.upvoted); mDownvotedColor = Utils.getAttributeColor(activity, R.attr.downvoted); + mCommentVerticalBarColor1 = Utils.getAttributeColor(activity, R.attr.commentVerticalBarColor1); + mCommentVerticalBarColor2 = Utils.getAttributeColor(activity, R.attr.commentVerticalBarColor2); + mCommentVerticalBarColor3 = Utils.getAttributeColor(activity, R.attr.commentVerticalBarColor3); + mCommentVerticalBarColor4 = Utils.getAttributeColor(activity, R.attr.commentVerticalBarColor4); + mCommentVerticalBarColor5 = Utils.getAttributeColor(activity, R.attr.commentVerticalBarColor5); + mCommentVerticalBarColor6 = Utils.getAttributeColor(activity, R.attr.commentVerticalBarColor6); + mCommentVerticalBarColor7 = Utils.getAttributeColor(activity, R.attr.commentVerticalBarColor7); + mSingleCommentThreadBackgroundColor = Utils.getAttributeColor(activity, R.attr.singleCommentThreadBackgroundColor); + mVoteAndReplyUnavailableVoteButtonColor = Utils.getAttributeColor(activity, R.attr.voteAndReplyUnavailableVoteButtonColor); mShareLinkBottomSheetFragment = new ShareLinkBottomSheetFragment(); mCopyTextBottomSheetFragment = new CopyTextBottomSheetFragment(); @@ -418,7 +437,7 @@ public class CommentAndPostRecyclerViewAdapter extends RecyclerView.Adapter<Recy case 0: ((PostDetailViewHolder) holder).mUpvoteButton.clearColorFilter(); ((PostDetailViewHolder) holder).mDownvoteButton.clearColorFilter(); - ((PostDetailViewHolder) holder).mScoreTextView.setTextColor(ContextCompat.getColor(mActivity, R.color.defaultTextColor)); + ((PostDetailViewHolder) holder).mScoreTextView.setTextColor(mSecondaryTextColor); } if (mPost.getPostType() != Post.TEXT_TYPE && mPost.getPostType() != Post.NO_PREVIEW_LINK_TYPE) { @@ -433,9 +452,9 @@ public class CommentAndPostRecyclerViewAdapter extends RecyclerView.Adapter<Recy if (mPost.isArchived()) { ((PostDetailViewHolder) holder).mUpvoteButton - .setColorFilter(ContextCompat.getColor(mActivity, R.color.voteAndReplyUnavailableVoteButtonColor), android.graphics.PorterDuff.Mode.SRC_IN); + .setColorFilter(mVoteAndReplyUnavailableVoteButtonColor, android.graphics.PorterDuff.Mode.SRC_IN); ((PostDetailViewHolder) holder).mDownvoteButton - .setColorFilter(ContextCompat.getColor(mActivity, R.color.voteAndReplyUnavailableVoteButtonColor), android.graphics.PorterDuff.Mode.SRC_IN); + .setColorFilter(mVoteAndReplyUnavailableVoteButtonColor, android.graphics.PorterDuff.Mode.SRC_IN); } if (mPost.isCrosspost()) { @@ -719,8 +738,7 @@ public class CommentAndPostRecyclerViewAdapter extends RecyclerView.Adapter<Recy } if (mIsSingleCommentThreadMode && comment.getId().equals(mSingleCommentId)) { - ((CommentViewHolder) holder).itemView.setBackgroundColor( - mActivity.getResources().getColor(R.color.singleCommentThreadBackgroundColor)); + ((CommentViewHolder) holder).itemView.setBackgroundColor(mSingleCommentThreadBackgroundColor); } String authorPrefixed = "u/" + comment.getAuthor(); @@ -769,31 +787,31 @@ public class CommentAndPostRecyclerViewAdapter extends RecyclerView.Adapter<Recy switch (comment.getDepth() % 7) { case 0: ((CommentViewHolder) holder).verticalBlock - .setBackgroundColor(ContextCompat.getColor(mActivity, R.color.commentVerticalBar7)); + .setBackgroundColor(mCommentVerticalBarColor7); break; case 1: ((CommentViewHolder) holder).verticalBlock - .setBackgroundColor(ContextCompat.getColor(mActivity, R.color.commentVerticalBar1)); + .setBackgroundColor(mCommentVerticalBarColor1); break; case 2: ((CommentViewHolder) holder).verticalBlock - .setBackgroundColor(ContextCompat.getColor(mActivity, R.color.commentVerticalBar2)); + .setBackgroundColor(mCommentVerticalBarColor2); break; case 3: ((CommentViewHolder) holder).verticalBlock - .setBackgroundColor(ContextCompat.getColor(mActivity, R.color.commentVerticalBar3)); + .setBackgroundColor(mCommentVerticalBarColor3); break; case 4: ((CommentViewHolder) holder).verticalBlock - .setBackgroundColor(ContextCompat.getColor(mActivity, R.color.commentVerticalBar4)); + .setBackgroundColor(mCommentVerticalBarColor4); break; case 5: ((CommentViewHolder) holder).verticalBlock - .setBackgroundColor(ContextCompat.getColor(mActivity, R.color.commentVerticalBar5)); + .setBackgroundColor(mCommentVerticalBarColor5); break; case 6: ((CommentViewHolder) holder).verticalBlock - .setBackgroundColor(ContextCompat.getColor(mActivity, R.color.commentVerticalBar6)); + .setBackgroundColor(mCommentVerticalBarColor6); break; } ViewGroup.LayoutParams params = ((CommentViewHolder) holder).verticalBlock.getLayoutParams(); @@ -841,19 +859,19 @@ public class CommentAndPostRecyclerViewAdapter extends RecyclerView.Adapter<Recy if (mPost.isArchived()) { ((CommentViewHolder) holder).replyButton - .setColorFilter(ContextCompat.getColor(mActivity, R.color.voteAndReplyUnavailableVoteButtonColor), + .setColorFilter(mVoteAndReplyUnavailableVoteButtonColor, android.graphics.PorterDuff.Mode.SRC_IN); ((CommentViewHolder) holder).upVoteButton - .setColorFilter(ContextCompat.getColor(mActivity, R.color.voteAndReplyUnavailableVoteButtonColor), + .setColorFilter(mVoteAndReplyUnavailableVoteButtonColor, android.graphics.PorterDuff.Mode.SRC_IN); ((CommentViewHolder) holder).downVoteButton - .setColorFilter(ContextCompat.getColor(mActivity, R.color.voteAndReplyUnavailableVoteButtonColor), + .setColorFilter(mVoteAndReplyUnavailableVoteButtonColor, android.graphics.PorterDuff.Mode.SRC_IN); } if (mPost.isLocked()) { ((CommentViewHolder) holder).replyButton - .setColorFilter(ContextCompat.getColor(mActivity, R.color.voteAndReplyUnavailableVoteButtonColor), + .setColorFilter(mVoteAndReplyUnavailableVoteButtonColor, android.graphics.PorterDuff.Mode.SRC_IN); } @@ -911,7 +929,7 @@ public class CommentAndPostRecyclerViewAdapter extends RecyclerView.Adapter<Recy comment.setVoteType(CommentData.VOTE_TYPE_NO_VOTE); newVoteType = RedditUtils.DIR_UNVOTE; ((CommentViewHolder) holder).upVoteButton.clearColorFilter(); - ((CommentViewHolder) holder).scoreTextView.setTextColor(ContextCompat.getColor(mActivity, R.color.defaultTextColor)); + ((CommentViewHolder) holder).scoreTextView.setTextColor(mSecondaryTextColor); } ((CommentViewHolder) holder).scoreTextView.setText(Utils.getNVotes(mShowAbsoluteNumberOfVotes, @@ -927,7 +945,7 @@ public class CommentAndPostRecyclerViewAdapter extends RecyclerView.Adapter<Recy } else { comment.setVoteType(CommentData.VOTE_TYPE_NO_VOTE); ((CommentViewHolder) holder).upVoteButton.clearColorFilter(); - ((CommentViewHolder) holder).scoreTextView.setTextColor(ContextCompat.getColor(mActivity, R.color.defaultTextColor)); + ((CommentViewHolder) holder).scoreTextView.setTextColor(mSecondaryTextColor); } ((CommentViewHolder) holder).downVoteButton.clearColorFilter(); @@ -968,7 +986,7 @@ public class CommentAndPostRecyclerViewAdapter extends RecyclerView.Adapter<Recy comment.setVoteType(CommentData.VOTE_TYPE_NO_VOTE); newVoteType = RedditUtils.DIR_UNVOTE; ((CommentViewHolder) holder).downVoteButton.clearColorFilter(); - ((CommentViewHolder) holder).scoreTextView.setTextColor(ContextCompat.getColor(mActivity, R.color.defaultTextColor)); + ((CommentViewHolder) holder).scoreTextView.setTextColor(mSecondaryTextColor); } ((CommentViewHolder) holder).scoreTextView.setText(Utils.getNVotes(mShowAbsoluteNumberOfVotes, @@ -984,7 +1002,7 @@ public class CommentAndPostRecyclerViewAdapter extends RecyclerView.Adapter<Recy } else { comment.setVoteType(CommentData.VOTE_TYPE_NO_VOTE); ((CommentViewHolder) holder).downVoteButton.clearColorFilter(); - ((CommentViewHolder) holder).scoreTextView.setTextColor(ContextCompat.getColor(mActivity, R.color.defaultTextColor)); + ((CommentViewHolder) holder).scoreTextView.setTextColor(mSecondaryTextColor); } ((CommentViewHolder) holder).upVoteButton.clearColorFilter(); @@ -1092,31 +1110,31 @@ public class CommentAndPostRecyclerViewAdapter extends RecyclerView.Adapter<Recy switch (placeholder.getDepth() % 7) { case 0: ((LoadMoreChildCommentsViewHolder) holder).verticalBlock - .setBackgroundColor(ContextCompat.getColor(mActivity, R.color.commentVerticalBar7)); + .setBackgroundColor(mCommentVerticalBarColor7); break; case 1: ((LoadMoreChildCommentsViewHolder) holder).verticalBlock - .setBackgroundColor(ContextCompat.getColor(mActivity, R.color.commentVerticalBar1)); + .setBackgroundColor(mCommentVerticalBarColor1); break; case 2: ((LoadMoreChildCommentsViewHolder) holder).verticalBlock - .setBackgroundColor(ContextCompat.getColor(mActivity, R.color.commentVerticalBar2)); + .setBackgroundColor(mCommentVerticalBarColor2); break; case 3: ((LoadMoreChildCommentsViewHolder) holder).verticalBlock - .setBackgroundColor(ContextCompat.getColor(mActivity, R.color.commentVerticalBar3)); + .setBackgroundColor(mCommentVerticalBarColor3); break; case 4: ((LoadMoreChildCommentsViewHolder) holder).verticalBlock - .setBackgroundColor(ContextCompat.getColor(mActivity, R.color.commentVerticalBar4)); + .setBackgroundColor(mCommentVerticalBarColor4); break; case 5: ((LoadMoreChildCommentsViewHolder) holder).verticalBlock - .setBackgroundColor(ContextCompat.getColor(mActivity, R.color.commentVerticalBar5)); + .setBackgroundColor(mCommentVerticalBarColor5); break; case 6: ((LoadMoreChildCommentsViewHolder) holder).verticalBlock - .setBackgroundColor(ContextCompat.getColor(mActivity, R.color.commentVerticalBar6)); + .setBackgroundColor(mCommentVerticalBarColor6); break; } @@ -1615,7 +1633,7 @@ public class CommentAndPostRecyclerViewAdapter extends RecyclerView.Adapter<Recy ((CommentViewHolder) holder).authorTypeImageView.setVisibility(View.GONE); ((CommentViewHolder) holder).expandButton.setVisibility(View.GONE); ((CommentViewHolder) holder).upVoteButton.clearColorFilter(); - ((CommentViewHolder) holder).scoreTextView.setTextColor(ContextCompat.getColor(mActivity, R.color.defaultTextColor)); + ((CommentViewHolder) holder).scoreTextView.setTextColor(mSecondaryTextColor); ((CommentViewHolder) holder).downVoteButton.clearColorFilter(); ((CommentViewHolder) holder).replyButton.clearColorFilter(); ViewGroup.LayoutParams params = ((CommentViewHolder) holder).verticalBlock.getLayoutParams(); @@ -1625,7 +1643,7 @@ public class CommentAndPostRecyclerViewAdapter extends RecyclerView.Adapter<Recy ((CommentViewHolder) holder).itemView.setBackgroundColor(mCommentBackgroundColor); } else if (holder instanceof PostDetailViewHolder) { ((PostDetailViewHolder) holder).mUpvoteButton.clearColorFilter(); - ((PostDetailViewHolder) holder).mScoreTextView.setTextColor(ContextCompat.getColor(mActivity, R.color.defaultTextColor)); + ((PostDetailViewHolder) holder).mScoreTextView.setTextColor(mSecondaryTextColor); ((PostDetailViewHolder) holder).mDownvoteButton.clearColorFilter(); ((PostDetailViewHolder) holder).flairTextView.setVisibility(View.GONE); ((PostDetailViewHolder) holder).spoilerTextView.setVisibility(View.GONE); @@ -1804,7 +1822,7 @@ public class CommentAndPostRecyclerViewAdapter extends RecyclerView.Adapter<Recy mPost.setVoteType(0); newVoteType = RedditUtils.DIR_UNVOTE; mUpvoteButton.clearColorFilter(); - mScoreTextView.setTextColor(ContextCompat.getColor(mActivity, R.color.defaultTextColor)); + mScoreTextView.setTextColor(mSecondaryTextColor); } mScoreTextView.setText(Utils.getNVotes(mShowAbsoluteNumberOfVotes, @@ -1822,7 +1840,7 @@ public class CommentAndPostRecyclerViewAdapter extends RecyclerView.Adapter<Recy } else { mPost.setVoteType(0); mUpvoteButton.clearColorFilter(); - mScoreTextView.setTextColor(ContextCompat.getColor(mActivity, R.color.defaultTextColor)); + mScoreTextView.setTextColor(mSecondaryTextColor); } mDownvoteButton.clearColorFilter(); @@ -1878,7 +1896,7 @@ public class CommentAndPostRecyclerViewAdapter extends RecyclerView.Adapter<Recy mPost.setVoteType(0); newVoteType = RedditUtils.DIR_UNVOTE; mDownvoteButton.clearColorFilter(); - mScoreTextView.setTextColor(ContextCompat.getColor(mActivity, R.color.defaultTextColor)); + mScoreTextView.setTextColor(mSecondaryTextColor); } mScoreTextView.setText(Utils.getNVotes(mShowAbsoluteNumberOfVotes, @@ -1896,7 +1914,7 @@ public class CommentAndPostRecyclerViewAdapter extends RecyclerView.Adapter<Recy } else { mPost.setVoteType(0); mDownvoteButton.clearColorFilter(); - mScoreTextView.setTextColor(ContextCompat.getColor(mActivity, R.color.defaultTextColor)); + mScoreTextView.setTextColor(mSecondaryTextColor); } mUpvoteButton.clearColorFilter(); diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/Adapter/CommentsListingRecyclerViewAdapter.java b/app/src/main/java/ml/docilealligator/infinityforreddit/Adapter/CommentsListingRecyclerViewAdapter.java index 82aa865b..078aa57b 100644 --- a/app/src/main/java/ml/docilealligator/infinityforreddit/Adapter/CommentsListingRecyclerViewAdapter.java +++ b/app/src/main/java/ml/docilealligator/infinityforreddit/Adapter/CommentsListingRecyclerViewAdapter.java @@ -19,7 +19,6 @@ import androidx.annotation.NonNull; import androidx.appcompat.app.AppCompatActivity; import androidx.constraintlayout.widget.ConstraintLayout; import androidx.constraintlayout.widget.ConstraintSet; -import androidx.core.content.ContextCompat; import androidx.paging.PagedListAdapter; import androidx.recyclerview.widget.DiffUtil; import androidx.recyclerview.widget.RecyclerView; @@ -66,6 +65,7 @@ public class CommentsListingRecyclerViewAdapter extends PagedListAdapter<Comment private Markwon mMarkwon; private String mAccessToken; private String mAccountName; + private int mSecondaryTextColor; private int mUsernameColor; private int mSubredditColor; private int mUpvotedColor; @@ -117,6 +117,7 @@ public class CommentsListingRecyclerViewAdapter extends PagedListAdapter<Comment mShowCommentDivider = showCommentDivider; mShowAbsoluteNumberOfVotes = showAbsoluteNumberOfVotes; mRetryLoadingMoreCallback = retryLoadingMoreCallback; + mSecondaryTextColor = Utils.getAttributeColor(context, R.attr.secondaryTextColor); mSubredditColor = Utils.getAttributeColor(context, R.attr.subreddit); mUsernameColor = Utils.getAttributeColor(context, R.attr.username); mUpvotedColor = Utils.getAttributeColor(context, R.attr.upvoted); @@ -232,7 +233,7 @@ public class CommentsListingRecyclerViewAdapter extends PagedListAdapter<Comment comment.setVoteType(CommentData.VOTE_TYPE_NO_VOTE); newVoteType = RedditUtils.DIR_UNVOTE; ((DataViewHolder) holder).upvoteButton.clearColorFilter(); - ((DataViewHolder) holder).scoreTextView.setTextColor(ContextCompat.getColor(mContext, R.color.defaultTextColor)); + ((DataViewHolder) holder).scoreTextView.setTextColor(mSecondaryTextColor); } ((DataViewHolder) holder).scoreTextView.setText(Utils.getNVotes(mShowAbsoluteNumberOfVotes, @@ -248,7 +249,7 @@ public class CommentsListingRecyclerViewAdapter extends PagedListAdapter<Comment } else { comment.setVoteType(CommentData.VOTE_TYPE_NO_VOTE); ((DataViewHolder) holder).upvoteButton.clearColorFilter(); - ((DataViewHolder) holder).scoreTextView.setTextColor(ContextCompat.getColor(mContext, R.color.defaultTextColor)); + ((DataViewHolder) holder).scoreTextView.setTextColor(mSecondaryTextColor); } ((DataViewHolder) holder).downvoteButton.clearColorFilter(); @@ -284,7 +285,7 @@ public class CommentsListingRecyclerViewAdapter extends PagedListAdapter<Comment comment.setVoteType(CommentData.VOTE_TYPE_NO_VOTE); newVoteType = RedditUtils.DIR_UNVOTE; ((DataViewHolder) holder).downvoteButton.clearColorFilter(); - ((DataViewHolder) holder).scoreTextView.setTextColor(ContextCompat.getColor(mContext, R.color.defaultTextColor)); + ((DataViewHolder) holder).scoreTextView.setTextColor(mSecondaryTextColor); } ((DataViewHolder) holder).scoreTextView.setText(Utils.getNVotes(mShowAbsoluteNumberOfVotes, @@ -300,7 +301,7 @@ public class CommentsListingRecyclerViewAdapter extends PagedListAdapter<Comment } else { comment.setVoteType(CommentData.VOTE_TYPE_NO_VOTE); ((DataViewHolder) holder).downvoteButton.clearColorFilter(); - ((DataViewHolder) holder).scoreTextView.setTextColor(ContextCompat.getColor(mContext, R.color.defaultTextColor)); + ((DataViewHolder) holder).scoreTextView.setTextColor(mSecondaryTextColor); } ((DataViewHolder) holder).upvoteButton.clearColorFilter(); @@ -380,7 +381,7 @@ public class CommentsListingRecyclerViewAdapter extends PagedListAdapter<Comment if (holder instanceof DataViewHolder) { ((DataViewHolder) holder).upvoteButton.clearColorFilter(); ((DataViewHolder) holder).downvoteButton.clearColorFilter(); - ((DataViewHolder) holder).scoreTextView.setTextColor(ContextCompat.getColor(mContext, R.color.defaultTextColor)); + ((DataViewHolder) holder).scoreTextView.setTextColor(mSecondaryTextColor); } } diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/Adapter/MessageRecyclerViewAdapter.java b/app/src/main/java/ml/docilealligator/infinityforreddit/Adapter/MessageRecyclerViewAdapter.java index 764b51e0..854bb95d 100644 --- a/app/src/main/java/ml/docilealligator/infinityforreddit/Adapter/MessageRecyclerViewAdapter.java +++ b/app/src/main/java/ml/docilealligator/infinityforreddit/Adapter/MessageRecyclerViewAdapter.java @@ -57,7 +57,9 @@ public class MessageRecyclerViewAdapter extends PagedListAdapter<Message, Recycl private NetworkState networkState; private RetryLoadingMoreCallback mRetryLoadingMoreCallback; private int mMessageBackgroundColor; - private int usernameColor; + private int mUsernameColor; + private int mPrimaryTextColor; + private int mUnreadMessageBackgroundColor; public MessageRecyclerViewAdapter(Context context, Retrofit oauthRetrofit, String accessToken, RetryLoadingMoreCallback retryLoadingMoreCallback) { @@ -94,7 +96,9 @@ public class MessageRecyclerViewAdapter extends PagedListAdapter<Message, Recycl mResources = context.getResources(); mMessageBackgroundColor = Utils.getAttributeColor(context, R.attr.cardViewBackgroundColor); - usernameColor = Utils.getAttributeColor(context, R.attr.username); + mUsernameColor = Utils.getAttributeColor(context, R.attr.username); + mPrimaryTextColor = Utils.getAttributeColor(context, R.attr.primaryTextColor); + mUnreadMessageBackgroundColor = Utils.getAttributeColor(context, R.attr.unreadMessageBackgroundColor); } @NonNull @@ -116,11 +120,11 @@ public class MessageRecyclerViewAdapter extends PagedListAdapter<Message, Recycl if (message != null) { if (message.isNew()) { ((DataViewHolder) holder).itemView.setBackgroundColor( - mResources.getColor(R.color.unreadMessageBackgroundColor)); + mUnreadMessageBackgroundColor); } if (message.wasComment()) { - ((DataViewHolder) holder).authorTextView.setTextColor(usernameColor); + ((DataViewHolder) holder).authorTextView.setTextColor(mUsernameColor); ((DataViewHolder) holder).titleTextView.setText(message.getTitle()); } else { ((DataViewHolder) holder).titleTextView.setVisibility(View.GONE); @@ -152,7 +156,7 @@ public class MessageRecyclerViewAdapter extends PagedListAdapter<Message, Recycl @Override public void readFailed() { message.setNew(true); - ((DataViewHolder) holder).itemView.setBackgroundColor(mResources.getColor(R.color.unreadMessageBackgroundColor)); + ((DataViewHolder) holder).itemView.setBackgroundColor(mUnreadMessageBackgroundColor); } }); } @@ -199,7 +203,7 @@ public class MessageRecyclerViewAdapter extends PagedListAdapter<Message, Recycl if (holder instanceof DataViewHolder) { ((DataViewHolder) holder).itemView.setBackgroundColor(mMessageBackgroundColor); ((DataViewHolder) holder).titleTextView.setVisibility(View.VISIBLE); - ((DataViewHolder) holder).authorTextView.setTextColor(mResources.getColor(R.color.primaryTextColor)); + ((DataViewHolder) holder).authorTextView.setTextColor(mPrimaryTextColor); } } diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/Adapter/PostRecyclerViewAdapter.java b/app/src/main/java/ml/docilealligator/infinityforreddit/Adapter/PostRecyclerViewAdapter.java index 878b502d..6c5a74d0 100644 --- a/app/src/main/java/ml/docilealligator/infinityforreddit/Adapter/PostRecyclerViewAdapter.java +++ b/app/src/main/java/ml/docilealligator/infinityforreddit/Adapter/PostRecyclerViewAdapter.java @@ -21,7 +21,6 @@ import androidx.annotation.Nullable; import androidx.appcompat.app.AppCompatActivity; import androidx.constraintlayout.widget.ConstraintLayout; import androidx.constraintlayout.widget.ConstraintSet; -import androidx.core.content.ContextCompat; import androidx.paging.PagedListAdapter; import androidx.recyclerview.widget.DiffUtil; import androidx.recyclerview.widget.RecyclerView; @@ -98,10 +97,12 @@ public class PostRecyclerViewAdapter extends PagedListAdapter<Post, RecyclerView private boolean canStartActivity = true; private int mPostType; private int mPostLayout; + private int mSecondaryTextColor; private int mSubredditColor; private int mUsernameColor; private int mUpvotedColor; private int mDownvotedColor; + private int mVoteAndReplyUnavailableVoteButtonColor; private float mScale; private boolean mDisplaySubredditName; private boolean mVoteButtonsOnTheRight; @@ -135,10 +136,12 @@ public class PostRecyclerViewAdapter extends PagedListAdapter<Post, RecyclerView mShowDividerInCompactLayout = showDividerInCompactLayout; mShowAbsoluteNumberOfVotes = showAbsoluteNumberOfVotes; mPostLayout = postLayout; + mSecondaryTextColor = Utils.getAttributeColor(activity, R.attr.secondaryTextColor); mSubredditColor = Utils.getAttributeColor(activity, R.attr.subreddit); mUsernameColor = Utils.getAttributeColor(activity, R.attr.username); mUpvotedColor = Utils.getAttributeColor(activity, R.attr.upvoted); mDownvotedColor = Utils.getAttributeColor(activity, R.attr.downvoted); + mVoteAndReplyUnavailableVoteButtonColor = Utils.getAttributeColor(activity, R.attr.voteAndReplyUnavailableVoteButtonColor); mScale = activity.getResources().getDisplayMetrics().density; mGlide = Glide.with(mActivity.getApplicationContext()); mRedditDataRoomDatabase = redditDataRoomDatabase; @@ -427,9 +430,9 @@ public class PostRecyclerViewAdapter extends PagedListAdapter<Post, RecyclerView ((PostViewHolder) holder).archivedImageView.setVisibility(View.VISIBLE); ((PostViewHolder) holder).upvoteButton - .setColorFilter(ContextCompat.getColor(mActivity, R.color.voteAndReplyUnavailableVoteButtonColor), android.graphics.PorterDuff.Mode.SRC_IN); + .setColorFilter(mVoteAndReplyUnavailableVoteButtonColor, android.graphics.PorterDuff.Mode.SRC_IN); ((PostViewHolder) holder).downvoteButton - .setColorFilter(ContextCompat.getColor(mActivity, R.color.voteAndReplyUnavailableVoteButtonColor), android.graphics.PorterDuff.Mode.SRC_IN); + .setColorFilter(mVoteAndReplyUnavailableVoteButtonColor, android.graphics.PorterDuff.Mode.SRC_IN); } if (post.isCrosspost()) { @@ -566,7 +569,7 @@ public class PostRecyclerViewAdapter extends PagedListAdapter<Post, RecyclerView post.setVoteType(0); newVoteType = RedditUtils.DIR_UNVOTE; ((PostViewHolder) holder).upvoteButton.clearColorFilter(); - ((PostViewHolder) holder).scoreTextView.setTextColor(ContextCompat.getColor(mActivity, R.color.defaultTextColor)); + ((PostViewHolder) holder).scoreTextView.setTextColor(mSecondaryTextColor); } ((PostViewHolder) holder).scoreTextView.setText(Utils.getNVotes(mShowAbsoluteNumberOfVotes, post.getScore() + post.getVoteType())); @@ -582,7 +585,7 @@ public class PostRecyclerViewAdapter extends PagedListAdapter<Post, RecyclerView } else { post.setVoteType(0); ((PostViewHolder) holder).upvoteButton.clearColorFilter(); - ((PostViewHolder) holder).scoreTextView.setTextColor(ContextCompat.getColor(mActivity, R.color.defaultTextColor)); + ((PostViewHolder) holder).scoreTextView.setTextColor(mSecondaryTextColor); } ((PostViewHolder) holder).downvoteButton.clearColorFilter(); @@ -637,7 +640,7 @@ public class PostRecyclerViewAdapter extends PagedListAdapter<Post, RecyclerView post.setVoteType(0); newVoteType = RedditUtils.DIR_UNVOTE; ((PostViewHolder) holder).downvoteButton.clearColorFilter(); - ((PostViewHolder) holder).scoreTextView.setTextColor(ContextCompat.getColor(mActivity, R.color.defaultTextColor)); + ((PostViewHolder) holder).scoreTextView.setTextColor(mSecondaryTextColor); } ((PostViewHolder) holder).scoreTextView.setText(Utils.getNVotes(mShowAbsoluteNumberOfVotes, post.getScore() + post.getVoteType())); @@ -653,7 +656,7 @@ public class PostRecyclerViewAdapter extends PagedListAdapter<Post, RecyclerView } else { post.setVoteType(0); ((PostViewHolder) holder).downvoteButton.clearColorFilter(); - ((PostViewHolder) holder).scoreTextView.setTextColor(ContextCompat.getColor(mActivity, R.color.defaultTextColor)); + ((PostViewHolder) holder).scoreTextView.setTextColor(mSecondaryTextColor); } ((PostViewHolder) holder).upvoteButton.clearColorFilter(); @@ -982,9 +985,9 @@ public class PostRecyclerViewAdapter extends PagedListAdapter<Post, RecyclerView ((PostCompactViewHolder) holder).archivedImageView.setVisibility(View.VISIBLE); ((PostCompactViewHolder) holder).upvoteButton - .setColorFilter(ContextCompat.getColor(mActivity, R.color.voteAndReplyUnavailableVoteButtonColor), android.graphics.PorterDuff.Mode.SRC_IN); + .setColorFilter(mVoteAndReplyUnavailableVoteButtonColor, android.graphics.PorterDuff.Mode.SRC_IN); ((PostCompactViewHolder) holder).downvoteButton - .setColorFilter(ContextCompat.getColor(mActivity, R.color.voteAndReplyUnavailableVoteButtonColor), android.graphics.PorterDuff.Mode.SRC_IN); + .setColorFilter(mVoteAndReplyUnavailableVoteButtonColor, android.graphics.PorterDuff.Mode.SRC_IN); } if (post.isCrosspost()) { @@ -1112,7 +1115,7 @@ public class PostRecyclerViewAdapter extends PagedListAdapter<Post, RecyclerView post.setVoteType(0); newVoteType = RedditUtils.DIR_UNVOTE; ((PostCompactViewHolder) holder).upvoteButton.clearColorFilter(); - ((PostCompactViewHolder) holder).scoreTextView.setTextColor(ContextCompat.getColor(mActivity, R.color.defaultTextColor)); + ((PostCompactViewHolder) holder).scoreTextView.setTextColor(mSecondaryTextColor); } ((PostCompactViewHolder) holder).scoreTextView.setText(Utils.getNVotes(mShowAbsoluteNumberOfVotes, post.getScore() + post.getVoteType())); @@ -1128,7 +1131,7 @@ public class PostRecyclerViewAdapter extends PagedListAdapter<Post, RecyclerView } else { post.setVoteType(0); ((PostCompactViewHolder) holder).upvoteButton.clearColorFilter(); - ((PostCompactViewHolder) holder).scoreTextView.setTextColor(ContextCompat.getColor(mActivity, R.color.defaultTextColor)); + ((PostCompactViewHolder) holder).scoreTextView.setTextColor(mSecondaryTextColor); } ((PostCompactViewHolder) holder).downvoteButton.clearColorFilter(); @@ -1183,7 +1186,7 @@ public class PostRecyclerViewAdapter extends PagedListAdapter<Post, RecyclerView post.setVoteType(0); newVoteType = RedditUtils.DIR_UNVOTE; ((PostCompactViewHolder) holder).downvoteButton.clearColorFilter(); - ((PostCompactViewHolder) holder).scoreTextView.setTextColor(ContextCompat.getColor(mActivity, R.color.defaultTextColor)); + ((PostCompactViewHolder) holder).scoreTextView.setTextColor(mSecondaryTextColor); } ((PostCompactViewHolder) holder).scoreTextView.setText(Utils.getNVotes(mShowAbsoluteNumberOfVotes, post.getScore() + post.getVoteType())); @@ -1199,7 +1202,7 @@ public class PostRecyclerViewAdapter extends PagedListAdapter<Post, RecyclerView } else { post.setVoteType(0); ((PostCompactViewHolder) holder).downvoteButton.clearColorFilter(); - ((PostCompactViewHolder) holder).scoreTextView.setTextColor(ContextCompat.getColor(mActivity, R.color.defaultTextColor)); + ((PostCompactViewHolder) holder).scoreTextView.setTextColor(mSecondaryTextColor); } ((PostCompactViewHolder) holder).upvoteButton.clearColorFilter(); @@ -1463,7 +1466,7 @@ public class PostRecyclerViewAdapter extends PagedListAdapter<Post, RecyclerView ((PostViewHolder) holder).noPreviewLinkImageView.setVisibility(View.GONE); ((PostViewHolder) holder).contentTextView.setVisibility(View.GONE); ((PostViewHolder) holder).upvoteButton.clearColorFilter(); - ((PostViewHolder) holder).scoreTextView.setTextColor(ContextCompat.getColor(mActivity, R.color.defaultTextColor)); + ((PostViewHolder) holder).scoreTextView.setTextColor(mSecondaryTextColor); ((PostViewHolder) holder).downvoteButton.clearColorFilter(); } else if (holder instanceof PostCompactViewHolder) { mGlide.clear(((PostCompactViewHolder) holder).imageView); @@ -1483,7 +1486,7 @@ public class PostRecyclerViewAdapter extends PagedListAdapter<Post, RecyclerView ((PostCompactViewHolder) holder).playButtonImageView.setVisibility(View.GONE); ((PostCompactViewHolder) holder).noPreviewLinkImageView.setVisibility(View.GONE); ((PostCompactViewHolder) holder).upvoteButton.clearColorFilter(); - ((PostCompactViewHolder) holder).scoreTextView.setTextColor(ContextCompat.getColor(mActivity, R.color.defaultTextColor)); + ((PostCompactViewHolder) holder).scoreTextView.setTextColor(mSecondaryTextColor); ((PostCompactViewHolder) holder).downvoteButton.clearColorFilter(); } } diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/Fragment/CommentsListingFragment.java b/app/src/main/java/ml/docilealligator/infinityforreddit/Fragment/CommentsListingFragment.java index ba5e94ed..cbef91ab 100644 --- a/app/src/main/java/ml/docilealligator/infinityforreddit/Fragment/CommentsListingFragment.java +++ b/app/src/main/java/ml/docilealligator/infinityforreddit/Fragment/CommentsListingFragment.java @@ -8,7 +8,6 @@ import android.content.res.Configuration; import android.content.res.Resources; import android.os.Build; import android.os.Bundle; -import android.util.TypedValue; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; @@ -42,6 +41,7 @@ import ml.docilealligator.infinityforreddit.R; import ml.docilealligator.infinityforreddit.RedditDataRoomDatabase; import ml.docilealligator.infinityforreddit.SortType; import ml.docilealligator.infinityforreddit.Utils.SharedPreferencesUtils; +import ml.docilealligator.infinityforreddit.Utils.Utils; import retrofit2.Retrofit; @@ -211,11 +211,8 @@ public class CommentsListingFragment extends Fragment implements FragmentCommuni mCommentViewModel.getPaginationNetworkState().observe(this, networkState -> mAdapter.setNetworkState(networkState)); mSwipeRefreshLayout.setOnRefreshListener(() -> mCommentViewModel.refresh()); - - TypedValue typedValue = new TypedValue(); - mActivity.getTheme().resolveAttribute(R.attr.cardViewBackgroundColor, typedValue, true); - mSwipeRefreshLayout.setProgressBackgroundColorSchemeColor(typedValue.data); - mSwipeRefreshLayout.setColorSchemeResources(R.color.colorAccent); + mSwipeRefreshLayout.setProgressBackgroundColorSchemeColor(Utils.getAttributeColor(mActivity, R.attr.cardViewBackgroundColor)); + mSwipeRefreshLayout.setColorSchemeColors(Utils.getAttributeColor(mActivity, R.attr.colorAccent)); } public void changeSortType(SortType sortType) { diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/Fragment/FollowedUsersListingFragment.java b/app/src/main/java/ml/docilealligator/infinityforreddit/Fragment/FollowedUsersListingFragment.java index 93f2b36b..e3ec8f91 100644 --- a/app/src/main/java/ml/docilealligator/infinityforreddit/Fragment/FollowedUsersListingFragment.java +++ b/app/src/main/java/ml/docilealligator/infinityforreddit/Fragment/FollowedUsersListingFragment.java @@ -6,7 +6,6 @@ import android.content.res.Configuration; import android.content.res.Resources; import android.os.Build; import android.os.Bundle; -import android.util.TypedValue; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; @@ -34,6 +33,7 @@ import ml.docilealligator.infinityforreddit.Infinity; import ml.docilealligator.infinityforreddit.R; import ml.docilealligator.infinityforreddit.RedditDataRoomDatabase; import ml.docilealligator.infinityforreddit.SubscribedUserDatabase.SubscribedUserViewModel; +import ml.docilealligator.infinityforreddit.Utils.Utils; import retrofit2.Retrofit; @@ -92,10 +92,8 @@ public class FollowedUsersListingFragment extends Fragment implements FragmentCo if (mActivity instanceof SubscribedThingListingActivity) { mSwipeRefreshLayout.setOnRefreshListener(() -> ((SubscribedThingListingActivity) mActivity).loadSubscriptions(true)); - TypedValue typedValue = new TypedValue(); - mActivity.getTheme().resolveAttribute(R.attr.cardViewBackgroundColor, typedValue, true); - mSwipeRefreshLayout.setProgressBackgroundColorSchemeColor(typedValue.data); - mSwipeRefreshLayout.setColorSchemeResources(R.color.colorAccent); + mSwipeRefreshLayout.setProgressBackgroundColorSchemeColor(Utils.getAttributeColor(mActivity, R.attr.cardViewBackgroundColor)); + mSwipeRefreshLayout.setColorSchemeColors(Utils.getAttributeColor(mActivity, R.attr.colorAccent)); } else { mSwipeRefreshLayout.setEnabled(false); } diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/Fragment/PostFragment.java b/app/src/main/java/ml/docilealligator/infinityforreddit/Fragment/PostFragment.java index cf434238..66a70c74 100644 --- a/app/src/main/java/ml/docilealligator/infinityforreddit/Fragment/PostFragment.java +++ b/app/src/main/java/ml/docilealligator/infinityforreddit/Fragment/PostFragment.java @@ -11,7 +11,6 @@ import android.os.Build; import android.os.Bundle; import android.os.CountDownTimer; import android.os.Handler; -import android.util.TypedValue; import android.view.KeyEvent; import android.view.LayoutInflater; import android.view.View; @@ -70,6 +69,7 @@ import ml.docilealligator.infinityforreddit.R; import ml.docilealligator.infinityforreddit.RedditDataRoomDatabase; import ml.docilealligator.infinityforreddit.SortType; import ml.docilealligator.infinityforreddit.Utils.SharedPreferencesUtils; +import ml.docilealligator.infinityforreddit.Utils.Utils; import retrofit2.Retrofit; @@ -262,11 +262,8 @@ public class PostFragment extends Fragment implements FragmentCommunicator { }; mSwipeRefreshLayout.setOnRefreshListener(this::refresh); - - TypedValue typedValue = new TypedValue(); - activity.getTheme().resolveAttribute(R.attr.cardViewBackgroundColor, typedValue, true); - mSwipeRefreshLayout.setProgressBackgroundColorSchemeColor(typedValue.data); - mSwipeRefreshLayout.setColorSchemeResources(R.color.colorAccent); + mSwipeRefreshLayout.setProgressBackgroundColorSchemeColor(Utils.getAttributeColor(activity, R.attr.cardViewBackgroundColor)); + mSwipeRefreshLayout.setColorSchemeColors(Utils.getAttributeColor(activity, R.attr.colorAccent)); if (savedInstanceState != null) { int recyclerViewPosition = savedInstanceState.getInt(RECYCLER_VIEW_POSITION_STATE); diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/Fragment/SubredditListingFragment.java b/app/src/main/java/ml/docilealligator/infinityforreddit/Fragment/SubredditListingFragment.java index 1709fed9..91698cb6 100644 --- a/app/src/main/java/ml/docilealligator/infinityforreddit/Fragment/SubredditListingFragment.java +++ b/app/src/main/java/ml/docilealligator/infinityforreddit/Fragment/SubredditListingFragment.java @@ -9,7 +9,6 @@ import android.content.res.Configuration; import android.content.res.Resources; import android.os.Build; import android.os.Bundle; -import android.util.TypedValue; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; @@ -43,6 +42,7 @@ import ml.docilealligator.infinityforreddit.RedditDataRoomDatabase; import ml.docilealligator.infinityforreddit.SortType; import ml.docilealligator.infinityforreddit.SubredditListingViewModel; import ml.docilealligator.infinityforreddit.Utils.SharedPreferencesUtils; +import ml.docilealligator.infinityforreddit.Utils.Utils; import retrofit2.Retrofit; @@ -175,11 +175,8 @@ public class SubredditListingFragment extends Fragment implements FragmentCommun }); mSwipeRefreshLayout.setOnRefreshListener(() -> mSubredditListingViewModel.refresh()); - - TypedValue typedValue = new TypedValue(); - mActivity.getTheme().resolveAttribute(R.attr.cardViewBackgroundColor, typedValue, true); - mSwipeRefreshLayout.setProgressBackgroundColorSchemeColor(typedValue.data); - mSwipeRefreshLayout.setColorSchemeResources(R.color.colorAccent); + mSwipeRefreshLayout.setProgressBackgroundColorSchemeColor(Utils.getAttributeColor(mActivity, R.attr.cardViewBackgroundColor)); + mSwipeRefreshLayout.setColorSchemeColors(Utils.getAttributeColor(mActivity, R.attr.colorAccent)); return rootView; } diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/Fragment/SubscribedSubredditsListingFragment.java b/app/src/main/java/ml/docilealligator/infinityforreddit/Fragment/SubscribedSubredditsListingFragment.java index 704dab43..076ac28c 100644 --- a/app/src/main/java/ml/docilealligator/infinityforreddit/Fragment/SubscribedSubredditsListingFragment.java +++ b/app/src/main/java/ml/docilealligator/infinityforreddit/Fragment/SubscribedSubredditsListingFragment.java @@ -7,7 +7,6 @@ import android.content.res.Configuration; import android.content.res.Resources; import android.os.Build; import android.os.Bundle; -import android.util.TypedValue; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; @@ -37,6 +36,7 @@ import ml.docilealligator.infinityforreddit.Infinity; import ml.docilealligator.infinityforreddit.R; import ml.docilealligator.infinityforreddit.RedditDataRoomDatabase; import ml.docilealligator.infinityforreddit.SubscribedSubredditDatabase.SubscribedSubredditViewModel; +import ml.docilealligator.infinityforreddit.Utils.Utils; import retrofit2.Retrofit; @@ -98,10 +98,8 @@ public class SubscribedSubredditsListingFragment extends Fragment implements Fra if (mActivity instanceof SubscribedThingListingActivity) { mSwipeRefreshLayout.setOnRefreshListener(() -> ((SubscribedThingListingActivity) mActivity).loadSubscriptions(true)); - TypedValue typedValue = new TypedValue(); - mActivity.getTheme().resolveAttribute(R.attr.cardViewBackgroundColor, typedValue, true); - mSwipeRefreshLayout.setProgressBackgroundColorSchemeColor(typedValue.data); - mSwipeRefreshLayout.setColorSchemeResources(R.color.colorAccent); + mSwipeRefreshLayout.setProgressBackgroundColorSchemeColor(Utils.getAttributeColor(mActivity, R.attr.cardViewBackgroundColor)); + mSwipeRefreshLayout.setColorSchemeColors(Utils.getAttributeColor(mActivity, R.attr.colorAccent)); } else { mSwipeRefreshLayout.setEnabled(false); } diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/Fragment/UserListingFragment.java b/app/src/main/java/ml/docilealligator/infinityforreddit/Fragment/UserListingFragment.java index 3e580e09..3baf7f8d 100644 --- a/app/src/main/java/ml/docilealligator/infinityforreddit/Fragment/UserListingFragment.java +++ b/app/src/main/java/ml/docilealligator/infinityforreddit/Fragment/UserListingFragment.java @@ -8,7 +8,6 @@ import android.content.res.Configuration; import android.content.res.Resources; import android.os.Build; import android.os.Bundle; -import android.util.TypedValue; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; @@ -40,6 +39,7 @@ import ml.docilealligator.infinityforreddit.RedditDataRoomDatabase; import ml.docilealligator.infinityforreddit.SortType; import ml.docilealligator.infinityforreddit.UserListingViewModel; import ml.docilealligator.infinityforreddit.Utils.SharedPreferencesUtils; +import ml.docilealligator.infinityforreddit.Utils.Utils; import retrofit2.Retrofit; @@ -155,11 +155,8 @@ public class UserListingFragment extends Fragment implements FragmentCommunicato }); mSwipeRefreshLayout.setOnRefreshListener(() -> mUserListingViewModel.refresh()); - - TypedValue typedValue = new TypedValue(); - mActivity.getTheme().resolveAttribute(R.attr.cardViewBackgroundColor, typedValue, true); - mSwipeRefreshLayout.setProgressBackgroundColorSchemeColor(typedValue.data); - mSwipeRefreshLayout.setColorSchemeResources(R.color.colorAccent); + mSwipeRefreshLayout.setProgressBackgroundColorSchemeColor(Utils.getAttributeColor(mActivity, R.attr.cardViewBackgroundColor)); + mSwipeRefreshLayout.setColorSchemeColors(Utils.getAttributeColor(mActivity, R.attr.colorAccent)); return rootView; } diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/NotificationUtils.java b/app/src/main/java/ml/docilealligator/infinityforreddit/NotificationUtils.java index 6a3b9acb..2e04377d 100644 --- a/app/src/main/java/ml/docilealligator/infinityforreddit/NotificationUtils.java +++ b/app/src/main/java/ml/docilealligator/infinityforreddit/NotificationUtils.java @@ -7,6 +7,8 @@ import android.content.Context; import androidx.core.app.NotificationCompat; import androidx.core.app.NotificationManagerCompat; +import ml.docilealligator.infinityforreddit.Utils.Utils; + public class NotificationUtils { public static final String CHANNEL_SUBMIT_POST = "Submit Post"; static final String CHANNEL_ID_NEW_MESSAGES = "new_messages"; @@ -31,7 +33,7 @@ public class NotificationUtils { .setContentTitle(title) .setContentText(content) .setSmallIcon(R.drawable.ic_notification) - .setColor(context.getResources().getColor(R.color.notificationIconColor)) + .setColor(context.getResources().getColor(Utils.getAttributeColor(context, R.attr.notificationIconColor))) .setStyle(new NotificationCompat.BigTextStyle() .setSummaryText(summary) .bigText(content)) @@ -52,7 +54,7 @@ public class NotificationUtils { //set content text to support devices running API level < 24 .setContentText(content) .setSmallIcon(R.drawable.ic_notification) - .setColor(context.getResources().getColor(R.color.notificationIconColor)) + .setColor(Utils.getAttributeColor(context, R.attr.notificationIconColor)) .setGroup(group) .setGroupSummary(true) .setAutoCancel(true); diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/Service/SubmitPostService.java b/app/src/main/java/ml/docilealligator/infinityforreddit/Service/SubmitPostService.java index 0fd5e8dc..d73ab466 100644 --- a/app/src/main/java/ml/docilealligator/infinityforreddit/Service/SubmitPostService.java +++ b/app/src/main/java/ml/docilealligator/infinityforreddit/Service/SubmitPostService.java @@ -4,6 +4,7 @@ import android.app.Notification; import android.app.NotificationChannel; import android.app.NotificationManager; import android.app.Service; +import android.content.Context; import android.content.Intent; import android.graphics.Bitmap; import android.graphics.drawable.Drawable; @@ -38,6 +39,7 @@ import ml.docilealligator.infinityforreddit.NotificationUtils; import ml.docilealligator.infinityforreddit.Post.Post; import ml.docilealligator.infinityforreddit.R; import ml.docilealligator.infinityforreddit.SubmitPost; +import ml.docilealligator.infinityforreddit.Utils.Utils; import retrofit2.Retrofit; public class SubmitPostService extends Service { @@ -106,27 +108,27 @@ public class SubmitPostService extends Service { if (postType == EXTRA_POST_TEXT_OR_LINK) { content = intent.getStringExtra(EXTRA_CONTENT); kind = intent.getStringExtra(EXTRA_KIND); - startForeground(NotificationUtils.SUBMIT_POST_SERVICE_NOTIFICATION_ID, createNotification(R.string.posting)); + startForeground(NotificationUtils.SUBMIT_POST_SERVICE_NOTIFICATION_ID, createNotification(this, R.string.posting)); submitTextOrLinkPost(); } else if (postType == EXTRA_POST_TYPE_IMAGE) { mediaUri = intent.getData(); - startForeground(NotificationUtils.SUBMIT_POST_SERVICE_NOTIFICATION_ID, createNotification(R.string.posting_image)); + startForeground(NotificationUtils.SUBMIT_POST_SERVICE_NOTIFICATION_ID, createNotification(this, R.string.posting_image)); submitImagePost(); } else { mediaUri = intent.getData(); - startForeground(NotificationUtils.SUBMIT_POST_SERVICE_NOTIFICATION_ID, createNotification(R.string.posting_video)); + startForeground(NotificationUtils.SUBMIT_POST_SERVICE_NOTIFICATION_ID, createNotification(this, R.string.posting_video)); submitVideoPost(); } return START_NOT_STICKY; } - private Notification createNotification(int stringResId) { + private Notification createNotification(Context context, int stringResId) { return new NotificationCompat.Builder(this, NotificationUtils.CHANNEL_SUBMIT_POST) .setContentTitle(getString(stringResId)) .setContentText(getString(R.string.please_wait)) .setSmallIcon(R.drawable.ic_notification) - .setColor(getResources().getColor(R.color.notificationIconColor)) + .setColor(Utils.getAttributeColor(context, R.attr.notificationIconColor)) .build(); } diff --git a/app/src/main/res/drawable/play_button_round_background.xml b/app/src/main/res/drawable/play_button_round_background.xml index d047c68d..f59e3ab5 100644 --- a/app/src/main/res/drawable/play_button_round_background.xml +++ b/app/src/main/res/drawable/play_button_round_background.xml @@ -2,7 +2,7 @@ <layer-list xmlns:android="http://schemas.android.com/apk/res/android" > <item> <shape android:shape="oval"> - <solid android:color="@color/backgroundColorInverse" /> + <solid android:color="@color/playButtonBackgroundColor" /> </shape> </item> diff --git a/app/src/main/res/layout/activity_comment.xml b/app/src/main/res/layout/activity_comment.xml index decf27dd..45023334 100644 --- a/app/src/main/res/layout/activity_comment.xml +++ b/app/src/main/res/layout/activity_comment.xml @@ -38,7 +38,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_margin="16dp" - android:textColor="@color/primaryTextColor" + android:textColor="?attr/primaryTextColor" android:textSize="?attr/title_font_16" /> <androidx.recyclerview.widget.RecyclerView @@ -54,7 +54,7 @@ android:layout_width="match_parent" android:layout_height="1dp" android:layout_marginBottom="16dp" - android:background="@color/dividerColor" /> + android:background="?attr/dividerColor" /> <EditText android:id="@+id/comment_edit_text_comment_activity" @@ -68,7 +68,7 @@ android:inputType="textCapSentences|textMultiLine" android:textSize="?attr/content_font_18" android:background="#00000000" - android:textColor="@color/primaryTextColor" /> + android:textColor="?attr/primaryTextColor" /> </LinearLayout> diff --git a/app/src/main/res/layout/activity_create_multi_reddit.xml b/app/src/main/res/layout/activity_create_multi_reddit.xml index 5a06e5ec..62f492bc 100644 --- a/app/src/main/res/layout/activity_create_multi_reddit.xml +++ b/app/src/main/res/layout/activity_create_multi_reddit.xml @@ -41,13 +41,13 @@ android:inputType="textMultiLine" android:textSize="?attr/font_default" android:background="#00000000" - android:textColor="@color/primaryTextColor" + android:textColor="?attr/primaryTextColor" android:maxLength="50" /> <View android:layout_width="match_parent" android:layout_height="1dp" - android:background="@color/dividerColor" /> + android:background="?attr/dividerColor" /> <EditText android:id="@+id/description_edit_text_create_multi_reddit_activity" @@ -58,12 +58,12 @@ android:inputType="textMultiLine" android:textSize="?attr/font_default" android:background="#00000000" - android:textColor="@color/primaryTextColor" /> + android:textColor="?attr/primaryTextColor" /> <View android:layout_width="match_parent" android:layout_height="1dp" - android:background="@color/dividerColor" /> + android:background="?attr/dividerColor" /> <LinearLayout android:id="@+id/visibility_wrapper_linear_layout_create_multi_reddit_activity" @@ -80,7 +80,7 @@ android:layout_weight="1" android:text="@string/private_multi_reddit" android:textSize="?attr/font_default" - android:textColor="@color/primaryTextColor" /> + android:textColor="?attr/primaryTextColor" /> <Switch android:id="@+id/visibility_switch_create_multi_reddit_activity" @@ -97,7 +97,7 @@ android:padding="16dp" android:text="@string/select_subreddit" android:textSize="?attr/font_default" - android:textColor="@color/primaryTextColor" + android:textColor="?attr/primaryTextColor" android:clickable="true" android:focusable="true" android:background="?attr/selectableItemBackground" /> diff --git a/app/src/main/res/layout/activity_edit_comment.xml b/app/src/main/res/layout/activity_edit_comment.xml index 37fa4462..88547d89 100644 --- a/app/src/main/res/layout/activity_edit_comment.xml +++ b/app/src/main/res/layout/activity_edit_comment.xml @@ -33,7 +33,7 @@ android:inputType="textCapSentences|textMultiLine" android:textSize="?attr/content_font_18" android:background="#00000000" - android:textColor="@color/primaryTextColor" + android:textColor="?attr/primaryTextColor" app:layout_behavior="@string/appbar_scrolling_view_behavior" /> </androidx.coordinatorlayout.widget.CoordinatorLayout>
\ No newline at end of file diff --git a/app/src/main/res/layout/activity_edit_post.xml b/app/src/main/res/layout/activity_edit_post.xml index 839e90c7..2c6d4757 100644 --- a/app/src/main/res/layout/activity_edit_post.xml +++ b/app/src/main/res/layout/activity_edit_post.xml @@ -40,12 +40,12 @@ android:gravity="top" android:padding="16dp" android:textSize="?attr/title_font_18" - android:textColor="@color/primaryTextColor" /> + android:textColor="?attr/primaryTextColor" /> <View android:layout_width="match_parent" android:layout_height="1dp" - android:background="@color/dividerColor" /> + android:background="?attr/dividerColor" /> <EditText android:id="@+id/post_text_content_edit_text_edit_post_activity" @@ -57,7 +57,7 @@ android:inputType="textCapSentences|textMultiLine" android:textSize="?attr/content_font_18" android:background="#00000000" - android:textColor="@color/primaryTextColor" /> + android:textColor="?attr/primaryTextColor" /> </LinearLayout> diff --git a/app/src/main/res/layout/activity_post_image.xml b/app/src/main/res/layout/activity_post_image.xml index 92254896..e4acbe5c 100644 --- a/app/src/main/res/layout/activity_post_image.xml +++ b/app/src/main/res/layout/activity_post_image.xml @@ -75,7 +75,7 @@ <View android:layout_width="match_parent" android:layout_height="1dp" - android:background="@color/dividerColor" /> + android:background="?attr/dividerColor" /> <LinearLayout android:layout_width="match_parent" @@ -88,7 +88,7 @@ android:layout_margin="16dp" android:padding="4dp" android:text="@string/flair" - android:textColor="@color/primaryTextColor" + android:textColor="?attr/primaryTextColor" android:textSize="?attr/font_default" android:visibility="gone" app:lib_setRadius="3dp" @@ -103,7 +103,7 @@ android:layout_margin="16dp" android:padding="4dp" android:text="@string/spoiler" - android:textColor="@color/primaryTextColor" + android:textColor="?attr/primaryTextColor" android:textSize="?attr/font_default" app:lib_setRadius="3dp" app:lib_setRoundedBorderColor="?attr/spoilerColor" @@ -117,10 +117,10 @@ android:layout_margin="16dp" android:padding="4dp" android:text="@string/nsfw" - android:textColor="@color/primaryTextColor" + android:textColor="?attr/primaryTextColor" android:textSize="?attr/font_default" app:lib_setRadius="3dp" - app:lib_setRoundedBorderColor="@color/colorAccent" + app:lib_setRoundedBorderColor="?attr/nsfwColor" app:lib_setRoundedView="true" app:lib_setShape="rectangle" /> @@ -129,7 +129,7 @@ <View android:layout_width="match_parent" android:layout_height="1dp" - android:background="@color/dividerColor" /> + android:background="?attr/dividerColor" /> <EditText android:id="@+id/post_title_edit_text_post_image_activity" @@ -141,12 +141,12 @@ android:inputType="textCapSentences|textMultiLine" android:textSize="?attr/title_font_18" android:background="#00000000" - android:textColor="@color/primaryTextColor" /> + android:textColor="?attr/primaryTextColor" /> <View android:layout_width="match_parent" android:layout_height="1dp" - android:background="@color/dividerColor" /> + android:background="?attr/dividerColor" /> <androidx.constraintlayout.widget.ConstraintLayout android:id="@+id/select_image_constraint_layout_post_image_activity" @@ -188,7 +188,7 @@ android:layout_height="wrap_content" android:padding="16dp" android:text="@string/select_again" - android:textColor="@color/colorAccent" + android:textColor="?attr/colorAccent" android:textSize="?attr/font_default" android:visibility="gone" /> diff --git a/app/src/main/res/layout/activity_post_link.xml b/app/src/main/res/layout/activity_post_link.xml index 7aed97e1..5a314141 100644 --- a/app/src/main/res/layout/activity_post_link.xml +++ b/app/src/main/res/layout/activity_post_link.xml @@ -75,7 +75,7 @@ <View android:layout_width="match_parent" android:layout_height="1dp" - android:background="@color/dividerColor" /> + android:background="?attr/dividerColor" /> <LinearLayout android:layout_width="match_parent" @@ -88,7 +88,7 @@ android:layout_margin="16dp" android:padding="4dp" android:text="@string/flair" - android:textColor="@color/primaryTextColor" + android:textColor="?attr/primaryTextColor" android:textSize="?attr/font_default" android:visibility="gone" app:lib_setRadius="3dp" @@ -103,7 +103,7 @@ android:layout_margin="16dp" android:padding="4dp" android:text="@string/spoiler" - android:textColor="@color/primaryTextColor" + android:textColor="?attr/primaryTextColor" android:textSize="?attr/font_default" app:lib_setRadius="3dp" app:lib_setRoundedBorderColor="?attr/spoilerColor" @@ -117,10 +117,10 @@ android:layout_margin="16dp" android:padding="4dp" android:text="@string/nsfw" - android:textColor="@color/primaryTextColor" + android:textColor="?attr/primaryTextColor" android:textSize="?attr/font_default" app:lib_setRadius="3dp" - app:lib_setRoundedBorderColor="@color/colorAccent" + app:lib_setRoundedBorderColor="?attr/nsfwColor" app:lib_setRoundedView="true" app:lib_setShape="rectangle" /> @@ -129,7 +129,7 @@ <View android:layout_width="match_parent" android:layout_height="1dp" - android:background="@color/dividerColor" /> + android:background="?attr/dividerColor" /> <EditText android:id="@+id/post_title_edit_text_post_link_activity" @@ -141,12 +141,12 @@ android:inputType="textCapSentences|textMultiLine" android:textSize="?attr/title_font_18" android:background="#00000000" - android:textColor="@color/primaryTextColor" /> + android:textColor="?attr/primaryTextColor" /> <View android:layout_width="match_parent" android:layout_height="1dp" - android:background="@color/dividerColor" /> + android:background="?attr/dividerColor" /> <EditText android:id="@+id/post_link_edit_text_post_link_activity" @@ -158,7 +158,7 @@ android:inputType="textMultiLine" android:textSize="?attr/content_font_18" android:background="#00000000" - android:textColor="@color/primaryTextColor" /> + android:textColor="?attr/primaryTextColor" /> </LinearLayout> diff --git a/app/src/main/res/layout/activity_post_text.xml b/app/src/main/res/layout/activity_post_text.xml index 5f6d638d..619e2805 100644 --- a/app/src/main/res/layout/activity_post_text.xml +++ b/app/src/main/res/layout/activity_post_text.xml @@ -75,7 +75,7 @@ <View android:layout_width="match_parent" android:layout_height="1dp" - android:background="@color/dividerColor" /> + android:background="?attr/dividerColor" /> <LinearLayout android:layout_width="match_parent" @@ -88,7 +88,7 @@ android:layout_margin="16dp" android:padding="4dp" android:text="@string/flair" - android:textColor="@color/primaryTextColor" + android:textColor="?attr/primaryTextColor" android:textSize="?attr/font_default" android:visibility="gone" app:lib_setRadius="3dp" @@ -103,7 +103,7 @@ android:layout_margin="16dp" android:padding="4dp" android:text="@string/spoiler" - android:textColor="@color/primaryTextColor" + android:textColor="?attr/primaryTextColor" android:textSize="?attr/font_default" app:lib_setRadius="3dp" app:lib_setRoundedBorderColor="?attr/spoilerColor" @@ -117,10 +117,10 @@ android:layout_margin="16dp" android:padding="4dp" android:text="@string/nsfw" - android:textColor="@color/primaryTextColor" + android:textColor="?attr/primaryTextColor" android:textSize="?attr/font_default" app:lib_setRadius="3dp" - app:lib_setRoundedBorderColor="@color/colorAccent" + app:lib_setRoundedBorderColor="?attr/nsfwColor" app:lib_setRoundedView="true" app:lib_setShape="rectangle" /> @@ -129,7 +129,7 @@ <View android:layout_width="match_parent" android:layout_height="1dp" - android:background="@color/dividerColor" /> + android:background="?attr/dividerColor" /> <EditText android:id="@+id/post_title_edit_text_post_text_activity" @@ -141,12 +141,12 @@ android:inputType="textCapSentences|textMultiLine" android:textSize="?attr/title_font_18" android:background="#00000000" - android:textColor="@color/primaryTextColor" /> + android:textColor="?attr/primaryTextColor" /> <View android:layout_width="match_parent" android:layout_height="1dp" - android:background="@color/dividerColor" /> + android:background="?attr/dividerColor" /> <EditText android:id="@+id/post_text_content_edit_text_post_text_activity" @@ -158,7 +158,7 @@ android:inputType="textCapSentences|textMultiLine" android:textSize="?attr/content_font_18" android:background="#00000000" - android:textColor="@color/primaryTextColor" /> + android:textColor="?attr/primaryTextColor" /> </LinearLayout> diff --git a/app/src/main/res/layout/activity_post_video.xml b/app/src/main/res/layout/activity_post_video.xml index 341034a7..b0a321f7 100644 --- a/app/src/main/res/layout/activity_post_video.xml +++ b/app/src/main/res/layout/activity_post_video.xml @@ -75,7 +75,7 @@ <View android:layout_width="match_parent" android:layout_height="1dp" - android:background="@color/dividerColor" /> + android:background="?attr/dividerColor" /> <LinearLayout android:layout_width="match_parent" @@ -88,7 +88,7 @@ android:layout_margin="16dp" android:padding="4dp" android:text="@string/flair" - android:textColor="@color/primaryTextColor" + android:textColor="?attr/primaryTextColor" android:textSize="?attr/font_default" android:visibility="gone" app:lib_setRadius="3dp" @@ -103,7 +103,7 @@ android:layout_margin="16dp" android:padding="4dp" android:text="@string/spoiler" - android:textColor="@color/primaryTextColor" + android:textColor="?attr/primaryTextColor" android:textSize="?attr/font_default" app:lib_setRadius="3dp" app:lib_setRoundedBorderColor="?attr/spoilerColor" @@ -117,10 +117,10 @@ android:layout_margin="16dp" android:padding="4dp" android:text="@string/nsfw" - android:textColor="@color/primaryTextColor" + android:textColor="?attr/primaryTextColor" android:textSize="?attr/font_default" app:lib_setRadius="3dp" - app:lib_setRoundedBorderColor="@color/colorAccent" + app:lib_setRoundedBorderColor="?attr/nsfwColor" app:lib_setRoundedView="true" app:lib_setShape="rectangle" /> @@ -129,7 +129,7 @@ <View android:layout_width="match_parent" android:layout_height="1dp" - android:background="@color/dividerColor" /> + android:background="?attr/dividerColor" /> <EditText android:id="@+id/post_title_edit_text_post_video_activity" @@ -141,12 +141,12 @@ android:inputType="textCapSentences|textMultiLine" android:textSize="?attr/title_font_18" android:background="#00000000" - android:textColor="@color/primaryTextColor" /> + android:textColor="?attr/primaryTextColor" /> <View android:layout_width="match_parent" android:layout_height="1dp" - android:background="@color/dividerColor" /> + android:background="?attr/dividerColor" /> <androidx.constraintlayout.widget.ConstraintLayout android:id="@+id/select_video_constraint_layout_post_video_activity" @@ -188,7 +188,7 @@ android:layout_height="wrap_content" android:padding="16dp" android:text="@string/select_again" - android:textColor="@color/colorAccent" + android:textColor="?attr/colorAccent" android:textSize="?attr/font_default" android:visibility="gone" /> diff --git a/app/src/main/res/layout/activity_search.xml b/app/src/main/res/layout/activity_search.xml index 1dca2b6b..6317ac03 100644 --- a/app/src/main/res/layout/activity_search.xml +++ b/app/src/main/res/layout/activity_search.xml @@ -62,7 +62,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="@string/search_in" - android:textColor="@color/colorAccent" + android:textColor="?attr/colorAccent" android:textSize="?attr/font_default" /> <TextView @@ -74,7 +74,7 @@ android:layout_marginEnd="16dp" android:layout_toEndOf="@id/search_in_text_view_search_activity" android:text="@string/all_subreddits" - android:textColor="@color/primaryTextColor" + android:textColor="?attr/primaryTextColor" android:textSize="?attr/font_default" /> </RelativeLayout> diff --git a/app/src/main/res/layout/activity_view_subreddit_detail.xml b/app/src/main/res/layout/activity_view_subreddit_detail.xml index f36640ce..4b159495 100644 --- a/app/src/main/res/layout/activity_view_subreddit_detail.xml +++ b/app/src/main/res/layout/activity_view_subreddit_detail.xml @@ -61,7 +61,7 @@ android:layout_marginTop="16dp" android:layout_marginBottom="16dp" android:textSize="?attr/font_18" - android:textColor="@color/colorAccent" + android:textColor="?attr/subreddit" android:layout_gravity="center_horizontal"/> <com.google.android.material.chip.Chip @@ -81,7 +81,7 @@ android:id="@+id/subscriber_count_text_view_view_subreddit_detail_activity" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:textColor="@color/primaryTextColor" + android:textColor="?attr/primaryTextColor" android:textSize="?attr/font_default" android:layout_alignParentStart="true" android:layout_toStartOf="@id/online_subscriber_count_text_view_view_subreddit_detail_activity" /> @@ -91,7 +91,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_alignParentEnd="true" - android:textColor="@color/primaryTextColor" + android:textColor="?attr/primaryTextColor" android:textSize="?attr/font_default" /> </RelativeLayout> @@ -101,7 +101,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginBottom="16dp" - android:textColor="@color/primaryTextColor" + android:textColor="?attr/primaryTextColor" android:textSize="?attr/font_default" android:visibility="gone"/> @@ -148,7 +148,7 @@ android:paddingTop="8dp" android:paddingBottom="8dp" android:src="@drawable/ic_subscritptions_bottom_app_bar_24dp" - android:textColor="@color/primaryTextColor" + android:textColor="?attr/primaryTextColor" android:background="?attr/selectableItemBackgroundBorderless" /> <ImageView @@ -160,7 +160,7 @@ android:paddingTop="8dp" android:paddingBottom="8dp" android:src="@drawable/ic_multi_reddit_24dp" - android:textColor="@color/primaryTextColor" + android:textColor="?attr/primaryTextColor" android:background="?attr/selectableItemBackgroundBorderless" /> <TextView @@ -178,7 +178,7 @@ android:paddingTop="8dp" android:paddingBottom="8dp" android:src="@drawable/ic_inbox_24dp" - android:textColor="@color/primaryTextColor" + android:textColor="?attr/primaryTextColor" android:background="?attr/selectableItemBackgroundBorderless" /> <ImageView @@ -191,7 +191,7 @@ android:paddingBottom="8dp" android:gravity="center" android:src="@drawable/ic_account_circle_24dp" - android:textColor="@color/primaryTextColor" + android:textColor="?attr/primaryTextColor" android:background="?attr/selectableItemBackgroundBorderless" /> </LinearLayout> diff --git a/app/src/main/res/layout/activity_view_user_detail.xml b/app/src/main/res/layout/activity_view_user_detail.xml index f1d257e6..53e917de 100644 --- a/app/src/main/res/layout/activity_view_user_detail.xml +++ b/app/src/main/res/layout/activity_view_user_detail.xml @@ -75,7 +75,7 @@ android:layout_height="wrap_content" android:layout_marginTop="16dp" android:layout_marginBottom="16dp" - android:textColor="@color/primaryTextColor" + android:textColor="?attr/primaryTextColor" android:textSize="?attr/font_default" android:layout_gravity="center_horizontal"/> diff --git a/app/src/main/res/layout/dialog_edit_flair.xml b/app/src/main/res/layout/dialog_edit_flair.xml index 55efc339..cb1f51d1 100644 --- a/app/src/main/res/layout/dialog_edit_flair.xml +++ b/app/src/main/res/layout/dialog_edit_flair.xml @@ -9,7 +9,7 @@ android:layout_height="wrap_content" android:layout_margin="24dp" android:background="#00000000" - android:textColor="@color/primaryTextColor" + android:textColor="?attr/primaryTextColor" android:textSize="?attr/font_default" android:hint="@string/flair" android:maxLength="64" /> @@ -20,7 +20,7 @@ android:layout_marginStart="24dp" android:layout_marginEnd="24dp" android:text="@string/only_allow_64_chars" - android:textColor="@color/colorAccent" + android:textColor="?attr/colorAccent" android:textSize="?attr/font_default" /> </LinearLayout>
\ No newline at end of file diff --git a/app/src/main/res/layout/fragment_comment_more_bottom_sheet.xml b/app/src/main/res/layout/fragment_comment_more_bottom_sheet.xml index 397d8439..d60fe273 100644 --- a/app/src/main/res/layout/fragment_comment_more_bottom_sheet.xml +++ b/app/src/main/res/layout/fragment_comment_more_bottom_sheet.xml @@ -23,7 +23,7 @@ android:paddingEnd="32dp" android:paddingBottom="16dp" android:text="@string/edit" - android:textColor="@color/primaryTextColor" + android:textColor="?attr/primaryTextColor" android:textSize="?attr/font_default" android:visibility="gone" /> @@ -41,7 +41,7 @@ android:paddingEnd="32dp" android:paddingBottom="16dp" android:text="@string/delete" - android:textColor="@color/primaryTextColor" + android:textColor="?attr/primaryTextColor" android:textSize="?attr/font_default" android:visibility="gone" /> @@ -60,7 +60,7 @@ android:paddingEnd="32dp" android:paddingBottom="16dp" android:text="@string/share" - android:textColor="@color/primaryTextColor" + android:textColor="?attr/primaryTextColor" android:textSize="?attr/font_default" /> <TextView @@ -78,7 +78,7 @@ android:paddingEnd="32dp" android:paddingBottom="16dp" android:text="@string/copy_text" - android:textColor="@color/primaryTextColor" + android:textColor="?attr/primaryTextColor" android:textSize="?attr/font_default" /> </LinearLayout> diff --git a/app/src/main/res/layout/fragment_copy_text_bottom_sheet.xml b/app/src/main/res/layout/fragment_copy_text_bottom_sheet.xml index 43044ca2..3d82d549 100644 --- a/app/src/main/res/layout/fragment_copy_text_bottom_sheet.xml +++ b/app/src/main/res/layout/fragment_copy_text_bottom_sheet.xml @@ -17,7 +17,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/copy_raw_text" - android:textColor="@color/primaryTextColor" + android:textColor="?attr/primaryTextColor" android:textSize="?attr/font_default" android:paddingTop="16dp" android:paddingBottom="16dp" @@ -32,7 +32,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/copy_markdown" - android:textColor="@color/primaryTextColor" + android:textColor="?attr/primaryTextColor" android:textSize="?attr/font_default" android:paddingTop="16dp" android:paddingBottom="16dp" @@ -47,7 +47,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/copy_all_raw_text" - android:textColor="@color/primaryTextColor" + android:textColor="?attr/primaryTextColor" android:textSize="?attr/font_default" android:paddingTop="16dp" android:paddingBottom="16dp" @@ -62,7 +62,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/copy_all_markdown" - android:textColor="@color/primaryTextColor" + android:textColor="?attr/primaryTextColor" android:textSize="?attr/font_default" android:paddingTop="16dp" android:paddingBottom="16dp" diff --git a/app/src/main/res/layout/fragment_post_comment_sort_type_bottom_sheet.xml b/app/src/main/res/layout/fragment_post_comment_sort_type_bottom_sheet.xml index 7f7fae31..23efa55e 100644 --- a/app/src/main/res/layout/fragment_post_comment_sort_type_bottom_sheet.xml +++ b/app/src/main/res/layout/fragment_post_comment_sort_type_bottom_sheet.xml @@ -23,7 +23,7 @@ android:paddingEnd="32dp" android:paddingBottom="16dp" android:text="@string/sort_best" - android:textColor="@color/primaryTextColor" + android:textColor="?attr/primaryTextColor" android:textSize="?attr/font_default" /> <TextView @@ -38,7 +38,7 @@ android:paddingEnd="32dp" android:paddingBottom="16dp" android:text="@string/sort_confidence" - android:textColor="@color/primaryTextColor" + android:textColor="?attr/primaryTextColor" android:textSize="?attr/font_default" /> <TextView @@ -53,7 +53,7 @@ android:paddingEnd="32dp" android:paddingBottom="16dp" android:text="@string/sort_top" - android:textColor="@color/primaryTextColor" + android:textColor="?attr/primaryTextColor" android:textSize="?attr/font_default" /> <TextView @@ -68,7 +68,7 @@ android:paddingEnd="32dp" android:paddingBottom="16dp" android:text="@string/sort_new" - android:textColor="@color/primaryTextColor" + android:textColor="?attr/primaryTextColor" android:textSize="?attr/font_default" /> <TextView @@ -83,7 +83,7 @@ android:paddingEnd="32dp" android:paddingBottom="16dp" android:text="@string/sort_controversial" - android:textColor="@color/primaryTextColor" + android:textColor="?attr/primaryTextColor" android:textSize="?attr/font_default" /> <TextView @@ -98,7 +98,7 @@ android:paddingEnd="32dp" android:paddingBottom="16dp" android:text="@string/sort_old" - android:textColor="@color/primaryTextColor" + android:textColor="?attr/primaryTextColor" android:textSize="?attr/font_default" /> <TextView @@ -113,7 +113,7 @@ android:paddingEnd="32dp" android:paddingBottom="16dp" android:text="@string/sort_random" - android:textColor="@color/primaryTextColor" + android:textColor="?attr/primaryTextColor" android:textSize="?attr/font_default" /> <TextView @@ -128,7 +128,7 @@ android:paddingEnd="32dp" android:paddingBottom="16dp" android:text="@string/sort_qa" - android:textColor="@color/primaryTextColor" + android:textColor="?attr/primaryTextColor" android:textSize="?attr/font_default" /> <TextView @@ -143,7 +143,7 @@ android:paddingEnd="32dp" android:paddingBottom="16dp" android:text="@string/sort_live" - android:textColor="@color/primaryTextColor" + android:textColor="?attr/primaryTextColor" android:textSize="?attr/font_default" /> </LinearLayout> diff --git a/app/src/main/res/layout/fragment_post_layot_bottom_sheet.xml b/app/src/main/res/layout/fragment_post_layot_bottom_sheet.xml index 1a0f9d0e..bfe273f5 100644 --- a/app/src/main/res/layout/fragment_post_layot_bottom_sheet.xml +++ b/app/src/main/res/layout/fragment_post_layot_bottom_sheet.xml @@ -24,7 +24,7 @@ android:paddingEnd="32dp" android:paddingBottom="16dp" android:text="@string/post_layout_card" - android:textColor="@color/primaryTextColor" + android:textColor="?attr/primaryTextColor" android:textSize="?attr/font_default" /> <TextView @@ -39,7 +39,7 @@ android:paddingEnd="32dp" android:paddingBottom="16dp" android:text="@string/post_layout_compact" - android:textColor="@color/primaryTextColor" + android:textColor="?attr/primaryTextColor" android:textSize="?attr/font_default" /> </LinearLayout> diff --git a/app/src/main/res/layout/fragment_post_type_bottom_sheet.xml b/app/src/main/res/layout/fragment_post_type_bottom_sheet.xml index a21d1a21..2497dcb0 100644 --- a/app/src/main/res/layout/fragment_post_type_bottom_sheet.xml +++ b/app/src/main/res/layout/fragment_post_type_bottom_sheet.xml @@ -20,7 +20,7 @@ android:paddingStart="32dp" android:paddingEnd="32dp" android:text="@string/bottom_sheet_post_text" - android:textColor="@color/primaryTextColor" + android:textColor="?attr/primaryTextColor" android:textSize="?attr/font_default" android:drawableStart="@drawable/ic_outline_text_24px" android:drawablePadding="48dp" @@ -38,7 +38,7 @@ android:paddingStart="32dp" android:paddingEnd="32dp" android:text="@string/bottom_sheet_post_link" - android:textColor="@color/primaryTextColor" + android:textColor="?attr/primaryTextColor" android:textSize="?attr/font_default" android:drawableStart="@drawable/ic_link" android:drawablePadding="48dp" @@ -56,7 +56,7 @@ android:paddingStart="32dp" android:paddingEnd="32dp" android:text="@string/bottom_sheet_post_video" - android:textColor="@color/primaryTextColor" + android:textColor="?attr/primaryTextColor" android:textSize="?attr/font_default" android:drawableStart="@drawable/ic_outline_video_24dp" android:drawablePadding="48dp" @@ -74,7 +74,7 @@ android:paddingStart="32dp" android:paddingEnd="32dp" android:text="@string/bottom_sheet_post_image" - android:textColor="@color/primaryTextColor" + android:textColor="?attr/primaryTextColor" android:textSize="?attr/font_default" android:drawableStart="@drawable/ic_image_24dp" android:drawablePadding="48dp" diff --git a/app/src/main/res/layout/fragment_search_post_sort_type_bottom_sheet.xml b/app/src/main/res/layout/fragment_search_post_sort_type_bottom_sheet.xml index 88b5391f..e1c0f8ea 100644 --- a/app/src/main/res/layout/fragment_search_post_sort_type_bottom_sheet.xml +++ b/app/src/main/res/layout/fragment_search_post_sort_type_bottom_sheet.xml @@ -15,7 +15,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/sort_relevance" - android:textColor="@color/primaryTextColor" + android:textColor="?attr/primaryTextColor" android:textSize="?attr/font_default" android:paddingTop="16dp" android:paddingBottom="16dp" @@ -30,7 +30,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/sort_hot" - android:textColor="@color/primaryTextColor" + android:textColor="?attr/primaryTextColor" android:textSize="?attr/font_default" android:paddingTop="16dp" android:paddingBottom="16dp" @@ -45,7 +45,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/sort_top" - android:textColor="@color/primaryTextColor" + android:textColor="?attr/primaryTextColor" android:textSize="?attr/font_default" android:paddingTop="16dp" android:paddingBottom="16dp" @@ -60,7 +60,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/sort_new" - android:textColor="@color/primaryTextColor" + android:textColor="?attr/primaryTextColor" android:textSize="?attr/font_default" android:paddingTop="16dp" android:paddingBottom="16dp" @@ -75,7 +75,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/sort_comments" - android:textColor="@color/primaryTextColor" + android:textColor="?attr/primaryTextColor" android:textSize="?attr/font_default" android:paddingTop="16dp" android:paddingBottom="16dp" diff --git a/app/src/main/res/layout/fragment_search_user_and_subreddit_sort_type_bottom_sheet.xml b/app/src/main/res/layout/fragment_search_user_and_subreddit_sort_type_bottom_sheet.xml index 852cfc6c..be3e8030 100644 --- a/app/src/main/res/layout/fragment_search_user_and_subreddit_sort_type_bottom_sheet.xml +++ b/app/src/main/res/layout/fragment_search_user_and_subreddit_sort_type_bottom_sheet.xml @@ -15,7 +15,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/sort_relevance" - android:textColor="@color/primaryTextColor" + android:textColor="?attr/primaryTextColor" android:textSize="?attr/font_default" android:paddingTop="16dp" android:paddingBottom="16dp" @@ -30,7 +30,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/sort_activity" - android:textColor="@color/primaryTextColor" + android:textColor="?attr/primaryTextColor" android:textSize="?attr/font_default" android:paddingTop="16dp" android:paddingBottom="16dp" diff --git a/app/src/main/res/layout/fragment_share_link_bottom_sheet.xml b/app/src/main/res/layout/fragment_share_link_bottom_sheet.xml index 0d69a9c6..b842f077 100644 --- a/app/src/main/res/layout/fragment_share_link_bottom_sheet.xml +++ b/app/src/main/res/layout/fragment_share_link_bottom_sheet.xml @@ -20,7 +20,7 @@ android:paddingStart="32dp" android:paddingEnd="32dp" android:text="@string/share_post_link" - android:textColor="@color/primaryTextColor" + android:textColor="?attr/primaryTextColor" android:textSize="?attr/font_default" android:drawableStart="@drawable/ic_link" android:drawablePadding="48dp" @@ -38,7 +38,7 @@ android:paddingStart="32dp" android:paddingEnd="32dp" android:text="@string/copy_post_link" - android:textColor="@color/primaryTextColor" + android:textColor="?attr/primaryTextColor" android:textSize="?attr/font_default" android:drawableStart="@drawable/ic_copy_24dp" android:drawablePadding="48dp" @@ -55,7 +55,7 @@ android:paddingBottom="16dp" android:paddingStart="32dp" android:paddingEnd="32dp" - android:textColor="@color/primaryTextColor" + android:textColor="?attr/primaryTextColor" android:textSize="?attr/font_default" android:drawableStart="@drawable/ic_link" android:drawablePadding="48dp" @@ -73,7 +73,7 @@ android:paddingBottom="16dp" android:paddingStart="32dp" android:paddingEnd="32dp" - android:textColor="@color/primaryTextColor" + android:textColor="?attr/primaryTextColor" android:textSize="?attr/font_default" android:drawableStart="@drawable/ic_copy_24dp" android:drawablePadding="48dp" diff --git a/app/src/main/res/layout/fragment_sort_time_bottom_sheet.xml b/app/src/main/res/layout/fragment_sort_time_bottom_sheet.xml index 5975b2cc..1c0ab47b 100644 --- a/app/src/main/res/layout/fragment_sort_time_bottom_sheet.xml +++ b/app/src/main/res/layout/fragment_sort_time_bottom_sheet.xml @@ -17,7 +17,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/sort_time_hour" - android:textColor="@color/primaryTextColor" + android:textColor="?attr/primaryTextColor" android:textSize="?attr/font_default" android:paddingTop="16dp" android:paddingBottom="16dp" @@ -32,7 +32,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/sort_time_day" - android:textColor="@color/primaryTextColor" + android:textColor="?attr/primaryTextColor" android:textSize="?attr/font_default" android:paddingTop="16dp" android:paddingBottom="16dp" @@ -47,7 +47,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/sort_time_week" - android:textColor="@color/primaryTextColor" + android:textColor="?attr/primaryTextColor" android:textSize="?attr/font_default" android:paddingTop="16dp" android:paddingBottom="16dp" @@ -62,7 +62,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/sort_time_month" - android:textColor="@color/primaryTextColor" + android:textColor="?attr/primaryTextColor" android:textSize="?attr/font_default" android:paddingTop="16dp" android:paddingBottom="16dp" @@ -77,7 +77,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/sort_time_year" - android:textColor="@color/primaryTextColor" + android:textColor="?attr/primaryTextColor" android:textSize="?attr/font_default" android:paddingTop="16dp" android:paddingBottom="16dp" @@ -92,7 +92,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/sort_time_all_time" - android:textColor="@color/primaryTextColor" + android:textColor="?attr/primaryTextColor" android:textSize="?attr/font_default" android:paddingTop="16dp" android:paddingBottom="16dp" diff --git a/app/src/main/res/layout/fragment_sort_type_bottom_sheet.xml b/app/src/main/res/layout/fragment_sort_type_bottom_sheet.xml index 731f35df..f60fe0bb 100644 --- a/app/src/main/res/layout/fragment_sort_type_bottom_sheet.xml +++ b/app/src/main/res/layout/fragment_sort_type_bottom_sheet.xml @@ -15,7 +15,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/sort_best" - android:textColor="@color/primaryTextColor" + android:textColor="?attr/primaryTextColor" android:textSize="?attr/font_default" android:paddingTop="16dp" android:paddingBottom="16dp" @@ -30,7 +30,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/sort_hot" - android:textColor="@color/primaryTextColor" + android:textColor="?attr/primaryTextColor" android:textSize="?attr/font_default" android:paddingTop="16dp" android:paddingBottom="16dp" @@ -45,7 +45,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/sort_new" - android:textColor="@color/primaryTextColor" + android:textColor="?attr/primaryTextColor" android:textSize="?attr/font_default" android:paddingTop="16dp" android:paddingBottom="16dp" @@ -60,7 +60,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/sort_random" - android:textColor="@color/primaryTextColor" + android:textColor="?attr/primaryTextColor" android:textSize="?attr/font_default" android:paddingTop="16dp" android:paddingBottom="16dp" @@ -75,7 +75,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/sort_rising" - android:textColor="@color/primaryTextColor" + android:textColor="?attr/primaryTextColor" android:textSize="?attr/font_default" android:paddingTop="16dp" android:paddingBottom="16dp" @@ -90,7 +90,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/sort_top" - android:textColor="@color/primaryTextColor" + android:textColor="?attr/primaryTextColor" android:textSize="?attr/font_default" android:paddingTop="16dp" android:paddingBottom="16dp" @@ -105,7 +105,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/sort_controversial" - android:textColor="@color/primaryTextColor" + android:textColor="?attr/primaryTextColor" android:textSize="?attr/font_default" android:paddingTop="16dp" android:paddingBottom="16dp" diff --git a/app/src/main/res/layout/fragment_user_thing_sort_type_bottom_sheet.xml b/app/src/main/res/layout/fragment_user_thing_sort_type_bottom_sheet.xml index e9746197..dbf56287 100644 --- a/app/src/main/res/layout/fragment_user_thing_sort_type_bottom_sheet.xml +++ b/app/src/main/res/layout/fragment_user_thing_sort_type_bottom_sheet.xml @@ -9,7 +9,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/sort_new" - android:textColor="@color/primaryTextColor" + android:textColor="?attr/primaryTextColor" android:textSize="?attr/font_default" android:paddingTop="16dp" android:paddingBottom="16dp" @@ -24,7 +24,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/sort_hot" - android:textColor="@color/primaryTextColor" + android:textColor="?attr/primaryTextColor" android:textSize="?attr/font_default" android:paddingTop="16dp" android:paddingBottom="16dp" @@ -39,7 +39,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/sort_top" - android:textColor="@color/primaryTextColor" + android:textColor="?attr/primaryTextColor" android:textSize="?attr/font_default" android:paddingTop="16dp" android:paddingBottom="16dp" @@ -54,7 +54,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/sort_controversial" - android:textColor="@color/primaryTextColor" + android:textColor="?attr/primaryTextColor" android:textSize="?attr/font_default" android:paddingTop="16dp" android:paddingBottom="16dp" diff --git a/app/src/main/res/layout/item_acknowledgement.xml b/app/src/main/res/layout/item_acknowledgement.xml index 5e75d492..b1d37f97 100644 --- a/app/src/main/res/layout/item_acknowledgement.xml +++ b/app/src/main/res/layout/item_acknowledgement.xml @@ -14,7 +14,7 @@ android:id="@+id/name_text_view_item_acknowledgement" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:textColor="@color/primaryTextColor" + android:textColor="?attr/primaryTextColor" android:textSize="?attr/font_16" /> <TextView diff --git a/app/src/main/res/layout/item_comment.xml b/app/src/main/res/layout/item_comment.xml index 88307a62..dfefe3d1 100644 --- a/app/src/main/res/layout/item_comment.xml +++ b/app/src/main/res/layout/item_comment.xml @@ -96,7 +96,7 @@ android:layout_marginStart="16dp" android:layout_marginEnd="16dp" android:layout_marginBottom="8dp" - android:textColor="@color/primaryTextColor" + android:textColor="?attr/primaryTextColor" android:textSize="?attr/content_font_default" /> <androidx.constraintlayout.widget.ConstraintLayout @@ -215,7 +215,7 @@ android:id="@+id/divider_item_comment" android:layout_width="match_parent" android:layout_height="1dp" - android:background="@color/dividerColor" + android:background="?attr/dividerColor" android:visibility="gone" /> </LinearLayout>
\ No newline at end of file diff --git a/app/src/main/res/layout/item_flair.xml b/app/src/main/res/layout/item_flair.xml index 596da813..abd5c477 100644 --- a/app/src/main/res/layout/item_flair.xml +++ b/app/src/main/res/layout/item_flair.xml @@ -11,7 +11,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:padding="16dp" - android:textColor="@color/primaryTextColor" + android:textColor="?attr/primaryTextColor" android:textSize="?attr/font_default" /> <ImageView @@ -22,7 +22,7 @@ android:layout_marginStart="32dp" android:src="@drawable/ic_outline_edit_24px" android:visibility="gone" - android:tint="@color/primaryTextColor" + android:tint="?attr/primaryTextColor" android:background="?actionBarItemBackground" android:clickable="true" android:focusable="true" /> diff --git a/app/src/main/res/layout/item_load_comments.xml b/app/src/main/res/layout/item_load_comments.xml index 3558554f..9f994dc7 100644 --- a/app/src/main/res/layout/item_load_comments.xml +++ b/app/src/main/res/layout/item_load_comments.xml @@ -11,7 +11,7 @@ android:layout_height="wrap_content" android:layout_margin="16dp" app:mlpb_progress_stoke_width="3dp" - app:mlpb_progress_color="@color/colorAccent" + app:mlpb_progress_color="?attr/colorAccent" app:mlpb_background_color="?attr/circularProgressBarBackground" android:layout_gravity="center_horizontal"/> diff --git a/app/src/main/res/layout/item_load_more_comments_placeholder.xml b/app/src/main/res/layout/item_load_more_comments_placeholder.xml index 8c0fb3e1..fc33b062 100644 --- a/app/src/main/res/layout/item_load_more_comments_placeholder.xml +++ b/app/src/main/res/layout/item_load_more_comments_placeholder.xml @@ -21,7 +21,7 @@ android:gravity="center" android:padding="8dp" android:text="@string/comment_load_more_comments" - android:textColor="@color/primaryTextColor" + android:textColor="?attr/primaryTextColor" android:textSize="?attr/font_default" /> </LinearLayout> @@ -30,7 +30,7 @@ android:id="@+id/divider_item_load_more_comments_placeholder" android:layout_width="match_parent" android:layout_height="1dp" - android:background="@color/dividerColor" + android:background="?attr/dividerColor" android:visibility="gone" /> </LinearLayout>
\ No newline at end of file diff --git a/app/src/main/res/layout/item_message.xml b/app/src/main/res/layout/item_message.xml index cc822cc0..1ac3b4ed 100644 --- a/app/src/main/res/layout/item_message.xml +++ b/app/src/main/res/layout/item_message.xml @@ -10,7 +10,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginBottom="8dp" - android:textColor="@color/primaryTextColor" + android:textColor="?attr/primaryTextColor" android:textSize="?attr/font_default" /> <TextView @@ -19,14 +19,14 @@ android:layout_height="wrap_content" android:layout_marginBottom="8dp" android:textSize="?attr/font_16" - android:textColor="@color/primaryTextColor" /> + android:textColor="?attr/primaryTextColor" /> <TextView android:id="@+id/title_text_view_item_message" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginBottom="8dp" - android:textColor="@color/primaryTextColor" + android:textColor="?attr/primaryTextColor" android:textSize="?attr/font_default" /> <TextView diff --git a/app/src/main/res/layout/item_multi_reddit.xml b/app/src/main/res/layout/item_multi_reddit.xml index 6a8723d2..b522251b 100644 --- a/app/src/main/res/layout/item_multi_reddit.xml +++ b/app/src/main/res/layout/item_multi_reddit.xml @@ -19,7 +19,7 @@ android:layout_width="0dp" android:layout_height="wrap_content" android:layout_weight="1" - android:textColor="@color/primaryTextColor" + android:textColor="?attr/primaryTextColor" android:textSize="?attr/font_default" android:layout_gravity="center_vertical" /> diff --git a/app/src/main/res/layout/item_nav_drawer_account.xml b/app/src/main/res/layout/item_nav_drawer_account.xml index 35405b82..7cf71e6a 100644 --- a/app/src/main/res/layout/item_nav_drawer_account.xml +++ b/app/src/main/res/layout/item_nav_drawer_account.xml @@ -20,7 +20,7 @@ android:layout_marginStart="16dp" android:layout_marginEnd="16dp" android:layout_gravity="center_vertical" - android:textColor="@color/primaryTextColor" + android:textColor="?attr/primaryTextColor" android:textSize="?attr/font_default" /> </LinearLayout>
\ No newline at end of file diff --git a/app/src/main/res/layout/item_nav_drawer_divider.xml b/app/src/main/res/layout/item_nav_drawer_divider.xml index c0e73dff..c27b4d55 100644 --- a/app/src/main/res/layout/item_nav_drawer_divider.xml +++ b/app/src/main/res/layout/item_nav_drawer_divider.xml @@ -2,4 +2,4 @@ <View xmlns:android="http://schemas.android.com/apk/res/android" android:layout_width="match_parent" android:layout_height="1dp" - android:background="@color/dividerColor" />
\ No newline at end of file + android:background="?attr/dividerColor" />
\ No newline at end of file diff --git a/app/src/main/res/layout/item_nav_drawer_menu_item.xml b/app/src/main/res/layout/item_nav_drawer_menu_item.xml index 4e9f911f..4e3cdf5b 100644 --- a/app/src/main/res/layout/item_nav_drawer_menu_item.xml +++ b/app/src/main/res/layout/item_nav_drawer_menu_item.xml @@ -8,5 +8,5 @@ android:focusable="true" android:gravity="center_vertical" android:padding="16dp" - android:textColor="@color/primaryTextColor" + android:textColor="?attr/primaryTextColor" android:textSize="?attr/font_default" />
\ No newline at end of file diff --git a/app/src/main/res/layout/item_nav_drawer_subscribed_thing.xml b/app/src/main/res/layout/item_nav_drawer_subscribed_thing.xml index 0dc934fe..9c96ea4f 100644 --- a/app/src/main/res/layout/item_nav_drawer_subscribed_thing.xml +++ b/app/src/main/res/layout/item_nav_drawer_subscribed_thing.xml @@ -20,7 +20,7 @@ android:layout_width="0dp" android:layout_height="wrap_content" android:layout_weight="1" - android:textColor="@color/primaryTextColor" + android:textColor="?attr/primaryTextColor" android:textSize="?attr/font_default" android:layout_gravity="center_vertical" /> diff --git a/app/src/main/res/layout/item_post.xml b/app/src/main/res/layout/item_post.xml index 113f6855..3acff256 100644 --- a/app/src/main/res/layout/item_post.xml +++ b/app/src/main/res/layout/item_post.xml @@ -98,7 +98,7 @@ android:paddingStart="16dp" android:paddingEnd="16dp" android:textSize="?attr/title_font_18" - android:textColor="@color/primaryTextColor" /> + android:textColor="?attr/primaryTextColor" /> <TextView android:id="@+id/content_text_view_item_post" @@ -158,8 +158,8 @@ android:textSize="?attr/font_12" android:textColor="@android:color/white" android:visibility="gone" - app:lib_setRoundedBGColor="@color/colorAccent" - app:lib_setRoundedBorderColor="@color/colorAccent" + app:lib_setRoundedBGColor="?attr/nsfwColor" + app:lib_setRoundedBorderColor="?attr/nsfwColor" app:lib_setRadius="3dp" app:lib_setRoundedView="true" app:lib_setShape="rectangle" /> @@ -287,7 +287,7 @@ android:scaleType="center" android:src="@drawable/ic_link" android:tint="@android:color/tab_indicator_text" - android:background="@color/grey" + android:background="?attr/noPreviewLinkBackgroundColor" android:visibility="gone"/> <androidx.constraintlayout.widget.ConstraintLayout diff --git a/app/src/main/res/layout/item_post_compact.xml b/app/src/main/res/layout/item_post_compact.xml index ef7c2fe9..5488508f 100644 --- a/app/src/main/res/layout/item_post_compact.xml +++ b/app/src/main/res/layout/item_post_compact.xml @@ -84,7 +84,7 @@ android:layout_height="wrap_content" android:paddingStart="16dp" android:paddingEnd="16dp" - android:textColor="@color/primaryTextColor" + android:textColor="?attr/primaryTextColor" android:textSize="?attr/title_font_18" app:layout_constraintBottom_toTopOf="@id/flow_layout_item_post_compact" app:layout_constraintStart_toStartOf="parent" @@ -146,8 +146,8 @@ android:textSize="?attr/font_10" android:visibility="gone" app:lib_setRadius="3dp" - app:lib_setRoundedBGColor="@color/colorAccent" - app:lib_setRoundedBorderColor="@color/colorAccent" + app:lib_setRoundedBGColor="?attr/nsfwColor" + app:lib_setRoundedBorderColor="?attr/nsfwColor" app:lib_setRoundedView="true" app:lib_setShape="rectangle" /> @@ -265,7 +265,7 @@ android:scaleType="center" android:src="@drawable/ic_link" android:tint="@android:color/tab_indicator_text" - android:background="@color/grey" + android:background="?attr/noPreviewLinkBackgroundColor" android:visibility="gone" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintStart_toEndOf="@id/barrier2" @@ -385,7 +385,7 @@ android:id="@+id/divider_item_post_compact" android:layout_width="match_parent" android:layout_height="1dp" - android:background="@color/dividerColor" /> + android:background="?attr/dividerColor" /> </LinearLayout> diff --git a/app/src/main/res/layout/item_post_detail.xml b/app/src/main/res/layout/item_post_detail.xml index e0bcc418..983ac476 100644 --- a/app/src/main/res/layout/item_post_detail.xml +++ b/app/src/main/res/layout/item_post_detail.xml @@ -78,7 +78,7 @@ android:layout_height="wrap_content" android:paddingStart="16dp" android:paddingEnd="16dp" - android:textColor="@color/primaryTextColor" + android:textColor="?attr/primaryTextColor" android:textSize="?attr/title_font_18" android:textIsSelectable="true" android:enabled="true" @@ -140,8 +140,8 @@ android:textSize="?attr/font_12" android:textColor="@android:color/white" android:visibility="gone" - app:lib_setRoundedBGColor="@color/colorAccent" - app:lib_setRoundedBorderColor="@color/colorAccent" + app:lib_setRoundedBGColor="?attr/nsfwColor" + app:lib_setRoundedBorderColor="?attr/nsfwColor" app:lib_setRadius="3dp" app:lib_setRoundedView="true" app:lib_setShape="rectangle" /> @@ -267,7 +267,7 @@ android:id="@+id/image_view_no_preview_link_item_post_detail" android:layout_width="match_parent" android:layout_height="150dp" - android:background="@color/grey" + android:background="?attr/noPreviewLinkBackgroundColor" android:scaleType="center" android:src="@drawable/ic_link" android:tint="@android:color/tab_indicator_text" diff --git a/app/src/main/res/layout/item_rule.xml b/app/src/main/res/layout/item_rule.xml index 5230295c..8b003197 100644 --- a/app/src/main/res/layout/item_rule.xml +++ b/app/src/main/res/layout/item_rule.xml @@ -8,7 +8,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:padding="16dp" - android:textColor="@color/primaryTextColor" + android:textColor="?attr/primaryTextColor" android:textSize="?attr/title_font_16" /> <TextView diff --git a/app/src/main/res/layout/item_subreddit_listing.xml b/app/src/main/res/layout/item_subreddit_listing.xml index f9797e7e..2b3e186b 100644 --- a/app/src/main/res/layout/item_subreddit_listing.xml +++ b/app/src/main/res/layout/item_subreddit_listing.xml @@ -24,7 +24,7 @@ android:layout_height="wrap_content" android:layout_gravity="center_vertical" android:layout_marginStart="32dp" - android:textColor="@color/primaryTextColor" + android:textColor="?attr/primaryTextColor" android:textSize="?attr/font_default" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintStart_toEndOf="@+id/subreddit_icon_gif_image_view_item_subreddit_listing" diff --git a/app/src/main/res/layout/item_subscribed_subreddit_multi_selection.xml b/app/src/main/res/layout/item_subscribed_subreddit_multi_selection.xml index 22327517..1f62ae81 100644 --- a/app/src/main/res/layout/item_subscribed_subreddit_multi_selection.xml +++ b/app/src/main/res/layout/item_subscribed_subreddit_multi_selection.xml @@ -25,7 +25,7 @@ android:layout_weight="1" android:layout_gravity="center_vertical" android:layout_marginEnd="32dp" - android:textColor="@color/primaryTextColor" + android:textColor="?attr/primaryTextColor" android:textSize="?attr/font_default" /> <CheckBox diff --git a/app/src/main/res/layout/item_subscribed_thing.xml b/app/src/main/res/layout/item_subscribed_thing.xml index 79622979..0507fac4 100644 --- a/app/src/main/res/layout/item_subscribed_thing.xml +++ b/app/src/main/res/layout/item_subscribed_thing.xml @@ -20,7 +20,7 @@ android:layout_width="0dp" android:layout_height="wrap_content" android:layout_weight="1" - android:textColor="@color/primaryTextColor" + android:textColor="?attr/primaryTextColor" android:textSize="?attr/font_default" android:layout_gravity="center_vertical" /> diff --git a/app/src/main/res/layout/item_user_listing.xml b/app/src/main/res/layout/item_user_listing.xml index 9ba6d291..e2b22637 100644 --- a/app/src/main/res/layout/item_user_listing.xml +++ b/app/src/main/res/layout/item_user_listing.xml @@ -24,7 +24,7 @@ android:layout_height="wrap_content" android:layout_gravity="center_vertical" android:layout_marginStart="32dp" - android:textColor="@color/primaryTextColor" + android:textColor="?attr/primaryTextColor" android:textSize="?attr/font_default" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintStart_toEndOf="@+id/user_icon_gif_image_view_item_user_listing" diff --git a/app/src/main/res/layout/item_view_all_comments.xml b/app/src/main/res/layout/item_view_all_comments.xml index 7a3b28fe..28816da4 100644 --- a/app/src/main/res/layout/item_view_all_comments.xml +++ b/app/src/main/res/layout/item_view_all_comments.xml @@ -1,18 +1,12 @@ <?xml version="1.0" encoding="utf-8"?> -<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" +<TextView xmlns:android="http://schemas.android.com/apk/res/android" android:layout_width="match_parent" android:layout_height="wrap_content" + android:gravity="center" android:padding="16dp" android:background="?attr/selectableItemBackground" android:clickable="true" - android:focusable="true"> - - <TextView - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:text="@string/view_all_comments" - android:gravity="center" - android:textColor="@color/colorAccent" - android:textSize="?attr/font_default" /> - -</LinearLayout>
\ No newline at end of file + android:focusable="true" + android:text="@string/view_all_comments" + android:textColor="?attr/colorAccent" + android:textSize="?attr/font_default" />
\ No newline at end of file diff --git a/app/src/main/res/values-night-v27/styles.xml b/app/src/main/res/values-night-v27/styles.xml index 275f4057..9aba4df5 100644 --- a/app/src/main/res/values-night-v27/styles.xml +++ b/app/src/main/res/values-night-v27/styles.xml @@ -2,7 +2,7 @@ <style name="AppTheme.Launcher" parent="@style/AppTheme.NoActionBarWithTransparentStatusBar"> <item name="android:windowBackground">@drawable/splash_screen</item> - <item name="android:navigationBarColor">@color/navBarColor</item> + <item name="android:navigationBarColor">#121212</item> </style> </resources> diff --git a/app/src/main/res/values-night/colors.xml b/app/src/main/res/values-night/colors.xml index 61bd090a..6eab85d1 100644 --- a/app/src/main/res/values-night/colors.xml +++ b/app/src/main/res/values-night/colors.xml @@ -8,13 +8,13 @@ <color name="gold">#FFC107</color> - <color name="primaryTextColor">#FFFFFF</color> + <!--<color name="primaryTextColor">#FFFFFF</color>--> <!--<color name="colorPrimaryDarkDayNightTheme">#1E88E5</color>--> - <color name="dividerColor">#69666C</color> + <!--<color name="dividerColor">#69666C</color>--> - <color name="grey">#424242</color> + <!--<color name="grey">#424242</color>--> <color name="backgroundColor">#121212</color> @@ -22,11 +22,11 @@ <color name="backgroundColorPrimaryDark">#1565C0</color>--> - <color name="backgroundColorInverse">#FFFFFF</color> + <color name="playButtonBackgroundColor">#FFFFFF</color> <color name="roundedBottomSheetPrimaryBackground">#242424</color> - <color name="voteAndReplyUnavailableVoteButtonColor">#3C3C3C</color> + <!--<color name="voteAndReplyUnavailableVoteButtonColor">#3C3C3C</color>--> <!--<color name="tabLayoutWithExpandedCollapsingToolbarTextColor">#FFFFFF</color> @@ -40,25 +40,25 @@ <color name="tabLayoutWithCollapsedCollapsingToolbarTabIndicator">@color/tabLayoutWithCollapsedCollapsingToolbarTextColor</color>--> - <color name="navBarColor">@color/backgroundColor</color> + <!--<color name="navBarColor">@color/backgroundColor</color>--> - <color name="cardViewBackgroundColor">#242424</color> + <!--<color name="cardViewBackgroundColor">#242424</color>--> - <color name="singleCommentThreadBackgroundColor">#123E77</color> + <!--<color name="singleCommentThreadBackgroundColor">#123E77</color>--> - <color name="unreadMessageBackgroundColor">#123E77</color> + <!--<color name="unreadMessageBackgroundColor">#123E77</color>--> - <color name="notificationIconColor">#1565C0</color> + <!--<color name="notificationIconColor">#1565C0</color>--> - <color name="defaultTextColor">#B3FFFFFF</color> + <!--<color name="defaultTextColor">#B3FFFFFF</color>--> - <color name="commentVerticalBar1">#1565C0</color> + <!--<color name="commentVerticalBar1">#1565C0</color> <color name="commentVerticalBar2">#C300B3</color> <color name="commentVerticalBar3">#00B8DA</color> <color name="commentVerticalBar4">#EDCA00</color> <color name="commentVerticalBar5">#EE0219</color> <color name="commentVerticalBar6">#00B925</color> - <color name="commentVerticalBar7">#EE4602</color> + <color name="commentVerticalBar7">#EE4602</color>--> <!--<color name="toolbarAndTabBackgroundColor">#282828</color>--> </resources> diff --git a/app/src/main/res/values-v27/styles.xml b/app/src/main/res/values-v27/styles.xml index c354ca2c..5b6eb075 100644 --- a/app/src/main/res/values-v27/styles.xml +++ b/app/src/main/res/values-v27/styles.xml @@ -2,7 +2,7 @@ <style name="AppTheme.Launcher" parent="@style/AppTheme.NoActionBarWithTransparentStatusBar"> <item name="android:windowBackground">@drawable/splash_screen</item> - <item name="android:navigationBarColor">@color/navBarColor</item> + <item name="android:navigationBarColor">#FFFFFF</item> <item name="android:windowLightStatusBar">true</item> <item name="android:windowLightNavigationBar">true</item> </style> diff --git a/app/src/main/res/values/attr.xml b/app/src/main/res/values/attr.xml index 9f35b9be..03dfb30f 100644 --- a/app/src/main/res/values/attr.xml +++ b/app/src/main/res/values/attr.xml @@ -4,7 +4,7 @@ <declare-styleable name="FontStyle"> <attr name="font_default" format="dimension"/> - <attr name="font_10" format="dimension" /> + <attr name="font_10" format="dimension"/> <attr name="font_12" format="dimension"/> <attr name="font_16" format="dimension"/> <attr name="font_18" format="dimension"/> @@ -30,36 +30,51 @@ <declare-styleable name="Theme"> <attr name="colorPrimary" format="color"/> <attr name="colorPrimaryDark" format="color"/> - <attr name="colorAccent" format="color" /> - <attr name="colorPrimaryLightTheme" format="color" /> + <attr name="colorAccent" format="color"/> + <attr name="colorPrimaryLightTheme" format="color"/> + <attr name="primaryTextColor" format="color"/> + <attr name="secondaryTextColor" format="color"/> <attr name="backgroundColor" format="color"/> <attr name="roundedBottomSheetPrimaryBackground" format="color"/> <attr name="cardViewBackgroundColor" format="color"/> <attr name="toolbarAndTabBackgroundColor" format="color"/> <attr name="circularProgressBarBackground" format="color"/> <attr name="tabLayoutWithExpandedCollapsingToolbarTabBackground" format="color"/> - <attr name="tabLayoutWithExpandedCollapsingToolbarTextColor" format="color" /> - <attr name="tabLayoutWithExpandedCollapsingToolbarTabIndicator" format="color" /> + <attr name="tabLayoutWithExpandedCollapsingToolbarTextColor" format="color"/> + <attr name="tabLayoutWithExpandedCollapsingToolbarTabIndicator" format="color"/> <attr name="tabLayoutWithCollapsedCollapsingToolbarTabBackground" format="color"/> - <attr name="tabLayoutWithCollapsedCollapsingToolbarTextColor" format="color" /> - <attr name="tabLayoutWithCollapsedCollapsingToolbarTabIndicator" format="color" /> - <attr name="navBarColor" format="color" /> - <attr name="upvoted" format="color" /> - <attr name="downvoted" format="color" /> - <attr name="post_type" format="color" /> - <attr name="spoilerColor" format="color" /> - <attr name="nsfwColor" format="color" /> - <attr name="flairColor" format="color" /> - <attr name="archivedTint" format="color" /> - <attr name="lockedIconTint" format="color" /> - <attr name="crosspost" format="color" /> - <attr name="stickiedPost" format="color" /> - <attr name="subscribed" format="color" /> - <attr name="unsubscribed" format="color" /> - <attr name="username" format="color" /> - <attr name="subreddit" format="color" /> - <attr name="authorFlairTextColor" format="color" /> - <attr name="submitter" format="color" /> - <attr name="moderator" format="color" /> + <attr name="tabLayoutWithCollapsedCollapsingToolbarTextColor" format="color"/> + <attr name="tabLayoutWithCollapsedCollapsingToolbarTabIndicator" format="color"/> + <attr name="navBarColor" format="color"/> + <attr name="upvoted" format="color"/> + <attr name="downvoted" format="color"/> + <attr name="post_type" format="color"/> + <attr name="spoilerColor" format="color"/> + <attr name="nsfwColor" format="color"/> + <attr name="flairColor" format="color"/> + <attr name="archivedTint" format="color"/> + <attr name="lockedIconTint" format="color"/> + <attr name="crosspost" format="color"/> + <attr name="stickiedPost" format="color"/> + <attr name="subscribed" format="color"/> + <attr name="unsubscribed" format="color"/> + <attr name="username" format="color"/> + <attr name="subreddit" format="color"/> + <attr name="authorFlairTextColor" format="color"/> + <attr name="submitter" format="color"/> + <attr name="moderator" format="color"/> + <attr name="notificationIconColor" format="color"/> + <attr name="singleCommentThreadBackgroundColor" format="color"/> + <attr name="unreadMessageBackgroundColor" format="color"/> + <attr name="dividerColor" format="color"/> + <attr name="noPreviewLinkBackgroundColor" format="color"/> + <attr name="voteAndReplyUnavailableVoteButtonColor" format="color"/> + <attr name="commentVerticalBarColor1" format="color"/> + <attr name="commentVerticalBarColor2" format="color"/> + <attr name="commentVerticalBarColor3" format="color"/> + <attr name="commentVerticalBarColor4" format="color"/> + <attr name="commentVerticalBarColor5" format="color"/> + <attr name="commentVerticalBarColor6" format="color"/> + <attr name="commentVerticalBarColor7" format="color"/> </declare-styleable> </resources>
\ No newline at end of file diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml index c7880cd7..f5e397c5 100644 --- a/app/src/main/res/values/colors.xml +++ b/app/src/main/res/values/colors.xml @@ -8,13 +8,13 @@ <color name="gold">#FFC107</color> - <color name="primaryTextColor">#000000</color> + <!--<color name="primaryTextColor">#000000</color>--> <!--<color name="colorPrimaryDarkDayNightTheme">@color/colorPrimaryDark</color>--> - <color name="dividerColor">#E0E0E0</color> + <!--<color name="dividerColor">#E0E0E0</color>--> - <color name="grey">#E0E0E0</color> + <!--<color name="grey">#E0E0E0</color>--> <color name="backgroundColor">#FFFFFF</color> @@ -22,17 +22,17 @@ <color name="backgroundColorPrimaryDark">@color/colorPrimaryDark</color>--> - <color name="backgroundColorInverse">#000000</color> + <color name="playButtonBackgroundColor">#000000</color> <color name="roundedBottomSheetPrimaryBackground">#FFFFFF</color> - <color name="roundedBottomSheetPrimaryNavigationBarColor">@android:color/black</color> + <color name="roundedBottomSheetPrimaryNavigationBarColor">#000000</color> <!--<color name="upvoted">#E91E63</color> <color name="downvoted">#007DDE</color>--> - <color name="voteAndReplyUnavailableVoteButtonColor">#F0F0F0</color> + <!--<color name="voteAndReplyUnavailableVoteButtonColor">#F0F0F0</color>--> <!--<color name="tabLayoutWithExpandedCollapsingToolbarTextColor">@color/colorPrimary</color> @@ -46,29 +46,29 @@ <color name="tabLayoutWithCollapsedCollapsingToolbarTabIndicator">@color/tabLayoutWithCollapsedCollapsingToolbarTextColor</color>--> - <color name="navBarColor">#FFFFFF</color> + <!--<color name="navBarColor">#FFFFFF</color>--> - <color name="cardViewBackgroundColor">#FFFFFF</color> + <!--<color name="cardViewBackgroundColor">#FFFFFF</color>--> - <color name="singleCommentThreadBackgroundColor">#B3E5F9</color> + <!--<color name="singleCommentThreadBackgroundColor">#B3E5F9</color>--> - <color name="unreadMessageBackgroundColor">#B3E5F9</color> + <!--<color name="unreadMessageBackgroundColor">#B3E5F9</color>--> <!--<color name="archivedTint">#B4009F</color> <color name="lockedIconTint">#EE7302</color>--> - <color name="notificationIconColor">@color/colorPrimary</color> + <!--<color name="notificationIconColor">@color/colorPrimary</color>--> - <color name="defaultTextColor">#8A000000</color> + <!--<color name="defaultTextColor">#8A000000</color>--> - <color name="commentVerticalBar1">#1565C0</color> + <!--<color name="commentVerticalBar1">#1565C0</color> <color name="commentVerticalBar2">#EE02BE</color> <color name="commentVerticalBar3">#02DFEE</color> <color name="commentVerticalBar4">#EED502</color> <color name="commentVerticalBar5">#EE0220</color> <color name="commentVerticalBar6">#02EE6E</color> - <color name="commentVerticalBar7">#EE4602</color> + <color name="commentVerticalBar7">#EE4602</color>--> <!--<color name="toolbarAndTabBackgroundColor">@color/colorPrimary</color> diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 0f9292a8..ccb251e4 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -308,7 +308,7 @@ <string name="settings_mute_video_title">Mute Video</string> <string name="settings_confirm_to_exit">Confirm to Exit</string> <string name="settings_show_top_level_comments_first_title">Show Top-level Comments First</string> - <string name="settings_show_comment_divider_title">Show comment divider</string> + <string name="settings_show_comment_divider_title">Show Comment Divider</string> <string name="settings_show_absolute_number_of_votes_title">Show Absolute Number of Votes</string> <string name="settings_show_elapsed_time">Show Elapsed Time in Posts and Comments</string> <string name="settings_default_post_layout">Default Post Layout</string> diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml index 79085b9b..61c2bdea 100644 --- a/app/src/main/res/values/styles.xml +++ b/app/src/main/res/values/styles.xml @@ -69,7 +69,7 @@ </style> <style name="MaterialAlertDialogNegativeButtonStyle" parent="Widget.MaterialComponents.Button.TextButton.Dialog"> - <item name="android:textColor">@color/primaryTextColor</item> + <item name="android:textColor">?attr/primaryTextColor</item> </style> <style name="MaterialAlertDialogTitleTextStyle" parent="MaterialAlertDialog.MaterialComponents.Title.Text"> @@ -83,7 +83,7 @@ <style name="PreferenceActivityTheme" parent="AppTheme.NoActionBar"> <item name="android:textAppearanceListItem">@style/PreferenceTitleTextStyle</item> <item name="android:textAppearanceListItemSecondary">@style/PreferenceSubtitleTextStyle</item> - <item name="android:textColorPrimary">@color/primaryTextColor</item> + <item name="android:textColorPrimary">?attr/primaryTextColor</item> <item name="buttonBarPositiveButtonStyle">@style/MaterialAlertDialogPositiveButtonStyle</item> <item name="buttonBarNegativeButtonStyle">@style/MaterialAlertDialogNegativeButtonStyle</item> <item name="alertDialogTheme">@style/ListPreferenceStyle</item> @@ -91,7 +91,7 @@ <style name="PreferenceTitleTextStyle"> <item name="android:textSize">?attr/font_16</item> - <item name="android:textColor">@color/primaryTextColor</item> + <item name="android:textColor">?attr/primaryTextColor</item> </style> <style name="PreferenceSubtitleTextStyle"> @@ -262,9 +262,11 @@ <item name="colorPrimaryDark">@color/colorPrimaryDark</item> <item name="colorAccent">@color/colorAccent</item> <item name="colorPrimaryLightTheme">@color/colorPrimary</item> + <item name="primaryTextColor">#000000</item> + <item name="secondaryTextColor">#8A000000</item> <item name="backgroundColor">@color/backgroundColor</item> <item name="roundedBottomSheetPrimaryBackground">@color/roundedBottomSheetPrimaryBackground</item> - <item name="cardViewBackgroundColor">@color/cardViewBackgroundColor</item> + <item name="cardViewBackgroundColor">#FFFFFF</item> <item name="toolbarAndTabBackgroundColor">@color/colorPrimary</item> <item name="circularProgressBarBackground">#FFFFFF</item> <item name="tabLayoutWithExpandedCollapsingToolbarTabBackground">#FFFFFF</item> @@ -291,6 +293,19 @@ <item name="authorFlairTextColor">#EE02C4</item> <item name="submitter">#EE8A02</item> <item name="moderator">#00BA81</item> + <item name="notificationIconColor">@color/colorPrimary</item> + <item name="singleCommentThreadBackgroundColor">#B3E5F9</item> + <item name="unreadMessageBackgroundColor">#B3E5F9</item> + <item name="dividerColor">#E0E0E0</item> + <item name="noPreviewLinkBackgroundColor">#E0E0E0</item> + <item name="voteAndReplyUnavailableVoteButtonColor">#F0F0F0</item> + <item name="commentVerticalBarColor1">#1565C0</item> + <item name="commentVerticalBarColor2">#EE02BE</item> + <item name="commentVerticalBarColor3">#02DFEE</item> + <item name="commentVerticalBarColor4">#EED502</item> + <item name="commentVerticalBarColor5">#EE0220</item> + <item name="commentVerticalBarColor6">#02EE6E</item> + <item name="commentVerticalBarColor7">#EE4602</item> </style> <style name="Theme.Default.NormalDark"> @@ -298,9 +313,11 @@ <item name="colorPrimaryDark">@color/colorPrimaryDark</item> <item name="colorAccent">@color/colorAccent</item> <item name="colorPrimaryLightTheme">#1565C0</item> + <item name="primaryTextColor">#FFFFFF</item> + <item name="secondaryTextColor">#B3FFFFFF</item> <item name="backgroundColor">@color/backgroundColor</item> <item name="roundedBottomSheetPrimaryBackground">@color/roundedBottomSheetPrimaryBackground</item> - <item name="cardViewBackgroundColor">@color/cardViewBackgroundColor</item> + <item name="cardViewBackgroundColor">#242424</item> <item name="toolbarAndTabBackgroundColor">#282828</item> <item name="circularProgressBarBackground">@color/colorPrimary</item> <item name="tabLayoutWithExpandedCollapsingToolbarTabBackground">@color/backgroundColor</item> @@ -327,6 +344,19 @@ <item name="authorFlairTextColor">#EE02C4</item> <item name="submitter">#EE8A02</item> <item name="moderator">#00BA81</item> + <item name="notificationIconColor">#1565C0</item> + <item name="singleCommentThreadBackgroundColor">#123E77</item> + <item name="unreadMessageBackgroundColor">#123E77</item> + <item name="dividerColor">#69666C</item> + <item name="noPreviewLinkBackgroundColor">#424242</item> + <item name="voteAndReplyUnavailableVoteButtonColor">#3C3C3C</item> + <item name="commentVerticalBarColor1">#1565C0</item> + <item name="commentVerticalBarColor2">#C300B3</item> + <item name="commentVerticalBarColor3">#00B8DA</item> + <item name="commentVerticalBarColor4">#EDCA00</item> + <item name="commentVerticalBarColor5">#EE0219</item> + <item name="commentVerticalBarColor6">#00B925</item> + <item name="commentVerticalBarColor7">#EE4602</item> </style> <style name="Theme.Default.AmoledDark"> @@ -334,6 +364,8 @@ <item name="colorPrimaryDark">#000000</item> <item name="colorAccent">@color/colorAccent</item> <item name="colorPrimaryLightTheme">#1565C0</item> + <item name="primaryTextColor">#FFFFFF</item> + <item name="secondaryTextColor">#B3FFFFFF</item> <item name="backgroundColor">#000000</item> <item name="roundedBottomSheetPrimaryBackground">#000000</item> <item name="cardViewBackgroundColor">#000000</item> @@ -363,6 +395,70 @@ <item name="authorFlairTextColor">#EE02C4</item> <item name="submitter">#EE8A02</item> <item name="moderator">#00BA81</item> + <item name="notificationIconColor">#1565C0</item> + <item name="singleCommentThreadBackgroundColor">#123E77</item> + <item name="unreadMessageBackgroundColor">#123E77</item> + <item name="dividerColor">#69666C</item> + <item name="noPreviewLinkBackgroundColor">#424242</item> + <item name="voteAndReplyUnavailableVoteButtonColor">#3C3C3C</item> + <item name="commentVerticalBarColor1">#1565C0</item> + <item name="commentVerticalBarColor2">#C300B3</item> + <item name="commentVerticalBarColor3">#00B8DA</item> + <item name="commentVerticalBarColor4">#EDCA00</item> + <item name="commentVerticalBarColor5">#EE0219</item> + <item name="commentVerticalBarColor6">#00B925</item> + <item name="commentVerticalBarColor7">#EE4602</item> + </style> + + <style name="Theme.Purple"> + <item name="colorPrimary">#9C27B0</item> + <item name="colorPrimaryDark">#7B1FA2</item> + <item name="colorAccent">#03A9F4</item> + <item name="colorPrimaryLightTheme">#9C27B0</item> + <item name="primaryTextColor">#000000</item> + <item name="secondaryTextColor">#8A000000</item> + <item name="backgroundColor">@color/backgroundColor</item> + <item name="roundedBottomSheetPrimaryBackground">@color/roundedBottomSheetPrimaryBackground</item> + <item name="cardViewBackgroundColor">#FFFFFF</item> + <item name="toolbarAndTabBackgroundColor">#9C27B0</item> + <item name="circularProgressBarBackground">#FFFFFF</item> + <item name="tabLayoutWithExpandedCollapsingToolbarTabBackground">#FFFFFF</item> + <item name="tabLayoutWithExpandedCollapsingToolbarTextColor">#9C27B0</item> + <item name="tabLayoutWithExpandedCollapsingToolbarTabIndicator">#9C27B0</item> + <item name="tabLayoutWithCollapsedCollapsingToolbarTabBackground">#9C27B0</item> + <item name="tabLayoutWithCollapsedCollapsingToolbarTextColor">#FFFFFF</item> + <item name="tabLayoutWithCollapsedCollapsingToolbarTabIndicator">#FFFFFF</item> + <item name="navBarColor">@color/backgroundColor</item> + <item name="upvoted">#E91E63</item> + <item name="downvoted">#007DDE</item> + <item name="post_type">#7B1FA2</item> + <item name="spoilerColor">#EE02EB</item> + <item name="nsfwColor">#03A9F4</item> + <item name="flairColor">#00AA8C</item> + <item name="archivedTint">#B4009F</item> + <item name="lockedIconTint">#EE7302</item> + <item name="crosspost">#03A9F4</item> + <item name="stickiedPost">#7B1FA2</item> + <item name="subscribed">#03A9F4</item> + <item name="unsubscribed">#7B1FA2</item> + <item name="username">#7B1FA2</item> + <item name="subreddit">#03A9F4</item> + <item name="authorFlairTextColor">#EE02C4</item> + <item name="submitter">#EE8A02</item> + <item name="moderator">#00BA81</item> + <item name="notificationIconColor">#9C27B0</item> + <item name="singleCommentThreadBackgroundColor">#B3E5F9</item> + <item name="unreadMessageBackgroundColor">#B3E5F9</item> + <item name="dividerColor">#E0E0E0</item> + <item name="noPreviewLinkBackgroundColor">#E0E0E0</item> + <item name="voteAndReplyUnavailableVoteButtonColor">#F0F0F0</item> + <item name="commentVerticalBarColor1">#1565C0</item> + <item name="commentVerticalBarColor2">#EE02BE</item> + <item name="commentVerticalBarColor3">#02DFEE</item> + <item name="commentVerticalBarColor4">#EED502</item> + <item name="commentVerticalBarColor5">#EE0220</item> + <item name="commentVerticalBarColor6">#02EE6E</item> + <item name="commentVerticalBarColor7">#EE4602</item> </style> </resources> |