Merge branch 'master' into changelanguage

README.md

@@ -52,7 +52,9 @@ Whether you have ideas, translations, design changes, code cleaning, or real hea
 </a>
 
 ### Donate
-**BTC:** `bc1qfcgqwddr894mywn9rk2crzlgvlac3prkwhdrdq`
+**BTC:** `bc1q0hk2smc74ej8fxupfrp05wk867e54e2zztnxfc`
+
+**XMR:** `44txdmy4E5bDzMYQJh1ZSoHbrp1sWfpGa2FYg26L2ya8EaRejPsh42yVrYhepW9P4YWvrqmTZvms35z5FDgqy1xcVewk18d`
 
 ## Mirrors (read-only)
 <a href="https://gitlab.com/libretube/LibreTube">GitLab</a></p>

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

@@ -209,7 +209,7 @@ class ChannelFragment : Fragment() {
                 runOnUiThread {
                     view.findViewById<ScrollView>(R.id.channel_scrollView).visibility = View.VISIBLE
                     view.findViewById<TextView>(R.id.channel_name).text=response.name
-                    view.findViewById<TextView>(R.id.channel_subs).text=response.subscriberCount.formatShort() + " subscribers"
+                    view.findViewById<TextView>(R.id.channel_subs).text=resources.getString(R.string.subscribers, response.subscriberCount.formatShort())
                     view.findViewById<TextView>(R.id.channel_description).text=response.description
                     val bannerImage = view.findViewById<ImageView>(R.id.channel_banner)
                     val channelImage = view.findViewById<ImageView>(R.id.channel_image)

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

@@ -1,6 +1,5 @@
 package com.github.libretube.adapters
 
-
 import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View

app/src/main/res/layout/fragment_channel.xml

@@ -91,7 +91,7 @@
                 android:layout_marginTop="10dp"
                 android:layout_marginRight="10dp"
                 android:layout_marginBottom="5dp"
-                android:text="Videos"
+                android:text="@string/videos"
                 android:textSize="17sp"
                 android:textStyle="bold" />
 

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

@@ -1,9 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <menu xmlns:android="http://schemas.android.com/apk/res/android">
 
-    <item android:id="@+id/home2" android:title="Home" android:icon="@drawable/ic_home"/>
-    <item android:id="@+id/subscriptions" android:title="Subscriptions" android:icon="@drawable/ic_subscriptions"/>
-    <item android:id="@+id/library" android:title="Library" android:icon="@drawable/ic_library"/>
-
+    <item android:id="@+id/home2" android:title="@string/startpage" android:icon="@drawable/ic_home"/>
+    <item android:id="@+id/subscriptions" android:title="@string/subscriptions" android:icon="@drawable/ic_subscriptions"/>
+    <item android:id="@+id/library" android:title="@string/library" android:icon="@drawable/ic_library"/>
 
 </menu>

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

@@ -1,7 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
+    <string name="startpage">Trends</string>
+    <string name="subscriptions">Abos</string>
+    <string name="library">Bibliothek</string>
     <string name="search_hint">Suche</string>
     <string name="subscribe">ABONNIEREN</string>
+    <string name="unsubscribe">ABONNIERT</string>
+    <string name="videos">Videos</string>
     <string name="share">Teilen</string>
     <string name="username">Benutzername</string>
     <string name="password">Passwort</string>
@@ -41,7 +46,6 @@
     <string name="choose_quality_dialog">Qualtität wählen:</string>
     <string name="login_register">Anmelden/Registrieren</string>
     <string name="dlcomplete">Herunterladen abgeschlossen!</string>
-    <string name="unsubscribe">ABONNIERT</string>
     <string name="save">Speichern</string>
     <string name="already_logged_in">Du bist bereits angemeldet. Du kannst dich hier von deinem Account abmelden.</string>
     <string name="please_login">Bitte melde dich zuerst an oder registriere dich in den Einstellungen!</string>
@@ -51,4 +55,8 @@
     <string name="deletePlaylist">Wiedergabeliste löschen</string>
     <string name="areYouSure">Bist du sicher, dass du die Wiedergabeliste löschen möchtest\?</string>
     <string name="about">Über</string>  
+    <string name="systemDefault">Automatisch</string>
+    <string name="lightTheme">Hell</string>
+    <string name="darkTheme">Dunkel</string>
+    <string name="subscribers">%1$s Abonnenten</string>
 </resources>

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

@@ -452,9 +452,9 @@
     </string-array>
 
     <string-array name="themes">
-        <item>System Default</item>
-        <item>Light Theme</item>
-        <item>Dark Theme</item>
+        <item>@string/systemDefault</item>
+        <item>@string/lightTheme</item>
+        <item>@string/darkTheme</item>
     </string-array>
 
     <string-array name="themesValue">

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

@@ -1,8 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
+    <string name="startpage">Home</string>
+    <string name="subscriptions">Subscriptions</string>
+    <string name="library">Library</string>
     <string name="yes">Yes</string>
     <string name="choose_quality_dialog">Choose Quality:</string>
     <string name="search_hint">Search</string>
+    <string name="videos">Videos</string>
     <string name="subscribe">Subscribe</string>
     <string name="unsubscribe">Unsubscribe</string>
     <string name="share">Share</string>
@@ -55,4 +59,8 @@
     <string name="about">About</string>
     <string name="changeLanguage">Change Language</string>
     <string name="systemLanguage">System Language</string>
+    <string name="systemDefault">System Default</string>
+    <string name="lightTheme">Light Theme</string>
+    <string name="darkTheme">Dark Theme</string>
+    <string name="subscribers">%1$s subscribers</string>
 </resources>