From 61021a1b79f01ce882c55c0e448bfad15d320b4e Mon Sep 17 00:00:00 2001 From: Bambooin Date: Wed, 8 Sep 2021 17:23:22 +0800 Subject: [PATCH] refactor: lower case package name and split --- .../{ime/SymbolKeyboard => clipboard}/ClipboardAdapter.java | 3 ++- .../{ime/SymbolKeyboard => clipboard}/ClipboardBean.java | 4 +++- .../{ime/SymbolKeyboard => clipboard}/ClipboardDao.java | 3 ++- .../SymbolKeyboard => clipboard}/ClipboardSqlHelper.java | 2 +- app/src/main/java/com/osfans/trime/ime/core/Trime.java | 6 +++--- .../ime/{SymbolKeyboard => symbol}/LiquidKeyboard.java | 5 ++++- .../trime/ime/{SymbolKeyboard => symbol}/SimpleAdapter.java | 2 +- .../trime/ime/{SymbolKeyboard => symbol}/SimpleKeyBean.java | 2 +- .../trime/ime/{SymbolKeyboard => symbol}/SimpleKeyDao.java | 2 +- .../trime/ime/{SymbolKeyboard => symbol}/TabManager.java | 2 +- .../osfans/trime/ime/{SymbolKeyboard => symbol}/TabTag.java | 2 +- .../trime/ime/{SymbolKeyboard => symbol}/TabView.java | 2 +- app/src/main/java/com/osfans/trime/setup/Config.java | 2 +- app/src/main/res/layout-land/input_root.xml | 2 +- app/src/main/res/layout/input_root.xml | 2 +- 15 files changed, 24 insertions(+), 17 deletions(-) rename app/src/main/java/com/osfans/trime/{ime/SymbolKeyboard => clipboard}/ClipboardAdapter.java (98%) rename app/src/main/java/com/osfans/trime/{ime/SymbolKeyboard => clipboard}/ClipboardBean.java (92%) rename app/src/main/java/com/osfans/trime/{ime/SymbolKeyboard => clipboard}/ClipboardDao.java (97%) rename app/src/main/java/com/osfans/trime/{ime/SymbolKeyboard => clipboard}/ClipboardSqlHelper.java (95%) rename app/src/main/java/com/osfans/trime/ime/{SymbolKeyboard => symbol}/LiquidKeyboard.java (97%) rename app/src/main/java/com/osfans/trime/ime/{SymbolKeyboard => symbol}/SimpleAdapter.java (99%) rename app/src/main/java/com/osfans/trime/ime/{SymbolKeyboard => symbol}/SimpleKeyBean.java (93%) rename app/src/main/java/com/osfans/trime/ime/{SymbolKeyboard => symbol}/SimpleKeyDao.java (98%) rename app/src/main/java/com/osfans/trime/ime/{SymbolKeyboard => symbol}/TabManager.java (98%) rename app/src/main/java/com/osfans/trime/ime/{SymbolKeyboard => symbol}/TabTag.java (94%) rename app/src/main/java/com/osfans/trime/ime/{SymbolKeyboard => symbol}/TabView.java (99%) diff --git a/app/src/main/java/com/osfans/trime/ime/SymbolKeyboard/ClipboardAdapter.java b/app/src/main/java/com/osfans/trime/clipboard/ClipboardAdapter.java similarity index 98% rename from app/src/main/java/com/osfans/trime/ime/SymbolKeyboard/ClipboardAdapter.java rename to app/src/main/java/com/osfans/trime/clipboard/ClipboardAdapter.java index 7cb2e827d6..ab33ecc4c7 100644 --- a/app/src/main/java/com/osfans/trime/ime/SymbolKeyboard/ClipboardAdapter.java +++ b/app/src/main/java/com/osfans/trime/clipboard/ClipboardAdapter.java @@ -1,4 +1,4 @@ -package com.osfans.trime.ime.SymbolKeyboard; +package com.osfans.trime.clipboard; import android.annotation.SuppressLint; import android.content.Context; @@ -15,6 +15,7 @@ import androidx.recyclerview.widget.RecyclerView; import com.google.android.flexbox.FlexboxLayoutManager; import com.osfans.trime.R; +import com.osfans.trime.ime.symbol.SimpleKeyBean; import com.osfans.trime.setup.Config; import java.util.List; diff --git a/app/src/main/java/com/osfans/trime/ime/SymbolKeyboard/ClipboardBean.java b/app/src/main/java/com/osfans/trime/clipboard/ClipboardBean.java similarity index 92% rename from app/src/main/java/com/osfans/trime/ime/SymbolKeyboard/ClipboardBean.java rename to app/src/main/java/com/osfans/trime/clipboard/ClipboardBean.java index 793eada426..a4642a6402 100644 --- a/app/src/main/java/com/osfans/trime/ime/SymbolKeyboard/ClipboardBean.java +++ b/app/src/main/java/com/osfans/trime/clipboard/ClipboardBean.java @@ -1,4 +1,6 @@ -package com.osfans.trime.ime.SymbolKeyboard; +package com.osfans.trime.clipboard; + +import com.osfans.trime.ime.symbol.SimpleKeyBean; public class ClipboardBean extends SimpleKeyBean { private long time; diff --git a/app/src/main/java/com/osfans/trime/ime/SymbolKeyboard/ClipboardDao.java b/app/src/main/java/com/osfans/trime/clipboard/ClipboardDao.java similarity index 97% rename from app/src/main/java/com/osfans/trime/ime/SymbolKeyboard/ClipboardDao.java rename to app/src/main/java/com/osfans/trime/clipboard/ClipboardDao.java index 420de589ea..e372c8f990 100644 --- a/app/src/main/java/com/osfans/trime/ime/SymbolKeyboard/ClipboardDao.java +++ b/app/src/main/java/com/osfans/trime/clipboard/ClipboardDao.java @@ -1,9 +1,10 @@ -package com.osfans.trime.ime.SymbolKeyboard; +package com.osfans.trime.clipboard; import android.database.Cursor; import android.database.sqlite.SQLiteDatabase; import android.database.sqlite.SQLiteOpenHelper; import com.osfans.trime.ime.core.Trime; +import com.osfans.trime.ime.symbol.SimpleKeyBean; import java.util.ArrayList; import java.util.List; import timber.log.Timber; diff --git a/app/src/main/java/com/osfans/trime/ime/SymbolKeyboard/ClipboardSqlHelper.java b/app/src/main/java/com/osfans/trime/clipboard/ClipboardSqlHelper.java similarity index 95% rename from app/src/main/java/com/osfans/trime/ime/SymbolKeyboard/ClipboardSqlHelper.java rename to app/src/main/java/com/osfans/trime/clipboard/ClipboardSqlHelper.java index 0afcba5d78..d41f6c1b40 100644 --- a/app/src/main/java/com/osfans/trime/ime/SymbolKeyboard/ClipboardSqlHelper.java +++ b/app/src/main/java/com/osfans/trime/clipboard/ClipboardSqlHelper.java @@ -1,4 +1,4 @@ -package com.osfans.trime.ime.SymbolKeyboard; +package com.osfans.trime.clipboard; import android.content.Context; import android.database.sqlite.SQLiteDatabase; diff --git a/app/src/main/java/com/osfans/trime/ime/core/Trime.java b/app/src/main/java/com/osfans/trime/ime/core/Trime.java index 689c2b96d0..1fa35443b4 100644 --- a/app/src/main/java/com/osfans/trime/ime/core/Trime.java +++ b/app/src/main/java/com/osfans/trime/ime/core/Trime.java @@ -62,11 +62,9 @@ import com.blankj.utilcode.util.BarUtils; import com.osfans.trime.R; import com.osfans.trime.Rime; +import com.osfans.trime.clipboard.ClipboardDao; import com.osfans.trime.databinding.CompositionContainerBinding; import com.osfans.trime.databinding.InputRootBinding; -import com.osfans.trime.ime.SymbolKeyboard.ClipboardDao; -import com.osfans.trime.ime.SymbolKeyboard.LiquidKeyboard; -import com.osfans.trime.ime.SymbolKeyboard.TabView; import com.osfans.trime.ime.enums.InlineModeType; import com.osfans.trime.ime.enums.WindowsPositionType; import com.osfans.trime.ime.keyboard.Event; @@ -74,6 +72,8 @@ import com.osfans.trime.ime.keyboard.Keyboard; import com.osfans.trime.ime.keyboard.KeyboardSwitch; import com.osfans.trime.ime.keyboard.KeyboardView; +import com.osfans.trime.ime.symbol.LiquidKeyboard; +import com.osfans.trime.ime.symbol.TabView; import com.osfans.trime.ime.text.Candidate; import com.osfans.trime.ime.text.Composition; import com.osfans.trime.ime.text.ScrollView; diff --git a/app/src/main/java/com/osfans/trime/ime/SymbolKeyboard/LiquidKeyboard.java b/app/src/main/java/com/osfans/trime/ime/symbol/LiquidKeyboard.java similarity index 97% rename from app/src/main/java/com/osfans/trime/ime/SymbolKeyboard/LiquidKeyboard.java rename to app/src/main/java/com/osfans/trime/ime/symbol/LiquidKeyboard.java index 8afbc95b0b..2c138552aa 100644 --- a/app/src/main/java/com/osfans/trime/ime/SymbolKeyboard/LiquidKeyboard.java +++ b/app/src/main/java/com/osfans/trime/ime/symbol/LiquidKeyboard.java @@ -1,4 +1,4 @@ -package com.osfans.trime.ime.SymbolKeyboard; +package com.osfans.trime.ime.symbol; import android.content.Context; import android.graphics.drawable.Drawable; @@ -10,6 +10,9 @@ import com.google.android.flexbox.FlexboxLayoutManager; import com.google.android.flexbox.JustifyContent; import com.osfans.trime.R; +import com.osfans.trime.clipboard.ClipboardAdapter; +import com.osfans.trime.clipboard.ClipboardBean; +import com.osfans.trime.clipboard.ClipboardDao; import com.osfans.trime.ime.core.Trime; import com.osfans.trime.ime.enums.SymbolKeyboardType; import com.osfans.trime.setup.Config; diff --git a/app/src/main/java/com/osfans/trime/ime/SymbolKeyboard/SimpleAdapter.java b/app/src/main/java/com/osfans/trime/ime/symbol/SimpleAdapter.java similarity index 99% rename from app/src/main/java/com/osfans/trime/ime/SymbolKeyboard/SimpleAdapter.java rename to app/src/main/java/com/osfans/trime/ime/symbol/SimpleAdapter.java index 6c3eb75c68..671ee17c2a 100644 --- a/app/src/main/java/com/osfans/trime/ime/SymbolKeyboard/SimpleAdapter.java +++ b/app/src/main/java/com/osfans/trime/ime/symbol/SimpleAdapter.java @@ -1,4 +1,4 @@ -package com.osfans.trime.ime.SymbolKeyboard; +package com.osfans.trime.ime.symbol; import android.annotation.SuppressLint; import android.content.Context; diff --git a/app/src/main/java/com/osfans/trime/ime/SymbolKeyboard/SimpleKeyBean.java b/app/src/main/java/com/osfans/trime/ime/symbol/SimpleKeyBean.java similarity index 93% rename from app/src/main/java/com/osfans/trime/ime/SymbolKeyboard/SimpleKeyBean.java rename to app/src/main/java/com/osfans/trime/ime/symbol/SimpleKeyBean.java index 75f60e29e5..a9d448d5f8 100644 --- a/app/src/main/java/com/osfans/trime/ime/SymbolKeyboard/SimpleKeyBean.java +++ b/app/src/main/java/com/osfans/trime/ime/symbol/SimpleKeyBean.java @@ -1,4 +1,4 @@ -package com.osfans.trime.ime.SymbolKeyboard; +package com.osfans.trime.ime.symbol; import androidx.annotation.NonNull; import java.io.Serializable; diff --git a/app/src/main/java/com/osfans/trime/ime/SymbolKeyboard/SimpleKeyDao.java b/app/src/main/java/com/osfans/trime/ime/symbol/SimpleKeyDao.java similarity index 98% rename from app/src/main/java/com/osfans/trime/ime/SymbolKeyboard/SimpleKeyDao.java rename to app/src/main/java/com/osfans/trime/ime/symbol/SimpleKeyDao.java index 6d7e26f0fd..fd89498b01 100644 --- a/app/src/main/java/com/osfans/trime/ime/SymbolKeyboard/SimpleKeyDao.java +++ b/app/src/main/java/com/osfans/trime/ime/symbol/SimpleKeyDao.java @@ -1,4 +1,4 @@ -package com.osfans.trime.ime.SymbolKeyboard; +package com.osfans.trime.ime.symbol; import java.io.File; import java.io.FileInputStream; diff --git a/app/src/main/java/com/osfans/trime/ime/SymbolKeyboard/TabManager.java b/app/src/main/java/com/osfans/trime/ime/symbol/TabManager.java similarity index 98% rename from app/src/main/java/com/osfans/trime/ime/SymbolKeyboard/TabManager.java rename to app/src/main/java/com/osfans/trime/ime/symbol/TabManager.java index 49f498e49d..19c60abd74 100644 --- a/app/src/main/java/com/osfans/trime/ime/SymbolKeyboard/TabManager.java +++ b/app/src/main/java/com/osfans/trime/ime/symbol/TabManager.java @@ -1,4 +1,4 @@ -package com.osfans.trime.ime.SymbolKeyboard; +package com.osfans.trime.ime.symbol; import com.osfans.trime.ime.enums.KeyCommandType; import com.osfans.trime.ime.enums.SymbolKeyboardType; diff --git a/app/src/main/java/com/osfans/trime/ime/SymbolKeyboard/TabTag.java b/app/src/main/java/com/osfans/trime/ime/symbol/TabTag.java similarity index 94% rename from app/src/main/java/com/osfans/trime/ime/SymbolKeyboard/TabTag.java rename to app/src/main/java/com/osfans/trime/ime/symbol/TabTag.java index 24537c8f72..fc061373cf 100644 --- a/app/src/main/java/com/osfans/trime/ime/SymbolKeyboard/TabTag.java +++ b/app/src/main/java/com/osfans/trime/ime/symbol/TabTag.java @@ -1,4 +1,4 @@ -package com.osfans.trime.ime.SymbolKeyboard; +package com.osfans.trime.ime.symbol; // Tab是滑动键盘顶部的标签按钮（包含返回键）。 // 为了公用候选栏的皮肤参数以及外观，保持了和普通键盘布局相似的代码。此类相当于原键盘布局的Rime.RimeCandidate diff --git a/app/src/main/java/com/osfans/trime/ime/SymbolKeyboard/TabView.java b/app/src/main/java/com/osfans/trime/ime/symbol/TabView.java similarity index 99% rename from app/src/main/java/com/osfans/trime/ime/SymbolKeyboard/TabView.java rename to app/src/main/java/com/osfans/trime/ime/symbol/TabView.java index 3dc916de47..737b747cd4 100644 --- a/app/src/main/java/com/osfans/trime/ime/SymbolKeyboard/TabView.java +++ b/app/src/main/java/com/osfans/trime/ime/symbol/TabView.java @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package com.osfans.trime.ime.SymbolKeyboard; +package com.osfans.trime.ime.symbol; import android.content.Context; import android.graphics.Canvas; diff --git a/app/src/main/java/com/osfans/trime/setup/Config.java b/app/src/main/java/com/osfans/trime/setup/Config.java index 75dca3682d..ae866ecb9e 100644 --- a/app/src/main/java/com/osfans/trime/setup/Config.java +++ b/app/src/main/java/com/osfans/trime/setup/Config.java @@ -36,11 +36,11 @@ import androidx.annotation.NonNull; import androidx.annotation.Nullable; import com.osfans.trime.Rime; -import com.osfans.trime.ime.SymbolKeyboard.TabManager; import com.osfans.trime.ime.core.Preferences; import com.osfans.trime.ime.enums.SymbolKeyboardType; import com.osfans.trime.ime.enums.WindowsPositionType; import com.osfans.trime.ime.keyboard.Key; +import com.osfans.trime.ime.symbol.TabManager; import com.osfans.trime.util.AppVersionUtils; import com.osfans.trime.util.YamlUtils; import java.io.File; diff --git a/app/src/main/res/layout-land/input_root.xml b/app/src/main/res/layout-land/input_root.xml index 6c91a2f2e8..66f8edd838 100644 --- a/app/src/main/res/layout-land/input_root.xml +++ b/app/src/main/res/layout-land/input_root.xml @@ -58,7 +58,7 @@ android:layout_height="wrap_content" android:orientation="horizontal"> - diff --git a/app/src/main/res/layout/input_root.xml b/app/src/main/res/layout/input_root.xml index a70b904676..7fe33300e9 100644 --- a/app/src/main/res/layout/input_root.xml +++ b/app/src/main/res/layout/input_root.xml @@ -58,7 +58,7 @@ android:layout_height="wrap_content" android:orientation="horizontal"> -