From e076e2374f8bba9e268a124e67e473ecdbd06f21 Mon Sep 17 00:00:00 2001 From: Alex Ning Date: Sun, 15 Mar 2020 13:12:02 +0800 Subject: Implement custom multiple themes (Buggy). --- app/src/main/res/layout/activity_account_posts.xml | 1 + app/src/main/res/layout/activity_account_saved_thing.xml | 1 + app/src/main/res/layout/activity_comment.xml | 3 ++- app/src/main/res/layout/activity_create_multi_reddit.xml | 3 +++ app/src/main/res/layout/activity_edit_comment.xml | 2 +- app/src/main/res/layout/activity_edit_post.xml | 1 + app/src/main/res/layout/activity_filtered_thing.xml | 1 + app/src/main/res/layout/activity_login.xml | 1 + app/src/main/res/layout/activity_main.xml | 1 + app/src/main/res/layout/activity_multi_reddit_listing.xml | 1 + app/src/main/res/layout/activity_post_image.xml | 3 +++ app/src/main/res/layout/activity_post_link.xml | 3 +++ app/src/main/res/layout/activity_post_text.xml | 3 +++ app/src/main/res/layout/activity_post_video.xml | 3 +++ app/src/main/res/layout/activity_rules.xml | 1 + app/src/main/res/layout/activity_search.xml | 2 ++ app/src/main/res/layout/activity_search_result.xml | 9 +-------- .../main/res/layout/activity_search_subreddits_result.xml | 1 + app/src/main/res/layout/activity_settings.xml | 1 + app/src/main/res/layout/activity_subreddit_selection.xml | 1 + .../layout/activity_subscribed_subreddits_multiselection.xml | 3 +++ .../main/res/layout/activity_subscribed_thing_listing.xml | 1 + app/src/main/res/layout/activity_view_message.xml | 1 + .../main/res/layout/activity_view_multi_reddit_detail.xml | 1 + app/src/main/res/layout/activity_view_sidebar.xml | 1 + app/src/main/res/layout/activity_view_subreddit_detail.xml | 5 +---- app/src/main/res/layout/fragment_followed_users_listing.xml | 1 + app/src/main/res/layout/fragment_subreddit_listing.xml | 1 - .../res/layout/fragment_subscribed_subreddits_listing.xml | 1 + app/src/main/res/layout/item_comment_footer_loading.xml | 1 + app/src/main/res/layout/item_footer_loading.xml | 1 + app/src/main/res/layout/item_load_comments.xml | 2 +- .../res/layout/item_load_comments_failed_placeholder.xml | 1 + app/src/main/res/layout/item_no_comment_placeholder.xml | 1 + app/src/main/res/values/attr.xml | 3 +++ app/src/main/res/values/styles.xml | 12 ++++++++++++ 36 files changed, 62 insertions(+), 16 deletions(-) (limited to 'app/src/main/res') diff --git a/app/src/main/res/layout/activity_account_posts.xml b/app/src/main/res/layout/activity_account_posts.xml index f05b8587..695384d5 100644 --- a/app/src/main/res/layout/activity_account_posts.xml +++ b/app/src/main/res/layout/activity_account_posts.xml @@ -5,6 +5,7 @@ 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"> @@ -71,6 +72,7 @@ android:textColor="?attr/primaryTextColor" /> @@ -85,6 +87,7 @@ android:background="?attr/selectableItemBackground"> diff --git a/app/src/main/res/layout/activity_filtered_thing.xml b/app/src/main/res/layout/activity_filtered_thing.xml index c86116f5..e6c0c125 100644 --- a/app/src/main/res/layout/activity_filtered_thing.xml +++ b/app/src/main/res/layout/activity_filtered_thing.xml @@ -4,6 +4,7 @@ xmlns:tools="http://schemas.android.com/tools" 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"> diff --git a/app/src/main/res/layout/activity_login.xml b/app/src/main/res/layout/activity_login.xml index 9fd051a5..a23e580c 100644 --- a/app/src/main/res/layout/activity_login.xml +++ b/app/src/main/res/layout/activity_login.xml @@ -4,6 +4,7 @@ xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent" android:layout_height="match_parent" + android:id="@+id/coordinator_layout_login_activity" android:background="?attr/backgroundColor" tools:application="ml.docilealligator.infinityforreddit.Activity.LoginActivity"> diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml index e9f99b9c..b40ac82f 100644 --- a/app/src/main/res/layout/activity_main.xml +++ b/app/src/main/res/layout/activity_main.xml @@ -17,6 +17,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"> @@ -137,6 +138,7 @@ @@ -154,6 +156,7 @@ android:textColor="?attr/primaryTextColor" /> diff --git a/app/src/main/res/layout/activity_post_link.xml b/app/src/main/res/layout/activity_post_link.xml index 07e94046..7998c1d6 100644 --- a/app/src/main/res/layout/activity_post_link.xml +++ b/app/src/main/res/layout/activity_post_link.xml @@ -83,6 +83,7 @@ @@ -137,6 +138,7 @@ @@ -154,6 +156,7 @@ android:textColor="?attr/primaryTextColor" /> diff --git a/app/src/main/res/layout/activity_post_text.xml b/app/src/main/res/layout/activity_post_text.xml index 95069d20..4109c150 100644 --- a/app/src/main/res/layout/activity_post_text.xml +++ b/app/src/main/res/layout/activity_post_text.xml @@ -83,6 +83,7 @@ @@ -137,6 +138,7 @@ @@ -154,6 +156,7 @@ android:textColor="?attr/primaryTextColor" /> diff --git a/app/src/main/res/layout/activity_post_video.xml b/app/src/main/res/layout/activity_post_video.xml index d8bd014d..dd51f10e 100644 --- a/app/src/main/res/layout/activity_post_video.xml +++ b/app/src/main/res/layout/activity_post_video.xml @@ -83,6 +83,7 @@ @@ -137,6 +138,7 @@ @@ -154,6 +156,7 @@ android:textColor="?attr/primaryTextColor" /> diff --git a/app/src/main/res/layout/activity_rules.xml b/app/src/main/res/layout/activity_rules.xml index f98d1fda..36d057db 100644 --- a/app/src/main/res/layout/activity_rules.xml +++ b/app/src/main/res/layout/activity_rules.xml @@ -4,6 +4,7 @@ xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent" android:layout_height="match_parent" + android:id="@+id/coordinator_layout_rules_activity" android:background="?attr/backgroundColor" tools:application=".RulesActivity"> diff --git a/app/src/main/res/layout/activity_search.xml b/app/src/main/res/layout/activity_search.xml index 6317ac03..f9ac9a90 100644 --- a/app/src/main/res/layout/activity_search.xml +++ b/app/src/main/res/layout/activity_search.xml @@ -4,10 +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_activity" android:background="?attr/backgroundColor" tools:application=".SearchActivity"> - - diff --git a/app/src/main/res/layout/activity_settings.xml b/app/src/main/res/layout/activity_settings.xml index 7e10c9ad..50dd0290 100644 --- a/app/src/main/res/layout/activity_settings.xml +++ b/app/src/main/res/layout/activity_settings.xml @@ -2,6 +2,7 @@ xmlns:app="http://schemas.android.com/apk/res-auto" android:layout_width="match_parent" android:layout_height="match_parent" + android:id="@+id/coordinator_layout_settings_activity" android:background="?attr/backgroundColor"> 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 bb58b2a6..ee0ae427 100644 --- a/app/src/main/res/layout/activity_subscribed_subreddits_multiselection.xml +++ b/app/src/main/res/layout/activity_subscribed_subreddits_multiselection.xml @@ -4,6 +4,8 @@ xmlns:tools="http://schemas.android.com/tools" 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"> diff --git a/app/src/main/res/layout/activity_view_message.xml b/app/src/main/res/layout/activity_view_message.xml index 25b4f76c..46c94f3a 100644 --- a/app/src/main/res/layout/activity_view_message.xml +++ b/app/src/main/res/layout/activity_view_message.xml @@ -4,6 +4,7 @@ xmlns:tools="http://schemas.android.com/tools" 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"> 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 a0ec7c23..310a4527 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 @@ -4,6 +4,7 @@ xmlns:tools="http://schemas.android.com/tools" 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"> diff --git a/app/src/main/res/layout/activity_view_sidebar.xml b/app/src/main/res/layout/activity_view_sidebar.xml index 169afaa6..113dd273 100644 --- a/app/src/main/res/layout/activity_view_sidebar.xml +++ b/app/src/main/res/layout/activity_view_sidebar.xml @@ -4,6 +4,7 @@ xmlns:tools="http://schemas.android.com/tools" 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"> 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 4b159495..5f2c2294 100644 --- a/app/src/main/res/layout/activity_view_subreddit_detail.xml +++ b/app/src/main/res/layout/activity_view_subreddit_detail.xml @@ -45,6 +45,7 @@ android:elevation="4dp" /> diff --git a/app/src/main/res/layout/fragment_followed_users_listing.xml b/app/src/main/res/layout/fragment_followed_users_listing.xml index 071e9e72..5b94e075 100644 --- a/app/src/main/res/layout/fragment_followed_users_listing.xml +++ b/app/src/main/res/layout/fragment_followed_users_listing.xml @@ -33,6 +33,7 @@ android:layout_height="wrap_content" /> + + + diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml index 8f7256a5..7055c73a 100644 --- a/app/src/main/res/values/styles.xml +++ b/app/src/main/res/values/styles.xml @@ -227,6 +227,9 @@ @color/colorPrimaryDark @color/colorAccent @color/colorPrimary + #000000 + #8A000000 + #000000 #000000 #8A000000 @color/backgroundColor @@ -279,6 +282,9 @@ @color/colorPrimaryDark @color/colorAccent #1565C0 + #FFFFFF + #B3FFFFFF + #FFFFFF #FFFFFF #B3FFFFFF @color/backgroundColor @@ -331,6 +337,9 @@ #000000 @color/colorAccent #1565C0 + #FFFFFF + #B3FFFFFF + #FFFFFF #FFFFFF #B3FFFFFF #000000 @@ -383,6 +392,9 @@ #3D00E0 #0098DD ?attr/colorPrimary + #000000 + #8A000000 + #000000 #000000 #8A000000 @color/backgroundColor -- cgit v1.2.3