Skip to content

Commit edf5a25

Browse files
authored
refactor: theme2 to kmp (#10636)
2 parents 3e0c7bc + 0a5b002 commit edf5a25

288 files changed

Lines changed: 678 additions & 637 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎app-k9mail/build.gradle.kts‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -139,6 +139,7 @@ android {
139139

140140
dependencies {
141141
implementation(projects.appCommon)
142+
implementation(projects.core.ui.compose.common)
142143
implementation(projects.core.ui.compose.theme2.k9mail)
143144
implementation(projects.core.ui.legacy.theme2.k9mail)
144145
implementation(projects.feature.launcher)

‎app-k9mail/dependencies/fossReleaseRuntimeClasspath.txt‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -264,8 +264,12 @@ org.jetbrains.compose.components:components-resources-android:1.10.1
264264
org.jetbrains.compose.components:components-resources:1.10.1
265265
org.jetbrains.compose.foundation:foundation-layout:1.10.1
266266
org.jetbrains.compose.foundation:foundation:1.10.1
267+
org.jetbrains.compose.material3:material3:1.9.0
268+
org.jetbrains.compose.material:material-ripple:1.9.1
267269
org.jetbrains.compose.runtime:runtime-saveable:1.10.1
268270
org.jetbrains.compose.runtime:runtime:1.10.1
271+
org.jetbrains.compose.ui:ui-backhandler-android:1.9.1
272+
org.jetbrains.compose.ui:ui-backhandler:1.9.1
269273
org.jetbrains.compose.ui:ui-geometry:1.10.1
270274
org.jetbrains.compose.ui:ui-graphics:1.10.1
271275
org.jetbrains.compose.ui:ui-text:1.10.1

‎app-k9mail/dependencies/fullReleaseRuntimeClasspath.txt‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -278,8 +278,12 @@ org.jetbrains.compose.components:components-resources-android:1.10.1
278278
org.jetbrains.compose.components:components-resources:1.10.1
279279
org.jetbrains.compose.foundation:foundation-layout:1.10.1
280280
org.jetbrains.compose.foundation:foundation:1.10.1
281+
org.jetbrains.compose.material3:material3:1.9.0
282+
org.jetbrains.compose.material:material-ripple:1.9.1
281283
org.jetbrains.compose.runtime:runtime-saveable:1.10.1
282284
org.jetbrains.compose.runtime:runtime:1.10.1
285+
org.jetbrains.compose.ui:ui-backhandler-android:1.9.1
286+
org.jetbrains.compose.ui:ui-backhandler:1.9.1
283287
org.jetbrains.compose.ui:ui-geometry:1.10.1
284288
org.jetbrains.compose.ui:ui-graphics:1.10.1
285289
org.jetbrains.compose.ui:ui-text:1.10.1

‎app-k9mail/src/main/kotlin/app/k9mail/provider/K9FeatureThemeProvider.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package app.k9mail.provider
22

33
import androidx.compose.runtime.Composable
4-
import app.k9mail.core.ui.compose.theme2.k9mail.K9MailTheme2
4+
import net.thunderbird.core.ui.compose.theme2.k9mail.K9MailTheme2
55
import net.thunderbird.core.ui.theme.api.FeatureThemeProvider
66

77
internal class K9FeatureThemeProvider : FeatureThemeProvider {

‎app-thunderbird/build.gradle.kts‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -212,6 +212,7 @@ val fullReleaseImplementation by configurations.creating
212212

213213
dependencies {
214214
implementation(projects.appCommon)
215+
implementation(projects.core.ui.compose.common)
215216
implementation(projects.core.ui.compose.theme2.thunderbird)
216217
implementation(projects.core.ui.legacy.theme2.thunderbird)
217218
implementation(projects.feature.launcher)

‎app-thunderbird/dependencies/fossBetaRuntimeClasspath.txt‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -272,8 +272,12 @@ org.jetbrains.compose.components:components-resources-android:1.10.1
272272
org.jetbrains.compose.components:components-resources:1.10.1
273273
org.jetbrains.compose.foundation:foundation-layout:1.10.1
274274
org.jetbrains.compose.foundation:foundation:1.10.1
275+
org.jetbrains.compose.material3:material3:1.9.0
276+
org.jetbrains.compose.material:material-ripple:1.9.1
275277
org.jetbrains.compose.runtime:runtime-saveable:1.10.1
276278
org.jetbrains.compose.runtime:runtime:1.10.1
279+
org.jetbrains.compose.ui:ui-backhandler-android:1.9.1
280+
org.jetbrains.compose.ui:ui-backhandler:1.9.1
277281
org.jetbrains.compose.ui:ui-geometry:1.10.1
278282
org.jetbrains.compose.ui:ui-graphics:1.10.1
279283
org.jetbrains.compose.ui:ui-text:1.10.1

‎app-thunderbird/dependencies/fossDailyRuntimeClasspath.txt‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -272,8 +272,12 @@ org.jetbrains.compose.components:components-resources-android:1.10.1
272272
org.jetbrains.compose.components:components-resources:1.10.1
273273
org.jetbrains.compose.foundation:foundation-layout:1.10.1
274274
org.jetbrains.compose.foundation:foundation:1.10.1
275+
org.jetbrains.compose.material3:material3:1.9.0
276+
org.jetbrains.compose.material:material-ripple:1.9.1
275277
org.jetbrains.compose.runtime:runtime-saveable:1.10.1
276278
org.jetbrains.compose.runtime:runtime:1.10.1
279+
org.jetbrains.compose.ui:ui-backhandler-android:1.9.1
280+
org.jetbrains.compose.ui:ui-backhandler:1.9.1
277281
org.jetbrains.compose.ui:ui-geometry:1.10.1
278282
org.jetbrains.compose.ui:ui-graphics:1.10.1
279283
org.jetbrains.compose.ui:ui-text:1.10.1

‎app-thunderbird/dependencies/fossReleaseRuntimeClasspath.txt‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -272,8 +272,12 @@ org.jetbrains.compose.components:components-resources-android:1.10.1
272272
org.jetbrains.compose.components:components-resources:1.10.1
273273
org.jetbrains.compose.foundation:foundation-layout:1.10.1
274274
org.jetbrains.compose.foundation:foundation:1.10.1
275+
org.jetbrains.compose.material3:material3:1.9.0
276+
org.jetbrains.compose.material:material-ripple:1.9.1
275277
org.jetbrains.compose.runtime:runtime-saveable:1.10.1
276278
org.jetbrains.compose.runtime:runtime:1.10.1
279+
org.jetbrains.compose.ui:ui-backhandler-android:1.9.1
280+
org.jetbrains.compose.ui:ui-backhandler:1.9.1
277281
org.jetbrains.compose.ui:ui-geometry:1.10.1
278282
org.jetbrains.compose.ui:ui-graphics:1.10.1
279283
org.jetbrains.compose.ui:ui-text:1.10.1

‎app-thunderbird/dependencies/fullBetaRuntimeClasspath.txt‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -286,8 +286,12 @@ org.jetbrains.compose.components:components-resources-android:1.10.1
286286
org.jetbrains.compose.components:components-resources:1.10.1
287287
org.jetbrains.compose.foundation:foundation-layout:1.10.1
288288
org.jetbrains.compose.foundation:foundation:1.10.1
289+
org.jetbrains.compose.material3:material3:1.9.0
290+
org.jetbrains.compose.material:material-ripple:1.9.1
289291
org.jetbrains.compose.runtime:runtime-saveable:1.10.1
290292
org.jetbrains.compose.runtime:runtime:1.10.1
293+
org.jetbrains.compose.ui:ui-backhandler-android:1.9.1
294+
org.jetbrains.compose.ui:ui-backhandler:1.9.1
291295
org.jetbrains.compose.ui:ui-geometry:1.10.1
292296
org.jetbrains.compose.ui:ui-graphics:1.10.1
293297
org.jetbrains.compose.ui:ui-text:1.10.1

‎app-thunderbird/dependencies/fullDailyRuntimeClasspath.txt‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -286,8 +286,12 @@ org.jetbrains.compose.components:components-resources-android:1.10.1
286286
org.jetbrains.compose.components:components-resources:1.10.1
287287
org.jetbrains.compose.foundation:foundation-layout:1.10.1
288288
org.jetbrains.compose.foundation:foundation:1.10.1
289+
org.jetbrains.compose.material3:material3:1.9.0
290+
org.jetbrains.compose.material:material-ripple:1.9.1
289291
org.jetbrains.compose.runtime:runtime-saveable:1.10.1
290292
org.jetbrains.compose.runtime:runtime:1.10.1
293+
org.jetbrains.compose.ui:ui-backhandler-android:1.9.1
294+
org.jetbrains.compose.ui:ui-backhandler:1.9.1
291295
org.jetbrains.compose.ui:ui-geometry:1.10.1
292296
org.jetbrains.compose.ui:ui-graphics:1.10.1
293297
org.jetbrains.compose.ui:ui-text:1.10.1

0 commit comments

Comments
 (0)