Merge pull request #453 from Bnyro/master

added missing translations

app/src/main/java/com/github/libretube/adapters/ChannelAdapter.kt

@@ -10,9 +10,9 @@ import android.widget.TextView
 import androidx.appcompat.app.AppCompatActivity
 import androidx.recyclerview.widget.RecyclerView
 import com.github.libretube.R
-import com.github.libretube.formatShort
 import com.github.libretube.fragments.PlayerFragment
 import com.github.libretube.obj.StreamItem
+import com.github.libretube.util.formatShort
 import com.squareup.picasso.Picasso
 
 class ChannelAdapter(private val videoFeed: MutableList<StreamItem>) :

app/src/main/java/com/github/libretube/adapters/CommentsAdapter.kt

@@ -14,10 +14,10 @@ import androidx.recyclerview.widget.LinearLayoutManager
 import androidx.recyclerview.widget.RecyclerView
 import com.github.libretube.MainActivity
 import com.github.libretube.R
-import com.github.libretube.formatShort
 import com.github.libretube.obj.Comment
 import com.github.libretube.obj.CommentsPage
 import com.github.libretube.util.RetrofitInstance
+import com.github.libretube.util.formatShort
 import com.squareup.picasso.Picasso
 import java.io.IOException
 import kotlinx.coroutines.CoroutineScope

app/src/main/java/com/github/libretube/adapters/RepliesAdapter.kt

@@ -10,8 +10,8 @@ import androidx.core.os.bundleOf
 import androidx.recyclerview.widget.RecyclerView
 import com.github.libretube.MainActivity
 import com.github.libretube.R
-import com.github.libretube.formatShort
 import com.github.libretube.obj.Comment
+import com.github.libretube.util.formatShort
 import com.squareup.picasso.Picasso
 
 class RepliesAdapter(

app/src/main/java/com/github/libretube/adapters/SearchAdapter.kt

@@ -14,9 +14,9 @@ import androidx.recyclerview.widget.RecyclerView
 import com.github.libretube.MainActivity
 import com.github.libretube.R
 import com.github.libretube.dialogs.VideoOptionsDialog
-import com.github.libretube.formatShort
 import com.github.libretube.fragments.PlayerFragment
 import com.github.libretube.obj.SearchItem
+import com.github.libretube.util.formatShort
 import com.squareup.picasso.Picasso
 
 class SearchAdapter(

app/src/main/java/com/github/libretube/adapters/SubscriptionAdapter.kt

@@ -15,9 +15,9 @@ import androidx.recyclerview.widget.RecyclerView
 import com.github.libretube.MainActivity
 import com.github.libretube.R
 import com.github.libretube.dialogs.VideoOptionsDialog
-import com.github.libretube.formatShort
 import com.github.libretube.fragments.PlayerFragment
 import com.github.libretube.obj.StreamItem
+import com.github.libretube.util.formatShort
 import com.squareup.picasso.Picasso
 
 class SubscriptionAdapter(

app/src/main/java/com/github/libretube/adapters/TrendingAdapter.kt

@@ -15,9 +15,9 @@ import androidx.recyclerview.widget.RecyclerView
 import com.github.libretube.MainActivity
 import com.github.libretube.R
 import com.github.libretube.dialogs.VideoOptionsDialog
-import com.github.libretube.formatShort
 import com.github.libretube.fragments.PlayerFragment
 import com.github.libretube.obj.StreamItem
+import com.github.libretube.util.formatShort
 import com.squareup.picasso.Picasso
 
 class TrendingAdapter(

app/src/main/java/com/github/libretube/fragments/ChannelFragment.kt

@@ -17,9 +17,9 @@ import androidx.recyclerview.widget.RecyclerView
 import androidx.swiperefreshlayout.widget.SwipeRefreshLayout
 import com.github.libretube.R
 import com.github.libretube.adapters.ChannelAdapter
-import com.github.libretube.formatShort
 import com.github.libretube.obj.Subscribe
 import com.github.libretube.util.RetrofitInstance
+import com.github.libretube.util.formatShort
 import com.google.android.material.button.MaterialButton
 import com.squareup.picasso.Picasso
 import java.io.IOException

app/src/main/java/com/github/libretube/fragments/PlayerFragment.kt

@@ -48,7 +48,6 @@ import com.github.libretube.adapters.TrendingAdapter
 import com.github.libretube.dialogs.AddtoPlaylistDialog
 import com.github.libretube.dialogs.DownloadDialog
 import com.github.libretube.dialogs.ShareDialog
-import com.github.libretube.formatShort
 import com.github.libretube.hideKeyboard
 import com.github.libretube.obj.PipedStream
 import com.github.libretube.obj.Segment
@@ -58,6 +57,7 @@ import com.github.libretube.obj.Subscribe
 import com.github.libretube.preferences.SponsorBlockSettings
 import com.github.libretube.util.CronetHelper
 import com.github.libretube.util.RetrofitInstance
+import com.github.libretube.util.formatShort
 import com.google.android.exoplayer2.C
 import com.google.android.exoplayer2.DefaultLoadControl
 import com.google.android.exoplayer2.ExoPlayer
@@ -445,7 +445,8 @@ class PlayerFragment : Fragment() {
 
     private fun initializePlayerView(view: View, response: Streams) {
         view.findViewById<TextView>(R.id.player_views_info).text =
-            response.views.formatShort() + " views • " + response.uploadDate
+            context?.getString(R.string.views, response.views.formatShort()) +
+            " • " + response.uploadDate
         view.findViewById<TextView>(R.id.textLike).text = response.likes.formatShort()
         val channelImage = view.findViewById<ImageView>(R.id.player_channelImage)
         Picasso.get().load(response.uploaderAvatar).into(channelImage)

app/src/main/java/com/github/libretube/util/VideoViews.kt

@@ -1,4 +1,4 @@
-package com.github.libretube
+package com.github.libretube.util
 
 import java.math.BigDecimal
 import java.math.RoundingMode

app/src/main/res/menu/action_bar.xml

@@ -3,7 +3,7 @@
     xmlns:app="http://schemas.android.com/apk/res-auto">
 
     <item
-        android:title="Search"
+        android:title="@string/search_hint"
         android:icon="@drawable/ic_search"
         android:id="@+id/action_search"
         app:showAsAction="always" />

app/src/main/res/values/array.xml

@@ -580,14 +580,14 @@
     </string-array>
 
     <string-array name="icons">
-        <item>Default</item>
+        <item>@string/defaultIcon</item>
-        <item>Legacy</item>
+        <item>@string/legacyIcon</item>
-        <item>Gradient</item>
+        <item>@string/gradientIcon</item>
-        <item>Fire</item>
+        <item>@string/fireIcon</item>
-        <item>Torch</item>
+        <item>@string/torchIcon</item>
-        <item>Shaped</item>
+        <item>@string/shapedIcon</item>
-        <item>Flame</item>
+        <item>@string/flameIcon</item>
-        <item>Bird</item>
+        <item>@string/birdIcon</item>
     </string-array>
     <string-array name="iconsValue">
         <item>MainActivity</item>
@@ -604,7 +604,6 @@
         <item>MP4</item>
         <item>MKV</item>
     </string-array>
-
     <string-array name="videoFormatsValues">
         <item>.mp4</item>
         <item>.mkv</item>
@@ -619,7 +618,6 @@
         <item>1.5x</item>
         <item>2x</item>
     </string-array>
-
     <string-array name="playbackSpeedValues">
         <item>0.25F</item>
         <item>0.5F</item>
@@ -636,7 +634,6 @@
         <item>@string/movies_directory</item>
         <item>@string/sdcard</item>
     </string-array>
-
     <string-array name="downloadLocationValues">
         <item>downloads</item>
         <item>music</item>

app/src/main/res/values/strings.xml

@@ -152,4 +152,13 @@
     <string name="music_directory">Music directory</string>
     <string name="movies_directory">Movies directory</string>
     <string name="shareTo">Share Url To:</string>
+    <string name="views">%1$s views</string>
+    <string name="defaultIcon">Default</string>
+    <string name="legacyIcon">Legacy</string>
+    <string name="gradientIcon">Gradient</string>
+    <string name="fireIcon">Fire</string>
+    <string name="torchIcon">Torch</string>
+    <string name="shapedIcon">Shaped</string>
+    <string name="flameIcon">Flame</string>
+    <string name="birdIcon">Bird</string>
 </resources>