Merge pull request #1 from StarkDroid/update

Update 1.1.0

.gitignore

@@ -10,6 +10,8 @@ build/
 .idea/compiler.xml
 .idea/libraries/
 .idea/uiDesigner.xml
+.idea/gradle.xml
+.idea/misc.xml
 *.iws
 *.iml
 *.ipr

README.md

@@ -17,8 +17,8 @@ To know more, follow this [link](https://learn.microsoft.com/en-us/windows/packa
 
 ## Screenshots
 
-<img src="static/Screenshot-1.png" width="500" height="500">
-<img src="static/Screenshot-2.png" width="500" height="500">
+<img src="static/Lightmode.png" width="500" height="500">
+<img src="static/Darkmode.png" width="500" height="500">
 
 
 ## Run Locally
@@ -55,27 +55,29 @@ or you can simply visit the [release]() page to get the latest build
 
 - Light/dark mode toggle
 - List all the installed apps
+- Displays the number of apps
 - Shows installed version of the app
 - Shows available updates for an app
 - One click solution to disc cleanup
 - Search and filter among the list of apps
 - Ability to upgrade an app to its available update
 - Ability to uninstall an app
-
+- Dialog Loader popup 
 
 ## Roadmap
 
 - [ ] Bring support to linux with the help of apt commands
-- [ ] Improvements to UI with dialog popup loader
+- [x] Improvements to UI with dialog popup loader
 - [ ] Remove MS Store upgrades out of the upgrades list
 - [ ] Implement feature to be able to install apps available via winget
 - [ ] Do some packages list sanitation
 
+
 ## Tech Stack
 
 **Interface:** Kotlin Multi-Platform, Compose Views, Material3
 
 **Services:** Winget-CLI
 
-**Platform:** Windows
+**Platform:** Windows 10/11
 

build.gradle.kts

@@ -6,7 +6,7 @@ plugins {
 }
 
 group = "org.kugc.kmpwinget"
-version = "1.0-SNAPSHOT"
+version = "1.1.0"
 
 repositories {
     mavenCentral()
@@ -29,10 +29,14 @@ compose.desktop {
     application {
         mainClass = "MainKt"
 
+        run {
+            jvmArgs += listOf("-Dapp.version=${project.version}")
+        }
+
         nativeDistributions {
             targetFormats(TargetFormat.Msi)
             packageName = "kmp-winget"
-            packageVersion = "1.0.0"
+            packageVersion = project.version.toString()
             description = "Compose Multiplatform based windows app for winget GUI package manager"
             copyright = "© 2024 Trishiraj. All rights reserved."
             windows {

gradle.properties

@@ -1,4 +1,4 @@
 org.gradle.jvmargs=-Xmx2048m -Dfile.encoding=UTF-8
 kotlin.code.style=official
 kotlin.version=1.9.22
-compose.version=1.6.0
+compose.version=1.6.0

src/main/kotlin/model/Package.kt

@@ -5,4 +5,4 @@ data class Package(
     val name: String,
     val version: String,
     val availableVersion: String? = null
-)
+)

src/main/kotlin/theme/Color.kt

@@ -5,9 +5,11 @@ import androidx.compose.ui.graphics.Color
 object AppColors {
     val Light = ColorScheme(
         primary = Color(0xFF6200EE),
+        primaryVariant = Color(0xFF9F8FFF),
         secondary = Color(0xFF03DAC6),
-        background = Color(0xFFFFFFFF),
-        surface = Color(0xFFFFFFFF),
+        secondaryVariant = Color(0xFFFFFFFF),
+        background = Color(0xFFFCFCFD),
+        surface = Color(0xFFEEEEEE),
         error = Color(0xFFB00020),
         onPrimary = Color(0xFFFFFFFF),
         onSecondary = Color(0xFF000000),
@@ -16,24 +18,29 @@ object AppColors {
         onError = Color(0xFFFF8383),
     )
 
-    // Dark Theme Colors
     val Dark = ColorScheme(
         primary = Color(0xFF2E236C),
+        primaryVariant = Color(0xFF907ce5),
         secondary = Color(0xFFC8ACD6),
-        background = Color(0xFF9AA6B2),
-        surface = Color(0xFF222831),
+        secondaryVariant = Color(0xFFFFFFFF),
+        background = Color(0xFF0A0A0B),
+        surface = Color(0xFF141417),
         error = Color(0xFFCF6679),
         onPrimary = Color(0xFF000000),
         onSecondary = Color(0xFF000000),
-        onBackground = Color(0xFF000000),
+        onBackground = Color(0xFFFCFCFC),
         onSurface = Color(0xFFFFFFFF),
         onError = Color(0xFFFF8383),
     )
 
     // Define Custom Colors
-    val darkSwitchCheckedTrackColor = Color(0xFF16C47F)
-    val lightSwitchCheckedTrackColor = Color(0xFF54C392)
-    val diskManagerBackgroundColor = Color(0xFFffd65a)
+    val switchCheckedTrackColor = Color(0xFF16C47F)
+
     val headerWingetTextColorLight = Color(0xFF0A5EB0)
     val headerWingetTextColorDark = Color(0xFF0D92F4)
+
+    val upgradeAvailableLight = Color(0xFF10B981)
+    val upgradeAvailableDark = Color(0xFF34D399)
+
+    val deleteButton = Color(0xFFFF8383)
 }

src/main/kotlin/theme/ColorScheme.kt

@@ -4,13 +4,15 @@ import androidx.compose.ui.graphics.Color
 
 data class ColorScheme(
     val primary: Color,
+    val primaryVariant: Color,
     val secondary: Color,
+    val secondaryVariant: Color,
     val background: Color,
     val surface: Color,
     val error: Color,
     val onPrimary: Color,
     val onSecondary: Color,
     val onBackground: Color,
     val onSurface: Color,
-    val onError: Color
+    val onError: Color,
 )

src/main/kotlin/theme/Theme.kt

@@ -18,7 +18,9 @@ fun AppTheme(
     val colors = if (isDarkTheme) {
         darkColors(
             primary = AppColors.Dark.primary,
+            primaryVariant = AppColors.Dark.primaryVariant,
             secondary = AppColors.Dark.secondary,
+            secondaryVariant = AppColors.Dark.secondaryVariant,
             background = AppColors.Dark.background,
             surface = AppColors.Dark.surface,
             onPrimary = AppColors.Dark.onPrimary,
@@ -30,7 +32,9 @@ fun AppTheme(
     } else {
         lightColors(
             primary = AppColors.Light.primary,
+            primaryVariant = AppColors.Light.primaryVariant,
             secondary = AppColors.Light.secondary,
+            secondaryVariant = AppColors.Light.secondaryVariant,
             background = AppColors.Light.background,
             surface = AppColors.Light.surface,
             onPrimary = AppColors.Light.onPrimary,