From ff6b838ff4638dd49c133a46828afa4173102bf7 Mon Sep 17 00:00:00 2001
From: WhiredPlanck <whiredplanck@outlook.com>
Date: Thu, 2 May 2024 02:58:49 +0800
Subject: [PATCH] refactor: move DataManager in a standalone package

---
 app/src/main/java/com/osfans/trime/core/Rime.kt                | 2 +-
 .../main/java/com/osfans/trime/data/{ => base}/DataManager.kt  | 3 ++-
 .../java/com/osfans/trime/data/opencc/OpenCCDictManager.kt     | 2 +-
 .../java/com/osfans/trime/data/sound/SoundEffectManager.kt     | 2 +-
 app/src/main/java/com/osfans/trime/data/theme/ColorManager.kt  | 2 +-
 app/src/main/java/com/osfans/trime/data/theme/FontManager.kt   | 2 +-
 app/src/main/java/com/osfans/trime/data/theme/ThemeManager.kt  | 2 +-
 .../java/com/osfans/trime/ui/fragments/KeyboardFragment.kt     | 2 +-
 .../main/java/com/osfans/trime/ui/fragments/ProfileFragment.kt | 2 +-
 app/src/main/java/com/osfans/trime/util/config/Config.kt       | 2 +-
 10 files changed, 11 insertions(+), 10 deletions(-)
 rename app/src/main/java/com/osfans/trime/data/{ => base}/DataManager.kt (97%)

diff --git a/app/src/main/java/com/osfans/trime/core/Rime.kt b/app/src/main/java/com/osfans/trime/core/Rime.kt
index c41294f5fd..39f3840814 100644
--- a/app/src/main/java/com/osfans/trime/core/Rime.kt
+++ b/app/src/main/java/com/osfans/trime/core/Rime.kt
@@ -5,7 +5,7 @@
 package com.osfans.trime.core
 
 import com.osfans.trime.data.AppPrefs
-import com.osfans.trime.data.DataManager
+import com.osfans.trime.data.base.DataManager
 import com.osfans.trime.data.opencc.OpenCCDictManager
 import com.osfans.trime.data.schema.SchemaManager
 import com.osfans.trime.util.appContext
diff --git a/app/src/main/java/com/osfans/trime/data/DataManager.kt b/app/src/main/java/com/osfans/trime/data/base/DataManager.kt
similarity index 97%
rename from app/src/main/java/com/osfans/trime/data/DataManager.kt
rename to app/src/main/java/com/osfans/trime/data/base/DataManager.kt
index 0ac16cd961..8e30e6b10d 100644
--- a/app/src/main/java/com/osfans/trime/data/DataManager.kt
+++ b/app/src/main/java/com/osfans/trime/data/base/DataManager.kt
@@ -2,10 +2,11 @@
 //
 // SPDX-License-Identifier: GPL-3.0-or-later
 
-package com.osfans.trime.data
+package com.osfans.trime.data.base
 
 import com.blankj.utilcode.util.PathUtils
 import com.blankj.utilcode.util.ResourceUtils
+import com.osfans.trime.data.AppPrefs
 import com.osfans.trime.util.Const
 import com.osfans.trime.util.WeakHashSet
 import timber.log.Timber
diff --git a/app/src/main/java/com/osfans/trime/data/opencc/OpenCCDictManager.kt b/app/src/main/java/com/osfans/trime/data/opencc/OpenCCDictManager.kt
index 5fc1641689..6ff70d337f 100644
--- a/app/src/main/java/com/osfans/trime/data/opencc/OpenCCDictManager.kt
+++ b/app/src/main/java/com/osfans/trime/data/opencc/OpenCCDictManager.kt
@@ -5,7 +5,7 @@
 package com.osfans.trime.data.opencc
 
 import androidx.annotation.Keep
-import com.osfans.trime.data.DataManager
+import com.osfans.trime.data.base.DataManager
 import com.osfans.trime.data.opencc.dict.Dictionary
 import com.osfans.trime.data.opencc.dict.OpenCCDictionary
 import com.osfans.trime.data.opencc.dict.TextDictionary
diff --git a/app/src/main/java/com/osfans/trime/data/sound/SoundEffectManager.kt b/app/src/main/java/com/osfans/trime/data/sound/SoundEffectManager.kt
index 9b1d9fa49c..a14fe0b0a9 100644
--- a/app/src/main/java/com/osfans/trime/data/sound/SoundEffectManager.kt
+++ b/app/src/main/java/com/osfans/trime/data/sound/SoundEffectManager.kt
@@ -8,7 +8,7 @@ import androidx.annotation.Keep
 import com.charleskorn.kaml.Yaml
 import com.charleskorn.kaml.YamlConfiguration
 import com.osfans.trime.data.AppPrefs
-import com.osfans.trime.data.DataManager
+import com.osfans.trime.data.base.DataManager
 import timber.log.Timber
 import java.io.File
 
diff --git a/app/src/main/java/com/osfans/trime/data/theme/ColorManager.kt b/app/src/main/java/com/osfans/trime/data/theme/ColorManager.kt
index a5a708b342..43f6c0af89 100644
--- a/app/src/main/java/com/osfans/trime/data/theme/ColorManager.kt
+++ b/app/src/main/java/com/osfans/trime/data/theme/ColorManager.kt
@@ -11,7 +11,7 @@ import android.graphics.drawable.GradientDrawable
 import androidx.annotation.ColorInt
 import androidx.core.math.MathUtils
 import com.osfans.trime.data.AppPrefs
-import com.osfans.trime.data.DataManager
+import com.osfans.trime.data.base.DataManager
 import com.osfans.trime.data.sound.SoundEffectManager
 import com.osfans.trime.util.ColorUtils
 import com.osfans.trime.util.WeakHashSet
diff --git a/app/src/main/java/com/osfans/trime/data/theme/FontManager.kt b/app/src/main/java/com/osfans/trime/data/theme/FontManager.kt
index 5ca250ec93..b8acb17fac 100644
--- a/app/src/main/java/com/osfans/trime/data/theme/FontManager.kt
+++ b/app/src/main/java/com/osfans/trime/data/theme/FontManager.kt
@@ -9,7 +9,7 @@ import android.graphics.fonts.Font
 import android.graphics.fonts.FontFamily
 import android.os.Build
 import androidx.annotation.RequiresApi
-import com.osfans.trime.data.DataManager
+import com.osfans.trime.data.base.DataManager
 import timber.log.Timber
 import java.io.File
 
diff --git a/app/src/main/java/com/osfans/trime/data/theme/ThemeManager.kt b/app/src/main/java/com/osfans/trime/data/theme/ThemeManager.kt
index 92718cd881..29a6f2b6e5 100644
--- a/app/src/main/java/com/osfans/trime/data/theme/ThemeManager.kt
+++ b/app/src/main/java/com/osfans/trime/data/theme/ThemeManager.kt
@@ -6,7 +6,7 @@ package com.osfans.trime.data.theme
 
 import androidx.annotation.Keep
 import com.osfans.trime.data.AppPrefs
-import com.osfans.trime.data.DataManager
+import com.osfans.trime.data.base.DataManager
 import com.osfans.trime.ime.symbol.TabManager
 import java.io.File
 
diff --git a/app/src/main/java/com/osfans/trime/ui/fragments/KeyboardFragment.kt b/app/src/main/java/com/osfans/trime/ui/fragments/KeyboardFragment.kt
index de31995e1d..1ef9156fd7 100644
--- a/app/src/main/java/com/osfans/trime/ui/fragments/KeyboardFragment.kt
+++ b/app/src/main/java/com/osfans/trime/ui/fragments/KeyboardFragment.kt
@@ -12,7 +12,7 @@ import androidx.preference.Preference
 import com.osfans.trime.R
 import com.osfans.trime.core.Rime
 import com.osfans.trime.data.AppPrefs
-import com.osfans.trime.data.DataManager
+import com.osfans.trime.data.base.DataManager
 import com.osfans.trime.ime.core.TrimeInputMethodService
 import com.osfans.trime.ui.components.PaddingPreferenceFragment
 import com.osfans.trime.ui.main.MainViewModel
diff --git a/app/src/main/java/com/osfans/trime/ui/fragments/ProfileFragment.kt b/app/src/main/java/com/osfans/trime/ui/fragments/ProfileFragment.kt
index 2f2e796b1f..987f6f5bf1 100644
--- a/app/src/main/java/com/osfans/trime/ui/fragments/ProfileFragment.kt
+++ b/app/src/main/java/com/osfans/trime/ui/fragments/ProfileFragment.kt
@@ -27,7 +27,7 @@ import com.osfans.trime.R
 import com.osfans.trime.core.Rime
 import com.osfans.trime.daemon.RimeDaemon
 import com.osfans.trime.data.AppPrefs
-import com.osfans.trime.data.DataManager
+import com.osfans.trime.data.base.DataManager
 import com.osfans.trime.ui.components.FolderPickerPreference
 import com.osfans.trime.ui.components.PaddingPreferenceFragment
 import com.osfans.trime.ui.main.MainViewModel
diff --git a/app/src/main/java/com/osfans/trime/util/config/Config.kt b/app/src/main/java/com/osfans/trime/util/config/Config.kt
index d0ed218734..ea343780b5 100644
--- a/app/src/main/java/com/osfans/trime/util/config/Config.kt
+++ b/app/src/main/java/com/osfans/trime/util/config/Config.kt
@@ -4,7 +4,7 @@
 
 package com.osfans.trime.util.config
 
-import com.osfans.trime.data.DataManager
+import com.osfans.trime.data.base.DataManager
 import timber.log.Timber
 
 /**