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

Jump to bottom

Migrate usages of MdcTheme to Accompanist #810

Merged
merged 1 commit into from Dec 1, 2022
Merged

Migrate usages of MdcTheme to Accompanist #810

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.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion app/build.gradle.kts
View file
Open in desktop
Expand Up @@ -135,6 +135,7 @@ dependencies {
implementation(libs.androidx.tracing.ktx)

// Compose
implementation(libs.accompanist.themeadapter.material)
implementation(libs.androidx.activity.compose)
implementation(libs.androidx.constraintlayout.compose)
implementation(libs.androidx.compose.runtime)
Expand All @@ -146,7 +147,6 @@ dependencies {
implementation(libs.androidx.compose.ui.tooling.preview)
implementation(libs.androidx.compose.runtime.livedata)
implementation(libs.androidx.lifecycle.viewmodel.compose)
implementation(libs.material.compose.theme.adapter)
implementation(libs.glide)
debugImplementation(libs.androidx.compose.ui.tooling)

Expand Down
2 changes: 1 addition & 1 deletion app/src/main/java/com/google/samples/apps/sunflower/PlantDetailFragment.kt
View file
Open in desktop
Expand Up @@ -27,7 +27,7 @@ import androidx.fragment.app.Fragment
import androidx.fragment.app.viewModels
import androidx.navigation.findNavController
import androidx.navigation.fragment.findNavController
import com.google.android.material.composethemeadapter.MdcTheme
import com.google.accompanist.themeadapter.material.MdcTheme
import com.google.samples.apps.sunflower.compose.plantdetail.PlantDetailsScreen
import com.google.samples.apps.sunflower.viewmodels.PlantDetailViewModel
import dagger.hilt.android.AndroidEntryPoint
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/java/com/google/samples/apps/sunflower/adapters/PlantAdapter.kt
View file
Open in desktop
Expand Up @@ -22,7 +22,7 @@ import androidx.navigation.findNavController
import androidx.recyclerview.widget.DiffUtil
import androidx.recyclerview.widget.ListAdapter
import androidx.recyclerview.widget.RecyclerView
import com.google.android.material.composethemeadapter.MdcTheme
import com.google.accompanist.themeadapter.material.MdcTheme
import com.google.samples.apps.sunflower.HomeViewPagerFragmentDirections
import com.google.samples.apps.sunflower.PlantListFragment
import com.google.samples.apps.sunflower.compose.plantlist.PlantListItemView
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/java/com/google/samples/apps/sunflower/compose/plantdetail/PlantDetailView.kt
View file
Open in desktop
Expand Up @@ -94,7 +94,7 @@ import com.bumptech.glide.load.DataSource
import com.bumptech.glide.load.engine.GlideException
import com.bumptech.glide.request.RequestListener
import com.bumptech.glide.request.target.Target
import com.google.android.material.composethemeadapter.MdcTheme
import com.google.accompanist.themeadapter.material.MdcTheme
import com.google.samples.apps.sunflower.R
import com.google.samples.apps.sunflower.compose.Dimens
import com.google.samples.apps.sunflower.compose.utils.TextSnackbarContainer
Expand Down
4 changes: 2 additions & 2 deletions gradle/libs.versions.toml
View file
Open in desktop
Expand Up @@ -15,13 +15,13 @@
##
[versions]
accessibilityTestFramework = "4.0.0"
accompanist = "0.28.0"
activityCompose = "1.6.0"
androidGradlePlugin = "7.3.1"
appcompat = "1.4.1"
benchmark = "1.1.0-rc02"
# @keep
compileSdk = "33"
composeThemeAdapter = "1.1.21"
compose = "1.3.0"
compose-compiler = "1.3.2"
constraintLayoutCompose = "1.0.1"
Expand Down Expand Up @@ -62,6 +62,7 @@ work = "2.7.1"

[libraries]
accessibility-test-framework = { module = "com.google.android.apps.common.testing.accessibility.framework:accessibility-test-framework", version.ref = "accessibilityTestFramework" }
accompanist-themeadapter-material = { module = "com.google.accompanist:accompanist-themeadapter-material", version.ref = "accompanist" }
android-gradle-plugin = { module = "com.android.tools.build:gradle", version.ref = "androidGradlePlugin" }
androidx-activity-compose = { module = "androidx.activity:activity-compose", version.ref = "activityCompose" }
androidx-appcompat = { module = "androidx.appcompat:appcompat", version.ref = "appcompat" }
Expand Down Expand Up @@ -113,7 +114,6 @@ kotlinx-coroutines-android = { module = "org.jetbrains.kotlinx:kotlinx-coroutine
kotlinx-coroutines-core = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-core", version.ref = "coroutines" }
kotlinx-coroutines-test = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-test", version.ref = "coroutines" }
material = { module = "com.google.android.material:material", version.ref = "material" }
material-compose-theme-adapter = { module = "com.google.android.material:compose-theme-adapter", version.ref = "composeThemeAdapter" }
okhttp3-logging-interceptor = { module = "com.squareup.okhttp3:logging-interceptor", version.ref = "okhttpLogging" }
retrofit2 = { module = "com.squareup.retrofit2:retrofit", version.ref = "retrofit" }
retrofit2-converter-gson = { module = "com.squareup.retrofit2:converter-gson", version.ref = "retrofit" }
Expand Down