version 1.1.0

build.gradle.kts

@@ -28,13 +28,19 @@ kotlin {
  dependencies {
  implementation(compose.desktop.currentOs)
  implementation(compose.materialIconsExtended)
+ implementation(compose.uiTooling)
+ // debugImplementation(compose.preview)
+
+ // kotlinx-coroutines-swing
+ implementation("org.jetbrains.kotlinx:kotlinx-coroutines-swing:1.5.2")
 
  // TODO: md3 migration
  // implementation(compose.material3)
  // define a BOM and its version
  implementation("com.squareup.okhttp3:okhttp:4.10.0")
  implementation("com.squareup.okhttp3:logging-interceptor:4.10.0")
  implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:1.4.1")
+ implementation("org.jmdns:jmdns:3.5.8")
  }
  }
  val jvmTest by getting
@@ -49,14 +55,17 @@ compose.desktop {
  modules("java.instrument", "java.prefs", "jdk.unsupported")
  targetFormats(TargetFormat.Dmg, TargetFormat.Msi, TargetFormat.Deb)
  packageName = "LifeUp Desktop"
- packageVersion = "1.0.2"
+ packageVersion = "1.1.0"
  macOS {
  iconFile.set(project.file("icon.icns"))
  }
  windows {
  iconFile.set(project.file("icon.ico"))
  dirChooser = true // enables customizing the installation path during installation
  // console = true
+ shortcut = true
+ perUserInstall = true
+ upgradeUuid = "6400cdde-3cb6-4bad-b238-70b02cc8d210"
  menuGroup = "LifeUp Desktop"
  }
  linux {

compose-desktop.pro

@@ -25,4 +25,12 @@
 }
 -keepclassmembers class <1>.<2> {
  <1>.<2>$Companion Companion;
-}
+}
+
+-dontwarn kotlinx.datetime.**
+-dontwarn org.slf4j.**
+-keep class org.slf4j.**{ *; }
+-keep class com.sun.jna.* { *; }
+-keep class * implements com.sun.jna.* { *; }
+
+-keep class org.jmdns.** { *; }

gradle.properties

@@ -1,4 +1,4 @@
 kotlin.code.style=official
-kotlin.version=1.7.20
+kotlin.version=1.8.20
 agp.version=7.3.0
-compose.version=1.3.0-rc05
+compose.version=1.4.0

src/jvmMain/kotlin/Main.kt

@@ -37,8 +37,10 @@ import ui.page.list.TasksScreen
 import ui.page.status.StatusScreen
 import ui.theme.AppTheme
 import ui.view.fakeDialog
+import java.awt.Toolkit
 import java.awt.event.WindowEvent
 import java.util.logging.Logger
+import javax.swing.UIManager
 import kotlin.system.exitProcess
 
 @ExperimentalUnitApi
@@ -180,22 +182,32 @@ fun main() {
  application(exitProcessOnExit = false) {
  // To fix the window crash issue: https://github.com/JetBrains/compose-jb/issues/610
  System.setProperty("skiko.renderApi", "OPENGL")
+ // get native dialog UI
+ UIManager.setLookAndFeel(UIManager.getSystemLookAndFeelClassName())
 
  CompositionLocalProvider(
  LocalWindowExceptionHandlerFactory provides WindowExceptionHandlerFactory { window ->
  WindowExceptionHandler {
  lastError = it
  window.dispatchEvent(WindowEvent(window, WindowEvent.WINDOW_CLOSING))
  // throw it
+ throw it
  }
  }
  ) {
+ // sum better window size
+ val screenSize = Toolkit.getDefaultToolkit().screenSize
+ val width = screenSize.width
+ val height = screenSize.height
+ val windowWidth = if (width > 1920) 1200 else 800
+ val windowHeight = if (height > 1080) 900 else 600
+
  Window(
  onCloseRequest = ::exitApplication,
  title = "LifeUp",
  state = rememberWindowState(
  position = WindowPosition(alignment = Alignment.Center),
- size = DpSize(1200.dp, 900.dp)
+ size = DpSize(windowWidth.dp, windowHeight.dp)
  ),
  icon = painterResource("icons/svg/icon.svg")
  ) {

src/jvmMain/kotlin/base/JsonSerializer.kt

@@ -4,4 +4,5 @@ import kotlinx.serialization.json.Json
 
 val json = Json {
  ignoreUnknownKeys = true
+ explicitNulls = false
 }

src/jvmMain/kotlin/base/Val.kt

@@ -1,10 +1,23 @@
 package base
 
 object Val {
- // FIXME: get version from gradle
- val version: String = "1.0.2"
+ val version: String
+  get() = System.getProperty("jpackage.app-version") ?: "UNKNOWN"
 
- val targetLifeUpCloudVersion = "1.1.2+"
+ val versionCode: Int by lazy {
+ val version = version.split(".")
+ assert(version.size == 3) { "Invalid version format" }
+ if (version.size != 3) {
+ return@lazy 0
+ }
+ val major = version[0].padStart(2, '0').toIntOrNull() ?: 0
+ val minor = version[1].padStart(2, '0').toIntOrNull() ?: 0
+ val patch = version[2].padStart(2, '0').toIntOrNull() ?: 0
+ assert(major <= 99 && minor <= 99 && patch <= 99) { "Version number is too large" }
+ (major * 100000 + minor * 1000 + patch)
+ }
 
- val targetLifeUpAndroidVersion = "1.91.0+"
+ const val targetLifeUpCloudVersion = "1.3.0+"
+
+ const val targetLifeUpAndroidVersion = "1.91.3+"
 }

src/jvmMain/kotlin/datasource/ApiService.kt

@@ -2,6 +2,7 @@ package datasource
 
 import datasource.data.*
 import datasource.net.HttpResponse
+import kotlinx.serialization.json.JsonElement
 
 interface ApiService {
 
@@ -38,5 +39,10 @@ interface ApiService {
 
  suspend fun getInfo(): Info
 
+ suspend fun rawCall(api: String): JsonElement?
+
  suspend fun purchaseItem(id: Long?, price: Long, desc: String)
+
+ suspend fun checkUpdate(): ApiServiceImpl.LocalizedUpdateInfo?
+
 }

src/jvmMain/kotlin/datasource/ApiServiceImpl.kt

@@ -6,12 +6,15 @@ import datasource.data.*
 import datasource.net.HttpResponse
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.withContext
+import kotlinx.serialization.Serializable
 import kotlinx.serialization.decodeFromString
+import kotlinx.serialization.json.JsonElement
 import kotlinx.serialization.json.JsonObject
 import kotlinx.serialization.json.jsonPrimitive
 import kotlinx.serialization.json.long
 import okhttp3.HttpUrl.Companion.toHttpUrl
 import okhttp3.Request
+import java.util.*
 
 object ApiServiceImpl : ApiService {
 
@@ -130,6 +133,17 @@ object ApiServiceImpl : ApiService {
  }
  }
 
+ override suspend fun rawCall(api: String): JsonElement? {
+ return withContext(Dispatchers.IO) {
+ val url = (OkHttpClientHolder.host + "/api/contentprovider").toHttpUrl().newBuilder()
+ .addQueryParameter("url", api)
+ .build()
+ val request = Request.Builder().url(url).build()
+ val response = okHttpClient.newCall(request).execute()
+ json.decodeFromString<HttpResponse<JsonElement>>(response.body?.string() ?: "").successOrThrow()
+ }
+ }
+
  override fun getIconUrl(icon: String): String {
  if (icon.isEmpty()) {
  return ""
@@ -141,4 +155,57 @@ object ApiServiceImpl : ApiService {
  .build()
  return url.toString()
  }
+
+ @Serializable
+ data class UpdateInfoMap(
+ val versionCode: Int,
+ val downloadUrl: String?,
+ val localeInfo: Map<String, UpdateInfo>
+ )
+
+ @Serializable
+ data class UpdateInfo(
+ val versionName: String?,
+ val downloadUrl: String?,
+ val releaseNotes: String?,
+ val downloadWebsite: String?
+ )
+
+ data class LocalizedUpdateInfo(
+ val versionCode: Int,
+ val versionName: String?,
+ val downloadUrl: String?,
+ val releaseNotes: String?,
+ val downloadWebsite: String?
+ )
+
+ private const val UPDATE_URL = "http://cdn.lifeupapp.fun/version/version.json"
+
+
+ override suspend fun checkUpdate(): LocalizedUpdateInfo? {
+ return withContext(Dispatchers.IO) {
+ val request = Request.Builder().url(UPDATE_URL).build()
+ val response = okHttpClient.newCall(request).execute()
+ if (response.isSuccessful) {
+ val jsonText = response.body?.string()
+ jsonText?.let {
+ val updateInfo = json.decodeFromString<UpdateInfoMap>(it)
+ val locale = Locale.getDefault()
+ val bestMatchedUpdateInfo =
+ updateInfo.localeInfo["${locale.language.lowercase()}_${locale.country.lowercase()}"]
+ ?: updateInfo.localeInfo[locale.language.lowercase()] ?: updateInfo.localeInfo["en"]
+
+ return@let LocalizedUpdateInfo(
+ versionCode = updateInfo.versionCode,
+ downloadUrl = updateInfo.downloadUrl,
+ versionName = bestMatchedUpdateInfo?.versionName ?: "",
+ releaseNotes = bestMatchedUpdateInfo?.releaseNotes ?: "",
+ downloadWebsite = bestMatchedUpdateInfo?.downloadWebsite ?: ""
+ )
+ }
+ } else {
+ null
+ }
+ }
+ }
 }

src/jvmMain/kotlin/datasource/data/Achievement.kt

@@ -82,5 +82,14 @@ data class Achievement(
  fun builder(block: Builder.() -> Unit): Achievement {
  return Builder().apply(block).build()
  }
+
+ private const val TYPE_NORMAL = 0
+ private const val TYPE_SUBCATEGORY = 1
  }
+
+ fun isNormalAchievement() = type == TYPE_NORMAL
+
+ fun isSubcategory() = type == TYPE_SUBCATEGORY
+
+
 }

src/jvmMain/kotlin/datasource/data/TaskCategory.kt

@@ -49,6 +49,14 @@ data class TaskCategory(
  }
  }
 
+ fun isNormalList(): Boolean {
+ return (id ?: 0 > 0L) && type == 0
+ }
+
+ fun isNotArchived(): Boolean {
+ return status == 0
+ }
+
  companion object {
  fun builder(block: Builder.() -> Unit): TaskCategory {
  return Builder().apply(block).build()

src/jvmMain/kotlin/datasource/net/HttpResponse.kt

@@ -34,6 +34,14 @@ data class HttpResponse<T>(
  return data
  }
 
+
+ fun successOrThrow(): T? {
+ if (code != SUCCESS) {
+ throw HttpException(this)
+ }
+ return data
+ }
+
  fun onSuccess(block: (T?) -> Unit): HttpResponse<T> {
  if (code == SUCCESS) {
  block(data)

src/jvmMain/kotlin/service/MdnsServiceDiscovery.kt

@@ -0,0 +1,65 @@
+package service
+
+import logger
+import java.net.InetAddress
+import java.util.logging.Level
+import javax.jmdns.JmDNS
+import javax.jmdns.ServiceEvent
+import javax.jmdns.ServiceListener
+
+/**
+ * Service to discover the lifeup cloud server
+ */
+class MdnsServiceDiscovery {
+
+ data class IpAndPort(val ip: String, val port: String) {
+ override fun toString(): String {
+ return "$ip:$port"
+ }
+ }
+
+ val ipAndPorts = HashMap<String, IpAndPort?>()
+
+ private val listener = object : ServiceListener {
+ override fun serviceAdded(event: ServiceEvent?) {
+ logger.log(Level.INFO, "Service added: ${event?.info}")
+ }
+
+ override fun serviceRemoved(event: ServiceEvent?) {
+ logger.log(Level.INFO, "Service removed: ${event?.info}")
+ event?.info?.inetAddresses?.firstOrNull()?.hostAddress?.let {
+ ipAndPorts.remove(it)
+ }
+ }
+
+ override fun serviceResolved(event: ServiceEvent?) {
+ logger.log(Level.INFO, "Service resolved: ${event?.info}")
+ runCatching {
+ if (event?.name?.contains("lifeup_cloud") == true) {
+ logger.log(Level.INFO, "Service resolved, address: ${event.info.inetAddresses}")
+
+ val port = event.info.getPropertyString("port")
+ if (port.isNullOrEmpty()) {
+ logger.log(Level.INFO, "Service resolved, but data has not port")
+ return@runCatching
+ }
+
+ val ip = event.info.inetAddresses.first().hostAddress
+ logger.log(Level.INFO, "Service resolved, ip: $ip")
+ ipAndPorts[ip] = IpAndPort(ip, port)
+ }
+ }.onFailure {
+ it.printStackTrace()
+ }
+ }
+ }
+
+
+ fun register() = runCatching {
+ // Create a JmDNS instance
+ val jmdns = JmDNS.create(InetAddress.getLocalHost())
+
+ // Add a service listener
+ jmdns.addServiceListener("_lifeup._tcp.local.", listener)
+ }
+}