refactor: split out composition stuffs from text package

osfans · May 8, 2024 · 4ffbe57 · 4ffbe57
1 parent 2c2f889
commit 4ffbe57
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 4 deletions.
diff --git a/.../com/osfans/trime/ime/text/Composition.kt → ...fans/trime/ime/composition/Composition.kt b/.../com/osfans/trime/ime/text/Composition.kt → ...fans/trime/ime/composition/Composition.kt
@@ -2,7 +2,7 @@
 //
 // SPDX-License-Identifier: GPL-3.0-or-later
 
-package com.osfans.trime.ime.text
+package com.osfans.trime.ime.composition
 
 import android.annotation.SuppressLint
 import android.content.Context
@@ -31,6 +31,8 @@ import com.osfans.trime.data.theme.model.CompositionComponent
 import com.osfans.trime.ime.core.TrimeInputMethodService
 import com.osfans.trime.ime.keyboard.Event
 import com.osfans.trime.ime.keyboard.KeyboardSwitcher
+import com.osfans.trime.ime.text.Candidate
+import com.osfans.trime.ime.text.TextInputManager
 import com.osfans.trime.util.sp
 import splitties.dimensions.dp
 import timber.log.Timber

diff --git a/.../trime/ime/text/CompositionPopupWindow.kt → ...ime/composition/CompositionPopupWindow.kt b/.../trime/ime/text/CompositionPopupWindow.kt → ...ime/composition/CompositionPopupWindow.kt
@@ -2,7 +2,7 @@
 //
 // SPDX-License-Identifier: GPL-3.0-or-later
 
-package com.osfans.trime.ime.text
+package com.osfans.trime.ime.composition
 
 import android.content.Context
 import android.graphics.RectF

diff --git a/app/src/main/java/com/osfans/trime/ime/core/TrimeInputMethodService.kt b/app/src/main/java/com/osfans/trime/ime/core/TrimeInputMethodService.kt
@@ -42,6 +42,7 @@ import com.osfans.trime.data.db.DraftHelper
 import com.osfans.trime.data.theme.ColorManager
 import com.osfans.trime.data.theme.ThemeManager
 import com.osfans.trime.ime.broadcast.IntentReceiver
+import com.osfans.trime.ime.composition.CompositionPopupWindow
 import com.osfans.trime.ime.enums.FullscreenMode
 import com.osfans.trime.ime.enums.InlinePreeditMode
 import com.osfans.trime.ime.enums.Keycode
@@ -54,7 +55,6 @@ import com.osfans.trime.ime.keyboard.KeyboardView
 import com.osfans.trime.ime.symbol.SymbolBoardType
 import com.osfans.trime.ime.symbol.TabManager
 import com.osfans.trime.ime.text.Candidate
-import com.osfans.trime.ime.text.CompositionPopupWindow
 import com.osfans.trime.ime.text.TextInputManager
 import com.osfans.trime.util.ShortcutUtils
 import com.osfans.trime.util.StringUtils

diff --git a/app/src/main/res/layout/composition_root.xml b/app/src/main/res/layout/composition_root.xml
@@ -12,7 +12,7 @@ SPDX-License-Identifier: GPL-3.0-or-later
   android:layout_width="wrap_content"
   android:layout_height="wrap_content">
 
-  <com.osfans.trime.ime.text.Composition
+  <com.osfans.trime.ime.composition.Composition
     android:id="@+id/compositionView"
     android:ellipsize="none"
     android:layout_width="wrap_content"