From f2dd6344e770c9f1cdff5af6c34a2b77383982fe Mon Sep 17 00:00:00 2001
From: Azuma Kasumi <azuma.kasumi@nttdata-sbc.co.jp>
Date: Wed, 12 Apr 2023 16:49:12 +0900
Subject: [PATCH 1/2] =?UTF-8?q?=E3=83=AD=E3=82=B0=E3=82=A4=E3=83=B3?=
 =?UTF-8?q?=E7=94=BB=E9=9D=A2=E3=81=AE=E8=AA=AD=E3=81=BF=E8=BE=BC=E3=81=BF?=
 =?UTF-8?q?=E4=B8=AD=E8=A1=A8=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../jp/atled/agileworks/view/ui/login/LoginFragment.kt    | 8 ++++++++
 app/src/main/res/layout/fragment_login.xml                | 5 +++++
 2 files changed, 13 insertions(+)

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 3a311ccb..d59658e4 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<ProgressBar>(R.id.progress_bar)
+        if (enabled) {
+            progressBar.visibility = View.GONE
+        } else {
+            progressBar.visibility = View.VISIBLE
+        }
         LOGIN_CONTROL_IDS.forEach {
             activity.findViewById<View>(it)?.isEnabled = enabled
         }
diff --git a/app/src/main/res/layout/fragment_login.xml b/app/src/main/res/layout/fragment_login.xml
index 22cc4e67..4acbc64f 100644
--- a/app/src/main/res/layout/fragment_login.xml
+++ b/app/src/main/res/layout/fragment_login.xml
@@ -186,6 +186,11 @@
             </RelativeLayout>
 
         </LinearLayout>
+        <ProgressBar
+            android:id="@+id/progress_bar"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center"/>
         <View
             android:id="@+id/disablingView"
             android:layout_width="match_parent"
-- 
GitLab


From d115ff8aa8ae408c685ebe08854d62fbef88be9d Mon Sep 17 00:00:00 2001
From: Azuma Kasumi <azuma.kasumi@nttdata-sbc.co.jp>
Date: Fri, 14 Apr 2023 11:18:24 +0900
Subject: [PATCH 2/2] =?UTF-8?q?=E3=82=A2=E3=83=97=E3=83=AA=E3=83=90?=
 =?UTF-8?q?=E3=83=BC=E3=82=B8=E3=83=A7=E3=83=B3=E3=82=A2=E3=83=83=E3=83=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/build.gradle b/app/build.gradle
index 79b2381c..8936ea7c 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 {
-- 
GitLab