From 79ff944bad4293f3ae4676377d75b32698936eee Mon Sep 17 00:00:00 2001
From: Syer10 <syer10@users.noreply.github.com>
Date: Fri, 1 Apr 2022 23:50:58 -0400
Subject: [PATCH] Minor cleanup and bugfixes

---
 .../kotlin/ca/gosyer/jui/android/ReaderActivity.kt     | 10 ++++------
 build.gradle.kts                                       |  6 +++---
 .../kotlin/ca/gosyer/jui/core/lang/JvmLocale.kt        |  2 +-
 3 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/android/src/main/kotlin/ca/gosyer/jui/android/ReaderActivity.kt b/android/src/main/kotlin/ca/gosyer/jui/android/ReaderActivity.kt
index 0b74e6bc..d4d5246f 100644
--- a/android/src/main/kotlin/ca/gosyer/jui/android/ReaderActivity.kt
+++ b/android/src/main/kotlin/ca/gosyer/jui/android/ReaderActivity.kt
@@ -13,7 +13,6 @@ import androidx.activity.compose.setContent
 import androidx.appcompat.app.AppCompatActivity
 import androidx.compose.runtime.CompositionLocalProvider
 import androidx.compose.ui.input.key.KeyEvent
-import androidx.compose.ui.input.key.NativeKeyEvent
 import androidx.compose.ui.input.key.key
 import androidx.lifecycle.lifecycleScope
 import ca.gosyer.jui.ui.base.theme.AppTheme
@@ -48,9 +47,7 @@ class ReaderActivity : AppCompatActivity() {
         }
 
         setContent {
-            CompositionLocalProvider(
-                *hooks
-            ) {
+            CompositionLocalProvider(*hooks) {
                 AppTheme {
                     ReaderMenu(
                         chapterIndex = chapterIndex,
@@ -64,8 +61,9 @@ class ReaderActivity : AppCompatActivity() {
     }
 
     override fun onKeyUp(keyCode: Int, event: android.view.KeyEvent?): Boolean {
-        event ?: super.onKeyUp(keyCode, event)
-        val composeKeyEvent = KeyEvent(event as NativeKeyEvent)
+        @Suppress("KotlinConstantConditions")
+        event ?: return super.onKeyUp(keyCode, event)
+        val composeKeyEvent = KeyEvent(event)
         lifecycleScope.launch {
             hotkeyFlow.emit(composeKeyEvent)
         }
diff --git a/build.gradle.kts b/build.gradle.kts
index 9dbd30d0..1e86e6e4 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -120,9 +120,9 @@ subprojects {
         }
     }
 
-    afterEvaluate {
-        plugins.withType<org.jetbrains.kotlin.gradle.plugin.KotlinMultiplatformPluginWrapper> {
-            configure<org.jetbrains.kotlin.gradle.dsl.KotlinMultiplatformExtension> {
+    plugins.withType<org.jetbrains.kotlin.gradle.plugin.KotlinMultiplatformPluginWrapper> {
+        configure<org.jetbrains.kotlin.gradle.dsl.KotlinMultiplatformExtension> {
+            afterEvaluate {
                 if (!Config.androidDev) {
                     sourceSets.addSrcDir("desktopMain", "src/jvmMain/kotlin")
                     sourceSets.addSrcDir("desktopTest", "src/jvmTest/kotlin")
diff --git a/core/src/jvmMain/kotlin/ca/gosyer/jui/core/lang/JvmLocale.kt b/core/src/jvmMain/kotlin/ca/gosyer/jui/core/lang/JvmLocale.kt
index 097499ac..c74c81e8 100644
--- a/core/src/jvmMain/kotlin/ca/gosyer/jui/core/lang/JvmLocale.kt
+++ b/core/src/jvmMain/kotlin/ca/gosyer/jui/core/lang/JvmLocale.kt
@@ -19,4 +19,4 @@ actual fun Locale.getDisplayLanguage(displayLocale: Locale): String = toPlatform
 actual fun Locale.getDisplayName(displayLocale: Locale): String = toPlatform()
     .getDisplayName(displayLocale.toPlatform())
 
-actual val Locale.displayName get() = toPlatform().displayName
+actual val Locale.displayName: String get() = toPlatform().displayName