rixxc/KeePassDX
1
0
Fork 0
mirror of https://github.com/Kunzisoft/KeePassDX.git synced 2025-12-04 15:49:33 +01:00
Code Issues Packages Projects Releases Wiki Activity

Add group loading

Browse Source
This commit is contained in:
J-Jamet
2021-08-19 14:44:59 +02:00
parent c77537ecee
commit 8379ffe1ce
3 changed files with 15 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/src/main/java/com/kunzisoft/keepass/activities/GroupActivity.kt
View File

@@ -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 ->

4
app/src/main/res/layout/activity_entry.xml
View File

@@ -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

11
app/src/main/res/layout/activity_group.xml
View File

@@ -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"