Skip to content

Update jetsnack to use new libraries #5139

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
eymar wants to merge 4 commits into
base: master
Choose a base branch
from
Open

Update jetsnack to use new libraries #5139

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
e96ab10
Update jetsnack to use new libraries
eymar Sep 16, 2024
151675c
upd 2
eymar Sep 16, 2024
9486a08
Update empty_state_search image
eymar Sep 17, 2024
9185b31
Use CM 1.7.0
eymar Oct 21, 2024
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
1 change: 1 addition & 0 deletions examples/jetsnack/android/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ repositories {
}

dependencies {
implementation(compose.components.resources)
Copy link
Member

@terrakok terrakok Oct 21, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

why do we need it here?

implementation(project(":common"))
implementation("androidx.activity:activity-compose:1.5.0")
}
Expand Down
19 changes: 1 addition & 18 deletions examples/jetsnack/android/src/main/java/com/example/android/MainActivity.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,30 +3,13 @@ package com.example.android
import android.os.Bundle
import androidx.activity.compose.setContent
import androidx.appcompat.app.AppCompatActivity
import androidx.compose.material.MaterialTheme
import androidx.compose.ui.text.font.Font
import androidx.compose.ui.text.font.FontFamily
import androidx.compose.ui.text.font.FontWeight
import com.example.jetsnack.R
import androidx.compose.material3.MaterialTheme
import com.example.jetsnack.ui.JetsnackApp
import com.example.jetsnack.ui.theme.Karla
import com.example.jetsnack.ui.theme.Montserrat

class MainActivity : AppCompatActivity() {
override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState)

Montserrat = FontFamily(
Font(R.font.montserrat_light, FontWeight.Light),
Font(R.font.montserrat_regular, FontWeight.Normal),
Font(R.font.montserrat_medium, FontWeight.Medium),
Font(R.font.montserrat_semibold, FontWeight.SemiBold)
)
Karla = FontFamily(
Font(R.font.karla_regular, FontWeight.Normal),
Font(R.font.karla_bold, FontWeight.Bold)
)

setContent {
MaterialTheme {
JetsnackApp()
Expand Down
17 changes: 10 additions & 7 deletions examples/jetsnack/common/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,14 +38,16 @@ kotlin {
dependencies {
api(compose.runtime)
api(compose.foundation)
api(compose.material)
api(compose.ui)
api(compose.material3)
implementation(libs.androidx.navigation.compose)
implementation(libs.androidx.lifecycle.viewModelCompose)
implementation(libs.androidx.lifecycle.viewModel)
implementation(compose.materialIconsExtended)
implementation(compose.components.resources)
implementation(libs.kotlinx.coroutines)
}
}
val nonAndroidMain by creating {
dependsOn(commonMain)
}
val commonTest by getting {
dependencies {
implementation(kotlin("test"))
Expand Down Expand Up @@ -73,22 +75,23 @@ kotlin {
}
}
val desktopMain by getting {
dependsOn(nonAndroidMain)
dependsOn(commonMain)
dependencies {
api(compose.preview)
implementation(libs.kotlinx.coroutines.swing)
}
}
val desktopTest by getting

val wasmJsMain by getting {
dependsOn(commonMain)
dependencies {
implementation(kotlin("stdlib"))
}
dependsOn(nonAndroidMain)
}

val iosMain by getting {
dependsOn(nonAndroidMain)
dependsOn(commonMain)
}
}
}
Expand Down
13 changes: 0 additions & 13 deletions .../jetsnack/common/src/androidMain/kotlin/com/example/jetsnack/drawableResources.android.kt
View file
Open in desktop

This file was deleted.

114 changes: 0 additions & 114 deletions ...les/jetsnack/common/src/androidMain/kotlin/com/example/jetsnack/stringResource.android.kt
View file
Open in desktop

This file was deleted.

74 changes: 0 additions & 74 deletions ...jetsnack/common/src/androidMain/kotlin/com/example/jetsnack/ui/JetsnackScaffoldContent.kt
View file
Open in desktop

This file was deleted.

Loading