From 2fca061b766f18979d01e60aefe34781afed5b8e Mon Sep 17 00:00:00 2001 From: Bnyro Date: Fri, 8 Jul 2022 14:26:00 +0200 Subject: [PATCH] dynamic login/out text --- app/src/main/java/com/github/libretube/dialogs/LoginDialog.kt | 1 + .../main/java/com/github/libretube/dialogs/LogoutDialog.kt | 1 + .../java/com/github/libretube/preferences/InstanceSettings.kt | 4 +++- app/src/main/res/layout/fragment_library.xml | 2 +- 4 files changed, 6 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/com/github/libretube/dialogs/LoginDialog.kt b/app/src/main/java/com/github/libretube/dialogs/LoginDialog.kt index ce75cde27..75983feb6 100644 --- a/app/src/main/java/com/github/libretube/dialogs/LoginDialog.kt +++ b/app/src/main/java/com/github/libretube/dialogs/LoginDialog.kt @@ -84,6 +84,7 @@ class LoginDialog : DialogFragment() { PreferenceHelper.setUsername(requireContext(), login.username!!) requireMainActivityRestart = true dialog?.dismiss() + activity?.recreate() } } } diff --git a/app/src/main/java/com/github/libretube/dialogs/LogoutDialog.kt b/app/src/main/java/com/github/libretube/dialogs/LogoutDialog.kt index b039f1a57..a7192efd4 100644 --- a/app/src/main/java/com/github/libretube/dialogs/LogoutDialog.kt +++ b/app/src/main/java/com/github/libretube/dialogs/LogoutDialog.kt @@ -29,6 +29,7 @@ class LogoutDialog : DialogFragment() { Toast.makeText(context, R.string.loggedout, Toast.LENGTH_SHORT).show() PreferenceHelper.setToken(requireContext(), "") dialog?.dismiss() + activity?.recreate() } binding.title.text = ThemeHelper.getStyledAppName(requireContext()) diff --git a/app/src/main/java/com/github/libretube/preferences/InstanceSettings.kt b/app/src/main/java/com/github/libretube/preferences/InstanceSettings.kt index 6e23c80e0..24ea4701a 100644 --- a/app/src/main/java/com/github/libretube/preferences/InstanceSettings.kt +++ b/app/src/main/java/com/github/libretube/preferences/InstanceSettings.kt @@ -34,6 +34,7 @@ import java.io.IOException import java.io.InputStream import java.util.zip.ZipEntry import java.util.zip.ZipInputStream +import kotlin.math.log class InstanceSettings : PreferenceFragmentCompat() { val TAG = "InstanceSettings" @@ -171,8 +172,9 @@ class InstanceSettings : PreferenceFragmentCompat() { } val login = findPreference("login_register") + val token = PreferenceHelper.getToken(requireContext()) + if (token != "") login?.setTitle(R.string.logout) login?.setOnPreferenceClickListener { - val token = PreferenceHelper.getToken(requireContext()) if (token == "") { val newFragment = LoginDialog() newFragment.show(childFragmentManager, "Login") diff --git a/app/src/main/res/layout/fragment_library.xml b/app/src/main/res/layout/fragment_library.xml index 933fa31c9..62af48c28 100644 --- a/app/src/main/res/layout/fragment_library.xml +++ b/app/src/main/res/layout/fragment_library.xml @@ -23,7 +23,7 @@ android:id="@+id/text_like" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_marginHorizontal="20dp" + android:layout_marginHorizontal="10dp" android:layout_below="@id/boogh" android:layout_centerHorizontal="true" android:gravity="center"