refactor: move DataManager in a standalone package

osfans · May 3, 2024 · ff6b838 · ff6b838
1 parent 7bb35d3
commit ff6b838
Show file tree

Hide file tree

Showing 10 changed files with 11 additions and 10 deletions.
diff --git 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/...java/com/osfans/trime/data/DataManager.kt → ...com/osfans/trime/data/base/DataManager.kt b/...java/com/osfans/trime/data/DataManager.kt → ...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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
 
 /**