kopia lustrzana https://github.com/meshtastic/Meshtastic-Android
chore: update Compose to 1.4.3
rodzic
8fef36a3f2
commit
f66a3fabc7
|
@ -84,7 +84,7 @@ android {
|
|||
compose true
|
||||
}
|
||||
composeOptions {
|
||||
kotlinCompilerExtensionVersion = "1.3.2"
|
||||
kotlinCompilerExtensionVersion = "1.4.3"
|
||||
}
|
||||
// Set both the Java and Kotlin compilers to target Java 8.
|
||||
compileOptions {
|
||||
|
@ -162,13 +162,13 @@ dependencies {
|
|||
kapt "com.google.dagger:hilt-compiler:$hilt_version"
|
||||
|
||||
// Compose
|
||||
def composeBom = platform('androidx.compose:compose-bom:2022.12.00')
|
||||
def composeBom = platform('androidx.compose:compose-bom:2023.01.00')
|
||||
implementation composeBom
|
||||
androidTestImplementation composeBom
|
||||
|
||||
implementation 'androidx.compose.material:material'
|
||||
implementation 'androidx.compose.runtime:runtime-livedata'
|
||||
implementation "com.google.accompanist:accompanist-themeadapter-material:0.28.0"
|
||||
implementation "com.google.accompanist:accompanist-themeadapter-appcompat:0.29.2-rc"
|
||||
|
||||
// Android Studio Preview support
|
||||
implementation 'androidx.compose.ui:ui-tooling-preview'
|
||||
|
|
|
@ -11,7 +11,7 @@ import androidx.fragment.app.activityViewModels
|
|||
import com.geeksville.mesh.R
|
||||
import com.geeksville.mesh.android.Logging
|
||||
import com.geeksville.mesh.model.UIViewModel
|
||||
import com.google.accompanist.themeadapter.material.MdcTheme
|
||||
import com.google.accompanist.themeadapter.appcompat.AppCompatTheme
|
||||
import dagger.hilt.android.AndroidEntryPoint
|
||||
|
||||
@AndroidEntryPoint
|
||||
|
@ -28,7 +28,7 @@ class DeviceSettingsFragment : ScreenFragment("Device Settings"), Logging {
|
|||
setViewCompositionStrategy(ViewCompositionStrategy.DisposeOnViewTreeLifecycleDestroyed)
|
||||
setBackgroundColor(ContextCompat.getColor(context, R.color.colorAdvancedBackground))
|
||||
setContent {
|
||||
MdcTheme {
|
||||
AppCompatTheme {
|
||||
DeviceSettingsItemList(model)
|
||||
}
|
||||
}
|
||||
|
|
|
@ -11,7 +11,7 @@ import androidx.fragment.app.activityViewModels
|
|||
import com.geeksville.mesh.R
|
||||
import com.geeksville.mesh.android.Logging
|
||||
import com.geeksville.mesh.model.UIViewModel
|
||||
import com.google.accompanist.themeadapter.material.MdcTheme
|
||||
import com.google.accompanist.themeadapter.appcompat.AppCompatTheme
|
||||
import dagger.hilt.android.AndroidEntryPoint
|
||||
|
||||
@AndroidEntryPoint
|
||||
|
@ -28,7 +28,7 @@ class ModuleSettingsFragment : ScreenFragment("Module Settings"), Logging {
|
|||
setViewCompositionStrategy(ViewCompositionStrategy.DisposeOnViewTreeLifecycleDestroyed)
|
||||
setBackgroundColor(ContextCompat.getColor(context, R.color.colorAdvancedBackground))
|
||||
setContent {
|
||||
MdcTheme {
|
||||
AppCompatTheme {
|
||||
ModuleSettingsItemList(model)
|
||||
}
|
||||
}
|
||||
|
|
|
@ -3,7 +3,7 @@
|
|||
buildscript {
|
||||
ext {
|
||||
useCrashlytics = false
|
||||
kotlin_version = '1.7.20'
|
||||
kotlin_version = '1.8.10'
|
||||
hilt_version = '2.44.2'
|
||||
protobuf_version = '3.21.12'
|
||||
}
|
||||
|
|
Ładowanie…
Reference in New Issue