refactor: lower case package name and split

Bambooin · Sep 8, 2021 · 61021a1 · 61021a1
1 parent a971088
commit 61021a1
Show file tree

Hide file tree

Showing 15 changed files with 24 additions and 17 deletions.
diff --git a/.../ime/SymbolKeyboard/ClipboardAdapter.java → ...ans/trime/clipboard/ClipboardAdapter.java b/.../ime/SymbolKeyboard/ClipboardAdapter.java → ...ans/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/...ime/ime/SymbolKeyboard/ClipboardBean.java → ...osfans/trime/clipboard/ClipboardBean.java b/...ime/ime/SymbolKeyboard/ClipboardBean.java → ...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/...rime/ime/SymbolKeyboard/ClipboardDao.java → .../osfans/trime/clipboard/ClipboardDao.java b/...rime/ime/SymbolKeyboard/ClipboardDao.java → .../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/...me/SymbolKeyboard/ClipboardSqlHelper.java → ...s/trime/clipboard/ClipboardSqlHelper.java b/...me/SymbolKeyboard/ClipboardSqlHelper.java → ...s/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
@@ -62,18 +62,18 @@
 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;
 import com.osfans.trime.ime.keyboard.Key;
 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/...me/ime/SymbolKeyboard/LiquidKeyboard.java → ...fans/trime/ime/symbol/LiquidKeyboard.java b/...me/ime/SymbolKeyboard/LiquidKeyboard.java → ...fans/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/...ime/ime/SymbolKeyboard/SimpleAdapter.java → ...sfans/trime/ime/symbol/SimpleAdapter.java b/...ime/ime/SymbolKeyboard/SimpleAdapter.java → ...sfans/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/...ime/ime/SymbolKeyboard/SimpleKeyBean.java → ...sfans/trime/ime/symbol/SimpleKeyBean.java b/...ime/ime/SymbolKeyboard/SimpleKeyBean.java → ...sfans/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/...rime/ime/SymbolKeyboard/SimpleKeyDao.java → ...osfans/trime/ime/symbol/SimpleKeyDao.java b/...rime/ime/SymbolKeyboard/SimpleKeyDao.java → ...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/.../trime/ime/SymbolKeyboard/TabManager.java → ...m/osfans/trime/ime/symbol/TabManager.java b/.../trime/ime/SymbolKeyboard/TabManager.java → ...m/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/...fans/trime/ime/SymbolKeyboard/TabTag.java → ...a/com/osfans/trime/ime/symbol/TabTag.java b/...fans/trime/ime/SymbolKeyboard/TabTag.java → ...a/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/...ans/trime/ime/SymbolKeyboard/TabView.java → .../com/osfans/trime/ime/symbol/TabView.java b/...ans/trime/ime/SymbolKeyboard/TabView.java → .../com/osfans/trime/ime/symbol/TabView.java
@@ -16,7 +16,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-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
@@ -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
@@ -58,7 +58,7 @@
                 android:layout_height="wrap_content"
                 android:orientation="horizontal">
 
-                <com.osfans.trime.ime.SymbolKeyboard.TabView
+                <com.osfans.trime.ime.symbol.TabView
                     android:id="@+id/tab_view"
                     android:layout_width="1000dp"
                     android:layout_height="20dp" />

diff --git 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">
 
-                <com.osfans.trime.ime.SymbolKeyboard.TabView
+                <com.osfans.trime.ime.symbol.TabView
                     android:id="@+id/tab_view"
                     android:layout_width="1000dp"
                     android:layout_height="20dp" />