From 29e4509b6e197c193573c770934a28c1908d28f9 Mon Sep 17 00:00:00 2001 From: merkost Date: Mon, 10 Jul 2023 12:09:16 +1000 Subject: [PATCH] Moved ActivityResult properties --- .../notes/pro/activities/SettingsActivity.kt | 42 +++++++++---------- 1 file changed, 20 insertions(+), 22 deletions(-) diff --git a/app/src/main/kotlin/com/simplemobiletools/notes/pro/activities/SettingsActivity.kt b/app/src/main/kotlin/com/simplemobiletools/notes/pro/activities/SettingsActivity.kt index 1c1cf496..5b8ee9f9 100644 --- a/app/src/main/kotlin/com/simplemobiletools/notes/pro/activities/SettingsActivity.kt +++ b/app/src/main/kotlin/com/simplemobiletools/notes/pro/activities/SettingsActivity.kt @@ -18,7 +18,6 @@ import com.simplemobiletools.notes.pro.helpers.* import com.simplemobiletools.notes.pro.models.Note import com.simplemobiletools.notes.pro.models.Widget import kotlinx.android.synthetic.main.activity_settings.* -import kotlinx.android.synthetic.main.activity_settings.view.settings_migrating_label import kotlinx.serialization.SerializationException import kotlinx.serialization.decodeFromString import kotlinx.serialization.encodeToString @@ -27,29 +26,8 @@ import java.util.Locale import kotlin.system.exitProcess class SettingsActivity : SimpleActivity() { - private val notesFileType = "application/json" - private val getContent = registerForActivityResult(ActivityResultContracts.GetContent()) { uri -> - if (uri != null) { - toast(R.string.importing) - importNotes(uri) - } - } - - private val saveDocument = registerForActivityResult(ActivityResultContracts.CreateDocument(notesFileType)) { uri -> - if (uri != null) { - toast(R.string.exporting) - NotesHelper(this).getNotes { notes -> - requestUnlockNotes(notes) { unlockedNotes -> - val notLockedNotes = notes.filterNot { it.isLocked() } - val notesToExport = unlockedNotes + notLockedNotes - exportNotes(notesToExport, uri) - } - } - } - } - override fun onCreate(savedInstanceState: Bundle?) { isMaterialActivity = true super.onCreate(savedInstanceState) @@ -100,6 +78,26 @@ class SettingsActivity : SimpleActivity() { return super.onCreateOptionsMenu(menu) } + private val getContent = registerForActivityResult(ActivityResultContracts.GetContent()) { uri -> + if (uri != null) { + toast(R.string.importing) + importNotes(uri) + } + } + + private val saveDocument = registerForActivityResult(ActivityResultContracts.CreateDocument(notesFileType)) { uri -> + if (uri != null) { + toast(R.string.exporting) + NotesHelper(this).getNotes { notes -> + requestUnlockNotes(notes) { unlockedNotes -> + val notLockedNotes = notes.filterNot { it.isLocked() } + val notesToExport = unlockedNotes + notLockedNotes + exportNotes(notesToExport, uri) + } + } + } + } + private fun setupCustomizeColors() { settings_color_customization_holder.setOnClickListener { startCustomizationActivity()