wbrawner/SimpleMarkdown
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix an issue with deleting changes upon device rotation

Browse source
This commit is contained in:
William Brawner 2020-10-05 20:43:56 -07:00
parent 1affb7069a
commit 0e7cdfa2b5
4 changed files with 23 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
app/src/free/java/com/wbrawner/simplemarkdown/utility/ErrorHandler.kt
View file

@ -1,5 +1,6 @@
package com.wbrawner.simplemarkdown.utility package com.wbrawner.simplemarkdown.utility
import android.util.Log
import kotlin.reflect.KProperty import kotlin.reflect.KProperty
class errorHandlerImpl { class errorHandlerImpl {

9
app/src/main/java/com/wbrawner/simplemarkdown/view/fragment/EditFragment.kt
View file

@ -95,15 +95,18 @@ class EditFragment : Fragment(), ViewPagerPage, CoroutineScope {
false false
} }
markdownEditor?.setText(viewModel.markdownUpdates.value) markdownEditor?.setText(viewModel.markdownUpdates.value)
viewModel.originalMarkdown.observe(viewLifecycleOwner, Observer { viewModel.editorActions.observe(viewLifecycleOwner, Observer {
markdownEditor?.setText(it) if (it.consumed.getAndSet(true)) return@Observer
if (it is MarkdownViewModel.EditorAction.Load) {
markdownEditor?.setText(it.markdown)
}
}) })
launch { launch {
val enableReadability = withContext(Dispatchers.IO) { val enableReadability = withContext(Dispatchers.IO) {
context?.let { context?.let {
PreferenceManager.getDefaultSharedPreferences(it) PreferenceManager.getDefaultSharedPreferences(it)
.getBoolean(getString(R.string.readability_enabled), false) .getBoolean(getString(R.string.readability_enabled), false)
}?: false } ?: false
} }
if (enableReadability) { if (enableReadability) {
if (readabilityWatcher == null) { if (readabilityWatcher == null) {

2
app/src/main/java/com/wbrawner/simplemarkdown/view/fragment/MainFragment.kt
View file

@ -252,7 +252,7 @@ class MainFragment : Fragment(), ActivityCompat.OnRequestPermissionsResultCallba
} }
private fun promptSaveOrDiscardChanges() { private fun promptSaveOrDiscardChanges() {
if (viewModel.originalMarkdown.value == viewModel.markdownUpdates.value) { if (viewModel.shouldPromptSave()) {
viewModel.reset("Untitled.md") viewModel.reset("Untitled.md")
PreferenceManager.getDefaultSharedPreferences(requireContext()).edit { PreferenceManager.getDefaultSharedPreferences(requireContext()).edit {
remove(getString(R.string.pref_key_autosave_uri)) remove(getString(R.string.pref_key_autosave_uri))

18
app/src/main/java/com/wbrawner/simplemarkdown/viewmodel/MarkdownViewModel.kt
View file

@ -9,15 +9,18 @@ import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.withContext import kotlinx.coroutines.withContext
import java.io.FileInputStream import java.io.FileInputStream
import java.io.Reader import java.io.Reader
import java.util.concurrent.atomic.AtomicBoolean
class MarkdownViewModel : ViewModel() { class MarkdownViewModel : ViewModel() {
val fileName = MutableLiveData<String>("Untitled.md") val fileName = MutableLiveData<String>("Untitled.md")
val markdownUpdates = MutableLiveData<String>() val markdownUpdates = MutableLiveData<String>()
val originalMarkdown = MutableLiveData<String>() val editorActions = MutableLiveData<EditorAction>()
val uri = MutableLiveData<Uri>() val uri = MutableLiveData<Uri>()
private val isDirty = AtomicBoolean(false)
fun updateMarkdown(markdown: String?) { fun updateMarkdown(markdown: String?) {
this.markdownUpdates.postValue(markdown ?: "") this.markdownUpdates.postValue(markdown ?: "")
isDirty.set(true)
} }
suspend fun load(context: Context, uri: Uri?): Boolean { suspend fun load(context: Context, uri: Uri?): Boolean {
@ -32,7 +35,8 @@ class MarkdownViewModel : ViewModel() {
// If we don't get anything back, then we can assume that reading the file failed // If we don't get anything back, then we can assume that reading the file failed
return@withContext false return@withContext false
} }
originalMarkdown.postValue(content) isDirty.set(false)
editorActions.postValue(EditorAction.Load(content))
markdownUpdates.postValue(content) markdownUpdates.postValue(content)
this@MarkdownViewModel.fileName.postValue(fileName) this@MarkdownViewModel.fileName.postValue(fileName)
this@MarkdownViewModel.uri.postValue(uri) this@MarkdownViewModel.uri.postValue(uri)
@ -66,7 +70,15 @@ class MarkdownViewModel : ViewModel() {
fun reset(untitledFileName: String) { fun reset(untitledFileName: String) {
fileName.postValue(untitledFileName) fileName.postValue(untitledFileName)
originalMarkdown.postValue("")
markdownUpdates.postValue("") markdownUpdates.postValue("")
isDirty.set(false)
}
fun shouldPromptSave() = isDirty.get()
sealed class EditorAction {
val consumed = AtomicBoolean(false)
data class Load(val markdown: String) : EditorAction()
} }
} }