fenix
/
Simple-Notes
mirror of https://github.com/SimpleMobileTools/Simple-Notes.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

simplify note exporting

This commit is contained in:
tibbi 2023-01-30 10:27:08 +01:00
parent 0e45034e72
commit ee3abd2577
2 changed files with 21 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
app/src/main/kotlin/com/simplemobiletools/notes/pro/activities/MainActivity.kt
View File

@ -183,8 +183,7 @@ class MainActivity : SimpleActivity() {
findItem(R.id.rename_note).isVisible = multipleNotesExist
findItem(R.id.open_note).isVisible = multipleNotesExist
findItem(R.id.delete_note).isVisible = multipleNotesExist
findItem(R.id.export_all_notes).isVisible = multipleNotesExist && !isQPlus()
findItem(R.id.export_notes).isVisible = multipleNotesExist && isQPlus()
findItem(R.id.export_all_notes).isVisible = multipleNotesExist
findItem(R.id.open_search).isVisible = !isCurrentItemChecklist
findItem(R.id.remove_done_items).isVisible = isCurrentItemChecklist
findItem(R.id.sort_checklist).isVisible = isCurrentItemChecklist
@ -223,8 +222,7 @@ class MainActivity : SimpleActivity() {
R.id.open_file -> tryOpenFile()
R.id.import_folder -> openFolder()
R.id.export_as_file -> fragment?.handleUnlocking { tryExportAsFile() }
R.id.export_all_notes -> tryExportAllNotes()
R.id.export_notes -> tryExportNotes()
R.id.export_all_notes -> tryExportNotes()
R.id.import_notes -> tryImportNotes()
R.id.print -> fragment?.handleUnlocking { printText() }
R.id.delete_note -> fragment?.handleUnlocking { displayDeleteNotePrompt() }
@ -889,20 +887,24 @@ class MainActivity : SimpleActivity() {
}
private fun tryExportNotes() {
hideKeyboard()
val fileName = "${getString(R.string.notes)}_${getCurrentFormattedDateTime()}"
Intent(Intent.ACTION_CREATE_DOCUMENT).apply {
type = EXPORT_MIME_TYPE
putExtra(Intent.EXTRA_TITLE, fileName)
addCategory(Intent.CATEGORY_OPENABLE)
if (isQPlus()) {
hideKeyboard()
val fileName = "${getString(R.string.notes)}_${getCurrentFormattedDateTime()}"
Intent(Intent.ACTION_CREATE_DOCUMENT).apply {
type = EXPORT_MIME_TYPE
putExtra(Intent.EXTRA_TITLE, fileName)
addCategory(Intent.CATEGORY_OPENABLE)
try {
startActivityForResult(this, PICK_EXPORT_NOTES_INTENT)
} catch (e: ActivityNotFoundException) {
toast(R.string.system_service_disabled, Toast.LENGTH_LONG)
} catch (e: Exception) {
showErrorToast(e)
try {
startActivityForResult(this, PICK_EXPORT_NOTES_INTENT)
} catch (e: ActivityNotFoundException) {
toast(R.string.system_service_disabled, Toast.LENGTH_LONG)
} catch (e: Exception) {
showErrorToast(e)
}
}
} else {
tryExportAllNotesBelowQ()
}
}
@ -1002,17 +1004,17 @@ class MainActivity : SimpleActivity() {
}
}
private fun tryExportAllNotes() {
private fun tryExportAllNotesBelowQ() {
handlePermission(PERMISSION_WRITE_STORAGE) {
if (it) {
exportAllNotes()
exportAllNotesBelowQ()
} else {
toast(R.string.no_storage_permissions)
}
}
}
private fun exportAllNotes() {
private fun exportAllNotesBelowQ() {
ExportFilesDialog(this, mNotes) { parent, extension ->
val items = arrayListOf(
RadioItem(EXPORT_FILE_SYNC, getString(R.string.update_file_at_note)),

4
app/src/main/res/menu/menu.xml
View File

@ -76,10 +76,6 @@
app:showAsAction="never" />
<item
android:id="@+id/export_all_notes"
android:title="@string/export_all_notes"
app:showAsAction="never" />
<item
android:id="@+id/export_notes"
android:title="@string/export_notes"
app:showAsAction="never" />
<item