支持夜间模式

h4ckm310n · Mar 10, 2020 · e2ec1b0 · e2ec1b0
1 parent 07f20a0
commit e2ec1b0
Show file tree

Hide file tree

Showing 11 changed files with 17 additions and 14 deletions.
diff --git a/README.md b/README.md
@@ -43,7 +43,7 @@
 
 ## 4.在Google Play上获取
 
-<a href="https://play.google.com/store/apps/details?id=ceui.lisa">
+<a href="https://play.google.com/store/apps/details?id=ceui.lisa.pixiv">
     <img
         alt="Get it on Google Play"
         src="https://play.google.com/intl/en_us/badges/images/generic/en_badge_web_generic.png"

diff --git a/app/build.gradle b/app/build.gradle
@@ -10,8 +10,8 @@ android {
         applicationId "ceui.lisa.pixiv"
         minSdkVersion 21
         targetSdkVersion 28
-        versionCode 66
-        versionName "1.5.0"
+        versionCode 67
+        versionName "1.5.1"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
 

diff --git a/app/src/main/res/layout/activity_out_wake.xml b/app/src/main/res/layout/activity_out_wake.xml
@@ -8,6 +8,7 @@
         android:layout_width="wrap_content"
         android:text="@string/finding_datas"
         android:textSize="16sp"
+        android:textColor="@color/rank_text_color"
         android:id="@+id/text"
         android:layout_centerInParent="true"
         android:layout_height="wrap_content" />

diff --git a/app/src/main/res/layout/fragment_novel_holder.xml b/app/src/main/res/layout/fragment_novel_holder.xml
@@ -181,7 +181,7 @@
                 android:text="@string/finding_datas"
                 android:gravity="center"
                 android:textSize="16sp"
-                android:textColor="@color/white"
+                android:textColor="@color/always_white"
                 android:layout_below="@+id/progress"
                 android:id="@+id/text"
                 android:layout_height="wrap_content" />

diff --git a/app/src/main/res/layout/fragment_recmd.xml b/app/src/main/res/layout/fragment_recmd.xml
@@ -64,7 +64,7 @@
                             android:text="@string/ranking_illust"
                             android:gravity="center"
                             android:id="@+id/ranking_s"
-                            android:textColor="#2c333c"
+                            android:textColor="@color/rank_text_color"
                             android:textSize="15sp"
                             android:textStyle="bold" />
 
@@ -111,8 +111,8 @@
 
                             <TextView
                                 android:layout_width="wrap_content"
-                                android:textColor="#2c333c"
                                 android:textSize="15sp"
+                                android:textColor="@color/rank_text_color"
                                 android:text="@string/recmd_for_you"
                                 android:layout_marginTop="@dimen/six_dp"
                                 android:textStyle="bold"

diff --git a/app/src/main/res/layout/fragment_single_novel.xml b/app/src/main/res/layout/fragment_single_novel.xml
@@ -12,7 +12,7 @@
         android:textSize="17sp"
         android:layout_margin="@dimen/sixteen_dp"
         android:background="#000339"
-        android:textColor="@color/white"
+        android:textColor="@color/white_to_gray"
         android:lineSpacingExtra="@dimen/six_dp"
         android:layout_height="wrap_content">
 

diff --git a/app/src/main/res/layout/recy_artical.xml b/app/src/main/res/layout/recy_artical.xml
@@ -19,7 +19,7 @@
             android:id="@+id/user_follow_linear"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:background="@android:color/white"
+            android:background="@color/white_to_deep_dark"
             android:orientation="vertical">
 
             <ImageView
@@ -50,7 +50,7 @@
                     android:layout_marginTop="@dimen/eight_dp"
                     android:layout_marginBottom="@dimen/eight_dp"
                     android:layout_marginEnd="@dimen/sixteen_dp"
-                    android:textColor="#666666"
+                    android:textColor="@color/rank_text_color"
                     android:id="@+id/title"
                     android:layout_height="wrap_content" />
             </RelativeLayout>

diff --git a/app/src/main/res/layout/recy_artical_horizon.xml b/app/src/main/res/layout/recy_artical_horizon.xml
@@ -13,7 +13,7 @@
             android:id="@+id/user_follow_linear"
             android:layout_width="220dp"
             android:layout_height="@dimen/article_horizontal_height"
-            android:background="@android:color/white"
+            android:background="@color/white_to_deep_dark"
             android:orientation="vertical">
 
             <ImageView
@@ -43,7 +43,7 @@
                 android:layout_marginTop="@dimen/six_dp"
                 android:layout_marginBottom="@dimen/six_dp"
                 android:layout_marginEnd="@dimen/eight_dp"
-                android:textColor="#666666"
+                android:textColor="@color/rank_text_color"
                 android:layout_below="@+id/illust_image"
                 android:id="@+id/title"
                 android:layout_height="match_parent" />

diff --git a/app/src/main/res/layout/recy_novel.xml b/app/src/main/res/layout/recy_novel.xml
@@ -10,7 +10,7 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:cardCornerRadius="2dp"
-        app:cardBackgroundColor="@color/white"
+        app:cardBackgroundColor="@color/white_to_deep_dark"
         app:cardElevation="@dimen/four_dp">
 
         <RelativeLayout
@@ -57,7 +57,7 @@
                     android:layout_marginTop="@dimen/eight_dp"
                     android:layout_marginBottom="@dimen/eight_dp"
                     android:layout_marginStart="@dimen/eight_dp"
-                    android:textColor="@color/black"
+                    android:textColor="@color/rank_text_color"
                     android:textSize="16sp">
 
                 </TextView>
@@ -99,7 +99,7 @@
             <de.hdodenhof.circleimageview.CircleImageView
                 android:layout_width="28dp"
                 android:id="@+id/user_head"
-                app:civ_border_color="@color/light_bg"
+                app:civ_border_color="@color/dark_bg"
                 app:civ_border_width="1dp"
                 android:layout_marginStart="@dimen/eight_dp"
                 android:layout_alignBottom="@+id/cover"

diff --git a/app/src/main/res/values-night/colors.xml b/app/src/main/res/values-night/colors.xml
@@ -45,4 +45,5 @@
     <color name="normal_bg">#434343</color>
     <color name="second_text_color">#8E8E8E</color>
     <color name="no_data_color">#BDBDBD</color>
+    <color name="white_to_deep_dark">#434343</color>
 </resources>
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
@@ -39,5 +39,6 @@
     <color name="normal_bg">#f4f4f4</color>
     <color name="second_text_color">#333333</color>
     <color name="no_data_color">#666666</color>
+    <color name="white_to_deep_dark">#FFFFFF</color>
 
 </resources>