From c83ee3df8fc152f56da8f8c7aebb3edb7aa51fdd Mon Sep 17 00:00:00 2001 From: X1nto Date: Mon, 22 Nov 2021 16:30:47 +0400 Subject: [PATCH] cleanup --- .../core/downloader/impl/MicrogDownloader.kt | 11 +- .../core/downloader/impl/MusicDownloader.kt | 26 ++-- .../core/downloader/impl/VancedDownloader.kt | 10 +- .../installer/service/AppInstallService.kt | 5 +- .../core/preferences/ManagerPreference.kt | 2 +- .../preferences/holder/PreferenceHolder.kt | 10 +- .../manager/network/model/AppDtoMapper.kt | 134 +++++++++--------- .../com/vanced/manager/ui/MainActivity.kt | 13 +- .../ui/component/layout/ManagerLazyColumn.kt | 5 - .../ui/component/layout/ManagerScaffold.kt | 16 +-- .../component/layout/ManagerSwipeRefresh.kt | 4 - .../ui/component/layout/ScrollableItemRow.kt | 1 - .../ui/component/menu/ManagerDropdownMenu.kt | 16 ++- .../preference/CheckboxDialogPreference.kt | 9 -- .../preference/CheckboxPreference.kt | 3 - .../ui/component/preference/Preference.kt | 2 - .../preference/RadiobuttonDialogPreference.kt | 2 +- .../vanced/manager/ui/screens/AboutLayout.kt | 6 +- .../vanced/manager/ui/screens/HomeLayout.kt | 31 ++-- .../manager/ui/screens/InstallScreen.kt | 11 +- .../java/com/vanced/manager/ui/util/Screen.kt | 6 +- .../manager/ui/viewmodel/InstallViewModel.kt | 13 +- .../manager/ui/viewmodel/MainViewModel.kt | 1 - .../vanced/manager/ui/widget/app/AppCard.kt | 2 - .../ui/widget/app/AppCardPlaceholder.kt | 1 - .../ui/widget/layout/CategoryLayout.kt | 5 +- .../widget/layout/SettingsCategoryLayout.kt | 1 - .../screens/settings/AccentColorItem.kt | 11 +- 28 files changed, 187 insertions(+), 170 deletions(-) diff --git a/app/src/main/java/com/vanced/manager/core/downloader/impl/MicrogDownloader.kt b/app/src/main/java/com/vanced/manager/core/downloader/impl/MicrogDownloader.kt index daf1933f..9a02b181 100644 --- a/app/src/main/java/com/vanced/manager/core/downloader/impl/MicrogDownloader.kt +++ b/app/src/main/java/com/vanced/manager/core/downloader/impl/MicrogDownloader.kt @@ -1,7 +1,6 @@ package com.vanced.manager.core.downloader.impl import android.content.Context -import android.util.Log import com.vanced.manager.core.downloader.api.MicrogAPI import com.vanced.manager.core.downloader.base.AppDownloader import com.vanced.manager.core.downloader.util.DownloadStatus @@ -33,10 +32,12 @@ class MicrogDownloader( onStatus(DownloadStatus.StartInstall) }, onError = { error, fileName -> - onStatus(DownloadStatus.Error( - displayError = "Failed to download $fileName", - stacktrace = error - )) + onStatus( + DownloadStatus.Error( + displayError = "Failed to download $fileName", + stacktrace = error + ) + ) } ) } diff --git a/app/src/main/java/com/vanced/manager/core/downloader/impl/MusicDownloader.kt b/app/src/main/java/com/vanced/manager/core/downloader/impl/MusicDownloader.kt index 024618d0..bb8bf897 100644 --- a/app/src/main/java/com/vanced/manager/core/downloader/impl/MusicDownloader.kt +++ b/app/src/main/java/com/vanced/manager/core/downloader/impl/MusicDownloader.kt @@ -23,13 +23,15 @@ class MusicDownloader( absoluteVersion = getLatestOrProvidedAppVersion(musicVersionPref, appVersions) downloadFiles( - downloadFiles = arrayOf(DownloadFile( - call = musicAPI.getFiles( - version = absoluteVersion, - variant = managerVariantPref, - ), - fileName = "music.apk" - )), + downloadFiles = arrayOf( + DownloadFile( + call = musicAPI.getFiles( + version = absoluteVersion, + variant = managerVariantPref, + ), + fileName = "music.apk" + ) + ), onProgress = { progress -> onStatus(DownloadStatus.Progress(progress)) }, @@ -40,10 +42,12 @@ class MusicDownloader( onStatus(DownloadStatus.StartInstall) }, onError = { error, fileName -> - onStatus(DownloadStatus.Error( - displayError = "Failed to download $fileName", - stacktrace = error - )) + onStatus( + DownloadStatus.Error( + displayError = "Failed to download $fileName", + stacktrace = error + ) + ) } ) } diff --git a/app/src/main/java/com/vanced/manager/core/downloader/impl/VancedDownloader.kt b/app/src/main/java/com/vanced/manager/core/downloader/impl/VancedDownloader.kt index a5f4c40d..8a66d255 100644 --- a/app/src/main/java/com/vanced/manager/core/downloader/impl/VancedDownloader.kt +++ b/app/src/main/java/com/vanced/manager/core/downloader/impl/VancedDownloader.kt @@ -53,10 +53,12 @@ class VancedDownloader( onStatus(DownloadStatus.StartInstall) }, onError = { error, fileName -> - onStatus(DownloadStatus.Error( - displayError = "Failed to download $fileName", - stacktrace = error - )) + onStatus( + DownloadStatus.Error( + displayError = "Failed to download $fileName", + stacktrace = error + ) + ) } ) } diff --git a/app/src/main/java/com/vanced/manager/core/installer/service/AppInstallService.kt b/app/src/main/java/com/vanced/manager/core/installer/service/AppInstallService.kt index bef5867c..bd2cf420 100644 --- a/app/src/main/java/com/vanced/manager/core/installer/service/AppInstallService.kt +++ b/app/src/main/java/com/vanced/manager/core/installer/service/AppInstallService.kt @@ -24,7 +24,10 @@ class AppInstallService : Service() { sendBroadcast(Intent().apply { action = APP_INSTALL_STATUS putExtra(EXTRA_INSTALL_STATUS, status) - putExtra(EXTRA_INSTALL_EXTRA, intent.getStringExtra(PackageInstaller.EXTRA_STATUS_MESSAGE)) + putExtra( + EXTRA_INSTALL_EXTRA, + intent.getStringExtra(PackageInstaller.EXTRA_STATUS_MESSAGE) + ) }) } } diff --git a/app/src/main/java/com/vanced/manager/core/preferences/ManagerPreference.kt b/app/src/main/java/com/vanced/manager/core/preferences/ManagerPreference.kt index 479928da..c698311f 100644 --- a/app/src/main/java/com/vanced/manager/core/preferences/ManagerPreference.kt +++ b/app/src/main/java/com/vanced/manager/core/preferences/ManagerPreference.kt @@ -70,7 +70,7 @@ class ManagerPreference( var value by mutableStateOf(sharedPreferences.getter(key, defaultValue) ?: defaultValue) private set - + operator fun getValue( thisRef: Any?, property: KProperty<*> diff --git a/app/src/main/java/com/vanced/manager/core/preferences/holder/PreferenceHolder.kt b/app/src/main/java/com/vanced/manager/core/preferences/holder/PreferenceHolder.kt index 613b9aa3..3da7135c 100644 --- a/app/src/main/java/com/vanced/manager/core/preferences/holder/PreferenceHolder.kt +++ b/app/src/main/java/com/vanced/manager/core/preferences/holder/PreferenceHolder.kt @@ -7,14 +7,20 @@ import com.vanced.manager.core.preferences.managerStringSetPreference import com.vanced.manager.ui.theme.defAccentColor var useCustomTabsPref by managerBooleanPreference(USE_CUSTOM_TABS_KEY) -var managerVariantPref by managerStringPreference(MANAGER_VARIANT_KEY, MANAGER_VARIANT_DEFAULT_VALUE) +var managerVariantPref by managerStringPreference( + MANAGER_VARIANT_KEY, + MANAGER_VARIANT_DEFAULT_VALUE +) var managerThemePref by managerStringPreference(MANAGER_THEME_KEY, MANAGER_THEME_DEFAULT_VALUE) var managerAccentColorPref by managerLongPreference(MANAGER_ACCENT_COLOR_KEY, defAccentColor) var vancedThemePref by managerStringPreference(APP_VANCED_THEME_KEY, VANCED_THEME_DEFAULT_VALUE) var vancedVersionPref by managerStringPreference(APP_VANCED_VERSION_KEY, APP_VERSION_DEFAULT_VALUE) -var vancedLanguagesPref by managerStringSetPreference(APP_VANCED_LANGUAGE_KEY, VANCED_LANGUAGE_DEFAULT_VALUE) +var vancedLanguagesPref by managerStringSetPreference( + APP_VANCED_LANGUAGE_KEY, + VANCED_LANGUAGE_DEFAULT_VALUE +) var musicVersionPref by managerStringPreference(APP_MUSIC_VERSION_KEY, APP_VERSION_DEFAULT_VALUE) diff --git a/app/src/main/java/com/vanced/manager/network/model/AppDtoMapper.kt b/app/src/main/java/com/vanced/manager/network/model/AppDtoMapper.kt index 6f6f5709..934e326e 100644 --- a/app/src/main/java/com/vanced/manager/network/model/AppDtoMapper.kt +++ b/app/src/main/java/com/vanced/manager/network/model/AppDtoMapper.kt @@ -74,72 +74,72 @@ class AppDtoMapper( appVersions: List?, appLanguages: List?, ) = when (appName) { - VANCED_NAME -> listOf( - InstallationOption.SingleSelect( - titleId = R.string.app_installation_options_theme, - getOption = { vancedThemePref }, - setOption = { - vancedThemePref = it - }, - items = appThemes?.map { theme -> - InstallationOptionItem( - displayText = { - theme.replaceFirstChar { - it.titlecase(Locale.getDefault()) - } - }, - key = theme - ) - } ?: emptyList(), - ), - InstallationOption.SingleSelect( - titleId = R.string.app_installation_options_version, - getOption = { vancedVersionPref }, - setOption = { - vancedVersionPref = it - }, - items = appVersions?.map { version -> - InstallationOptionItem( - displayText = { "v$version" }, - key = version - ) - }?.plus(latestVersionRadioButton)?.reversed() ?: emptyList(), - ), - InstallationOption.MultiSelect( - titleId = R.string.app_installation_options_language, - getOption = { vancedLanguagesPref }, - addOption = { - vancedLanguagesPref = vancedLanguagesPref + it - }, - removeOption = { - vancedLanguagesPref = vancedLanguagesPref - it - }, - items = appLanguages?.map { language -> - InstallationOptionItem( - displayText = { - val locale = Locale(it) - locale.getDisplayName(locale) - }, - key = language - ) - } ?: emptyList(), - ), + VANCED_NAME -> listOf( + InstallationOption.SingleSelect( + titleId = R.string.app_installation_options_theme, + getOption = { vancedThemePref }, + setOption = { + vancedThemePref = it + }, + items = appThemes?.map { theme -> + InstallationOptionItem( + displayText = { + theme.replaceFirstChar { + it.titlecase(Locale.getDefault()) + } + }, + key = theme + ) + } ?: emptyList(), + ), + InstallationOption.SingleSelect( + titleId = R.string.app_installation_options_version, + getOption = { vancedVersionPref }, + setOption = { + vancedVersionPref = it + }, + items = appVersions?.map { version -> + InstallationOptionItem( + displayText = { "v$version" }, + key = version + ) + }?.plus(latestVersionRadioButton)?.reversed() ?: emptyList(), + ), + InstallationOption.MultiSelect( + titleId = R.string.app_installation_options_language, + getOption = { vancedLanguagesPref }, + addOption = { + vancedLanguagesPref = vancedLanguagesPref + it + }, + removeOption = { + vancedLanguagesPref = vancedLanguagesPref - it + }, + items = appLanguages?.map { language -> + InstallationOptionItem( + displayText = { + val locale = Locale(it) + locale.getDisplayName(locale) + }, + key = language + ) + } ?: emptyList(), + ), + ) + MUSIC_NAME -> listOf( + InstallationOption.SingleSelect( + titleId = R.string.app_installation_options_version, + getOption = { musicVersionPref }, + setOption = { + musicVersionPref = it + }, + items = appVersions?.map { version -> + InstallationOptionItem( + displayText = { version }, + key = version + ) + } ?: emptyList(), ) - MUSIC_NAME -> listOf( - InstallationOption.SingleSelect( - titleId = R.string.app_installation_options_version, - getOption = { musicVersionPref }, - setOption = { - musicVersionPref = it - }, - items = appVersions?.map { version -> - InstallationOptionItem( - displayText = { version }, - key = version - ) - } ?: emptyList(), - ) - ) - else -> null - } + ) + else -> null + } } \ No newline at end of file diff --git a/app/src/main/java/com/vanced/manager/ui/MainActivity.kt b/app/src/main/java/com/vanced/manager/ui/MainActivity.kt index bb3c5dff..6e31136a 100644 --- a/app/src/main/java/com/vanced/manager/ui/MainActivity.kt +++ b/app/src/main/java/com/vanced/manager/ui/MainActivity.kt @@ -7,7 +7,7 @@ import android.content.IntentFilter import android.os.Bundle import androidx.activity.ComponentActivity import androidx.activity.compose.setContent -import androidx.compose.animation.* +import androidx.compose.animation.ExperimentalAnimationApi import androidx.compose.foundation.ExperimentalFoundationApi import androidx.compose.material3.ExperimentalMaterial3Api import androidx.compose.runtime.CompositionLocalProvider @@ -23,11 +23,13 @@ import com.vanced.manager.ui.theme.ManagerTheme import com.vanced.manager.ui.theme.isDark import com.vanced.manager.ui.util.Screen import com.vanced.manager.ui.viewmodel.InstallViewModel +import com.vanced.manager.ui.viewmodel.MainViewModel import org.koin.androidx.viewmodel.ext.android.viewModel class MainActivity : ComponentActivity() { private val installViewModel: InstallViewModel by viewModel() + private val mainViewModel: MainViewModel by viewModel() private val backPressHandler = BackPressHandler() @@ -46,7 +48,7 @@ class MainActivity : ComponentActivity() { @OptIn( ExperimentalAnimationApi::class, ExperimentalMaterial3Api::class, - ExperimentalFoundationApi::class + ExperimentalFoundationApi::class, ) override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) @@ -72,6 +74,7 @@ class MainActivity : ComponentActivity() { when (val screen = backStack.last()) { is Screen.Home -> { HomeLayout( + viewModel = mainViewModel, onToolbarScreenSelected = { backStack.push(it) }, @@ -124,7 +127,11 @@ class MainActivity : ComponentActivity() { ) } is Screen.Install -> { - InstallScreen(screen.appName, screen.appVersions) + InstallScreen( + appName = screen.appName, + appVersions = screen.appVersions, + viewModel = installViewModel + ) } } } diff --git a/app/src/main/java/com/vanced/manager/ui/component/layout/ManagerLazyColumn.kt b/app/src/main/java/com/vanced/manager/ui/component/layout/ManagerLazyColumn.kt index c19a6864..886b002d 100644 --- a/app/src/main/java/com/vanced/manager/ui/component/layout/ManagerLazyColumn.kt +++ b/app/src/main/java/com/vanced/manager/ui/component/layout/ManagerLazyColumn.kt @@ -1,14 +1,9 @@ package com.vanced.manager.ui.component.layout -import androidx.compose.foundation.layout.Arrangement -import androidx.compose.foundation.layout.PaddingValues import androidx.compose.foundation.lazy.LazyColumn import androidx.compose.foundation.lazy.LazyListScope import androidx.compose.runtime.Composable import androidx.compose.ui.Modifier -import androidx.compose.ui.unit.Dp -import androidx.compose.ui.unit.dp -import com.vanced.manager.ui.util.DefaultContentPaddingVertical @Composable fun ManagerLazyColumn( diff --git a/app/src/main/java/com/vanced/manager/ui/component/layout/ManagerScaffold.kt b/app/src/main/java/com/vanced/manager/ui/component/layout/ManagerScaffold.kt index 06f747fb..6a9fc88f 100644 --- a/app/src/main/java/com/vanced/manager/ui/component/layout/ManagerScaffold.kt +++ b/app/src/main/java/com/vanced/manager/ui/component/layout/ManagerScaffold.kt @@ -20,13 +20,13 @@ fun ManagerScaffold( // CompositionLocalProvider( // LocalAbsoluteTonalElevation provides absoluteTonalElevation // ) { - Scaffold( - modifier = modifier, - scaffoldState = scaffoldState, - topBar = topBar, - floatingActionButton = floatingActionButton, - floatingActionButtonPosition = floatingActionButtonPosition, - content = content - ) + Scaffold( + modifier = modifier, + scaffoldState = scaffoldState, + topBar = topBar, + floatingActionButton = floatingActionButton, + floatingActionButtonPosition = floatingActionButtonPosition, + content = content + ) // } } \ No newline at end of file diff --git a/app/src/main/java/com/vanced/manager/ui/component/layout/ManagerSwipeRefresh.kt b/app/src/main/java/com/vanced/manager/ui/component/layout/ManagerSwipeRefresh.kt index 31195220..a03508c1 100644 --- a/app/src/main/java/com/vanced/manager/ui/component/layout/ManagerSwipeRefresh.kt +++ b/app/src/main/java/com/vanced/manager/ui/component/layout/ManagerSwipeRefresh.kt @@ -3,13 +3,9 @@ package com.vanced.manager.ui.component.layout import androidx.compose.material3.MaterialTheme import androidx.compose.runtime.Composable import androidx.compose.ui.Modifier -import androidx.compose.ui.graphics.Color -import androidx.compose.ui.unit.dp import com.google.accompanist.swiperefresh.SwipeRefresh import com.google.accompanist.swiperefresh.SwipeRefreshIndicator import com.google.accompanist.swiperefresh.SwipeRefreshState -import com.vanced.manager.ui.component.card.ManagerCard -import com.vanced.manager.ui.component.color.managerAccentColor @Composable fun ManagerSwipeRefresh( diff --git a/app/src/main/java/com/vanced/manager/ui/component/layout/ScrollableItemRow.kt b/app/src/main/java/com/vanced/manager/ui/component/layout/ScrollableItemRow.kt index 65dd6149..a20d6544 100644 --- a/app/src/main/java/com/vanced/manager/ui/component/layout/ScrollableItemRow.kt +++ b/app/src/main/java/com/vanced/manager/ui/component/layout/ScrollableItemRow.kt @@ -1,7 +1,6 @@ package com.vanced.manager.ui.component.layout import androidx.compose.foundation.layout.Arrangement -import androidx.compose.foundation.layout.fillMaxWidth import androidx.compose.foundation.lazy.LazyRow import androidx.compose.foundation.lazy.items import androidx.compose.foundation.lazy.rememberLazyListState diff --git a/app/src/main/java/com/vanced/manager/ui/component/menu/ManagerDropdownMenu.kt b/app/src/main/java/com/vanced/manager/ui/component/menu/ManagerDropdownMenu.kt index 22b12c59..d8a84936 100644 --- a/app/src/main/java/com/vanced/manager/ui/component/menu/ManagerDropdownMenu.kt +++ b/app/src/main/java/com/vanced/manager/ui/component/menu/ManagerDropdownMenu.kt @@ -1,9 +1,17 @@ package com.vanced.manager.ui.component.menu -import androidx.compose.animation.* -import androidx.compose.animation.core.* -import androidx.compose.foundation.layout.* -import androidx.compose.runtime.* +import androidx.compose.animation.ExperimentalAnimationApi +import androidx.compose.animation.core.MutableTransitionState +import androidx.compose.animation.core.animateFloat +import androidx.compose.animation.core.tween +import androidx.compose.animation.core.updateTransition +import androidx.compose.foundation.layout.Column +import androidx.compose.foundation.layout.ColumnScope +import androidx.compose.foundation.layout.IntrinsicSize +import androidx.compose.foundation.layout.width +import androidx.compose.runtime.Composable +import androidx.compose.runtime.getValue +import androidx.compose.runtime.remember import androidx.compose.ui.ExperimentalComposeUiApi import androidx.compose.ui.Modifier import androidx.compose.ui.draw.alpha diff --git a/app/src/main/java/com/vanced/manager/ui/component/preference/CheckboxDialogPreference.kt b/app/src/main/java/com/vanced/manager/ui/component/preference/CheckboxDialogPreference.kt index f9ea847f..93c1b294 100644 --- a/app/src/main/java/com/vanced/manager/ui/component/preference/CheckboxDialogPreference.kt +++ b/app/src/main/java/com/vanced/manager/ui/component/preference/CheckboxDialogPreference.kt @@ -1,26 +1,17 @@ package com.vanced.manager.ui.component.preference -import androidx.compose.foundation.layout.fillMaxWidth import androidx.compose.foundation.layout.heightIn import androidx.compose.foundation.lazy.LazyColumn import androidx.compose.foundation.lazy.items import androidx.compose.material.TextButton import androidx.compose.runtime.Composable -import androidx.compose.runtime.remember -import androidx.compose.runtime.rememberCoroutineScope -import androidx.compose.runtime.toMutableStateList import androidx.compose.ui.Modifier -import androidx.compose.ui.res.stringResource import androidx.compose.ui.unit.dp import com.vanced.manager.R -import com.vanced.manager.core.preferences.CheckboxPreference -import com.vanced.manager.core.preferences.ManagerPreference import com.vanced.manager.core.preferences.RadioButtonPreference -import com.vanced.manager.ui.component.button.ManagerThemedTextButton import com.vanced.manager.ui.component.text.ManagerText import com.vanced.manager.ui.resources.managerString import com.vanced.manager.ui.widget.list.CheckboxItem -import kotlinx.coroutines.launch @Composable fun CheckboxDialogPreference( diff --git a/app/src/main/java/com/vanced/manager/ui/component/preference/CheckboxPreference.kt b/app/src/main/java/com/vanced/manager/ui/component/preference/CheckboxPreference.kt index 20a2c89d..7ed9213f 100644 --- a/app/src/main/java/com/vanced/manager/ui/component/preference/CheckboxPreference.kt +++ b/app/src/main/java/com/vanced/manager/ui/component/preference/CheckboxPreference.kt @@ -1,11 +1,8 @@ package com.vanced.manager.ui.component.preference import androidx.compose.runtime.Composable -import androidx.compose.runtime.rememberCoroutineScope import androidx.compose.ui.unit.dp -import com.vanced.manager.core.preferences.ManagerPreference import com.vanced.manager.ui.widget.checkbox.ManagerAnimatedCheckbox -import kotlinx.coroutines.launch @Composable fun CheckboxPreference( diff --git a/app/src/main/java/com/vanced/manager/ui/component/preference/Preference.kt b/app/src/main/java/com/vanced/manager/ui/component/preference/Preference.kt index 2563ae89..e4de9b96 100644 --- a/app/src/main/java/com/vanced/manager/ui/component/preference/Preference.kt +++ b/app/src/main/java/com/vanced/manager/ui/component/preference/Preference.kt @@ -11,11 +11,9 @@ import androidx.compose.ui.unit.dp import com.vanced.manager.ui.component.card.ManagerTonalCard import com.vanced.manager.ui.component.color.managerAnimatedColor import com.vanced.manager.ui.component.list.ManagerListItem -import com.vanced.manager.ui.component.modifier.managerClickable import com.vanced.manager.ui.component.text.ManagerText import com.vanced.manager.ui.theme.LargeShape import com.vanced.manager.ui.util.DefaultContentPaddingHorizontal -import com.vanced.manager.ui.util.DefaultContentPaddingVertical @Composable fun Preference( diff --git a/app/src/main/java/com/vanced/manager/ui/component/preference/RadiobuttonDialogPreference.kt b/app/src/main/java/com/vanced/manager/ui/component/preference/RadiobuttonDialogPreference.kt index 93af3056..533895e2 100644 --- a/app/src/main/java/com/vanced/manager/ui/component/preference/RadiobuttonDialogPreference.kt +++ b/app/src/main/java/com/vanced/manager/ui/component/preference/RadiobuttonDialogPreference.kt @@ -4,7 +4,7 @@ import androidx.compose.foundation.layout.heightIn import androidx.compose.foundation.lazy.LazyColumn import androidx.compose.foundation.lazy.items import androidx.compose.material3.TextButton -import androidx.compose.runtime.* +import androidx.compose.runtime.Composable import androidx.compose.ui.Modifier import androidx.compose.ui.unit.dp import com.vanced.manager.R diff --git a/app/src/main/java/com/vanced/manager/ui/screens/AboutLayout.kt b/app/src/main/java/com/vanced/manager/ui/screens/AboutLayout.kt index b6740a9b..08dd4c38 100644 --- a/app/src/main/java/com/vanced/manager/ui/screens/AboutLayout.kt +++ b/app/src/main/java/com/vanced/manager/ui/screens/AboutLayout.kt @@ -67,7 +67,7 @@ private val vancedTeam = listOf( ) ) -private val otherContributors = listOf( +private val otherContributors = listOf( Person( name = "bhatVikrant", contribution = "Website" @@ -132,7 +132,9 @@ fun AboutLayout( } ) { paddingValues -> ManagerLazyColumn( - modifier = Modifier.fillMaxSize().padding(paddingValues), + modifier = Modifier + .fillMaxSize() + .padding(paddingValues), ) { item { ManagerTonalCard( diff --git a/app/src/main/java/com/vanced/manager/ui/screens/HomeLayout.kt b/app/src/main/java/com/vanced/manager/ui/screens/HomeLayout.kt index 468fadec..54a165e5 100644 --- a/app/src/main/java/com/vanced/manager/ui/screens/HomeLayout.kt +++ b/app/src/main/java/com/vanced/manager/ui/screens/HomeLayout.kt @@ -4,7 +4,10 @@ import androidx.compose.animation.* import androidx.compose.foundation.layout.* import androidx.compose.material.icons.Icons import androidx.compose.material.icons.rounded.MoreVert -import androidx.compose.material3.* +import androidx.compose.material3.ExperimentalMaterial3Api +import androidx.compose.material3.Icon +import androidx.compose.material3.IconButton +import androidx.compose.material3.TextButton import androidx.compose.runtime.* import androidx.compose.runtime.saveable.rememberSaveable import androidx.compose.ui.Modifier @@ -33,12 +36,12 @@ import com.vanced.manager.ui.viewmodel.MainViewModel import com.vanced.manager.ui.widget.app.AppCard import com.vanced.manager.ui.widget.app.AppCardPlaceholder import com.vanced.manager.ui.widget.layout.managerCategory -import org.koin.androidx.compose.getViewModel @ExperimentalMaterial3Api @ExperimentalAnimationApi @Composable fun HomeLayout( + viewModel: MainViewModel, onToolbarScreenSelected: (Screen) -> Unit, onAppInstallPress: ( appName: String, @@ -46,11 +49,10 @@ fun HomeLayout( installationOptions: List? ) -> Unit ) { - val viewModel: MainViewModel = getViewModel() - val appState by viewModel.appState.collectAsState() - val refreshState = rememberSwipeRefreshState(isRefreshing = appState is MainViewModel.AppState.Fetching) + val refreshState = + rememberSwipeRefreshState(isRefreshing = appState is MainViewModel.AppState.Fetching) var isMenuExpanded by remember { mutableStateOf(false) } val dropdownScreens = remember { listOf(Screen.Settings, Screen.About) } @@ -69,7 +71,7 @@ fun HomeLayout( contentDescription = "Navigation" ) } - + ManagerDropdownMenu( expanded = isMenuExpanded, onDismissRequest = { @@ -116,7 +118,11 @@ fun HomeLayout( diskCachePolicy(CachePolicy.ENABLED) } - var showAppInfoDialog by rememberSaveable { mutableStateOf(false) } + var showAppInfoDialog by rememberSaveable { + mutableStateOf( + false + ) + } AppCard( appName = app.name, @@ -124,7 +130,11 @@ fun HomeLayout( appInstalledVersion = app.installedVersion, appRemoteVersion = app.remoteVersion, onAppDownloadClick = { - onAppInstallPress(app.name, app.versions, app.installationOptions) + onAppInstallPress( + app.name, + app.versions, + app.installationOptions + ) }, onAppUninstallClick = { /*TODO*/ }, onAppLaunchClick = { /*TODO*/ }, @@ -135,7 +145,10 @@ fun HomeLayout( if (showAppInfoDialog) { ManagerDialog( - title = managerString(R.string.app_info_title, app.name), + title = managerString( + R.string.app_info_title, + app.name + ), onDismissRequest = { showAppInfoDialog = false }, confirmButton = { TextButton(onClick = { diff --git a/app/src/main/java/com/vanced/manager/ui/screens/InstallScreen.kt b/app/src/main/java/com/vanced/manager/ui/screens/InstallScreen.kt index 7e95292c..c0b394e3 100644 --- a/app/src/main/java/com/vanced/manager/ui/screens/InstallScreen.kt +++ b/app/src/main/java/com/vanced/manager/ui/screens/InstallScreen.kt @@ -8,7 +8,10 @@ import androidx.compose.foundation.lazy.items import androidx.compose.material.icons.Icons import androidx.compose.material.icons.rounded.ArrowDropDown import androidx.compose.material.icons.rounded.Done -import androidx.compose.material3.* +import androidx.compose.material3.ExperimentalMaterial3Api +import androidx.compose.material3.ExtendedFloatingActionButton +import androidx.compose.material3.Icon +import androidx.compose.material3.MaterialTheme import androidx.compose.runtime.* import androidx.compose.runtime.saveable.rememberSaveable import androidx.compose.ui.Alignment @@ -30,7 +33,6 @@ import com.vanced.manager.ui.component.topappbar.ManagerTopAppBar import com.vanced.manager.ui.resources.managerString import com.vanced.manager.ui.util.DefaultContentPaddingHorizontal import com.vanced.manager.ui.viewmodel.InstallViewModel -import org.koin.androidx.compose.getViewModel @OptIn( ExperimentalFoundationApi::class, @@ -39,10 +41,9 @@ import org.koin.androidx.compose.getViewModel @Composable fun InstallScreen( appName: String, - appVersions: List? + appVersions: List?, + viewModel: InstallViewModel, ) { - val viewModel: InstallViewModel = getViewModel() - var startedProcess by rememberSaveable { mutableStateOf(false) } val logs = viewModel.logs diff --git a/app/src/main/java/com/vanced/manager/ui/util/Screen.kt b/app/src/main/java/com/vanced/manager/ui/util/Screen.kt index 33806919..cfb77b62 100644 --- a/app/src/main/java/com/vanced/manager/ui/util/Screen.kt +++ b/app/src/main/java/com/vanced/manager/ui/util/Screen.kt @@ -13,19 +13,21 @@ sealed class Screen( displayName = R.string.app_name ) - object Settings: Screen( + object Settings : Screen( route = "settings", displayName = R.string.toolbar_settings, ) - object About: Screen( + object About : Screen( route = "about", displayName = R.string.toolbar_about, ) + object Logs : Screen( route = "logs", displayName = R.string.toolbar_logs, ) + data class InstallPreferences( val appName: String, val appVersions: List?, diff --git a/app/src/main/java/com/vanced/manager/ui/viewmodel/InstallViewModel.kt b/app/src/main/java/com/vanced/manager/ui/viewmodel/InstallViewModel.kt index 2d399076..94a80705 100644 --- a/app/src/main/java/com/vanced/manager/ui/viewmodel/InstallViewModel.kt +++ b/app/src/main/java/com/vanced/manager/ui/viewmodel/InstallViewModel.kt @@ -83,11 +83,14 @@ class InstallViewModel( downloader.download(appVersions) { downloadStatus -> when (downloadStatus) { is DownloadStatus.File -> log(Log.Info("Downloading ${downloadStatus.fileName}")) - is DownloadStatus.Error -> log(Log.Error( - displayText = downloadStatus.displayError, - stacktrace = downloadStatus.stacktrace - )) - is DownloadStatus.Progress -> status = Status.Progress(downloadStatus.progress / 100) + is DownloadStatus.Error -> log( + Log.Error( + displayText = downloadStatus.displayError, + stacktrace = downloadStatus.stacktrace + ) + ) + is DownloadStatus.Progress -> status = + Status.Progress(downloadStatus.progress / 100) is DownloadStatus.StartInstall -> { log(Log.Success("Successfully downloaded $appName")) installApp(appName, appVersions) diff --git a/app/src/main/java/com/vanced/manager/ui/viewmodel/MainViewModel.kt b/app/src/main/java/com/vanced/manager/ui/viewmodel/MainViewModel.kt index 73a82bba..fd820950 100644 --- a/app/src/main/java/com/vanced/manager/ui/viewmodel/MainViewModel.kt +++ b/app/src/main/java/com/vanced/manager/ui/viewmodel/MainViewModel.kt @@ -8,7 +8,6 @@ import com.vanced.manager.core.preferences.holder.musicEnabled import com.vanced.manager.core.preferences.holder.vancedEnabled import com.vanced.manager.domain.model.App import com.vanced.manager.repository.JsonRepository -import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.flow.MutableStateFlow import kotlinx.coroutines.flow.StateFlow import kotlinx.coroutines.launch diff --git a/app/src/main/java/com/vanced/manager/ui/widget/app/AppCard.kt b/app/src/main/java/com/vanced/manager/ui/widget/app/AppCard.kt index cd58c595..e0748a7b 100644 --- a/app/src/main/java/com/vanced/manager/ui/widget/app/AppCard.kt +++ b/app/src/main/java/com/vanced/manager/ui/widget/app/AppCard.kt @@ -5,7 +5,6 @@ import androidx.compose.foundation.Image import androidx.compose.foundation.layout.fillMaxSize import androidx.compose.foundation.layout.size import androidx.compose.material.icons.Icons -import androidx.compose.material.icons.filled.Info import androidx.compose.material.icons.outlined.Info import androidx.compose.material.icons.rounded.DeleteForever import androidx.compose.material.icons.rounded.Download @@ -19,7 +18,6 @@ import androidx.compose.ui.res.stringResource import androidx.compose.ui.unit.dp import coil.compose.ImagePainter import com.vanced.manager.R -import com.vanced.manager.ui.component.button.ManagerIconButton import com.vanced.manager.ui.component.text.AppVersionText import com.vanced.manager.ui.component.text.ManagerText diff --git a/app/src/main/java/com/vanced/manager/ui/widget/app/AppCardPlaceholder.kt b/app/src/main/java/com/vanced/manager/ui/widget/app/AppCardPlaceholder.kt index 92ae807b..42d766d1 100644 --- a/app/src/main/java/com/vanced/manager/ui/widget/app/AppCardPlaceholder.kt +++ b/app/src/main/java/com/vanced/manager/ui/widget/app/AppCardPlaceholder.kt @@ -5,7 +5,6 @@ import androidx.compose.foundation.layout.fillMaxWidth import androidx.compose.foundation.layout.height import androidx.compose.foundation.layout.size import androidx.compose.foundation.shape.CircleShape -import androidx.compose.material3.IconButton import androidx.compose.material3.MaterialTheme import androidx.compose.runtime.Composable import androidx.compose.ui.Modifier diff --git a/app/src/main/java/com/vanced/manager/ui/widget/layout/CategoryLayout.kt b/app/src/main/java/com/vanced/manager/ui/widget/layout/CategoryLayout.kt index 3ad5489e..031c4869 100644 --- a/app/src/main/java/com/vanced/manager/ui/widget/layout/CategoryLayout.kt +++ b/app/src/main/java/com/vanced/manager/ui/widget/layout/CategoryLayout.kt @@ -1,6 +1,9 @@ package com.vanced.manager.ui.widget.layout -import androidx.compose.foundation.layout.* +import androidx.compose.foundation.layout.Arrangement +import androidx.compose.foundation.layout.Column +import androidx.compose.foundation.layout.ColumnScope +import androidx.compose.foundation.layout.padding import androidx.compose.foundation.lazy.LazyItemScope import androidx.compose.foundation.lazy.LazyListScope import androidx.compose.foundation.lazy.items diff --git a/app/src/main/java/com/vanced/manager/ui/widget/layout/SettingsCategoryLayout.kt b/app/src/main/java/com/vanced/manager/ui/widget/layout/SettingsCategoryLayout.kt index d8235f93..e1457694 100644 --- a/app/src/main/java/com/vanced/manager/ui/widget/layout/SettingsCategoryLayout.kt +++ b/app/src/main/java/com/vanced/manager/ui/widget/layout/SettingsCategoryLayout.kt @@ -2,7 +2,6 @@ package com.vanced.manager.ui.widget.layout import androidx.compose.foundation.layout.Column import androidx.compose.runtime.Composable -import androidx.compose.ui.unit.dp @Composable fun SettingsCategoryLayout( diff --git a/app/src/main/java/com/vanced/manager/ui/widget/screens/settings/AccentColorItem.kt b/app/src/main/java/com/vanced/manager/ui/widget/screens/settings/AccentColorItem.kt index eae4feec..71da7a94 100644 --- a/app/src/main/java/com/vanced/manager/ui/widget/screens/settings/AccentColorItem.kt +++ b/app/src/main/java/com/vanced/manager/ui/widget/screens/settings/AccentColorItem.kt @@ -1,15 +1,6 @@ package com.vanced.manager.ui.widget.screens.settings -import androidx.compose.runtime.* -import androidx.compose.ui.graphics.Color -import com.vanced.manager.R -import com.vanced.manager.core.preferences.holder.managerAccentColorPref -import com.vanced.manager.ui.component.color.ManagerColorPicker -import com.vanced.manager.ui.component.preference.DialogPreference -import com.vanced.manager.ui.resources.managerString -import com.vanced.manager.ui.theme.defAccentColor -import com.vanced.manager.ui.widget.button.ManagerResetButton -import com.vanced.manager.ui.widget.button.ManagerSaveButton +import androidx.compose.runtime.Composable @Composable fun SettingsAccentColorItem() {