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

Unverified Commit e7b79398 authored by cketti's avatar cketti Committed by GitHub
Browse files

Merge pull request #8326 from cketti/ftue_settings_import 

Add 'import from Thunderbird' screen to onboarding
parents 023ea406 26683155

app-k9mail/build.gradle.kts

+1 −0
Original line number Diff line number Diff line
@@ -25,6 +25,7 @@ dependencies { 
    implementation(projects.feature.widget.unread)

    implementation(projects.feature.telemetry.noop)

    implementation(projects.feature.funding.noop)

    implementation(projects.feature.onboarding.migration.noop)



    implementation(libs.androidx.work.runtime)

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

+2 −0
Original line number Diff line number Diff line
@@ -8,6 +8,7 @@ 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.funding.featureFundingModule

import app.k9mail.feature.onboarding.migration.onboardingMigrationModule

import app.k9mail.feature.telemetry.telemetryModule

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

import app.k9mail.featureflag.K9FeatureFlagFactory
@@ -28,6 +29,7 @@ val appModule = module { 
    includes(appWidgetModule)

    includes(telemetryModule)

    includes(featureFundingModule)

    includes(onboardingMigrationModule)



    single(named("ClientInfoAppName")) { BuildConfig.CLIENT_INFO_APP_NAME }

    single(named("ClientInfoAppVersion")) { BuildConfig.VERSION_NAME }

app-thunderbird/build.gradle.kts

+2 −0
Original line number Diff line number Diff line
@@ -225,6 +225,8 @@ dependencies { 
    fullBetaImplementation(projects.feature.funding.googleplay)

    fullReleaseImplementation(projects.feature.funding.googleplay)



    implementation(projects.feature.onboarding.migration.thunderbird)



    testImplementation(libs.robolectric)



    // Required for DependencyInjectionTest to be able to resolve OpenPgpApiManager

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

+2 −0
Original line number Diff line number Diff line
@@ -6,6 +6,7 @@ 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.feature.funding.featureFundingModule

import app.k9mail.feature.onboarding.migration.onboardingMigrationModule

import app.k9mail.feature.telemetry.telemetryModule

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

import com.fsck.k9.AppConfig
@@ -27,6 +28,7 @@ val appModule = module { 
    includes(appWidgetModule)

    includes(telemetryModule)

    includes(featureFundingModule)

    includes(onboardingMigrationModule)



    single(named("ClientInfoAppName")) { BuildConfig.CLIENT_INFO_APP_NAME }

    single(named("ClientInfoAppVersion")) { BuildConfig.VERSION_NAME }

core/ui/compose/designsystem/src/debug/kotlin/app/k9mail/core/ui/compose/designsystem/atom/card/CardFilledPreview.kt

0 → 100644
+22 −0
Original line number Diff line number Diff line 
package app.k9mail.core.ui.compose.designsystem.atom.card



import androidx.compose.foundation.layout.Box

import androidx.compose.foundation.layout.padding

import androidx.compose.runtime.Composable

import androidx.compose.ui.Modifier

import androidx.compose.ui.tooling.preview.Preview

import app.k9mail.core.ui.compose.designsystem.PreviewWithThemes

import app.k9mail.core.ui.compose.designsystem.atom.text.TextBodyMedium

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



@Composable

@Preview(showBackground = true)

internal fun CardFilledPreview() {

    PreviewWithThemes {

        CardFilled {

            Box(modifier = Modifier.padding(MainTheme.spacings.double)) {

                TextBodyMedium("Text in card")

            }

        }

    }

}