diff options
56 files changed, 45 insertions, 395 deletions
diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/Utils/GlideImageGetter.java b/app/src/main/java/ml/docilealligator/infinityforreddit/Utils/GlideImageGetter.java index 8e018449..04c16284 100644 --- a/app/src/main/java/ml/docilealligator/infinityforreddit/Utils/GlideImageGetter.java +++ b/app/src/main/java/ml/docilealligator/infinityforreddit/Utils/GlideImageGetter.java @@ -1,5 +1,7 @@ package ml.docilealligator.infinityforreddit.Utils; +import android.app.Activity; +import android.content.Context; import android.graphics.Bitmap; import android.graphics.Canvas; import android.graphics.drawable.BitmapDrawable; @@ -53,10 +55,13 @@ public class GlideImageGetter implements Html.ImageGetter { BitmapDrawablePlaceholder drawable = new BitmapDrawablePlaceholder(textSize); - container.get().post(() -> Glide.with(container.get().getContext()) - .asBitmap() - .load(source) - .into(drawable)); + Context context = container.get().getContext(); + if (!(context instanceof Activity && ((Activity) context).isFinishing())) { + container.get().post(() -> Glide.with(context) + .asBitmap() + .load(source) + .into(drawable)); + } return drawable; } diff --git a/app/src/main/res/drawable/ic_bookmark_border_toolbar_24dp.xml b/app/src/main/res/drawable/ic_bookmark_border_toolbar_24dp.xml index 3dfb41d7..f41f953b 100644 --- a/app/src/main/res/drawable/ic_bookmark_border_toolbar_24dp.xml +++ b/app/src/main/res/drawable/ic_bookmark_border_toolbar_24dp.xml @@ -4,6 +4,6 @@ android:viewportWidth="24" android:viewportHeight="24"> <path - android:fillColor="?attr/toolbarPrimaryTextAndIconColor" + android:fillColor="#FFFFFF" android:pathData="M17,3L7,3c-1.1,0 -1.99,0.9 -1.99,2L5,21l7,-3 7,3L19,5c0,-1.1 -0.9,-2 -2,-2zM17,18l-5,-2.18L7,18L7,5h10v13z"/> </vector> diff --git a/app/src/main/res/drawable/ic_bookmark_toolbar_24dp.xml b/app/src/main/res/drawable/ic_bookmark_toolbar_24dp.xml index fededc94..edee7cf9 100644 --- a/app/src/main/res/drawable/ic_bookmark_toolbar_24dp.xml +++ b/app/src/main/res/drawable/ic_bookmark_toolbar_24dp.xml @@ -4,6 +4,6 @@ android:viewportWidth="24" android:viewportHeight="24"> <path - android:fillColor="?attr/toolbarPrimaryTextAndIconColor" + android:fillColor="#FFFFFF" android:pathData="M17,3H7c-1.1,0 -1.99,0.9 -1.99,2L5,21l7,-3 7,3V5c0,-1.1 -0.9,-2 -2,-2z"/> </vector> diff --git a/app/src/main/res/drawable/ic_check_circle_toolbar_24dp.xml b/app/src/main/res/drawable/ic_check_circle_toolbar_24dp.xml index e5b5df1d..5f701e7f 100644 --- a/app/src/main/res/drawable/ic_check_circle_toolbar_24dp.xml +++ b/app/src/main/res/drawable/ic_check_circle_toolbar_24dp.xml @@ -4,6 +4,6 @@ android:viewportWidth="24" android:viewportHeight="24"> <path - android:fillColor="?attr/toolbarPrimaryTextAndIconColor" + android:fillColor="#FFFFFF" android:pathData="M12,2C6.48,2 2,6.48 2,12s4.48,10 10,10 10,-4.48 10,-10S17.52,2 12,2zM12,20c-4.41,0 -8,-3.59 -8,-8s3.59,-8 8,-8 8,3.59 8,8 -3.59,8 -8,8zM16.59,7.58L10,14.17l-2.59,-2.58L6,13l4,4 8,-8z"/> </vector> diff --git a/app/src/main/res/drawable/ic_comment_toolbar_24dp.xml b/app/src/main/res/drawable/ic_comment_toolbar_24dp.xml index d4920fc6..a64e966e 100644 --- a/app/src/main/res/drawable/ic_comment_toolbar_24dp.xml +++ b/app/src/main/res/drawable/ic_comment_toolbar_24dp.xml @@ -4,6 +4,6 @@ android:viewportWidth="24" android:viewportHeight="24"> <path - android:fillColor="?attr/toolbarPrimaryTextAndIconColor" + android:fillColor="#FFFFFF" android:pathData="M21.99,4c0,-1.1 -0.89,-2 -1.99,-2L4,2c-1.1,0 -2,0.9 -2,2v12c0,1.1 0.9,2 2,2h14l4,4 -0.01,-18zM20,4v13.17L18.83,16L4,16L4,4h16zM6,12h12v2L6,14zM6,9h12v2L6,11zM6,6h12v2L6,8z"/> </vector> diff --git a/app/src/main/res/drawable/ic_refresh_toolbar_24dp.xml b/app/src/main/res/drawable/ic_refresh_toolbar_24dp.xml index 0bddedb8..cf8ba97f 100644 --- a/app/src/main/res/drawable/ic_refresh_toolbar_24dp.xml +++ b/app/src/main/res/drawable/ic_refresh_toolbar_24dp.xml @@ -1,5 +1,5 @@ <vector android:height="24dp" android:viewportHeight="24.0" android:viewportWidth="24.0" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android"> - <path android:fillColor="?attr/toolbarPrimaryTextAndIconColor" android:pathData="M17.65,6.35C16.2,4.9 14.21,4 12,4c-4.42,0 -7.99,3.58 -7.99,8s3.57,8 7.99,8c3.73,0 6.84,-2.55 7.73,-6h-2.08c-0.82,2.33 -3.04,4 -5.65,4 -3.31,0 -6,-2.69 -6,-6s2.69,-6 6,-6c1.66,0 3.14,0.69 4.22,1.78L13,11h7V4l-2.35,2.35z"/> + <path android:fillColor="#FFFFFF" android:pathData="M17.65,6.35C16.2,4.9 14.21,4 12,4c-4.42,0 -7.99,3.58 -7.99,8s3.57,8 7.99,8c3.73,0 6.84,-2.55 7.73,-6h-2.08c-0.82,2.33 -3.04,4 -5.65,4 -3.31,0 -6,-2.69 -6,-6s2.69,-6 6,-6c1.66,0 3.14,0.69 4.22,1.78L13,11h7V4l-2.35,2.35z"/> </vector> diff --git a/app/src/main/res/drawable/ic_search_toolbar_24dp.xml b/app/src/main/res/drawable/ic_search_toolbar_24dp.xml index 87dde9fb..466e71dd 100644 --- a/app/src/main/res/drawable/ic_search_toolbar_24dp.xml +++ b/app/src/main/res/drawable/ic_search_toolbar_24dp.xml @@ -1,5 +1,5 @@ <vector android:height="24dp" android:viewportHeight="24.0" android:viewportWidth="24.0" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android"> - <path android:fillColor="?attr/toolbarPrimaryTextAndIconColor" android:pathData="M15.5,14h-0.79l-0.28,-0.27C15.41,12.59 16,11.11 16,9.5 16,5.91 13.09,3 9.5,3S3,5.91 3,9.5 5.91,16 9.5,16c1.61,0 3.09,-0.59 4.23,-1.57l0.27,0.28v0.79l5,4.99L20.49,19l-4.99,-5zM9.5,14C7.01,14 5,11.99 5,9.5S7.01,5 9.5,5 14,7.01 14,9.5 11.99,14 9.5,14z"/> + <path android:fillColor="#FFFFFF" android:pathData="M15.5,14h-0.79l-0.28,-0.27C15.41,12.59 16,11.11 16,9.5 16,5.91 13.09,3 9.5,3S3,5.91 3,9.5 5.91,16 9.5,16c1.61,0 3.09,-0.59 4.23,-1.57l0.27,0.28v0.79l5,4.99L20.49,19l-4.99,-5zM9.5,14C7.01,14 5,11.99 5,9.5S7.01,5 9.5,5 14,7.01 14,9.5 11.99,14 9.5,14z"/> </vector> diff --git a/app/src/main/res/drawable/ic_send_toolbar_24dp.xml b/app/src/main/res/drawable/ic_send_toolbar_24dp.xml index fb547099..9d17fde6 100644 --- a/app/src/main/res/drawable/ic_send_toolbar_24dp.xml +++ b/app/src/main/res/drawable/ic_send_toolbar_24dp.xml @@ -1,5 +1,5 @@ <vector android:height="24dp" android:viewportHeight="24.0" android:viewportWidth="24.0" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android"> - <path android:fillColor="?attr/toolbarPrimaryTextAndIconColor" android:pathData="M2.01,21L23,12 2.01,3 2,10l15,2 -15,2z"/> + <path android:fillColor="#FFFFFF" android:pathData="M2.01,21L23,12 2.01,3 2,10l15,2 -15,2z"/> </vector> diff --git a/app/src/main/res/drawable/ic_sort_toolbar_24dp.xml b/app/src/main/res/drawable/ic_sort_toolbar_24dp.xml index 8984e5aa..e795d2a2 100644 --- a/app/src/main/res/drawable/ic_sort_toolbar_24dp.xml +++ b/app/src/main/res/drawable/ic_sort_toolbar_24dp.xml @@ -4,6 +4,6 @@ android:viewportWidth="24" android:viewportHeight="24"> <path - android:fillColor="?attr/toolbarPrimaryTextAndIconColor" + android:fillColor="#FFFFFF" android:pathData="M3,18h6v-2L3,16v2zM3,6v2h18L21,6L3,6zM3,13h12v-2L3,11v2z"/> </vector> diff --git a/app/src/main/res/layout/activity_account_posts.xml b/app/src/main/res/layout/activity_account_posts.xml index 695384d5..0cf8d0ef 100644 --- a/app/src/main/res/layout/activity_account_posts.xml +++ b/app/src/main/res/layout/activity_account_posts.xml @@ -4,7 +4,6 @@ xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent" android:layout_height="match_parent" - android:background="?attr/backgroundColor" android:id="@+id/coordinator_layout_account_posts_activity" tools:context=".Activity.AccountPostsActivity"> @@ -12,7 +11,6 @@ android:id="@+id/appbar_layout_account_posts_activity" android:layout_width="match_parent" android:layout_height="wrap_content" - android:background="?attr/toolbarAndTabBackgroundColor" android:theme="@style/AppTheme.AppBarOverlay"> <com.google.android.material.appbar.CollapsingToolbarLayout diff --git a/app/src/main/res/layout/activity_account_saved_thing.xml b/app/src/main/res/layout/activity_account_saved_thing.xml index 4fb26ebe..9f54be21 100644 --- a/app/src/main/res/layout/activity_account_saved_thing.xml +++ b/app/src/main/res/layout/activity_account_saved_thing.xml @@ -4,7 +4,6 @@ xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent" android:layout_height="match_parent" - android:background="?attr/backgroundColor" android:id="@+id/coordinator_layout_account_saved_thing_activity" tools:context=".Activity.AccountPostsActivity"> @@ -12,7 +11,6 @@ android:id="@+id/appbar_layout_account_saved_thing_activity" android:layout_width="match_parent" android:layout_height="wrap_content" - android:background="?attr/toolbarAndTabBackgroundColor" android:theme="@style/AppTheme.AppBarOverlay"> <com.google.android.material.appbar.CollapsingToolbarLayout @@ -39,15 +37,11 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_gravity="bottom" - android:background="?attr/toolbarAndTabBackgroundColor" app:layout_scrollFlags="scroll|enterAlways" app:tabGravity="fill" - app:tabIndicatorColor="?attr/tabLayoutWithCollapsedCollapsingToolbarTabIndicator" app:tabIndicatorHeight="3dp" app:tabMode="fixed" app:tabRippleColor="?attr/colorControlHighlight" - app:tabSelectedTextColor="?attr/tabLayoutWithCollapsedCollapsingToolbarTextColor" - app:tabTextColor="?attr/tabLayoutWithCollapsedCollapsingToolbarTextColor" app:tabUnboundedRipple="false" /> </com.google.android.material.appbar.AppBarLayout> diff --git a/app/src/main/res/layout/activity_comment.xml b/app/src/main/res/layout/activity_comment.xml index a9af4118..33b9cfc3 100644 --- a/app/src/main/res/layout/activity_comment.xml +++ b/app/src/main/res/layout/activity_comment.xml @@ -5,14 +5,12 @@ android:id="@+id/coordinator_layout_comment_activity" android:layout_width="match_parent" android:layout_height="match_parent" - android:background="?attr/backgroundColor" tools:application=".CommentActivity"> <com.google.android.material.appbar.AppBarLayout android:id="@+id/appbar_layout_comment_activity" android:layout_width="match_parent" android:layout_height="wrap_content" - android:background="?attr/toolbarAndTabBackgroundColor" android:theme="@style/AppTheme.AppBarOverlay"> <androidx.appcompat.widget.Toolbar @@ -39,7 +37,6 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_margin="16dp" - android:textColor="?attr/commentColor" android:textSize="?attr/title_font_16" /> <androidx.recyclerview.widget.RecyclerView @@ -55,8 +52,7 @@ android:id="@+id/divider_comment_activity" android:layout_width="match_parent" android:layout_height="1dp" - android:layout_marginBottom="16dp" - android:background="?attr/dividerColor" /> + android:layout_marginBottom="16dp" /> <EditText android:id="@+id/comment_edit_text_comment_activity" 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 be4bdeda..a3a6f916 100644 --- a/app/src/main/res/layout/activity_create_multi_reddit.xml +++ b/app/src/main/res/layout/activity_create_multi_reddit.xml @@ -11,7 +11,6 @@ android:id="@+id/appbar_layout_create_multi_reddit_activity" android:layout_width="match_parent" android:layout_height="wrap_content" - android:background="?attr/toolbarAndTabBackgroundColor" android:theme="@style/AppTheme.AppBarOverlay"> <com.google.android.material.appbar.CollapsingToolbarLayout @@ -57,8 +56,7 @@ <View android:id="@+id/divider_1_create_multi_reddit_activity" android:layout_width="match_parent" - android:layout_height="1dp" - android:background="?attr/dividerColor" /> + android:layout_height="1dp" /> <EditText android:id="@+id/description_edit_text_create_multi_reddit_activity" @@ -74,8 +72,7 @@ <View android:id="@+id/divider_2_create_multi_reddit_activity" android:layout_width="match_parent" - android:layout_height="1dp" - android:background="?attr/dividerColor" /> + android:layout_height="1dp"/> <LinearLayout android:id="@+id/visibility_wrapper_linear_layout_create_multi_reddit_activity" diff --git a/app/src/main/res/layout/activity_custom_theme_listing.xml b/app/src/main/res/layout/activity_custom_theme_listing.xml index 5b35b48c..7a16e736 100644 --- a/app/src/main/res/layout/activity_custom_theme_listing.xml +++ b/app/src/main/res/layout/activity_custom_theme_listing.xml @@ -11,7 +11,6 @@ android:id="@+id/appbar_layout_customize_theme_listing_activity" android:layout_width="match_parent" android:layout_height="wrap_content" - android:background="?attr/toolbarAndTabBackgroundColor" android:theme="@style/AppTheme.AppBarOverlay"> <com.google.android.material.appbar.CollapsingToolbarLayout diff --git a/app/src/main/res/layout/activity_customize_theme.xml b/app/src/main/res/layout/activity_customize_theme.xml index 90dfa2b8..40358952 100644 --- a/app/src/main/res/layout/activity_customize_theme.xml +++ b/app/src/main/res/layout/activity_customize_theme.xml @@ -5,13 +5,13 @@ android:layout_width="match_parent" android:layout_height="match_parent" android:id="@+id/coordinator_customize_theme_activity" + android:background="?attr/backgroundColor" tools:context=".Activity.CustomizeThemeActivity"> <com.google.android.material.appbar.AppBarLayout android:id="@+id/appbar_layout_customize_theme_activity" android:layout_width="match_parent" android:layout_height="wrap_content" - android:background="?attr/toolbarAndTabBackgroundColor" android:theme="@style/AppTheme.AppBarOverlay"> <com.google.android.material.appbar.CollapsingToolbarLayout diff --git a/app/src/main/res/layout/activity_edit_comment.xml b/app/src/main/res/layout/activity_edit_comment.xml index 0b77fb15..305c9578 100644 --- a/app/src/main/res/layout/activity_edit_comment.xml +++ b/app/src/main/res/layout/activity_edit_comment.xml @@ -5,14 +5,12 @@ android:id="@+id/coordinator_layout_edit_comment_activity" android:layout_width="match_parent" android:layout_height="match_parent" - android:background="?attr/backgroundColor" tools:context=".Activity.EditCommentActivity"> <com.google.android.material.appbar.AppBarLayout android:id="@+id/appbar_layout_edit_comment_activity" android:layout_width="match_parent" android:layout_height="wrap_content" - android:background="?attr/toolbarAndTabBackgroundColor" android:theme="@style/AppTheme.AppBarOverlay"> <androidx.appcompat.widget.Toolbar diff --git a/app/src/main/res/layout/activity_edit_multi_reddit.xml b/app/src/main/res/layout/activity_edit_multi_reddit.xml index 2cc7af50..c95ea6d1 100644 --- a/app/src/main/res/layout/activity_edit_multi_reddit.xml +++ b/app/src/main/res/layout/activity_edit_multi_reddit.xml @@ -11,7 +11,6 @@ android:id="@+id/appbar_layout_edit_multi_reddit_activity" android:layout_width="match_parent" android:layout_height="wrap_content" - android:background="?attr/toolbarAndTabBackgroundColor" android:theme="@style/AppTheme.AppBarOverlay"> <com.google.android.material.appbar.CollapsingToolbarLayout @@ -65,8 +64,7 @@ <View android:id="@+id/divider_1_edit_multi_reddit_activity" android:layout_width="match_parent" - android:layout_height="1dp" - android:background="?attr/dividerColor" /> + android:layout_height="1dp" /> <EditText android:id="@+id/description_edit_text_edit_multi_reddit_activity" @@ -82,8 +80,7 @@ <View android:id="@+id/divider_2_edit_multi_reddit_activity" android:layout_width="match_parent" - android:layout_height="1dp" - android:background="?attr/dividerColor" /> + android:layout_height="1dp" /> <LinearLayout android:id="@+id/visibility_wrapper_linear_layout_edit_multi_reddit_activity" diff --git a/app/src/main/res/layout/activity_edit_post.xml b/app/src/main/res/layout/activity_edit_post.xml index 178e8af3..bc3e377b 100644 --- a/app/src/main/res/layout/activity_edit_post.xml +++ b/app/src/main/res/layout/activity_edit_post.xml @@ -5,14 +5,12 @@ android:layout_width="match_parent" android:layout_height="match_parent" android:id="@+id/coordinator_layout_edit_post_activity" - android:background="?attr/backgroundColor" tools:context=".Activity.EditPostActivity"> <com.google.android.material.appbar.AppBarLayout android:id="@+id/appbar_layout_edit_post_activity" android:layout_width="match_parent" android:layout_height="wrap_content" - android:background="?attr/toolbarAndTabBackgroundColor" android:theme="@style/AppTheme.AppBarOverlay"> <com.google.android.material.appbar.CollapsingToolbarLayout @@ -55,8 +53,7 @@ <View android:id="@+id/divider_edit_post_activity" android:layout_width="match_parent" - android:layout_height="1dp" - android:background="?attr/dividerColor" /> + android:layout_height="1dp" /> <EditText android:id="@+id/post_text_content_edit_text_edit_post_activity" diff --git a/app/src/main/res/layout/activity_filtered_thing.xml b/app/src/main/res/layout/activity_filtered_thing.xml index e6c0c125..dd8e8cb9 100644 --- a/app/src/main/res/layout/activity_filtered_thing.xml +++ b/app/src/main/res/layout/activity_filtered_thing.xml @@ -5,14 +5,12 @@ android:layout_width="match_parent" android:layout_height="match_parent" android:id="@+id/coordinator_layout_filtered_thing_activity" - android:background="?attr/backgroundColor" tools:application=".FilteredPostsActivity"> <com.google.android.material.appbar.AppBarLayout android:id="@+id/appbar_layout_filtered_posts_activity" android:layout_width="match_parent" android:layout_height="wrap_content" - android:background="?attr/toolbarAndTabBackgroundColor" android:theme="@style/AppTheme.AppBarOverlay"> <com.google.android.material.appbar.CollapsingToolbarLayout diff --git a/app/src/main/res/layout/activity_login.xml b/app/src/main/res/layout/activity_login.xml index dbf51b4c..bceaf7a0 100644 --- a/app/src/main/res/layout/activity_login.xml +++ b/app/src/main/res/layout/activity_login.xml @@ -4,14 +4,12 @@ xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent" android:layout_height="match_parent" - android:background="?attr/backgroundColor" tools:application="ml.docilealligator.infinityforreddit.Activity.LoginActivity"> <com.google.android.material.appbar.AppBarLayout android:id="@+id/appbar_layout_login_activity" android:layout_width="match_parent" android:layout_height="wrap_content" - android:background="?attr/toolbarAndTabBackgroundColor" android:theme="@style/AppTheme.AppBarOverlay"> <androidx.appcompat.widget.Toolbar diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml index b40ac82f..0165cd9f 100644 --- a/app/src/main/res/layout/activity_main.xml +++ b/app/src/main/res/layout/activity_main.xml @@ -5,7 +5,6 @@ android:layout_width="match_parent" android:layout_height="match_parent" android:fitsSystemWindows="true" - android:background="?attr/backgroundColor" tools:openDrawer="start"> <include @@ -17,8 +16,7 @@ android:layout_width="wrap_content" android:layout_height="match_parent" android:layout_gravity="start" - android:id="@+id/navigation_view_main_activity" - android:background="?attr/backgroundColor"> + android:id="@+id/navigation_view_main_activity"> <androidx.recyclerview.widget.RecyclerView android:id="@+id/nav_drawer_recycler_view_main_activity" diff --git a/app/src/main/res/layout/activity_multi_reddit_listing.xml b/app/src/main/res/layout/activity_multi_reddit_listing.xml index 65285189..6fdd794a 100644 --- a/app/src/main/res/layout/activity_multi_reddit_listing.xml +++ b/app/src/main/res/layout/activity_multi_reddit_listing.xml @@ -11,7 +11,6 @@ android:id="@+id/appbar_layout_multi_reddit_listing_activity" android:layout_width="match_parent" android:layout_height="wrap_content" - android:background="?attr/toolbarAndTabBackgroundColor" android:theme="@style/AppTheme.AppBarOverlay"> <com.google.android.material.appbar.CollapsingToolbarLayout @@ -77,7 +76,6 @@ android:layout_height="wrap_content" android:layout_margin="@dimen/fab_margin" android:layout_gravity="bottom|end" - app:backgroundTint="?attr/colorPrimaryLightTheme" app:srcCompat="@drawable/ic_add_day_night_24dp" app:tint="@android:color/white" /> diff --git a/app/src/main/res/layout/activity_post_image.xml b/app/src/main/res/layout/activity_post_image.xml index e4a21951..8360f4b9 100644 --- a/app/src/main/res/layout/activity_post_image.xml +++ b/app/src/main/res/layout/activity_post_image.xml @@ -5,14 +5,12 @@ android:id="@+id/coordinator_layout_post_image_activity" android:layout_width="match_parent" android:layout_height="match_parent" - android:background="?attr/backgroundColor" tools:application=".PostImageActivity"> <com.google.android.material.appbar.AppBarLayout android:id="@+id/appbar_layout_post_image_activity" android:layout_width="match_parent" android:layout_height="wrap_content" - android:background="?attr/toolbarAndTabBackgroundColor" android:theme="@style/AppTheme.AppBarOverlay"> <androidx.appcompat.widget.Toolbar @@ -76,8 +74,7 @@ <View android:id="@+id/divider_1_post_image_activity" android:layout_width="match_parent" - android:layout_height="1dp" - android:background="?attr/dividerColor" /> + android:layout_height="1dp" /> <LinearLayout android:layout_width="match_parent" @@ -94,7 +91,6 @@ android:textSize="?attr/font_default" android:visibility="gone" app:lib_setRadius="3dp" - app:lib_setRoundedBorderColor="?attr/flairColor" app:lib_setRoundedView="true" app:lib_setShape="rectangle" /> @@ -108,7 +104,6 @@ android:textColor="?attr/primaryTextColor" android:textSize="?attr/font_default" app:lib_setRadius="3dp" - app:lib_setRoundedBorderColor="?attr/spoilerColor" app:lib_setRoundedView="true" app:lib_setShape="rectangle" /> @@ -122,7 +117,6 @@ android:textColor="?attr/primaryTextColor" android:textSize="?attr/font_default" app:lib_setRadius="3dp" - app:lib_setRoundedBorderColor="?attr/nsfwColor" app:lib_setRoundedView="true" app:lib_setShape="rectangle" /> @@ -131,8 +125,7 @@ <View android:id="@+id/divider_2_post_image_activity" android:layout_width="match_parent" - android:layout_height="1dp" - android:background="?attr/dividerColor" /> + android:layout_height="1dp" /> <EditText android:id="@+id/post_title_edit_text_post_image_activity" @@ -149,8 +142,7 @@ <View android:id="@+id/divider_3_post_image_activity" android:layout_width="match_parent" - android:layout_height="1dp" - android:background="?attr/dividerColor" /> + android:layout_height="1dp" /> <androidx.constraintlayout.widget.ConstraintLayout android:id="@+id/select_image_constraint_layout_post_image_activity" @@ -163,7 +155,6 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:src="@drawable/ic_outline_add_a_photo_24dp" - app:backgroundTint="?attr/colorPrimaryLightTheme" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toStartOf="@+id/select_from_library_fab_post_image_activity" app:layout_constraintHorizontal_chainStyle="spread" @@ -176,7 +167,6 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:src="@drawable/ic_outline_select_photo_24dp" - app:backgroundTint="?attr/colorPrimaryLightTheme" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintHorizontal_chainStyle="spread" diff --git a/app/src/main/res/layout/activity_post_link.xml b/app/src/main/res/layout/activity_post_link.xml index 4b7ba671..0187eb5a 100644 --- a/app/src/main/res/layout/activity_post_link.xml +++ b/app/src/main/res/layout/activity_post_link.xml @@ -5,14 +5,12 @@ android:id="@+id/coordinator_layout_post_link_activity" android:layout_width="match_parent" android:layout_height="match_parent" - android:background="?attr/backgroundColor" tools:application=".PostTextActivity"> <com.google.android.material.appbar.AppBarLayout android:id="@+id/appbar_layout_post_link_activity" android:layout_width="match_parent" android:layout_height="wrap_content" - android:background="?attr/toolbarAndTabBackgroundColor" android:theme="@style/AppTheme.AppBarOverlay"> <androidx.appcompat.widget.Toolbar @@ -76,8 +74,7 @@ <View android:id="@+id/divider_1_post_link_activity" android:layout_width="match_parent" - android:layout_height="1dp" - android:background="?attr/dividerColor" /> + android:layout_height="1dp" /> <LinearLayout android:layout_width="match_parent" @@ -94,7 +91,6 @@ android:textSize="?attr/font_default" android:visibility="gone" app:lib_setRadius="3dp" - app:lib_setRoundedBorderColor="?attr/flairColor" app:lib_setRoundedView="true" app:lib_setShape="rectangle" /> @@ -108,7 +104,6 @@ android:textColor="?attr/primaryTextColor" android:textSize="?attr/font_default" app:lib_setRadius="3dp" - app:lib_setRoundedBorderColor="?attr/spoilerColor" app:lib_setRoundedView="true" app:lib_setShape="rectangle" /> @@ -122,7 +117,6 @@ android:textColor="?attr/primaryTextColor" android:textSize="?attr/font_default" app:lib_setRadius="3dp" - app:lib_setRoundedBorderColor="?attr/nsfwColor" app:lib_setRoundedView="true" app:lib_setShape="rectangle" /> @@ -131,8 +125,7 @@ <View android:id="@+id/divider_2_post_link_activity" android:layout_width="match_parent" - android:layout_height="1dp" - android:background="?attr/dividerColor" /> + android:layout_height="1dp" /> <EditText android:id="@+id/post_title_edit_text_post_link_activity" @@ -149,8 +142,7 @@ <View android:id="@+id/divider_3_post_link_activity" android:layout_width="match_parent" - android:layout_height="1dp" - android:background="?attr/dividerColor" /> + android:layout_height="1dp" /> <EditText android:id="@+id/post_link_edit_text_post_link_activity" diff --git a/app/src/main/res/layout/activity_post_text.xml b/app/src/main/res/layout/activity_post_text.xml index b4a7fb4a..c28d08f5 100644 --- a/app/src/main/res/layout/activity_post_text.xml +++ b/app/src/main/res/layout/activity_post_text.xml @@ -5,14 +5,12 @@ android:id="@+id/coordinator_layout_post_text_activity" android:layout_width="match_parent" android:layout_height="match_parent" - android:background="?attr/backgroundColor" tools:application=".PostTextActivity"> <com.google.android.material.appbar.AppBarLayout android:id="@+id/appbar_layout_post_text_activity" android:layout_width="match_parent" android:layout_height="wrap_content" - android:background="?attr/toolbarAndTabBackgroundColor" android:theme="@style/AppTheme.AppBarOverlay"> <androidx.appcompat.widget.Toolbar @@ -76,8 +74,7 @@ <View android:id="@+id/divider_1_post_text_activity" android:layout_width="match_parent" - android:layout_height="1dp" - android:background="?attr/dividerColor" /> + android:layout_height="1dp" /> <LinearLayout android:layout_width="match_parent" @@ -94,7 +91,6 @@ android:textSize="?attr/font_default" android:visibility="gone" app:lib_setRadius="3dp" - app:lib_setRoundedBorderColor="?attr/flairColor" app:lib_setRoundedView="true" app:lib_setShape="rectangle" /> @@ -108,7 +104,6 @@ android:textColor="?attr/primaryTextColor" android:textSize="?attr/font_default" app:lib_setRadius="3dp" - app:lib_setRoundedBorderColor="?attr/spoilerColor" app:lib_setRoundedView="true" app:lib_setShape="rectangle" /> @@ -122,7 +117,6 @@ android:textColor="?attr/primaryTextColor" android:textSize="?attr/font_default" app:lib_setRadius="3dp" - app:lib_setRoundedBorderColor="?attr/nsfwColor" app:lib_setRoundedView="true" app:lib_setShape="rectangle" /> @@ -131,8 +125,7 @@ <View android:id="@+id/divider_2_post_text_activity" android:layout_width="match_parent" - android:layout_height="1dp" - android:background="?attr/dividerColor" /> + android:layout_height="1dp" /> <EditText android:id="@+id/post_title_edit_text_post_text_activity" @@ -149,8 +142,7 @@ <View android:id="@+id/divider_3_post_text_activity" android:layout_width="match_parent" - android:layout_height="1dp" - android:background="?attr/dividerColor" /> + android:layout_height="1dp" /> <EditText android:id="@+id/post_text_content_edit_text_post_text_activity" diff --git a/app/src/main/res/layout/activity_post_video.xml b/app/src/main/res/layout/activity_post_video.xml index ebebe237..7eea9601 100644 --- a/app/src/main/res/layout/activity_post_video.xml +++ b/app/src/main/res/layout/activity_post_video.xml @@ -5,14 +5,12 @@ android:id="@+id/coordinator_layout_post_video_activity" android:layout_width="match_parent" android:layout_height="match_parent" - android:background="?attr/backgroundColor" tools:application=".PostImageActivity"> <com.google.android.material.appbar.AppBarLayout android:id="@+id/appbar_layout_post_video_activity" android:layout_width="match_parent" android:layout_height="wrap_content" - android:background="?attr/toolbarAndTabBackgroundColor" android:theme="@style/AppTheme.AppBarOverlay"> <androidx.appcompat.widget.Toolbar @@ -76,8 +74,7 @@ <View android:id="@+id/divider_1_post_video_activity" android:layout_width="match_parent" - android:layout_height="1dp" - android:background="?attr/dividerColor" /> + android:layout_height="1dp" /> <LinearLayout android:layout_width="match_parent" @@ -94,7 +91,6 @@ android:textSize="?attr/font_default" android:visibility="gone" app:lib_setRadius="3dp" - app:lib_setRoundedBorderColor="?attr/flairColor" app:lib_setRoundedView="true" app:lib_setShape="rectangle" /> @@ -108,7 +104,6 @@ android:textColor="?attr/primaryTextColor" android:textSize="?attr/font_default" app:lib_setRadius="3dp" - app:lib_setRoundedBorderColor="?attr/spoilerColor" app:lib_setRoundedView="true" app:lib_setShape="rectangle" /> @@ -122,7 +117,6 @@ android:textColor="?attr/primaryTextColor" android:textSize="?attr/font_default" app:lib_setRadius="3dp" - app:lib_setRoundedBorderColor="?attr/nsfwColor" app:lib_setRoundedView="true" app:lib_setShape="rectangle" /> @@ -131,8 +125,7 @@ <View android:id="@+id/divider_2_post_video_activity" android:layout_width="match_parent" - android:layout_height="1dp" - android:background="?attr/dividerColor" /> + android:layout_height="1dp" /> <EditText android:id="@+id/post_title_edit_text_post_video_activity" @@ -149,8 +142,7 @@ <View android:id="@+id/divider_3_post_video_activity" android:layout_width="match_parent" - android:layout_height="1dp" - android:background="?attr/dividerColor" /> + android:layout_height="1dp" /> <androidx.constraintlayout.widget.ConstraintLayout android:id="@+id/select_video_constraint_layout_post_video_activity" @@ -163,7 +155,6 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:src="@drawable/ic_outline_add_a_photo_24dp" - app:backgroundTint="?attr/colorPrimaryLightTheme" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toStartOf="@+id/select_from_library_fab_post_video_activity" app:layout_constraintHorizontal_chainStyle="spread" @@ -176,7 +167,6 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:src="@drawable/ic_outline_select_photo_24dp" - app:backgroundTint="?attr/colorPrimaryLightTheme" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintHorizontal_chainStyle="spread" diff --git a/app/src/main/res/layout/activity_rules.xml b/app/src/main/res/layout/activity_rules.xml index 4012d419..3d39420a 100644 --- a/app/src/main/res/layout/activity_rules.xml +++ b/app/src/main/res/layout/activity_rules.xml @@ -5,14 +5,12 @@ android:layout_width="match_parent" android:layout_height="match_parent" android:id="@+id/coordinator_layout_rules_activity" - android:background="?attr/backgroundColor" tools:application=".RulesActivity"> <com.google.android.material.appbar.AppBarLayout android:id="@+id/appbar_layout_rules_activity" android:layout_width="match_parent" android:layout_height="wrap_content" - android:background="?attr/toolbarAndTabBackgroundColor" android:theme="@style/AppTheme.AppBarOverlay"> <com.google.android.material.appbar.CollapsingToolbarLayout diff --git a/app/src/main/res/layout/activity_search.xml b/app/src/main/res/layout/activity_search.xml index f9ac9a90..bcda1172 100644 --- a/app/src/main/res/layout/activity_search.xml +++ b/app/src/main/res/layout/activity_search.xml @@ -5,14 +5,12 @@ android:layout_width="match_parent" android:layout_height="match_parent" android:id="@+id/coordinator_layout_search_activity" - android:background="?attr/backgroundColor" tools:application=".SearchActivity"> <com.google.android.material.appbar.AppBarLayout android:id="@+id/appbar_layout_search_activity" android:layout_width="match_parent" android:layout_height="wrap_content" - android:background="?attr/toolbarAndTabBackgroundColor" android:theme="@style/AppTheme.AppBarOverlay"> <FrameLayout diff --git a/app/src/main/res/layout/activity_search_result.xml b/app/src/main/res/layout/activity_search_result.xml index 63c8212e..79859872 100644 --- a/app/src/main/res/layout/activity_search_result.xml +++ b/app/src/main/res/layout/activity_search_result.xml @@ -4,14 +4,12 @@ xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent" android:layout_height="match_parent" - android:id="@+id/coordinator_layout_search_result_activity" - android:background="?attr/backgroundColor"> + android:id="@+id/coordinator_layout_search_result_activity"> <com.google.android.material.appbar.AppBarLayout android:id="@+id/appbar_layout_search_result_activity" android:layout_width="match_parent" android:layout_height="wrap_content" - android:background="?attr/toolbarAndTabBackgroundColor" android:theme="@style/AppTheme.AppBarOverlay"> <com.google.android.material.appbar.CollapsingToolbarLayout @@ -34,14 +32,10 @@ android:id="@+id/tab_layout_search_result_activity" android:layout_width="match_parent" android:layout_height="wrap_content" - android:background="?attr/toolbarAndTabBackgroundColor" app:layout_scrollFlags="scroll|enterAlways" app:tabGravity="fill" app:tabMode="fixed" - app:tabIndicatorColor="?attr/tabLayoutWithCollapsedCollapsingToolbarTabIndicator" app:tabIndicatorHeight="3dp" - app:tabSelectedTextColor="?attr/tabLayoutWithCollapsedCollapsingToolbarTextColor" - app:tabTextColor="?attr/tabLayoutWithCollapsedCollapsingToolbarTextColor" app:tabRippleColor="?attr/colorControlHighlight" app:tabUnboundedRipple="false"/> diff --git a/app/src/main/res/layout/activity_search_subreddits_result.xml b/app/src/main/res/layout/activity_search_subreddits_result.xml index 183104b1..eaa560e7 100644 --- a/app/src/main/res/layout/activity_search_subreddits_result.xml +++ b/app/src/main/res/layout/activity_search_subreddits_result.xml @@ -5,14 +5,12 @@ android:layout_width="match_parent" android:layout_height="match_parent" android:id="@+id/coordinator_layout_search_subreddits_result_activity" - android:background="?attr/backgroundColor" tools:application=".SearchSubredditsResultActivity"> <com.google.android.material.appbar.AppBarLayout android:id="@+id/appbar_layout_search_subreddits_result_activity" android:layout_width="match_parent" android:layout_height="wrap_content" - android:background="?attr/toolbarAndTabBackgroundColor" android:theme="@style/AppTheme.AppBarOverlay"> <androidx.appcompat.widget.Toolbar diff --git a/app/src/main/res/layout/activity_selected_subreddits.xml b/app/src/main/res/layout/activity_selected_subreddits.xml index 44edbd7e..dc33a69c 100644 --- a/app/src/main/res/layout/activity_selected_subreddits.xml +++ b/app/src/main/res/layout/activity_selected_subreddits.xml @@ -4,7 +4,6 @@ xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent" android:layout_height="match_parent" - android:background="?attr/backgroundColor" android:id="@+id/coordinator_layout_selected_subreddits_activity" tools:context=".Activity.AccountPostsActivity"> @@ -12,7 +11,6 @@ android:id="@+id/appbar_layout_selected_subreddits_activity" android:layout_width="match_parent" android:layout_height="wrap_content" - android:background="?attr/toolbarAndTabBackgroundColor" android:theme="@style/AppTheme.AppBarOverlay"> <com.google.android.material.appbar.CollapsingToolbarLayout diff --git a/app/src/main/res/layout/activity_settings.xml b/app/src/main/res/layout/activity_settings.xml index 7e10c9ad..1bd20c09 100644 --- a/app/src/main/res/layout/activity_settings.xml +++ b/app/src/main/res/layout/activity_settings.xml @@ -1,14 +1,12 @@ <androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:layout_width="match_parent" - android:layout_height="match_parent" - android:background="?attr/backgroundColor"> + android:layout_height="match_parent"> <com.google.android.material.appbar.AppBarLayout android:id="@+id/appbar_layout_settings_activity" android:layout_width="match_parent" android:layout_height="wrap_content" - android:background="?attr/toolbarAndTabBackgroundColor" android:theme="@style/AppTheme.AppBarOverlay"> <com.google.android.material.appbar.CollapsingToolbarLayout diff --git a/app/src/main/res/layout/activity_subreddit_selection.xml b/app/src/main/res/layout/activity_subreddit_selection.xml index 4422754d..630f2af4 100644 --- a/app/src/main/res/layout/activity_subreddit_selection.xml +++ b/app/src/main/res/layout/activity_subreddit_selection.xml @@ -5,14 +5,12 @@ android:layout_width="match_parent" android:layout_height="match_parent" android:id="@+id/coordinator_layout_subreddit_selection_activity" - android:background="?attr/backgroundColor" tools:application=".SubredditSelectionActivity"> <com.google.android.material.appbar.AppBarLayout android:id="@+id/appbar_layout_subreddit_selection_activity" android:layout_width="match_parent" android:layout_height="wrap_content" - android:background="?attr/toolbarAndTabBackgroundColor" android:theme="@style/AppTheme.AppBarOverlay"> <com.google.android.material.appbar.CollapsingToolbarLayout diff --git a/app/src/main/res/layout/activity_subscribed_subreddits_multiselection.xml b/app/src/main/res/layout/activity_subscribed_subreddits_multiselection.xml index d552fb84..9585922d 100644 --- a/app/src/main/res/layout/activity_subscribed_subreddits_multiselection.xml +++ b/app/src/main/res/layout/activity_subscribed_subreddits_multiselection.xml @@ -5,14 +5,12 @@ android:layout_width="match_parent" android:layout_height="match_parent" android:id="@+id/coordinator_layout_subreddits_multiselection_activity" - android:background="?attr/backgroundColor" tools:application=".SubscribedSubredditsListingFragment"> <com.google.android.material.appbar.AppBarLayout android:id="@+id/appbar_layout_subreddits_multiselection_activity" android:layout_width="match_parent" android:layout_height="wrap_content" - android:background="?attr/toolbarAndTabBackgroundColor" android:theme="@style/AppTheme.AppBarOverlay"> <com.google.android.material.appbar.CollapsingToolbarLayout diff --git a/app/src/main/res/layout/activity_subscribed_thing_listing.xml b/app/src/main/res/layout/activity_subscribed_thing_listing.xml index 460b1ba6..db10bdc8 100644 --- a/app/src/main/res/layout/activity_subscribed_thing_listing.xml +++ b/app/src/main/res/layout/activity_subscribed_thing_listing.xml @@ -5,14 +5,12 @@ android:layout_width="match_parent" android:layout_height="match_parent" android:id="@+id/coordinator_layout_subscribed_thing_listing_activity" - android:background="?attr/backgroundColor" tools:application=".SubscribedThingListingActivity"> <com.google.android.material.appbar.AppBarLayout android:id="@+id/appbar_layout_subscribed_thing_listing_activity" android:layout_width="match_parent" android:layout_height="wrap_content" - android:background="?attr/toolbarAndTabBackgroundColor" android:theme="@style/AppTheme.AppBarOverlay"> <com.google.android.material.appbar.CollapsingToolbarLayout @@ -37,14 +35,10 @@ android:id="@+id/tab_layout_subscribed_thing_listing_activity" android:layout_width="match_parent" android:layout_height="wrap_content" - android:background="?attr/toolbarAndTabBackgroundColor" app:layout_scrollFlags="scroll|enterAlways" app:tabGravity="fill" app:tabMode="fixed" - app:tabIndicatorColor="?attr/tabLayoutWithCollapsedCollapsingToolbarTabIndicator" app:tabIndicatorHeight="3dp" - app:tabSelectedTextColor="?attr/tabLayoutWithCollapsedCollapsingToolbarTextColor" - app:tabTextColor="?attr/tabLayoutWithCollapsedCollapsingToolbarTextColor" app:tabRippleColor="?attr/colorControlHighlight" app:tabUnboundedRipple="false" /> diff --git a/app/src/main/res/layout/activity_view_message.xml b/app/src/main/res/layout/activity_view_message.xml index 46c94f3a..f5f1c4e5 100644 --- a/app/src/main/res/layout/activity_view_message.xml +++ b/app/src/main/res/layout/activity_view_message.xml @@ -5,14 +5,12 @@ android:layout_width="match_parent" android:layout_height="match_parent" android:id="@+id/coordinator_layout_view_message_activity" - android:background="?attr/backgroundColor" tools:context=".Activity.ViewMessageActivity"> <com.google.android.material.appbar.AppBarLayout android:id="@+id/appbar_layout_view_message_activity" android:layout_width="match_parent" android:layout_height="wrap_content" - android:background="?attr/toolbarAndTabBackgroundColor" android:theme="@style/AppTheme.AppBarOverlay"> <com.google.android.material.appbar.CollapsingToolbarLayout diff --git a/app/src/main/res/layout/activity_view_multi_reddit_detail.xml b/app/src/main/res/layout/activity_view_multi_reddit_detail.xml index 310a4527..dbe8875b 100644 --- a/app/src/main/res/layout/activity_view_multi_reddit_detail.xml +++ b/app/src/main/res/layout/activity_view_multi_reddit_detail.xml @@ -5,14 +5,12 @@ android:layout_width="match_parent" android:layout_height="match_parent" android:id="@+id/coordinator_layout_view_multi_reddit_detail_activity" - android:background="?attr/backgroundColor" tools:context=".Activity.ViewMultiRedditDetailActivity"> <com.google.android.material.appbar.AppBarLayout android:id="@+id/appbar_layout_view_multi_reddit_detail_activity" android:layout_width="match_parent" android:layout_height="wrap_content" - android:background="?attr/toolbarAndTabBackgroundColor" android:theme="@style/AppTheme.AppBarOverlay"> <com.google.android.material.appbar.CollapsingToolbarLayout diff --git a/app/src/main/res/layout/activity_view_post_detail.xml b/app/src/main/res/layout/activity_view_post_detail.xml index fb9bb240..3b0dd281 100644 --- a/app/src/main/res/layout/activity_view_post_detail.xml +++ b/app/src/main/res/layout/activity_view_post_detail.xml @@ -5,14 +5,12 @@ android:id="@+id/coordinator_layout_view_post_detail" android:layout_width="match_parent" android:layout_height="match_parent" - android:background="?attr/backgroundColor" tools:application=".ViewPostDetailActivity"> <com.google.android.material.appbar.AppBarLayout android:id="@+id/appbar_layout_view_post_detail_activity" android:layout_width="match_parent" android:layout_height="wrap_content" - android:background="?attr/toolbarAndTabBackgroundColor" android:theme="@style/AppTheme.AppBarOverlay"> <com.google.android.material.appbar.CollapsingToolbarLayout @@ -76,7 +74,6 @@ android:layout_height="wrap_content" android:layout_gravity="bottom|end" android:layout_margin="@dimen/fab_margin" - app:backgroundTint="?attr/colorPrimaryLightTheme" app:tint="@android:color/white" app:srcCompat="@drawable/ic_keyboard_arrow_down_24dp" /> diff --git a/app/src/main/res/layout/activity_view_sidebar.xml b/app/src/main/res/layout/activity_view_sidebar.xml index 113dd273..301b04cc 100644 --- a/app/src/main/res/layout/activity_view_sidebar.xml +++ b/app/src/main/res/layout/activity_view_sidebar.xml @@ -5,14 +5,12 @@ android:layout_width="match_parent" android:layout_height="match_parent" android:id="@+id/coordinator_layout_view_sidebar_activity" - android:background="?attr/backgroundColor" tools:context=".Activity.ViewSidebarActivity"> <com.google.android.material.appbar.AppBarLayout android:id="@+id/appbar_layout_view_sidebar_activity" android:layout_width="match_parent" android:layout_height="wrap_content" - android:background="?attr/toolbarAndTabBackgroundColor" android:theme="@style/AppTheme.AppBarOverlay"> <com.google.android.material.appbar.CollapsingToolbarLayout 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 f7b2ee50..da17e978 100644 --- a/app/src/main/res/layout/activity_view_subreddit_detail.xml +++ b/app/src/main/res/layout/activity_view_subreddit_detail.xml @@ -5,7 +5,6 @@ android:layout_width="match_parent" android:layout_height="match_parent" android:id="@+id/coordinator_layout_view_subreddit_detail_activity" - android:background="?attr/backgroundColor" tools:application=".Activity.ViewSubredditDetailActivity"> <androidx.viewpager.widget.ViewPager @@ -18,7 +17,6 @@ android:id="@+id/appbar_layout_view_subreddit_detail_activity" android:layout_width="match_parent" android:layout_height="wrap_content" - android:background="?attr/toolbarAndTabBackgroundColor" android:theme="@style/AppTheme.AppBarOverlay"> <com.google.android.material.appbar.CollapsingToolbarLayout @@ -58,8 +56,7 @@ android:paddingTop="36dp" android:paddingStart="16dp" android:paddingEnd="16dp" - android:layout_below="@id/banner_image_view_view_subreddit_detail_activity" - android:background="?attr/backgroundColor"> + android:layout_below="@id/banner_image_view_view_subreddit_detail_activity"> <TextView android:id="@+id/subreddit_name_text_view_view_subreddit_detail_activity" @@ -68,7 +65,6 @@ android:layout_marginTop="16dp" android:layout_marginBottom="16dp" android:textSize="?attr/font_18" - android:textColor="?attr/subreddit" android:layout_gravity="center_horizontal"/> <com.google.android.material.chip.Chip @@ -132,7 +128,6 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_gravity="bottom" - android:background="?attr/toolbarAndTabBackgroundColor" app:layout_scrollFlags="scroll|enterAlways" app:tabGravity="fill" app:tabMode="fixed" @@ -148,7 +143,6 @@ android:layout_height="wrap_content" android:layout_gravity="bottom" android:visibility="gone" - app:backgroundTint="?attr/backgroundColor" app:fabAlignmentMode="center"> <LinearLayout @@ -217,7 +211,6 @@ android:layout_height="wrap_content" android:layout_margin="@dimen/fab_margin" android:visibility="gone" - app:backgroundTint="?attr/colorPrimaryLightTheme" app:srcCompat="@drawable/ic_add_day_night_24dp" app:tint="@android:color/white" app:layout_anchor="@id/bottom_navigation_view_subreddit_detail_activity" /> 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 8b2e3546..4539f50a 100644 --- a/app/src/main/res/layout/activity_view_user_detail.xml +++ b/app/src/main/res/layout/activity_view_user_detail.xml @@ -5,7 +5,6 @@ android:layout_width="match_parent" android:layout_height="match_parent" android:id="@+id/coordinator_layout_view_user_detail_activity" - android:background="?attr/backgroundColor" tools:application=".ViewUserDetailActivity"> <androidx.viewpager.widget.ViewPager @@ -18,7 +17,6 @@ android:id="@+id/appbar_layout_view_user_detail" android:layout_width="match_parent" android:layout_height="wrap_content" - android:background="?attr/toolbarAndTabBackgroundColor" android:theme="@style/AppTheme.AppBarOverlay"> <com.google.android.material.appbar.CollapsingToolbarLayout @@ -26,7 +24,6 @@ android:layout_width="match_parent" android:layout_height="match_parent" app:titleEnabled="false" - app:contentScrim="?attr/colorPrimary" app:layout_scrollFlags="scroll|enterAlways|enterAlwaysCollapsed" app:toolbarId="@+id/toolbar_view_user_detail_activity"> @@ -58,8 +55,7 @@ android:paddingTop="36dp" android:paddingStart="16dp" android:paddingEnd="16dp" - android:layout_below="@id/banner_image_view_view_user_detail_activity" - android:background="?attr/backgroundColor"> + android:layout_below="@id/banner_image_view_view_user_detail_activity"> <TextView android:id="@+id/user_name_text_view_view_user_detail_activity" @@ -67,7 +63,6 @@ android:layout_height="wrap_content" android:layout_marginTop="16dp" android:textSize="?attr/font_18" - android:textColor="?attr/username" android:layout_gravity="center_horizontal"/> <TextView @@ -76,7 +71,6 @@ android:layout_height="wrap_content" android:layout_marginTop="16dp" android:layout_marginBottom="16dp" - android:textColor="?attr/primaryTextColor" android:textSize="?attr/font_default" android:layout_gravity="center_horizontal"/> @@ -109,7 +103,6 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_gravity="bottom" - android:background="?attr/toolbarAndTabBackgroundColor" app:layout_scrollFlags="scroll|enterAlways" app:tabGravity="fill" app:tabMode="fixed" diff --git a/app/src/main/res/layout/app_bar_main.xml b/app/src/main/res/layout/app_bar_main.xml index b1d9b330..bcc7afb8 100644 --- a/app/src/main/res/layout/app_bar_main.xml +++ b/app/src/main/res/layout/app_bar_main.xml @@ -11,7 +11,6 @@ android:id="@+id/appbar_layout_main_activity" android:layout_width="match_parent" android:layout_height="wrap_content" - android:background="?attr/toolbarAndTabBackgroundColor" android:theme="@style/AppTheme.AppBarOverlay"> <com.google.android.material.appbar.CollapsingToolbarLayout @@ -37,15 +36,11 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_gravity="bottom" - android:background="?attr/toolbarAndTabBackgroundColor" app:layout_scrollFlags="scroll|enterAlways" app:tabGravity="fill" - app:tabIndicatorColor="?attr/tabLayoutWithCollapsedCollapsingToolbarTabIndicator" app:tabIndicatorHeight="3dp" app:tabMode="fixed" app:tabRippleColor="?attr/colorControlHighlight" - app:tabSelectedTextColor="?attr/tabLayoutWithCollapsedCollapsingToolbarTextColor" - app:tabTextColor="?attr/tabLayoutWithCollapsedCollapsingToolbarTextColor" app:tabUnboundedRipple="false" /> </com.google.android.material.appbar.AppBarLayout> @@ -62,7 +57,6 @@ android:layout_height="wrap_content" android:layout_gravity="bottom" android:visibility="gone" - app:backgroundTint="?attr/backgroundColor" app:fabAlignmentMode="center"> <LinearLayout @@ -131,7 +125,6 @@ android:layout_height="wrap_content" android:layout_margin="@dimen/fab_margin" android:visibility="gone" - app:backgroundTint="?attr/colorPrimaryLightTheme" app:srcCompat="@drawable/ic_add_day_night_24dp" app:tint="@android:color/white" app:layout_anchor="@id/bottom_navigation_main_activity" /> diff --git a/app/src/main/res/layout/fragment_flair_bottom_sheet.xml b/app/src/main/res/layout/fragment_flair_bottom_sheet.xml index 4cec7313..edd8ad20 100644 --- a/app/src/main/res/layout/fragment_flair_bottom_sheet.xml +++ b/app/src/main/res/layout/fragment_flair_bottom_sheet.xml @@ -4,7 +4,6 @@ android:layout_width="match_parent" android:layout_height="match_parent" android:orientation="vertical" - android:background="?attr/backgroundColor" tools:application=".FlairBottomSheetFragment"> <TextView diff --git a/app/src/main/res/layout/fragment_theme_preview_posts.xml b/app/src/main/res/layout/fragment_theme_preview_posts.xml index 4b4f7cb0..c486f8b0 100644 --- a/app/src/main/res/layout/fragment_theme_preview_posts.xml +++ b/app/src/main/res/layout/fragment_theme_preview_posts.xml @@ -224,8 +224,7 @@ android:layout_height="150dp" android:scaleType="center" android:src="@drawable/ic_link" - android:tint="@android:color/tab_indicator_text" - android:background="?attr/noPreviewLinkBackgroundColor" /> + android:tint="@android:color/tab_indicator_text" /> <androidx.constraintlayout.widget.ConstraintLayout android:layout_width="match_parent" diff --git a/app/src/main/res/layout/item_comment.xml b/app/src/main/res/layout/item_comment.xml index 3a0505d2..ab0ebbe4 100644 --- a/app/src/main/res/layout/item_comment.xml +++ b/app/src/main/res/layout/item_comment.xml @@ -47,7 +47,6 @@ android:layout_marginEnd="8dp" android:ellipsize="end" android:maxLines="2" - android:textColor="?attr/username" android:textSize="?attr/font_default" app:layout_constraintBottom_toTopOf="@id/author_flair_text_view_item_post_comment" app:layout_constraintEnd_toStartOf="@+id/barrier" @@ -61,7 +60,6 @@ android:layout_marginEnd="8dp" android:ellipsize="end" android:maxLines="2" - android:textColor="?attr/authorFlairTextColor" android:textSize="?attr/font_12" android:visibility="gone" app:layout_constraintBottom_toBottomOf="parent" @@ -236,7 +234,6 @@ android:id="@+id/divider_item_comment" android:layout_width="match_parent" android:layout_height="1dp" - android:background="?attr/dividerColor" android:visibility="gone" /> </LinearLayout>
\ No newline at end of file diff --git a/app/src/main/res/layout/item_footer_error.xml b/app/src/main/res/layout/item_footer_error.xml index fba52052..c0278ca9 100644 --- a/app/src/main/res/layout/item_footer_error.xml +++ b/app/src/main/res/layout/item_footer_error.xml @@ -22,7 +22,6 @@ android:layout_height="wrap_content" android:layout_alignParentEnd="true" android:layout_centerVertical="true" - android:backgroundTint="?attr/colorPrimaryLightTheme" android:textColor="@android:color/white" android:text="@string/retry" android:textSize="?attr/font_default" /> diff --git a/app/src/main/res/layout/item_load_comments.xml b/app/src/main/res/layout/item_load_comments.xml index 058db8f1..1df3566f 100644 --- a/app/src/main/res/layout/item_load_comments.xml +++ b/app/src/main/res/layout/item_load_comments.xml @@ -12,7 +12,6 @@ android:layout_margin="16dp" app:mlpb_progress_stoke_width="3dp" app:mlpb_progress_color="?attr/colorAccent" - app:mlpb_background_color="?attr/circularProgressBarBackground" android:layout_gravity="center_horizontal"/> </LinearLayout>
\ No newline at end of file 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 fc33b062..d801a867 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 @@ -30,7 +30,6 @@ android:id="@+id/divider_item_load_more_comments_placeholder" android:layout_width="match_parent" android:layout_height="1dp" - android:background="?attr/dividerColor" android:visibility="gone" /> </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 c27b4d55..7f641a96 100644 --- a/app/src/main/res/layout/item_nav_drawer_divider.xml +++ b/app/src/main/res/layout/item_nav_drawer_divider.xml @@ -1,5 +1,4 @@ <?xml version="1.0" encoding="utf-8"?> <View xmlns:android="http://schemas.android.com/apk/res/android" android:layout_width="match_parent" - android:layout_height="1dp" - android:background="?attr/dividerColor" />
\ No newline at end of file + android:layout_height="1dp" />
\ No newline at end of file diff --git a/app/src/main/res/layout/item_post.xml b/app/src/main/res/layout/item_post.xml index 7e1e25cc..b2030d63 100644 --- a/app/src/main/res/layout/item_post.xml +++ b/app/src/main/res/layout/item_post.xml @@ -36,7 +36,6 @@ android:layout_gravity="center" android:layout_marginStart="16dp" android:layout_marginEnd="8dp" - android:textColor="?attr/subreddit" android:textSize="?attr/font_default" app:layout_constraintBottom_toTopOf="@id/user_text_view_item_post" app:layout_constraintStart_toEndOf="@id/icon_gif_image_view_item_post" @@ -49,7 +48,6 @@ android:layout_height="wrap_content" android:layout_marginStart="16dp" android:layout_marginEnd="8dp" - android:textColor="?attr/username" android:textSize="?attr/font_default" android:maxLines="2" android:ellipsize="end" @@ -64,7 +62,6 @@ android:layout_width="24dp" android:layout_height="24dp" android:layout_marginEnd="8dp" - android:tint="?attr/stickiedPost" android:visibility="gone" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintStart_toEndOf="@id/subreddit_name_text_view_item_post" @@ -127,8 +124,6 @@ android:padding="4dp" android:textSize="?attr/font_12" android:textColor="@android:color/white" - app:lib_setRoundedBGColor="?attr/postType" - app:lib_setRoundedBorderColor="?attr/postType" app:lib_setRadius="3dp" app:lib_setRoundedView="true" app:lib_setShape="rectangle" /> @@ -144,8 +139,6 @@ android:padding="4dp" android:visibility="gone" app:lib_setRadius="3dp" - app:lib_setRoundedBGColor="?attr/spoilerColor" - app:lib_setRoundedBorderColor="?attr/spoilerColor" app:lib_setRoundedView="true" app:lib_setShape="rectangle" /> @@ -158,8 +151,6 @@ android:textSize="?attr/font_12" android:textColor="@android:color/white" android:visibility="gone" - app:lib_setRoundedBGColor="?attr/nsfwColor" - app:lib_setRoundedBorderColor="?attr/nsfwColor" app:lib_setRadius="3dp" app:lib_setRoundedView="true" app:lib_setShape="rectangle" /> @@ -174,8 +165,6 @@ android:padding="4dp" android:visibility="gone" app:lib_setRadius="3dp" - app:lib_setRoundedBGColor="?attr/flairColor" - app:lib_setRoundedBorderColor="?attr/flairColor" app:lib_setRoundedView="true" app:lib_setShape="rectangle" /> @@ -184,7 +173,6 @@ android:layout_width="24dp" android:layout_height="24dp" android:src="@drawable/ic_archive_outline" - android:tint="?attr/archivedTint" android:visibility="gone" /> <ImageView @@ -192,7 +180,6 @@ android:layout_width="24dp" android:layout_height="24dp" android:src="@drawable/ic_outline_lock_24dp" - android:tint="?attr/lockedIconTint" android:visibility="gone" /> <ImageView @@ -200,7 +187,6 @@ android:layout_width="24dp" android:layout_height="24dp" android:src="@drawable/crosspost" - android:tint="?attr/crosspost" android:visibility="gone" /> <TextView @@ -283,7 +269,6 @@ android:scaleType="center" android:src="@drawable/ic_link" android:tint="@android:color/tab_indicator_text" - 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 edf83fd0..a6375133 100644 --- a/app/src/main/res/layout/item_post_compact.xml +++ b/app/src/main/res/layout/item_post_compact.xml @@ -47,7 +47,6 @@ android:layout_width="24dp" android:layout_height="24dp" android:layout_marginEnd="8dp" - android:tint="?attr/stickiedPost" android:visibility="gone" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toStartOf="@+id/guideline2" @@ -115,8 +114,6 @@ android:textColor="@android:color/white" android:textSize="?attr/font_10" app:lib_setRadius="3dp" - app:lib_setRoundedBGColor="?attr/postType" - app:lib_setRoundedBorderColor="?attr/postType" app:lib_setRoundedView="true" app:lib_setShape="rectangle" /> @@ -131,8 +128,6 @@ android:textSize="?attr/font_10" android:visibility="gone" app:lib_setRadius="3dp" - app:lib_setRoundedBGColor="?attr/spoilerColor" - app:lib_setRoundedBorderColor="?attr/spoilerColor" app:lib_setRoundedView="true" app:lib_setShape="rectangle" /> @@ -146,8 +141,6 @@ android:textSize="?attr/font_10" android:visibility="gone" app:lib_setRadius="3dp" - app:lib_setRoundedBGColor="?attr/nsfwColor" - app:lib_setRoundedBorderColor="?attr/nsfwColor" app:lib_setRoundedView="true" app:lib_setShape="rectangle" /> @@ -161,8 +154,6 @@ android:textSize="?attr/font_10" android:visibility="gone" app:lib_setRadius="3dp" - app:lib_setRoundedBGColor="?attr/flairColor" - app:lib_setRoundedBorderColor="?attr/flairColor" app:lib_setRoundedView="true" app:lib_setShape="rectangle" /> @@ -171,7 +162,6 @@ android:layout_width="24dp" android:layout_height="24dp" android:src="@drawable/ic_archive_outline" - android:tint="?attr/archivedTint" android:visibility="gone" /> <ImageView @@ -179,7 +169,6 @@ android:layout_width="24dp" android:layout_height="24dp" android:src="@drawable/ic_outline_lock_24dp" - android:tint="?attr/lockedIconTint" android:visibility="gone" /> <ImageView @@ -187,7 +176,6 @@ android:layout_width="24dp" android:layout_height="24dp" android:src="@drawable/crosspost" - android:tint="?attr/crosspost" android:visibility="gone" /> <TextView @@ -261,7 +249,6 @@ android:scaleType="center" android:src="@drawable/ic_link" android:tint="@android:color/tab_indicator_text" - android:background="?attr/noPreviewLinkBackgroundColor" android:visibility="gone" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintStart_toEndOf="@id/barrier2" @@ -380,8 +367,7 @@ <View android:id="@+id/divider_item_post_compact" android:layout_width="match_parent" - android:layout_height="1dp" - android:background="?attr/dividerColor" /> + android:layout_height="1dp" /> </LinearLayout> diff --git a/app/src/main/res/layout/item_post_detail.xml b/app/src/main/res/layout/item_post_detail.xml index 61cf7399..ce515feb 100644 --- a/app/src/main/res/layout/item_post_detail.xml +++ b/app/src/main/res/layout/item_post_detail.xml @@ -26,7 +26,6 @@ android:layout_height="wrap_content" android:layout_marginStart="16dp" android:layout_marginEnd="8dp" - android:textColor="?attr/subreddit" android:textSize="?attr/font_default" android:maxLines="2" android:ellipsize="end" @@ -41,7 +40,6 @@ android:layout_height="wrap_content" android:layout_marginStart="16dp" android:layout_marginEnd="8dp" - android:textColor="?attr/username" android:textSize="?attr/font_default" android:maxLines="2" android:ellipsize="end" @@ -57,7 +55,6 @@ android:layout_height="wrap_content" android:layout_marginStart="16dp" android:layout_marginEnd="8dp" - android:textColor="?attr/username" android:textSize="?attr/font_12" android:maxLines="2" android:ellipsize="end" @@ -126,8 +123,6 @@ android:padding="4dp" android:textSize="?attr/font_12" android:textColor="@android:color/white" - app:lib_setRoundedBGColor="?attr/postType" - app:lib_setRoundedBorderColor="?attr/postType" app:lib_setRadius="3dp" app:lib_setRoundedView="true" app:lib_setShape="rectangle" /> @@ -143,8 +138,6 @@ android:padding="4dp" android:visibility="gone" app:lib_setRadius="3dp" - app:lib_setRoundedBGColor="?attr/spoilerColor" - app:lib_setRoundedBorderColor="?attr/spoilerColor" app:lib_setRoundedView="true" app:lib_setShape="rectangle" /> @@ -157,8 +150,6 @@ android:textSize="?attr/font_12" android:textColor="@android:color/white" android:visibility="gone" - app:lib_setRoundedBGColor="?attr/nsfwColor" - app:lib_setRoundedBorderColor="?attr/nsfwColor" app:lib_setRadius="3dp" app:lib_setRoundedView="true" app:lib_setShape="rectangle" /> @@ -173,8 +164,6 @@ android:textColor="@android:color/white" android:visibility="gone" app:lib_setRadius="3dp" - app:lib_setRoundedBGColor="?attr/flairColor" - app:lib_setRoundedBorderColor="?attr/flairColor" app:lib_setRoundedView="true" app:lib_setShape="rectangle" /> @@ -183,7 +172,6 @@ android:layout_width="20dp" android:layout_height="20dp" android:src="@drawable/ic_archive_outline" - android:tint="?attr/archivedTint" android:visibility="gone" /> <ImageView @@ -191,7 +179,6 @@ android:layout_width="20dp" android:layout_height="20dp" android:src="@drawable/ic_outline_lock_24dp" - android:tint="?attr/lockedIconTint" android:visibility="gone" /> <ImageView @@ -199,7 +186,6 @@ android:layout_width="20dp" android:layout_height="20dp" android:src="@drawable/crosspost" - android:tint="?attr/crosspost" android:visibility="gone" /> <TextView @@ -280,7 +266,6 @@ android:id="@+id/image_view_no_preview_link_item_post_detail" android:layout_width="match_parent" android:layout_height="150dp" - 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_subreddit_listing.xml b/app/src/main/res/layout/item_subreddit_listing.xml index 2b3e186b..30a6fe90 100644 --- a/app/src/main/res/layout/item_subreddit_listing.xml +++ b/app/src/main/res/layout/item_subreddit_listing.xml @@ -36,7 +36,6 @@ android:layout_height="wrap_content" android:layout_gravity="center_vertical" android:src="@drawable/ic_add_24dp" - android:tint="?attr/unsubscribed" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintTop_toTopOf="parent" app:layout_constraintBottom_toBottomOf="parent" diff --git a/app/src/main/res/layout/item_user_listing.xml b/app/src/main/res/layout/item_user_listing.xml index e2b22637..522b2e42 100644 --- a/app/src/main/res/layout/item_user_listing.xml +++ b/app/src/main/res/layout/item_user_listing.xml @@ -36,7 +36,6 @@ android:layout_height="wrap_content" android:layout_gravity="center_vertical" android:src="@drawable/ic_add_24dp" - android:tint="?attr/unsubscribed" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintTop_toTopOf="parent" app:layout_constraintBottom_toBottomOf="parent" diff --git a/app/src/main/res/values/attr.xml b/app/src/main/res/values/attr.xml index 57b4a09d..59df6280 100644 --- a/app/src/main/res/values/attr.xml +++ b/app/src/main/res/values/attr.xml @@ -32,53 +32,9 @@ <attr name="colorPrimaryDark" format="color"/> <attr name="colorAccent" format="color"/> <attr name="colorPrimaryLightTheme" format="color"/> - <attr name="postTitleColor" format="color" /> - <attr name="postContentColor" format="color" /> - <attr name="commentColor" 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="toolbarPrimaryTextAndIconColor" 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="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="postType" 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/styles.xml b/app/src/main/res/values/styles.xml index 6f490709..68f78baa 100644 --- a/app/src/main/res/values/styles.xml +++ b/app/src/main/res/values/styles.xml @@ -39,7 +39,7 @@ </style> <style name="AppTheme.AppBarOverlay" parent="ThemeOverlay.AppCompat.DayNight.ActionBar"> - <item name="android:textColorPrimary">?attr/toolbarPrimaryTextAndIconColor</item> + <!--<item name="android:textColorPrimary">?attr/toolbarPrimaryTextAndIconColor</item>--> </style> <style name="AppTheme.PopupOverlay" parent="ThemeOverlay.AppCompat.DayNight" /> @@ -227,54 +227,10 @@ <item name="colorPrimaryDark">@color/colorPrimaryDark</item> <item name="colorAccent">@color/colorAccent</item> <item name="colorPrimaryLightTheme">@color/colorPrimary</item> - <item name="postTitleColor">#000000</item> - <item name="postContentColor">#8A000000</item> - <item name="commentColor">#000000</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="toolbarPrimaryTextAndIconColor">#FFFFFF</item> - <item name="toolbarAndTabBackgroundColor">@color/colorPrimary</item> - <item name="circularProgressBarBackground">#FFFFFF</item> - <item name="tabLayoutWithExpandedCollapsingToolbarTabBackground">#FFFFFF</item> - <item name="tabLayoutWithExpandedCollapsingToolbarTextColor">@color/colorPrimary</item> - <item name="tabLayoutWithExpandedCollapsingToolbarTabIndicator">@color/colorPrimary</item> - <item name="tabLayoutWithCollapsedCollapsingToolbarTabBackground">@color/colorPrimary</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="postType">@color/colorPrimaryDark</item> - <item name="spoilerColor">#EE02EB</item> - <item name="nsfwColor">@color/colorAccent</item> - <item name="flairColor">#00AA8C</item> - <item name="archivedTint">#B4009F</item> - <item name="lockedIconTint">#EE7302</item> - <item name="crosspost">@color/colorAccent</item> - <item name="stickiedPost">@color/colorPrimaryDark</item> - <item name="subscribed">@color/colorAccent</item> - <item name="unsubscribed">@color/colorPrimaryDark</item> - <item name="username">@color/colorPrimaryDark</item> - <item name="subreddit">@color/colorAccent</item> - <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.Normal.NormalDark"> @@ -282,54 +238,10 @@ <item name="colorPrimaryDark">@color/colorPrimaryDark</item> <item name="colorAccent">@color/colorAccent</item> <item name="colorPrimaryLightTheme">#1565C0</item> - <item name="postTitleColor">#FFFFFF</item> - <item name="postContentColor">#B3FFFFFF</item> - <item name="commentColor">#FFFFFF</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">#242424</item> - <item name="toolbarPrimaryTextAndIconColor">#FFFFFF</item> - <item name="toolbarAndTabBackgroundColor">#282828</item> - <item name="circularProgressBarBackground">@color/colorPrimary</item> - <item name="tabLayoutWithExpandedCollapsingToolbarTabBackground">@color/backgroundColor</item> - <item name="tabLayoutWithExpandedCollapsingToolbarTextColor">#FFFFFF</item> - <item name="tabLayoutWithExpandedCollapsingToolbarTabIndicator">#FFFFFF</item> - <item name="tabLayoutWithCollapsedCollapsingToolbarTabBackground">@color/colorPrimary</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="postType">#0D47A1</item> - <item name="spoilerColor">#EE02EB</item> - <item name="nsfwColor">@color/colorAccent</item> - <item name="flairColor">#00AA8C</item> - <item name="archivedTint">#B4009F</item> - <item name="lockedIconTint">#EE7302</item> - <item name="crosspost">@color/colorAccent</item> - <item name="stickiedPost">#1565C0</item> - <item name="subscribed">@color/colorAccent</item> - <item name="unsubscribed">#1565C0</item> - <item name="username">#0D47A1</item> - <item name="subreddit">@color/colorAccent</item> - <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.Normal.AmoledDark"> @@ -337,54 +249,10 @@ <item name="colorPrimaryDark">#000000</item> <item name="colorAccent">@color/colorAccent</item> <item name="colorPrimaryLightTheme">#1565C0</item> - <item name="postTitleColor">#FFFFFF</item> - <item name="postContentColor">#B3FFFFFF</item> - <item name="commentColor">#FFFFFF</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> - <item name="toolbarPrimaryTextAndIconColor">#FFFFFF</item> - <item name="toolbarAndTabBackgroundColor">#000000</item> - <item name="circularProgressBarBackground">#000000</item> - <item name="tabLayoutWithExpandedCollapsingToolbarTabBackground">@color/backgroundColor</item> - <item name="tabLayoutWithExpandedCollapsingToolbarTextColor">#FFFFFF</item> - <item name="tabLayoutWithExpandedCollapsingToolbarTabIndicator">#FFFFFF</item> - <item name="tabLayoutWithCollapsedCollapsingToolbarTabBackground">@color/colorPrimary</item> - <item name="tabLayoutWithCollapsedCollapsingToolbarTextColor">#FFFFFF</item> - <item name="tabLayoutWithCollapsedCollapsingToolbarTabIndicator">#FFFFFF</item> - <item name="navBarColor">#000000</item> - <item name="upvoted">#E91E63</item> - <item name="downvoted">#007DDE</item> - <item name="postType">#0D47A1</item> - <item name="spoilerColor">#EE02EB</item> - <item name="nsfwColor">@color/colorAccent</item> - <item name="flairColor">#00AA8C</item> - <item name="archivedTint">#B4009F</item> - <item name="lockedIconTint">#EE7302</item> - <item name="crosspost">@color/colorAccent</item> - <item name="stickiedPost">#1565C0</item> - <item name="subscribed">@color/colorAccent</item> - <item name="unsubscribed">#1565C0</item> - <item name="username">#0D47A1</item> - <item name="subreddit">@color/colorAccent</item> - <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> </resources> |