Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

#21: The app becomes unusable if user closes folder selection dialog #32

Merged
merged 10 commits into from
Jan 11, 2024
Merged

#21: The app becomes unusable if user closes folder selection dialog #32

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
91499d5
Close app when no root folder is selected
shubertm Dec 5, 2023
f70651c
Minor refactors
shubertm Dec 28, 2023
caa4b3c
Create dependabot.yml (#31)
hieuwu Dec 14, 2023
3cc5a08
Proper workflow location for Dependabot
kirillt Dec 14, 2023
8b876e6
* SVG parsing
shubertm Dec 14, 2023
e988cbd
Signing with a new keystore using GitHub Actions, bump JDK version
kirillt Dec 16, 2023
e273527
Bump com.google.code.gson:gson from 2.8.9 to 2.10.1 (#33)
dependabot[bot] Dec 17, 2023
3908b60
Close dialog on touch outside
shubertm Jan 8, 2024
fe144f4
Disable closing dialog on touch outside
shubertm Jan 9, 2024
de2d3ac
Merge branch 'main' into bug/filepicker-dismiss
shubertm Jan 11, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 0 additions & 17 deletions app/src/main/java/dev/arkbuilders/arkmemo/files/parsers/JsonParser.kt
View file
Open in desktop

This file was deleted.

13 changes: 6 additions & 7 deletions app/src/main/java/dev/arkbuilders/arkmemo/ui/activities/MainActivity.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ import dev.arkbuilders.arkfilepicker.presentation.onArkPathPicked
import dev.arkbuilders.arkmemo.R
import dev.arkbuilders.arkmemo.contracts.PermissionContract
import dev.arkbuilders.arkmemo.databinding.ActivityMainBinding
import dev.arkbuilders.arkmemo.files.FilePicker
import dev.arkbuilders.arkmemo.ui.dialogs.FilePickerDialog
import dev.arkbuilders.arkmemo.preferences.MemoPreferences
import dev.arkbuilders.arkmemo.ui.fragments.EditTextNotesFragment
import dev.arkbuilders.arkmemo.ui.fragments.SettingsFragment
Expand All @@ -41,15 +41,15 @@ class MainActivity : AppCompatActivity(R.layout.activity_main) {
var fragment: Fragment = TextNotesFragment()

init {
FilePicker.readPermLauncher =
FilePickerDialog.readPermLauncher =
registerForActivityResult(ActivityResultContracts.RequestPermission()) { isGranted ->
if (isGranted) FilePicker.show()
if (isGranted) FilePickerDialog.show()
else finish()
}

FilePicker.readPermLauncher_SDK_R =
FilePickerDialog.readPermLauncher_SDK_R =
registerForActivityResult(PermissionContract()) { isGranted ->
if (isGranted) FilePicker.show()
if (isGranted) FilePickerDialog.show()
else finish()
}
}
Expand Down Expand Up @@ -85,11 +85,10 @@ class MainActivity : AppCompatActivity(R.layout.activity_main) {
}
}
}

}

if (memoPreferences.getPathString() == null) {
FilePicker.show(this, supportFragmentManager)
FilePickerDialog.show(this, supportFragmentManager)

supportFragmentManager.onArkPathPicked(this) {
memoPreferences.storePath(it.toString())
Expand Down
26 changes: 16 additions & 10 deletions ...v/arkbuilders/arkmemo/files/FilePicker.kt → ...rs/arkmemo/ui/dialogs/FilePickerDialog.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,9 @@
package dev.arkbuilders.arkmemo.files
package dev.arkbuilders.arkmemo.ui.dialogs

import android.Manifest
import android.content.Context
import android.content.pm.PackageManager
import android.os.Build
import android.os.Environment
import android.widget.Toast
import androidx.activity.result.ActivityResultLauncher
import androidx.appcompat.app.AppCompatActivity
import androidx.core.content.ContextCompat
Expand All @@ -15,21 +13,33 @@ import dev.arkbuilders.arkfilepicker.presentation.filepicker.ArkFilePickerFragme
import dev.arkbuilders.arkfilepicker.presentation.filepicker.ArkFilePickerMode
import dev.arkbuilders.arkmemo.BuildConfig
import dev.arkbuilders.arkmemo.R
import dev.arkbuilders.arkmemo.ui.activities.MainActivity

class FilePickerDialog: ArkFilePickerFragment() {

override fun dismiss() {
super.dismiss()
val activity = (requireActivity() as MainActivity)
if (activity.memoPreferences.getPathString() == null) activity.finish()
}
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Assuming FilePickerDialog might probably be used in other activity in the future, rather than MainActivity, this casting will cause a crash.
What do you think about below?

Suggested change
val activity = (requireActivity() as MainActivity)
if (activity.memoPreferences.getPathString() == null) activity.finish()
}
val activity = (activity as? MainActivity)
if (activity?.memoPreferences?.getPathString() == null) activity?.finish()
}


class FilePicker private constructor(){
companion object{

private const val TAG = "file_picker"
private var fragmentManager: FragmentManager? = null
var readPermLauncher: ActivityResultLauncher<String>? = null
var readPermLauncher_SDK_R: ActivityResultLauncher<String>? = null

fun newInstance(config: ArkFilePickerConfig) = FilePickerDialog().apply {
setConfig(config)
}

fun show() {
ArkFilePickerFragment.newInstance(getFilePickerConfig()).show(fragmentManager!!, TAG)
newInstance(getFilePickerConfig()).show(fragmentManager!!, TAG)
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
newInstance(getFilePickerConfig()).show(fragmentManager!!, TAG)
fragmentManager?.let { newInstance(getFilePickerConfig()).show(it, TAG) }

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think fragmentManager can not really be null here. We can just make it non-nullable

}

fun show(activity: AppCompatActivity, fragmentManager: FragmentManager){
this.fragmentManager = fragmentManager
Companion.fragmentManager = fragmentManager
if(isReadPermissionGranted(activity)){
show()
}
Expand All @@ -55,10 +65,6 @@ class FilePicker private constructor(){
}
}

fun permissionDeniedError(context: Context){
Toast.makeText(context, context.getString(R.string.no_file_access), Toast.LENGTH_SHORT).show()
}

private fun getFilePickerConfig() = ArkFilePickerConfig(
mode = ArkFilePickerMode.FOLDER,
titleStringId = R.string.file_picker_title,
Expand Down
4 changes: 2 additions & 2 deletions app/src/main/java/dev/arkbuilders/arkmemo/ui/fragments/SettingsFragment.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import androidx.preference.PreferenceFragmentCompat
import dagger.hilt.android.AndroidEntryPoint
import dev.arkbuilders.arkfilepicker.presentation.onArkPathPicked
import dev.arkbuilders.arkmemo.R
import dev.arkbuilders.arkmemo.files.FilePicker
import dev.arkbuilders.arkmemo.ui.dialogs.FilePickerDialog
import dev.arkbuilders.arkmemo.preferences.MemoPreferences
import dev.arkbuilders.arkmemo.ui.activities.MainActivity
import dev.arkbuilders.arkmemo.ui.views.PathPreference
Expand Down Expand Up @@ -40,7 +40,7 @@ class SettingsFragment : PreferenceFragmentCompat() {
activity.supportActionBar?.setDisplayHomeAsUpEnabled(true)

pathPref?.setOnPreferenceClickListener {
FilePicker.show(activity, parentFragmentManager)
FilePickerDialog.show(activity, parentFragmentManager)
true
}

Expand Down