Skip to content
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

Remove Material Theme and use compose Foundation instead #68

Merged
merged 1 commit into from
Sep 28, 2024
Merged

Remove Material Theme and use compose Foundation instead #68

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 4 additions & 2 deletions app/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,12 +72,14 @@ dependencies {
implementation(projects.feature.tripPlanner.network.api)
implementation(projects.feature.tripPlanner.network.real)

implementation(libs.activity.compose)
implementation(libs.compose.foundation)
implementation(libs.compose.navigation)
implementation(libs.core.ktx)
implementation(libs.lifecycle.runtime.ktx)
implementation(libs.activity.compose)
implementation(libs.timber)

androidTestImplementation(libs.androidx.test.ext.junit)
testImplementation(libs.ui.test.junit4)
testImplementation(libs.compose.ui.test.junit4)
testImplementation(libs.paparazzi)
}
8 changes: 4 additions & 4 deletions app/src/main/kotlin/xyz/ksharma/krail/KrailApp.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@ package xyz.ksharma.krail
import androidx.compose.foundation.layout.Column
import androidx.compose.foundation.layout.fillMaxSize
import androidx.compose.foundation.layout.safeContentPadding
import androidx.compose.material3.Text
import androidx.compose.runtime.Composable
import androidx.compose.ui.Modifier
import androidx.compose.foundation.text.BasicText
import androidx.navigation.NavHostController
import androidx.navigation.compose.NavHost
import androidx.navigation.compose.composable
Expand All @@ -25,9 +25,9 @@ internal fun KrailApp(
) {
composable(route = AppScreen.DemoPage.name) {
Column {
Text("Krail App", style = KrailTheme.typography.bodyLarge)
Text("Krail App", style = KrailTheme.typography.bodyMedium)
Text("Krail App", style = KrailTheme.typography.bodySmall)
BasicText("Krail App", style = KrailTheme.typography.bodyLarge)
BasicText("Krail App", style = KrailTheme.typography.bodyMedium)
BasicText("Krail App", style = KrailTheme.typography.bodySmall)
}
}
}
Expand Down
13 changes: 6 additions & 7 deletions core/design-system/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,13 +9,12 @@ android {

dependencies {
api(platform(libs.compose.bom))
api(libs.compose.navigation)
api(libs.material3)
api(libs.ui)
api(libs.ui.graphics)
api(libs.ui.tooling.preview)
api(libs.compose.foundation)
api(libs.compose.ui)
api(libs.compose.ui.graphics)
api(libs.compose.ui.tooling.preview)

androidTestImplementation(platform(libs.compose.bom))
debugApi(libs.ui.tooling)
debugApi(libs.ui.test.manifest)
debugApi(libs.compose.ui.tooling)
debugApi(libs.compose.ui.test.manifest)
}
19 changes: 9 additions & 10 deletions gradle/libs.versions.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,6 @@ targetSdk = "34"
timber = "5.0.1"
espressoCore = "3.6.1"
appcompat = "1.7.0"
material = "1.12.0"

[libraries]
#ksp-gradle-plugin = { module = "com.google.devtools.ksp:com.google.devtools.ksp.gradle.plugin", version.ref = "ksp" }
Expand All @@ -47,11 +46,11 @@ timber = { module = "com.jakewharton.timber:timber", version.ref = "timber" }

#Compose
compose-bom = { group = "androidx.compose", name = "compose-bom", version.ref = "compose-bom" }
ui = { group = "androidx.compose.ui", name = "ui" }
ui-graphics = { group = "androidx.compose.ui", name = "ui-graphics" }
ui-tooling = { group = "androidx.compose.ui", name = "ui-tooling" }
ui-tooling-preview = { group = "androidx.compose.ui", name = "ui-tooling-preview" }
material3 = { group = "androidx.compose.material3", name = "material3" }
compose-foundation = { group = "androidx.compose.foundation", name = "foundation" }
compose-ui = { group = "androidx.compose.ui", name = "ui" }
compose-ui-graphics = { group = "androidx.compose.ui", name = "ui-graphics" }
compose-ui-tooling = { group = "androidx.compose.ui", name = "ui-tooling" }
compose-ui-tooling-preview = { group = "androidx.compose.ui", name = "ui-tooling-preview" }
compose-navigation = { group = "androidx.navigation", name = "navigation-compose", version.ref = "compose-navigation" }

#Hilt
Expand All @@ -66,8 +65,8 @@ okhttp-bom = { module = "com.squareup.okhttp3:okhttp-bom", version.ref = "okhttp
retrofit = { module = "com.squareup.retrofit2:retrofit", version.ref = "retrofit" }

#Test
ui-test-manifest = { group = "androidx.compose.ui", name = "ui-test-manifest" }
ui-test-junit4 = { group = "androidx.compose.ui", name = "ui-test-junit4" }
compose-ui-test-manifest = { group = "androidx.compose.ui", name = "ui-test-manifest" }
compose-ui-test-junit4 = { group = "androidx.compose.ui", name = "ui-test-junit4" }
junit = { group = "junit", name = "junit", version.ref = "junit" }
androidx-test-ext-junit = { group = "androidx.test.ext", name = "junit", version.ref = "androidx-test-ext-junit" }
google-truth = { group = "com.google.truth", name = "truth", version = "1.4.2" }
Expand Down Expand Up @@ -98,8 +97,8 @@ cash-paparazzi = { id = "app.cash.paparazzi", version.ref = "paparazzi" }
ksp = { id = "com.google.devtools.ksp", version.ref = "ksp" }
detekt = { id = "io.gitlab.arturbosch.detekt", version.ref = "detekt" }
compose-compiler = { id = "org.jetbrains.kotlin.plugin.compose", version.ref = "kotlin" }
wire = { id = "com.squareup.wire", version.ref = "wire"}
cash-sqldelight = {id = "app.cash.sqldelight", version.ref ="sqldelight"}
wire = { id = "com.squareup.wire", version.ref = "wire" }
cash-sqldelight = { id = "app.cash.sqldelight", version.ref = "sqldelight" }

#Convention Plugins
krail-android-application = { id = "krail.android.application", version = "unspecified" }
Expand Down