diff options
Diffstat (limited to '')
34 files changed, 47 insertions, 16 deletions
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"> <com.google.android.material.appbar.AppBarLayout 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 5da65dd9..351c716f 100644 --- a/app/src/main/res/layout/activity_account_saved_thing.xml +++ b/app/src/main/res/layout/activity_account_saved_thing.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_saved_thing_activity" tools:context=".Activity.AccountPostsActivity"> <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 c30536c1..09d5ab34 100644 --- a/app/src/main/res/layout/activity_comment.xml +++ b/app/src/main/res/layout/activity_comment.xml @@ -48,7 +48,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_margin="16dp" - android:textColor="?attr/primaryTextColor" + android:textColor="?attr/commentColor" android:textSize="?attr/title_font_16" /> <androidx.recyclerview.widget.RecyclerView @@ -61,6 +61,7 @@ android:visibility="gone" /> <View + android:id="@+id/divider_comment_activity" android:layout_width="match_parent" android:layout_height="1dp" android:layout_marginBottom="16dp" 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 1f056675..07bbcea1 100644 --- a/app/src/main/res/layout/activity_create_multi_reddit.xml +++ b/app/src/main/res/layout/activity_create_multi_reddit.xml @@ -55,6 +55,7 @@ android:maxLength="50" /> <View + android:id="@+id/divider_1_create_multi_reddit_activity" android:layout_width="match_parent" android:layout_height="1dp" android:background="?attr/dividerColor" /> @@ -71,6 +72,7 @@ android:textColor="?attr/primaryTextColor" /> <View + android:id="@+id/divider_2_create_multi_reddit_activity" android:layout_width="match_parent" android:layout_height="1dp" android:background="?attr/dividerColor" /> @@ -85,6 +87,7 @@ android:background="?attr/selectableItemBackground"> <TextView + android:id="@+id/visibility_text_view_create_multi_reddit_activity" android:layout_width="0dp" android:layout_height="wrap_content" android:layout_weight="1" diff --git a/app/src/main/res/layout/activity_edit_comment.xml b/app/src/main/res/layout/activity_edit_comment.xml index 5a2940f7..3952770d 100644 --- a/app/src/main/res/layout/activity_edit_comment.xml +++ b/app/src/main/res/layout/activity_edit_comment.xml @@ -34,7 +34,7 @@ </com.google.android.material.appbar.AppBarLayout> <EditText - android:id="@+id/post_text_content_edit_text_edit_comment_activity" + android:id="@+id/comment_edit_text_edit_comment_activity" android:layout_width="match_parent" android:layout_height="match_parent" android:gravity="top" diff --git a/app/src/main/res/layout/activity_edit_post.xml b/app/src/main/res/layout/activity_edit_post.xml index b82c9e05..178e8af3 100644 --- a/app/src/main/res/layout/activity_edit_post.xml +++ b/app/src/main/res/layout/activity_edit_post.xml @@ -53,6 +53,7 @@ android:textColor="?attr/primaryTextColor" /> <View + android:id="@+id/divider_edit_post_activity" android:layout_width="match_parent" android:layout_height="1dp" android:background="?attr/dividerColor" /> 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"> <androidx.recyclerview.widget.RecyclerView 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 ef04c4e7..ea101e05 100644 --- a/app/src/main/res/layout/activity_multi_reddit_listing.xml +++ b/app/src/main/res/layout/activity_multi_reddit_listing.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_multi_reddit_listing_activity" tools:context=".Activity.MultiRedditListingActivity"> <com.google.android.material.appbar.AppBarLayout diff --git a/app/src/main/res/layout/activity_post_image.xml b/app/src/main/res/layout/activity_post_image.xml index 5a6bb303..e49c9179 100644 --- a/app/src/main/res/layout/activity_post_image.xml +++ b/app/src/main/res/layout/activity_post_image.xml @@ -83,6 +83,7 @@ </RelativeLayout> <View + android:id="@+id/divider_1_post_image_activity" android:layout_width="match_parent" android:layout_height="1dp" android:background="?attr/dividerColor" /> @@ -137,6 +138,7 @@ </LinearLayout> <View + android:id="@+id/divider_2_post_image_activity" android:layout_width="match_parent" android:layout_height="1dp" android:background="?attr/dividerColor" /> @@ -154,6 +156,7 @@ android:textColor="?attr/primaryTextColor" /> <View + android:id="@+id/divider_3_post_image_activity" android:layout_width="match_parent" android:layout_height="1dp" android:background="?attr/dividerColor" /> 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 @@ </RelativeLayout> <View + android:id="@+id/divider_1_post_link_activity" android:layout_width="match_parent" android:layout_height="1dp" android:background="?attr/dividerColor" /> @@ -137,6 +138,7 @@ </LinearLayout> <View + android:id="@+id/divider_2_post_link_activity" android:layout_width="match_parent" android:layout_height="1dp" android:background="?attr/dividerColor" /> @@ -154,6 +156,7 @@ android:textColor="?attr/primaryTextColor" /> <View + android:id="@+id/divider_3_post_link_activity" android:layout_width="match_parent" android:layout_height="1dp" android:background="?attr/dividerColor" /> 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 @@ </RelativeLayout> <View + android:id="@+id/divider_1_post_text_activity" android:layout_width="match_parent" android:layout_height="1dp" android:background="?attr/dividerColor" /> @@ -137,6 +138,7 @@ </LinearLayout> <View + android:id="@+id/divider_2_post_text_activity" android:layout_width="match_parent" android:layout_height="1dp" android:background="?attr/dividerColor" /> @@ -154,6 +156,7 @@ android:textColor="?attr/primaryTextColor" /> <View + android:id="@+id/divider_3_post_text_activity" android:layout_width="match_parent" android:layout_height="1dp" android:background="?attr/dividerColor" /> 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 @@ </RelativeLayout> <View + android:id="@+id/divider_1_post_video_activity" android:layout_width="match_parent" android:layout_height="1dp" android:background="?attr/dividerColor" /> @@ -137,6 +138,7 @@ </LinearLayout> <View + android:id="@+id/divider_2_post_video_activity" android:layout_width="match_parent" android:layout_height="1dp" android:background="?attr/dividerColor" /> @@ -154,6 +156,7 @@ android:textColor="?attr/primaryTextColor" /> <View + android:id="@+id/divider_3_post_video_activity" android:layout_width="match_parent" android:layout_height="1dp" android:background="?attr/dividerColor" /> 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"> <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" diff --git a/app/src/main/res/layout/activity_search_result.xml b/app/src/main/res/layout/activity_search_result.xml index ecf52a61..c1b641b1 100644 --- a/app/src/main/res/layout/activity_search_result.xml +++ b/app/src/main/res/layout/activity_search_result.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_search_result_activity" android:background="?attr/backgroundColor"> <com.google.android.material.appbar.AppBarLayout @@ -45,14 +46,6 @@ </com.google.android.material.appbar.AppBarLayout> - <View - android:id="@+id/transparent_overlay_search_result_activity" - android:layout_width="match_parent" - android:layout_height="match_parent" - android:background="#40000000" - android:elevation="1dp" - android:visibility="gone"/> - <androidx.viewpager.widget.ViewPager android:id="@+id/view_pager_search_result_activity" android:layout_width="match_parent" 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 3d0467d6..183104b1 100644 --- a/app/src/main/res/layout/activity_search_subreddits_result.xml +++ b/app/src/main/res/layout/activity_search_subreddits_result.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_search_subreddits_result_activity" android:background="?attr/backgroundColor" tools:application=".SearchSubredditsResultActivity"> 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"> <com.google.android.material.appbar.AppBarLayout diff --git a/app/src/main/res/layout/activity_subreddit_selection.xml b/app/src/main/res/layout/activity_subreddit_selection.xml index 33548519..4422754d 100644 --- a/app/src/main/res/layout/activity_subreddit_selection.xml +++ b/app/src/main/res/layout/activity_subreddit_selection.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_subreddit_selection_activity" android:background="?attr/backgroundColor" tools:application=".SubredditSelectionActivity"> 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"> <com.google.android.material.appbar.AppBarLayout @@ -62,6 +64,7 @@ android:layout_height="wrap_content" /> <TextView + android:id="@+id/error_text_view_subscribed_subreddits_multiselection_activity" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="16dp" 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 656d2b15..183a0b61 100644 --- a/app/src/main/res/layout/activity_subscribed_thing_listing.xml +++ b/app/src/main/res/layout/activity_subscribed_thing_listing.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_subscribed_thing_listing_activity" android:background="?attr/backgroundColor" tools:application=".SubscribedThingListingActivity"> 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" /> <LinearLayout + android:id="@+id/toolbar_linear_layout_view_subreddit_detail_activity" android:layout_width="match_parent" android:layout_height="wrap_content" android:orientation="vertical" @@ -148,7 +149,6 @@ android:paddingTop="8dp" android:paddingBottom="8dp" android:src="@drawable/ic_subscritptions_bottom_app_bar_24dp" - android:textColor="?attr/primaryTextColor" android:background="?attr/selectableItemBackgroundBorderless" /> <ImageView @@ -160,7 +160,6 @@ android:paddingTop="8dp" android:paddingBottom="8dp" android:src="@drawable/ic_multi_reddit_24dp" - android:textColor="?attr/primaryTextColor" android:background="?attr/selectableItemBackgroundBorderless" /> <TextView @@ -178,7 +177,6 @@ android:paddingTop="8dp" android:paddingBottom="8dp" android:src="@drawable/ic_inbox_24dp" - android:textColor="?attr/primaryTextColor" android:background="?attr/selectableItemBackgroundBorderless" /> <ImageView @@ -191,7 +189,6 @@ android:paddingBottom="8dp" android:gravity="center" android:src="@drawable/ic_account_circle_24dp" - android:textColor="?attr/primaryTextColor" android:background="?attr/selectableItemBackgroundBorderless" /> </LinearLayout> 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" /> <TextView + android:id="@+id/error_text_view_followed_users_listing_fragment" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="16dp" diff --git a/app/src/main/res/layout/fragment_subreddit_listing.xml b/app/src/main/res/layout/fragment_subreddit_listing.xml index d9fba175..8c81235d 100644 --- a/app/src/main/res/layout/fragment_subreddit_listing.xml +++ b/app/src/main/res/layout/fragment_subreddit_listing.xml @@ -4,7 +4,6 @@ android:id="@+id/coordinator_layout_subreddit_listing_fragment" android:layout_width="match_parent" android:layout_height="match_parent" - xmlns:app="http://schemas.android.com/apk/res-auto" tools:application=".SubredditListingFragment"> <androidx.swiperefreshlayout.widget.SwipeRefreshLayout diff --git a/app/src/main/res/layout/fragment_subscribed_subreddits_listing.xml b/app/src/main/res/layout/fragment_subscribed_subreddits_listing.xml index 139c8902..5675e124 100644 --- a/app/src/main/res/layout/fragment_subscribed_subreddits_listing.xml +++ b/app/src/main/res/layout/fragment_subscribed_subreddits_listing.xml @@ -33,6 +33,7 @@ android:layout_height="wrap_content" /> <TextView + android:id="@+id/error_text_view_subscribed_subreddits_listing_fragment" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="16dp" diff --git a/app/src/main/res/layout/item_comment_footer_loading.xml b/app/src/main/res/layout/item_comment_footer_loading.xml index bf01664e..e4bd7aa1 100644 --- a/app/src/main/res/layout/item_comment_footer_loading.xml +++ b/app/src/main/res/layout/item_comment_footer_loading.xml @@ -5,6 +5,7 @@ android:layout_height="wrap_content"> <ProgressBar + android:id="@+id/progress_bar_item_comment_footer_loading" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="16dp" diff --git a/app/src/main/res/layout/item_footer_loading.xml b/app/src/main/res/layout/item_footer_loading.xml index 9a4dce0e..87a6f8b3 100644 --- a/app/src/main/res/layout/item_footer_loading.xml +++ b/app/src/main/res/layout/item_footer_loading.xml @@ -5,6 +5,7 @@ android:layout_height="wrap_content"> <ProgressBar + android:id="@+id/progress_bar_item_footer_loading" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="8dp" diff --git a/app/src/main/res/layout/item_load_comments.xml b/app/src/main/res/layout/item_load_comments.xml index 9f994dc7..058db8f1 100644 --- a/app/src/main/res/layout/item_load_comments.xml +++ b/app/src/main/res/layout/item_load_comments.xml @@ -6,7 +6,7 @@ android:layout_height="wrap_content"> <com.lsjwzh.widget.materialloadingprogressbar.CircleProgressBar - android:id="@+id/comment_progress_bar_view_post_detail" + android:id="@+id/comment_progress_bar_item_load_comments" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_margin="16dp" diff --git a/app/src/main/res/layout/item_load_comments_failed_placeholder.xml b/app/src/main/res/layout/item_load_comments_failed_placeholder.xml index 02f3b24f..6d49a1e6 100644 --- a/app/src/main/res/layout/item_load_comments_failed_placeholder.xml +++ b/app/src/main/res/layout/item_load_comments_failed_placeholder.xml @@ -12,6 +12,7 @@ android:src="@drawable/error_image" /> <TextView + android:id="@+id/error_text_view_item_load_comments_failed_placeholder" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_gravity="center_horizontal" diff --git a/app/src/main/res/layout/item_no_comment_placeholder.xml b/app/src/main/res/layout/item_no_comment_placeholder.xml index 530f17c8..2e0dc99d 100644 --- a/app/src/main/res/layout/item_no_comment_placeholder.xml +++ b/app/src/main/res/layout/item_no_comment_placeholder.xml @@ -12,6 +12,7 @@ android:src="@drawable/error_image" /> <TextView + android:id="@+id/error_text_view_item_no_comment_placeholder" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_gravity="center_horizontal" |