Skip to content

Commit 4ffbe57

Browse files
committed
refactor: split out composition stuffs from text package
1 parent 2c2f889 commit 4ffbe57

File tree

4 files changed

+6
-4
lines changed

4 files changed

+6
-4
lines changed

app/src/main/java/com/osfans/trime/ime/text/Composition.kt renamed to app/src/main/java/com/osfans/trime/ime/composition/Composition.kt

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
//
33
// SPDX-License-Identifier: GPL-3.0-or-later
44

5-
package com.osfans.trime.ime.text
5+
package com.osfans.trime.ime.composition
66

77
import android.annotation.SuppressLint
88
import android.content.Context
@@ -31,6 +31,8 @@ import com.osfans.trime.data.theme.model.CompositionComponent
3131
import com.osfans.trime.ime.core.TrimeInputMethodService
3232
import com.osfans.trime.ime.keyboard.Event
3333
import com.osfans.trime.ime.keyboard.KeyboardSwitcher
34+
import com.osfans.trime.ime.text.Candidate
35+
import com.osfans.trime.ime.text.TextInputManager
3436
import com.osfans.trime.util.sp
3537
import splitties.dimensions.dp
3638
import timber.log.Timber

app/src/main/java/com/osfans/trime/ime/text/CompositionPopupWindow.kt renamed to app/src/main/java/com/osfans/trime/ime/composition/CompositionPopupWindow.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
//
33
// SPDX-License-Identifier: GPL-3.0-or-later
44

5-
package com.osfans.trime.ime.text
5+
package com.osfans.trime.ime.composition
66

77
import android.content.Context
88
import android.graphics.RectF

app/src/main/java/com/osfans/trime/ime/core/TrimeInputMethodService.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,7 @@ import com.osfans.trime.data.db.DraftHelper
4242
import com.osfans.trime.data.theme.ColorManager
4343
import com.osfans.trime.data.theme.ThemeManager
4444
import com.osfans.trime.ime.broadcast.IntentReceiver
45+
import com.osfans.trime.ime.composition.CompositionPopupWindow
4546
import com.osfans.trime.ime.enums.FullscreenMode
4647
import com.osfans.trime.ime.enums.InlinePreeditMode
4748
import com.osfans.trime.ime.enums.Keycode
@@ -54,7 +55,6 @@ import com.osfans.trime.ime.keyboard.KeyboardView
5455
import com.osfans.trime.ime.symbol.SymbolBoardType
5556
import com.osfans.trime.ime.symbol.TabManager
5657
import com.osfans.trime.ime.text.Candidate
57-
import com.osfans.trime.ime.text.CompositionPopupWindow
5858
import com.osfans.trime.ime.text.TextInputManager
5959
import com.osfans.trime.util.ShortcutUtils
6060
import com.osfans.trime.util.StringUtils

app/src/main/res/layout/composition_root.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ SPDX-License-Identifier: GPL-3.0-or-later
1212
android:layout_width="wrap_content"
1313
android:layout_height="wrap_content">
1414

15-
<com.osfans.trime.ime.text.Composition
15+
<com.osfans.trime.ime.composition.Composition
1616
android:id="@+id/compositionView"
1717
android:ellipsize="none"
1818
android:layout_width="wrap_content"

0 commit comments

Comments
 (0)