From d984e94a46cd81ba7a5333ed686b619ad75b484e Mon Sep 17 00:00:00 2001
From: Bnyro <yannick.fehler@web.de>
Date: Fri, 10 Jun 2022 15:02:51 +0200
Subject: [PATCH 1/2] added missing translations

---
 .../libretube/adapters/ChannelAdapter.kt      |  2 +-
 .../libretube/adapters/CommentsAdapter.kt     |  2 +-
 .../libretube/adapters/RepliesAdapter.kt      |  2 +-
 .../libretube/adapters/SearchAdapter.kt       |  2 +-
 .../libretube/adapters/SubscriptionAdapter.kt |  2 +-
 .../libretube/adapters/TrendingAdapter.kt     |  2 +-
 .../libretube/fragments/ChannelFragment.kt    |  2 +-
 .../libretube/fragments/PlayerFragment.kt     |  4 ++--
 .../com/github/libretube/util/VideoViews.kt   |  2 +-
 app/src/main/res/menu/action_bar.xml          |  2 +-
 app/src/main/res/values/array.xml             | 19 ++++++++-----------
 app/src/main/res/values/strings.xml           |  9 +++++++++
 12 files changed, 28 insertions(+), 22 deletions(-)

diff --git a/app/src/main/java/com/github/libretube/adapters/ChannelAdapter.kt b/app/src/main/java/com/github/libretube/adapters/ChannelAdapter.kt
index 5b8f70bc8..20bea6628 100644
--- a/app/src/main/java/com/github/libretube/adapters/ChannelAdapter.kt
+++ b/app/src/main/java/com/github/libretube/adapters/ChannelAdapter.kt
@@ -10,7 +10,7 @@ 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.util.formatShort
 import com.github.libretube.fragments.PlayerFragment
 import com.github.libretube.obj.StreamItem
 import com.squareup.picasso.Picasso
diff --git a/app/src/main/java/com/github/libretube/adapters/CommentsAdapter.kt b/app/src/main/java/com/github/libretube/adapters/CommentsAdapter.kt
index 7740c7e58..18bb2d5cf 100644
--- a/app/src/main/java/com/github/libretube/adapters/CommentsAdapter.kt
+++ b/app/src/main/java/com/github/libretube/adapters/CommentsAdapter.kt
@@ -14,7 +14,7 @@ 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.util.formatShort
 import com.github.libretube.obj.Comment
 import com.github.libretube.obj.CommentsPage
 import com.github.libretube.util.RetrofitInstance
diff --git a/app/src/main/java/com/github/libretube/adapters/RepliesAdapter.kt b/app/src/main/java/com/github/libretube/adapters/RepliesAdapter.kt
index de06907ae..a282d3a0b 100644
--- a/app/src/main/java/com/github/libretube/adapters/RepliesAdapter.kt
+++ b/app/src/main/java/com/github/libretube/adapters/RepliesAdapter.kt
@@ -10,7 +10,7 @@ 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.util.formatShort
 import com.github.libretube.obj.Comment
 import com.squareup.picasso.Picasso
 
diff --git a/app/src/main/java/com/github/libretube/adapters/SearchAdapter.kt b/app/src/main/java/com/github/libretube/adapters/SearchAdapter.kt
index d1fa29523..cebe3ee6e 100644
--- a/app/src/main/java/com/github/libretube/adapters/SearchAdapter.kt
+++ b/app/src/main/java/com/github/libretube/adapters/SearchAdapter.kt
@@ -14,7 +14,7 @@ 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.util.formatShort
 import com.github.libretube.fragments.PlayerFragment
 import com.github.libretube.obj.SearchItem
 import com.squareup.picasso.Picasso
diff --git a/app/src/main/java/com/github/libretube/adapters/SubscriptionAdapter.kt b/app/src/main/java/com/github/libretube/adapters/SubscriptionAdapter.kt
index 3e37fd814..e14bb89de 100644
--- a/app/src/main/java/com/github/libretube/adapters/SubscriptionAdapter.kt
+++ b/app/src/main/java/com/github/libretube/adapters/SubscriptionAdapter.kt
@@ -15,7 +15,7 @@ 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.util.formatShort
 import com.github.libretube.fragments.PlayerFragment
 import com.github.libretube.obj.StreamItem
 import com.squareup.picasso.Picasso
diff --git a/app/src/main/java/com/github/libretube/adapters/TrendingAdapter.kt b/app/src/main/java/com/github/libretube/adapters/TrendingAdapter.kt
index 376171c9e..34e76b25d 100644
--- a/app/src/main/java/com/github/libretube/adapters/TrendingAdapter.kt
+++ b/app/src/main/java/com/github/libretube/adapters/TrendingAdapter.kt
@@ -15,7 +15,7 @@ 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.util.formatShort
 import com.github.libretube.fragments.PlayerFragment
 import com.github.libretube.obj.StreamItem
 import com.squareup.picasso.Picasso
diff --git a/app/src/main/java/com/github/libretube/fragments/ChannelFragment.kt b/app/src/main/java/com/github/libretube/fragments/ChannelFragment.kt
index bf33cecf6..e2bc2acc5 100644
--- a/app/src/main/java/com/github/libretube/fragments/ChannelFragment.kt
+++ b/app/src/main/java/com/github/libretube/fragments/ChannelFragment.kt
@@ -17,7 +17,7 @@ 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.util.formatShort
 import com.github.libretube.obj.Subscribe
 import com.github.libretube.util.RetrofitInstance
 import com.google.android.material.button.MaterialButton
diff --git a/app/src/main/java/com/github/libretube/fragments/PlayerFragment.kt b/app/src/main/java/com/github/libretube/fragments/PlayerFragment.kt
index a8c6a2f67..fc13387fe 100644
--- a/app/src/main/java/com/github/libretube/fragments/PlayerFragment.kt
+++ b/app/src/main/java/com/github/libretube/fragments/PlayerFragment.kt
@@ -48,7 +48,7 @@ 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.util.formatShort
 import com.github.libretube.hideKeyboard
 import com.github.libretube.obj.PipedStream
 import com.github.libretube.obj.Segment
@@ -445,7 +445,7 @@ 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)
diff --git a/app/src/main/java/com/github/libretube/util/VideoViews.kt b/app/src/main/java/com/github/libretube/util/VideoViews.kt
index 41c7c4cbe..5de54163d 100644
--- a/app/src/main/java/com/github/libretube/util/VideoViews.kt
+++ b/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
diff --git a/app/src/main/res/menu/action_bar.xml b/app/src/main/res/menu/action_bar.xml
index 88b77a9ac..6aa29f4da 100644
--- a/app/src/main/res/menu/action_bar.xml
+++ b/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" />
diff --git a/app/src/main/res/values/array.xml b/app/src/main/res/values/array.xml
index 1edd99554..31f7d2b94 100644
--- a/app/src/main/res/values/array.xml
+++ b/app/src/main/res/values/array.xml
@@ -580,14 +580,14 @@
     </string-array>
 
     <string-array name="icons">
-        <item>Default</item>
-        <item>Legacy</item>
-        <item>Gradient</item>
-        <item>Fire</item>
-        <item>Torch</item>
-        <item>Shaped</item>
-        <item>Flame</item>
-        <item>Bird</item>
+        <item>@string/defaultIcon</item>
+        <item>@string/legacyIcon</item>
+        <item>@string/gradientIcon</item>
+        <item>@string/fireIcon</item>
+        <item>@string/torchIcon</item>
+        <item>@string/shapedIcon</item>
+        <item>@string/flameIcon</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>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 8215b8a32..363b5bb98 100644
--- a/app/src/main/res/values/strings.xml
+++ b/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>
\ No newline at end of file

From 0db214469a901ed63e72a7b86f7b73764d03b80f Mon Sep 17 00:00:00 2001
From: Bnyro <yannick.fehler@web.de>
Date: Fri, 10 Jun 2022 15:03:48 +0200
Subject: [PATCH 2/2] ktlint

---
 .../java/com/github/libretube/adapters/ChannelAdapter.kt     | 2 +-
 .../java/com/github/libretube/adapters/CommentsAdapter.kt    | 2 +-
 .../java/com/github/libretube/adapters/RepliesAdapter.kt     | 2 +-
 .../main/java/com/github/libretube/adapters/SearchAdapter.kt | 2 +-
 .../com/github/libretube/adapters/SubscriptionAdapter.kt     | 2 +-
 .../java/com/github/libretube/adapters/TrendingAdapter.kt    | 2 +-
 .../java/com/github/libretube/fragments/ChannelFragment.kt   | 2 +-
 .../java/com/github/libretube/fragments/PlayerFragment.kt    | 5 +++--
 8 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/app/src/main/java/com/github/libretube/adapters/ChannelAdapter.kt b/app/src/main/java/com/github/libretube/adapters/ChannelAdapter.kt
index 20bea6628..28f716ac1 100644
--- a/app/src/main/java/com/github/libretube/adapters/ChannelAdapter.kt
+++ b/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.util.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>) :
diff --git a/app/src/main/java/com/github/libretube/adapters/CommentsAdapter.kt b/app/src/main/java/com/github/libretube/adapters/CommentsAdapter.kt
index 18bb2d5cf..efce52157 100644
--- a/app/src/main/java/com/github/libretube/adapters/CommentsAdapter.kt
+++ b/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.util.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
diff --git a/app/src/main/java/com/github/libretube/adapters/RepliesAdapter.kt b/app/src/main/java/com/github/libretube/adapters/RepliesAdapter.kt
index a282d3a0b..7cd46cfc8 100644
--- a/app/src/main/java/com/github/libretube/adapters/RepliesAdapter.kt
+++ b/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.util.formatShort
 import com.github.libretube.obj.Comment
+import com.github.libretube.util.formatShort
 import com.squareup.picasso.Picasso
 
 class RepliesAdapter(
diff --git a/app/src/main/java/com/github/libretube/adapters/SearchAdapter.kt b/app/src/main/java/com/github/libretube/adapters/SearchAdapter.kt
index cebe3ee6e..75fedea49 100644
--- a/app/src/main/java/com/github/libretube/adapters/SearchAdapter.kt
+++ b/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.util.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(
diff --git a/app/src/main/java/com/github/libretube/adapters/SubscriptionAdapter.kt b/app/src/main/java/com/github/libretube/adapters/SubscriptionAdapter.kt
index e14bb89de..0db923b83 100644
--- a/app/src/main/java/com/github/libretube/adapters/SubscriptionAdapter.kt
+++ b/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.util.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(
diff --git a/app/src/main/java/com/github/libretube/adapters/TrendingAdapter.kt b/app/src/main/java/com/github/libretube/adapters/TrendingAdapter.kt
index 34e76b25d..0d223e54d 100644
--- a/app/src/main/java/com/github/libretube/adapters/TrendingAdapter.kt
+++ b/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.util.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(
diff --git a/app/src/main/java/com/github/libretube/fragments/ChannelFragment.kt b/app/src/main/java/com/github/libretube/fragments/ChannelFragment.kt
index e2bc2acc5..d7c3fd030 100644
--- a/app/src/main/java/com/github/libretube/fragments/ChannelFragment.kt
+++ b/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.util.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
diff --git a/app/src/main/java/com/github/libretube/fragments/PlayerFragment.kt b/app/src/main/java/com/github/libretube/fragments/PlayerFragment.kt
index fc13387fe..e3002e85d 100644
--- a/app/src/main/java/com/github/libretube/fragments/PlayerFragment.kt
+++ b/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.util.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 =
-            context?.getString(R.string.views, response.views.formatShort()) + " • " + 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)