emu-mirror/Lime3DS
1
0
Fork 0
mirror of https://github.com/Lime3DS/Lime3DS.git synced 2025-03-14 09:42:28 +01:00
Code Issues Packages Projects Releases Wiki Activity

Rework CitraDirectoryHelper to support button step state

Browse Source
This commit is contained in:
Kleidis 2025-03-07 18:28:31 +01:00 committed by OpenSauce
parent 33e11bf19c
commit 2e2b044678
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/android/app/src/main/java/org/citra/citra_emu/fragments/CopyDirProgressDialogFragment.kt
View File

@ -141,7 +141,7 @@ class CopyDirProgressDialog : DialogFragment() {
override fun onComplete() {
CitraDirectoryHelper.initializeCitraDirectory(path)
callback?.onStepCompleted()
callback?.onStepCompleted(0, false)
viewModel.setCopyComplete(true)
}
})

2
src/android/app/src/main/java/org/citra/citra_emu/ui/main/MainActivity.kt
View File

@ -307,7 +307,7 @@ class MainActivity : AppCompatActivity(), ThemeProvider {
return@registerForActivityResult
}
CitraDirectoryHelper(this@MainActivity).showCitraDirectoryDialog(result)
CitraDirectoryHelper(this@MainActivity).showCitraDirectoryDialog(result, buttonState = {})
}
val ciaFileInstaller = registerForActivityResult(

4
src/android/app/src/main/java/org/citra/citra_emu/utils/CitraDirectoryHelper.kt
View File

@ -17,7 +17,7 @@ import org.citra.citra_emu.viewmodel.HomeViewModel
* Citra directory initialization ui flow controller.
*/
class CitraDirectoryHelper(private val fragmentActivity: FragmentActivity) {
fun showCitraDirectoryDialog(result: Uri, callback: SetupCallback? = null) {
fun showCitraDirectoryDialog(result: Uri, callback: SetupCallback? = null, buttonState: () -> Unit) {
val citraDirectoryDialog = CitraDirectoryDialogFragment.newInstance(
fragmentActivity,
result.toString(),
@ -36,7 +36,7 @@ class CitraDirectoryHelper(private val fragmentActivity: FragmentActivity) {
)
if (!moveData || previous.toString().isEmpty()) {
initializeCitraDirectory(path)
callback?.onStepCompleted()
buttonState()
val viewModel = ViewModelProvider(fragmentActivity)[HomeViewModel::class.java]
viewModel.setUserDir(fragmentActivity, path.path!!)
viewModel.setPickingUserDir(false)