From faac4418b2b869173c31e5ab5c96612b13bec938 Mon Sep 17 00:00:00 2001
From: WhiredPlanck <whiredplanck@outlook.com>
Date: Tue, 19 Nov 2024 21:28:45 +0800
Subject: [PATCH] refactor: relocate the files in candidates

---
 app/src/main/java/com/osfans/trime/ime/bar/QuickBar.kt |  2 +-
 .../candidates/{ => compact}/CompactCandidateModule.kt | 10 +++++-----
 .../CompactCandidateViewAdapter.kt                     |  2 +-
 .../PagingCandidateViewAdapter.kt                      |  9 +++++----
 .../unrolled/window/BaseUnrolledCandidateWindow.kt     |  4 ++--
 .../unrolled/window/FlexboxUnrolledCandidateWindow.kt  |  4 ++--
 .../main/java/com/osfans/trime/ime/core/InputView.kt   |  2 +-
 .../com/osfans/trime/ime/dependency/InputComponent.kt  |  2 +-
 8 files changed, 18 insertions(+), 17 deletions(-)
 rename app/src/main/java/com/osfans/trime/ime/candidates/{ => compact}/CompactCandidateModule.kt (96%)
 rename app/src/main/java/com/osfans/trime/ime/candidates/{adapter => compact}/CompactCandidateViewAdapter.kt (98%)
 rename app/src/main/java/com/osfans/trime/ime/candidates/{adapter => unrolled}/PagingCandidateViewAdapter.kt (91%)

diff --git a/app/src/main/java/com/osfans/trime/ime/bar/QuickBar.kt b/app/src/main/java/com/osfans/trime/ime/bar/QuickBar.kt
index 13c7c5ef97..a5faf8add5 100644
--- a/app/src/main/java/com/osfans/trime/ime/bar/QuickBar.kt
+++ b/app/src/main/java/com/osfans/trime/ime/bar/QuickBar.kt
@@ -23,7 +23,7 @@ import com.osfans.trime.ime.bar.ui.AlwaysUi
 import com.osfans.trime.ime.bar.ui.CandidateUi
 import com.osfans.trime.ime.bar.ui.TabUi
 import com.osfans.trime.ime.broadcast.InputBroadcastReceiver
-import com.osfans.trime.ime.candidates.CompactCandidateModule
+import com.osfans.trime.ime.candidates.compact.CompactCandidateModule
 import com.osfans.trime.ime.candidates.popup.PopupCandidatesMode
 import com.osfans.trime.ime.candidates.unrolled.window.FlexboxUnrolledCandidateWindow
 import com.osfans.trime.ime.core.TrimeInputMethodService
diff --git a/app/src/main/java/com/osfans/trime/ime/candidates/CompactCandidateModule.kt b/app/src/main/java/com/osfans/trime/ime/candidates/compact/CompactCandidateModule.kt
similarity index 96%
rename from app/src/main/java/com/osfans/trime/ime/candidates/CompactCandidateModule.kt
rename to app/src/main/java/com/osfans/trime/ime/candidates/compact/CompactCandidateModule.kt
index 4224614fef..9f74a39d6f 100644
--- a/app/src/main/java/com/osfans/trime/ime/candidates/CompactCandidateModule.kt
+++ b/app/src/main/java/com/osfans/trime/ime/candidates/compact/CompactCandidateModule.kt
@@ -1,8 +1,9 @@
-// SPDX-FileCopyrightText: 2024 Rime community
-//
-// SPDX-License-Identifier: GPL-3.0-or-later
+/*
+ * SPDX-FileCopyrightText: 2015 - 2024 Rime community
+ * SPDX-License-Identifier: GPL-3.0-or-later
+ */
 
-package com.osfans.trime.ime.candidates
+package com.osfans.trime.ime.candidates.compact
 
 import android.content.Context
 import android.graphics.drawable.ShapeDrawable
@@ -27,7 +28,6 @@ import com.osfans.trime.data.theme.Theme
 import com.osfans.trime.ime.bar.QuickBar
 import com.osfans.trime.ime.bar.UnrollButtonStateMachine
 import com.osfans.trime.ime.broadcast.InputBroadcastReceiver
-import com.osfans.trime.ime.candidates.adapter.CompactCandidateViewAdapter
 import com.osfans.trime.ime.candidates.popup.PopupCandidatesMode
 import com.osfans.trime.ime.candidates.unrolled.decoration.FlexboxVerticalDecoration
 import com.osfans.trime.ime.core.TrimeInputMethodService
diff --git a/app/src/main/java/com/osfans/trime/ime/candidates/adapter/CompactCandidateViewAdapter.kt b/app/src/main/java/com/osfans/trime/ime/candidates/compact/CompactCandidateViewAdapter.kt
similarity index 98%
rename from app/src/main/java/com/osfans/trime/ime/candidates/adapter/CompactCandidateViewAdapter.kt
rename to app/src/main/java/com/osfans/trime/ime/candidates/compact/CompactCandidateViewAdapter.kt
index 41e594d37f..64f646b507 100644
--- a/app/src/main/java/com/osfans/trime/ime/candidates/adapter/CompactCandidateViewAdapter.kt
+++ b/app/src/main/java/com/osfans/trime/ime/candidates/compact/CompactCandidateViewAdapter.kt
@@ -2,7 +2,7 @@
 //
 // SPDX-License-Identifier: GPL-3.0-or-later
 
-package com.osfans.trime.ime.candidates.adapter
+package com.osfans.trime.ime.candidates.compact
 
 import android.content.Context
 import android.view.ViewGroup
diff --git a/app/src/main/java/com/osfans/trime/ime/candidates/adapter/PagingCandidateViewAdapter.kt b/app/src/main/java/com/osfans/trime/ime/candidates/unrolled/PagingCandidateViewAdapter.kt
similarity index 91%
rename from app/src/main/java/com/osfans/trime/ime/candidates/adapter/PagingCandidateViewAdapter.kt
rename to app/src/main/java/com/osfans/trime/ime/candidates/unrolled/PagingCandidateViewAdapter.kt
index a4310f72a3..82d6c98bc7 100644
--- a/app/src/main/java/com/osfans/trime/ime/candidates/adapter/PagingCandidateViewAdapter.kt
+++ b/app/src/main/java/com/osfans/trime/ime/candidates/unrolled/PagingCandidateViewAdapter.kt
@@ -1,8 +1,9 @@
-// SPDX-FileCopyrightText: 2015 - 2024 Rime community
-//
-// SPDX-License-Identifier: GPL-3.0-or-later
+/*
+ * SPDX-FileCopyrightText: 2015 - 2024 Rime community
+ * SPDX-License-Identifier: GPL-3.0-or-later
+ */
 
-package com.osfans.trime.ime.candidates.adapter
+package com.osfans.trime.ime.candidates.unrolled
 
 import android.view.ViewGroup
 import androidx.paging.PagingDataAdapter
diff --git a/app/src/main/java/com/osfans/trime/ime/candidates/unrolled/window/BaseUnrolledCandidateWindow.kt b/app/src/main/java/com/osfans/trime/ime/candidates/unrolled/window/BaseUnrolledCandidateWindow.kt
index 2501294b9c..712edfbae0 100644
--- a/app/src/main/java/com/osfans/trime/ime/candidates/unrolled/window/BaseUnrolledCandidateWindow.kt
+++ b/app/src/main/java/com/osfans/trime/ime/candidates/unrolled/window/BaseUnrolledCandidateWindow.kt
@@ -23,8 +23,8 @@ import com.osfans.trime.ime.bar.QuickBar
 import com.osfans.trime.ime.bar.UnrollButtonStateMachine
 import com.osfans.trime.ime.broadcast.InputBroadcastReceiver
 import com.osfans.trime.ime.candidates.CandidateViewHolder
-import com.osfans.trime.ime.candidates.CompactCandidateModule
-import com.osfans.trime.ime.candidates.adapter.PagingCandidateViewAdapter
+import com.osfans.trime.ime.candidates.compact.CompactCandidateModule
+import com.osfans.trime.ime.candidates.unrolled.PagingCandidateViewAdapter
 import com.osfans.trime.ime.candidates.unrolled.CandidatesPagingSource
 import com.osfans.trime.ime.candidates.unrolled.UnrolledCandidateLayout
 import com.osfans.trime.ime.core.TrimeInputMethodService
diff --git a/app/src/main/java/com/osfans/trime/ime/candidates/unrolled/window/FlexboxUnrolledCandidateWindow.kt b/app/src/main/java/com/osfans/trime/ime/candidates/unrolled/window/FlexboxUnrolledCandidateWindow.kt
index f4b0a1be7c..bc27627523 100644
--- a/app/src/main/java/com/osfans/trime/ime/candidates/unrolled/window/FlexboxUnrolledCandidateWindow.kt
+++ b/app/src/main/java/com/osfans/trime/ime/candidates/unrolled/window/FlexboxUnrolledCandidateWindow.kt
@@ -16,8 +16,8 @@ import com.osfans.trime.daemon.RimeSession
 import com.osfans.trime.data.theme.Theme
 import com.osfans.trime.ime.bar.QuickBar
 import com.osfans.trime.ime.candidates.CandidateViewHolder
-import com.osfans.trime.ime.candidates.CompactCandidateModule
-import com.osfans.trime.ime.candidates.adapter.PagingCandidateViewAdapter
+import com.osfans.trime.ime.candidates.compact.CompactCandidateModule
+import com.osfans.trime.ime.candidates.unrolled.PagingCandidateViewAdapter
 import com.osfans.trime.ime.candidates.unrolled.UnrolledCandidateLayout
 import com.osfans.trime.ime.candidates.unrolled.decoration.FlexboxHorizontalDecoration
 import com.osfans.trime.ime.core.TrimeInputMethodService
diff --git a/app/src/main/java/com/osfans/trime/ime/core/InputView.kt b/app/src/main/java/com/osfans/trime/ime/core/InputView.kt
index e3dc177f25..12e4fb3be1 100644
--- a/app/src/main/java/com/osfans/trime/ime/core/InputView.kt
+++ b/app/src/main/java/com/osfans/trime/ime/core/InputView.kt
@@ -30,7 +30,7 @@ import com.osfans.trime.data.prefs.AppPrefs
 import com.osfans.trime.data.theme.ColorManager
 import com.osfans.trime.data.theme.Theme
 import com.osfans.trime.ime.bar.QuickBar
-import com.osfans.trime.ime.candidates.CompactCandidateModule
+import com.osfans.trime.ime.candidates.compact.CompactCandidateModule
 import com.osfans.trime.ime.composition.CompositionPopupWindow
 import com.osfans.trime.ime.dependency.InputComponent
 import com.osfans.trime.ime.dependency.create
diff --git a/app/src/main/java/com/osfans/trime/ime/dependency/InputComponent.kt b/app/src/main/java/com/osfans/trime/ime/dependency/InputComponent.kt
index be1debf8de..ab360c7bc6 100644
--- a/app/src/main/java/com/osfans/trime/ime/dependency/InputComponent.kt
+++ b/app/src/main/java/com/osfans/trime/ime/dependency/InputComponent.kt
@@ -10,7 +10,7 @@ import com.osfans.trime.data.theme.Theme
 import com.osfans.trime.ime.bar.QuickBar
 import com.osfans.trime.ime.broadcast.EnterKeyLabelModule
 import com.osfans.trime.ime.broadcast.InputBroadcaster
-import com.osfans.trime.ime.candidates.CompactCandidateModule
+import com.osfans.trime.ime.candidates.compact.CompactCandidateModule
 import com.osfans.trime.ime.composition.CompositionPopupWindow
 import com.osfans.trime.ime.core.InputView
 import com.osfans.trime.ime.core.TrimeInputMethodService