diff --git a/app/build.gradle.kts b/app/build.gradle.kts index fb6a651..7db4866 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -7,12 +7,12 @@ plugins { } android { - namespace = "app.revanced.manager.compose" + namespace = "app.revanced.manager" compileSdk = 33 buildToolsVersion = "33.0.2" defaultConfig { - applicationId = "app.revanced.manager.compose" + applicationId = "app.revanced.manager" minSdk = 26 targetSdk = 33 versionCode = 1 diff --git a/app/schemas/app.revanced.manager.compose.data.room.AppDatabase/1.json b/app/schemas/app.revanced.manager.data.room.AppDatabase/1.json similarity index 100% rename from app/schemas/app.revanced.manager.compose.data.room.AppDatabase/1.json rename to app/schemas/app.revanced.manager.data.room.AppDatabase/1.json diff --git a/app/src/main/java/app/revanced/manager/compose/MainActivity.kt b/app/src/main/java/app/revanced/manager/MainActivity.kt similarity index 86% rename from app/src/main/java/app/revanced/manager/compose/MainActivity.kt rename to app/src/main/java/app/revanced/manager/MainActivity.kt index 86604b7..16f2347 100644 --- a/app/src/main/java/app/revanced/manager/compose/MainActivity.kt +++ b/app/src/main/java/app/revanced/manager/MainActivity.kt @@ -1,4 +1,4 @@ -package app.revanced.manager.compose +package app.revanced.manager import android.os.Bundle import androidx.activity.ComponentActivity @@ -6,16 +6,16 @@ import androidx.activity.compose.setContent import androidx.compose.animation.ExperimentalAnimationApi import androidx.compose.foundation.isSystemInDarkTheme import androidx.core.splashscreen.SplashScreen.Companion.installSplashScreen -import app.revanced.manager.compose.domain.manager.PreferencesManager -import app.revanced.manager.compose.ui.destination.Destination -import app.revanced.manager.compose.ui.screen.AppSelectorScreen -import app.revanced.manager.compose.ui.screen.DashboardScreen -import app.revanced.manager.compose.ui.screen.InstallerScreen -import app.revanced.manager.compose.ui.screen.PatchesSelectorScreen -import app.revanced.manager.compose.ui.screen.SettingsScreen -import app.revanced.manager.compose.ui.theme.ReVancedManagerTheme -import app.revanced.manager.compose.ui.theme.Theme -import app.revanced.manager.compose.ui.viewmodel.MainViewModel +import app.revanced.manager.domain.manager.PreferencesManager +import app.revanced.manager.ui.destination.Destination +import app.revanced.manager.ui.screen.AppSelectorScreen +import app.revanced.manager.ui.screen.DashboardScreen +import app.revanced.manager.ui.screen.InstallerScreen +import app.revanced.manager.ui.screen.PatchesSelectorScreen +import app.revanced.manager.ui.screen.SettingsScreen +import app.revanced.manager.ui.theme.ReVancedManagerTheme +import app.revanced.manager.ui.theme.Theme +import app.revanced.manager.ui.viewmodel.MainViewModel import coil.Coil import coil.ImageLoader import dev.olshevski.navigation.reimagined.AnimatedNavHost diff --git a/app/src/main/java/app/revanced/manager/compose/ManagerApplication.kt b/app/src/main/java/app/revanced/manager/ManagerApplication.kt similarity index 89% rename from app/src/main/java/app/revanced/manager/compose/ManagerApplication.kt rename to app/src/main/java/app/revanced/manager/ManagerApplication.kt index 0a45281..77edb12 100644 --- a/app/src/main/java/app/revanced/manager/compose/ManagerApplication.kt +++ b/app/src/main/java/app/revanced/manager/ManagerApplication.kt @@ -1,7 +1,7 @@ -package app.revanced.manager.compose +package app.revanced.manager import android.app.Application -import app.revanced.manager.compose.di.* +import app.revanced.manager.di.* import org.koin.android.ext.koin.androidContext import org.koin.androidx.workmanager.koin.workManagerFactory import org.koin.core.context.startKoin diff --git a/app/src/main/java/app/revanced/manager/compose/di/RepositoryModule.kt b/app/src/main/java/app/revanced/manager/compose/di/RepositoryModule.kt deleted file mode 100644 index f93c456..0000000 --- a/app/src/main/java/app/revanced/manager/compose/di/RepositoryModule.kt +++ /dev/null @@ -1,15 +0,0 @@ -package app.revanced.manager.compose.di - -import app.revanced.manager.compose.domain.repository.ReVancedRepository -import app.revanced.manager.compose.network.api.ManagerAPI -import app.revanced.manager.compose.domain.repository.SourcePersistenceRepository -import app.revanced.manager.compose.domain.repository.SourceRepository -import org.koin.core.module.dsl.singleOf -import org.koin.dsl.module - -val repositoryModule = module { - singleOf(::ReVancedRepository) - singleOf(::ManagerAPI) - singleOf(::SourcePersistenceRepository) - singleOf(::SourceRepository) -} \ No newline at end of file diff --git a/app/src/main/java/app/revanced/manager/compose/data/room/AppDatabase.kt b/app/src/main/java/app/revanced/manager/data/room/AppDatabase.kt similarity index 61% rename from app/src/main/java/app/revanced/manager/compose/data/room/AppDatabase.kt rename to app/src/main/java/app/revanced/manager/data/room/AppDatabase.kt index 72714e2..14748c3 100644 --- a/app/src/main/java/app/revanced/manager/compose/data/room/AppDatabase.kt +++ b/app/src/main/java/app/revanced/manager/data/room/AppDatabase.kt @@ -1,10 +1,10 @@ -package app.revanced.manager.compose.data.room +package app.revanced.manager.data.room import androidx.room.Database import androidx.room.RoomDatabase import androidx.room.TypeConverters -import app.revanced.manager.compose.data.room.sources.SourceEntity -import app.revanced.manager.compose.data.room.sources.SourceDao +import app.revanced.manager.data.room.sources.SourceEntity +import app.revanced.manager.data.room.sources.SourceDao @Database(entities = [SourceEntity::class], version = 1) @TypeConverters(Converters::class) diff --git a/app/src/main/java/app/revanced/manager/compose/data/room/Converters.kt b/app/src/main/java/app/revanced/manager/data/room/Converters.kt similarity index 75% rename from app/src/main/java/app/revanced/manager/compose/data/room/Converters.kt rename to app/src/main/java/app/revanced/manager/data/room/Converters.kt index 9f25029..bde6917 100644 --- a/app/src/main/java/app/revanced/manager/compose/data/room/Converters.kt +++ b/app/src/main/java/app/revanced/manager/data/room/Converters.kt @@ -1,7 +1,7 @@ -package app.revanced.manager.compose.data.room +package app.revanced.manager.data.room import androidx.room.TypeConverter -import app.revanced.manager.compose.data.room.sources.SourceLocation +import app.revanced.manager.data.room.sources.SourceLocation import io.ktor.http.* class Converters { diff --git a/app/src/main/java/app/revanced/manager/compose/data/room/sources/SourceDao.kt b/app/src/main/java/app/revanced/manager/data/room/sources/SourceDao.kt similarity index 92% rename from app/src/main/java/app/revanced/manager/compose/data/room/sources/SourceDao.kt rename to app/src/main/java/app/revanced/manager/data/room/sources/SourceDao.kt index 9d56967..b318a9d 100644 --- a/app/src/main/java/app/revanced/manager/compose/data/room/sources/SourceDao.kt +++ b/app/src/main/java/app/revanced/manager/data/room/sources/SourceDao.kt @@ -1,4 +1,4 @@ -package app.revanced.manager.compose.data.room.sources +package app.revanced.manager.data.room.sources import androidx.room.* diff --git a/app/src/main/java/app/revanced/manager/compose/data/room/sources/SourceEntity.kt b/app/src/main/java/app/revanced/manager/data/room/sources/SourceEntity.kt similarity index 93% rename from app/src/main/java/app/revanced/manager/compose/data/room/sources/SourceEntity.kt rename to app/src/main/java/app/revanced/manager/data/room/sources/SourceEntity.kt index 0e22cbb..7000d44 100644 --- a/app/src/main/java/app/revanced/manager/compose/data/room/sources/SourceEntity.kt +++ b/app/src/main/java/app/revanced/manager/data/room/sources/SourceEntity.kt @@ -1,4 +1,4 @@ -package app.revanced.manager.compose.data.room.sources +package app.revanced.manager.data.room.sources import androidx.room.* import io.ktor.http.* diff --git a/app/src/main/java/app/revanced/manager/compose/di/DatabaseModule.kt b/app/src/main/java/app/revanced/manager/di/DatabaseModule.kt similarity index 78% rename from app/src/main/java/app/revanced/manager/compose/di/DatabaseModule.kt rename to app/src/main/java/app/revanced/manager/di/DatabaseModule.kt index 44aefd5..37d8c05 100644 --- a/app/src/main/java/app/revanced/manager/compose/di/DatabaseModule.kt +++ b/app/src/main/java/app/revanced/manager/di/DatabaseModule.kt @@ -1,8 +1,8 @@ -package app.revanced.manager.compose.di +package app.revanced.manager.di import android.content.Context import androidx.room.Room -import app.revanced.manager.compose.data.room.AppDatabase +import app.revanced.manager.data.room.AppDatabase import org.koin.android.ext.koin.androidContext import org.koin.dsl.module diff --git a/app/src/main/java/app/revanced/manager/compose/di/HttpModule.kt b/app/src/main/java/app/revanced/manager/di/HttpModule.kt similarity index 97% rename from app/src/main/java/app/revanced/manager/compose/di/HttpModule.kt rename to app/src/main/java/app/revanced/manager/di/HttpModule.kt index c67a036..05a5547 100644 --- a/app/src/main/java/app/revanced/manager/compose/di/HttpModule.kt +++ b/app/src/main/java/app/revanced/manager/di/HttpModule.kt @@ -1,4 +1,4 @@ -package app.revanced.manager.compose.di +package app.revanced.manager.di import android.content.Context import io.ktor.client.* diff --git a/app/src/main/java/app/revanced/manager/compose/di/ManagerModule.kt b/app/src/main/java/app/revanced/manager/di/ManagerModule.kt similarity index 51% rename from app/src/main/java/app/revanced/manager/compose/di/ManagerModule.kt rename to app/src/main/java/app/revanced/manager/di/ManagerModule.kt index f2765ed..b5dee83 100644 --- a/app/src/main/java/app/revanced/manager/compose/di/ManagerModule.kt +++ b/app/src/main/java/app/revanced/manager/di/ManagerModule.kt @@ -1,7 +1,7 @@ -package app.revanced.manager.compose.di +package app.revanced.manager.di -import app.revanced.manager.compose.patcher.SignerService -import app.revanced.manager.compose.util.PM +import app.revanced.manager.patcher.SignerService +import app.revanced.manager.util.PM import org.koin.core.module.dsl.singleOf import org.koin.dsl.module diff --git a/app/src/main/java/app/revanced/manager/compose/di/PreferencesModule.kt b/app/src/main/java/app/revanced/manager/di/PreferencesModule.kt similarity index 74% rename from app/src/main/java/app/revanced/manager/compose/di/PreferencesModule.kt rename to app/src/main/java/app/revanced/manager/di/PreferencesModule.kt index 83c2887..9b8f993 100644 --- a/app/src/main/java/app/revanced/manager/compose/di/PreferencesModule.kt +++ b/app/src/main/java/app/revanced/manager/di/PreferencesModule.kt @@ -1,7 +1,7 @@ -package app.revanced.manager.compose.di +package app.revanced.manager.di import android.content.Context -import app.revanced.manager.compose.domain.manager.PreferencesManager +import app.revanced.manager.domain.manager.PreferencesManager import org.koin.core.module.dsl.singleOf import org.koin.dsl.module diff --git a/app/src/main/java/app/revanced/manager/di/RepositoryModule.kt b/app/src/main/java/app/revanced/manager/di/RepositoryModule.kt new file mode 100644 index 0000000..eb7b5b9 --- /dev/null +++ b/app/src/main/java/app/revanced/manager/di/RepositoryModule.kt @@ -0,0 +1,15 @@ +package app.revanced.manager.di + +import app.revanced.manager.domain.repository.ReVancedRepository +import app.revanced.manager.network.api.ManagerAPI +import app.revanced.manager.domain.repository.SourcePersistenceRepository +import app.revanced.manager.domain.repository.SourceRepository +import org.koin.core.module.dsl.singleOf +import org.koin.dsl.module + +val repositoryModule = module { + singleOf(::ReVancedRepository) + singleOf(::ManagerAPI) + singleOf(::SourcePersistenceRepository) + singleOf(::SourceRepository) +} \ No newline at end of file diff --git a/app/src/main/java/app/revanced/manager/compose/di/ServiceModule.kt b/app/src/main/java/app/revanced/manager/di/ServiceModule.kt similarity index 66% rename from app/src/main/java/app/revanced/manager/compose/di/ServiceModule.kt rename to app/src/main/java/app/revanced/manager/di/ServiceModule.kt index 353e6a2..6333d9f 100644 --- a/app/src/main/java/app/revanced/manager/compose/di/ServiceModule.kt +++ b/app/src/main/java/app/revanced/manager/di/ServiceModule.kt @@ -1,7 +1,7 @@ -package app.revanced.manager.compose.di +package app.revanced.manager.di -import app.revanced.manager.compose.network.service.HttpService -import app.revanced.manager.compose.network.service.ReVancedService +import app.revanced.manager.network.service.HttpService +import app.revanced.manager.network.service.ReVancedService import org.koin.core.module.dsl.singleOf import org.koin.dsl.module diff --git a/app/src/main/java/app/revanced/manager/compose/di/ViewModelModule.kt b/app/src/main/java/app/revanced/manager/di/ViewModelModule.kt similarity index 80% rename from app/src/main/java/app/revanced/manager/compose/di/ViewModelModule.kt rename to app/src/main/java/app/revanced/manager/di/ViewModelModule.kt index d4327d6..c6b1aa0 100644 --- a/app/src/main/java/app/revanced/manager/compose/di/ViewModelModule.kt +++ b/app/src/main/java/app/revanced/manager/di/ViewModelModule.kt @@ -1,6 +1,6 @@ -package app.revanced.manager.compose.di +package app.revanced.manager.di -import app.revanced.manager.compose.ui.viewmodel.* +import app.revanced.manager.ui.viewmodel.* import org.koin.androidx.viewmodel.dsl.viewModelOf import org.koin.dsl.module diff --git a/app/src/main/java/app/revanced/manager/compose/di/WorkerModule.kt b/app/src/main/java/app/revanced/manager/di/WorkerModule.kt similarity index 56% rename from app/src/main/java/app/revanced/manager/compose/di/WorkerModule.kt rename to app/src/main/java/app/revanced/manager/di/WorkerModule.kt index e7ce418..d5d9112 100644 --- a/app/src/main/java/app/revanced/manager/compose/di/WorkerModule.kt +++ b/app/src/main/java/app/revanced/manager/di/WorkerModule.kt @@ -1,6 +1,6 @@ -package app.revanced.manager.compose.di +package app.revanced.manager.di -import app.revanced.manager.compose.patcher.worker.PatcherWorker +import app.revanced.manager.patcher.worker.PatcherWorker import org.koin.androidx.workmanager.dsl.workerOf import org.koin.dsl.module diff --git a/app/src/main/java/app/revanced/manager/compose/domain/manager/PreferencesManager.kt b/app/src/main/java/app/revanced/manager/domain/manager/PreferencesManager.kt similarity index 67% rename from app/src/main/java/app/revanced/manager/compose/domain/manager/PreferencesManager.kt rename to app/src/main/java/app/revanced/manager/domain/manager/PreferencesManager.kt index b84c647..d2bf7ff 100644 --- a/app/src/main/java/app/revanced/manager/compose/domain/manager/PreferencesManager.kt +++ b/app/src/main/java/app/revanced/manager/domain/manager/PreferencesManager.kt @@ -1,8 +1,8 @@ -package app.revanced.manager.compose.domain.manager +package app.revanced.manager.domain.manager import android.content.SharedPreferences -import app.revanced.manager.compose.domain.manager.base.BasePreferenceManager -import app.revanced.manager.compose.ui.theme.Theme +import app.revanced.manager.domain.manager.base.BasePreferenceManager +import app.revanced.manager.ui.theme.Theme /** * @author Hyperion Authors, zt64 diff --git a/app/src/main/java/app/revanced/manager/compose/domain/manager/base/BasePreferencesManager.kt b/app/src/main/java/app/revanced/manager/domain/manager/base/BasePreferencesManager.kt similarity index 98% rename from app/src/main/java/app/revanced/manager/compose/domain/manager/base/BasePreferencesManager.kt rename to app/src/main/java/app/revanced/manager/domain/manager/base/BasePreferencesManager.kt index 3fd6858..c257d24 100644 --- a/app/src/main/java/app/revanced/manager/compose/domain/manager/base/BasePreferencesManager.kt +++ b/app/src/main/java/app/revanced/manager/domain/manager/base/BasePreferencesManager.kt @@ -1,4 +1,4 @@ -package app.revanced.manager.compose.domain.manager.base +package app.revanced.manager.domain.manager.base import android.content.SharedPreferences import androidx.compose.runtime.getValue diff --git a/app/src/main/java/app/revanced/manager/compose/domain/repository/ReVancedRepository.kt b/app/src/main/java/app/revanced/manager/domain/repository/ReVancedRepository.kt similarity index 69% rename from app/src/main/java/app/revanced/manager/compose/domain/repository/ReVancedRepository.kt rename to app/src/main/java/app/revanced/manager/domain/repository/ReVancedRepository.kt index 8824ac2..3820280 100644 --- a/app/src/main/java/app/revanced/manager/compose/domain/repository/ReVancedRepository.kt +++ b/app/src/main/java/app/revanced/manager/domain/repository/ReVancedRepository.kt @@ -1,6 +1,6 @@ -package app.revanced.manager.compose.domain.repository +package app.revanced.manager.domain.repository -import app.revanced.manager.compose.network.service.ReVancedService +import app.revanced.manager.network.service.ReVancedService class ReVancedRepository( private val service: ReVancedService diff --git a/app/src/main/java/app/revanced/manager/compose/domain/repository/SourcePersistenceRepository.kt b/app/src/main/java/app/revanced/manager/domain/repository/SourcePersistenceRepository.kt similarity index 78% rename from app/src/main/java/app/revanced/manager/compose/domain/repository/SourcePersistenceRepository.kt rename to app/src/main/java/app/revanced/manager/domain/repository/SourcePersistenceRepository.kt index 58bedf1..0122a5d 100644 --- a/app/src/main/java/app/revanced/manager/compose/domain/repository/SourcePersistenceRepository.kt +++ b/app/src/main/java/app/revanced/manager/domain/repository/SourcePersistenceRepository.kt @@ -1,10 +1,10 @@ -package app.revanced.manager.compose.domain.repository +package app.revanced.manager.domain.repository -import app.revanced.manager.compose.data.room.AppDatabase -import app.revanced.manager.compose.data.room.sources.SourceEntity -import app.revanced.manager.compose.data.room.sources.SourceLocation -import app.revanced.manager.compose.data.room.sources.VersionInfo -import app.revanced.manager.compose.util.apiURL +import app.revanced.manager.data.room.AppDatabase +import app.revanced.manager.data.room.sources.SourceEntity +import app.revanced.manager.data.room.sources.SourceLocation +import app.revanced.manager.data.room.sources.VersionInfo +import app.revanced.manager.util.apiURL import kotlin.random.Random import io.ktor.http.* diff --git a/app/src/main/java/app/revanced/manager/compose/domain/repository/SourceRepository.kt b/app/src/main/java/app/revanced/manager/domain/repository/SourceRepository.kt similarity index 88% rename from app/src/main/java/app/revanced/manager/compose/domain/repository/SourceRepository.kt rename to app/src/main/java/app/revanced/manager/domain/repository/SourceRepository.kt index 166f89e..7e4c10c 100644 --- a/app/src/main/java/app/revanced/manager/compose/domain/repository/SourceRepository.kt +++ b/app/src/main/java/app/revanced/manager/domain/repository/SourceRepository.kt @@ -1,13 +1,13 @@ -package app.revanced.manager.compose.domain.repository +package app.revanced.manager.domain.repository import android.app.Application import android.util.Log -import app.revanced.manager.compose.data.room.sources.SourceEntity -import app.revanced.manager.compose.data.room.sources.SourceLocation -import app.revanced.manager.compose.domain.sources.LocalSource -import app.revanced.manager.compose.domain.sources.RemoteSource -import app.revanced.manager.compose.domain.sources.Source -import app.revanced.manager.compose.util.tag +import app.revanced.manager.data.room.sources.SourceEntity +import app.revanced.manager.data.room.sources.SourceLocation +import app.revanced.manager.domain.sources.LocalSource +import app.revanced.manager.domain.sources.RemoteSource +import app.revanced.manager.domain.sources.Source +import app.revanced.manager.util.tag import io.ktor.http.* import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.ExperimentalCoroutinesApi diff --git a/app/src/main/java/app/revanced/manager/compose/domain/sources/LocalSource.kt b/app/src/main/java/app/revanced/manager/domain/sources/LocalSource.kt similarity index 93% rename from app/src/main/java/app/revanced/manager/compose/domain/sources/LocalSource.kt rename to app/src/main/java/app/revanced/manager/domain/sources/LocalSource.kt index 449ce38..e119342 100644 --- a/app/src/main/java/app/revanced/manager/compose/domain/sources/LocalSource.kt +++ b/app/src/main/java/app/revanced/manager/domain/sources/LocalSource.kt @@ -1,4 +1,4 @@ -package app.revanced.manager.compose.domain.sources +package app.revanced.manager.domain.sources import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.withContext diff --git a/app/src/main/java/app/revanced/manager/compose/domain/sources/RemoteSource.kt b/app/src/main/java/app/revanced/manager/domain/sources/RemoteSource.kt similarity index 88% rename from app/src/main/java/app/revanced/manager/compose/domain/sources/RemoteSource.kt rename to app/src/main/java/app/revanced/manager/domain/sources/RemoteSource.kt index 66faa4a..472e26f 100644 --- a/app/src/main/java/app/revanced/manager/compose/domain/sources/RemoteSource.kt +++ b/app/src/main/java/app/revanced/manager/domain/sources/RemoteSource.kt @@ -1,7 +1,7 @@ -package app.revanced.manager.compose.domain.sources +package app.revanced.manager.domain.sources import androidx.compose.runtime.Stable -import app.revanced.manager.compose.network.api.ManagerAPI +import app.revanced.manager.network.api.ManagerAPI import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.withContext import org.koin.core.component.get diff --git a/app/src/main/java/app/revanced/manager/compose/domain/sources/Source.kt b/app/src/main/java/app/revanced/manager/domain/sources/Source.kt similarity index 87% rename from app/src/main/java/app/revanced/manager/compose/domain/sources/Source.kt rename to app/src/main/java/app/revanced/manager/domain/sources/Source.kt index b3360a8..20f8031 100644 --- a/app/src/main/java/app/revanced/manager/compose/domain/sources/Source.kt +++ b/app/src/main/java/app/revanced/manager/domain/sources/Source.kt @@ -1,10 +1,10 @@ -package app.revanced.manager.compose.domain.sources +package app.revanced.manager.domain.sources import android.util.Log import androidx.compose.runtime.Stable -import app.revanced.manager.compose.patcher.patch.PatchBundle -import app.revanced.manager.compose.domain.repository.SourcePersistenceRepository -import app.revanced.manager.compose.util.tag +import app.revanced.manager.patcher.patch.PatchBundle +import app.revanced.manager.domain.repository.SourcePersistenceRepository +import app.revanced.manager.util.tag import kotlinx.coroutines.flow.MutableStateFlow import kotlinx.coroutines.flow.asStateFlow import org.koin.core.component.KoinComponent diff --git a/app/src/main/java/app/revanced/manager/compose/network/api/ManagerAPI.kt b/app/src/main/java/app/revanced/manager/network/api/ManagerAPI.kt similarity index 94% rename from app/src/main/java/app/revanced/manager/compose/network/api/ManagerAPI.kt rename to app/src/main/java/app/revanced/manager/network/api/ManagerAPI.kt index e9ec220..9ed37bf 100644 --- a/app/src/main/java/app/revanced/manager/compose/network/api/ManagerAPI.kt +++ b/app/src/main/java/app/revanced/manager/network/api/ManagerAPI.kt @@ -1,4 +1,4 @@ -package app.revanced.manager.compose.network.api +package app.revanced.manager.network.api import android.app.Application import android.os.Environment @@ -6,8 +6,8 @@ import android.util.Log import androidx.compose.runtime.getValue import androidx.compose.runtime.mutableStateOf import androidx.compose.runtime.setValue -import app.revanced.manager.compose.domain.repository.ReVancedRepository -import app.revanced.manager.compose.util.* +import app.revanced.manager.domain.repository.ReVancedRepository +import app.revanced.manager.util.* import io.ktor.client.* import io.ktor.client.plugins.* import io.ktor.client.request.* diff --git a/app/src/main/java/app/revanced/manager/compose/network/dto/ReVancedContributors.kt b/app/src/main/java/app/revanced/manager/network/dto/ReVancedContributors.kt similarity index 91% rename from app/src/main/java/app/revanced/manager/compose/network/dto/ReVancedContributors.kt rename to app/src/main/java/app/revanced/manager/network/dto/ReVancedContributors.kt index 5d125a4..4e4c96a 100644 --- a/app/src/main/java/app/revanced/manager/compose/network/dto/ReVancedContributors.kt +++ b/app/src/main/java/app/revanced/manager/network/dto/ReVancedContributors.kt @@ -1,4 +1,4 @@ -package app.revanced.manager.compose.network.dto +package app.revanced.manager.network.dto import kotlinx.serialization.SerialName import kotlinx.serialization.Serializable diff --git a/app/src/main/java/app/revanced/manager/compose/network/dto/ReVancedReleases.kt b/app/src/main/java/app/revanced/manager/network/dto/ReVancedReleases.kt similarity index 92% rename from app/src/main/java/app/revanced/manager/compose/network/dto/ReVancedReleases.kt rename to app/src/main/java/app/revanced/manager/network/dto/ReVancedReleases.kt index e6b101c..8b1ddea 100644 --- a/app/src/main/java/app/revanced/manager/compose/network/dto/ReVancedReleases.kt +++ b/app/src/main/java/app/revanced/manager/network/dto/ReVancedReleases.kt @@ -1,4 +1,4 @@ -package app.revanced.manager.compose.network.dto +package app.revanced.manager.network.dto import kotlinx.serialization.SerialName import kotlinx.serialization.Serializable diff --git a/app/src/main/java/app/revanced/manager/compose/network/service/HttpService.kt b/app/src/main/java/app/revanced/manager/network/service/HttpService.kt similarity index 82% rename from app/src/main/java/app/revanced/manager/compose/network/service/HttpService.kt rename to app/src/main/java/app/revanced/manager/network/service/HttpService.kt index 237f5a2..c28913b 100644 --- a/app/src/main/java/app/revanced/manager/compose/network/service/HttpService.kt +++ b/app/src/main/java/app/revanced/manager/network/service/HttpService.kt @@ -1,10 +1,10 @@ -package app.revanced.manager.compose.network.service +package app.revanced.manager.network.service import android.util.Log -import app.revanced.manager.compose.network.utils.APIError -import app.revanced.manager.compose.network.utils.APIFailure -import app.revanced.manager.compose.network.utils.APIResponse -import app.revanced.manager.compose.util.tag +import app.revanced.manager.network.utils.APIError +import app.revanced.manager.network.utils.APIFailure +import app.revanced.manager.network.utils.APIResponse +import app.revanced.manager.util.tag import io.ktor.client.* import io.ktor.client.request.* import io.ktor.client.statement.* diff --git a/app/src/main/java/app/revanced/manager/compose/network/service/ReVancedService.kt b/app/src/main/java/app/revanced/manager/network/service/ReVancedService.kt similarity index 69% rename from app/src/main/java/app/revanced/manager/compose/network/service/ReVancedService.kt rename to app/src/main/java/app/revanced/manager/network/service/ReVancedService.kt index 2c7184f..949c2a1 100644 --- a/app/src/main/java/app/revanced/manager/compose/network/service/ReVancedService.kt +++ b/app/src/main/java/app/revanced/manager/network/service/ReVancedService.kt @@ -1,12 +1,12 @@ -package app.revanced.manager.compose.network.service +package app.revanced.manager.network.service -import app.revanced.manager.compose.network.api.MissingAssetException -import app.revanced.manager.compose.network.dto.Assets -import app.revanced.manager.compose.network.dto.ReVancedReleases -import app.revanced.manager.compose.network.dto.ReVancedRepositories -import app.revanced.manager.compose.network.utils.APIResponse -import app.revanced.manager.compose.network.utils.getOrThrow -import app.revanced.manager.compose.util.apiURL +import app.revanced.manager.network.api.MissingAssetException +import app.revanced.manager.network.dto.Assets +import app.revanced.manager.network.dto.ReVancedReleases +import app.revanced.manager.network.dto.ReVancedRepositories +import app.revanced.manager.network.utils.APIResponse +import app.revanced.manager.network.utils.getOrThrow +import app.revanced.manager.util.apiURL import io.ktor.client.request.* import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.withContext diff --git a/app/src/main/java/app/revanced/manager/compose/network/utils/APIResponse.kt b/app/src/main/java/app/revanced/manager/network/utils/APIResponse.kt similarity index 97% rename from app/src/main/java/app/revanced/manager/compose/network/utils/APIResponse.kt rename to app/src/main/java/app/revanced/manager/network/utils/APIResponse.kt index 2b5a284..04765f8 100644 --- a/app/src/main/java/app/revanced/manager/compose/network/utils/APIResponse.kt +++ b/app/src/main/java/app/revanced/manager/network/utils/APIResponse.kt @@ -1,6 +1,6 @@ @file:Suppress("NOTHING_TO_INLINE") -package app.revanced.manager.compose.network.utils +package app.revanced.manager.network.utils import io.ktor.http.* diff --git a/app/src/main/java/app/revanced/manager/compose/patcher/Aligning.kt b/app/src/main/java/app/revanced/manager/patcher/Aligning.kt similarity index 79% rename from app/src/main/java/app/revanced/manager/compose/patcher/Aligning.kt rename to app/src/main/java/app/revanced/manager/patcher/Aligning.kt index 6d5bb94..56d4b70 100644 --- a/app/src/main/java/app/revanced/manager/compose/patcher/Aligning.kt +++ b/app/src/main/java/app/revanced/manager/patcher/Aligning.kt @@ -1,8 +1,8 @@ -package app.revanced.manager.compose.patcher +package app.revanced.manager.patcher -import app.revanced.manager.compose.patcher.alignment.ZipAligner -import app.revanced.manager.compose.patcher.alignment.zip.ZipFile -import app.revanced.manager.compose.patcher.alignment.zip.structures.ZipEntry +import app.revanced.manager.patcher.alignment.ZipAligner +import app.revanced.manager.patcher.alignment.zip.ZipFile +import app.revanced.manager.patcher.alignment.zip.structures.ZipEntry import app.revanced.patcher.PatcherResult import java.io.File diff --git a/app/src/main/java/app/revanced/manager/compose/patcher/Session.kt b/app/src/main/java/app/revanced/manager/patcher/Session.kt similarity index 95% rename from app/src/main/java/app/revanced/manager/compose/patcher/Session.kt rename to app/src/main/java/app/revanced/manager/patcher/Session.kt index ed48167..5a4fdb8 100644 --- a/app/src/main/java/app/revanced/manager/compose/patcher/Session.kt +++ b/app/src/main/java/app/revanced/manager/patcher/Session.kt @@ -1,8 +1,8 @@ -package app.revanced.manager.compose.patcher +package app.revanced.manager.patcher import android.util.Log -import app.revanced.manager.compose.patcher.worker.Progress -import app.revanced.manager.compose.util.tag +import app.revanced.manager.patcher.worker.Progress +import app.revanced.manager.util.tag import app.revanced.patcher.Patcher import app.revanced.patcher.PatcherOptions import app.revanced.patcher.data.Context diff --git a/app/src/main/java/app/revanced/manager/compose/patcher/SignerService.kt b/app/src/main/java/app/revanced/manager/patcher/SignerService.kt similarity index 57% rename from app/src/main/java/app/revanced/manager/compose/patcher/SignerService.kt rename to app/src/main/java/app/revanced/manager/patcher/SignerService.kt index 2a069cb..a92b077 100644 --- a/app/src/main/java/app/revanced/manager/compose/patcher/SignerService.kt +++ b/app/src/main/java/app/revanced/manager/patcher/SignerService.kt @@ -1,8 +1,8 @@ -package app.revanced.manager.compose.patcher +package app.revanced.manager.patcher import android.app.Application -import app.revanced.manager.compose.util.signing.Signer -import app.revanced.manager.compose.util.signing.SigningOptions +import app.revanced.manager.util.signing.Signer +import app.revanced.manager.util.signing.SigningOptions class SignerService(app: Application) { private val options = SigningOptions("ReVanced", "ReVanced", app.dataDir.resolve("manager.keystore").path) diff --git a/app/src/main/java/app/revanced/manager/compose/patcher/aapt/Aapt.kt b/app/src/main/java/app/revanced/manager/patcher/aapt/Aapt.kt similarity index 86% rename from app/src/main/java/app/revanced/manager/compose/patcher/aapt/Aapt.kt rename to app/src/main/java/app/revanced/manager/patcher/aapt/Aapt.kt index 20aa05f..25e26be 100644 --- a/app/src/main/java/app/revanced/manager/compose/patcher/aapt/Aapt.kt +++ b/app/src/main/java/app/revanced/manager/patcher/aapt/Aapt.kt @@ -1,4 +1,4 @@ -package app.revanced.manager.compose.patcher.aapt +package app.revanced.manager.patcher.aapt import android.content.Context import java.io.File diff --git a/app/src/main/java/app/revanced/manager/compose/patcher/alignment/ZipAlign.kt b/app/src/main/java/app/revanced/manager/patcher/alignment/ZipAlign.kt similarity index 69% rename from app/src/main/java/app/revanced/manager/compose/patcher/alignment/ZipAlign.kt rename to app/src/main/java/app/revanced/manager/patcher/alignment/ZipAlign.kt index 354fd1e..4f8504c 100644 --- a/app/src/main/java/app/revanced/manager/compose/patcher/alignment/ZipAlign.kt +++ b/app/src/main/java/app/revanced/manager/patcher/alignment/ZipAlign.kt @@ -1,6 +1,6 @@ -package app.revanced.manager.compose.patcher.alignment +package app.revanced.manager.patcher.alignment -import app.revanced.manager.compose.patcher.alignment.zip.structures.ZipEntry +import app.revanced.manager.patcher.alignment.zip.structures.ZipEntry internal object ZipAligner { private const val DEFAULT_ALIGNMENT = 4 diff --git a/app/src/main/java/app/revanced/manager/compose/patcher/alignment/zip/Extensions.kt b/app/src/main/java/app/revanced/manager/patcher/alignment/zip/Extensions.kt similarity index 95% rename from app/src/main/java/app/revanced/manager/compose/patcher/alignment/zip/Extensions.kt rename to app/src/main/java/app/revanced/manager/patcher/alignment/zip/Extensions.kt index dfeaf8d..c022005 100644 --- a/app/src/main/java/app/revanced/manager/compose/patcher/alignment/zip/Extensions.kt +++ b/app/src/main/java/app/revanced/manager/patcher/alignment/zip/Extensions.kt @@ -1,4 +1,4 @@ -package app.revanced.manager.compose.patcher.alignment.zip +package app.revanced.manager.patcher.alignment.zip import java.io.DataInput import java.io.DataOutput diff --git a/app/src/main/java/app/revanced/manager/compose/patcher/alignment/zip/ZipFile.kt b/app/src/main/java/app/revanced/manager/patcher/alignment/zip/ZipFile.kt similarity index 96% rename from app/src/main/java/app/revanced/manager/compose/patcher/alignment/zip/ZipFile.kt rename to app/src/main/java/app/revanced/manager/patcher/alignment/zip/ZipFile.kt index f828fbe..faacdaf 100644 --- a/app/src/main/java/app/revanced/manager/compose/patcher/alignment/zip/ZipFile.kt +++ b/app/src/main/java/app/revanced/manager/patcher/alignment/zip/ZipFile.kt @@ -1,7 +1,7 @@ -package app.revanced.manager.compose.patcher.alignment.zip +package app.revanced.manager.patcher.alignment.zip -import app.revanced.manager.compose.patcher.alignment.zip.structures.ZipEndRecord -import app.revanced.manager.compose.patcher.alignment.zip.structures.ZipEntry +import app.revanced.manager.patcher.alignment.zip.structures.ZipEndRecord +import app.revanced.manager.patcher.alignment.zip.structures.ZipEntry import java.io.Closeable import java.io.File diff --git a/app/src/main/java/app/revanced/manager/compose/patcher/alignment/zip/structures/ZipEndRecord.kt b/app/src/main/java/app/revanced/manager/patcher/alignment/zip/structures/ZipEndRecord.kt similarity index 87% rename from app/src/main/java/app/revanced/manager/compose/patcher/alignment/zip/structures/ZipEndRecord.kt rename to app/src/main/java/app/revanced/manager/patcher/alignment/zip/structures/ZipEndRecord.kt index 455dab7..06555cd 100644 --- a/app/src/main/java/app/revanced/manager/compose/patcher/alignment/zip/structures/ZipEndRecord.kt +++ b/app/src/main/java/app/revanced/manager/patcher/alignment/zip/structures/ZipEndRecord.kt @@ -1,9 +1,9 @@ -package app.revanced.manager.compose.patcher.alignment.zip.structures +package app.revanced.manager.patcher.alignment.zip.structures -import app.revanced.manager.compose.patcher.alignment.zip.putUInt -import app.revanced.manager.compose.patcher.alignment.zip.putUShort -import app.revanced.manager.compose.patcher.alignment.zip.readUIntLE -import app.revanced.manager.compose.patcher.alignment.zip.readUShortLE +import app.revanced.manager.patcher.alignment.zip.putUInt +import app.revanced.manager.patcher.alignment.zip.putUShort +import app.revanced.manager.patcher.alignment.zip.readUIntLE +import app.revanced.manager.patcher.alignment.zip.readUShortLE import java.io.DataInput import java.nio.ByteBuffer import java.nio.ByteOrder diff --git a/app/src/main/java/app/revanced/manager/compose/patcher/alignment/zip/structures/ZipEntry.kt b/app/src/main/java/app/revanced/manager/patcher/alignment/zip/structures/ZipEntry.kt similarity index 97% rename from app/src/main/java/app/revanced/manager/compose/patcher/alignment/zip/structures/ZipEntry.kt rename to app/src/main/java/app/revanced/manager/patcher/alignment/zip/structures/ZipEntry.kt index c99ae21..f070386 100644 --- a/app/src/main/java/app/revanced/manager/compose/patcher/alignment/zip/structures/ZipEntry.kt +++ b/app/src/main/java/app/revanced/manager/patcher/alignment/zip/structures/ZipEntry.kt @@ -1,6 +1,6 @@ -package app.revanced.manager.compose.patcher.alignment.zip.structures +package app.revanced.manager.patcher.alignment.zip.structures -import app.revanced.manager.compose.patcher.alignment.zip.* +import app.revanced.manager.patcher.alignment.zip.* import java.io.DataInput import java.nio.ByteBuffer import java.nio.ByteOrder diff --git a/app/src/main/java/app/revanced/manager/compose/patcher/patch/PatchBundle.kt b/app/src/main/java/app/revanced/manager/patcher/patch/PatchBundle.kt similarity index 90% rename from app/src/main/java/app/revanced/manager/compose/patcher/patch/PatchBundle.kt rename to app/src/main/java/app/revanced/manager/patcher/patch/PatchBundle.kt index b1a8de3..8f2c4c9 100644 --- a/app/src/main/java/app/revanced/manager/compose/patcher/patch/PatchBundle.kt +++ b/app/src/main/java/app/revanced/manager/patcher/patch/PatchBundle.kt @@ -1,8 +1,8 @@ -package app.revanced.manager.compose.patcher.patch +package app.revanced.manager.patcher.patch import android.util.Log -import app.revanced.manager.compose.patcher.PatchClass -import app.revanced.manager.compose.util.tag +import app.revanced.manager.patcher.PatchClass +import app.revanced.manager.util.tag import app.revanced.patcher.Patcher import app.revanced.patcher.extensions.PatchExtensions.compatiblePackages import app.revanced.patcher.util.patch.PatchBundle diff --git a/app/src/main/java/app/revanced/manager/compose/patcher/patch/PatchInfo.kt b/app/src/main/java/app/revanced/manager/patcher/patch/PatchInfo.kt similarity index 94% rename from app/src/main/java/app/revanced/manager/compose/patcher/patch/PatchInfo.kt rename to app/src/main/java/app/revanced/manager/patcher/patch/PatchInfo.kt index b9cd9c9..100d539 100644 --- a/app/src/main/java/app/revanced/manager/compose/patcher/patch/PatchInfo.kt +++ b/app/src/main/java/app/revanced/manager/patcher/patch/PatchInfo.kt @@ -1,7 +1,7 @@ -package app.revanced.manager.compose.patcher.patch +package app.revanced.manager.patcher.patch import androidx.compose.runtime.Immutable -import app.revanced.manager.compose.patcher.PatchClass +import app.revanced.manager.patcher.PatchClass import app.revanced.patcher.annotation.Package import app.revanced.patcher.extensions.PatchExtensions.compatiblePackages import app.revanced.patcher.extensions.PatchExtensions.dependencies diff --git a/app/src/main/java/app/revanced/manager/compose/patcher/worker/PatcherProgressManager.kt b/app/src/main/java/app/revanced/manager/patcher/worker/PatcherProgressManager.kt similarity index 97% rename from app/src/main/java/app/revanced/manager/compose/patcher/worker/PatcherProgressManager.kt rename to app/src/main/java/app/revanced/manager/patcher/worker/PatcherProgressManager.kt index 7233e79..6bb46b3 100644 --- a/app/src/main/java/app/revanced/manager/compose/patcher/worker/PatcherProgressManager.kt +++ b/app/src/main/java/app/revanced/manager/patcher/worker/PatcherProgressManager.kt @@ -1,11 +1,11 @@ -package app.revanced.manager.compose.patcher.worker +package app.revanced.manager.patcher.worker import android.content.Context import androidx.annotation.StringRes import androidx.work.Data import androidx.work.workDataOf -import app.revanced.manager.compose.R -import app.revanced.manager.compose.patcher.Session +import app.revanced.manager.R +import app.revanced.manager.patcher.Session import kotlinx.collections.immutable.ImmutableList import kotlinx.collections.immutable.persistentListOf import kotlinx.collections.immutable.toImmutableList diff --git a/app/src/main/java/app/revanced/manager/compose/patcher/worker/PatcherWorker.kt b/app/src/main/java/app/revanced/manager/patcher/worker/PatcherWorker.kt similarity index 90% rename from app/src/main/java/app/revanced/manager/compose/patcher/worker/PatcherWorker.kt rename to app/src/main/java/app/revanced/manager/patcher/worker/PatcherWorker.kt index 10e5b99..ed272db 100644 --- a/app/src/main/java/app/revanced/manager/compose/patcher/worker/PatcherWorker.kt +++ b/app/src/main/java/app/revanced/manager/patcher/worker/PatcherWorker.kt @@ -1,14 +1,14 @@ -package app.revanced.manager.compose.patcher.worker +package app.revanced.manager.patcher.worker import android.content.Context import android.util.Log import androidx.work.CoroutineWorker import androidx.work.WorkerParameters -import app.revanced.manager.compose.domain.repository.SourceRepository -import app.revanced.manager.compose.patcher.Session -import app.revanced.manager.compose.patcher.aapt.Aapt -import app.revanced.manager.compose.util.PatchesSelection -import app.revanced.manager.compose.util.tag +import app.revanced.manager.domain.repository.SourceRepository +import app.revanced.manager.patcher.Session +import app.revanced.manager.patcher.aapt.Aapt +import app.revanced.manager.util.PatchesSelection +import app.revanced.manager.util.tag import app.revanced.patcher.extensions.PatchExtensions.patchName import kotlinx.coroutines.flow.first import kotlinx.serialization.Serializable diff --git a/app/src/main/java/app/revanced/manager/compose/service/InstallService.kt b/app/src/main/java/app/revanced/manager/service/InstallService.kt similarity index 97% rename from app/src/main/java/app/revanced/manager/compose/service/InstallService.kt rename to app/src/main/java/app/revanced/manager/service/InstallService.kt index e12e69c..d7b0f49 100644 --- a/app/src/main/java/app/revanced/manager/compose/service/InstallService.kt +++ b/app/src/main/java/app/revanced/manager/service/InstallService.kt @@ -1,4 +1,4 @@ -package app.revanced.manager.compose.service +package app.revanced.manager.service import android.app.Service import android.content.Intent diff --git a/app/src/main/java/app/revanced/manager/compose/service/UninstallService.kt b/app/src/main/java/app/revanced/manager/service/UninstallService.kt similarity index 96% rename from app/src/main/java/app/revanced/manager/compose/service/UninstallService.kt rename to app/src/main/java/app/revanced/manager/service/UninstallService.kt index e80dbac..2b954f9 100644 --- a/app/src/main/java/app/revanced/manager/compose/service/UninstallService.kt +++ b/app/src/main/java/app/revanced/manager/service/UninstallService.kt @@ -1,4 +1,4 @@ -package app.revanced.manager.compose.service +package app.revanced.manager.service import android.app.Service import android.content.Intent diff --git a/app/src/main/java/app/revanced/manager/compose/ui/component/AppIcon.kt b/app/src/main/java/app/revanced/manager/ui/component/AppIcon.kt similarity index 91% rename from app/src/main/java/app/revanced/manager/compose/ui/component/AppIcon.kt rename to app/src/main/java/app/revanced/manager/ui/component/AppIcon.kt index 33f4167..7164f9b 100644 --- a/app/src/main/java/app/revanced/manager/compose/ui/component/AppIcon.kt +++ b/app/src/main/java/app/revanced/manager/ui/component/AppIcon.kt @@ -1,4 +1,4 @@ -package app.revanced.manager.compose.ui.component +package app.revanced.manager.ui.component import androidx.compose.foundation.Image import androidx.compose.foundation.layout.size @@ -10,7 +10,7 @@ import androidx.compose.ui.Modifier import androidx.compose.ui.graphics.ColorFilter import androidx.compose.ui.graphics.vector.rememberVectorPainter import androidx.compose.ui.unit.dp -import app.revanced.manager.compose.util.AppInfo +import app.revanced.manager.util.AppInfo import coil.compose.AsyncImage @Composable diff --git a/app/src/main/java/app/revanced/manager/compose/ui/component/AppScaffold.kt b/app/src/main/java/app/revanced/manager/ui/component/AppScaffold.kt similarity index 97% rename from app/src/main/java/app/revanced/manager/compose/ui/component/AppScaffold.kt rename to app/src/main/java/app/revanced/manager/ui/component/AppScaffold.kt index 0ac8a09..0d9e012 100644 --- a/app/src/main/java/app/revanced/manager/compose/ui/component/AppScaffold.kt +++ b/app/src/main/java/app/revanced/manager/ui/component/AppScaffold.kt @@ -1,4 +1,4 @@ -package app.revanced.manager.compose.ui.component +package app.revanced.manager.ui.component import androidx.compose.foundation.layout.PaddingValues import androidx.compose.foundation.layout.RowScope diff --git a/app/src/main/java/app/revanced/manager/compose/ui/component/FileSelector.kt b/app/src/main/java/app/revanced/manager/ui/component/FileSelector.kt similarity index 92% rename from app/src/main/java/app/revanced/manager/compose/ui/component/FileSelector.kt rename to app/src/main/java/app/revanced/manager/ui/component/FileSelector.kt index 241c739..4cbe7e7 100644 --- a/app/src/main/java/app/revanced/manager/compose/ui/component/FileSelector.kt +++ b/app/src/main/java/app/revanced/manager/ui/component/FileSelector.kt @@ -1,4 +1,4 @@ -package app.revanced.manager.compose.ui.component +package app.revanced.manager.ui.component import android.net.Uri import androidx.activity.compose.rememberLauncherForActivityResult diff --git a/app/src/main/java/app/revanced/manager/compose/ui/component/GroupHeader.kt b/app/src/main/java/app/revanced/manager/ui/component/GroupHeader.kt similarity index 91% rename from app/src/main/java/app/revanced/manager/compose/ui/component/GroupHeader.kt rename to app/src/main/java/app/revanced/manager/ui/component/GroupHeader.kt index 228e25b..2eb25f1 100644 --- a/app/src/main/java/app/revanced/manager/compose/ui/component/GroupHeader.kt +++ b/app/src/main/java/app/revanced/manager/ui/component/GroupHeader.kt @@ -1,4 +1,4 @@ -package app.revanced.manager.compose.ui.component +package app.revanced.manager.ui.component import androidx.compose.foundation.layout.padding import androidx.compose.material3.MaterialTheme diff --git a/app/src/main/java/app/revanced/manager/compose/ui/component/LoadingIndicator.kt b/app/src/main/java/app/revanced/manager/ui/component/LoadingIndicator.kt similarity index 95% rename from app/src/main/java/app/revanced/manager/compose/ui/component/LoadingIndicator.kt rename to app/src/main/java/app/revanced/manager/ui/component/LoadingIndicator.kt index 5560f25..2413d15 100644 --- a/app/src/main/java/app/revanced/manager/compose/ui/component/LoadingIndicator.kt +++ b/app/src/main/java/app/revanced/manager/ui/component/LoadingIndicator.kt @@ -1,4 +1,4 @@ -package app.revanced.manager.compose.ui.component +package app.revanced.manager.ui.component import androidx.compose.foundation.layout.Arrangement import androidx.compose.foundation.layout.Column diff --git a/app/src/main/java/app/revanced/manager/compose/ui/component/sources/LocalBundleSelectors.kt b/app/src/main/java/app/revanced/manager/ui/component/sources/LocalBundleSelectors.kt similarity index 76% rename from app/src/main/java/app/revanced/manager/compose/ui/component/sources/LocalBundleSelectors.kt rename to app/src/main/java/app/revanced/manager/ui/component/sources/LocalBundleSelectors.kt index 7b55816..b4a9bb5 100644 --- a/app/src/main/java/app/revanced/manager/compose/ui/component/sources/LocalBundleSelectors.kt +++ b/app/src/main/java/app/revanced/manager/ui/component/sources/LocalBundleSelectors.kt @@ -1,4 +1,4 @@ -package app.revanced.manager.compose.ui.component.sources +package app.revanced.manager.ui.component.sources import android.net.Uri import androidx.compose.foundation.layout.Arrangement @@ -6,9 +6,9 @@ import androidx.compose.foundation.layout.Row import androidx.compose.material3.Text import androidx.compose.runtime.Composable import androidx.compose.ui.unit.dp -import app.revanced.manager.compose.ui.component.FileSelector -import app.revanced.manager.compose.util.APK_MIMETYPE -import app.revanced.manager.compose.util.JAR_MIMETYPE +import app.revanced.manager.ui.component.FileSelector +import app.revanced.manager.util.APK_MIMETYPE +import app.revanced.manager.util.JAR_MIMETYPE @Composable fun LocalBundleSelectors(onPatchesSelection: (Uri) -> Unit, onIntegrationsSelection: (Uri) -> Unit) { diff --git a/app/src/main/java/app/revanced/manager/compose/ui/component/sources/NewSourceDialog.kt b/app/src/main/java/app/revanced/manager/ui/component/sources/NewSourceDialog.kt similarity index 95% rename from app/src/main/java/app/revanced/manager/compose/ui/component/sources/NewSourceDialog.kt rename to app/src/main/java/app/revanced/manager/ui/component/sources/NewSourceDialog.kt index fe2c43f..1705982 100644 --- a/app/src/main/java/app/revanced/manager/compose/ui/component/sources/NewSourceDialog.kt +++ b/app/src/main/java/app/revanced/manager/ui/component/sources/NewSourceDialog.kt @@ -1,4 +1,4 @@ -package app.revanced.manager.compose.ui.component.sources +package app.revanced.manager.ui.component.sources import android.net.Uri import androidx.compose.foundation.layout.Column @@ -12,8 +12,8 @@ import androidx.compose.ui.Modifier import androidx.compose.ui.res.stringResource import androidx.compose.ui.window.Dialog import androidx.compose.ui.window.DialogProperties -import app.revanced.manager.compose.R -import app.revanced.manager.compose.util.parseUrlOrNull +import app.revanced.manager.R +import app.revanced.manager.util.parseUrlOrNull import io.ktor.http.* @Composable diff --git a/app/src/main/java/app/revanced/manager/compose/ui/component/sources/SourceItem.kt b/app/src/main/java/app/revanced/manager/ui/component/sources/SourceItem.kt similarity index 91% rename from app/src/main/java/app/revanced/manager/compose/ui/component/sources/SourceItem.kt rename to app/src/main/java/app/revanced/manager/ui/component/sources/SourceItem.kt index e1bf2d3..c1542cd 100644 --- a/app/src/main/java/app/revanced/manager/compose/ui/component/sources/SourceItem.kt +++ b/app/src/main/java/app/revanced/manager/ui/component/sources/SourceItem.kt @@ -1,4 +1,4 @@ -package app.revanced.manager.compose.ui.component.sources +package app.revanced.manager.ui.component.sources import android.net.Uri import androidx.annotation.StringRes @@ -13,12 +13,12 @@ import androidx.compose.ui.platform.LocalContext import androidx.compose.ui.res.pluralStringResource import androidx.compose.ui.unit.dp import androidx.lifecycle.compose.collectAsStateWithLifecycle -import app.revanced.manager.compose.R -import app.revanced.manager.compose.domain.sources.LocalSource -import app.revanced.manager.compose.domain.sources.RemoteSource -import app.revanced.manager.compose.domain.sources.Source -import app.revanced.manager.compose.ui.viewmodel.SourcesViewModel -import app.revanced.manager.compose.util.uiSafe +import app.revanced.manager.R +import app.revanced.manager.domain.sources.LocalSource +import app.revanced.manager.domain.sources.RemoteSource +import app.revanced.manager.domain.sources.Source +import app.revanced.manager.ui.viewmodel.SourcesViewModel +import app.revanced.manager.util.uiSafe import kotlinx.coroutines.launch import java.io.InputStream diff --git a/app/src/main/java/app/revanced/manager/compose/ui/destination/Destination.kt b/app/src/main/java/app/revanced/manager/ui/destination/Destination.kt similarity index 74% rename from app/src/main/java/app/revanced/manager/compose/ui/destination/Destination.kt rename to app/src/main/java/app/revanced/manager/ui/destination/Destination.kt index a1143c5..316fc2f 100644 --- a/app/src/main/java/app/revanced/manager/compose/ui/destination/Destination.kt +++ b/app/src/main/java/app/revanced/manager/ui/destination/Destination.kt @@ -1,8 +1,8 @@ -package app.revanced.manager.compose.ui.destination +package app.revanced.manager.ui.destination import android.os.Parcelable -import app.revanced.manager.compose.util.AppInfo -import app.revanced.manager.compose.util.PatchesSelection +import app.revanced.manager.util.AppInfo +import app.revanced.manager.util.PatchesSelection import kotlinx.parcelize.Parcelize sealed interface Destination : Parcelable { diff --git a/app/src/main/java/app/revanced/manager/compose/ui/destination/SettingsDestination.kt b/app/src/main/java/app/revanced/manager/ui/destination/SettingsDestination.kt similarity index 91% rename from app/src/main/java/app/revanced/manager/compose/ui/destination/SettingsDestination.kt rename to app/src/main/java/app/revanced/manager/ui/destination/SettingsDestination.kt index 39eb5dd..0ac71fc 100644 --- a/app/src/main/java/app/revanced/manager/compose/ui/destination/SettingsDestination.kt +++ b/app/src/main/java/app/revanced/manager/ui/destination/SettingsDestination.kt @@ -1,4 +1,4 @@ -package app.revanced.manager.compose.ui.destination +package app.revanced.manager.ui.destination import android.os.Parcelable import kotlinx.parcelize.Parcelize diff --git a/app/src/main/java/app/revanced/manager/compose/ui/screen/AppSelectorScreen.kt b/app/src/main/java/app/revanced/manager/ui/screen/AppSelectorScreen.kt similarity index 93% rename from app/src/main/java/app/revanced/manager/compose/ui/screen/AppSelectorScreen.kt rename to app/src/main/java/app/revanced/manager/ui/screen/AppSelectorScreen.kt index 4a72ed5..4cd845e 100644 --- a/app/src/main/java/app/revanced/manager/compose/ui/screen/AppSelectorScreen.kt +++ b/app/src/main/java/app/revanced/manager/ui/screen/AppSelectorScreen.kt @@ -1,4 +1,4 @@ -package app.revanced.manager.compose.ui.screen +package app.revanced.manager.ui.screen import androidx.activity.compose.rememberLauncherForActivityResult import androidx.activity.result.contract.ActivityResultContracts @@ -23,13 +23,13 @@ import androidx.compose.ui.res.pluralStringResource import androidx.compose.ui.res.stringResource import androidx.compose.ui.unit.dp import androidx.lifecycle.compose.collectAsStateWithLifecycle -import app.revanced.manager.compose.R -import app.revanced.manager.compose.ui.component.AppIcon -import app.revanced.manager.compose.ui.component.AppTopBar -import app.revanced.manager.compose.ui.component.LoadingIndicator -import app.revanced.manager.compose.ui.viewmodel.AppSelectorViewModel -import app.revanced.manager.compose.util.APK_MIMETYPE -import app.revanced.manager.compose.util.AppInfo +import app.revanced.manager.R +import app.revanced.manager.ui.component.AppIcon +import app.revanced.manager.ui.component.AppTopBar +import app.revanced.manager.ui.component.LoadingIndicator +import app.revanced.manager.ui.viewmodel.AppSelectorViewModel +import app.revanced.manager.util.APK_MIMETYPE +import app.revanced.manager.util.AppInfo import org.koin.androidx.compose.getViewModel @OptIn(ExperimentalMaterial3Api::class) diff --git a/app/src/main/java/app/revanced/manager/compose/ui/screen/DashboardScreen.kt b/app/src/main/java/app/revanced/manager/ui/screen/DashboardScreen.kt similarity index 96% rename from app/src/main/java/app/revanced/manager/compose/ui/screen/DashboardScreen.kt rename to app/src/main/java/app/revanced/manager/ui/screen/DashboardScreen.kt index 1d30199..4672498 100644 --- a/app/src/main/java/app/revanced/manager/compose/ui/screen/DashboardScreen.kt +++ b/app/src/main/java/app/revanced/manager/ui/screen/DashboardScreen.kt @@ -1,4 +1,4 @@ -package app.revanced.manager.compose.ui.screen +package app.revanced.manager.ui.screen import androidx.compose.foundation.ExperimentalFoundationApi import androidx.compose.foundation.layout.Column @@ -18,8 +18,8 @@ import androidx.compose.ui.Modifier import androidx.compose.ui.graphics.vector.ImageVector import androidx.compose.ui.res.stringResource import androidx.compose.ui.unit.dp -import app.revanced.manager.compose.R -import app.revanced.manager.compose.ui.component.AppTopBar +import app.revanced.manager.R +import app.revanced.manager.ui.component.AppTopBar import kotlinx.coroutines.launch enum class DashboardPage( diff --git a/app/src/main/java/app/revanced/manager/compose/ui/screen/InstalledAppsScreen.kt b/app/src/main/java/app/revanced/manager/ui/screen/InstalledAppsScreen.kt similarity index 87% rename from app/src/main/java/app/revanced/manager/compose/ui/screen/InstalledAppsScreen.kt rename to app/src/main/java/app/revanced/manager/ui/screen/InstalledAppsScreen.kt index 412b115..ab1a5e4 100644 --- a/app/src/main/java/app/revanced/manager/compose/ui/screen/InstalledAppsScreen.kt +++ b/app/src/main/java/app/revanced/manager/ui/screen/InstalledAppsScreen.kt @@ -1,4 +1,4 @@ -package app.revanced.manager.compose.ui.screen +package app.revanced.manager.ui.screen import androidx.compose.foundation.layout.Box import androidx.compose.foundation.layout.fillMaxSize @@ -8,7 +8,7 @@ import androidx.compose.runtime.Composable import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier import androidx.compose.ui.res.stringResource -import app.revanced.manager.compose.R +import app.revanced.manager.R @Composable fun InstalledAppsScreen() { diff --git a/app/src/main/java/app/revanced/manager/compose/ui/screen/InstallerScreen.kt b/app/src/main/java/app/revanced/manager/ui/screen/InstallerScreen.kt similarity index 94% rename from app/src/main/java/app/revanced/manager/compose/ui/screen/InstallerScreen.kt rename to app/src/main/java/app/revanced/manager/ui/screen/InstallerScreen.kt index 678b2e1..7a8ba4e 100644 --- a/app/src/main/java/app/revanced/manager/compose/ui/screen/InstallerScreen.kt +++ b/app/src/main/java/app/revanced/manager/ui/screen/InstallerScreen.kt @@ -1,4 +1,4 @@ -package app.revanced.manager.compose.ui.screen +package app.revanced.manager.ui.screen import androidx.activity.compose.rememberLauncherForActivityResult import androidx.activity.result.contract.ActivityResultContracts.CreateDocument @@ -28,13 +28,13 @@ import androidx.compose.ui.semantics.semantics import androidx.compose.ui.text.style.TextOverflow import androidx.compose.ui.unit.Dp import androidx.compose.ui.unit.dp -import app.revanced.manager.compose.R -import app.revanced.manager.compose.patcher.worker.StepGroup -import app.revanced.manager.compose.patcher.worker.StepStatus -import app.revanced.manager.compose.ui.component.AppScaffold -import app.revanced.manager.compose.ui.component.AppTopBar -import app.revanced.manager.compose.ui.viewmodel.InstallerViewModel -import app.revanced.manager.compose.util.APK_MIMETYPE +import app.revanced.manager.R +import app.revanced.manager.patcher.worker.StepGroup +import app.revanced.manager.patcher.worker.StepStatus +import app.revanced.manager.ui.component.AppScaffold +import app.revanced.manager.ui.component.AppTopBar +import app.revanced.manager.ui.viewmodel.InstallerViewModel +import app.revanced.manager.util.APK_MIMETYPE import kotlin.math.floor @OptIn(ExperimentalMaterial3Api::class) diff --git a/app/src/main/java/app/revanced/manager/compose/ui/screen/PatchesSelectorScreen.kt b/app/src/main/java/app/revanced/manager/ui/screen/PatchesSelectorScreen.kt similarity index 95% rename from app/src/main/java/app/revanced/manager/compose/ui/screen/PatchesSelectorScreen.kt rename to app/src/main/java/app/revanced/manager/ui/screen/PatchesSelectorScreen.kt index a7c2659..ca26b17 100644 --- a/app/src/main/java/app/revanced/manager/compose/ui/screen/PatchesSelectorScreen.kt +++ b/app/src/main/java/app/revanced/manager/ui/screen/PatchesSelectorScreen.kt @@ -1,4 +1,4 @@ -package app.revanced.manager.compose.ui.screen +package app.revanced.manager.ui.screen import androidx.compose.foundation.ExperimentalFoundationApi import androidx.compose.foundation.clickable @@ -21,12 +21,12 @@ import androidx.compose.ui.draw.alpha import androidx.compose.ui.res.stringResource import androidx.compose.ui.unit.dp import androidx.lifecycle.compose.collectAsStateWithLifecycle -import app.revanced.manager.compose.R -import app.revanced.manager.compose.patcher.patch.PatchInfo -import app.revanced.manager.compose.ui.component.AppTopBar -import app.revanced.manager.compose.ui.component.GroupHeader -import app.revanced.manager.compose.ui.viewmodel.PatchesSelectorViewModel -import app.revanced.manager.compose.util.PatchesSelection +import app.revanced.manager.R +import app.revanced.manager.patcher.patch.PatchInfo +import app.revanced.manager.ui.component.AppTopBar +import app.revanced.manager.ui.component.GroupHeader +import app.revanced.manager.ui.viewmodel.PatchesSelectorViewModel +import app.revanced.manager.util.PatchesSelection import kotlinx.coroutines.launch const val allowUnsupported = false diff --git a/app/src/main/java/app/revanced/manager/compose/ui/screen/SettingsScreen.kt b/app/src/main/java/app/revanced/manager/ui/screen/SettingsScreen.kt similarity index 96% rename from app/src/main/java/app/revanced/manager/compose/ui/screen/SettingsScreen.kt rename to app/src/main/java/app/revanced/manager/ui/screen/SettingsScreen.kt index af4e074..23d033a 100644 --- a/app/src/main/java/app/revanced/manager/compose/ui/screen/SettingsScreen.kt +++ b/app/src/main/java/app/revanced/manager/ui/screen/SettingsScreen.kt @@ -1,4 +1,4 @@ -package app.revanced.manager.compose.ui.screen +package app.revanced.manager.ui.screen import android.annotation.SuppressLint import android.content.Context @@ -35,11 +35,11 @@ import androidx.compose.ui.draw.clip import androidx.compose.ui.platform.LocalContext import androidx.compose.ui.res.stringResource import androidx.compose.ui.unit.dp -import app.revanced.manager.compose.R -import app.revanced.manager.compose.ui.component.AppTopBar -import app.revanced.manager.compose.ui.destination.SettingsDestination -import app.revanced.manager.compose.ui.screen.settings.* -import app.revanced.manager.compose.ui.viewmodel.SettingsViewModel +import app.revanced.manager.R +import app.revanced.manager.ui.component.AppTopBar +import app.revanced.manager.ui.destination.SettingsDestination +import app.revanced.manager.ui.screen.settings.* +import app.revanced.manager.ui.viewmodel.SettingsViewModel import dev.olshevski.navigation.reimagined.* import org.koin.androidx.compose.getViewModel diff --git a/app/src/main/java/app/revanced/manager/compose/ui/screen/SourcesScreen.kt b/app/src/main/java/app/revanced/manager/ui/screen/SourcesScreen.kt similarity index 85% rename from app/src/main/java/app/revanced/manager/compose/ui/screen/SourcesScreen.kt rename to app/src/main/java/app/revanced/manager/ui/screen/SourcesScreen.kt index 89b51a1..aabac67 100644 --- a/app/src/main/java/app/revanced/manager/compose/ui/screen/SourcesScreen.kt +++ b/app/src/main/java/app/revanced/manager/ui/screen/SourcesScreen.kt @@ -1,4 +1,4 @@ -package app.revanced.manager.compose.ui.screen +package app.revanced.manager.ui.screen import androidx.compose.foundation.layout.* import androidx.compose.material3.* @@ -7,10 +7,10 @@ import androidx.compose.runtime.saveable.rememberSaveable import androidx.compose.ui.Modifier import androidx.compose.ui.res.stringResource import androidx.lifecycle.compose.collectAsStateWithLifecycle -import app.revanced.manager.compose.R -import app.revanced.manager.compose.ui.component.sources.NewSourceDialog -import app.revanced.manager.compose.ui.component.sources.SourceItem -import app.revanced.manager.compose.ui.viewmodel.SourcesViewModel +import app.revanced.manager.R +import app.revanced.manager.ui.component.sources.NewSourceDialog +import app.revanced.manager.ui.component.sources.SourceItem +import app.revanced.manager.ui.viewmodel.SourcesViewModel import kotlinx.coroutines.launch import org.koin.androidx.compose.getViewModel diff --git a/app/src/main/java/app/revanced/manager/compose/ui/screen/settings/AboutSettingsScreen.kt b/app/src/main/java/app/revanced/manager/ui/screen/settings/AboutSettingsScreen.kt similarity index 96% rename from app/src/main/java/app/revanced/manager/compose/ui/screen/settings/AboutSettingsScreen.kt rename to app/src/main/java/app/revanced/manager/ui/screen/settings/AboutSettingsScreen.kt index 975c586..9be80ac 100644 --- a/app/src/main/java/app/revanced/manager/compose/ui/screen/settings/AboutSettingsScreen.kt +++ b/app/src/main/java/app/revanced/manager/ui/screen/settings/AboutSettingsScreen.kt @@ -1,4 +1,4 @@ -package app.revanced.manager.compose.ui.screen.settings +package app.revanced.manager.ui.screen.settings import androidx.compose.foundation.Image import androidx.compose.foundation.border @@ -19,10 +19,10 @@ import androidx.compose.ui.graphics.Color import androidx.compose.ui.platform.LocalContext import androidx.compose.ui.res.stringResource import androidx.compose.ui.unit.dp -import app.revanced.manager.compose.BuildConfig -import app.revanced.manager.compose.R -import app.revanced.manager.compose.ui.component.AppTopBar -import app.revanced.manager.compose.util.openUrl +import app.revanced.manager.BuildConfig +import app.revanced.manager.R +import app.revanced.manager.ui.component.AppTopBar +import app.revanced.manager.util.openUrl import com.google.accompanist.drawablepainter.rememberDrawablePainter @OptIn(ExperimentalMaterial3Api::class) diff --git a/app/src/main/java/app/revanced/manager/compose/ui/screen/settings/DownloadsSettingsScreen.kt b/app/src/main/java/app/revanced/manager/ui/screen/settings/DownloadsSettingsScreen.kt similarity index 86% rename from app/src/main/java/app/revanced/manager/compose/ui/screen/settings/DownloadsSettingsScreen.kt rename to app/src/main/java/app/revanced/manager/ui/screen/settings/DownloadsSettingsScreen.kt index 92c56b9..d94301f 100644 --- a/app/src/main/java/app/revanced/manager/compose/ui/screen/settings/DownloadsSettingsScreen.kt +++ b/app/src/main/java/app/revanced/manager/ui/screen/settings/DownloadsSettingsScreen.kt @@ -1,4 +1,4 @@ -package app.revanced.manager.compose.ui.screen.settings +package app.revanced.manager.ui.screen.settings import androidx.compose.foundation.layout.Column import androidx.compose.foundation.layout.fillMaxSize @@ -10,8 +10,8 @@ import androidx.compose.material3.Scaffold import androidx.compose.runtime.Composable import androidx.compose.ui.Modifier import androidx.compose.ui.res.stringResource -import app.revanced.manager.compose.R -import app.revanced.manager.compose.ui.component.AppTopBar +import app.revanced.manager.R +import app.revanced.manager.ui.component.AppTopBar @OptIn(ExperimentalMaterial3Api::class) @Composable diff --git a/app/src/main/java/app/revanced/manager/compose/ui/screen/settings/GeneralSettingsScreen.kt b/app/src/main/java/app/revanced/manager/ui/screen/settings/GeneralSettingsScreen.kt similarity index 90% rename from app/src/main/java/app/revanced/manager/compose/ui/screen/settings/GeneralSettingsScreen.kt rename to app/src/main/java/app/revanced/manager/ui/screen/settings/GeneralSettingsScreen.kt index 334b734..3db1850 100644 --- a/app/src/main/java/app/revanced/manager/compose/ui/screen/settings/GeneralSettingsScreen.kt +++ b/app/src/main/java/app/revanced/manager/ui/screen/settings/GeneralSettingsScreen.kt @@ -1,4 +1,4 @@ -package app.revanced.manager.compose.ui.screen.settings +package app.revanced.manager.ui.screen.settings import android.os.Build import androidx.compose.foundation.clickable @@ -14,12 +14,12 @@ import androidx.compose.runtime.setValue import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier import androidx.compose.ui.res.stringResource -import app.revanced.manager.compose.R -import app.revanced.manager.compose.domain.manager.PreferencesManager -import app.revanced.manager.compose.ui.component.AppTopBar -import app.revanced.manager.compose.ui.component.GroupHeader -import app.revanced.manager.compose.ui.theme.Theme -import app.revanced.manager.compose.ui.viewmodel.SettingsViewModel +import app.revanced.manager.R +import app.revanced.manager.domain.manager.PreferencesManager +import app.revanced.manager.ui.component.AppTopBar +import app.revanced.manager.ui.component.GroupHeader +import app.revanced.manager.ui.theme.Theme +import app.revanced.manager.ui.viewmodel.SettingsViewModel import org.koin.compose.koinInject @OptIn(ExperimentalMaterial3Api::class) diff --git a/app/src/main/java/app/revanced/manager/compose/ui/screen/settings/ImportExportSettingsScreen.kt b/app/src/main/java/app/revanced/manager/ui/screen/settings/ImportExportSettingsScreen.kt similarity index 89% rename from app/src/main/java/app/revanced/manager/compose/ui/screen/settings/ImportExportSettingsScreen.kt rename to app/src/main/java/app/revanced/manager/ui/screen/settings/ImportExportSettingsScreen.kt index a6f9cfa..d051a7a 100644 --- a/app/src/main/java/app/revanced/manager/compose/ui/screen/settings/ImportExportSettingsScreen.kt +++ b/app/src/main/java/app/revanced/manager/ui/screen/settings/ImportExportSettingsScreen.kt @@ -1,4 +1,4 @@ -package app.revanced.manager.compose.ui.screen.settings +package app.revanced.manager.ui.screen.settings import androidx.compose.foundation.clickable import androidx.compose.foundation.layout.Column @@ -13,9 +13,9 @@ import androidx.compose.material3.Text import androidx.compose.runtime.Composable import androidx.compose.ui.Modifier import androidx.compose.ui.res.stringResource -import app.revanced.manager.compose.R -import app.revanced.manager.compose.ui.component.AppTopBar -import app.revanced.manager.compose.ui.component.GroupHeader +import app.revanced.manager.R +import app.revanced.manager.ui.component.AppTopBar +import app.revanced.manager.ui.component.GroupHeader @OptIn(ExperimentalMaterial3Api::class) @Composable diff --git a/app/src/main/java/app/revanced/manager/compose/ui/screen/settings/UpdatesSettingsScreen.kt b/app/src/main/java/app/revanced/manager/ui/screen/settings/UpdatesSettingsScreen.kt similarity index 96% rename from app/src/main/java/app/revanced/manager/compose/ui/screen/settings/UpdatesSettingsScreen.kt rename to app/src/main/java/app/revanced/manager/ui/screen/settings/UpdatesSettingsScreen.kt index edb0ece..ca95c52 100644 --- a/app/src/main/java/app/revanced/manager/compose/ui/screen/settings/UpdatesSettingsScreen.kt +++ b/app/src/main/java/app/revanced/manager/ui/screen/settings/UpdatesSettingsScreen.kt @@ -1,4 +1,4 @@ -package app.revanced.manager.compose.ui.screen.settings +package app.revanced.manager.ui.screen.settings import androidx.compose.foundation.background import androidx.compose.foundation.clickable @@ -35,10 +35,10 @@ import androidx.compose.ui.draw.clip import androidx.compose.ui.res.stringResource import androidx.compose.ui.text.style.TextAlign import androidx.compose.ui.unit.dp -import app.revanced.manager.compose.R -import app.revanced.manager.compose.ui.component.AppTopBar -import app.revanced.manager.compose.ui.destination.SettingsDestination -import app.revanced.manager.compose.ui.viewmodel.UpdateSettingsViewModel +import app.revanced.manager.R +import app.revanced.manager.ui.component.AppTopBar +import app.revanced.manager.ui.destination.SettingsDestination +import app.revanced.manager.ui.viewmodel.UpdateSettingsViewModel import dev.olshevski.navigation.reimagined.NavController import dev.olshevski.navigation.reimagined.navigate import org.koin.androidx.compose.getViewModel diff --git a/app/src/main/java/app/revanced/manager/compose/ui/theme/Color.kt b/app/src/main/java/app/revanced/manager/ui/theme/Color.kt similarity index 84% rename from app/src/main/java/app/revanced/manager/compose/ui/theme/Color.kt rename to app/src/main/java/app/revanced/manager/ui/theme/Color.kt index d8621e2..903d630 100644 --- a/app/src/main/java/app/revanced/manager/compose/ui/theme/Color.kt +++ b/app/src/main/java/app/revanced/manager/ui/theme/Color.kt @@ -1,4 +1,4 @@ -package app.revanced.manager.compose.ui.theme +package app.revanced.manager.ui.theme import androidx.compose.ui.graphics.Color diff --git a/app/src/main/java/app/revanced/manager/compose/ui/theme/Theme.kt b/app/src/main/java/app/revanced/manager/ui/theme/Theme.kt similarity index 95% rename from app/src/main/java/app/revanced/manager/compose/ui/theme/Theme.kt rename to app/src/main/java/app/revanced/manager/ui/theme/Theme.kt index 8c75162..b6bb698 100644 --- a/app/src/main/java/app/revanced/manager/compose/ui/theme/Theme.kt +++ b/app/src/main/java/app/revanced/manager/ui/theme/Theme.kt @@ -1,4 +1,4 @@ -package app.revanced.manager.compose.ui.theme +package app.revanced.manager.ui.theme import android.app.Activity import android.os.Build @@ -10,7 +10,7 @@ import androidx.compose.ui.graphics.toArgb import androidx.compose.ui.platform.LocalContext import androidx.compose.ui.platform.LocalView import androidx.core.view.WindowCompat -import app.revanced.manager.compose.R +import app.revanced.manager.R private val DarkColorScheme = darkColorScheme( primary = Purple80, diff --git a/app/src/main/java/app/revanced/manager/compose/ui/theme/Type.kt b/app/src/main/java/app/revanced/manager/ui/theme/Type.kt similarity index 90% rename from app/src/main/java/app/revanced/manager/compose/ui/theme/Type.kt rename to app/src/main/java/app/revanced/manager/ui/theme/Type.kt index 03e428d..d999aae 100644 --- a/app/src/main/java/app/revanced/manager/compose/ui/theme/Type.kt +++ b/app/src/main/java/app/revanced/manager/ui/theme/Type.kt @@ -1,4 +1,4 @@ -package app.revanced.manager.compose.ui.theme +package app.revanced.manager.ui.theme import androidx.compose.material3.Typography import androidx.compose.ui.text.TextStyle diff --git a/app/src/main/java/app/revanced/manager/compose/ui/viewmodel/AppSelectorViewModel.kt b/app/src/main/java/app/revanced/manager/ui/viewmodel/AppSelectorViewModel.kt similarity index 89% rename from app/src/main/java/app/revanced/manager/compose/ui/viewmodel/AppSelectorViewModel.kt rename to app/src/main/java/app/revanced/manager/ui/viewmodel/AppSelectorViewModel.kt index 315406f..2daeacb 100644 --- a/app/src/main/java/app/revanced/manager/compose/ui/viewmodel/AppSelectorViewModel.kt +++ b/app/src/main/java/app/revanced/manager/ui/viewmodel/AppSelectorViewModel.kt @@ -1,10 +1,10 @@ -package app.revanced.manager.compose.ui.viewmodel +package app.revanced.manager.ui.viewmodel import android.app.Application import android.content.pm.PackageInfo import android.net.Uri import androidx.lifecycle.ViewModel -import app.revanced.manager.compose.util.PM +import app.revanced.manager.util.PM import java.io.File import java.nio.file.Files diff --git a/app/src/main/java/app/revanced/manager/compose/ui/viewmodel/InstallerViewModel.kt b/app/src/main/java/app/revanced/manager/ui/viewmodel/InstallerViewModel.kt similarity index 89% rename from app/src/main/java/app/revanced/manager/compose/ui/viewmodel/InstallerViewModel.kt rename to app/src/main/java/app/revanced/manager/ui/viewmodel/InstallerViewModel.kt index af4bfbc..ed47626 100644 --- a/app/src/main/java/app/revanced/manager/compose/ui/viewmodel/InstallerViewModel.kt +++ b/app/src/main/java/app/revanced/manager/ui/viewmodel/InstallerViewModel.kt @@ -1,4 +1,4 @@ -package app.revanced.manager.compose.ui.viewmodel +package app.revanced.manager.ui.viewmodel import android.app.Application import android.content.BroadcastReceiver @@ -15,17 +15,17 @@ import androidx.compose.runtime.setValue import androidx.lifecycle.Observer import androidx.lifecycle.ViewModel import androidx.work.* -import app.revanced.manager.compose.R -import app.revanced.manager.compose.patcher.SignerService -import app.revanced.manager.compose.patcher.worker.PatcherProgressManager -import app.revanced.manager.compose.patcher.worker.PatcherWorker -import app.revanced.manager.compose.patcher.worker.StepGroup -import app.revanced.manager.compose.service.InstallService -import app.revanced.manager.compose.service.UninstallService -import app.revanced.manager.compose.util.AppInfo -import app.revanced.manager.compose.util.PM -import app.revanced.manager.compose.util.PatchesSelection -import app.revanced.manager.compose.util.toast +import app.revanced.manager.R +import app.revanced.manager.patcher.SignerService +import app.revanced.manager.patcher.worker.PatcherProgressManager +import app.revanced.manager.patcher.worker.PatcherWorker +import app.revanced.manager.patcher.worker.StepGroup +import app.revanced.manager.service.InstallService +import app.revanced.manager.service.UninstallService +import app.revanced.manager.util.AppInfo +import app.revanced.manager.util.PM +import app.revanced.manager.util.PatchesSelection +import app.revanced.manager.util.toast import kotlinx.serialization.encodeToString import kotlinx.serialization.json.Json import org.koin.core.component.KoinComponent diff --git a/app/src/main/java/app/revanced/manager/compose/ui/viewmodel/MainViewModel.kt b/app/src/main/java/app/revanced/manager/ui/viewmodel/MainViewModel.kt similarity index 76% rename from app/src/main/java/app/revanced/manager/compose/ui/viewmodel/MainViewModel.kt rename to app/src/main/java/app/revanced/manager/ui/viewmodel/MainViewModel.kt index 7930082..d040b96 100644 --- a/app/src/main/java/app/revanced/manager/compose/ui/viewmodel/MainViewModel.kt +++ b/app/src/main/java/app/revanced/manager/ui/viewmodel/MainViewModel.kt @@ -1,9 +1,9 @@ -package app.revanced.manager.compose.ui.viewmodel +package app.revanced.manager.ui.viewmodel import androidx.lifecycle.ViewModel import androidx.lifecycle.viewModelScope -import app.revanced.manager.compose.domain.repository.SourceRepository -import app.revanced.manager.compose.util.PM +import app.revanced.manager.domain.repository.SourceRepository +import app.revanced.manager.util.PM import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.launch diff --git a/app/src/main/java/app/revanced/manager/compose/ui/viewmodel/PatchesSelectorViewModel.kt b/app/src/main/java/app/revanced/manager/ui/viewmodel/PatchesSelectorViewModel.kt similarity index 88% rename from app/src/main/java/app/revanced/manager/compose/ui/viewmodel/PatchesSelectorViewModel.kt rename to app/src/main/java/app/revanced/manager/ui/viewmodel/PatchesSelectorViewModel.kt index b54d230..d1263a5 100644 --- a/app/src/main/java/app/revanced/manager/compose/ui/viewmodel/PatchesSelectorViewModel.kt +++ b/app/src/main/java/app/revanced/manager/ui/viewmodel/PatchesSelectorViewModel.kt @@ -1,4 +1,4 @@ -package app.revanced.manager.compose.ui.viewmodel +package app.revanced.manager.ui.viewmodel import androidx.compose.runtime.Stable import androidx.compose.runtime.getValue @@ -6,10 +6,10 @@ import androidx.compose.runtime.mutableStateListOf import androidx.compose.runtime.mutableStateOf import androidx.compose.runtime.setValue import androidx.lifecycle.ViewModel -import app.revanced.manager.compose.domain.repository.SourceRepository -import app.revanced.manager.compose.patcher.patch.PatchInfo -import app.revanced.manager.compose.util.AppInfo -import app.revanced.manager.compose.util.PatchesSelection +import app.revanced.manager.domain.repository.SourceRepository +import app.revanced.manager.patcher.patch.PatchInfo +import app.revanced.manager.util.AppInfo +import app.revanced.manager.util.PatchesSelection import kotlinx.coroutines.flow.map import org.koin.core.component.KoinComponent import org.koin.core.component.get diff --git a/app/src/main/java/app/revanced/manager/compose/ui/viewmodel/SettingsViewModel.kt b/app/src/main/java/app/revanced/manager/ui/viewmodel/SettingsViewModel.kt similarity index 51% rename from app/src/main/java/app/revanced/manager/compose/ui/viewmodel/SettingsViewModel.kt rename to app/src/main/java/app/revanced/manager/ui/viewmodel/SettingsViewModel.kt index c5eede3..0372695 100644 --- a/app/src/main/java/app/revanced/manager/compose/ui/viewmodel/SettingsViewModel.kt +++ b/app/src/main/java/app/revanced/manager/ui/viewmodel/SettingsViewModel.kt @@ -1,8 +1,8 @@ -package app.revanced.manager.compose.ui.viewmodel +package app.revanced.manager.ui.viewmodel import androidx.lifecycle.ViewModel -import app.revanced.manager.compose.domain.manager.PreferencesManager -import app.revanced.manager.compose.ui.theme.Theme +import app.revanced.manager.domain.manager.PreferencesManager +import app.revanced.manager.ui.theme.Theme class SettingsViewModel( val prefs: PreferencesManager diff --git a/app/src/main/java/app/revanced/manager/compose/ui/viewmodel/SourcesViewModel.kt b/app/src/main/java/app/revanced/manager/ui/viewmodel/SourcesViewModel.kt similarity index 85% rename from app/src/main/java/app/revanced/manager/compose/ui/viewmodel/SourcesViewModel.kt rename to app/src/main/java/app/revanced/manager/ui/viewmodel/SourcesViewModel.kt index 114a505..cd13362 100644 --- a/app/src/main/java/app/revanced/manager/compose/ui/viewmodel/SourcesViewModel.kt +++ b/app/src/main/java/app/revanced/manager/ui/viewmodel/SourcesViewModel.kt @@ -1,14 +1,14 @@ -package app.revanced.manager.compose.ui.viewmodel +package app.revanced.manager.ui.viewmodel import android.app.Application import android.content.ContentResolver import android.net.Uri import androidx.lifecycle.ViewModel import androidx.lifecycle.viewModelScope -import app.revanced.manager.compose.R -import app.revanced.manager.compose.domain.sources.Source -import app.revanced.manager.compose.domain.repository.SourceRepository -import app.revanced.manager.compose.util.uiSafe +import app.revanced.manager.R +import app.revanced.manager.domain.sources.Source +import app.revanced.manager.domain.repository.SourceRepository +import app.revanced.manager.util.uiSafe import io.ktor.http.* import kotlinx.coroutines.launch diff --git a/app/src/main/java/app/revanced/manager/compose/ui/viewmodel/UpdateSettingsViewModel.kt b/app/src/main/java/app/revanced/manager/ui/viewmodel/UpdateSettingsViewModel.kt similarity index 86% rename from app/src/main/java/app/revanced/manager/compose/ui/viewmodel/UpdateSettingsViewModel.kt rename to app/src/main/java/app/revanced/manager/ui/viewmodel/UpdateSettingsViewModel.kt index be7bddd..c3e1a04 100644 --- a/app/src/main/java/app/revanced/manager/compose/ui/viewmodel/UpdateSettingsViewModel.kt +++ b/app/src/main/java/app/revanced/manager/ui/viewmodel/UpdateSettingsViewModel.kt @@ -1,10 +1,10 @@ -package app.revanced.manager.compose.ui.viewmodel +package app.revanced.manager.ui.viewmodel import android.os.Environment import androidx.lifecycle.ViewModel import androidx.lifecycle.viewModelScope -import app.revanced.manager.compose.network.api.ManagerAPI -import app.revanced.manager.compose.util.PM +import app.revanced.manager.network.api.ManagerAPI +import app.revanced.manager.util.PM import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.launch import java.io.File diff --git a/app/src/main/java/app/revanced/manager/compose/util/Constants.kt b/app/src/main/java/app/revanced/manager/util/Constants.kt similarity index 92% rename from app/src/main/java/app/revanced/manager/compose/util/Constants.kt rename to app/src/main/java/app/revanced/manager/util/Constants.kt index a742542..c0c07d1 100644 --- a/app/src/main/java/app/revanced/manager/compose/util/Constants.kt +++ b/app/src/main/java/app/revanced/manager/util/Constants.kt @@ -1,4 +1,4 @@ -package app.revanced.manager.compose.util +package app.revanced.manager.util private const val team = "revanced" const val ghOrganization = "https://github.com/$team" diff --git a/app/src/main/java/app/revanced/manager/compose/util/PM.kt b/app/src/main/java/app/revanced/manager/util/PM.kt similarity index 95% rename from app/src/main/java/app/revanced/manager/compose/util/PM.kt rename to app/src/main/java/app/revanced/manager/util/PM.kt index 69b7f22..54f3f95 100644 --- a/app/src/main/java/app/revanced/manager/compose/util/PM.kt +++ b/app/src/main/java/app/revanced/manager/util/PM.kt @@ -1,4 +1,4 @@ -package app.revanced.manager.compose.util +package app.revanced.manager.util import android.annotation.SuppressLint import android.app.Application @@ -12,9 +12,9 @@ import android.content.pm.PackageManager.MATCH_UNINSTALLED_PACKAGES import android.os.Build import android.os.Parcelable import androidx.compose.runtime.Immutable -import app.revanced.manager.compose.domain.repository.SourceRepository -import app.revanced.manager.compose.service.InstallService -import app.revanced.manager.compose.service.UninstallService +import app.revanced.manager.domain.repository.SourceRepository +import app.revanced.manager.service.InstallService +import app.revanced.manager.service.UninstallService import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.flow.MutableStateFlow diff --git a/app/src/main/java/app/revanced/manager/compose/util/Util.kt b/app/src/main/java/app/revanced/manager/util/Util.kt similarity index 98% rename from app/src/main/java/app/revanced/manager/compose/util/Util.kt rename to app/src/main/java/app/revanced/manager/util/Util.kt index 6d71edc..22bdf3a 100644 --- a/app/src/main/java/app/revanced/manager/compose/util/Util.kt +++ b/app/src/main/java/app/revanced/manager/util/Util.kt @@ -1,4 +1,4 @@ -package app.revanced.manager.compose.util +package app.revanced.manager.util import android.content.Context import android.content.Intent diff --git a/app/src/main/java/app/revanced/manager/compose/util/signing/Signer.kt b/app/src/main/java/app/revanced/manager/util/signing/Signer.kt similarity index 96% rename from app/src/main/java/app/revanced/manager/compose/util/signing/Signer.kt rename to app/src/main/java/app/revanced/manager/util/signing/Signer.kt index cda508f..8112db7 100644 --- a/app/src/main/java/app/revanced/manager/compose/util/signing/Signer.kt +++ b/app/src/main/java/app/revanced/manager/util/signing/Signer.kt @@ -1,7 +1,7 @@ -package app.revanced.manager.compose.util.signing +package app.revanced.manager.util.signing import android.util.Log -import app.revanced.manager.compose.util.tag +import app.revanced.manager.util.tag import com.android.apksig.ApkSigner import org.bouncycastle.asn1.x500.X500Name import org.bouncycastle.asn1.x509.SubjectPublicKeyInfo diff --git a/app/src/main/java/app/revanced/manager/compose/util/signing/SigningOptions.kt b/app/src/main/java/app/revanced/manager/util/signing/SigningOptions.kt similarity index 68% rename from app/src/main/java/app/revanced/manager/compose/util/signing/SigningOptions.kt rename to app/src/main/java/app/revanced/manager/util/signing/SigningOptions.kt index df88b54..403b01d 100644 --- a/app/src/main/java/app/revanced/manager/compose/util/signing/SigningOptions.kt +++ b/app/src/main/java/app/revanced/manager/util/signing/SigningOptions.kt @@ -1,4 +1,4 @@ -package app.revanced.manager.compose.util.signing +package app.revanced.manager.util.signing data class SigningOptions( val cn: String,