upd 2

JetBrains · Oct 21, 2024 · 151675c · 151675c
1 parent e96ab10
commit 151675c
Show file tree

Hide file tree

Showing 60 changed files with 177 additions and 987 deletions.
diff --git a/examples/jetsnack/android/build.gradle.kts b/examples/jetsnack/android/build.gradle.kts
@@ -13,6 +13,7 @@ repositories {
 }
 
 dependencies {
+    implementation(compose.components.resources)
     implementation(project(":common"))
     implementation("androidx.activity:activity-compose:1.5.0")
 }

diff --git a/examples/jetsnack/android/src/main/java/com/example/android/MainActivity.kt b/examples/jetsnack/android/src/main/java/com/example/android/MainActivity.kt
@@ -4,29 +4,12 @@ import android.os.Bundle
 import androidx.activity.compose.setContent
 import androidx.appcompat.app.AppCompatActivity
 import androidx.compose.material3.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 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()

diff --git a/.../jetsnack/common/src/androidMain/kotlin/com/example/jetsnack/drawableResources.android.kt b/.../jetsnack/common/src/androidMain/kotlin/com/example/jetsnack/drawableResources.android.kt
diff --git a/...les/jetsnack/common/src/androidMain/kotlin/com/example/jetsnack/stringResource.android.kt b/...les/jetsnack/common/src/androidMain/kotlin/com/example/jetsnack/stringResource.android.kt
diff --git a/...jetsnack/common/src/androidMain/kotlin/com/example/jetsnack/ui/JetsnackScaffoldContent.kt b/...jetsnack/common/src/androidMain/kotlin/com/example/jetsnack/ui/JetsnackScaffoldContent.kt
diff --git a/...les/jetsnack/common/src/androidMain/kotlin/com/example/jetsnack/ui/MppJetsnackAppState.kt b/...les/jetsnack/common/src/androidMain/kotlin/com/example/jetsnack/ui/MppJetsnackAppState.kt