Two emergency-patch UX fixes on the New/Edit screen: 1. Title left-aligned against the back arrow. NoteEditorScreen used CenterAlignedTopAppBar, but with six actions on the right (camera, attach, tag, favourite, save, more) the visually-centred title landed right next to the action cluster. Swap for Material 3's standard TopAppBar so 'New' / 'Edit' sits flush right of the back arrow on the left. 2. Colour chooser is now equally spaced between the title bar and the top of the note. The picker Row had padding(vertical = 4.dp) (4dp above + 4dp below), but the OutlinedTextField below has an intrinsic top inset (~16dp) inside its border, so the perceived gap from the picker to the first line of the note dwarfed the gap from the title bar's bottom to the picker's top. Remove the vertical = 4.dp and bracket the Row with two explicit Spacer(Modifier.height(12.dp)) siblings so the picker sits 12dp from the title bar AND 12dp from the field's top border. versionCode 27 → 28 versionName 0.3.6.0 → 0.3.6.1 APP_VERSION 0.3.6.0 → 0.3.6.1
177 lines
6.6 KiB
Kotlin
177 lines
6.6 KiB
Kotlin
// :app — Android application entry point. Hosts MainActivity and the
|
|
// application manifest, including the launcher icon and theme.
|
|
//
|
|
// Version scheme (v0.3.0.0 onwards):
|
|
// versionName = "MAJOR.MINOR.MAINTENANCE.EMERGENCY"
|
|
// - MAJOR: large breaking redesigns (rare in v0.x)
|
|
// - MINOR: normal feature releases
|
|
// - MAINTENANCE: bug fixes / refactors on a given MINOR
|
|
// - EMERGENCY: 0 in normal releases; non-zero only for hotfixes
|
|
// shipped out-of-band (e.g. v0.2.0.1 — search-icon fix)
|
|
// versionCode: monotonic int. Always +1 per release.
|
|
//
|
|
// The validator below fails the build if versionName doesn't match the
|
|
// required dotted format, so we can't regress the scheme by accident.
|
|
import java.util.Properties
|
|
|
|
plugins {
|
|
alias(libs.plugins.androidApplication)
|
|
alias(libs.plugins.kotlinAndroid)
|
|
alias(libs.plugins.kotlinCompose)
|
|
}
|
|
|
|
android {
|
|
namespace = "org.incido.app"
|
|
compileSdk = 35
|
|
|
|
defaultConfig {
|
|
applicationId = "org.incido.app"
|
|
minSdk = 26
|
|
targetSdk = 35
|
|
// v0.3.6.1: Emergency hotfix — editor screen UX.
|
|
// - Title in the editor's top bar now sits against the back
|
|
// arrow on the LEFT (was centred and crowding the six
|
|
// right-side action buttons).
|
|
// - Note colour chooser is now equally spaced between the
|
|
// title bar and the top edge of the note content (was
|
|
// dwarfed by the OutlinedTextField's intrinsic top inset,
|
|
// making the lower gap appear far larger).
|
|
// versionCode monotonic +1 from v0.3.6.0 (27).
|
|
versionCode = 28
|
|
versionName = "0.3.6.1"
|
|
}
|
|
|
|
// --- Signing ---
|
|
signingConfigs {
|
|
create("release") {
|
|
val keystoreFilePath = rootProject.file("keystore/release.jks")
|
|
if (keystoreFilePath.exists()) {
|
|
storeFile = keystoreFilePath
|
|
storePassword = "incido_dev_keystore"
|
|
keyAlias = "incido"
|
|
keyPassword = "incido_dev_keystore"
|
|
}
|
|
}
|
|
}
|
|
|
|
buildTypes {
|
|
debug {
|
|
isMinifyEnabled = false
|
|
}
|
|
release {
|
|
isMinifyEnabled = false // TODO(v0.3.0.0+): enable R8
|
|
signingConfig = signingConfigs.getByName("release")
|
|
}
|
|
}
|
|
|
|
buildFeatures {
|
|
compose = true
|
|
}
|
|
|
|
compileOptions {
|
|
sourceCompatibility = JavaVersion.VERSION_17
|
|
targetCompatibility = JavaVersion.VERSION_17
|
|
}
|
|
|
|
kotlin {
|
|
jvmToolchain(17)
|
|
}
|
|
|
|
packaging {
|
|
resources {
|
|
excludes += "/META-INF/{AL2.0,LGPL2.1}"
|
|
}
|
|
}
|
|
}
|
|
|
|
// v0.3.6.0: ship version-stamped APKs at the repo root for every
|
|
// release (e.g. `incido-0.3.6.0-debug.apk`, `incido-0.3.6.0.apk`).
|
|
// See Incido Development Plan §11 for the full release build
|
|
// procedure.
|
|
//
|
|
// Rather than mutating each variant's `outputFileName` (which trips over
|
|
// Kotlin/Gradle DSL overload ambiguities in AGP 8.x — the legacy
|
|
// `applicationVariants.outputs.all { ... }` lambda resolution clashes
|
|
// with `Iterable<T>.all(predicate: (T) -> Boolean)` and the modern
|
|
// `androidComponents.onVariants` API doesn't expose `outputFileName` as
|
|
// a settable property on its outputs), we just register a copy task
|
|
// that runs after both `assembleDebug` and `assembleRelease` and drops
|
|
// the built APKs at the project root with the right names.
|
|
//
|
|
// `copyReleaseApks` is registered as a `dependsOn` of `assembleRelease`
|
|
// so `./gradlew assembleRelease` is enough to get both files at the
|
|
// repo root in one command.
|
|
val copyReleaseApks = tasks.register("copyReleaseApks") {
|
|
group = "build"
|
|
description = "Copies debug + release APKs to the repo root, " +
|
|
"stamped with the current versionName " +
|
|
"(e.g. incido-0.3.6.0-debug.apk, incido-0.3.6.0.apk). " +
|
|
"See Incido Development Plan §11."
|
|
dependsOn("assembleDebug", "assembleRelease")
|
|
doLast {
|
|
val versionName = android.defaultConfig.versionName
|
|
val rootDir = rootProject.projectDir
|
|
val debugSrc = file("$buildDir/outputs/apk/debug/app-debug.apk")
|
|
val releaseSrc = file("$buildDir/outputs/apk/release/app-release.apk")
|
|
val debugDest = file("$rootDir/incido-${versionName}-debug.apk")
|
|
val releaseDest = file("$rootDir/incido-${versionName}.apk")
|
|
if (debugSrc.exists()) {
|
|
debugSrc.copyTo(debugDest, overwrite = true)
|
|
logger.lifecycle("Copied: ${debugDest.absolutePath}")
|
|
} else {
|
|
logger.warn("Debug APK not found at ${debugSrc.absolutePath}")
|
|
}
|
|
if (releaseSrc.exists()) {
|
|
releaseSrc.copyTo(releaseDest, overwrite = true)
|
|
logger.lifecycle("Copied: ${releaseDest.absolutePath}")
|
|
} else {
|
|
logger.warn("Release APK not found at ${releaseSrc.absolutePath}")
|
|
}
|
|
}
|
|
}
|
|
|
|
// Make `assembleRelease` finalize with `copyReleaseApks` so a single
|
|
// `./gradlew assembleRelease` produces both root-level APKs. Using
|
|
// `finalizedBy` (not `dependsOn`) avoids a circular dependency:
|
|
// `copyReleaseApks` already `dependsOn` `assembleRelease`.
|
|
afterEvaluate {
|
|
tasks.findByName("assembleRelease")?.finalizedBy(copyReleaseApks)
|
|
}
|
|
|
|
dependencies {
|
|
implementation(project(":composeApp"))
|
|
// v0.3.1.0: MainActivity needs the NoteRepository type to hand it
|
|
// through to IncidoApp (used by the editor's full-screen image
|
|
// viewer + the list card thumbnails). It's the *interface* in
|
|
// :core:domain, not the impl, so this stays clean of ObjectBox.
|
|
implementation(project(":core:domain"))
|
|
implementation(libs.androidx.core.ktx)
|
|
implementation(libs.kotlinx.coroutines.android)
|
|
// v0.3.2.0: MainActivity now extends FragmentActivity so the
|
|
// BiometricPrompt has a Fragment-based host.
|
|
implementation(libs.androidx.fragment.ktx)
|
|
|
|
val composeBom = platform(libs.composeBom)
|
|
implementation(composeBom)
|
|
|
|
implementation(libs.androidx.activity.compose)
|
|
implementation(libs.compose.ui)
|
|
implementation(libs.compose.material3)
|
|
}
|
|
|
|
// --- Version-name scheme validator ---
|
|
//
|
|
// MAJOR.MINOR.MAINTENANCE.EMERGENCY — exactly four dotted integers.
|
|
// Fails fast so we can't accidentally publish a "0.3" again.
|
|
val versionScheme = Regex("""^\d+\.\d+\.\d+\.\d+$""")
|
|
|
|
gradle.taskGraph.whenReady {
|
|
val vn = android.defaultConfig.versionName
|
|
if (vn != null && !versionScheme.matches(vn)) {
|
|
throw GradleException(
|
|
"app versionName = \"$vn\" doesn't match the required " +
|
|
"MAJOR.MINOR.MAINTENANCE.EMERGENCY scheme (e.g. 0.3.0.0). " +
|
|
"Update app/build.gradle.kts."
|
|
)
|
|
}
|
|
} |