issue-380-ui-improvement

core/data/src/androidMain/kotlin/zed/rainxch/core/data/local/db/initDatabase.kt

@@ -10,6 +10,7 @@ import zed.rainxch.core.data.local.db.migrations.MIGRATION_4_5
 import zed.rainxch.core.data.local.db.migrations.MIGRATION_5_6
 import zed.rainxch.core.data.local.db.migrations.MIGRATION_6_7
 import zed.rainxch.core.data.local.db.migrations.MIGRATION_7_8
+import zed.rainxch.core.data.local.db.migrations.MIGRATION_8_9
 
 fun initDatabase(context: Context): AppDatabase {
     val appContext = context.applicationContext
@@ -27,5 +28,6 @@ fun initDatabase(context: Context): AppDatabase {
             MIGRATION_5_6,
             MIGRATION_6_7,
             MIGRATION_7_8,
+            MIGRATION_8_9,
         ).build()
 }

core/data/src/androidMain/kotlin/zed/rainxch/core/data/local/db/migrations/MIGRATION_8_9.kt

@@ -0,0 +1,13 @@
+package zed.rainxch.core.data.local.db.migrations
+
+import androidx.room.migration.Migration
+import androidx.sqlite.db.SupportSQLiteDatabase
+
+val MIGRATION_8_9 =
+    object : Migration(8, 9) {
+        override fun migrate(db: SupportSQLiteDatabase) {
+            db.execSQL(
+                "ALTER TABLE installed_apps ADD COLUMN latestReleasePublishedAt TEXT",
+            )
+        }
+    }

core/data/src/commonMain/kotlin/zed/rainxch/core/data/local/db/AppDatabase.kt

@@ -27,7 +27,7 @@ import zed.rainxch.core.data.local.db.entities.UpdateHistoryEntity
         SeenRepoEntity::class,
         SearchHistoryEntity::class,
     ],
-    version = 8,
+    version = 9,
     exportSchema = true,
 )
 abstract class AppDatabase : RoomDatabase() {

core/data/src/commonMain/kotlin/zed/rainxch/core/data/local/db/dao/InstalledAppDao.kt

@@ -52,7 +52,8 @@ interface InstalledAppDao {
         releaseNotes = :releaseNotes,
         lastCheckedAt = :timestamp,
         latestVersionName = :latestVersionName,
-        latestVersionCode = :latestVersionCode
+        latestVersionCode = :latestVersionCode,
+        latestReleasePublishedAt = :latestReleasePublishedAt
     WHERE packageName = :packageName
 """,
     )
@@ -67,6 +68,7 @@ interface InstalledAppDao {
         timestamp: Long,
         latestVersionName: String?,
         latestVersionCode: Long?,
+        latestReleasePublishedAt: String?,
     )
 
     @Query("UPDATE installed_apps SET includePreReleases = :enabled WHERE packageName = :packageName")

core/data/src/commonMain/kotlin/zed/rainxch/core/data/local/db/entities/InstalledAppEntity.kt

@@ -37,5 +37,6 @@ data class InstalledAppEntity(
     val installedVersionCode: Long = 0L,
     val latestVersionName: String? = null,
     val latestVersionCode: Long? = null,
+    val latestReleasePublishedAt: String? = null,
     val includePreReleases: Boolean = false,
 )

core/data/src/commonMain/kotlin/zed/rainxch/core/data/mappers/InstalledAppsMappers.kt

@@ -35,6 +35,7 @@ fun InstalledApp.toEntity(): InstalledAppEntity =
         installedVersionCode = installedVersionCode,
         latestVersionName = latestVersionName,
         latestVersionCode = latestVersionCode,
+        latestReleasePublishedAt = latestReleasePublishedAt,
         signingFingerprint = signingFingerprint,
         includePreReleases = includePreReleases,
     )
@@ -71,6 +72,7 @@ fun InstalledAppEntity.toDomain(): InstalledApp =
         installedVersionCode = installedVersionCode,
         latestVersionName = latestVersionName,
         latestVersionCode = latestVersionCode,
+        latestReleasePublishedAt = latestReleasePublishedAt,
         signingFingerprint = signingFingerprint,
         includePreReleases = includePreReleases,
     )

core/data/src/commonMain/kotlin/zed/rainxch/core/data/repository/InstalledAppsRepositoryImpl.kt

@@ -149,6 +149,7 @@ class InstalledAppsRepositoryImpl(
                     timestamp = System.currentTimeMillis(),
                     latestVersionName = latestRelease.tagName,
                     latestVersionCode = null,
+                    latestReleasePublishedAt = latestRelease.publishedAt,
                 )
 
                 return isUpdateAvailable

core/domain/src/commonMain/kotlin/zed/rainxch/core/domain/model/InstalledApp.kt

@@ -32,5 +32,6 @@ data class InstalledApp(
     val installedVersionCode: Long = 0L,
     val latestVersionName: String? = null,
     val latestVersionCode: Long? = null,
+    val latestReleasePublishedAt: String? = null,
     val includePreReleases: Boolean = false,
 )

core/presentation/src/commonMain/composeResources/values/strings.xml

@@ -20,6 +20,9 @@
     <!-- Apps feature - Search -->
     <string name="search_your_apps">Search your apps</string>
     <string name="no_apps_found">No apps found</string>
+    <string name="sort_apps">Sort apps</string>
+    <string name="sort_updates_first">Updates first</string>
+
 
     <!-- Apps feature - Actions -->
     <string name="update_all">Update All</string>
@@ -155,7 +158,7 @@
 
     <!-- Dialog -->
     <string name="warning">Warning!</string>
-    <string name="logout_confirmation">Are you sure you want to logout?</string>
+    <string name="logout_confirmation">Are you sure you want to log out?</string>
 
     <!-- Theme names -->
     <string name="theme_dynamic">Dynamic</string>
@@ -258,7 +261,7 @@
 
     <!-- External installer -->
     <string name="install_permission_unavailable">Install permission unavailable</string>
-    <string name="install_permission_blocked_message">The APK was downloaded successfully but this device doesn\'t allow direct installation. Would you like to open it with an external installer?</string>
+    <string name="install_permission_blocked_message">The APK was downloaded successfully but this device doesn't allow direct installation. Would you like to open it with an external installer?</string>
     <string name="open_with_external_installer">Open with external installer</string>
     <string name="external_installer_description">Use a third-party app to install the APK</string>
 
@@ -626,4 +629,4 @@
 
     <!-- Per-app pre-release toggle -->
     <string name="pre_releases">Pre-releases</string>
-</resources>
+</resources>

feature/apps/presentation/build.gradle.kts

@@ -19,6 +19,7 @@ kotlin {
                 implementation(libs.liquid)
 
                 implementation(libs.kotlinx.collections.immutable)
+                implementation(libs.kotlinx.datetime)
             }
         }
 

feature/apps/presentation/src/androidMain/kotlin/zed/rainxch/apps/presentation/components/InstalledAppIcon.android.kt

@@ -0,0 +1,47 @@
+package zed.rainxch.apps.presentation.components
+
+import android.content.pm.PackageManager.NameNotFoundException
+import androidx.compose.foundation.Image
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.remember
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.graphics.asImageBitmap
+import androidx.compose.ui.platform.LocalContext
+import androidx.core.graphics.drawable.toBitmap
+import org.jetbrains.compose.resources.painterResource
+import zed.rainxch.githubstore.core.presentation.res.Res
+import zed.rainxch.githubstore.core.presentation.res.app_icon
+
+@Composable
+actual fun InstalledAppIcon(
+    packageName: String,
+    appName: String,
+    modifier: Modifier,
+) {
+    val packageManager = LocalContext.current.packageManager
+    val iconBitmap =
+        remember(packageName, packageManager) {
+            try {
+                packageManager
+                    .getApplicationIcon(packageName)
+                    .toBitmap()
+                    .asImageBitmap()
+            } catch (_: NameNotFoundException) {
+                null
+            }
+        }
+
+    if (iconBitmap != null) {
+        Image(
+            bitmap = iconBitmap,
+            contentDescription = appName,
+            modifier = modifier,
+        )
+    } else {
+        Image(
+            painter = painterResource(Res.drawable.app_icon),
+            contentDescription = appName,
+            modifier = modifier,
+        )
+    }
+}

feature/apps/presentation/src/commonMain/kotlin/zed/rainxch/apps/presentation/AppsAction.kt

@@ -1,6 +1,7 @@
 package zed.rainxch.apps.presentation
 
 import zed.rainxch.apps.presentation.model.InstalledAppUi
+import zed.rainxch.apps.presentation.model.AppSortRule
 import zed.rainxch.apps.presentation.model.DeviceAppUi
 import zed.rainxch.apps.presentation.model.GithubAssetUi
 
@@ -12,6 +13,10 @@ sealed interface AppsAction {
         val query: String,
     ) : AppsAction
 
+    data class OnSortRuleSelected(
+        val sortRule: AppSortRule,
+    ) : AppsAction
+
     data class OnOpenApp(
         val app: InstalledAppUi,
     ) : AppsAction