2 files changed, 67 insertions, 75 deletions
diff --git a/app/src/main/java/dev/msfjarvis/aps/ui/folderselect/SelectFolderActivity.kt b/app/src/main/java/dev/msfjarvis/aps/ui/folderselect/SelectFolderActivity.kt
index 910f7c27..1c6a236e 100644
--- a/app/src/main/java/dev/msfjarvis/aps/ui/folderselect/SelectFolderActivity.kt
+++ b/app/src/main/java/dev/msfjarvis/aps/ui/folderselect/SelectFolderActivity.kt
@@ -15,49 +15,46 @@ import dev.msfjarvis.aps.data.repo.PasswordRepository
 import dev.msfjarvis.aps.ui.passwords.PASSWORD_FRAGMENT_TAG
 import dev.msfjarvis.aps.ui.passwords.PasswordStore
 
-
 class SelectFolderActivity : AppCompatActivity(R.layout.select_folder_layout) {
 
-    private lateinit var passwordList: SelectFolderFragment
+  private lateinit var passwordList: SelectFolderFragment
 
-    override fun onCreate(savedInstanceState: Bundle?) {
-        super.onCreate(savedInstanceState)
+  override fun onCreate(savedInstanceState: Bundle?) {
+    super.onCreate(savedInstanceState)
 
-        passwordList = SelectFolderFragment()
-        val args = Bundle()
-        args.putString(PasswordStore.REQUEST_ARG_PATH, PasswordRepository.getRepositoryDirectory().absolutePath)
+    passwordList = SelectFolderFragment()
+    val args = Bundle()
+    args.putString(PasswordStore.REQUEST_ARG_PATH, PasswordRepository.getRepositoryDirectory().absolutePath)
 
-        passwordList.arguments = args
+    passwordList.arguments = args
 
-        supportActionBar?.show()
+    supportActionBar?.show()
 
-        supportFragmentManager.popBackStack(null, FragmentManager.POP_BACK_STACK_INCLUSIVE)
+    supportFragmentManager.popBackStack(null, FragmentManager.POP_BACK_STACK_INCLUSIVE)
 
-        supportFragmentManager.commit {
-            replace(R.id.pgp_handler_linearlayout, passwordList, PASSWORD_FRAGMENT_TAG)
-        }
-    }
+    supportFragmentManager.commit { replace(R.id.pgp_handler_linearlayout, passwordList, PASSWORD_FRAGMENT_TAG) }
+  }
 
-    override fun onCreateOptionsMenu(menu: Menu): Boolean {
-        menuInflater.inflate(R.menu.pgp_handler_select_folder, menu)
-        return true
-    }
-
-    override fun onOptionsItemSelected(item: MenuItem): Boolean {
-        when (item.itemId) {
-            android.R.id.home -> {
-                setResult(RESULT_CANCELED)
-                onBackPressed()
-            }
-            R.id.crypto_select -> selectFolder()
-            else -> return super.onOptionsItemSelected(item)
-        }
-        return true
-    }
+  override fun onCreateOptionsMenu(menu: Menu): Boolean {
+    menuInflater.inflate(R.menu.pgp_handler_select_folder, menu)
+    return true
+  }
 
-    private fun selectFolder() {
-        intent.putExtra("SELECTED_FOLDER_PATH", passwordList.currentDir.absolutePath)
-        setResult(RESULT_OK, intent)
-        finish()
+  override fun onOptionsItemSelected(item: MenuItem): Boolean {
+    when (item.itemId) {
+      android.R.id.home -> {
+        setResult(RESULT_CANCELED)
+        onBackPressed()
+      }
+      R.id.crypto_select -> selectFolder()
+      else -> return super.onOptionsItemSelected(item)
     }
+    return true
+  }
+
+  private fun selectFolder() {
+    intent.putExtra("SELECTED_FOLDER_PATH", passwordList.currentDir.absolutePath)
+    setResult(RESULT_OK, intent)
+    finish()
+  }
 }
diff --git a/app/src/main/java/dev/msfjarvis/aps/ui/folderselect/SelectFolderFragment.kt b/app/src/main/java/dev/msfjarvis/aps/ui/folderselect/SelectFolderFragment.kt
index 2a192e78..1905aab0 100644
--- a/app/src/main/java/dev/msfjarvis/aps/ui/folderselect/SelectFolderFragment.kt
+++ b/app/src/main/java/dev/msfjarvis/aps/ui/folderselect/SelectFolderFragment.kt
@@ -26,56 +26,51 @@ import me.zhanghai.android.fastscroll.FastScrollerBuilder
 
 class SelectFolderFragment : Fragment(R.layout.password_recycler_view) {
 
-    private val binding by viewBinding(PasswordRecyclerViewBinding::bind)
-    private lateinit var recyclerAdapter: PasswordItemRecyclerAdapter
-    private lateinit var listener: OnFragmentInteractionListener
+  private val binding by viewBinding(PasswordRecyclerViewBinding::bind)
+  private lateinit var recyclerAdapter: PasswordItemRecyclerAdapter
+  private lateinit var listener: OnFragmentInteractionListener
 
-    private val model: SearchableRepositoryViewModel by activityViewModels()
+  private val model: SearchableRepositoryViewModel by activityViewModels()
 
-    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
-        super.onViewCreated(view, savedInstanceState)
-        binding.fab.hide()
-        recyclerAdapter = PasswordItemRecyclerAdapter()
-            .onItemClicked { _, item ->
-                listener.onFragmentInteraction(item)
-            }
-        binding.passRecycler.apply {
-            layoutManager = LinearLayoutManager(requireContext())
-            itemAnimator = null
-            adapter = recyclerAdapter
-        }
+  override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+    super.onViewCreated(view, savedInstanceState)
+    binding.fab.hide()
+    recyclerAdapter = PasswordItemRecyclerAdapter().onItemClicked { _, item -> listener.onFragmentInteraction(item) }
+    binding.passRecycler.apply {
+      layoutManager = LinearLayoutManager(requireContext())
+      itemAnimator = null
+      adapter = recyclerAdapter
+    }
 
-        FastScrollerBuilder(binding.passRecycler).build()
-        registerForContextMenu(binding.passRecycler)
+    FastScrollerBuilder(binding.passRecycler).build()
+    registerForContextMenu(binding.passRecycler)
 
-        val path = requireNotNull(requireArguments().getString(PasswordStore.REQUEST_ARG_PATH))
-        model.navigateTo(File(path), listMode = ListMode.DirectoriesOnly, pushPreviousLocation = false)
-        model.searchResult.observe(viewLifecycleOwner) { result ->
-            recyclerAdapter.submitList(result.passwordItems)
-        }
-    }
+    val path = requireNotNull(requireArguments().getString(PasswordStore.REQUEST_ARG_PATH))
+    model.navigateTo(File(path), listMode = ListMode.DirectoriesOnly, pushPreviousLocation = false)
+    model.searchResult.observe(viewLifecycleOwner) { result -> recyclerAdapter.submitList(result.passwordItems) }
+  }
 
-    override fun onAttach(context: Context) {
-        super.onAttach(context)
-        runCatching {
-            listener = object : OnFragmentInteractionListener {
-                override fun onFragmentInteraction(item: PasswordItem) {
-                    if (item.type == PasswordItem.TYPE_CATEGORY) {
-                        model.navigateTo(item.file, listMode = ListMode.DirectoriesOnly)
-                        (requireActivity() as AppCompatActivity).supportActionBar?.setDisplayHomeAsUpEnabled(true)
-                    }
-                }
+  override fun onAttach(context: Context) {
+    super.onAttach(context)
+    runCatching {
+      listener =
+        object : OnFragmentInteractionListener {
+          override fun onFragmentInteraction(item: PasswordItem) {
+            if (item.type == PasswordItem.TYPE_CATEGORY) {
+              model.navigateTo(item.file, listMode = ListMode.DirectoriesOnly)
+              (requireActivity() as AppCompatActivity).supportActionBar?.setDisplayHomeAsUpEnabled(true)
             }
-        }.onFailure {
-            throw ClassCastException("$context must implement OnFragmentInteractionListener")
+          }
         }
     }
+      .onFailure { throw ClassCastException("$context must implement OnFragmentInteractionListener") }
+  }
 
-    val currentDir: File
-        get() = model.currentDir.value!!
+  val currentDir: File
+    get() = model.currentDir.value!!
 
-    interface OnFragmentInteractionListener {
+  interface OnFragmentInteractionListener {
 
-        fun onFragmentInteraction(item: PasswordItem)
-    }
+    fun onFragmentInteraction(item: PasswordItem)
+  }
 }