Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[![CI-MASTER](https://github.com/jarroyoesp/ComposeMultiplatformApp/actions/workflows/ci.yml/badge.svg?branch=master)](https://github.com/jarroyoesp/ComposeMultiplatformApp/actions/workflows/ci.yml)
[![Latest release](https://img.shields.io/github/v/release/JetBrains/compose-multiplatform?color=blue&label=Compose%20multiplatform)](https://github.com/JetBrains/compose-multiplatform/releases/tag/v1.10.1)
![Kotlin Version](https://img.shields.io/badge/Kotlin-2.3.20-blue?logo=kotlin&logoColor=white)
[![Latest release](https://img.shields.io/github/v/release/JetBrains/compose-multiplatform?color=blue&label=Compose%20multiplatform)](https://github.com/JetBrains/compose-multiplatform/releases/tag/v1.10.3)
![Kotlin Version](https://img.shields.io/badge/Kotlin-2.3.21-blue?logo=kotlin&logoColor=white)
<div align="center">
<img alt="Compose multiplatform charts" src="./screenshots/compose_multiplatform_logo.png"/>
<h1>🚀 Example project to show SpaceX data built with Kotlin Multiplatform and Compose UI Multiplatform</h1>
Expand Down

Large diffs are not rendered by default.

1,489 changes: 744 additions & 745 deletions app/versions/dependencies/debugRuntimeClasspathDependencies.txt

Large diffs are not rendered by default.

1,539 changes: 769 additions & 770 deletions app/versions/dependencies/debugUnitTestRuntimeClasspathDependencies.txt

Large diffs are not rendered by default.

1,352 changes: 675 additions & 677 deletions app/versions/dependencies/releaseRuntimeClasspathDependencies.txt

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
Expand Up @@ -146,13 +146,6 @@
android:exported="false"
android:theme="@android:style/Theme.Translucent.NoTitleBar" />

<uses-library
android:name="androidx.window.extensions"
android:required="false" />
<uses-library
android:name="androidx.window.sidecar"
android:required="false" />

<provider
android:name="androidx.startup.InitializationProvider"
android:authorities="com.jarroyo.composeapp.debug.androidx-startup"
Expand All @@ -170,6 +163,14 @@
android:name="androidx.profileinstaller.ProfileInstallerInitializer"
android:value="androidx.startup" />
</provider>

<uses-library
android:name="androidx.window.extensions"
android:required="false" />
<uses-library
android:name="androidx.window.sidecar"
android:required="false" />

<provider
android:name="com.google.firebase.provider.FirebaseInitProvider"
android:authorities="com.jarroyo.composeapp.debug.firebaseinitprovider"
Expand All @@ -181,13 +182,13 @@
android:name="com.google.android.gms.version"
android:value="@integer/google_play_services_version" />

<activity
android:name="androidx.compose.ui.tooling.PreviewActivity"
android:exported="true" />
<activity
android:name="androidx.activity.ComponentActivity"
android:exported="true"
android:theme="@android:style/Theme.Material.Light.NoActionBar" />
<activity
android:name="androidx.compose.ui.tooling.PreviewActivity"
android:exported="true" />

<provider
android:name="leakcanary.internal.LeakCanaryFileProvider"
Expand Down
27 changes: 13 additions & 14 deletions gradle/libs.versions.toml
Original file line number Diff line number Diff line change
Expand Up @@ -5,34 +5,33 @@
aboutlibraries = "13.2.1"
agp = "9.0.1"
androidCompileSdk = "36"
androidx-compose = "1.10.5"
apollo = "4.4.2"
androidx-compose = "1.11.0"
apollo = "4.4.3"
coil3 = "3.4.0"
coroutines = "1.10.2"
detekt = "1.23.8"
diktat = "1.2.5"
firebase-bom = "34.10.0"
firebase-bom = "34.12.0"
gitlive = "2.4.0"
gradle = "8.1.1"
jetbrains-lifecycle = "2.10.0"
jetbrains-navigation = "2.9.2"
koin = "4.2.0"
koin-ksp = "4.2.0"
kotlin = "2.3.20"
kotlinpoet = "2.2.0"
koin = "4.2.1"
koin-ksp = "4.2.1"
kotlin = "2.3.21"
kotlinpoet = "2.3.0"
kotlin-multiplatform = "1.10.3"
kotlin-result = "2.3.1"
kotlinx-datetime = "0.7.1"
ksp = "2.3.5"
ktlint = "0.43.0"
ktor = "3.4.1"
ktor = "3.4.3"
material3 = "1.9.0"
mockk = "1.14.9"
okhttp = "4.12.0"
prettier = "2.7.1"
sqlDelight = "2.3.2"
junitVersion = "1.3.0"
kotlinVersion = "2.3.20"

[libraries]
androidx-activity-compose = { module = "androidx.activity:activity-compose", version = "1.13.0" }
Expand All @@ -49,7 +48,7 @@ apollo-adapters = { module = "com.apollographql.apollo:apollo-adapters", version
apollo-cache = { module = "com.apollographql.apollo:apollo-normalized-cache", version.ref = "apollo" }
apollo-cache-sqlite = { module = "com.apollographql.apollo:apollo-normalized-cache-sqlite", version.ref = "apollo" }
apollo-testing-support = { module = "com.apollographql.apollo:apollo-testing-support", version.ref = "apollo" }
calendar = { module = "com.kizitonwose.calendar:compose-multiplatform", version = "2.10.0" }
calendar = { module = "com.kizitonwose.calendar:compose-multiplatform", version = "2.10.1" }
composemultiplatformcharts = { module = "io.github.koalaplot:koalaplot-core", version = "0.11.0" }
composemultiplatformcharts2 = { module = "io.github.thechance101:chart", version = "Beta-0.0.5" }
coil-compose = { module = "io.coil-kt.coil3:coil-compose", version.ref = "coil3" }
Expand Down Expand Up @@ -83,13 +82,13 @@ jetbrains-kotlin-stdlib = { module = "org.jetbrains.kotlin:kotlin-stdlib-jdk8",
jetbrains-kotlin-test = { module = "org.jetbrains.kotlin:kotlin-test", version.ref = "kotlin" }
jetbrains-kotlin-test-junit = { module = "org.jetbrains.kotlin:kotlin-test-junit", version.ref = "kotlin" }
jetbrains-kotlinx-collections-immutable = { module = "org.jetbrains.kotlinx:kotlinx-collections-immutable", version = "0.4.0" }
jetbrains-kotlinx-serialization = { module = "org.jetbrains.kotlinx:kotlinx-serialization-json", version = "1.10.0" }
jetbrains-kotlinx-serialization = { module = "org.jetbrains.kotlinx:kotlinx-serialization-json", version = "1.11.0" }
jetbrains-lifecycle-runtime-compose = { module = "org.jetbrains.androidx.lifecycle:lifecycle-runtime-compose", version.ref = "jetbrains-lifecycle" }
jetbrains-lifecycle-viewmodel = { module = "org.jetbrains.androidx.lifecycle:lifecycle-viewmodel", version.ref = "jetbrains-lifecycle" }
jetbrains-lifecycle-viewmodel-compose = { module = "org.jetbrains.androidx.lifecycle:lifecycle-viewmodel-compose", version.ref = "jetbrains-lifecycle" }
jetbrains-navigation-compose = { module = "org.jetbrains.androidx.navigation:navigation-compose", version.ref = "jetbrains-navigation" }
junit = { module = "junit:junit", version = "4.13.2" }
koin-android = {module = "io.insert-koin:koin-android", version = "4.2.0"}
koin-android = {module = "io.insert-koin:koin-android", version = "4.2.1"}
koin-annotations = {module = "io.insert-koin:koin-annotations", version.ref = "koin-ksp"}
koin-compose-viewmodel = {module = "io.insert-koin:koin-compose-viewmodel", version.ref = "koin"}
koin-compiler = {module = "io.insert-koin:koin-ksp-compiler", version = "koin-ksp"}
Expand Down Expand Up @@ -125,7 +124,7 @@ timber = { module = "com.jakewharton.timber:timber", version = "5.0.1" }
plugin-aboutlibraries = { module = "com.mikepenz.aboutlibraries.plugin:aboutlibraries-plugin", version.ref = "aboutlibraries" }
plugin-android-gradle = { module = "com.android.tools.build:gradle", version.ref = "agp" }
plugin-androidcachefix = { module = "gradle.plugin.org.gradle.android:android-cache-fix-gradle-plugin", version = "3.0.3" }
plugin-appversioning = { module = "io.github.reactivecircus.appversioning:app-versioning-gradle-plugin", version = "1.5.0" }
plugin-appversioning = { module = "io.github.reactivecircus.appversioning:app-versioning-gradle-plugin", version = "1.6.0" }
plugin-compose-compiler = { module = "org.jetbrains.kotlin:compose-compiler-gradle-plugin", version.ref = "kotlin" }
plugin-detekt = { module = "io.gitlab.arturbosch.detekt:detekt-gradle-plugin", version.ref = "detekt" }
plugin-easylauncher = { module = "com.project.starter:easylauncher", version = "6.4.1" }
Expand All @@ -151,4 +150,4 @@ multiplatform = { id = "org.jetbrains.compose", version.ref = "kotlin-multiplatf
sqldelight = { id = "app.cash.sqldelight", version.ref = "sqlDelight" }
tripletplay = { id = "com.github.triplet.play", version = "3.12.2" }
androidKmpLibrary = { id = "com.android.kotlin.multiplatform.library", version.ref = "agp" }
kotlin-android = { id = "org.jetbrains.kotlin.android", version.ref = "kotlinVersion" }
kotlin-android = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin" }
Binary file not shown.
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ import co.touchlab.kermit.Logger
import com.jarroyo.feature.electricity.ui.ElectricityContract.Effect
import com.jarroyo.feature.electricity.ui.ElectricityContract.Event
import com.jarroyo.feature.electricity.ui.ElectricityContract.State
import com.jarroyo.library.ui.shared.component.EmptyStateWithImage
import com.jarroyo.library.ui.shared.component.EmptyState
import com.jarroyo.library.ui.shared.component.LocalMainScaffoldPadding
import com.jarroyo.library.ui.shared.component.placeholder
import com.jarroyo.library.ui.shared.theme.Spacing
Expand Down Expand Up @@ -125,7 +125,7 @@ private fun ElectricityScreen(
Text(state.dateSelected.toString())
XYSamplePlot(state)
} else {
EmptyStateWithImage("Something was wrong getting Electricity data.")
EmptyState("Something was wrong getting Electricity data.")
}
}
}
Expand Down
Loading