Browse Source

Added string and color resources

Vadik Sirekanyan 7 năm trước cách đây
mục cha
commit
c8ca545be0

+ 6 - 5
app/src/main/res/layout/profile_activity.xml

@@ -44,6 +44,7 @@
             android:ellipsize="end"
             android:gravity="center"
             android:maxLines="1"
+            android:textColor="?android:attr/textColorPrimary"
             android:textSize="28sp"
             tools:text="Павел Дуров" />
 
@@ -66,8 +67,8 @@
 
     <View
         android:layout_width="match_parent"
-        android:layout_height="1dp"
-        android:background="#BBFFFFFF" />
+        android:layout_height="0.5dp"
+        android:background="?android:attr/textColorTertiary" />
 
     <LinearLayout
         android:layout_width="match_parent"
@@ -89,8 +90,8 @@
 
     <View
         android:layout_width="match_parent"
-        android:layout_height="1dp"
-        android:background="#BBFFFFFF" />
+        android:layout_height="0.5dp"
+        android:background="?android:attr/textColorTertiary" />
 
     <TextView
         android:id="@+id/randomProfileBook"
@@ -98,7 +99,7 @@
         android:layout_height="56dp"
         android:gravity="bottom|center"
         android:padding="8dp"
-        android:textColor="@android:color/secondary_text_dark"
+        android:textColor="?android:attr/textColorSecondary"
         android:textSize="12sp"
         tools:text="Мастер и маргарита — 90%" />
 

+ 5 - 0
app/src/main/res/values-ru/strings.xml

@@ -5,6 +5,11 @@
     <string name="common.button.retry">Повторить</string>
     <string name="common.button.cancel">Отмена</string>
     <string name="common.info.dev">НЕ ПЫТАЙТЕСБ ЧТОТ0 N3МЕНИТЬ!</string>
+    <plurals name="common.header.books">
+        <item quantity="one">%d книга</item>
+        <item quantity="few">%d книги</item>
+        <item quantity="many">%d книг</item>
+    </plurals>
 
     <!-- main screen -->
     <string name="main.navigation.home">Мои книги</string>

+ 5 - 0
app/src/main/res/values/colors.xml

@@ -10,9 +10,14 @@
     <color name="colorAccent">#FF3D00</color>
     <color name="white">#FFFFFF</color>
     <color name="white_12">#1FFFFFFF</color>
+    <color name="white_38">#61FFFFFF</color>
+    <color name="white_60">#99FFFFFF</color>
+    <color name="white_87">#DEFFFFFF</color>
     <color name="black_12">#1F000000</color>
     <color name="black_20">#33000000</color>
+    <color name="black_38">#61000000</color>
     <color name="black_54">#8A000000</color>
+    <color name="black_60">#99000000</color>
     <color name="black_87">#DE000000</color>
     <color name="image_placeholder_color_light">@color/colorPrimary50</color>
     <color name="image_placeholder_color_dark">@color/colorPrimaryLight</color>

+ 4 - 0
app/src/main/res/values/strings.xml

@@ -5,6 +5,10 @@
     <string name="common.button.retry">Retry</string>
     <string name="common.button.cancel">Cancel</string>
     <string name="common.info.dev">We Present A SPECIAL PRESENTATION</string>
+    <plurals name="common.header.books">
+        <item quantity="one">%d book</item>
+        <item quantity="many">%d books</item>
+    </plurals>
 
     <!-- main screen -->
     <string name="main.navigation.home">Books</string>

+ 7 - 1
app/src/main/res/values/styles.xml

@@ -7,6 +7,9 @@
         <item name="android:windowBackground">@color/colorPrimary</item>
         <item name="android:listDivider">@drawable/recycler_view_divider</item>
         <item name="image_placeholder_color">@color/image_placeholder_color_light</item>
+        <item name="android:textColorPrimary">@color/black_87</item>
+        <item name="android:textColorSecondary">@color/black_60</item>
+        <item name="android:textColorTertiary">@color/black_38</item>
     </style>
 
     <style name="DarkAppTheme" parent="Theme.AppCompat.NoActionBar">
@@ -16,6 +19,9 @@
         <item name="android:windowBackground">@color/colorPrimary</item>
         <item name="android:listDivider">@drawable/recycler_view_divider</item>
         <item name="image_placeholder_color">@color/image_placeholder_color_dark</item>
+        <item name="android:textColorPrimary">@color/white_87</item>
+        <item name="android:textColorSecondary">@color/white_60</item>
+        <item name="android:textColorTertiary">@color/white_38</item>
     </style>
 
     <style name="DevTheme" parent="AppTheme">
@@ -52,7 +58,7 @@
         <item name="android:paddingLeft">4dp</item>
         <item name="android:paddingRight">4dp</item>
         <item name="android:textAllCaps">true</item>
-        <item name="android:textColor">@color/white</item>
+        <item name="android:textColor">?android:attr/textColorPrimary</item>
     </style>
 
     <style name="TextInputLayoutStyle">