mirror/thunderbird-android
0
0
Fork 0
mirror of https://github.com/thunderbird/thunderbird-android.git synced 2024-09-19 19:52:14 +02:00
Code

Add :legacy:preferences module and move GeneralSettings and GeneralSettingsManager

Browse Source
This commit is contained in:
Wolf-Martell Montwé 2024-08-06 17:59:29 +02:00
parent 91a92c8b9b
commit 97dbd9b37a
No known key found for this signature in database
GPG Key ID: 6D45B21512ACBF72
18 changed files with 38 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
legacy/core/build.gradle.kts
View File

@ -15,6 +15,7 @@ dependencies {
api(projects.legacy.mailstore)
api(projects.legacy.message)
api(projects.legacy.notification)
api(projects.legacy.preferences)
api(projects.legacy.search)
implementation(projects.plugins.openpgpApiLib.openpgpApi)

4
legacy/core/src/main/java/com/fsck/k9/controller/push/PushController.kt
View File

@ -3,6 +3,8 @@ package com.fsck.k9.controller.push
import app.k9mail.legacy.account.Account
import app.k9mail.legacy.account.Account.FolderMode
import app.k9mail.legacy.account.AccountManager
import app.k9mail.legacy.preferences.BackgroundSync
import app.k9mail.legacy.preferences.GeneralSettingsManager
import com.fsck.k9.backend.BackendManager
import com.fsck.k9.network.ConnectivityChangeListener
import com.fsck.k9.network.ConnectivityManager
@ -12,8 +14,6 @@ import com.fsck.k9.notification.PushNotificationState.ALARM_PERMISSION_MISSING
import com.fsck.k9.notification.PushNotificationState.LISTENING
import com.fsck.k9.notification.PushNotificationState.WAIT_BACKGROUND_SYNC
import com.fsck.k9.notification.PushNotificationState.WAIT_NETWORK
import com.fsck.k9.preferences.BackgroundSync
import com.fsck.k9.preferences.GeneralSettingsManager
import java.util.concurrent.Executors
import kotlinx.coroutines.CoroutineDispatcher
import kotlinx.coroutines.CoroutineScope

2
legacy/core/src/main/java/com/fsck/k9/preferences/GeneralSettingsDescriptions.java
View File

@ -13,6 +13,8 @@ import android.content.Context;
import app.k9mail.legacy.account.Account;
import app.k9mail.legacy.account.Account.SortType;
import app.k9mail.legacy.di.DI;
import app.k9mail.legacy.preferences.AppTheme;
import app.k9mail.legacy.preferences.SubTheme;
import com.fsck.k9.FontSizes;
import com.fsck.k9.K9;
import com.fsck.k9.K9.BACKGROUND_OPS;

1
legacy/core/src/main/java/com/fsck/k9/preferences/KoinModule.kt
View File

@ -1,6 +1,7 @@
package com.fsck.k9.preferences
import app.k9mail.legacy.account.AccountManager
import app.k9mail.legacy.preferences.GeneralSettingsManager
import com.fsck.k9.Preferences
import org.koin.core.qualifier.named
import org.koin.dsl.bind

5
legacy/core/src/main/java/com/fsck/k9/preferences/RealGeneralSettingsManager.kt
View File

@ -2,6 +2,11 @@
package com.fsck.k9.preferences
import app.k9mail.legacy.preferences.AppTheme
import app.k9mail.legacy.preferences.BackgroundSync
import app.k9mail.legacy.preferences.GeneralSettings
import app.k9mail.legacy.preferences.GeneralSettingsManager
import app.k9mail.legacy.preferences.SubTheme
import com.fsck.k9.K9
import com.fsck.k9.Preferences
import kotlinx.coroutines.CoroutineDispatcher

4
legacy/core/src/main/java/com/fsck/k9/preferences/upgrader/GeneralSettingsUpgraderTo24.java
View File

@ -4,9 +4,9 @@ package com.fsck.k9.preferences.upgrader;
import java.util.Map;
import java.util.Set;
import com.fsck.k9.preferences.AppTheme;
import app.k9mail.legacy.preferences.AppTheme;
import app.k9mail.legacy.preferences.SubTheme;
import com.fsck.k9.preferences.Settings.SettingsUpgrader;
import com.fsck.k9.preferences.SubTheme;
/**

2
legacy/core/src/main/java/com/fsck/k9/preferences/upgrader/GeneralSettingsUpgraderTo58.java
View File

@ -4,7 +4,7 @@ package com.fsck.k9.preferences.upgrader;
import java.util.Map;
import java.util.Set;
import com.fsck.k9.preferences.AppTheme;
import app.k9mail.legacy.preferences.AppTheme;
import com.fsck.k9.preferences.Settings.SettingsUpgrader;

7
legacy/preferences/build.gradle.kts Normal file
View File

@ -0,0 +1,7 @@
plugins {
id(ThunderbirdPlugins.Library.android)
}
android {
namespace = "app.k9mail.legacy.preferences"
}

2
legacy/core/src/main/java/com/fsck/k9/preferences/GeneralSettings.kt → legacy/preferences/src/main/java/app/k9mail/legacy/preferences/GeneralSettings.kt
View File

@ -1,4 +1,4 @@
package com.fsck.k9.preferences
package app.k9mail.legacy.preferences
/**
* Stores a snapshot of the app's general settings.

2
legacy/core/src/main/java/com/fsck/k9/preferences/GeneralSettingsManager.kt → legacy/preferences/src/main/java/app/k9mail/legacy/preferences/GeneralSettingsManager.kt
View File

@ -1,4 +1,4 @@
package com.fsck.k9.preferences
package app.k9mail.legacy.preferences
import kotlinx.coroutines.flow.Flow

8
legacy/ui/base/src/main/java/com/fsck/k9/ui/base/ThemeManager.kt
View File

@ -5,10 +5,10 @@ import android.content.res.Configuration
import android.os.Build
import androidx.annotation.StyleRes
import androidx.appcompat.app.AppCompatDelegate
import com.fsck.k9.preferences.AppTheme
import com.fsck.k9.preferences.GeneralSettings
import com.fsck.k9.preferences.GeneralSettingsManager
import com.fsck.k9.preferences.SubTheme
import app.k9mail.legacy.preferences.AppTheme
import app.k9mail.legacy.preferences.GeneralSettings
import app.k9mail.legacy.preferences.GeneralSettingsManager
import app.k9mail.legacy.preferences.SubTheme
import kotlinx.coroutines.CoroutineScope
import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.flow.distinctUntilChanged

2
legacy/ui/legacy/src/main/java/com/fsck/k9/activity/MessageList.kt
View File

@ -30,6 +30,7 @@ import app.k9mail.feature.launcher.FeatureLauncherActivity
import app.k9mail.legacy.account.Account
import app.k9mail.legacy.account.AccountManager
import app.k9mail.legacy.message.controller.MessageReference
import app.k9mail.legacy.preferences.GeneralSettingsManager
import app.k9mail.legacy.search.LocalSearch
import app.k9mail.legacy.search.SearchAccount
import app.k9mail.legacy.search.api.SearchAttribute
@ -46,7 +47,6 @@ import com.fsck.k9.account.BackgroundAccountRemover
import com.fsck.k9.activity.compose.MessageActions
import com.fsck.k9.controller.MessagingController
import com.fsck.k9.helper.ParcelableUtil
import com.fsck.k9.preferences.GeneralSettingsManager
import com.fsck.k9.search.isUnifiedInbox
import com.fsck.k9.ui.BuildConfig
import com.fsck.k9.ui.K9Drawer

6
legacy/ui/legacy/src/main/java/com/fsck/k9/activity/MessageListActivityConfig.kt
View File

@ -1,11 +1,11 @@
package com.fsck.k9.activity
import app.k9mail.legacy.preferences.AppTheme
import app.k9mail.legacy.preferences.GeneralSettingsManager
import app.k9mail.legacy.preferences.SubTheme
import com.fsck.k9.K9
import com.fsck.k9.SwipeAction
import com.fsck.k9.UiDensity
import com.fsck.k9.preferences.AppTheme
import com.fsck.k9.preferences.GeneralSettingsManager
import com.fsck.k9.preferences.SubTheme
data class MessageListActivityConfig(
val appTheme: AppTheme,

2
legacy/ui/legacy/src/main/java/com/fsck/k9/ui/changelog/ChangelogViewModel.kt
View File

@ -3,7 +3,7 @@ package com.fsck.k9.ui.changelog
import androidx.lifecycle.LiveData
import androidx.lifecycle.ViewModel
import androidx.lifecycle.asLiveData
import com.fsck.k9.preferences.GeneralSettingsManager
import app.k9mail.legacy.preferences.GeneralSettingsManager
import com.fsck.k9.ui.base.loader.LoaderState
import com.fsck.k9.ui.base.loader.liveDataLoader
import de.cketti.changelog.ReleaseItem

2
legacy/ui/legacy/src/main/java/com/fsck/k9/ui/changelog/RecentChangesViewModel.kt
View File

@ -2,7 +2,7 @@ package com.fsck.k9.ui.changelog
import androidx.lifecycle.ViewModel
import androidx.lifecycle.asLiveData
import com.fsck.k9.preferences.GeneralSettingsManager
import app.k9mail.legacy.preferences.GeneralSettingsManager
import kotlinx.coroutines.ExperimentalCoroutinesApi
import kotlinx.coroutines.flow.Flow
import kotlinx.coroutines.flow.distinctUntilChanged

2
legacy/ui/legacy/src/main/java/com/fsck/k9/ui/messageview/MessageViewFragment.kt
View File

@ -26,6 +26,7 @@ import app.k9mail.core.ui.legacy.designsystem.atom.icon.Icons
import app.k9mail.legacy.account.Account
import app.k9mail.legacy.account.AccountManager
import app.k9mail.legacy.message.controller.MessageReference
import app.k9mail.legacy.preferences.GeneralSettingsManager
import com.fsck.k9.K9
import com.fsck.k9.activity.MessageCompose
import com.fsck.k9.activity.MessageLoaderHelper
@ -42,7 +43,6 @@ import com.fsck.k9.mail.Flag
import com.fsck.k9.mailstore.AttachmentViewInfo
import com.fsck.k9.mailstore.LocalMessage
import com.fsck.k9.mailstore.MessageViewInfo
import com.fsck.k9.preferences.GeneralSettingsManager
import com.fsck.k9.ui.R
import com.fsck.k9.ui.base.Theme
import com.fsck.k9.ui.base.ThemeManager

6
legacy/ui/legacy/src/main/java/com/fsck/k9/ui/settings/general/GeneralSettingsDataStore.kt
View File

@ -1,15 +1,15 @@
package com.fsck.k9.ui.settings.general
import androidx.preference.PreferenceDataStore
import app.k9mail.legacy.preferences.AppTheme
import app.k9mail.legacy.preferences.GeneralSettingsManager
import app.k9mail.legacy.preferences.SubTheme
import com.fsck.k9.K9
import com.fsck.k9.K9.PostMarkAsUnreadNavigation
import com.fsck.k9.K9.PostRemoveNavigation
import com.fsck.k9.SwipeAction
import com.fsck.k9.UiDensity
import com.fsck.k9.job.K9JobManager
import com.fsck.k9.preferences.AppTheme
import com.fsck.k9.preferences.GeneralSettingsManager
import com.fsck.k9.preferences.SubTheme
import com.fsck.k9.ui.base.AppLanguageManager
class GeneralSettingsDataStore(

1
settings.gradle.kts
View File

@ -96,6 +96,7 @@ include(
":legacy:mailstore",
":legacy:message",
":legacy:notification",
":legacy:preferences",
":legacy:search",
":legacy:storage",
":legacy:testing",