From c8d1a9e37ada68835838440ce7c25b0ee96798b5 Mon Sep 17 00:00:00 2001 From: Alex Ning Date: Tue, 7 May 2019 23:55:49 +0800 Subject: Dark theme support. --- app/src/main/res/layout/activity_main.xml | 7 +- .../main/res/layout/activity_view_post_detail.xml | 14 +- .../res/layout/activity_view_subreddit_detail.xml | 8 +- .../main/res/layout/activity_view_user_detail.xml | 6 +- app/src/main/res/layout/fragment_post.xml | 1 + app/src/main/res/layout/item_comment.xml | 231 +++++++++++---------- app/src/main/res/layout/item_post.xml | 9 +- app/src/main/res/layout/item_subreddit_listing.xml | 5 +- .../main/res/layout/item_subscribed_subreddit.xml | 24 --- app/src/main/res/layout/item_subscribed_thing.xml | 24 +++ app/src/main/res/layout/item_user_listing.xml | 5 +- 11 files changed, 171 insertions(+), 163 deletions(-) delete mode 100644 app/src/main/res/layout/item_subscribed_subreddit.xml create mode 100644 app/src/main/res/layout/item_subscribed_thing.xml (limited to 'app/src/main/res/layout') diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml index 12eff6dc..f0ba107e 100644 --- a/app/src/main/res/layout/activity_main.xml +++ b/app/src/main/res/layout/activity_main.xml @@ -46,21 +46,22 @@ android:layout_height="24dp" android:layout_gravity="center_vertical" android:layout_marginEnd="32dp" - android:src="@drawable/ic_outline_account_circle_24px" /> + android:src="@drawable/ic_outline_account_circle_24px" + android:tint="@color/primaryTextColor"/> + android:textColor="@color/primaryTextColor" /> + android:background="@color/dividerColor" /> + app:chipBackgroundColor="@color/backgroundColorPrimaryDark"/> - - + + android:background="@color/backgroundColor"> @@ -86,7 +86,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_alignParentEnd="true" - android:textColor="@android:color/black" /> + android:textColor="@color/primaryTextColor" /> @@ -95,7 +95,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginBottom="16dp" - android:textColor="@android:color/black" + android:textColor="@color/primaryTextColor" android:visibility="gone"/> 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 9bd70a72..70b225f8 100644 --- a/app/src/main/res/layout/activity_view_user_detail.xml +++ b/app/src/main/res/layout/activity_view_user_detail.xml @@ -48,7 +48,7 @@ android:paddingStart="16dp" android:paddingEnd="16dp" android:layout_below="@id/banner_image_view_view_user_detail_activity" - android:background="@android:color/white"> + android:background="@color/backgroundColor"> - - - + + android:layout_height="wrap_content"> - + - - - - - - - - - + android:layout_marginTop="12dp" + android:layout_marginBottom="12dp" + android:orientation="vertical"> - - - + + + + + + + + - - - - - - + + - - + android:layout_marginStart="16dp" + android:layout_marginEnd="16dp"> + + + + + + + + + + + + + + - + - \ No newline at end of file + \ 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 02c8ce23..8f1beb79 100644 --- a/app/src/main/res/layout/item_post.xml +++ b/app/src/main/res/layout/item_post.xml @@ -50,7 +50,7 @@ android:layout_height="24dp" android:layout_marginStart="8dp" android:layout_marginEnd="8dp" - android:tint="@color/colorPrimary" + android:tint="@color/textColorPrimaryDark" android:visibility="gone" app:layout_constraintStart_toEndOf="@id/subreddit_icon_name_linear_layout_view_item_best_post" app:layout_constraintEnd_toStartOf="@+id/post_time_text_view_best_post_item" @@ -77,7 +77,7 @@ android:paddingStart="16dp" android:paddingEnd="16dp" android:textSize="18sp" - android:textColor="#000000"/> + android:textColor="@color/primaryTextColor"/> + app:chipBackgroundColor="@color/backgroundColorPrimaryDark" /> @@ -34,9 +34,8 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_gravity="center_vertical" - android:src="@drawable/baseline_add_white_24" - android:tint="@color/colorPrimary" + android:tint="@color/textColorPrimaryDark" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintTop_toTopOf="parent" app:layout_constraintBottom_toBottomOf="parent" diff --git a/app/src/main/res/layout/item_subscribed_subreddit.xml b/app/src/main/res/layout/item_subscribed_subreddit.xml deleted file mode 100644 index 0717c7c4..00000000 --- a/app/src/main/res/layout/item_subscribed_subreddit.xml +++ /dev/null @@ -1,24 +0,0 @@ - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/item_subscribed_thing.xml b/app/src/main/res/layout/item_subscribed_thing.xml new file mode 100644 index 00000000..0f4afc20 --- /dev/null +++ b/app/src/main/res/layout/item_subscribed_thing.xml @@ -0,0 +1,24 @@ + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/item_user_listing.xml b/app/src/main/res/layout/item_user_listing.xml index 24ba6102..04b16bdc 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="@android:color/black" + android:textColor="@color/primaryTextColor" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintStart_toEndOf="@+id/user_icon_gif_image_view_item_user_listing" app:layout_constraintTop_toTopOf="parent" /> @@ -34,9 +34,8 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_gravity="center_vertical" - android:src="@drawable/baseline_add_white_24" - android:tint="@color/colorPrimary" + android:tint="@color/textColorPrimaryDark" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintTop_toTopOf="parent" app:layout_constraintBottom_toBottomOf="parent" -- cgit v1.2.3