Rename packages
This commit is contained in:
parent
960d7a72d2
commit
66bf0f128e
36 changed files with 70 additions and 71 deletions
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
||||
|
|
@ -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
|
||||
|
|
@ -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
|
||||
|
|
@ -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
|
||||
|
|
@ -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
|
||||
|
||||
|
|
@ -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")
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
||||
|
|
@ -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
|
||||
|
|
@ -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
|
||||
|
|
@ -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(
|
||||
|
|
@ -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
|
||||
|
|
@ -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
|
||||
|
|
@ -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.*
|
||||
|
|
@ -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
|
||||
|
|
@ -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
|
||||
|
|
@ -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("\\[(.+?)]\\((.+?\\))")
|
||||
|
||||
|
|
@ -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
|
||||
|
|
@ -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.*
|
||||
|
|
@ -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.*
|
||||
|
|
@ -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.*
|
||||
|
|
@ -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
|
||||
|
|
@ -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)
|
||||
|
|
@ -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
|
||||
|
|
@ -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
|
||||
|
||||
|
|
@ -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
|
||||
|
|
@ -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.*
|
||||
|
|
@ -3,7 +3,6 @@
|
|||
* Licensed under the Open Software License version 3.0
|
||||
*/
|
||||
|
||||
|
||||
package com.aliucord.manager.ui.theme
|
||||
|
||||
import android.os.Build
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
@ -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.*
|
||||
|
|
@ -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
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
package com.aliucord.manager.ui.viewmodels
|
||||
package com.aliucord.manager.ui.viewmodel
|
||||
|
||||
import android.app.Application
|
||||
import androidx.lifecycle.AndroidViewModel
|
||||
|
|
@ -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.*
|
||||
|
|
@ -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
|
||||
|
|
@ -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
|
||||
|
|
@ -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
|
||||
Loading…
Add table
Reference in a new issue