Skip to content

Moves :legacy:ui:account to core:ui:account #9067

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 2 commits into from
Apr 24, 2025
Merged

Moves :legacy:ui:account to core:ui:account #9067

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
47980a4
Refactor: Moved :legacy:ui:account to :core:ui:account
shamim-emon Apr 15, 2025
02d4660
Refactor: Deleted :legacy:ui:account module
shamim-emon Apr 15, 2025
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
2 changes: 1 addition & 1 deletion legacy/ui/account/build.gradle.kts → core/ui/account/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ plugins {
}

android {
namespace = "app.k9mail.legacy.ui.account"
namespace = "net.thunderbird.core.ui.account"
}

dependencies {
Expand Down
2 changes: 1 addition & 1 deletion ...i/account/AccountFallbackImageProvider.kt → ...i/account/AccountFallbackImageProvider.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package app.k9mail.legacy.ui.account
package net.thunderbird.core.ui.account

import android.content.Context
import android.graphics.drawable.ColorDrawable
Expand Down
2 changes: 1 addition & 1 deletion .../k9mail/legacy/ui/account/AccountImage.kt → ...underbird/core/ui/account/AccountImage.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package app.k9mail.legacy.ui.account
package net.thunderbird.core.ui.account

import com.bumptech.glide.load.Key
import java.security.MessageDigest
Expand Down
2 changes: 1 addition & 1 deletion legacy/ui/legacy/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ plugins {

dependencies {
api(projects.legacy.ui.base)
api(projects.legacy.ui.account)
api(projects.core.ui.account)
api(projects.legacy.ui.folder)
api(projects.core.ui.legacy.designsystem)

Expand Down
2 changes: 1 addition & 1 deletion legacy/ui/legacy/src/main/java/com/fsck/k9/contacts/ContactPictureGlideModule.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@
import com.bumptech.glide.annotation.GlideModule;
import com.bumptech.glide.module.LibraryGlideModule;
import app.k9mail.legacy.di.DI;
import app.k9mail.legacy.ui.account.AccountImage;
import com.fsck.k9.ui.account.AccountImageModelLoaderFactory;
import net.thunderbird.core.ui.account.AccountImage;
import org.jetbrains.annotations.NotNull;

@GlideModule
Expand Down
4 changes: 2 additions & 2 deletions legacy/ui/legacy/src/main/java/com/fsck/k9/ui/account/AccountImageModelLoader.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,6 @@ package com.fsck.k9.ui.account

import android.graphics.Bitmap
import androidx.core.graphics.drawable.toBitmap
import app.k9mail.legacy.ui.account.AccountFallbackImageProvider
import app.k9mail.legacy.ui.account.AccountImage
import com.bumptech.glide.Priority
import com.bumptech.glide.load.DataSource
import com.bumptech.glide.load.Options
Expand All @@ -12,6 +10,8 @@ import com.bumptech.glide.load.model.ModelLoader
import com.bumptech.glide.load.model.ModelLoaderFactory
import com.bumptech.glide.load.model.MultiModelLoaderFactory
import com.fsck.k9.contacts.ContactPhotoLoader
import net.thunderbird.core.ui.account.AccountFallbackImageProvider
import net.thunderbird.core.ui.account.AccountImage

/**
* A custom [ModelLoader] so we can use [AccountImageDataFetcher] to load the account image.
Expand Down
2 changes: 1 addition & 1 deletion legacy/ui/legacy/src/main/java/com/fsck/k9/ui/account/KoinModule.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package com.fsck.k9.ui.account

import app.k9mail.legacy.ui.account.AccountFallbackImageProvider
import net.thunderbird.core.ui.account.AccountFallbackImageProvider
import org.koin.dsl.module

val accountUiModule = module {
Expand Down
2 changes: 1 addition & 1 deletion settings.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -168,7 +168,6 @@ include(
":legacy:storage",
":legacy:testing",
":legacy:ui:base",
":legacy:ui:account",
":legacy:ui:folder",
":legacy:ui:legacy",
)
Expand Down Expand Up @@ -226,3 +225,4 @@ include(":core:preferences")
include(":core:mail:mailserver")
include(":feature:notification")
include(":core:ui:theme:manager")
include(":core:ui:account")