Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Unverified Commit 8b393209 authored by Wolf-Martell Montwé's avatar Wolf-Martell Montwé Committed by GitHub
Browse files

Merge pull request #8117 from wmontwe/move-theme-to-core 

Move theme to `:core:ui:theme:api` module
parents ddceefda ff78e327

app-k9mail/src/main/kotlin/app/k9mail/K9KoinModule.kt

+2 −2
Original line number Diff line number Diff line
@@ -4,11 +4,11 @@ import app.k9mail.auth.K9OAuthConfigurationFactory 
import app.k9mail.core.common.oauth.OAuthConfigurationFactory

import app.k9mail.core.common.provider.AppNameProvider

import app.k9mail.core.featureflag.FeatureFlagFactory

import app.k9mail.core.ui.theme.api.FeatureThemeProvider

import app.k9mail.core.ui.theme.api.ThemeProvider

import app.k9mail.dev.developmentModuleAdditions

import app.k9mail.feature.launcher.FeatureLauncherExternalContract.FeatureThemeProvider

import app.k9mail.feature.widget.shortcut.LauncherShortcutActivity

import app.k9mail.featureflag.K9FeatureFlagFactory

import app.k9mail.legacy.ui.theme.ThemeProvider

import app.k9mail.provider.K9AppNameProvider

import app.k9mail.provider.K9FeatureThemeProvider

import app.k9mail.widget.appWidgetModule

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

+2 −2
Original line number Diff line number Diff line
@@ -2,9 +2,9 @@ package app.k9mail.provider 


import androidx.compose.runtime.Composable

import app.k9mail.core.ui.compose.theme2.k9mail.K9MailTheme2

import app.k9mail.feature.launcher.FeatureLauncherExternalContract

import app.k9mail.core.ui.theme.api.FeatureThemeProvider



class K9FeatureThemeProvider : FeatureLauncherExternalContract.FeatureThemeProvider {

class K9FeatureThemeProvider : FeatureThemeProvider {

    @Composable

    override fun WithTheme(content: @Composable () -> Unit) {

        K9MailTheme2 {

app-k9mail/src/main/kotlin/com/fsck/k9/provider/K9ThemeProvider.kt

+1 −1
Original line number Diff line number Diff line 
package com.fsck.k9.provider



import app.k9mail.legacy.ui.theme.ThemeProvider

import app.k9mail.core.ui.theme.api.ThemeProvider

import com.fsck.k9.R



class K9ThemeProvider : ThemeProvider {

app-thunderbird/src/main/kotlin/net/thunderbird/android/ThunderbirdKoinModule.kt

+2 −2
Original line number Diff line number Diff line
@@ -3,9 +3,9 @@ package net.thunderbird.android 
import app.k9mail.core.common.oauth.OAuthConfigurationFactory

import app.k9mail.core.common.provider.AppNameProvider

import app.k9mail.core.featureflag.FeatureFlagFactory

import app.k9mail.feature.launcher.FeatureLauncherExternalContract.FeatureThemeProvider

import app.k9mail.core.ui.theme.api.FeatureThemeProvider

import app.k9mail.core.ui.theme.api.ThemeProvider

import app.k9mail.feature.widget.shortcut.LauncherShortcutActivity

import app.k9mail.legacy.ui.theme.ThemeProvider

import com.fsck.k9.AppConfig

import com.fsck.k9.activity.MessageCompose

import net.thunderbird.android.auth.TbOAuthConfigurationFactory

app-thunderbird/src/main/kotlin/net/thunderbird/android/provider/TbFeatureThemeProvider.kt

+2 −2
Original line number Diff line number Diff line
@@ -2,9 +2,9 @@ package net.thunderbird.android.provider 


import androidx.compose.runtime.Composable

import app.k9mail.core.ui.compose.theme2.thunderbird.ThunderbirdTheme2

import app.k9mail.feature.launcher.FeatureLauncherExternalContract

import app.k9mail.core.ui.theme.api.FeatureThemeProvider



class TbFeatureThemeProvider : FeatureLauncherExternalContract.FeatureThemeProvider {

class TbFeatureThemeProvider : FeatureThemeProvider {

    @Composable

    override fun WithTheme(content: @Composable () -> Unit) {

        ThunderbirdTheme2 {