Skip to content

Commit 972c8f4

Browse files
committed
chore(core): Move Rime class into core package
1 parent 31f4f99 commit 972c8f4

18 files changed

+18
-18
lines changed

app/src/main/java/com/osfans/trime/Rime.java app/src/main/java/com/osfans/trime/core/Rime.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
* along with this program. If not, see <http://www.gnu.org/licenses/>.
1717
*/
1818

19-
package com.osfans.trime;
19+
package com.osfans.trime.core;
2020

2121
import android.content.Context;
2222
import android.text.TextUtils;

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import android.view.KeyEvent
88
import android.view.inputmethod.EditorInfo
99
import android.view.inputmethod.ExtractedTextRequest
1010
import android.view.inputmethod.InputConnection
11-
import com.osfans.trime.Rime
11+
import com.osfans.trime.core.Rime
1212
import com.osfans.trime.ime.enums.InlineModeType
1313
import com.osfans.trime.ime.text.TextInputManager
1414
import timber.log.Timber

app/src/main/java/com/osfans/trime/ime/core/Speech.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
import androidx.annotation.StringRes;
2929
import com.blankj.utilcode.util.ToastUtils;
3030
import com.osfans.trime.R;
31-
import com.osfans.trime.Rime;
31+
import com.osfans.trime.core.Rime;
3232
import com.osfans.trime.setup.Config;
3333
import java.util.ArrayList;
3434
import java.util.Arrays;

app/src/main/java/com/osfans/trime/ime/core/Trime.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@
6060
import androidx.appcompat.app.AlertDialog;
6161
import com.blankj.utilcode.util.BarUtils;
6262
import com.osfans.trime.R;
63-
import com.osfans.trime.Rime;
63+
import com.osfans.trime.core.Rime;
6464
import com.osfans.trime.clipboard.ClipboardDao;
6565
import com.osfans.trime.common.ViewUtils;
6666
import com.osfans.trime.databinding.CompositionRootBinding;

app/src/main/java/com/osfans/trime/ime/keyboard/Event.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
import android.text.TextUtils;
2222
import android.view.KeyEvent;
2323
import androidx.annotation.NonNull;
24-
import com.osfans.trime.Rime;
24+
import com.osfans.trime.core.Rime;
2525
import com.osfans.trime.setup.Config;
2626
import com.osfans.trime.util.YamlUtils;
2727
import java.util.HashMap;

app/src/main/java/com/osfans/trime/ime/keyboard/Key.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
import android.text.TextUtils;
2525
import android.view.KeyCharacterMap;
2626
import android.view.KeyEvent;
27-
import com.osfans.trime.Rime;
27+
import com.osfans.trime.core.Rime;
2828
import com.osfans.trime.ime.enums.KeyEventType;
2929
import com.osfans.trime.setup.Config;
3030
import com.osfans.trime.util.YamlUtils;

app/src/main/java/com/osfans/trime/ime/text/Candidate.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
import android.view.ViewGroup.LayoutParams;
3434
import androidx.annotation.NonNull;
3535
import androidx.annotation.Nullable;
36-
import com.osfans.trime.Rime;
36+
import com.osfans.trime.core.Rime;
3737
import com.osfans.trime.setup.Config;
3838
import com.osfans.trime.util.GraphicUtils;
3939
import java.lang.ref.WeakReference;

app/src/main/java/com/osfans/trime/ime/text/Composition.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@
4242
import android.view.View;
4343
import androidx.annotation.NonNull;
4444
import androidx.appcompat.widget.AppCompatTextView;
45-
import com.osfans.trime.Rime;
45+
import com.osfans.trime.core.Rime;
4646
import com.osfans.trime.common.ViewUtils;
4747
import com.osfans.trime.ime.core.Trime;
4848
import com.osfans.trime.ime.keyboard.Event;

app/src/main/java/com/osfans/trime/ime/text/ScrollView.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
import android.view.animation.TranslateAnimation;
1010
import android.widget.HorizontalScrollView;
1111
import androidx.annotation.NonNull;
12-
import com.osfans.trime.Rime;
12+
import com.osfans.trime.core.Rime;
1313
import timber.log.Timber;
1414

1515
public class ScrollView extends HorizontalScrollView {

app/src/main/java/com/osfans/trime/ime/text/TextInputManager.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import android.view.KeyEvent
55
import android.view.View
66
import android.view.inputmethod.EditorInfo
77
import android.view.inputmethod.InputMethodManager
8-
import com.osfans.trime.Rime
8+
import com.osfans.trime.core.Rime
99
import com.osfans.trime.common.startsWithAsciiChar
1010
import com.osfans.trime.databinding.InputRootBinding
1111
import com.osfans.trime.ime.core.EditorInstance

app/src/main/java/com/osfans/trime/settings/AboutActivity.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ import androidx.fragment.app.Fragment
1010
import androidx.preference.Preference
1111
import androidx.preference.PreferenceFragmentCompat
1212
import com.osfans.trime.R
13-
import com.osfans.trime.Rime
13+
import com.osfans.trime.core.Rime
1414
import com.osfans.trime.databinding.AboutActivityBinding
1515
import com.osfans.trime.util.AppVersionUtils.writeLibraryVersionToSummary
1616

app/src/main/java/com/osfans/trime/settings/components/SchemaPickerDialog.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import android.os.Build
77
import android.view.WindowManager
88
import androidx.appcompat.app.AlertDialog
99
import com.osfans.trime.R
10-
import com.osfans.trime.Rime
10+
import com.osfans.trime.core.Rime
1111
import com.osfans.trime.ime.core.Trime
1212
import com.osfans.trime.setup.Config
1313
import com.osfans.trime.util.RimeUtils

app/src/main/java/com/osfans/trime/settings/fragments/KeyboardFragment.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import androidx.core.view.forEach
77
import androidx.preference.Preference
88
import androidx.preference.PreferenceFragmentCompat
99
import com.osfans.trime.R
10-
import com.osfans.trime.Rime
10+
import com.osfans.trime.core.Rime
1111
import com.osfans.trime.ime.core.Preferences
1212
import com.osfans.trime.ime.core.Trime
1313
import com.osfans.trime.settings.components.SoundPickerDialog

app/src/main/java/com/osfans/trime/setup/Config.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535
import android.util.TypedValue;
3636
import androidx.annotation.NonNull;
3737
import androidx.annotation.Nullable;
38-
import com.osfans.trime.Rime;
38+
import com.osfans.trime.core.Rime;
3939
import com.osfans.trime.ime.core.Preferences;
4040
import com.osfans.trime.ime.enums.SymbolKeyboardType;
4141
import com.osfans.trime.ime.enums.WindowsPositionType;

app/src/main/java/com/osfans/trime/setup/IntentReceiver.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
import android.content.Intent;
2424
import android.content.IntentFilter;
2525
import androidx.annotation.NonNull;
26-
import com.osfans.trime.Rime;
26+
import com.osfans.trime.core.Rime;
2727
import com.osfans.trime.util.RimeUtils;
2828
import kotlin.Unit;
2929
import kotlinx.coroutines.BuildersKt;

app/src/main/java/com/osfans/trime/util/RimeUtils.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ package com.osfans.trime.util
33
import android.content.Context
44
import com.blankj.utilcode.util.ToastUtils
55
import com.osfans.trime.R
6-
import com.osfans.trime.Rime
6+
import com.osfans.trime.core.Rime
77
import kotlinx.coroutines.Dispatchers
88
import kotlinx.coroutines.withContext
99
import kotlin.system.exitProcess

app/src/main/java/com/osfans/trime/util/ShortcutUtils.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ import android.util.SparseArray
1515
import android.view.KeyEvent
1616
import com.blankj.utilcode.util.ActivityUtils
1717
import com.blankj.utilcode.util.IntentUtils
18-
import com.osfans.trime.Rime
18+
import com.osfans.trime.core.Rime
1919
import com.osfans.trime.ime.core.Preferences
2020
import com.osfans.trime.ime.core.Trime
2121
import timber.log.Timber

app/src/main/java/com/osfans/trime/util/YamlUtils.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ package com.osfans.trime.util
22

33
import android.util.TypedValue
44
import com.blankj.utilcode.util.SizeUtils
5-
import com.osfans.trime.Rime
5+
import com.osfans.trime.core.Rime
66

77
object YamlUtils {
88

0 commit comments

Comments
 (0)