Skip to content

armgit / ente

Public Imported from GitHub
0

πŸ’š End-to-end encrypted cloud for everything.

Migrate Ensu Android to Kotlin 2

Manav Rathibabc4f4c33f5
diff --git a/android/apps/ensu/app/build.gradle.kts b/android/apps/ensu/app/build.gradle.kts
index a5a460a90b..2a64702c59 100644
--- a/android/apps/ensu/app/build.gradle.kts
+++ b/android/apps/ensu/app/build.gradle.kts
@@ -1,9 +1,11 @@
import java.io.ByteArrayOutputStream
import java.util.Properties
+import org.jetbrains.kotlin.gradle.dsl.JvmTarget
plugins {
id("com.android.application")
id("org.jetbrains.kotlin.android")
+ id("org.jetbrains.kotlin.plugin.compose")
id("org.jetbrains.kotlin.plugin.serialization")
}
@@ -100,10 +102,6 @@ android {
compose = true
}
- composeOptions {
- kotlinCompilerExtensionVersion = "1.5.11"
- }
-
packaging {
resources {
excludes += "/META-INF/{AL2.0,LGPL2.1}"
@@ -122,9 +120,12 @@ android {
sourceCompatibility = JavaVersion.VERSION_17
targetCompatibility = JavaVersion.VERSION_17
}
+}
- kotlinOptions {
- jvmTarget = "17"
+kotlin {
+ compilerOptions {
+ jvmTarget.set(JvmTarget.JVM_17)
+ allWarningsAsErrors.set(true)
}
}
@@ -147,7 +148,6 @@ dependencies {
implementation("androidx.lifecycle:lifecycle-runtime-ktx:2.7.0")
implementation("androidx.lifecycle:lifecycle-viewmodel-compose:2.7.0")
implementation("androidx.navigation:navigation-compose:2.7.7")
- implementation("com.google.accompanist:accompanist-navigation-animation:0.34.0")
implementation(project(":rust"))
implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.8.0")
diff --git a/android/apps/ensu/app/src/main/java/io/ente/ensu/HomeNavigation.kt b/android/apps/ensu/app/src/main/java/io/ente/ensu/HomeNavigation.kt
index 55c514b07a..089995b98b 100644
--- a/android/apps/ensu/app/src/main/java/io/ente/ensu/HomeNavigation.kt
+++ b/android/apps/ensu/app/src/main/java/io/ente/ensu/HomeNavigation.kt
@@ -1,9 +1,6 @@
-@file:OptIn(ExperimentalAnimationApi::class)
-
package io.ente.ensu
import androidx.compose.animation.AnimatedContentTransitionScope
-import androidx.compose.animation.ExperimentalAnimationApi
import androidx.compose.animation.fadeIn
import androidx.compose.animation.fadeOut
import androidx.compose.animation.slideInHorizontally
@@ -23,8 +20,8 @@ import androidx.compose.runtime.getValue
import androidx.compose.ui.Modifier
import androidx.navigation.NavBackStackEntry
import androidx.navigation.NavHostController
-import com.google.accompanist.navigation.animation.AnimatedNavHost
-import com.google.accompanist.navigation.animation.composable
+import androidx.navigation.compose.NavHost
+import androidx.navigation.compose.composable
import io.ente.ensu.chat.ChatView
import io.ente.ensu.notes.NotesSettingsScreen
import io.ente.ensu.settings.AdvancedSettingsDataStore
@@ -108,7 +105,7 @@ internal fun HomeNavigation(
.fillMaxSize()
.padding(padding)
) {
- AnimatedNavHost(
+ NavHost(
navController = navController,
startDestination = HomeRoute.Chat,
modifier = Modifier.fillMaxSize()
diff --git a/android/apps/ensu/app/src/main/java/io/ente/ensu/HomeView.kt b/android/apps/ensu/app/src/main/java/io/ente/ensu/HomeView.kt
index 748db89e75..9ae0526913 100644
--- a/android/apps/ensu/app/src/main/java/io/ente/ensu/HomeView.kt
+++ b/android/apps/ensu/app/src/main/java/io/ente/ensu/HomeView.kt
@@ -1,7 +1,4 @@
-@file:OptIn(
- androidx.compose.animation.ExperimentalAnimationApi::class,
- androidx.compose.material3.ExperimentalMaterial3Api::class
-)
+@file:OptIn(androidx.compose.material3.ExperimentalMaterial3Api::class)
package io.ente.ensu
@@ -47,7 +44,7 @@ import androidx.core.content.FileProvider
import androidx.lifecycle.Lifecycle
import androidx.lifecycle.LifecycleEventObserver
import androidx.navigation.compose.currentBackStackEntryAsState
-import com.google.accompanist.navigation.animation.rememberAnimatedNavController
+import androidx.navigation.compose.rememberNavController
import io.ente.ensu.chat.SessionDrawer
import io.ente.ensu.components.ImageAttachmentPreviewDialog
import io.ente.ensu.components.NativeChoiceDialog
@@ -88,7 +85,7 @@ fun HomeView(
val drawerState = androidx.compose.material3.rememberDrawerState(DrawerValue.Closed)
val scope = rememberCoroutineScope()
val context = androidx.compose.ui.platform.LocalContext.current
- val navController = rememberAnimatedNavController()
+ val navController = rememberNavController()
val lifecycleOwner = LocalLifecycleOwner.current
val latestStore by rememberUpdatedState(store)
val navBackStackEntry by navController.currentBackStackEntryAsState()
diff --git a/android/apps/ensu/app/src/main/java/io/ente/ensu/chat/ChatStoreActions.kt b/android/apps/ensu/app/src/main/java/io/ente/ensu/chat/ChatStoreActions.kt
index b8be4da805..4d3b7e1fd3 100644
--- a/android/apps/ensu/app/src/main/java/io/ente/ensu/chat/ChatStoreActions.kt
+++ b/android/apps/ensu/app/src/main/java/io/ente/ensu/chat/ChatStoreActions.kt
@@ -441,7 +441,7 @@ internal class ChatStoreActions(
)
}
- if (sessionStillExists && currentSessionId != null) {
+ if (sessionStillExists) {
loadMessagesFromDb(currentSessionId)
rebuildChatState(currentSessionId)
}
@@ -639,12 +639,12 @@ internal class ChatStoreActions(
}
val useKnowledge = knowledgeHistorySelection?.wasTrimmed == false
val historySelection = if (useKnowledge) {
- knowledgeHistorySelection ?: normalHistorySelection
+ knowledgeHistorySelection
} else {
normalHistorySelection
}
- var activeCitations = if (useKnowledge) knowledgeContext?.sources.orEmpty() else emptyList()
- val systemPrompt = if (useKnowledge) candidateSystemPrompt ?: normalSystemPrompt else normalSystemPrompt
+ var activeCitations = if (useKnowledge) knowledgeContext.sources else emptyList()
+ val systemPrompt = if (useKnowledge) candidateSystemPrompt else normalSystemPrompt
val systemMessage = LlmMessage(
text = systemPrompt,
role = LlmMessageRole.System
diff --git a/android/apps/ensu/app/src/main/java/io/ente/ensu/chat/MarkdownRenderer.kt b/android/apps/ensu/app/src/main/java/io/ente/ensu/chat/MarkdownRenderer.kt
index 5664c89aaa..2b6ab642f4 100644
--- a/android/apps/ensu/app/src/main/java/io/ente/ensu/chat/MarkdownRenderer.kt
+++ b/android/apps/ensu/app/src/main/java/io/ente/ensu/chat/MarkdownRenderer.kt
@@ -20,7 +20,7 @@ import androidx.compose.foundation.layout.width
import androidx.compose.foundation.rememberScrollState
import androidx.compose.foundation.shape.RoundedCornerShape
import androidx.compose.foundation.text.selection.SelectionContainer
-import androidx.compose.material3.Divider
+import androidx.compose.material3.HorizontalDivider
import androidx.compose.material3.Icon
import androidx.compose.material3.IconButton
import androidx.compose.material3.Text
@@ -117,7 +117,7 @@ fun MarkdownView(
}
}
MarkdownBlock.Divider -> {
- Divider(color = EnsuColor.border())
+ HorizontalDivider(color = EnsuColor.border())
if (appendCursor) {
TrailingCursor()
}
diff --git a/android/apps/ensu/app/src/main/java/io/ente/ensu/platform/Haptics.kt b/android/apps/ensu/app/src/main/java/io/ente/ensu/platform/Haptics.kt
index 92df5e2d8e..a9ca97cd8d 100644
--- a/android/apps/ensu/app/src/main/java/io/ente/ensu/platform/Haptics.kt
+++ b/android/apps/ensu/app/src/main/java/io/ente/ensu/platform/Haptics.kt
@@ -92,6 +92,8 @@ class Haptics(
private fun isHapticsEnabled(context: Context): Boolean {
return try {
+ // The manual vibration fallback must honor the system haptics setting.
+ @Suppress("DEPRECATION")
Settings.System.getInt(context.contentResolver, Settings.System.HAPTIC_FEEDBACK_ENABLED, 1) == 1
} catch (_: Throwable) {
true
diff --git a/android/apps/ensu/app/src/main/java/io/ente/ensu/platform/SystemBars.kt b/android/apps/ensu/app/src/main/java/io/ente/ensu/platform/SystemBars.kt
index e0f625a293..af16915870 100644
--- a/android/apps/ensu/app/src/main/java/io/ente/ensu/platform/SystemBars.kt
+++ b/android/apps/ensu/app/src/main/java/io/ente/ensu/platform/SystemBars.kt
@@ -14,6 +14,8 @@ fun ApplySystemBars(backgroundColor: Color) {
val view = LocalView.current
val isDark = isSystemInDarkTheme()
+ // These setters still control bar colors on older Android versions.
+ @Suppress("DEPRECATION")
SideEffect {
val window = (view.context as Activity).window
window.statusBarColor = backgroundColor.toArgb()
diff --git a/android/apps/ensu/build.gradle.kts b/android/apps/ensu/build.gradle.kts
index bf1cdb8b92..6c1cc7be57 100644
--- a/android/apps/ensu/build.gradle.kts
+++ b/android/apps/ensu/build.gradle.kts
@@ -1,7 +1,8 @@
plugins {
id("com.android.application") version "8.10.1" apply false
id("com.android.library") version "8.10.1" apply false
- id("org.jetbrains.kotlin.android") version "1.9.23" apply false
- id("org.jetbrains.kotlin.jvm") version "1.9.23" apply false
- id("org.jetbrains.kotlin.plugin.serialization") version "1.9.23" apply false
+ id("org.jetbrains.kotlin.android") version "2.4.20" apply false
+ id("org.jetbrains.kotlin.jvm") version "2.4.20" apply false
+ id("org.jetbrains.kotlin.plugin.compose") version "2.4.20" apply false
+ id("org.jetbrains.kotlin.plugin.serialization") version "2.4.20" apply false
}
diff --git a/android/apps/ensu/rust/build.gradle.kts b/android/apps/ensu/rust/build.gradle.kts
index 3cdbeca65c..2e0ab0c8f4 100644
--- a/android/apps/ensu/rust/build.gradle.kts
+++ b/android/apps/ensu/rust/build.gradle.kts
@@ -1,4 +1,5 @@
import java.io.ByteArrayOutputStream
+import org.jetbrains.kotlin.gradle.dsl.JvmTarget
plugins {
id("com.android.library")
@@ -115,9 +116,14 @@ android {
sourceCompatibility = JavaVersion.VERSION_17
targetCompatibility = JavaVersion.VERSION_17
}
+}
- kotlinOptions {
- jvmTarget = "17"
+kotlin {
+ compilerOptions {
+ jvmTarget.set(JvmTarget.JVM_17)
+ allWarningsAsErrors.set(true)
+ // TODO: Remove when UniFFI releases https://github.com/mozilla/uniffi-rs/pull/2949.
+ freeCompilerArgs.add("-Xwarning-level=UNUSED_EXPRESSION:warning")
}
}