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

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

Merge pull request #8055 from wmontwe/move-feature-flags-to-app-modules 

Move feature flags to app modules
parents bd9d1735 b8156d93

app-k9mail/build.gradle.kts

+2 −0
Original line number Diff line number Diff line
@@ -18,6 +18,8 @@ dependencies { 
    implementation(projects.legacy.core)

    implementation(projects.legacy.ui.legacy)



    implementation(projects.core.featureflags)



    implementation(projects.feature.widget.messageList)

    implementation(projects.feature.widget.shortcut)

    implementation(projects.feature.widget.unread)

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

+3 −0
Original line number Diff line number Diff line
@@ -3,9 +3,11 @@ package app.k9mail 
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.dev.developmentModuleAdditions

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

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

import app.k9mail.featureflag.K9FeatureFlagFactory

import app.k9mail.provider.K9AppNameProvider

import app.k9mail.provider.K9FeatureThemeProvider

import app.k9mail.widget.appWidgetModule
@@ -27,6 +29,7 @@ val appModule = module { 
    single<OAuthConfigurationFactory> { K9OAuthConfigurationFactory() }

    single<AppNameProvider> { K9AppNameProvider(androidContext()) }

    single<FeatureThemeProvider> { K9FeatureThemeProvider() }

    single<FeatureFlagFactory> { K9FeatureFlagFactory() }



    developmentModuleAdditions()

}

legacy/common/src/main/java/com/fsck/k9/featureflag/InMemoryFeatureFlagFactory.kt→app-k9mail/src/main/kotlin/app/k9mail/featureflag/K9FeatureFlagFactory.kt

+2 −2
Original line number Diff line number Diff line 
package com.fsck.k9.featureflag

package app.k9mail.featureflag



import app.k9mail.core.featureflag.FeatureFlag

import app.k9mail.core.featureflag.FeatureFlagFactory



class InMemoryFeatureFlagFactory : FeatureFlagFactory {

class K9FeatureFlagFactory : FeatureFlagFactory {

    override fun createFeatureCatalog(): List<FeatureFlag> {

        return emptyList()

    }

app-thunderbird/build.gradle.kts

+2 −0
Original line number Diff line number Diff line
@@ -18,6 +18,8 @@ dependencies { 
    implementation(projects.legacy.core)

    implementation(projects.legacy.ui.legacy)



    implementation(projects.core.featureflags)



    implementation(projects.feature.widget.messageList)

    implementation(projects.feature.widget.shortcut)

    implementation(projects.feature.widget.unread)

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

+3 −0
Original line number Diff line number Diff line
@@ -2,12 +2,14 @@ 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.feature.widget.shortcut.LauncherShortcutActivity

import com.fsck.k9.AppConfig

import com.fsck.k9.activity.MessageCompose

import net.thunderbird.android.auth.TbOAuthConfigurationFactory

import net.thunderbird.android.dev.developmentModuleAdditions

import net.thunderbird.android.featureflag.TbFeatureFlagFactory

import net.thunderbird.android.provider.TbAppNameProvider

import net.thunderbird.android.provider.TbFeatureThemeProvider

import net.thunderbird.android.widget.appWidgetModule
@@ -26,6 +28,7 @@ val appModule = module { 
    single<OAuthConfigurationFactory> { TbOAuthConfigurationFactory() }

    single<AppNameProvider> { TbAppNameProvider(androidContext()) }

    single<FeatureThemeProvider> { TbFeatureThemeProvider() }

    single<FeatureFlagFactory> { TbFeatureFlagFactory() }



    developmentModuleAdditions()

}