Compare commits
6 commits
3ac064c02c
...
9d26752d2b
Author | SHA1 | Date | |
---|---|---|---|
9d26752d2b | |||
3f5c6b7ebf | |||
79d609f138 | |||
4271ded6aa | |||
7f945ba5fe | |||
12d5fcb834 |
9 changed files with 18 additions and 16 deletions
|
@ -37,11 +37,11 @@ android {
|
|||
}
|
||||
compileSdk = libs.versions.maxSdk.get().toInt()
|
||||
compileOptions {
|
||||
sourceCompatibility = JavaVersion.VERSION_1_8
|
||||
targetCompatibility = JavaVersion.VERSION_1_8
|
||||
sourceCompatibility = JavaVersion.VERSION_11
|
||||
targetCompatibility = JavaVersion.VERSION_11
|
||||
}
|
||||
kotlinOptions {
|
||||
jvmTarget = "1.8"
|
||||
jvmTarget = "11"
|
||||
}
|
||||
defaultConfig {
|
||||
applicationId = "com.wbrawner.simplemarkdown"
|
||||
|
|
|
@ -4,7 +4,6 @@ import android.content.Intent
|
|||
import android.net.Uri
|
||||
import androidx.activity.compose.rememberLauncherForActivityResult
|
||||
import androidx.activity.result.contract.ActivityResultContracts
|
||||
import androidx.compose.foundation.ExperimentalFoundationApi
|
||||
import androidx.compose.foundation.background
|
||||
import androidx.compose.foundation.layout.Box
|
||||
import androidx.compose.foundation.layout.Column
|
||||
|
@ -327,7 +326,7 @@ private fun MainScreen(
|
|||
}
|
||||
|
||||
@Composable
|
||||
@OptIn(ExperimentalFoundationApi::class, ExperimentalMaterial3Api::class)
|
||||
@OptIn(ExperimentalMaterial3Api::class)
|
||||
private fun TabbedMarkdownEditor(
|
||||
initialMarkdown: String,
|
||||
markdown: String,
|
||||
|
@ -349,7 +348,7 @@ private fun TabbedMarkdownEditor(
|
|||
}
|
||||
HorizontalPager(
|
||||
modifier = Modifier.fillMaxSize(1f), state = pagerState,
|
||||
beyondBoundsPageCount = 1,
|
||||
beyondViewportPageCount = 1,
|
||||
userScrollEnabled = !lockSwiping
|
||||
) { page ->
|
||||
val keyboardController = LocalSoftwareKeyboardController.current
|
||||
|
|
|
@ -47,6 +47,7 @@ class AndroidPreferenceHelper(context: Context, private val coroutineScope: Coro
|
|||
}
|
||||
}
|
||||
|
||||
@Suppress("UNCHECKED_CAST")
|
||||
override fun <T> observe(preference: Preference): StateFlow<T> = states[preference]!!.asStateFlow() as StateFlow<T>
|
||||
}
|
||||
|
||||
|
|
|
@ -23,6 +23,7 @@ class FakePreferenceHelper: PreferenceHelper {
|
|||
preferences[preference] = value
|
||||
}
|
||||
|
||||
@Suppress("UNCHECKED_CAST")
|
||||
override fun <T> observe(preference: Preference): StateFlow<T> =
|
||||
preferenceFlow(preference) as StateFlow<T>
|
||||
}
|
|
@ -23,6 +23,7 @@ import timber.log.Timber
|
|||
import java.io.File
|
||||
import java.net.URI
|
||||
|
||||
@OptIn(ExperimentalCoroutinesApi::class)
|
||||
class MarkdownViewModelTest {
|
||||
private lateinit var fileHelper: FakeFileHelper
|
||||
private lateinit var preferenceHelper: FakePreferenceHelper
|
||||
|
|
|
@ -41,11 +41,11 @@ android {
|
|||
}
|
||||
}
|
||||
compileOptions {
|
||||
sourceCompatibility = JavaVersion.VERSION_1_8
|
||||
targetCompatibility = JavaVersion.VERSION_1_8
|
||||
sourceCompatibility = JavaVersion.VERSION_11
|
||||
targetCompatibility = JavaVersion.VERSION_11
|
||||
}
|
||||
kotlinOptions {
|
||||
jvmTarget = "1.8"
|
||||
jvmTarget = "11"
|
||||
}
|
||||
lint {
|
||||
disable += listOf("AndroidGradlePluginVersion", "GradleDependency")
|
||||
|
|
|
@ -27,11 +27,11 @@ android {
|
|||
compose = true
|
||||
}
|
||||
compileOptions {
|
||||
sourceCompatibility = JavaVersion.VERSION_1_8
|
||||
targetCompatibility = JavaVersion.VERSION_1_8
|
||||
sourceCompatibility = JavaVersion.VERSION_11
|
||||
targetCompatibility = JavaVersion.VERSION_11
|
||||
}
|
||||
kotlinOptions {
|
||||
jvmTarget = "1.8"
|
||||
jvmTarget = "11"
|
||||
}
|
||||
lint {
|
||||
disable += listOf("AndroidGradlePluginVersion", "GradleDependency")
|
||||
|
|
|
@ -6,7 +6,7 @@ appcompat = "1.7.0"
|
|||
billing = "7.1.0"
|
||||
browser = "1.8.0"
|
||||
commonMarkVersion = "0.23.0"
|
||||
composeBom = "2024.08.00"
|
||||
composeBom = "2024.09.02"
|
||||
core = "1.6.1"
|
||||
coreKtx = "1.13.1"
|
||||
coreSplashscreen = "1.0.1"
|
||||
|
|
|
@ -24,14 +24,14 @@ android {
|
|||
}
|
||||
}
|
||||
compileOptions {
|
||||
sourceCompatibility = JavaVersion.VERSION_1_8
|
||||
targetCompatibility = JavaVersion.VERSION_1_8
|
||||
sourceCompatibility = JavaVersion.VERSION_11
|
||||
targetCompatibility = JavaVersion.VERSION_11
|
||||
}
|
||||
buildFeatures {
|
||||
compose = true
|
||||
}
|
||||
kotlinOptions {
|
||||
jvmTarget = "1.8"
|
||||
jvmTarget = "11"
|
||||
}
|
||||
lint {
|
||||
disable += listOf("AndroidGradlePluginVersion", "GradleDependency")
|
||||
|
|
Loading…
Reference in a new issue