From d1400ff422c989c5e354d46a53aead4942ace6ad Mon Sep 17 00:00:00 2001 From: Sadwhy <99601717+Sadwhy@users.noreply.github.com> Date: Sat, 23 Nov 2024 23:20:04 +0600 Subject: [PATCH 1/3] Fix save state --- .../main/java/ani/dantotsu/settings/ProxyDialogFragment.kt | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/app/src/main/java/ani/dantotsu/settings/ProxyDialogFragment.kt b/app/src/main/java/ani/dantotsu/settings/ProxyDialogFragment.kt index a0c275be..d3e94c67 100644 --- a/app/src/main/java/ani/dantotsu/settings/ProxyDialogFragment.kt +++ b/app/src/main/java/ani/dantotsu/settings/ProxyDialogFragment.kt @@ -39,6 +39,10 @@ class ProxyDialogFragment : BottomSheetDialogFragment() { binding.proxyUsername.setText(proxyUsername) binding.proxyPassword.setText(proxyPassword) binding.proxyAuthentication.isChecked = authEnabled + binding.proxyUsername.isEnabled = authEnabled + binding.proxyPassword.isEnabled = authEnabled + binding.proxyUsernameLayout.isEnabled = authEnabled + binding.proxyPasswordLayout.isEnabled = authEnabled binding.proxySave.setOnClickListener { proxyHost = binding.proxyHost.text.toString() ?: "" @@ -68,4 +72,4 @@ class ProxyDialogFragment : BottomSheetDialogFragment() { _binding = null super.onDestroyView() } -} \ No newline at end of file +} From 6d3290056810117e991ff971a954b996f73b8fde Mon Sep 17 00:00:00 2001 From: Sadwhy <99601717+Sadwhy@users.noreply.github.com> Date: Wed, 11 Dec 2024 13:40:08 +0600 Subject: [PATCH 2/3] Add animation to dialog --- app/src/main/java/ani/dantotsu/util/AlertDialogBuilder.kt | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/app/src/main/java/ani/dantotsu/util/AlertDialogBuilder.kt b/app/src/main/java/ani/dantotsu/util/AlertDialogBuilder.kt index 374eb3d1..7891e7d6 100644 --- a/app/src/main/java/ani/dantotsu/util/AlertDialogBuilder.kt +++ b/app/src/main/java/ani/dantotsu/util/AlertDialogBuilder.kt @@ -181,7 +181,10 @@ class AlertDialogBuilder(private val context: Context) { dialog.setOnShowListener { onShow?.invoke() } - dialog.window?.setDimAmount(0.8f) + dialog.window?.apply { + setDimAmount(0.8f) + attributes.windowAnimations = android.R.style.Animation_Dialog + } dialog.show() } } From 8ad8637fcece9eeac22192a2e3235480d945c97d Mon Sep 17 00:00:00 2001 From: Sadwhy <99601717+Sadwhy@users.noreply.github.com> Date: Wed, 11 Dec 2024 15:25:19 +0600 Subject: [PATCH 3/3] Clean redundant code --- .../dantotsu/settings/ProxyDialogFragment.kt | 43 +++++++++++-------- 1 file changed, 26 insertions(+), 17 deletions(-) diff --git a/app/src/main/java/ani/dantotsu/settings/ProxyDialogFragment.kt b/app/src/main/java/ani/dantotsu/settings/ProxyDialogFragment.kt index d3e94c67..14700753 100644 --- a/app/src/main/java/ani/dantotsu/settings/ProxyDialogFragment.kt +++ b/app/src/main/java/ani/dantotsu/settings/ProxyDialogFragment.kt @@ -6,7 +6,6 @@ import android.view.View import android.view.ViewGroup import ani.dantotsu.BottomSheetDialogFragment import ani.dantotsu.databinding.BottomSheetProxyBinding -import ani.dantotsu.snackString import ani.dantotsu.settings.saving.PrefManager import ani.dantotsu.settings.saving.PrefName import ani.dantotsu.restartApp @@ -15,10 +14,10 @@ class ProxyDialogFragment : BottomSheetDialogFragment() { private var _binding: BottomSheetProxyBinding? = null private val binding get() = _binding!! - private var proxyHost: String? = PrefManager.getVal(PrefName.Socks5ProxyHost) ?: "" - private var proxyPort: String? = PrefManager.getVal(PrefName.Socks5ProxyPort) ?: "" - private var proxyUsername: String? = PrefManager.getVal(PrefName.Socks5ProxyUsername) ?: "" - private var proxyPassword: String? = PrefManager.getVal(PrefName.Socks5ProxyPassword) ?: "" + private var proxyHost: String? = PrefManager.getVal(PrefName.Socks5ProxyHost).orEmpty() + private var proxyPort: String? = PrefManager.getVal(PrefName.Socks5ProxyPort).orEmpty() + private var proxyUsername: String? = PrefManager.getVal(PrefName.Socks5ProxyUsername).orEmpty() + private var proxyPassword: String? = PrefManager.getVal(PrefName.Socks5ProxyPassword).orEmpty() private var authEnabled: Boolean = PrefManager.getVal(PrefName.ProxyAuthEnabled) private val proxyEnabled: Boolean = PrefManager.getVal(PrefName.EnableSocks5Proxy) @@ -39,16 +38,14 @@ class ProxyDialogFragment : BottomSheetDialogFragment() { binding.proxyUsername.setText(proxyUsername) binding.proxyPassword.setText(proxyPassword) binding.proxyAuthentication.isChecked = authEnabled - binding.proxyUsername.isEnabled = authEnabled - binding.proxyPassword.isEnabled = authEnabled - binding.proxyUsernameLayout.isEnabled = authEnabled - binding.proxyPasswordLayout.isEnabled = authEnabled + + toggleAuthentication(authEnabled) binding.proxySave.setOnClickListener { - proxyHost = binding.proxyHost.text.toString() ?: "" - proxyPort = binding.proxyPort.text.toString() ?: "" - proxyUsername = binding.proxyUsername.text.toString() ?: "" - proxyPassword = binding.proxyPassword.text.toString() ?: "" + proxyHost = binding.proxyHost.text?.toString().orEmpty() + proxyPort = binding.proxyPort.text?.toString().orEmpty() + proxyUsername = binding.proxyUsername.text?.toString().orEmpty() + proxyPassword = binding.proxyPassword.text?.toString().orEmpty() PrefManager.setVal(PrefName.Socks5ProxyHost, proxyHost) PrefManager.setVal(PrefName.Socks5ProxyPort, proxyPort) @@ -61,10 +58,22 @@ class ProxyDialogFragment : BottomSheetDialogFragment() { binding.proxyAuthentication.setOnCheckedChangeListener { _, isChecked -> PrefManager.setVal(PrefName.ProxyAuthEnabled, isChecked) - binding.proxyUsername.isEnabled = isChecked - binding.proxyPassword.isEnabled = isChecked - binding.proxyUsernameLayout.isEnabled = isChecked - binding.proxyPasswordLayout.isEnabled = isChecked + toggleAuthentication(isChecked) + } + } + + private fun toggleAuthentication(isChecked: Boolean) { + arrayOf( + binding.proxyUsername, + binding.proxyPassword, + binding.proxyUsernameLayout, + binding.proxyPasswordLayout + ).forEach { + it.isEnabled = isChecked + it.alpha = when (isChecked) { + true -> 1f + false -> 0.5f + } } }