diff --git a/app/build.gradle b/app/build.gradle index 79b2381c5449c94b271b82a33514230973b07388..8936ea7c57deb78f7cfcfae690dcc4a4f3dc65bc 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -13,7 +13,7 @@ android { minSdkVersion 24 targetSdk 33 versionCode 39 - versionName "1.0.0" + versionName "1.0.1" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" } buildTypes { diff --git a/app/src/main/java/jp/atled/agileworks/view/ui/login/LoginFragment.kt b/app/src/main/java/jp/atled/agileworks/view/ui/login/LoginFragment.kt index 3a311ccbe783105c85bcb9d52d66a83063cd3818..d59658e4ace7225c064902000a6c772addd2283b 100644 --- a/app/src/main/java/jp/atled/agileworks/view/ui/login/LoginFragment.kt +++ b/app/src/main/java/jp/atled/agileworks/view/ui/login/LoginFragment.kt @@ -71,6 +71,8 @@ class LoginFragment: Fragment() { super.onViewCreated(view, savedInstanceState) app_ver_label.text = getString(R.string.app_ver_format, BuildConfig.VERSION_NAME) + setLoginControlsEnabled(true) + CertRepository.getClientCertificate { cert -> requireActivity().runOnUiThread { setCertificate(cert) @@ -453,6 +455,12 @@ class LoginFragment: Fragment() { private fun setLoginControlsEnabled(enabled: Boolean) { val activity = requireActivity() + val progressBar = activity.findViewById(R.id.progress_bar) + if (enabled) { + progressBar.visibility = View.GONE + } else { + progressBar.visibility = View.VISIBLE + } LOGIN_CONTROL_IDS.forEach { activity.findViewById(it)?.isEnabled = enabled } diff --git a/app/src/main/res/layout/fragment_login.xml b/app/src/main/res/layout/fragment_login.xml index 22cc4e677b58af758aea296cd3b8bda9647113e3..4acbc64f827c447b3161468b248068268a9fa70b 100644 --- a/app/src/main/res/layout/fragment_login.xml +++ b/app/src/main/res/layout/fragment_login.xml @@ -186,6 +186,11 @@ +