diff --git a/app/src/main/kotlin/com/aliucord/manager/MainActivity.kt b/app/src/main/kotlin/com/aliucord/manager/MainActivity.kt index ade8017..a9c0807 100644 --- a/app/src/main/kotlin/com/aliucord/manager/MainActivity.kt +++ b/app/src/main/kotlin/com/aliucord/manager/MainActivity.kt @@ -19,7 +19,7 @@ import androidx.core.net.toUri import androidx.core.splashscreen.SplashScreen.Companion.installSplashScreen import com.aliucord.manager.preferences.Prefs import com.aliucord.manager.preferences.sharedPreferences -import com.aliucord.manager.ui.components.ManagerScaffold +import com.aliucord.manager.ui.component.ManagerScaffold import com.aliucord.manager.ui.theme.ManagerTheme import com.aliucord.manager.ui.theme.Theme import com.google.accompanist.permissions.ExperimentalPermissionsApi diff --git a/app/src/main/kotlin/com/aliucord/manager/models/Manifest.kt b/app/src/main/kotlin/com/aliucord/manager/model/Manifest.kt similarity index 92% rename from app/src/main/kotlin/com/aliucord/manager/models/Manifest.kt rename to app/src/main/kotlin/com/aliucord/manager/model/Manifest.kt index 4f4f622..e17e44a 100644 --- a/app/src/main/kotlin/com/aliucord/manager/models/Manifest.kt +++ b/app/src/main/kotlin/com/aliucord/manager/model/Manifest.kt @@ -3,7 +3,7 @@ * Licensed under the Open Software License version 3.0 */ -package com.aliucord.manager.models +package com.aliucord.manager.model import kotlinx.serialization.Serializable diff --git a/app/src/main/kotlin/com/aliucord/manager/models/Plugin.kt b/app/src/main/kotlin/com/aliucord/manager/model/Plugin.kt similarity index 93% rename from app/src/main/kotlin/com/aliucord/manager/models/Plugin.kt rename to app/src/main/kotlin/com/aliucord/manager/model/Plugin.kt index 9153204..ce2ef84 100644 --- a/app/src/main/kotlin/com/aliucord/manager/models/Plugin.kt +++ b/app/src/main/kotlin/com/aliucord/manager/model/Plugin.kt @@ -3,12 +3,12 @@ * Licensed under the Open Software License version 3.0 */ -package com.aliucord.manager.models +package com.aliucord.manager.model import android.util.Log import com.aliucord.manager.BuildConfig -import com.aliucord.manager.utils.aliucordDir -import com.aliucord.manager.utils.json +import com.aliucord.manager.util.aliucordDir +import com.aliucord.manager.util.json import kotlinx.serialization.ExperimentalSerializationApi import kotlinx.serialization.json.decodeFromStream import java.io.File diff --git a/app/src/main/kotlin/com/aliucord/manager/models/github/Commit.kt b/app/src/main/kotlin/com/aliucord/manager/model/github/Commit.kt similarity index 91% rename from app/src/main/kotlin/com/aliucord/manager/models/github/Commit.kt rename to app/src/main/kotlin/com/aliucord/manager/model/github/Commit.kt index 96ec796..01212fc 100644 --- a/app/src/main/kotlin/com/aliucord/manager/models/github/Commit.kt +++ b/app/src/main/kotlin/com/aliucord/manager/model/github/Commit.kt @@ -3,7 +3,7 @@ * Licensed under the Open Software License version 3.0 */ -package com.aliucord.manager.models.github +package com.aliucord.manager.model.github import kotlinx.serialization.SerialName import kotlinx.serialization.Serializable diff --git a/app/src/main/kotlin/com/aliucord/manager/models/github/GithubUser.kt b/app/src/main/kotlin/com/aliucord/manager/model/github/GithubUser.kt similarity index 87% rename from app/src/main/kotlin/com/aliucord/manager/models/github/GithubUser.kt rename to app/src/main/kotlin/com/aliucord/manager/model/github/GithubUser.kt index a9701f3..62b52ad 100644 --- a/app/src/main/kotlin/com/aliucord/manager/models/github/GithubUser.kt +++ b/app/src/main/kotlin/com/aliucord/manager/model/github/GithubUser.kt @@ -3,7 +3,7 @@ * Licensed under the Open Software License version 3.0 */ -package com.aliucord.manager.models.github +package com.aliucord.manager.model.github import kotlinx.serialization.SerialName import kotlinx.serialization.Serializable diff --git a/app/src/main/kotlin/com/aliucord/manager/models/github/Version.kt b/app/src/main/kotlin/com/aliucord/manager/model/github/Version.kt similarity index 86% rename from app/src/main/kotlin/com/aliucord/manager/models/github/Version.kt rename to app/src/main/kotlin/com/aliucord/manager/model/github/Version.kt index 5992589..2c0e69e 100644 --- a/app/src/main/kotlin/com/aliucord/manager/models/github/Version.kt +++ b/app/src/main/kotlin/com/aliucord/manager/model/github/Version.kt @@ -3,7 +3,7 @@ * Licensed under the Open Software License version 3.0 */ -package com.aliucord.manager.models.github +package com.aliucord.manager.model.github import kotlinx.serialization.Serializable diff --git a/app/src/main/kotlin/com/aliucord/manager/preferences/PreferencesHolder.kt b/app/src/main/kotlin/com/aliucord/manager/preferences/PreferencesHolder.kt index 273fc3a..f9ad786 100644 --- a/app/src/main/kotlin/com/aliucord/manager/preferences/PreferencesHolder.kt +++ b/app/src/main/kotlin/com/aliucord/manager/preferences/PreferencesHolder.kt @@ -5,7 +5,7 @@ package com.aliucord.manager.preferences -import com.aliucord.manager.utils.aliucordDir +import com.aliucord.manager.util.aliucordDir object Prefs { val theme = intPreference("theme") diff --git a/app/src/main/kotlin/com/aliucord/manager/ui/components/AppBar.kt b/app/src/main/kotlin/com/aliucord/manager/ui/component/AppBar.kt similarity index 97% rename from app/src/main/kotlin/com/aliucord/manager/ui/components/AppBar.kt rename to app/src/main/kotlin/com/aliucord/manager/ui/component/AppBar.kt index 2eaee2e..a956834 100644 --- a/app/src/main/kotlin/com/aliucord/manager/ui/components/AppBar.kt +++ b/app/src/main/kotlin/com/aliucord/manager/ui/component/AppBar.kt @@ -3,7 +3,7 @@ * Licensed under the Open Software License version 3.0 */ -package com.aliucord.manager.ui.components +package com.aliucord.manager.ui.component import androidx.annotation.StringRes import androidx.compose.foundation.layout.Box @@ -23,8 +23,8 @@ import androidx.navigation.NavController import androidx.navigation.compose.currentBackStackEntryAsState import com.aliucord.manager.BuildConfig import com.aliucord.manager.R -import com.aliucord.manager.ui.screens.appDestination -import com.aliucord.manager.ui.screens.destinations.* +import com.aliucord.manager.ui.screen.appDestination +import com.aliucord.manager.ui.screen.destinations.* import com.ramcosta.composedestinations.navigation.navigate import com.ramcosta.composedestinations.navigation.popUpTo diff --git a/app/src/main/kotlin/com/aliucord/manager/ui/components/GrantPermission.kt b/app/src/main/kotlin/com/aliucord/manager/ui/component/GrantPermission.kt similarity index 98% rename from app/src/main/kotlin/com/aliucord/manager/ui/components/GrantPermission.kt rename to app/src/main/kotlin/com/aliucord/manager/ui/component/GrantPermission.kt index 1d73d2e..b16590e 100644 --- a/app/src/main/kotlin/com/aliucord/manager/ui/components/GrantPermission.kt +++ b/app/src/main/kotlin/com/aliucord/manager/ui/component/GrantPermission.kt @@ -3,7 +3,7 @@ * Licensed under the Open Software License version 3.0 */ -package com.aliucord.manager.ui.components +package com.aliucord.manager.ui.component import android.content.Intent import android.net.Uri diff --git a/app/src/main/kotlin/com/aliucord/manager/ui/components/ManagerScaffold.kt b/app/src/main/kotlin/com/aliucord/manager/ui/component/ManagerScaffold.kt similarity index 94% rename from app/src/main/kotlin/com/aliucord/manager/ui/components/ManagerScaffold.kt rename to app/src/main/kotlin/com/aliucord/manager/ui/component/ManagerScaffold.kt index b1b26ea..8a9e9bc 100644 --- a/app/src/main/kotlin/com/aliucord/manager/ui/components/ManagerScaffold.kt +++ b/app/src/main/kotlin/com/aliucord/manager/ui/component/ManagerScaffold.kt @@ -3,7 +3,7 @@ * Licensed under the Open Software License version 3.0 */ -package com.aliucord.manager.ui.components +package com.aliucord.manager.ui.component import android.Manifest import androidx.compose.foundation.layout.padding @@ -13,7 +13,7 @@ import androidx.compose.runtime.Composable import androidx.compose.ui.Modifier import androidx.compose.ui.unit.dp import androidx.navigation.compose.rememberNavController -import com.aliucord.manager.ui.screens.NavGraphs +import com.aliucord.manager.ui.screen.NavGraphs import com.google.accompanist.permissions.* import com.ramcosta.composedestinations.DestinationsNavHost import com.ramcosta.composedestinations.rememberNavHostEngine diff --git a/app/src/main/kotlin/com/aliucord/manager/ui/components/PluginsList.kt b/app/src/main/kotlin/com/aliucord/manager/ui/component/PluginsList.kt similarity index 95% rename from app/src/main/kotlin/com/aliucord/manager/ui/components/PluginsList.kt rename to app/src/main/kotlin/com/aliucord/manager/ui/component/PluginsList.kt index 64bf98e..304531b 100644 --- a/app/src/main/kotlin/com/aliucord/manager/ui/components/PluginsList.kt +++ b/app/src/main/kotlin/com/aliucord/manager/ui/component/PluginsList.kt @@ -3,7 +3,7 @@ * Licensed under the Open Software License version 3.0 */ -package com.aliucord.manager.ui.components +package com.aliucord.manager.ui.component import androidx.compose.foundation.layout.* import androidx.compose.foundation.lazy.LazyColumn @@ -22,9 +22,9 @@ import androidx.compose.ui.text.input.ImeAction import androidx.compose.ui.unit.dp import androidx.compose.ui.window.Dialog import com.aliucord.manager.R -import com.aliucord.manager.models.Plugin -import com.aliucord.manager.ui.components.plugins.Changelog -import com.aliucord.manager.ui.components.plugins.PluginCard +import com.aliucord.manager.model.Plugin +import com.aliucord.manager.ui.component.plugins.Changelog +import com.aliucord.manager.ui.component.plugins.PluginCard @Composable fun PluginsList() = Column( diff --git a/app/src/main/kotlin/com/aliucord/manager/ui/components/about/ContributorEntry.kt b/app/src/main/kotlin/com/aliucord/manager/ui/component/about/ContributorEntry.kt similarity index 94% rename from app/src/main/kotlin/com/aliucord/manager/ui/components/about/ContributorEntry.kt rename to app/src/main/kotlin/com/aliucord/manager/ui/component/about/ContributorEntry.kt index a601a30..9ac9792 100644 --- a/app/src/main/kotlin/com/aliucord/manager/ui/components/about/ContributorEntry.kt +++ b/app/src/main/kotlin/com/aliucord/manager/ui/component/about/ContributorEntry.kt @@ -3,7 +3,7 @@ * Licensed under the Open Software License version 3.0 */ -package com.aliucord.manager.ui.components.about +package com.aliucord.manager.ui.component.about import androidx.compose.foundation.clickable import androidx.compose.foundation.layout.fillMaxSize diff --git a/app/src/main/kotlin/com/aliucord/manager/ui/components/about/ContributorsCard.kt b/app/src/main/kotlin/com/aliucord/manager/ui/component/about/ContributorsCard.kt similarity index 95% rename from app/src/main/kotlin/com/aliucord/manager/ui/components/about/ContributorsCard.kt rename to app/src/main/kotlin/com/aliucord/manager/ui/component/about/ContributorsCard.kt index 123a982..6e0777f 100644 --- a/app/src/main/kotlin/com/aliucord/manager/ui/components/about/ContributorsCard.kt +++ b/app/src/main/kotlin/com/aliucord/manager/ui/component/about/ContributorsCard.kt @@ -3,7 +3,7 @@ * Licensed under the Open Software License version 3.0 */ -package com.aliucord.manager.ui.components.about +package com.aliucord.manager.ui.component.about import androidx.compose.foundation.ExperimentalFoundationApi import androidx.compose.foundation.layout.* @@ -15,7 +15,7 @@ import androidx.compose.ui.Modifier import androidx.compose.ui.res.stringResource import androidx.compose.ui.unit.dp import com.aliucord.manager.R -import com.aliucord.manager.models.github.GithubUser +import com.aliucord.manager.model.github.GithubUser @OptIn(ExperimentalMaterial3Api::class, ExperimentalFoundationApi::class) @Composable diff --git a/app/src/main/kotlin/com/aliucord/manager/ui/components/about/TeamCard.kt b/app/src/main/kotlin/com/aliucord/manager/ui/component/about/TeamCard.kt similarity index 95% rename from app/src/main/kotlin/com/aliucord/manager/ui/components/about/TeamCard.kt rename to app/src/main/kotlin/com/aliucord/manager/ui/component/about/TeamCard.kt index a5e3fed..2955af2 100644 --- a/app/src/main/kotlin/com/aliucord/manager/ui/components/about/TeamCard.kt +++ b/app/src/main/kotlin/com/aliucord/manager/ui/component/about/TeamCard.kt @@ -3,7 +3,7 @@ * Licensed under the Open Software License version 3.0 */ -package com.aliucord.manager.ui.components.about +package com.aliucord.manager.ui.component.about import androidx.compose.foundation.layout.* import androidx.compose.material3.* diff --git a/app/src/main/kotlin/com/aliucord/manager/ui/components/about/UserEntry.kt b/app/src/main/kotlin/com/aliucord/manager/ui/component/about/UserEntry.kt similarity index 95% rename from app/src/main/kotlin/com/aliucord/manager/ui/components/about/UserEntry.kt rename to app/src/main/kotlin/com/aliucord/manager/ui/component/about/UserEntry.kt index 677cf57..09eed86 100644 --- a/app/src/main/kotlin/com/aliucord/manager/ui/components/about/UserEntry.kt +++ b/app/src/main/kotlin/com/aliucord/manager/ui/component/about/UserEntry.kt @@ -3,7 +3,7 @@ * Licensed under the Open Software License version 3.0 */ -package com.aliucord.manager.ui.components.about +package com.aliucord.manager.ui.component.about import androidx.compose.foundation.layout.* import androidx.compose.foundation.shape.CircleShape diff --git a/app/src/main/kotlin/com/aliucord/manager/ui/components/installer/InstallerDialog.kt b/app/src/main/kotlin/com/aliucord/manager/ui/component/installer/InstallerDialog.kt similarity index 98% rename from app/src/main/kotlin/com/aliucord/manager/ui/components/installer/InstallerDialog.kt rename to app/src/main/kotlin/com/aliucord/manager/ui/component/installer/InstallerDialog.kt index 85e8353..59b93e0 100644 --- a/app/src/main/kotlin/com/aliucord/manager/ui/components/installer/InstallerDialog.kt +++ b/app/src/main/kotlin/com/aliucord/manager/ui/component/installer/InstallerDialog.kt @@ -3,7 +3,7 @@ * Licensed under the Open Software License version 3.0 */ -package com.aliucord.manager.ui.components.installer +package com.aliucord.manager.ui.component.installer import androidx.compose.foundation.ExperimentalFoundationApi import androidx.compose.foundation.clickable diff --git a/app/src/main/kotlin/com/aliucord/manager/ui/components/plugins/Changelog.kt b/app/src/main/kotlin/com/aliucord/manager/ui/component/plugins/Changelog.kt similarity index 98% rename from app/src/main/kotlin/com/aliucord/manager/ui/components/plugins/Changelog.kt rename to app/src/main/kotlin/com/aliucord/manager/ui/component/plugins/Changelog.kt index 697f294..f555592 100644 --- a/app/src/main/kotlin/com/aliucord/manager/ui/components/plugins/Changelog.kt +++ b/app/src/main/kotlin/com/aliucord/manager/ui/component/plugins/Changelog.kt @@ -3,7 +3,7 @@ * Licensed under the Open Software License version 3.0 */ -package com.aliucord.manager.ui.components.plugins +package com.aliucord.manager.ui.component.plugins import android.annotation.SuppressLint import androidx.compose.foundation.layout.* @@ -29,7 +29,7 @@ import androidx.compose.ui.unit.dp import coil.compose.AsyncImage import coil.request.ImageRequest import com.aliucord.manager.R -import com.aliucord.manager.models.Plugin +import com.aliucord.manager.model.Plugin private val hyperLinkPattern = Regex("\\[(.+?)]\\((.+?\\))") diff --git a/app/src/main/kotlin/com/aliucord/manager/ui/components/plugins/PluginCard.kt b/app/src/main/kotlin/com/aliucord/manager/ui/component/plugins/PluginCard.kt similarity index 98% rename from app/src/main/kotlin/com/aliucord/manager/ui/components/plugins/PluginCard.kt rename to app/src/main/kotlin/com/aliucord/manager/ui/component/plugins/PluginCard.kt index c7fd05d..5773c02 100644 --- a/app/src/main/kotlin/com/aliucord/manager/ui/components/plugins/PluginCard.kt +++ b/app/src/main/kotlin/com/aliucord/manager/ui/component/plugins/PluginCard.kt @@ -3,7 +3,7 @@ * Licensed under the Open Software License version 3.0 */ -package com.aliucord.manager.ui.components.plugins +package com.aliucord.manager.ui.component.plugins import androidx.compose.foundation.layout.* import androidx.compose.foundation.selection.toggleable @@ -21,7 +21,7 @@ import androidx.compose.ui.text.* import androidx.compose.ui.text.font.FontWeight import androidx.compose.ui.unit.dp import com.aliucord.manager.R -import com.aliucord.manager.models.Plugin +import com.aliucord.manager.model.Plugin @OptIn(ExperimentalMaterial3Api::class) @Composable diff --git a/app/src/main/kotlin/com/aliucord/manager/ui/components/settings/Setting.kt b/app/src/main/kotlin/com/aliucord/manager/ui/component/settings/Setting.kt similarity index 94% rename from app/src/main/kotlin/com/aliucord/manager/ui/components/settings/Setting.kt rename to app/src/main/kotlin/com/aliucord/manager/ui/component/settings/Setting.kt index 60a64c2..0dc3c10 100644 --- a/app/src/main/kotlin/com/aliucord/manager/ui/components/settings/Setting.kt +++ b/app/src/main/kotlin/com/aliucord/manager/ui/component/settings/Setting.kt @@ -3,7 +3,7 @@ * Licensed under the Open Software License version 3.0 */ -package com.aliucord.manager.ui.components.settings +package com.aliucord.manager.ui.component.settings import androidx.compose.foundation.clickable import androidx.compose.material3.* diff --git a/app/src/main/kotlin/com/aliucord/manager/ui/components/settings/ThemeDialog.kt b/app/src/main/kotlin/com/aliucord/manager/ui/component/settings/ThemeDialog.kt similarity index 97% rename from app/src/main/kotlin/com/aliucord/manager/ui/components/settings/ThemeDialog.kt rename to app/src/main/kotlin/com/aliucord/manager/ui/component/settings/ThemeDialog.kt index a98125c..354b766 100644 --- a/app/src/main/kotlin/com/aliucord/manager/ui/components/settings/ThemeDialog.kt +++ b/app/src/main/kotlin/com/aliucord/manager/ui/component/settings/ThemeDialog.kt @@ -3,7 +3,7 @@ * Licensed under the Open Software License version 3.0 */ -package com.aliucord.manager.ui.components.settings +package com.aliucord.manager.ui.component.settings import androidx.compose.foundation.clickable import androidx.compose.foundation.layout.* diff --git a/app/src/main/kotlin/com/aliucord/manager/ui/components/settings/ThemeSetting.kt b/app/src/main/kotlin/com/aliucord/manager/ui/component/settings/ThemeSetting.kt similarity index 94% rename from app/src/main/kotlin/com/aliucord/manager/ui/components/settings/ThemeSetting.kt rename to app/src/main/kotlin/com/aliucord/manager/ui/component/settings/ThemeSetting.kt index d28cda8..9d26afb 100644 --- a/app/src/main/kotlin/com/aliucord/manager/ui/components/settings/ThemeSetting.kt +++ b/app/src/main/kotlin/com/aliucord/manager/ui/component/settings/ThemeSetting.kt @@ -3,7 +3,7 @@ * Licensed under the Open Software License version 3.0 */ -package com.aliucord.manager.ui.components.settings +package com.aliucord.manager.ui.component.settings import androidx.compose.foundation.clickable import androidx.compose.material3.* diff --git a/app/src/main/kotlin/com/aliucord/manager/ui/screens/AboutScreen.kt b/app/src/main/kotlin/com/aliucord/manager/ui/screen/AboutScreen.kt similarity index 86% rename from app/src/main/kotlin/com/aliucord/manager/ui/screens/AboutScreen.kt rename to app/src/main/kotlin/com/aliucord/manager/ui/screen/AboutScreen.kt index 48b934c..299bbd4 100644 --- a/app/src/main/kotlin/com/aliucord/manager/ui/screens/AboutScreen.kt +++ b/app/src/main/kotlin/com/aliucord/manager/ui/screen/AboutScreen.kt @@ -3,7 +3,7 @@ * Licensed under the Open Software License version 3.0 */ -package com.aliucord.manager.ui.screens +package com.aliucord.manager.ui.screen import androidx.compose.foundation.layout.* import androidx.compose.material3.* @@ -15,9 +15,9 @@ import androidx.compose.ui.res.stringResource import androidx.compose.ui.unit.dp import androidx.lifecycle.viewmodel.compose.viewModel import com.aliucord.manager.R -import com.aliucord.manager.ui.components.about.ContributorsCard -import com.aliucord.manager.ui.components.about.TeamCard -import com.aliucord.manager.ui.viewmodels.AboutViewModel +import com.aliucord.manager.ui.component.about.ContributorsCard +import com.aliucord.manager.ui.component.about.TeamCard +import com.aliucord.manager.ui.viewmodel.AboutViewModel import com.ramcosta.composedestinations.annotation.Destination @Destination diff --git a/app/src/main/kotlin/com/aliucord/manager/ui/screens/CommitsScreen.kt b/app/src/main/kotlin/com/aliucord/manager/ui/screen/CommitsScreen.kt similarity index 96% rename from app/src/main/kotlin/com/aliucord/manager/ui/screens/CommitsScreen.kt rename to app/src/main/kotlin/com/aliucord/manager/ui/screen/CommitsScreen.kt index ea4e701..a3ad8a9 100644 --- a/app/src/main/kotlin/com/aliucord/manager/ui/screens/CommitsScreen.kt +++ b/app/src/main/kotlin/com/aliucord/manager/ui/screen/CommitsScreen.kt @@ -3,7 +3,7 @@ * Licensed under the Open Software License version 3.0 */ -package com.aliucord.manager.ui.screens +package com.aliucord.manager.ui.screen import androidx.compose.foundation.clickable import androidx.compose.foundation.layout.* @@ -20,8 +20,8 @@ import androidx.paging.* import androidx.paging.compose.collectAsLazyPagingItems import androidx.paging.compose.items import com.aliucord.manager.R -import com.aliucord.manager.models.github.Commit -import com.aliucord.manager.utils.Github +import com.aliucord.manager.model.github.Commit +import com.aliucord.manager.util.Github import com.ramcosta.composedestinations.annotation.Destination @OptIn(ExperimentalMaterial3Api::class) diff --git a/app/src/main/kotlin/com/aliucord/manager/ui/screens/HomeScreen.kt b/app/src/main/kotlin/com/aliucord/manager/ui/screen/HomeScreen.kt similarity index 95% rename from app/src/main/kotlin/com/aliucord/manager/ui/screens/HomeScreen.kt rename to app/src/main/kotlin/com/aliucord/manager/ui/screen/HomeScreen.kt index 10258ab..d00f26c 100644 --- a/app/src/main/kotlin/com/aliucord/manager/ui/screens/HomeScreen.kt +++ b/app/src/main/kotlin/com/aliucord/manager/ui/screen/HomeScreen.kt @@ -4,7 +4,7 @@ */ -package com.aliucord.manager.ui.screens +package com.aliucord.manager.ui.screen import androidx.activity.compose.rememberLauncherForActivityResult import androidx.activity.result.contract.ActivityResultContracts @@ -23,12 +23,12 @@ import androidx.compose.ui.unit.dp import androidx.lifecycle.viewmodel.compose.viewModel import com.aliucord.manager.R import com.aliucord.manager.preferences.Prefs -import com.aliucord.manager.ui.components.PluginsList -import com.aliucord.manager.ui.components.installer.DownloadMethod -import com.aliucord.manager.ui.components.installer.InstallerDialog -import com.aliucord.manager.ui.screens.destinations.CommitsScreenDestination -import com.aliucord.manager.ui.screens.destinations.InstallerScreenDestination -import com.aliucord.manager.ui.viewmodels.HomeViewModel +import com.aliucord.manager.ui.component.PluginsList +import com.aliucord.manager.ui.component.installer.DownloadMethod +import com.aliucord.manager.ui.component.installer.InstallerDialog +import com.aliucord.manager.ui.screen.destinations.CommitsScreenDestination +import com.aliucord.manager.ui.screen.destinations.InstallerScreenDestination +import com.aliucord.manager.ui.viewmodel.HomeViewModel import com.ramcosta.composedestinations.annotation.Destination import com.ramcosta.composedestinations.annotation.RootNavGraph import com.ramcosta.composedestinations.navigation.DestinationsNavigator diff --git a/app/src/main/kotlin/com/aliucord/manager/ui/screens/InstallScreen.kt b/app/src/main/kotlin/com/aliucord/manager/ui/screen/InstallScreen.kt similarity index 89% rename from app/src/main/kotlin/com/aliucord/manager/ui/screens/InstallScreen.kt rename to app/src/main/kotlin/com/aliucord/manager/ui/screen/InstallScreen.kt index f73d264..4ac92c0 100644 --- a/app/src/main/kotlin/com/aliucord/manager/ui/screens/InstallScreen.kt +++ b/app/src/main/kotlin/com/aliucord/manager/ui/screen/InstallScreen.kt @@ -3,7 +3,7 @@ * Licensed under the Open Software License version 3.0 */ -package com.aliucord.manager.ui.screens +package com.aliucord.manager.ui.screen import androidx.compose.foundation.ExperimentalFoundationApi import androidx.compose.foundation.layout.fillMaxSize @@ -15,8 +15,8 @@ import androidx.compose.runtime.* import androidx.compose.ui.Modifier import androidx.compose.ui.unit.dp import androidx.lifecycle.viewmodel.compose.viewModel -import com.aliucord.manager.ui.screens.destinations.HomeScreenDestination -import com.aliucord.manager.ui.viewmodels.InstallViewModel +import com.aliucord.manager.ui.screen.destinations.HomeScreenDestination +import com.aliucord.manager.ui.viewmodel.InstallViewModel import com.ramcosta.composedestinations.annotation.Destination import com.ramcosta.composedestinations.navigation.DestinationsNavigator diff --git a/app/src/main/kotlin/com/aliucord/manager/ui/screens/SettingsScreen.kt b/app/src/main/kotlin/com/aliucord/manager/ui/screen/SettingsScreen.kt similarity index 95% rename from app/src/main/kotlin/com/aliucord/manager/ui/screens/SettingsScreen.kt rename to app/src/main/kotlin/com/aliucord/manager/ui/screen/SettingsScreen.kt index 4e8412e..8945c5e 100644 --- a/app/src/main/kotlin/com/aliucord/manager/ui/screens/SettingsScreen.kt +++ b/app/src/main/kotlin/com/aliucord/manager/ui/screen/SettingsScreen.kt @@ -3,7 +3,7 @@ * Licensed under the Open Software License version 3.0 */ -package com.aliucord.manager.ui.screens +package com.aliucord.manager.ui.screen import androidx.compose.animation.AnimatedVisibility import androidx.compose.animation.shrinkVertically @@ -19,8 +19,8 @@ import androidx.compose.ui.unit.dp import androidx.lifecycle.viewmodel.compose.viewModel import com.aliucord.manager.R import com.aliucord.manager.preferences.Prefs -import com.aliucord.manager.ui.components.settings.* -import com.aliucord.manager.ui.viewmodels.SettingsViewModel +import com.aliucord.manager.ui.component.settings.* +import com.aliucord.manager.ui.viewmodel.SettingsViewModel import com.ramcosta.composedestinations.annotation.Destination @Destination diff --git a/app/src/main/kotlin/com/aliucord/manager/ui/screens/StoreScreen.kt b/app/src/main/kotlin/com/aliucord/manager/ui/screen/StoreScreen.kt similarity index 95% rename from app/src/main/kotlin/com/aliucord/manager/ui/screens/StoreScreen.kt rename to app/src/main/kotlin/com/aliucord/manager/ui/screen/StoreScreen.kt index 962bda2..8780924 100644 --- a/app/src/main/kotlin/com/aliucord/manager/ui/screens/StoreScreen.kt +++ b/app/src/main/kotlin/com/aliucord/manager/ui/screen/StoreScreen.kt @@ -3,7 +3,7 @@ * Licensed under the Open Software License version 3.0 */ -package com.aliucord.manager.ui.screens +package com.aliucord.manager.ui.screen import androidx.compose.foundation.layout.* import androidx.compose.foundation.lazy.LazyColumn @@ -13,7 +13,7 @@ import androidx.compose.runtime.* import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier import androidx.compose.ui.unit.dp -import com.aliucord.manager.utils.httpClient +import com.aliucord.manager.util.httpClient import com.ramcosta.composedestinations.annotation.Destination import io.ktor.client.call.* import io.ktor.client.request.* diff --git a/app/src/main/kotlin/com/aliucord/manager/ui/theme/Theme.kt b/app/src/main/kotlin/com/aliucord/manager/ui/theme/Theme.kt index 5c1c640..2961cc7 100644 --- a/app/src/main/kotlin/com/aliucord/manager/ui/theme/Theme.kt +++ b/app/src/main/kotlin/com/aliucord/manager/ui/theme/Theme.kt @@ -3,7 +3,6 @@ * Licensed under the Open Software License version 3.0 */ - package com.aliucord.manager.ui.theme import android.os.Build diff --git a/app/src/main/kotlin/com/aliucord/manager/ui/viewmodels/AboutViewModel.kt b/app/src/main/kotlin/com/aliucord/manager/ui/viewmodel/AboutViewModel.kt similarity index 78% rename from app/src/main/kotlin/com/aliucord/manager/ui/viewmodels/AboutViewModel.kt rename to app/src/main/kotlin/com/aliucord/manager/ui/viewmodel/AboutViewModel.kt index e36a0e6..37a8c6b 100644 --- a/app/src/main/kotlin/com/aliucord/manager/ui/viewmodels/AboutViewModel.kt +++ b/app/src/main/kotlin/com/aliucord/manager/ui/viewmodel/AboutViewModel.kt @@ -1,11 +1,11 @@ -package com.aliucord.manager.ui.viewmodels +package com.aliucord.manager.ui.viewmodel import androidx.compose.runtime.mutableStateListOf import androidx.lifecycle.ViewModel import androidx.lifecycle.viewModelScope -import com.aliucord.manager.models.github.GithubUser -import com.aliucord.manager.utils.Github -import com.aliucord.manager.utils.httpClient +import com.aliucord.manager.model.github.GithubUser +import com.aliucord.manager.util.Github +import com.aliucord.manager.util.httpClient import io.ktor.client.call.* import io.ktor.client.request.* import kotlinx.coroutines.launch diff --git a/app/src/main/kotlin/com/aliucord/manager/ui/viewmodels/HomeViewModel.kt b/app/src/main/kotlin/com/aliucord/manager/ui/viewmodel/HomeViewModel.kt similarity index 94% rename from app/src/main/kotlin/com/aliucord/manager/ui/viewmodels/HomeViewModel.kt rename to app/src/main/kotlin/com/aliucord/manager/ui/viewmodel/HomeViewModel.kt index 030d8a5..693f267 100644 --- a/app/src/main/kotlin/com/aliucord/manager/ui/viewmodels/HomeViewModel.kt +++ b/app/src/main/kotlin/com/aliucord/manager/ui/viewmodel/HomeViewModel.kt @@ -1,4 +1,4 @@ -package com.aliucord.manager.ui.viewmodels +package com.aliucord.manager.ui.viewmodel import android.app.Application import android.content.Intent @@ -7,9 +7,9 @@ import android.widget.Toast import androidx.compose.runtime.* import androidx.lifecycle.AndroidViewModel import androidx.lifecycle.viewModelScope -import com.aliucord.manager.models.github.Version +import com.aliucord.manager.model.github.Version import com.aliucord.manager.preferences.Prefs -import com.aliucord.manager.utils.* +import com.aliucord.manager.util.* import io.ktor.client.request.* import io.ktor.client.statement.* import kotlinx.coroutines.* diff --git a/app/src/main/kotlin/com/aliucord/manager/ui/viewmodels/InstallViewModel.kt b/app/src/main/kotlin/com/aliucord/manager/ui/viewmodel/InstallViewModel.kt similarity index 98% rename from app/src/main/kotlin/com/aliucord/manager/ui/viewmodels/InstallViewModel.kt rename to app/src/main/kotlin/com/aliucord/manager/ui/viewmodel/InstallViewModel.kt index bae4aad..e1994d2 100644 --- a/app/src/main/kotlin/com/aliucord/manager/ui/viewmodels/InstallViewModel.kt +++ b/app/src/main/kotlin/com/aliucord/manager/ui/viewmodel/InstallViewModel.kt @@ -1,4 +1,4 @@ -package com.aliucord.manager.ui.viewmodels +package com.aliucord.manager.ui.viewmodel import android.annotation.SuppressLint import android.app.Application @@ -13,7 +13,7 @@ import androidx.lifecycle.viewModelScope import com.aliucord.manager.installer.service.InstallService import com.aliucord.manager.installer.util.DownloadUtils import com.aliucord.manager.installer.util.ManifestPatcher -import com.aliucord.manager.utils.Signer +import com.aliucord.manager.util.Signer import com.android.zipflinger.* import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.flow.MutableSharedFlow diff --git a/app/src/main/kotlin/com/aliucord/manager/ui/viewmodels/SettingsViewModel.kt b/app/src/main/kotlin/com/aliucord/manager/ui/viewmodel/SettingsViewModel.kt similarity index 85% rename from app/src/main/kotlin/com/aliucord/manager/ui/viewmodels/SettingsViewModel.kt rename to app/src/main/kotlin/com/aliucord/manager/ui/viewmodel/SettingsViewModel.kt index 886bea0..5d1c2ba 100644 --- a/app/src/main/kotlin/com/aliucord/manager/ui/viewmodels/SettingsViewModel.kt +++ b/app/src/main/kotlin/com/aliucord/manager/ui/viewmodel/SettingsViewModel.kt @@ -1,4 +1,4 @@ -package com.aliucord.manager.ui.viewmodels +package com.aliucord.manager.ui.viewmodel import android.app.Application import androidx.lifecycle.AndroidViewModel diff --git a/app/src/main/kotlin/com/aliucord/manager/utils/Const.kt b/app/src/main/kotlin/com/aliucord/manager/util/Const.kt similarity index 93% rename from app/src/main/kotlin/com/aliucord/manager/utils/Const.kt rename to app/src/main/kotlin/com/aliucord/manager/util/Const.kt index 61c841e..65e2d19 100644 --- a/app/src/main/kotlin/com/aliucord/manager/utils/Const.kt +++ b/app/src/main/kotlin/com/aliucord/manager/util/Const.kt @@ -3,7 +3,7 @@ * Licensed under the Open Software License version 3.0 */ -package com.aliucord.manager.utils +package com.aliucord.manager.util import android.os.Environment import io.ktor.client.* diff --git a/app/src/main/kotlin/com/aliucord/manager/utils/Github.kt b/app/src/main/kotlin/com/aliucord/manager/util/Github.kt similarity index 91% rename from app/src/main/kotlin/com/aliucord/manager/utils/Github.kt rename to app/src/main/kotlin/com/aliucord/manager/util/Github.kt index f5f1f21..5fef249 100644 --- a/app/src/main/kotlin/com/aliucord/manager/utils/Github.kt +++ b/app/src/main/kotlin/com/aliucord/manager/util/Github.kt @@ -3,10 +3,10 @@ * Licensed under the Open Software License version 3.0 */ -package com.aliucord.manager.utils +package com.aliucord.manager.util -import com.aliucord.manager.models.github.Commit -import com.aliucord.manager.models.github.Version +import com.aliucord.manager.model.github.Commit +import com.aliucord.manager.model.github.Version import io.ktor.client.call.* import io.ktor.client.request.* import kotlinx.serialization.ExperimentalSerializationApi diff --git a/app/src/main/kotlin/com/aliucord/manager/utils/Signer.kt b/app/src/main/kotlin/com/aliucord/manager/util/Signer.kt similarity index 98% rename from app/src/main/kotlin/com/aliucord/manager/utils/Signer.kt rename to app/src/main/kotlin/com/aliucord/manager/util/Signer.kt index b9a5bdb..c8526b1 100644 --- a/app/src/main/kotlin/com/aliucord/manager/utils/Signer.kt +++ b/app/src/main/kotlin/com/aliucord/manager/util/Signer.kt @@ -3,7 +3,7 @@ * Licensed under the Open Software License version 3.0 */ -package com.aliucord.manager.utils +package com.aliucord.manager.util import com.android.apksig.ApkSigner import org.bouncycastle.asn1.x500.X500Name diff --git a/app/src/main/kotlin/com/aliucord/manager/utils/ZipUtils.kt b/app/src/main/kotlin/com/aliucord/manager/util/ZipUtils.kt similarity index 92% rename from app/src/main/kotlin/com/aliucord/manager/utils/ZipUtils.kt rename to app/src/main/kotlin/com/aliucord/manager/util/ZipUtils.kt index 3da2746..0a7f4f2 100644 --- a/app/src/main/kotlin/com/aliucord/manager/utils/ZipUtils.kt +++ b/app/src/main/kotlin/com/aliucord/manager/util/ZipUtils.kt @@ -3,7 +3,7 @@ * Licensed under the Open Software License version 3.0 */ -package com.aliucord.manager.utils +package com.aliucord.manager.util import com.aliucord.libzip.Zip import java.io.InputStream