Преглед на файлове

Fixed layout ids and string resources

Vadik Sirekanyan преди 7 години
родител
ревизия
46910d6507

+ 4 - 4
app/src/main/res/layout/book.xml

@@ -7,7 +7,7 @@
     android:foreground="?android:attr/selectableItemBackground">
 
     <ProgressBar
-        android:id="@+id/book_progress"
+        android:id="@+id/bookProgress"
         style="@style/Widget.AppCompat.ProgressBar.Horizontal"
         android:layout_width="match_parent"
         android:layout_height="2dp"
@@ -18,7 +18,7 @@
         tools:progress="80" />
 
     <ImageView
-        android:id="@+id/book_image"
+        android:id="@+id/bookImage"
         android:layout_width="40dp"
         android:layout_height="40dp"
         android:layout_gravity="center_vertical"
@@ -38,7 +38,7 @@
         android:paddingStart="72dp">
 
         <TextView
-            android:id="@+id/book_title"
+            android:id="@+id/bookTitle"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:ellipsize="end"
@@ -48,7 +48,7 @@
             tools:text="Мастер и Маргарита" />
 
         <TextView
-            android:id="@+id/book_author"
+            android:id="@+id/bookAuthor"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:ellipsize="end"

+ 3 - 3
app/src/main/res/layout/header.xml

@@ -6,14 +6,14 @@
     android:background="?android:attr/windowBackground">
 
     <View
-        android:id="@+id/header_divider"
+        android:id="@+id/headerDivider"
         android:layout_width="match_parent"
         android:layout_height="0.5dp"
         android:background="?attr/recycler_divider_color"
         android:visibility="invisible" />
 
     <TextView
-        android:id="@+id/book_title"
+        android:id="@+id/headerTitle"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_gravity="center_vertical"
@@ -25,7 +25,7 @@
         tools:text="К прочтению" />
 
     <TextView
-        android:id="@+id/books_count"
+        android:id="@+id/headerCount"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_gravity="end|center_vertical"

+ 1 - 1
app/src/main/res/layout/user.xml

@@ -46,7 +46,7 @@
         android:layout_height="match_parent"
         android:gravity="center_vertical"
         android:textColor="@android:color/holo_green_dark"
-        android:textSize="16sp"
+        android:textSize="12sp"
         tools:text="+2" />
 
 </LinearLayout>

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

@@ -10,6 +10,8 @@
         <item quantity="few">%d книги</item>
         <item quantity="many">%d книг</item>
     </plurals>
+    <string name="common.book.notitle">(без названия)</string>
+    <string name="common.book.noauthor">(автор не указан)</string>
 
     <!-- main screen -->
     <string name="main.navigation.home">Мои книги</string>

+ 0 - 1
app/src/main/res/values/no-translate.xml

@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <string name="user_new_books_count" translatable="false"><![CDATA[<sup><small>+%d</small><sup>]]></string>
     <string name="note_date_delimiter" translatable="false">/</string>
 </resources>

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

@@ -9,6 +9,8 @@
         <item quantity="one">%d book</item>
         <item quantity="other">%d books</item>
     </plurals>
+    <string name="common.book.notitle">(no title)</string>
+    <string name="common.book.noauthor">(no author)</string>
 
     <!-- main screen -->
     <string name="main.navigation.home">Books</string>