Эх сурвалжийг харах

Fixed empty nickname text and russian localization

Vadik Sirekanyan 7 жил өмнө
parent
commit
0b0f4f487d

+ 1 - 1
app/src/main/java/me/vadik/knigopis/profile/ProfileActivity.kt

@@ -88,7 +88,7 @@ class ProfileActivity : AppCompatActivity() {
             .subscribe({ user ->
                 userId = user.id
                 profileUrl = user.fixedProfile
-                profileNickname.text = user.nickname ?: "(не указано имя)"
+                profileNickname.text = user.nickname.orEmpty()
                 Glide.with(this)
                     .load(user.photo)
                     .apply(

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

@@ -17,9 +17,9 @@
     <string name="option_about">О приложении</string>
 
     <!-- profile -->
-    <string name="profile_caption_todo">%d\n0%%</string>
-    <string name="profile_caption_doing">%d\n1—99%%</string>
-    <string name="profile_caption_done">%d\n100%%</string>
+    <string name="profile_caption_todo">%d\nв очереди</string>
+    <string name="profile_caption_doing">%d\nв процессе</string>
+    <string name="profile_caption_done">%d\nпрочитано</string>
     <string name="profile_hint_nickname">псевдоним</string>
     <string name="profile_hint_homepage">личная страница</string>
 

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

@@ -51,7 +51,10 @@
         <item name="android:gravity">center</item>
         <item name="android:lineSpacingExtra">8sp</item>
         <item name="android:maxLines">2</item>
-        <item name="android:padding">16dp</item>
+        <item name="android:paddingTop">16dp</item>
+        <item name="android:paddingBottom">16dp</item>
+        <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>
     </style>