refactor(upgrade): upgrade kotlin and compose and fix related issues

xetra11 · Feb 4, 2021 · 0404595 · 0404595
1 parent d652016
commit 0404595
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 13 deletions.
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -11,9 +11,9 @@ buildscript {
 }
 
 plugins {
-    kotlin("jvm") version "1.4.21"
+    kotlin("jvm") version "1.4.21-2"
     kotlin("plugin.serialization") version "1.4.21"
-    id("org.jetbrains.compose") version "0.3.0-build138"
+    id("org.jetbrains.compose") version "0.3.0-build142"
     id("org.jlleitschuh.gradle.ktlint") version "9.4.1"
     id("io.gitlab.arturbosch.detekt") version "1.15.0"
     id("com.palantir.git-version") version "0.12.3"

diff --git a/src/main/kotlin/com/github/xetra11/ck3workbench/app/AppInitializer.kt b/src/main/kotlin/com/github/xetra11/ck3workbench/app/AppInitializer.kt
@@ -5,7 +5,6 @@ import com.github.xetra11.ck3workbench.app.project.Project
 import com.github.xetra11.ck3workbench.app.project.ProjectManager
 import kotlinx.serialization.decodeFromString
 import kotlinx.serialization.json.Json
-import java.io.File
 import java.nio.file.Paths
 
 /**

diff --git a/src/main/kotlin/com/github/xetra11/ck3workbench/app/ui/WorkbenchPanel.kt b/src/main/kotlin/com/github/xetra11/ck3workbench/app/ui/WorkbenchPanel.kt
@@ -52,7 +52,7 @@ object WorkbenchPanel {
             boxModifier,
             contentAlignment = Alignment.Center,
         ) {
-            Image(squareImage, alpha = 0.2F)
+            Image(bitmap = squareImage, "", alpha = 0.2F)
         }
     }
 
@@ -62,8 +62,8 @@ object WorkbenchPanel {
             boxModifier.clickable(onClick = { ViewManager.changeView(ViewManager.View.DYNASTY_VIEW) }),
             contentAlignment = Alignment.Center,
         ) {
-            Image(squareImage)
-            Image(bloodImage, modifier = Modifier.fillMaxSize(0.7F))
+            Image(squareImage, "Background Square")
+            Image(bloodImage, "Blood Icon", modifier = Modifier.fillMaxSize(0.7F))
         }
     }
 
@@ -73,9 +73,9 @@ object WorkbenchPanel {
             boxModifier.clickable(onClick = { ViewManager.changeView(ViewManager.View.CHARACTER_CREATE_VIEW) }),
             contentAlignment = Alignment.Center,
         ) {
-            Image(squareImage)
-            Image(crownImage, modifier = Modifier.fillMaxSize(0.7F))
-            Image(plusIconImage, modifier = Modifier.fillMaxSize(0.4F).align(Alignment.BottomEnd))
+            Image(squareImage, "")
+            Image(crownImage, "", modifier = Modifier.fillMaxSize(0.7F))
+            Image(plusIconImage, "", modifier = Modifier.fillMaxSize(0.4F).align(Alignment.BottomEnd))
         }
     }
 
@@ -85,8 +85,8 @@ object WorkbenchPanel {
             boxModifier.clickable(onClick = { ViewManager.changeView(ViewManager.View.CHARACTER_VIEW) }),
             contentAlignment = Alignment.Center,
         ) {
-            Image(squareImage)
-            Image(crownImage, modifier = Modifier.fillMaxSize(0.7F))
+            Image(squareImage, "")
+            Image(crownImage, "", modifier = Modifier.fillMaxSize(0.7F))
         }
     }
 }
diff --git a/src/main/kotlin/com/github/xetra11/ck3workbench/module/character/SkillSelection.kt b/src/main/kotlin/com/github/xetra11/ck3workbench/module/character/SkillSelection.kt
@@ -61,7 +61,7 @@ class SkillSelection {
             horizontalAlignment = Alignment.CenterHorizontally
         ) {
             Box(contentAlignment = Alignment.Center) {
-                Image(modifier = Modifier.size(60.dp), bitmap = skillImage(skill))
+                Image(contentDescription = "", modifier = Modifier.size(60.dp), bitmap = skillImage(skill))
             }
             Row {
                 Text(modifier = Modifier.clickable { counter = if (counter <= 1) 0 else counter.minus(1) }, text = "<")

diff --git a/src/main/kotlin/com/github/xetra11/ck3workbench/module/character/TraitSelection.kt b/src/main/kotlin/com/github/xetra11/ck3workbench/module/character/TraitSelection.kt
@@ -343,8 +343,9 @@ class TraitSelection {
             contentAlignment = Alignment.Center,
         ) {
             Image(
+                contentDescription = "",
                 modifier = selectionModifier.size(70.dp, 70.dp),
-                bitmap = traitImage(leveledTrait, level)
+                bitmap = traitImage(leveledTrait, level),
             )
         }
     }
@@ -387,6 +388,7 @@ class TraitSelection {
         trait: Trait
     ) {
         Image(
+            contentDescription = "",
             modifier = selectionModifier,
             bitmap = traitImage(trait)
         )