diff options
Diffstat (limited to 'app/src/main/res/layout')
43 files changed, 153 insertions, 159 deletions
diff --git a/app/src/main/res/layout/activity_comment.xml b/app/src/main/res/layout/activity_comment.xml index decf27dd..45023334 100644 --- a/app/src/main/res/layout/activity_comment.xml +++ b/app/src/main/res/layout/activity_comment.xml @@ -38,7 +38,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_margin="16dp" - android:textColor="@color/primaryTextColor" + android:textColor="?attr/primaryTextColor" android:textSize="?attr/title_font_16" /> <androidx.recyclerview.widget.RecyclerView @@ -54,7 +54,7 @@ android:layout_width="match_parent" android:layout_height="1dp" android:layout_marginBottom="16dp" - android:background="@color/dividerColor" /> + android:background="?attr/dividerColor" /> <EditText android:id="@+id/comment_edit_text_comment_activity" @@ -68,7 +68,7 @@ android:inputType="textCapSentences|textMultiLine" android:textSize="?attr/content_font_18" android:background="#00000000" - android:textColor="@color/primaryTextColor" /> + android:textColor="?attr/primaryTextColor" /> </LinearLayout> diff --git a/app/src/main/res/layout/activity_create_multi_reddit.xml b/app/src/main/res/layout/activity_create_multi_reddit.xml index 5a06e5ec..62f492bc 100644 --- a/app/src/main/res/layout/activity_create_multi_reddit.xml +++ b/app/src/main/res/layout/activity_create_multi_reddit.xml @@ -41,13 +41,13 @@ android:inputType="textMultiLine" android:textSize="?attr/font_default" android:background="#00000000" - android:textColor="@color/primaryTextColor" + android:textColor="?attr/primaryTextColor" android:maxLength="50" /> <View android:layout_width="match_parent" android:layout_height="1dp" - android:background="@color/dividerColor" /> + android:background="?attr/dividerColor" /> <EditText android:id="@+id/description_edit_text_create_multi_reddit_activity" @@ -58,12 +58,12 @@ android:inputType="textMultiLine" android:textSize="?attr/font_default" android:background="#00000000" - android:textColor="@color/primaryTextColor" /> + android:textColor="?attr/primaryTextColor" /> <View android:layout_width="match_parent" android:layout_height="1dp" - android:background="@color/dividerColor" /> + android:background="?attr/dividerColor" /> <LinearLayout android:id="@+id/visibility_wrapper_linear_layout_create_multi_reddit_activity" @@ -80,7 +80,7 @@ android:layout_weight="1" android:text="@string/private_multi_reddit" android:textSize="?attr/font_default" - android:textColor="@color/primaryTextColor" /> + android:textColor="?attr/primaryTextColor" /> <Switch android:id="@+id/visibility_switch_create_multi_reddit_activity" @@ -97,7 +97,7 @@ android:padding="16dp" android:text="@string/select_subreddit" android:textSize="?attr/font_default" - android:textColor="@color/primaryTextColor" + android:textColor="?attr/primaryTextColor" android:clickable="true" android:focusable="true" android:background="?attr/selectableItemBackground" /> diff --git a/app/src/main/res/layout/activity_edit_comment.xml b/app/src/main/res/layout/activity_edit_comment.xml index 37fa4462..88547d89 100644 --- a/app/src/main/res/layout/activity_edit_comment.xml +++ b/app/src/main/res/layout/activity_edit_comment.xml @@ -33,7 +33,7 @@ android:inputType="textCapSentences|textMultiLine" android:textSize="?attr/content_font_18" android:background="#00000000" - android:textColor="@color/primaryTextColor" + android:textColor="?attr/primaryTextColor" app:layout_behavior="@string/appbar_scrolling_view_behavior" /> </androidx.coordinatorlayout.widget.CoordinatorLayout>
\ No newline at end of file diff --git a/app/src/main/res/layout/activity_edit_post.xml b/app/src/main/res/layout/activity_edit_post.xml index 839e90c7..2c6d4757 100644 --- a/app/src/main/res/layout/activity_edit_post.xml +++ b/app/src/main/res/layout/activity_edit_post.xml @@ -40,12 +40,12 @@ android:gravity="top" android:padding="16dp" android:textSize="?attr/title_font_18" - android:textColor="@color/primaryTextColor" /> + android:textColor="?attr/primaryTextColor" /> <View android:layout_width="match_parent" android:layout_height="1dp" - android:background="@color/dividerColor" /> + android:background="?attr/dividerColor" /> <EditText android:id="@+id/post_text_content_edit_text_edit_post_activity" @@ -57,7 +57,7 @@ android:inputType="textCapSentences|textMultiLine" android:textSize="?attr/content_font_18" android:background="#00000000" - android:textColor="@color/primaryTextColor" /> + android:textColor="?attr/primaryTextColor" /> </LinearLayout> diff --git a/app/src/main/res/layout/activity_post_image.xml b/app/src/main/res/layout/activity_post_image.xml index 92254896..e4acbe5c 100644 --- a/app/src/main/res/layout/activity_post_image.xml +++ b/app/src/main/res/layout/activity_post_image.xml @@ -75,7 +75,7 @@ <View android:layout_width="match_parent" android:layout_height="1dp" - android:background="@color/dividerColor" /> + android:background="?attr/dividerColor" /> <LinearLayout android:layout_width="match_parent" @@ -88,7 +88,7 @@ android:layout_margin="16dp" android:padding="4dp" android:text="@string/flair" - android:textColor="@color/primaryTextColor" + android:textColor="?attr/primaryTextColor" android:textSize="?attr/font_default" android:visibility="gone" app:lib_setRadius="3dp" @@ -103,7 +103,7 @@ android:layout_margin="16dp" android:padding="4dp" android:text="@string/spoiler" - android:textColor="@color/primaryTextColor" + android:textColor="?attr/primaryTextColor" android:textSize="?attr/font_default" app:lib_setRadius="3dp" app:lib_setRoundedBorderColor="?attr/spoilerColor" @@ -117,10 +117,10 @@ android:layout_margin="16dp" android:padding="4dp" android:text="@string/nsfw" - android:textColor="@color/primaryTextColor" + android:textColor="?attr/primaryTextColor" android:textSize="?attr/font_default" app:lib_setRadius="3dp" - app:lib_setRoundedBorderColor="@color/colorAccent" + app:lib_setRoundedBorderColor="?attr/nsfwColor" app:lib_setRoundedView="true" app:lib_setShape="rectangle" /> @@ -129,7 +129,7 @@ <View android:layout_width="match_parent" android:layout_height="1dp" - android:background="@color/dividerColor" /> + android:background="?attr/dividerColor" /> <EditText android:id="@+id/post_title_edit_text_post_image_activity" @@ -141,12 +141,12 @@ android:inputType="textCapSentences|textMultiLine" android:textSize="?attr/title_font_18" android:background="#00000000" - android:textColor="@color/primaryTextColor" /> + android:textColor="?attr/primaryTextColor" /> <View android:layout_width="match_parent" android:layout_height="1dp" - android:background="@color/dividerColor" /> + android:background="?attr/dividerColor" /> <androidx.constraintlayout.widget.ConstraintLayout android:id="@+id/select_image_constraint_layout_post_image_activity" @@ -188,7 +188,7 @@ android:layout_height="wrap_content" android:padding="16dp" android:text="@string/select_again" - android:textColor="@color/colorAccent" + android:textColor="?attr/colorAccent" android:textSize="?attr/font_default" android:visibility="gone" /> diff --git a/app/src/main/res/layout/activity_post_link.xml b/app/src/main/res/layout/activity_post_link.xml index 7aed97e1..5a314141 100644 --- a/app/src/main/res/layout/activity_post_link.xml +++ b/app/src/main/res/layout/activity_post_link.xml @@ -75,7 +75,7 @@ <View android:layout_width="match_parent" android:layout_height="1dp" - android:background="@color/dividerColor" /> + android:background="?attr/dividerColor" /> <LinearLayout android:layout_width="match_parent" @@ -88,7 +88,7 @@ android:layout_margin="16dp" android:padding="4dp" android:text="@string/flair" - android:textColor="@color/primaryTextColor" + android:textColor="?attr/primaryTextColor" android:textSize="?attr/font_default" android:visibility="gone" app:lib_setRadius="3dp" @@ -103,7 +103,7 @@ android:layout_margin="16dp" android:padding="4dp" android:text="@string/spoiler" - android:textColor="@color/primaryTextColor" + android:textColor="?attr/primaryTextColor" android:textSize="?attr/font_default" app:lib_setRadius="3dp" app:lib_setRoundedBorderColor="?attr/spoilerColor" @@ -117,10 +117,10 @@ android:layout_margin="16dp" android:padding="4dp" android:text="@string/nsfw" - android:textColor="@color/primaryTextColor" + android:textColor="?attr/primaryTextColor" android:textSize="?attr/font_default" app:lib_setRadius="3dp" - app:lib_setRoundedBorderColor="@color/colorAccent" + app:lib_setRoundedBorderColor="?attr/nsfwColor" app:lib_setRoundedView="true" app:lib_setShape="rectangle" /> @@ -129,7 +129,7 @@ <View android:layout_width="match_parent" android:layout_height="1dp" - android:background="@color/dividerColor" /> + android:background="?attr/dividerColor" /> <EditText android:id="@+id/post_title_edit_text_post_link_activity" @@ -141,12 +141,12 @@ android:inputType="textCapSentences|textMultiLine" android:textSize="?attr/title_font_18" android:background="#00000000" - android:textColor="@color/primaryTextColor" /> + android:textColor="?attr/primaryTextColor" /> <View android:layout_width="match_parent" android:layout_height="1dp" - android:background="@color/dividerColor" /> + android:background="?attr/dividerColor" /> <EditText android:id="@+id/post_link_edit_text_post_link_activity" @@ -158,7 +158,7 @@ android:inputType="textMultiLine" android:textSize="?attr/content_font_18" android:background="#00000000" - android:textColor="@color/primaryTextColor" /> + android:textColor="?attr/primaryTextColor" /> </LinearLayout> diff --git a/app/src/main/res/layout/activity_post_text.xml b/app/src/main/res/layout/activity_post_text.xml index 5f6d638d..619e2805 100644 --- a/app/src/main/res/layout/activity_post_text.xml +++ b/app/src/main/res/layout/activity_post_text.xml @@ -75,7 +75,7 @@ <View android:layout_width="match_parent" android:layout_height="1dp" - android:background="@color/dividerColor" /> + android:background="?attr/dividerColor" /> <LinearLayout android:layout_width="match_parent" @@ -88,7 +88,7 @@ android:layout_margin="16dp" android:padding="4dp" android:text="@string/flair" - android:textColor="@color/primaryTextColor" + android:textColor="?attr/primaryTextColor" android:textSize="?attr/font_default" android:visibility="gone" app:lib_setRadius="3dp" @@ -103,7 +103,7 @@ android:layout_margin="16dp" android:padding="4dp" android:text="@string/spoiler" - android:textColor="@color/primaryTextColor" + android:textColor="?attr/primaryTextColor" android:textSize="?attr/font_default" app:lib_setRadius="3dp" app:lib_setRoundedBorderColor="?attr/spoilerColor" @@ -117,10 +117,10 @@ android:layout_margin="16dp" android:padding="4dp" android:text="@string/nsfw" - android:textColor="@color/primaryTextColor" + android:textColor="?attr/primaryTextColor" android:textSize="?attr/font_default" app:lib_setRadius="3dp" - app:lib_setRoundedBorderColor="@color/colorAccent" + app:lib_setRoundedBorderColor="?attr/nsfwColor" app:lib_setRoundedView="true" app:lib_setShape="rectangle" /> @@ -129,7 +129,7 @@ <View android:layout_width="match_parent" android:layout_height="1dp" - android:background="@color/dividerColor" /> + android:background="?attr/dividerColor" /> <EditText android:id="@+id/post_title_edit_text_post_text_activity" @@ -141,12 +141,12 @@ android:inputType="textCapSentences|textMultiLine" android:textSize="?attr/title_font_18" android:background="#00000000" - android:textColor="@color/primaryTextColor" /> + android:textColor="?attr/primaryTextColor" /> <View android:layout_width="match_parent" android:layout_height="1dp" - android:background="@color/dividerColor" /> + android:background="?attr/dividerColor" /> <EditText android:id="@+id/post_text_content_edit_text_post_text_activity" @@ -158,7 +158,7 @@ android:inputType="textCapSentences|textMultiLine" android:textSize="?attr/content_font_18" android:background="#00000000" - android:textColor="@color/primaryTextColor" /> + android:textColor="?attr/primaryTextColor" /> </LinearLayout> diff --git a/app/src/main/res/layout/activity_post_video.xml b/app/src/main/res/layout/activity_post_video.xml index 341034a7..b0a321f7 100644 --- a/app/src/main/res/layout/activity_post_video.xml +++ b/app/src/main/res/layout/activity_post_video.xml @@ -75,7 +75,7 @@ <View android:layout_width="match_parent" android:layout_height="1dp" - android:background="@color/dividerColor" /> + android:background="?attr/dividerColor" /> <LinearLayout android:layout_width="match_parent" @@ -88,7 +88,7 @@ android:layout_margin="16dp" android:padding="4dp" android:text="@string/flair" - android:textColor="@color/primaryTextColor" + android:textColor="?attr/primaryTextColor" android:textSize="?attr/font_default" android:visibility="gone" app:lib_setRadius="3dp" @@ -103,7 +103,7 @@ android:layout_margin="16dp" android:padding="4dp" android:text="@string/spoiler" - android:textColor="@color/primaryTextColor" + android:textColor="?attr/primaryTextColor" android:textSize="?attr/font_default" app:lib_setRadius="3dp" app:lib_setRoundedBorderColor="?attr/spoilerColor" @@ -117,10 +117,10 @@ android:layout_margin="16dp" android:padding="4dp" android:text="@string/nsfw" - android:textColor="@color/primaryTextColor" + android:textColor="?attr/primaryTextColor" android:textSize="?attr/font_default" app:lib_setRadius="3dp" - app:lib_setRoundedBorderColor="@color/colorAccent" + app:lib_setRoundedBorderColor="?attr/nsfwColor" app:lib_setRoundedView="true" app:lib_setShape="rectangle" /> @@ -129,7 +129,7 @@ <View android:layout_width="match_parent" android:layout_height="1dp" - android:background="@color/dividerColor" /> + android:background="?attr/dividerColor" /> <EditText android:id="@+id/post_title_edit_text_post_video_activity" @@ -141,12 +141,12 @@ android:inputType="textCapSentences|textMultiLine" android:textSize="?attr/title_font_18" android:background="#00000000" - android:textColor="@color/primaryTextColor" /> + android:textColor="?attr/primaryTextColor" /> <View android:layout_width="match_parent" android:layout_height="1dp" - android:background="@color/dividerColor" /> + android:background="?attr/dividerColor" /> <androidx.constraintlayout.widget.ConstraintLayout android:id="@+id/select_video_constraint_layout_post_video_activity" @@ -188,7 +188,7 @@ android:layout_height="wrap_content" android:padding="16dp" android:text="@string/select_again" - android:textColor="@color/colorAccent" + android:textColor="?attr/colorAccent" android:textSize="?attr/font_default" android:visibility="gone" /> diff --git a/app/src/main/res/layout/activity_search.xml b/app/src/main/res/layout/activity_search.xml index 1dca2b6b..6317ac03 100644 --- a/app/src/main/res/layout/activity_search.xml +++ b/app/src/main/res/layout/activity_search.xml @@ -62,7 +62,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="@string/search_in" - android:textColor="@color/colorAccent" + android:textColor="?attr/colorAccent" android:textSize="?attr/font_default" /> <TextView @@ -74,7 +74,7 @@ android:layout_marginEnd="16dp" android:layout_toEndOf="@id/search_in_text_view_search_activity" android:text="@string/all_subreddits" - android:textColor="@color/primaryTextColor" + android:textColor="?attr/primaryTextColor" android:textSize="?attr/font_default" /> </RelativeLayout> diff --git a/app/src/main/res/layout/activity_view_subreddit_detail.xml b/app/src/main/res/layout/activity_view_subreddit_detail.xml index f36640ce..4b159495 100644 --- a/app/src/main/res/layout/activity_view_subreddit_detail.xml +++ b/app/src/main/res/layout/activity_view_subreddit_detail.xml @@ -61,7 +61,7 @@ android:layout_marginTop="16dp" android:layout_marginBottom="16dp" android:textSize="?attr/font_18" - android:textColor="@color/colorAccent" + android:textColor="?attr/subreddit" android:layout_gravity="center_horizontal"/> <com.google.android.material.chip.Chip @@ -81,7 +81,7 @@ android:id="@+id/subscriber_count_text_view_view_subreddit_detail_activity" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:textColor="@color/primaryTextColor" + android:textColor="?attr/primaryTextColor" android:textSize="?attr/font_default" android:layout_alignParentStart="true" android:layout_toStartOf="@id/online_subscriber_count_text_view_view_subreddit_detail_activity" /> @@ -91,7 +91,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_alignParentEnd="true" - android:textColor="@color/primaryTextColor" + android:textColor="?attr/primaryTextColor" android:textSize="?attr/font_default" /> </RelativeLayout> @@ -101,7 +101,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginBottom="16dp" - android:textColor="@color/primaryTextColor" + android:textColor="?attr/primaryTextColor" android:textSize="?attr/font_default" android:visibility="gone"/> @@ -148,7 +148,7 @@ android:paddingTop="8dp" android:paddingBottom="8dp" android:src="@drawable/ic_subscritptions_bottom_app_bar_24dp" - android:textColor="@color/primaryTextColor" + android:textColor="?attr/primaryTextColor" android:background="?attr/selectableItemBackgroundBorderless" /> <ImageView @@ -160,7 +160,7 @@ android:paddingTop="8dp" android:paddingBottom="8dp" android:src="@drawable/ic_multi_reddit_24dp" - android:textColor="@color/primaryTextColor" + android:textColor="?attr/primaryTextColor" android:background="?attr/selectableItemBackgroundBorderless" /> <TextView @@ -178,7 +178,7 @@ android:paddingTop="8dp" android:paddingBottom="8dp" android:src="@drawable/ic_inbox_24dp" - android:textColor="@color/primaryTextColor" + android:textColor="?attr/primaryTextColor" android:background="?attr/selectableItemBackgroundBorderless" /> <ImageView @@ -191,7 +191,7 @@ android:paddingBottom="8dp" android:gravity="center" android:src="@drawable/ic_account_circle_24dp" - android:textColor="@color/primaryTextColor" + android:textColor="?attr/primaryTextColor" android:background="?attr/selectableItemBackgroundBorderless" /> </LinearLayout> diff --git a/app/src/main/res/layout/activity_view_user_detail.xml b/app/src/main/res/layout/activity_view_user_detail.xml index f1d257e6..53e917de 100644 --- a/app/src/main/res/layout/activity_view_user_detail.xml +++ b/app/src/main/res/layout/activity_view_user_detail.xml @@ -75,7 +75,7 @@ android:layout_height="wrap_content" android:layout_marginTop="16dp" android:layout_marginBottom="16dp" - android:textColor="@color/primaryTextColor" + android:textColor="?attr/primaryTextColor" android:textSize="?attr/font_default" android:layout_gravity="center_horizontal"/> diff --git a/app/src/main/res/layout/dialog_edit_flair.xml b/app/src/main/res/layout/dialog_edit_flair.xml index 55efc339..cb1f51d1 100644 --- a/app/src/main/res/layout/dialog_edit_flair.xml +++ b/app/src/main/res/layout/dialog_edit_flair.xml @@ -9,7 +9,7 @@ android:layout_height="wrap_content" android:layout_margin="24dp" android:background="#00000000" - android:textColor="@color/primaryTextColor" + android:textColor="?attr/primaryTextColor" android:textSize="?attr/font_default" android:hint="@string/flair" android:maxLength="64" /> @@ -20,7 +20,7 @@ android:layout_marginStart="24dp" android:layout_marginEnd="24dp" android:text="@string/only_allow_64_chars" - android:textColor="@color/colorAccent" + android:textColor="?attr/colorAccent" android:textSize="?attr/font_default" /> </LinearLayout>
\ No newline at end of file diff --git a/app/src/main/res/layout/fragment_comment_more_bottom_sheet.xml b/app/src/main/res/layout/fragment_comment_more_bottom_sheet.xml index 397d8439..d60fe273 100644 --- a/app/src/main/res/layout/fragment_comment_more_bottom_sheet.xml +++ b/app/src/main/res/layout/fragment_comment_more_bottom_sheet.xml @@ -23,7 +23,7 @@ android:paddingEnd="32dp" android:paddingBottom="16dp" android:text="@string/edit" - android:textColor="@color/primaryTextColor" + android:textColor="?attr/primaryTextColor" android:textSize="?attr/font_default" android:visibility="gone" /> @@ -41,7 +41,7 @@ android:paddingEnd="32dp" android:paddingBottom="16dp" android:text="@string/delete" - android:textColor="@color/primaryTextColor" + android:textColor="?attr/primaryTextColor" android:textSize="?attr/font_default" android:visibility="gone" /> @@ -60,7 +60,7 @@ android:paddingEnd="32dp" android:paddingBottom="16dp" android:text="@string/share" - android:textColor="@color/primaryTextColor" + android:textColor="?attr/primaryTextColor" android:textSize="?attr/font_default" /> <TextView @@ -78,7 +78,7 @@ android:paddingEnd="32dp" android:paddingBottom="16dp" android:text="@string/copy_text" - android:textColor="@color/primaryTextColor" + android:textColor="?attr/primaryTextColor" android:textSize="?attr/font_default" /> </LinearLayout> diff --git a/app/src/main/res/layout/fragment_copy_text_bottom_sheet.xml b/app/src/main/res/layout/fragment_copy_text_bottom_sheet.xml index 43044ca2..3d82d549 100644 --- a/app/src/main/res/layout/fragment_copy_text_bottom_sheet.xml +++ b/app/src/main/res/layout/fragment_copy_text_bottom_sheet.xml @@ -17,7 +17,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/copy_raw_text" - android:textColor="@color/primaryTextColor" + android:textColor="?attr/primaryTextColor" android:textSize="?attr/font_default" android:paddingTop="16dp" android:paddingBottom="16dp" @@ -32,7 +32,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/copy_markdown" - android:textColor="@color/primaryTextColor" + android:textColor="?attr/primaryTextColor" android:textSize="?attr/font_default" android:paddingTop="16dp" android:paddingBottom="16dp" @@ -47,7 +47,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/copy_all_raw_text" - android:textColor="@color/primaryTextColor" + android:textColor="?attr/primaryTextColor" android:textSize="?attr/font_default" android:paddingTop="16dp" android:paddingBottom="16dp" @@ -62,7 +62,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/copy_all_markdown" - android:textColor="@color/primaryTextColor" + android:textColor="?attr/primaryTextColor" android:textSize="?attr/font_default" android:paddingTop="16dp" android:paddingBottom="16dp" diff --git a/app/src/main/res/layout/fragment_post_comment_sort_type_bottom_sheet.xml b/app/src/main/res/layout/fragment_post_comment_sort_type_bottom_sheet.xml index 7f7fae31..23efa55e 100644 --- a/app/src/main/res/layout/fragment_post_comment_sort_type_bottom_sheet.xml +++ b/app/src/main/res/layout/fragment_post_comment_sort_type_bottom_sheet.xml @@ -23,7 +23,7 @@ android:paddingEnd="32dp" android:paddingBottom="16dp" android:text="@string/sort_best" - android:textColor="@color/primaryTextColor" + android:textColor="?attr/primaryTextColor" android:textSize="?attr/font_default" /> <TextView @@ -38,7 +38,7 @@ android:paddingEnd="32dp" android:paddingBottom="16dp" android:text="@string/sort_confidence" - android:textColor="@color/primaryTextColor" + android:textColor="?attr/primaryTextColor" android:textSize="?attr/font_default" /> <TextView @@ -53,7 +53,7 @@ android:paddingEnd="32dp" android:paddingBottom="16dp" android:text="@string/sort_top" - android:textColor="@color/primaryTextColor" + android:textColor="?attr/primaryTextColor" android:textSize="?attr/font_default" /> <TextView @@ -68,7 +68,7 @@ android:paddingEnd="32dp" android:paddingBottom="16dp" android:text="@string/sort_new" - android:textColor="@color/primaryTextColor" + android:textColor="?attr/primaryTextColor" android:textSize="?attr/font_default" /> <TextView @@ -83,7 +83,7 @@ android:paddingEnd="32dp" android:paddingBottom="16dp" android:text="@string/sort_controversial" - android:textColor="@color/primaryTextColor" + android:textColor="?attr/primaryTextColor" android:textSize="?attr/font_default" /> <TextView @@ -98,7 +98,7 @@ android:paddingEnd="32dp" android:paddingBottom="16dp" android:text="@string/sort_old" - android:textColor="@color/primaryTextColor" + android:textColor="?attr/primaryTextColor" android:textSize="?attr/font_default" /> <TextView @@ -113,7 +113,7 @@ android:paddingEnd="32dp" android:paddingBottom="16dp" android:text="@string/sort_random" - android:textColor="@color/primaryTextColor" + android:textColor="?attr/primaryTextColor" android:textSize="?attr/font_default" /> <TextView @@ -128,7 +128,7 @@ android:paddingEnd="32dp" android:paddingBottom="16dp" android:text="@string/sort_qa" - android:textColor="@color/primaryTextColor" + android:textColor="?attr/primaryTextColor" android:textSize="?attr/font_default" /> <TextView @@ -143,7 +143,7 @@ android:paddingEnd="32dp" android:paddingBottom="16dp" android:text="@string/sort_live" - android:textColor="@color/primaryTextColor" + android:textColor="?attr/primaryTextColor" android:textSize="?attr/font_default" /> </LinearLayout> diff --git a/app/src/main/res/layout/fragment_post_layot_bottom_sheet.xml b/app/src/main/res/layout/fragment_post_layot_bottom_sheet.xml index 1a0f9d0e..bfe273f5 100644 --- a/app/src/main/res/layout/fragment_post_layot_bottom_sheet.xml +++ b/app/src/main/res/layout/fragment_post_layot_bottom_sheet.xml @@ -24,7 +24,7 @@ android:paddingEnd="32dp" android:paddingBottom="16dp" android:text="@string/post_layout_card" - android:textColor="@color/primaryTextColor" + android:textColor="?attr/primaryTextColor" android:textSize="?attr/font_default" /> <TextView @@ -39,7 +39,7 @@ android:paddingEnd="32dp" android:paddingBottom="16dp" android:text="@string/post_layout_compact" - android:textColor="@color/primaryTextColor" + android:textColor="?attr/primaryTextColor" android:textSize="?attr/font_default" /> </LinearLayout> diff --git a/app/src/main/res/layout/fragment_post_type_bottom_sheet.xml b/app/src/main/res/layout/fragment_post_type_bottom_sheet.xml index a21d1a21..2497dcb0 100644 --- a/app/src/main/res/layout/fragment_post_type_bottom_sheet.xml +++ b/app/src/main/res/layout/fragment_post_type_bottom_sheet.xml @@ -20,7 +20,7 @@ android:paddingStart="32dp" android:paddingEnd="32dp" android:text="@string/bottom_sheet_post_text" - android:textColor="@color/primaryTextColor" + android:textColor="?attr/primaryTextColor" android:textSize="?attr/font_default" android:drawableStart="@drawable/ic_outline_text_24px" android:drawablePadding="48dp" @@ -38,7 +38,7 @@ android:paddingStart="32dp" android:paddingEnd="32dp" android:text="@string/bottom_sheet_post_link" - android:textColor="@color/primaryTextColor" + android:textColor="?attr/primaryTextColor" android:textSize="?attr/font_default" android:drawableStart="@drawable/ic_link" android:drawablePadding="48dp" @@ -56,7 +56,7 @@ android:paddingStart="32dp" android:paddingEnd="32dp" android:text="@string/bottom_sheet_post_video" - android:textColor="@color/primaryTextColor" + android:textColor="?attr/primaryTextColor" android:textSize="?attr/font_default" android:drawableStart="@drawable/ic_outline_video_24dp" android:drawablePadding="48dp" @@ -74,7 +74,7 @@ android:paddingStart="32dp" android:paddingEnd="32dp" android:text="@string/bottom_sheet_post_image" - android:textColor="@color/primaryTextColor" + android:textColor="?attr/primaryTextColor" android:textSize="?attr/font_default" android:drawableStart="@drawable/ic_image_24dp" android:drawablePadding="48dp" diff --git a/app/src/main/res/layout/fragment_search_post_sort_type_bottom_sheet.xml b/app/src/main/res/layout/fragment_search_post_sort_type_bottom_sheet.xml index 88b5391f..e1c0f8ea 100644 --- a/app/src/main/res/layout/fragment_search_post_sort_type_bottom_sheet.xml +++ b/app/src/main/res/layout/fragment_search_post_sort_type_bottom_sheet.xml @@ -15,7 +15,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/sort_relevance" - android:textColor="@color/primaryTextColor" + android:textColor="?attr/primaryTextColor" android:textSize="?attr/font_default" android:paddingTop="16dp" android:paddingBottom="16dp" @@ -30,7 +30,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/sort_hot" - android:textColor="@color/primaryTextColor" + android:textColor="?attr/primaryTextColor" android:textSize="?attr/font_default" android:paddingTop="16dp" android:paddingBottom="16dp" @@ -45,7 +45,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/sort_top" - android:textColor="@color/primaryTextColor" + android:textColor="?attr/primaryTextColor" android:textSize="?attr/font_default" android:paddingTop="16dp" android:paddingBottom="16dp" @@ -60,7 +60,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/sort_new" - android:textColor="@color/primaryTextColor" + android:textColor="?attr/primaryTextColor" android:textSize="?attr/font_default" android:paddingTop="16dp" android:paddingBottom="16dp" @@ -75,7 +75,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/sort_comments" - android:textColor="@color/primaryTextColor" + android:textColor="?attr/primaryTextColor" android:textSize="?attr/font_default" android:paddingTop="16dp" android:paddingBottom="16dp" diff --git a/app/src/main/res/layout/fragment_search_user_and_subreddit_sort_type_bottom_sheet.xml b/app/src/main/res/layout/fragment_search_user_and_subreddit_sort_type_bottom_sheet.xml index 852cfc6c..be3e8030 100644 --- a/app/src/main/res/layout/fragment_search_user_and_subreddit_sort_type_bottom_sheet.xml +++ b/app/src/main/res/layout/fragment_search_user_and_subreddit_sort_type_bottom_sheet.xml @@ -15,7 +15,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/sort_relevance" - android:textColor="@color/primaryTextColor" + android:textColor="?attr/primaryTextColor" android:textSize="?attr/font_default" android:paddingTop="16dp" android:paddingBottom="16dp" @@ -30,7 +30,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/sort_activity" - android:textColor="@color/primaryTextColor" + android:textColor="?attr/primaryTextColor" android:textSize="?attr/font_default" android:paddingTop="16dp" android:paddingBottom="16dp" diff --git a/app/src/main/res/layout/fragment_share_link_bottom_sheet.xml b/app/src/main/res/layout/fragment_share_link_bottom_sheet.xml index 0d69a9c6..b842f077 100644 --- a/app/src/main/res/layout/fragment_share_link_bottom_sheet.xml +++ b/app/src/main/res/layout/fragment_share_link_bottom_sheet.xml @@ -20,7 +20,7 @@ android:paddingStart="32dp" android:paddingEnd="32dp" android:text="@string/share_post_link" - android:textColor="@color/primaryTextColor" + android:textColor="?attr/primaryTextColor" android:textSize="?attr/font_default" android:drawableStart="@drawable/ic_link" android:drawablePadding="48dp" @@ -38,7 +38,7 @@ android:paddingStart="32dp" android:paddingEnd="32dp" android:text="@string/copy_post_link" - android:textColor="@color/primaryTextColor" + android:textColor="?attr/primaryTextColor" android:textSize="?attr/font_default" android:drawableStart="@drawable/ic_copy_24dp" android:drawablePadding="48dp" @@ -55,7 +55,7 @@ android:paddingBottom="16dp" android:paddingStart="32dp" android:paddingEnd="32dp" - android:textColor="@color/primaryTextColor" + android:textColor="?attr/primaryTextColor" android:textSize="?attr/font_default" android:drawableStart="@drawable/ic_link" android:drawablePadding="48dp" @@ -73,7 +73,7 @@ android:paddingBottom="16dp" android:paddingStart="32dp" android:paddingEnd="32dp" - android:textColor="@color/primaryTextColor" + android:textColor="?attr/primaryTextColor" android:textSize="?attr/font_default" android:drawableStart="@drawable/ic_copy_24dp" android:drawablePadding="48dp" diff --git a/app/src/main/res/layout/fragment_sort_time_bottom_sheet.xml b/app/src/main/res/layout/fragment_sort_time_bottom_sheet.xml index 5975b2cc..1c0ab47b 100644 --- a/app/src/main/res/layout/fragment_sort_time_bottom_sheet.xml +++ b/app/src/main/res/layout/fragment_sort_time_bottom_sheet.xml @@ -17,7 +17,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/sort_time_hour" - android:textColor="@color/primaryTextColor" + android:textColor="?attr/primaryTextColor" android:textSize="?attr/font_default" android:paddingTop="16dp" android:paddingBottom="16dp" @@ -32,7 +32,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/sort_time_day" - android:textColor="@color/primaryTextColor" + android:textColor="?attr/primaryTextColor" android:textSize="?attr/font_default" android:paddingTop="16dp" android:paddingBottom="16dp" @@ -47,7 +47,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/sort_time_week" - android:textColor="@color/primaryTextColor" + android:textColor="?attr/primaryTextColor" android:textSize="?attr/font_default" android:paddingTop="16dp" android:paddingBottom="16dp" @@ -62,7 +62,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/sort_time_month" - android:textColor="@color/primaryTextColor" + android:textColor="?attr/primaryTextColor" android:textSize="?attr/font_default" android:paddingTop="16dp" android:paddingBottom="16dp" @@ -77,7 +77,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/sort_time_year" - android:textColor="@color/primaryTextColor" + android:textColor="?attr/primaryTextColor" android:textSize="?attr/font_default" android:paddingTop="16dp" android:paddingBottom="16dp" @@ -92,7 +92,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/sort_time_all_time" - android:textColor="@color/primaryTextColor" + android:textColor="?attr/primaryTextColor" android:textSize="?attr/font_default" android:paddingTop="16dp" android:paddingBottom="16dp" diff --git a/app/src/main/res/layout/fragment_sort_type_bottom_sheet.xml b/app/src/main/res/layout/fragment_sort_type_bottom_sheet.xml index 731f35df..f60fe0bb 100644 --- a/app/src/main/res/layout/fragment_sort_type_bottom_sheet.xml +++ b/app/src/main/res/layout/fragment_sort_type_bottom_sheet.xml @@ -15,7 +15,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/sort_best" - android:textColor="@color/primaryTextColor" + android:textColor="?attr/primaryTextColor" android:textSize="?attr/font_default" android:paddingTop="16dp" android:paddingBottom="16dp" @@ -30,7 +30,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/sort_hot" - android:textColor="@color/primaryTextColor" + android:textColor="?attr/primaryTextColor" android:textSize="?attr/font_default" android:paddingTop="16dp" android:paddingBottom="16dp" @@ -45,7 +45,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/sort_new" - android:textColor="@color/primaryTextColor" + android:textColor="?attr/primaryTextColor" android:textSize="?attr/font_default" android:paddingTop="16dp" android:paddingBottom="16dp" @@ -60,7 +60,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/sort_random" - android:textColor="@color/primaryTextColor" + android:textColor="?attr/primaryTextColor" android:textSize="?attr/font_default" android:paddingTop="16dp" android:paddingBottom="16dp" @@ -75,7 +75,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/sort_rising" - android:textColor="@color/primaryTextColor" + android:textColor="?attr/primaryTextColor" android:textSize="?attr/font_default" android:paddingTop="16dp" android:paddingBottom="16dp" @@ -90,7 +90,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/sort_top" - android:textColor="@color/primaryTextColor" + android:textColor="?attr/primaryTextColor" android:textSize="?attr/font_default" android:paddingTop="16dp" android:paddingBottom="16dp" @@ -105,7 +105,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/sort_controversial" - android:textColor="@color/primaryTextColor" + android:textColor="?attr/primaryTextColor" android:textSize="?attr/font_default" android:paddingTop="16dp" android:paddingBottom="16dp" diff --git a/app/src/main/res/layout/fragment_user_thing_sort_type_bottom_sheet.xml b/app/src/main/res/layout/fragment_user_thing_sort_type_bottom_sheet.xml index e9746197..dbf56287 100644 --- a/app/src/main/res/layout/fragment_user_thing_sort_type_bottom_sheet.xml +++ b/app/src/main/res/layout/fragment_user_thing_sort_type_bottom_sheet.xml @@ -9,7 +9,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/sort_new" - android:textColor="@color/primaryTextColor" + android:textColor="?attr/primaryTextColor" android:textSize="?attr/font_default" android:paddingTop="16dp" android:paddingBottom="16dp" @@ -24,7 +24,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/sort_hot" - android:textColor="@color/primaryTextColor" + android:textColor="?attr/primaryTextColor" android:textSize="?attr/font_default" android:paddingTop="16dp" android:paddingBottom="16dp" @@ -39,7 +39,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/sort_top" - android:textColor="@color/primaryTextColor" + android:textColor="?attr/primaryTextColor" android:textSize="?attr/font_default" android:paddingTop="16dp" android:paddingBottom="16dp" @@ -54,7 +54,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/sort_controversial" - android:textColor="@color/primaryTextColor" + android:textColor="?attr/primaryTextColor" android:textSize="?attr/font_default" android:paddingTop="16dp" android:paddingBottom="16dp" diff --git a/app/src/main/res/layout/item_acknowledgement.xml b/app/src/main/res/layout/item_acknowledgement.xml index 5e75d492..b1d37f97 100644 --- a/app/src/main/res/layout/item_acknowledgement.xml +++ b/app/src/main/res/layout/item_acknowledgement.xml @@ -14,7 +14,7 @@ android:id="@+id/name_text_view_item_acknowledgement" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:textColor="@color/primaryTextColor" + android:textColor="?attr/primaryTextColor" android:textSize="?attr/font_16" /> <TextView diff --git a/app/src/main/res/layout/item_comment.xml b/app/src/main/res/layout/item_comment.xml index 88307a62..dfefe3d1 100644 --- a/app/src/main/res/layout/item_comment.xml +++ b/app/src/main/res/layout/item_comment.xml @@ -96,7 +96,7 @@ android:layout_marginStart="16dp" android:layout_marginEnd="16dp" android:layout_marginBottom="8dp" - android:textColor="@color/primaryTextColor" + android:textColor="?attr/primaryTextColor" android:textSize="?attr/content_font_default" /> <androidx.constraintlayout.widget.ConstraintLayout @@ -215,7 +215,7 @@ android:id="@+id/divider_item_comment" android:layout_width="match_parent" android:layout_height="1dp" - android:background="@color/dividerColor" + android:background="?attr/dividerColor" android:visibility="gone" /> </LinearLayout>
\ No newline at end of file diff --git a/app/src/main/res/layout/item_flair.xml b/app/src/main/res/layout/item_flair.xml index 596da813..abd5c477 100644 --- a/app/src/main/res/layout/item_flair.xml +++ b/app/src/main/res/layout/item_flair.xml @@ -11,7 +11,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:padding="16dp" - android:textColor="@color/primaryTextColor" + android:textColor="?attr/primaryTextColor" android:textSize="?attr/font_default" /> <ImageView @@ -22,7 +22,7 @@ android:layout_marginStart="32dp" android:src="@drawable/ic_outline_edit_24px" android:visibility="gone" - android:tint="@color/primaryTextColor" + android:tint="?attr/primaryTextColor" android:background="?actionBarItemBackground" android:clickable="true" android:focusable="true" /> diff --git a/app/src/main/res/layout/item_load_comments.xml b/app/src/main/res/layout/item_load_comments.xml index 3558554f..9f994dc7 100644 --- a/app/src/main/res/layout/item_load_comments.xml +++ b/app/src/main/res/layout/item_load_comments.xml @@ -11,7 +11,7 @@ android:layout_height="wrap_content" android:layout_margin="16dp" app:mlpb_progress_stoke_width="3dp" - app:mlpb_progress_color="@color/colorAccent" + app:mlpb_progress_color="?attr/colorAccent" app:mlpb_background_color="?attr/circularProgressBarBackground" android:layout_gravity="center_horizontal"/> diff --git a/app/src/main/res/layout/item_load_more_comments_placeholder.xml b/app/src/main/res/layout/item_load_more_comments_placeholder.xml index 8c0fb3e1..fc33b062 100644 --- a/app/src/main/res/layout/item_load_more_comments_placeholder.xml +++ b/app/src/main/res/layout/item_load_more_comments_placeholder.xml @@ -21,7 +21,7 @@ android:gravity="center" android:padding="8dp" android:text="@string/comment_load_more_comments" - android:textColor="@color/primaryTextColor" + android:textColor="?attr/primaryTextColor" android:textSize="?attr/font_default" /> </LinearLayout> @@ -30,7 +30,7 @@ android:id="@+id/divider_item_load_more_comments_placeholder" android:layout_width="match_parent" android:layout_height="1dp" - android:background="@color/dividerColor" + android:background="?attr/dividerColor" android:visibility="gone" /> </LinearLayout>
\ No newline at end of file diff --git a/app/src/main/res/layout/item_message.xml b/app/src/main/res/layout/item_message.xml index cc822cc0..1ac3b4ed 100644 --- a/app/src/main/res/layout/item_message.xml +++ b/app/src/main/res/layout/item_message.xml @@ -10,7 +10,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginBottom="8dp" - android:textColor="@color/primaryTextColor" + android:textColor="?attr/primaryTextColor" android:textSize="?attr/font_default" /> <TextView @@ -19,14 +19,14 @@ android:layout_height="wrap_content" android:layout_marginBottom="8dp" android:textSize="?attr/font_16" - android:textColor="@color/primaryTextColor" /> + android:textColor="?attr/primaryTextColor" /> <TextView android:id="@+id/title_text_view_item_message" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginBottom="8dp" - android:textColor="@color/primaryTextColor" + android:textColor="?attr/primaryTextColor" android:textSize="?attr/font_default" /> <TextView diff --git a/app/src/main/res/layout/item_multi_reddit.xml b/app/src/main/res/layout/item_multi_reddit.xml index 6a8723d2..b522251b 100644 --- a/app/src/main/res/layout/item_multi_reddit.xml +++ b/app/src/main/res/layout/item_multi_reddit.xml @@ -19,7 +19,7 @@ android:layout_width="0dp" android:layout_height="wrap_content" android:layout_weight="1" - android:textColor="@color/primaryTextColor" + android:textColor="?attr/primaryTextColor" android:textSize="?attr/font_default" android:layout_gravity="center_vertical" /> diff --git a/app/src/main/res/layout/item_nav_drawer_account.xml b/app/src/main/res/layout/item_nav_drawer_account.xml index 35405b82..7cf71e6a 100644 --- a/app/src/main/res/layout/item_nav_drawer_account.xml +++ b/app/src/main/res/layout/item_nav_drawer_account.xml @@ -20,7 +20,7 @@ android:layout_marginStart="16dp" android:layout_marginEnd="16dp" android:layout_gravity="center_vertical" - android:textColor="@color/primaryTextColor" + android:textColor="?attr/primaryTextColor" android:textSize="?attr/font_default" /> </LinearLayout>
\ No newline at end of file diff --git a/app/src/main/res/layout/item_nav_drawer_divider.xml b/app/src/main/res/layout/item_nav_drawer_divider.xml index c0e73dff..c27b4d55 100644 --- a/app/src/main/res/layout/item_nav_drawer_divider.xml +++ b/app/src/main/res/layout/item_nav_drawer_divider.xml @@ -2,4 +2,4 @@ <View xmlns:android="http://schemas.android.com/apk/res/android" android:layout_width="match_parent" android:layout_height="1dp" - android:background="@color/dividerColor" />
\ No newline at end of file + android:background="?attr/dividerColor" />
\ No newline at end of file diff --git a/app/src/main/res/layout/item_nav_drawer_menu_item.xml b/app/src/main/res/layout/item_nav_drawer_menu_item.xml index 4e9f911f..4e3cdf5b 100644 --- a/app/src/main/res/layout/item_nav_drawer_menu_item.xml +++ b/app/src/main/res/layout/item_nav_drawer_menu_item.xml @@ -8,5 +8,5 @@ android:focusable="true" android:gravity="center_vertical" android:padding="16dp" - android:textColor="@color/primaryTextColor" + android:textColor="?attr/primaryTextColor" android:textSize="?attr/font_default" />
\ No newline at end of file diff --git a/app/src/main/res/layout/item_nav_drawer_subscribed_thing.xml b/app/src/main/res/layout/item_nav_drawer_subscribed_thing.xml index 0dc934fe..9c96ea4f 100644 --- a/app/src/main/res/layout/item_nav_drawer_subscribed_thing.xml +++ b/app/src/main/res/layout/item_nav_drawer_subscribed_thing.xml @@ -20,7 +20,7 @@ android:layout_width="0dp" android:layout_height="wrap_content" android:layout_weight="1" - android:textColor="@color/primaryTextColor" + android:textColor="?attr/primaryTextColor" android:textSize="?attr/font_default" android:layout_gravity="center_vertical" /> diff --git a/app/src/main/res/layout/item_post.xml b/app/src/main/res/layout/item_post.xml index 113f6855..3acff256 100644 --- a/app/src/main/res/layout/item_post.xml +++ b/app/src/main/res/layout/item_post.xml @@ -98,7 +98,7 @@ android:paddingStart="16dp" android:paddingEnd="16dp" android:textSize="?attr/title_font_18" - android:textColor="@color/primaryTextColor" /> + android:textColor="?attr/primaryTextColor" /> <TextView android:id="@+id/content_text_view_item_post" @@ -158,8 +158,8 @@ android:textSize="?attr/font_12" android:textColor="@android:color/white" android:visibility="gone" - app:lib_setRoundedBGColor="@color/colorAccent" - app:lib_setRoundedBorderColor="@color/colorAccent" + app:lib_setRoundedBGColor="?attr/nsfwColor" + app:lib_setRoundedBorderColor="?attr/nsfwColor" app:lib_setRadius="3dp" app:lib_setRoundedView="true" app:lib_setShape="rectangle" /> @@ -287,7 +287,7 @@ android:scaleType="center" android:src="@drawable/ic_link" android:tint="@android:color/tab_indicator_text" - android:background="@color/grey" + android:background="?attr/noPreviewLinkBackgroundColor" android:visibility="gone"/> <androidx.constraintlayout.widget.ConstraintLayout diff --git a/app/src/main/res/layout/item_post_compact.xml b/app/src/main/res/layout/item_post_compact.xml index ef7c2fe9..5488508f 100644 --- a/app/src/main/res/layout/item_post_compact.xml +++ b/app/src/main/res/layout/item_post_compact.xml @@ -84,7 +84,7 @@ android:layout_height="wrap_content" android:paddingStart="16dp" android:paddingEnd="16dp" - android:textColor="@color/primaryTextColor" + android:textColor="?attr/primaryTextColor" android:textSize="?attr/title_font_18" app:layout_constraintBottom_toTopOf="@id/flow_layout_item_post_compact" app:layout_constraintStart_toStartOf="parent" @@ -146,8 +146,8 @@ android:textSize="?attr/font_10" android:visibility="gone" app:lib_setRadius="3dp" - app:lib_setRoundedBGColor="@color/colorAccent" - app:lib_setRoundedBorderColor="@color/colorAccent" + app:lib_setRoundedBGColor="?attr/nsfwColor" + app:lib_setRoundedBorderColor="?attr/nsfwColor" app:lib_setRoundedView="true" app:lib_setShape="rectangle" /> @@ -265,7 +265,7 @@ android:scaleType="center" android:src="@drawable/ic_link" android:tint="@android:color/tab_indicator_text" - android:background="@color/grey" + android:background="?attr/noPreviewLinkBackgroundColor" android:visibility="gone" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintStart_toEndOf="@id/barrier2" @@ -385,7 +385,7 @@ android:id="@+id/divider_item_post_compact" android:layout_width="match_parent" android:layout_height="1dp" - android:background="@color/dividerColor" /> + android:background="?attr/dividerColor" /> </LinearLayout> diff --git a/app/src/main/res/layout/item_post_detail.xml b/app/src/main/res/layout/item_post_detail.xml index e0bcc418..983ac476 100644 --- a/app/src/main/res/layout/item_post_detail.xml +++ b/app/src/main/res/layout/item_post_detail.xml @@ -78,7 +78,7 @@ android:layout_height="wrap_content" android:paddingStart="16dp" android:paddingEnd="16dp" - android:textColor="@color/primaryTextColor" + android:textColor="?attr/primaryTextColor" android:textSize="?attr/title_font_18" android:textIsSelectable="true" android:enabled="true" @@ -140,8 +140,8 @@ android:textSize="?attr/font_12" android:textColor="@android:color/white" android:visibility="gone" - app:lib_setRoundedBGColor="@color/colorAccent" - app:lib_setRoundedBorderColor="@color/colorAccent" + app:lib_setRoundedBGColor="?attr/nsfwColor" + app:lib_setRoundedBorderColor="?attr/nsfwColor" app:lib_setRadius="3dp" app:lib_setRoundedView="true" app:lib_setShape="rectangle" /> @@ -267,7 +267,7 @@ android:id="@+id/image_view_no_preview_link_item_post_detail" android:layout_width="match_parent" android:layout_height="150dp" - android:background="@color/grey" + android:background="?attr/noPreviewLinkBackgroundColor" android:scaleType="center" android:src="@drawable/ic_link" android:tint="@android:color/tab_indicator_text" diff --git a/app/src/main/res/layout/item_rule.xml b/app/src/main/res/layout/item_rule.xml index 5230295c..8b003197 100644 --- a/app/src/main/res/layout/item_rule.xml +++ b/app/src/main/res/layout/item_rule.xml @@ -8,7 +8,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:padding="16dp" - android:textColor="@color/primaryTextColor" + android:textColor="?attr/primaryTextColor" android:textSize="?attr/title_font_16" /> <TextView diff --git a/app/src/main/res/layout/item_subreddit_listing.xml b/app/src/main/res/layout/item_subreddit_listing.xml index f9797e7e..2b3e186b 100644 --- a/app/src/main/res/layout/item_subreddit_listing.xml +++ b/app/src/main/res/layout/item_subreddit_listing.xml @@ -24,7 +24,7 @@ android:layout_height="wrap_content" android:layout_gravity="center_vertical" android:layout_marginStart="32dp" - android:textColor="@color/primaryTextColor" + android:textColor="?attr/primaryTextColor" android:textSize="?attr/font_default" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintStart_toEndOf="@+id/subreddit_icon_gif_image_view_item_subreddit_listing" diff --git a/app/src/main/res/layout/item_subscribed_subreddit_multi_selection.xml b/app/src/main/res/layout/item_subscribed_subreddit_multi_selection.xml index 22327517..1f62ae81 100644 --- a/app/src/main/res/layout/item_subscribed_subreddit_multi_selection.xml +++ b/app/src/main/res/layout/item_subscribed_subreddit_multi_selection.xml @@ -25,7 +25,7 @@ android:layout_weight="1" android:layout_gravity="center_vertical" android:layout_marginEnd="32dp" - android:textColor="@color/primaryTextColor" + android:textColor="?attr/primaryTextColor" android:textSize="?attr/font_default" /> <CheckBox diff --git a/app/src/main/res/layout/item_subscribed_thing.xml b/app/src/main/res/layout/item_subscribed_thing.xml index 79622979..0507fac4 100644 --- a/app/src/main/res/layout/item_subscribed_thing.xml +++ b/app/src/main/res/layout/item_subscribed_thing.xml @@ -20,7 +20,7 @@ android:layout_width="0dp" android:layout_height="wrap_content" android:layout_weight="1" - android:textColor="@color/primaryTextColor" + android:textColor="?attr/primaryTextColor" android:textSize="?attr/font_default" android:layout_gravity="center_vertical" /> diff --git a/app/src/main/res/layout/item_user_listing.xml b/app/src/main/res/layout/item_user_listing.xml index 9ba6d291..e2b22637 100644 --- a/app/src/main/res/layout/item_user_listing.xml +++ b/app/src/main/res/layout/item_user_listing.xml @@ -24,7 +24,7 @@ android:layout_height="wrap_content" android:layout_gravity="center_vertical" android:layout_marginStart="32dp" - android:textColor="@color/primaryTextColor" + android:textColor="?attr/primaryTextColor" android:textSize="?attr/font_default" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintStart_toEndOf="@+id/user_icon_gif_image_view_item_user_listing" diff --git a/app/src/main/res/layout/item_view_all_comments.xml b/app/src/main/res/layout/item_view_all_comments.xml index 7a3b28fe..28816da4 100644 --- a/app/src/main/res/layout/item_view_all_comments.xml +++ b/app/src/main/res/layout/item_view_all_comments.xml @@ -1,18 +1,12 @@ <?xml version="1.0" encoding="utf-8"?> -<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" +<TextView xmlns:android="http://schemas.android.com/apk/res/android" android:layout_width="match_parent" android:layout_height="wrap_content" + android:gravity="center" android:padding="16dp" android:background="?attr/selectableItemBackground" android:clickable="true" - android:focusable="true"> - - <TextView - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:text="@string/view_all_comments" - android:gravity="center" - android:textColor="@color/colorAccent" - android:textSize="?attr/font_default" /> - -</LinearLayout>
\ No newline at end of file + android:focusable="true" + android:text="@string/view_all_comments" + android:textColor="?attr/colorAccent" + android:textSize="?attr/font_default" />
\ No newline at end of file |