From 8379ffe1ce79dcb672ae413c2d86a6ff54fd65a0 Mon Sep 17 00:00:00 2001
From: J-Jamet <jeremy.jamet@kunzisoft.com>
Date: Thu, 19 Aug 2021 14:44:59 +0200
Subject: [PATCH] Add group loading

---
 .../com/kunzisoft/keepass/activities/GroupActivity.kt |  4 +++-
 app/src/main/res/layout/activity_entry.xml            |  4 +---
 app/src/main/res/layout/activity_group.xml            | 11 +++++++++++
 3 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/app/src/main/java/com/kunzisoft/keepass/activities/GroupActivity.kt b/app/src/main/java/com/kunzisoft/keepass/activities/GroupActivity.kt
index 95fe03b9f..eb5a5f9a7 100644
--- a/app/src/main/java/com/kunzisoft/keepass/activities/GroupActivity.kt
+++ b/app/src/main/java/com/kunzisoft/keepass/activities/GroupActivity.kt
@@ -88,6 +88,7 @@ class GroupActivity : DatabaseLockActivity(),
     private var numberChildrenView: TextView? = null
     private var addNodeButtonView: AddNodeButtonView? = null
     private var groupNameView: TextView? = null
+    private var loadingView: ProgressBar? = null
 
     private val mGroupViewModel: GroupViewModel by viewModels()
     private val mGroupEditViewModel: GroupEditViewModel by viewModels()
@@ -128,6 +129,7 @@ class GroupActivity : DatabaseLockActivity(),
         groupNameView = findViewById(R.id.group_name)
         toolbarAction = findViewById(R.id.toolbar_action)
         lockView = findViewById(R.id.lock_button)
+        loadingView = findViewById(R.id.loading)
 
         lockView?.setOnClickListener {
             lockAndExit()
@@ -254,7 +256,7 @@ class GroupActivity : DatabaseLockActivity(),
             assignGroupViewElements(currentGroup)
             invalidateOptionsMenu()
 
-            Log.i(TAG, "Finished creating tree")
+            loadingView?.hideByFading()
         }
 
         mGroupViewModel.firstPositionVisible.observe(this) { firstPositionVisible ->
diff --git a/app/src/main/res/layout/activity_entry.xml b/app/src/main/res/layout/activity_entry.xml
index 410a51809..5fd3ad192 100644
--- a/app/src/main/res/layout/activity_entry.xml
+++ b/app/src/main/res/layout/activity_entry.xml
@@ -133,9 +133,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="center"
-            android:indeterminate="true"
-            app:layout_anchor="@+id/entry_scroll"
-            app:layout_anchorGravity="center" />
+            android:indeterminate="true" />
     </FrameLayout>
 
     <include
diff --git a/app/src/main/res/layout/activity_group.xml b/app/src/main/res/layout/activity_group.xml
index e7bd96282..c554d67a3 100644
--- a/app/src/main/res/layout/activity_group.xml
+++ b/app/src/main/res/layout/activity_group.xml
@@ -157,6 +157,17 @@
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintBottom_toBottomOf="parent" />
 
+    <FrameLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent">
+        <ProgressBar
+            android:id="@+id/loading"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center"
+            android:indeterminate="true" />
+    </FrameLayout>
+
     <include
         layout="@layout/view_button_lock"
         android:layout_width="@dimen/lock_button_size"