From c88df81c90a012abc82f3180599561b31aabb3da Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Wolf-Martell=20Montw=C3=A9?= Date: Wed, 10 Jan 2024 18:17:09 +0100 Subject: [PATCH] Rename `app:k9mail` module to `app:common` --- app-k9mail/build.gradle.kts | 2 +- app/{k9mail => common}/build.gradle.kts | 0 app/{k9mail => common}/src/main/AndroidManifest.xml | 0 .../src/main/java/com/fsck/k9/CommonApp.kt | 0 .../src/main/java/com/fsck/k9/CommonKoinModule.kt | 0 .../java/com/fsck/k9/MessagingListenerProvider.kt | 0 .../java/com/fsck/k9/account/AccountColorPicker.kt | 0 .../main/java/com/fsck/k9/account/AccountCreator.kt | 0 .../main/java/com/fsck/k9/account/AccountModule.kt | 0 .../com/fsck/k9/account/AccountOwnerNameProvider.kt | 0 .../fsck/k9/account/AccountServerSettingsUpdater.kt | 0 .../java/com/fsck/k9/account/AccountStateLoader.kt | 0 .../com/fsck/k9/backends/AccountAuthStateStorage.kt | 0 .../com/fsck/k9/backends/AndroidAlarmManager.kt | 0 .../java/com/fsck/k9/backends/ImapBackendFactory.kt | 0 .../k9/backends/ImapServerSettingsExtensions.kt | 0 .../main/java/com/fsck/k9/backends/KoinModule.kt | 0 .../java/com/fsck/k9/backends/Pop3BackendFactory.kt | 0 .../com/fsck/k9/backends/RealOAuth2TokenProvider.kt | 0 .../k9/backends/RealOAuth2TokenProviderFactory.kt | 0 .../fsck/k9/feature/AccountSetupFinishedLauncher.kt | 0 .../main/java/com/fsck/k9/feature/FeatureModule.kt | 0 .../com/fsck/k9/feature/ImportSettingsLauncher.kt | 0 .../k9/featureflag/InMemoryFeatureFlagFactory.kt | 0 .../java/com/fsck/k9/glide/K9AppGlideModule.java | 0 .../k9/notification/K9NotificationActionCreator.kt | 0 .../notification/K9NotificationResourceProvider.kt | 0 .../fsck/k9/notification/K9NotificationStrategy.kt | 0 .../java/com/fsck/k9/notification/KoinModule.kt | 0 .../com/fsck/k9/provider/UnreadWidgetProvider.kt | 0 .../fsck/k9/resources/K9AutocryptStringProvider.kt | 0 .../com/fsck/k9/resources/K9CoreResourceProvider.kt | 0 .../main/java/com/fsck/k9/resources/KoinModule.kt | 0 .../main/java/com/fsck/k9/widget/list/KoinModule.kt | 0 .../k9/widget/list/MessageListWidgetProvider.kt | 0 .../java/com/fsck/k9/widget/unread/KoinModule.kt | 0 .../unread/UnreadWidgetConfigurationActivity.kt | 0 .../unread/UnreadWidgetConfigurationFragment.kt | 0 .../com/fsck/k9/widget/unread/UnreadWidgetData.kt | 0 .../k9/widget/unread/UnreadWidgetDataProvider.kt | 0 .../fsck/k9/widget/unread/UnreadWidgetMigrations.kt | 0 .../fsck/k9/widget/unread/UnreadWidgetRepository.kt | 0 .../k9/widget/unread/UnreadWidgetUpdateListener.kt | 0 .../fsck/k9/widget/unread/UnreadWidgetUpdater.kt | 0 .../src/main/res/drawable-hdpi/ic_unread_widget.png | Bin .../res/drawable-hdpi/ic_unread_widget_selected.png | Bin .../src/main/res/drawable-mdpi/ic_unread_widget.png | Bin .../res/drawable-mdpi/ic_unread_widget_selected.png | Bin .../main/res/drawable-xhdpi/ic_unread_widget.png | Bin .../drawable-xhdpi/ic_unread_widget_selected.png | Bin .../main/res/drawable/unread_count_background.xml | 0 .../main/res/drawable/unread_widget_background.xml | 0 .../src/main/res/drawable/unread_widget_icon.xml | 0 .../layout/activity_unread_widget_configuration.xml | 0 .../src/main/res/layout/unread_widget_layout.xml | 0 .../src/main/res/menu/unread_widget_option.xml | 0 .../main/res/values-land/unread_widget_styles.xml | 0 .../values-sw600dp-land/unread_widget_styles.xml | 0 .../values-sw600dp-port/unread_widget_styles.xml | 0 .../src/main/res/values/manifest_values.xml | 0 .../src/main/res/values/unread_widget_styles.xml | 0 .../src/main/res/xml/network_security_config.xml | 0 .../main/res/xml/unread_widget_configuration.xml | 0 .../src/main/res/xml/unread_widget_info.xml | 0 .../java/com/fsck/k9/DependencyInjectionTest.kt | 0 .../src/test/java/com/fsck/k9/TestApp.kt | 0 .../k9/account/AccountServerSettingsUpdaterTest.kt | 0 .../com/fsck/k9/account/AccountStateLoaderTest.kt | 0 .../com/fsck/k9/account/DeletePolicyHelperTest.kt | 0 .../java/com/fsck/k9/account/FakeAccountManager.kt | 0 .../widget/unread/UnreadWidgetDataProviderTest.kt | 0 ...pp-k9mail.xml => detekt-baseline-app-common.xml} | 0 settings.gradle.kts | 2 +- 73 files changed, 2 insertions(+), 2 deletions(-) rename app/{k9mail => common}/build.gradle.kts (100%) rename app/{k9mail => common}/src/main/AndroidManifest.xml (100%) rename app/{k9mail => common}/src/main/java/com/fsck/k9/CommonApp.kt (100%) rename app/{k9mail => common}/src/main/java/com/fsck/k9/CommonKoinModule.kt (100%) rename app/{k9mail => common}/src/main/java/com/fsck/k9/MessagingListenerProvider.kt (100%) rename app/{k9mail => common}/src/main/java/com/fsck/k9/account/AccountColorPicker.kt (100%) rename app/{k9mail => common}/src/main/java/com/fsck/k9/account/AccountCreator.kt (100%) rename app/{k9mail => common}/src/main/java/com/fsck/k9/account/AccountModule.kt (100%) rename app/{k9mail => common}/src/main/java/com/fsck/k9/account/AccountOwnerNameProvider.kt (100%) rename app/{k9mail => common}/src/main/java/com/fsck/k9/account/AccountServerSettingsUpdater.kt (100%) rename app/{k9mail => common}/src/main/java/com/fsck/k9/account/AccountStateLoader.kt (100%) rename app/{k9mail => common}/src/main/java/com/fsck/k9/backends/AccountAuthStateStorage.kt (100%) rename app/{k9mail => common}/src/main/java/com/fsck/k9/backends/AndroidAlarmManager.kt (100%) rename app/{k9mail => common}/src/main/java/com/fsck/k9/backends/ImapBackendFactory.kt (100%) rename app/{k9mail => common}/src/main/java/com/fsck/k9/backends/ImapServerSettingsExtensions.kt (100%) rename app/{k9mail => common}/src/main/java/com/fsck/k9/backends/KoinModule.kt (100%) rename app/{k9mail => common}/src/main/java/com/fsck/k9/backends/Pop3BackendFactory.kt (100%) rename app/{k9mail => common}/src/main/java/com/fsck/k9/backends/RealOAuth2TokenProvider.kt (100%) rename app/{k9mail => common}/src/main/java/com/fsck/k9/backends/RealOAuth2TokenProviderFactory.kt (100%) rename app/{k9mail => common}/src/main/java/com/fsck/k9/feature/AccountSetupFinishedLauncher.kt (100%) rename app/{k9mail => common}/src/main/java/com/fsck/k9/feature/FeatureModule.kt (100%) rename app/{k9mail => common}/src/main/java/com/fsck/k9/feature/ImportSettingsLauncher.kt (100%) rename app/{k9mail => common}/src/main/java/com/fsck/k9/featureflag/InMemoryFeatureFlagFactory.kt (100%) rename app/{k9mail => common}/src/main/java/com/fsck/k9/glide/K9AppGlideModule.java (100%) rename app/{k9mail => common}/src/main/java/com/fsck/k9/notification/K9NotificationActionCreator.kt (100%) rename app/{k9mail => common}/src/main/java/com/fsck/k9/notification/K9NotificationResourceProvider.kt (100%) rename app/{k9mail => common}/src/main/java/com/fsck/k9/notification/K9NotificationStrategy.kt (100%) rename app/{k9mail => common}/src/main/java/com/fsck/k9/notification/KoinModule.kt (100%) rename app/{k9mail => common}/src/main/java/com/fsck/k9/provider/UnreadWidgetProvider.kt (100%) rename app/{k9mail => common}/src/main/java/com/fsck/k9/resources/K9AutocryptStringProvider.kt (100%) rename app/{k9mail => common}/src/main/java/com/fsck/k9/resources/K9CoreResourceProvider.kt (100%) rename app/{k9mail => common}/src/main/java/com/fsck/k9/resources/KoinModule.kt (100%) rename app/{k9mail => common}/src/main/java/com/fsck/k9/widget/list/KoinModule.kt (100%) rename app/{k9mail => common}/src/main/java/com/fsck/k9/widget/list/MessageListWidgetProvider.kt (100%) rename app/{k9mail => common}/src/main/java/com/fsck/k9/widget/unread/KoinModule.kt (100%) rename app/{k9mail => common}/src/main/java/com/fsck/k9/widget/unread/UnreadWidgetConfigurationActivity.kt (100%) rename app/{k9mail => common}/src/main/java/com/fsck/k9/widget/unread/UnreadWidgetConfigurationFragment.kt (100%) rename app/{k9mail => common}/src/main/java/com/fsck/k9/widget/unread/UnreadWidgetData.kt (100%) rename app/{k9mail => common}/src/main/java/com/fsck/k9/widget/unread/UnreadWidgetDataProvider.kt (100%) rename app/{k9mail => common}/src/main/java/com/fsck/k9/widget/unread/UnreadWidgetMigrations.kt (100%) rename app/{k9mail => common}/src/main/java/com/fsck/k9/widget/unread/UnreadWidgetRepository.kt (100%) rename app/{k9mail => common}/src/main/java/com/fsck/k9/widget/unread/UnreadWidgetUpdateListener.kt (100%) rename app/{k9mail => common}/src/main/java/com/fsck/k9/widget/unread/UnreadWidgetUpdater.kt (100%) rename app/{k9mail => common}/src/main/res/drawable-hdpi/ic_unread_widget.png (100%) rename app/{k9mail => common}/src/main/res/drawable-hdpi/ic_unread_widget_selected.png (100%) rename app/{k9mail => common}/src/main/res/drawable-mdpi/ic_unread_widget.png (100%) rename app/{k9mail => common}/src/main/res/drawable-mdpi/ic_unread_widget_selected.png (100%) rename app/{k9mail => common}/src/main/res/drawable-xhdpi/ic_unread_widget.png (100%) rename app/{k9mail => common}/src/main/res/drawable-xhdpi/ic_unread_widget_selected.png (100%) rename app/{k9mail => common}/src/main/res/drawable/unread_count_background.xml (100%) rename app/{k9mail => common}/src/main/res/drawable/unread_widget_background.xml (100%) rename app/{k9mail => common}/src/main/res/drawable/unread_widget_icon.xml (100%) rename app/{k9mail => common}/src/main/res/layout/activity_unread_widget_configuration.xml (100%) rename app/{k9mail => common}/src/main/res/layout/unread_widget_layout.xml (100%) rename app/{k9mail => common}/src/main/res/menu/unread_widget_option.xml (100%) rename app/{k9mail => common}/src/main/res/values-land/unread_widget_styles.xml (100%) rename app/{k9mail => common}/src/main/res/values-sw600dp-land/unread_widget_styles.xml (100%) rename app/{k9mail => common}/src/main/res/values-sw600dp-port/unread_widget_styles.xml (100%) rename app/{k9mail => common}/src/main/res/values/manifest_values.xml (100%) rename app/{k9mail => common}/src/main/res/values/unread_widget_styles.xml (100%) rename app/{k9mail => common}/src/main/res/xml/network_security_config.xml (100%) rename app/{k9mail => common}/src/main/res/xml/unread_widget_configuration.xml (100%) rename app/{k9mail => common}/src/main/res/xml/unread_widget_info.xml (100%) rename app/{k9mail => common}/src/test/java/com/fsck/k9/DependencyInjectionTest.kt (100%) rename app/{k9mail => common}/src/test/java/com/fsck/k9/TestApp.kt (100%) rename app/{k9mail => common}/src/test/java/com/fsck/k9/account/AccountServerSettingsUpdaterTest.kt (100%) rename app/{k9mail => common}/src/test/java/com/fsck/k9/account/AccountStateLoaderTest.kt (100%) rename app/{k9mail => common}/src/test/java/com/fsck/k9/account/DeletePolicyHelperTest.kt (100%) rename app/{k9mail => common}/src/test/java/com/fsck/k9/account/FakeAccountManager.kt (100%) rename app/{k9mail => common}/src/test/java/com/fsck/k9/widget/unread/UnreadWidgetDataProviderTest.kt (100%) rename config/detekt/{detekt-baseline-app-k9mail.xml => detekt-baseline-app-common.xml} (100%) diff --git a/app-k9mail/build.gradle.kts b/app-k9mail/build.gradle.kts index 4719be17b..2c9fbdd5a 100644 --- a/app-k9mail/build.gradle.kts +++ b/app-k9mail/build.gradle.kts @@ -9,7 +9,7 @@ if (testCoverageEnabled) { } dependencies { - implementation(projects.app.k9mail) + implementation(projects.app.common) implementation(projects.app.core) implementation(projects.app.ui.legacy) diff --git a/app/k9mail/build.gradle.kts b/app/common/build.gradle.kts similarity index 100% rename from app/k9mail/build.gradle.kts rename to app/common/build.gradle.kts diff --git a/app/k9mail/src/main/AndroidManifest.xml b/app/common/src/main/AndroidManifest.xml similarity index 100% rename from app/k9mail/src/main/AndroidManifest.xml rename to app/common/src/main/AndroidManifest.xml diff --git a/app/k9mail/src/main/java/com/fsck/k9/CommonApp.kt b/app/common/src/main/java/com/fsck/k9/CommonApp.kt similarity index 100% rename from app/k9mail/src/main/java/com/fsck/k9/CommonApp.kt rename to app/common/src/main/java/com/fsck/k9/CommonApp.kt diff --git a/app/k9mail/src/main/java/com/fsck/k9/CommonKoinModule.kt b/app/common/src/main/java/com/fsck/k9/CommonKoinModule.kt similarity index 100% rename from app/k9mail/src/main/java/com/fsck/k9/CommonKoinModule.kt rename to app/common/src/main/java/com/fsck/k9/CommonKoinModule.kt diff --git a/app/k9mail/src/main/java/com/fsck/k9/MessagingListenerProvider.kt b/app/common/src/main/java/com/fsck/k9/MessagingListenerProvider.kt similarity index 100% rename from app/k9mail/src/main/java/com/fsck/k9/MessagingListenerProvider.kt rename to app/common/src/main/java/com/fsck/k9/MessagingListenerProvider.kt diff --git a/app/k9mail/src/main/java/com/fsck/k9/account/AccountColorPicker.kt b/app/common/src/main/java/com/fsck/k9/account/AccountColorPicker.kt similarity index 100% rename from app/k9mail/src/main/java/com/fsck/k9/account/AccountColorPicker.kt rename to app/common/src/main/java/com/fsck/k9/account/AccountColorPicker.kt diff --git a/app/k9mail/src/main/java/com/fsck/k9/account/AccountCreator.kt b/app/common/src/main/java/com/fsck/k9/account/AccountCreator.kt similarity index 100% rename from app/k9mail/src/main/java/com/fsck/k9/account/AccountCreator.kt rename to app/common/src/main/java/com/fsck/k9/account/AccountCreator.kt diff --git a/app/k9mail/src/main/java/com/fsck/k9/account/AccountModule.kt b/app/common/src/main/java/com/fsck/k9/account/AccountModule.kt similarity index 100% rename from app/k9mail/src/main/java/com/fsck/k9/account/AccountModule.kt rename to app/common/src/main/java/com/fsck/k9/account/AccountModule.kt diff --git a/app/k9mail/src/main/java/com/fsck/k9/account/AccountOwnerNameProvider.kt b/app/common/src/main/java/com/fsck/k9/account/AccountOwnerNameProvider.kt similarity index 100% rename from app/k9mail/src/main/java/com/fsck/k9/account/AccountOwnerNameProvider.kt rename to app/common/src/main/java/com/fsck/k9/account/AccountOwnerNameProvider.kt diff --git a/app/k9mail/src/main/java/com/fsck/k9/account/AccountServerSettingsUpdater.kt b/app/common/src/main/java/com/fsck/k9/account/AccountServerSettingsUpdater.kt similarity index 100% rename from app/k9mail/src/main/java/com/fsck/k9/account/AccountServerSettingsUpdater.kt rename to app/common/src/main/java/com/fsck/k9/account/AccountServerSettingsUpdater.kt diff --git a/app/k9mail/src/main/java/com/fsck/k9/account/AccountStateLoader.kt b/app/common/src/main/java/com/fsck/k9/account/AccountStateLoader.kt similarity index 100% rename from app/k9mail/src/main/java/com/fsck/k9/account/AccountStateLoader.kt rename to app/common/src/main/java/com/fsck/k9/account/AccountStateLoader.kt diff --git a/app/k9mail/src/main/java/com/fsck/k9/backends/AccountAuthStateStorage.kt b/app/common/src/main/java/com/fsck/k9/backends/AccountAuthStateStorage.kt similarity index 100% rename from app/k9mail/src/main/java/com/fsck/k9/backends/AccountAuthStateStorage.kt rename to app/common/src/main/java/com/fsck/k9/backends/AccountAuthStateStorage.kt diff --git a/app/k9mail/src/main/java/com/fsck/k9/backends/AndroidAlarmManager.kt b/app/common/src/main/java/com/fsck/k9/backends/AndroidAlarmManager.kt similarity index 100% rename from app/k9mail/src/main/java/com/fsck/k9/backends/AndroidAlarmManager.kt rename to app/common/src/main/java/com/fsck/k9/backends/AndroidAlarmManager.kt diff --git a/app/k9mail/src/main/java/com/fsck/k9/backends/ImapBackendFactory.kt b/app/common/src/main/java/com/fsck/k9/backends/ImapBackendFactory.kt similarity index 100% rename from app/k9mail/src/main/java/com/fsck/k9/backends/ImapBackendFactory.kt rename to app/common/src/main/java/com/fsck/k9/backends/ImapBackendFactory.kt diff --git a/app/k9mail/src/main/java/com/fsck/k9/backends/ImapServerSettingsExtensions.kt b/app/common/src/main/java/com/fsck/k9/backends/ImapServerSettingsExtensions.kt similarity index 100% rename from app/k9mail/src/main/java/com/fsck/k9/backends/ImapServerSettingsExtensions.kt rename to app/common/src/main/java/com/fsck/k9/backends/ImapServerSettingsExtensions.kt diff --git a/app/k9mail/src/main/java/com/fsck/k9/backends/KoinModule.kt b/app/common/src/main/java/com/fsck/k9/backends/KoinModule.kt similarity index 100% rename from app/k9mail/src/main/java/com/fsck/k9/backends/KoinModule.kt rename to app/common/src/main/java/com/fsck/k9/backends/KoinModule.kt diff --git a/app/k9mail/src/main/java/com/fsck/k9/backends/Pop3BackendFactory.kt b/app/common/src/main/java/com/fsck/k9/backends/Pop3BackendFactory.kt similarity index 100% rename from app/k9mail/src/main/java/com/fsck/k9/backends/Pop3BackendFactory.kt rename to app/common/src/main/java/com/fsck/k9/backends/Pop3BackendFactory.kt diff --git a/app/k9mail/src/main/java/com/fsck/k9/backends/RealOAuth2TokenProvider.kt b/app/common/src/main/java/com/fsck/k9/backends/RealOAuth2TokenProvider.kt similarity index 100% rename from app/k9mail/src/main/java/com/fsck/k9/backends/RealOAuth2TokenProvider.kt rename to app/common/src/main/java/com/fsck/k9/backends/RealOAuth2TokenProvider.kt diff --git a/app/k9mail/src/main/java/com/fsck/k9/backends/RealOAuth2TokenProviderFactory.kt b/app/common/src/main/java/com/fsck/k9/backends/RealOAuth2TokenProviderFactory.kt similarity index 100% rename from app/k9mail/src/main/java/com/fsck/k9/backends/RealOAuth2TokenProviderFactory.kt rename to app/common/src/main/java/com/fsck/k9/backends/RealOAuth2TokenProviderFactory.kt diff --git a/app/k9mail/src/main/java/com/fsck/k9/feature/AccountSetupFinishedLauncher.kt b/app/common/src/main/java/com/fsck/k9/feature/AccountSetupFinishedLauncher.kt similarity index 100% rename from app/k9mail/src/main/java/com/fsck/k9/feature/AccountSetupFinishedLauncher.kt rename to app/common/src/main/java/com/fsck/k9/feature/AccountSetupFinishedLauncher.kt diff --git a/app/k9mail/src/main/java/com/fsck/k9/feature/FeatureModule.kt b/app/common/src/main/java/com/fsck/k9/feature/FeatureModule.kt similarity index 100% rename from app/k9mail/src/main/java/com/fsck/k9/feature/FeatureModule.kt rename to app/common/src/main/java/com/fsck/k9/feature/FeatureModule.kt diff --git a/app/k9mail/src/main/java/com/fsck/k9/feature/ImportSettingsLauncher.kt b/app/common/src/main/java/com/fsck/k9/feature/ImportSettingsLauncher.kt similarity index 100% rename from app/k9mail/src/main/java/com/fsck/k9/feature/ImportSettingsLauncher.kt rename to app/common/src/main/java/com/fsck/k9/feature/ImportSettingsLauncher.kt diff --git a/app/k9mail/src/main/java/com/fsck/k9/featureflag/InMemoryFeatureFlagFactory.kt b/app/common/src/main/java/com/fsck/k9/featureflag/InMemoryFeatureFlagFactory.kt similarity index 100% rename from app/k9mail/src/main/java/com/fsck/k9/featureflag/InMemoryFeatureFlagFactory.kt rename to app/common/src/main/java/com/fsck/k9/featureflag/InMemoryFeatureFlagFactory.kt diff --git a/app/k9mail/src/main/java/com/fsck/k9/glide/K9AppGlideModule.java b/app/common/src/main/java/com/fsck/k9/glide/K9AppGlideModule.java similarity index 100% rename from app/k9mail/src/main/java/com/fsck/k9/glide/K9AppGlideModule.java rename to app/common/src/main/java/com/fsck/k9/glide/K9AppGlideModule.java diff --git a/app/k9mail/src/main/java/com/fsck/k9/notification/K9NotificationActionCreator.kt b/app/common/src/main/java/com/fsck/k9/notification/K9NotificationActionCreator.kt similarity index 100% rename from app/k9mail/src/main/java/com/fsck/k9/notification/K9NotificationActionCreator.kt rename to app/common/src/main/java/com/fsck/k9/notification/K9NotificationActionCreator.kt diff --git a/app/k9mail/src/main/java/com/fsck/k9/notification/K9NotificationResourceProvider.kt b/app/common/src/main/java/com/fsck/k9/notification/K9NotificationResourceProvider.kt similarity index 100% rename from app/k9mail/src/main/java/com/fsck/k9/notification/K9NotificationResourceProvider.kt rename to app/common/src/main/java/com/fsck/k9/notification/K9NotificationResourceProvider.kt diff --git a/app/k9mail/src/main/java/com/fsck/k9/notification/K9NotificationStrategy.kt b/app/common/src/main/java/com/fsck/k9/notification/K9NotificationStrategy.kt similarity index 100% rename from app/k9mail/src/main/java/com/fsck/k9/notification/K9NotificationStrategy.kt rename to app/common/src/main/java/com/fsck/k9/notification/K9NotificationStrategy.kt diff --git a/app/k9mail/src/main/java/com/fsck/k9/notification/KoinModule.kt b/app/common/src/main/java/com/fsck/k9/notification/KoinModule.kt similarity index 100% rename from app/k9mail/src/main/java/com/fsck/k9/notification/KoinModule.kt rename to app/common/src/main/java/com/fsck/k9/notification/KoinModule.kt diff --git a/app/k9mail/src/main/java/com/fsck/k9/provider/UnreadWidgetProvider.kt b/app/common/src/main/java/com/fsck/k9/provider/UnreadWidgetProvider.kt similarity index 100% rename from app/k9mail/src/main/java/com/fsck/k9/provider/UnreadWidgetProvider.kt rename to app/common/src/main/java/com/fsck/k9/provider/UnreadWidgetProvider.kt diff --git a/app/k9mail/src/main/java/com/fsck/k9/resources/K9AutocryptStringProvider.kt b/app/common/src/main/java/com/fsck/k9/resources/K9AutocryptStringProvider.kt similarity index 100% rename from app/k9mail/src/main/java/com/fsck/k9/resources/K9AutocryptStringProvider.kt rename to app/common/src/main/java/com/fsck/k9/resources/K9AutocryptStringProvider.kt diff --git a/app/k9mail/src/main/java/com/fsck/k9/resources/K9CoreResourceProvider.kt b/app/common/src/main/java/com/fsck/k9/resources/K9CoreResourceProvider.kt similarity index 100% rename from app/k9mail/src/main/java/com/fsck/k9/resources/K9CoreResourceProvider.kt rename to app/common/src/main/java/com/fsck/k9/resources/K9CoreResourceProvider.kt diff --git a/app/k9mail/src/main/java/com/fsck/k9/resources/KoinModule.kt b/app/common/src/main/java/com/fsck/k9/resources/KoinModule.kt similarity index 100% rename from app/k9mail/src/main/java/com/fsck/k9/resources/KoinModule.kt rename to app/common/src/main/java/com/fsck/k9/resources/KoinModule.kt diff --git a/app/k9mail/src/main/java/com/fsck/k9/widget/list/KoinModule.kt b/app/common/src/main/java/com/fsck/k9/widget/list/KoinModule.kt similarity index 100% rename from app/k9mail/src/main/java/com/fsck/k9/widget/list/KoinModule.kt rename to app/common/src/main/java/com/fsck/k9/widget/list/KoinModule.kt diff --git a/app/k9mail/src/main/java/com/fsck/k9/widget/list/MessageListWidgetProvider.kt b/app/common/src/main/java/com/fsck/k9/widget/list/MessageListWidgetProvider.kt similarity index 100% rename from app/k9mail/src/main/java/com/fsck/k9/widget/list/MessageListWidgetProvider.kt rename to app/common/src/main/java/com/fsck/k9/widget/list/MessageListWidgetProvider.kt diff --git a/app/k9mail/src/main/java/com/fsck/k9/widget/unread/KoinModule.kt b/app/common/src/main/java/com/fsck/k9/widget/unread/KoinModule.kt similarity index 100% rename from app/k9mail/src/main/java/com/fsck/k9/widget/unread/KoinModule.kt rename to app/common/src/main/java/com/fsck/k9/widget/unread/KoinModule.kt diff --git a/app/k9mail/src/main/java/com/fsck/k9/widget/unread/UnreadWidgetConfigurationActivity.kt b/app/common/src/main/java/com/fsck/k9/widget/unread/UnreadWidgetConfigurationActivity.kt similarity index 100% rename from app/k9mail/src/main/java/com/fsck/k9/widget/unread/UnreadWidgetConfigurationActivity.kt rename to app/common/src/main/java/com/fsck/k9/widget/unread/UnreadWidgetConfigurationActivity.kt diff --git a/app/k9mail/src/main/java/com/fsck/k9/widget/unread/UnreadWidgetConfigurationFragment.kt b/app/common/src/main/java/com/fsck/k9/widget/unread/UnreadWidgetConfigurationFragment.kt similarity index 100% rename from app/k9mail/src/main/java/com/fsck/k9/widget/unread/UnreadWidgetConfigurationFragment.kt rename to app/common/src/main/java/com/fsck/k9/widget/unread/UnreadWidgetConfigurationFragment.kt diff --git a/app/k9mail/src/main/java/com/fsck/k9/widget/unread/UnreadWidgetData.kt b/app/common/src/main/java/com/fsck/k9/widget/unread/UnreadWidgetData.kt similarity index 100% rename from app/k9mail/src/main/java/com/fsck/k9/widget/unread/UnreadWidgetData.kt rename to app/common/src/main/java/com/fsck/k9/widget/unread/UnreadWidgetData.kt diff --git a/app/k9mail/src/main/java/com/fsck/k9/widget/unread/UnreadWidgetDataProvider.kt b/app/common/src/main/java/com/fsck/k9/widget/unread/UnreadWidgetDataProvider.kt similarity index 100% rename from app/k9mail/src/main/java/com/fsck/k9/widget/unread/UnreadWidgetDataProvider.kt rename to app/common/src/main/java/com/fsck/k9/widget/unread/UnreadWidgetDataProvider.kt diff --git a/app/k9mail/src/main/java/com/fsck/k9/widget/unread/UnreadWidgetMigrations.kt b/app/common/src/main/java/com/fsck/k9/widget/unread/UnreadWidgetMigrations.kt similarity index 100% rename from app/k9mail/src/main/java/com/fsck/k9/widget/unread/UnreadWidgetMigrations.kt rename to app/common/src/main/java/com/fsck/k9/widget/unread/UnreadWidgetMigrations.kt diff --git a/app/k9mail/src/main/java/com/fsck/k9/widget/unread/UnreadWidgetRepository.kt b/app/common/src/main/java/com/fsck/k9/widget/unread/UnreadWidgetRepository.kt similarity index 100% rename from app/k9mail/src/main/java/com/fsck/k9/widget/unread/UnreadWidgetRepository.kt rename to app/common/src/main/java/com/fsck/k9/widget/unread/UnreadWidgetRepository.kt diff --git a/app/k9mail/src/main/java/com/fsck/k9/widget/unread/UnreadWidgetUpdateListener.kt b/app/common/src/main/java/com/fsck/k9/widget/unread/UnreadWidgetUpdateListener.kt similarity index 100% rename from app/k9mail/src/main/java/com/fsck/k9/widget/unread/UnreadWidgetUpdateListener.kt rename to app/common/src/main/java/com/fsck/k9/widget/unread/UnreadWidgetUpdateListener.kt diff --git a/app/k9mail/src/main/java/com/fsck/k9/widget/unread/UnreadWidgetUpdater.kt b/app/common/src/main/java/com/fsck/k9/widget/unread/UnreadWidgetUpdater.kt similarity index 100% rename from app/k9mail/src/main/java/com/fsck/k9/widget/unread/UnreadWidgetUpdater.kt rename to app/common/src/main/java/com/fsck/k9/widget/unread/UnreadWidgetUpdater.kt diff --git a/app/k9mail/src/main/res/drawable-hdpi/ic_unread_widget.png b/app/common/src/main/res/drawable-hdpi/ic_unread_widget.png similarity index 100% rename from app/k9mail/src/main/res/drawable-hdpi/ic_unread_widget.png rename to app/common/src/main/res/drawable-hdpi/ic_unread_widget.png diff --git a/app/k9mail/src/main/res/drawable-hdpi/ic_unread_widget_selected.png b/app/common/src/main/res/drawable-hdpi/ic_unread_widget_selected.png similarity index 100% rename from app/k9mail/src/main/res/drawable-hdpi/ic_unread_widget_selected.png rename to app/common/src/main/res/drawable-hdpi/ic_unread_widget_selected.png diff --git a/app/k9mail/src/main/res/drawable-mdpi/ic_unread_widget.png b/app/common/src/main/res/drawable-mdpi/ic_unread_widget.png similarity index 100% rename from app/k9mail/src/main/res/drawable-mdpi/ic_unread_widget.png rename to app/common/src/main/res/drawable-mdpi/ic_unread_widget.png diff --git a/app/k9mail/src/main/res/drawable-mdpi/ic_unread_widget_selected.png b/app/common/src/main/res/drawable-mdpi/ic_unread_widget_selected.png similarity index 100% rename from app/k9mail/src/main/res/drawable-mdpi/ic_unread_widget_selected.png rename to app/common/src/main/res/drawable-mdpi/ic_unread_widget_selected.png diff --git a/app/k9mail/src/main/res/drawable-xhdpi/ic_unread_widget.png b/app/common/src/main/res/drawable-xhdpi/ic_unread_widget.png similarity index 100% rename from app/k9mail/src/main/res/drawable-xhdpi/ic_unread_widget.png rename to app/common/src/main/res/drawable-xhdpi/ic_unread_widget.png diff --git a/app/k9mail/src/main/res/drawable-xhdpi/ic_unread_widget_selected.png b/app/common/src/main/res/drawable-xhdpi/ic_unread_widget_selected.png similarity index 100% rename from app/k9mail/src/main/res/drawable-xhdpi/ic_unread_widget_selected.png rename to app/common/src/main/res/drawable-xhdpi/ic_unread_widget_selected.png diff --git a/app/k9mail/src/main/res/drawable/unread_count_background.xml b/app/common/src/main/res/drawable/unread_count_background.xml similarity index 100% rename from app/k9mail/src/main/res/drawable/unread_count_background.xml rename to app/common/src/main/res/drawable/unread_count_background.xml diff --git a/app/k9mail/src/main/res/drawable/unread_widget_background.xml b/app/common/src/main/res/drawable/unread_widget_background.xml similarity index 100% rename from app/k9mail/src/main/res/drawable/unread_widget_background.xml rename to app/common/src/main/res/drawable/unread_widget_background.xml diff --git a/app/k9mail/src/main/res/drawable/unread_widget_icon.xml b/app/common/src/main/res/drawable/unread_widget_icon.xml similarity index 100% rename from app/k9mail/src/main/res/drawable/unread_widget_icon.xml rename to app/common/src/main/res/drawable/unread_widget_icon.xml diff --git a/app/k9mail/src/main/res/layout/activity_unread_widget_configuration.xml b/app/common/src/main/res/layout/activity_unread_widget_configuration.xml similarity index 100% rename from app/k9mail/src/main/res/layout/activity_unread_widget_configuration.xml rename to app/common/src/main/res/layout/activity_unread_widget_configuration.xml diff --git a/app/k9mail/src/main/res/layout/unread_widget_layout.xml b/app/common/src/main/res/layout/unread_widget_layout.xml similarity index 100% rename from app/k9mail/src/main/res/layout/unread_widget_layout.xml rename to app/common/src/main/res/layout/unread_widget_layout.xml diff --git a/app/k9mail/src/main/res/menu/unread_widget_option.xml b/app/common/src/main/res/menu/unread_widget_option.xml similarity index 100% rename from app/k9mail/src/main/res/menu/unread_widget_option.xml rename to app/common/src/main/res/menu/unread_widget_option.xml diff --git a/app/k9mail/src/main/res/values-land/unread_widget_styles.xml b/app/common/src/main/res/values-land/unread_widget_styles.xml similarity index 100% rename from app/k9mail/src/main/res/values-land/unread_widget_styles.xml rename to app/common/src/main/res/values-land/unread_widget_styles.xml diff --git a/app/k9mail/src/main/res/values-sw600dp-land/unread_widget_styles.xml b/app/common/src/main/res/values-sw600dp-land/unread_widget_styles.xml similarity index 100% rename from app/k9mail/src/main/res/values-sw600dp-land/unread_widget_styles.xml rename to app/common/src/main/res/values-sw600dp-land/unread_widget_styles.xml diff --git a/app/k9mail/src/main/res/values-sw600dp-port/unread_widget_styles.xml b/app/common/src/main/res/values-sw600dp-port/unread_widget_styles.xml similarity index 100% rename from app/k9mail/src/main/res/values-sw600dp-port/unread_widget_styles.xml rename to app/common/src/main/res/values-sw600dp-port/unread_widget_styles.xml diff --git a/app/k9mail/src/main/res/values/manifest_values.xml b/app/common/src/main/res/values/manifest_values.xml similarity index 100% rename from app/k9mail/src/main/res/values/manifest_values.xml rename to app/common/src/main/res/values/manifest_values.xml diff --git a/app/k9mail/src/main/res/values/unread_widget_styles.xml b/app/common/src/main/res/values/unread_widget_styles.xml similarity index 100% rename from app/k9mail/src/main/res/values/unread_widget_styles.xml rename to app/common/src/main/res/values/unread_widget_styles.xml diff --git a/app/k9mail/src/main/res/xml/network_security_config.xml b/app/common/src/main/res/xml/network_security_config.xml similarity index 100% rename from app/k9mail/src/main/res/xml/network_security_config.xml rename to app/common/src/main/res/xml/network_security_config.xml diff --git a/app/k9mail/src/main/res/xml/unread_widget_configuration.xml b/app/common/src/main/res/xml/unread_widget_configuration.xml similarity index 100% rename from app/k9mail/src/main/res/xml/unread_widget_configuration.xml rename to app/common/src/main/res/xml/unread_widget_configuration.xml diff --git a/app/k9mail/src/main/res/xml/unread_widget_info.xml b/app/common/src/main/res/xml/unread_widget_info.xml similarity index 100% rename from app/k9mail/src/main/res/xml/unread_widget_info.xml rename to app/common/src/main/res/xml/unread_widget_info.xml diff --git a/app/k9mail/src/test/java/com/fsck/k9/DependencyInjectionTest.kt b/app/common/src/test/java/com/fsck/k9/DependencyInjectionTest.kt similarity index 100% rename from app/k9mail/src/test/java/com/fsck/k9/DependencyInjectionTest.kt rename to app/common/src/test/java/com/fsck/k9/DependencyInjectionTest.kt diff --git a/app/k9mail/src/test/java/com/fsck/k9/TestApp.kt b/app/common/src/test/java/com/fsck/k9/TestApp.kt similarity index 100% rename from app/k9mail/src/test/java/com/fsck/k9/TestApp.kt rename to app/common/src/test/java/com/fsck/k9/TestApp.kt diff --git a/app/k9mail/src/test/java/com/fsck/k9/account/AccountServerSettingsUpdaterTest.kt b/app/common/src/test/java/com/fsck/k9/account/AccountServerSettingsUpdaterTest.kt similarity index 100% rename from app/k9mail/src/test/java/com/fsck/k9/account/AccountServerSettingsUpdaterTest.kt rename to app/common/src/test/java/com/fsck/k9/account/AccountServerSettingsUpdaterTest.kt diff --git a/app/k9mail/src/test/java/com/fsck/k9/account/AccountStateLoaderTest.kt b/app/common/src/test/java/com/fsck/k9/account/AccountStateLoaderTest.kt similarity index 100% rename from app/k9mail/src/test/java/com/fsck/k9/account/AccountStateLoaderTest.kt rename to app/common/src/test/java/com/fsck/k9/account/AccountStateLoaderTest.kt diff --git a/app/k9mail/src/test/java/com/fsck/k9/account/DeletePolicyHelperTest.kt b/app/common/src/test/java/com/fsck/k9/account/DeletePolicyHelperTest.kt similarity index 100% rename from app/k9mail/src/test/java/com/fsck/k9/account/DeletePolicyHelperTest.kt rename to app/common/src/test/java/com/fsck/k9/account/DeletePolicyHelperTest.kt diff --git a/app/k9mail/src/test/java/com/fsck/k9/account/FakeAccountManager.kt b/app/common/src/test/java/com/fsck/k9/account/FakeAccountManager.kt similarity index 100% rename from app/k9mail/src/test/java/com/fsck/k9/account/FakeAccountManager.kt rename to app/common/src/test/java/com/fsck/k9/account/FakeAccountManager.kt diff --git a/app/k9mail/src/test/java/com/fsck/k9/widget/unread/UnreadWidgetDataProviderTest.kt b/app/common/src/test/java/com/fsck/k9/widget/unread/UnreadWidgetDataProviderTest.kt similarity index 100% rename from app/k9mail/src/test/java/com/fsck/k9/widget/unread/UnreadWidgetDataProviderTest.kt rename to app/common/src/test/java/com/fsck/k9/widget/unread/UnreadWidgetDataProviderTest.kt diff --git a/config/detekt/detekt-baseline-app-k9mail.xml b/config/detekt/detekt-baseline-app-common.xml similarity index 100% rename from config/detekt/detekt-baseline-app-k9mail.xml rename to config/detekt/detekt-baseline-app-common.xml diff --git a/settings.gradle.kts b/settings.gradle.kts index 518823938..0630f9147 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -27,7 +27,7 @@ include( ) include( - ":app:k9mail", + ":app:common", ":app:ui:base", ":app:ui:legacy", ":app:ui:message-list-widget",