Skip to content

Commit 5e8ca0b

Browse files
committed
migrate library to material 3
1 parent 914db39 commit 5e8ca0b

6 files changed

Lines changed: 9 additions & 10 deletions

File tree

gradle/libs.versions.toml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,6 @@ androidx-appcompat = { group = "androidx.appcompat", name = "appcompat", version
3636
androidx-compose-bom = { group = "androidx.compose", name = "compose-bom", version.ref = "androidxComposeBom" }
3737
androidx-compose-ui = { group = "androidx.compose.ui", name = "ui", version.ref = "androidxComposeUi" }
3838
androidx-compose-ui-text = { group = "androidx.compose.ui", name = "ui-text", version.ref = "androidxComposeUiText" }
39-
androidx-compose-material = { group = "androidx.compose.material", name = "material", version.ref = "androidxComposeUiText" }
4039
androidx-compose-material3 = { group = "androidx.compose.material3", name = "material3", version.ref = "androidComposeMaterial3" }
4140
androidx-compose-ui-tooling = { group = "androidx.compose.ui", name = "ui-tooling" }
4241
androidx-compose-ui-tooling-preview = { group = "androidx.compose.ui", name = "ui-tooling-preview" }

library/build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ dependencies {
1616
implementation(libs.androidx.annotation)
1717

1818
implementation(libs.androidx.compose.ui)
19-
implementation(libs.androidx.compose.material)
19+
implementation(libs.androidx.compose.material3)
2020

2121
debugImplementation(libs.androidx.compose.ui.tooling)
2222
implementation(libs.androidx.compose.ui.tooling.preview)

library/src/main/java/de/markusressel/kodeeditor/library/compose/KodeEditor.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import androidx.compose.foundation.layout.Box
55
import androidx.compose.foundation.layout.fillMaxSize
66
import androidx.compose.foundation.layout.padding
77
import androidx.compose.foundation.layout.wrapContentSize
8-
import androidx.compose.material.LocalTextStyle
8+
import androidx.compose.material3.LocalTextStyle
99
import androidx.compose.runtime.*
1010
import androidx.compose.ui.Alignment
1111
import androidx.compose.ui.Modifier

library/src/main/java/de/markusressel/kodeeditor/library/compose/KodeEditorColors.kt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package de.markusressel.kodeeditor.library.compose
22

3-
import androidx.compose.material.MaterialTheme
3+
import androidx.compose.material3.MaterialTheme
44
import androidx.compose.runtime.*
55
import androidx.compose.ui.graphics.Color
66
import de.markusressel.kodehighlighter.core.ui.KodeTextField
@@ -59,9 +59,9 @@ object KodeEditorDefaults {
5959
@Composable
6060
fun editorColors(
6161
textFieldColors: KodeTextFieldColors = KodeTextFieldDefaults.textFieldColors(),
62-
textFieldBackgroundColor: Color = MaterialTheme.colors.surface,
63-
lineNumberTextColor: Color = MaterialTheme.colors.onSurface,
64-
lineNumberBackgroundColor: Color = MaterialTheme.colors.surface,
62+
textFieldBackgroundColor: Color = MaterialTheme.colorScheme.surface,
63+
lineNumberTextColor: Color = MaterialTheme.colorScheme.onSurface,
64+
lineNumberBackgroundColor: Color = MaterialTheme.colorScheme.surface,
6565
): KodeEditorColors =
6666
DefaultKodeEditorColors(
6767
textFieldColors = textFieldColors,

library/src/main/java/de/markusressel/kodeeditor/library/compose/LineNumbers.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ package de.markusressel.kodeeditor.library.compose
33
import androidx.compose.foundation.background
44
import androidx.compose.foundation.layout.Box
55
import androidx.compose.foundation.layout.padding
6-
import androidx.compose.material.LocalTextStyle
7-
import androidx.compose.material.Text
6+
import androidx.compose.material3.LocalTextStyle
7+
import androidx.compose.material3.Text
88
import androidx.compose.runtime.Composable
99
import androidx.compose.runtime.getValue
1010
import androidx.compose.runtime.mutableStateOf

library/src/main/java/de/markusressel/kodeeditor/library/compose/ZoomLayout.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ package de.markusressel.kodeeditor.library.compose
33
import androidx.compose.foundation.background
44
import androidx.compose.foundation.gestures.detectTransformGestures
55
import androidx.compose.foundation.layout.*
6-
import androidx.compose.material.Surface
6+
import androidx.compose.material3.Surface
77
import androidx.compose.runtime.*
88
import androidx.compose.ui.Modifier
99
import androidx.compose.ui.geometry.Offset

0 commit comments

Comments
 (0)