diff --git a/app/src/main/java/com/cherret/zaprett/MainActivity.kt b/app/src/main/java/com/cherret/zaprett/MainActivity.kt index 67425da..7871614 100644 --- a/app/src/main/java/com/cherret/zaprett/MainActivity.kt +++ b/app/src/main/java/com/cherret/zaprett/MainActivity.kt @@ -8,7 +8,6 @@ import android.content.pm.PackageManager import android.net.Uri import android.os.Build import android.os.Bundle -import android.os.Environment import android.provider.Settings import androidx.activity.ComponentActivity import androidx.activity.compose.setContent @@ -29,7 +28,6 @@ import androidx.compose.material3.AlertDialog import androidx.compose.material3.ExperimentalMaterial3ExpressiveApi import androidx.compose.material3.Icon import androidx.compose.material3.NavigationBar -import androidx.compose.material3.NavigationBarDefaults import androidx.compose.material3.NavigationBarItem import androidx.compose.material3.Scaffold import androidx.compose.material3.Text diff --git a/app/src/main/java/com/cherret/zaprett/byedpi/ByeDpiVpnService.kt b/app/src/main/java/com/cherret/zaprett/byedpi/ByeDpiVpnService.kt index f6eb21f..cdd3405 100644 --- a/app/src/main/java/com/cherret/zaprett/byedpi/ByeDpiVpnService.kt +++ b/app/src/main/java/com/cherret/zaprett/byedpi/ByeDpiVpnService.kt @@ -21,7 +21,6 @@ import com.cherret.zaprett.utils.getActiveExcludeIpsets import com.cherret.zaprett.utils.getActiveExcludeLists import com.cherret.zaprett.utils.getActiveIpsets import com.cherret.zaprett.utils.getActiveLists -import com.cherret.zaprett.utils.getActiveStrategy import com.cherret.zaprett.utils.getAppsListMode import com.cherret.zaprett.utils.getHostListMode import kotlinx.coroutines.CoroutineScope diff --git a/app/src/main/java/com/cherret/zaprett/ui/component/SettingsComponents.kt b/app/src/main/java/com/cherret/zaprett/ui/component/SettingsComponents.kt index 8fee633..a0b9522 100644 --- a/app/src/main/java/com/cherret/zaprett/ui/component/SettingsComponents.kt +++ b/app/src/main/java/com/cherret/zaprett/ui/component/SettingsComponents.kt @@ -1,6 +1,5 @@ package com.cherret.zaprett.ui.component -import androidx.compose.foundation.clickable import androidx.compose.foundation.layout.Row import androidx.compose.foundation.layout.fillMaxSize import androidx.compose.foundation.layout.fillMaxWidth diff --git a/app/src/main/java/com/cherret/zaprett/ui/screen/DebugScreen.kt b/app/src/main/java/com/cherret/zaprett/ui/screen/DebugScreen.kt index 6f0fa02..b4ceb9e 100644 --- a/app/src/main/java/com/cherret/zaprett/ui/screen/DebugScreen.kt +++ b/app/src/main/java/com/cherret/zaprett/ui/screen/DebugScreen.kt @@ -12,10 +12,7 @@ import androidx.compose.foundation.lazy.LazyColumn import androidx.compose.foundation.lazy.items import androidx.compose.material.icons.Icons import androidx.compose.material.icons.automirrored.filled.ArrowBack -import androidx.compose.material.icons.filled.MoreVert import androidx.compose.material3.AlertDialog -import androidx.compose.material3.DropdownMenu -import androidx.compose.material3.DropdownMenuItem import androidx.compose.material3.ExperimentalMaterial3Api import androidx.compose.material3.ExperimentalMaterial3ExpressiveApi import androidx.compose.material3.Icon @@ -25,10 +22,8 @@ import androidx.compose.material3.Text import androidx.compose.material3.TextButton import androidx.compose.material3.TopAppBar import androidx.compose.runtime.Composable -import androidx.compose.runtime.getValue import androidx.compose.runtime.mutableStateOf import androidx.compose.runtime.remember -import androidx.compose.runtime.setValue import androidx.compose.ui.Modifier import androidx.compose.ui.platform.LocalContext import androidx.compose.ui.res.stringResource diff --git a/app/src/main/java/com/cherret/zaprett/ui/screen/HomeScreen.kt b/app/src/main/java/com/cherret/zaprett/ui/screen/HomeScreen.kt index 68f6616..50ba8d8 100644 --- a/app/src/main/java/com/cherret/zaprett/ui/screen/HomeScreen.kt +++ b/app/src/main/java/com/cherret/zaprett/ui/screen/HomeScreen.kt @@ -71,15 +71,12 @@ import androidx.compose.ui.text.style.TextAlign import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.sp import androidx.lifecycle.viewmodel.compose.viewModel -import androidx.navigation.NavController import com.cherret.zaprett.BuildConfig import com.cherret.zaprett.R import com.cherret.zaprett.data.ServiceStatusUI import com.cherret.zaprett.ui.viewmodel.HomeViewModel import dev.jeziellago.compose.markdowntext.MarkdownText import kotlinx.coroutines.CoroutineScope -import kotlinx.serialization.SerializationException -import java.io.IOException @OptIn(ExperimentalMaterial3Api::class) @Composable diff --git a/app/src/main/java/com/cherret/zaprett/ui/screen/HostsScreen.kt b/app/src/main/java/com/cherret/zaprett/ui/screen/HostsScreen.kt index 332c486..8eecfeb 100644 --- a/app/src/main/java/com/cherret/zaprett/ui/screen/HostsScreen.kt +++ b/app/src/main/java/com/cherret/zaprett/ui/screen/HostsScreen.kt @@ -43,7 +43,6 @@ import androidx.compose.material3.TopAppBar import androidx.compose.material3.pulltorefresh.PullToRefreshBox import androidx.compose.runtime.Composable import androidx.compose.runtime.LaunchedEffect -import androidx.compose.runtime.MutableState import androidx.compose.runtime.collectAsState import androidx.compose.runtime.getValue import androidx.compose.runtime.mutableStateOf diff --git a/app/src/main/java/com/cherret/zaprett/ui/screen/IpsetsScreen.kt b/app/src/main/java/com/cherret/zaprett/ui/screen/IpsetsScreen.kt index 681c5f1..4ddf2d2 100644 --- a/app/src/main/java/com/cherret/zaprett/ui/screen/IpsetsScreen.kt +++ b/app/src/main/java/com/cherret/zaprett/ui/screen/IpsetsScreen.kt @@ -63,7 +63,6 @@ import androidx.lifecycle.viewmodel.compose.viewModel import androidx.navigation.NavController import com.cherret.zaprett.R import com.cherret.zaprett.ui.component.ListSwitchItem -import com.cherret.zaprett.ui.viewmodel.HostsViewModel import com.cherret.zaprett.ui.viewmodel.IpsetViewModel import com.cherret.zaprett.utils.getHostListMode diff --git a/app/src/main/java/com/cherret/zaprett/ui/screen/SettingsScreen.kt b/app/src/main/java/com/cherret/zaprett/ui/screen/SettingsScreen.kt index a595d19..37300e7 100644 --- a/app/src/main/java/com/cherret/zaprett/ui/screen/SettingsScreen.kt +++ b/app/src/main/java/com/cherret/zaprett/ui/screen/SettingsScreen.kt @@ -43,7 +43,6 @@ import androidx.compose.material3.Scaffold import androidx.compose.material3.Switch import androidx.compose.material3.Text import androidx.compose.material3.TextButton -import androidx.compose.material3.TextField import androidx.compose.material3.TopAppBar import androidx.compose.runtime.Composable import androidx.compose.runtime.LaunchedEffect @@ -75,23 +74,16 @@ import androidx.navigation.NavController import coil3.compose.AsyncImage import com.cherret.zaprett.BuildConfig import com.cherret.zaprett.R -import com.cherret.zaprett.byedpi.ByeDpiVpnService +import com.cherret.zaprett.data.AppListType +import com.cherret.zaprett.data.Setting +import com.cherret.zaprett.ui.component.InfoDialog import com.cherret.zaprett.ui.component.SettingsActionItem import com.cherret.zaprett.ui.component.SettingsItem import com.cherret.zaprett.ui.component.SettingsSection -import com.cherret.zaprett.data.AppListType -import com.cherret.zaprett.data.ServiceStatus -import com.cherret.zaprett.ui.component.InfoDialog -import com.cherret.zaprett.data.Setting import com.cherret.zaprett.ui.component.TextDialog import com.cherret.zaprett.ui.viewmodel.SettingsViewModel -import com.cherret.zaprett.utils.checkModuleInstallation -import com.cherret.zaprett.utils.checkRoot import com.cherret.zaprett.utils.getAppsListMode -import com.cherret.zaprett.utils.getStartOnBoot import com.cherret.zaprett.utils.setAppsListMode -import com.cherret.zaprett.utils.setStartOnBoot -import com.cherret.zaprett.utils.stopService @OptIn(ExperimentalMaterial3Api::class) @Composable diff --git a/app/src/main/java/com/cherret/zaprett/ui/viewmodel/IpsetRepoViewModel.kt b/app/src/main/java/com/cherret/zaprett/ui/viewmodel/IpsetRepoViewModel.kt index f8535cc..bb39964 100644 --- a/app/src/main/java/com/cherret/zaprett/ui/viewmodel/IpsetRepoViewModel.kt +++ b/app/src/main/java/com/cherret/zaprett/ui/viewmodel/IpsetRepoViewModel.kt @@ -4,8 +4,6 @@ import android.app.Application import com.cherret.zaprett.utils.RepoItemInfo import com.cherret.zaprett.utils.getAllExcludeIpsets import com.cherret.zaprett.utils.getAllIpsets -import com.cherret.zaprett.utils.getAllLists -import com.cherret.zaprett.utils.getHostList import com.cherret.zaprett.utils.getHostListMode import com.cherret.zaprett.utils.getIpsetList diff --git a/app/src/main/java/com/cherret/zaprett/ui/viewmodel/IpsetViewModel.kt b/app/src/main/java/com/cherret/zaprett/ui/viewmodel/IpsetViewModel.kt index b76e555..73a673e 100644 --- a/app/src/main/java/com/cherret/zaprett/ui/viewmodel/IpsetViewModel.kt +++ b/app/src/main/java/com/cherret/zaprett/ui/viewmodel/IpsetViewModel.kt @@ -4,11 +4,8 @@ import android.app.Application import android.content.Context import androidx.compose.material3.SnackbarHostState import com.cherret.zaprett.utils.disableIpset -import com.cherret.zaprett.utils.disableList import com.cherret.zaprett.utils.enableIpset -import com.cherret.zaprett.utils.enableList import com.cherret.zaprett.utils.getActiveExcludeIpsets -import com.cherret.zaprett.utils.getActiveExcludeLists import com.cherret.zaprett.utils.getActiveIpsets import com.cherret.zaprett.utils.getAllExcludeIpsets import com.cherret.zaprett.utils.getAllIpsets diff --git a/app/src/main/java/com/cherret/zaprett/ui/viewmodel/StrategySelectionViewModel.kt b/app/src/main/java/com/cherret/zaprett/ui/viewmodel/StrategySelectionViewModel.kt index a7c18c9..fdb8bd5 100644 --- a/app/src/main/java/com/cherret/zaprett/ui/viewmodel/StrategySelectionViewModel.kt +++ b/app/src/main/java/com/cherret/zaprett/ui/viewmodel/StrategySelectionViewModel.kt @@ -8,7 +8,6 @@ import androidx.compose.runtime.mutableStateListOf import androidx.compose.runtime.mutableStateOf import androidx.core.content.ContextCompat import androidx.lifecycle.AndroidViewModel -import com.cherret.zaprett.R import com.cherret.zaprett.byedpi.ByeDpiVpnService import com.cherret.zaprett.data.ServiceStatus import com.cherret.zaprett.data.StrategyCheckResult @@ -16,7 +15,6 @@ import com.cherret.zaprett.data.StrategyTestingStatus import com.cherret.zaprett.utils.disableStrategy import com.cherret.zaprett.utils.enableStrategy import com.cherret.zaprett.utils.getActiveLists -import com.cherret.zaprett.utils.getActiveStrategy import com.cherret.zaprett.utils.getAllStrategies import com.cherret.zaprett.utils.getStatus import com.cherret.zaprett.utils.startService @@ -27,7 +25,6 @@ import kotlinx.coroutines.awaitAll import kotlinx.coroutines.coroutineScope import kotlinx.coroutines.delay import kotlinx.coroutines.flow.MutableStateFlow -import kotlinx.coroutines.flow.StateFlow import kotlinx.coroutines.flow.asStateFlow import kotlinx.coroutines.withContext import kotlinx.coroutines.withTimeoutOrNull diff --git a/app/src/main/java/com/cherret/zaprett/utils/Updater.kt b/app/src/main/java/com/cherret/zaprett/utils/Updater.kt index 89f5565..66352b1 100644 --- a/app/src/main/java/com/cherret/zaprett/utils/Updater.kt +++ b/app/src/main/java/com/cherret/zaprett/utils/Updater.kt @@ -1,16 +1,11 @@ package com.cherret.zaprett.utils -import android.annotation.SuppressLint import android.app.DownloadManager -import android.content.BroadcastReceiver import android.content.Context import android.content.Intent -import android.content.IntentFilter import android.content.SharedPreferences import android.net.Uri -import android.os.Build import android.os.Environment -import androidx.core.content.ContextCompat import androidx.core.content.FileProvider import androidx.core.net.toUri import com.cherret.zaprett.BuildConfig