optimize import

GangJust · Apr 15, 2024 · 2cc8510 · 2cc8510
1 parent 2420ae8
commit 2cc8510
Show file tree

Hide file tree

Showing 52 changed files with 162 additions and 164 deletions.
diff --git a/app/src/main/java/io/github/fplus/activity/ErrorActivity.kt b/app/src/main/java/io/github/fplus/activity/ErrorActivity.kt
@@ -26,10 +26,10 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.text.input.ImeAction
 import androidx.compose.ui.unit.dp
+import com.freegang.extension.activeActivity
+import com.freegang.extension.appVersionCode
+import com.freegang.extension.appVersionName
 import com.freegang.ktutils.app.KAppCrashUtils
-import com.freegang.ktutils.app.activeActivity
-import com.freegang.ktutils.app.appVersionCode
-import com.freegang.ktutils.app.appVersionName
 import io.github.fplus.FreedomTheme
 import io.github.fplus.R
 import io.github.fplus.Themes

diff --git a/app/src/main/java/io/github/fplus/activity/HomeActivity.kt b/app/src/main/java/io/github/fplus/activity/HomeActivity.kt
@@ -57,9 +57,9 @@ import androidx.compose.ui.text.withStyle
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.viewinterop.AndroidView
 import androidx.lifecycle.lifecycleScope
+import com.freegang.extension.appVersionName
 import com.freegang.ktutils.app.KAppUtils
 import com.freegang.ktutils.app.KToastUtils
-import com.freegang.ktutils.app.appVersionName
 import com.freegang.ktutils.log.KLogCat
 import io.github.fplus.Constant
 import io.github.fplus.FreedomTheme

diff --git a/app/src/main/java/io/github/fplus/viewmodel/HomeVM.kt b/app/src/main/java/io/github/fplus/viewmodel/HomeVM.kt
@@ -6,13 +6,13 @@ import androidx.lifecycle.AndroidViewModel
 import androidx.lifecycle.LiveData
 import androidx.lifecycle.MutableLiveData
 import androidx.lifecycle.viewModelScope
+import com.freegang.extension.appVersionName
+import com.freegang.extension.child
+import com.freegang.extension.storageRootFile
+import com.freegang.ktutils.app.KAppUtils
 import io.github.fplus.core.config.ConfigV1
 import io.github.fplus.core.config.Version
 import io.github.fplus.core.config.VersionConfig
-import com.freegang.ktutils.app.KAppUtils
-import com.freegang.ktutils.app.appVersionName
-import com.freegang.ktutils.io.child
-import com.freegang.ktutils.io.storageRootFile
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
@@ -43,8 +43,8 @@ class HomeVM(application: Application) : AndroidViewModel(application) {
 
  // 检查版本更新
  fun checkVersion() {
- if (KAppUtils.isAppInDebug(app)) return //测试包不检查更新
- if (app.appVersionName.contains(Regex("beta|alpha"))) return //非release包不检查更新
+ if (KAppUtils.isAppInDebug(app)) return // 测试包不检查更新
+ if (app.appVersionName.contains(Regex("beta|alpha"))) return // 非release包不检查更新
  viewModelScope.launch {
  val version = withContext(Dispatchers.IO) { Version.getRemoteReleasesLatest() }
  if (version != null) _versionConfig.value = version
@@ -53,8 +53,8 @@ class HomeVM(application: Application) : AndroidViewModel(application) {
 
  // 获取远程版本适配列表
  fun updateVersions() {
- if (KAppUtils.isAppInDebug(app)) return //测试包不检查更新
- if (app.appVersionName.contains(Regex("beta|alpha"))) return //非release包不检查更新
+ if (KAppUtils.isAppInDebug(app)) return // 测试包不检查更新
+ if (app.appVersionName.contains(Regex("beta|alpha"))) return // 非release包不检查更新
  viewModelScope.launch {
  withContext(Dispatchers.IO) {
  val versions = Version.getVersions() ?: return@withContext

diff --git a/core/src/main/java/io/github/fplus/core/base/BaseHook.kt b/core/src/main/java/io/github/fplus/core/base/BaseHook.kt
@@ -18,10 +18,10 @@ import android.widget.Toast
 import androidx.annotation.DrawableRes
 import androidx.compose.runtime.Composable
 import androidx.core.view.isVisible
+import com.freegang.extension.isDarkMode
 import com.freegang.ktutils.app.IProgressNotification
 import com.freegang.ktutils.app.KNotifiUtils
 import com.freegang.ktutils.app.KToastUtils
-import com.freegang.ktutils.app.isDarkMode
 import io.github.fplus.core.R
 import io.github.fplus.core.databinding.DialogChoiceLayoutBinding
 import io.github.fplus.core.databinding.DialogInputChoiceLayoutBinding

diff --git a/core/src/main/java/io/github/fplus/core/config/ConfigV1.kt b/core/src/main/java/io/github/fplus/core/config/ConfigV1.kt
@@ -2,10 +2,10 @@ package io.github.fplus.core.config
 
 import android.content.Context
 import android.os.Environment
-import com.freegang.ktutils.io.child
-import com.freegang.ktutils.io.storageRootFile
-import com.freegang.ktutils.json.getStringOrDefault
-import com.freegang.ktutils.json.parseJSON
+import com.freegang.extension.child
+import com.freegang.extension.getStringOrDefault
+import com.freegang.extension.parseJSON
+import com.freegang.extension.storageRootFile
 import com.tencent.mmkv.MMKV
 import io.github.webdav.WebDav
 import org.json.JSONObject

diff --git a/core/src/main/java/io/github/fplus/core/config/Version.kt b/core/src/main/java/io/github/fplus/core/config/Version.kt
@@ -1,18 +1,18 @@
 package io.github.fplus.core.config
 
 import android.util.Base64
-import com.freegang.ktutils.json.firstJsonObject
-import com.freegang.ktutils.json.getLongOrDefault
-import com.freegang.ktutils.json.getStringOrDefault
-import com.freegang.ktutils.json.parseJSON
+import com.freegang.extension.firstJsonObject
+import com.freegang.extension.getLongOrDefault
+import com.freegang.extension.getStringOrDefault
+import com.freegang.extension.parseJSON
 import com.freegang.ktutils.net.KHttpUtils
 
 
 object Version {
  // Api
  private const val githubReleasesApi = "https://api.github.com/repos/GangJust/FreedomPlus/releases/latest"
 
- //private const val githubVersionApi = "https://raw.githubusercontent.com/GangJust/FreedomPlus/master/versions.json"
+ // private const val githubVersionApi = "https://raw.githubusercontent.com/GangJust/FreedomPlus/master/versions.json"
  private const val githubVersionApi = "https://api.github.com/repos/GangJust/FreedomPlus/contents/versions.json?ref=master"
 
  // 获取Github最后一次 releases

diff --git a/core/src/main/java/io/github/fplus/core/helper/DexkitBuilder.kt b/core/src/main/java/io/github/fplus/core/helper/DexkitBuilder.kt
@@ -1,11 +1,11 @@
 package io.github.fplus.core.helper
 
 import android.app.Application
-import com.freegang.ktutils.app.appVersionCode
-import com.freegang.ktutils.app.appVersionName
-import com.freegang.ktutils.json.getIntOrDefault
-import com.freegang.ktutils.json.getJSONArrayOrDefault
-import com.freegang.ktutils.json.getStringOrDefault
+import com.freegang.extension.appVersionCode
+import com.freegang.extension.appVersionName
+import com.freegang.extension.getIntOrDefault
+import com.freegang.extension.getJSONArrayOrDefault
+import com.freegang.extension.getStringOrDefault
 import com.freegang.ktutils.log.KLogCat
 import com.freegang.ktutils.text.KTextUtils
 import io.github.fplus.core.config.ConfigV1

diff --git a/core/src/main/java/io/github/fplus/core/hook/HAbstractFeedAdapter.kt b/core/src/main/java/io/github/fplus/core/hook/HAbstractFeedAdapter.kt
@@ -8,11 +8,11 @@ import android.widget.FrameLayout
 import android.widget.LinearLayout
 import androidx.core.view.children
 import androidx.core.view.updatePadding
-import com.freegang.ktutils.display.dip2px
-import com.freegang.ktutils.extension.asOrNull
-import com.freegang.ktutils.view.firstOrNull
-import com.freegang.ktutils.view.firstParentOrNull
-import com.freegang.ktutils.view.forEachChild
+import com.freegang.extension.asOrNull
+import com.freegang.extension.dip2px
+import com.freegang.extension.firstOrNull
+import com.freegang.extension.firstParentOrNull
+import com.freegang.extension.forEachChild
 import com.ss.android.ugc.aweme.ad.feed.VideoViewHolderRootView
 import de.robv.android.xposed.XC_MethodHook
 import io.github.fplus.core.base.BaseHook

diff --git a/core/src/main/java/io/github/fplus/core/hook/HActivity.kt b/core/src/main/java/io/github/fplus/core/hook/HActivity.kt
@@ -3,9 +3,9 @@ package io.github.fplus.core.hook
 import android.app.Activity
 import android.view.MotionEvent
 import androidx.core.view.updatePadding
-import com.freegang.ktutils.app.contentView
-import com.freegang.ktutils.app.navBarInteractionMode
-import com.freegang.ktutils.app.navigationBarHeight
+import com.freegang.extension.contentView
+import com.freegang.extension.navBarInteractionMode
+import com.freegang.extension.navigationBarHeight
 import de.robv.android.xposed.XC_MethodHook
 import io.github.fplus.core.base.BaseHook
 import io.github.fplus.core.config.ConfigV1

diff --git a/core/src/main/java/io/github/fplus/core/hook/HChatListRecalledHint.kt b/core/src/main/java/io/github/fplus/core/hook/HChatListRecalledHint.kt
@@ -2,10 +2,10 @@ package io.github.fplus.core.hook
 
 import android.widget.TextView
 import com.bytedance.im.core.model.Message
-import com.freegang.ktutils.extension.asOrNull
-import com.freegang.ktutils.reflect.fieldGet
-import com.freegang.ktutils.reflect.methodInvoke
-import com.freegang.ktutils.reflect.methods
+import com.freegang.extension.asOrNull
+import com.freegang.extension.fieldGet
+import com.freegang.extension.methodInvoke
+import com.freegang.extension.methods
 import de.robv.android.xposed.XC_MethodHook
 import io.github.fplus.core.base.BaseHook
 import io.github.fplus.core.config.ConfigV1

diff --git a/core/src/main/java/io/github/fplus/core/hook/HChatListRecyclerViewAdapter.kt b/core/src/main/java/io/github/fplus/core/hook/HChatListRecyclerViewAdapter.kt
@@ -8,13 +8,13 @@ import android.widget.TextView
 import androidx.core.view.children
 import androidx.core.view.isVisible
 import com.bytedance.im.core.model.Message
-import com.freegang.ktutils.extension.asOrNull
-import com.freegang.ktutils.reflect.fieldGet
-import com.freegang.ktutils.reflect.methodInvoke
-import com.freegang.ktutils.reflect.methods
-import com.freegang.ktutils.view.firstOrNull
-import com.freegang.ktutils.view.idName
-import com.freegang.ktutils.view.parentView
+import com.freegang.extension.asOrNull
+import com.freegang.extension.fieldGet
+import com.freegang.extension.firstOrNull
+import com.freegang.extension.idName
+import com.freegang.extension.methodInvoke
+import com.freegang.extension.methods
+import com.freegang.extension.parentView
 import de.robv.android.xposed.XC_MethodHook
 import io.github.fplus.core.base.BaseHook
 import io.github.fplus.core.config.ConfigV1

diff --git a/core/src/main/java/io/github/fplus/core/hook/HCommentAudioView.kt b/core/src/main/java/io/github/fplus/core/hook/HCommentAudioView.kt
@@ -5,12 +5,12 @@ import android.widget.FrameLayout
 import android.widget.ImageView
 import android.widget.LinearLayout
 import androidx.core.view.children
-import com.freegang.ktutils.display.dip2px
-import com.freegang.ktutils.json.firstJsonObject
-import com.freegang.ktutils.json.getJSONArrayOrDefault
-import com.freegang.ktutils.json.getStringOrDefault
-import com.freegang.ktutils.json.parseJSON
-import com.freegang.ktutils.reflect.fieldGets
+import com.freegang.extension.dip2px
+import com.freegang.extension.fieldGets
+import com.freegang.extension.firstJsonObject
+import com.freegang.extension.getJSONArrayOrDefault
+import com.freegang.extension.getStringOrDefault
+import com.freegang.extension.parseJSON
 import com.freegang.ktutils.text.KTextUtils
 import com.ss.android.ugc.aweme.comment.model.Comment
 import de.robv.android.xposed.XC_MethodHook

diff --git a/core/src/main/java/io/github/fplus/core/hook/HCommentListPageFragment.kt b/core/src/main/java/io/github/fplus/core/hook/HCommentListPageFragment.kt
@@ -4,9 +4,9 @@ import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
-import com.freegang.ktutils.extension.asOrNull
-import com.freegang.ktutils.reflect.fieldGets
-import com.freegang.ktutils.view.removeInParent
+import com.freegang.extension.asOrNull
+import com.freegang.extension.fieldGets
+import com.freegang.extension.removeInParent
 import com.ss.android.ugc.aweme.comment.constants.CommentColorMode
 import de.robv.android.xposed.XC_MethodHook
 import io.github.fplus.core.base.BaseHook

diff --git a/core/src/main/java/io/github/fplus/core/hook/HConversationFragment.kt b/core/src/main/java/io/github/fplus/core/hook/HConversationFragment.kt
@@ -2,9 +2,9 @@ package io.github.fplus.core.hook
 
 import android.os.Bundle
 import android.view.View
-import com.freegang.ktutils.app.isDarkMode
-import com.freegang.ktutils.extension.asOrNull
-import com.freegang.ktutils.reflect.fieldGets
+import com.freegang.extension.asOrNull
+import com.freegang.extension.fieldGets
+import com.freegang.extension.isDarkMode
 import de.robv.android.xposed.XC_MethodHook
 import io.github.fplus.core.R
 import io.github.fplus.core.base.BaseHook

diff --git a/core/src/main/java/io/github/fplus/core/hook/HCornerExtensionsPopupWindow.kt b/core/src/main/java/io/github/fplus/core/hook/HCornerExtensionsPopupWindow.kt
@@ -6,10 +6,10 @@ import android.view.View
 import android.view.ViewGroup
 import android.widget.PopupWindow
 import androidx.core.view.children
+import com.freegang.extension.isDarkMode
+import com.freegang.extension.postRunning
 import com.freegang.ktutils.app.KAppUtils
 import com.freegang.ktutils.app.KToastUtils
-import com.freegang.ktutils.app.isDarkMode
-import com.freegang.ktutils.view.postRunning
 import de.robv.android.xposed.XC_MethodHook
 import io.github.fplus.Constant
 import io.github.fplus.core.R

diff --git a/core/src/main/java/io/github/fplus/core/hook/HCustomizedUISeekBar.kt b/core/src/main/java/io/github/fplus/core/hook/HCustomizedUISeekBar.kt
@@ -2,7 +2,7 @@ package io.github.fplus.core.hook
 
 import android.widget.FrameLayout
 import androidx.core.view.updateMargins
-import com.freegang.ktutils.display.dip2px
+import com.freegang.extension.dip2px
 import com.ss.android.ugc.aweme.feed.ui.seekbar.SeekBarState
 import de.robv.android.xposed.XC_MethodHook
 import io.github.fplus.core.base.BaseHook

diff --git a/core/src/main/java/io/github/fplus/core/hook/HDetailPageFragment.kt b/core/src/main/java/io/github/fplus/core/hook/HDetailPageFragment.kt
@@ -7,11 +7,11 @@ import android.widget.ImageView
 import android.widget.RelativeLayout
 import android.widget.TextView
 import androidx.core.view.updatePadding
-import com.freegang.ktutils.display.dip2px
-import com.freegang.ktutils.reflect.methodInvoke
-import com.freegang.ktutils.view.firstOrNull
-import com.freegang.ktutils.view.forEachWhereChild
-import com.freegang.ktutils.view.postRunning
+import com.freegang.extension.dip2px
+import com.freegang.extension.firstOrNull
+import com.freegang.extension.forEachWhereChild
+import com.freegang.extension.methodInvoke
+import com.freegang.extension.postRunning
 import com.ss.android.ugc.aweme.feed.model.Aweme
 import de.robv.android.xposed.XC_MethodHook
 import io.github.fplus.core.R

diff --git a/core/src/main/java/io/github/fplus/core/hook/HDialog.kt b/core/src/main/java/io/github/fplus/core/hook/HDialog.kt
@@ -2,10 +2,9 @@ package io.github.fplus.core.hook
 
 import android.app.Dialog
 import android.widget.TextView
+import com.freegang.extension.ellipsis
+import com.freegang.extension.forEachWhereChild
 import com.freegang.ktutils.app.KToastUtils
-import com.freegang.ktutils.log.KLogCat
-import com.freegang.ktutils.text.ellipsis
-import com.freegang.ktutils.view.forEachWhereChild
 import de.robv.android.xposed.XC_MethodHook
 import io.github.fplus.core.base.BaseHook
 import io.github.fplus.core.config.ConfigV1

diff --git a/core/src/main/java/io/github/fplus/core/hook/HDialogFragment.kt b/core/src/main/java/io/github/fplus/core/hook/HDialogFragment.kt
@@ -2,13 +2,14 @@ package io.github.fplus.core.hook
 
 import android.content.Context
 import androidx.fragment.app.DialogFragment
-import com.freegang.ktutils.reflect.methodInvoke
+import com.freegang.extension.methodInvoke
 import de.robv.android.xposed.XC_MethodHook
 import io.github.fplus.core.base.BaseHook
 import io.github.xpler.core.entity.OnBefore
 import io.github.xpler.core.hookBlockRunning
 import io.github.xpler.core.log.XplerLog
 
+@Deprecated("暂存区")
 class HDialogFragment : BaseHook<DialogFragment>() {
  companion object {
  const val TAG = "HDialogFragment"

diff --git a/core/src/main/java/io/github/fplus/core/hook/HDisallowInterceptRelativeLayout.kt b/core/src/main/java/io/github/fplus/core/hook/HDisallowInterceptRelativeLayout.kt
@@ -1,8 +1,8 @@
 package io.github.fplus.core.hook
 
-import com.freegang.ktutils.view.forEachChild
-import com.freegang.ktutils.view.postRunning
-import com.freegang.ktutils.view.removeInParent
+import com.freegang.extension.forEachChild
+import com.freegang.extension.postRunning
+import com.freegang.extension.removeInParent
 import de.robv.android.xposed.XC_MethodHook
 import io.github.fplus.core.base.BaseHook
 import io.github.fplus.core.config.ConfigV1

diff --git a/core/src/main/java/io/github/fplus/core/hook/HEmojiDetailDialog.kt b/core/src/main/java/io/github/fplus/core/hook/HEmojiDetailDialog.kt
@@ -2,10 +2,10 @@ package io.github.fplus.core.hook
 
 import android.os.Bundle
 import android.widget.TextView
-import com.freegang.ktutils.app.contentView
-import com.freegang.ktutils.extension.asOrNull
-import com.freegang.ktutils.reflect.fieldGet
-import com.freegang.ktutils.view.firstOrNull
+import com.freegang.extension.asOrNull
+import com.freegang.extension.contentView
+import com.freegang.extension.fieldGet
+import com.freegang.extension.firstOrNull
 import com.ss.android.ugc.aweme.base.model.UrlModel
 import com.ss.android.ugc.aweme.emoji.store.view.EmojiBottomSheetDialog
 import com.ss.android.ugc.aweme.emoji.views.EmojiDetailDialog

diff --git a/core/src/main/java/io/github/fplus/core/hook/HEmojiDetailDialogNew.kt b/core/src/main/java/io/github/fplus/core/hook/HEmojiDetailDialogNew.kt
@@ -2,11 +2,11 @@ package io.github.fplus.core.hook
 
 import android.os.Bundle
 import android.widget.TextView
-import com.freegang.ktutils.app.contentView
-import com.freegang.ktutils.extension.asOrNull
-import com.freegang.ktutils.reflect.fieldGet
-import com.freegang.ktutils.view.firstOrNull
-import com.freegang.ktutils.view.postDelayedRunning
+import com.freegang.extension.asOrNull
+import com.freegang.extension.contentView
+import com.freegang.extension.fieldGet
+import com.freegang.extension.firstOrNull
+import com.freegang.extension.postDelayedRunning
 import com.ss.android.ugc.aweme.base.model.UrlModel
 import com.ss.android.ugc.aweme.emoji.similaremoji.EmojiDetailDialogNew
 import com.ss.android.ugc.aweme.emoji.store.view.EmojiBottomSheetDialog

diff --git a/core/src/main/java/io/github/fplus/core/hook/HEmojiPopupWindow.kt b/core/src/main/java/io/github/fplus/core/hook/HEmojiPopupWindow.kt
@@ -1,7 +1,7 @@
 package io.github.fplus.core.hook
 
 import android.widget.TextView
-import com.freegang.ktutils.extension.asOrNull
+import com.freegang.extension.asOrNull
 import com.ss.android.ugc.aweme.emoji.base.BaseEmoji
 import de.robv.android.xposed.XC_MethodHook
 import io.github.fplus.core.base.BaseHook

diff --git a/core/src/main/java/io/github/fplus/core/hook/HGifEmojiDetailActivity.kt b/core/src/main/java/io/github/fplus/core/hook/HGifEmojiDetailActivity.kt
@@ -3,11 +3,11 @@ package io.github.fplus.core.hook
 import android.os.Bundle
 import android.widget.TextView
 import androidx.core.view.isVisible
-import com.freegang.ktutils.app.contentView
-import com.freegang.ktutils.extension.asOrNull
-import com.freegang.ktutils.reflect.fieldGet
-import com.freegang.ktutils.view.firstOrNull
-import com.freegang.ktutils.view.idName
+import com.freegang.extension.asOrNull
+import com.freegang.extension.contentView
+import com.freegang.extension.fieldGet
+import com.freegang.extension.firstOrNull
+import com.freegang.extension.idName
 import com.ss.android.ugc.aweme.comment.ui.GifEmojiDetailActivity
 import com.ss.android.ugc.aweme.emoji.model.Emoji
 import de.robv.android.xposed.XC_MethodHook

diff --git a/core/src/main/java/io/github/fplus/core/hook/HInteractStickerParent.kt b/core/src/main/java/io/github/fplus/core/hook/HInteractStickerParent.kt
@@ -1,7 +1,7 @@
 package io.github.fplus.core.hook
 
-import com.freegang.ktutils.view.postRunning
-import com.freegang.ktutils.view.removeInParent
+import com.freegang.extension.postRunning
+import com.freegang.extension.removeInParent
 import com.ss.android.ugc.aweme.sticker.infoSticker.interact.consume.view.InteractStickerParent
 import de.robv.android.xposed.XC_MethodHook
 import io.github.fplus.core.base.BaseHook