From 7b32170b23bbbf872544bf8412878631fb174bb9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Wolf-Martell=20Montw=C3=A9?= <wolf@thunderbird.net>
Date: Thu, 1 Aug 2024 15:25:26 +0200
Subject: [PATCH] Add `:legacy:ui:account` module and move `DisplayAccount`

---
 legacy/ui/account/build.gradle.kts                    | 11 +++++++++++
 .../app/k9mail/legacy}/ui/account/DisplayAccount.kt   |  2 +-
 legacy/ui/legacy/build.gradle.kts                     |  1 +
 .../legacy/src/main/java/com/fsck/k9/ui/K9Drawer.kt   |  2 +-
 .../java/com/fsck/k9/ui/account/AccountsViewModel.kt  |  1 +
 settings.gradle.kts                                   |  1 +
 6 files changed, 16 insertions(+), 2 deletions(-)
 create mode 100644 legacy/ui/account/build.gradle.kts
 rename legacy/ui/{legacy/src/main/java/com/fsck/k9 => account/src/main/java/app/k9mail/legacy}/ui/account/DisplayAccount.kt (81%)

diff --git a/legacy/ui/account/build.gradle.kts b/legacy/ui/account/build.gradle.kts
new file mode 100644
index 0000000000..dbd3e21ada
--- /dev/null
+++ b/legacy/ui/account/build.gradle.kts
@@ -0,0 +1,11 @@
+plugins {
+    id(ThunderbirdPlugins.Library.android)
+}
+
+android {
+    namespace = "app.k9mail.legacy.ui.account"
+}
+
+dependencies {
+    api(projects.legacy.account)
+}
diff --git a/legacy/ui/legacy/src/main/java/com/fsck/k9/ui/account/DisplayAccount.kt b/legacy/ui/account/src/main/java/app/k9mail/legacy/ui/account/DisplayAccount.kt
similarity index 81%
rename from legacy/ui/legacy/src/main/java/com/fsck/k9/ui/account/DisplayAccount.kt
rename to legacy/ui/account/src/main/java/app/k9mail/legacy/ui/account/DisplayAccount.kt
index f6e9e99bc9..06d2c38f06 100644
--- a/legacy/ui/legacy/src/main/java/com/fsck/k9/ui/account/DisplayAccount.kt
+++ b/legacy/ui/account/src/main/java/app/k9mail/legacy/ui/account/DisplayAccount.kt
@@ -1,4 +1,4 @@
-package com.fsck.k9.ui.account
+package app.k9mail.legacy.ui.account
 
 import app.k9mail.legacy.account.Account
 
diff --git a/legacy/ui/legacy/build.gradle.kts b/legacy/ui/legacy/build.gradle.kts
index ac2e333992..ea3c05e733 100644
--- a/legacy/ui/legacy/build.gradle.kts
+++ b/legacy/ui/legacy/build.gradle.kts
@@ -5,6 +5,7 @@ plugins {
 
 dependencies {
     api(projects.legacy.ui.base)
+    api(projects.legacy.ui.account)
     api(projects.legacy.ui.folder)
     api(projects.core.ui.legacy.designsystem)
     // TODO: Remove once Theme2 is fully migrated
diff --git a/legacy/ui/legacy/src/main/java/com/fsck/k9/ui/K9Drawer.kt b/legacy/ui/legacy/src/main/java/com/fsck/k9/ui/K9Drawer.kt
index 0045a787b3..412a7a6375 100644
--- a/legacy/ui/legacy/src/main/java/com/fsck/k9/ui/K9Drawer.kt
+++ b/legacy/ui/legacy/src/main/java/com/fsck/k9/ui/K9Drawer.kt
@@ -14,6 +14,7 @@ import androidx.swiperefreshlayout.widget.SwipeRefreshLayout
 import app.k9mail.core.ui.legacy.designsystem.atom.icon.Icons
 import app.k9mail.legacy.account.Account
 import app.k9mail.legacy.folder.Folder
+import app.k9mail.legacy.ui.account.DisplayAccount
 import app.k9mail.legacy.ui.folder.FolderIconProvider
 import app.k9mail.legacy.ui.folder.FolderNameFormatter
 import com.fsck.k9.K9
@@ -23,7 +24,6 @@ import com.fsck.k9.controller.SimpleMessagingListener
 import com.fsck.k9.mailstore.DisplayFolder
 import com.fsck.k9.ui.account.AccountImageLoader
 import com.fsck.k9.ui.account.AccountsViewModel
-import com.fsck.k9.ui.account.DisplayAccount
 import com.fsck.k9.ui.base.Theme
 import com.fsck.k9.ui.base.ThemeManager
 import com.fsck.k9.ui.base.livedata.observeNotNull
diff --git a/legacy/ui/legacy/src/main/java/com/fsck/k9/ui/account/AccountsViewModel.kt b/legacy/ui/legacy/src/main/java/com/fsck/k9/ui/account/AccountsViewModel.kt
index c5cafbd400..4ca63ad691 100644
--- a/legacy/ui/legacy/src/main/java/com/fsck/k9/ui/account/AccountsViewModel.kt
+++ b/legacy/ui/legacy/src/main/java/com/fsck/k9/ui/account/AccountsViewModel.kt
@@ -4,6 +4,7 @@ import androidx.lifecycle.LiveData
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.asLiveData
 import app.k9mail.legacy.account.Account
+import app.k9mail.legacy.ui.account.DisplayAccount
 import com.fsck.k9.controller.MessageCounts
 import com.fsck.k9.controller.MessageCountsProvider
 import com.fsck.k9.mailstore.MessageListChangedListener
diff --git a/settings.gradle.kts b/settings.gradle.kts
index 35afa93b8b..2b9a61c4ff 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -97,6 +97,7 @@ include(
     ":legacy:storage",
     ":legacy:testing",
     ":legacy:ui:base",
+    ":legacy:ui:account",
     ":legacy:ui:folder",
     ":legacy:ui:legacy",
 )