From 24c5f3e594c7678058938c56b5c5cc92232f6581 Mon Sep 17 00:00:00 2001 From: Bnyro Date: Tue, 3 May 2022 20:08:47 +0200 Subject: [PATCH 1/7] Added navbar and changetheme strings --- app/src/main/res/menu/bottom_menu.xml | 7 +++---- app/src/main/res/values-de/strings.xml | 6 ++++++ app/src/main/res/values/array.xml | 6 +++--- app/src/main/res/values/strings.xml | 6 ++++++ 4 files changed, 18 insertions(+), 7 deletions(-) diff --git a/app/src/main/res/menu/bottom_menu.xml b/app/src/main/res/menu/bottom_menu.xml index 50ce0ee35..459eb0a82 100644 --- a/app/src/main/res/menu/bottom_menu.xml +++ b/app/src/main/res/menu/bottom_menu.xml @@ -1,9 +1,8 @@ - - - - + + + \ No newline at end of file diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml index e7ccad89e..7bbf9cffb 100644 --- a/app/src/main/res/values-de/strings.xml +++ b/app/src/main/res/values-de/strings.xml @@ -1,5 +1,8 @@ + Trends + Abos + Bibliothek Suche ABONNIEREN Teilen @@ -50,4 +53,7 @@ Benutzername und Passwort können nicht leer sein! Wiedergabeliste löschen Bist du sicher, dass du die Wiedergabeliste löschen möchtest\? + Automatisch + Hell + Dunkel \ No newline at end of file diff --git a/app/src/main/res/values/array.xml b/app/src/main/res/values/array.xml index b4771ebb8..72b54cf52 100644 --- a/app/src/main/res/values/array.xml +++ b/app/src/main/res/values/array.xml @@ -406,9 +406,9 @@ - System Default - Light Theme - Dark Theme + @string/systemDefault + @string/lightTheme + @string/darkTheme diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 487830149..346d3f802 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -1,4 +1,7 @@ + Home + Subscriptions + Library Yes Choose Quality: Search @@ -50,4 +53,7 @@ Success! Failed :( About + System Default + Light Theme + Dark Theme \ No newline at end of file From ac4fe4e9408a6351b741db1d19d7ba924b107bf2 Mon Sep 17 00:00:00 2001 From: Bnyro Date: Tue, 3 May 2022 22:04:32 +0200 Subject: [PATCH 2/7] Added Video and Subscribers String --- app/src/main/java/com/github/libretube/ChannelFragment.kt | 2 +- .../main/java/com/github/libretube/adapters/SearchAdapter.kt | 1 - app/src/main/res/layout/fragment_channel.xml | 2 +- app/src/main/res/values-de/strings.xml | 4 +++- app/src/main/res/values/strings.xml | 2 ++ 5 files changed, 7 insertions(+), 4 deletions(-) diff --git a/app/src/main/java/com/github/libretube/ChannelFragment.kt b/app/src/main/java/com/github/libretube/ChannelFragment.kt index ac44c3833..d2e2a5a4c 100644 --- a/app/src/main/java/com/github/libretube/ChannelFragment.kt +++ b/app/src/main/java/com/github/libretube/ChannelFragment.kt @@ -209,7 +209,7 @@ class ChannelFragment : Fragment() { runOnUiThread { view.findViewById(R.id.channel_scrollView).visibility = View.VISIBLE view.findViewById(R.id.channel_name).text=response.name - view.findViewById(R.id.channel_subs).text=response.subscriberCount.formatShort() + " subscribers" + view.findViewById(R.id.channel_subs).text=response.subscriberCount.formatShort() + " " + resources.getString(R.string.subscribers) view.findViewById(R.id.channel_description).text=response.description val bannerImage = view.findViewById(R.id.channel_banner) val channelImage = view.findViewById(R.id.channel_image) 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 f52371135..eb3a10903 100644 --- a/app/src/main/java/com/github/libretube/adapters/SearchAdapter.kt +++ b/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 diff --git a/app/src/main/res/layout/fragment_channel.xml b/app/src/main/res/layout/fragment_channel.xml index e1bfb7648..3e5005186 100644 --- a/app/src/main/res/layout/fragment_channel.xml +++ b/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" /> diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml index 7bbf9cffb..a0e51c5b0 100644 --- a/app/src/main/res/values-de/strings.xml +++ b/app/src/main/res/values-de/strings.xml @@ -5,6 +5,9 @@ Bibliothek Suche ABONNIEREN + ABONNIERT + Abonnenten + Videos Teilen Benutzername Passwort @@ -44,7 +47,6 @@ Qualtität wählen: Anmelden/Registrieren Herunterladen abgeschlossen! - ABONNIERT Speichern Du bist bereits angemeldet. Du kannst dich hier von deinem Account abmelden. Bitte melde dich zuerst an oder registriere dich in den Einstellungen! diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 346d3f802..0de3fa938 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -7,6 +7,8 @@ Search SUBSCRIBE UNSUBSCRIBE + subscribers + Videos Share Download Save From fa3ae8150a1518b7f5f2f5c850fb4bc2c1c282ca Mon Sep 17 00:00:00 2001 From: Bnyro Date: Thu, 5 May 2022 13:28:50 +0200 Subject: [PATCH 3/7] Subscribers String to Literal (not a clean solution but it works) --- app/src/main/java/com/github/libretube/ChannelFragment.kt | 3 ++- app/src/main/res/values-de/strings.xml | 2 +- app/src/main/res/values/strings.xml | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/app/src/main/java/com/github/libretube/ChannelFragment.kt b/app/src/main/java/com/github/libretube/ChannelFragment.kt index d2e2a5a4c..adc3e2cf0 100644 --- a/app/src/main/java/com/github/libretube/ChannelFragment.kt +++ b/app/src/main/java/com/github/libretube/ChannelFragment.kt @@ -209,7 +209,8 @@ class ChannelFragment : Fragment() { runOnUiThread { view.findViewById(R.id.channel_scrollView).visibility = View.VISIBLE view.findViewById(R.id.channel_name).text=response.name - view.findViewById(R.id.channel_subs).text=response.subscriberCount.formatShort() + " " + resources.getString(R.string.subscribers) + var subCount = response.subscriberCount.formatShort() + view.findViewById(R.id.channel_subs).text=resources.getString(R.string.subscribers).replace("#subCount", "$subCount") view.findViewById(R.id.channel_description).text=response.description val bannerImage = view.findViewById(R.id.channel_banner) val channelImage = view.findViewById(R.id.channel_image) diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml index a0e51c5b0..89eb7c9f9 100644 --- a/app/src/main/res/values-de/strings.xml +++ b/app/src/main/res/values-de/strings.xml @@ -6,7 +6,6 @@ Suche ABONNIEREN ABONNIERT - Abonnenten Videos Teilen Benutzername @@ -58,4 +57,5 @@ Automatisch Hell Dunkel + #subCount Abonnenten \ No newline at end of file diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 0de3fa938..94b014212 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -7,7 +7,6 @@ Search SUBSCRIBE UNSUBSCRIBE - subscribers Videos Share Download @@ -58,4 +57,5 @@ System Default Light Theme Dark Theme + #subCount subscribers \ No newline at end of file From 3623a082b72045936a0dc7d14dd19d4462e2e0b7 Mon Sep 17 00:00:00 2001 From: Bnyro Date: Thu, 5 May 2022 18:36:54 +0200 Subject: [PATCH 4/7] Try Nr. 2000 --- app/src/main/java/com/github/libretube/ChannelFragment.kt | 3 +-- app/src/main/res/values-de/strings.xml | 2 +- app/src/main/res/values/strings.xml | 2 +- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/app/src/main/java/com/github/libretube/ChannelFragment.kt b/app/src/main/java/com/github/libretube/ChannelFragment.kt index adc3e2cf0..77e08f082 100644 --- a/app/src/main/java/com/github/libretube/ChannelFragment.kt +++ b/app/src/main/java/com/github/libretube/ChannelFragment.kt @@ -209,8 +209,7 @@ class ChannelFragment : Fragment() { runOnUiThread { view.findViewById(R.id.channel_scrollView).visibility = View.VISIBLE view.findViewById(R.id.channel_name).text=response.name - var subCount = response.subscriberCount.formatShort() - view.findViewById(R.id.channel_subs).text=resources.getString(R.string.subscribers).replace("#subCount", "$subCount") + view.findViewById(R.id.channel_subs).text=resources.getString(R.string.subscribers, response.subscriberCount.formatShort()) view.findViewById(R.id.channel_description).text=response.description val bannerImage = view.findViewById(R.id.channel_banner) val channelImage = view.findViewById(R.id.channel_image) diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml index 89eb7c9f9..59353a320 100644 --- a/app/src/main/res/values-de/strings.xml +++ b/app/src/main/res/values-de/strings.xml @@ -57,5 +57,5 @@ Automatisch Hell Dunkel - #subCount Abonnenten + %1$s Abonnenten \ No newline at end of file diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 94b014212..24f0eb30d 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -57,5 +57,5 @@ System Default Light Theme Dark Theme - #subCount subscribers + %1$s subscribers \ No newline at end of file From 01d34304f4446ac0ead2c142df583d56bddd28cc Mon Sep 17 00:00:00 2001 From: Bnyro Date: Thu, 5 May 2022 18:40:35 +0200 Subject: [PATCH 5/7] Resolved merge conflicts --- app/src/main/res/values/strings.xml | 2 -- 1 file changed, 2 deletions(-) diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index c7fde5ad8..f9aa58a5b 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -6,8 +6,6 @@ Yes Choose Quality: Search - SUBSCRIBE - UNSUBSCRIBE Videos Subscribe Unsubscribe From 14fb0b23add72f0d70eb752290997c1e2e0f5769 Mon Sep 17 00:00:00 2001 From: Farbod Date: Fri, 6 May 2022 12:34:18 +0400 Subject: [PATCH 6/7] update donations --- README.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index a606c5222..488ccc0d4 100644 --- a/README.md +++ b/README.md @@ -52,7 +52,8 @@ Whether you have ideas, translations, design changes, code cleaning, or real hea ### Donate -**BTC:** `bc1qfcgqwddr894mywn9rk2crzlgvlac3prkwhdrdq` +**BTC:** `bc1q0hk2smc74ej8fxupfrp05wk867e54e2zztnxfc` +**XMR:** `44txdmy4E5bDzMYQJh1ZSoHbrp1sWfpGa2FYg26L2ya8EaRejPsh42yVrYhepW9P4YWvrqmTZvms35z5FDgqy1xcVewk18d` ## Mirrors (read-only) GitLab

From e6ee131be8c8d64a05a45ce9b28aede1b1e554f6 Mon Sep 17 00:00:00 2001 From: Farbod Date: Fri, 6 May 2022 12:34:50 +0400 Subject: [PATCH 7/7] update donations --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index 488ccc0d4..c52c36e87 100644 --- a/README.md +++ b/README.md @@ -53,6 +53,7 @@ Whether you have ideas, translations, design changes, code cleaning, or real hea ### Donate **BTC:** `bc1q0hk2smc74ej8fxupfrp05wk867e54e2zztnxfc` + **XMR:** `44txdmy4E5bDzMYQJh1ZSoHbrp1sWfpGa2FYg26L2ya8EaRejPsh42yVrYhepW9P4YWvrqmTZvms35z5FDgqy1xcVewk18d` ## Mirrors (read-only)