From 544eccfeef83007ec576827163a9a9788379f860 Mon Sep 17 00:00:00 2001 From: NkBe Date: Thu, 4 Dec 2025 23:06:27 +0800 Subject: [PATCH] Move org.lsposed.npatch.util to nkbe.util --- manager/src/main/AndroidManifest.xml | 2 +- .../{org/lsposed/npatch => nkbe}/util/IntentSenderHelper.kt | 2 +- .../{org/lsposed/npatch => nkbe}/util/NPackageManager.kt | 5 +++-- .../java/{org/lsposed/npatch => nkbe}/util/ShizukuApi.kt | 2 +- manager/src/main/java/org/lsposed/npatch/LSPApplication.kt | 4 ++-- .../java/org/lsposed/npatch/manager/AppBroadcastReceiver.kt | 2 +- .../src/main/java/org/lsposed/npatch/ui/page/HomeScreen.kt | 2 +- .../main/java/org/lsposed/npatch/ui/page/NewPatchScreen.kt | 6 +++--- .../java/org/lsposed/npatch/ui/page/SelectAppsScreen.kt | 4 ++-- .../java/org/lsposed/npatch/ui/page/manage/AppManagePage.kt | 4 ++-- .../org/lsposed/npatch/ui/page/manage/ModuleManagePage.kt | 2 +- .../org/lsposed/npatch/ui/viewmodel/NewPatchViewModel.kt | 4 ++-- .../org/lsposed/npatch/ui/viewmodel/SelectAppsViewModel.kt | 4 ++-- .../npatch/ui/viewmodel/manage/AppManageViewModel.kt | 6 +++--- .../npatch/ui/viewmodel/manage/ModuleManageViewModel.kt | 2 +- 15 files changed, 26 insertions(+), 25 deletions(-) rename manager/src/main/java/{org/lsposed/npatch => nkbe}/util/IntentSenderHelper.kt (97%) rename manager/src/main/java/{org/lsposed/npatch => nkbe}/util/NPackageManager.kt (99%) rename manager/src/main/java/{org/lsposed/npatch => nkbe}/util/ShizukuApi.kt (99%) diff --git a/manager/src/main/AndroidManifest.xml b/manager/src/main/AndroidManifest.xml index 181c88d..7b5eb1a 100644 --- a/manager/src/main/AndroidManifest.xml +++ b/manager/src/main/AndroidManifest.xml @@ -46,7 +46,7 @@ android:name=".ui.activity.InstallActivity" android:enabled="false" android:exported="true" - android:targetActivity="org.lsposed.npatch.ui.activity.MainActivity"> + android:targetActivity=".ui.activity.MainActivity"> diff --git a/manager/src/main/java/org/lsposed/npatch/util/IntentSenderHelper.kt b/manager/src/main/java/nkbe/util/IntentSenderHelper.kt similarity index 97% rename from manager/src/main/java/org/lsposed/npatch/util/IntentSenderHelper.kt rename to manager/src/main/java/nkbe/util/IntentSenderHelper.kt index 79bd21a..80450db 100644 --- a/manager/src/main/java/org/lsposed/npatch/util/IntentSenderHelper.kt +++ b/manager/src/main/java/nkbe/util/IntentSenderHelper.kt @@ -1,4 +1,4 @@ -package org.lsposed.npatch.util +package nkbe.util import android.content.IIntentReceiver import android.content.IIntentSender diff --git a/manager/src/main/java/org/lsposed/npatch/util/NPackageManager.kt b/manager/src/main/java/nkbe/util/NPackageManager.kt similarity index 99% rename from manager/src/main/java/org/lsposed/npatch/util/NPackageManager.kt rename to manager/src/main/java/nkbe/util/NPackageManager.kt index 5e04604..ae0ba0e 100644 --- a/manager/src/main/java/org/lsposed/npatch/util/NPackageManager.kt +++ b/manager/src/main/java/nkbe/util/NPackageManager.kt @@ -1,5 +1,6 @@ -package org.lsposed.npatch.util +package nkbe.util +import android.R import android.annotation.SuppressLint import android.content.Intent import android.content.pm.ApplicationInfo @@ -50,7 +51,7 @@ object NPackageManager { private set @SuppressLint("StaticFieldLeak") - private val iconLoader = AppIconLoader(lspApp.resources.getDimensionPixelSize(android.R.dimen.app_icon_size), false, lspApp) + private val iconLoader = AppIconLoader(lspApp.resources.getDimensionPixelSize(R.dimen.app_icon_size), false, lspApp) private val appIcon = mutableMapOf() diff --git a/manager/src/main/java/org/lsposed/npatch/util/ShizukuApi.kt b/manager/src/main/java/nkbe/util/ShizukuApi.kt similarity index 99% rename from manager/src/main/java/org/lsposed/npatch/util/ShizukuApi.kt rename to manager/src/main/java/nkbe/util/ShizukuApi.kt index 1a3924d..c328fa8 100644 --- a/manager/src/main/java/org/lsposed/npatch/util/ShizukuApi.kt +++ b/manager/src/main/java/nkbe/util/ShizukuApi.kt @@ -1,4 +1,4 @@ -package org.lsposed.npatch.util +package nkbe.util import android.content.IntentSender import android.content.pm.* diff --git a/manager/src/main/java/org/lsposed/npatch/LSPApplication.kt b/manager/src/main/java/org/lsposed/npatch/LSPApplication.kt index 0c783f7..1215620 100644 --- a/manager/src/main/java/org/lsposed/npatch/LSPApplication.kt +++ b/manager/src/main/java/org/lsposed/npatch/LSPApplication.kt @@ -8,8 +8,8 @@ import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.launch import org.lsposed.hiddenapibypass.HiddenApiBypass import org.lsposed.npatch.manager.AppBroadcastReceiver -import org.lsposed.npatch.util.NPackageManager -import org.lsposed.npatch.util.ShizukuApi +import nkbe.util.NPackageManager +import nkbe.util.ShizukuApi import java.io.File lateinit var lspApp: LSPApplication diff --git a/manager/src/main/java/org/lsposed/npatch/manager/AppBroadcastReceiver.kt b/manager/src/main/java/org/lsposed/npatch/manager/AppBroadcastReceiver.kt index 2cab15c..0337c06 100644 --- a/manager/src/main/java/org/lsposed/npatch/manager/AppBroadcastReceiver.kt +++ b/manager/src/main/java/org/lsposed/npatch/manager/AppBroadcastReceiver.kt @@ -7,7 +7,7 @@ import android.content.IntentFilter import android.util.Log import kotlinx.coroutines.launch import org.lsposed.npatch.lspApp -import org.lsposed.npatch.util.NPackageManager +import nkbe.util.NPackageManager class AppBroadcastReceiver : BroadcastReceiver() { diff --git a/manager/src/main/java/org/lsposed/npatch/ui/page/HomeScreen.kt b/manager/src/main/java/org/lsposed/npatch/ui/page/HomeScreen.kt index 0988cf3..aec7dc3 100644 --- a/manager/src/main/java/org/lsposed/npatch/ui/page/HomeScreen.kt +++ b/manager/src/main/java/org/lsposed/npatch/ui/page/HomeScreen.kt @@ -42,7 +42,7 @@ import org.lsposed.npatch.ui.page.destinations.ManageScreenDestination import org.lsposed.npatch.ui.page.destinations.NewPatchScreenDestination import org.lsposed.npatch.ui.util.HtmlText import org.lsposed.npatch.ui.util.LocalSnackbarHost -import org.lsposed.npatch.util.ShizukuApi +import nkbe.util.ShizukuApi import rikka.shizuku.Shizuku @OptIn(ExperimentalMaterial3Api::class) diff --git a/manager/src/main/java/org/lsposed/npatch/ui/page/NewPatchScreen.kt b/manager/src/main/java/org/lsposed/npatch/ui/page/NewPatchScreen.kt index e5867c5..14314cd 100644 --- a/manager/src/main/java/org/lsposed/npatch/ui/page/NewPatchScreen.kt +++ b/manager/src/main/java/org/lsposed/npatch/ui/page/NewPatchScreen.kt @@ -66,9 +66,9 @@ import org.lsposed.npatch.ui.util.uninstallApkByPackageName import org.lsposed.npatch.ui.viewmodel.NewPatchViewModel import org.lsposed.npatch.ui.viewmodel.NewPatchViewModel.PatchState import org.lsposed.npatch.ui.viewmodel.NewPatchViewModel.ViewAction -import org.lsposed.npatch.util.NPackageManager -import org.lsposed.npatch.util.NPackageManager.AppInfo -import org.lsposed.npatch.util.ShizukuApi +import nkbe.util.NPackageManager +import nkbe.util.NPackageManager.AppInfo +import nkbe.util.ShizukuApi private const val TAG = "NewPatchPage" diff --git a/manager/src/main/java/org/lsposed/npatch/ui/page/SelectAppsScreen.kt b/manager/src/main/java/org/lsposed/npatch/ui/page/SelectAppsScreen.kt index 5bc821e..da91571 100644 --- a/manager/src/main/java/org/lsposed/npatch/ui/page/SelectAppsScreen.kt +++ b/manager/src/main/java/org/lsposed/npatch/ui/page/SelectAppsScreen.kt @@ -29,8 +29,8 @@ import org.lsposed.npatch.R import org.lsposed.npatch.ui.component.AppItem import org.lsposed.npatch.ui.component.SearchAppBar import org.lsposed.npatch.ui.viewmodel.SelectAppsViewModel -import org.lsposed.npatch.util.NPackageManager -import org.lsposed.npatch.util.NPackageManager.AppInfo +import nkbe.util.NPackageManager +import nkbe.util.NPackageManager.AppInfo @Parcelize sealed class SelectAppsResult : Parcelable { diff --git a/manager/src/main/java/org/lsposed/npatch/ui/page/manage/AppManagePage.kt b/manager/src/main/java/org/lsposed/npatch/ui/page/manage/AppManagePage.kt index 8e7f95f..115ee51 100644 --- a/manager/src/main/java/org/lsposed/npatch/ui/page/manage/AppManagePage.kt +++ b/manager/src/main/java/org/lsposed/npatch/ui/page/manage/AppManagePage.kt @@ -53,8 +53,8 @@ import org.lsposed.npatch.ui.page.destinations.SelectAppsScreenDestination import org.lsposed.npatch.ui.util.LocalSnackbarHost import org.lsposed.npatch.ui.viewmodel.manage.AppManageViewModel import org.lsposed.npatch.ui.viewstate.ProcessingState -import org.lsposed.npatch.util.NPackageManager -import org.lsposed.npatch.util.ShizukuApi +import nkbe.util.NPackageManager +import nkbe.util.ShizukuApi import java.io.IOException private const val TAG = "AppManagePage" diff --git a/manager/src/main/java/org/lsposed/npatch/ui/page/manage/ModuleManagePage.kt b/manager/src/main/java/org/lsposed/npatch/ui/page/manage/ModuleManagePage.kt index d3690b9..3bb8efa 100644 --- a/manager/src/main/java/org/lsposed/npatch/ui/page/manage/ModuleManagePage.kt +++ b/manager/src/main/java/org/lsposed/npatch/ui/page/manage/ModuleManagePage.kt @@ -26,7 +26,7 @@ import org.lsposed.npatch.ui.component.AnywhereDropdown import org.lsposed.npatch.ui.component.AppItem import org.lsposed.npatch.R import org.lsposed.npatch.ui.viewmodel.manage.ModuleManageViewModel -import org.lsposed.npatch.util.NPackageManager +import nkbe.util.NPackageManager @Composable fun ModuleManageBody() { diff --git a/manager/src/main/java/org/lsposed/npatch/ui/viewmodel/NewPatchViewModel.kt b/manager/src/main/java/org/lsposed/npatch/ui/viewmodel/NewPatchViewModel.kt index 6c098cb..3fc52cf 100644 --- a/manager/src/main/java/org/lsposed/npatch/ui/viewmodel/NewPatchViewModel.kt +++ b/manager/src/main/java/org/lsposed/npatch/ui/viewmodel/NewPatchViewModel.kt @@ -10,8 +10,8 @@ import androidx.lifecycle.viewModelScope import kotlinx.coroutines.launch import org.lsposed.npatch.Patcher import org.lsposed.npatch.share.PatchConfig -import org.lsposed.npatch.util.NPackageManager -import org.lsposed.npatch.util.NPackageManager.AppInfo +import nkbe.util.NPackageManager +import nkbe.util.NPackageManager.AppInfo import org.lsposed.patch.util.Logger class NewPatchViewModel : ViewModel() { diff --git a/manager/src/main/java/org/lsposed/npatch/ui/viewmodel/SelectAppsViewModel.kt b/manager/src/main/java/org/lsposed/npatch/ui/viewmodel/SelectAppsViewModel.kt index ae80648..602fe8c 100644 --- a/manager/src/main/java/org/lsposed/npatch/ui/viewmodel/SelectAppsViewModel.kt +++ b/manager/src/main/java/org/lsposed/npatch/ui/viewmodel/SelectAppsViewModel.kt @@ -8,8 +8,8 @@ import androidx.compose.runtime.setValue import androidx.lifecycle.ViewModel import androidx.lifecycle.viewModelScope import kotlinx.coroutines.launch -import org.lsposed.npatch.util.NPackageManager -import org.lsposed.npatch.util.NPackageManager.AppInfo +import nkbe.util.NPackageManager +import nkbe.util.NPackageManager.AppInfo class SelectAppsViewModel : ViewModel() { diff --git a/manager/src/main/java/org/lsposed/npatch/ui/viewmodel/manage/AppManageViewModel.kt b/manager/src/main/java/org/lsposed/npatch/ui/viewmodel/manage/AppManageViewModel.kt index 990cce8..4d50cab 100644 --- a/manager/src/main/java/org/lsposed/npatch/ui/viewmodel/manage/AppManageViewModel.kt +++ b/manager/src/main/java/org/lsposed/npatch/ui/viewmodel/manage/AppManageViewModel.kt @@ -23,9 +23,9 @@ import org.lsposed.npatch.share.PatchConfig import org.lsposed.npatch.ui.util.installApk import org.lsposed.npatch.ui.util.installApks import org.lsposed.npatch.ui.viewstate.ProcessingState -import org.lsposed.npatch.util.NPackageManager -import org.lsposed.npatch.util.NPackageManager.AppInfo -import org.lsposed.npatch.util.ShizukuApi +import nkbe.util.NPackageManager +import nkbe.util.NPackageManager.AppInfo +import nkbe.util.ShizukuApi import org.lsposed.patch.util.Logger import java.io.FileNotFoundException import java.util.zip.ZipFile diff --git a/manager/src/main/java/org/lsposed/npatch/ui/viewmodel/manage/ModuleManageViewModel.kt b/manager/src/main/java/org/lsposed/npatch/ui/viewmodel/manage/ModuleManageViewModel.kt index fd943ee..350a8bf 100644 --- a/manager/src/main/java/org/lsposed/npatch/ui/viewmodel/manage/ModuleManageViewModel.kt +++ b/manager/src/main/java/org/lsposed/npatch/ui/viewmodel/manage/ModuleManageViewModel.kt @@ -4,7 +4,7 @@ import android.util.Log import androidx.compose.runtime.derivedStateOf import androidx.compose.runtime.getValue import androidx.lifecycle.ViewModel -import org.lsposed.npatch.util.NPackageManager +import nkbe.util.NPackageManager class ModuleManageViewModel : ViewModel() {