Update changelog

I somehow missed this when migrating to compose and worse yet, didn't have any tests covering it. That's been remedied now so hopefully it continues to work well into the future

Closes #90

.forgejo/workflows/pull_request.yml

@@ -15,7 +15,7 @@ jobs:
         distribution: 'zulu'
         java-version: '17'
     - name: Validate Gradle Wrapper
-      uses: https://git.wbrawner.com/gradle/actions/wrapper-validation@v3
+      uses: https://git.wbrawner.com/gradle/actions/wrapper-validation@v4
   unit_tests:
     name: Run Unit Tests
     runs-on: ubuntu-latest
@@ -30,10 +30,10 @@ jobs:
           java-version: '17'
       - name: Setup Android SDK
         uses: https://git.wbrawner.com/android-actions/setup-android@v3
+      - name: Setup Gradle
+        uses: https://git.wbrawner.com/gradle/actions/setup-gradle@v4
       - name: Run unit tests
-        uses: https://git.wbrawner.com/gradle/actions/setup-gradle@v3
-        with:
-            arguments: check
+        run: ./gradlew check
       - name: Publish JUnit Results
         uses: actions/upload-artifact@v3
         if: always()
@@ -55,10 +55,10 @@ jobs:
           java-version: '17'
       - name: Setup Android SDK
         uses: https://git.wbrawner.com/android-actions/setup-android@v3
-      - name: Build with Gradle
-        uses: https://git.wbrawner.com/gradle/gradle-build-action@v2
-        with:
-          arguments: assemblePlayDebug assemblePlayDebugAndroidTest
+      - name: Setup Gradle
+        uses: https://git.wbrawner.com/gradle/actions/setup-gradle@v4
+      - name: Build APKs
+        run: ./gradlew assemblePlayDebug assemblePlayDebugAndroidTest
       - name: Grant execute permission for flank_auth.sh
         run: chmod +x flank_auth.sh
       - name: Add auth for flank
@@ -67,6 +67,4 @@ jobs:
         run: |
           ./flank_auth.sh
       - name: Run UI tests
-        uses: https://git.wbrawner.com/gradle/gradle-build-action@v2
-        with:
-          arguments: runFlank
+        run: ./gradlew runFlank

.github/workflows/android.yml

@@ -37,7 +37,7 @@ jobs:
           distribution: 'zulu'
           java-version: '17'
       - name: Run unit tests
-        uses: gradle/gradle-build-action@v2
+        uses: gradle/gradle-build-action@v3
         with:
             arguments: testPlayDebugUnitTest
       - name: Publish JUnit Results
@@ -61,7 +61,7 @@ jobs:
           distribution: 'zulu'
           java-version: '17'
       - name: Build with Gradle
-        uses: gradle/gradle-build-action@v2
+        uses: gradle/gradle-build-action@v3
         with:
           arguments: assemblePlayDebug assemblePlayDebugAndroidTest
       - name: Grant execute permission for flank_auth.sh
@@ -72,6 +72,6 @@ jobs:
         run: |
           ./flank_auth.sh
       - name: Run UI tests
-        uses: gradle/gradle-build-action@v2
+        uses: gradle/gradle-build-action@v3
         with:
           arguments: runFlank

app/build.gradle.kts

@@ -21,6 +21,7 @@ try {
     keystoreProperties["keyPassword"] = ""
     keystoreProperties["storeFile"] = File.createTempFile("temp", ".tmp").absolutePath
     keystoreProperties["storePassword"] = ""
+    keystoreProperties["publishCredentialsFile"] = ""
 }
 
 android {
@@ -37,18 +38,18 @@ 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"
         minSdk = libs.versions.minSdk.get().toInt()
         targetSdk = libs.versions.maxSdk.get().toInt()
-        versionCode = 44
-        versionName = "1.0.2"
+        versionCode = 45
+        versionName = "2024.10.0"
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
         testInstrumentationRunnerArguments["clearPackageData"] = "true"
         buildConfigField("boolean", "ENABLE_CUSTOM_CSS", "true")
@@ -98,7 +99,11 @@ android {
         }
     }
     lint {
-        disable += listOf("AndroidGradlePluginVersion", "GradleDependency")
+        disable += listOf(
+            "AndroidGradlePluginVersion",
+            "GradleDependency",
+            "ObsoleteLintCustomCheck"
+        )
         warningsAsErrors = true
     }
 }
@@ -108,6 +113,9 @@ play {
     enabled.set(false)
     track.set("production")
     defaultToAppBundles.set(true)
+    (keystoreProperties["publishCredentialsFile"] as? String)?.ifBlank { null }?.let {
+        serviceAccountCredentials.set(file(it))
+    }
 }
 
 dependencies {
@@ -154,7 +162,6 @@ dependencies {
     androidTestImplementation(libs.androidx.core)
     androidTestImplementation(libs.androidx.monitor)
     androidTestImplementation(libs.junit)
-    androidTestImplementation(libs.hamcrest.core)
     implementation(libs.androidx.activity.ktx)
     implementation(libs.androidx.activity.ktx)
     implementation(libs.androidx.animation.core)

app/src/androidTest/kotlin/com/wbrawner/simplemarkdown/MarkdownTests.kt

@@ -182,6 +182,29 @@ 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 {

app/src/main/AndroidManifest.xml

@@ -7,6 +7,7 @@
     <application
         android:name=".MarkdownApplication"
         android:allowBackup="true"
+        android:enableOnBackInvokedCallback="true"
         android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"
         android:resizeableActivity="true"
@@ -14,7 +15,7 @@
         android:supportsRtl="true"
         android:theme="@style/Theme.App.Starting"
         tools:ignore="AllowBackup"
-        tools:targetApi="n">
+        tools:targetApi="tiramisu">
         <activity android:name=".MainActivity"
             android:exported="true"
             android:label="@string/app_name_short">

app/src/main/java/com/wbrawner/simplemarkdown/MainActivity.kt

@@ -8,12 +8,11 @@ import androidx.annotation.StringRes
 import androidx.appcompat.app.AppCompatActivity
 import androidx.appcompat.app.AppCompatDelegate
 import androidx.compose.animation.AnimatedContentTransitionScope
-import androidx.compose.animation.EnterTransition
 import androidx.compose.animation.core.EaseIn
 import androidx.compose.animation.core.LinearEasing
 import androidx.compose.animation.core.tween
 import androidx.compose.animation.fadeIn
-import androidx.compose.animation.fadeOut
+import androidx.compose.animation.scaleOut
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.automirrored.filled.Help
 import androidx.compose.material.icons.filled.Edit
@@ -108,13 +107,9 @@ class MainActivity : AppCompatActivity(), ActivityCompat.OnRequestPermissionsRes
                             towards = AnimatedContentTransitionScope.SlideDirection.Start
                         )
                     },
-                    popEnterTransition = { EnterTransition.None },
+                    popEnterTransition = { fadeIn() },
                     popExitTransition = {
-                        fadeOut(
-                            animationSpec = tween(
-                                300, easing = LinearEasing
-                            )
-                        ) + slideOutOfContainer(
+                        scaleOut(targetScale = 0.9f) + slideOutOfContainer(
                             animationSpec = tween(300, easing = EaseIn),
                             towards = AnimatedContentTransitionScope.SlideDirection.End
                         )

app/src/main/java/com/wbrawner/simplemarkdown/MarkdownViewModel.kt

@@ -14,7 +14,6 @@ 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
@@ -50,9 +49,6 @@ 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)

app/src/main/java/com/wbrawner/simplemarkdown/ui/MainScreen.kt

@@ -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
@@ -62,6 +61,7 @@ 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
@@ -87,6 +87,10 @@ 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) {
@@ -327,7 +331,7 @@ private fun MainScreen(
 }
 
 @Composable
-@OptIn(ExperimentalFoundationApi::class, ExperimentalMaterial3Api::class)
+@OptIn(ExperimentalMaterial3Api::class)
 private fun TabbedMarkdownEditor(
     initialMarkdown: String,
     markdown: String,
@@ -349,7 +353,7 @@ private fun TabbedMarkdownEditor(
     }
     HorizontalPager(
         modifier = Modifier.fillMaxSize(1f), state = pagerState,
-        beyondBoundsPageCount = 1,
+        beyondViewportPageCount = 1,
         userScrollEnabled = !lockSwiping
     ) { page ->
         val keyboardController = LocalSoftwareKeyboardController.current

app/src/main/java/com/wbrawner/simplemarkdown/utility/Extensions.kt

@@ -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
@@ -41,3 +41,11 @@ 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
+    }

app/src/main/java/com/wbrawner/simplemarkdown/utility/PreferenceHelper.kt

@@ -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>
 }
 

app/src/play/play/release-notes/en-US/default.txt

@@ -0,0 +1,2 @@
+- Fix opening files from external apps
+- Update dependencies

app/src/play/play/release-notes/en-US/production.txt

@@ -1,5 +0,0 @@
-- 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

app/src/test/java/com/wbrawner/simplemarkdown/FakePreferenceHelper.kt

@@ -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>
 }

app/src/test/java/com/wbrawner/simplemarkdown/MarkdownViewModelTest.kt

@@ -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

buildSrc/src/main/kotlin/com/wbrawner/releasehelper/ChangelogTask.kt

@@ -2,25 +2,37 @@ package com.wbrawner.releasehelper
 
 import org.gradle.api.DefaultTask
 import org.gradle.api.file.RegularFileProperty
+import org.gradle.api.internal.provider.Providers
 import org.gradle.api.model.ObjectFactory
+import org.gradle.api.provider.Property
+import org.gradle.api.provider.ProviderFactory
+import org.gradle.api.tasks.Input
 import org.gradle.api.tasks.OutputFile
 import org.gradle.api.tasks.TaskAction
 import javax.inject.Inject
 
-private const val CHANGELOG_PATH = "src/play/play/release-notes/en-US/default.txt"
+private const val CHANGELOG_PATH = "src/play/play/release-notes/en-US/production.txt"
 
-abstract class ChangelogTask @Inject constructor(objectFactory: ObjectFactory) : DefaultTask() {
+abstract class ChangelogTask @Inject constructor(
+    objectFactory: ObjectFactory,
+    providers: ProviderFactory,
+) : DefaultTask() {
     @get:OutputFile
     val changelogFile: RegularFileProperty = objectFactory.fileProperty()
 
+    @get:Input
+    @Suppress("UnstableApiUsage")
+    val latestTag: String = providers.exec {
+        commandLine("git" , "describe", "--tags", "--abbrev=0")
+    }.standardOutput.asText.get()
+
     init {
         changelogFile.set(project.layout.projectDirectory.file(CHANGELOG_PATH))
     }
 
     @TaskAction
     fun execute() {
-        val latestTag = "git describe --tags --abbrev=0".execute()
-        val changelog = "git log --format=\"%B\" ${latestTag.first().trim()}..".execute()
+        val changelog = "git log --format=\"%B\" ${latestTag.trim()}..".execute()
         logger.info("Latest tag: $latestTag")
         logger.info("Changelog: ${changelog.joinToString("\n")}")
         changelogFile.get().asFile.writer().use { writer ->

core/build.gradle.kts

@@ -41,14 +41,18 @@ 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")
+        disable += listOf(
+            "AndroidGradlePluginVersion",
+            "GradleDependency",
+            "ObsoleteLintCustomCheck"
+        )
         warningsAsErrors = true
     }
 }

free/build.gradle.kts

@@ -27,14 +27,18 @@ 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")
+        disable += listOf(
+            "AndroidGradlePluginVersion",
+            "GradleDependency",
+            "ObsoleteLintCustomCheck"
+        )
         warningsAsErrors = true
     }
 }

gradle/libs.versions.toml

@@ -1,37 +1,34 @@
 [versions]
-acra = "5.11.4"
-activityKtx = "1.9.2"
-animationCore = "1.7.2"
+acra = "5.12.0"
+activityKtx = "1.9.3"
+animationCore = "1.7.5"
 appcompat = "1.7.0"
-billing = "7.1.0"
+billing = "7.1.1"
 browser = "1.8.0"
-commonMarkVersion = "0.23.0"
-composeBom = "2024.08.00"
+commonMarkVersion = "0.24.0"
+composeBom = "2024.10.01"
 core = "1.6.1"
-coreKtx = "1.13.1"
+coreKtx = "1.15.0"
 coreSplashscreen = "1.0.1"
 coroutines = "1.9.0"
-dependencyAnalysis = "2.1.0"
+dependencyAnalysis = "2.4.2"
 espressoVersion = "3.6.1"
 fladle = "0.17.5"
 googleServices = "4.4.2"
 firebaseCrashlyticsGradle = "3.0.2"
-androidGradlePlugin = "8.5.2"
-hamcrestCore = "1.3"
+androidGradlePlugin = "8.7.2"
 junit = "4.13.2"
-kotlin = "2.0.20"
-lifecycleViewmodelKtx = "2.8.6"
+kotlin = "2.0.21"
+lifecycleViewmodelKtx = "2.8.7"
 material = "1.12.0"
-material3WindowSizeClassAndroid = "1.3.0"
-materialIconsCore = "1.7.2"
+material3WindowSizeClassAndroid = "1.3.1"
+materialIconsCore = "1.7.5"
 maxSdk = "35"
 minSdk = "23"
 monitor = "1.7.2"
-navigationCommon = "2.7.7"
-navigationRuntimeKtx = "2.7.7"
-navigationVersion = "2.7.7"
-orchestrator = "1.5.0"
-play = "2.0.1"
+navigation = "2.8.3"
+orchestrator = "1.5.1"
+play = "2.0.2"
 preferenceKtx = "1.2.1"
 robolectric = "4.13"
 runner = "1.6.2"
@@ -65,9 +62,9 @@ androidx-material-icons-extended = { module = "androidx.compose.material:materia
 androidx-material3 = { module = "androidx.compose.material3:material3" }
 androidx-material3-windowsizeclass = { module = "androidx.compose.material3:material3-window-size-class-android", version.ref = "material3WindowSizeClassAndroid" }
 androidx-monitor = { module = "androidx.test:monitor", version.ref = "monitor" }
-androidx-navigation-common = { module = "androidx.navigation:navigation-common", version.ref = "navigationCommon" }
-androidx-navigation-compose = { module = "androidx.navigation:navigation-compose", version.ref = "navigationVersion" }
-androidx-navigation-runtime-ktx = { module = "androidx.navigation:navigation-runtime-ktx", version.ref = "navigationRuntimeKtx" }
+androidx-navigation-common = { module = "androidx.navigation:navigation-common", version.ref = "navigation" }
+androidx-navigation-compose = { module = "androidx.navigation:navigation-compose", version.ref = "navigation" }
+androidx-navigation-runtime-ktx = { module = "androidx.navigation:navigation-runtime-ktx", version.ref = "navigation" }
 androidx-orchestrator = { module = "androidx.test:orchestrator", version.ref = "orchestrator" }
 androidx-preference-ktx = { module = "androidx.preference:preference-ktx", version.ref = "preferenceKtx" }
 androidx-runner = { module = "androidx.test:runner", version.ref = "runner" }
@@ -92,7 +89,6 @@ commonmark-ext-yaml-front-matter = { module = "org.commonmark:commonmark-ext-yam
 compose-bom = { module = "androidx.compose:compose-bom", version.ref = "composeBom" }
 foundation = { module = "androidx.compose.foundation:foundation" }
 foundation-layout = { module = "androidx.compose.foundation:foundation-layout" }
-hamcrest-core = { module = "org.hamcrest:hamcrest-core", version.ref = "hamcrestCore" }
 junit = { module = "junit:junit", version.ref = "junit" }
 kotlinx-coroutines-android = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-android", version.ref = "coroutines" }
 kotlinx-coroutines-core = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-core", version.ref = "coroutines" }

keystore.properties.sample

@@ -2,3 +2,4 @@ storePassword=
 keyPassword=
 keyAlias=
 storeFile=
+publishCredentialsFile=

non-free/build.gradle.kts

@@ -24,17 +24,21 @@ 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")
+        disable += listOf(
+            "AndroidGradlePluginVersion",
+            "GradleDependency",
+            "ObsoleteLintCustomCheck"
+        )
         warningsAsErrors = true
     }
 }