diff --git a/.idea/misc.xml b/.idea/misc.xml index 0c12caf..2c03559 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -28,7 +28,7 @@ - + \ No newline at end of file diff --git a/app/desktop/rules.pro b/app/desktop/rules.pro index 26310c6..8f5979f 100644 --- a/app/desktop/rules.pro +++ b/app/desktop/rules.pro @@ -53,3 +53,6 @@ -keepclassmembers class <1>.<2> { <1>.<2>$Companion Companion; } + +# compose +-keep class androidx.compose.ui.text.platform.Platform { *; } diff --git a/app/desktop/uwp_helper/Cargo.lock b/app/desktop/uwp_helper/Cargo.lock index ecd54b2..d848869 100644 --- a/app/desktop/uwp_helper/Cargo.lock +++ b/app/desktop/uwp_helper/Cargo.lock @@ -2,6 +2,21 @@ # It is not intended for manual editing. version = 3 +[[package]] +name = "addr2line" +version = "0.20.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f4fa78e18c64fce05e902adecd7a5eed15a5e0a3439f7b0e169f0252214865e3" +dependencies = [ + "gimli", +] + +[[package]] +name = "adler" +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" + [[package]] name = "anstream" version = "0.3.2" @@ -57,6 +72,21 @@ version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" +[[package]] +name = "backtrace" +version = "0.3.68" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4319208da049c43661739c5fade2ba182f09d1dc2299b32298d3a31692b17e12" +dependencies = [ + "addr2line", + "cc", + "cfg-if", + "libc", + "miniz_oxide", + "object", + "rustc-demangle", +] + [[package]] name = "bitflags" version = "1.3.2" @@ -69,6 +99,12 @@ version = "1.0.79" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "50d30906286121d95be3d479533b458f87493b30a4b5f79a607db8f5d11aa91f" +[[package]] +name = "cfg-if" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" + [[package]] name = "clap" version = "4.3.8" @@ -138,6 +174,12 @@ dependencies = [ "libc", ] +[[package]] +name = "gimli" +version = "0.27.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b6c80984affa11d98d1b88b66ac8853f143217b399d3c74116778ff8fdb4ed2e" + [[package]] name = "heck" version = "0.4.1" @@ -194,6 +236,21 @@ version = "0.3.8" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ef53942eb7bf7ff43a617b3e2c1c4a5ecf5944a7c1bc12d7ee39bbb15e5c1519" +[[package]] +name = "memchr" +version = "2.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d" + +[[package]] +name = "miniz_oxide" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e7810e0be55b428ada41041c41f32c9f1a42817901b4ccf45fa3d4b6561e74c7" +dependencies = [ + "adler", +] + [[package]] name = "num_cpus" version = "1.15.0" @@ -204,6 +261,15 @@ dependencies = [ "libc", ] +[[package]] +name = "object" +version = "0.31.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8bda667d9f2b5051b8833f59f3bf748b28ef54f850f4fcb389a252aa383866d1" +dependencies = [ + "memchr", +] + [[package]] name = "once_cell" version = "1.18.0" @@ -234,6 +300,12 @@ dependencies = [ "proc-macro2", ] +[[package]] +name = "rustc-demangle" +version = "0.1.23" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d626bb9dae77e28219937af045c257c28bfd3f69333c512553507f5f9798cb76" + [[package]] name = "rustix" version = "0.37.20" @@ -267,15 +339,15 @@ dependencies = [ [[package]] name = "tokio" -version = "1.28.2" +version = "1.29.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "94d7b1cfd2aa4011f2de74c2c4c63665e27a71006b0a192dcd2710272e73dfa2" +checksum = "532826ff75199d5833b9d2c5fe410f29235e25704ee5f0ef599fb51c21f4a4da" dependencies = [ "autocfg", + "backtrace", "num_cpus", "pin-project-lite", "tokio-macros", - "windows-sys", ] [[package]] diff --git a/app/shared/src/commonMain/kotlin/components/SearchBar.kt b/app/shared/src/commonMain/kotlin/components/SearchBar.kt index 6a60061..b8a381f 100644 --- a/app/shared/src/commonMain/kotlin/components/SearchBar.kt +++ b/app/shared/src/commonMain/kotlin/components/SearchBar.kt @@ -179,8 +179,11 @@ private fun SearchField( placeholder = { Text(strings.searchExplainer) }, colors = OutlinedTextFieldDefaults.colors( focusedContainerColor = ColorScheme.searchBarColor, + unfocusedContainerColor = ColorScheme.searchBarColor, focusedPlaceholderColor = ColorScheme.secondaryContainer, + unfocusedPlaceholderColor = ColorScheme.secondaryContainer, focusedTextColor = ColorScheme.textColor, + unfocusedTextColor = ColorScheme.textColor, focusedBorderColor = ColorScheme.searchBarColor, disabledBorderColor = ColorScheme.searchBarColor, errorBorderColor = ColorScheme.searchBarColor, diff --git a/build.gradle.kts b/build.gradle.kts index 05e4124..9319190 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -9,7 +9,7 @@ plugins { allprojects { group = "dev.schlaubi.tonbrett" - version = "1.12.3" + version = "1.12.4" repositories { mavenCentral()