Skip to content

Refactor: Move :legacy:common.feature to app-common.feature #9043

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
kewisch merged 1 commit into from
Apr 11, 2025
Merged

Refactor: Move :legacy:common.feature to app-common.feature #9043

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions app-common/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,14 @@ android {
dependencies {
api(projects.legacy.common)

api(projects.legacy.ui.legacy)

api(projects.feature.account.core)

api(projects.feature.launcher)

api(projects.feature.navigation.drawer.api)

implementation(projects.legacy.core)
implementation(projects.legacy.account)

Expand Down
2 changes: 1 addition & 1 deletion ...9/feature/AccountSetupFinishedLauncher.kt → ...n/feature/AccountSetupFinishedLauncher.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.fsck.k9.feature
package net.thunderbird.app.common.feature

import android.content.Context
import app.k9mail.feature.launcher.FeatureLauncherExternalContract
Expand Down
2 changes: 1 addition & 1 deletion ...java/com/fsck/k9/feature/FeatureModule.kt → ...rbird/app/common/feature/FeatureModule.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.fsck.k9.feature
package net.thunderbird.app.common.feature

import app.k9mail.feature.launcher.FeatureLauncherExternalContract
import net.thunderbird.feature.navigation.drawer.api.NavigationDrawerExternalContract
Expand Down
12 changes: 12 additions & 0 deletions ...common/src/main/kotlin/net/thunderbird/app/common/feature/NavigationDrawerConfigLoader.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
package net.thunderbird.app.common.feature

import com.fsck.k9.preferences.DrawerConfigManager
import kotlinx.coroutines.flow.Flow
import net.thunderbird.feature.navigation.drawer.api.NavigationDrawerExternalContract

class NavigationDrawerConfigLoader(private val drawerConfigManager: DrawerConfigManager) :
NavigationDrawerExternalContract.DrawerConfigLoader {
override fun loadDrawerConfigFlow(): Flow<NavigationDrawerExternalContract.DrawerConfig> {
return drawerConfigManager.getConfigFlow()
}
}
2 changes: 1 addition & 1 deletion ...9/feature/NavigationDrawerConfigWriter.kt → ...n/feature/NavigationDrawerConfigWriter.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.fsck.k9.feature
package net.thunderbird.app.common.feature

import com.fsck.k9.preferences.DrawerConfigManager
import net.thunderbird.feature.navigation.drawer.api.NavigationDrawerExternalContract
Expand Down
2 changes: 1 addition & 1 deletion app-k9mail/src/main/kotlin/app/k9mail/feature/FeatureModule.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import app.k9mail.feature.funding.featureFundingModule
import app.k9mail.feature.migration.launcher.featureMigrationModule
import app.k9mail.feature.onboarding.migration.onboardingMigrationModule
import app.k9mail.feature.telemetry.telemetryModule
import com.fsck.k9.feature.featureLauncherModule
import net.thunderbird.app.common.feature.featureLauncherModule
import net.thunderbird.feature.account.settings.featureAccountSettingsModule
import org.koin.dsl.module

Expand Down
2 changes: 1 addition & 1 deletion app-thunderbird/src/main/kotlin/net/thunderbird/android/feature/FeatureModule.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import app.k9mail.feature.funding.featureFundingModule
import app.k9mail.feature.migration.launcher.featureMigrationModule
import app.k9mail.feature.onboarding.migration.onboardingMigrationModule
import app.k9mail.feature.telemetry.telemetryModule
import com.fsck.k9.feature.featureLauncherModule
import net.thunderbird.app.common.feature.featureLauncherModule
import net.thunderbird.feature.account.settings.featureAccountSettingsModule
import org.koin.dsl.module

Expand Down
2 changes: 1 addition & 1 deletion legacy/common/src/main/java/com/fsck/k9/CommonKoinModule.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ package com.fsck.k9

import app.k9mail.core.featureflag.FeatureFlagProvider
import app.k9mail.core.featureflag.InMemoryFeatureFlagProvider
import app.k9mail.feature.launcher.di.featureLauncherModule
import app.k9mail.feature.widget.message.list.messageListWidgetModule
import app.k9mail.feature.widget.unread.UnreadWidgetUpdateListener
import app.k9mail.feature.widget.unread.unreadWidgetModule
Expand All @@ -10,7 +11,6 @@ import com.fsck.k9.backends.backendsModule
import com.fsck.k9.controller.ControllerExtension
import com.fsck.k9.crypto.EncryptionExtractor
import com.fsck.k9.crypto.openpgp.OpenPgpEncryptionExtractor
import com.fsck.k9.feature.featureLauncherModule
import com.fsck.k9.notification.notificationModule
import com.fsck.k9.preferences.K9StoragePersister
import com.fsck.k9.preferences.StoragePersister
Expand Down
12 changes: 0 additions & 12 deletions legacy/common/src/main/java/com/fsck/k9/feature/NavigationDrawerConfigLoader.kt
View file
Open in desktop

This file was deleted.