Add lock action

app/src/main/java/com/kunzisoft/keepass/activities/IconPickerActivity.kt

@@ -24,13 +24,16 @@ import android.content.Intent
 import android.os.Bundle
 import android.view.MenuItem
 import android.view.View
+import android.view.ViewGroup
 import androidx.activity.viewModels
 import androidx.appcompat.widget.Toolbar
 import androidx.fragment.app.commit
 import com.kunzisoft.keepass.R
 import com.kunzisoft.keepass.activities.fragments.IconPickerFragment
 import com.kunzisoft.keepass.activities.lock.LockingActivity
+import com.kunzisoft.keepass.activities.lock.resetAppTimeoutWhenViewFocusedOrChanged
 import com.kunzisoft.keepass.database.element.icon.IconImage
+import com.kunzisoft.keepass.settings.PreferencesUtil
 import com.kunzisoft.keepass.view.updateLockPaddingLeft
 import com.kunzisoft.keepass.viewmodels.IconPickerViewModel
 
@@ -39,6 +42,7 @@ class IconPickerActivity : LockingActivity() {
 
     private lateinit var toolbar: Toolbar
     private lateinit var uploadButton: View
+    private var lockView: View? = null
 
     private val iconPickerViewModel: IconPickerViewModel by viewModels()
 
@@ -59,6 +63,11 @@ class IconPickerActivity : LockingActivity() {
             // TODO Upload icon
         }
 
+        lockView = findViewById(R.id.lock_button)
+        lockView?.setOnClickListener {
+            lockAndExit()
+        }
+
         if (savedInstanceState == null) {
             supportFragmentManager.commit {
                 setReorderingAllowed(true)
@@ -66,6 +75,9 @@ class IconPickerActivity : LockingActivity() {
             }
         }
 
+        // Focus view to reinitialize timeout
+        findViewById<ViewGroup>(R.id.icon_picker_container)?.resetAppTimeoutWhenViewFocusedOrChanged(this)
+
         // TODO  keep previous standard icon id
         iconPickerViewModel.iconStandardSelected.observe(this) { iconStandard ->
             setResult(Activity.RESULT_OK, Intent().apply {
@@ -84,6 +96,13 @@ class IconPickerActivity : LockingActivity() {
     override fun onResume() {
         super.onResume()
 
+        // Show the lock button
+        lockView?.visibility = if (PreferencesUtil.showLockDatabaseButton(this)) {
+            View.VISIBLE
+        } else {
+            View.GONE
+        }
+
         // Padding if lock button visible
         toolbar.updateLockPaddingLeft()
     }

app/src/main/res/layout/activity_icon_picker.xml

@@ -19,6 +19,7 @@
 -->
 <androidx.constraintlayout.widget.ConstraintLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/icon_picker_container"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     xmlns:app="http://schemas.android.com/apk/res-auto">