Compare commits
No commits in common. "ebe47c4126557b507f91307b77705a1a7a0a2468" and "ee5db64532a4471796c34ed3ac28c12df6896aa4" have entirely different histories.
ebe47c4126
...
ee5db64532
6 changed files with 16 additions and 45 deletions
|
@ -182,29 +182,6 @@ class MarkdownTests {
|
|||
}
|
||||
}
|
||||
|
||||
@Test
|
||||
fun launchWithContentUriTest() = runTest {
|
||||
val markdownText = "# UI Testing\n\nThe quick brown fox jumped over the lazy dog."
|
||||
file.outputStream().writer().use { it.write(markdownText) }
|
||||
val fileUri = FileProvider.getUriForFile(
|
||||
getApplicationContext(),
|
||||
"${BuildConfig.APPLICATION_ID}.fileprovider",
|
||||
file
|
||||
)
|
||||
ActivityScenario.launch<MainActivity>(
|
||||
Intent(
|
||||
Intent.ACTION_VIEW,
|
||||
fileUri,
|
||||
getInstrumentation().targetContext,
|
||||
MainActivity::class.java
|
||||
)
|
||||
)
|
||||
onMainScreen(composeRule) {
|
||||
awaitIdle()
|
||||
checkMarkdownEquals(markdownText)
|
||||
checkTitleEquals("temp.md")
|
||||
}
|
||||
}
|
||||
|
||||
@Test
|
||||
fun openEditAndSaveMarkdownTest() = runTest {
|
||||
|
|
|
@ -14,6 +14,7 @@ import kotlinx.coroutines.flow.MutableStateFlow
|
|||
import kotlinx.coroutines.flow.asStateFlow
|
||||
import kotlinx.coroutines.flow.launchIn
|
||||
import kotlinx.coroutines.flow.onEach
|
||||
import kotlinx.coroutines.launch
|
||||
import kotlinx.coroutines.sync.Mutex
|
||||
import kotlinx.coroutines.sync.withLock
|
||||
import kotlinx.coroutines.withContext
|
||||
|
@ -49,6 +50,9 @@ class MarkdownViewModel(
|
|||
private val saveMutex = Mutex()
|
||||
|
||||
init {
|
||||
viewModelScope.launch {
|
||||
load(null)
|
||||
}
|
||||
preferenceHelper.observe<Boolean>(Preference.LOCK_SWIPING)
|
||||
.onEach {
|
||||
_state.value = _state.value.copy(lockSwiping = it)
|
||||
|
|
|
@ -62,7 +62,6 @@ import com.wbrawner.simplemarkdown.MarkdownViewModel
|
|||
import com.wbrawner.simplemarkdown.ParameterizedText
|
||||
import com.wbrawner.simplemarkdown.R
|
||||
import com.wbrawner.simplemarkdown.Route
|
||||
import com.wbrawner.simplemarkdown.utility.activity
|
||||
import kotlinx.coroutines.delay
|
||||
import kotlinx.coroutines.flow.distinctUntilChanged
|
||||
import kotlinx.coroutines.flow.map
|
||||
|
@ -88,10 +87,6 @@ fun MainScreen(
|
|||
val alert by viewModel.collectAsState(EditorState::alert, null)
|
||||
val saveCallback by viewModel.collectAsState(EditorState::saveCallback, null)
|
||||
val lockSwiping by viewModel.collectAsState(EditorState::lockSwiping, false)
|
||||
val intentData = LocalContext.current.activity?.intent?.data
|
||||
LaunchedEffect(intentData) {
|
||||
viewModel.load(intentData?.toString())
|
||||
}
|
||||
LaunchedEffect(enableAutosave) {
|
||||
if (!enableAutosave) return@LaunchedEffect
|
||||
while (isActive) {
|
||||
|
|
|
@ -1,11 +1,11 @@
|
|||
package com.wbrawner.simplemarkdown.utility
|
||||
|
||||
import android.app.Activity
|
||||
import android.content.Context
|
||||
import android.content.ContextWrapper
|
||||
import android.content.res.AssetManager
|
||||
import android.net.Uri
|
||||
import android.provider.OpenableColumns
|
||||
import android.view.View
|
||||
import android.view.inputmethod.InputMethodManager
|
||||
import kotlinx.coroutines.Dispatchers
|
||||
import kotlinx.coroutines.withContext
|
||||
import java.io.Reader
|
||||
|
@ -22,11 +22,11 @@ suspend fun Uri.getName(context: Context): String {
|
|||
if ("content" == scheme) {
|
||||
withContext(Dispatchers.IO) {
|
||||
context.contentResolver.query(
|
||||
this@getName,
|
||||
null,
|
||||
null,
|
||||
null,
|
||||
null
|
||||
this@getName,
|
||||
null,
|
||||
null,
|
||||
null,
|
||||
null
|
||||
)?.use {
|
||||
val nameIndex = it.getColumnIndex(OpenableColumns.DISPLAY_NAME)
|
||||
it.moveToFirst()
|
||||
|
@ -41,11 +41,3 @@ suspend fun Uri.getName(context: Context): String {
|
|||
}
|
||||
return fileName ?: "Untitled.md"
|
||||
}
|
||||
|
||||
@Suppress("RecursivePropertyAccessor")
|
||||
val Context.activity: Activity?
|
||||
get() = when (this) {
|
||||
is Activity -> this
|
||||
is ContextWrapper -> baseContext.activity
|
||||
else -> null
|
||||
}
|
|
@ -1,2 +0,0 @@
|
|||
- Fix opening files from external apps
|
||||
- Update dependencies
|
5
app/src/play/play/release-notes/en-US/production.txt
Normal file
5
app/src/play/play/release-notes/en-US/production.txt
Normal file
|
@ -0,0 +1,5 @@
|
|||
- Fix crash on markdown preview
|
||||
- Persist preference for Lock Swiping
|
||||
- Enable gestures on nav drawer when open
|
||||
- Close navigation drawer on back press
|
||||
- Various dependency updates
|
Loading…
Reference in a new issue