diff --git a/.idea/.name b/.idea/.name index b036ce5..0d10ea7 100644 --- a/.idea/.name +++ b/.idea/.name @@ -1 +1 @@ -Etsudoku \ No newline at end of file +Shirizu \ No newline at end of file diff --git a/.idea/deploymentTargetDropDown.xml b/.idea/deploymentTargetDropDown.xml index d5945b4..7084d2c 100644 --- a/.idea/deploymentTargetDropDown.xml +++ b/.idea/deploymentTargetDropDown.xml @@ -13,12 +13,12 @@ - + - + diff --git a/README.md b/README.md index e45dc80..d2e906a 100644 --- a/README.md +++ b/README.md @@ -1,14 +1,14 @@
- Etsudoku logo + Shirizu logo -# Etsudoku +# Shirizu
-Etsudoku (閲読) - An attempt to write an Android manga reading application on Jetpack Compose using the [Kotatsu parser library](https://github.com/KotatsuApp/kotatsu-parsers). +Shirizu (シリーズ, from Japanese - series) - An attempt to write an Android manga reading application on Jetpack Compose using the [Kotatsu parser library](https://github.com/KotatsuApp/kotatsu-parsers). ## Is it possible to use it now? diff --git a/app/build.gradle.kts b/app/build.gradle.kts index f4388ab..cbe8652 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -19,11 +19,11 @@ val acraAuthLogin: String = gradleLocalProperties(rootDir).getProperty("authLogi val acraAuthPassword: String = gradleLocalProperties(rootDir).getProperty("authPassword") ?: "\"acra_password\"" android { - namespace = "org.xtimms.etsudoku" + namespace = "org.xtimms.shirizu" compileSdk = 34 defaultConfig { - applicationId = "org.xtimms.etsudoku" + applicationId = "org.xtimms.shirizu" minSdk = 26 targetSdk = 34 versionCode = 1 @@ -37,7 +37,7 @@ android { buildConfigField("String", "ACRA_AUTH_LOGIN", acraAuthLogin) buildConfigField("String", "ACRA_AUTH_PASSWORD", acraAuthPassword) - testInstrumentationRunner = "org.xtimms.etsudoku.HiltTestRunner" + testInstrumentationRunner = "org.xtimms.shirizu.HiltTestRunner" vectorDrawables { useSupportLibrary = true } diff --git a/app/src/androidTest/java/org/xtimms/etsudoku/HiltTestRunner.kt b/app/src/androidTest/java/org/xtimms/shirizu/HiltTestRunner.kt similarity index 93% rename from app/src/androidTest/java/org/xtimms/etsudoku/HiltTestRunner.kt rename to app/src/androidTest/java/org/xtimms/shirizu/HiltTestRunner.kt index 2f389f4..76a3d01 100644 --- a/app/src/androidTest/java/org/xtimms/etsudoku/HiltTestRunner.kt +++ b/app/src/androidTest/java/org/xtimms/shirizu/HiltTestRunner.kt @@ -1,4 +1,4 @@ -package org.xtimms.etsudoku +package org.xtimms.shirizu import android.app.Application import android.content.Context diff --git a/app/src/androidTest/java/org/xtimms/etsudoku/Instrumentation.kt b/app/src/androidTest/java/org/xtimms/shirizu/Instrumentation.kt similarity index 88% rename from app/src/androidTest/java/org/xtimms/etsudoku/Instrumentation.kt rename to app/src/androidTest/java/org/xtimms/shirizu/Instrumentation.kt index 1b1b458..45c5a9d 100644 --- a/app/src/androidTest/java/org/xtimms/etsudoku/Instrumentation.kt +++ b/app/src/androidTest/java/org/xtimms/shirizu/Instrumentation.kt @@ -1,4 +1,4 @@ -package org.xtimms.etsudoku +package org.xtimms.shirizu import android.app.Instrumentation import kotlin.coroutines.resume diff --git a/app/src/androidTest/java/org/xtimms/etsudoku/SampleData.kt b/app/src/androidTest/java/org/xtimms/shirizu/SampleData.kt similarity index 95% rename from app/src/androidTest/java/org/xtimms/etsudoku/SampleData.kt rename to app/src/androidTest/java/org/xtimms/shirizu/SampleData.kt index da6ad4d..10df7b5 100644 --- a/app/src/androidTest/java/org/xtimms/etsudoku/SampleData.kt +++ b/app/src/androidTest/java/org/xtimms/shirizu/SampleData.kt @@ -1,4 +1,4 @@ -package org.xtimms.etsudoku +package org.xtimms.shirizu import androidx.test.platform.app.InstrumentationRegistry import com.squareup.moshi.FromJson @@ -11,7 +11,7 @@ import com.squareup.moshi.kotlin.reflect.KotlinJsonAdapterFactory import okio.buffer import okio.source import org.koitharu.kotatsu.parsers.model.Manga -import org.xtimms.etsudoku.core.model.FavouriteCategory +import org.xtimms.shirizu.core.model.FavouriteCategory import java.util.Date import kotlin.reflect.KClass diff --git a/app/src/androidTest/java/org/xtimms/etsudoku/sections/settings/backup/AppBackupAgentTest.kt b/app/src/androidTest/java/org/xtimms/shirizu/sections/settings/backup/AppBackupAgentTest.kt similarity index 88% rename from app/src/androidTest/java/org/xtimms/etsudoku/sections/settings/backup/AppBackupAgentTest.kt rename to app/src/androidTest/java/org/xtimms/shirizu/sections/settings/backup/AppBackupAgentTest.kt index c9c1ec8..a21af73 100644 --- a/app/src/androidTest/java/org/xtimms/etsudoku/sections/settings/backup/AppBackupAgentTest.kt +++ b/app/src/androidTest/java/org/xtimms/shirizu/sections/settings/backup/AppBackupAgentTest.kt @@ -1,4 +1,4 @@ -package org.xtimms.etsudoku.sections.settings.backup +package org.xtimms.shirizu.sections.settings.backup import android.content.res.AssetManager import androidx.test.ext.junit.runners.AndroidJUnit4 @@ -12,12 +12,12 @@ import org.junit.Before import org.junit.Rule import org.junit.Test import org.junit.runner.RunWith -import org.xtimms.etsudoku.SampleData -import org.xtimms.etsudoku.core.database.EtsudokuDatabase -import org.xtimms.etsudoku.core.database.entity.toMangaTags -import org.xtimms.etsudoku.data.repository.FavouritesRepository -import org.xtimms.etsudoku.data.repository.HistoryRepository -import org.xtimms.etsudoku.data.repository.backup.BackupRepository +import org.xtimms.shirizu.SampleData +import org.xtimms.shirizu.core.database.ShirizuDatabase +import org.xtimms.shirizu.core.database.entity.toMangaTags +import org.xtimms.shirizu.data.repository.FavouritesRepository +import org.xtimms.shirizu.data.repository.HistoryRepository +import org.xtimms.shirizu.data.repository.backup.BackupRepository import java.io.File import javax.inject.Inject @@ -38,7 +38,7 @@ class AppBackupAgentTest { lateinit var backupRepository: BackupRepository @Inject - lateinit var database: EtsudokuDatabase + lateinit var database: ShirizuDatabase @Before fun setUp() { diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index fc1cac8..da2e8ac 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -35,7 +35,7 @@ android:label="@string/app_name" android:largeHeap="true" android:supportsRtl="true" - android:theme="@style/Theme.Etsudoku.Starting" + android:theme="@style/Theme.Shirizu" android:networkSecurityConfig="@xml/network_security_config" tools:targetApi="tiramisu"> @@ -43,7 +43,7 @@ android:name=".MainActivity" android:exported="true" android:launchMode="singleTop" - android:theme="@style/Theme.Etsudoku"> + android:theme="@style/Theme.Shirizu.SplashTheme"> diff --git a/app/src/main/java/org/xtimms/etsudoku/core/exceptions/SyncApiException.kt b/app/src/main/java/org/xtimms/etsudoku/core/exceptions/SyncApiException.kt deleted file mode 100644 index ee5c9bb..0000000 --- a/app/src/main/java/org/xtimms/etsudoku/core/exceptions/SyncApiException.kt +++ /dev/null @@ -1,6 +0,0 @@ -package org.xtimms.etsudoku.core.exceptions - -class SyncApiException( - message: String, - val code: Int, -) : RuntimeException(message) \ No newline at end of file diff --git a/app/src/main/java/org/xtimms/etsudoku/sections/details/DetailsEvent.kt b/app/src/main/java/org/xtimms/etsudoku/sections/details/DetailsEvent.kt deleted file mode 100644 index 53a1cce..0000000 --- a/app/src/main/java/org/xtimms/etsudoku/sections/details/DetailsEvent.kt +++ /dev/null @@ -1,5 +0,0 @@ -package org.xtimms.etsudoku.sections.details - -import org.xtimms.etsudoku.core.base.event.UiEvent - -interface DetailsEvent : UiEvent \ No newline at end of file diff --git a/app/src/main/java/org/xtimms/etsudoku/sections/explore/ExploreEvent.kt b/app/src/main/java/org/xtimms/etsudoku/sections/explore/ExploreEvent.kt deleted file mode 100644 index bd5faba..0000000 --- a/app/src/main/java/org/xtimms/etsudoku/sections/explore/ExploreEvent.kt +++ /dev/null @@ -1,5 +0,0 @@ -package org.xtimms.etsudoku.sections.explore - -import org.xtimms.etsudoku.core.base.event.UiEvent - -interface ExploreEvent : UiEvent \ No newline at end of file diff --git a/app/src/main/java/org/xtimms/etsudoku/sections/list/MangaListEvent.kt b/app/src/main/java/org/xtimms/etsudoku/sections/list/MangaListEvent.kt deleted file mode 100644 index 3194ec5..0000000 --- a/app/src/main/java/org/xtimms/etsudoku/sections/list/MangaListEvent.kt +++ /dev/null @@ -1,5 +0,0 @@ -package org.xtimms.etsudoku.sections.list - -import org.xtimms.etsudoku.core.base.event.PagedUiEvent - -interface MangaListEvent : PagedUiEvent \ No newline at end of file diff --git a/app/src/main/java/org/xtimms/etsudoku/sections/reader/ReaderContent.kt b/app/src/main/java/org/xtimms/etsudoku/sections/reader/ReaderContent.kt deleted file mode 100644 index 4fb877e..0000000 --- a/app/src/main/java/org/xtimms/etsudoku/sections/reader/ReaderContent.kt +++ /dev/null @@ -1,8 +0,0 @@ -package org.xtimms.etsudoku.sections.reader - -import org.xtimms.etsudoku.sections.reader.pager.ReaderPage - -data class ReaderContent( - val pages: List, - val state: ReaderState? -) \ No newline at end of file diff --git a/app/src/main/java/org/xtimms/etsudoku/sections/settings/appearance/Card.kt b/app/src/main/java/org/xtimms/etsudoku/sections/settings/appearance/Card.kt deleted file mode 100644 index 87f55a0..0000000 --- a/app/src/main/java/org/xtimms/etsudoku/sections/settings/appearance/Card.kt +++ /dev/null @@ -1,88 +0,0 @@ -package org.xtimms.etsudoku.sections.settings.appearance - -import androidx.compose.foundation.Image -import androidx.compose.foundation.layout.Arrangement -import androidx.compose.foundation.layout.Column -import androidx.compose.foundation.layout.Row -import androidx.compose.foundation.layout.fillMaxHeight -import androidx.compose.foundation.layout.fillMaxWidth -import androidx.compose.foundation.layout.height -import androidx.compose.foundation.layout.padding -import androidx.compose.material3.ElevatedCard -import androidx.compose.material3.MaterialTheme -import androidx.compose.material3.Text -import androidx.compose.runtime.Composable -import androidx.compose.ui.Modifier -import androidx.compose.ui.draw.clip -import androidx.compose.ui.res.painterResource -import androidx.compose.ui.text.style.TextOverflow -import androidx.compose.ui.tooling.preview.PreviewLightDark -import androidx.compose.ui.unit.dp -import org.xtimms.etsudoku.R -import org.xtimms.etsudoku.ui.theme.EtsudokuTheme - -@Composable -fun MangaCard( - modifier: Modifier = Modifier, - title: String = "Ookami to Koushinryou", - author: String = "Hasekura Isuna", - thumbnailUrl: Any = "", - showCancelButton: Boolean = false, - onCancel: () -> Unit = {}, - onClick: () -> Unit = {}, - progress: Float = 75f, -) { - ElevatedCard( - modifier = modifier - .height(136.dp) - .fillMaxWidth(), - onClick = onClick, - shape = MaterialTheme.shapes.small, - ) { - Row( - modifier = Modifier.fillMaxWidth() - ) { - Image( - modifier = Modifier - .padding() - .fillMaxHeight() - .clip(MaterialTheme.shapes.small), - painter = painterResource(id = R.drawable.ookami), - contentDescription = null - ) - Column( - modifier = Modifier - .weight(1f) - .padding(horizontal = 12.dp, vertical = 8.dp) - .fillMaxWidth(), - verticalArrangement = Arrangement.Top - ) { - Text( - text = title, - style = MaterialTheme.typography.titleLarge, - color = MaterialTheme.colorScheme.onSurface, - maxLines = 2, - overflow = TextOverflow.Ellipsis - ) - if (author != "null") Text( - modifier = Modifier.padding(top = 3.dp), - text = author, - style = MaterialTheme.typography.bodySmall, - color = MaterialTheme.colorScheme.onSurfaceVariant, - maxLines = 1, - overflow = TextOverflow.Ellipsis - ) - } - } - } -} - -@PreviewLightDark -@Composable -fun MangaCardPreview() { - EtsudokuTheme { - MangaCard( - thumbnailUrl = "https://spice-and-wolf.com/special/img/visual_january.jpg" - ) - } -} \ No newline at end of file diff --git a/app/src/main/java/org/xtimms/etsudoku/sections/settings/storage/StorageEvent.kt b/app/src/main/java/org/xtimms/etsudoku/sections/settings/storage/StorageEvent.kt deleted file mode 100644 index a547644..0000000 --- a/app/src/main/java/org/xtimms/etsudoku/sections/settings/storage/StorageEvent.kt +++ /dev/null @@ -1,5 +0,0 @@ -package org.xtimms.etsudoku.sections.settings.storage - -import org.xtimms.etsudoku.core.base.event.UiEvent - -interface StorageEvent : UiEvent \ No newline at end of file diff --git a/app/src/main/java/org/xtimms/etsudoku/utils/material/Constants.kt b/app/src/main/java/org/xtimms/etsudoku/utils/material/Constants.kt deleted file mode 100644 index b6fea3e..0000000 --- a/app/src/main/java/org/xtimms/etsudoku/utils/material/Constants.kt +++ /dev/null @@ -1,3 +0,0 @@ -package org.xtimms.etsudoku.utils.material - -const val SecondaryItemAlpha = .78f \ No newline at end of file diff --git a/app/src/main/java/org/xtimms/etsudoku/work/tracker/TrackingItem.kt b/app/src/main/java/org/xtimms/etsudoku/work/tracker/TrackingItem.kt deleted file mode 100644 index 6b9c4fe..0000000 --- a/app/src/main/java/org/xtimms/etsudoku/work/tracker/TrackingItem.kt +++ /dev/null @@ -1,8 +0,0 @@ -package org.xtimms.etsudoku.work.tracker - -import org.xtimms.etsudoku.core.tracker.model.MangaTracking - -data class TrackingItem( - val tracking: MangaTracking, - val channelId: String?, -) \ No newline at end of file diff --git a/app/src/main/java/org/xtimms/etsudoku/App.kt b/app/src/main/java/org/xtimms/shirizu/App.kt similarity index 91% rename from app/src/main/java/org/xtimms/etsudoku/App.kt rename to app/src/main/java/org/xtimms/shirizu/App.kt index c850930..b8d6e67 100644 --- a/app/src/main/java/org/xtimms/etsudoku/App.kt +++ b/app/src/main/java/org/xtimms/shirizu/App.kt @@ -1,4 +1,4 @@ -package org.xtimms.etsudoku +package org.xtimms.shirizu import android.app.Application import android.content.Context @@ -20,12 +20,12 @@ import org.acra.data.StringFormat import org.acra.ktx.initAcra import org.acra.sender.HttpSender import org.koitharu.kotatsu.parsers.MangaLoaderContext -import org.xtimms.etsudoku.core.database.EtsudokuDatabase -import org.xtimms.etsudoku.core.prefs.AppSettings -import org.xtimms.etsudoku.core.prefs.KotatsuAppSettings -import org.xtimms.etsudoku.core.updates.Updater -import org.xtimms.etsudoku.utils.lang.processLifecycleScope -import org.xtimms.etsudoku.work.WorkScheduleManager +import org.xtimms.shirizu.core.database.ShirizuDatabase +import org.xtimms.shirizu.core.prefs.AppSettings +import org.xtimms.shirizu.core.prefs.KotatsuAppSettings +import org.xtimms.shirizu.core.updates.Updater +import org.xtimms.shirizu.utils.lang.processLifecycleScope +import org.xtimms.shirizu.work.WorkScheduleManager import javax.inject.Inject import javax.inject.Provider @@ -33,7 +33,7 @@ import javax.inject.Provider class App : Application(), Configuration.Provider { @Inject - lateinit var database: Provider + lateinit var database: Provider @Inject lateinit var settings: KotatsuAppSettings diff --git a/app/src/main/java/org/xtimms/etsudoku/CompositionLocals.kt b/app/src/main/java/org/xtimms/shirizu/CompositionLocals.kt similarity index 80% rename from app/src/main/java/org/xtimms/etsudoku/CompositionLocals.kt rename to app/src/main/java/org/xtimms/shirizu/CompositionLocals.kt index 3cc9ea3..435ec68 100644 --- a/app/src/main/java/org/xtimms/etsudoku/CompositionLocals.kt +++ b/app/src/main/java/org/xtimms/shirizu/CompositionLocals.kt @@ -1,4 +1,4 @@ -package org.xtimms.etsudoku +package org.xtimms.shirizu import android.os.Build import androidx.compose.foundation.layout.PaddingValues @@ -11,13 +11,13 @@ import androidx.compose.ui.graphics.Color import androidx.compose.ui.platform.LocalContext import androidx.compose.ui.unit.Dp import androidx.compose.ui.unit.dp -import org.xtimms.etsudoku.ui.theme.SEED -import org.xtimms.etsudoku.core.prefs.AppSettings -import org.xtimms.etsudoku.core.prefs.DarkThemePreference -import org.xtimms.etsudoku.core.prefs.paletteStyles -import org.xtimms.etsudoku.ui.monet.LocalTonalPalettes -import org.xtimms.etsudoku.ui.monet.PaletteStyle -import org.xtimms.etsudoku.ui.monet.TonalPalettes.Companion.toTonalPalettes +import org.xtimms.shirizu.ui.theme.SEED +import org.xtimms.shirizu.core.prefs.AppSettings +import org.xtimms.shirizu.core.prefs.DarkThemePreference +import org.xtimms.shirizu.core.prefs.paletteStyles +import org.xtimms.shirizu.ui.monet.LocalTonalPalettes +import org.xtimms.shirizu.ui.monet.PaletteStyle +import org.xtimms.shirizu.ui.monet.TonalPalettes.Companion.toTonalPalettes data class BottomSheetScrollState( val topPadding: Dp, diff --git a/app/src/main/java/org/xtimms/etsudoku/MainActivity.kt b/app/src/main/java/org/xtimms/shirizu/MainActivity.kt similarity index 94% rename from app/src/main/java/org/xtimms/etsudoku/MainActivity.kt rename to app/src/main/java/org/xtimms/shirizu/MainActivity.kt index 172c537..c90083c 100644 --- a/app/src/main/java/org/xtimms/etsudoku/MainActivity.kt +++ b/app/src/main/java/org/xtimms/shirizu/MainActivity.kt @@ -1,4 +1,4 @@ -package org.xtimms.etsudoku +package org.xtimms.shirizu import android.Manifest import android.content.Intent @@ -58,18 +58,18 @@ import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.Job import kotlinx.coroutines.launch import kotlinx.coroutines.runBlocking -import org.xtimms.etsudoku.core.Navigation -import org.xtimms.etsudoku.core.components.BottomNavBar -import org.xtimms.etsudoku.core.components.ContinueReadingButton -import org.xtimms.etsudoku.core.components.NavigationRail -import org.xtimms.etsudoku.core.components.TopAppBar -import org.xtimms.etsudoku.core.logs.FileLogger -import org.xtimms.etsudoku.core.prefs.AppSettings -import org.xtimms.etsudoku.core.screens.UpdateDialogImpl -import org.xtimms.etsudoku.core.updates.Updater -import org.xtimms.etsudoku.ui.theme.EtsudokuTheme -import org.xtimms.etsudoku.utils.system.setLanguage -import org.xtimms.etsudoku.utils.system.suspendToast +import org.xtimms.shirizu.core.Navigation +import org.xtimms.shirizu.core.components.BottomNavBar +import org.xtimms.shirizu.core.components.ContinueReadingButton +import org.xtimms.shirizu.core.components.NavigationRail +import org.xtimms.shirizu.core.components.TopAppBar +import org.xtimms.shirizu.core.logs.FileLogger +import org.xtimms.shirizu.core.prefs.AppSettings +import org.xtimms.shirizu.core.screens.UpdateDialogImpl +import org.xtimms.shirizu.core.updates.Updater +import org.xtimms.shirizu.ui.theme.ShirizuTheme +import org.xtimms.shirizu.utils.system.setLanguage +import org.xtimms.shirizu.utils.system.suspendToast import javax.inject.Inject @OptIn(ExperimentalMaterial3WindowSizeClassApi::class) @@ -142,7 +142,7 @@ class MainActivity : ComponentActivity() { } if (isReady.value) { SettingsProvider { - EtsudokuTheme( + ShirizuTheme( darkTheme = LocalDarkTheme.current.isDarkTheme(), isDynamicColorEnabled = LocalDynamicColorSwitch.current, isHighContrastModeEnabled = LocalDarkTheme.current.isHighContrastModeEnabled, diff --git a/app/src/main/java/org/xtimms/etsudoku/EtsudokuModule.kt b/app/src/main/java/org/xtimms/shirizu/ShirizuModule.kt similarity index 77% rename from app/src/main/java/org/xtimms/etsudoku/EtsudokuModule.kt rename to app/src/main/java/org/xtimms/shirizu/ShirizuModule.kt index 2ca9ab1..ae7d76b 100644 --- a/app/src/main/java/org/xtimms/etsudoku/EtsudokuModule.kt +++ b/app/src/main/java/org/xtimms/shirizu/ShirizuModule.kt @@ -1,4 +1,4 @@ -package org.xtimms.etsudoku +package org.xtimms.shirizu import android.app.Application import android.content.Context @@ -20,28 +20,28 @@ import kotlinx.coroutines.flow.SharedFlow import kotlinx.coroutines.flow.asSharedFlow import okhttp3.OkHttpClient import org.koitharu.kotatsu.parsers.MangaLoaderContext -import org.xtimms.etsudoku.core.cache.CacheDir -import org.xtimms.etsudoku.core.cache.ContentCache -import org.xtimms.etsudoku.core.cache.MemoryContentCache -import org.xtimms.etsudoku.core.cache.StubContentCache -import org.xtimms.etsudoku.core.database.EtsudokuDatabase -import org.xtimms.etsudoku.core.model.LocalManga -import org.xtimms.etsudoku.core.network.MangaHttpClient -import org.xtimms.etsudoku.core.network.interceptors.ImageProxyInterceptor -import org.xtimms.etsudoku.core.os.NetworkState -import org.xtimms.etsudoku.core.parser.MangaLoaderContextImpl -import org.xtimms.etsudoku.core.parser.MangaRepository -import org.xtimms.etsudoku.core.parser.favicon.FaviconFetcher -import org.xtimms.etsudoku.core.parser.local.LocalStorageChanges -import org.xtimms.etsudoku.sections.reader.thumbnails.MangaPageFetcher -import org.xtimms.etsudoku.utils.CoilImageGetter -import org.xtimms.etsudoku.utils.system.connectivityManager -import org.xtimms.etsudoku.utils.system.isLowRamDevice +import org.xtimms.shirizu.core.cache.CacheDir +import org.xtimms.shirizu.core.cache.ContentCache +import org.xtimms.shirizu.core.cache.MemoryContentCache +import org.xtimms.shirizu.core.cache.StubContentCache +import org.xtimms.shirizu.core.database.ShirizuDatabase +import org.xtimms.shirizu.core.model.LocalManga +import org.xtimms.shirizu.core.network.MangaHttpClient +import org.xtimms.shirizu.core.network.interceptors.ImageProxyInterceptor +import org.xtimms.shirizu.core.os.NetworkState +import org.xtimms.shirizu.core.parser.MangaLoaderContextImpl +import org.xtimms.shirizu.core.parser.MangaRepository +import org.xtimms.shirizu.core.parser.favicon.FaviconFetcher +import org.xtimms.shirizu.core.parser.local.LocalStorageChanges +import org.xtimms.shirizu.sections.reader.thumbnails.MangaPageFetcher +import org.xtimms.shirizu.utils.CoilImageGetter +import org.xtimms.shirizu.utils.system.connectivityManager +import org.xtimms.shirizu.utils.system.isLowRamDevice import javax.inject.Singleton @Module @InstallIn(SingletonComponent::class) -interface EtsudokuModule { +interface ShirizuModule { @Binds fun bindMangaLoaderContext(mangaLoaderContextImpl: MangaLoaderContextImpl): MangaLoaderContext @@ -61,8 +61,8 @@ interface EtsudokuModule { @Singleton fun provideMangaDatabase( @ApplicationContext context: Context, - ): EtsudokuDatabase { - return EtsudokuDatabase(context) + ): ShirizuDatabase { + return ShirizuDatabase(context) } @Provides diff --git a/app/src/main/java/org/xtimms/etsudoku/core/AsyncImageImpl.kt b/app/src/main/java/org/xtimms/shirizu/core/AsyncImageImpl.kt similarity index 92% rename from app/src/main/java/org/xtimms/etsudoku/core/AsyncImageImpl.kt rename to app/src/main/java/org/xtimms/shirizu/core/AsyncImageImpl.kt index d8127ca..3f3236e 100644 --- a/app/src/main/java/org/xtimms/etsudoku/core/AsyncImageImpl.kt +++ b/app/src/main/java/org/xtimms/shirizu/core/AsyncImageImpl.kt @@ -1,4 +1,4 @@ -package org.xtimms.etsudoku.core +package org.xtimms.shirizu.core import androidx.compose.foundation.Image import androidx.compose.runtime.Composable @@ -14,8 +14,8 @@ import androidx.compose.ui.res.painterResource import coil.ImageLoader import coil.compose.AsyncImage import coil.compose.AsyncImagePainter -import org.xtimms.etsudoku.R -import org.xtimms.etsudoku.utils.composable.rememberResourceBitmapPainter +import org.xtimms.shirizu.R +import org.xtimms.shirizu.utils.composable.rememberResourceBitmapPainter @Composable fun AsyncImageImpl( diff --git a/app/src/main/java/org/xtimms/etsudoku/core/BottomNavDestination.kt b/app/src/main/java/org/xtimms/shirizu/core/BottomNavDestination.kt similarity index 89% rename from app/src/main/java/org/xtimms/etsudoku/core/BottomNavDestination.kt rename to app/src/main/java/org/xtimms/shirizu/core/BottomNavDestination.kt index 7569295..1d5af18 100644 --- a/app/src/main/java/org/xtimms/etsudoku/core/BottomNavDestination.kt +++ b/app/src/main/java/org/xtimms/shirizu/core/BottomNavDestination.kt @@ -1,4 +1,4 @@ -package org.xtimms.etsudoku.core +package org.xtimms.shirizu.core import androidx.annotation.StringRes import androidx.compose.material.icons.Icons @@ -11,10 +11,10 @@ import androidx.compose.material.icons.outlined.LocalLibrary import androidx.compose.runtime.Composable import androidx.compose.ui.graphics.vector.ImageVector import androidx.compose.ui.res.stringResource -import org.xtimms.etsudoku.R -import org.xtimms.etsudoku.sections.explore.EXPLORE_DESTINATION -import org.xtimms.etsudoku.sections.history.HISTORY_DESTINATION -import org.xtimms.etsudoku.sections.shelf.SHELF_DESTINATION +import org.xtimms.shirizu.R +import org.xtimms.shirizu.sections.explore.EXPLORE_DESTINATION +import org.xtimms.shirizu.sections.history.HISTORY_DESTINATION +import org.xtimms.shirizu.sections.shelf.SHELF_DESTINATION sealed class BottomNavDestination( val value: String, diff --git a/app/src/main/java/org/xtimms/etsudoku/core/ModifierCollapsable.kt b/app/src/main/java/org/xtimms/shirizu/core/ModifierCollapsable.kt similarity index 98% rename from app/src/main/java/org/xtimms/etsudoku/core/ModifierCollapsable.kt rename to app/src/main/java/org/xtimms/shirizu/core/ModifierCollapsable.kt index 3941b9d..74836bb 100644 --- a/app/src/main/java/org/xtimms/etsudoku/core/ModifierCollapsable.kt +++ b/app/src/main/java/org/xtimms/shirizu/core/ModifierCollapsable.kt @@ -1,4 +1,4 @@ -package org.xtimms.etsudoku.core +package org.xtimms.shirizu.core import androidx.compose.animation.core.Animatable import androidx.compose.animation.core.AnimationVector1D diff --git a/app/src/main/java/org/xtimms/etsudoku/core/Navigation.kt b/app/src/main/java/org/xtimms/shirizu/core/Navigation.kt similarity index 76% rename from app/src/main/java/org/xtimms/etsudoku/core/Navigation.kt rename to app/src/main/java/org/xtimms/shirizu/core/Navigation.kt index 3af70d2..9b77fd7 100644 --- a/app/src/main/java/org/xtimms/etsudoku/core/Navigation.kt +++ b/app/src/main/java/org/xtimms/shirizu/core/Navigation.kt @@ -1,4 +1,4 @@ -package org.xtimms.etsudoku.core +package org.xtimms.shirizu.core import android.graphics.Path import android.view.animation.PathInterpolator @@ -20,69 +20,69 @@ import androidx.navigation.compose.composable import androidx.navigation.navArgument import coil.ImageLoader import org.koitharu.kotatsu.parsers.model.MangaSource -import org.xtimms.etsudoku.core.logs.FileLogger -import org.xtimms.etsudoku.sections.details.DETAILS_DESTINATION -import org.xtimms.etsudoku.sections.details.DetailsView -import org.xtimms.etsudoku.sections.details.FULL_POSTER_DESTINATION -import org.xtimms.etsudoku.sections.details.FullImageView -import org.xtimms.etsudoku.sections.details.MANGA_ID_ARGUMENT -import org.xtimms.etsudoku.sections.details.PICTURES_ARGUMENT -import org.xtimms.etsudoku.sections.explore.ExploreView -import org.xtimms.etsudoku.sections.feed.FEED_DESTINATION -import org.xtimms.etsudoku.sections.feed.FeedView -import org.xtimms.etsudoku.sections.history.HistoryView -import org.xtimms.etsudoku.sections.list.LIST_DESTINATION -import org.xtimms.etsudoku.sections.list.MangaListView -import org.xtimms.etsudoku.sections.list.PROVIDER_ARGUMENT -import org.xtimms.etsudoku.sections.reader.READER_DESTINATION -import org.xtimms.etsudoku.sections.reader.ReaderView -import org.xtimms.etsudoku.sections.search.SEARCH_DESTINATION -import org.xtimms.etsudoku.sections.search.SearchHostView -import org.xtimms.etsudoku.sections.settings.SETTINGS_DESTINATION -import org.xtimms.etsudoku.sections.settings.SettingsView -import org.xtimms.etsudoku.sections.settings.about.ABOUT_DESTINATION -import org.xtimms.etsudoku.sections.settings.about.AboutView -import org.xtimms.etsudoku.sections.settings.about.LICENSES_DESTINATION -import org.xtimms.etsudoku.sections.settings.about.LICENSE_CONTENT_ARGUMENT -import org.xtimms.etsudoku.sections.settings.about.LICENSE_DESTINATION -import org.xtimms.etsudoku.sections.settings.about.LICENSE_NAME_ARGUMENT -import org.xtimms.etsudoku.sections.settings.about.LICENSE_WEBSITE_ARGUMENT -import org.xtimms.etsudoku.sections.settings.about.LicenseView -import org.xtimms.etsudoku.sections.settings.about.OpenSourceLicensesView -import org.xtimms.etsudoku.sections.settings.about.UPDATES_DESTINATION -import org.xtimms.etsudoku.sections.settings.about.UpdateView -import org.xtimms.etsudoku.sections.settings.advanced.ADVANCED_DESTINATION -import org.xtimms.etsudoku.sections.settings.advanced.AdvancedView -import org.xtimms.etsudoku.sections.settings.appearance.APPEARANCE_DESTINATION -import org.xtimms.etsudoku.sections.settings.appearance.AppearanceView -import org.xtimms.etsudoku.sections.settings.appearance.DARK_THEME_DESTINATION -import org.xtimms.etsudoku.sections.settings.appearance.DarkThemeView -import org.xtimms.etsudoku.sections.settings.appearance.LANGUAGES_DESTINATION -import org.xtimms.etsudoku.sections.settings.appearance.LanguagesView -import org.xtimms.etsudoku.sections.settings.backup.BACKUP_RESTORE_DESTINATION -import org.xtimms.etsudoku.sections.settings.backup.BackupRestoreView -import org.xtimms.etsudoku.sections.settings.backup.RESTORE_ARGUMENT -import org.xtimms.etsudoku.sections.settings.backup.RESTORE_DESTINATION -import org.xtimms.etsudoku.sections.settings.backup.RestoreItemsView -import org.xtimms.etsudoku.sections.settings.network.NETWORK_DESTINATION -import org.xtimms.etsudoku.sections.settings.network.NetworkView -import org.xtimms.etsudoku.sections.settings.shelf.SHELF_SETTINGS_DESTINATION -import org.xtimms.etsudoku.sections.settings.shelf.ShelfSettingsView -import org.xtimms.etsudoku.sections.settings.shelf.categories.CATEGORIES_DESTINATION -import org.xtimms.etsudoku.sections.settings.shelf.categories.CategoriesView -import org.xtimms.etsudoku.sections.settings.sources.SOURCES_DESTINATION -import org.xtimms.etsudoku.sections.settings.sources.SourcesView -import org.xtimms.etsudoku.sections.settings.sources.catalog.CATALOG_DESTINATION -import org.xtimms.etsudoku.sections.settings.sources.catalog.SourcesCatalogView -import org.xtimms.etsudoku.sections.settings.storage.STORAGE_DESTINATION -import org.xtimms.etsudoku.sections.settings.storage.StorageView -import org.xtimms.etsudoku.sections.shelf.ShelfView -import org.xtimms.etsudoku.sections.stats.STATS_DESTINATION -import org.xtimms.etsudoku.sections.stats.StatsView -import org.xtimms.etsudoku.sections.suggestions.SUGGESTIONS_DESTINATION -import org.xtimms.etsudoku.sections.suggestions.SuggestionsView -import org.xtimms.etsudoku.utils.StringArrayNavType -import org.xtimms.etsudoku.utils.lang.removeFirstAndLast +import org.xtimms.shirizu.core.logs.FileLogger +import org.xtimms.shirizu.sections.details.DETAILS_DESTINATION +import org.xtimms.shirizu.sections.details.DetailsView +import org.xtimms.shirizu.sections.details.FULL_POSTER_DESTINATION +import org.xtimms.shirizu.sections.details.FullImageView +import org.xtimms.shirizu.sections.details.MANGA_ID_ARGUMENT +import org.xtimms.shirizu.sections.details.PICTURES_ARGUMENT +import org.xtimms.shirizu.sections.explore.ExploreView +import org.xtimms.shirizu.sections.feed.FEED_DESTINATION +import org.xtimms.shirizu.sections.feed.FeedView +import org.xtimms.shirizu.sections.history.HistoryView +import org.xtimms.shirizu.sections.list.LIST_DESTINATION +import org.xtimms.shirizu.sections.list.MangaListView +import org.xtimms.shirizu.sections.list.PROVIDER_ARGUMENT +import org.xtimms.shirizu.sections.reader.READER_DESTINATION +import org.xtimms.shirizu.sections.reader.ReaderView +import org.xtimms.shirizu.sections.search.SEARCH_DESTINATION +import org.xtimms.shirizu.sections.search.SearchHostView +import org.xtimms.shirizu.sections.settings.SETTINGS_DESTINATION +import org.xtimms.shirizu.sections.settings.SettingsView +import org.xtimms.shirizu.sections.settings.about.ABOUT_DESTINATION +import org.xtimms.shirizu.sections.settings.about.AboutView +import org.xtimms.shirizu.sections.settings.about.LICENSES_DESTINATION +import org.xtimms.shirizu.sections.settings.about.LICENSE_CONTENT_ARGUMENT +import org.xtimms.shirizu.sections.settings.about.LICENSE_DESTINATION +import org.xtimms.shirizu.sections.settings.about.LICENSE_NAME_ARGUMENT +import org.xtimms.shirizu.sections.settings.about.LICENSE_WEBSITE_ARGUMENT +import org.xtimms.shirizu.sections.settings.about.LicenseView +import org.xtimms.shirizu.sections.settings.about.OpenSourceLicensesView +import org.xtimms.shirizu.sections.settings.about.UPDATES_DESTINATION +import org.xtimms.shirizu.sections.settings.about.UpdateView +import org.xtimms.shirizu.sections.settings.advanced.ADVANCED_DESTINATION +import org.xtimms.shirizu.sections.settings.advanced.AdvancedView +import org.xtimms.shirizu.sections.settings.appearance.APPEARANCE_DESTINATION +import org.xtimms.shirizu.sections.settings.appearance.AppearanceView +import org.xtimms.shirizu.sections.settings.appearance.DARK_THEME_DESTINATION +import org.xtimms.shirizu.sections.settings.appearance.DarkThemeView +import org.xtimms.shirizu.sections.settings.appearance.LANGUAGES_DESTINATION +import org.xtimms.shirizu.sections.settings.appearance.LanguagesView +import org.xtimms.shirizu.sections.settings.backup.BACKUP_RESTORE_DESTINATION +import org.xtimms.shirizu.sections.settings.backup.BackupRestoreView +import org.xtimms.shirizu.sections.settings.backup.RESTORE_ARGUMENT +import org.xtimms.shirizu.sections.settings.backup.RESTORE_DESTINATION +import org.xtimms.shirizu.sections.settings.backup.RestoreItemsView +import org.xtimms.shirizu.sections.settings.network.NETWORK_DESTINATION +import org.xtimms.shirizu.sections.settings.network.NetworkView +import org.xtimms.shirizu.sections.settings.shelf.SHELF_SETTINGS_DESTINATION +import org.xtimms.shirizu.sections.settings.shelf.ShelfSettingsView +import org.xtimms.shirizu.sections.settings.shelf.categories.CATEGORIES_DESTINATION +import org.xtimms.shirizu.sections.settings.shelf.categories.CategoriesView +import org.xtimms.shirizu.sections.settings.sources.SOURCES_DESTINATION +import org.xtimms.shirizu.sections.settings.sources.SourcesView +import org.xtimms.shirizu.sections.settings.sources.catalog.CATALOG_DESTINATION +import org.xtimms.shirizu.sections.settings.sources.catalog.SourcesCatalogView +import org.xtimms.shirizu.sections.settings.storage.STORAGE_DESTINATION +import org.xtimms.shirizu.sections.settings.storage.StorageView +import org.xtimms.shirizu.sections.shelf.ShelfView +import org.xtimms.shirizu.sections.stats.STATS_DESTINATION +import org.xtimms.shirizu.sections.stats.StatsView +import org.xtimms.shirizu.sections.suggestions.SUGGESTIONS_DESTINATION +import org.xtimms.shirizu.sections.suggestions.SuggestionsView +import org.xtimms.shirizu.utils.StringArrayNavType +import org.xtimms.shirizu.utils.lang.removeFirstAndLast const val DURATION_ENTER = 400 const val DURATION_EXIT = 200 diff --git a/app/src/main/java/org/xtimms/etsudoku/core/base/AlertDialogFragment.kt b/app/src/main/java/org/xtimms/shirizu/core/base/AlertDialogFragment.kt similarity index 98% rename from app/src/main/java/org/xtimms/etsudoku/core/base/AlertDialogFragment.kt rename to app/src/main/java/org/xtimms/shirizu/core/base/AlertDialogFragment.kt index 605da44..341ca3c 100644 --- a/app/src/main/java/org/xtimms/etsudoku/core/base/AlertDialogFragment.kt +++ b/app/src/main/java/org/xtimms/shirizu/core/base/AlertDialogFragment.kt @@ -1,4 +1,4 @@ -package org.xtimms.etsudoku.core.base +package org.xtimms.shirizu.core.base import android.app.Dialog import android.os.Bundle diff --git a/app/src/main/java/org/xtimms/etsudoku/core/base/BaseActivity.kt b/app/src/main/java/org/xtimms/shirizu/core/base/BaseActivity.kt similarity index 98% rename from app/src/main/java/org/xtimms/etsudoku/core/base/BaseActivity.kt rename to app/src/main/java/org/xtimms/shirizu/core/base/BaseActivity.kt index 8fd850a..a31dafc 100644 --- a/app/src/main/java/org/xtimms/etsudoku/core/base/BaseActivity.kt +++ b/app/src/main/java/org/xtimms/shirizu/core/base/BaseActivity.kt @@ -1,4 +1,4 @@ -package org.xtimms.etsudoku.core.base +package org.xtimms.shirizu.core.base import android.content.Intent import android.content.res.Configuration diff --git a/app/src/main/java/org/xtimms/etsudoku/core/base/event/PagedUiEvent.kt b/app/src/main/java/org/xtimms/shirizu/core/base/event/PagedUiEvent.kt similarity index 55% rename from app/src/main/java/org/xtimms/etsudoku/core/base/event/PagedUiEvent.kt rename to app/src/main/java/org/xtimms/shirizu/core/base/event/PagedUiEvent.kt index dcfde69..5c9356f 100644 --- a/app/src/main/java/org/xtimms/etsudoku/core/base/event/PagedUiEvent.kt +++ b/app/src/main/java/org/xtimms/shirizu/core/base/event/PagedUiEvent.kt @@ -1,4 +1,4 @@ -package org.xtimms.etsudoku.core.base.event +package org.xtimms.shirizu.core.base.event interface PagedUiEvent : UiEvent { fun loadMore() diff --git a/app/src/main/java/org/xtimms/etsudoku/core/base/event/UiEvent.kt b/app/src/main/java/org/xtimms/shirizu/core/base/event/UiEvent.kt similarity index 66% rename from app/src/main/java/org/xtimms/etsudoku/core/base/event/UiEvent.kt rename to app/src/main/java/org/xtimms/shirizu/core/base/event/UiEvent.kt index 096f134..f76ebca 100644 --- a/app/src/main/java/org/xtimms/etsudoku/core/base/event/UiEvent.kt +++ b/app/src/main/java/org/xtimms/shirizu/core/base/event/UiEvent.kt @@ -1,4 +1,4 @@ -package org.xtimms.etsudoku.core.base.event +package org.xtimms.shirizu.core.base.event interface UiEvent { fun showMessage(message: String?) diff --git a/app/src/main/java/org/xtimms/etsudoku/core/base/state/PagedUiState.kt b/app/src/main/java/org/xtimms/shirizu/core/base/state/PagedUiState.kt similarity index 86% rename from app/src/main/java/org/xtimms/etsudoku/core/base/state/PagedUiState.kt rename to app/src/main/java/org/xtimms/shirizu/core/base/state/PagedUiState.kt index 9458a6a..a284862 100644 --- a/app/src/main/java/org/xtimms/etsudoku/core/base/state/PagedUiState.kt +++ b/app/src/main/java/org/xtimms/shirizu/core/base/state/PagedUiState.kt @@ -1,4 +1,4 @@ -package org.xtimms.etsudoku.core.base.state +package org.xtimms.shirizu.core.base.state abstract class PagedUiState : UiState() { diff --git a/app/src/main/java/org/xtimms/etsudoku/core/base/state/UiState.kt b/app/src/main/java/org/xtimms/shirizu/core/base/state/UiState.kt similarity index 90% rename from app/src/main/java/org/xtimms/etsudoku/core/base/state/UiState.kt rename to app/src/main/java/org/xtimms/shirizu/core/base/state/UiState.kt index 0f0e310..b1b9050 100644 --- a/app/src/main/java/org/xtimms/etsudoku/core/base/state/UiState.kt +++ b/app/src/main/java/org/xtimms/shirizu/core/base/state/UiState.kt @@ -1,4 +1,4 @@ -package org.xtimms.etsudoku.core.base.state +package org.xtimms.shirizu.core.base.state abstract class UiState { abstract val isLoading: Boolean diff --git a/app/src/main/java/org/xtimms/etsudoku/core/base/viewmodel/BaseViewModel.kt b/app/src/main/java/org/xtimms/shirizu/core/base/viewmodel/BaseViewModel.kt similarity index 89% rename from app/src/main/java/org/xtimms/etsudoku/core/base/viewmodel/BaseViewModel.kt rename to app/src/main/java/org/xtimms/shirizu/core/base/viewmodel/BaseViewModel.kt index 942a5e5..7005381 100644 --- a/app/src/main/java/org/xtimms/etsudoku/core/base/viewmodel/BaseViewModel.kt +++ b/app/src/main/java/org/xtimms/shirizu/core/base/viewmodel/BaseViewModel.kt @@ -1,4 +1,4 @@ -package org.xtimms.etsudoku.core.base.viewmodel +package org.xtimms.shirizu.core.base.viewmodel import androidx.lifecycle.ViewModel import androidx.lifecycle.viewModelScope @@ -11,11 +11,11 @@ import kotlinx.coroutines.flow.StateFlow import kotlinx.coroutines.flow.asStateFlow import kotlinx.coroutines.flow.update import kotlinx.coroutines.launch -import org.xtimms.etsudoku.core.base.event.UiEvent -import org.xtimms.etsudoku.core.base.state.UiState -import org.xtimms.etsudoku.utils.lang.EventFlow -import org.xtimms.etsudoku.utils.lang.MutableEventFlow -import org.xtimms.etsudoku.utils.lang.call +import org.xtimms.shirizu.core.base.event.UiEvent +import org.xtimms.shirizu.core.base.state.UiState +import org.xtimms.shirizu.utils.lang.EventFlow +import org.xtimms.shirizu.utils.lang.MutableEventFlow +import org.xtimms.shirizu.utils.lang.call import kotlin.coroutines.CoroutineContext import kotlin.coroutines.EmptyCoroutineContext import kotlin.coroutines.cancellation.CancellationException diff --git a/app/src/main/java/org/xtimms/etsudoku/core/base/viewmodel/KotatsuBaseViewModel.kt b/app/src/main/java/org/xtimms/shirizu/core/base/viewmodel/KotatsuBaseViewModel.kt similarity index 92% rename from app/src/main/java/org/xtimms/etsudoku/core/base/viewmodel/KotatsuBaseViewModel.kt rename to app/src/main/java/org/xtimms/shirizu/core/base/viewmodel/KotatsuBaseViewModel.kt index 89c205d..3db9fe1 100644 --- a/app/src/main/java/org/xtimms/etsudoku/core/base/viewmodel/KotatsuBaseViewModel.kt +++ b/app/src/main/java/org/xtimms/shirizu/core/base/viewmodel/KotatsuBaseViewModel.kt @@ -1,4 +1,4 @@ -package org.xtimms.etsudoku.core.base.viewmodel +package org.xtimms.shirizu.core.base.viewmodel import androidx.lifecycle.ViewModel import androidx.lifecycle.viewModelScope @@ -17,9 +17,9 @@ import kotlinx.coroutines.flow.onStart import kotlinx.coroutines.flow.stateIn import kotlinx.coroutines.flow.update import kotlinx.coroutines.launch -import org.xtimms.etsudoku.utils.lang.EventFlow -import org.xtimms.etsudoku.utils.lang.MutableEventFlow -import org.xtimms.etsudoku.utils.lang.call +import org.xtimms.shirizu.utils.lang.EventFlow +import org.xtimms.shirizu.utils.lang.MutableEventFlow +import org.xtimms.shirizu.utils.lang.call import kotlin.coroutines.CoroutineContext import kotlin.coroutines.EmptyCoroutineContext import kotlin.coroutines.cancellation.CancellationException diff --git a/app/src/main/java/org/xtimms/etsudoku/core/cache/CacheDir.kt b/app/src/main/java/org/xtimms/shirizu/core/cache/CacheDir.kt similarity index 74% rename from app/src/main/java/org/xtimms/etsudoku/core/cache/CacheDir.kt rename to app/src/main/java/org/xtimms/shirizu/core/cache/CacheDir.kt index a2f7047..beecbc9 100644 --- a/app/src/main/java/org/xtimms/etsudoku/core/cache/CacheDir.kt +++ b/app/src/main/java/org/xtimms/shirizu/core/cache/CacheDir.kt @@ -1,4 +1,4 @@ -package org.xtimms.etsudoku.core.cache +package org.xtimms.shirizu.core.cache enum class CacheDir(val dir: String) { diff --git a/app/src/main/java/org/xtimms/etsudoku/core/cache/ContentCache.kt b/app/src/main/java/org/xtimms/shirizu/core/cache/ContentCache.kt similarity index 95% rename from app/src/main/java/org/xtimms/etsudoku/core/cache/ContentCache.kt rename to app/src/main/java/org/xtimms/shirizu/core/cache/ContentCache.kt index 2e201fa..21d0a91 100644 --- a/app/src/main/java/org/xtimms/etsudoku/core/cache/ContentCache.kt +++ b/app/src/main/java/org/xtimms/shirizu/core/cache/ContentCache.kt @@ -1,4 +1,4 @@ -package org.xtimms.etsudoku.core.cache +package org.xtimms.shirizu.core.cache import org.koitharu.kotatsu.parsers.model.Manga import org.koitharu.kotatsu.parsers.model.MangaPage diff --git a/app/src/main/java/org/xtimms/etsudoku/core/cache/ExpiringLruCache.kt b/app/src/main/java/org/xtimms/shirizu/core/cache/ExpiringLruCache.kt similarity index 94% rename from app/src/main/java/org/xtimms/etsudoku/core/cache/ExpiringLruCache.kt rename to app/src/main/java/org/xtimms/shirizu/core/cache/ExpiringLruCache.kt index e8bc371..8d1f768 100644 --- a/app/src/main/java/org/xtimms/etsudoku/core/cache/ExpiringLruCache.kt +++ b/app/src/main/java/org/xtimms/shirizu/core/cache/ExpiringLruCache.kt @@ -1,4 +1,4 @@ -package org.xtimms.etsudoku.core.cache +package org.xtimms.shirizu.core.cache import androidx.collection.LruCache import java.util.concurrent.TimeUnit diff --git a/app/src/main/java/org/xtimms/etsudoku/core/cache/ExpiringValue.kt b/app/src/main/java/org/xtimms/shirizu/core/cache/ExpiringValue.kt similarity index 95% rename from app/src/main/java/org/xtimms/etsudoku/core/cache/ExpiringValue.kt rename to app/src/main/java/org/xtimms/shirizu/core/cache/ExpiringValue.kt index ffef8c9..3c6a5f1 100644 --- a/app/src/main/java/org/xtimms/etsudoku/core/cache/ExpiringValue.kt +++ b/app/src/main/java/org/xtimms/shirizu/core/cache/ExpiringValue.kt @@ -1,4 +1,4 @@ -package org.xtimms.etsudoku.core.cache +package org.xtimms.shirizu.core.cache import android.os.SystemClock import java.util.concurrent.TimeUnit diff --git a/app/src/main/java/org/xtimms/etsudoku/core/cache/MemoryContentCache.kt b/app/src/main/java/org/xtimms/shirizu/core/cache/MemoryContentCache.kt similarity index 98% rename from app/src/main/java/org/xtimms/etsudoku/core/cache/MemoryContentCache.kt rename to app/src/main/java/org/xtimms/shirizu/core/cache/MemoryContentCache.kt index 19a1401..bec6d8f 100644 --- a/app/src/main/java/org/xtimms/etsudoku/core/cache/MemoryContentCache.kt +++ b/app/src/main/java/org/xtimms/shirizu/core/cache/MemoryContentCache.kt @@ -1,4 +1,4 @@ -package org.xtimms.etsudoku.core.cache +package org.xtimms.shirizu.core.cache import android.app.Application import android.content.ComponentCallbacks2 diff --git a/app/src/main/java/org/xtimms/etsudoku/core/cache/PagesCache.kt b/app/src/main/java/org/xtimms/shirizu/core/cache/PagesCache.kt similarity index 87% rename from app/src/main/java/org/xtimms/etsudoku/core/cache/PagesCache.kt rename to app/src/main/java/org/xtimms/shirizu/core/cache/PagesCache.kt index dc65337..f13e671 100644 --- a/app/src/main/java/org/xtimms/etsudoku/core/cache/PagesCache.kt +++ b/app/src/main/java/org/xtimms/shirizu/core/cache/PagesCache.kt @@ -1,4 +1,4 @@ -package org.xtimms.etsudoku.core.cache +package org.xtimms.shirizu.core.cache import android.content.Context import android.graphics.Bitmap @@ -13,13 +13,13 @@ import okio.buffer import okio.sink import org.koitharu.kotatsu.parsers.util.SuspendLazy import org.koitharu.kotatsu.parsers.util.runCatchingCancellable -import org.xtimms.etsudoku.utils.FileSize -import org.xtimms.etsudoku.utils.lang.longHashCode -import org.xtimms.etsudoku.utils.lang.writeAllCancellable -import org.xtimms.etsudoku.utils.system.compressToPNG -import org.xtimms.etsudoku.utils.system.subdir -import org.xtimms.etsudoku.utils.system.takeIfReadable -import org.xtimms.etsudoku.utils.system.takeIfWriteable +import org.xtimms.shirizu.utils.FileSize +import org.xtimms.shirizu.utils.lang.longHashCode +import org.xtimms.shirizu.utils.lang.writeAllCancellable +import org.xtimms.shirizu.utils.system.compressToPNG +import org.xtimms.shirizu.utils.system.subdir +import org.xtimms.shirizu.utils.system.takeIfReadable +import org.xtimms.shirizu.utils.system.takeIfWriteable import java.io.File import javax.inject.Inject import javax.inject.Singleton diff --git a/app/src/main/java/org/xtimms/etsudoku/core/cache/SafeDeferred.kt b/app/src/main/java/org/xtimms/shirizu/core/cache/SafeDeferred.kt similarity index 89% rename from app/src/main/java/org/xtimms/etsudoku/core/cache/SafeDeferred.kt rename to app/src/main/java/org/xtimms/shirizu/core/cache/SafeDeferred.kt index 632592b..a38922a 100644 --- a/app/src/main/java/org/xtimms/etsudoku/core/cache/SafeDeferred.kt +++ b/app/src/main/java/org/xtimms/shirizu/core/cache/SafeDeferred.kt @@ -1,4 +1,4 @@ -package org.xtimms.etsudoku.core.cache +package org.xtimms.shirizu.core.cache import kotlinx.coroutines.Deferred diff --git a/app/src/main/java/org/xtimms/etsudoku/core/cache/StubContentCache.kt b/app/src/main/java/org/xtimms/shirizu/core/cache/StubContentCache.kt similarity index 95% rename from app/src/main/java/org/xtimms/etsudoku/core/cache/StubContentCache.kt rename to app/src/main/java/org/xtimms/shirizu/core/cache/StubContentCache.kt index 21d9380..f2ad5da 100644 --- a/app/src/main/java/org/xtimms/etsudoku/core/cache/StubContentCache.kt +++ b/app/src/main/java/org/xtimms/shirizu/core/cache/StubContentCache.kt @@ -1,4 +1,4 @@ -package org.xtimms.etsudoku.core.cache +package org.xtimms.shirizu.core.cache import org.koitharu.kotatsu.parsers.model.Manga import org.koitharu.kotatsu.parsers.model.MangaPage diff --git a/app/src/main/java/org/xtimms/etsudoku/core/components/AnimatedButton.kt b/app/src/main/java/org/xtimms/shirizu/core/components/AnimatedButton.kt similarity index 97% rename from app/src/main/java/org/xtimms/etsudoku/core/components/AnimatedButton.kt rename to app/src/main/java/org/xtimms/shirizu/core/components/AnimatedButton.kt index 6ca2e69..19dbb75 100644 --- a/app/src/main/java/org/xtimms/etsudoku/core/components/AnimatedButton.kt +++ b/app/src/main/java/org/xtimms/shirizu/core/components/AnimatedButton.kt @@ -1,4 +1,4 @@ -package org.xtimms.etsudoku.core.components +package org.xtimms.shirizu.core.components import androidx.compose.animation.core.animateDpAsState import androidx.compose.foundation.ExperimentalFoundationApi @@ -31,7 +31,7 @@ import androidx.compose.ui.platform.LocalDensity import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.min -import org.xtimms.etsudoku.ui.theme.EtsudokuTheme +import org.xtimms.shirizu.ui.theme.ShirizuTheme import java.lang.Integer.MAX_VALUE import kotlin.math.min @@ -105,7 +105,7 @@ fun AnimatedButton( @Preview(name = "Icon") @Composable private fun PreviewWithIcon() { - EtsudokuTheme { + ShirizuTheme { AnimatedButton( type = ButtonType.PRIMARY, icon = Icons.Outlined.Edit diff --git a/app/src/main/java/org/xtimms/etsudoku/core/components/AnimatedNumber.kt b/app/src/main/java/org/xtimms/shirizu/core/components/AnimatedNumber.kt similarity index 98% rename from app/src/main/java/org/xtimms/etsudoku/core/components/AnimatedNumber.kt rename to app/src/main/java/org/xtimms/shirizu/core/components/AnimatedNumber.kt index 7850196..4f076f7 100644 --- a/app/src/main/java/org/xtimms/etsudoku/core/components/AnimatedNumber.kt +++ b/app/src/main/java/org/xtimms/shirizu/core/components/AnimatedNumber.kt @@ -1,4 +1,4 @@ -package org.xtimms.etsudoku.core.components +package org.xtimms.shirizu.core.components import androidx.compose.animation.AnimatedContent import androidx.compose.animation.SizeTransform diff --git a/app/src/main/java/org/xtimms/etsudoku/core/components/BackgroundProgress.kt b/app/src/main/java/org/xtimms/shirizu/core/components/BackgroundProgress.kt similarity index 91% rename from app/src/main/java/org/xtimms/etsudoku/core/components/BackgroundProgress.kt rename to app/src/main/java/org/xtimms/shirizu/core/components/BackgroundProgress.kt index 5b88049..0e01841 100644 --- a/app/src/main/java/org/xtimms/etsudoku/core/components/BackgroundProgress.kt +++ b/app/src/main/java/org/xtimms/shirizu/core/components/BackgroundProgress.kt @@ -1,4 +1,4 @@ -package org.xtimms.etsudoku.core.components +package org.xtimms.shirizu.core.components import androidx.compose.animation.core.Animatable import androidx.compose.animation.core.TweenSpec @@ -14,8 +14,8 @@ import androidx.compose.ui.Modifier import androidx.compose.ui.graphics.Color import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.times -import org.xtimms.etsudoku.core.components.shape.WavyShape -import org.xtimms.etsudoku.utils.lang.clamp +import org.xtimms.shirizu.core.components.shape.WavyShape +import org.xtimms.shirizu.utils.lang.clamp @Composable fun BackgroundProgress( diff --git a/app/src/main/java/org/xtimms/etsudoku/core/components/BottomNavBar.kt b/app/src/main/java/org/xtimms/shirizu/core/components/BottomNavBar.kt similarity index 88% rename from app/src/main/java/org/xtimms/etsudoku/core/components/BottomNavBar.kt rename to app/src/main/java/org/xtimms/shirizu/core/components/BottomNavBar.kt index 0f516e0..7bbf32d 100644 --- a/app/src/main/java/org/xtimms/etsudoku/core/components/BottomNavBar.kt +++ b/app/src/main/java/org/xtimms/shirizu/core/components/BottomNavBar.kt @@ -1,4 +1,4 @@ -package org.xtimms.etsudoku.core.components +package org.xtimms.shirizu.core.components import androidx.compose.animation.AnimatedVisibility import androidx.compose.animation.core.Animatable @@ -19,11 +19,11 @@ import androidx.navigation.NavController import androidx.navigation.NavGraph.Companion.findStartDestination import androidx.navigation.compose.currentBackStackEntryAsState import kotlinx.coroutines.launch -import org.xtimms.etsudoku.core.BottomNavDestination -import org.xtimms.etsudoku.core.BottomNavDestination.Companion.Icon -import org.xtimms.etsudoku.sections.explore.EXPLORE_DESTINATION -import org.xtimms.etsudoku.sections.history.HISTORY_DESTINATION -import org.xtimms.etsudoku.sections.shelf.SHELF_DESTINATION +import org.xtimms.shirizu.core.BottomNavDestination +import org.xtimms.shirizu.core.BottomNavDestination.Companion.Icon +import org.xtimms.shirizu.sections.explore.EXPLORE_DESTINATION +import org.xtimms.shirizu.sections.history.HISTORY_DESTINATION +import org.xtimms.shirizu.sections.shelf.SHELF_DESTINATION @Composable fun BottomNavBar( diff --git a/app/src/main/java/org/xtimms/etsudoku/core/components/Buttons.kt b/app/src/main/java/org/xtimms/shirizu/core/components/Buttons.kt similarity index 95% rename from app/src/main/java/org/xtimms/etsudoku/core/components/Buttons.kt rename to app/src/main/java/org/xtimms/shirizu/core/components/Buttons.kt index 6205777..2f1707c 100644 --- a/app/src/main/java/org/xtimms/etsudoku/core/components/Buttons.kt +++ b/app/src/main/java/org/xtimms/shirizu/core/components/Buttons.kt @@ -1,4 +1,4 @@ -package org.xtimms.etsudoku.core.components +package org.xtimms.shirizu.core.components import androidx.compose.foundation.layout.Arrangement import androidx.compose.foundation.layout.Column @@ -12,7 +12,7 @@ import androidx.compose.ui.graphics.vector.ImageVector import androidx.compose.ui.res.stringResource import androidx.compose.ui.text.style.TextAlign import androidx.compose.ui.unit.dp -import org.xtimms.etsudoku.R +import org.xtimms.shirizu.R @Composable fun ConfirmButton( diff --git a/app/src/main/java/org/xtimms/etsudoku/core/components/CheckBox.kt b/app/src/main/java/org/xtimms/shirizu/core/components/CheckBox.kt similarity index 96% rename from app/src/main/java/org/xtimms/etsudoku/core/components/CheckBox.kt rename to app/src/main/java/org/xtimms/shirizu/core/components/CheckBox.kt index 2cf2299..921348a 100644 --- a/app/src/main/java/org/xtimms/etsudoku/core/components/CheckBox.kt +++ b/app/src/main/java/org/xtimms/shirizu/core/components/CheckBox.kt @@ -1,4 +1,4 @@ -package org.xtimms.etsudoku.core.components +package org.xtimms.shirizu.core.components import androidx.compose.foundation.layout.Row import androidx.compose.foundation.layout.fillMaxWidth diff --git a/app/src/main/java/org/xtimms/etsudoku/core/components/ContinueReadingButton.kt b/app/src/main/java/org/xtimms/shirizu/core/components/ContinueReadingButton.kt similarity index 93% rename from app/src/main/java/org/xtimms/etsudoku/core/components/ContinueReadingButton.kt rename to app/src/main/java/org/xtimms/shirizu/core/components/ContinueReadingButton.kt index 3c7863d..4508d9e 100644 --- a/app/src/main/java/org/xtimms/etsudoku/core/components/ContinueReadingButton.kt +++ b/app/src/main/java/org/xtimms/shirizu/core/components/ContinueReadingButton.kt @@ -1,4 +1,4 @@ -package org.xtimms.etsudoku.core.components +package org.xtimms.shirizu.core.components import androidx.compose.animation.AnimatedVisibility import androidx.compose.animation.core.animateFloatAsState @@ -23,9 +23,9 @@ import androidx.compose.ui.res.stringResource import androidx.compose.ui.unit.dp import androidx.navigation.NavController import androidx.navigation.compose.currentBackStackEntryAsState -import org.xtimms.etsudoku.R -import org.xtimms.etsudoku.sections.history.HISTORY_DESTINATION -import org.xtimms.etsudoku.sections.reader.READER_DESTINATION +import org.xtimms.shirizu.R +import org.xtimms.shirizu.sections.history.HISTORY_DESTINATION +import org.xtimms.shirizu.sections.reader.READER_DESTINATION @Composable fun ContinueReadingButton( diff --git a/app/src/main/java/org/xtimms/etsudoku/core/components/DetailsToolbar.kt b/app/src/main/java/org/xtimms/shirizu/core/components/DetailsToolbar.kt similarity index 99% rename from app/src/main/java/org/xtimms/etsudoku/core/components/DetailsToolbar.kt rename to app/src/main/java/org/xtimms/shirizu/core/components/DetailsToolbar.kt index 5360a4f..1c81644 100644 --- a/app/src/main/java/org/xtimms/etsudoku/core/components/DetailsToolbar.kt +++ b/app/src/main/java/org/xtimms/shirizu/core/components/DetailsToolbar.kt @@ -1,4 +1,4 @@ -package org.xtimms.etsudoku.core.components +package org.xtimms.shirizu.core.components import androidx.compose.animation.core.animateDpAsState import androidx.compose.foundation.background diff --git a/app/src/main/java/org/xtimms/etsudoku/core/components/Dialogs.kt b/app/src/main/java/org/xtimms/shirizu/core/components/Dialogs.kt similarity index 98% rename from app/src/main/java/org/xtimms/etsudoku/core/components/Dialogs.kt rename to app/src/main/java/org/xtimms/shirizu/core/components/Dialogs.kt index df23875..e3e2a2d 100644 --- a/app/src/main/java/org/xtimms/etsudoku/core/components/Dialogs.kt +++ b/app/src/main/java/org/xtimms/shirizu/core/components/Dialogs.kt @@ -1,4 +1,4 @@ -package org.xtimms.etsudoku.core.components +package org.xtimms.shirizu.core.components import androidx.compose.foundation.layout.Arrangement import androidx.compose.foundation.layout.Box @@ -34,7 +34,7 @@ private val ButtonsCrossAxisSpacing = Arrangement.spacedBy(12.dp, Alignment.Top) @OptIn(ExperimentalMaterial3Api::class, ExperimentalLayoutApi::class) @Composable -fun EtsudokuDialog( +fun ShirizuDialog( onDismissRequest: () -> Unit, confirmButton: @Composable () -> Unit, modifier: Modifier = Modifier, diff --git a/app/src/main/java/org/xtimms/etsudoku/core/components/DotSeparatorText.kt b/app/src/main/java/org/xtimms/shirizu/core/components/DotSeparatorText.kt similarity index 90% rename from app/src/main/java/org/xtimms/etsudoku/core/components/DotSeparatorText.kt rename to app/src/main/java/org/xtimms/shirizu/core/components/DotSeparatorText.kt index 4954b25..dc897e2 100644 --- a/app/src/main/java/org/xtimms/etsudoku/core/components/DotSeparatorText.kt +++ b/app/src/main/java/org/xtimms/shirizu/core/components/DotSeparatorText.kt @@ -1,4 +1,4 @@ -package org.xtimms.etsudoku.core.components +package org.xtimms.shirizu.core.components import androidx.compose.material3.Text import androidx.compose.runtime.Composable diff --git a/app/src/main/java/org/xtimms/etsudoku/core/components/ExploreButton.kt b/app/src/main/java/org/xtimms/shirizu/core/components/ExploreButton.kt similarity index 97% rename from app/src/main/java/org/xtimms/etsudoku/core/components/ExploreButton.kt rename to app/src/main/java/org/xtimms/shirizu/core/components/ExploreButton.kt index db27509..118ac74 100644 --- a/app/src/main/java/org/xtimms/etsudoku/core/components/ExploreButton.kt +++ b/app/src/main/java/org/xtimms/shirizu/core/components/ExploreButton.kt @@ -1,4 +1,4 @@ -package org.xtimms.etsudoku.core.components +package org.xtimms.shirizu.core.components import androidx.compose.foundation.layout.Row import androidx.compose.foundation.layout.height diff --git a/app/src/main/java/org/xtimms/etsudoku/core/components/FloatingActionButton.kt b/app/src/main/java/org/xtimms/shirizu/core/components/FloatingActionButton.kt similarity index 98% rename from app/src/main/java/org/xtimms/etsudoku/core/components/FloatingActionButton.kt rename to app/src/main/java/org/xtimms/shirizu/core/components/FloatingActionButton.kt index 8faacf6..40c84a5 100644 --- a/app/src/main/java/org/xtimms/etsudoku/core/components/FloatingActionButton.kt +++ b/app/src/main/java/org/xtimms/shirizu/core/components/FloatingActionButton.kt @@ -1,4 +1,4 @@ -package org.xtimms.etsudoku.core.components +package org.xtimms.shirizu.core.components import androidx.compose.animation.AnimatedVisibility import androidx.compose.animation.core.CubicBezierEasing diff --git a/app/src/main/java/org/xtimms/etsudoku/core/components/HtmlTextField.kt b/app/src/main/java/org/xtimms/shirizu/core/components/HtmlTextField.kt similarity index 97% rename from app/src/main/java/org/xtimms/etsudoku/core/components/HtmlTextField.kt rename to app/src/main/java/org/xtimms/shirizu/core/components/HtmlTextField.kt index 207727e..a62a9e2 100644 --- a/app/src/main/java/org/xtimms/etsudoku/core/components/HtmlTextField.kt +++ b/app/src/main/java/org/xtimms/shirizu/core/components/HtmlTextField.kt @@ -1,4 +1,4 @@ -package org.xtimms.etsudoku.core.components +package org.xtimms.shirizu.core.components import android.text.Spanned import android.text.style.BulletSpan @@ -28,7 +28,7 @@ import androidx.compose.ui.text.style.TextOverflow import androidx.compose.ui.unit.TextUnit import androidx.compose.ui.unit.sp import androidx.core.text.HtmlCompat -import org.xtimms.etsudoku.utils.spanStyle +import org.xtimms.shirizu.utils.spanStyle private const val URL_TAG = "url_tag" diff --git a/app/src/main/java/org/xtimms/etsudoku/core/components/IconButtons.kt b/app/src/main/java/org/xtimms/shirizu/core/components/IconButtons.kt similarity index 96% rename from app/src/main/java/org/xtimms/etsudoku/core/components/IconButtons.kt rename to app/src/main/java/org/xtimms/shirizu/core/components/IconButtons.kt index 0fce17a..3670580 100644 --- a/app/src/main/java/org/xtimms/etsudoku/core/components/IconButtons.kt +++ b/app/src/main/java/org/xtimms/shirizu/core/components/IconButtons.kt @@ -1,4 +1,4 @@ -package org.xtimms.etsudoku.core.components +package org.xtimms.shirizu.core.components import androidx.compose.foundation.layout.padding import androidx.compose.material.icons.Icons @@ -14,7 +14,7 @@ import androidx.compose.runtime.Composable import androidx.compose.ui.Modifier import androidx.compose.ui.res.stringResource import androidx.compose.ui.unit.dp -import org.xtimms.etsudoku.R +import org.xtimms.shirizu.R @Composable fun BackIconButton( diff --git a/app/src/main/java/org/xtimms/etsudoku/core/components/ListGroupHeader.kt b/app/src/main/java/org/xtimms/shirizu/core/components/ListGroupHeader.kt similarity index 93% rename from app/src/main/java/org/xtimms/etsudoku/core/components/ListGroupHeader.kt rename to app/src/main/java/org/xtimms/shirizu/core/components/ListGroupHeader.kt index cf459ec..2b1c3b1 100644 --- a/app/src/main/java/org/xtimms/etsudoku/core/components/ListGroupHeader.kt +++ b/app/src/main/java/org/xtimms/shirizu/core/components/ListGroupHeader.kt @@ -1,4 +1,4 @@ -package org.xtimms.etsudoku.core.components +package org.xtimms.shirizu.core.components import androidx.compose.foundation.layout.padding import androidx.compose.material3.MaterialTheme diff --git a/app/src/main/java/org/xtimms/etsudoku/core/components/MangaCover.kt b/app/src/main/java/org/xtimms/shirizu/core/components/MangaCover.kt similarity index 91% rename from app/src/main/java/org/xtimms/etsudoku/core/components/MangaCover.kt rename to app/src/main/java/org/xtimms/shirizu/core/components/MangaCover.kt index 92bd531..d4a5591 100644 --- a/app/src/main/java/org/xtimms/etsudoku/core/components/MangaCover.kt +++ b/app/src/main/java/org/xtimms/shirizu/core/components/MangaCover.kt @@ -1,4 +1,4 @@ -package org.xtimms.etsudoku.core.components +package org.xtimms.shirizu.core.components import androidx.compose.foundation.Image import androidx.compose.foundation.clickable @@ -14,7 +14,7 @@ import androidx.compose.ui.layout.ContentScale import androidx.compose.ui.semantics.Role import coil.ImageLoader import coil.compose.AsyncImage -import org.xtimms.etsudoku.core.AsyncImageImpl +import org.xtimms.shirizu.core.AsyncImageImpl enum class MangaCover(val ratio: Float) { Square(1f / 1f), diff --git a/app/src/main/java/org/xtimms/etsudoku/core/components/MangaGridItem.kt b/app/src/main/java/org/xtimms/shirizu/core/components/MangaGridItem.kt similarity index 98% rename from app/src/main/java/org/xtimms/etsudoku/core/components/MangaGridItem.kt rename to app/src/main/java/org/xtimms/shirizu/core/components/MangaGridItem.kt index 7d28c48..428bd96 100644 --- a/app/src/main/java/org/xtimms/etsudoku/core/components/MangaGridItem.kt +++ b/app/src/main/java/org/xtimms/shirizu/core/components/MangaGridItem.kt @@ -1,4 +1,4 @@ -package org.xtimms.etsudoku.core.components +package org.xtimms.shirizu.core.components import androidx.compose.foundation.ExperimentalFoundationApi import androidx.compose.foundation.background @@ -33,7 +33,7 @@ import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.sp import coil.ImageLoader import org.koitharu.kotatsu.parsers.model.Manga -import org.xtimms.etsudoku.core.AsyncImageImpl +import org.xtimms.shirizu.core.AsyncImageImpl private const val GridSelectedCoverAlpha = 0.76f diff --git a/app/src/main/java/org/xtimms/etsudoku/core/components/NavigationRail.kt b/app/src/main/java/org/xtimms/shirizu/core/components/NavigationRail.kt similarity index 92% rename from app/src/main/java/org/xtimms/etsudoku/core/components/NavigationRail.kt rename to app/src/main/java/org/xtimms/shirizu/core/components/NavigationRail.kt index fe63dc6..7b030c7 100644 --- a/app/src/main/java/org/xtimms/etsudoku/core/components/NavigationRail.kt +++ b/app/src/main/java/org/xtimms/shirizu/core/components/NavigationRail.kt @@ -1,4 +1,4 @@ -package org.xtimms.etsudoku.core.components +package org.xtimms.shirizu.core.components import androidx.compose.foundation.layout.Arrangement import androidx.compose.foundation.layout.Column @@ -19,9 +19,9 @@ import androidx.compose.ui.res.stringResource import androidx.navigation.NavController import androidx.navigation.NavGraph.Companion.findStartDestination import androidx.navigation.compose.currentBackStackEntryAsState -import org.xtimms.etsudoku.core.BottomNavDestination -import org.xtimms.etsudoku.core.BottomNavDestination.Companion.Icon -import org.xtimms.etsudoku.sections.search.SEARCH_DESTINATION +import org.xtimms.shirizu.core.BottomNavDestination +import org.xtimms.shirizu.core.BottomNavDestination.Companion.Icon +import org.xtimms.shirizu.sections.search.SEARCH_DESTINATION @Composable fun NavigationRail( diff --git a/app/src/main/java/org/xtimms/etsudoku/core/components/Pill.kt b/app/src/main/java/org/xtimms/shirizu/core/components/Pill.kt similarity index 96% rename from app/src/main/java/org/xtimms/etsudoku/core/components/Pill.kt rename to app/src/main/java/org/xtimms/shirizu/core/components/Pill.kt index b58f6c4..c9b7896 100644 --- a/app/src/main/java/org/xtimms/etsudoku/core/components/Pill.kt +++ b/app/src/main/java/org/xtimms/shirizu/core/components/Pill.kt @@ -1,4 +1,4 @@ -package org.xtimms.etsudoku.core.components +package org.xtimms.shirizu.core.components import androidx.compose.foundation.layout.Box import androidx.compose.foundation.layout.padding diff --git a/app/src/main/java/org/xtimms/etsudoku/core/components/PreferenceItem.kt b/app/src/main/java/org/xtimms/shirizu/core/components/PreferenceItem.kt similarity index 98% rename from app/src/main/java/org/xtimms/etsudoku/core/components/PreferenceItem.kt rename to app/src/main/java/org/xtimms/shirizu/core/components/PreferenceItem.kt index 0131ce5..75b3b8b 100644 --- a/app/src/main/java/org/xtimms/etsudoku/core/components/PreferenceItem.kt +++ b/app/src/main/java/org/xtimms/shirizu/core/components/PreferenceItem.kt @@ -1,4 +1,4 @@ -package org.xtimms.etsudoku.core.components +package org.xtimms.shirizu.core.components import androidx.compose.animation.AnimatedContent import androidx.compose.animation.SizeTransform @@ -65,14 +65,14 @@ import androidx.compose.ui.text.style.TextOverflow import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.sp -import org.xtimms.etsudoku.ui.theme.FixedAccentColors -import org.xtimms.etsudoku.R -import org.xtimms.etsudoku.ui.monet.LocalTonalPalettes -import org.xtimms.etsudoku.ui.monet.TonalPalettes.Companion.toTonalPalettes -import org.xtimms.etsudoku.ui.theme.PreviewThemeLight -import org.xtimms.etsudoku.ui.theme.EtsudokuTheme -import org.xtimms.etsudoku.ui.theme.applyOpacity -import org.xtimms.etsudoku.utils.FileSize +import org.xtimms.shirizu.ui.theme.FixedAccentColors +import org.xtimms.shirizu.R +import org.xtimms.shirizu.ui.monet.LocalTonalPalettes +import org.xtimms.shirizu.ui.monet.TonalPalettes.Companion.toTonalPalettes +import org.xtimms.shirizu.ui.theme.PreviewThemeLight +import org.xtimms.shirizu.ui.theme.ShirizuTheme +import org.xtimms.shirizu.ui.theme.applyOpacity +import org.xtimms.shirizu.utils.FileSize private const val horizontal = 8 private const val vertical = 16 @@ -754,7 +754,7 @@ fun PreferenceStorageItem( @Composable @Preview(showBackground = true) fun PreferenceStorageHeaderPreview() { - EtsudokuTheme { + ShirizuTheme { PreferenceStorageHeader() } } @@ -762,7 +762,7 @@ fun PreferenceStorageHeaderPreview() { @Composable @Preview(showBackground = true) fun PreferenceStorageItemPreview() { - EtsudokuTheme { + ShirizuTheme { PreferenceStorageItem(title = "Saved manga", icon = Icons.Outlined.Save, total = 0F) } } diff --git a/app/src/main/java/org/xtimms/etsudoku/core/components/PullRefresh.kt b/app/src/main/java/org/xtimms/shirizu/core/components/PullRefresh.kt similarity index 99% rename from app/src/main/java/org/xtimms/etsudoku/core/components/PullRefresh.kt rename to app/src/main/java/org/xtimms/shirizu/core/components/PullRefresh.kt index 80990ff..82a8fbd 100644 --- a/app/src/main/java/org/xtimms/etsudoku/core/components/PullRefresh.kt +++ b/app/src/main/java/org/xtimms/shirizu/core/components/PullRefresh.kt @@ -1,4 +1,4 @@ -package org.xtimms.etsudoku.core.components +package org.xtimms.shirizu.core.components import androidx.compose.animation.core.animate import androidx.compose.foundation.layout.Box diff --git a/app/src/main/java/org/xtimms/etsudoku/core/components/ReadButton.kt b/app/src/main/java/org/xtimms/shirizu/core/components/ReadButton.kt similarity index 96% rename from app/src/main/java/org/xtimms/etsudoku/core/components/ReadButton.kt rename to app/src/main/java/org/xtimms/shirizu/core/components/ReadButton.kt index c668a0d..ce66056 100644 --- a/app/src/main/java/org/xtimms/etsudoku/core/components/ReadButton.kt +++ b/app/src/main/java/org/xtimms/shirizu/core/components/ReadButton.kt @@ -1,4 +1,4 @@ -package org.xtimms.etsudoku.core.components +package org.xtimms.shirizu.core.components import android.content.res.Configuration.UI_MODE_NIGHT_YES import androidx.compose.animation.AnimatedContent @@ -46,10 +46,10 @@ import androidx.compose.ui.res.stringResource import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.unit.dp import kotlinx.coroutines.launch -import org.xtimms.etsudoku.R -import org.xtimms.etsudoku.core.model.MangaHistory -import org.xtimms.etsudoku.sections.details.model.HistoryInfo -import org.xtimms.etsudoku.ui.theme.EtsudokuTheme +import org.xtimms.shirizu.R +import org.xtimms.shirizu.core.model.MangaHistory +import org.xtimms.shirizu.sections.details.model.HistoryInfo +import org.xtimms.shirizu.ui.theme.ShirizuTheme import java.time.Instant @Composable @@ -198,7 +198,7 @@ fun Modifier.drawWithLayer(block: ContentDrawScope.() -> Unit) = this.then( @Preview @Composable private fun Preview() { - EtsudokuTheme { + ShirizuTheme { Row { ReadButton( HistoryInfo( @@ -222,7 +222,7 @@ private fun Preview() { @Preview(name = "Night mode", uiMode = UI_MODE_NIGHT_YES) @Composable private fun PreviewNightMode() { - EtsudokuTheme { + ShirizuTheme { Row { ReadButton( HistoryInfo( diff --git a/app/src/main/java/org/xtimms/etsudoku/core/components/ScaffoldWithTopAppBar.kt b/app/src/main/java/org/xtimms/shirizu/core/components/ScaffoldWithTopAppBar.kt similarity index 98% rename from app/src/main/java/org/xtimms/etsudoku/core/components/ScaffoldWithTopAppBar.kt rename to app/src/main/java/org/xtimms/shirizu/core/components/ScaffoldWithTopAppBar.kt index 46793a8..6aa4a54 100644 --- a/app/src/main/java/org/xtimms/etsudoku/core/components/ScaffoldWithTopAppBar.kt +++ b/app/src/main/java/org/xtimms/shirizu/core/components/ScaffoldWithTopAppBar.kt @@ -1,4 +1,4 @@ -package org.xtimms.etsudoku.core.components +package org.xtimms.shirizu.core.components import androidx.compose.foundation.layout.PaddingValues import androidx.compose.foundation.layout.RowScope diff --git a/app/src/main/java/org/xtimms/etsudoku/core/components/ScoreIndicator.kt b/app/src/main/java/org/xtimms/shirizu/core/components/ScoreIndicator.kt similarity index 87% rename from app/src/main/java/org/xtimms/etsudoku/core/components/ScoreIndicator.kt rename to app/src/main/java/org/xtimms/shirizu/core/components/ScoreIndicator.kt index b78cd1b..c95456c 100644 --- a/app/src/main/java/org/xtimms/etsudoku/core/components/ScoreIndicator.kt +++ b/app/src/main/java/org/xtimms/shirizu/core/components/ScoreIndicator.kt @@ -1,4 +1,4 @@ -package org.xtimms.etsudoku.core.components +package org.xtimms.shirizu.core.components import androidx.compose.foundation.layout.Row import androidx.compose.foundation.layout.padding @@ -15,9 +15,9 @@ import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.unit.TextUnit import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.sp -import org.xtimms.etsudoku.R -import org.xtimms.etsudoku.ui.theme.EtsudokuTheme -import org.xtimms.etsudoku.utils.lang.toStringPositiveValueOrUnknown +import org.xtimms.shirizu.R +import org.xtimms.shirizu.ui.theme.ShirizuTheme +import org.xtimms.shirizu.utils.lang.toStringPositiveValueOrUnknown @Composable fun SmallScoreIndicator( @@ -48,7 +48,7 @@ fun SmallScoreIndicator( @Preview(showBackground = true) @Composable fun SmallScoreIndicatorPreview() { - EtsudokuTheme { + ShirizuTheme { SmallScoreIndicator(score = 1f) } } \ No newline at end of file diff --git a/app/src/main/java/org/xtimms/etsudoku/core/components/SearchBar.kt b/app/src/main/java/org/xtimms/shirizu/core/components/SearchBar.kt similarity index 98% rename from app/src/main/java/org/xtimms/etsudoku/core/components/SearchBar.kt rename to app/src/main/java/org/xtimms/shirizu/core/components/SearchBar.kt index 89ab8e0..8ff8f99 100644 --- a/app/src/main/java/org/xtimms/etsudoku/core/components/SearchBar.kt +++ b/app/src/main/java/org/xtimms/shirizu/core/components/SearchBar.kt @@ -1,4 +1,4 @@ -package org.xtimms.etsudoku.core.components +package org.xtimms.shirizu.core.components import androidx.compose.animation.animateContentSize import androidx.compose.animation.core.Spring @@ -25,7 +25,7 @@ import androidx.compose.runtime.setValue import androidx.compose.ui.Modifier import androidx.compose.ui.res.stringResource import androidx.compose.ui.unit.dp -import org.xtimms.etsudoku.R +import org.xtimms.shirizu.R @Composable @OptIn(ExperimentalMaterial3Api::class) diff --git a/app/src/main/java/org/xtimms/etsudoku/core/components/SettingItem.kt b/app/src/main/java/org/xtimms/shirizu/core/components/SettingItem.kt similarity index 97% rename from app/src/main/java/org/xtimms/etsudoku/core/components/SettingItem.kt rename to app/src/main/java/org/xtimms/shirizu/core/components/SettingItem.kt index ff6031e..d8a1507 100644 --- a/app/src/main/java/org/xtimms/etsudoku/core/components/SettingItem.kt +++ b/app/src/main/java/org/xtimms/shirizu/core/components/SettingItem.kt @@ -1,4 +1,4 @@ -package org.xtimms.etsudoku.core.components +package org.xtimms.shirizu.core.components import androidx.compose.animation.AnimatedContent import androidx.compose.animation.SizeTransform @@ -20,7 +20,7 @@ import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier import androidx.compose.ui.graphics.vector.ImageVector import androidx.compose.ui.unit.dp -import org.xtimms.etsudoku.ui.theme.applyOpacity +import org.xtimms.shirizu.ui.theme.applyOpacity @Composable fun SettingTitle(text: String) { diff --git a/app/src/main/java/org/xtimms/etsudoku/core/components/SourceItem.kt b/app/src/main/java/org/xtimms/shirizu/core/components/SourceItem.kt similarity index 94% rename from app/src/main/java/org/xtimms/etsudoku/core/components/SourceItem.kt rename to app/src/main/java/org/xtimms/shirizu/core/components/SourceItem.kt index 3374b62..cdc7b22 100644 --- a/app/src/main/java/org/xtimms/etsudoku/core/components/SourceItem.kt +++ b/app/src/main/java/org/xtimms/shirizu/core/components/SourceItem.kt @@ -1,4 +1,4 @@ -package org.xtimms.etsudoku.core.components +package org.xtimms.shirizu.core.components import android.net.Uri import androidx.compose.foundation.clickable @@ -24,8 +24,8 @@ import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.sp import androidx.core.net.toUri import coil.ImageLoader -import org.xtimms.etsudoku.core.AsyncImageImpl -import org.xtimms.etsudoku.ui.theme.EtsudokuTheme +import org.xtimms.shirizu.core.AsyncImageImpl +import org.xtimms.shirizu.ui.theme.ShirizuTheme @Composable fun SourceItem( @@ -77,7 +77,7 @@ fun SourceItem( @Preview @Composable fun SourceItemPreview() { - EtsudokuTheme { + ShirizuTheme { SourceItem( coil = ImageLoader(LocalContext.current), faviconUrl = "".toUri(), diff --git a/app/src/main/java/org/xtimms/etsudoku/core/components/Tab.kt b/app/src/main/java/org/xtimms/shirizu/core/components/Tab.kt similarity index 96% rename from app/src/main/java/org/xtimms/etsudoku/core/components/Tab.kt rename to app/src/main/java/org/xtimms/shirizu/core/components/Tab.kt index bafff82..45bb90d 100644 --- a/app/src/main/java/org/xtimms/etsudoku/core/components/Tab.kt +++ b/app/src/main/java/org/xtimms/shirizu/core/components/Tab.kt @@ -1,4 +1,4 @@ -package org.xtimms.etsudoku.core.components +package org.xtimms.shirizu.core.components import androidx.compose.foundation.isSystemInDarkTheme import androidx.compose.foundation.layout.Row diff --git a/app/src/main/java/org/xtimms/etsudoku/core/components/TopAppBar.kt b/app/src/main/java/org/xtimms/shirizu/core/components/TopAppBar.kt similarity index 94% rename from app/src/main/java/org/xtimms/etsudoku/core/components/TopAppBar.kt rename to app/src/main/java/org/xtimms/shirizu/core/components/TopAppBar.kt index d06e061..2a367fc 100644 --- a/app/src/main/java/org/xtimms/etsudoku/core/components/TopAppBar.kt +++ b/app/src/main/java/org/xtimms/shirizu/core/components/TopAppBar.kt @@ -1,4 +1,4 @@ -package org.xtimms.etsudoku.core.components +package org.xtimms.shirizu.core.components import android.graphics.Path import android.view.animation.PathInterpolator @@ -84,18 +84,18 @@ import androidx.compose.ui.unit.dp import androidx.navigation.NavController import androidx.navigation.NavHostController import androidx.navigation.compose.currentBackStackEntryAsState -import org.xtimms.etsudoku.R -import org.xtimms.etsudoku.core.DURATION_ENTER -import org.xtimms.etsudoku.core.DURATION_EXIT -import org.xtimms.etsudoku.core.initialOffset -import org.xtimms.etsudoku.core.toEasing -import org.xtimms.etsudoku.sections.explore.EXPLORE_DESTINATION -import org.xtimms.etsudoku.sections.feed.FEED_DESTINATION -import org.xtimms.etsudoku.sections.history.HISTORY_DESTINATION -import org.xtimms.etsudoku.sections.search.SEARCH_DESTINATION -import org.xtimms.etsudoku.sections.settings.SETTINGS_DESTINATION -import org.xtimms.etsudoku.sections.shelf.SHELF_DESTINATION -import org.xtimms.etsudoku.ui.theme.EtsudokuTheme +import org.xtimms.shirizu.R +import org.xtimms.shirizu.core.DURATION_ENTER +import org.xtimms.shirizu.core.DURATION_EXIT +import org.xtimms.shirizu.core.initialOffset +import org.xtimms.shirizu.core.toEasing +import org.xtimms.shirizu.sections.explore.EXPLORE_DESTINATION +import org.xtimms.shirizu.sections.feed.FEED_DESTINATION +import org.xtimms.shirizu.sections.history.HISTORY_DESTINATION +import org.xtimms.shirizu.sections.search.SEARCH_DESTINATION +import org.xtimms.shirizu.sections.settings.SETTINGS_DESTINATION +import org.xtimms.shirizu.sections.shelf.SHELF_DESTINATION +import org.xtimms.shirizu.ui.theme.ShirizuTheme import java.time.LocalDate import java.time.format.DateTimeFormatter diff --git a/app/src/main/java/org/xtimms/etsudoku/core/components/effects/ListAnimation.kt b/app/src/main/java/org/xtimms/shirizu/core/components/effects/ListAnimation.kt similarity index 98% rename from app/src/main/java/org/xtimms/etsudoku/core/components/effects/ListAnimation.kt rename to app/src/main/java/org/xtimms/shirizu/core/components/effects/ListAnimation.kt index b7646fe..fae1ab9 100644 --- a/app/src/main/java/org/xtimms/etsudoku/core/components/effects/ListAnimation.kt +++ b/app/src/main/java/org/xtimms/shirizu/core/components/effects/ListAnimation.kt @@ -1,4 +1,4 @@ -package org.xtimms.etsudoku.core.components.effects +package org.xtimms.shirizu.core.components.effects import android.annotation.SuppressLint import androidx.compose.animation.AnimatedVisibility @@ -22,7 +22,7 @@ import androidx.recyclerview.widget.DiffUtil import androidx.recyclerview.widget.ListUpdateCallback import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.withContext -import org.xtimms.etsudoku.core.model.ListModel +import org.xtimms.shirizu.core.model.ListModel import java.time.Instant enum class RowEntityType { Header, Item } diff --git a/app/src/main/java/org/xtimms/etsudoku/core/components/effects/Snowflake.kt b/app/src/main/java/org/xtimms/shirizu/core/components/effects/Snowflake.kt similarity index 97% rename from app/src/main/java/org/xtimms/etsudoku/core/components/effects/Snowflake.kt rename to app/src/main/java/org/xtimms/shirizu/core/components/effects/Snowflake.kt index 21d0344..0ebd216 100644 --- a/app/src/main/java/org/xtimms/etsudoku/core/components/effects/Snowflake.kt +++ b/app/src/main/java/org/xtimms/shirizu/core/components/effects/Snowflake.kt @@ -1,4 +1,4 @@ -package org.xtimms.etsudoku.core.components.effects +package org.xtimms.shirizu.core.components.effects import androidx.compose.animation.core.LinearEasing import androidx.compose.animation.core.RepeatMode diff --git a/app/src/main/java/org/xtimms/etsudoku/core/components/icons/ArrowDecisionOutline.kt b/app/src/main/java/org/xtimms/shirizu/core/components/icons/ArrowDecisionOutline.kt similarity index 95% rename from app/src/main/java/org/xtimms/etsudoku/core/components/icons/ArrowDecisionOutline.kt rename to app/src/main/java/org/xtimms/shirizu/core/components/icons/ArrowDecisionOutline.kt index 2f885b1..75c4188 100644 --- a/app/src/main/java/org/xtimms/etsudoku/core/components/icons/ArrowDecisionOutline.kt +++ b/app/src/main/java/org/xtimms/shirizu/core/components/icons/ArrowDecisionOutline.kt @@ -1,4 +1,4 @@ -package org.xtimms.etsudoku.core.components.icons +package org.xtimms.shirizu.core.components.icons import androidx.compose.material.icons.Icons import androidx.compose.material.icons.materialIcon diff --git a/app/src/main/java/org/xtimms/etsudoku/core/components/icons/Dice.kt b/app/src/main/java/org/xtimms/shirizu/core/components/icons/Dice.kt similarity index 96% rename from app/src/main/java/org/xtimms/etsudoku/core/components/icons/Dice.kt rename to app/src/main/java/org/xtimms/shirizu/core/components/icons/Dice.kt index 483bf20..f7419f8 100644 --- a/app/src/main/java/org/xtimms/etsudoku/core/components/icons/Dice.kt +++ b/app/src/main/java/org/xtimms/shirizu/core/components/icons/Dice.kt @@ -1,4 +1,4 @@ -package org.xtimms.etsudoku.core.components.icons +package org.xtimms.shirizu.core.components.icons import androidx.compose.material.icons.Icons import androidx.compose.material.icons.materialIcon diff --git a/app/src/main/java/org/xtimms/etsudoku/core/components/icons/Kotatsu.kt b/app/src/main/java/org/xtimms/shirizu/core/components/icons/Kotatsu.kt similarity index 99% rename from app/src/main/java/org/xtimms/etsudoku/core/components/icons/Kotatsu.kt rename to app/src/main/java/org/xtimms/shirizu/core/components/icons/Kotatsu.kt index 75c4635..c57df6c 100644 --- a/app/src/main/java/org/xtimms/etsudoku/core/components/icons/Kotatsu.kt +++ b/app/src/main/java/org/xtimms/shirizu/core/components/icons/Kotatsu.kt @@ -1,4 +1,4 @@ -package org.xtimms.etsudoku.core.components.icons +package org.xtimms.shirizu.core.components.icons import androidx.compose.material.icons.Icons import androidx.compose.ui.graphics.Color diff --git a/app/src/main/java/org/xtimms/etsudoku/core/components/shape/WavyShape.kt b/app/src/main/java/org/xtimms/shirizu/core/components/shape/WavyShape.kt similarity index 96% rename from app/src/main/java/org/xtimms/etsudoku/core/components/shape/WavyShape.kt rename to app/src/main/java/org/xtimms/shirizu/core/components/shape/WavyShape.kt index 628478d..81a39f2 100644 --- a/app/src/main/java/org/xtimms/etsudoku/core/components/shape/WavyShape.kt +++ b/app/src/main/java/org/xtimms/shirizu/core/components/shape/WavyShape.kt @@ -1,4 +1,4 @@ -package org.xtimms.etsudoku.core.components.shape +package org.xtimms.shirizu.core.components.shape import androidx.compose.ui.geometry.Offset import androidx.compose.ui.geometry.Rect diff --git a/app/src/main/java/org/xtimms/etsudoku/core/database/DatabasePrePopulateCallback.kt b/app/src/main/java/org/xtimms/shirizu/core/database/DatabasePrePopulateCallback.kt similarity index 91% rename from app/src/main/java/org/xtimms/etsudoku/core/database/DatabasePrePopulateCallback.kt rename to app/src/main/java/org/xtimms/shirizu/core/database/DatabasePrePopulateCallback.kt index ea2df28..9f7b221 100644 --- a/app/src/main/java/org/xtimms/etsudoku/core/database/DatabasePrePopulateCallback.kt +++ b/app/src/main/java/org/xtimms/shirizu/core/database/DatabasePrePopulateCallback.kt @@ -1,10 +1,10 @@ -package org.xtimms.etsudoku.core.database +package org.xtimms.shirizu.core.database import android.content.res.Resources import androidx.room.RoomDatabase import androidx.sqlite.db.SupportSQLiteDatabase import org.koitharu.kotatsu.parsers.model.SortOrder -import org.xtimms.etsudoku.R +import org.xtimms.shirizu.R class DatabasePrePopulateCallback(private val resources: Resources) : RoomDatabase.Callback() { diff --git a/app/src/main/java/org/xtimms/etsudoku/core/database/EtsudokuDatabase.kt b/app/src/main/java/org/xtimms/shirizu/core/database/ShirizuDatabase.kt similarity index 52% rename from app/src/main/java/org/xtimms/etsudoku/core/database/EtsudokuDatabase.kt rename to app/src/main/java/org/xtimms/shirizu/core/database/ShirizuDatabase.kt index 79ba219..9781166 100644 --- a/app/src/main/java/org/xtimms/etsudoku/core/database/EtsudokuDatabase.kt +++ b/app/src/main/java/org/xtimms/shirizu/core/database/ShirizuDatabase.kt @@ -1,4 +1,4 @@ -package org.xtimms.etsudoku.core.database +package org.xtimms.shirizu.core.database import android.content.Context import androidx.room.Database @@ -10,28 +10,28 @@ import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.ExperimentalCoroutinesApi import kotlinx.coroutines.isActive import kotlinx.coroutines.launch -import org.xtimms.etsudoku.core.database.dao.BookmarksDao -import org.xtimms.etsudoku.core.database.dao.FavouriteCategoriesDao -import org.xtimms.etsudoku.core.database.dao.FavouritesDao -import org.xtimms.etsudoku.core.database.dao.HistoryDao -import org.xtimms.etsudoku.core.database.dao.MangaDao -import org.xtimms.etsudoku.core.database.dao.MangaSourcesDao -import org.xtimms.etsudoku.core.database.dao.SuggestionDao -import org.xtimms.etsudoku.core.database.dao.TagsDao -import org.xtimms.etsudoku.core.database.dao.TrackLogsDao -import org.xtimms.etsudoku.core.database.dao.TracksDao -import org.xtimms.etsudoku.core.database.entity.BookmarkEntity -import org.xtimms.etsudoku.core.database.entity.FavouriteCategoryEntity -import org.xtimms.etsudoku.core.database.entity.FavouriteEntity -import org.xtimms.etsudoku.core.database.entity.HistoryEntity -import org.xtimms.etsudoku.core.database.entity.MangaEntity -import org.xtimms.etsudoku.core.database.entity.MangaSourceEntity -import org.xtimms.etsudoku.core.database.entity.MangaTagsEntity -import org.xtimms.etsudoku.core.database.entity.SuggestionEntity -import org.xtimms.etsudoku.core.database.entity.TagEntity -import org.xtimms.etsudoku.core.database.entity.TrackEntity -import org.xtimms.etsudoku.core.database.entity.TrackLogEntity -import org.xtimms.etsudoku.utils.lang.processLifecycleScope +import org.xtimms.shirizu.core.database.dao.BookmarksDao +import org.xtimms.shirizu.core.database.dao.FavouriteCategoriesDao +import org.xtimms.shirizu.core.database.dao.FavouritesDao +import org.xtimms.shirizu.core.database.dao.HistoryDao +import org.xtimms.shirizu.core.database.dao.MangaDao +import org.xtimms.shirizu.core.database.dao.MangaSourcesDao +import org.xtimms.shirizu.core.database.dao.SuggestionDao +import org.xtimms.shirizu.core.database.dao.TagsDao +import org.xtimms.shirizu.core.database.dao.TrackLogsDao +import org.xtimms.shirizu.core.database.dao.TracksDao +import org.xtimms.shirizu.core.database.entity.BookmarkEntity +import org.xtimms.shirizu.core.database.entity.FavouriteCategoryEntity +import org.xtimms.shirizu.core.database.entity.FavouriteEntity +import org.xtimms.shirizu.core.database.entity.HistoryEntity +import org.xtimms.shirizu.core.database.entity.MangaEntity +import org.xtimms.shirizu.core.database.entity.MangaSourceEntity +import org.xtimms.shirizu.core.database.entity.MangaTagsEntity +import org.xtimms.shirizu.core.database.entity.SuggestionEntity +import org.xtimms.shirizu.core.database.entity.TagEntity +import org.xtimms.shirizu.core.database.entity.TrackEntity +import org.xtimms.shirizu.core.database.entity.TrackLogEntity +import org.xtimms.shirizu.utils.lang.processLifecycleScope const val DATABASE_VERSION = 1 @@ -51,7 +51,7 @@ const val DATABASE_VERSION = 1 ], version = DATABASE_VERSION ) -abstract class EtsudokuDatabase : RoomDatabase() { +abstract class ShirizuDatabase : RoomDatabase() { abstract fun getTagsDao(): TagsDao @@ -75,8 +75,8 @@ abstract class EtsudokuDatabase : RoomDatabase() { } -fun EtsudokuDatabase(context: Context): EtsudokuDatabase = Room - .databaseBuilder(context, EtsudokuDatabase::class.java, "etsudoku-db") +fun ShirizuDatabase(context: Context): ShirizuDatabase = Room + .databaseBuilder(context, ShirizuDatabase::class.java, "shirizu-db") .addCallback(DatabasePrePopulateCallback(context.resources)) .build() diff --git a/app/src/main/java/org/xtimms/etsudoku/core/database/Tables.kt b/app/src/main/java/org/xtimms/shirizu/core/database/Tables.kt similarity index 68% rename from app/src/main/java/org/xtimms/etsudoku/core/database/Tables.kt rename to app/src/main/java/org/xtimms/shirizu/core/database/Tables.kt index e650a65..3352224 100644 --- a/app/src/main/java/org/xtimms/etsudoku/core/database/Tables.kt +++ b/app/src/main/java/org/xtimms/shirizu/core/database/Tables.kt @@ -1,4 +1,4 @@ -package org.xtimms.etsudoku.core.database +package org.xtimms.shirizu.core.database const val TABLE_MANGA = "manga" const val TABLE_TAGS = "tags" diff --git a/app/src/main/java/org/xtimms/etsudoku/core/database/dao/BookmarksDao.kt b/app/src/main/java/org/xtimms/shirizu/core/database/dao/BookmarksDao.kt similarity index 92% rename from app/src/main/java/org/xtimms/etsudoku/core/database/dao/BookmarksDao.kt rename to app/src/main/java/org/xtimms/shirizu/core/database/dao/BookmarksDao.kt index 84e1306..a67b892 100644 --- a/app/src/main/java/org/xtimms/etsudoku/core/database/dao/BookmarksDao.kt +++ b/app/src/main/java/org/xtimms/shirizu/core/database/dao/BookmarksDao.kt @@ -1,4 +1,4 @@ -package org.xtimms.etsudoku.core.database.dao +package org.xtimms.shirizu.core.database.dao import androidx.room.Dao import androidx.room.Delete @@ -7,8 +7,8 @@ import androidx.room.Query import androidx.room.Transaction import androidx.room.Upsert import kotlinx.coroutines.flow.Flow -import org.xtimms.etsudoku.core.database.entity.BookmarkEntity -import org.xtimms.etsudoku.core.database.entity.MangaWithTags +import org.xtimms.shirizu.core.database.entity.BookmarkEntity +import org.xtimms.shirizu.core.database.entity.MangaWithTags @Dao abstract class BookmarksDao { diff --git a/app/src/main/java/org/xtimms/etsudoku/core/database/dao/FavouriteCategoriesDao.kt b/app/src/main/java/org/xtimms/shirizu/core/database/dao/FavouriteCategoriesDao.kt similarity index 95% rename from app/src/main/java/org/xtimms/etsudoku/core/database/dao/FavouriteCategoriesDao.kt rename to app/src/main/java/org/xtimms/shirizu/core/database/dao/FavouriteCategoriesDao.kt index 78a472a..6066174 100644 --- a/app/src/main/java/org/xtimms/etsudoku/core/database/dao/FavouriteCategoriesDao.kt +++ b/app/src/main/java/org/xtimms/shirizu/core/database/dao/FavouriteCategoriesDao.kt @@ -1,4 +1,4 @@ -package org.xtimms.etsudoku.core.database.dao +package org.xtimms.shirizu.core.database.dao import androidx.room.Dao import androidx.room.Insert @@ -6,7 +6,7 @@ import androidx.room.OnConflictStrategy import androidx.room.Query import androidx.room.Upsert import kotlinx.coroutines.flow.Flow -import org.xtimms.etsudoku.core.database.entity.FavouriteCategoryEntity +import org.xtimms.shirizu.core.database.entity.FavouriteCategoryEntity @Dao abstract class FavouriteCategoriesDao { diff --git a/app/src/main/java/org/xtimms/etsudoku/core/database/dao/FavouritesDao.kt b/app/src/main/java/org/xtimms/shirizu/core/database/dao/FavouritesDao.kt similarity index 95% rename from app/src/main/java/org/xtimms/etsudoku/core/database/dao/FavouritesDao.kt rename to app/src/main/java/org/xtimms/shirizu/core/database/dao/FavouritesDao.kt index c04df58..31e706f 100644 --- a/app/src/main/java/org/xtimms/etsudoku/core/database/dao/FavouritesDao.kt +++ b/app/src/main/java/org/xtimms/shirizu/core/database/dao/FavouritesDao.kt @@ -1,4 +1,4 @@ -package org.xtimms.etsudoku.core.database.dao +package org.xtimms.shirizu.core.database.dao import androidx.room.Dao import androidx.room.Insert @@ -11,10 +11,10 @@ import androidx.sqlite.db.SimpleSQLiteQuery import androidx.sqlite.db.SupportSQLiteQuery import kotlinx.coroutines.flow.Flow import org.intellij.lang.annotations.Language -import org.xtimms.etsudoku.core.database.entity.FavouriteEntity -import org.xtimms.etsudoku.core.database.entity.MangaEntity -import org.xtimms.etsudoku.core.model.ListSortOrder -import org.xtimms.etsudoku.sections.shelf.FavouriteManga +import org.xtimms.shirizu.core.database.entity.FavouriteEntity +import org.xtimms.shirizu.core.database.entity.MangaEntity +import org.xtimms.shirizu.core.model.ListSortOrder +import org.xtimms.shirizu.sections.shelf.FavouriteManga @Dao abstract class FavouritesDao { diff --git a/app/src/main/java/org/xtimms/etsudoku/core/database/dao/HistoryDao.kt b/app/src/main/java/org/xtimms/shirizu/core/database/dao/HistoryDao.kt similarity index 93% rename from app/src/main/java/org/xtimms/etsudoku/core/database/dao/HistoryDao.kt rename to app/src/main/java/org/xtimms/shirizu/core/database/dao/HistoryDao.kt index f0a9519..02c2692 100644 --- a/app/src/main/java/org/xtimms/etsudoku/core/database/dao/HistoryDao.kt +++ b/app/src/main/java/org/xtimms/shirizu/core/database/dao/HistoryDao.kt @@ -1,4 +1,4 @@ -package org.xtimms.etsudoku.core.database.dao +package org.xtimms.shirizu.core.database.dao import androidx.room.Dao import androidx.room.Insert @@ -10,11 +10,11 @@ import androidx.sqlite.db.SimpleSQLiteQuery import androidx.sqlite.db.SupportSQLiteQuery import kotlinx.coroutines.flow.Flow import org.intellij.lang.annotations.Language -import org.xtimms.etsudoku.core.database.entity.HistoryEntity -import org.xtimms.etsudoku.core.database.entity.HistoryWithManga -import org.xtimms.etsudoku.core.database.entity.MangaEntity -import org.xtimms.etsudoku.core.database.entity.TagEntity -import org.xtimms.etsudoku.core.model.ListSortOrder +import org.xtimms.shirizu.core.database.entity.HistoryEntity +import org.xtimms.shirizu.core.database.entity.HistoryWithManga +import org.xtimms.shirizu.core.database.entity.MangaEntity +import org.xtimms.shirizu.core.database.entity.TagEntity +import org.xtimms.shirizu.core.model.ListSortOrder @Dao abstract class HistoryDao { diff --git a/app/src/main/java/org/xtimms/etsudoku/core/database/dao/MangaDao.kt b/app/src/main/java/org/xtimms/shirizu/core/database/dao/MangaDao.kt similarity index 84% rename from app/src/main/java/org/xtimms/etsudoku/core/database/dao/MangaDao.kt rename to app/src/main/java/org/xtimms/shirizu/core/database/dao/MangaDao.kt index a53850f..78b689d 100644 --- a/app/src/main/java/org/xtimms/etsudoku/core/database/dao/MangaDao.kt +++ b/app/src/main/java/org/xtimms/shirizu/core/database/dao/MangaDao.kt @@ -1,4 +1,4 @@ -package org.xtimms.etsudoku.core.database.dao +package org.xtimms.shirizu.core.database.dao import androidx.room.Dao import androidx.room.Delete @@ -8,10 +8,10 @@ import androidx.room.Query import androidx.room.Transaction import androidx.room.Update import androidx.room.Upsert -import org.xtimms.etsudoku.core.database.entity.MangaEntity -import org.xtimms.etsudoku.core.database.entity.MangaTagsEntity -import org.xtimms.etsudoku.core.database.entity.MangaWithTags -import org.xtimms.etsudoku.core.database.entity.TagEntity +import org.xtimms.shirizu.core.database.entity.MangaEntity +import org.xtimms.shirizu.core.database.entity.MangaTagsEntity +import org.xtimms.shirizu.core.database.entity.MangaWithTags +import org.xtimms.shirizu.core.database.entity.TagEntity @Dao abstract class MangaDao { diff --git a/app/src/main/java/org/xtimms/etsudoku/core/database/dao/MangaSourcesDao.kt b/app/src/main/java/org/xtimms/shirizu/core/database/dao/MangaSourcesDao.kt similarity index 93% rename from app/src/main/java/org/xtimms/etsudoku/core/database/dao/MangaSourcesDao.kt rename to app/src/main/java/org/xtimms/shirizu/core/database/dao/MangaSourcesDao.kt index b616dc0..135d3eb 100644 --- a/app/src/main/java/org/xtimms/etsudoku/core/database/dao/MangaSourcesDao.kt +++ b/app/src/main/java/org/xtimms/shirizu/core/database/dao/MangaSourcesDao.kt @@ -1,4 +1,4 @@ -package org.xtimms.etsudoku.core.database.dao +package org.xtimms.shirizu.core.database.dao import androidx.room.Dao import androidx.room.Query @@ -9,8 +9,8 @@ import androidx.sqlite.db.SimpleSQLiteQuery import androidx.sqlite.db.SupportSQLiteQuery import kotlinx.coroutines.flow.Flow import org.intellij.lang.annotations.Language -import org.xtimms.etsudoku.core.database.entity.MangaSourceEntity -import org.xtimms.etsudoku.sections.explore.data.SourcesSortOrder +import org.xtimms.shirizu.core.database.entity.MangaSourceEntity +import org.xtimms.shirizu.sections.explore.data.SourcesSortOrder @Dao abstract class MangaSourcesDao { diff --git a/app/src/main/java/org/xtimms/etsudoku/core/database/dao/SuggestionDao.kt b/app/src/main/java/org/xtimms/shirizu/core/database/dao/SuggestionDao.kt similarity index 88% rename from app/src/main/java/org/xtimms/etsudoku/core/database/dao/SuggestionDao.kt rename to app/src/main/java/org/xtimms/shirizu/core/database/dao/SuggestionDao.kt index fd9a88a..fd120fb 100644 --- a/app/src/main/java/org/xtimms/etsudoku/core/database/dao/SuggestionDao.kt +++ b/app/src/main/java/org/xtimms/shirizu/core/database/dao/SuggestionDao.kt @@ -1,4 +1,4 @@ -package org.xtimms.etsudoku.core.database.dao +package org.xtimms.shirizu.core.database.dao import androidx.room.Dao import androidx.room.Insert @@ -7,8 +7,8 @@ import androidx.room.Query import androidx.room.Transaction import androidx.room.Update import kotlinx.coroutines.flow.Flow -import org.xtimms.etsudoku.core.database.entity.SuggestionEntity -import org.xtimms.etsudoku.core.database.entity.SuggestionWithManga +import org.xtimms.shirizu.core.database.entity.SuggestionEntity +import org.xtimms.shirizu.core.database.entity.SuggestionWithManga @Dao abstract class SuggestionDao { diff --git a/app/src/main/java/org/xtimms/etsudoku/core/database/dao/TagsDao.kt b/app/src/main/java/org/xtimms/shirizu/core/database/dao/TagsDao.kt similarity index 96% rename from app/src/main/java/org/xtimms/etsudoku/core/database/dao/TagsDao.kt rename to app/src/main/java/org/xtimms/shirizu/core/database/dao/TagsDao.kt index ca23847..ea25b86 100644 --- a/app/src/main/java/org/xtimms/etsudoku/core/database/dao/TagsDao.kt +++ b/app/src/main/java/org/xtimms/shirizu/core/database/dao/TagsDao.kt @@ -1,9 +1,9 @@ -package org.xtimms.etsudoku.core.database.dao +package org.xtimms.shirizu.core.database.dao import androidx.room.Dao import androidx.room.Query import androidx.room.Upsert -import org.xtimms.etsudoku.core.database.entity.TagEntity +import org.xtimms.shirizu.core.database.entity.TagEntity @Dao abstract class TagsDao { diff --git a/app/src/main/java/org/xtimms/etsudoku/core/database/dao/TrackLogsDao.kt b/app/src/main/java/org/xtimms/shirizu/core/database/dao/TrackLogsDao.kt similarity index 82% rename from app/src/main/java/org/xtimms/etsudoku/core/database/dao/TrackLogsDao.kt rename to app/src/main/java/org/xtimms/shirizu/core/database/dao/TrackLogsDao.kt index 3929702..64d926d 100644 --- a/app/src/main/java/org/xtimms/etsudoku/core/database/dao/TrackLogsDao.kt +++ b/app/src/main/java/org/xtimms/shirizu/core/database/dao/TrackLogsDao.kt @@ -1,4 +1,4 @@ -package org.xtimms.etsudoku.core.database.dao +package org.xtimms.shirizu.core.database.dao import androidx.room.Dao import androidx.room.Insert @@ -6,8 +6,8 @@ import androidx.room.OnConflictStrategy import androidx.room.Query import androidx.room.Transaction import kotlinx.coroutines.flow.Flow -import org.xtimms.etsudoku.core.database.entity.TrackLogEntity -import org.xtimms.etsudoku.core.database.entity.TrackLogWithManga +import org.xtimms.shirizu.core.database.entity.TrackLogEntity +import org.xtimms.shirizu.core.database.entity.TrackLogWithManga @Dao interface TrackLogsDao { diff --git a/app/src/main/java/org/xtimms/etsudoku/core/database/dao/TracksDao.kt b/app/src/main/java/org/xtimms/shirizu/core/database/dao/TracksDao.kt similarity index 93% rename from app/src/main/java/org/xtimms/etsudoku/core/database/dao/TracksDao.kt rename to app/src/main/java/org/xtimms/shirizu/core/database/dao/TracksDao.kt index c057e72..4fc1ff0 100644 --- a/app/src/main/java/org/xtimms/etsudoku/core/database/dao/TracksDao.kt +++ b/app/src/main/java/org/xtimms/shirizu/core/database/dao/TracksDao.kt @@ -1,4 +1,4 @@ -package org.xtimms.etsudoku.core.database.dao +package org.xtimms.shirizu.core.database.dao import androidx.room.Dao import androidx.room.MapColumn @@ -6,8 +6,8 @@ import androidx.room.Query import androidx.room.Transaction import androidx.room.Upsert import kotlinx.coroutines.flow.Flow -import org.xtimms.etsudoku.core.database.entity.MangaWithTags -import org.xtimms.etsudoku.core.database.entity.TrackEntity +import org.xtimms.shirizu.core.database.entity.MangaWithTags +import org.xtimms.shirizu.core.database.entity.TrackEntity @Dao abstract class TracksDao { diff --git a/app/src/main/java/org/xtimms/etsudoku/core/database/entity/BookmarksEntity.kt b/app/src/main/java/org/xtimms/shirizu/core/database/entity/BookmarksEntity.kt similarity index 94% rename from app/src/main/java/org/xtimms/etsudoku/core/database/entity/BookmarksEntity.kt rename to app/src/main/java/org/xtimms/shirizu/core/database/entity/BookmarksEntity.kt index e04423e..5e6b368 100644 --- a/app/src/main/java/org/xtimms/etsudoku/core/database/entity/BookmarksEntity.kt +++ b/app/src/main/java/org/xtimms/shirizu/core/database/entity/BookmarksEntity.kt @@ -1,4 +1,4 @@ -package org.xtimms.etsudoku.core.database.entity +package org.xtimms.shirizu.core.database.entity import androidx.room.ColumnInfo import androidx.room.Entity diff --git a/app/src/main/java/org/xtimms/etsudoku/core/database/entity/EntityMapping.kt b/app/src/main/java/org/xtimms/shirizu/core/database/entity/EntityMapping.kt similarity index 89% rename from app/src/main/java/org/xtimms/etsudoku/core/database/entity/EntityMapping.kt rename to app/src/main/java/org/xtimms/shirizu/core/database/entity/EntityMapping.kt index cdace44..c0776cb 100644 --- a/app/src/main/java/org/xtimms/etsudoku/core/database/entity/EntityMapping.kt +++ b/app/src/main/java/org/xtimms/shirizu/core/database/entity/EntityMapping.kt @@ -1,4 +1,4 @@ -package org.xtimms.etsudoku.core.database.entity +package org.xtimms.shirizu.core.database.entity import org.koitharu.kotatsu.parsers.model.Manga import org.koitharu.kotatsu.parsers.model.MangaState @@ -6,14 +6,14 @@ import org.koitharu.kotatsu.parsers.model.MangaTag import org.koitharu.kotatsu.parsers.model.SortOrder import org.koitharu.kotatsu.parsers.util.mapToSet import org.koitharu.kotatsu.parsers.util.toTitleCase -import org.xtimms.etsudoku.core.model.Bookmark -import org.xtimms.etsudoku.core.model.FavouriteCategory -import org.xtimms.etsudoku.core.model.ListSortOrder -import org.xtimms.etsudoku.core.model.MangaHistory -import org.xtimms.etsudoku.core.model.MangaSource -import org.xtimms.etsudoku.core.tracker.model.TrackingLogItem -import org.xtimms.etsudoku.sections.shelf.FavouriteManga -import org.xtimms.etsudoku.utils.lang.longHashCode +import org.xtimms.shirizu.core.model.Bookmark +import org.xtimms.shirizu.core.model.FavouriteCategory +import org.xtimms.shirizu.core.model.ListSortOrder +import org.xtimms.shirizu.core.model.MangaHistory +import org.xtimms.shirizu.core.model.MangaSource +import org.xtimms.shirizu.core.tracker.model.TrackingLogItem +import org.xtimms.shirizu.sections.shelf.FavouriteManga +import org.xtimms.shirizu.utils.lang.longHashCode import java.time.Instant // Entity to model diff --git a/app/src/main/java/org/xtimms/etsudoku/core/database/entity/FavouriteCategoryEntity.kt b/app/src/main/java/org/xtimms/shirizu/core/database/entity/FavouriteCategoryEntity.kt similarity index 93% rename from app/src/main/java/org/xtimms/etsudoku/core/database/entity/FavouriteCategoryEntity.kt rename to app/src/main/java/org/xtimms/shirizu/core/database/entity/FavouriteCategoryEntity.kt index 0eae11a..01eaa9b 100644 --- a/app/src/main/java/org/xtimms/etsudoku/core/database/entity/FavouriteCategoryEntity.kt +++ b/app/src/main/java/org/xtimms/shirizu/core/database/entity/FavouriteCategoryEntity.kt @@ -1,9 +1,9 @@ -package org.xtimms.etsudoku.core.database.entity +package org.xtimms.shirizu.core.database.entity import androidx.room.ColumnInfo import androidx.room.Entity import androidx.room.PrimaryKey -import org.xtimms.etsudoku.core.database.TABLE_FAVOURITE_CATEGORIES +import org.xtimms.shirizu.core.database.TABLE_FAVOURITE_CATEGORIES @Entity(tableName = TABLE_FAVOURITE_CATEGORIES) data class FavouriteCategoryEntity( diff --git a/app/src/main/java/org/xtimms/etsudoku/core/database/entity/FavouriteEntity.kt b/app/src/main/java/org/xtimms/shirizu/core/database/entity/FavouriteEntity.kt similarity index 89% rename from app/src/main/java/org/xtimms/etsudoku/core/database/entity/FavouriteEntity.kt rename to app/src/main/java/org/xtimms/shirizu/core/database/entity/FavouriteEntity.kt index eb6db38..be41642 100644 --- a/app/src/main/java/org/xtimms/etsudoku/core/database/entity/FavouriteEntity.kt +++ b/app/src/main/java/org/xtimms/shirizu/core/database/entity/FavouriteEntity.kt @@ -1,9 +1,9 @@ -package org.xtimms.etsudoku.core.database.entity +package org.xtimms.shirizu.core.database.entity import androidx.room.ColumnInfo import androidx.room.Entity import androidx.room.ForeignKey -import org.xtimms.etsudoku.core.database.TABLE_FAVOURITES +import org.xtimms.shirizu.core.database.TABLE_FAVOURITES @Entity( tableName = TABLE_FAVOURITES, diff --git a/app/src/main/java/org/xtimms/etsudoku/core/database/entity/HistoryEntity.kt b/app/src/main/java/org/xtimms/shirizu/core/database/entity/HistoryEntity.kt similarity index 89% rename from app/src/main/java/org/xtimms/etsudoku/core/database/entity/HistoryEntity.kt rename to app/src/main/java/org/xtimms/shirizu/core/database/entity/HistoryEntity.kt index 14b433d..c145297 100644 --- a/app/src/main/java/org/xtimms/etsudoku/core/database/entity/HistoryEntity.kt +++ b/app/src/main/java/org/xtimms/shirizu/core/database/entity/HistoryEntity.kt @@ -1,10 +1,10 @@ -package org.xtimms.etsudoku.core.database.entity +package org.xtimms.shirizu.core.database.entity import androidx.room.ColumnInfo import androidx.room.Entity import androidx.room.ForeignKey import androidx.room.PrimaryKey -import org.xtimms.etsudoku.core.database.TABLE_HISTORY +import org.xtimms.shirizu.core.database.TABLE_HISTORY @Entity( tableName = TABLE_HISTORY, diff --git a/app/src/main/java/org/xtimms/etsudoku/core/database/entity/HistoryWithManga.kt b/app/src/main/java/org/xtimms/shirizu/core/database/entity/HistoryWithManga.kt similarity index 90% rename from app/src/main/java/org/xtimms/etsudoku/core/database/entity/HistoryWithManga.kt rename to app/src/main/java/org/xtimms/shirizu/core/database/entity/HistoryWithManga.kt index e1ad231..a283036 100644 --- a/app/src/main/java/org/xtimms/etsudoku/core/database/entity/HistoryWithManga.kt +++ b/app/src/main/java/org/xtimms/shirizu/core/database/entity/HistoryWithManga.kt @@ -1,4 +1,4 @@ -package org.xtimms.etsudoku.core.database.entity +package org.xtimms.shirizu.core.database.entity import androidx.room.Embedded import androidx.room.Junction diff --git a/app/src/main/java/org/xtimms/etsudoku/core/database/entity/MangaEntity.kt b/app/src/main/java/org/xtimms/shirizu/core/database/entity/MangaEntity.kt similarity index 89% rename from app/src/main/java/org/xtimms/etsudoku/core/database/entity/MangaEntity.kt rename to app/src/main/java/org/xtimms/shirizu/core/database/entity/MangaEntity.kt index 19cb873..5ddcf4e 100644 --- a/app/src/main/java/org/xtimms/etsudoku/core/database/entity/MangaEntity.kt +++ b/app/src/main/java/org/xtimms/shirizu/core/database/entity/MangaEntity.kt @@ -1,9 +1,9 @@ -package org.xtimms.etsudoku.core.database.entity +package org.xtimms.shirizu.core.database.entity import androidx.room.ColumnInfo import androidx.room.Entity import androidx.room.PrimaryKey -import org.xtimms.etsudoku.core.database.TABLE_MANGA +import org.xtimms.shirizu.core.database.TABLE_MANGA @Entity(tableName = TABLE_MANGA) data class MangaEntity( diff --git a/app/src/main/java/org/xtimms/etsudoku/core/database/entity/MangaSourceEntity.kt b/app/src/main/java/org/xtimms/shirizu/core/database/entity/MangaSourceEntity.kt similarity index 78% rename from app/src/main/java/org/xtimms/etsudoku/core/database/entity/MangaSourceEntity.kt rename to app/src/main/java/org/xtimms/shirizu/core/database/entity/MangaSourceEntity.kt index 40d2cce..b2afa5b 100644 --- a/app/src/main/java/org/xtimms/etsudoku/core/database/entity/MangaSourceEntity.kt +++ b/app/src/main/java/org/xtimms/shirizu/core/database/entity/MangaSourceEntity.kt @@ -1,9 +1,9 @@ -package org.xtimms.etsudoku.core.database.entity +package org.xtimms.shirizu.core.database.entity import androidx.room.ColumnInfo import androidx.room.Entity import androidx.room.PrimaryKey -import org.xtimms.etsudoku.core.database.TABLE_SOURCES +import org.xtimms.shirizu.core.database.TABLE_SOURCES @Entity(tableName = TABLE_SOURCES) data class MangaSourceEntity( diff --git a/app/src/main/java/org/xtimms/etsudoku/core/database/entity/MangaTagsEntity.kt b/app/src/main/java/org/xtimms/shirizu/core/database/entity/MangaTagsEntity.kt similarity index 87% rename from app/src/main/java/org/xtimms/etsudoku/core/database/entity/MangaTagsEntity.kt rename to app/src/main/java/org/xtimms/shirizu/core/database/entity/MangaTagsEntity.kt index bc0bfad..21f5b79 100644 --- a/app/src/main/java/org/xtimms/etsudoku/core/database/entity/MangaTagsEntity.kt +++ b/app/src/main/java/org/xtimms/shirizu/core/database/entity/MangaTagsEntity.kt @@ -1,9 +1,9 @@ -package org.xtimms.etsudoku.core.database.entity +package org.xtimms.shirizu.core.database.entity import androidx.room.ColumnInfo import androidx.room.Entity import androidx.room.ForeignKey -import org.xtimms.etsudoku.core.database.TABLE_MANGA_TAGS +import org.xtimms.shirizu.core.database.TABLE_MANGA_TAGS @Entity( tableName = TABLE_MANGA_TAGS, diff --git a/app/src/main/java/org/xtimms/etsudoku/core/database/entity/MangaWithTags.kt b/app/src/main/java/org/xtimms/shirizu/core/database/entity/MangaWithTags.kt similarity index 86% rename from app/src/main/java/org/xtimms/etsudoku/core/database/entity/MangaWithTags.kt rename to app/src/main/java/org/xtimms/shirizu/core/database/entity/MangaWithTags.kt index 47d6080..b8e73e0 100644 --- a/app/src/main/java/org/xtimms/etsudoku/core/database/entity/MangaWithTags.kt +++ b/app/src/main/java/org/xtimms/shirizu/core/database/entity/MangaWithTags.kt @@ -1,4 +1,4 @@ -package org.xtimms.etsudoku.core.database.entity +package org.xtimms.shirizu.core.database.entity import androidx.room.Embedded import androidx.room.Junction diff --git a/app/src/main/java/org/xtimms/etsudoku/core/database/entity/SuggestionEntity.kt b/app/src/main/java/org/xtimms/shirizu/core/database/entity/SuggestionEntity.kt similarity index 93% rename from app/src/main/java/org/xtimms/etsudoku/core/database/entity/SuggestionEntity.kt rename to app/src/main/java/org/xtimms/shirizu/core/database/entity/SuggestionEntity.kt index d0cdfd4..920e587 100644 --- a/app/src/main/java/org/xtimms/etsudoku/core/database/entity/SuggestionEntity.kt +++ b/app/src/main/java/org/xtimms/shirizu/core/database/entity/SuggestionEntity.kt @@ -1,4 +1,4 @@ -package org.xtimms.etsudoku.core.database.entity +package org.xtimms.shirizu.core.database.entity import androidx.annotation.FloatRange import androidx.room.ColumnInfo diff --git a/app/src/main/java/org/xtimms/etsudoku/core/database/entity/SuggestionWithManga.kt b/app/src/main/java/org/xtimms/shirizu/core/database/entity/SuggestionWithManga.kt similarity index 90% rename from app/src/main/java/org/xtimms/etsudoku/core/database/entity/SuggestionWithManga.kt rename to app/src/main/java/org/xtimms/shirizu/core/database/entity/SuggestionWithManga.kt index 82a7409..e721eb7 100644 --- a/app/src/main/java/org/xtimms/etsudoku/core/database/entity/SuggestionWithManga.kt +++ b/app/src/main/java/org/xtimms/shirizu/core/database/entity/SuggestionWithManga.kt @@ -1,4 +1,4 @@ -package org.xtimms.etsudoku.core.database.entity +package org.xtimms.shirizu.core.database.entity import androidx.room.Embedded import androidx.room.Junction diff --git a/app/src/main/java/org/xtimms/etsudoku/core/database/entity/TagEntity.kt b/app/src/main/java/org/xtimms/shirizu/core/database/entity/TagEntity.kt similarity index 79% rename from app/src/main/java/org/xtimms/etsudoku/core/database/entity/TagEntity.kt rename to app/src/main/java/org/xtimms/shirizu/core/database/entity/TagEntity.kt index 4c41b78..d8eeeee 100644 --- a/app/src/main/java/org/xtimms/etsudoku/core/database/entity/TagEntity.kt +++ b/app/src/main/java/org/xtimms/shirizu/core/database/entity/TagEntity.kt @@ -1,9 +1,9 @@ -package org.xtimms.etsudoku.core.database.entity +package org.xtimms.shirizu.core.database.entity import androidx.room.ColumnInfo import androidx.room.Entity import androidx.room.PrimaryKey -import org.xtimms.etsudoku.core.database.TABLE_TAGS +import org.xtimms.shirizu.core.database.TABLE_TAGS @Entity(tableName = TABLE_TAGS) data class TagEntity( diff --git a/app/src/main/java/org/xtimms/etsudoku/core/database/entity/TrackEntity.kt b/app/src/main/java/org/xtimms/shirizu/core/database/entity/TrackEntity.kt similarity index 95% rename from app/src/main/java/org/xtimms/etsudoku/core/database/entity/TrackEntity.kt rename to app/src/main/java/org/xtimms/shirizu/core/database/entity/TrackEntity.kt index 2ace75a..27bb9ac 100644 --- a/app/src/main/java/org/xtimms/etsudoku/core/database/entity/TrackEntity.kt +++ b/app/src/main/java/org/xtimms/shirizu/core/database/entity/TrackEntity.kt @@ -1,4 +1,4 @@ -package org.xtimms.etsudoku.core.database.entity +package org.xtimms.shirizu.core.database.entity import androidx.room.ColumnInfo import androidx.room.Entity diff --git a/app/src/main/java/org/xtimms/etsudoku/core/database/entity/TrackLogEntity.kt b/app/src/main/java/org/xtimms/shirizu/core/database/entity/TrackLogEntity.kt similarity index 93% rename from app/src/main/java/org/xtimms/etsudoku/core/database/entity/TrackLogEntity.kt rename to app/src/main/java/org/xtimms/shirizu/core/database/entity/TrackLogEntity.kt index 4e0c7a1..8ca53d8 100644 --- a/app/src/main/java/org/xtimms/etsudoku/core/database/entity/TrackLogEntity.kt +++ b/app/src/main/java/org/xtimms/shirizu/core/database/entity/TrackLogEntity.kt @@ -1,4 +1,4 @@ -package org.xtimms.etsudoku.core.database.entity +package org.xtimms.shirizu.core.database.entity import androidx.room.ColumnInfo import androidx.room.Entity diff --git a/app/src/main/java/org/xtimms/etsudoku/core/database/entity/TrackLogWithManga.kt b/app/src/main/java/org/xtimms/shirizu/core/database/entity/TrackLogWithManga.kt similarity index 90% rename from app/src/main/java/org/xtimms/etsudoku/core/database/entity/TrackLogWithManga.kt rename to app/src/main/java/org/xtimms/shirizu/core/database/entity/TrackLogWithManga.kt index 9547846..537aab6 100644 --- a/app/src/main/java/org/xtimms/etsudoku/core/database/entity/TrackLogWithManga.kt +++ b/app/src/main/java/org/xtimms/shirizu/core/database/entity/TrackLogWithManga.kt @@ -1,4 +1,4 @@ -package org.xtimms.etsudoku.core.database.entity +package org.xtimms.shirizu.core.database.entity import androidx.room.Embedded import androidx.room.Junction diff --git a/app/src/main/java/org/xtimms/etsudoku/core/exceptions/CloudflareProtectedException.kt b/app/src/main/java/org/xtimms/shirizu/core/exceptions/CloudflareProtectedException.kt similarity index 72% rename from app/src/main/java/org/xtimms/etsudoku/core/exceptions/CloudflareProtectedException.kt rename to app/src/main/java/org/xtimms/shirizu/core/exceptions/CloudflareProtectedException.kt index 3ec0e48..da5a194 100644 --- a/app/src/main/java/org/xtimms/etsudoku/core/exceptions/CloudflareProtectedException.kt +++ b/app/src/main/java/org/xtimms/shirizu/core/exceptions/CloudflareProtectedException.kt @@ -1,4 +1,4 @@ -package org.xtimms.etsudoku.core.exceptions +package org.xtimms.shirizu.core.exceptions import okhttp3.Headers import okio.IOException diff --git a/app/src/main/java/org/xtimms/shirizu/core/exceptions/SyncApiException.kt b/app/src/main/java/org/xtimms/shirizu/core/exceptions/SyncApiException.kt new file mode 100644 index 0000000..94dc28a --- /dev/null +++ b/app/src/main/java/org/xtimms/shirizu/core/exceptions/SyncApiException.kt @@ -0,0 +1,6 @@ +package org.xtimms.shirizu.core.exceptions + +class SyncApiException( + message: String, + val code: Int, +) : RuntimeException(message) \ No newline at end of file diff --git a/app/src/main/java/org/xtimms/etsudoku/core/exceptions/TooManyRequestExceptions.kt b/app/src/main/java/org/xtimms/shirizu/core/exceptions/TooManyRequestExceptions.kt similarity index 86% rename from app/src/main/java/org/xtimms/etsudoku/core/exceptions/TooManyRequestExceptions.kt rename to app/src/main/java/org/xtimms/shirizu/core/exceptions/TooManyRequestExceptions.kt index 7f1d1d3..ea72103 100644 --- a/app/src/main/java/org/xtimms/etsudoku/core/exceptions/TooManyRequestExceptions.kt +++ b/app/src/main/java/org/xtimms/shirizu/core/exceptions/TooManyRequestExceptions.kt @@ -1,4 +1,4 @@ -package org.xtimms.etsudoku.core.exceptions +package org.xtimms.shirizu.core.exceptions import okio.IOException import java.time.Instant diff --git a/app/src/main/java/org/xtimms/etsudoku/core/logs/FileLogger.kt b/app/src/main/java/org/xtimms/shirizu/core/logs/FileLogger.kt similarity index 95% rename from app/src/main/java/org/xtimms/etsudoku/core/logs/FileLogger.kt rename to app/src/main/java/org/xtimms/shirizu/core/logs/FileLogger.kt index c5b67b9..6cbf189 100644 --- a/app/src/main/java/org/xtimms/etsudoku/core/logs/FileLogger.kt +++ b/app/src/main/java/org/xtimms/shirizu/core/logs/FileLogger.kt @@ -1,4 +1,4 @@ -package org.xtimms.etsudoku.core.logs +package org.xtimms.shirizu.core.logs import android.content.Context import androidx.annotation.WorkerThread @@ -14,9 +14,9 @@ import kotlinx.coroutines.sync.Mutex import kotlinx.coroutines.sync.withLock import kotlinx.coroutines.withContext import org.koitharu.kotatsu.parsers.util.runCatchingCancellable -import org.xtimms.etsudoku.core.prefs.AppSettings -import org.xtimms.etsudoku.utils.lang.processLifecycleScope -import org.xtimms.etsudoku.utils.system.subdir +import org.xtimms.shirizu.core.prefs.AppSettings +import org.xtimms.shirizu.utils.lang.processLifecycleScope +import org.xtimms.shirizu.utils.system.subdir import java.io.File import java.io.FileOutputStream import java.time.LocalDateTime diff --git a/app/src/main/java/org/xtimms/etsudoku/core/logs/Loggers.kt b/app/src/main/java/org/xtimms/shirizu/core/logs/Loggers.kt similarity index 71% rename from app/src/main/java/org/xtimms/etsudoku/core/logs/Loggers.kt rename to app/src/main/java/org/xtimms/shirizu/core/logs/Loggers.kt index aeea3a5..f576261 100644 --- a/app/src/main/java/org/xtimms/etsudoku/core/logs/Loggers.kt +++ b/app/src/main/java/org/xtimms/shirizu/core/logs/Loggers.kt @@ -1,4 +1,4 @@ -package org.xtimms.etsudoku.core.logs +package org.xtimms.shirizu.core.logs import javax.inject.Qualifier diff --git a/app/src/main/java/org/xtimms/etsudoku/core/logs/LoggersModule.kt b/app/src/main/java/org/xtimms/shirizu/core/logs/LoggersModule.kt similarity index 95% rename from app/src/main/java/org/xtimms/etsudoku/core/logs/LoggersModule.kt rename to app/src/main/java/org/xtimms/shirizu/core/logs/LoggersModule.kt index 34bd8fe..d9fba9f 100644 --- a/app/src/main/java/org/xtimms/etsudoku/core/logs/LoggersModule.kt +++ b/app/src/main/java/org/xtimms/shirizu/core/logs/LoggersModule.kt @@ -1,4 +1,4 @@ -package org.xtimms.etsudoku.core.logs +package org.xtimms.shirizu.core.logs import android.content.Context import androidx.collection.arraySetOf diff --git a/app/src/main/java/org/xtimms/etsudoku/core/model/Bookmark.kt b/app/src/main/java/org/xtimms/shirizu/core/model/Bookmark.kt similarity index 91% rename from app/src/main/java/org/xtimms/etsudoku/core/model/Bookmark.kt rename to app/src/main/java/org/xtimms/shirizu/core/model/Bookmark.kt index 83ff2e1..a0f7c00 100644 --- a/app/src/main/java/org/xtimms/etsudoku/core/model/Bookmark.kt +++ b/app/src/main/java/org/xtimms/shirizu/core/model/Bookmark.kt @@ -1,8 +1,8 @@ -package org.xtimms.etsudoku.core.model +package org.xtimms.shirizu.core.model import org.koitharu.kotatsu.parsers.model.Manga import org.koitharu.kotatsu.parsers.model.MangaPage -import org.xtimms.etsudoku.utils.hasImageExtension +import org.xtimms.shirizu.utils.hasImageExtension import java.time.Instant data class Bookmark( diff --git a/app/src/main/java/org/xtimms/etsudoku/core/model/FavouriteCategory.kt b/app/src/main/java/org/xtimms/shirizu/core/model/FavouriteCategory.kt similarity index 92% rename from app/src/main/java/org/xtimms/etsudoku/core/model/FavouriteCategory.kt rename to app/src/main/java/org/xtimms/shirizu/core/model/FavouriteCategory.kt index 9da2371..abc18f8 100644 --- a/app/src/main/java/org/xtimms/etsudoku/core/model/FavouriteCategory.kt +++ b/app/src/main/java/org/xtimms/shirizu/core/model/FavouriteCategory.kt @@ -1,4 +1,4 @@ -package org.xtimms.etsudoku.core.model +package org.xtimms.shirizu.core.model import android.os.Parcelable import kotlinx.parcelize.Parcelize diff --git a/app/src/main/java/org/xtimms/etsudoku/core/model/ListModel.kt b/app/src/main/java/org/xtimms/shirizu/core/model/ListModel.kt similarity index 82% rename from app/src/main/java/org/xtimms/etsudoku/core/model/ListModel.kt rename to app/src/main/java/org/xtimms/shirizu/core/model/ListModel.kt index 4f97c7d..329d97a 100644 --- a/app/src/main/java/org/xtimms/etsudoku/core/model/ListModel.kt +++ b/app/src/main/java/org/xtimms/shirizu/core/model/ListModel.kt @@ -1,4 +1,4 @@ -package org.xtimms.etsudoku.core.model +package org.xtimms.shirizu.core.model interface ListModel { diff --git a/app/src/main/java/org/xtimms/etsudoku/core/model/ListSortOrder.kt b/app/src/main/java/org/xtimms/shirizu/core/model/ListSortOrder.kt similarity index 89% rename from app/src/main/java/org/xtimms/etsudoku/core/model/ListSortOrder.kt rename to app/src/main/java/org/xtimms/shirizu/core/model/ListSortOrder.kt index e2b2186..a9434c5 100644 --- a/app/src/main/java/org/xtimms/etsudoku/core/model/ListSortOrder.kt +++ b/app/src/main/java/org/xtimms/shirizu/core/model/ListSortOrder.kt @@ -1,7 +1,7 @@ -package org.xtimms.etsudoku.core.model +package org.xtimms.shirizu.core.model import androidx.annotation.StringRes -import org.xtimms.etsudoku.R +import org.xtimms.shirizu.R import org.koitharu.kotatsu.parsers.util.find import java.util.EnumSet diff --git a/app/src/main/java/org/xtimms/etsudoku/core/model/LocalManga.kt b/app/src/main/java/org/xtimms/shirizu/core/model/LocalManga.kt similarity index 91% rename from app/src/main/java/org/xtimms/etsudoku/core/model/LocalManga.kt rename to app/src/main/java/org/xtimms/shirizu/core/model/LocalManga.kt index d95ac7c..1f8b8e1 100644 --- a/app/src/main/java/org/xtimms/etsudoku/core/model/LocalManga.kt +++ b/app/src/main/java/org/xtimms/shirizu/core/model/LocalManga.kt @@ -1,10 +1,10 @@ -package org.xtimms.etsudoku.core.model +package org.xtimms.shirizu.core.model import androidx.core.net.toFile import androidx.core.net.toUri import org.koitharu.kotatsu.parsers.model.Manga import org.koitharu.kotatsu.parsers.model.MangaTag -import org.xtimms.etsudoku.utils.system.creationTime +import org.xtimms.shirizu.utils.system.creationTime import java.io.File data class LocalManga( diff --git a/app/src/main/java/org/xtimms/etsudoku/core/model/Manga.kt b/app/src/main/java/org/xtimms/shirizu/core/model/Manga.kt similarity index 93% rename from app/src/main/java/org/xtimms/etsudoku/core/model/Manga.kt rename to app/src/main/java/org/xtimms/shirizu/core/model/Manga.kt index 6ee72e8..66e6000 100644 --- a/app/src/main/java/org/xtimms/etsudoku/core/model/Manga.kt +++ b/app/src/main/java/org/xtimms/shirizu/core/model/Manga.kt @@ -1,10 +1,10 @@ -package org.xtimms.etsudoku.core.model +package org.xtimms.shirizu.core.model import androidx.core.os.LocaleListCompat import org.koitharu.kotatsu.parsers.model.Manga import org.koitharu.kotatsu.parsers.model.MangaChapter import org.koitharu.kotatsu.parsers.model.MangaSource -import org.xtimms.etsudoku.utils.system.iterator +import org.xtimms.shirizu.utils.system.iterator import java.text.DecimalFormat import java.text.DecimalFormatSymbols diff --git a/app/src/main/java/org/xtimms/etsudoku/core/model/MangaHistory.kt b/app/src/main/java/org/xtimms/shirizu/core/model/MangaHistory.kt similarity index 83% rename from app/src/main/java/org/xtimms/etsudoku/core/model/MangaHistory.kt rename to app/src/main/java/org/xtimms/shirizu/core/model/MangaHistory.kt index cf12c42..d2a89c3 100644 --- a/app/src/main/java/org/xtimms/etsudoku/core/model/MangaHistory.kt +++ b/app/src/main/java/org/xtimms/shirizu/core/model/MangaHistory.kt @@ -1,4 +1,4 @@ -package org.xtimms.etsudoku.core.model +package org.xtimms.shirizu.core.model import android.os.Parcelable import kotlinx.parcelize.Parcelize diff --git a/app/src/main/java/org/xtimms/etsudoku/core/model/MangaSource.kt b/app/src/main/java/org/xtimms/shirizu/core/model/MangaSource.kt similarity index 72% rename from app/src/main/java/org/xtimms/etsudoku/core/model/MangaSource.kt rename to app/src/main/java/org/xtimms/shirizu/core/model/MangaSource.kt index e1309e5..228bda3 100644 --- a/app/src/main/java/org/xtimms/etsudoku/core/model/MangaSource.kt +++ b/app/src/main/java/org/xtimms/shirizu/core/model/MangaSource.kt @@ -1,4 +1,4 @@ -package org.xtimms.etsudoku.core.model +package org.xtimms.shirizu.core.model import org.koitharu.kotatsu.parsers.model.ContentType import org.koitharu.kotatsu.parsers.model.MangaSource diff --git a/app/src/main/java/org/xtimms/etsudoku/core/model/MangaSuggestion.kt b/app/src/main/java/org/xtimms/shirizu/core/model/MangaSuggestion.kt similarity index 83% rename from app/src/main/java/org/xtimms/etsudoku/core/model/MangaSuggestion.kt rename to app/src/main/java/org/xtimms/shirizu/core/model/MangaSuggestion.kt index 191a644..05facbc 100644 --- a/app/src/main/java/org/xtimms/etsudoku/core/model/MangaSuggestion.kt +++ b/app/src/main/java/org/xtimms/shirizu/core/model/MangaSuggestion.kt @@ -1,4 +1,4 @@ -package org.xtimms.etsudoku.core.model +package org.xtimms.shirizu.core.model import androidx.annotation.FloatRange import org.koitharu.kotatsu.parsers.model.Manga diff --git a/app/src/main/java/org/xtimms/etsudoku/core/model/MangaWithHistory.kt b/app/src/main/java/org/xtimms/shirizu/core/model/MangaWithHistory.kt similarity index 76% rename from app/src/main/java/org/xtimms/etsudoku/core/model/MangaWithHistory.kt rename to app/src/main/java/org/xtimms/shirizu/core/model/MangaWithHistory.kt index 4764dcc..04c897e 100644 --- a/app/src/main/java/org/xtimms/etsudoku/core/model/MangaWithHistory.kt +++ b/app/src/main/java/org/xtimms/shirizu/core/model/MangaWithHistory.kt @@ -1,4 +1,4 @@ -package org.xtimms.etsudoku.core.model +package org.xtimms.shirizu.core.model import org.koitharu.kotatsu.parsers.model.Manga diff --git a/app/src/main/java/org/xtimms/etsudoku/core/model/ShelfCategory.kt b/app/src/main/java/org/xtimms/shirizu/core/model/ShelfCategory.kt similarity index 87% rename from app/src/main/java/org/xtimms/etsudoku/core/model/ShelfCategory.kt rename to app/src/main/java/org/xtimms/shirizu/core/model/ShelfCategory.kt index 1b3dba6..61bd02c 100644 --- a/app/src/main/java/org/xtimms/etsudoku/core/model/ShelfCategory.kt +++ b/app/src/main/java/org/xtimms/shirizu/core/model/ShelfCategory.kt @@ -1,4 +1,4 @@ -package org.xtimms.etsudoku.core.model +package org.xtimms.shirizu.core.model import java.io.Serializable diff --git a/app/src/main/java/org/xtimms/etsudoku/core/model/TagsBlacklist.kt b/app/src/main/java/org/xtimms/shirizu/core/model/TagsBlacklist.kt similarity index 95% rename from app/src/main/java/org/xtimms/etsudoku/core/model/TagsBlacklist.kt rename to app/src/main/java/org/xtimms/shirizu/core/model/TagsBlacklist.kt index 7ff4ab1..14be948 100644 --- a/app/src/main/java/org/xtimms/etsudoku/core/model/TagsBlacklist.kt +++ b/app/src/main/java/org/xtimms/shirizu/core/model/TagsBlacklist.kt @@ -1,4 +1,4 @@ -package org.xtimms.etsudoku.core.model +package org.xtimms.shirizu.core.model import org.koitharu.kotatsu.parsers.model.Manga import org.koitharu.kotatsu.parsers.model.MangaTag diff --git a/app/src/main/java/org/xtimms/etsudoku/core/model/parcelable/ParcelableMangaTags.kt b/app/src/main/java/org/xtimms/shirizu/core/model/parcelable/ParcelableMangaTags.kt similarity index 87% rename from app/src/main/java/org/xtimms/etsudoku/core/model/parcelable/ParcelableMangaTags.kt rename to app/src/main/java/org/xtimms/shirizu/core/model/parcelable/ParcelableMangaTags.kt index cd1920e..70ec851 100644 --- a/app/src/main/java/org/xtimms/etsudoku/core/model/parcelable/ParcelableMangaTags.kt +++ b/app/src/main/java/org/xtimms/shirizu/core/model/parcelable/ParcelableMangaTags.kt @@ -1,4 +1,4 @@ -package org.xtimms.etsudoku.core.model.parcelable +package org.xtimms.shirizu.core.model.parcelable import android.os.Parcel import android.os.Parcelable @@ -6,7 +6,7 @@ import kotlinx.parcelize.Parceler import kotlinx.parcelize.Parcelize import kotlinx.parcelize.TypeParceler import org.koitharu.kotatsu.parsers.model.MangaTag -import org.xtimms.etsudoku.utils.lang.readSerializableCompat +import org.xtimms.shirizu.utils.lang.readSerializableCompat object MangaTagParceler : Parceler { override fun create(parcel: Parcel) = MangaTag( diff --git a/app/src/main/java/org/xtimms/etsudoku/core/model/parcelable/ParcerableManga.kt b/app/src/main/java/org/xtimms/shirizu/core/model/parcelable/ParcerableManga.kt similarity index 92% rename from app/src/main/java/org/xtimms/etsudoku/core/model/parcelable/ParcerableManga.kt rename to app/src/main/java/org/xtimms/shirizu/core/model/parcelable/ParcerableManga.kt index f1ca97e..c5ff57c 100644 --- a/app/src/main/java/org/xtimms/etsudoku/core/model/parcelable/ParcerableManga.kt +++ b/app/src/main/java/org/xtimms/shirizu/core/model/parcelable/ParcerableManga.kt @@ -1,4 +1,4 @@ -package org.xtimms.etsudoku.core.model.parcelable +package org.xtimms.shirizu.core.model.parcelable import android.os.Parcel import android.os.Parcelable @@ -6,8 +6,8 @@ import androidx.core.os.ParcelCompat import kotlinx.parcelize.Parceler import kotlinx.parcelize.Parcelize import org.koitharu.kotatsu.parsers.model.Manga -import org.xtimms.etsudoku.utils.lang.readParcelableCompat -import org.xtimms.etsudoku.utils.lang.readSerializableCompat +import org.xtimms.shirizu.utils.lang.readParcelableCompat +import org.xtimms.shirizu.utils.lang.readSerializableCompat @Parcelize data class ParcelableManga( diff --git a/app/src/main/java/org/xtimms/etsudoku/core/motion/MaterialSharedAxis.kt b/app/src/main/java/org/xtimms/shirizu/core/motion/MaterialSharedAxis.kt similarity index 98% rename from app/src/main/java/org/xtimms/etsudoku/core/motion/MaterialSharedAxis.kt rename to app/src/main/java/org/xtimms/shirizu/core/motion/MaterialSharedAxis.kt index aedce3d..47bcbb1 100644 --- a/app/src/main/java/org/xtimms/etsudoku/core/motion/MaterialSharedAxis.kt +++ b/app/src/main/java/org/xtimms/shirizu/core/motion/MaterialSharedAxis.kt @@ -1,4 +1,4 @@ -package org.xtimms.etsudoku.core.motion +package org.xtimms.shirizu.core.motion import androidx.compose.animation.ContentTransform import androidx.compose.animation.EnterTransition diff --git a/app/src/main/java/org/xtimms/etsudoku/core/motion/MotionConstants.kt b/app/src/main/java/org/xtimms/shirizu/core/motion/MotionConstants.kt similarity index 87% rename from app/src/main/java/org/xtimms/etsudoku/core/motion/MotionConstants.kt rename to app/src/main/java/org/xtimms/shirizu/core/motion/MotionConstants.kt index 92b9e44..a7884d5 100644 --- a/app/src/main/java/org/xtimms/etsudoku/core/motion/MotionConstants.kt +++ b/app/src/main/java/org/xtimms/shirizu/core/motion/MotionConstants.kt @@ -1,4 +1,4 @@ -package org.xtimms.etsudoku.core.motion +package org.xtimms.shirizu.core.motion import androidx.compose.ui.unit.Dp import androidx.compose.ui.unit.dp diff --git a/app/src/main/java/org/xtimms/etsudoku/core/motion/sharedelements/DelayExit.kt b/app/src/main/java/org/xtimms/shirizu/core/motion/sharedelements/DelayExit.kt similarity index 95% rename from app/src/main/java/org/xtimms/etsudoku/core/motion/sharedelements/DelayExit.kt rename to app/src/main/java/org/xtimms/shirizu/core/motion/sharedelements/DelayExit.kt index 8e01389..5e507b0 100644 --- a/app/src/main/java/org/xtimms/etsudoku/core/motion/sharedelements/DelayExit.kt +++ b/app/src/main/java/org/xtimms/shirizu/core/motion/sharedelements/DelayExit.kt @@ -1,4 +1,4 @@ -package org.xtimms.etsudoku.core.motion.sharedelements +package org.xtimms.shirizu.core.motion.sharedelements import androidx.compose.runtime.Composable import androidx.compose.runtime.getValue diff --git a/app/src/main/java/org/xtimms/etsudoku/core/motion/sharedelements/ElementContainer.kt b/app/src/main/java/org/xtimms/shirizu/core/motion/sharedelements/ElementContainer.kt similarity index 95% rename from app/src/main/java/org/xtimms/etsudoku/core/motion/sharedelements/ElementContainer.kt rename to app/src/main/java/org/xtimms/shirizu/core/motion/sharedelements/ElementContainer.kt index f0f1d9b..6b7b12e 100644 --- a/app/src/main/java/org/xtimms/etsudoku/core/motion/sharedelements/ElementContainer.kt +++ b/app/src/main/java/org/xtimms/shirizu/core/motion/sharedelements/ElementContainer.kt @@ -1,4 +1,4 @@ -package org.xtimms.etsudoku.core.motion.sharedelements +package org.xtimms.shirizu.core.motion.sharedelements import androidx.compose.runtime.Composable import androidx.compose.ui.Modifier diff --git a/app/src/main/java/org/xtimms/etsudoku/core/motion/sharedelements/KeyframeBasedMotion.kt b/app/src/main/java/org/xtimms/shirizu/core/motion/sharedelements/KeyframeBasedMotion.kt similarity index 97% rename from app/src/main/java/org/xtimms/etsudoku/core/motion/sharedelements/KeyframeBasedMotion.kt rename to app/src/main/java/org/xtimms/shirizu/core/motion/sharedelements/KeyframeBasedMotion.kt index 31d39c8..08b2ecb 100644 --- a/app/src/main/java/org/xtimms/etsudoku/core/motion/sharedelements/KeyframeBasedMotion.kt +++ b/app/src/main/java/org/xtimms/shirizu/core/motion/sharedelements/KeyframeBasedMotion.kt @@ -1,4 +1,4 @@ -package org.xtimms.etsudoku.core.motion.sharedelements +package org.xtimms.shirizu.core.motion.sharedelements import androidx.compose.ui.geometry.Offset import androidx.compose.ui.geometry.lerp diff --git a/app/src/main/java/org/xtimms/etsudoku/core/motion/sharedelements/MaterialArcMotion.kt b/app/src/main/java/org/xtimms/shirizu/core/motion/sharedelements/MaterialArcMotion.kt similarity index 87% rename from app/src/main/java/org/xtimms/etsudoku/core/motion/sharedelements/MaterialArcMotion.kt rename to app/src/main/java/org/xtimms/shirizu/core/motion/sharedelements/MaterialArcMotion.kt index b68ad8e..fda3c0e 100644 --- a/app/src/main/java/org/xtimms/etsudoku/core/motion/sharedelements/MaterialArcMotion.kt +++ b/app/src/main/java/org/xtimms/shirizu/core/motion/sharedelements/MaterialArcMotion.kt @@ -1,4 +1,4 @@ -package org.xtimms.etsudoku.core.motion.sharedelements +package org.xtimms.shirizu.core.motion.sharedelements import androidx.compose.ui.geometry.Offset diff --git a/app/src/main/java/org/xtimms/etsudoku/core/motion/sharedelements/MathUtils.kt b/app/src/main/java/org/xtimms/shirizu/core/motion/sharedelements/MathUtils.kt similarity index 96% rename from app/src/main/java/org/xtimms/etsudoku/core/motion/sharedelements/MathUtils.kt rename to app/src/main/java/org/xtimms/shirizu/core/motion/sharedelements/MathUtils.kt index 40d3dee..0aa41a9 100644 --- a/app/src/main/java/org/xtimms/etsudoku/core/motion/sharedelements/MathUtils.kt +++ b/app/src/main/java/org/xtimms/shirizu/core/motion/sharedelements/MathUtils.kt @@ -1,4 +1,4 @@ -package org.xtimms.etsudoku.core.motion.sharedelements +package org.xtimms.shirizu.core.motion.sharedelements import androidx.compose.ui.geometry.Offset import androidx.compose.ui.geometry.Rect diff --git a/app/src/main/java/org/xtimms/etsudoku/core/motion/sharedelements/PathMotion.kt b/app/src/main/java/org/xtimms/shirizu/core/motion/sharedelements/PathMotion.kt similarity index 68% rename from app/src/main/java/org/xtimms/etsudoku/core/motion/sharedelements/PathMotion.kt rename to app/src/main/java/org/xtimms/shirizu/core/motion/sharedelements/PathMotion.kt index 5d34f6a..6fca21a 100644 --- a/app/src/main/java/org/xtimms/etsudoku/core/motion/sharedelements/PathMotion.kt +++ b/app/src/main/java/org/xtimms/shirizu/core/motion/sharedelements/PathMotion.kt @@ -1,4 +1,4 @@ -package org.xtimms.etsudoku.core.motion.sharedelements +package org.xtimms.shirizu.core.motion.sharedelements import androidx.compose.ui.geometry.Offset import androidx.compose.ui.geometry.lerp diff --git a/app/src/main/java/org/xtimms/etsudoku/core/motion/sharedelements/ProgressThresholds.kt b/app/src/main/java/org/xtimms/shirizu/core/motion/sharedelements/ProgressThresholds.kt similarity index 94% rename from app/src/main/java/org/xtimms/etsudoku/core/motion/sharedelements/ProgressThresholds.kt rename to app/src/main/java/org/xtimms/shirizu/core/motion/sharedelements/ProgressThresholds.kt index 9f6c1e4..eaca76a 100644 --- a/app/src/main/java/org/xtimms/etsudoku/core/motion/sharedelements/ProgressThresholds.kt +++ b/app/src/main/java/org/xtimms/shirizu/core/motion/sharedelements/ProgressThresholds.kt @@ -1,4 +1,4 @@ -package org.xtimms.etsudoku.core.motion.sharedelements +package org.xtimms.shirizu.core.motion.sharedelements import androidx.compose.runtime.Immutable import androidx.compose.runtime.Stable diff --git a/app/src/main/java/org/xtimms/etsudoku/core/motion/sharedelements/QuadraticBezier.kt b/app/src/main/java/org/xtimms/shirizu/core/motion/sharedelements/QuadraticBezier.kt similarity index 97% rename from app/src/main/java/org/xtimms/etsudoku/core/motion/sharedelements/QuadraticBezier.kt rename to app/src/main/java/org/xtimms/shirizu/core/motion/sharedelements/QuadraticBezier.kt index cb5446b..fc7ae7e 100644 --- a/app/src/main/java/org/xtimms/etsudoku/core/motion/sharedelements/QuadraticBezier.kt +++ b/app/src/main/java/org/xtimms/shirizu/core/motion/sharedelements/QuadraticBezier.kt @@ -1,4 +1,4 @@ -package org.xtimms.etsudoku.core.motion.sharedelements +package org.xtimms.shirizu.core.motion.sharedelements import androidx.compose.ui.geometry.Offset diff --git a/app/src/main/java/org/xtimms/etsudoku/core/motion/sharedelements/SharedElement.kt b/app/src/main/java/org/xtimms/shirizu/core/motion/sharedelements/SharedElement.kt similarity index 98% rename from app/src/main/java/org/xtimms/etsudoku/core/motion/sharedelements/SharedElement.kt rename to app/src/main/java/org/xtimms/shirizu/core/motion/sharedelements/SharedElement.kt index 95d095a..bdedc94 100644 --- a/app/src/main/java/org/xtimms/etsudoku/core/motion/sharedelements/SharedElement.kt +++ b/app/src/main/java/org/xtimms/shirizu/core/motion/sharedelements/SharedElement.kt @@ -1,4 +1,4 @@ -package org.xtimms.etsudoku.core.motion.sharedelements +package org.xtimms.shirizu.core.motion.sharedelements import androidx.compose.foundation.layout.offset import androidx.compose.foundation.layout.size diff --git a/app/src/main/java/org/xtimms/etsudoku/core/motion/sharedelements/SharedElementsRoot.kt b/app/src/main/java/org/xtimms/shirizu/core/motion/sharedelements/SharedElementsRoot.kt similarity index 99% rename from app/src/main/java/org/xtimms/etsudoku/core/motion/sharedelements/SharedElementsRoot.kt rename to app/src/main/java/org/xtimms/shirizu/core/motion/sharedelements/SharedElementsRoot.kt index 33887a9..be70513 100644 --- a/app/src/main/java/org/xtimms/etsudoku/core/motion/sharedelements/SharedElementsRoot.kt +++ b/app/src/main/java/org/xtimms/shirizu/core/motion/sharedelements/SharedElementsRoot.kt @@ -1,4 +1,4 @@ -package org.xtimms.etsudoku.core.motion.sharedelements +package org.xtimms.shirizu.core.motion.sharedelements import android.view.Choreographer import androidx.compose.animation.core.Animatable diff --git a/app/src/main/java/org/xtimms/etsudoku/core/motion/sharedelements/SharedElementsTransitionSpec.kt b/app/src/main/java/org/xtimms/shirizu/core/motion/sharedelements/SharedElementsTransitionSpec.kt similarity index 94% rename from app/src/main/java/org/xtimms/etsudoku/core/motion/sharedelements/SharedElementsTransitionSpec.kt rename to app/src/main/java/org/xtimms/shirizu/core/motion/sharedelements/SharedElementsTransitionSpec.kt index 7348763..359eb35 100644 --- a/app/src/main/java/org/xtimms/etsudoku/core/motion/sharedelements/SharedElementsTransitionSpec.kt +++ b/app/src/main/java/org/xtimms/shirizu/core/motion/sharedelements/SharedElementsTransitionSpec.kt @@ -1,4 +1,4 @@ -package org.xtimms.etsudoku.core.motion.sharedelements +package org.xtimms.shirizu.core.motion.sharedelements import androidx.compose.animation.core.AnimationConstants import androidx.compose.animation.core.Easing diff --git a/app/src/main/java/org/xtimms/etsudoku/core/motion/sharedelements/SharedMaterialContainer.kt b/app/src/main/java/org/xtimms/shirizu/core/motion/sharedelements/SharedMaterialContainer.kt similarity index 99% rename from app/src/main/java/org/xtimms/etsudoku/core/motion/sharedelements/SharedMaterialContainer.kt rename to app/src/main/java/org/xtimms/shirizu/core/motion/sharedelements/SharedMaterialContainer.kt index d9a5e56..7c66e7b 100644 --- a/app/src/main/java/org/xtimms/etsudoku/core/motion/sharedelements/SharedMaterialContainer.kt +++ b/app/src/main/java/org/xtimms/shirizu/core/motion/sharedelements/SharedMaterialContainer.kt @@ -1,4 +1,4 @@ -package org.xtimms.etsudoku.core.motion.sharedelements +package org.xtimms.shirizu.core.motion.sharedelements import androidx.compose.animation.core.AnimationConstants import androidx.compose.animation.core.Easing diff --git a/app/src/main/java/org/xtimms/etsudoku/core/network/CommonHeaders.kt b/app/src/main/java/org/xtimms/shirizu/core/network/CommonHeaders.kt similarity index 94% rename from app/src/main/java/org/xtimms/etsudoku/core/network/CommonHeaders.kt rename to app/src/main/java/org/xtimms/shirizu/core/network/CommonHeaders.kt index 5861787..29fb611 100644 --- a/app/src/main/java/org/xtimms/etsudoku/core/network/CommonHeaders.kt +++ b/app/src/main/java/org/xtimms/shirizu/core/network/CommonHeaders.kt @@ -1,4 +1,4 @@ -package org.xtimms.etsudoku.core.network +package org.xtimms.shirizu.core.network import okhttp3.CacheControl diff --git a/app/src/main/java/org/xtimms/etsudoku/core/network/HttpClients.kt b/app/src/main/java/org/xtimms/shirizu/core/network/HttpClients.kt similarity index 69% rename from app/src/main/java/org/xtimms/etsudoku/core/network/HttpClients.kt rename to app/src/main/java/org/xtimms/shirizu/core/network/HttpClients.kt index 7def503..93911c6 100644 --- a/app/src/main/java/org/xtimms/etsudoku/core/network/HttpClients.kt +++ b/app/src/main/java/org/xtimms/shirizu/core/network/HttpClients.kt @@ -1,4 +1,4 @@ -package org.xtimms.etsudoku.core.network +package org.xtimms.shirizu.core.network import javax.inject.Qualifier diff --git a/app/src/main/java/org/xtimms/etsudoku/core/network/NetworkModule.kt b/app/src/main/java/org/xtimms/shirizu/core/network/NetworkModule.kt similarity index 75% rename from app/src/main/java/org/xtimms/etsudoku/core/network/NetworkModule.kt rename to app/src/main/java/org/xtimms/shirizu/core/network/NetworkModule.kt index 3059ecb..526b6df 100644 --- a/app/src/main/java/org/xtimms/etsudoku/core/network/NetworkModule.kt +++ b/app/src/main/java/org/xtimms/shirizu/core/network/NetworkModule.kt @@ -1,4 +1,4 @@ -package org.xtimms.etsudoku.core.network +package org.xtimms.shirizu.core.network import android.content.Context import android.util.AndroidRuntimeException @@ -11,16 +11,16 @@ import dagger.hilt.components.SingletonComponent import okhttp3.Cache import okhttp3.CookieJar import okhttp3.OkHttpClient -import org.xtimms.etsudoku.core.network.cookies.AndroidCookieJar -import org.xtimms.etsudoku.core.network.cookies.MutableCookieJar -import org.xtimms.etsudoku.core.network.cookies.PreferencesCookieJar -import org.xtimms.etsudoku.core.network.interceptors.CacheLimitInterceptor -import org.xtimms.etsudoku.core.network.interceptors.CloudflareInterceptor -import org.xtimms.etsudoku.core.network.interceptors.CommonHeadersInterceptor -import org.xtimms.etsudoku.core.network.interceptors.GZipInterceptor -import org.xtimms.etsudoku.core.network.interceptors.RateLimitInterceptor -import org.xtimms.etsudoku.core.prefs.AppSettings -import org.xtimms.etsudoku.data.LocalStorageManager +import org.xtimms.shirizu.core.network.cookies.AndroidCookieJar +import org.xtimms.shirizu.core.network.cookies.MutableCookieJar +import org.xtimms.shirizu.core.network.cookies.PreferencesCookieJar +import org.xtimms.shirizu.core.network.interceptors.CacheLimitInterceptor +import org.xtimms.shirizu.core.network.interceptors.CloudflareInterceptor +import org.xtimms.shirizu.core.network.interceptors.CommonHeadersInterceptor +import org.xtimms.shirizu.core.network.interceptors.GZipInterceptor +import org.xtimms.shirizu.core.network.interceptors.RateLimitInterceptor +import org.xtimms.shirizu.core.prefs.AppSettings +import org.xtimms.shirizu.data.LocalStorageManager import java.util.concurrent.TimeUnit import javax.inject.Singleton diff --git a/app/src/main/java/org/xtimms/etsudoku/core/network/SSLBypass.kt b/app/src/main/java/org/xtimms/shirizu/core/network/SSLBypass.kt similarity index 96% rename from app/src/main/java/org/xtimms/etsudoku/core/network/SSLBypass.kt rename to app/src/main/java/org/xtimms/shirizu/core/network/SSLBypass.kt index bd65bb7..9b3aa40 100644 --- a/app/src/main/java/org/xtimms/etsudoku/core/network/SSLBypass.kt +++ b/app/src/main/java/org/xtimms/shirizu/core/network/SSLBypass.kt @@ -1,4 +1,4 @@ -package org.xtimms.etsudoku.core.network +package org.xtimms.shirizu.core.network import android.annotation.SuppressLint import okhttp3.OkHttpClient diff --git a/app/src/main/java/org/xtimms/etsudoku/core/network/cookies/AndroidCookieJar.kt b/app/src/main/java/org/xtimms/shirizu/core/network/cookies/AndroidCookieJar.kt similarity index 94% rename from app/src/main/java/org/xtimms/etsudoku/core/network/cookies/AndroidCookieJar.kt rename to app/src/main/java/org/xtimms/shirizu/core/network/cookies/AndroidCookieJar.kt index 765caa3..aebef49 100644 --- a/app/src/main/java/org/xtimms/etsudoku/core/network/cookies/AndroidCookieJar.kt +++ b/app/src/main/java/org/xtimms/shirizu/core/network/cookies/AndroidCookieJar.kt @@ -1,11 +1,11 @@ -package org.xtimms.etsudoku.core.network.cookies +package org.xtimms.shirizu.core.network.cookies import android.webkit.CookieManager import androidx.annotation.WorkerThread import androidx.core.util.Predicate import okhttp3.Cookie import okhttp3.HttpUrl -import org.xtimms.etsudoku.utils.system.newBuilder +import org.xtimms.shirizu.utils.system.newBuilder import kotlin.coroutines.resume import kotlin.coroutines.suspendCoroutine diff --git a/app/src/main/java/org/xtimms/etsudoku/core/network/cookies/CookieWrapper.kt b/app/src/main/java/org/xtimms/shirizu/core/network/cookies/CookieWrapper.kt similarity index 97% rename from app/src/main/java/org/xtimms/etsudoku/core/network/cookies/CookieWrapper.kt rename to app/src/main/java/org/xtimms/shirizu/core/network/cookies/CookieWrapper.kt index 5c4a9b5..7fa3295 100644 --- a/app/src/main/java/org/xtimms/etsudoku/core/network/cookies/CookieWrapper.kt +++ b/app/src/main/java/org/xtimms/shirizu/core/network/cookies/CookieWrapper.kt @@ -1,4 +1,4 @@ -package org.xtimms.etsudoku.core.network.cookies +package org.xtimms.shirizu.core.network.cookies import android.util.Base64 import okhttp3.Cookie diff --git a/app/src/main/java/org/xtimms/etsudoku/core/network/cookies/MutableCookieJar.kt b/app/src/main/java/org/xtimms/shirizu/core/network/cookies/MutableCookieJar.kt similarity index 90% rename from app/src/main/java/org/xtimms/etsudoku/core/network/cookies/MutableCookieJar.kt rename to app/src/main/java/org/xtimms/shirizu/core/network/cookies/MutableCookieJar.kt index ec52974..1859d1d 100644 --- a/app/src/main/java/org/xtimms/etsudoku/core/network/cookies/MutableCookieJar.kt +++ b/app/src/main/java/org/xtimms/shirizu/core/network/cookies/MutableCookieJar.kt @@ -1,4 +1,4 @@ -package org.xtimms.etsudoku.core.network.cookies +package org.xtimms.shirizu.core.network.cookies import androidx.annotation.WorkerThread import androidx.core.util.Predicate diff --git a/app/src/main/java/org/xtimms/etsudoku/core/network/cookies/PreferencesCookieJar.kt b/app/src/main/java/org/xtimms/shirizu/core/network/cookies/PreferencesCookieJar.kt similarity index 98% rename from app/src/main/java/org/xtimms/etsudoku/core/network/cookies/PreferencesCookieJar.kt rename to app/src/main/java/org/xtimms/shirizu/core/network/cookies/PreferencesCookieJar.kt index 6de3059..27efd28 100644 --- a/app/src/main/java/org/xtimms/etsudoku/core/network/cookies/PreferencesCookieJar.kt +++ b/app/src/main/java/org/xtimms/shirizu/core/network/cookies/PreferencesCookieJar.kt @@ -1,4 +1,4 @@ -package org.xtimms.etsudoku.core.network.cookies +package org.xtimms.shirizu.core.network.cookies import android.content.Context import androidx.annotation.WorkerThread diff --git a/app/src/main/java/org/xtimms/etsudoku/core/network/interceptors/CacheLimitInterceptor.kt b/app/src/main/java/org/xtimms/shirizu/core/network/interceptors/CacheLimitInterceptor.kt similarity index 88% rename from app/src/main/java/org/xtimms/etsudoku/core/network/interceptors/CacheLimitInterceptor.kt rename to app/src/main/java/org/xtimms/shirizu/core/network/interceptors/CacheLimitInterceptor.kt index 229df8b..325384a 100644 --- a/app/src/main/java/org/xtimms/etsudoku/core/network/interceptors/CacheLimitInterceptor.kt +++ b/app/src/main/java/org/xtimms/shirizu/core/network/interceptors/CacheLimitInterceptor.kt @@ -1,9 +1,9 @@ -package org.xtimms.etsudoku.core.network.interceptors +package org.xtimms.shirizu.core.network.interceptors import okhttp3.CacheControl import okhttp3.Interceptor import okhttp3.Response -import org.xtimms.etsudoku.core.network.CommonHeaders +import org.xtimms.shirizu.core.network.CommonHeaders import java.util.concurrent.TimeUnit class CacheLimitInterceptor : Interceptor { diff --git a/app/src/main/java/org/xtimms/etsudoku/core/network/interceptors/CloudflareInterceptor.kt b/app/src/main/java/org/xtimms/shirizu/core/network/interceptors/CloudflareInterceptor.kt similarity index 90% rename from app/src/main/java/org/xtimms/etsudoku/core/network/interceptors/CloudflareInterceptor.kt rename to app/src/main/java/org/xtimms/shirizu/core/network/interceptors/CloudflareInterceptor.kt index 08b3675..b5cd5f4 100644 --- a/app/src/main/java/org/xtimms/etsudoku/core/network/interceptors/CloudflareInterceptor.kt +++ b/app/src/main/java/org/xtimms/shirizu/core/network/interceptors/CloudflareInterceptor.kt @@ -1,11 +1,11 @@ -package org.xtimms.etsudoku.core.network.interceptors +package org.xtimms.shirizu.core.network.interceptors import okhttp3.Interceptor import okhttp3.Response import okhttp3.internal.closeQuietly import org.jsoup.Jsoup import org.koitharu.kotatsu.parsers.model.MangaSource -import org.xtimms.etsudoku.core.exceptions.CloudflareProtectedException +import org.xtimms.shirizu.core.exceptions.CloudflareProtectedException import java.net.HttpURLConnection.HTTP_FORBIDDEN import java.net.HttpURLConnection.HTTP_UNAVAILABLE diff --git a/app/src/main/java/org/xtimms/etsudoku/core/network/interceptors/CommonHeadersInterceptor.kt b/app/src/main/java/org/xtimms/shirizu/core/network/interceptors/CommonHeadersInterceptor.kt similarity index 88% rename from app/src/main/java/org/xtimms/etsudoku/core/network/interceptors/CommonHeadersInterceptor.kt rename to app/src/main/java/org/xtimms/shirizu/core/network/interceptors/CommonHeadersInterceptor.kt index 65701a8..8afb7de 100644 --- a/app/src/main/java/org/xtimms/etsudoku/core/network/interceptors/CommonHeadersInterceptor.kt +++ b/app/src/main/java/org/xtimms/shirizu/core/network/interceptors/CommonHeadersInterceptor.kt @@ -1,4 +1,4 @@ -package org.xtimms.etsudoku.core.network.interceptors +package org.xtimms.shirizu.core.network.interceptors import android.util.Log import dagger.Lazy @@ -9,10 +9,10 @@ import okhttp3.Response import org.koitharu.kotatsu.parsers.model.MangaSource import org.koitharu.kotatsu.parsers.network.UserAgents import org.koitharu.kotatsu.parsers.util.mergeWith -import org.xtimms.etsudoku.BuildConfig -import org.xtimms.etsudoku.core.network.CommonHeaders -import org.xtimms.etsudoku.core.parser.MangaRepository -import org.xtimms.etsudoku.core.parser.RemoteMangaRepository +import org.xtimms.shirizu.BuildConfig +import org.xtimms.shirizu.core.network.CommonHeaders +import org.xtimms.shirizu.core.parser.MangaRepository +import org.xtimms.shirizu.core.parser.RemoteMangaRepository import java.net.IDN import javax.inject.Inject import javax.inject.Singleton diff --git a/app/src/main/java/org/xtimms/etsudoku/core/network/interceptors/GZipInterceptor.kt b/app/src/main/java/org/xtimms/shirizu/core/network/interceptors/GZipInterceptor.kt similarity index 78% rename from app/src/main/java/org/xtimms/etsudoku/core/network/interceptors/GZipInterceptor.kt rename to app/src/main/java/org/xtimms/shirizu/core/network/interceptors/GZipInterceptor.kt index 86c8172..9a80cb6 100644 --- a/app/src/main/java/org/xtimms/etsudoku/core/network/interceptors/GZipInterceptor.kt +++ b/app/src/main/java/org/xtimms/shirizu/core/network/interceptors/GZipInterceptor.kt @@ -1,9 +1,9 @@ -package org.xtimms.etsudoku.core.network.interceptors +package org.xtimms.shirizu.core.network.interceptors import okhttp3.Interceptor import okhttp3.Response import okio.IOException -import org.xtimms.etsudoku.core.network.CommonHeaders.CONTENT_ENCODING +import org.xtimms.shirizu.core.network.CommonHeaders.CONTENT_ENCODING class GZipInterceptor : Interceptor { diff --git a/app/src/main/java/org/xtimms/etsudoku/core/network/interceptors/ImageProxyInterceptor.kt b/app/src/main/java/org/xtimms/shirizu/core/network/interceptors/ImageProxyInterceptor.kt similarity index 92% rename from app/src/main/java/org/xtimms/etsudoku/core/network/interceptors/ImageProxyInterceptor.kt rename to app/src/main/java/org/xtimms/shirizu/core/network/interceptors/ImageProxyInterceptor.kt index 0274e38..28f9ba0 100644 --- a/app/src/main/java/org/xtimms/etsudoku/core/network/interceptors/ImageProxyInterceptor.kt +++ b/app/src/main/java/org/xtimms/shirizu/core/network/interceptors/ImageProxyInterceptor.kt @@ -1,4 +1,4 @@ -package org.xtimms.etsudoku.core.network.interceptors +package org.xtimms.shirizu.core.network.interceptors import android.util.Log import androidx.collection.ArraySet @@ -15,10 +15,10 @@ import okhttp3.Request import okhttp3.Response import org.koitharu.kotatsu.parsers.util.await import org.koitharu.kotatsu.parsers.util.runCatchingCancellable -import org.xtimms.etsudoku.BuildConfig -import org.xtimms.etsudoku.core.prefs.AppSettings -import org.xtimms.etsudoku.utils.system.ensureSuccess -import org.xtimms.etsudoku.utils.system.isHttpOrHttps +import org.xtimms.shirizu.BuildConfig +import org.xtimms.shirizu.core.prefs.AppSettings +import org.xtimms.shirizu.utils.system.ensureSuccess +import org.xtimms.shirizu.utils.system.isHttpOrHttps import java.util.Collections import javax.inject.Inject import javax.inject.Singleton diff --git a/app/src/main/java/org/xtimms/etsudoku/core/network/interceptors/RateLimitInterceptor.kt b/app/src/main/java/org/xtimms/shirizu/core/network/interceptors/RateLimitInterceptor.kt similarity index 84% rename from app/src/main/java/org/xtimms/etsudoku/core/network/interceptors/RateLimitInterceptor.kt rename to app/src/main/java/org/xtimms/shirizu/core/network/interceptors/RateLimitInterceptor.kt index c15f5f9..e55e02d 100644 --- a/app/src/main/java/org/xtimms/etsudoku/core/network/interceptors/RateLimitInterceptor.kt +++ b/app/src/main/java/org/xtimms/shirizu/core/network/interceptors/RateLimitInterceptor.kt @@ -1,10 +1,10 @@ -package org.xtimms.etsudoku.core.network.interceptors +package org.xtimms.shirizu.core.network.interceptors import okhttp3.Interceptor import okhttp3.Response import okhttp3.internal.closeQuietly -import org.xtimms.etsudoku.core.exceptions.TooManyRequestExceptions -import org.xtimms.etsudoku.core.network.CommonHeaders +import org.xtimms.shirizu.core.exceptions.TooManyRequestExceptions +import org.xtimms.shirizu.core.network.CommonHeaders import java.time.Instant import java.time.ZonedDateTime import java.time.format.DateTimeFormatter diff --git a/app/src/main/java/org/xtimms/etsudoku/core/os/NetworkState.kt b/app/src/main/java/org/xtimms/shirizu/core/os/NetworkState.kt similarity index 90% rename from app/src/main/java/org/xtimms/etsudoku/core/os/NetworkState.kt rename to app/src/main/java/org/xtimms/shirizu/core/os/NetworkState.kt index c5a51c0..64c9e9b 100644 --- a/app/src/main/java/org/xtimms/etsudoku/core/os/NetworkState.kt +++ b/app/src/main/java/org/xtimms/shirizu/core/os/NetworkState.kt @@ -1,12 +1,12 @@ -package org.xtimms.etsudoku.core.os +package org.xtimms.shirizu.core.os import android.net.ConnectivityManager import android.net.Network import android.net.NetworkCapabilities import android.net.NetworkRequest import kotlinx.coroutines.flow.first -import org.xtimms.etsudoku.utils.MediatorStateFlow -import org.xtimms.etsudoku.utils.system.isOnline +import org.xtimms.shirizu.utils.MediatorStateFlow +import org.xtimms.shirizu.utils.system.isOnline class NetworkState( private val connectivityManager: ConnectivityManager, diff --git a/app/src/main/java/org/xtimms/etsudoku/core/parser/LocalMangaRepository.kt b/app/src/main/java/org/xtimms/shirizu/core/parser/LocalMangaRepository.kt similarity index 50% rename from app/src/main/java/org/xtimms/etsudoku/core/parser/LocalMangaRepository.kt rename to app/src/main/java/org/xtimms/shirizu/core/parser/LocalMangaRepository.kt index bfabbd5..d189030 100644 --- a/app/src/main/java/org/xtimms/etsudoku/core/parser/LocalMangaRepository.kt +++ b/app/src/main/java/org/xtimms/shirizu/core/parser/LocalMangaRepository.kt @@ -1,4 +1,4 @@ -package org.xtimms.etsudoku.core.parser +package org.xtimms.shirizu.core.parser private const val MAX_PARALLELISM = 4 diff --git a/app/src/main/java/org/xtimms/etsudoku/core/parser/MangaDataRepository.kt b/app/src/main/java/org/xtimms/shirizu/core/parser/MangaDataRepository.kt similarity index 77% rename from app/src/main/java/org/xtimms/etsudoku/core/parser/MangaDataRepository.kt rename to app/src/main/java/org/xtimms/shirizu/core/parser/MangaDataRepository.kt index 1898c18..cfa029a 100644 --- a/app/src/main/java/org/xtimms/etsudoku/core/parser/MangaDataRepository.kt +++ b/app/src/main/java/org/xtimms/shirizu/core/parser/MangaDataRepository.kt @@ -1,18 +1,18 @@ -package org.xtimms.etsudoku.core.parser +package org.xtimms.shirizu.core.parser import androidx.room.withTransaction import dagger.Reusable import org.koitharu.kotatsu.parsers.model.Manga -import org.xtimms.etsudoku.core.database.EtsudokuDatabase -import org.xtimms.etsudoku.core.database.entity.toEntities -import org.xtimms.etsudoku.core.database.entity.toEntity -import org.xtimms.etsudoku.core.database.entity.toManga +import org.xtimms.shirizu.core.database.ShirizuDatabase +import org.xtimms.shirizu.core.database.entity.toEntities +import org.xtimms.shirizu.core.database.entity.toEntity +import org.xtimms.shirizu.core.database.entity.toManga import javax.inject.Inject import javax.inject.Provider @Reusable class MangaDataRepository @Inject constructor( - private val db: EtsudokuDatabase, + private val db: ShirizuDatabase, private val resolverProvider: Provider, ) { diff --git a/app/src/main/java/org/xtimms/etsudoku/core/parser/MangaIntent.kt b/app/src/main/java/org/xtimms/shirizu/core/parser/MangaIntent.kt similarity index 82% rename from app/src/main/java/org/xtimms/etsudoku/core/parser/MangaIntent.kt rename to app/src/main/java/org/xtimms/shirizu/core/parser/MangaIntent.kt index f44c41f..3c18f3c 100644 --- a/app/src/main/java/org/xtimms/etsudoku/core/parser/MangaIntent.kt +++ b/app/src/main/java/org/xtimms/shirizu/core/parser/MangaIntent.kt @@ -1,14 +1,14 @@ -package org.xtimms.etsudoku.core.parser +package org.xtimms.shirizu.core.parser import android.content.Intent import android.net.Uri import android.os.Bundle import androidx.lifecycle.SavedStateHandle import org.koitharu.kotatsu.parsers.model.Manga -import org.xtimms.etsudoku.MainActivity -import org.xtimms.etsudoku.core.model.parcelable.ParcelableManga -import org.xtimms.etsudoku.utils.lang.getParcelableCompat -import org.xtimms.etsudoku.utils.lang.getParcelableExtraCompat +import org.xtimms.shirizu.MainActivity +import org.xtimms.shirizu.core.model.parcelable.ParcelableManga +import org.xtimms.shirizu.utils.lang.getParcelableCompat +import org.xtimms.shirizu.utils.lang.getParcelableExtraCompat class MangaIntent private constructor( @JvmField val manga: Manga?, diff --git a/app/src/main/java/org/xtimms/etsudoku/core/parser/MangaLinkResolver.kt b/app/src/main/java/org/xtimms/shirizu/core/parser/MangaLinkResolver.kt similarity index 95% rename from app/src/main/java/org/xtimms/etsudoku/core/parser/MangaLinkResolver.kt rename to app/src/main/java/org/xtimms/shirizu/core/parser/MangaLinkResolver.kt index 4cb0c89..5ef06b4 100644 --- a/app/src/main/java/org/xtimms/etsudoku/core/parser/MangaLinkResolver.kt +++ b/app/src/main/java/org/xtimms/shirizu/core/parser/MangaLinkResolver.kt @@ -1,4 +1,4 @@ -package org.xtimms.etsudoku.core.parser +package org.xtimms.shirizu.core.parser import android.net.Uri import coil.request.CachePolicy @@ -12,9 +12,9 @@ import org.koitharu.kotatsu.parsers.util.almostEquals import org.koitharu.kotatsu.parsers.util.levenshteinDistance import org.koitharu.kotatsu.parsers.util.runCatchingCancellable import org.koitharu.kotatsu.parsers.util.toRelativeUrl -import org.xtimms.etsudoku.core.model.MangaSource -import org.xtimms.etsudoku.data.repository.MangaSourcesRepository -import org.xtimms.etsudoku.utils.lang.ifNullOrEmpty +import org.xtimms.shirizu.core.model.MangaSource +import org.xtimms.shirizu.data.repository.MangaSourcesRepository +import org.xtimms.shirizu.utils.lang.ifNullOrEmpty import javax.inject.Inject @Reusable diff --git a/app/src/main/java/org/xtimms/etsudoku/core/parser/MangaLoaderContextImpl.kt b/app/src/main/java/org/xtimms/shirizu/core/parser/MangaLoaderContextImpl.kt similarity index 88% rename from app/src/main/java/org/xtimms/etsudoku/core/parser/MangaLoaderContextImpl.kt rename to app/src/main/java/org/xtimms/shirizu/core/parser/MangaLoaderContextImpl.kt index 82cdbc5..301f583 100644 --- a/app/src/main/java/org/xtimms/etsudoku/core/parser/MangaLoaderContextImpl.kt +++ b/app/src/main/java/org/xtimms/shirizu/core/parser/MangaLoaderContextImpl.kt @@ -1,4 +1,4 @@ -package org.xtimms.etsudoku.core.parser +package org.xtimms.shirizu.core.parser import android.annotation.SuppressLint import android.content.Context @@ -12,10 +12,10 @@ import okhttp3.OkHttpClient import org.koitharu.kotatsu.parsers.MangaLoaderContext import org.koitharu.kotatsu.parsers.config.MangaSourceConfig import org.koitharu.kotatsu.parsers.model.MangaSource -import org.xtimms.etsudoku.core.network.MangaHttpClient -import org.xtimms.etsudoku.core.network.cookies.MutableCookieJar -import org.xtimms.etsudoku.core.prefs.SourceSettings -import org.xtimms.etsudoku.utils.system.toList +import org.xtimms.shirizu.core.network.MangaHttpClient +import org.xtimms.shirizu.core.network.cookies.MutableCookieJar +import org.xtimms.shirizu.core.prefs.SourceSettings +import org.xtimms.shirizu.utils.system.toList import java.lang.ref.WeakReference import java.util.Locale import javax.inject.Inject diff --git a/app/src/main/java/org/xtimms/etsudoku/core/parser/MangaParser.kt b/app/src/main/java/org/xtimms/shirizu/core/parser/MangaParser.kt similarity index 87% rename from app/src/main/java/org/xtimms/etsudoku/core/parser/MangaParser.kt rename to app/src/main/java/org/xtimms/shirizu/core/parser/MangaParser.kt index 5982837..810e254 100644 --- a/app/src/main/java/org/xtimms/etsudoku/core/parser/MangaParser.kt +++ b/app/src/main/java/org/xtimms/shirizu/core/parser/MangaParser.kt @@ -1,4 +1,4 @@ -package org.xtimms.etsudoku.core.parser +package org.xtimms.shirizu.core.parser import org.koitharu.kotatsu.parsers.MangaLoaderContext import org.koitharu.kotatsu.parsers.MangaParser diff --git a/app/src/main/java/org/xtimms/etsudoku/core/parser/MangaRepository.kt b/app/src/main/java/org/xtimms/shirizu/core/parser/MangaRepository.kt similarity index 93% rename from app/src/main/java/org/xtimms/etsudoku/core/parser/MangaRepository.kt rename to app/src/main/java/org/xtimms/shirizu/core/parser/MangaRepository.kt index 0859cbf..42ac783 100644 --- a/app/src/main/java/org/xtimms/etsudoku/core/parser/MangaRepository.kt +++ b/app/src/main/java/org/xtimms/shirizu/core/parser/MangaRepository.kt @@ -1,4 +1,4 @@ -package org.xtimms.etsudoku.core.parser +package org.xtimms.shirizu.core.parser import androidx.annotation.AnyThread import org.koitharu.kotatsu.parsers.MangaLoaderContext @@ -11,8 +11,8 @@ import org.koitharu.kotatsu.parsers.model.MangaSource import org.koitharu.kotatsu.parsers.model.MangaState import org.koitharu.kotatsu.parsers.model.MangaTag import org.koitharu.kotatsu.parsers.model.SortOrder -import org.xtimms.etsudoku.core.cache.ContentCache -import org.xtimms.etsudoku.core.parser.local.LocalMangaRepository +import org.xtimms.shirizu.core.cache.ContentCache +import org.xtimms.shirizu.core.parser.local.LocalMangaRepository import java.lang.ref.WeakReference import java.util.EnumMap import java.util.Locale diff --git a/app/src/main/java/org/xtimms/etsudoku/core/parser/RemoteMangaRepository.kt b/app/src/main/java/org/xtimms/shirizu/core/parser/RemoteMangaRepository.kt similarity index 94% rename from app/src/main/java/org/xtimms/etsudoku/core/parser/RemoteMangaRepository.kt rename to app/src/main/java/org/xtimms/shirizu/core/parser/RemoteMangaRepository.kt index 30fa7b0..c4a476e 100644 --- a/app/src/main/java/org/xtimms/etsudoku/core/parser/RemoteMangaRepository.kt +++ b/app/src/main/java/org/xtimms/shirizu/core/parser/RemoteMangaRepository.kt @@ -1,4 +1,4 @@ -package org.xtimms.etsudoku.core.parser +package org.xtimms.shirizu.core.parser import android.util.Log import coil.request.CachePolicy @@ -26,11 +26,11 @@ import org.koitharu.kotatsu.parsers.model.MangaTag import org.koitharu.kotatsu.parsers.model.SortOrder import org.koitharu.kotatsu.parsers.util.domain import org.koitharu.kotatsu.parsers.util.runCatchingCancellable -import org.xtimms.etsudoku.BuildConfig -import org.xtimms.etsudoku.core.cache.ContentCache -import org.xtimms.etsudoku.core.cache.SafeDeferred -import org.xtimms.etsudoku.core.prefs.SourceSettings -import org.xtimms.etsudoku.utils.lang.processLifecycleScope +import org.xtimms.shirizu.BuildConfig +import org.xtimms.shirizu.core.cache.ContentCache +import org.xtimms.shirizu.core.cache.SafeDeferred +import org.xtimms.shirizu.core.prefs.SourceSettings +import org.xtimms.shirizu.utils.lang.processLifecycleScope import java.util.Locale @OptIn(InternalParsersApi::class) diff --git a/app/src/main/java/org/xtimms/etsudoku/core/parser/favicon/FaviconFetcher.kt b/app/src/main/java/org/xtimms/shirizu/core/parser/favicon/FaviconFetcher.kt similarity index 94% rename from app/src/main/java/org/xtimms/etsudoku/core/parser/favicon/FaviconFetcher.kt rename to app/src/main/java/org/xtimms/shirizu/core/parser/favicon/FaviconFetcher.kt index ae0b45e..fbef918 100644 --- a/app/src/main/java/org/xtimms/etsudoku/core/parser/favicon/FaviconFetcher.kt +++ b/app/src/main/java/org/xtimms/shirizu/core/parser/favicon/FaviconFetcher.kt @@ -1,4 +1,4 @@ -package org.xtimms.etsudoku.core.parser.favicon +package org.xtimms.shirizu.core.parser.favicon import android.content.Context import android.net.Uri @@ -25,12 +25,12 @@ import okio.Closeable import okio.buffer import org.koitharu.kotatsu.parsers.model.MangaSource import org.koitharu.kotatsu.parsers.util.await -import org.xtimms.etsudoku.core.cache.CacheDir -import org.xtimms.etsudoku.core.model.MangaSource -import org.xtimms.etsudoku.core.parser.MangaRepository -import org.xtimms.etsudoku.core.parser.RemoteMangaRepository -import org.xtimms.etsudoku.utils.lang.writeAllCancellable -import org.xtimms.etsudoku.utils.withExtraCloseable +import org.xtimms.shirizu.core.cache.CacheDir +import org.xtimms.shirizu.core.model.MangaSource +import org.xtimms.shirizu.core.parser.MangaRepository +import org.xtimms.shirizu.core.parser.RemoteMangaRepository +import org.xtimms.shirizu.utils.lang.writeAllCancellable +import org.xtimms.shirizu.utils.withExtraCloseable import java.net.HttpURLConnection import kotlin.coroutines.coroutineContext diff --git a/app/src/main/java/org/xtimms/etsudoku/core/parser/favicon/FaviconUri.kt b/app/src/main/java/org/xtimms/shirizu/core/parser/favicon/FaviconUri.kt similarity index 74% rename from app/src/main/java/org/xtimms/etsudoku/core/parser/favicon/FaviconUri.kt rename to app/src/main/java/org/xtimms/shirizu/core/parser/favicon/FaviconUri.kt index 65293ac..fa065cf 100644 --- a/app/src/main/java/org/xtimms/etsudoku/core/parser/favicon/FaviconUri.kt +++ b/app/src/main/java/org/xtimms/shirizu/core/parser/favicon/FaviconUri.kt @@ -1,4 +1,4 @@ -package org.xtimms.etsudoku.core.parser.favicon +package org.xtimms.shirizu.core.parser.favicon import android.net.Uri import org.koitharu.kotatsu.parsers.model.MangaSource diff --git a/app/src/main/java/org/xtimms/etsudoku/core/parser/local/CbzFilter.kt b/app/src/main/java/org/xtimms/shirizu/core/parser/local/CbzFilter.kt similarity index 77% rename from app/src/main/java/org/xtimms/etsudoku/core/parser/local/CbzFilter.kt rename to app/src/main/java/org/xtimms/shirizu/core/parser/local/CbzFilter.kt index 122665d..1c74487 100644 --- a/app/src/main/java/org/xtimms/etsudoku/core/parser/local/CbzFilter.kt +++ b/app/src/main/java/org/xtimms/shirizu/core/parser/local/CbzFilter.kt @@ -1,7 +1,7 @@ -package org.xtimms.etsudoku.core.parser.local +package org.xtimms.shirizu.core.parser.local import android.net.Uri -import org.xtimms.etsudoku.utils.system.URI_SCHEME_ZIP +import org.xtimms.shirizu.utils.system.URI_SCHEME_ZIP import java.io.File private fun isCbzExtension(ext: String?): Boolean { diff --git a/app/src/main/java/org/xtimms/etsudoku/core/parser/local/DownloadFormat.kt b/app/src/main/java/org/xtimms/shirizu/core/parser/local/DownloadFormat.kt similarity index 62% rename from app/src/main/java/org/xtimms/etsudoku/core/parser/local/DownloadFormat.kt rename to app/src/main/java/org/xtimms/shirizu/core/parser/local/DownloadFormat.kt index 1eb40f7..2b55fd9 100644 --- a/app/src/main/java/org/xtimms/etsudoku/core/parser/local/DownloadFormat.kt +++ b/app/src/main/java/org/xtimms/shirizu/core/parser/local/DownloadFormat.kt @@ -1,4 +1,4 @@ -package org.xtimms.etsudoku.core.parser.local +package org.xtimms.shirizu.core.parser.local enum class DownloadFormat { diff --git a/app/src/main/java/org/xtimms/etsudoku/core/parser/local/LocalMangaRepository.kt b/app/src/main/java/org/xtimms/shirizu/core/parser/local/LocalMangaRepository.kt similarity index 91% rename from app/src/main/java/org/xtimms/etsudoku/core/parser/local/LocalMangaRepository.kt rename to app/src/main/java/org/xtimms/shirizu/core/parser/local/LocalMangaRepository.kt index 6f7feb8..78a298e 100644 --- a/app/src/main/java/org/xtimms/etsudoku/core/parser/local/LocalMangaRepository.kt +++ b/app/src/main/java/org/xtimms/shirizu/core/parser/local/LocalMangaRepository.kt @@ -1,4 +1,4 @@ -package org.xtimms.etsudoku.core.parser.local +package org.xtimms.shirizu.core.parser.local import android.net.Uri import androidx.core.net.toFile @@ -21,18 +21,18 @@ import org.koitharu.kotatsu.parsers.model.MangaState import org.koitharu.kotatsu.parsers.model.MangaTag import org.koitharu.kotatsu.parsers.model.SortOrder import org.koitharu.kotatsu.parsers.util.runCatchingCancellable -import org.xtimms.etsudoku.core.model.LocalManga -import org.xtimms.etsudoku.core.model.isLocal -import org.xtimms.etsudoku.core.parser.MangaRepository -import org.xtimms.etsudoku.core.parser.local.input.LocalMangaInput -import org.xtimms.etsudoku.core.parser.local.output.LocalMangaOutput -import org.xtimms.etsudoku.core.parser.local.output.LocalMangaUtil -import org.xtimms.etsudoku.data.LocalStorageManager -import org.xtimms.etsudoku.utils.AlphanumComparator -import org.xtimms.etsudoku.utils.CompositeMutex2 -import org.xtimms.etsudoku.utils.system.children -import org.xtimms.etsudoku.utils.system.deleteAwait -import org.xtimms.etsudoku.utils.system.filterWith +import org.xtimms.shirizu.core.model.LocalManga +import org.xtimms.shirizu.core.model.isLocal +import org.xtimms.shirizu.core.parser.MangaRepository +import org.xtimms.shirizu.core.parser.local.input.LocalMangaInput +import org.xtimms.shirizu.core.parser.local.output.LocalMangaOutput +import org.xtimms.shirizu.core.parser.local.output.LocalMangaUtil +import org.xtimms.shirizu.data.LocalStorageManager +import org.xtimms.shirizu.utils.AlphanumComparator +import org.xtimms.shirizu.utils.CompositeMutex2 +import org.xtimms.shirizu.utils.system.children +import org.xtimms.shirizu.utils.system.deleteAwait +import org.xtimms.shirizu.utils.system.filterWith import java.io.File import java.util.EnumSet import java.util.Locale diff --git a/app/src/main/java/org/xtimms/etsudoku/core/parser/local/MangaIndex.kt b/app/src/main/java/org/xtimms/shirizu/core/parser/local/MangaIndex.kt similarity index 97% rename from app/src/main/java/org/xtimms/etsudoku/core/parser/local/MangaIndex.kt rename to app/src/main/java/org/xtimms/shirizu/core/parser/local/MangaIndex.kt index ee4ef3c..bed58d9 100644 --- a/app/src/main/java/org/xtimms/etsudoku/core/parser/local/MangaIndex.kt +++ b/app/src/main/java/org/xtimms/shirizu/core/parser/local/MangaIndex.kt @@ -1,4 +1,4 @@ -package org.xtimms.etsudoku.core.parser.local +package org.xtimms.shirizu.core.parser.local import androidx.annotation.WorkerThread import org.json.JSONArray @@ -16,9 +16,9 @@ import org.koitharu.kotatsu.parsers.util.json.getLongOrDefault import org.koitharu.kotatsu.parsers.util.json.getStringOrNull import org.koitharu.kotatsu.parsers.util.json.mapJSONToSet import org.koitharu.kotatsu.parsers.util.toTitleCase -import org.xtimms.etsudoku.BuildConfig -import org.xtimms.etsudoku.core.model.isLocal -import org.xtimms.etsudoku.utils.AlphanumComparator +import org.xtimms.shirizu.BuildConfig +import org.xtimms.shirizu.core.model.isLocal +import org.xtimms.shirizu.utils.AlphanumComparator import java.io.File class MangaIndex(source: String?) { diff --git a/app/src/main/java/org/xtimms/etsudoku/core/parser/local/Qualifiers.kt b/app/src/main/java/org/xtimms/shirizu/core/parser/local/Qualifiers.kt similarity index 50% rename from app/src/main/java/org/xtimms/etsudoku/core/parser/local/Qualifiers.kt rename to app/src/main/java/org/xtimms/shirizu/core/parser/local/Qualifiers.kt index b825aa6..a41e822 100644 --- a/app/src/main/java/org/xtimms/etsudoku/core/parser/local/Qualifiers.kt +++ b/app/src/main/java/org/xtimms/shirizu/core/parser/local/Qualifiers.kt @@ -1,4 +1,4 @@ -package org.xtimms.etsudoku.core.parser.local +package org.xtimms.shirizu.core.parser.local import javax.inject.Qualifier diff --git a/app/src/main/java/org/xtimms/etsudoku/core/parser/local/TempFileFilter.kt b/app/src/main/java/org/xtimms/shirizu/core/parser/local/TempFileFilter.kt similarity index 80% rename from app/src/main/java/org/xtimms/etsudoku/core/parser/local/TempFileFilter.kt rename to app/src/main/java/org/xtimms/shirizu/core/parser/local/TempFileFilter.kt index 3512463..b7048db 100644 --- a/app/src/main/java/org/xtimms/etsudoku/core/parser/local/TempFileFilter.kt +++ b/app/src/main/java/org/xtimms/shirizu/core/parser/local/TempFileFilter.kt @@ -1,4 +1,4 @@ -package org.xtimms.etsudoku.core.parser.local +package org.xtimms.shirizu.core.parser.local import java.io.File import java.io.FileFilter diff --git a/app/src/main/java/org/xtimms/etsudoku/core/parser/local/input/LocalMangaDirInput.kt b/app/src/main/java/org/xtimms/shirizu/core/parser/local/input/LocalMangaDirInput.kt similarity index 89% rename from app/src/main/java/org/xtimms/etsudoku/core/parser/local/input/LocalMangaDirInput.kt rename to app/src/main/java/org/xtimms/shirizu/core/parser/local/input/LocalMangaDirInput.kt index 559691c..c5c1161 100644 --- a/app/src/main/java/org/xtimms/etsudoku/core/parser/local/input/LocalMangaDirInput.kt +++ b/app/src/main/java/org/xtimms/shirizu/core/parser/local/input/LocalMangaDirInput.kt @@ -1,4 +1,4 @@ -package org.xtimms.etsudoku.core.parser.local.input +package org.xtimms.shirizu.core.parser.local.input import androidx.core.net.toFile import androidx.core.net.toUri @@ -9,17 +9,17 @@ import org.koitharu.kotatsu.parsers.model.MangaChapter import org.koitharu.kotatsu.parsers.model.MangaPage import org.koitharu.kotatsu.parsers.model.MangaSource import org.koitharu.kotatsu.parsers.util.toCamelCase -import org.xtimms.etsudoku.core.model.LocalManga -import org.xtimms.etsudoku.core.parser.local.MangaIndex -import org.xtimms.etsudoku.core.parser.local.hasCbzExtension -import org.xtimms.etsudoku.core.parser.local.output.LocalMangaOutput -import org.xtimms.etsudoku.utils.AlphanumComparator -import org.xtimms.etsudoku.utils.hasImageExtension -import org.xtimms.etsudoku.utils.lang.longHashCode -import org.xtimms.etsudoku.utils.lang.toListSorted -import org.xtimms.etsudoku.utils.system.children -import org.xtimms.etsudoku.utils.system.creationTime -import org.xtimms.etsudoku.utils.system.walkCompat +import org.xtimms.shirizu.core.model.LocalManga +import org.xtimms.shirizu.core.parser.local.MangaIndex +import org.xtimms.shirizu.core.parser.local.hasCbzExtension +import org.xtimms.shirizu.core.parser.local.output.LocalMangaOutput +import org.xtimms.shirizu.utils.AlphanumComparator +import org.xtimms.shirizu.utils.hasImageExtension +import org.xtimms.shirizu.utils.lang.longHashCode +import org.xtimms.shirizu.utils.lang.toListSorted +import org.xtimms.shirizu.utils.system.children +import org.xtimms.shirizu.utils.system.creationTime +import org.xtimms.shirizu.utils.system.walkCompat import java.io.File import java.util.TreeMap import java.util.zip.ZipFile diff --git a/app/src/main/java/org/xtimms/etsudoku/core/parser/local/input/LocalMangaInput.kt b/app/src/main/java/org/xtimms/shirizu/core/parser/local/input/LocalMangaInput.kt similarity index 95% rename from app/src/main/java/org/xtimms/etsudoku/core/parser/local/input/LocalMangaInput.kt rename to app/src/main/java/org/xtimms/shirizu/core/parser/local/input/LocalMangaInput.kt index c36a8fe..eaa270e 100644 --- a/app/src/main/java/org/xtimms/etsudoku/core/parser/local/input/LocalMangaInput.kt +++ b/app/src/main/java/org/xtimms/shirizu/core/parser/local/input/LocalMangaInput.kt @@ -1,4 +1,4 @@ -package org.xtimms.etsudoku.core.parser.local.input +package org.xtimms.shirizu.core.parser.local.input import android.net.Uri import androidx.core.net.toFile @@ -13,8 +13,8 @@ import org.koitharu.kotatsu.parsers.model.MangaPage import org.koitharu.kotatsu.parsers.model.MangaSource import org.koitharu.kotatsu.parsers.util.runCatchingCancellable import org.koitharu.kotatsu.parsers.util.toFileNameSafe -import org.xtimms.etsudoku.core.model.LocalManga -import org.xtimms.etsudoku.core.parser.local.hasCbzExtension +import org.xtimms.shirizu.core.model.LocalManga +import org.xtimms.shirizu.core.parser.local.hasCbzExtension import java.io.File sealed class LocalMangaInput( diff --git a/app/src/main/java/org/xtimms/etsudoku/core/parser/local/input/LocalMangaZipInput.kt b/app/src/main/java/org/xtimms/shirizu/core/parser/local/input/LocalMangaZipInput.kt similarity index 93% rename from app/src/main/java/org/xtimms/etsudoku/core/parser/local/input/LocalMangaZipInput.kt rename to app/src/main/java/org/xtimms/shirizu/core/parser/local/input/LocalMangaZipInput.kt index c22838b..c00f031 100644 --- a/app/src/main/java/org/xtimms/etsudoku/core/parser/local/input/LocalMangaZipInput.kt +++ b/app/src/main/java/org/xtimms/shirizu/core/parser/local/input/LocalMangaZipInput.kt @@ -1,4 +1,4 @@ -package org.xtimms.etsudoku.core.parser.local.input +package org.xtimms.shirizu.core.parser.local.input import android.net.Uri import android.webkit.MimeTypeMap @@ -12,13 +12,13 @@ import org.koitharu.kotatsu.parsers.model.MangaChapter import org.koitharu.kotatsu.parsers.model.MangaPage import org.koitharu.kotatsu.parsers.model.MangaSource import org.koitharu.kotatsu.parsers.util.toCamelCase -import org.xtimms.etsudoku.core.model.LocalManga -import org.xtimms.etsudoku.core.parser.local.MangaIndex -import org.xtimms.etsudoku.core.parser.local.output.LocalMangaOutput -import org.xtimms.etsudoku.utils.AlphanumComparator -import org.xtimms.etsudoku.utils.lang.longHashCode -import org.xtimms.etsudoku.utils.lang.toListSorted -import org.xtimms.etsudoku.utils.system.readText +import org.xtimms.shirizu.core.model.LocalManga +import org.xtimms.shirizu.core.parser.local.MangaIndex +import org.xtimms.shirizu.core.parser.local.output.LocalMangaOutput +import org.xtimms.shirizu.utils.AlphanumComparator +import org.xtimms.shirizu.utils.lang.longHashCode +import org.xtimms.shirizu.utils.lang.toListSorted +import org.xtimms.shirizu.utils.system.readText import java.io.File import java.util.Enumeration import java.util.zip.ZipEntry diff --git a/app/src/main/java/org/xtimms/etsudoku/core/parser/local/output/LocalMangaDirOutput.kt b/app/src/main/java/org/xtimms/shirizu/core/parser/local/output/LocalMangaDirOutput.kt similarity index 93% rename from app/src/main/java/org/xtimms/etsudoku/core/parser/local/output/LocalMangaDirOutput.kt rename to app/src/main/java/org/xtimms/shirizu/core/parser/local/output/LocalMangaDirOutput.kt index 6537583..530c563 100644 --- a/app/src/main/java/org/xtimms/etsudoku/core/parser/local/output/LocalMangaDirOutput.kt +++ b/app/src/main/java/org/xtimms/shirizu/core/parser/local/output/LocalMangaDirOutput.kt @@ -1,4 +1,4 @@ -package org.xtimms.etsudoku.core.parser.local.output +package org.xtimms.shirizu.core.parser.local.output import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.runInterruptible @@ -7,11 +7,11 @@ import kotlinx.coroutines.sync.withLock import org.koitharu.kotatsu.parsers.model.Manga import org.koitharu.kotatsu.parsers.model.MangaChapter import org.koitharu.kotatsu.parsers.util.toFileNameSafe -import org.xtimms.etsudoku.core.model.isLocal -import org.xtimms.etsudoku.core.parser.local.MangaIndex -import org.xtimms.etsudoku.core.zip.ZipOutput -import org.xtimms.etsudoku.utils.system.deleteAwait -import org.xtimms.etsudoku.utils.system.takeIfReadable +import org.xtimms.shirizu.core.model.isLocal +import org.xtimms.shirizu.core.parser.local.MangaIndex +import org.xtimms.shirizu.core.zip.ZipOutput +import org.xtimms.shirizu.utils.system.deleteAwait +import org.xtimms.shirizu.utils.system.takeIfReadable import java.io.File class LocalMangaDirOutput( diff --git a/app/src/main/java/org/xtimms/etsudoku/core/parser/local/output/LocalMangaOutput.kt b/app/src/main/java/org/xtimms/shirizu/core/parser/local/output/LocalMangaOutput.kt similarity index 95% rename from app/src/main/java/org/xtimms/etsudoku/core/parser/local/output/LocalMangaOutput.kt rename to app/src/main/java/org/xtimms/shirizu/core/parser/local/output/LocalMangaOutput.kt index 786caf7..7153f6c 100644 --- a/app/src/main/java/org/xtimms/etsudoku/core/parser/local/output/LocalMangaOutput.kt +++ b/app/src/main/java/org/xtimms/shirizu/core/parser/local/output/LocalMangaOutput.kt @@ -1,4 +1,4 @@ -package org.xtimms.etsudoku.core.parser.local.output +package org.xtimms.shirizu.core.parser.local.output import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.sync.Mutex @@ -9,8 +9,8 @@ import org.koitharu.kotatsu.parsers.model.Manga import org.koitharu.kotatsu.parsers.model.MangaChapter import org.koitharu.kotatsu.parsers.util.runCatchingCancellable import org.koitharu.kotatsu.parsers.util.toFileNameSafe -import org.xtimms.etsudoku.core.parser.local.DownloadFormat -import org.xtimms.etsudoku.core.parser.local.input.LocalMangaInput +import org.xtimms.shirizu.core.parser.local.DownloadFormat +import org.xtimms.shirizu.core.parser.local.input.LocalMangaInput import java.io.File sealed class LocalMangaOutput( diff --git a/app/src/main/java/org/xtimms/etsudoku/core/parser/local/output/LocalMangaUtil.kt b/app/src/main/java/org/xtimms/shirizu/core/parser/local/output/LocalMangaUtil.kt similarity index 95% rename from app/src/main/java/org/xtimms/etsudoku/core/parser/local/output/LocalMangaUtil.kt rename to app/src/main/java/org/xtimms/shirizu/core/parser/local/output/LocalMangaUtil.kt index 3a62aee..de3e224 100644 --- a/app/src/main/java/org/xtimms/etsudoku/core/parser/local/output/LocalMangaUtil.kt +++ b/app/src/main/java/org/xtimms/shirizu/core/parser/local/output/LocalMangaUtil.kt @@ -1,4 +1,4 @@ -package org.xtimms.etsudoku.core.parser.local.output +package org.xtimms.shirizu.core.parser.local.output import androidx.core.net.toFile import androidx.core.net.toUri diff --git a/app/src/main/java/org/xtimms/etsudoku/core/parser/local/output/LocalMangaZipOutput.kt b/app/src/main/java/org/xtimms/shirizu/core/parser/local/output/LocalMangaZipOutput.kt similarity index 94% rename from app/src/main/java/org/xtimms/etsudoku/core/parser/local/output/LocalMangaZipOutput.kt rename to app/src/main/java/org/xtimms/shirizu/core/parser/local/output/LocalMangaZipOutput.kt index 930ef12..7ab1870 100644 --- a/app/src/main/java/org/xtimms/etsudoku/core/parser/local/output/LocalMangaZipOutput.kt +++ b/app/src/main/java/org/xtimms/shirizu/core/parser/local/output/LocalMangaZipOutput.kt @@ -1,4 +1,4 @@ -package org.xtimms.etsudoku.core.parser.local.output +package org.xtimms.shirizu.core.parser.local.output import androidx.annotation.WorkerThread import kotlinx.coroutines.Dispatchers @@ -7,11 +7,11 @@ import kotlinx.coroutines.sync.Mutex import kotlinx.coroutines.sync.withLock import org.koitharu.kotatsu.parsers.model.Manga import org.koitharu.kotatsu.parsers.model.MangaChapter -import org.xtimms.etsudoku.core.model.isLocal -import org.xtimms.etsudoku.core.parser.local.MangaIndex -import org.xtimms.etsudoku.core.zip.ZipOutput -import org.xtimms.etsudoku.utils.system.deleteAwait -import org.xtimms.etsudoku.utils.system.readText +import org.xtimms.shirizu.core.model.isLocal +import org.xtimms.shirizu.core.parser.local.MangaIndex +import org.xtimms.shirizu.core.zip.ZipOutput +import org.xtimms.shirizu.utils.system.deleteAwait +import org.xtimms.shirizu.utils.system.readText import java.io.File import java.util.zip.ZipFile diff --git a/app/src/main/java/org/xtimms/etsudoku/core/prefs/AppSettings.kt b/app/src/main/java/org/xtimms/shirizu/core/prefs/AppSettings.kt similarity index 96% rename from app/src/main/java/org/xtimms/etsudoku/core/prefs/AppSettings.kt rename to app/src/main/java/org/xtimms/shirizu/core/prefs/AppSettings.kt index bb7f109..1286d0d 100644 --- a/app/src/main/java/org/xtimms/etsudoku/core/prefs/AppSettings.kt +++ b/app/src/main/java/org/xtimms/shirizu/core/prefs/AppSettings.kt @@ -1,4 +1,4 @@ -package org.xtimms.etsudoku.core.prefs +package org.xtimms.shirizu.core.prefs import android.os.Build import androidx.annotation.DeprecatedSinceApi @@ -13,11 +13,11 @@ import kotlinx.coroutines.flow.MutableStateFlow import kotlinx.coroutines.flow.asStateFlow import kotlinx.coroutines.flow.update import kotlinx.coroutines.launch -import org.xtimms.etsudoku.ui.theme.SEED -import org.xtimms.etsudoku.R -import org.xtimms.etsudoku.ui.monet.PaletteStyle -import org.xtimms.etsudoku.utils.lang.processLifecycleScope -import org.xtimms.etsudoku.utils.system.LocaleLanguageCodeMap +import org.xtimms.shirizu.ui.theme.SEED +import org.xtimms.shirizu.R +import org.xtimms.shirizu.ui.monet.PaletteStyle +import org.xtimms.shirizu.utils.lang.processLifecycleScope +import org.xtimms.shirizu.utils.system.LocaleLanguageCodeMap import java.util.Locale private const val DYNAMIC_COLOR = "dynamic_color" diff --git a/app/src/main/java/org/xtimms/etsudoku/core/prefs/KotatsuAppSettings.kt b/app/src/main/java/org/xtimms/shirizu/core/prefs/KotatsuAppSettings.kt similarity index 93% rename from app/src/main/java/org/xtimms/etsudoku/core/prefs/KotatsuAppSettings.kt rename to app/src/main/java/org/xtimms/shirizu/core/prefs/KotatsuAppSettings.kt index 7fd2b0b..3d6ba06 100644 --- a/app/src/main/java/org/xtimms/etsudoku/core/prefs/KotatsuAppSettings.kt +++ b/app/src/main/java/org/xtimms/shirizu/core/prefs/KotatsuAppSettings.kt @@ -1,4 +1,4 @@ -package org.xtimms.etsudoku.core.prefs +package org.xtimms.shirizu.core.prefs import android.content.Context import android.content.SharedPreferences @@ -15,9 +15,9 @@ import kotlinx.coroutines.flow.callbackFlow import kotlinx.coroutines.flow.flow import kotlinx.coroutines.flow.stateIn import kotlinx.coroutines.flow.transform -import org.xtimms.etsudoku.sections.explore.data.SourcesSortOrder -import org.xtimms.etsudoku.utils.system.getEnumValue -import org.xtimms.etsudoku.utils.system.putEnumValue +import org.xtimms.shirizu.sections.explore.data.SourcesSortOrder +import org.xtimms.shirizu.utils.system.getEnumValue +import org.xtimms.shirizu.utils.system.putEnumValue import javax.inject.Inject import javax.inject.Singleton diff --git a/app/src/main/java/org/xtimms/etsudoku/core/prefs/SourceSettings.kt b/app/src/main/java/org/xtimms/shirizu/core/prefs/SourceSettings.kt similarity index 90% rename from app/src/main/java/org/xtimms/etsudoku/core/prefs/SourceSettings.kt rename to app/src/main/java/org/xtimms/shirizu/core/prefs/SourceSettings.kt index ef725da..29826fd 100644 --- a/app/src/main/java/org/xtimms/etsudoku/core/prefs/SourceSettings.kt +++ b/app/src/main/java/org/xtimms/shirizu/core/prefs/SourceSettings.kt @@ -1,4 +1,4 @@ -package org.xtimms.etsudoku.core.prefs +package org.xtimms.shirizu.core.prefs import android.content.Context import androidx.core.content.edit @@ -6,9 +6,9 @@ import org.koitharu.kotatsu.parsers.config.ConfigKey import org.koitharu.kotatsu.parsers.config.MangaSourceConfig import org.koitharu.kotatsu.parsers.model.MangaSource import org.koitharu.kotatsu.parsers.model.SortOrder -import org.xtimms.etsudoku.utils.lang.ifNullOrEmpty -import org.xtimms.etsudoku.utils.system.getEnumValue -import org.xtimms.etsudoku.utils.system.putEnumValue +import org.xtimms.shirizu.utils.lang.ifNullOrEmpty +import org.xtimms.shirizu.utils.system.getEnumValue +import org.xtimms.shirizu.utils.system.putEnumValue private const val KEY_SORT_ORDER = "sort_order" private const val KEY_SLOWDOWN = "slowdown" diff --git a/app/src/main/java/org/xtimms/etsudoku/core/screens/EmptyScreen.kt b/app/src/main/java/org/xtimms/shirizu/core/screens/EmptyScreen.kt similarity index 95% rename from app/src/main/java/org/xtimms/etsudoku/core/screens/EmptyScreen.kt rename to app/src/main/java/org/xtimms/shirizu/core/screens/EmptyScreen.kt index bd55a34..aca305e 100644 --- a/app/src/main/java/org/xtimms/etsudoku/core/screens/EmptyScreen.kt +++ b/app/src/main/java/org/xtimms/shirizu/core/screens/EmptyScreen.kt @@ -1,4 +1,4 @@ -package org.xtimms.etsudoku.core.screens +package org.xtimms.shirizu.core.screens import androidx.annotation.StringRes import androidx.compose.foundation.layout.Arrangement @@ -27,8 +27,8 @@ import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.sp import androidx.compose.ui.util.fastForEach import kotlinx.collections.immutable.ImmutableList -import org.xtimms.etsudoku.core.components.ActionButton -import org.xtimms.etsudoku.utils.composable.secondaryItemAlpha +import org.xtimms.shirizu.core.components.ActionButton +import org.xtimms.shirizu.utils.composable.secondaryItemAlpha import kotlin.random.Random data class EmptyScreenAction( diff --git a/app/src/main/java/org/xtimms/etsudoku/core/screens/InfoScreen.kt b/app/src/main/java/org/xtimms/shirizu/core/screens/InfoScreen.kt similarity index 97% rename from app/src/main/java/org/xtimms/etsudoku/core/screens/InfoScreen.kt rename to app/src/main/java/org/xtimms/shirizu/core/screens/InfoScreen.kt index a5bf636..9663e50 100644 --- a/app/src/main/java/org/xtimms/etsudoku/core/screens/InfoScreen.kt +++ b/app/src/main/java/org/xtimms/shirizu/core/screens/InfoScreen.kt @@ -1,4 +1,4 @@ -package org.xtimms.etsudoku.core.screens +package org.xtimms.shirizu.core.screens import androidx.compose.foundation.background import androidx.compose.foundation.layout.Box @@ -29,7 +29,7 @@ import androidx.compose.ui.tooling.preview.PreviewLightDark import androidx.compose.ui.unit.Dp import androidx.compose.ui.unit.dp import androidx.compose.ui.zIndex -import org.xtimms.etsudoku.utils.composable.secondaryItemAlpha +import org.xtimms.shirizu.utils.composable.secondaryItemAlpha @Composable fun InfoScreen( diff --git a/app/src/main/java/org/xtimms/etsudoku/core/screens/LoadingScreen.kt b/app/src/main/java/org/xtimms/shirizu/core/screens/LoadingScreen.kt similarity index 92% rename from app/src/main/java/org/xtimms/etsudoku/core/screens/LoadingScreen.kt rename to app/src/main/java/org/xtimms/shirizu/core/screens/LoadingScreen.kt index 2ff39aa..0997c41 100644 --- a/app/src/main/java/org/xtimms/etsudoku/core/screens/LoadingScreen.kt +++ b/app/src/main/java/org/xtimms/shirizu/core/screens/LoadingScreen.kt @@ -1,4 +1,4 @@ -package org.xtimms.etsudoku.core.screens +package org.xtimms.shirizu.core.screens import androidx.compose.foundation.layout.Box import androidx.compose.foundation.layout.fillMaxSize diff --git a/app/src/main/java/org/xtimms/etsudoku/core/screens/UpdateDialog.kt b/app/src/main/java/org/xtimms/shirizu/core/screens/UpdateDialog.kt similarity index 93% rename from app/src/main/java/org/xtimms/etsudoku/core/screens/UpdateDialog.kt rename to app/src/main/java/org/xtimms/shirizu/core/screens/UpdateDialog.kt index 2225fe3..76c6c58 100644 --- a/app/src/main/java/org/xtimms/etsudoku/core/screens/UpdateDialog.kt +++ b/app/src/main/java/org/xtimms/shirizu/core/screens/UpdateDialog.kt @@ -1,4 +1,4 @@ -package org.xtimms.etsudoku.core.screens +package org.xtimms.shirizu.core.screens import androidx.compose.foundation.layout.Column import androidx.compose.foundation.rememberScrollState @@ -20,10 +20,10 @@ import androidx.compose.ui.platform.LocalContext import androidx.compose.ui.res.stringResource import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.launch -import org.xtimms.etsudoku.R -import org.xtimms.etsudoku.core.components.DismissButton -import org.xtimms.etsudoku.core.updates.Updater -import org.xtimms.etsudoku.utils.system.suspendToast +import org.xtimms.shirizu.R +import org.xtimms.shirizu.core.components.DismissButton +import org.xtimms.shirizu.core.updates.Updater +import org.xtimms.shirizu.utils.system.suspendToast @Composable fun UpdateDialog( diff --git a/app/src/main/java/org/xtimms/etsudoku/core/sync/SyncAccountAuthenticator.kt b/app/src/main/java/org/xtimms/shirizu/core/sync/SyncAccountAuthenticator.kt similarity index 98% rename from app/src/main/java/org/xtimms/etsudoku/core/sync/SyncAccountAuthenticator.kt rename to app/src/main/java/org/xtimms/shirizu/core/sync/SyncAccountAuthenticator.kt index 5151d6c..e7e6445 100644 --- a/app/src/main/java/org/xtimms/etsudoku/core/sync/SyncAccountAuthenticator.kt +++ b/app/src/main/java/org/xtimms/shirizu/core/sync/SyncAccountAuthenticator.kt @@ -1,4 +1,4 @@ -package org.xtimms.etsudoku.core.sync +package org.xtimms.shirizu.core.sync import android.accounts.AbstractAccountAuthenticator import android.accounts.Account diff --git a/app/src/main/java/org/xtimms/etsudoku/core/sync/SyncAdapterEntryPoint.kt b/app/src/main/java/org/xtimms/shirizu/core/sync/SyncAdapterEntryPoint.kt similarity index 86% rename from app/src/main/java/org/xtimms/etsudoku/core/sync/SyncAdapterEntryPoint.kt rename to app/src/main/java/org/xtimms/shirizu/core/sync/SyncAdapterEntryPoint.kt index ce38bca..6cf954a 100644 --- a/app/src/main/java/org/xtimms/etsudoku/core/sync/SyncAdapterEntryPoint.kt +++ b/app/src/main/java/org/xtimms/shirizu/core/sync/SyncAdapterEntryPoint.kt @@ -1,4 +1,4 @@ -package org.xtimms.etsudoku.core.sync +package org.xtimms.shirizu.core.sync import dagger.hilt.EntryPoint import dagger.hilt.InstallIn diff --git a/app/src/main/java/org/xtimms/etsudoku/core/sync/SyncAuthActivity.kt b/app/src/main/java/org/xtimms/shirizu/core/sync/SyncAuthActivity.kt similarity index 94% rename from app/src/main/java/org/xtimms/etsudoku/core/sync/SyncAuthActivity.kt rename to app/src/main/java/org/xtimms/shirizu/core/sync/SyncAuthActivity.kt index f3d2edb..cd9a097 100644 --- a/app/src/main/java/org/xtimms/etsudoku/core/sync/SyncAuthActivity.kt +++ b/app/src/main/java/org/xtimms/shirizu/core/sync/SyncAuthActivity.kt @@ -1,4 +1,4 @@ -package org.xtimms.etsudoku.core.sync +package org.xtimms.shirizu.core.sync import android.accounts.Account import android.accounts.AccountAuthenticatorResponse @@ -17,13 +17,13 @@ import androidx.transition.Fade import androidx.transition.TransitionManager import com.google.android.material.dialog.MaterialAlertDialogBuilder import dagger.hilt.android.AndroidEntryPoint -import org.xtimms.etsudoku.R -import org.xtimms.etsudoku.core.base.BaseActivity -import org.xtimms.etsudoku.databinding.ActivitySyncAuthBinding -import org.xtimms.etsudoku.utils.lang.getParcelableExtraCompat -import org.xtimms.etsudoku.utils.lang.observe -import org.xtimms.etsudoku.utils.lang.observeEvent -import org.xtimms.etsudoku.utils.system.getDisplayMessage +import org.xtimms.shirizu.R +import org.xtimms.shirizu.core.base.BaseActivity +import org.xtimms.shirizu.databinding.ActivitySyncAuthBinding +import org.xtimms.shirizu.utils.lang.getParcelableExtraCompat +import org.xtimms.shirizu.utils.lang.observe +import org.xtimms.shirizu.utils.lang.observeEvent +import org.xtimms.shirizu.utils.system.getDisplayMessage @AndroidEntryPoint class SyncAuthActivity : BaseActivity(), View.OnClickListener, diff --git a/app/src/main/java/org/xtimms/etsudoku/core/sync/SyncAuthApi.kt b/app/src/main/java/org/xtimms/shirizu/core/sync/SyncAuthApi.kt similarity index 87% rename from app/src/main/java/org/xtimms/etsudoku/core/sync/SyncAuthApi.kt rename to app/src/main/java/org/xtimms/shirizu/core/sync/SyncAuthApi.kt index 26a3e0d..fb5b819 100644 --- a/app/src/main/java/org/xtimms/etsudoku/core/sync/SyncAuthApi.kt +++ b/app/src/main/java/org/xtimms/shirizu/core/sync/SyncAuthApi.kt @@ -1,4 +1,4 @@ -package org.xtimms.etsudoku.core.sync +package org.xtimms.shirizu.core.sync import dagger.Reusable import okhttp3.OkHttpClient @@ -7,9 +7,9 @@ import org.json.JSONObject import org.koitharu.kotatsu.parsers.util.await import org.koitharu.kotatsu.parsers.util.parseJson import org.koitharu.kotatsu.parsers.util.removeSurrounding -import org.xtimms.etsudoku.core.exceptions.SyncApiException -import org.xtimms.etsudoku.core.network.BaseHttpClient -import org.xtimms.etsudoku.utils.system.toRequestBody +import org.xtimms.shirizu.core.exceptions.SyncApiException +import org.xtimms.shirizu.core.network.BaseHttpClient +import org.xtimms.shirizu.utils.system.toRequestBody import javax.inject.Inject @Reusable diff --git a/app/src/main/java/org/xtimms/etsudoku/core/sync/SyncAuthResult.kt b/app/src/main/java/org/xtimms/shirizu/core/sync/SyncAuthResult.kt similarity index 75% rename from app/src/main/java/org/xtimms/etsudoku/core/sync/SyncAuthResult.kt rename to app/src/main/java/org/xtimms/shirizu/core/sync/SyncAuthResult.kt index ffb5c13..9bf4cd2 100644 --- a/app/src/main/java/org/xtimms/etsudoku/core/sync/SyncAuthResult.kt +++ b/app/src/main/java/org/xtimms/shirizu/core/sync/SyncAuthResult.kt @@ -1,4 +1,4 @@ -package org.xtimms.etsudoku.core.sync +package org.xtimms.shirizu.core.sync data class SyncAuthResult( val host: String, diff --git a/app/src/main/java/org/xtimms/etsudoku/core/sync/SyncAuthViewModel.kt b/app/src/main/java/org/xtimms/shirizu/core/sync/SyncAuthViewModel.kt similarity index 84% rename from app/src/main/java/org/xtimms/etsudoku/core/sync/SyncAuthViewModel.kt rename to app/src/main/java/org/xtimms/shirizu/core/sync/SyncAuthViewModel.kt index 37e677a..69cba7d 100644 --- a/app/src/main/java/org/xtimms/etsudoku/core/sync/SyncAuthViewModel.kt +++ b/app/src/main/java/org/xtimms/shirizu/core/sync/SyncAuthViewModel.kt @@ -1,4 +1,4 @@ -package org.xtimms.etsudoku.core.sync +package org.xtimms.shirizu.core.sync import android.accounts.AccountManager import android.content.Context @@ -6,10 +6,10 @@ import dagger.hilt.android.lifecycle.HiltViewModel import dagger.hilt.android.qualifiers.ApplicationContext import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.flow.MutableStateFlow -import org.xtimms.etsudoku.R -import org.xtimms.etsudoku.core.base.viewmodel.KotatsuBaseViewModel -import org.xtimms.etsudoku.utils.lang.MutableEventFlow -import org.xtimms.etsudoku.utils.lang.call +import org.xtimms.shirizu.R +import org.xtimms.shirizu.core.base.viewmodel.KotatsuBaseViewModel +import org.xtimms.shirizu.utils.lang.MutableEventFlow +import org.xtimms.shirizu.utils.lang.call import javax.inject.Inject @HiltViewModel diff --git a/app/src/main/java/org/xtimms/etsudoku/core/sync/SyncAuthenticator.kt b/app/src/main/java/org/xtimms/shirizu/core/sync/SyncAuthenticator.kt similarity index 90% rename from app/src/main/java/org/xtimms/etsudoku/core/sync/SyncAuthenticator.kt rename to app/src/main/java/org/xtimms/shirizu/core/sync/SyncAuthenticator.kt index 68fa984..091ae7b 100644 --- a/app/src/main/java/org/xtimms/etsudoku/core/sync/SyncAuthenticator.kt +++ b/app/src/main/java/org/xtimms/shirizu/core/sync/SyncAuthenticator.kt @@ -1,4 +1,4 @@ -package org.xtimms.etsudoku.core.sync +package org.xtimms.shirizu.core.sync import android.accounts.Account import android.accounts.AccountManager @@ -8,8 +8,8 @@ import okhttp3.Authenticator import okhttp3.Request import okhttp3.Response import okhttp3.Route -import org.xtimms.etsudoku.R -import org.xtimms.etsudoku.core.network.CommonHeaders +import org.xtimms.shirizu.R +import org.xtimms.shirizu.core.network.CommonHeaders class SyncAuthenticator( context: Context, diff --git a/app/src/main/java/org/xtimms/etsudoku/core/sync/SyncAuthenticatorService.kt b/app/src/main/java/org/xtimms/shirizu/core/sync/SyncAuthenticatorService.kt similarity index 91% rename from app/src/main/java/org/xtimms/etsudoku/core/sync/SyncAuthenticatorService.kt rename to app/src/main/java/org/xtimms/shirizu/core/sync/SyncAuthenticatorService.kt index eb96da7..7da2716 100644 --- a/app/src/main/java/org/xtimms/etsudoku/core/sync/SyncAuthenticatorService.kt +++ b/app/src/main/java/org/xtimms/shirizu/core/sync/SyncAuthenticatorService.kt @@ -1,4 +1,4 @@ -package org.xtimms.etsudoku.core.sync +package org.xtimms.shirizu.core.sync import android.app.Service import android.content.Intent diff --git a/app/src/main/java/org/xtimms/etsudoku/core/sync/SyncController.kt b/app/src/main/java/org/xtimms/shirizu/core/sync/SyncController.kt similarity index 90% rename from app/src/main/java/org/xtimms/etsudoku/core/sync/SyncController.kt rename to app/src/main/java/org/xtimms/shirizu/core/sync/SyncController.kt index a18ef6a..95bc72f 100644 --- a/app/src/main/java/org/xtimms/etsudoku/core/sync/SyncController.kt +++ b/app/src/main/java/org/xtimms/shirizu/core/sync/SyncController.kt @@ -1,4 +1,4 @@ -package org.xtimms.etsudoku.core.sync +package org.xtimms.shirizu.core.sync import android.accounts.Account import android.accounts.AccountManager @@ -18,12 +18,12 @@ import kotlinx.coroutines.launch import kotlinx.coroutines.sync.Mutex import kotlinx.coroutines.sync.withLock import kotlinx.coroutines.withContext -import org.xtimms.etsudoku.R -import org.xtimms.etsudoku.core.database.TABLE_FAVOURITES -import org.xtimms.etsudoku.core.database.TABLE_FAVOURITE_CATEGORIES -import org.xtimms.etsudoku.core.database.TABLE_HISTORY -import org.xtimms.etsudoku.core.database.EtsudokuDatabase -import org.xtimms.etsudoku.utils.lang.processLifecycleScope +import org.xtimms.shirizu.R +import org.xtimms.shirizu.core.database.TABLE_FAVOURITES +import org.xtimms.shirizu.core.database.TABLE_FAVOURITE_CATEGORIES +import org.xtimms.shirizu.core.database.TABLE_HISTORY +import org.xtimms.shirizu.core.database.ShirizuDatabase +import org.xtimms.shirizu.utils.lang.processLifecycleScope import java.util.concurrent.TimeUnit import javax.inject.Inject import javax.inject.Provider @@ -32,7 +32,7 @@ import javax.inject.Singleton @Singleton class SyncController @Inject constructor( @ApplicationContext context: Context, - private val dbProvider: Provider, + private val dbProvider: Provider, ) : InvalidationTracker.Observer(arrayOf(TABLE_HISTORY, TABLE_FAVOURITES, TABLE_FAVOURITE_CATEGORIES)) { private val authorityHistory = context.getString(R.string.sync_authority_history) @@ -117,7 +117,7 @@ class SyncController @Inject constructor( return am.getAccountsByType(accountType).firstOrNull() } - private suspend fun EtsudokuDatabase.gc(favourites: Boolean, history: Boolean) = withTransaction { + private suspend fun ShirizuDatabase.gc(favourites: Boolean, history: Boolean) = withTransaction { val deletedAt = System.currentTimeMillis() - defaultGcPeriod if (history) { getHistoryDao().gc(deletedAt) diff --git a/app/src/main/java/org/xtimms/etsudoku/core/sync/SyncHelper.kt b/app/src/main/java/org/xtimms/shirizu/core/sync/SyncHelper.kt similarity index 93% rename from app/src/main/java/org/xtimms/etsudoku/core/sync/SyncHelper.kt rename to app/src/main/java/org/xtimms/shirizu/core/sync/SyncHelper.kt index 31712ac..8c2b14b 100644 --- a/app/src/main/java/org/xtimms/etsudoku/core/sync/SyncHelper.kt +++ b/app/src/main/java/org/xtimms/shirizu/core/sync/SyncHelper.kt @@ -1,4 +1,4 @@ -package org.xtimms.etsudoku.core.sync +package org.xtimms.shirizu.core.sync import android.accounts.Account import android.content.ContentProviderClient @@ -22,20 +22,20 @@ import okhttp3.Response import org.json.JSONArray import org.json.JSONObject import org.koitharu.kotatsu.parsers.util.json.mapJSONTo -import org.xtimms.etsudoku.R -import org.xtimms.etsudoku.core.database.TABLE_FAVOURITES -import org.xtimms.etsudoku.core.database.TABLE_FAVOURITE_CATEGORIES -import org.xtimms.etsudoku.core.database.TABLE_HISTORY -import org.xtimms.etsudoku.core.database.TABLE_MANGA -import org.xtimms.etsudoku.core.database.TABLE_MANGA_TAGS -import org.xtimms.etsudoku.core.database.TABLE_TAGS -import org.xtimms.etsudoku.core.logs.FileLogger -import org.xtimms.etsudoku.core.logs.SyncLogger -import org.xtimms.etsudoku.core.network.BaseHttpClient -import org.xtimms.etsudoku.utils.system.parseJsonOrNull -import org.xtimms.etsudoku.utils.system.toContentValues -import org.xtimms.etsudoku.utils.system.toJson -import org.xtimms.etsudoku.utils.system.toRequestBody +import org.xtimms.shirizu.R +import org.xtimms.shirizu.core.database.TABLE_FAVOURITES +import org.xtimms.shirizu.core.database.TABLE_FAVOURITE_CATEGORIES +import org.xtimms.shirizu.core.database.TABLE_HISTORY +import org.xtimms.shirizu.core.database.TABLE_MANGA +import org.xtimms.shirizu.core.database.TABLE_MANGA_TAGS +import org.xtimms.shirizu.core.database.TABLE_TAGS +import org.xtimms.shirizu.core.logs.FileLogger +import org.xtimms.shirizu.core.logs.SyncLogger +import org.xtimms.shirizu.core.network.BaseHttpClient +import org.xtimms.shirizu.utils.system.parseJsonOrNull +import org.xtimms.shirizu.utils.system.toContentValues +import org.xtimms.shirizu.utils.system.toJson +import org.xtimms.shirizu.utils.system.toRequestBody import java.util.concurrent.TimeUnit private const val FIELD_TIMESTAMP = "timestamp" diff --git a/app/src/main/java/org/xtimms/etsudoku/core/sync/SyncHostDialogFragment.kt b/app/src/main/java/org/xtimms/shirizu/core/sync/SyncHostDialogFragment.kt similarity index 90% rename from app/src/main/java/org/xtimms/etsudoku/core/sync/SyncHostDialogFragment.kt rename to app/src/main/java/org/xtimms/shirizu/core/sync/SyncHostDialogFragment.kt index 925acfb..18c1071 100644 --- a/app/src/main/java/org/xtimms/etsudoku/core/sync/SyncHostDialogFragment.kt +++ b/app/src/main/java/org/xtimms/shirizu/core/sync/SyncHostDialogFragment.kt @@ -1,4 +1,4 @@ -package org.xtimms.etsudoku.core.sync +package org.xtimms.shirizu.core.sync import android.content.DialogInterface import android.os.Bundle @@ -10,11 +10,11 @@ import androidx.core.view.updateLayoutParams import androidx.fragment.app.FragmentManager import com.google.android.material.dialog.MaterialAlertDialogBuilder import dagger.hilt.android.AndroidEntryPoint -import org.xtimms.etsudoku.R -import org.xtimms.etsudoku.core.base.AlertDialogFragment -import org.xtimms.etsudoku.databinding.PreferenceDialogAutocompleteTextViewBinding -import org.xtimms.etsudoku.utils.DomainValidator -import org.xtimms.etsudoku.utils.lang.ifNullOrEmpty +import org.xtimms.shirizu.R +import org.xtimms.shirizu.core.base.AlertDialogFragment +import org.xtimms.shirizu.databinding.PreferenceDialogAutocompleteTextViewBinding +import org.xtimms.shirizu.utils.DomainValidator +import org.xtimms.shirizu.utils.lang.ifNullOrEmpty import javax.inject.Inject @AndroidEntryPoint diff --git a/app/src/main/java/org/xtimms/etsudoku/core/sync/SyncInterceptor.kt b/app/src/main/java/org/xtimms/shirizu/core/sync/SyncInterceptor.kt similarity index 80% rename from app/src/main/java/org/xtimms/etsudoku/core/sync/SyncInterceptor.kt rename to app/src/main/java/org/xtimms/shirizu/core/sync/SyncInterceptor.kt index 82ed9d1..269c129 100644 --- a/app/src/main/java/org/xtimms/etsudoku/core/sync/SyncInterceptor.kt +++ b/app/src/main/java/org/xtimms/shirizu/core/sync/SyncInterceptor.kt @@ -1,14 +1,14 @@ -package org.xtimms.etsudoku.core.sync +package org.xtimms.shirizu.core.sync import android.accounts.Account import android.accounts.AccountManager import android.content.Context import okhttp3.Interceptor import okhttp3.Response -import org.xtimms.etsudoku.BuildConfig -import org.xtimms.etsudoku.R -import org.xtimms.etsudoku.core.database.DATABASE_VERSION -import org.xtimms.etsudoku.core.network.CommonHeaders +import org.xtimms.shirizu.BuildConfig +import org.xtimms.shirizu.R +import org.xtimms.shirizu.core.database.DATABASE_VERSION +import org.xtimms.shirizu.core.network.CommonHeaders class SyncInterceptor( context: Context, diff --git a/app/src/main/java/org/xtimms/etsudoku/core/sync/SyncProvider.kt b/app/src/main/java/org/xtimms/shirizu/core/sync/SyncProvider.kt similarity index 90% rename from app/src/main/java/org/xtimms/etsudoku/core/sync/SyncProvider.kt rename to app/src/main/java/org/xtimms/shirizu/core/sync/SyncProvider.kt index bdba3c4..00bbaba 100644 --- a/app/src/main/java/org/xtimms/etsudoku/core/sync/SyncProvider.kt +++ b/app/src/main/java/org/xtimms/shirizu/core/sync/SyncProvider.kt @@ -1,4 +1,4 @@ -package org.xtimms.etsudoku.core.sync +package org.xtimms.shirizu.core.sync import android.content.ContentProvider import android.content.ContentProviderOperation @@ -13,13 +13,13 @@ import dagger.hilt.EntryPoint import dagger.hilt.InstallIn import dagger.hilt.android.EntryPointAccessors import dagger.hilt.components.SingletonComponent -import org.xtimms.etsudoku.core.database.TABLE_FAVOURITES -import org.xtimms.etsudoku.core.database.TABLE_FAVOURITE_CATEGORIES -import org.xtimms.etsudoku.core.database.TABLE_HISTORY -import org.xtimms.etsudoku.core.database.TABLE_MANGA -import org.xtimms.etsudoku.core.database.TABLE_MANGA_TAGS -import org.xtimms.etsudoku.core.database.TABLE_TAGS -import org.xtimms.etsudoku.core.database.EtsudokuDatabase +import org.xtimms.shirizu.core.database.TABLE_FAVOURITES +import org.xtimms.shirizu.core.database.TABLE_FAVOURITE_CATEGORIES +import org.xtimms.shirizu.core.database.TABLE_HISTORY +import org.xtimms.shirizu.core.database.TABLE_MANGA +import org.xtimms.shirizu.core.database.TABLE_MANGA_TAGS +import org.xtimms.shirizu.core.database.TABLE_TAGS +import org.xtimms.shirizu.core.database.ShirizuDatabase import java.util.concurrent.Callable abstract class SyncProvider : ContentProvider() { @@ -125,6 +125,6 @@ abstract class SyncProvider : ContentProvider() { @InstallIn(SingletonComponent::class) interface SyncProviderEntryPoint { - val database: EtsudokuDatabase + val database: ShirizuDatabase } } \ No newline at end of file diff --git a/app/src/main/java/org/xtimms/etsudoku/core/sync/SyncSettings.kt b/app/src/main/java/org/xtimms/shirizu/core/sync/SyncSettings.kt similarity index 90% rename from app/src/main/java/org/xtimms/etsudoku/core/sync/SyncSettings.kt rename to app/src/main/java/org/xtimms/shirizu/core/sync/SyncSettings.kt index afa2ea5..fb64d13 100644 --- a/app/src/main/java/org/xtimms/etsudoku/core/sync/SyncSettings.kt +++ b/app/src/main/java/org/xtimms/shirizu/core/sync/SyncSettings.kt @@ -1,12 +1,12 @@ -package org.xtimms.etsudoku.core.sync +package org.xtimms.shirizu.core.sync import android.accounts.Account import android.accounts.AccountManager import android.content.Context import androidx.annotation.WorkerThread import dagger.hilt.android.qualifiers.ApplicationContext -import org.xtimms.etsudoku.R -import org.xtimms.etsudoku.utils.lang.ifNullOrEmpty +import org.xtimms.shirizu.R +import org.xtimms.shirizu.utils.lang.ifNullOrEmpty import javax.inject.Inject class SyncSettings( diff --git a/app/src/main/java/org/xtimms/etsudoku/core/tracker/Tracker.kt b/app/src/main/java/org/xtimms/shirizu/core/tracker/Tracker.kt similarity index 89% rename from app/src/main/java/org/xtimms/etsudoku/core/tracker/Tracker.kt rename to app/src/main/java/org/xtimms/shirizu/core/tracker/Tracker.kt index eaf6b73..b303fa2 100644 --- a/app/src/main/java/org/xtimms/etsudoku/core/tracker/Tracker.kt +++ b/app/src/main/java/org/xtimms/shirizu/core/tracker/Tracker.kt @@ -1,19 +1,19 @@ -package org.xtimms.etsudoku.core.tracker +package org.xtimms.shirizu.core.tracker import androidx.annotation.VisibleForTesting import androidx.collection.MutableLongSet import coil.request.CachePolicy import org.koitharu.kotatsu.parsers.model.Manga -import org.xtimms.etsudoku.core.model.getPreferredBranch -import org.xtimms.etsudoku.core.parser.MangaRepository -import org.xtimms.etsudoku.core.parser.RemoteMangaRepository -import org.xtimms.etsudoku.core.tracker.model.MangaTracking -import org.xtimms.etsudoku.core.tracker.model.MangaUpdates -import org.xtimms.etsudoku.data.repository.HistoryRepository -import org.xtimms.etsudoku.data.repository.TrackingRepository -import org.xtimms.etsudoku.utils.CompositeMutex2 -import org.xtimms.etsudoku.work.tracker.TrackerNotificationChannels -import org.xtimms.etsudoku.work.tracker.TrackingItem +import org.xtimms.shirizu.core.model.getPreferredBranch +import org.xtimms.shirizu.core.parser.MangaRepository +import org.xtimms.shirizu.core.parser.RemoteMangaRepository +import org.xtimms.shirizu.core.tracker.model.MangaTracking +import org.xtimms.shirizu.core.tracker.model.MangaUpdates +import org.xtimms.shirizu.data.repository.HistoryRepository +import org.xtimms.shirizu.data.repository.TrackingRepository +import org.xtimms.shirizu.utils.CompositeMutex2 +import org.xtimms.shirizu.work.tracker.TrackerNotificationChannels +import org.xtimms.shirizu.work.tracker.TrackingItem import javax.inject.Inject import kotlin.contracts.ExperimentalContracts import kotlin.contracts.InvocationKind diff --git a/app/src/main/java/org/xtimms/etsudoku/core/tracker/model/MangaTracking.kt b/app/src/main/java/org/xtimms/shirizu/core/tracker/model/MangaTracking.kt similarity index 84% rename from app/src/main/java/org/xtimms/etsudoku/core/tracker/model/MangaTracking.kt rename to app/src/main/java/org/xtimms/shirizu/core/tracker/model/MangaTracking.kt index 5367ebb..41420e3 100644 --- a/app/src/main/java/org/xtimms/etsudoku/core/tracker/model/MangaTracking.kt +++ b/app/src/main/java/org/xtimms/shirizu/core/tracker/model/MangaTracking.kt @@ -1,4 +1,4 @@ -package org.xtimms.etsudoku.core.tracker.model +package org.xtimms.shirizu.core.tracker.model import org.koitharu.kotatsu.parsers.model.Manga import java.time.Instant diff --git a/app/src/main/java/org/xtimms/etsudoku/core/tracker/model/MangaUpdates.kt b/app/src/main/java/org/xtimms/shirizu/core/tracker/model/MangaUpdates.kt similarity index 83% rename from app/src/main/java/org/xtimms/etsudoku/core/tracker/model/MangaUpdates.kt rename to app/src/main/java/org/xtimms/shirizu/core/tracker/model/MangaUpdates.kt index ebad6ad..7d0cde0 100644 --- a/app/src/main/java/org/xtimms/etsudoku/core/tracker/model/MangaUpdates.kt +++ b/app/src/main/java/org/xtimms/shirizu/core/tracker/model/MangaUpdates.kt @@ -1,8 +1,8 @@ -package org.xtimms.etsudoku.core.tracker.model +package org.xtimms.shirizu.core.tracker.model import org.koitharu.kotatsu.parsers.model.Manga import org.koitharu.kotatsu.parsers.model.MangaChapter -import org.xtimms.etsudoku.core.exceptions.TooManyRequestExceptions +import org.xtimms.shirizu.core.exceptions.TooManyRequestExceptions sealed interface MangaUpdates { diff --git a/app/src/main/java/org/xtimms/etsudoku/core/tracker/model/TrackingLogItem.kt b/app/src/main/java/org/xtimms/shirizu/core/tracker/model/TrackingLogItem.kt similarity index 79% rename from app/src/main/java/org/xtimms/etsudoku/core/tracker/model/TrackingLogItem.kt rename to app/src/main/java/org/xtimms/shirizu/core/tracker/model/TrackingLogItem.kt index 4a5b093..f0e4a6f 100644 --- a/app/src/main/java/org/xtimms/etsudoku/core/tracker/model/TrackingLogItem.kt +++ b/app/src/main/java/org/xtimms/shirizu/core/tracker/model/TrackingLogItem.kt @@ -1,7 +1,7 @@ -package org.xtimms.etsudoku.core.tracker.model +package org.xtimms.shirizu.core.tracker.model import org.koitharu.kotatsu.parsers.model.Manga -import org.xtimms.etsudoku.core.model.ListModel +import org.xtimms.shirizu.core.model.ListModel import java.time.Instant data class TrackingLogItem( diff --git a/app/src/main/java/org/xtimms/etsudoku/core/updates/Updater.kt b/app/src/main/java/org/xtimms/shirizu/core/updates/Updater.kt similarity index 96% rename from app/src/main/java/org/xtimms/etsudoku/core/updates/Updater.kt rename to app/src/main/java/org/xtimms/shirizu/core/updates/Updater.kt index 6a23a36..d07e043 100644 --- a/app/src/main/java/org/xtimms/etsudoku/core/updates/Updater.kt +++ b/app/src/main/java/org/xtimms/shirizu/core/updates/Updater.kt @@ -1,4 +1,4 @@ -package org.xtimms.etsudoku.core.updates +package org.xtimms.shirizu.core.updates import android.content.Context import android.content.Intent @@ -19,19 +19,19 @@ import kotlinx.serialization.json.Json import okhttp3.OkHttpClient import okhttp3.Request import okhttp3.ResponseBody -import org.xtimms.etsudoku.R -import org.xtimms.etsudoku.core.prefs.AppSettings.getInt -import org.xtimms.etsudoku.core.prefs.STABLE -import org.xtimms.etsudoku.core.prefs.UPDATE_CHANNEL -import org.xtimms.etsudoku.utils.system.getFileProvider -import org.xtimms.etsudoku.utils.system.toast +import org.xtimms.shirizu.R +import org.xtimms.shirizu.core.prefs.AppSettings.getInt +import org.xtimms.shirizu.core.prefs.STABLE +import org.xtimms.shirizu.core.prefs.UPDATE_CHANNEL +import org.xtimms.shirizu.utils.system.getFileProvider +import org.xtimms.shirizu.utils.system.toast import java.io.File import java.util.regex.Pattern object Updater { private const val OWNER = "ztimms73" - private const val REPO = "etsudoku" + private const val REPO = "shirizu" private const val TAG = "Updates" private val client = OkHttpClient() diff --git a/app/src/main/java/org/xtimms/etsudoku/core/zip/ZipOutput.kt b/app/src/main/java/org/xtimms/shirizu/core/zip/ZipOutput.kt similarity index 97% rename from app/src/main/java/org/xtimms/etsudoku/core/zip/ZipOutput.kt rename to app/src/main/java/org/xtimms/shirizu/core/zip/ZipOutput.kt index 1efdd64..9c677ab 100644 --- a/app/src/main/java/org/xtimms/etsudoku/core/zip/ZipOutput.kt +++ b/app/src/main/java/org/xtimms/shirizu/core/zip/ZipOutput.kt @@ -1,9 +1,9 @@ -package org.xtimms.etsudoku.core.zip +package org.xtimms.shirizu.core.zip import androidx.annotation.WorkerThread import androidx.collection.ArraySet import okio.Closeable -import org.xtimms.etsudoku.utils.system.children +import org.xtimms.shirizu.utils.system.children import java.io.File import java.io.FileInputStream import java.util.zip.Deflater diff --git a/app/src/main/java/org/xtimms/etsudoku/crash/CrashActivity.kt b/app/src/main/java/org/xtimms/shirizu/crash/CrashActivity.kt similarity index 80% rename from app/src/main/java/org/xtimms/etsudoku/crash/CrashActivity.kt rename to app/src/main/java/org/xtimms/shirizu/crash/CrashActivity.kt index 7338bdf..c132ba8 100644 --- a/app/src/main/java/org/xtimms/etsudoku/crash/CrashActivity.kt +++ b/app/src/main/java/org/xtimms/shirizu/crash/CrashActivity.kt @@ -1,4 +1,4 @@ -package org.xtimms.etsudoku.crash +package org.xtimms.shirizu.crash import android.content.Intent import android.os.Bundle @@ -6,11 +6,11 @@ import androidx.activity.ComponentActivity import androidx.activity.compose.setContent import androidx.activity.enableEdgeToEdge import dagger.hilt.android.AndroidEntryPoint -import org.xtimms.etsudoku.LocalDarkTheme -import org.xtimms.etsudoku.LocalDynamicColorSwitch -import org.xtimms.etsudoku.MainActivity -import org.xtimms.etsudoku.SettingsProvider -import org.xtimms.etsudoku.ui.theme.EtsudokuTheme +import org.xtimms.shirizu.LocalDarkTheme +import org.xtimms.shirizu.LocalDynamicColorSwitch +import org.xtimms.shirizu.MainActivity +import org.xtimms.shirizu.SettingsProvider +import org.xtimms.shirizu.ui.theme.ShirizuTheme @AndroidEntryPoint class CrashActivity : ComponentActivity() { @@ -22,7 +22,7 @@ class CrashActivity : ComponentActivity() { val exception = GlobalExceptionHandler.getThrowableFromIntent(intent) setContent { SettingsProvider { - EtsudokuTheme( + ShirizuTheme( darkTheme = LocalDarkTheme.current.isDarkTheme(), isDynamicColorEnabled = LocalDynamicColorSwitch.current, isHighContrastModeEnabled = LocalDarkTheme.current.isHighContrastModeEnabled, diff --git a/app/src/main/java/org/xtimms/etsudoku/crash/CrashScreen.kt b/app/src/main/java/org/xtimms/shirizu/crash/CrashScreen.kt similarity index 90% rename from app/src/main/java/org/xtimms/etsudoku/crash/CrashScreen.kt rename to app/src/main/java/org/xtimms/shirizu/crash/CrashScreen.kt index 1ac2292..01f651b 100644 --- a/app/src/main/java/org/xtimms/etsudoku/crash/CrashScreen.kt +++ b/app/src/main/java/org/xtimms/shirizu/crash/CrashScreen.kt @@ -1,4 +1,4 @@ -package org.xtimms.etsudoku.crash +package org.xtimms.shirizu.crash import androidx.compose.foundation.background import androidx.compose.foundation.layout.Box @@ -18,10 +18,10 @@ import androidx.compose.ui.text.font.FontFamily import androidx.compose.ui.tooling.preview.PreviewLightDark import androidx.compose.ui.unit.dp import kotlinx.coroutines.launch -import org.xtimms.etsudoku.R -import org.xtimms.etsudoku.core.screens.InfoScreen -import org.xtimms.etsudoku.ui.theme.EtsudokuTheme -import org.xtimms.etsudoku.utils.CrashLogUtil +import org.xtimms.shirizu.R +import org.xtimms.shirizu.core.screens.InfoScreen +import org.xtimms.shirizu.ui.theme.ShirizuTheme +import org.xtimms.shirizu.utils.CrashLogUtil @Composable fun CrashScreen( @@ -65,7 +65,7 @@ fun CrashScreen( @PreviewLightDark @Composable private fun CrashScreenPreview() { - EtsudokuTheme { + ShirizuTheme { CrashScreen(exception = RuntimeException("Dummy")) {} } } \ No newline at end of file diff --git a/app/src/main/java/org/xtimms/etsudoku/crash/GlobalExceptionHandler.kt b/app/src/main/java/org/xtimms/shirizu/crash/GlobalExceptionHandler.kt similarity index 98% rename from app/src/main/java/org/xtimms/etsudoku/crash/GlobalExceptionHandler.kt rename to app/src/main/java/org/xtimms/shirizu/crash/GlobalExceptionHandler.kt index 98b478b..fd38628 100644 --- a/app/src/main/java/org/xtimms/etsudoku/crash/GlobalExceptionHandler.kt +++ b/app/src/main/java/org/xtimms/shirizu/crash/GlobalExceptionHandler.kt @@ -1,4 +1,4 @@ -package org.xtimms.etsudoku.crash +package org.xtimms.shirizu.crash import android.content.Context import android.content.Intent diff --git a/app/src/main/java/org/xtimms/etsudoku/data/LocalStorageManager.kt b/app/src/main/java/org/xtimms/shirizu/data/LocalStorageManager.kt similarity index 97% rename from app/src/main/java/org/xtimms/etsudoku/data/LocalStorageManager.kt rename to app/src/main/java/org/xtimms/shirizu/data/LocalStorageManager.kt index 58c03cf..b41ad83 100644 --- a/app/src/main/java/org/xtimms/etsudoku/data/LocalStorageManager.kt +++ b/app/src/main/java/org/xtimms/shirizu/data/LocalStorageManager.kt @@ -1,4 +1,4 @@ -package org.xtimms.etsudoku.data +package org.xtimms.shirizu.data import android.content.Context import android.os.StatFs @@ -10,8 +10,8 @@ import kotlinx.coroutines.runInterruptible import kotlinx.coroutines.withContext import okhttp3.Cache import org.koitharu.kotatsu.parsers.util.mapToSet -import org.xtimms.etsudoku.core.cache.CacheDir -import org.xtimms.etsudoku.utils.system.computeSize +import org.xtimms.shirizu.core.cache.CacheDir +import org.xtimms.shirizu.utils.system.computeSize import java.io.File import javax.inject.Inject diff --git a/app/src/main/java/org/xtimms/etsudoku/data/repository/BookmarksRepository.kt b/app/src/main/java/org/xtimms/shirizu/data/repository/BookmarksRepository.kt similarity index 81% rename from app/src/main/java/org/xtimms/etsudoku/data/repository/BookmarksRepository.kt rename to app/src/main/java/org/xtimms/shirizu/data/repository/BookmarksRepository.kt index 740611d..507be03 100644 --- a/app/src/main/java/org/xtimms/etsudoku/data/repository/BookmarksRepository.kt +++ b/app/src/main/java/org/xtimms/shirizu/data/repository/BookmarksRepository.kt @@ -1,4 +1,4 @@ -package org.xtimms.etsudoku.data.repository +package org.xtimms.shirizu.data.repository import android.database.SQLException import androidx.room.withTransaction @@ -6,21 +6,21 @@ import dagger.Reusable import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.map import org.koitharu.kotatsu.parsers.model.Manga -import org.xtimms.etsudoku.core.database.EtsudokuDatabase -import org.xtimms.etsudoku.core.database.entity.BookmarkEntity -import org.xtimms.etsudoku.core.database.entity.toBookmark -import org.xtimms.etsudoku.core.database.entity.toBookmarks -import org.xtimms.etsudoku.core.database.entity.toEntities -import org.xtimms.etsudoku.core.database.entity.toEntity -import org.xtimms.etsudoku.core.database.entity.toManga -import org.xtimms.etsudoku.core.model.Bookmark -import org.xtimms.etsudoku.utils.ReversibleHandle -import org.xtimms.etsudoku.utils.lang.mapItems +import org.xtimms.shirizu.core.database.ShirizuDatabase +import org.xtimms.shirizu.core.database.entity.BookmarkEntity +import org.xtimms.shirizu.core.database.entity.toBookmark +import org.xtimms.shirizu.core.database.entity.toBookmarks +import org.xtimms.shirizu.core.database.entity.toEntities +import org.xtimms.shirizu.core.database.entity.toEntity +import org.xtimms.shirizu.core.database.entity.toManga +import org.xtimms.shirizu.core.model.Bookmark +import org.xtimms.shirizu.utils.ReversibleHandle +import org.xtimms.shirizu.utils.lang.mapItems import javax.inject.Inject @Reusable class BookmarksRepository @Inject constructor( - private val db: EtsudokuDatabase, + private val db: ShirizuDatabase, ) { fun observeBookmark(manga: Manga, chapterId: Long, page: Int): Flow { diff --git a/app/src/main/java/org/xtimms/etsudoku/data/repository/ExploreRepository.kt b/app/src/main/java/org/xtimms/shirizu/data/repository/ExploreRepository.kt similarity index 89% rename from app/src/main/java/org/xtimms/etsudoku/data/repository/ExploreRepository.kt rename to app/src/main/java/org/xtimms/shirizu/data/repository/ExploreRepository.kt index 59ec43a..b9f9144 100644 --- a/app/src/main/java/org/xtimms/etsudoku/data/repository/ExploreRepository.kt +++ b/app/src/main/java/org/xtimms/shirizu/data/repository/ExploreRepository.kt @@ -1,12 +1,12 @@ -package org.xtimms.etsudoku.data.repository +package org.xtimms.shirizu.data.repository import org.koitharu.kotatsu.parsers.model.Manga import org.koitharu.kotatsu.parsers.model.MangaListFilter import org.koitharu.kotatsu.parsers.model.MangaSource import org.koitharu.kotatsu.parsers.util.almostEquals import org.koitharu.kotatsu.parsers.util.runCatchingCancellable -import org.xtimms.etsudoku.core.parser.MangaRepository -import org.xtimms.etsudoku.utils.lang.asArrayList +import org.xtimms.shirizu.core.parser.MangaRepository +import org.xtimms.shirizu.utils.lang.asArrayList import javax.inject.Inject class ExploreRepository @Inject constructor( diff --git a/app/src/main/java/org/xtimms/etsudoku/data/repository/FavouritesRepository.kt b/app/src/main/java/org/xtimms/shirizu/data/repository/FavouritesRepository.kt similarity index 89% rename from app/src/main/java/org/xtimms/etsudoku/data/repository/FavouritesRepository.kt rename to app/src/main/java/org/xtimms/shirizu/data/repository/FavouritesRepository.kt index 2deae81..1d5ea04 100644 --- a/app/src/main/java/org/xtimms/etsudoku/data/repository/FavouritesRepository.kt +++ b/app/src/main/java/org/xtimms/shirizu/data/repository/FavouritesRepository.kt @@ -1,4 +1,4 @@ -package org.xtimms.etsudoku.data.repository +package org.xtimms.shirizu.data.repository import androidx.room.withTransaction import dagger.Reusable @@ -9,23 +9,23 @@ import kotlinx.coroutines.flow.filterNotNull import kotlinx.coroutines.flow.flatMapLatest import kotlinx.coroutines.flow.map import org.koitharu.kotatsu.parsers.model.Manga -import org.xtimms.etsudoku.core.database.EtsudokuDatabase -import org.xtimms.etsudoku.core.database.entity.FavouriteCategoryEntity -import org.xtimms.etsudoku.core.database.entity.FavouriteEntity -import org.xtimms.etsudoku.core.database.entity.toEntities -import org.xtimms.etsudoku.core.database.entity.toEntity -import org.xtimms.etsudoku.core.database.entity.toFavouriteCategory -import org.xtimms.etsudoku.core.database.entity.toManga -import org.xtimms.etsudoku.core.database.entity.toMangaList -import org.xtimms.etsudoku.core.model.FavouriteCategory -import org.xtimms.etsudoku.core.model.ListSortOrder -import org.xtimms.etsudoku.utils.ReversibleHandle -import org.xtimms.etsudoku.utils.lang.mapItems +import org.xtimms.shirizu.core.database.ShirizuDatabase +import org.xtimms.shirizu.core.database.entity.FavouriteCategoryEntity +import org.xtimms.shirizu.core.database.entity.FavouriteEntity +import org.xtimms.shirizu.core.database.entity.toEntities +import org.xtimms.shirizu.core.database.entity.toEntity +import org.xtimms.shirizu.core.database.entity.toFavouriteCategory +import org.xtimms.shirizu.core.database.entity.toManga +import org.xtimms.shirizu.core.database.entity.toMangaList +import org.xtimms.shirizu.core.model.FavouriteCategory +import org.xtimms.shirizu.core.model.ListSortOrder +import org.xtimms.shirizu.utils.ReversibleHandle +import org.xtimms.shirizu.utils.lang.mapItems import javax.inject.Inject @Reusable class FavouritesRepository @Inject constructor( - private val db: EtsudokuDatabase, + private val db: ShirizuDatabase, ) { suspend fun getAllManga(): List { diff --git a/app/src/main/java/org/xtimms/etsudoku/data/repository/HistoryRepository.kt b/app/src/main/java/org/xtimms/shirizu/data/repository/HistoryRepository.kt similarity index 82% rename from app/src/main/java/org/xtimms/etsudoku/data/repository/HistoryRepository.kt rename to app/src/main/java/org/xtimms/shirizu/data/repository/HistoryRepository.kt index 2cbe05c..2e21e8a 100644 --- a/app/src/main/java/org/xtimms/etsudoku/data/repository/HistoryRepository.kt +++ b/app/src/main/java/org/xtimms/shirizu/data/repository/HistoryRepository.kt @@ -1,28 +1,28 @@ -package org.xtimms.etsudoku.data.repository +package org.xtimms.shirizu.data.repository import androidx.room.withTransaction import dagger.Reusable import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.map import org.koitharu.kotatsu.parsers.model.Manga -import org.xtimms.etsudoku.core.database.EtsudokuDatabase -import org.xtimms.etsudoku.core.database.entity.HistoryEntity -import org.xtimms.etsudoku.core.database.entity.toManga -import org.xtimms.etsudoku.core.database.entity.toMangaHistory -import org.xtimms.etsudoku.core.database.entity.toMangaTags -import org.xtimms.etsudoku.core.model.MangaHistory -import org.xtimms.etsudoku.core.model.MangaWithHistory -import org.xtimms.etsudoku.core.model.findById -import org.xtimms.etsudoku.core.model.isNsfw -import org.xtimms.etsudoku.core.parser.MangaDataRepository -import org.xtimms.etsudoku.utils.lang.mapItems +import org.xtimms.shirizu.core.database.ShirizuDatabase +import org.xtimms.shirizu.core.database.entity.HistoryEntity +import org.xtimms.shirizu.core.database.entity.toManga +import org.xtimms.shirizu.core.database.entity.toMangaHistory +import org.xtimms.shirizu.core.database.entity.toMangaTags +import org.xtimms.shirizu.core.model.MangaHistory +import org.xtimms.shirizu.core.model.MangaWithHistory +import org.xtimms.shirizu.core.model.findById +import org.xtimms.shirizu.core.model.isNsfw +import org.xtimms.shirizu.core.parser.MangaDataRepository +import org.xtimms.shirizu.utils.lang.mapItems import javax.inject.Inject const val PROGRESS_NONE = -1f @Reusable class HistoryRepository @Inject constructor( - private val db: EtsudokuDatabase, + private val db: ShirizuDatabase, private val mangaRepository: MangaDataRepository, ) { diff --git a/app/src/main/java/org/xtimms/etsudoku/data/repository/MangaSourcesRepository.kt b/app/src/main/java/org/xtimms/shirizu/data/repository/MangaSourcesRepository.kt similarity index 86% rename from app/src/main/java/org/xtimms/etsudoku/data/repository/MangaSourcesRepository.kt rename to app/src/main/java/org/xtimms/shirizu/data/repository/MangaSourcesRepository.kt index a7e8c37..fdd6e47 100644 --- a/app/src/main/java/org/xtimms/etsudoku/data/repository/MangaSourcesRepository.kt +++ b/app/src/main/java/org/xtimms/shirizu/data/repository/MangaSourcesRepository.kt @@ -1,4 +1,4 @@ -package org.xtimms.etsudoku.data.repository +package org.xtimms.shirizu.data.repository import androidx.compose.runtime.Composable import dagger.Reusable @@ -14,17 +14,17 @@ import kotlinx.coroutines.flow.map import org.koitharu.kotatsu.parsers.model.ContentType import org.koitharu.kotatsu.parsers.model.MangaSource import org.koitharu.kotatsu.parsers.util.mapToSet -import org.xtimms.etsudoku.BuildConfig -import org.xtimms.etsudoku.core.database.EtsudokuDatabase -import org.xtimms.etsudoku.core.database.dao.MangaSourcesDao -import org.xtimms.etsudoku.core.database.entity.MangaSourceEntity -import org.xtimms.etsudoku.core.model.MangaSource -import org.xtimms.etsudoku.core.model.isNsfw -import org.xtimms.etsudoku.core.prefs.AppSettings -import org.xtimms.etsudoku.core.prefs.KotatsuAppSettings -import org.xtimms.etsudoku.core.prefs.observeAsFlow -import org.xtimms.etsudoku.sections.explore.data.SourcesSortOrder -import org.xtimms.etsudoku.utils.ReversibleHandle +import org.xtimms.shirizu.BuildConfig +import org.xtimms.shirizu.core.database.ShirizuDatabase +import org.xtimms.shirizu.core.database.dao.MangaSourcesDao +import org.xtimms.shirizu.core.database.entity.MangaSourceEntity +import org.xtimms.shirizu.core.model.MangaSource +import org.xtimms.shirizu.core.model.isNsfw +import org.xtimms.shirizu.core.prefs.AppSettings +import org.xtimms.shirizu.core.prefs.KotatsuAppSettings +import org.xtimms.shirizu.core.prefs.observeAsFlow +import org.xtimms.shirizu.sections.explore.data.SourcesSortOrder +import org.xtimms.shirizu.utils.ReversibleHandle import java.util.Collections import java.util.EnumSet import javax.inject.Inject @@ -32,7 +32,7 @@ import javax.inject.Inject @OptIn(ExperimentalCoroutinesApi::class) @Reusable class MangaSourcesRepository @Inject constructor( - private val db: EtsudokuDatabase, + private val db: ShirizuDatabase, private val settings: KotatsuAppSettings, ) { diff --git a/app/src/main/java/org/xtimms/etsudoku/data/repository/SuggestionRepository.kt b/app/src/main/java/org/xtimms/shirizu/data/repository/SuggestionRepository.kt similarity index 74% rename from app/src/main/java/org/xtimms/etsudoku/data/repository/SuggestionRepository.kt rename to app/src/main/java/org/xtimms/shirizu/data/repository/SuggestionRepository.kt index fa0b149..f631f87 100644 --- a/app/src/main/java/org/xtimms/etsudoku/data/repository/SuggestionRepository.kt +++ b/app/src/main/java/org/xtimms/shirizu/data/repository/SuggestionRepository.kt @@ -1,20 +1,20 @@ -package org.xtimms.etsudoku.data.repository +package org.xtimms.shirizu.data.repository import androidx.room.withTransaction import kotlinx.coroutines.flow.Flow import org.koitharu.kotatsu.parsers.model.Manga -import org.xtimms.etsudoku.core.database.EtsudokuDatabase -import org.xtimms.etsudoku.core.database.entity.SuggestionEntity -import org.xtimms.etsudoku.core.database.entity.toEntities -import org.xtimms.etsudoku.core.database.entity.toEntity -import org.xtimms.etsudoku.core.database.entity.toManga -import org.xtimms.etsudoku.core.database.entity.toMangaTags -import org.xtimms.etsudoku.core.model.MangaSuggestion -import org.xtimms.etsudoku.utils.lang.mapItems +import org.xtimms.shirizu.core.database.ShirizuDatabase +import org.xtimms.shirizu.core.database.entity.SuggestionEntity +import org.xtimms.shirizu.core.database.entity.toEntities +import org.xtimms.shirizu.core.database.entity.toEntity +import org.xtimms.shirizu.core.database.entity.toManga +import org.xtimms.shirizu.core.database.entity.toMangaTags +import org.xtimms.shirizu.core.model.MangaSuggestion +import org.xtimms.shirizu.utils.lang.mapItems import javax.inject.Inject class SuggestionRepository @Inject constructor( - private val db: EtsudokuDatabase, + private val db: ShirizuDatabase, ) { fun observeAll(): Flow> { diff --git a/app/src/main/java/org/xtimms/etsudoku/data/repository/TrackingRepository.kt b/app/src/main/java/org/xtimms/shirizu/data/repository/TrackingRepository.kt similarity index 90% rename from app/src/main/java/org/xtimms/etsudoku/data/repository/TrackingRepository.kt rename to app/src/main/java/org/xtimms/shirizu/data/repository/TrackingRepository.kt index a7b46ea..b0856c3 100644 --- a/app/src/main/java/org/xtimms/etsudoku/data/repository/TrackingRepository.kt +++ b/app/src/main/java/org/xtimms/shirizu/data/repository/TrackingRepository.kt @@ -1,4 +1,4 @@ -package org.xtimms.etsudoku.data.repository +package org.xtimms.shirizu.data.repository import androidx.annotation.VisibleForTesting import androidx.collection.MutableLongSet @@ -13,20 +13,20 @@ import kotlinx.coroutines.flow.map import kotlinx.coroutines.flow.onStart import org.koitharu.kotatsu.parsers.model.Manga import org.koitharu.kotatsu.parsers.util.mapToSet -import org.xtimms.etsudoku.core.database.EtsudokuDatabase -import org.xtimms.etsudoku.core.database.entity.MangaEntity -import org.xtimms.etsudoku.core.database.entity.TrackEntity -import org.xtimms.etsudoku.core.database.entity.TrackLogEntity -import org.xtimms.etsudoku.core.database.entity.toFavouriteCategory -import org.xtimms.etsudoku.core.database.entity.toManga -import org.xtimms.etsudoku.core.database.entity.toTrackingLogItem -import org.xtimms.etsudoku.core.model.FavouriteCategory -import org.xtimms.etsudoku.core.model.isLocal -import org.xtimms.etsudoku.core.parser.local.LocalMangaRepository -import org.xtimms.etsudoku.core.tracker.model.MangaTracking -import org.xtimms.etsudoku.core.tracker.model.MangaUpdates -import org.xtimms.etsudoku.core.tracker.model.TrackingLogItem -import org.xtimms.etsudoku.utils.lang.mapItems +import org.xtimms.shirizu.core.database.ShirizuDatabase +import org.xtimms.shirizu.core.database.entity.MangaEntity +import org.xtimms.shirizu.core.database.entity.TrackEntity +import org.xtimms.shirizu.core.database.entity.TrackLogEntity +import org.xtimms.shirizu.core.database.entity.toFavouriteCategory +import org.xtimms.shirizu.core.database.entity.toManga +import org.xtimms.shirizu.core.database.entity.toTrackingLogItem +import org.xtimms.shirizu.core.model.FavouriteCategory +import org.xtimms.shirizu.core.model.isLocal +import org.xtimms.shirizu.core.parser.local.LocalMangaRepository +import org.xtimms.shirizu.core.tracker.model.MangaTracking +import org.xtimms.shirizu.core.tracker.model.MangaUpdates +import org.xtimms.shirizu.core.tracker.model.TrackingLogItem +import org.xtimms.shirizu.utils.lang.mapItems import java.time.Instant import java.util.concurrent.atomic.AtomicBoolean import javax.inject.Inject @@ -37,7 +37,7 @@ private const val MAX_QUERY_IDS = 100 @Reusable class TrackingRepository @Inject constructor( - private val db: EtsudokuDatabase, + private val db: ShirizuDatabase, private val localMangaRepositoryProvider: Provider, ) { diff --git a/app/src/main/java/org/xtimms/etsudoku/data/repository/backup/BackupEntry.kt b/app/src/main/java/org/xtimms/shirizu/data/repository/backup/BackupEntry.kt similarity index 86% rename from app/src/main/java/org/xtimms/etsudoku/data/repository/backup/BackupEntry.kt rename to app/src/main/java/org/xtimms/shirizu/data/repository/backup/BackupEntry.kt index 2c41d9c..2c8f9dc 100644 --- a/app/src/main/java/org/xtimms/etsudoku/data/repository/backup/BackupEntry.kt +++ b/app/src/main/java/org/xtimms/shirizu/data/repository/backup/BackupEntry.kt @@ -1,4 +1,4 @@ -package org.xtimms.etsudoku.data.repository.backup +package org.xtimms.shirizu.data.repository.backup import org.json.JSONArray diff --git a/app/src/main/java/org/xtimms/etsudoku/data/repository/backup/BackupRepository.kt b/app/src/main/java/org/xtimms/shirizu/data/repository/backup/BackupRepository.kt similarity index 97% rename from app/src/main/java/org/xtimms/etsudoku/data/repository/backup/BackupRepository.kt rename to app/src/main/java/org/xtimms/shirizu/data/repository/backup/BackupRepository.kt index 5025d55..c47bcd8 100644 --- a/app/src/main/java/org/xtimms/etsudoku/data/repository/backup/BackupRepository.kt +++ b/app/src/main/java/org/xtimms/shirizu/data/repository/backup/BackupRepository.kt @@ -1,4 +1,4 @@ -package org.xtimms.etsudoku.data.repository.backup +package org.xtimms.shirizu.data.repository.backup import androidx.room.withTransaction import org.json.JSONArray @@ -7,15 +7,15 @@ import org.koitharu.kotatsu.parsers.util.json.JSONIterator import org.koitharu.kotatsu.parsers.util.json.getLongOrDefault import org.koitharu.kotatsu.parsers.util.json.mapJSON import org.koitharu.kotatsu.parsers.util.runCatchingCancellable -import org.xtimms.etsudoku.BuildConfig -import org.xtimms.etsudoku.core.database.EtsudokuDatabase +import org.xtimms.shirizu.BuildConfig +import org.xtimms.shirizu.core.database.ShirizuDatabase import java.util.Date import javax.inject.Inject private const val PAGE_SIZE = 10 class BackupRepository @Inject constructor( - private val db: EtsudokuDatabase, + private val db: ShirizuDatabase, ) { suspend fun dumpHistory(): BackupEntry { diff --git a/app/src/main/java/org/xtimms/etsudoku/data/repository/backup/BackupZipInput.kt b/app/src/main/java/org/xtimms/shirizu/data/repository/backup/BackupZipInput.kt similarity index 91% rename from app/src/main/java/org/xtimms/etsudoku/data/repository/backup/BackupZipInput.kt rename to app/src/main/java/org/xtimms/shirizu/data/repository/backup/BackupZipInput.kt index c23ef9f..95bb4b3 100644 --- a/app/src/main/java/org/xtimms/etsudoku/data/repository/backup/BackupZipInput.kt +++ b/app/src/main/java/org/xtimms/shirizu/data/repository/backup/BackupZipInput.kt @@ -1,4 +1,4 @@ -package org.xtimms.etsudoku.data.repository.backup +package org.xtimms.shirizu.data.repository.backup import kotlinx.coroutines.CoroutineStart import kotlinx.coroutines.Dispatchers @@ -6,7 +6,7 @@ import kotlinx.coroutines.launch import kotlinx.coroutines.runInterruptible import okio.Closeable import org.json.JSONArray -import org.xtimms.etsudoku.utils.lang.processLifecycleScope +import org.xtimms.shirizu.utils.lang.processLifecycleScope import java.io.File import java.util.EnumSet import java.util.zip.ZipFile diff --git a/app/src/main/java/org/xtimms/etsudoku/data/repository/backup/BackupZipOutput.kt b/app/src/main/java/org/xtimms/shirizu/data/repository/backup/BackupZipOutput.kt similarity index 90% rename from app/src/main/java/org/xtimms/etsudoku/data/repository/backup/BackupZipOutput.kt rename to app/src/main/java/org/xtimms/shirizu/data/repository/backup/BackupZipOutput.kt index efafe76..db08399 100644 --- a/app/src/main/java/org/xtimms/etsudoku/data/repository/backup/BackupZipOutput.kt +++ b/app/src/main/java/org/xtimms/shirizu/data/repository/backup/BackupZipOutput.kt @@ -1,11 +1,11 @@ -package org.xtimms.etsudoku.data.repository.backup +package org.xtimms.shirizu.data.repository.backup import android.content.Context import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.runInterruptible import okio.Closeable -import org.xtimms.etsudoku.R -import org.xtimms.etsudoku.core.zip.ZipOutput +import org.xtimms.shirizu.R +import org.xtimms.shirizu.core.zip.ZipOutput import java.io.File import java.time.LocalDate import java.time.format.DateTimeFormatter diff --git a/app/src/main/java/org/xtimms/etsudoku/data/repository/backup/CompositeResult.kt b/app/src/main/java/org/xtimms/shirizu/data/repository/backup/CompositeResult.kt similarity index 95% rename from app/src/main/java/org/xtimms/etsudoku/data/repository/backup/CompositeResult.kt rename to app/src/main/java/org/xtimms/shirizu/data/repository/backup/CompositeResult.kt index 9601322..2d8d66c 100644 --- a/app/src/main/java/org/xtimms/etsudoku/data/repository/backup/CompositeResult.kt +++ b/app/src/main/java/org/xtimms/shirizu/data/repository/backup/CompositeResult.kt @@ -1,4 +1,4 @@ -package org.xtimms.etsudoku.data.repository.backup +package org.xtimms.shirizu.data.repository.backup class CompositeResult { diff --git a/app/src/main/java/org/xtimms/etsudoku/data/repository/backup/JsonDeserializer.kt b/app/src/main/java/org/xtimms/shirizu/data/repository/backup/JsonDeserializer.kt similarity index 86% rename from app/src/main/java/org/xtimms/etsudoku/data/repository/backup/JsonDeserializer.kt rename to app/src/main/java/org/xtimms/shirizu/data/repository/backup/JsonDeserializer.kt index 77d55ad..07144e6 100644 --- a/app/src/main/java/org/xtimms/etsudoku/data/repository/backup/JsonDeserializer.kt +++ b/app/src/main/java/org/xtimms/shirizu/data/repository/backup/JsonDeserializer.kt @@ -1,4 +1,4 @@ -package org.xtimms.etsudoku.data.repository.backup +package org.xtimms.shirizu.data.repository.backup import org.json.JSONObject import org.koitharu.kotatsu.parsers.model.SortOrder @@ -6,13 +6,13 @@ import org.koitharu.kotatsu.parsers.util.json.getBooleanOrDefault import org.koitharu.kotatsu.parsers.util.json.getFloatOrDefault import org.koitharu.kotatsu.parsers.util.json.getIntOrDefault import org.koitharu.kotatsu.parsers.util.json.getStringOrNull -import org.xtimms.etsudoku.core.database.entity.BookmarkEntity -import org.xtimms.etsudoku.core.database.entity.FavouriteCategoryEntity -import org.xtimms.etsudoku.core.database.entity.FavouriteEntity -import org.xtimms.etsudoku.core.database.entity.HistoryEntity -import org.xtimms.etsudoku.core.database.entity.MangaEntity -import org.xtimms.etsudoku.core.database.entity.MangaSourceEntity -import org.xtimms.etsudoku.core.database.entity.TagEntity +import org.xtimms.shirizu.core.database.entity.BookmarkEntity +import org.xtimms.shirizu.core.database.entity.FavouriteCategoryEntity +import org.xtimms.shirizu.core.database.entity.FavouriteEntity +import org.xtimms.shirizu.core.database.entity.HistoryEntity +import org.xtimms.shirizu.core.database.entity.MangaEntity +import org.xtimms.shirizu.core.database.entity.MangaSourceEntity +import org.xtimms.shirizu.core.database.entity.TagEntity class JsonDeserializer(private val json: JSONObject) { diff --git a/app/src/main/java/org/xtimms/etsudoku/data/repository/backup/JsonSerializer.kt b/app/src/main/java/org/xtimms/shirizu/data/repository/backup/JsonSerializer.kt similarity index 83% rename from app/src/main/java/org/xtimms/etsudoku/data/repository/backup/JsonSerializer.kt rename to app/src/main/java/org/xtimms/shirizu/data/repository/backup/JsonSerializer.kt index ffc8e24..b9a2109 100644 --- a/app/src/main/java/org/xtimms/etsudoku/data/repository/backup/JsonSerializer.kt +++ b/app/src/main/java/org/xtimms/shirizu/data/repository/backup/JsonSerializer.kt @@ -1,13 +1,13 @@ -package org.xtimms.etsudoku.data.repository.backup +package org.xtimms.shirizu.data.repository.backup import org.json.JSONObject -import org.xtimms.etsudoku.core.database.entity.BookmarkEntity -import org.xtimms.etsudoku.core.database.entity.FavouriteCategoryEntity -import org.xtimms.etsudoku.core.database.entity.FavouriteEntity -import org.xtimms.etsudoku.core.database.entity.HistoryEntity -import org.xtimms.etsudoku.core.database.entity.MangaEntity -import org.xtimms.etsudoku.core.database.entity.MangaSourceEntity -import org.xtimms.etsudoku.core.database.entity.TagEntity +import org.xtimms.shirizu.core.database.entity.BookmarkEntity +import org.xtimms.shirizu.core.database.entity.FavouriteCategoryEntity +import org.xtimms.shirizu.core.database.entity.FavouriteEntity +import org.xtimms.shirizu.core.database.entity.HistoryEntity +import org.xtimms.shirizu.core.database.entity.MangaEntity +import org.xtimms.shirizu.core.database.entity.MangaSourceEntity +import org.xtimms.shirizu.core.database.entity.TagEntity class JsonSerializer private constructor(private val json: JSONObject) { diff --git a/app/src/main/java/org/xtimms/etsudoku/sections/details/ChapterListItem.kt b/app/src/main/java/org/xtimms/shirizu/sections/details/ChapterListItem.kt similarity index 95% rename from app/src/main/java/org/xtimms/etsudoku/sections/details/ChapterListItem.kt rename to app/src/main/java/org/xtimms/shirizu/sections/details/ChapterListItem.kt index 6c867e9..a76155d 100644 --- a/app/src/main/java/org/xtimms/etsudoku/sections/details/ChapterListItem.kt +++ b/app/src/main/java/org/xtimms/shirizu/sections/details/ChapterListItem.kt @@ -1,4 +1,4 @@ -package org.xtimms.etsudoku.sections.details +package org.xtimms.shirizu.sections.details import androidx.compose.foundation.ExperimentalFoundationApi import androidx.compose.foundation.combinedClickable @@ -30,10 +30,10 @@ import androidx.compose.ui.platform.LocalDensity import androidx.compose.ui.res.stringResource import androidx.compose.ui.text.style.TextOverflow import androidx.compose.ui.unit.dp -import org.xtimms.etsudoku.R -import org.xtimms.etsudoku.core.components.DotSeparatorText -import org.xtimms.etsudoku.utils.composable.selectedBackground -import org.xtimms.etsudoku.utils.material.SecondaryItemAlpha +import org.xtimms.shirizu.R +import org.xtimms.shirizu.core.components.DotSeparatorText +import org.xtimms.shirizu.utils.composable.selectedBackground +import org.xtimms.shirizu.utils.material.SecondaryItemAlpha import java.time.Instant import java.time.LocalDateTime import java.time.ZoneId diff --git a/app/src/main/java/org/xtimms/etsudoku/sections/details/ChaptersMapper.kt b/app/src/main/java/org/xtimms/shirizu/sections/details/ChaptersMapper.kt similarity index 85% rename from app/src/main/java/org/xtimms/etsudoku/sections/details/ChaptersMapper.kt rename to app/src/main/java/org/xtimms/shirizu/sections/details/ChaptersMapper.kt index 2570c23..087a967 100644 --- a/app/src/main/java/org/xtimms/etsudoku/sections/details/ChaptersMapper.kt +++ b/app/src/main/java/org/xtimms/shirizu/sections/details/ChaptersMapper.kt @@ -1,11 +1,11 @@ -package org.xtimms.etsudoku.sections.details +package org.xtimms.shirizu.sections.details import org.koitharu.kotatsu.parsers.util.mapToSet -import org.xtimms.etsudoku.core.model.Bookmark -import org.xtimms.etsudoku.core.model.MangaHistory -import org.xtimms.etsudoku.sections.details.data.MangaDetails -import org.xtimms.etsudoku.sections.details.model.ChapterItem -import org.xtimms.etsudoku.sections.details.model.toListItem +import org.xtimms.shirizu.core.model.Bookmark +import org.xtimms.shirizu.core.model.MangaHistory +import org.xtimms.shirizu.sections.details.data.MangaDetails +import org.xtimms.shirizu.sections.details.model.ChapterItem +import org.xtimms.shirizu.sections.details.model.toListItem fun MangaDetails.mapChapters( history: MangaHistory?, diff --git a/app/src/main/java/org/xtimms/shirizu/sections/details/DetailsEvent.kt b/app/src/main/java/org/xtimms/shirizu/sections/details/DetailsEvent.kt new file mode 100644 index 0000000..feec8b8 --- /dev/null +++ b/app/src/main/java/org/xtimms/shirizu/sections/details/DetailsEvent.kt @@ -0,0 +1,5 @@ +package org.xtimms.shirizu.sections.details + +import org.xtimms.shirizu.core.base.event.UiEvent + +interface DetailsEvent : UiEvent \ No newline at end of file diff --git a/app/src/main/java/org/xtimms/etsudoku/sections/details/DetailsInfoHeader.kt b/app/src/main/java/org/xtimms/shirizu/sections/details/DetailsInfoHeader.kt similarity index 97% rename from app/src/main/java/org/xtimms/etsudoku/sections/details/DetailsInfoHeader.kt rename to app/src/main/java/org/xtimms/shirizu/sections/details/DetailsInfoHeader.kt index a74f0f8..9fbfc3d 100644 --- a/app/src/main/java/org/xtimms/etsudoku/sections/details/DetailsInfoHeader.kt +++ b/app/src/main/java/org/xtimms/shirizu/sections/details/DetailsInfoHeader.kt @@ -1,4 +1,4 @@ -package org.xtimms.etsudoku.sections.details +package org.xtimms.shirizu.sections.details import android.net.Uri import androidx.compose.animation.AnimatedContent @@ -98,19 +98,19 @@ import coil.ImageLoader import org.koitharu.kotatsu.parsers.model.MangaSource import org.koitharu.kotatsu.parsers.model.MangaState import org.koitharu.kotatsu.parsers.model.MangaTag -import org.xtimms.etsudoku.R -import org.xtimms.etsudoku.core.AsyncImageImpl -import org.xtimms.etsudoku.core.components.AnimatedButton -import org.xtimms.etsudoku.core.components.ButtonType -import org.xtimms.etsudoku.core.components.HtmlTextField -import org.xtimms.etsudoku.core.components.MangaCover -import org.xtimms.etsudoku.core.components.ReadButton -import org.xtimms.etsudoku.core.parser.favicon.faviconUri -import org.xtimms.etsudoku.sections.details.data.ReadingTime -import org.xtimms.etsudoku.sections.details.model.HistoryInfo -import org.xtimms.etsudoku.ui.theme.EtsudokuTheme -import org.xtimms.etsudoku.utils.composable.clickableNoIndication -import org.xtimms.etsudoku.utils.composable.secondaryItemAlpha +import org.xtimms.shirizu.R +import org.xtimms.shirizu.core.AsyncImageImpl +import org.xtimms.shirizu.core.components.AnimatedButton +import org.xtimms.shirizu.core.components.ButtonType +import org.xtimms.shirizu.core.components.HtmlTextField +import org.xtimms.shirizu.core.components.MangaCover +import org.xtimms.shirizu.core.components.ReadButton +import org.xtimms.shirizu.core.parser.favicon.faviconUri +import org.xtimms.shirizu.sections.details.data.ReadingTime +import org.xtimms.shirizu.sections.details.model.HistoryInfo +import org.xtimms.shirizu.ui.theme.ShirizuTheme +import org.xtimms.shirizu.utils.composable.clickableNoIndication +import org.xtimms.shirizu.utils.composable.secondaryItemAlpha import kotlin.math.roundToInt private val whitespaceLineRegex = Regex("[\\r\\n]{2,}", setOf(RegexOption.MULTILINE)) diff --git a/app/src/main/java/org/xtimms/etsudoku/sections/details/DetailsUiState.kt b/app/src/main/java/org/xtimms/shirizu/sections/details/DetailsUiState.kt similarity index 66% rename from app/src/main/java/org/xtimms/etsudoku/sections/details/DetailsUiState.kt rename to app/src/main/java/org/xtimms/shirizu/sections/details/DetailsUiState.kt index ce4a9d9..de4fdf8 100644 --- a/app/src/main/java/org/xtimms/etsudoku/sections/details/DetailsUiState.kt +++ b/app/src/main/java/org/xtimms/shirizu/sections/details/DetailsUiState.kt @@ -1,7 +1,7 @@ -package org.xtimms.etsudoku.sections.details +package org.xtimms.shirizu.sections.details -import org.xtimms.etsudoku.core.base.state.UiState -import org.xtimms.etsudoku.sections.details.data.MangaDetails +import org.xtimms.shirizu.core.base.state.UiState +import org.xtimms.shirizu.sections.details.data.MangaDetails data class DetailsUiState( val details: MangaDetails? = null, diff --git a/app/src/main/java/org/xtimms/etsudoku/sections/details/DetailsView.kt b/app/src/main/java/org/xtimms/shirizu/sections/details/DetailsView.kt similarity index 97% rename from app/src/main/java/org/xtimms/etsudoku/sections/details/DetailsView.kt rename to app/src/main/java/org/xtimms/shirizu/sections/details/DetailsView.kt index 6640509..2a0e762 100644 --- a/app/src/main/java/org/xtimms/etsudoku/sections/details/DetailsView.kt +++ b/app/src/main/java/org/xtimms/shirizu/sections/details/DetailsView.kt @@ -1,4 +1,4 @@ -package org.xtimms.etsudoku.sections.details +package org.xtimms.shirizu.sections.details import android.net.Uri import androidx.compose.animation.AnimatedVisibility @@ -51,12 +51,12 @@ import kotlinx.coroutines.flow.collectLatest import org.koitharu.kotatsu.parsers.model.MangaSource import org.koitharu.kotatsu.parsers.model.MangaState import org.koitharu.kotatsu.parsers.model.RATING_UNKNOWN -import org.xtimms.etsudoku.R -import org.xtimms.etsudoku.core.components.DetailsToolbar -import org.xtimms.etsudoku.core.components.MangaHorizontalItem -import org.xtimms.etsudoku.core.parser.favicon.faviconUri -import org.xtimms.etsudoku.core.prefs.AppSettings -import org.xtimms.etsudoku.utils.lang.toNavArgument +import org.xtimms.shirizu.R +import org.xtimms.shirizu.core.components.DetailsToolbar +import org.xtimms.shirizu.core.components.MangaHorizontalItem +import org.xtimms.shirizu.core.parser.favicon.faviconUri +import org.xtimms.shirizu.core.prefs.AppSettings +import org.xtimms.shirizu.utils.lang.toNavArgument const val MANGA_ID_ARGUMENT = "{mangaId}" const val DETAILS_DESTINATION = "details/?mangaId=$MANGA_ID_ARGUMENT" diff --git a/app/src/main/java/org/xtimms/etsudoku/sections/details/DetailsViewConstants.kt b/app/src/main/java/org/xtimms/shirizu/sections/details/DetailsViewConstants.kt similarity index 72% rename from app/src/main/java/org/xtimms/etsudoku/sections/details/DetailsViewConstants.kt rename to app/src/main/java/org/xtimms/shirizu/sections/details/DetailsViewConstants.kt index aae35f4..45248ea 100644 --- a/app/src/main/java/org/xtimms/etsudoku/sections/details/DetailsViewConstants.kt +++ b/app/src/main/java/org/xtimms/shirizu/sections/details/DetailsViewConstants.kt @@ -1,4 +1,4 @@ -package org.xtimms.etsudoku.sections.details +package org.xtimms.shirizu.sections.details enum class DetailsViewItem { INFO_BOX, diff --git a/app/src/main/java/org/xtimms/etsudoku/sections/details/DetailsViewModel.kt b/app/src/main/java/org/xtimms/shirizu/sections/details/DetailsViewModel.kt similarity index 84% rename from app/src/main/java/org/xtimms/etsudoku/sections/details/DetailsViewModel.kt rename to app/src/main/java/org/xtimms/shirizu/sections/details/DetailsViewModel.kt index 0418055..46f8aa8 100644 --- a/app/src/main/java/org/xtimms/etsudoku/sections/details/DetailsViewModel.kt +++ b/app/src/main/java/org/xtimms/shirizu/sections/details/DetailsViewModel.kt @@ -1,4 +1,4 @@ -package org.xtimms.etsudoku.sections.details +package org.xtimms.shirizu.sections.details import androidx.lifecycle.SavedStateHandle import androidx.lifecycle.viewModelScope @@ -21,24 +21,24 @@ import kotlinx.coroutines.flow.receiveAsFlow import kotlinx.coroutines.flow.stateIn import kotlinx.coroutines.plus import org.koitharu.kotatsu.parsers.model.Manga -import org.xtimms.etsudoku.core.base.viewmodel.KotatsuBaseViewModel -import org.xtimms.etsudoku.core.model.findById -import org.xtimms.etsudoku.core.model.getPreferredBranch -import org.xtimms.etsudoku.core.parser.MangaIntent -import org.xtimms.etsudoku.data.repository.BookmarksRepository -import org.xtimms.etsudoku.data.repository.FavouritesRepository -import org.xtimms.etsudoku.data.repository.HistoryRepository -import org.xtimms.etsudoku.sections.details.data.MangaDetails -import org.xtimms.etsudoku.sections.details.domain.BranchComparator -import org.xtimms.etsudoku.sections.details.domain.DetailsInteractor -import org.xtimms.etsudoku.sections.details.domain.DetailsLoadUseCase -import org.xtimms.etsudoku.sections.details.domain.ReadingTimeUseCase -import org.xtimms.etsudoku.sections.details.domain.RelatedMangaUseCase -import org.xtimms.etsudoku.sections.details.model.ChapterItem -import org.xtimms.etsudoku.sections.details.model.HistoryInfo -import org.xtimms.etsudoku.sections.details.model.MangaBranch -import org.xtimms.etsudoku.utils.lang.onEachWhile -import org.xtimms.etsudoku.utils.lang.removeFirstAndLast +import org.xtimms.shirizu.core.base.viewmodel.KotatsuBaseViewModel +import org.xtimms.shirizu.core.model.findById +import org.xtimms.shirizu.core.model.getPreferredBranch +import org.xtimms.shirizu.core.parser.MangaIntent +import org.xtimms.shirizu.data.repository.BookmarksRepository +import org.xtimms.shirizu.data.repository.FavouritesRepository +import org.xtimms.shirizu.data.repository.HistoryRepository +import org.xtimms.shirizu.sections.details.data.MangaDetails +import org.xtimms.shirizu.sections.details.domain.BranchComparator +import org.xtimms.shirizu.sections.details.domain.DetailsInteractor +import org.xtimms.shirizu.sections.details.domain.DetailsLoadUseCase +import org.xtimms.shirizu.sections.details.domain.ReadingTimeUseCase +import org.xtimms.shirizu.sections.details.domain.RelatedMangaUseCase +import org.xtimms.shirizu.sections.details.model.ChapterItem +import org.xtimms.shirizu.sections.details.model.HistoryInfo +import org.xtimms.shirizu.sections.details.model.MangaBranch +import org.xtimms.shirizu.utils.lang.onEachWhile +import org.xtimms.shirizu.utils.lang.removeFirstAndLast import javax.inject.Inject @HiltViewModel diff --git a/app/src/main/java/org/xtimms/etsudoku/sections/details/FullImageView.kt b/app/src/main/java/org/xtimms/shirizu/sections/details/FullImageView.kt similarity index 94% rename from app/src/main/java/org/xtimms/etsudoku/sections/details/FullImageView.kt rename to app/src/main/java/org/xtimms/shirizu/sections/details/FullImageView.kt index fe92fda..e09c187 100644 --- a/app/src/main/java/org/xtimms/etsudoku/sections/details/FullImageView.kt +++ b/app/src/main/java/org/xtimms/shirizu/sections/details/FullImageView.kt @@ -1,4 +1,4 @@ -package org.xtimms.etsudoku.sections.details +package org.xtimms.shirizu.sections.details import androidx.compose.foundation.background import androidx.compose.foundation.clickable @@ -30,10 +30,10 @@ import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.unit.dp import coil.ImageLoader import kotlinx.coroutines.launch -import org.xtimms.etsudoku.core.AsyncImageImpl -import org.xtimms.etsudoku.core.components.BackIconButton -import org.xtimms.etsudoku.core.components.ViewInBrowserButton -import org.xtimms.etsudoku.ui.theme.EtsudokuTheme +import org.xtimms.shirizu.core.AsyncImageImpl +import org.xtimms.shirizu.core.components.BackIconButton +import org.xtimms.shirizu.core.components.ViewInBrowserButton +import org.xtimms.shirizu.ui.theme.ShirizuTheme const val PICTURES_ARGUMENT = "{pictures}" const val FULL_POSTER_DESTINATION = "full_poster/$PICTURES_ARGUMENT" @@ -129,7 +129,7 @@ fun FullImageView( @Preview(showBackground = true) @Composable fun FullPosterPreview() { - EtsudokuTheme { + ShirizuTheme { FullImageView( coil = ImageLoader(LocalContext.current), pictures = arrayOf("", ""), diff --git a/app/src/main/java/org/xtimms/etsudoku/sections/details/data/MangaDetails.kt b/app/src/main/java/org/xtimms/shirizu/sections/details/data/MangaDetails.kt similarity index 94% rename from app/src/main/java/org/xtimms/etsudoku/sections/details/data/MangaDetails.kt rename to app/src/main/java/org/xtimms/shirizu/sections/details/data/MangaDetails.kt index 36d6bc7..1e3419b 100644 --- a/app/src/main/java/org/xtimms/etsudoku/sections/details/data/MangaDetails.kt +++ b/app/src/main/java/org/xtimms/shirizu/sections/details/data/MangaDetails.kt @@ -1,9 +1,9 @@ -package org.xtimms.etsudoku.sections.details.data +package org.xtimms.shirizu.sections.details.data import org.koitharu.kotatsu.parsers.model.Manga import org.koitharu.kotatsu.parsers.model.MangaChapter -import org.xtimms.etsudoku.core.model.LocalManga -import org.xtimms.etsudoku.core.model.isLocal +import org.xtimms.shirizu.core.model.LocalManga +import org.xtimms.shirizu.core.model.isLocal data class MangaDetails( private val manga: Manga, diff --git a/app/src/main/java/org/xtimms/etsudoku/sections/details/data/ReadingTime.kt b/app/src/main/java/org/xtimms/shirizu/sections/details/data/ReadingTime.kt similarity index 88% rename from app/src/main/java/org/xtimms/etsudoku/sections/details/data/ReadingTime.kt rename to app/src/main/java/org/xtimms/shirizu/sections/details/data/ReadingTime.kt index 65694de..2b00839 100644 --- a/app/src/main/java/org/xtimms/etsudoku/sections/details/data/ReadingTime.kt +++ b/app/src/main/java/org/xtimms/shirizu/sections/details/data/ReadingTime.kt @@ -1,7 +1,7 @@ -package org.xtimms.etsudoku.sections.details.data +package org.xtimms.shirizu.sections.details.data import android.content.res.Resources -import org.xtimms.etsudoku.R +import org.xtimms.shirizu.R data class ReadingTime( val minutes: Int, diff --git a/app/src/main/java/org/xtimms/etsudoku/sections/details/domain/BranchComparator.kt b/app/src/main/java/org/xtimms/shirizu/sections/details/domain/BranchComparator.kt similarity index 56% rename from app/src/main/java/org/xtimms/etsudoku/sections/details/domain/BranchComparator.kt rename to app/src/main/java/org/xtimms/shirizu/sections/details/domain/BranchComparator.kt index 2c3f5e9..fc148a4 100644 --- a/app/src/main/java/org/xtimms/etsudoku/sections/details/domain/BranchComparator.kt +++ b/app/src/main/java/org/xtimms/shirizu/sections/details/domain/BranchComparator.kt @@ -1,6 +1,6 @@ -package org.xtimms.etsudoku.sections.details.domain +package org.xtimms.shirizu.sections.details.domain -import org.xtimms.etsudoku.sections.details.model.MangaBranch +import org.xtimms.shirizu.sections.details.model.MangaBranch class BranchComparator : Comparator { diff --git a/app/src/main/java/org/xtimms/etsudoku/sections/details/domain/DetailsInteractor.kt b/app/src/main/java/org/xtimms/shirizu/sections/details/domain/DetailsInteractor.kt similarity index 74% rename from app/src/main/java/org/xtimms/etsudoku/sections/details/domain/DetailsInteractor.kt rename to app/src/main/java/org/xtimms/shirizu/sections/details/domain/DetailsInteractor.kt index c17516e..f1df5ef 100644 --- a/app/src/main/java/org/xtimms/etsudoku/sections/details/domain/DetailsInteractor.kt +++ b/app/src/main/java/org/xtimms/shirizu/sections/details/domain/DetailsInteractor.kt @@ -1,4 +1,4 @@ -package org.xtimms.etsudoku.sections.details.domain +package org.xtimms.shirizu.sections.details.domain import kotlinx.coroutines.ExperimentalCoroutinesApi import kotlinx.coroutines.flow.Flow @@ -7,9 +7,9 @@ import kotlinx.coroutines.flow.distinctUntilChangedBy import kotlinx.coroutines.flow.flatMapLatest import kotlinx.coroutines.flow.map import org.koitharu.kotatsu.parsers.model.Manga -import org.xtimms.etsudoku.core.prefs.AppSettings -import org.xtimms.etsudoku.data.repository.FavouritesRepository -import org.xtimms.etsudoku.data.repository.HistoryRepository +import org.xtimms.shirizu.core.prefs.AppSettings +import org.xtimms.shirizu.data.repository.FavouritesRepository +import org.xtimms.shirizu.data.repository.HistoryRepository import javax.inject.Inject class DetailsInteractor @Inject constructor( diff --git a/app/src/main/java/org/xtimms/etsudoku/sections/details/domain/DetailsLoadUseCase.kt b/app/src/main/java/org/xtimms/shirizu/sections/details/domain/DetailsLoadUseCase.kt similarity index 84% rename from app/src/main/java/org/xtimms/etsudoku/sections/details/domain/DetailsLoadUseCase.kt rename to app/src/main/java/org/xtimms/shirizu/sections/details/domain/DetailsLoadUseCase.kt index 41d76c4..0584581 100644 --- a/app/src/main/java/org/xtimms/etsudoku/sections/details/domain/DetailsLoadUseCase.kt +++ b/app/src/main/java/org/xtimms/shirizu/sections/details/domain/DetailsLoadUseCase.kt @@ -1,4 +1,4 @@ -package org.xtimms.etsudoku.sections.details.domain +package org.xtimms.shirizu.sections.details.domain import android.text.Html import android.text.SpannableString @@ -13,14 +13,14 @@ import kotlinx.coroutines.flow.channelFlow import kotlinx.coroutines.runInterruptible import org.koitharu.kotatsu.parsers.model.Manga import org.koitharu.kotatsu.parsers.util.runCatchingCancellable -import org.xtimms.etsudoku.core.model.isLocal -import org.xtimms.etsudoku.core.parser.MangaDataRepository -import org.xtimms.etsudoku.core.parser.MangaIntent -import org.xtimms.etsudoku.core.parser.MangaRepository -import org.xtimms.etsudoku.core.parser.local.LocalMangaRepository -import org.xtimms.etsudoku.sections.details.data.MangaDetails -import org.xtimms.etsudoku.utils.lang.peek -import org.xtimms.etsudoku.utils.lang.sanitize +import org.xtimms.shirizu.core.model.isLocal +import org.xtimms.shirizu.core.parser.MangaDataRepository +import org.xtimms.shirizu.core.parser.MangaIntent +import org.xtimms.shirizu.core.parser.MangaRepository +import org.xtimms.shirizu.core.parser.local.LocalMangaRepository +import org.xtimms.shirizu.sections.details.data.MangaDetails +import org.xtimms.shirizu.utils.lang.peek +import org.xtimms.shirizu.utils.lang.sanitize import java.io.IOException import javax.inject.Inject diff --git a/app/src/main/java/org/xtimms/etsudoku/sections/details/domain/ReadingTimeUseCase.kt b/app/src/main/java/org/xtimms/shirizu/sections/details/domain/ReadingTimeUseCase.kt similarity index 78% rename from app/src/main/java/org/xtimms/etsudoku/sections/details/domain/ReadingTimeUseCase.kt rename to app/src/main/java/org/xtimms/shirizu/sections/details/domain/ReadingTimeUseCase.kt index 332a57a..b843009 100644 --- a/app/src/main/java/org/xtimms/etsudoku/sections/details/domain/ReadingTimeUseCase.kt +++ b/app/src/main/java/org/xtimms/shirizu/sections/details/domain/ReadingTimeUseCase.kt @@ -1,10 +1,10 @@ -package org.xtimms.etsudoku.sections.details.domain +package org.xtimms.shirizu.sections.details.domain -import org.xtimms.etsudoku.core.model.MangaHistory -import org.xtimms.etsudoku.core.model.findById -import org.xtimms.etsudoku.core.prefs.AppSettings -import org.xtimms.etsudoku.sections.details.data.MangaDetails -import org.xtimms.etsudoku.sections.details.data.ReadingTime +import org.xtimms.shirizu.core.model.MangaHistory +import org.xtimms.shirizu.core.model.findById +import org.xtimms.shirizu.core.prefs.AppSettings +import org.xtimms.shirizu.sections.details.data.MangaDetails +import org.xtimms.shirizu.sections.details.data.ReadingTime import javax.inject.Inject import kotlin.math.roundToInt diff --git a/app/src/main/java/org/xtimms/etsudoku/sections/details/domain/RelatedMangaUseCase.kt b/app/src/main/java/org/xtimms/shirizu/sections/details/domain/RelatedMangaUseCase.kt similarity index 81% rename from app/src/main/java/org/xtimms/etsudoku/sections/details/domain/RelatedMangaUseCase.kt rename to app/src/main/java/org/xtimms/shirizu/sections/details/domain/RelatedMangaUseCase.kt index 6e72570..48ea409 100644 --- a/app/src/main/java/org/xtimms/etsudoku/sections/details/domain/RelatedMangaUseCase.kt +++ b/app/src/main/java/org/xtimms/shirizu/sections/details/domain/RelatedMangaUseCase.kt @@ -1,8 +1,8 @@ -package org.xtimms.etsudoku.sections.details.domain +package org.xtimms.shirizu.sections.details.domain import org.koitharu.kotatsu.parsers.model.Manga import org.koitharu.kotatsu.parsers.util.runCatchingCancellable -import org.xtimms.etsudoku.core.parser.MangaRepository +import org.xtimms.shirizu.core.parser.MangaRepository import javax.inject.Inject class RelatedMangaUseCase @Inject constructor( diff --git a/app/src/main/java/org/xtimms/etsudoku/sections/details/model/ChapterItem.kt b/app/src/main/java/org/xtimms/shirizu/sections/details/model/ChapterItem.kt similarity index 94% rename from app/src/main/java/org/xtimms/etsudoku/sections/details/model/ChapterItem.kt rename to app/src/main/java/org/xtimms/shirizu/sections/details/model/ChapterItem.kt index c77228d..15f8f93 100644 --- a/app/src/main/java/org/xtimms/etsudoku/sections/details/model/ChapterItem.kt +++ b/app/src/main/java/org/xtimms/shirizu/sections/details/model/ChapterItem.kt @@ -1,9 +1,9 @@ -package org.xtimms.etsudoku.sections.details.model +package org.xtimms.shirizu.sections.details.model import android.text.format.DateUtils import org.koitharu.kotatsu.parsers.model.MangaChapter -import org.xtimms.etsudoku.core.model.ListModel -import org.xtimms.etsudoku.core.model.formatNumber +import org.xtimms.shirizu.core.model.ListModel +import org.xtimms.shirizu.core.model.formatNumber import org.jsoup.internal.StringUtil.StringJoiner data class ChapterItem( diff --git a/app/src/main/java/org/xtimms/etsudoku/sections/details/model/HistoryInfo.kt b/app/src/main/java/org/xtimms/shirizu/sections/details/model/HistoryInfo.kt similarity index 86% rename from app/src/main/java/org/xtimms/etsudoku/sections/details/model/HistoryInfo.kt rename to app/src/main/java/org/xtimms/shirizu/sections/details/model/HistoryInfo.kt index a18b7d7..046a5bf 100644 --- a/app/src/main/java/org/xtimms/etsudoku/sections/details/model/HistoryInfo.kt +++ b/app/src/main/java/org/xtimms/shirizu/sections/details/model/HistoryInfo.kt @@ -1,7 +1,7 @@ -package org.xtimms.etsudoku.sections.details.model +package org.xtimms.shirizu.sections.details.model import org.koitharu.kotatsu.parsers.model.Manga -import org.xtimms.etsudoku.core.model.MangaHistory +import org.xtimms.shirizu.core.model.MangaHistory data class HistoryInfo( val totalChapters: Int, diff --git a/app/src/main/java/org/xtimms/etsudoku/sections/details/model/ListModelConversionExt.kt b/app/src/main/java/org/xtimms/shirizu/sections/details/model/ListModelConversionExt.kt similarity index 55% rename from app/src/main/java/org/xtimms/etsudoku/sections/details/model/ListModelConversionExt.kt rename to app/src/main/java/org/xtimms/shirizu/sections/details/model/ListModelConversionExt.kt index 49db462..daa9f85 100644 --- a/app/src/main/java/org/xtimms/etsudoku/sections/details/model/ListModelConversionExt.kt +++ b/app/src/main/java/org/xtimms/shirizu/sections/details/model/ListModelConversionExt.kt @@ -1,11 +1,11 @@ -package org.xtimms.etsudoku.sections.details.model +package org.xtimms.shirizu.sections.details.model import org.koitharu.kotatsu.parsers.model.MangaChapter -import org.xtimms.etsudoku.sections.details.model.ChapterItem.Companion.FLAG_BOOKMARKED -import org.xtimms.etsudoku.sections.details.model.ChapterItem.Companion.FLAG_CURRENT -import org.xtimms.etsudoku.sections.details.model.ChapterItem.Companion.FLAG_DOWNLOADED -import org.xtimms.etsudoku.sections.details.model.ChapterItem.Companion.FLAG_NEW -import org.xtimms.etsudoku.sections.details.model.ChapterItem.Companion.FLAG_UNREAD +import org.xtimms.shirizu.sections.details.model.ChapterItem.Companion.FLAG_BOOKMARKED +import org.xtimms.shirizu.sections.details.model.ChapterItem.Companion.FLAG_CURRENT +import org.xtimms.shirizu.sections.details.model.ChapterItem.Companion.FLAG_DOWNLOADED +import org.xtimms.shirizu.sections.details.model.ChapterItem.Companion.FLAG_NEW +import org.xtimms.shirizu.sections.details.model.ChapterItem.Companion.FLAG_UNREAD fun MangaChapter.toListItem( isCurrent: Boolean, diff --git a/app/src/main/java/org/xtimms/etsudoku/sections/details/model/MangaBranch.kt b/app/src/main/java/org/xtimms/shirizu/sections/details/model/MangaBranch.kt similarity index 77% rename from app/src/main/java/org/xtimms/etsudoku/sections/details/model/MangaBranch.kt rename to app/src/main/java/org/xtimms/shirizu/sections/details/model/MangaBranch.kt index 1d6d793..39db1f9 100644 --- a/app/src/main/java/org/xtimms/etsudoku/sections/details/model/MangaBranch.kt +++ b/app/src/main/java/org/xtimms/shirizu/sections/details/model/MangaBranch.kt @@ -1,6 +1,6 @@ -package org.xtimms.etsudoku.sections.details.model +package org.xtimms.shirizu.sections.details.model -import org.xtimms.etsudoku.core.model.ListModel +import org.xtimms.shirizu.core.model.ListModel data class MangaBranch( val name: String?, diff --git a/app/src/main/java/org/xtimms/shirizu/sections/explore/ExploreEvent.kt b/app/src/main/java/org/xtimms/shirizu/sections/explore/ExploreEvent.kt new file mode 100644 index 0000000..6f19c1c --- /dev/null +++ b/app/src/main/java/org/xtimms/shirizu/sections/explore/ExploreEvent.kt @@ -0,0 +1,5 @@ +package org.xtimms.shirizu.sections.explore + +import org.xtimms.shirizu.core.base.event.UiEvent + +interface ExploreEvent : UiEvent \ No newline at end of file diff --git a/app/src/main/java/org/xtimms/etsudoku/sections/explore/ExploreUiState.kt b/app/src/main/java/org/xtimms/shirizu/sections/explore/ExploreUiState.kt similarity index 81% rename from app/src/main/java/org/xtimms/etsudoku/sections/explore/ExploreUiState.kt rename to app/src/main/java/org/xtimms/shirizu/sections/explore/ExploreUiState.kt index 135a3bb..9b4bf97 100644 --- a/app/src/main/java/org/xtimms/etsudoku/sections/explore/ExploreUiState.kt +++ b/app/src/main/java/org/xtimms/shirizu/sections/explore/ExploreUiState.kt @@ -1,8 +1,8 @@ -package org.xtimms.etsudoku.sections.explore +package org.xtimms.shirizu.sections.explore import coil.ImageLoader import org.koitharu.kotatsu.parsers.model.MangaSource -import org.xtimms.etsudoku.core.base.state.UiState +import org.xtimms.shirizu.core.base.state.UiState data class ExploreUiState( val sources: List = emptyList(), diff --git a/app/src/main/java/org/xtimms/etsudoku/sections/explore/ExploreView.kt b/app/src/main/java/org/xtimms/shirizu/sections/explore/ExploreView.kt similarity index 96% rename from app/src/main/java/org/xtimms/etsudoku/sections/explore/ExploreView.kt rename to app/src/main/java/org/xtimms/shirizu/sections/explore/ExploreView.kt index 025b972..a7b18c9 100644 --- a/app/src/main/java/org/xtimms/etsudoku/sections/explore/ExploreView.kt +++ b/app/src/main/java/org/xtimms/shirizu/sections/explore/ExploreView.kt @@ -1,4 +1,4 @@ -package org.xtimms.etsudoku.sections.explore +package org.xtimms.shirizu.sections.explore import androidx.compose.animation.animateContentSize import androidx.compose.foundation.clickable @@ -50,12 +50,12 @@ import androidx.compose.ui.unit.dp import androidx.hilt.navigation.compose.hiltViewModel import androidx.lifecycle.compose.collectAsStateWithLifecycle import coil.ImageLoader -import org.xtimms.etsudoku.R -import org.xtimms.etsudoku.core.AsyncImageImpl -import org.xtimms.etsudoku.core.components.ExploreButton -import org.xtimms.etsudoku.core.components.SourceItem -import org.xtimms.etsudoku.core.components.icons.Dice -import org.xtimms.etsudoku.ui.theme.EtsudokuTheme +import org.xtimms.shirizu.R +import org.xtimms.shirizu.core.AsyncImageImpl +import org.xtimms.shirizu.core.components.ExploreButton +import org.xtimms.shirizu.core.components.SourceItem +import org.xtimms.shirizu.core.components.icons.Dice +import org.xtimms.shirizu.ui.theme.ShirizuTheme const val EXPLORE_DESTINATION = "explore" @@ -236,7 +236,7 @@ fun ExploreView( @PreviewLightDark @Composable fun RecommendationPreview() { - EtsudokuTheme { + ShirizuTheme { Row( verticalAlignment = Alignment.CenterVertically ) { diff --git a/app/src/main/java/org/xtimms/etsudoku/sections/explore/ExploreViewModel.kt b/app/src/main/java/org/xtimms/shirizu/sections/explore/ExploreViewModel.kt similarity index 84% rename from app/src/main/java/org/xtimms/etsudoku/sections/explore/ExploreViewModel.kt rename to app/src/main/java/org/xtimms/shirizu/sections/explore/ExploreViewModel.kt index 961c06e..5a781eb 100644 --- a/app/src/main/java/org/xtimms/etsudoku/sections/explore/ExploreViewModel.kt +++ b/app/src/main/java/org/xtimms/shirizu/sections/explore/ExploreViewModel.kt @@ -1,4 +1,4 @@ -package org.xtimms.etsudoku.sections.explore +package org.xtimms.shirizu.sections.explore import androidx.lifecycle.viewModelScope import dagger.hilt.android.lifecycle.HiltViewModel @@ -16,13 +16,13 @@ import kotlinx.coroutines.plus import org.koitharu.kotatsu.parsers.model.Manga import org.koitharu.kotatsu.parsers.model.MangaSource import org.koitharu.kotatsu.parsers.util.runCatchingCancellable -import org.xtimms.etsudoku.core.base.viewmodel.KotatsuBaseViewModel -import org.xtimms.etsudoku.core.parser.favicon.faviconUri -import org.xtimms.etsudoku.core.prefs.AppSettings -import org.xtimms.etsudoku.data.repository.ExploreRepository -import org.xtimms.etsudoku.data.repository.MangaSourcesRepository -import org.xtimms.etsudoku.data.repository.SuggestionRepository -import org.xtimms.etsudoku.utils.lang.mapItems +import org.xtimms.shirizu.core.base.viewmodel.KotatsuBaseViewModel +import org.xtimms.shirizu.core.parser.favicon.faviconUri +import org.xtimms.shirizu.core.prefs.AppSettings +import org.xtimms.shirizu.data.repository.ExploreRepository +import org.xtimms.shirizu.data.repository.MangaSourcesRepository +import org.xtimms.shirizu.data.repository.SuggestionRepository +import org.xtimms.shirizu.utils.lang.mapItems import javax.inject.Inject @HiltViewModel diff --git a/app/src/main/java/org/xtimms/etsudoku/sections/explore/SourceItemModel.kt b/app/src/main/java/org/xtimms/shirizu/sections/explore/SourceItemModel.kt similarity index 74% rename from app/src/main/java/org/xtimms/etsudoku/sections/explore/SourceItemModel.kt rename to app/src/main/java/org/xtimms/shirizu/sections/explore/SourceItemModel.kt index 37acb83..1a24abe 100644 --- a/app/src/main/java/org/xtimms/etsudoku/sections/explore/SourceItemModel.kt +++ b/app/src/main/java/org/xtimms/shirizu/sections/explore/SourceItemModel.kt @@ -1,7 +1,7 @@ -package org.xtimms.etsudoku.sections.explore +package org.xtimms.shirizu.sections.explore import android.net.Uri -import org.xtimms.etsudoku.core.model.ListModel +import org.xtimms.shirizu.core.model.ListModel data class SourceItemModel( val id: Int, diff --git a/app/src/main/java/org/xtimms/etsudoku/sections/explore/data/SourcesSortOrder.kt b/app/src/main/java/org/xtimms/shirizu/sections/explore/data/SourcesSortOrder.kt similarity index 71% rename from app/src/main/java/org/xtimms/etsudoku/sections/explore/data/SourcesSortOrder.kt rename to app/src/main/java/org/xtimms/shirizu/sections/explore/data/SourcesSortOrder.kt index 05825db..811946d 100644 --- a/app/src/main/java/org/xtimms/etsudoku/sections/explore/data/SourcesSortOrder.kt +++ b/app/src/main/java/org/xtimms/shirizu/sections/explore/data/SourcesSortOrder.kt @@ -1,7 +1,7 @@ -package org.xtimms.etsudoku.sections.explore.data +package org.xtimms.shirizu.sections.explore.data import androidx.annotation.StringRes -import org.xtimms.etsudoku.R +import org.xtimms.shirizu.R enum class SourcesSortOrder( @StringRes val titleResId: Int, diff --git a/app/src/main/java/org/xtimms/etsudoku/sections/feed/FeedView.kt b/app/src/main/java/org/xtimms/shirizu/sections/feed/FeedView.kt similarity index 88% rename from app/src/main/java/org/xtimms/etsudoku/sections/feed/FeedView.kt rename to app/src/main/java/org/xtimms/shirizu/sections/feed/FeedView.kt index 8388abb..f7b13a3 100644 --- a/app/src/main/java/org/xtimms/etsudoku/sections/feed/FeedView.kt +++ b/app/src/main/java/org/xtimms/shirizu/sections/feed/FeedView.kt @@ -1,4 +1,4 @@ -package org.xtimms.etsudoku.sections.feed +package org.xtimms.shirizu.sections.feed import androidx.compose.animation.core.Spring import androidx.compose.animation.core.VisibilityThreshold @@ -34,22 +34,22 @@ import androidx.compose.ui.unit.dp import androidx.hilt.navigation.compose.hiltViewModel import androidx.lifecycle.compose.collectAsStateWithLifecycle import coil.ImageLoader -import org.xtimms.etsudoku.R -import org.xtimms.etsudoku.core.components.ConfirmButton -import org.xtimms.etsudoku.core.components.DialogCheckBoxItem -import org.xtimms.etsudoku.core.components.DismissButton -import org.xtimms.etsudoku.core.components.ListGroupHeader -import org.xtimms.etsudoku.core.components.ScaffoldWithClassicTopAppBar -import org.xtimms.etsudoku.core.components.EtsudokuDialog -import org.xtimms.etsudoku.core.components.effects.RowEntity -import org.xtimms.etsudoku.core.components.effects.RowEntityType -import org.xtimms.etsudoku.core.components.effects.animatedItemsIndexed -import org.xtimms.etsudoku.core.components.effects.updateAnimatedItemsState -import org.xtimms.etsudoku.core.screens.EmptyScreen -import org.xtimms.etsudoku.core.tracker.model.TrackingLogItem -import org.xtimms.etsudoku.sections.feed.model.toFeedItem -import org.xtimms.etsudoku.utils.lang.calculateTimeAgo -import org.xtimms.etsudoku.utils.lang.isSameDay +import org.xtimms.shirizu.R +import org.xtimms.shirizu.core.components.ConfirmButton +import org.xtimms.shirizu.core.components.DialogCheckBoxItem +import org.xtimms.shirizu.core.components.DismissButton +import org.xtimms.shirizu.core.components.ListGroupHeader +import org.xtimms.shirizu.core.components.ScaffoldWithClassicTopAppBar +import org.xtimms.shirizu.core.components.ShirizuDialog +import org.xtimms.shirizu.core.components.effects.RowEntity +import org.xtimms.shirizu.core.components.effects.RowEntityType +import org.xtimms.shirizu.core.components.effects.animatedItemsIndexed +import org.xtimms.shirizu.core.components.effects.updateAnimatedItemsState +import org.xtimms.shirizu.core.screens.EmptyScreen +import org.xtimms.shirizu.core.tracker.model.TrackingLogItem +import org.xtimms.shirizu.sections.feed.model.toFeedItem +import org.xtimms.shirizu.utils.lang.calculateTimeAgo +import org.xtimms.shirizu.utils.lang.isSameDay import java.time.Instant const val FEED_DESTINATION = "feed" @@ -192,7 +192,7 @@ fun ClearFeedDialog( mutableStateOf(isClearInfoAboutNewChaptersSelected) } - EtsudokuDialog( + ShirizuDialog( onDismissRequest = onDismissRequest, confirmButton = { ConfirmButton { diff --git a/app/src/main/java/org/xtimms/etsudoku/sections/feed/FeedViewItem.kt b/app/src/main/java/org/xtimms/shirizu/sections/feed/FeedViewItem.kt similarity index 94% rename from app/src/main/java/org/xtimms/etsudoku/sections/feed/FeedViewItem.kt rename to app/src/main/java/org/xtimms/shirizu/sections/feed/FeedViewItem.kt index e1155e2..1f0baae 100644 --- a/app/src/main/java/org/xtimms/etsudoku/sections/feed/FeedViewItem.kt +++ b/app/src/main/java/org/xtimms/shirizu/sections/feed/FeedViewItem.kt @@ -1,4 +1,4 @@ -package org.xtimms.etsudoku.sections.feed +package org.xtimms.shirizu.sections.feed import androidx.compose.foundation.ExperimentalFoundationApi import androidx.compose.foundation.combinedClickable @@ -27,10 +27,10 @@ import androidx.compose.ui.res.stringResource import androidx.compose.ui.text.style.TextOverflow import androidx.compose.ui.unit.dp import coil.ImageLoader -import org.xtimms.etsudoku.R -import org.xtimms.etsudoku.core.components.MangaCover -import org.xtimms.etsudoku.sections.feed.model.FeedItem -import org.xtimms.etsudoku.utils.composable.selectedBackground +import org.xtimms.shirizu.R +import org.xtimms.shirizu.core.components.MangaCover +import org.xtimms.shirizu.sections.feed.model.FeedItem +import org.xtimms.shirizu.utils.composable.selectedBackground const val ReadItemAlpha = .38f diff --git a/app/src/main/java/org/xtimms/etsudoku/sections/feed/FeedViewModel.kt b/app/src/main/java/org/xtimms/shirizu/sections/feed/FeedViewModel.kt similarity index 79% rename from app/src/main/java/org/xtimms/etsudoku/sections/feed/FeedViewModel.kt rename to app/src/main/java/org/xtimms/shirizu/sections/feed/FeedViewModel.kt index dcd9c5f..6923864 100644 --- a/app/src/main/java/org/xtimms/etsudoku/sections/feed/FeedViewModel.kt +++ b/app/src/main/java/org/xtimms/shirizu/sections/feed/FeedViewModel.kt @@ -1,4 +1,4 @@ -package org.xtimms.etsudoku.sections.feed +package org.xtimms.shirizu.sections.feed import androidx.lifecycle.viewModelScope import dagger.hilt.android.lifecycle.HiltViewModel @@ -7,12 +7,12 @@ import kotlinx.coroutines.flow.MutableStateFlow import kotlinx.coroutines.flow.SharingStarted import kotlinx.coroutines.flow.stateIn import kotlinx.coroutines.plus -import org.xtimms.etsudoku.core.base.viewmodel.KotatsuBaseViewModel -import org.xtimms.etsudoku.data.repository.TrackingRepository -import org.xtimms.etsudoku.utils.lang.MutableEventFlow -import org.xtimms.etsudoku.utils.lang.call -import org.xtimms.etsudoku.utils.lang.insertSeparators -import org.xtimms.etsudoku.work.tracker.TrackWorker +import org.xtimms.shirizu.core.base.viewmodel.KotatsuBaseViewModel +import org.xtimms.shirizu.data.repository.TrackingRepository +import org.xtimms.shirizu.utils.lang.MutableEventFlow +import org.xtimms.shirizu.utils.lang.call +import org.xtimms.shirizu.utils.lang.insertSeparators +import org.xtimms.shirizu.work.tracker.TrackWorker import java.util.concurrent.atomic.AtomicBoolean import javax.inject.Inject diff --git a/app/src/main/java/org/xtimms/etsudoku/sections/feed/model/FeedItem.kt b/app/src/main/java/org/xtimms/shirizu/sections/feed/model/FeedItem.kt similarity index 77% rename from app/src/main/java/org/xtimms/etsudoku/sections/feed/model/FeedItem.kt rename to app/src/main/java/org/xtimms/shirizu/sections/feed/model/FeedItem.kt index b68b554..5a697f2 100644 --- a/app/src/main/java/org/xtimms/etsudoku/sections/feed/model/FeedItem.kt +++ b/app/src/main/java/org/xtimms/shirizu/sections/feed/model/FeedItem.kt @@ -1,7 +1,7 @@ -package org.xtimms.etsudoku.sections.feed.model +package org.xtimms.shirizu.sections.feed.model import org.koitharu.kotatsu.parsers.model.Manga -import org.xtimms.etsudoku.core.model.ListModel +import org.xtimms.shirizu.core.model.ListModel data class FeedItem( val id: Long, diff --git a/app/src/main/java/org/xtimms/etsudoku/sections/feed/model/ListModelConversionExt.kt b/app/src/main/java/org/xtimms/shirizu/sections/feed/model/ListModelConversionExt.kt similarity index 61% rename from app/src/main/java/org/xtimms/etsudoku/sections/feed/model/ListModelConversionExt.kt rename to app/src/main/java/org/xtimms/shirizu/sections/feed/model/ListModelConversionExt.kt index 25dfa82..02b568f 100644 --- a/app/src/main/java/org/xtimms/etsudoku/sections/feed/model/ListModelConversionExt.kt +++ b/app/src/main/java/org/xtimms/shirizu/sections/feed/model/ListModelConversionExt.kt @@ -1,6 +1,6 @@ -package org.xtimms.etsudoku.sections.feed.model +package org.xtimms.shirizu.sections.feed.model -import org.xtimms.etsudoku.core.tracker.model.TrackingLogItem +import org.xtimms.shirizu.core.tracker.model.TrackingLogItem fun TrackingLogItem.toFeedItem() = FeedItem( id = id, diff --git a/app/src/main/java/org/xtimms/etsudoku/sections/history/HistoryItem.kt b/app/src/main/java/org/xtimms/shirizu/sections/history/HistoryItem.kt similarity index 96% rename from app/src/main/java/org/xtimms/etsudoku/sections/history/HistoryItem.kt rename to app/src/main/java/org/xtimms/shirizu/sections/history/HistoryItem.kt index 1beea65..64bab2d 100644 --- a/app/src/main/java/org/xtimms/etsudoku/sections/history/HistoryItem.kt +++ b/app/src/main/java/org/xtimms/shirizu/sections/history/HistoryItem.kt @@ -1,4 +1,4 @@ -package org.xtimms.etsudoku.sections.history +package org.xtimms.shirizu.sections.history import androidx.compose.foundation.clickable import androidx.compose.foundation.layout.Arrangement @@ -16,7 +16,7 @@ import androidx.compose.ui.Modifier import androidx.compose.ui.text.style.TextOverflow import androidx.compose.ui.unit.dp import coil.ImageLoader -import org.xtimms.etsudoku.core.components.MangaCover +import org.xtimms.shirizu.core.components.MangaCover @Composable fun HistoryItem( diff --git a/app/src/main/java/org/xtimms/etsudoku/sections/history/HistoryItemModel.kt b/app/src/main/java/org/xtimms/shirizu/sections/history/HistoryItemModel.kt similarity index 66% rename from app/src/main/java/org/xtimms/etsudoku/sections/history/HistoryItemModel.kt rename to app/src/main/java/org/xtimms/shirizu/sections/history/HistoryItemModel.kt index 8b14da0..1404b94 100644 --- a/app/src/main/java/org/xtimms/etsudoku/sections/history/HistoryItemModel.kt +++ b/app/src/main/java/org/xtimms/shirizu/sections/history/HistoryItemModel.kt @@ -1,8 +1,8 @@ -package org.xtimms.etsudoku.sections.history +package org.xtimms.shirizu.sections.history import org.koitharu.kotatsu.parsers.model.Manga -import org.xtimms.etsudoku.core.model.ListModel -import org.xtimms.etsudoku.core.model.MangaHistory +import org.xtimms.shirizu.core.model.ListModel +import org.xtimms.shirizu.core.model.MangaHistory data class HistoryItemModel( val manga: Manga, diff --git a/app/src/main/java/org/xtimms/etsudoku/sections/history/HistoryView.kt b/app/src/main/java/org/xtimms/shirizu/sections/history/HistoryView.kt similarity index 93% rename from app/src/main/java/org/xtimms/etsudoku/sections/history/HistoryView.kt rename to app/src/main/java/org/xtimms/shirizu/sections/history/HistoryView.kt index 5855038..6bf5fac 100644 --- a/app/src/main/java/org/xtimms/etsudoku/sections/history/HistoryView.kt +++ b/app/src/main/java/org/xtimms/shirizu/sections/history/HistoryView.kt @@ -1,4 +1,4 @@ -package org.xtimms.etsudoku.sections.history +package org.xtimms.shirizu.sections.history //noinspection UsingMaterialAndMaterial3Libraries import androidx.compose.animation.core.Animatable @@ -49,19 +49,19 @@ import androidx.compose.ui.unit.min import androidx.hilt.navigation.compose.hiltViewModel import androidx.lifecycle.compose.collectAsStateWithLifecycle import coil.ImageLoader -import org.xtimms.etsudoku.R -import org.xtimms.etsudoku.core.collapsable -import org.xtimms.etsudoku.core.components.ListGroupHeader -import org.xtimms.etsudoku.core.components.effects.RowEntity -import org.xtimms.etsudoku.core.components.effects.RowEntityType -import org.xtimms.etsudoku.core.components.effects.animatedItemsIndexed -import org.xtimms.etsudoku.core.components.effects.updateAnimatedItemsState -import org.xtimms.etsudoku.core.prefs.AppSettings -import org.xtimms.etsudoku.core.prefs.SWIPE_TUTORIAL -import org.xtimms.etsudoku.core.screens.EmptyScreen -import org.xtimms.etsudoku.core.screens.LoadingScreen -import org.xtimms.etsudoku.utils.lang.calculateTimeAgo -import org.xtimms.etsudoku.utils.lang.isSameDay +import org.xtimms.shirizu.R +import org.xtimms.shirizu.core.collapsable +import org.xtimms.shirizu.core.components.ListGroupHeader +import org.xtimms.shirizu.core.components.effects.RowEntity +import org.xtimms.shirizu.core.components.effects.RowEntityType +import org.xtimms.shirizu.core.components.effects.animatedItemsIndexed +import org.xtimms.shirizu.core.components.effects.updateAnimatedItemsState +import org.xtimms.shirizu.core.prefs.AppSettings +import org.xtimms.shirizu.core.prefs.SWIPE_TUTORIAL +import org.xtimms.shirizu.core.screens.EmptyScreen +import org.xtimms.shirizu.core.screens.LoadingScreen +import org.xtimms.shirizu.utils.lang.calculateTimeAgo +import org.xtimms.shirizu.utils.lang.isSameDay import java.time.Instant import kotlin.math.abs import kotlin.math.absoluteValue diff --git a/app/src/main/java/org/xtimms/etsudoku/sections/history/HistoryViewModel.kt b/app/src/main/java/org/xtimms/shirizu/sections/history/HistoryViewModel.kt similarity index 82% rename from app/src/main/java/org/xtimms/etsudoku/sections/history/HistoryViewModel.kt rename to app/src/main/java/org/xtimms/shirizu/sections/history/HistoryViewModel.kt index a9a8620..96be18b 100644 --- a/app/src/main/java/org/xtimms/etsudoku/sections/history/HistoryViewModel.kt +++ b/app/src/main/java/org/xtimms/shirizu/sections/history/HistoryViewModel.kt @@ -1,4 +1,4 @@ -package org.xtimms.etsudoku.sections.history +package org.xtimms.shirizu.sections.history import androidx.lifecycle.viewModelScope import dagger.hilt.android.lifecycle.HiltViewModel @@ -8,9 +8,9 @@ import kotlinx.coroutines.flow.distinctUntilChanged import kotlinx.coroutines.flow.filterNotNull import kotlinx.coroutines.flow.stateIn import kotlinx.coroutines.plus -import org.xtimms.etsudoku.core.base.viewmodel.KotatsuBaseViewModel -import org.xtimms.etsudoku.data.repository.HistoryRepository -import org.xtimms.etsudoku.utils.lang.mapItems +import org.xtimms.shirizu.core.base.viewmodel.KotatsuBaseViewModel +import org.xtimms.shirizu.data.repository.HistoryRepository +import org.xtimms.shirizu.utils.lang.mapItems import javax.inject.Inject @HiltViewModel diff --git a/app/src/main/java/org/xtimms/etsudoku/sections/history/SwipeActions.kt b/app/src/main/java/org/xtimms/shirizu/sections/history/SwipeActions.kt similarity index 98% rename from app/src/main/java/org/xtimms/etsudoku/sections/history/SwipeActions.kt rename to app/src/main/java/org/xtimms/shirizu/sections/history/SwipeActions.kt index 56ec230..6ea5ed1 100644 --- a/app/src/main/java/org/xtimms/etsudoku/sections/history/SwipeActions.kt +++ b/app/src/main/java/org/xtimms/shirizu/sections/history/SwipeActions.kt @@ -1,4 +1,4 @@ -package org.xtimms.etsudoku.sections.history +package org.xtimms.shirizu.sections.history import android.view.MotionEvent import androidx.compose.animation.* @@ -39,9 +39,9 @@ import kotlin.math.abs import kotlin.math.absoluteValue import kotlin.math.sqrt import androidx.compose.ui.unit.min -import org.xtimms.etsudoku.R -import org.xtimms.etsudoku.ui.theme.SEED -import org.xtimms.etsudoku.ui.theme.EtsudokuTheme +import org.xtimms.shirizu.R +import org.xtimms.shirizu.ui.theme.SEED +import org.xtimms.shirizu.ui.theme.ShirizuTheme data class SwipeActionsConfig( val threshold: Float, @@ -313,7 +313,7 @@ class CirclePath(private val progress: Float, private val start: Boolean) : Shap @Preview(widthDp = 300) @Composable private fun PreviewDefault() { - EtsudokuTheme { + ShirizuTheme { SwipeActions( startActionsConfig = SwipeActionsConfig( threshold = 0.4f, diff --git a/app/src/main/java/org/xtimms/shirizu/sections/list/MangaListEvent.kt b/app/src/main/java/org/xtimms/shirizu/sections/list/MangaListEvent.kt new file mode 100644 index 0000000..ce09f3f --- /dev/null +++ b/app/src/main/java/org/xtimms/shirizu/sections/list/MangaListEvent.kt @@ -0,0 +1,5 @@ +package org.xtimms.shirizu.sections.list + +import org.xtimms.shirizu.core.base.event.PagedUiEvent + +interface MangaListEvent : PagedUiEvent \ No newline at end of file diff --git a/app/src/main/java/org/xtimms/etsudoku/sections/list/MangaListUiState.kt b/app/src/main/java/org/xtimms/shirizu/sections/list/MangaListUiState.kt similarity index 82% rename from app/src/main/java/org/xtimms/etsudoku/sections/list/MangaListUiState.kt rename to app/src/main/java/org/xtimms/shirizu/sections/list/MangaListUiState.kt index cd2c8e2..b8a9e07 100644 --- a/app/src/main/java/org/xtimms/etsudoku/sections/list/MangaListUiState.kt +++ b/app/src/main/java/org/xtimms/shirizu/sections/list/MangaListUiState.kt @@ -1,7 +1,7 @@ -package org.xtimms.etsudoku.sections.list +package org.xtimms.shirizu.sections.list import org.koitharu.kotatsu.parsers.model.Manga -import org.xtimms.etsudoku.core.base.state.PagedUiState +import org.xtimms.shirizu.core.base.state.PagedUiState data class MangaListUiState( val manga: List = listOf(), diff --git a/app/src/main/java/org/xtimms/etsudoku/sections/list/MangaListView.kt b/app/src/main/java/org/xtimms/shirizu/sections/list/MangaListView.kt similarity index 95% rename from app/src/main/java/org/xtimms/etsudoku/sections/list/MangaListView.kt rename to app/src/main/java/org/xtimms/shirizu/sections/list/MangaListView.kt index 7f2b3e3..432c5fc 100644 --- a/app/src/main/java/org/xtimms/etsudoku/sections/list/MangaListView.kt +++ b/app/src/main/java/org/xtimms/shirizu/sections/list/MangaListView.kt @@ -1,4 +1,4 @@ -package org.xtimms.etsudoku.sections.list +package org.xtimms.shirizu.sections.list import androidx.compose.animation.AnimatedVisibility import androidx.compose.animation.core.tween @@ -34,10 +34,10 @@ import androidx.lifecycle.compose.collectAsStateWithLifecycle import coil.ImageLoader import org.koitharu.kotatsu.parsers.model.Manga import org.koitharu.kotatsu.parsers.model.MangaSource -import org.xtimms.etsudoku.core.components.MangaGridItem -import org.xtimms.etsudoku.core.components.ScaffoldWithSmallTopAppBarWithChips -import org.xtimms.etsudoku.utils.composable.onBottomReached -import org.xtimms.etsudoku.utils.system.toast +import org.xtimms.shirizu.core.components.MangaGridItem +import org.xtimms.shirizu.core.components.ScaffoldWithSmallTopAppBarWithChips +import org.xtimms.shirizu.utils.composable.onBottomReached +import org.xtimms.shirizu.utils.system.toast const val PROVIDER_ARGUMENT = "{source}" const val LIST_DESTINATION = "provider/${PROVIDER_ARGUMENT}" diff --git a/app/src/main/java/org/xtimms/etsudoku/sections/list/MangaListViewModel.kt b/app/src/main/java/org/xtimms/shirizu/sections/list/MangaListViewModel.kt similarity index 93% rename from app/src/main/java/org/xtimms/etsudoku/sections/list/MangaListViewModel.kt rename to app/src/main/java/org/xtimms/shirizu/sections/list/MangaListViewModel.kt index 47f9609..f73727d 100644 --- a/app/src/main/java/org/xtimms/etsudoku/sections/list/MangaListViewModel.kt +++ b/app/src/main/java/org/xtimms/shirizu/sections/list/MangaListViewModel.kt @@ -1,4 +1,4 @@ -package org.xtimms.etsudoku.sections.list +package org.xtimms.shirizu.sections.list import androidx.lifecycle.SavedStateHandle import dagger.hilt.android.lifecycle.HiltViewModel @@ -12,11 +12,11 @@ import kotlinx.coroutines.flow.getAndUpdate import kotlinx.coroutines.flow.update import org.koitharu.kotatsu.parsers.model.Manga import org.koitharu.kotatsu.parsers.model.MangaSource -import org.xtimms.etsudoku.core.base.viewmodel.BaseViewModel -import org.xtimms.etsudoku.core.parser.MangaRepository -import org.xtimms.etsudoku.utils.lang.call -import org.xtimms.etsudoku.utils.lang.removeFirstAndLast -import org.xtimms.etsudoku.utils.lang.require +import org.xtimms.shirizu.core.base.viewmodel.BaseViewModel +import org.xtimms.shirizu.core.parser.MangaRepository +import org.xtimms.shirizu.utils.lang.call +import org.xtimms.shirizu.utils.lang.removeFirstAndLast +import org.xtimms.shirizu.utils.lang.require import javax.inject.Inject import kotlin.coroutines.cancellation.CancellationException diff --git a/app/src/main/java/org/xtimms/shirizu/sections/reader/ReaderContent.kt b/app/src/main/java/org/xtimms/shirizu/sections/reader/ReaderContent.kt new file mode 100644 index 0000000..8a16245 --- /dev/null +++ b/app/src/main/java/org/xtimms/shirizu/sections/reader/ReaderContent.kt @@ -0,0 +1,8 @@ +package org.xtimms.shirizu.sections.reader + +import org.xtimms.shirizu.sections.reader.pager.ReaderPage + +data class ReaderContent( + val pages: List, + val state: ReaderState? +) \ No newline at end of file diff --git a/app/src/main/java/org/xtimms/etsudoku/sections/reader/ReaderState.kt b/app/src/main/java/org/xtimms/shirizu/sections/reader/ReaderState.kt similarity index 86% rename from app/src/main/java/org/xtimms/etsudoku/sections/reader/ReaderState.kt rename to app/src/main/java/org/xtimms/shirizu/sections/reader/ReaderState.kt index 8ff87c1..f4ce4f6 100644 --- a/app/src/main/java/org/xtimms/etsudoku/sections/reader/ReaderState.kt +++ b/app/src/main/java/org/xtimms/shirizu/sections/reader/ReaderState.kt @@ -1,9 +1,9 @@ -package org.xtimms.etsudoku.sections.reader +package org.xtimms.shirizu.sections.reader import android.os.Parcelable import kotlinx.parcelize.Parcelize import org.koitharu.kotatsu.parsers.model.Manga -import org.xtimms.etsudoku.core.model.MangaHistory +import org.xtimms.shirizu.core.model.MangaHistory @Parcelize data class ReaderState( diff --git a/app/src/main/java/org/xtimms/etsudoku/sections/reader/ReaderView.kt b/app/src/main/java/org/xtimms/shirizu/sections/reader/ReaderView.kt similarity index 94% rename from app/src/main/java/org/xtimms/etsudoku/sections/reader/ReaderView.kt rename to app/src/main/java/org/xtimms/shirizu/sections/reader/ReaderView.kt index 03b2eb1..5b1ce2a 100644 --- a/app/src/main/java/org/xtimms/etsudoku/sections/reader/ReaderView.kt +++ b/app/src/main/java/org/xtimms/shirizu/sections/reader/ReaderView.kt @@ -1,4 +1,4 @@ -package org.xtimms.etsudoku.sections.reader +package org.xtimms.shirizu.sections.reader import androidx.compose.foundation.layout.fillMaxSize import androidx.compose.foundation.layout.padding @@ -28,8 +28,8 @@ import com.google.android.material.slider.Slider import me.saket.telephoto.zoomable.coil.ZoomableAsyncImage import org.koitharu.kotatsu.parsers.model.Manga import org.koitharu.kotatsu.parsers.model.MangaChapter -import org.xtimms.etsudoku.core.components.AppBarTitle -import org.xtimms.etsudoku.core.components.BackIconButton +import org.xtimms.shirizu.core.components.AppBarTitle +import org.xtimms.shirizu.core.components.BackIconButton const val READER_DESTINATION = "reader" diff --git a/app/src/main/java/org/xtimms/etsudoku/sections/reader/ReaderViewModel.kt b/app/src/main/java/org/xtimms/shirizu/sections/reader/ReaderViewModel.kt similarity index 71% rename from app/src/main/java/org/xtimms/etsudoku/sections/reader/ReaderViewModel.kt rename to app/src/main/java/org/xtimms/shirizu/sections/reader/ReaderViewModel.kt index cdbeb0f..31bcaf2 100644 --- a/app/src/main/java/org/xtimms/etsudoku/sections/reader/ReaderViewModel.kt +++ b/app/src/main/java/org/xtimms/shirizu/sections/reader/ReaderViewModel.kt @@ -1,4 +1,4 @@ -package org.xtimms.etsudoku.sections.reader +package org.xtimms.shirizu.sections.reader import androidx.lifecycle.SavedStateHandle import dagger.hilt.android.lifecycle.HiltViewModel @@ -6,14 +6,14 @@ import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.Job import kotlinx.coroutines.flow.MutableStateFlow import kotlinx.coroutines.flow.first -import org.xtimms.etsudoku.core.base.viewmodel.KotatsuBaseViewModel -import org.xtimms.etsudoku.core.parser.MangaDataRepository -import org.xtimms.etsudoku.core.parser.MangaIntent -import org.xtimms.etsudoku.data.repository.HistoryRepository -import org.xtimms.etsudoku.sections.details.data.MangaDetails -import org.xtimms.etsudoku.sections.details.domain.DetailsLoadUseCase -import org.xtimms.etsudoku.sections.reader.domain.ChaptersLoader -import org.xtimms.etsudoku.sections.reader.domain.PageLoader +import org.xtimms.shirizu.core.base.viewmodel.KotatsuBaseViewModel +import org.xtimms.shirizu.core.parser.MangaDataRepository +import org.xtimms.shirizu.core.parser.MangaIntent +import org.xtimms.shirizu.data.repository.HistoryRepository +import org.xtimms.shirizu.sections.details.data.MangaDetails +import org.xtimms.shirizu.sections.details.domain.DetailsLoadUseCase +import org.xtimms.shirizu.sections.reader.domain.ChaptersLoader +import org.xtimms.shirizu.sections.reader.domain.PageLoader import javax.inject.Inject @HiltViewModel diff --git a/app/src/main/java/org/xtimms/etsudoku/sections/reader/domain/ChapterPages.kt b/app/src/main/java/org/xtimms/shirizu/sections/reader/domain/ChapterPages.kt similarity index 95% rename from app/src/main/java/org/xtimms/etsudoku/sections/reader/domain/ChapterPages.kt rename to app/src/main/java/org/xtimms/shirizu/sections/reader/domain/ChapterPages.kt index cc89c0b..be26787 100644 --- a/app/src/main/java/org/xtimms/etsudoku/sections/reader/domain/ChapterPages.kt +++ b/app/src/main/java/org/xtimms/shirizu/sections/reader/domain/ChapterPages.kt @@ -1,8 +1,8 @@ -package org.xtimms.etsudoku.sections.reader.domain +package org.xtimms.shirizu.sections.reader.domain import androidx.collection.LongSparseArray import androidx.collection.contains -import org.xtimms.etsudoku.sections.reader.pager.ReaderPage +import org.xtimms.shirizu.sections.reader.pager.ReaderPage class ChapterPages private constructor(private val pages: ArrayDeque) : List by pages { diff --git a/app/src/main/java/org/xtimms/etsudoku/sections/reader/domain/ChaptersLoader.kt b/app/src/main/java/org/xtimms/shirizu/sections/reader/domain/ChaptersLoader.kt similarity index 92% rename from app/src/main/java/org/xtimms/etsudoku/sections/reader/domain/ChaptersLoader.kt rename to app/src/main/java/org/xtimms/shirizu/sections/reader/domain/ChaptersLoader.kt index cdb79b4..0ada7f6 100644 --- a/app/src/main/java/org/xtimms/etsudoku/sections/reader/domain/ChaptersLoader.kt +++ b/app/src/main/java/org/xtimms/shirizu/sections/reader/domain/ChaptersLoader.kt @@ -1,13 +1,13 @@ -package org.xtimms.etsudoku.sections.reader.domain +package org.xtimms.shirizu.sections.reader.domain import androidx.collection.LongSparseArray import dagger.hilt.android.scopes.ViewModelScoped import kotlinx.coroutines.sync.Mutex import kotlinx.coroutines.sync.withLock import org.koitharu.kotatsu.parsers.model.MangaChapter -import org.xtimms.etsudoku.core.parser.MangaRepository -import org.xtimms.etsudoku.sections.details.data.MangaDetails -import org.xtimms.etsudoku.sections.reader.pager.ReaderPage +import org.xtimms.shirizu.core.parser.MangaRepository +import org.xtimms.shirizu.sections.details.data.MangaDetails +import org.xtimms.shirizu.sections.reader.pager.ReaderPage import javax.inject.Inject private const val PAGES_TRIM_THRESHOLD = 120 diff --git a/app/src/main/java/org/xtimms/etsudoku/sections/reader/domain/PageLoader.kt b/app/src/main/java/org/xtimms/shirizu/sections/reader/domain/PageLoader.kt similarity index 86% rename from app/src/main/java/org/xtimms/etsudoku/sections/reader/domain/PageLoader.kt rename to app/src/main/java/org/xtimms/shirizu/sections/reader/domain/PageLoader.kt index 46442ef..63e47db 100644 --- a/app/src/main/java/org/xtimms/etsudoku/sections/reader/domain/PageLoader.kt +++ b/app/src/main/java/org/xtimms/shirizu/sections/reader/domain/PageLoader.kt @@ -1,4 +1,4 @@ -package org.xtimms.etsudoku.sections.reader.domain +package org.xtimms.shirizu.sections.reader.domain import android.content.Context import android.graphics.BitmapFactory @@ -27,29 +27,29 @@ import okhttp3.OkHttpClient import okhttp3.Request import org.koitharu.kotatsu.parsers.model.MangaPage import org.koitharu.kotatsu.parsers.model.MangaSource -import org.xtimms.etsudoku.core.cache.PagesCache -import org.xtimms.etsudoku.core.network.CommonHeaders -import org.xtimms.etsudoku.core.network.MangaHttpClient -import org.xtimms.etsudoku.core.network.interceptors.ImageProxyInterceptor -import org.xtimms.etsudoku.core.parser.MangaRepository -import org.xtimms.etsudoku.core.parser.RemoteMangaRepository -import org.xtimms.etsudoku.core.parser.local.isFileUri -import org.xtimms.etsudoku.core.parser.local.isZipUri -import org.xtimms.etsudoku.core.prefs.AppSettings -import org.xtimms.etsudoku.sections.reader.pager.ReaderPage -import org.xtimms.etsudoku.utils.FileSize -import org.xtimms.etsudoku.utils.RetainedLifecycleCoroutineScope -import org.xtimms.etsudoku.utils.lang.getCompletionResultOrNull -import org.xtimms.etsudoku.utils.lang.withProgress -import org.xtimms.etsudoku.utils.progress.ProgressDeferred -import org.xtimms.etsudoku.utils.system.URI_SCHEME_ZIP -import org.xtimms.etsudoku.utils.system.compressToPNG -import org.xtimms.etsudoku.utils.system.ensureRamAtLeast -import org.xtimms.etsudoku.utils.system.ensureSuccess -import org.xtimms.etsudoku.utils.system.exists -import org.xtimms.etsudoku.utils.system.isPowerSaveMode -import org.xtimms.etsudoku.utils.system.isTargetNotEmpty -import org.xtimms.etsudoku.utils.system.ramAvailable +import org.xtimms.shirizu.core.cache.PagesCache +import org.xtimms.shirizu.core.network.CommonHeaders +import org.xtimms.shirizu.core.network.MangaHttpClient +import org.xtimms.shirizu.core.network.interceptors.ImageProxyInterceptor +import org.xtimms.shirizu.core.parser.MangaRepository +import org.xtimms.shirizu.core.parser.RemoteMangaRepository +import org.xtimms.shirizu.core.parser.local.isFileUri +import org.xtimms.shirizu.core.parser.local.isZipUri +import org.xtimms.shirizu.core.prefs.AppSettings +import org.xtimms.shirizu.sections.reader.pager.ReaderPage +import org.xtimms.shirizu.utils.FileSize +import org.xtimms.shirizu.utils.RetainedLifecycleCoroutineScope +import org.xtimms.shirizu.utils.lang.getCompletionResultOrNull +import org.xtimms.shirizu.utils.lang.withProgress +import org.xtimms.shirizu.utils.progress.ProgressDeferred +import org.xtimms.shirizu.utils.system.URI_SCHEME_ZIP +import org.xtimms.shirizu.utils.system.compressToPNG +import org.xtimms.shirizu.utils.system.ensureRamAtLeast +import org.xtimms.shirizu.utils.system.ensureSuccess +import org.xtimms.shirizu.utils.system.exists +import org.xtimms.shirizu.utils.system.isPowerSaveMode +import org.xtimms.shirizu.utils.system.isTargetNotEmpty +import org.xtimms.shirizu.utils.system.ramAvailable import java.util.LinkedList import java.util.concurrent.atomic.AtomicInteger import java.util.zip.ZipFile diff --git a/app/src/main/java/org/xtimms/etsudoku/sections/reader/pager/ReaderPage.kt b/app/src/main/java/org/xtimms/shirizu/sections/reader/pager/ReaderPage.kt similarity index 93% rename from app/src/main/java/org/xtimms/etsudoku/sections/reader/pager/ReaderPage.kt rename to app/src/main/java/org/xtimms/shirizu/sections/reader/pager/ReaderPage.kt index 3c86003..351e452 100644 --- a/app/src/main/java/org/xtimms/etsudoku/sections/reader/pager/ReaderPage.kt +++ b/app/src/main/java/org/xtimms/shirizu/sections/reader/pager/ReaderPage.kt @@ -1,4 +1,4 @@ -package org.xtimms.etsudoku.sections.reader.pager +package org.xtimms.shirizu.sections.reader.pager import android.os.Parcelable import kotlinx.parcelize.Parcelize diff --git a/app/src/main/java/org/xtimms/etsudoku/sections/reader/thumbnails/MangaPageFetcher.kt b/app/src/main/java/org/xtimms/shirizu/sections/reader/thumbnails/MangaPageFetcher.kt similarity index 90% rename from app/src/main/java/org/xtimms/etsudoku/sections/reader/thumbnails/MangaPageFetcher.kt rename to app/src/main/java/org/xtimms/shirizu/sections/reader/thumbnails/MangaPageFetcher.kt index d6bf375..63dacc5 100644 --- a/app/src/main/java/org/xtimms/etsudoku/sections/reader/thumbnails/MangaPageFetcher.kt +++ b/app/src/main/java/org/xtimms/shirizu/sections/reader/thumbnails/MangaPageFetcher.kt @@ -1,4 +1,4 @@ -package org.xtimms.etsudoku.sections.reader.thumbnails +package org.xtimms.shirizu.sections.reader.thumbnails import android.content.Context import android.webkit.MimeTypeMap @@ -21,14 +21,14 @@ import okio.buffer import okio.source import org.koitharu.kotatsu.parsers.model.MangaPage import org.koitharu.kotatsu.parsers.util.mimeType -import org.xtimms.etsudoku.core.cache.PagesCache -import org.xtimms.etsudoku.core.network.MangaHttpClient -import org.xtimms.etsudoku.core.network.interceptors.ImageProxyInterceptor -import org.xtimms.etsudoku.core.parser.MangaRepository -import org.xtimms.etsudoku.core.parser.local.isFileUri -import org.xtimms.etsudoku.core.parser.local.isZipUri -import org.xtimms.etsudoku.sections.reader.domain.PageLoader -import org.xtimms.etsudoku.utils.withExtraCloseable +import org.xtimms.shirizu.core.cache.PagesCache +import org.xtimms.shirizu.core.network.MangaHttpClient +import org.xtimms.shirizu.core.network.interceptors.ImageProxyInterceptor +import org.xtimms.shirizu.core.parser.MangaRepository +import org.xtimms.shirizu.core.parser.local.isFileUri +import org.xtimms.shirizu.core.parser.local.isZipUri +import org.xtimms.shirizu.sections.reader.domain.PageLoader +import org.xtimms.shirizu.utils.withExtraCloseable import java.util.zip.ZipFile import javax.inject.Inject diff --git a/app/src/main/java/org/xtimms/etsudoku/sections/search/SearchView.kt b/app/src/main/java/org/xtimms/shirizu/sections/search/SearchView.kt similarity index 94% rename from app/src/main/java/org/xtimms/etsudoku/sections/search/SearchView.kt rename to app/src/main/java/org/xtimms/shirizu/sections/search/SearchView.kt index a8c9f32..ba763f6 100644 --- a/app/src/main/java/org/xtimms/etsudoku/sections/search/SearchView.kt +++ b/app/src/main/java/org/xtimms/shirizu/sections/search/SearchView.kt @@ -1,4 +1,4 @@ -package org.xtimms.etsudoku.sections.search +package org.xtimms.shirizu.sections.search import androidx.compose.foundation.layout.Column import androidx.compose.foundation.layout.PaddingValues @@ -32,10 +32,10 @@ import androidx.compose.ui.res.stringResource import androidx.compose.ui.text.input.ImeAction import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.unit.dp -import org.xtimms.etsudoku.R -import org.xtimms.etsudoku.core.components.BackIconButton -import org.xtimms.etsudoku.core.screens.EmptyScreen -import org.xtimms.etsudoku.ui.theme.EtsudokuTheme +import org.xtimms.shirizu.R +import org.xtimms.shirizu.core.components.BackIconButton +import org.xtimms.shirizu.core.screens.EmptyScreen +import org.xtimms.shirizu.ui.theme.ShirizuTheme const val SEARCH_DESTINATION = "search" @@ -114,7 +114,7 @@ fun SearchView( @Preview(showBackground = true) @Composable fun SearchPreview() { - EtsudokuTheme { + ShirizuTheme { SearchHostView( isCompactScreen = true, padding = PaddingValues(), diff --git a/app/src/main/java/org/xtimms/etsudoku/sections/settings/SettingsView.kt b/app/src/main/java/org/xtimms/shirizu/sections/settings/SettingsView.kt similarity index 96% rename from app/src/main/java/org/xtimms/etsudoku/sections/settings/SettingsView.kt rename to app/src/main/java/org/xtimms/shirizu/sections/settings/SettingsView.kt index 1c77791..5e4cf0c 100644 --- a/app/src/main/java/org/xtimms/etsudoku/sections/settings/SettingsView.kt +++ b/app/src/main/java/org/xtimms/shirizu/sections/settings/SettingsView.kt @@ -1,4 +1,4 @@ -package org.xtimms.etsudoku.sections.settings +package org.xtimms.shirizu.sections.settings import android.annotation.SuppressLint import android.content.Context @@ -40,11 +40,11 @@ import androidx.compose.ui.platform.LocalContext import androidx.compose.ui.res.stringResource import androidx.hilt.navigation.compose.hiltViewModel import androidx.lifecycle.compose.collectAsStateWithLifecycle -import org.xtimms.etsudoku.R -import org.xtimms.etsudoku.core.components.PreferencesHintCard -import org.xtimms.etsudoku.core.components.ScaffoldWithTopAppBar -import org.xtimms.etsudoku.core.components.SettingItem -import org.xtimms.etsudoku.utils.FileSize +import org.xtimms.shirizu.R +import org.xtimms.shirizu.core.components.PreferencesHintCard +import org.xtimms.shirizu.core.components.ScaffoldWithTopAppBar +import org.xtimms.shirizu.core.components.SettingItem +import org.xtimms.shirizu.utils.FileSize const val SETTINGS_DESTINATION = "settings" diff --git a/app/src/main/java/org/xtimms/etsudoku/sections/settings/SettingsViewModel.kt b/app/src/main/java/org/xtimms/shirizu/sections/settings/SettingsViewModel.kt similarity index 83% rename from app/src/main/java/org/xtimms/etsudoku/sections/settings/SettingsViewModel.kt rename to app/src/main/java/org/xtimms/shirizu/sections/settings/SettingsViewModel.kt index 8f88e06..73727e7 100644 --- a/app/src/main/java/org/xtimms/etsudoku/sections/settings/SettingsViewModel.kt +++ b/app/src/main/java/org/xtimms/shirizu/sections/settings/SettingsViewModel.kt @@ -1,4 +1,4 @@ -package org.xtimms.etsudoku.sections.settings +package org.xtimms.shirizu.sections.settings import androidx.lifecycle.viewModelScope import dagger.hilt.android.lifecycle.HiltViewModel @@ -12,11 +12,11 @@ import kotlinx.coroutines.flow.update import kotlinx.coroutines.plus import kotlinx.coroutines.runInterruptible import okhttp3.Cache -import org.xtimms.etsudoku.core.base.viewmodel.KotatsuBaseViewModel -import org.xtimms.etsudoku.core.cache.CacheDir -import org.xtimms.etsudoku.data.LocalStorageManager -import org.xtimms.etsudoku.data.repository.MangaSourcesRepository -import org.xtimms.etsudoku.sections.settings.sources.SourcesSettingsViewModel +import org.xtimms.shirizu.core.base.viewmodel.KotatsuBaseViewModel +import org.xtimms.shirizu.core.cache.CacheDir +import org.xtimms.shirizu.data.LocalStorageManager +import org.xtimms.shirizu.data.repository.MangaSourcesRepository +import org.xtimms.shirizu.sections.settings.sources.SourcesSettingsViewModel import javax.inject.Inject @HiltViewModel diff --git a/app/src/main/java/org/xtimms/etsudoku/sections/settings/about/AboutView.kt b/app/src/main/java/org/xtimms/shirizu/sections/settings/about/AboutView.kt similarity index 86% rename from app/src/main/java/org/xtimms/etsudoku/sections/settings/about/AboutView.kt rename to app/src/main/java/org/xtimms/shirizu/sections/settings/about/AboutView.kt index 8039797..421ba8f 100644 --- a/app/src/main/java/org/xtimms/etsudoku/sections/settings/about/AboutView.kt +++ b/app/src/main/java/org/xtimms/shirizu/sections/settings/about/AboutView.kt @@ -1,4 +1,4 @@ -package org.xtimms.etsudoku.sections.settings.about +package org.xtimms.shirizu.sections.settings.about import androidx.compose.foundation.layout.PaddingValues import androidx.compose.foundation.layout.WindowInsets @@ -24,20 +24,20 @@ import androidx.compose.ui.platform.LocalContext import androidx.compose.ui.platform.LocalUriHandler import androidx.compose.ui.res.stringResource import androidx.compose.ui.text.AnnotatedString -import org.xtimms.etsudoku.App -import org.xtimms.etsudoku.App.Companion.packageInfo -import org.xtimms.etsudoku.R -import org.xtimms.etsudoku.core.components.PreferenceItem -import org.xtimms.etsudoku.core.components.PreferenceSwitchWithDivider -import org.xtimms.etsudoku.core.components.ScaffoldWithTopAppBar -import org.xtimms.etsudoku.core.prefs.AUTO_UPDATE -import org.xtimms.etsudoku.core.prefs.AppSettings -import org.xtimms.etsudoku.utils.system.toast +import org.xtimms.shirizu.App +import org.xtimms.shirizu.App.Companion.packageInfo +import org.xtimms.shirizu.R +import org.xtimms.shirizu.core.components.PreferenceItem +import org.xtimms.shirizu.core.components.PreferenceSwitchWithDivider +import org.xtimms.shirizu.core.components.ScaffoldWithTopAppBar +import org.xtimms.shirizu.core.prefs.AUTO_UPDATE +import org.xtimms.shirizu.core.prefs.AppSettings +import org.xtimms.shirizu.utils.system.toast const val ABOUT_DESTINATION = "about" -private const val repoUrl = "https://git.kotatsu.app/Xtimms/Etsudoku" -const val weblate = "https://hosted.weblate.org/engage/etsudoku/" +private const val repoUrl = "https://git.kotatsu.app/Xtimms/Shirizu" +const val weblate = "https://hosted.weblate.org/engage/shirizu/" @Composable fun AboutView( diff --git a/app/src/main/java/org/xtimms/etsudoku/sections/settings/about/LicenseView.kt b/app/src/main/java/org/xtimms/shirizu/sections/settings/about/LicenseView.kt similarity index 93% rename from app/src/main/java/org/xtimms/etsudoku/sections/settings/about/LicenseView.kt rename to app/src/main/java/org/xtimms/shirizu/sections/settings/about/LicenseView.kt index ace8a08..995480e 100644 --- a/app/src/main/java/org/xtimms/etsudoku/sections/settings/about/LicenseView.kt +++ b/app/src/main/java/org/xtimms/shirizu/sections/settings/about/LicenseView.kt @@ -1,4 +1,4 @@ -package org.xtimms.etsudoku.sections.settings.about +package org.xtimms.shirizu.sections.settings.about import androidx.compose.foundation.layout.Column import androidx.compose.foundation.layout.padding @@ -15,7 +15,7 @@ import androidx.compose.ui.unit.dp import androidx.compose.ui.viewinterop.AndroidView import androidx.core.text.HtmlCompat import com.google.android.material.textview.MaterialTextView -import org.xtimms.etsudoku.core.components.ScaffoldWithClassicTopAppBar +import org.xtimms.shirizu.core.components.ScaffoldWithClassicTopAppBar const val LICENSE_NAME_ARGUMENT = "{name}" const val LICENSE_WEBSITE_ARGUMENT = "{website}" diff --git a/app/src/main/java/org/xtimms/etsudoku/sections/settings/about/OpenSourceLicensesView.kt b/app/src/main/java/org/xtimms/shirizu/sections/settings/about/OpenSourceLicensesView.kt similarity index 87% rename from app/src/main/java/org/xtimms/etsudoku/sections/settings/about/OpenSourceLicensesView.kt rename to app/src/main/java/org/xtimms/shirizu/sections/settings/about/OpenSourceLicensesView.kt index 68e063d..fd5bc1a 100644 --- a/app/src/main/java/org/xtimms/etsudoku/sections/settings/about/OpenSourceLicensesView.kt +++ b/app/src/main/java/org/xtimms/shirizu/sections/settings/about/OpenSourceLicensesView.kt @@ -1,4 +1,4 @@ -package org.xtimms.etsudoku.sections.settings.about +package org.xtimms.shirizu.sections.settings.about import androidx.compose.foundation.layout.fillMaxSize import androidx.compose.runtime.Composable @@ -6,8 +6,8 @@ import androidx.compose.ui.Modifier import androidx.compose.ui.res.stringResource import com.mikepenz.aboutlibraries.ui.compose.m3.LibrariesContainer import com.mikepenz.aboutlibraries.ui.compose.m3.util.htmlReadyLicenseContent -import org.xtimms.etsudoku.R -import org.xtimms.etsudoku.core.components.ScaffoldWithClassicTopAppBar +import org.xtimms.shirizu.R +import org.xtimms.shirizu.core.components.ScaffoldWithClassicTopAppBar const val LICENSES_DESTINATION = "licenses" diff --git a/app/src/main/java/org/xtimms/etsudoku/sections/settings/about/UpdateView.kt b/app/src/main/java/org/xtimms/shirizu/sections/settings/about/UpdateView.kt similarity index 87% rename from app/src/main/java/org/xtimms/etsudoku/sections/settings/about/UpdateView.kt rename to app/src/main/java/org/xtimms/shirizu/sections/settings/about/UpdateView.kt index 37a18d5..c85ee70 100644 --- a/app/src/main/java/org/xtimms/etsudoku/sections/settings/about/UpdateView.kt +++ b/app/src/main/java/org/xtimms/shirizu/sections/settings/about/UpdateView.kt @@ -1,4 +1,4 @@ -package org.xtimms.etsudoku.sections.settings.about +package org.xtimms.shirizu.sections.settings.about import androidx.compose.foundation.layout.Arrangement import androidx.compose.foundation.layout.Box @@ -34,23 +34,23 @@ import androidx.compose.ui.unit.dp import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.launch import kotlinx.coroutines.withContext -import org.xtimms.etsudoku.R -import org.xtimms.etsudoku.core.components.PreferenceInfo -import org.xtimms.etsudoku.core.components.PreferenceSingleChoiceItem -import org.xtimms.etsudoku.core.components.PreferenceSubtitle -import org.xtimms.etsudoku.core.components.PreferenceSwitchWithContainer -import org.xtimms.etsudoku.core.components.ScaffoldWithTopAppBar -import org.xtimms.etsudoku.core.prefs.AUTO_UPDATE -import org.xtimms.etsudoku.core.prefs.AppSettings.updateBoolean -import org.xtimms.etsudoku.core.prefs.AppSettings.updateInt -import org.xtimms.etsudoku.core.prefs.PRE_RELEASE -import org.xtimms.etsudoku.core.prefs.STABLE -import org.xtimms.etsudoku.core.prefs.UPDATE_CHANNEL -import org.xtimms.etsudoku.core.screens.UpdateDialog -import org.xtimms.etsudoku.core.updates.Updater -import org.xtimms.etsudoku.utils.lang.booleanState -import org.xtimms.etsudoku.utils.lang.intState -import org.xtimms.etsudoku.utils.system.suspendToast +import org.xtimms.shirizu.R +import org.xtimms.shirizu.core.components.PreferenceInfo +import org.xtimms.shirizu.core.components.PreferenceSingleChoiceItem +import org.xtimms.shirizu.core.components.PreferenceSubtitle +import org.xtimms.shirizu.core.components.PreferenceSwitchWithContainer +import org.xtimms.shirizu.core.components.ScaffoldWithTopAppBar +import org.xtimms.shirizu.core.prefs.AUTO_UPDATE +import org.xtimms.shirizu.core.prefs.AppSettings.updateBoolean +import org.xtimms.shirizu.core.prefs.AppSettings.updateInt +import org.xtimms.shirizu.core.prefs.PRE_RELEASE +import org.xtimms.shirizu.core.prefs.STABLE +import org.xtimms.shirizu.core.prefs.UPDATE_CHANNEL +import org.xtimms.shirizu.core.screens.UpdateDialog +import org.xtimms.shirizu.core.updates.Updater +import org.xtimms.shirizu.utils.lang.booleanState +import org.xtimms.shirizu.utils.lang.intState +import org.xtimms.shirizu.utils.system.suspendToast const val UPDATES_DESTINATION = "updates" diff --git a/app/src/main/java/org/xtimms/etsudoku/sections/settings/advanced/AdvancedView.kt b/app/src/main/java/org/xtimms/shirizu/sections/settings/advanced/AdvancedView.kt similarity index 91% rename from app/src/main/java/org/xtimms/etsudoku/sections/settings/advanced/AdvancedView.kt rename to app/src/main/java/org/xtimms/shirizu/sections/settings/advanced/AdvancedView.kt index eec7769..7c36a4c 100644 --- a/app/src/main/java/org/xtimms/etsudoku/sections/settings/advanced/AdvancedView.kt +++ b/app/src/main/java/org/xtimms/shirizu/sections/settings/advanced/AdvancedView.kt @@ -1,4 +1,4 @@ -package org.xtimms.etsudoku.sections.settings.advanced +package org.xtimms.shirizu.sections.settings.advanced import android.os.Build import androidx.compose.foundation.layout.PaddingValues @@ -25,21 +25,21 @@ import androidx.compose.ui.platform.LocalContext import androidx.compose.ui.res.stringResource import androidx.profileinstaller.ProfileVerifier import kotlinx.coroutines.guava.await -import org.xtimms.etsudoku.BuildConfig -import org.xtimms.etsudoku.R -import org.xtimms.etsudoku.core.components.PreferenceItem -import org.xtimms.etsudoku.core.components.PreferenceSubtitle -import org.xtimms.etsudoku.core.components.PreferenceSwitch -import org.xtimms.etsudoku.core.components.ScaffoldWithTopAppBar -import org.xtimms.etsudoku.core.logs.FileLogger -import org.xtimms.etsudoku.core.prefs.ACRA -import org.xtimms.etsudoku.core.prefs.AppSettings -import org.xtimms.etsudoku.core.prefs.LOGGING -import org.xtimms.etsudoku.utils.DeviceUtil -import org.xtimms.etsudoku.utils.ShareHelper -import org.xtimms.etsudoku.utils.WebViewUtil -import org.xtimms.etsudoku.utils.lang.toDateTimestampString -import org.xtimms.etsudoku.utils.system.toast +import org.xtimms.shirizu.BuildConfig +import org.xtimms.shirizu.R +import org.xtimms.shirizu.core.components.PreferenceItem +import org.xtimms.shirizu.core.components.PreferenceSubtitle +import org.xtimms.shirizu.core.components.PreferenceSwitch +import org.xtimms.shirizu.core.components.ScaffoldWithTopAppBar +import org.xtimms.shirizu.core.logs.FileLogger +import org.xtimms.shirizu.core.prefs.ACRA +import org.xtimms.shirizu.core.prefs.AppSettings +import org.xtimms.shirizu.core.prefs.LOGGING +import org.xtimms.shirizu.utils.DeviceUtil +import org.xtimms.shirizu.utils.ShareHelper +import org.xtimms.shirizu.utils.WebViewUtil +import org.xtimms.shirizu.utils.lang.toDateTimestampString +import org.xtimms.shirizu.utils.system.toast import java.text.DateFormat import java.text.SimpleDateFormat import java.util.Locale diff --git a/app/src/main/java/org/xtimms/etsudoku/sections/settings/appearance/AppearanceView.kt b/app/src/main/java/org/xtimms/shirizu/sections/settings/appearance/AppearanceView.kt similarity index 90% rename from app/src/main/java/org/xtimms/etsudoku/sections/settings/appearance/AppearanceView.kt rename to app/src/main/java/org/xtimms/shirizu/sections/settings/appearance/AppearanceView.kt index d9021af..893a1b3 100644 --- a/app/src/main/java/org/xtimms/etsudoku/sections/settings/appearance/AppearanceView.kt +++ b/app/src/main/java/org/xtimms/shirizu/sections/settings/appearance/AppearanceView.kt @@ -1,4 +1,4 @@ -package org.xtimms.etsudoku.sections.settings.appearance +package org.xtimms.shirizu.sections.settings.appearance import androidx.compose.animation.core.RepeatMode import androidx.compose.animation.core.animateDpAsState @@ -59,34 +59,34 @@ import androidx.compose.ui.unit.dp import androidx.compose.ui.zIndex import com.google.accompanist.pager.HorizontalPagerIndicator import com.google.android.material.color.DynamicColors -import org.xtimms.etsudoku.LocalDarkTheme -import org.xtimms.etsudoku.LocalDynamicColorSwitch -import org.xtimms.etsudoku.LocalPaletteStyleIndex -import org.xtimms.etsudoku.LocalSeedColor -import org.xtimms.etsudoku.R -import org.xtimms.etsudoku.core.components.PreferenceItem -import org.xtimms.etsudoku.core.components.PreferenceSubtitle -import org.xtimms.etsudoku.core.components.PreferenceSwitch -import org.xtimms.etsudoku.core.components.PreferenceSwitchWithDivider -import org.xtimms.etsudoku.core.components.ScaffoldWithTopAppBar -import org.xtimms.etsudoku.core.prefs.AppSettings -import org.xtimms.etsudoku.core.prefs.DarkThemePreference.Companion.OFF -import org.xtimms.etsudoku.core.prefs.DarkThemePreference.Companion.ON -import org.xtimms.etsudoku.core.prefs.READING_TIME -import org.xtimms.etsudoku.core.prefs.STYLE_MONOCHROME -import org.xtimms.etsudoku.core.prefs.STYLE_TONAL_SPOT -import org.xtimms.etsudoku.core.prefs.paletteStyles -import org.xtimms.etsudoku.sections.stats.Size -import org.xtimms.etsudoku.ui.harmonize.hct.Hct -import org.xtimms.etsudoku.ui.monet.LocalTonalPalettes -import org.xtimms.etsudoku.ui.monet.PaletteStyle -import org.xtimms.etsudoku.ui.monet.TonalPalettes -import org.xtimms.etsudoku.ui.monet.TonalPalettes.Companion.toTonalPalettes -import org.xtimms.etsudoku.ui.monet.a1 -import org.xtimms.etsudoku.ui.monet.a2 -import org.xtimms.etsudoku.ui.monet.a3 -import org.xtimms.etsudoku.utils.material.combineColors -import org.xtimms.etsudoku.utils.system.toDisplayName +import org.xtimms.shirizu.LocalDarkTheme +import org.xtimms.shirizu.LocalDynamicColorSwitch +import org.xtimms.shirizu.LocalPaletteStyleIndex +import org.xtimms.shirizu.LocalSeedColor +import org.xtimms.shirizu.R +import org.xtimms.shirizu.core.components.PreferenceItem +import org.xtimms.shirizu.core.components.PreferenceSubtitle +import org.xtimms.shirizu.core.components.PreferenceSwitch +import org.xtimms.shirizu.core.components.PreferenceSwitchWithDivider +import org.xtimms.shirizu.core.components.ScaffoldWithTopAppBar +import org.xtimms.shirizu.core.prefs.AppSettings +import org.xtimms.shirizu.core.prefs.DarkThemePreference.Companion.OFF +import org.xtimms.shirizu.core.prefs.DarkThemePreference.Companion.ON +import org.xtimms.shirizu.core.prefs.READING_TIME +import org.xtimms.shirizu.core.prefs.STYLE_MONOCHROME +import org.xtimms.shirizu.core.prefs.STYLE_TONAL_SPOT +import org.xtimms.shirizu.core.prefs.paletteStyles +import org.xtimms.shirizu.sections.stats.Size +import org.xtimms.shirizu.ui.harmonize.hct.Hct +import org.xtimms.shirizu.ui.monet.LocalTonalPalettes +import org.xtimms.shirizu.ui.monet.PaletteStyle +import org.xtimms.shirizu.ui.monet.TonalPalettes +import org.xtimms.shirizu.ui.monet.TonalPalettes.Companion.toTonalPalettes +import org.xtimms.shirizu.ui.monet.a1 +import org.xtimms.shirizu.ui.monet.a2 +import org.xtimms.shirizu.ui.monet.a3 +import org.xtimms.shirizu.utils.material.combineColors +import org.xtimms.shirizu.utils.system.toDisplayName import java.util.Locale const val APPEARANCE_DESTINATION = "appearance" diff --git a/app/src/main/java/org/xtimms/etsudoku/sections/settings/appearance/DarkThemeView.kt b/app/src/main/java/org/xtimms/shirizu/sections/settings/appearance/DarkThemeView.kt similarity index 80% rename from app/src/main/java/org/xtimms/etsudoku/sections/settings/appearance/DarkThemeView.kt rename to app/src/main/java/org/xtimms/shirizu/sections/settings/appearance/DarkThemeView.kt index 241472f..e2e47ec 100644 --- a/app/src/main/java/org/xtimms/etsudoku/sections/settings/appearance/DarkThemeView.kt +++ b/app/src/main/java/org/xtimms/shirizu/sections/settings/appearance/DarkThemeView.kt @@ -1,4 +1,4 @@ -package org.xtimms.etsudoku.sections.settings.appearance +package org.xtimms.shirizu.sections.settings.appearance import android.os.Build import androidx.compose.foundation.layout.PaddingValues @@ -12,16 +12,16 @@ import androidx.compose.material.icons.outlined.Contrast import androidx.compose.runtime.Composable import androidx.compose.ui.Modifier import androidx.compose.ui.res.stringResource -import org.xtimms.etsudoku.LocalDarkTheme -import org.xtimms.etsudoku.R -import org.xtimms.etsudoku.core.components.PreferenceSingleChoiceItem -import org.xtimms.etsudoku.core.components.PreferenceSubtitle -import org.xtimms.etsudoku.core.components.PreferenceSwitch -import org.xtimms.etsudoku.core.components.ScaffoldWithTopAppBar -import org.xtimms.etsudoku.core.prefs.AppSettings -import org.xtimms.etsudoku.core.prefs.DarkThemePreference.Companion.FOLLOW_SYSTEM -import org.xtimms.etsudoku.core.prefs.DarkThemePreference.Companion.OFF -import org.xtimms.etsudoku.core.prefs.DarkThemePreference.Companion.ON +import org.xtimms.shirizu.LocalDarkTheme +import org.xtimms.shirizu.R +import org.xtimms.shirizu.core.components.PreferenceSingleChoiceItem +import org.xtimms.shirizu.core.components.PreferenceSubtitle +import org.xtimms.shirizu.core.components.PreferenceSwitch +import org.xtimms.shirizu.core.components.ScaffoldWithTopAppBar +import org.xtimms.shirizu.core.prefs.AppSettings +import org.xtimms.shirizu.core.prefs.DarkThemePreference.Companion.FOLLOW_SYSTEM +import org.xtimms.shirizu.core.prefs.DarkThemePreference.Companion.OFF +import org.xtimms.shirizu.core.prefs.DarkThemePreference.Companion.ON const val DARK_THEME_DESTINATION = "dark_theme" diff --git a/app/src/main/java/org/xtimms/etsudoku/sections/settings/appearance/LanguagesView.kt b/app/src/main/java/org/xtimms/shirizu/sections/settings/appearance/LanguagesView.kt similarity index 91% rename from app/src/main/java/org/xtimms/etsudoku/sections/settings/appearance/LanguagesView.kt rename to app/src/main/java/org/xtimms/shirizu/sections/settings/appearance/LanguagesView.kt index 6aea2d3..4857ca3 100644 --- a/app/src/main/java/org/xtimms/etsudoku/sections/settings/appearance/LanguagesView.kt +++ b/app/src/main/java/org/xtimms/shirizu/sections/settings/appearance/LanguagesView.kt @@ -1,4 +1,4 @@ -package org.xtimms.etsudoku.sections.settings.appearance +package org.xtimms.shirizu.sections.settings.appearance import android.content.Intent import android.content.pm.PackageManager @@ -38,16 +38,16 @@ import androidx.compose.ui.text.style.TextOverflow import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.sp -import org.xtimms.etsudoku.R -import org.xtimms.etsudoku.core.components.PreferenceSingleChoiceItem -import org.xtimms.etsudoku.core.components.PreferencesHintCard -import org.xtimms.etsudoku.core.components.ScaffoldWithTopAppBar -import org.xtimms.etsudoku.core.prefs.AppSettings -import org.xtimms.etsudoku.sections.settings.about.weblate -import org.xtimms.etsudoku.ui.theme.EtsudokuTheme -import org.xtimms.etsudoku.utils.system.LocaleLanguageCodeMap -import org.xtimms.etsudoku.utils.system.setLanguage -import org.xtimms.etsudoku.utils.system.toDisplayName +import org.xtimms.shirizu.R +import org.xtimms.shirizu.core.components.PreferenceSingleChoiceItem +import org.xtimms.shirizu.core.components.PreferencesHintCard +import org.xtimms.shirizu.core.components.ScaffoldWithTopAppBar +import org.xtimms.shirizu.core.prefs.AppSettings +import org.xtimms.shirizu.sections.settings.about.weblate +import org.xtimms.shirizu.ui.theme.ShirizuTheme +import org.xtimms.shirizu.utils.system.LocaleLanguageCodeMap +import org.xtimms.shirizu.utils.system.setLanguage +import org.xtimms.shirizu.utils.system.toDisplayName import java.util.Locale const val LANGUAGES_DESTINATION = "languages" @@ -186,7 +186,7 @@ private fun LanguagePagePreview() { mutableStateOf(Locale.KOREAN) } val map = setOf(Locale.forLanguageTag("ru")) - EtsudokuTheme { + ShirizuTheme { LanguageViewImpl( localeSet = map, isSystemLocaleSettingsAvailable = true, diff --git a/app/src/main/java/org/xtimms/etsudoku/sections/settings/backup/AppBackupAgent.kt b/app/src/main/java/org/xtimms/shirizu/sections/settings/backup/AppBackupAgent.kt similarity index 87% rename from app/src/main/java/org/xtimms/etsudoku/sections/settings/backup/AppBackupAgent.kt rename to app/src/main/java/org/xtimms/shirizu/sections/settings/backup/AppBackupAgent.kt index 1e43817..6dc7dea 100644 --- a/app/src/main/java/org/xtimms/etsudoku/sections/settings/backup/AppBackupAgent.kt +++ b/app/src/main/java/org/xtimms/shirizu/sections/settings/backup/AppBackupAgent.kt @@ -1,4 +1,4 @@ -package org.xtimms.etsudoku.sections.settings.backup +package org.xtimms.shirizu.sections.settings.backup import android.app.backup.BackupAgent import android.app.backup.BackupDataInput @@ -8,11 +8,11 @@ import android.content.Context import android.os.ParcelFileDescriptor import androidx.annotation.VisibleForTesting import kotlinx.coroutines.runBlocking -import org.xtimms.etsudoku.core.database.EtsudokuDatabase -import org.xtimms.etsudoku.data.repository.backup.BackupEntry -import org.xtimms.etsudoku.data.repository.backup.BackupRepository -import org.xtimms.etsudoku.data.repository.backup.BackupZipInput -import org.xtimms.etsudoku.data.repository.backup.BackupZipOutput +import org.xtimms.shirizu.core.database.ShirizuDatabase +import org.xtimms.shirizu.data.repository.backup.BackupEntry +import org.xtimms.shirizu.data.repository.backup.BackupRepository +import org.xtimms.shirizu.data.repository.backup.BackupZipInput +import org.xtimms.shirizu.data.repository.backup.BackupZipOutput import java.io.File import java.io.FileDescriptor import java.io.FileInputStream @@ -36,7 +36,7 @@ class AppBackupAgent : BackupAgent() { override fun onFullBackup(data: FullBackupDataOutput) { super.onFullBackup(data) val file = - createBackupFile(this, BackupRepository(EtsudokuDatabase(applicationContext))) + createBackupFile(this, BackupRepository(ShirizuDatabase(applicationContext))) try { fullBackupFile(file, data) } finally { @@ -56,7 +56,7 @@ class AppBackupAgent : BackupAgent() { restoreBackupFile( data.fileDescriptor, size, - BackupRepository(EtsudokuDatabase(applicationContext)), + BackupRepository(ShirizuDatabase(applicationContext)), ) destination.delete() } else { diff --git a/app/src/main/java/org/xtimms/etsudoku/sections/settings/backup/BackupEntryModel.kt b/app/src/main/java/org/xtimms/shirizu/sections/settings/backup/BackupEntryModel.kt similarity index 79% rename from app/src/main/java/org/xtimms/etsudoku/sections/settings/backup/BackupEntryModel.kt rename to app/src/main/java/org/xtimms/shirizu/sections/settings/backup/BackupEntryModel.kt index a9b298f..b364765 100644 --- a/app/src/main/java/org/xtimms/etsudoku/sections/settings/backup/BackupEntryModel.kt +++ b/app/src/main/java/org/xtimms/shirizu/sections/settings/backup/BackupEntryModel.kt @@ -1,9 +1,9 @@ -package org.xtimms.etsudoku.sections.settings.backup +package org.xtimms.shirizu.sections.settings.backup import androidx.annotation.StringRes -import org.xtimms.etsudoku.R -import org.xtimms.etsudoku.core.model.ListModel -import org.xtimms.etsudoku.data.repository.backup.BackupEntry +import org.xtimms.shirizu.R +import org.xtimms.shirizu.core.model.ListModel +import org.xtimms.shirizu.data.repository.backup.BackupEntry data class BackupEntryModel( val name: BackupEntry.Name, diff --git a/app/src/main/java/org/xtimms/etsudoku/sections/settings/backup/BackupItem.kt b/app/src/main/java/org/xtimms/shirizu/sections/settings/backup/BackupItem.kt similarity index 87% rename from app/src/main/java/org/xtimms/etsudoku/sections/settings/backup/BackupItem.kt rename to app/src/main/java/org/xtimms/shirizu/sections/settings/backup/BackupItem.kt index 81f28c5..caec30a 100644 --- a/app/src/main/java/org/xtimms/etsudoku/sections/settings/backup/BackupItem.kt +++ b/app/src/main/java/org/xtimms/shirizu/sections/settings/backup/BackupItem.kt @@ -1,4 +1,4 @@ -package org.xtimms.etsudoku.sections.settings.backup +package org.xtimms.shirizu.sections.settings.backup import androidx.compose.foundation.ExperimentalFoundationApi import androidx.compose.foundation.combinedClickable @@ -16,9 +16,9 @@ import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.unit.dp -import org.xtimms.etsudoku.core.components.PreferenceItemDescription -import org.xtimms.etsudoku.core.components.PreferenceItemTitle -import org.xtimms.etsudoku.ui.theme.EtsudokuTheme +import org.xtimms.shirizu.core.components.PreferenceItemDescription +import org.xtimms.shirizu.core.components.PreferenceItemTitle +import org.xtimms.shirizu.ui.theme.ShirizuTheme @OptIn(ExperimentalFoundationApi::class) @Composable @@ -59,7 +59,7 @@ fun BackupItem( @Preview @Composable fun BackupItemPreview() { - EtsudokuTheme { + ShirizuTheme { BackupItem(title = "Title") } } \ No newline at end of file diff --git a/app/src/main/java/org/xtimms/etsudoku/sections/settings/backup/BackupObserver.kt b/app/src/main/java/org/xtimms/shirizu/sections/settings/backup/BackupObserver.kt similarity index 71% rename from app/src/main/java/org/xtimms/etsudoku/sections/settings/backup/BackupObserver.kt rename to app/src/main/java/org/xtimms/shirizu/sections/settings/backup/BackupObserver.kt index 6551af4..e917b65 100644 --- a/app/src/main/java/org/xtimms/etsudoku/sections/settings/backup/BackupObserver.kt +++ b/app/src/main/java/org/xtimms/shirizu/sections/settings/backup/BackupObserver.kt @@ -1,12 +1,12 @@ -package org.xtimms.etsudoku.sections.settings.backup +package org.xtimms.shirizu.sections.settings.backup import android.app.backup.BackupManager import android.content.Context import androidx.room.InvalidationTracker import dagger.hilt.android.qualifiers.ApplicationContext -import org.xtimms.etsudoku.core.database.TABLE_FAVOURITES -import org.xtimms.etsudoku.core.database.TABLE_FAVOURITE_CATEGORIES -import org.xtimms.etsudoku.core.database.TABLE_HISTORY +import org.xtimms.shirizu.core.database.TABLE_FAVOURITES +import org.xtimms.shirizu.core.database.TABLE_FAVOURITE_CATEGORIES +import org.xtimms.shirizu.core.database.TABLE_HISTORY import javax.inject.Inject import javax.inject.Singleton diff --git a/app/src/main/java/org/xtimms/etsudoku/sections/settings/backup/BackupRestoreView.kt b/app/src/main/java/org/xtimms/shirizu/sections/settings/backup/BackupRestoreView.kt similarity index 92% rename from app/src/main/java/org/xtimms/etsudoku/sections/settings/backup/BackupRestoreView.kt rename to app/src/main/java/org/xtimms/shirizu/sections/settings/backup/BackupRestoreView.kt index 9798684..d4be39e 100644 --- a/app/src/main/java/org/xtimms/etsudoku/sections/settings/backup/BackupRestoreView.kt +++ b/app/src/main/java/org/xtimms/shirizu/sections/settings/backup/BackupRestoreView.kt @@ -1,4 +1,4 @@ -package org.xtimms.etsudoku.sections.settings.backup +package org.xtimms.shirizu.sections.settings.backup import android.content.Context import android.content.Intent @@ -35,16 +35,16 @@ import androidx.compose.ui.platform.LocalContext import androidx.compose.ui.res.stringResource import androidx.compose.ui.unit.dp import androidx.hilt.navigation.compose.hiltViewModel -import org.xtimms.etsudoku.R -import org.xtimms.etsudoku.core.components.PreferenceInfo -import org.xtimms.etsudoku.core.components.PreferenceItem -import org.xtimms.etsudoku.core.components.PreferenceSubtitle -import org.xtimms.etsudoku.core.components.PreferenceSwitchWithContainer -import org.xtimms.etsudoku.core.components.PreferencesHintCard -import org.xtimms.etsudoku.core.components.ScaffoldWithTopAppBar -import org.xtimms.etsudoku.core.components.icons.Kotatsu -import org.xtimms.etsudoku.utils.system.toast -import org.xtimms.etsudoku.utils.system.tryLaunch +import org.xtimms.shirizu.R +import org.xtimms.shirizu.core.components.PreferenceInfo +import org.xtimms.shirizu.core.components.PreferenceItem +import org.xtimms.shirizu.core.components.PreferenceSubtitle +import org.xtimms.shirizu.core.components.PreferenceSwitchWithContainer +import org.xtimms.shirizu.core.components.PreferencesHintCard +import org.xtimms.shirizu.core.components.ScaffoldWithTopAppBar +import org.xtimms.shirizu.core.components.icons.Kotatsu +import org.xtimms.shirizu.utils.system.toast +import org.xtimms.shirizu.utils.system.tryLaunch import java.io.File import java.io.FileOutputStream diff --git a/app/src/main/java/org/xtimms/etsudoku/sections/settings/backup/BackupViewModel.kt b/app/src/main/java/org/xtimms/shirizu/sections/settings/backup/BackupViewModel.kt similarity index 78% rename from app/src/main/java/org/xtimms/etsudoku/sections/settings/backup/BackupViewModel.kt rename to app/src/main/java/org/xtimms/shirizu/sections/settings/backup/BackupViewModel.kt index fa90e1c..1bb66da 100644 --- a/app/src/main/java/org/xtimms/etsudoku/sections/settings/backup/BackupViewModel.kt +++ b/app/src/main/java/org/xtimms/shirizu/sections/settings/backup/BackupViewModel.kt @@ -1,14 +1,14 @@ -package org.xtimms.etsudoku.sections.settings.backup +package org.xtimms.shirizu.sections.settings.backup import android.content.Context import dagger.hilt.android.lifecycle.HiltViewModel import dagger.hilt.android.qualifiers.ApplicationContext import kotlinx.coroutines.flow.MutableStateFlow -import org.xtimms.etsudoku.core.base.viewmodel.KotatsuBaseViewModel -import org.xtimms.etsudoku.data.repository.backup.BackupRepository -import org.xtimms.etsudoku.data.repository.backup.BackupZipOutput -import org.xtimms.etsudoku.utils.lang.MutableEventFlow -import org.xtimms.etsudoku.utils.lang.call +import org.xtimms.shirizu.core.base.viewmodel.KotatsuBaseViewModel +import org.xtimms.shirizu.data.repository.backup.BackupRepository +import org.xtimms.shirizu.data.repository.backup.BackupZipOutput +import org.xtimms.shirizu.utils.lang.MutableEventFlow +import org.xtimms.shirizu.utils.lang.call import java.io.File import javax.inject.Inject diff --git a/app/src/main/java/org/xtimms/etsudoku/sections/settings/backup/PeriodicalBackupWorker.kt b/app/src/main/java/org/xtimms/shirizu/sections/settings/backup/PeriodicalBackupWorker.kt similarity index 89% rename from app/src/main/java/org/xtimms/etsudoku/sections/settings/backup/PeriodicalBackupWorker.kt rename to app/src/main/java/org/xtimms/shirizu/sections/settings/backup/PeriodicalBackupWorker.kt index 13e86dc..7c21b20 100644 --- a/app/src/main/java/org/xtimms/etsudoku/sections/settings/backup/PeriodicalBackupWorker.kt +++ b/app/src/main/java/org/xtimms/shirizu/sections/settings/backup/PeriodicalBackupWorker.kt @@ -1,4 +1,4 @@ -package org.xtimms.etsudoku.sections.settings.backup +package org.xtimms.shirizu.sections.settings.backup import android.content.Context import android.os.Build @@ -16,11 +16,11 @@ import androidx.work.workDataOf import dagger.Reusable import dagger.assisted.Assisted import dagger.assisted.AssistedInject -import org.xtimms.etsudoku.data.repository.backup.BackupRepository -import org.xtimms.etsudoku.data.repository.backup.BackupZipOutput -import org.xtimms.etsudoku.utils.lang.awaitUniqueWorkInfoByName -import org.xtimms.etsudoku.utils.system.deleteAwait -import org.xtimms.etsudoku.work.PeriodicWorkScheduler +import org.xtimms.shirizu.data.repository.backup.BackupRepository +import org.xtimms.shirizu.data.repository.backup.BackupZipOutput +import org.xtimms.shirizu.utils.lang.awaitUniqueWorkInfoByName +import org.xtimms.shirizu.utils.system.deleteAwait +import org.xtimms.shirizu.work.PeriodicWorkScheduler import java.util.Date import java.util.concurrent.TimeUnit import javax.inject.Inject diff --git a/app/src/main/java/org/xtimms/etsudoku/sections/settings/backup/RestoreItemsView.kt b/app/src/main/java/org/xtimms/shirizu/sections/settings/backup/RestoreItemsView.kt similarity index 91% rename from app/src/main/java/org/xtimms/etsudoku/sections/settings/backup/RestoreItemsView.kt rename to app/src/main/java/org/xtimms/shirizu/sections/settings/backup/RestoreItemsView.kt index e6abe91..22db5fa 100644 --- a/app/src/main/java/org/xtimms/etsudoku/sections/settings/backup/RestoreItemsView.kt +++ b/app/src/main/java/org/xtimms/shirizu/sections/settings/backup/RestoreItemsView.kt @@ -1,4 +1,4 @@ -package org.xtimms.etsudoku.sections.settings.backup +package org.xtimms.shirizu.sections.settings.backup import androidx.compose.foundation.layout.Arrangement import androidx.compose.foundation.layout.PaddingValues @@ -24,11 +24,11 @@ import androidx.compose.ui.res.stringResource import androidx.compose.ui.unit.dp import androidx.hilt.navigation.compose.hiltViewModel import androidx.lifecycle.compose.collectAsStateWithLifecycle -import org.xtimms.etsudoku.R -import org.xtimms.etsudoku.core.components.PreferencesHintCard -import org.xtimms.etsudoku.core.components.ScaffoldWithTopAppBar -import org.xtimms.etsudoku.sections.settings.about.ProgressIndicatorButton -import org.xtimms.etsudoku.utils.DeviceUtil +import org.xtimms.shirizu.R +import org.xtimms.shirizu.core.components.PreferencesHintCard +import org.xtimms.shirizu.core.components.ScaffoldWithTopAppBar +import org.xtimms.shirizu.sections.settings.about.ProgressIndicatorButton +import org.xtimms.shirizu.utils.DeviceUtil const val RESTORE_ARGUMENT = "{file}" const val RESTORE_DESTINATION = "restore/?file=${RESTORE_ARGUMENT}" diff --git a/app/src/main/java/org/xtimms/etsudoku/sections/settings/backup/RestoreViewModel.kt b/app/src/main/java/org/xtimms/shirizu/sections/settings/backup/RestoreViewModel.kt similarity index 91% rename from app/src/main/java/org/xtimms/etsudoku/sections/settings/backup/RestoreViewModel.kt rename to app/src/main/java/org/xtimms/shirizu/sections/settings/backup/RestoreViewModel.kt index e9419c1..0daba21 100644 --- a/app/src/main/java/org/xtimms/etsudoku/sections/settings/backup/RestoreViewModel.kt +++ b/app/src/main/java/org/xtimms/shirizu/sections/settings/backup/RestoreViewModel.kt @@ -1,4 +1,4 @@ -package org.xtimms.etsudoku.sections.settings.backup +package org.xtimms.shirizu.sections.settings.backup import android.content.Context import android.net.Uri @@ -9,14 +9,14 @@ import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.flow.MutableStateFlow import kotlinx.coroutines.runInterruptible import org.koitharu.kotatsu.parsers.util.SuspendLazy -import org.xtimms.etsudoku.core.base.viewmodel.KotatsuBaseViewModel -import org.xtimms.etsudoku.data.repository.backup.BackupEntry -import org.xtimms.etsudoku.data.repository.backup.BackupRepository -import org.xtimms.etsudoku.data.repository.backup.BackupZipInput -import org.xtimms.etsudoku.data.repository.backup.CompositeResult -import org.xtimms.etsudoku.utils.lang.MutableEventFlow -import org.xtimms.etsudoku.utils.lang.call -import org.xtimms.etsudoku.utils.system.toUriOrNull +import org.xtimms.shirizu.core.base.viewmodel.KotatsuBaseViewModel +import org.xtimms.shirizu.data.repository.backup.BackupEntry +import org.xtimms.shirizu.data.repository.backup.BackupRepository +import org.xtimms.shirizu.data.repository.backup.BackupZipInput +import org.xtimms.shirizu.data.repository.backup.CompositeResult +import org.xtimms.shirizu.utils.lang.MutableEventFlow +import org.xtimms.shirizu.utils.lang.call +import org.xtimms.shirizu.utils.system.toUriOrNull import java.io.File import java.io.FileNotFoundException import java.util.Date diff --git a/app/src/main/java/org/xtimms/etsudoku/sections/settings/network/NetworkView.kt b/app/src/main/java/org/xtimms/shirizu/sections/settings/network/NetworkView.kt similarity index 86% rename from app/src/main/java/org/xtimms/etsudoku/sections/settings/network/NetworkView.kt rename to app/src/main/java/org/xtimms/shirizu/sections/settings/network/NetworkView.kt index e08d50b..b1e3e81 100644 --- a/app/src/main/java/org/xtimms/etsudoku/sections/settings/network/NetworkView.kt +++ b/app/src/main/java/org/xtimms/shirizu/sections/settings/network/NetworkView.kt @@ -1,4 +1,4 @@ -package org.xtimms.etsudoku.sections.settings.network +package org.xtimms.shirizu.sections.settings.network import androidx.compose.foundation.layout.PaddingValues import androidx.compose.foundation.layout.WindowInsets @@ -17,14 +17,14 @@ import androidx.compose.runtime.remember import androidx.compose.runtime.setValue import androidx.compose.ui.Modifier import androidx.compose.ui.res.stringResource -import org.xtimms.etsudoku.R -import org.xtimms.etsudoku.core.components.PreferenceItem -import org.xtimms.etsudoku.core.components.PreferenceSwitch -import org.xtimms.etsudoku.core.components.ScaffoldWithTopAppBar -import org.xtimms.etsudoku.core.components.icons.ArrowDecisionOutline -import org.xtimms.etsudoku.core.prefs.AppSettings -import org.xtimms.etsudoku.core.prefs.SSL_BYPASS -import org.xtimms.etsudoku.core.prefs.WSRV +import org.xtimms.shirizu.R +import org.xtimms.shirizu.core.components.PreferenceItem +import org.xtimms.shirizu.core.components.PreferenceSwitch +import org.xtimms.shirizu.core.components.ScaffoldWithTopAppBar +import org.xtimms.shirizu.core.components.icons.ArrowDecisionOutline +import org.xtimms.shirizu.core.prefs.AppSettings +import org.xtimms.shirizu.core.prefs.SSL_BYPASS +import org.xtimms.shirizu.core.prefs.WSRV const val NETWORK_DESTINATION = "network" diff --git a/app/src/main/java/org/xtimms/etsudoku/sections/settings/shelf/ShelfSettingsView.kt b/app/src/main/java/org/xtimms/shirizu/sections/settings/shelf/ShelfSettingsView.kt similarity index 91% rename from app/src/main/java/org/xtimms/etsudoku/sections/settings/shelf/ShelfSettingsView.kt rename to app/src/main/java/org/xtimms/shirizu/sections/settings/shelf/ShelfSettingsView.kt index 42d8e1b..ccd4012 100644 --- a/app/src/main/java/org/xtimms/etsudoku/sections/settings/shelf/ShelfSettingsView.kt +++ b/app/src/main/java/org/xtimms/shirizu/sections/settings/shelf/ShelfSettingsView.kt @@ -1,4 +1,4 @@ -package org.xtimms.etsudoku.sections.settings.shelf +package org.xtimms.shirizu.sections.settings.shelf import androidx.compose.foundation.interaction.MutableInteractionSource import androidx.compose.foundation.layout.Column @@ -34,15 +34,15 @@ import androidx.compose.ui.res.stringResource import androidx.compose.ui.unit.dp import androidx.hilt.navigation.compose.hiltViewModel import androidx.lifecycle.compose.collectAsStateWithLifecycle -import org.xtimms.etsudoku.R -import org.xtimms.etsudoku.core.components.PreferenceItem -import org.xtimms.etsudoku.core.components.PreferenceSubtitle -import org.xtimms.etsudoku.core.components.PreferenceSwitch -import org.xtimms.etsudoku.core.components.ScaffoldWithTopAppBar -import org.xtimms.etsudoku.core.prefs.AppSettings -import org.xtimms.etsudoku.core.prefs.GRID_COLUMNS -import org.xtimms.etsudoku.core.prefs.TABS_MANGA_COUNT -import org.xtimms.etsudoku.sections.shelf.ShelfViewModel +import org.xtimms.shirizu.R +import org.xtimms.shirizu.core.components.PreferenceItem +import org.xtimms.shirizu.core.components.PreferenceSubtitle +import org.xtimms.shirizu.core.components.PreferenceSwitch +import org.xtimms.shirizu.core.components.ScaffoldWithTopAppBar +import org.xtimms.shirizu.core.prefs.AppSettings +import org.xtimms.shirizu.core.prefs.GRID_COLUMNS +import org.xtimms.shirizu.core.prefs.TABS_MANGA_COUNT +import org.xtimms.shirizu.sections.shelf.ShelfViewModel const val SHELF_SETTINGS_DESTINATION = "shelf_settings" diff --git a/app/src/main/java/org/xtimms/etsudoku/sections/settings/shelf/categories/AddCategoryDialog.kt b/app/src/main/java/org/xtimms/shirizu/sections/settings/shelf/categories/AddCategoryDialog.kt similarity index 88% rename from app/src/main/java/org/xtimms/etsudoku/sections/settings/shelf/categories/AddCategoryDialog.kt rename to app/src/main/java/org/xtimms/shirizu/sections/settings/shelf/categories/AddCategoryDialog.kt index 51c5779..d66fd7a 100644 --- a/app/src/main/java/org/xtimms/etsudoku/sections/settings/shelf/categories/AddCategoryDialog.kt +++ b/app/src/main/java/org/xtimms/shirizu/sections/settings/shelf/categories/AddCategoryDialog.kt @@ -1,4 +1,4 @@ -package org.xtimms.etsudoku.sections.settings.shelf.categories +package org.xtimms.shirizu.sections.settings.shelf.categories import androidx.compose.foundation.layout.Column import androidx.compose.foundation.layout.padding @@ -14,9 +14,9 @@ import androidx.compose.ui.Modifier import androidx.compose.ui.res.stringResource import androidx.compose.ui.text.input.ImeAction import androidx.compose.ui.unit.dp -import org.xtimms.etsudoku.R -import org.xtimms.etsudoku.core.components.ConfirmButton -import org.xtimms.etsudoku.core.components.DismissButton +import org.xtimms.shirizu.R +import org.xtimms.shirizu.core.components.ConfirmButton +import org.xtimms.shirizu.core.components.DismissButton @Composable fun AddCategoryDialog(onDismissRequest: () -> Unit) { diff --git a/app/src/main/java/org/xtimms/etsudoku/sections/settings/shelf/categories/CategoriesView.kt b/app/src/main/java/org/xtimms/shirizu/sections/settings/shelf/categories/CategoriesView.kt similarity index 92% rename from app/src/main/java/org/xtimms/etsudoku/sections/settings/shelf/categories/CategoriesView.kt rename to app/src/main/java/org/xtimms/shirizu/sections/settings/shelf/categories/CategoriesView.kt index db920c8..0e6c28b 100644 --- a/app/src/main/java/org/xtimms/etsudoku/sections/settings/shelf/categories/CategoriesView.kt +++ b/app/src/main/java/org/xtimms/shirizu/sections/settings/shelf/categories/CategoriesView.kt @@ -1,4 +1,4 @@ -package org.xtimms.etsudoku.sections.settings.shelf.categories +package org.xtimms.shirizu.sections.settings.shelf.categories import androidx.compose.animation.core.Spring import androidx.compose.animation.core.VisibilityThreshold @@ -26,10 +26,10 @@ import androidx.compose.ui.unit.IntOffset import androidx.compose.ui.unit.dp import androidx.hilt.navigation.compose.hiltViewModel import androidx.lifecycle.compose.collectAsStateWithLifecycle -import org.xtimms.etsudoku.R -import org.xtimms.etsudoku.core.components.ScaffoldWithClassicTopAppBar -import org.xtimms.etsudoku.sections.shelf.ShelfViewModel -import org.xtimms.etsudoku.utils.system.plus +import org.xtimms.shirizu.R +import org.xtimms.shirizu.core.components.ScaffoldWithClassicTopAppBar +import org.xtimms.shirizu.sections.shelf.ShelfViewModel +import org.xtimms.shirizu.utils.system.plus const val CATEGORIES_DESTINATION = "categories" diff --git a/app/src/main/java/org/xtimms/etsudoku/sections/settings/shelf/categories/CategoryListItem.kt b/app/src/main/java/org/xtimms/shirizu/sections/settings/shelf/categories/CategoryListItem.kt similarity index 95% rename from app/src/main/java/org/xtimms/etsudoku/sections/settings/shelf/categories/CategoryListItem.kt rename to app/src/main/java/org/xtimms/shirizu/sections/settings/shelf/categories/CategoryListItem.kt index 9771342..54036c0 100644 --- a/app/src/main/java/org/xtimms/etsudoku/sections/settings/shelf/categories/CategoryListItem.kt +++ b/app/src/main/java/org/xtimms/shirizu/sections/settings/shelf/categories/CategoryListItem.kt @@ -1,4 +1,4 @@ -package org.xtimms.etsudoku.sections.settings.shelf.categories +package org.xtimms.shirizu.sections.settings.shelf.categories import androidx.compose.foundation.clickable import androidx.compose.foundation.layout.Row @@ -22,8 +22,8 @@ import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier import androidx.compose.ui.res.stringResource import androidx.compose.ui.unit.dp -import org.xtimms.etsudoku.R -import org.xtimms.etsudoku.sections.shelf.FavouriteTabModel +import org.xtimms.shirizu.R +import org.xtimms.shirizu.sections.shelf.FavouriteTabModel @Composable fun CategoryListItem( diff --git a/app/src/main/java/org/xtimms/etsudoku/sections/settings/shelf/categories/interactor/ReorderCategory.kt b/app/src/main/java/org/xtimms/shirizu/sections/settings/shelf/categories/interactor/ReorderCategory.kt similarity index 84% rename from app/src/main/java/org/xtimms/etsudoku/sections/settings/shelf/categories/interactor/ReorderCategory.kt rename to app/src/main/java/org/xtimms/shirizu/sections/settings/shelf/categories/interactor/ReorderCategory.kt index 33b21f2..70c9579 100644 --- a/app/src/main/java/org/xtimms/etsudoku/sections/settings/shelf/categories/interactor/ReorderCategory.kt +++ b/app/src/main/java/org/xtimms/shirizu/sections/settings/shelf/categories/interactor/ReorderCategory.kt @@ -1,4 +1,4 @@ -package org.xtimms.etsudoku.sections.settings.shelf.categories.interactor +package org.xtimms.shirizu.sections.settings.shelf.categories.interactor import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.flow.SharingStarted @@ -7,10 +7,10 @@ import kotlinx.coroutines.flow.stateIn import kotlinx.coroutines.plus import kotlinx.coroutines.sync.Mutex import kotlinx.coroutines.sync.withLock -import org.xtimms.etsudoku.core.model.FavouriteCategory -import org.xtimms.etsudoku.data.repository.FavouritesRepository -import org.xtimms.etsudoku.utils.lang.processLifecycleScope -import org.xtimms.etsudoku.utils.lang.withNonCancellableContext +import org.xtimms.shirizu.core.model.FavouriteCategory +import org.xtimms.shirizu.data.repository.FavouritesRepository +import org.xtimms.shirizu.utils.lang.processLifecycleScope +import org.xtimms.shirizu.utils.lang.withNonCancellableContext import java.util.Collections class ReorderCategory( diff --git a/app/src/main/java/org/xtimms/etsudoku/sections/settings/sources/SourcesSettingsView.kt b/app/src/main/java/org/xtimms/shirizu/sections/settings/sources/SourcesSettingsView.kt similarity index 91% rename from app/src/main/java/org/xtimms/etsudoku/sections/settings/sources/SourcesSettingsView.kt rename to app/src/main/java/org/xtimms/shirizu/sections/settings/sources/SourcesSettingsView.kt index 683808e..273618b 100644 --- a/app/src/main/java/org/xtimms/etsudoku/sections/settings/sources/SourcesSettingsView.kt +++ b/app/src/main/java/org/xtimms/shirizu/sections/settings/sources/SourcesSettingsView.kt @@ -1,4 +1,4 @@ -package org.xtimms.etsudoku.sections.settings.sources +package org.xtimms.shirizu.sections.settings.sources import androidx.compose.foundation.layout.PaddingValues import androidx.compose.foundation.layout.WindowInsets @@ -21,12 +21,12 @@ import androidx.compose.ui.platform.LocalContext import androidx.compose.ui.res.stringResource import androidx.hilt.navigation.compose.hiltViewModel import androidx.lifecycle.compose.collectAsStateWithLifecycle -import org.xtimms.etsudoku.R -import org.xtimms.etsudoku.core.components.PreferenceItem -import org.xtimms.etsudoku.core.components.PreferenceSwitch -import org.xtimms.etsudoku.core.components.ScaffoldWithTopAppBar -import org.xtimms.etsudoku.core.prefs.AppSettings -import org.xtimms.etsudoku.core.prefs.NSFW +import org.xtimms.shirizu.R +import org.xtimms.shirizu.core.components.PreferenceItem +import org.xtimms.shirizu.core.components.PreferenceSwitch +import org.xtimms.shirizu.core.components.ScaffoldWithTopAppBar +import org.xtimms.shirizu.core.prefs.AppSettings +import org.xtimms.shirizu.core.prefs.NSFW const val SOURCES_DESTINATION = "sources" diff --git a/app/src/main/java/org/xtimms/etsudoku/sections/settings/sources/SourcesSettingsViewModel.kt b/app/src/main/java/org/xtimms/shirizu/sections/settings/sources/SourcesSettingsViewModel.kt similarity index 79% rename from app/src/main/java/org/xtimms/etsudoku/sections/settings/sources/SourcesSettingsViewModel.kt rename to app/src/main/java/org/xtimms/shirizu/sections/settings/sources/SourcesSettingsViewModel.kt index 1b5266a..5ffdf6d 100644 --- a/app/src/main/java/org/xtimms/etsudoku/sections/settings/sources/SourcesSettingsViewModel.kt +++ b/app/src/main/java/org/xtimms/shirizu/sections/settings/sources/SourcesSettingsViewModel.kt @@ -1,10 +1,10 @@ -package org.xtimms.etsudoku.sections.settings.sources +package org.xtimms.shirizu.sections.settings.sources import dagger.hilt.android.lifecycle.HiltViewModel import kotlinx.coroutines.flow.MutableStateFlow import kotlinx.coroutines.flow.asStateFlow -import org.xtimms.etsudoku.core.base.viewmodel.KotatsuBaseViewModel -import org.xtimms.etsudoku.data.repository.MangaSourcesRepository +import org.xtimms.shirizu.core.base.viewmodel.KotatsuBaseViewModel +import org.xtimms.shirizu.data.repository.MangaSourcesRepository import javax.inject.Inject @HiltViewModel diff --git a/app/src/main/java/org/xtimms/etsudoku/sections/settings/sources/catalog/SourceCatalogItem.kt b/app/src/main/java/org/xtimms/shirizu/sections/settings/sources/catalog/SourceCatalogItem.kt similarity index 89% rename from app/src/main/java/org/xtimms/etsudoku/sections/settings/sources/catalog/SourceCatalogItem.kt rename to app/src/main/java/org/xtimms/shirizu/sections/settings/sources/catalog/SourceCatalogItem.kt index 132d101..d96289c 100644 --- a/app/src/main/java/org/xtimms/etsudoku/sections/settings/sources/catalog/SourceCatalogItem.kt +++ b/app/src/main/java/org/xtimms/shirizu/sections/settings/sources/catalog/SourceCatalogItem.kt @@ -1,4 +1,4 @@ -package org.xtimms.etsudoku.sections.settings.sources.catalog +package org.xtimms.shirizu.sections.settings.sources.catalog import androidx.compose.foundation.layout.Row import androidx.compose.foundation.layout.fillMaxWidth @@ -14,8 +14,8 @@ import androidx.compose.ui.Modifier import androidx.compose.ui.unit.dp import coil.ImageLoader import org.koitharu.kotatsu.parsers.model.MangaSource -import org.xtimms.etsudoku.core.AsyncImageImpl -import org.xtimms.etsudoku.core.parser.favicon.faviconUri +import org.xtimms.shirizu.core.AsyncImageImpl +import org.xtimms.shirizu.core.parser.favicon.faviconUri @Composable fun SourceCatalogItem( diff --git a/app/src/main/java/org/xtimms/etsudoku/sections/settings/sources/catalog/SourceCatalogItemModel.kt b/app/src/main/java/org/xtimms/shirizu/sections/settings/sources/catalog/SourceCatalogItemModel.kt similarity index 78% rename from app/src/main/java/org/xtimms/etsudoku/sections/settings/sources/catalog/SourceCatalogItemModel.kt rename to app/src/main/java/org/xtimms/shirizu/sections/settings/sources/catalog/SourceCatalogItemModel.kt index e99e97c..a0ccae8 100644 --- a/app/src/main/java/org/xtimms/etsudoku/sections/settings/sources/catalog/SourceCatalogItemModel.kt +++ b/app/src/main/java/org/xtimms/shirizu/sections/settings/sources/catalog/SourceCatalogItemModel.kt @@ -1,9 +1,9 @@ -package org.xtimms.etsudoku.sections.settings.sources.catalog +package org.xtimms.shirizu.sections.settings.sources.catalog import androidx.annotation.StringRes import androidx.compose.ui.graphics.vector.ImageVector import org.koitharu.kotatsu.parsers.model.MangaSource -import org.xtimms.etsudoku.core.model.ListModel +import org.xtimms.shirizu.core.model.ListModel data class SourceCatalogItemModel( val source: MangaSource, diff --git a/app/src/main/java/org/xtimms/etsudoku/sections/settings/sources/catalog/SourceCatalogPage.kt b/app/src/main/java/org/xtimms/shirizu/sections/settings/sources/catalog/SourceCatalogPage.kt similarity index 73% rename from app/src/main/java/org/xtimms/etsudoku/sections/settings/sources/catalog/SourceCatalogPage.kt rename to app/src/main/java/org/xtimms/shirizu/sections/settings/sources/catalog/SourceCatalogPage.kt index 1c961b5..759d9f2 100644 --- a/app/src/main/java/org/xtimms/etsudoku/sections/settings/sources/catalog/SourceCatalogPage.kt +++ b/app/src/main/java/org/xtimms/shirizu/sections/settings/sources/catalog/SourceCatalogPage.kt @@ -1,7 +1,7 @@ -package org.xtimms.etsudoku.sections.settings.sources.catalog +package org.xtimms.shirizu.sections.settings.sources.catalog import org.koitharu.kotatsu.parsers.model.ContentType -import org.xtimms.etsudoku.core.model.ListModel +import org.xtimms.shirizu.core.model.ListModel data class SourceCatalogPage( val type: ContentType, diff --git a/app/src/main/java/org/xtimms/etsudoku/sections/settings/sources/catalog/SourcesCatalogListProducer.kt b/app/src/main/java/org/xtimms/shirizu/sections/settings/sources/catalog/SourcesCatalogListProducer.kt similarity index 86% rename from app/src/main/java/org/xtimms/etsudoku/sections/settings/sources/catalog/SourcesCatalogListProducer.kt rename to app/src/main/java/org/xtimms/shirizu/sections/settings/sources/catalog/SourcesCatalogListProducer.kt index 0d6c837..f61ebe4 100644 --- a/app/src/main/java/org/xtimms/etsudoku/sections/settings/sources/catalog/SourcesCatalogListProducer.kt +++ b/app/src/main/java/org/xtimms/shirizu/sections/settings/sources/catalog/SourcesCatalogListProducer.kt @@ -1,4 +1,4 @@ -package org.xtimms.etsudoku.sections.settings.sources.catalog +package org.xtimms.shirizu.sections.settings.sources.catalog import androidx.compose.material.icons.Icons import androidx.compose.material.icons.outlined.SearchOff @@ -14,19 +14,19 @@ import kotlinx.coroutines.flow.MutableStateFlow import kotlinx.coroutines.flow.update import kotlinx.coroutines.launch import org.koitharu.kotatsu.parsers.model.ContentType -import org.xtimms.etsudoku.R -import org.xtimms.etsudoku.core.database.TABLE_SOURCES -import org.xtimms.etsudoku.core.database.EtsudokuDatabase -import org.xtimms.etsudoku.core.database.removeObserverAsync -import org.xtimms.etsudoku.data.repository.MangaSourcesRepository -import org.xtimms.etsudoku.utils.lang.lifecycleScope +import org.xtimms.shirizu.R +import org.xtimms.shirizu.core.database.TABLE_SOURCES +import org.xtimms.shirizu.core.database.ShirizuDatabase +import org.xtimms.shirizu.core.database.removeObserverAsync +import org.xtimms.shirizu.data.repository.MangaSourcesRepository +import org.xtimms.shirizu.utils.lang.lifecycleScope class SourcesCatalogListProducer @AssistedInject constructor( @Assisted private val locale: String?, @Assisted private val contentType: ContentType, @Assisted lifecycle: ViewModelLifecycle, private val repository: MangaSourcesRepository, - private val database: EtsudokuDatabase, + private val database: ShirizuDatabase, ) : InvalidationTracker.Observer(TABLE_SOURCES), RetainedLifecycle.OnClearedListener { private val scope = lifecycle.lifecycleScope diff --git a/app/src/main/java/org/xtimms/etsudoku/sections/settings/sources/catalog/SourcesCatalogPager.kt b/app/src/main/java/org/xtimms/shirizu/sections/settings/sources/catalog/SourcesCatalogPager.kt similarity index 87% rename from app/src/main/java/org/xtimms/etsudoku/sections/settings/sources/catalog/SourcesCatalogPager.kt rename to app/src/main/java/org/xtimms/shirizu/sections/settings/sources/catalog/SourcesCatalogPager.kt index 6d8eae5..3ec825f 100644 --- a/app/src/main/java/org/xtimms/etsudoku/sections/settings/sources/catalog/SourcesCatalogPager.kt +++ b/app/src/main/java/org/xtimms/shirizu/sections/settings/sources/catalog/SourcesCatalogPager.kt @@ -1,4 +1,4 @@ -package org.xtimms.etsudoku.sections.settings.sources.catalog +package org.xtimms.shirizu.sections.settings.sources.catalog import androidx.compose.foundation.layout.Column import androidx.compose.foundation.layout.PaddingValues @@ -19,13 +19,13 @@ import androidx.compose.ui.Modifier import androidx.compose.ui.unit.dp import androidx.compose.ui.util.fastAny import coil.ImageLoader -import org.xtimms.etsudoku.R -import org.xtimms.etsudoku.core.components.MangaGridItem -import org.xtimms.etsudoku.core.screens.EmptyScreen -import org.xtimms.etsudoku.sections.shelf.LazyShelfGrid -import org.xtimms.etsudoku.sections.shelf.ShelfGrid -import org.xtimms.etsudoku.sections.shelf.ShelfManga -import org.xtimms.etsudoku.utils.system.plus +import org.xtimms.shirizu.R +import org.xtimms.shirizu.core.components.MangaGridItem +import org.xtimms.shirizu.core.screens.EmptyScreen +import org.xtimms.shirizu.sections.shelf.LazyShelfGrid +import org.xtimms.shirizu.sections.shelf.ShelfGrid +import org.xtimms.shirizu.sections.shelf.ShelfManga +import org.xtimms.shirizu.utils.system.plus @Composable fun SourcesCatalogPager( diff --git a/app/src/main/java/org/xtimms/etsudoku/sections/settings/sources/catalog/SourcesCatalogTabs.kt b/app/src/main/java/org/xtimms/shirizu/sections/settings/sources/catalog/SourcesCatalogTabs.kt similarity index 94% rename from app/src/main/java/org/xtimms/etsudoku/sections/settings/sources/catalog/SourcesCatalogTabs.kt rename to app/src/main/java/org/xtimms/shirizu/sections/settings/sources/catalog/SourcesCatalogTabs.kt index 5fe7405..36f0c79 100644 --- a/app/src/main/java/org/xtimms/etsudoku/sections/settings/sources/catalog/SourcesCatalogTabs.kt +++ b/app/src/main/java/org/xtimms/shirizu/sections/settings/sources/catalog/SourcesCatalogTabs.kt @@ -1,4 +1,4 @@ -package org.xtimms.etsudoku.sections.settings.sources.catalog +package org.xtimms.shirizu.sections.settings.sources.catalog import androidx.compose.foundation.ExperimentalFoundationApi import androidx.compose.foundation.layout.Column @@ -15,8 +15,8 @@ import androidx.compose.ui.unit.dp import androidx.compose.ui.zIndex import org.koitharu.kotatsu.parsers.model.ContentType import org.koitharu.kotatsu.parsers.model.MangaState -import org.xtimms.etsudoku.R -import org.xtimms.etsudoku.core.components.TabText +import org.xtimms.shirizu.R +import org.xtimms.shirizu.core.components.TabText @OptIn(ExperimentalFoundationApi::class, ExperimentalMaterial3Api::class) @Composable diff --git a/app/src/main/java/org/xtimms/etsudoku/sections/settings/sources/catalog/SourcesCatalogView.kt b/app/src/main/java/org/xtimms/shirizu/sections/settings/sources/catalog/SourcesCatalogView.kt similarity index 91% rename from app/src/main/java/org/xtimms/etsudoku/sections/settings/sources/catalog/SourcesCatalogView.kt rename to app/src/main/java/org/xtimms/shirizu/sections/settings/sources/catalog/SourcesCatalogView.kt index dd6b84a..21594b4 100644 --- a/app/src/main/java/org/xtimms/etsudoku/sections/settings/sources/catalog/SourcesCatalogView.kt +++ b/app/src/main/java/org/xtimms/shirizu/sections/settings/sources/catalog/SourcesCatalogView.kt @@ -1,4 +1,4 @@ -package org.xtimms.etsudoku.sections.settings.sources.catalog +package org.xtimms.shirizu.sections.settings.sources.catalog import androidx.compose.foundation.ExperimentalFoundationApi import androidx.compose.foundation.layout.Column @@ -13,8 +13,8 @@ import androidx.hilt.navigation.compose.hiltViewModel import androidx.lifecycle.compose.collectAsStateWithLifecycle import coil.ImageLoader import kotlinx.coroutines.launch -import org.xtimms.etsudoku.R -import org.xtimms.etsudoku.core.components.ScaffoldWithClassicTopAppBar +import org.xtimms.shirizu.R +import org.xtimms.shirizu.core.components.ScaffoldWithClassicTopAppBar const val CATALOG_DESTINATION = "catalog" diff --git a/app/src/main/java/org/xtimms/etsudoku/sections/settings/sources/catalog/SourcesCatalogViewModel.kt b/app/src/main/java/org/xtimms/shirizu/sections/settings/sources/catalog/SourcesCatalogViewModel.kt similarity index 87% rename from app/src/main/java/org/xtimms/etsudoku/sections/settings/sources/catalog/SourcesCatalogViewModel.kt rename to app/src/main/java/org/xtimms/shirizu/sections/settings/sources/catalog/SourcesCatalogViewModel.kt index d470e5a..ac221d3 100644 --- a/app/src/main/java/org/xtimms/etsudoku/sections/settings/sources/catalog/SourcesCatalogViewModel.kt +++ b/app/src/main/java/org/xtimms/shirizu/sections/settings/sources/catalog/SourcesCatalogViewModel.kt @@ -1,4 +1,4 @@ -package org.xtimms.etsudoku.sections.settings.sources.catalog +package org.xtimms.shirizu.sections.settings.sources.catalog import androidx.annotation.MainThread import androidx.lifecycle.viewModelScope @@ -17,13 +17,13 @@ import kotlinx.coroutines.plus import org.koitharu.kotatsu.parsers.model.ContentType import org.koitharu.kotatsu.parsers.model.MangaSource import org.koitharu.kotatsu.parsers.util.mapToSet -import org.xtimms.etsudoku.R -import org.xtimms.etsudoku.core.base.viewmodel.KotatsuBaseViewModel -import org.xtimms.etsudoku.core.prefs.AppSettings -import org.xtimms.etsudoku.data.repository.MangaSourcesRepository -import org.xtimms.etsudoku.utils.ReversibleAction -import org.xtimms.etsudoku.utils.lang.MutableEventFlow -import org.xtimms.etsudoku.utils.lang.call +import org.xtimms.shirizu.R +import org.xtimms.shirizu.core.base.viewmodel.KotatsuBaseViewModel +import org.xtimms.shirizu.core.prefs.AppSettings +import org.xtimms.shirizu.data.repository.MangaSourcesRepository +import org.xtimms.shirizu.utils.ReversibleAction +import org.xtimms.shirizu.utils.lang.MutableEventFlow +import org.xtimms.shirizu.utils.lang.call import java.util.EnumMap import java.util.EnumSet import java.util.Locale diff --git a/app/src/main/java/org/xtimms/etsudoku/sections/settings/storage/CleanDialog.kt b/app/src/main/java/org/xtimms/shirizu/sections/settings/storage/CleanDialog.kt similarity index 91% rename from app/src/main/java/org/xtimms/etsudoku/sections/settings/storage/CleanDialog.kt rename to app/src/main/java/org/xtimms/shirizu/sections/settings/storage/CleanDialog.kt index 32f292d..9e89301 100644 --- a/app/src/main/java/org/xtimms/etsudoku/sections/settings/storage/CleanDialog.kt +++ b/app/src/main/java/org/xtimms/shirizu/sections/settings/storage/CleanDialog.kt @@ -1,4 +1,4 @@ -package org.xtimms.etsudoku.sections.settings.storage +package org.xtimms.shirizu.sections.settings.storage import androidx.compose.foundation.layout.Column import androidx.compose.foundation.layout.Spacer @@ -22,12 +22,12 @@ import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.unit.dp import androidx.hilt.navigation.compose.hiltViewModel import androidx.lifecycle.compose.collectAsStateWithLifecycle -import org.xtimms.etsudoku.R -import org.xtimms.etsudoku.core.components.ConfirmButton -import org.xtimms.etsudoku.core.components.DialogCheckBoxItem -import org.xtimms.etsudoku.core.components.DismissButton -import org.xtimms.etsudoku.core.components.EtsudokuDialog -import org.xtimms.etsudoku.utils.FileSize +import org.xtimms.shirizu.R +import org.xtimms.shirizu.core.components.ConfirmButton +import org.xtimms.shirizu.core.components.DialogCheckBoxItem +import org.xtimms.shirizu.core.components.DismissButton +import org.xtimms.shirizu.core.components.ShirizuDialog +import org.xtimms.shirizu.utils.FileSize @Composable fun CleanDialog( @@ -51,7 +51,7 @@ fun CleanDialog( mutableStateOf(isNetworkCacheSelected) } - EtsudokuDialog( + ShirizuDialog( onDismissRequest = onDismissRequest, confirmButton = { ConfirmButton { diff --git a/app/src/main/java/org/xtimms/shirizu/sections/settings/storage/StorageEvent.kt b/app/src/main/java/org/xtimms/shirizu/sections/settings/storage/StorageEvent.kt new file mode 100644 index 0000000..f3c399a --- /dev/null +++ b/app/src/main/java/org/xtimms/shirizu/sections/settings/storage/StorageEvent.kt @@ -0,0 +1,5 @@ +package org.xtimms.shirizu.sections.settings.storage + +import org.xtimms.shirizu.core.base.event.UiEvent + +interface StorageEvent : UiEvent \ No newline at end of file diff --git a/app/src/main/java/org/xtimms/etsudoku/sections/settings/storage/StorageUiState.kt b/app/src/main/java/org/xtimms/shirizu/sections/settings/storage/StorageUiState.kt similarity index 79% rename from app/src/main/java/org/xtimms/etsudoku/sections/settings/storage/StorageUiState.kt rename to app/src/main/java/org/xtimms/shirizu/sections/settings/storage/StorageUiState.kt index 83971dd..809febc 100644 --- a/app/src/main/java/org/xtimms/etsudoku/sections/settings/storage/StorageUiState.kt +++ b/app/src/main/java/org/xtimms/shirizu/sections/settings/storage/StorageUiState.kt @@ -1,6 +1,6 @@ -package org.xtimms.etsudoku.sections.settings.storage +package org.xtimms.shirizu.sections.settings.storage -import org.xtimms.etsudoku.core.base.state.UiState +import org.xtimms.shirizu.core.base.state.UiState data class StorageUiState( val pagesCache: Long = -1L, diff --git a/app/src/main/java/org/xtimms/etsudoku/sections/settings/storage/StorageView.kt b/app/src/main/java/org/xtimms/shirizu/sections/settings/storage/StorageView.kt similarity index 90% rename from app/src/main/java/org/xtimms/etsudoku/sections/settings/storage/StorageView.kt rename to app/src/main/java/org/xtimms/shirizu/sections/settings/storage/StorageView.kt index 6bd4354..b6b8dca 100644 --- a/app/src/main/java/org/xtimms/etsudoku/sections/settings/storage/StorageView.kt +++ b/app/src/main/java/org/xtimms/shirizu/sections/settings/storage/StorageView.kt @@ -1,4 +1,4 @@ -package org.xtimms.etsudoku.sections.settings.storage +package org.xtimms.shirizu.sections.settings.storage import androidx.compose.foundation.layout.PaddingValues import androidx.compose.foundation.layout.WindowInsets @@ -22,13 +22,13 @@ import androidx.compose.ui.Modifier import androidx.compose.ui.res.stringResource import androidx.hilt.navigation.compose.hiltViewModel import androidx.lifecycle.compose.collectAsStateWithLifecycle -import org.xtimms.etsudoku.R -import org.xtimms.etsudoku.core.cache.CacheDir -import org.xtimms.etsudoku.core.components.PreferenceStorageHeader -import org.xtimms.etsudoku.core.components.PreferenceStorageItem -import org.xtimms.etsudoku.core.components.PreferencesHintCard -import org.xtimms.etsudoku.core.components.ScaffoldWithTopAppBar -import org.xtimms.etsudoku.data.CACHE_SIZE_MAX +import org.xtimms.shirizu.R +import org.xtimms.shirizu.core.cache.CacheDir +import org.xtimms.shirizu.core.components.PreferenceStorageHeader +import org.xtimms.shirizu.core.components.PreferenceStorageItem +import org.xtimms.shirizu.core.components.PreferencesHintCard +import org.xtimms.shirizu.core.components.ScaffoldWithTopAppBar +import org.xtimms.shirizu.data.CACHE_SIZE_MAX const val STORAGE_DESTINATION = "storage" diff --git a/app/src/main/java/org/xtimms/etsudoku/sections/settings/storage/StorageViewModel.kt b/app/src/main/java/org/xtimms/shirizu/sections/settings/storage/StorageViewModel.kt similarity index 92% rename from app/src/main/java/org/xtimms/etsudoku/sections/settings/storage/StorageViewModel.kt rename to app/src/main/java/org/xtimms/shirizu/sections/settings/storage/StorageViewModel.kt index 8a226a5..fa4fa21 100644 --- a/app/src/main/java/org/xtimms/etsudoku/sections/settings/storage/StorageViewModel.kt +++ b/app/src/main/java/org/xtimms/shirizu/sections/settings/storage/StorageViewModel.kt @@ -1,4 +1,4 @@ -package org.xtimms.etsudoku.sections.settings.storage +package org.xtimms.shirizu.sections.settings.storage import dagger.hilt.android.lifecycle.HiltViewModel import kotlinx.coroutines.Dispatchers @@ -7,9 +7,9 @@ import kotlinx.coroutines.flow.MutableStateFlow import kotlinx.coroutines.flow.update import kotlinx.coroutines.runInterruptible import okhttp3.Cache -import org.xtimms.etsudoku.core.base.viewmodel.BaseViewModel -import org.xtimms.etsudoku.core.cache.CacheDir -import org.xtimms.etsudoku.data.LocalStorageManager +import org.xtimms.shirizu.core.base.viewmodel.BaseViewModel +import org.xtimms.shirizu.core.cache.CacheDir +import org.xtimms.shirizu.data.LocalStorageManager import javax.inject.Inject @HiltViewModel diff --git a/app/src/main/java/org/xtimms/etsudoku/sections/shelf/FavouriteManga.kt b/app/src/main/java/org/xtimms/shirizu/sections/shelf/FavouriteManga.kt similarity index 62% rename from app/src/main/java/org/xtimms/etsudoku/sections/shelf/FavouriteManga.kt rename to app/src/main/java/org/xtimms/shirizu/sections/shelf/FavouriteManga.kt index ea9b0fe..c5d469b 100644 --- a/app/src/main/java/org/xtimms/etsudoku/sections/shelf/FavouriteManga.kt +++ b/app/src/main/java/org/xtimms/shirizu/sections/shelf/FavouriteManga.kt @@ -1,13 +1,13 @@ -package org.xtimms.etsudoku.sections.shelf +package org.xtimms.shirizu.sections.shelf import androidx.room.Embedded import androidx.room.Junction import androidx.room.Relation -import org.xtimms.etsudoku.core.database.entity.FavouriteCategoryEntity -import org.xtimms.etsudoku.core.database.entity.FavouriteEntity -import org.xtimms.etsudoku.core.database.entity.MangaEntity -import org.xtimms.etsudoku.core.database.entity.MangaTagsEntity -import org.xtimms.etsudoku.core.database.entity.TagEntity +import org.xtimms.shirizu.core.database.entity.FavouriteCategoryEntity +import org.xtimms.shirizu.core.database.entity.FavouriteEntity +import org.xtimms.shirizu.core.database.entity.MangaEntity +import org.xtimms.shirizu.core.database.entity.MangaTagsEntity +import org.xtimms.shirizu.core.database.entity.TagEntity class FavouriteManga( @Embedded val favourite: FavouriteEntity, diff --git a/app/src/main/java/org/xtimms/etsudoku/sections/shelf/FavouriteTabModel.kt b/app/src/main/java/org/xtimms/shirizu/sections/shelf/FavouriteTabModel.kt similarity index 72% rename from app/src/main/java/org/xtimms/etsudoku/sections/shelf/FavouriteTabModel.kt rename to app/src/main/java/org/xtimms/shirizu/sections/shelf/FavouriteTabModel.kt index cd5e5d4..6634fbd 100644 --- a/app/src/main/java/org/xtimms/etsudoku/sections/shelf/FavouriteTabModel.kt +++ b/app/src/main/java/org/xtimms/shirizu/sections/shelf/FavouriteTabModel.kt @@ -1,6 +1,6 @@ -package org.xtimms.etsudoku.sections.shelf +package org.xtimms.shirizu.sections.shelf -import org.xtimms.etsudoku.core.model.ListModel +import org.xtimms.shirizu.core.model.ListModel data class FavouriteTabModel( val id: Long, diff --git a/app/src/main/java/org/xtimms/etsudoku/sections/shelf/LazyShelfGrid.kt b/app/src/main/java/org/xtimms/shirizu/sections/shelf/LazyShelfGrid.kt similarity index 91% rename from app/src/main/java/org/xtimms/etsudoku/sections/shelf/LazyShelfGrid.kt rename to app/src/main/java/org/xtimms/shirizu/sections/shelf/LazyShelfGrid.kt index fef7aaa..a0da672 100644 --- a/app/src/main/java/org/xtimms/etsudoku/sections/shelf/LazyShelfGrid.kt +++ b/app/src/main/java/org/xtimms/shirizu/sections/shelf/LazyShelfGrid.kt @@ -1,4 +1,4 @@ -package org.xtimms.etsudoku.sections.shelf +package org.xtimms.shirizu.sections.shelf import androidx.compose.foundation.layout.Arrangement import androidx.compose.foundation.layout.PaddingValues @@ -8,7 +8,7 @@ import androidx.compose.foundation.lazy.grid.LazyVerticalGrid import androidx.compose.runtime.Composable import androidx.compose.ui.Modifier import androidx.compose.ui.unit.dp -import org.xtimms.etsudoku.utils.system.plus +import org.xtimms.shirizu.utils.system.plus @Composable internal fun LazyShelfGrid( diff --git a/app/src/main/java/org/xtimms/etsudoku/sections/shelf/ShelfGrid.kt b/app/src/main/java/org/xtimms/shirizu/sections/shelf/ShelfGrid.kt similarity index 91% rename from app/src/main/java/org/xtimms/etsudoku/sections/shelf/ShelfGrid.kt rename to app/src/main/java/org/xtimms/shirizu/sections/shelf/ShelfGrid.kt index 742f344..b9597ad 100644 --- a/app/src/main/java/org/xtimms/etsudoku/sections/shelf/ShelfGrid.kt +++ b/app/src/main/java/org/xtimms/shirizu/sections/shelf/ShelfGrid.kt @@ -1,4 +1,4 @@ -package org.xtimms.etsudoku.sections.shelf +package org.xtimms.shirizu.sections.shelf import androidx.compose.foundation.layout.PaddingValues import androidx.compose.foundation.layout.fillMaxSize @@ -7,7 +7,7 @@ import androidx.compose.runtime.Composable import androidx.compose.ui.Modifier import androidx.compose.ui.util.fastAny import coil.ImageLoader -import org.xtimms.etsudoku.core.components.MangaGridItem +import org.xtimms.shirizu.core.components.MangaGridItem @Composable internal fun ShelfGrid( diff --git a/app/src/main/java/org/xtimms/etsudoku/sections/shelf/ShelfItem.kt b/app/src/main/java/org/xtimms/shirizu/sections/shelf/ShelfItem.kt similarity index 81% rename from app/src/main/java/org/xtimms/etsudoku/sections/shelf/ShelfItem.kt rename to app/src/main/java/org/xtimms/shirizu/sections/shelf/ShelfItem.kt index 266fd2a..380c309 100644 --- a/app/src/main/java/org/xtimms/etsudoku/sections/shelf/ShelfItem.kt +++ b/app/src/main/java/org/xtimms/shirizu/sections/shelf/ShelfItem.kt @@ -1,4 +1,4 @@ -package org.xtimms.etsudoku.sections.shelf +package org.xtimms.shirizu.sections.shelf data class ShelfItem( val libraryManga: ShelfManga, diff --git a/app/src/main/java/org/xtimms/etsudoku/sections/shelf/ShelfManga.kt b/app/src/main/java/org/xtimms/shirizu/sections/shelf/ShelfManga.kt similarity index 74% rename from app/src/main/java/org/xtimms/etsudoku/sections/shelf/ShelfManga.kt rename to app/src/main/java/org/xtimms/shirizu/sections/shelf/ShelfManga.kt index 02ef4b6..3572a5e 100644 --- a/app/src/main/java/org/xtimms/etsudoku/sections/shelf/ShelfManga.kt +++ b/app/src/main/java/org/xtimms/shirizu/sections/shelf/ShelfManga.kt @@ -1,4 +1,4 @@ -package org.xtimms.etsudoku.sections.shelf +package org.xtimms.shirizu.sections.shelf import org.koitharu.kotatsu.parsers.model.Manga diff --git a/app/src/main/java/org/xtimms/etsudoku/sections/shelf/ShelfPager.kt b/app/src/main/java/org/xtimms/shirizu/sections/shelf/ShelfPager.kt similarity index 91% rename from app/src/main/java/org/xtimms/etsudoku/sections/shelf/ShelfPager.kt rename to app/src/main/java/org/xtimms/shirizu/sections/shelf/ShelfPager.kt index 2a90a9e..55a1f7d 100644 --- a/app/src/main/java/org/xtimms/etsudoku/sections/shelf/ShelfPager.kt +++ b/app/src/main/java/org/xtimms/shirizu/sections/shelf/ShelfPager.kt @@ -1,4 +1,4 @@ -package org.xtimms.etsudoku.sections.shelf +package org.xtimms.shirizu.sections.shelf import androidx.compose.foundation.layout.Column import androidx.compose.foundation.layout.PaddingValues @@ -15,10 +15,10 @@ import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier import androidx.compose.ui.unit.dp import coil.ImageLoader -import org.xtimms.etsudoku.R -import org.xtimms.etsudoku.core.prefs.AppSettings -import org.xtimms.etsudoku.core.screens.EmptyScreen -import org.xtimms.etsudoku.utils.system.plus +import org.xtimms.shirizu.R +import org.xtimms.shirizu.core.prefs.AppSettings +import org.xtimms.shirizu.core.screens.EmptyScreen +import org.xtimms.shirizu.utils.system.plus @Composable fun ShelfPager( diff --git a/app/src/main/java/org/xtimms/etsudoku/sections/shelf/ShelfTabs.kt b/app/src/main/java/org/xtimms/shirizu/sections/shelf/ShelfTabs.kt similarity index 89% rename from app/src/main/java/org/xtimms/etsudoku/sections/shelf/ShelfTabs.kt rename to app/src/main/java/org/xtimms/shirizu/sections/shelf/ShelfTabs.kt index 42ed73a..068c6d2 100644 --- a/app/src/main/java/org/xtimms/etsudoku/sections/shelf/ShelfTabs.kt +++ b/app/src/main/java/org/xtimms/shirizu/sections/shelf/ShelfTabs.kt @@ -1,4 +1,4 @@ -package org.xtimms.etsudoku.sections.shelf +package org.xtimms.shirizu.sections.shelf import androidx.compose.foundation.ExperimentalFoundationApi import androidx.compose.foundation.layout.Column @@ -12,9 +12,9 @@ import androidx.compose.runtime.Composable import androidx.compose.ui.Modifier import androidx.compose.ui.unit.dp import androidx.compose.ui.zIndex -import org.xtimms.etsudoku.core.components.TabText -import org.xtimms.etsudoku.core.model.FavouriteCategory -import org.xtimms.etsudoku.core.prefs.AppSettings +import org.xtimms.shirizu.core.components.TabText +import org.xtimms.shirizu.core.model.FavouriteCategory +import org.xtimms.shirizu.core.prefs.AppSettings @OptIn(ExperimentalFoundationApi::class, ExperimentalMaterial3Api::class) @Composable diff --git a/app/src/main/java/org/xtimms/etsudoku/sections/shelf/ShelfView.kt b/app/src/main/java/org/xtimms/shirizu/sections/shelf/ShelfView.kt similarity index 95% rename from app/src/main/java/org/xtimms/etsudoku/sections/shelf/ShelfView.kt rename to app/src/main/java/org/xtimms/shirizu/sections/shelf/ShelfView.kt index 9816190..16cc184 100644 --- a/app/src/main/java/org/xtimms/etsudoku/sections/shelf/ShelfView.kt +++ b/app/src/main/java/org/xtimms/shirizu/sections/shelf/ShelfView.kt @@ -1,4 +1,4 @@ -package org.xtimms.etsudoku.sections.shelf +package org.xtimms.shirizu.sections.shelf import androidx.compose.animation.core.Animatable import androidx.compose.animation.core.AnimationVector1D @@ -19,8 +19,8 @@ import androidx.lifecycle.compose.collectAsStateWithLifecycle import coil.ImageLoader import kotlinx.coroutines.delay import kotlinx.coroutines.launch -import org.xtimms.etsudoku.core.collapsable -import org.xtimms.etsudoku.core.components.PullRefresh +import org.xtimms.shirizu.core.collapsable +import org.xtimms.shirizu.core.components.PullRefresh import kotlin.time.Duration.Companion.seconds const val SHELF_DESTINATION = "shelf" diff --git a/app/src/main/java/org/xtimms/etsudoku/sections/shelf/ShelfViewModel.kt b/app/src/main/java/org/xtimms/shirizu/sections/shelf/ShelfViewModel.kt similarity index 88% rename from app/src/main/java/org/xtimms/etsudoku/sections/shelf/ShelfViewModel.kt rename to app/src/main/java/org/xtimms/shirizu/sections/shelf/ShelfViewModel.kt index c3ff37f..a328efe 100644 --- a/app/src/main/java/org/xtimms/etsudoku/sections/shelf/ShelfViewModel.kt +++ b/app/src/main/java/org/xtimms/shirizu/sections/shelf/ShelfViewModel.kt @@ -1,4 +1,4 @@ -package org.xtimms.etsudoku.sections.shelf +package org.xtimms.shirizu.sections.shelf import androidx.lifecycle.viewModelScope import dagger.hilt.android.lifecycle.HiltViewModel @@ -9,9 +9,9 @@ import kotlinx.coroutines.flow.filterNotNull import kotlinx.coroutines.flow.map import kotlinx.coroutines.flow.stateIn import kotlinx.coroutines.plus -import org.xtimms.etsudoku.core.base.viewmodel.KotatsuBaseViewModel -import org.xtimms.etsudoku.data.repository.FavouritesRepository -import org.xtimms.etsudoku.utils.lang.mapItems +import org.xtimms.shirizu.core.base.viewmodel.KotatsuBaseViewModel +import org.xtimms.shirizu.data.repository.FavouritesRepository +import org.xtimms.shirizu.utils.lang.mapItems import javax.inject.Inject @HiltViewModel diff --git a/app/src/main/java/org/xtimms/etsudoku/sections/stats/ChaptersChart.kt b/app/src/main/java/org/xtimms/shirizu/sections/stats/ChaptersChart.kt similarity index 94% rename from app/src/main/java/org/xtimms/etsudoku/sections/stats/ChaptersChart.kt rename to app/src/main/java/org/xtimms/shirizu/sections/stats/ChaptersChart.kt index b355f96..367abdf 100644 --- a/app/src/main/java/org/xtimms/etsudoku/sections/stats/ChaptersChart.kt +++ b/app/src/main/java/org/xtimms/shirizu/sections/stats/ChaptersChart.kt @@ -1,4 +1,4 @@ -package org.xtimms.etsudoku.sections.stats +package org.xtimms.shirizu.sections.stats import androidx.compose.foundation.Canvas import androidx.compose.foundation.isSystemInDarkTheme @@ -19,12 +19,12 @@ import androidx.compose.ui.unit.LayoutDirection import androidx.compose.ui.unit.dp import org.koitharu.kotatsu.parsers.model.MangaChapter import org.koitharu.kotatsu.parsers.model.MangaSource -import org.xtimms.etsudoku.ui.theme.colorMax -import org.xtimms.etsudoku.ui.theme.colorMin -import org.xtimms.etsudoku.ui.theme.EtsudokuTheme -import org.xtimms.etsudoku.utils.material.combineColors -import org.xtimms.etsudoku.utils.material.harmonize -import org.xtimms.etsudoku.utils.material.toPalette +import org.xtimms.shirizu.ui.theme.colorMax +import org.xtimms.shirizu.ui.theme.colorMin +import org.xtimms.shirizu.ui.theme.ShirizuTheme +import org.xtimms.shirizu.utils.material.combineColors +import org.xtimms.shirizu.utils.material.harmonize +import org.xtimms.shirizu.utils.material.toPalette import kotlin.math.abs @Composable @@ -154,7 +154,7 @@ fun ChaptersChart( @Preview @Composable private fun PreviewChart() { - EtsudokuTheme { + ShirizuTheme { ChaptersChart( modifier = Modifier.size(100.dp), chapters = listOf( diff --git a/app/src/main/java/org/xtimms/etsudoku/sections/stats/MinMaxReadCard.kt b/app/src/main/java/org/xtimms/shirizu/sections/stats/MinMaxReadCard.kt similarity index 92% rename from app/src/main/java/org/xtimms/etsudoku/sections/stats/MinMaxReadCard.kt rename to app/src/main/java/org/xtimms/shirizu/sections/stats/MinMaxReadCard.kt index 52bbcf5..bd25c17 100644 --- a/app/src/main/java/org/xtimms/etsudoku/sections/stats/MinMaxReadCard.kt +++ b/app/src/main/java/org/xtimms/shirizu/sections/stats/MinMaxReadCard.kt @@ -1,4 +1,4 @@ -package org.xtimms.etsudoku.sections.stats +package org.xtimms.shirizu.sections.stats import androidx.compose.foundation.layout.Row import androidx.compose.foundation.layout.Spacer @@ -21,12 +21,12 @@ import androidx.compose.ui.res.stringResource import androidx.compose.ui.unit.dp import org.koitharu.kotatsu.parsers.model.MangaChapter import org.koitharu.kotatsu.parsers.model.MangaSource -import org.xtimms.etsudoku.ui.theme.colorMax -import org.xtimms.etsudoku.ui.theme.colorMin -import org.xtimms.etsudoku.R -import org.xtimms.etsudoku.utils.material.combineColors -import org.xtimms.etsudoku.utils.material.harmonize -import org.xtimms.etsudoku.utils.material.toPalette +import org.xtimms.shirizu.ui.theme.colorMax +import org.xtimms.shirizu.ui.theme.colorMin +import org.xtimms.shirizu.R +import org.xtimms.shirizu.utils.material.combineColors +import org.xtimms.shirizu.utils.material.harmonize +import org.xtimms.shirizu.utils.material.toPalette @Composable fun MinMaxReadCard( diff --git a/app/src/main/java/org/xtimms/etsudoku/sections/stats/StatsCard.kt b/app/src/main/java/org/xtimms/shirizu/sections/stats/StatsCard.kt similarity index 98% rename from app/src/main/java/org/xtimms/etsudoku/sections/stats/StatsCard.kt rename to app/src/main/java/org/xtimms/shirizu/sections/stats/StatsCard.kt index cb853a0..161ac0d 100644 --- a/app/src/main/java/org/xtimms/etsudoku/sections/stats/StatsCard.kt +++ b/app/src/main/java/org/xtimms/shirizu/sections/stats/StatsCard.kt @@ -1,4 +1,4 @@ -package org.xtimms.etsudoku.sections.stats +package org.xtimms.shirizu.sections.stats import androidx.compose.foundation.Canvas import androidx.compose.foundation.layout.Box @@ -35,7 +35,7 @@ import androidx.compose.ui.unit.Density import androidx.compose.ui.unit.TextUnit import androidx.compose.ui.unit.TextUnitType import androidx.compose.ui.unit.dp -import org.xtimms.etsudoku.ui.theme.EtsudokuTheme +import org.xtimms.shirizu.ui.theme.ShirizuTheme @Composable fun TimeCard( @@ -239,7 +239,7 @@ fun growByMiddleChildRowMeasurePolicy(localDensity: Density) = @Preview @Composable private fun TimeCardPreview() { - EtsudokuTheme { + ShirizuTheme { TimeCard( modifier = Modifier.height(IntrinsicSize.Min), ) @@ -249,7 +249,7 @@ private fun TimeCardPreview() { @Preview @Composable private fun StatsCardPreview() { - EtsudokuTheme { + ShirizuTheme { StatsCard( value = "value", label = "label" diff --git a/app/src/main/java/org/xtimms/etsudoku/sections/stats/StatsView.kt b/app/src/main/java/org/xtimms/shirizu/sections/stats/StatsView.kt similarity index 96% rename from app/src/main/java/org/xtimms/etsudoku/sections/stats/StatsView.kt rename to app/src/main/java/org/xtimms/shirizu/sections/stats/StatsView.kt index f2be722..12b5c6f 100644 --- a/app/src/main/java/org/xtimms/etsudoku/sections/stats/StatsView.kt +++ b/app/src/main/java/org/xtimms/shirizu/sections/stats/StatsView.kt @@ -1,4 +1,4 @@ -package org.xtimms.etsudoku.sections.stats +package org.xtimms.shirizu.sections.stats import androidx.compose.animation.core.RepeatMode import androidx.compose.animation.core.animateFloat @@ -50,12 +50,12 @@ import androidx.compose.ui.unit.dp import androidx.compose.ui.zIndex import org.koitharu.kotatsu.parsers.model.MangaChapter import org.koitharu.kotatsu.parsers.model.MangaSource -import org.xtimms.etsudoku.LocalBottomSheetScrollState -import org.xtimms.etsudoku.LocalWindowInsets -import org.xtimms.etsudoku.R -import org.xtimms.etsudoku.sections.stats.categories.CategoriesChart -import org.xtimms.etsudoku.ui.theme.EtsudokuTheme -import org.xtimms.etsudoku.utils.material.combineColors +import org.xtimms.shirizu.LocalBottomSheetScrollState +import org.xtimms.shirizu.LocalWindowInsets +import org.xtimms.shirizu.R +import org.xtimms.shirizu.sections.stats.categories.CategoriesChart +import org.xtimms.shirizu.ui.theme.ShirizuTheme +import org.xtimms.shirizu.utils.material.combineColors data class Size(val width: Dp, val height: Dp) @@ -222,7 +222,7 @@ fun StatsView( @Preview @Composable private fun Preview() { - EtsudokuTheme { + ShirizuTheme { StatsView( navigateBack = { } ) diff --git a/app/src/main/java/org/xtimms/etsudoku/sections/stats/categories/CategoriesChartCard.kt b/app/src/main/java/org/xtimms/shirizu/sections/stats/categories/CategoriesChartCard.kt similarity index 91% rename from app/src/main/java/org/xtimms/etsudoku/sections/stats/categories/CategoriesChartCard.kt rename to app/src/main/java/org/xtimms/shirizu/sections/stats/categories/CategoriesChartCard.kt index 5aaaf9a..b174cf5 100644 --- a/app/src/main/java/org/xtimms/etsudoku/sections/stats/categories/CategoriesChartCard.kt +++ b/app/src/main/java/org/xtimms/shirizu/sections/stats/categories/CategoriesChartCard.kt @@ -1,4 +1,4 @@ -package org.xtimms.etsudoku.sections.stats.categories +package org.xtimms.shirizu.sections.stats.categories import androidx.compose.foundation.isSystemInDarkTheme import androidx.compose.foundation.layout.Arrangement @@ -18,9 +18,9 @@ import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier import androidx.compose.ui.graphics.Color import androidx.compose.ui.unit.dp -import org.xtimms.etsudoku.utils.material.combineColors -import org.xtimms.etsudoku.utils.material.harmonizeWithColor -import org.xtimms.etsudoku.utils.material.toPalette +import org.xtimms.shirizu.utils.material.combineColors +import org.xtimms.shirizu.utils.material.harmonizeWithColor +import org.xtimms.shirizu.utils.material.toPalette var baseColors = listOf( Color(0xFFF86BAE), diff --git a/app/src/main/java/org/xtimms/etsudoku/sections/stats/categories/DonutChart.kt b/app/src/main/java/org/xtimms/shirizu/sections/stats/categories/DonutChart.kt similarity index 96% rename from app/src/main/java/org/xtimms/etsudoku/sections/stats/categories/DonutChart.kt rename to app/src/main/java/org/xtimms/shirizu/sections/stats/categories/DonutChart.kt index f84bbe5..50719c0 100644 --- a/app/src/main/java/org/xtimms/etsudoku/sections/stats/categories/DonutChart.kt +++ b/app/src/main/java/org/xtimms/shirizu/sections/stats/categories/DonutChart.kt @@ -1,4 +1,4 @@ -package org.xtimms.etsudoku.sections.stats.categories +package org.xtimms.shirizu.sections.stats.categories import androidx.compose.foundation.Canvas import androidx.compose.foundation.layout.PaddingValues @@ -15,7 +15,7 @@ import androidx.compose.ui.platform.LocalConfiguration import androidx.compose.ui.platform.LocalDensity import androidx.compose.ui.unit.LayoutDirection import androidx.compose.ui.unit.dp -import org.xtimms.etsudoku.core.model.ShelfCategory +import org.xtimms.shirizu.core.model.ShelfCategory @Composable fun DonutChart( diff --git a/app/src/main/java/org/xtimms/etsudoku/sections/stats/categories/TagAmount.kt b/app/src/main/java/org/xtimms/shirizu/sections/stats/categories/TagAmount.kt similarity index 94% rename from app/src/main/java/org/xtimms/etsudoku/sections/stats/categories/TagAmount.kt rename to app/src/main/java/org/xtimms/shirizu/sections/stats/categories/TagAmount.kt index bc42e3d..7b2af54 100644 --- a/app/src/main/java/org/xtimms/etsudoku/sections/stats/categories/TagAmount.kt +++ b/app/src/main/java/org/xtimms/shirizu/sections/stats/categories/TagAmount.kt @@ -1,4 +1,4 @@ -package org.xtimms.etsudoku.sections.stats.categories +package org.xtimms.shirizu.sections.stats.categories import androidx.compose.foundation.layout.Row import androidx.compose.foundation.layout.Spacer @@ -16,7 +16,7 @@ import androidx.compose.ui.text.font.FontStyle import androidx.compose.ui.text.font.FontWeight import androidx.compose.ui.text.style.TextOverflow import androidx.compose.ui.unit.dp -import org.xtimms.etsudoku.utils.material.HarmonizedColorPalette +import org.xtimms.shirizu.utils.material.HarmonizedColorPalette import java.math.BigDecimal @Composable diff --git a/app/src/main/java/org/xtimms/etsudoku/sections/suggestions/SuggestionMangaModel.kt b/app/src/main/java/org/xtimms/shirizu/sections/suggestions/SuggestionMangaModel.kt similarity index 72% rename from app/src/main/java/org/xtimms/etsudoku/sections/suggestions/SuggestionMangaModel.kt rename to app/src/main/java/org/xtimms/shirizu/sections/suggestions/SuggestionMangaModel.kt index 904103c..01cebd9 100644 --- a/app/src/main/java/org/xtimms/etsudoku/sections/suggestions/SuggestionMangaModel.kt +++ b/app/src/main/java/org/xtimms/shirizu/sections/suggestions/SuggestionMangaModel.kt @@ -1,7 +1,7 @@ -package org.xtimms.etsudoku.sections.suggestions +package org.xtimms.shirizu.sections.suggestions import org.koitharu.kotatsu.parsers.model.Manga -import org.xtimms.etsudoku.core.model.ListModel +import org.xtimms.shirizu.core.model.ListModel data class SuggestionMangaModel( val manga: Manga diff --git a/app/src/main/java/org/xtimms/etsudoku/sections/suggestions/SuggestionsView.kt b/app/src/main/java/org/xtimms/shirizu/sections/suggestions/SuggestionsView.kt similarity index 95% rename from app/src/main/java/org/xtimms/etsudoku/sections/suggestions/SuggestionsView.kt rename to app/src/main/java/org/xtimms/shirizu/sections/suggestions/SuggestionsView.kt index 70a9ca4..c055c61 100644 --- a/app/src/main/java/org/xtimms/etsudoku/sections/suggestions/SuggestionsView.kt +++ b/app/src/main/java/org/xtimms/shirizu/sections/suggestions/SuggestionsView.kt @@ -1,4 +1,4 @@ -package org.xtimms.etsudoku.sections.suggestions +package org.xtimms.shirizu.sections.suggestions import androidx.compose.animation.core.Spring import androidx.compose.animation.core.VisibilityThreshold @@ -32,9 +32,9 @@ import androidx.hilt.navigation.compose.hiltViewModel import androidx.lifecycle.compose.collectAsStateWithLifecycle import coil.ImageLoader import org.koitharu.kotatsu.parsers.model.Manga -import org.xtimms.etsudoku.R -import org.xtimms.etsudoku.core.components.MangaGridItem -import org.xtimms.etsudoku.core.components.ScaffoldWithTopAppBar +import org.xtimms.shirizu.R +import org.xtimms.shirizu.core.components.MangaGridItem +import org.xtimms.shirizu.core.components.ScaffoldWithTopAppBar const val SUGGESTIONS_DESTINATION = "suggestions" diff --git a/app/src/main/java/org/xtimms/etsudoku/sections/suggestions/SuggestionsViewModel.kt b/app/src/main/java/org/xtimms/shirizu/sections/suggestions/SuggestionsViewModel.kt similarity index 75% rename from app/src/main/java/org/xtimms/etsudoku/sections/suggestions/SuggestionsViewModel.kt rename to app/src/main/java/org/xtimms/shirizu/sections/suggestions/SuggestionsViewModel.kt index 72765ad..9576c64 100644 --- a/app/src/main/java/org/xtimms/etsudoku/sections/suggestions/SuggestionsViewModel.kt +++ b/app/src/main/java/org/xtimms/shirizu/sections/suggestions/SuggestionsViewModel.kt @@ -1,4 +1,4 @@ -package org.xtimms.etsudoku.sections.suggestions +package org.xtimms.shirizu.sections.suggestions import androidx.lifecycle.viewModelScope import dagger.hilt.android.lifecycle.HiltViewModel @@ -9,11 +9,11 @@ import kotlinx.coroutines.flow.filterNotNull import kotlinx.coroutines.flow.stateIn import kotlinx.coroutines.plus import org.koitharu.kotatsu.parsers.model.Manga -import org.xtimms.etsudoku.core.base.viewmodel.KotatsuBaseViewModel -import org.xtimms.etsudoku.data.repository.SuggestionRepository -import org.xtimms.etsudoku.sections.history.HistoryItemModel -import org.xtimms.etsudoku.utils.lang.mapItems -import org.xtimms.etsudoku.work.suggestions.SuggestionsWorker +import org.xtimms.shirizu.core.base.viewmodel.KotatsuBaseViewModel +import org.xtimms.shirizu.data.repository.SuggestionRepository +import org.xtimms.shirizu.sections.history.HistoryItemModel +import org.xtimms.shirizu.utils.lang.mapItems +import org.xtimms.shirizu.work.suggestions.SuggestionsWorker import javax.inject.Inject @HiltViewModel diff --git a/app/src/main/java/org/xtimms/etsudoku/ui/harmonize/blend/Blend.java b/app/src/main/java/org/xtimms/shirizu/ui/harmonize/blend/Blend.java similarity index 91% rename from app/src/main/java/org/xtimms/etsudoku/ui/harmonize/blend/Blend.java rename to app/src/main/java/org/xtimms/shirizu/ui/harmonize/blend/Blend.java index af73375..c8a410c 100644 --- a/app/src/main/java/org/xtimms/etsudoku/ui/harmonize/blend/Blend.java +++ b/app/src/main/java/org/xtimms/shirizu/ui/harmonize/blend/Blend.java @@ -1,9 +1,9 @@ -package org.xtimms.etsudoku.ui.harmonize.blend; +package org.xtimms.shirizu.ui.harmonize.blend; -import org.xtimms.etsudoku.ui.harmonize.hct.Cam16; -import org.xtimms.etsudoku.ui.harmonize.hct.Hct; -import org.xtimms.etsudoku.ui.harmonize.utils.ColorUtils; -import org.xtimms.etsudoku.ui.harmonize.utils.MathUtils; +import org.xtimms.shirizu.ui.harmonize.hct.Cam16; +import org.xtimms.shirizu.ui.harmonize.hct.Hct; +import org.xtimms.shirizu.ui.harmonize.utils.ColorUtils; +import org.xtimms.shirizu.ui.harmonize.utils.MathUtils; /** Functions for blending in HCT and CAM16. */ public class Blend { diff --git a/app/src/main/java/org/xtimms/etsudoku/ui/harmonize/hct/Cam16.java b/app/src/main/java/org/xtimms/shirizu/ui/harmonize/hct/Cam16.java similarity index 99% rename from app/src/main/java/org/xtimms/etsudoku/ui/harmonize/hct/Cam16.java rename to app/src/main/java/org/xtimms/shirizu/ui/harmonize/hct/Cam16.java index 3f35279..07ee2d4 100644 --- a/app/src/main/java/org/xtimms/etsudoku/ui/harmonize/hct/Cam16.java +++ b/app/src/main/java/org/xtimms/shirizu/ui/harmonize/hct/Cam16.java @@ -14,11 +14,11 @@ * limitations under the License. */ -package org.xtimms.etsudoku.ui.harmonize.hct; +package org.xtimms.shirizu.ui.harmonize.hct; import static java.lang.Math.max; -import org.xtimms.etsudoku.ui.harmonize.utils.ColorUtils; +import org.xtimms.shirizu.ui.harmonize.utils.ColorUtils; /** * CAM16, a color appearance model. Colors are not just defined by their hex code, but rather, a hex diff --git a/app/src/main/java/org/xtimms/etsudoku/ui/harmonize/hct/CamSolver.java b/app/src/main/java/org/xtimms/shirizu/ui/harmonize/hct/CamSolver.java similarity index 99% rename from app/src/main/java/org/xtimms/etsudoku/ui/harmonize/hct/CamSolver.java rename to app/src/main/java/org/xtimms/shirizu/ui/harmonize/hct/CamSolver.java index a318951..f4ba346 100644 --- a/app/src/main/java/org/xtimms/etsudoku/ui/harmonize/hct/CamSolver.java +++ b/app/src/main/java/org/xtimms/shirizu/ui/harmonize/hct/CamSolver.java @@ -14,12 +14,12 @@ * limitations under the License. */ -package org.xtimms.etsudoku.ui.harmonize.hct; +package org.xtimms.shirizu.ui.harmonize.hct; import static java.lang.Math.max; -import org.xtimms.etsudoku.ui.harmonize.utils.ColorUtils; -import org.xtimms.etsudoku.ui.harmonize.utils.MathUtils; +import org.xtimms.shirizu.ui.harmonize.utils.ColorUtils; +import org.xtimms.shirizu.ui.harmonize.utils.MathUtils; import java.util.ArrayList; diff --git a/app/src/main/java/org/xtimms/etsudoku/ui/harmonize/hct/Hct.java b/app/src/main/java/org/xtimms/shirizu/ui/harmonize/hct/Hct.java similarity index 97% rename from app/src/main/java/org/xtimms/etsudoku/ui/harmonize/hct/Hct.java rename to app/src/main/java/org/xtimms/shirizu/ui/harmonize/hct/Hct.java index 8a5f603..a947de1 100644 --- a/app/src/main/java/org/xtimms/etsudoku/ui/harmonize/hct/Hct.java +++ b/app/src/main/java/org/xtimms/shirizu/ui/harmonize/hct/Hct.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.xtimms.etsudoku.ui.harmonize.hct; +package org.xtimms.shirizu.ui.harmonize.hct; /** * A color system built using CAM16 hue and chroma, and L* from L*a*b*. @@ -30,7 +30,7 @@ package org.xtimms.etsudoku.ui.harmonize.hct; * guarantees a contrast ratio >= 4.5. */ -import org.xtimms.etsudoku.ui.harmonize.utils.ColorUtils; +import org.xtimms.shirizu.ui.harmonize.utils.ColorUtils; /** * HCT, hue, chroma, and tone. A color system that provides a perceptually accurate color diff --git a/app/src/main/java/org/xtimms/etsudoku/ui/harmonize/hct/ViewingConditions.java b/app/src/main/java/org/xtimms/shirizu/ui/harmonize/hct/ViewingConditions.java similarity index 97% rename from app/src/main/java/org/xtimms/etsudoku/ui/harmonize/hct/ViewingConditions.java rename to app/src/main/java/org/xtimms/shirizu/ui/harmonize/hct/ViewingConditions.java index 3581720..6bf7c8f 100644 --- a/app/src/main/java/org/xtimms/etsudoku/ui/harmonize/hct/ViewingConditions.java +++ b/app/src/main/java/org/xtimms/shirizu/ui/harmonize/hct/ViewingConditions.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package org.xtimms.etsudoku.ui.harmonize.hct; +package org.xtimms.shirizu.ui.harmonize.hct; -import org.xtimms.etsudoku.ui.harmonize.utils.ColorUtils; -import org.xtimms.etsudoku.ui.harmonize.utils.MathUtils; +import org.xtimms.shirizu.ui.harmonize.utils.ColorUtils; +import org.xtimms.shirizu.ui.harmonize.utils.MathUtils; /** * In traditional color spaces, a color can be identified solely by the observer's measurement of diff --git a/app/src/main/java/org/xtimms/etsudoku/ui/harmonize/palettes/CorePalette.java b/app/src/main/java/org/xtimms/shirizu/ui/harmonize/palettes/CorePalette.java similarity index 96% rename from app/src/main/java/org/xtimms/etsudoku/ui/harmonize/palettes/CorePalette.java rename to app/src/main/java/org/xtimms/shirizu/ui/harmonize/palettes/CorePalette.java index 2779074..0ba456d 100644 --- a/app/src/main/java/org/xtimms/etsudoku/ui/harmonize/palettes/CorePalette.java +++ b/app/src/main/java/org/xtimms/shirizu/ui/harmonize/palettes/CorePalette.java @@ -14,12 +14,12 @@ * limitations under the License. */ -package org.xtimms.etsudoku.ui.harmonize.palettes; +package org.xtimms.shirizu.ui.harmonize.palettes; import static java.lang.Math.max; import static java.lang.Math.min; -import org.xtimms.etsudoku.ui.harmonize.hct.Hct; +import org.xtimms.shirizu.ui.harmonize.hct.Hct; /** * An intermediate concept between the key color for a UI theme, and a full color scheme. 5 sets of diff --git a/app/src/main/java/org/xtimms/etsudoku/ui/harmonize/palettes/TonalPalette.java b/app/src/main/java/org/xtimms/shirizu/ui/harmonize/palettes/TonalPalette.java similarity index 96% rename from app/src/main/java/org/xtimms/etsudoku/ui/harmonize/palettes/TonalPalette.java rename to app/src/main/java/org/xtimms/shirizu/ui/harmonize/palettes/TonalPalette.java index a0c60c0..1b2a835 100644 --- a/app/src/main/java/org/xtimms/etsudoku/ui/harmonize/palettes/TonalPalette.java +++ b/app/src/main/java/org/xtimms/shirizu/ui/harmonize/palettes/TonalPalette.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package org.xtimms.etsudoku.ui.harmonize.palettes; +package org.xtimms.shirizu.ui.harmonize.palettes; -import org.xtimms.etsudoku.ui.harmonize.hct.Hct; +import org.xtimms.shirizu.ui.harmonize.hct.Hct; import java.util.HashMap; import java.util.Map; diff --git a/app/src/main/java/org/xtimms/etsudoku/ui/harmonize/utils/ColorUtils.java b/app/src/main/java/org/xtimms/shirizu/ui/harmonize/utils/ColorUtils.java similarity index 99% rename from app/src/main/java/org/xtimms/etsudoku/ui/harmonize/utils/ColorUtils.java rename to app/src/main/java/org/xtimms/shirizu/ui/harmonize/utils/ColorUtils.java index e741083..fd66da0 100644 --- a/app/src/main/java/org/xtimms/etsudoku/ui/harmonize/utils/ColorUtils.java +++ b/app/src/main/java/org/xtimms/shirizu/ui/harmonize/utils/ColorUtils.java @@ -16,7 +16,7 @@ // This file is automatically generated. Do not modify it. -package org.xtimms.etsudoku.ui.harmonize.utils; +package org.xtimms.shirizu.ui.harmonize.utils; /** * Color science utilities. diff --git a/app/src/main/java/org/xtimms/etsudoku/ui/harmonize/utils/MathUtils.java b/app/src/main/java/org/xtimms/shirizu/ui/harmonize/utils/MathUtils.java similarity index 98% rename from app/src/main/java/org/xtimms/etsudoku/ui/harmonize/utils/MathUtils.java rename to app/src/main/java/org/xtimms/shirizu/ui/harmonize/utils/MathUtils.java index 31e2c93..94801e5 100644 --- a/app/src/main/java/org/xtimms/etsudoku/ui/harmonize/utils/MathUtils.java +++ b/app/src/main/java/org/xtimms/shirizu/ui/harmonize/utils/MathUtils.java @@ -16,7 +16,7 @@ // This file is automatically generated. Do not modify it. -package org.xtimms.etsudoku.ui.harmonize.utils; +package org.xtimms.shirizu.ui.harmonize.utils; /** Utility methods for mathematical operations. */ public class MathUtils { diff --git a/app/src/main/java/org/xtimms/etsudoku/ui/monet/ColorSpec.kt b/app/src/main/java/org/xtimms/shirizu/ui/monet/ColorSpec.kt similarity index 75% rename from app/src/main/java/org/xtimms/etsudoku/ui/monet/ColorSpec.kt rename to app/src/main/java/org/xtimms/shirizu/ui/monet/ColorSpec.kt index 258d1fb..369e9a7 100644 --- a/app/src/main/java/org/xtimms/etsudoku/ui/monet/ColorSpec.kt +++ b/app/src/main/java/org/xtimms/shirizu/ui/monet/ColorSpec.kt @@ -1,4 +1,4 @@ -package org.xtimms.etsudoku.ui.monet +package org.xtimms.shirizu.ui.monet data class ColorSpec( val chroma: (Double) -> Double = { it }, diff --git a/app/src/main/java/org/xtimms/etsudoku/ui/monet/Monet.kt b/app/src/main/java/org/xtimms/shirizu/ui/monet/Monet.kt similarity index 96% rename from app/src/main/java/org/xtimms/etsudoku/ui/monet/Monet.kt rename to app/src/main/java/org/xtimms/shirizu/ui/monet/Monet.kt index 232e096..4ff96b5 100644 --- a/app/src/main/java/org/xtimms/etsudoku/ui/monet/Monet.kt +++ b/app/src/main/java/org/xtimms/shirizu/ui/monet/Monet.kt @@ -1,4 +1,4 @@ -package org.xtimms.etsudoku.ui.monet +package org.xtimms.shirizu.ui.monet import androidx.compose.foundation.isSystemInDarkTheme import androidx.compose.material3.ColorScheme @@ -7,7 +7,7 @@ import androidx.compose.material3.lightColorScheme import androidx.compose.runtime.Composable import androidx.compose.runtime.staticCompositionLocalOf import androidx.compose.ui.graphics.Color -import org.xtimms.etsudoku.ui.monet.TonalPalettes.Companion.toTonalPalettes +import org.xtimms.shirizu.ui.monet.TonalPalettes.Companion.toTonalPalettes val LocalTonalPalettes = staticCompositionLocalOf { Color(0xFF1978D2).toTonalPalettes() diff --git a/app/src/main/java/org/xtimms/etsudoku/ui/monet/PaletteStyle.kt b/app/src/main/java/org/xtimms/shirizu/ui/monet/PaletteStyle.kt similarity index 99% rename from app/src/main/java/org/xtimms/etsudoku/ui/monet/PaletteStyle.kt rename to app/src/main/java/org/xtimms/shirizu/ui/monet/PaletteStyle.kt index f1e8783..9d8be89 100644 --- a/app/src/main/java/org/xtimms/etsudoku/ui/monet/PaletteStyle.kt +++ b/app/src/main/java/org/xtimms/shirizu/ui/monet/PaletteStyle.kt @@ -1,4 +1,4 @@ -package org.xtimms.etsudoku.ui.monet +package org.xtimms.shirizu.ui.monet class PaletteStyle( val accent1Spec: ColorSpec, diff --git a/app/src/main/java/org/xtimms/etsudoku/ui/monet/TonalPalettes.kt b/app/src/main/java/org/xtimms/shirizu/ui/monet/TonalPalettes.kt similarity index 97% rename from app/src/main/java/org/xtimms/etsudoku/ui/monet/TonalPalettes.kt rename to app/src/main/java/org/xtimms/shirizu/ui/monet/TonalPalettes.kt index 0e6b31c..f53395a 100644 --- a/app/src/main/java/org/xtimms/etsudoku/ui/monet/TonalPalettes.kt +++ b/app/src/main/java/org/xtimms/shirizu/ui/monet/TonalPalettes.kt @@ -1,9 +1,9 @@ -package org.xtimms.etsudoku.ui.monet +package org.xtimms.shirizu.ui.monet import androidx.compose.material3.ColorScheme import androidx.compose.ui.graphics.Color import androidx.compose.ui.graphics.toArgb -import org.xtimms.etsudoku.ui.harmonize.hct.Hct +import org.xtimms.shirizu.ui.harmonize.hct.Hct typealias TonalPalette = Map diff --git a/app/src/main/java/org/xtimms/etsudoku/ui/theme/Color.kt b/app/src/main/java/org/xtimms/shirizu/ui/theme/Color.kt similarity index 84% rename from app/src/main/java/org/xtimms/etsudoku/ui/theme/Color.kt rename to app/src/main/java/org/xtimms/shirizu/ui/theme/Color.kt index 5a72903..3ed57e5 100644 --- a/app/src/main/java/org/xtimms/etsudoku/ui/theme/Color.kt +++ b/app/src/main/java/org/xtimms/shirizu/ui/theme/Color.kt @@ -1,10 +1,10 @@ -package org.xtimms.etsudoku.ui.theme +package org.xtimms.shirizu.ui.theme import androidx.compose.runtime.Composable import androidx.compose.ui.graphics.Color -import org.xtimms.etsudoku.ui.monet.a1 -import org.xtimms.etsudoku.ui.monet.a2 -import org.xtimms.etsudoku.ui.monet.a3 +import org.xtimms.shirizu.ui.monet.a1 +import org.xtimms.shirizu.ui.monet.a2 +import org.xtimms.shirizu.ui.monet.a3 val colorMin = Color(0xFF185ED6) val colorMax = Color(0xFFDD1414) diff --git a/app/src/main/java/org/xtimms/etsudoku/ui/theme/Theme.kt b/app/src/main/java/org/xtimms/shirizu/ui/theme/Theme.kt similarity index 96% rename from app/src/main/java/org/xtimms/etsudoku/ui/theme/Theme.kt rename to app/src/main/java/org/xtimms/shirizu/ui/theme/Theme.kt index b3febcf..f2002d1 100644 --- a/app/src/main/java/org/xtimms/etsudoku/ui/theme/Theme.kt +++ b/app/src/main/java/org/xtimms/shirizu/ui/theme/Theme.kt @@ -1,4 +1,4 @@ -package org.xtimms.etsudoku.ui.theme +package org.xtimms.shirizu.ui.theme import android.app.Activity import android.content.Context @@ -18,7 +18,7 @@ import androidx.compose.ui.text.style.TextDirection import androidx.core.view.WindowCompat import com.google.accompanist.systemuicontroller.rememberSystemUiController import com.google.android.material.color.MaterialColors -import org.xtimms.etsudoku.ui.monet.dynamicColorScheme +import org.xtimms.shirizu.ui.monet.dynamicColorScheme fun Color.disabledIconOpacity(): Color { return this.copy(alpha = 0.38f) @@ -44,7 +44,7 @@ private tailrec fun Context.findWindow(): Window? = } @Composable -fun EtsudokuTheme( +fun ShirizuTheme( darkTheme: Boolean = isSystemInDarkTheme(), isHighContrastModeEnabled: Boolean = false, isDynamicColorEnabled: Boolean = false, diff --git a/app/src/main/java/org/xtimms/etsudoku/ui/theme/Type.kt b/app/src/main/java/org/xtimms/shirizu/ui/theme/Type.kt similarity index 98% rename from app/src/main/java/org/xtimms/etsudoku/ui/theme/Type.kt rename to app/src/main/java/org/xtimms/shirizu/ui/theme/Type.kt index 229dfa0..f66d4ee 100644 --- a/app/src/main/java/org/xtimms/etsudoku/ui/theme/Type.kt +++ b/app/src/main/java/org/xtimms/shirizu/ui/theme/Type.kt @@ -1,4 +1,4 @@ -package org.xtimms.etsudoku.ui.theme +package org.xtimms.shirizu.ui.theme import android.content.Context import androidx.compose.foundation.layout.Column @@ -114,7 +114,7 @@ fun FontCard(family: String, size: String, style: TextStyle) { @Preview @Composable fun PreviewTypography() { - EtsudokuTheme { + ShirizuTheme { Surface { Row { Column { diff --git a/app/src/main/java/org/xtimms/etsudoku/utils/AlphanumComparator.kt b/app/src/main/java/org/xtimms/shirizu/utils/AlphanumComparator.kt similarity index 98% rename from app/src/main/java/org/xtimms/etsudoku/utils/AlphanumComparator.kt rename to app/src/main/java/org/xtimms/shirizu/utils/AlphanumComparator.kt index 7ffde60..848125a 100644 --- a/app/src/main/java/org/xtimms/etsudoku/utils/AlphanumComparator.kt +++ b/app/src/main/java/org/xtimms/shirizu/utils/AlphanumComparator.kt @@ -1,4 +1,4 @@ -package org.xtimms.etsudoku.utils +package org.xtimms.shirizu.utils class AlphanumComparator : Comparator { diff --git a/app/src/main/java/org/xtimms/etsudoku/utils/CancellableSource.kt b/app/src/main/java/org/xtimms/shirizu/utils/CancellableSource.kt similarity index 91% rename from app/src/main/java/org/xtimms/etsudoku/utils/CancellableSource.kt rename to app/src/main/java/org/xtimms/shirizu/utils/CancellableSource.kt index 9644e33..b231e79 100644 --- a/app/src/main/java/org/xtimms/etsudoku/utils/CancellableSource.kt +++ b/app/src/main/java/org/xtimms/shirizu/utils/CancellableSource.kt @@ -1,4 +1,4 @@ -package org.xtimms.etsudoku.utils +package org.xtimms.shirizu.utils import kotlinx.coroutines.Job import kotlinx.coroutines.ensureActive diff --git a/app/src/main/java/org/xtimms/etsudoku/utils/CoilImageGetter.kt b/app/src/main/java/org/xtimms/shirizu/utils/CoilImageGetter.kt similarity index 95% rename from app/src/main/java/org/xtimms/etsudoku/utils/CoilImageGetter.kt rename to app/src/main/java/org/xtimms/shirizu/utils/CoilImageGetter.kt index 454cb3d..ae80718 100644 --- a/app/src/main/java/org/xtimms/etsudoku/utils/CoilImageGetter.kt +++ b/app/src/main/java/org/xtimms/shirizu/utils/CoilImageGetter.kt @@ -1,4 +1,4 @@ -package org.xtimms.etsudoku.utils +package org.xtimms.shirizu.utils import android.content.Context import android.graphics.drawable.Drawable diff --git a/app/src/main/java/org/xtimms/etsudoku/utils/CompositeMutex.kt b/app/src/main/java/org/xtimms/shirizu/utils/CompositeMutex.kt similarity index 97% rename from app/src/main/java/org/xtimms/etsudoku/utils/CompositeMutex.kt rename to app/src/main/java/org/xtimms/shirizu/utils/CompositeMutex.kt index 2cadd5b..eac7b19 100644 --- a/app/src/main/java/org/xtimms/etsudoku/utils/CompositeMutex.kt +++ b/app/src/main/java/org/xtimms/shirizu/utils/CompositeMutex.kt @@ -1,4 +1,4 @@ -package org.xtimms.etsudoku.utils +package org.xtimms.shirizu.utils import androidx.collection.ArrayMap import kotlinx.coroutines.flow.MutableStateFlow diff --git a/app/src/main/java/org/xtimms/etsudoku/utils/CompositeMutex2.kt b/app/src/main/java/org/xtimms/shirizu/utils/CompositeMutex2.kt similarity index 96% rename from app/src/main/java/org/xtimms/etsudoku/utils/CompositeMutex2.kt rename to app/src/main/java/org/xtimms/shirizu/utils/CompositeMutex2.kt index 5f52111..f7e00ac 100644 --- a/app/src/main/java/org/xtimms/etsudoku/utils/CompositeMutex2.kt +++ b/app/src/main/java/org/xtimms/shirizu/utils/CompositeMutex2.kt @@ -1,4 +1,4 @@ -package org.xtimms.etsudoku.utils +package org.xtimms.shirizu.utils import androidx.collection.ArrayMap import kotlinx.coroutines.sync.Mutex diff --git a/app/src/main/java/org/xtimms/etsudoku/utils/CrashLogUtil.kt b/app/src/main/java/org/xtimms/shirizu/utils/CrashLogUtil.kt similarity index 72% rename from app/src/main/java/org/xtimms/etsudoku/utils/CrashLogUtil.kt rename to app/src/main/java/org/xtimms/shirizu/utils/CrashLogUtil.kt index aa1959b..fef0fc7 100644 --- a/app/src/main/java/org/xtimms/etsudoku/utils/CrashLogUtil.kt +++ b/app/src/main/java/org/xtimms/shirizu/utils/CrashLogUtil.kt @@ -1,15 +1,15 @@ -package org.xtimms.etsudoku.utils +package org.xtimms.shirizu.utils import android.content.Context import android.os.Build import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.withContext -import org.xtimms.etsudoku.BuildConfig -import org.xtimms.etsudoku.utils.lang.withNonCancellableContext -import org.xtimms.etsudoku.utils.system.createFileInCacheDir -import org.xtimms.etsudoku.utils.system.getUriCompat -import org.xtimms.etsudoku.utils.system.toShareIntent -import org.xtimms.etsudoku.utils.system.toast +import org.xtimms.shirizu.BuildConfig +import org.xtimms.shirizu.utils.lang.withNonCancellableContext +import org.xtimms.shirizu.utils.system.createFileInCacheDir +import org.xtimms.shirizu.utils.system.getUriCompat +import org.xtimms.shirizu.utils.system.toShareIntent +import org.xtimms.shirizu.utils.system.toast class CrashLogUtil( private val context: Context, @@ -17,7 +17,7 @@ class CrashLogUtil( suspend fun dumpLogs() = withNonCancellableContext { try { - val file = context.createFileInCacheDir("etsudoku_crash_logs.txt") + val file = context.createFileInCacheDir("shirizu_crash_logs.txt") file.appendText(getDebugInfo() + "\n\n") diff --git a/app/src/main/java/org/xtimms/etsudoku/utils/DeviceUtil.kt b/app/src/main/java/org/xtimms/shirizu/utils/DeviceUtil.kt similarity index 98% rename from app/src/main/java/org/xtimms/etsudoku/utils/DeviceUtil.kt rename to app/src/main/java/org/xtimms/shirizu/utils/DeviceUtil.kt index 4704361..66bb157 100644 --- a/app/src/main/java/org/xtimms/etsudoku/utils/DeviceUtil.kt +++ b/app/src/main/java/org/xtimms/shirizu/utils/DeviceUtil.kt @@ -1,4 +1,4 @@ -package org.xtimms.etsudoku.utils +package org.xtimms.shirizu.utils import android.annotation.SuppressLint import android.app.ActivityManager diff --git a/app/src/main/java/org/xtimms/etsudoku/utils/DomainValidator.kt b/app/src/main/java/org/xtimms/shirizu/utils/DomainValidator.kt similarity index 95% rename from app/src/main/java/org/xtimms/etsudoku/utils/DomainValidator.kt rename to app/src/main/java/org/xtimms/shirizu/utils/DomainValidator.kt index be2506f..48783aa 100644 --- a/app/src/main/java/org/xtimms/etsudoku/utils/DomainValidator.kt +++ b/app/src/main/java/org/xtimms/shirizu/utils/DomainValidator.kt @@ -1,4 +1,4 @@ -package org.xtimms.etsudoku.utils +package org.xtimms.shirizu.utils import android.content.Context import android.text.Editable @@ -6,8 +6,8 @@ import android.text.TextWatcher import android.widget.EditText import androidx.annotation.CallSuper import okhttp3.HttpUrl -import org.xtimms.etsudoku.R -import org.xtimms.etsudoku.utils.system.getDisplayMessage +import org.xtimms.shirizu.R +import org.xtimms.shirizu.utils.system.getDisplayMessage import java.lang.ref.WeakReference class DomainValidator : EditTextValidator() { diff --git a/app/src/main/java/org/xtimms/etsudoku/utils/Event.kt b/app/src/main/java/org/xtimms/shirizu/utils/Event.kt similarity index 95% rename from app/src/main/java/org/xtimms/etsudoku/utils/Event.kt rename to app/src/main/java/org/xtimms/shirizu/utils/Event.kt index 9c976a2..ee5c3f5 100644 --- a/app/src/main/java/org/xtimms/etsudoku/utils/Event.kt +++ b/app/src/main/java/org/xtimms/shirizu/utils/Event.kt @@ -1,4 +1,4 @@ -package org.xtimms.etsudoku.utils +package org.xtimms.shirizu.utils import kotlinx.coroutines.flow.FlowCollector diff --git a/app/src/main/java/org/xtimms/etsudoku/utils/ExtraCloseableSource.kt b/app/src/main/java/org/xtimms/shirizu/utils/ExtraCloseableSource.kt similarity index 86% rename from app/src/main/java/org/xtimms/etsudoku/utils/ExtraCloseableSource.kt rename to app/src/main/java/org/xtimms/shirizu/utils/ExtraCloseableSource.kt index 6e2993c..7170120 100644 --- a/app/src/main/java/org/xtimms/etsudoku/utils/ExtraCloseableSource.kt +++ b/app/src/main/java/org/xtimms/shirizu/utils/ExtraCloseableSource.kt @@ -1,4 +1,4 @@ -package org.xtimms.etsudoku.utils +package org.xtimms.shirizu.utils import okhttp3.internal.closeQuietly import okio.Closeable diff --git a/app/src/main/java/org/xtimms/etsudoku/utils/FileSequence.kt b/app/src/main/java/org/xtimms/shirizu/utils/FileSequence.kt similarity index 68% rename from app/src/main/java/org/xtimms/etsudoku/utils/FileSequence.kt rename to app/src/main/java/org/xtimms/shirizu/utils/FileSequence.kt index 522687a..22c2e81 100644 --- a/app/src/main/java/org/xtimms/etsudoku/utils/FileSequence.kt +++ b/app/src/main/java/org/xtimms/shirizu/utils/FileSequence.kt @@ -1,7 +1,7 @@ -package org.xtimms.etsudoku.utils +package org.xtimms.shirizu.utils -import org.xtimms.etsudoku.utils.iterator.CloseableIterator -import org.xtimms.etsudoku.utils.iterator.MappingIterator +import org.xtimms.shirizu.utils.iterator.CloseableIterator +import org.xtimms.shirizu.utils.iterator.MappingIterator import java.io.File import java.nio.file.Files import java.nio.file.Path diff --git a/app/src/main/java/org/xtimms/etsudoku/utils/FileSize.kt b/app/src/main/java/org/xtimms/shirizu/utils/FileSize.kt similarity index 98% rename from app/src/main/java/org/xtimms/etsudoku/utils/FileSize.kt rename to app/src/main/java/org/xtimms/shirizu/utils/FileSize.kt index a7e681f..db261dc 100644 --- a/app/src/main/java/org/xtimms/etsudoku/utils/FileSize.kt +++ b/app/src/main/java/org/xtimms/shirizu/utils/FileSize.kt @@ -1,7 +1,7 @@ -package org.xtimms.etsudoku.utils +package org.xtimms.shirizu.utils import android.content.Context -import org.xtimms.etsudoku.R +import org.xtimms.shirizu.R import java.text.DecimalFormat import kotlin.math.log10 import kotlin.math.pow diff --git a/app/src/main/java/org/xtimms/etsudoku/utils/ImageFileFilter.kt b/app/src/main/java/org/xtimms/shirizu/utils/ImageFileFilter.kt similarity index 91% rename from app/src/main/java/org/xtimms/etsudoku/utils/ImageFileFilter.kt rename to app/src/main/java/org/xtimms/shirizu/utils/ImageFileFilter.kt index 2b406ef..998a052 100644 --- a/app/src/main/java/org/xtimms/etsudoku/utils/ImageFileFilter.kt +++ b/app/src/main/java/org/xtimms/shirizu/utils/ImageFileFilter.kt @@ -1,4 +1,4 @@ -package org.xtimms.etsudoku.utils +package org.xtimms.shirizu.utils import java.io.File diff --git a/app/src/main/java/org/xtimms/etsudoku/utils/MediatorStateFlow.kt b/app/src/main/java/org/xtimms/shirizu/utils/MediatorStateFlow.kt similarity index 96% rename from app/src/main/java/org/xtimms/etsudoku/utils/MediatorStateFlow.kt rename to app/src/main/java/org/xtimms/shirizu/utils/MediatorStateFlow.kt index 4ecd415..3eda250 100644 --- a/app/src/main/java/org/xtimms/etsudoku/utils/MediatorStateFlow.kt +++ b/app/src/main/java/org/xtimms/shirizu/utils/MediatorStateFlow.kt @@ -1,4 +1,4 @@ -package org.xtimms.etsudoku.utils +package org.xtimms.shirizu.utils import kotlinx.coroutines.flow.FlowCollector import kotlinx.coroutines.flow.MutableStateFlow diff --git a/app/src/main/java/org/xtimms/etsudoku/utils/MetricAffectingSpan.kt b/app/src/main/java/org/xtimms/shirizu/utils/MetricAffectingSpan.kt similarity index 98% rename from app/src/main/java/org/xtimms/etsudoku/utils/MetricAffectingSpan.kt rename to app/src/main/java/org/xtimms/shirizu/utils/MetricAffectingSpan.kt index cdf3423..935ef78 100644 --- a/app/src/main/java/org/xtimms/etsudoku/utils/MetricAffectingSpan.kt +++ b/app/src/main/java/org/xtimms/shirizu/utils/MetricAffectingSpan.kt @@ -1,4 +1,4 @@ -package org.xtimms.etsudoku.utils +package org.xtimms.shirizu.utils import android.graphics.Typeface import android.text.style.RelativeSizeSpan diff --git a/app/src/main/java/org/xtimms/etsudoku/utils/ProgressResponseBody.kt b/app/src/main/java/org/xtimms/shirizu/utils/ProgressResponseBody.kt similarity index 97% rename from app/src/main/java/org/xtimms/etsudoku/utils/ProgressResponseBody.kt rename to app/src/main/java/org/xtimms/shirizu/utils/ProgressResponseBody.kt index 80fdce7..3795ae3 100644 --- a/app/src/main/java/org/xtimms/etsudoku/utils/ProgressResponseBody.kt +++ b/app/src/main/java/org/xtimms/shirizu/utils/ProgressResponseBody.kt @@ -1,4 +1,4 @@ -package org.xtimms.etsudoku.utils +package org.xtimms.shirizu.utils import kotlinx.coroutines.flow.MutableStateFlow import okhttp3.MediaType diff --git a/app/src/main/java/org/xtimms/etsudoku/utils/RetainedLifecycleCoroutineScope.kt b/app/src/main/java/org/xtimms/shirizu/utils/RetainedLifecycleCoroutineScope.kt similarity index 94% rename from app/src/main/java/org/xtimms/etsudoku/utils/RetainedLifecycleCoroutineScope.kt rename to app/src/main/java/org/xtimms/shirizu/utils/RetainedLifecycleCoroutineScope.kt index a88ee61..e7f15ca 100644 --- a/app/src/main/java/org/xtimms/etsudoku/utils/RetainedLifecycleCoroutineScope.kt +++ b/app/src/main/java/org/xtimms/shirizu/utils/RetainedLifecycleCoroutineScope.kt @@ -1,4 +1,4 @@ -package org.xtimms.etsudoku.utils +package org.xtimms.shirizu.utils import dagger.hilt.android.lifecycle.RetainedLifecycle import kotlinx.coroutines.CoroutineScope diff --git a/app/src/main/java/org/xtimms/etsudoku/utils/ReversibleAction.kt b/app/src/main/java/org/xtimms/shirizu/utils/ReversibleAction.kt similarity index 79% rename from app/src/main/java/org/xtimms/etsudoku/utils/ReversibleAction.kt rename to app/src/main/java/org/xtimms/shirizu/utils/ReversibleAction.kt index 0d3aa1d..fad9332 100644 --- a/app/src/main/java/org/xtimms/etsudoku/utils/ReversibleAction.kt +++ b/app/src/main/java/org/xtimms/shirizu/utils/ReversibleAction.kt @@ -1,4 +1,4 @@ -package org.xtimms.etsudoku.utils +package org.xtimms.shirizu.utils import androidx.annotation.StringRes diff --git a/app/src/main/java/org/xtimms/etsudoku/utils/ReversibleHandle.kt b/app/src/main/java/org/xtimms/shirizu/utils/ReversibleHandle.kt similarity index 89% rename from app/src/main/java/org/xtimms/etsudoku/utils/ReversibleHandle.kt rename to app/src/main/java/org/xtimms/shirizu/utils/ReversibleHandle.kt index 10c4685..128d4ec 100644 --- a/app/src/main/java/org/xtimms/etsudoku/utils/ReversibleHandle.kt +++ b/app/src/main/java/org/xtimms/shirizu/utils/ReversibleHandle.kt @@ -1,4 +1,4 @@ -package org.xtimms.etsudoku.utils +package org.xtimms.shirizu.utils import kotlinx.coroutines.CoroutineStart import kotlinx.coroutines.Dispatchers @@ -7,7 +7,7 @@ import kotlinx.coroutines.NonCancellable import kotlinx.coroutines.launch import kotlinx.coroutines.withContext import org.koitharu.kotatsu.parsers.util.runCatchingCancellable -import org.xtimms.etsudoku.utils.lang.processLifecycleScope +import org.xtimms.shirizu.utils.lang.processLifecycleScope fun interface ReversibleHandle { diff --git a/app/src/main/java/org/xtimms/etsudoku/utils/ShareHelper.kt b/app/src/main/java/org/xtimms/shirizu/utils/ShareHelper.kt similarity index 86% rename from app/src/main/java/org/xtimms/etsudoku/utils/ShareHelper.kt rename to app/src/main/java/org/xtimms/shirizu/utils/ShareHelper.kt index 0fead58..2152cfe 100644 --- a/app/src/main/java/org/xtimms/etsudoku/utils/ShareHelper.kt +++ b/app/src/main/java/org/xtimms/shirizu/utils/ShareHelper.kt @@ -1,12 +1,12 @@ -package org.xtimms.etsudoku.utils +package org.xtimms.shirizu.utils import android.content.Context import android.widget.Toast import androidx.core.app.ShareCompat import androidx.core.content.FileProvider -import org.xtimms.etsudoku.BuildConfig -import org.xtimms.etsudoku.R -import org.xtimms.etsudoku.core.logs.FileLogger +import org.xtimms.shirizu.BuildConfig +import org.xtimms.shirizu.R +import org.xtimms.shirizu.core.logs.FileLogger private const val TYPE_TEXT = "text/plain" diff --git a/app/src/main/java/org/xtimms/etsudoku/utils/StringArrayNavType.kt b/app/src/main/java/org/xtimms/shirizu/utils/StringArrayNavType.kt similarity index 93% rename from app/src/main/java/org/xtimms/etsudoku/utils/StringArrayNavType.kt rename to app/src/main/java/org/xtimms/shirizu/utils/StringArrayNavType.kt index 8ab277e..fa4e746 100644 --- a/app/src/main/java/org/xtimms/etsudoku/utils/StringArrayNavType.kt +++ b/app/src/main/java/org/xtimms/shirizu/utils/StringArrayNavType.kt @@ -1,4 +1,4 @@ -package org.xtimms.etsudoku.utils +package org.xtimms.shirizu.utils import android.os.Bundle import androidx.navigation.NavType diff --git a/app/src/main/java/org/xtimms/etsudoku/utils/WebViewUtil.kt b/app/src/main/java/org/xtimms/shirizu/utils/WebViewUtil.kt similarity index 91% rename from app/src/main/java/org/xtimms/etsudoku/utils/WebViewUtil.kt rename to app/src/main/java/org/xtimms/shirizu/utils/WebViewUtil.kt index ed15e8d..081c2a9 100644 --- a/app/src/main/java/org/xtimms/etsudoku/utils/WebViewUtil.kt +++ b/app/src/main/java/org/xtimms/shirizu/utils/WebViewUtil.kt @@ -1,4 +1,4 @@ -package org.xtimms.etsudoku.utils +package org.xtimms.shirizu.utils import android.content.Context import android.webkit.WebView diff --git a/app/src/main/java/org/xtimms/etsudoku/utils/composable/Bitmap.kt b/app/src/main/java/org/xtimms/shirizu/utils/composable/Bitmap.kt similarity index 94% rename from app/src/main/java/org/xtimms/etsudoku/utils/composable/Bitmap.kt rename to app/src/main/java/org/xtimms/shirizu/utils/composable/Bitmap.kt index c1f9f28..f1e798a 100644 --- a/app/src/main/java/org/xtimms/etsudoku/utils/composable/Bitmap.kt +++ b/app/src/main/java/org/xtimms/shirizu/utils/composable/Bitmap.kt @@ -1,4 +1,4 @@ -package org.xtimms.etsudoku.utils.composable +package org.xtimms.shirizu.utils.composable import android.content.res.Resources import androidx.annotation.DrawableRes diff --git a/app/src/main/java/org/xtimms/etsudoku/utils/composable/LazyListState.kt b/app/src/main/java/org/xtimms/shirizu/utils/composable/LazyListState.kt similarity index 98% rename from app/src/main/java/org/xtimms/etsudoku/utils/composable/LazyListState.kt rename to app/src/main/java/org/xtimms/shirizu/utils/composable/LazyListState.kt index ca08f9c..b3a247d 100644 --- a/app/src/main/java/org/xtimms/etsudoku/utils/composable/LazyListState.kt +++ b/app/src/main/java/org/xtimms/shirizu/utils/composable/LazyListState.kt @@ -1,4 +1,4 @@ -package org.xtimms.etsudoku.utils.composable +package org.xtimms.shirizu.utils.composable import androidx.compose.foundation.lazy.LazyListState import androidx.compose.foundation.lazy.grid.LazyGridState diff --git a/app/src/main/java/org/xtimms/etsudoku/utils/composable/Modifier.kt b/app/src/main/java/org/xtimms/shirizu/utils/composable/Modifier.kt similarity index 92% rename from app/src/main/java/org/xtimms/etsudoku/utils/composable/Modifier.kt rename to app/src/main/java/org/xtimms/shirizu/utils/composable/Modifier.kt index 4116656..6d5ff05 100644 --- a/app/src/main/java/org/xtimms/etsudoku/utils/composable/Modifier.kt +++ b/app/src/main/java/org/xtimms/shirizu/utils/composable/Modifier.kt @@ -1,4 +1,4 @@ -package org.xtimms.etsudoku.utils.composable +package org.xtimms.shirizu.utils.composable import androidx.compose.foundation.ExperimentalFoundationApi import androidx.compose.foundation.combinedClickable @@ -10,7 +10,7 @@ import androidx.compose.ui.Modifier import androidx.compose.ui.composed import androidx.compose.ui.draw.alpha import androidx.compose.ui.draw.drawBehind -import org.xtimms.etsudoku.utils.material.SecondaryItemAlpha +import org.xtimms.shirizu.utils.material.SecondaryItemAlpha fun Modifier.selectedBackground(isSelected: Boolean): Modifier = if (isSelected) { composed { diff --git a/app/src/main/java/org/xtimms/etsudoku/utils/iterator/CloseableIterator.kt b/app/src/main/java/org/xtimms/shirizu/utils/iterator/CloseableIterator.kt similarity index 94% rename from app/src/main/java/org/xtimms/etsudoku/utils/iterator/CloseableIterator.kt rename to app/src/main/java/org/xtimms/shirizu/utils/iterator/CloseableIterator.kt index aa61ddb..202b639 100644 --- a/app/src/main/java/org/xtimms/etsudoku/utils/iterator/CloseableIterator.kt +++ b/app/src/main/java/org/xtimms/shirizu/utils/iterator/CloseableIterator.kt @@ -1,4 +1,4 @@ -package org.xtimms.etsudoku.utils.iterator +package org.xtimms.shirizu.utils.iterator import okhttp3.internal.closeQuietly import okio.Closeable diff --git a/app/src/main/java/org/xtimms/etsudoku/utils/iterator/MappingIterator.kt b/app/src/main/java/org/xtimms/shirizu/utils/iterator/MappingIterator.kt similarity index 84% rename from app/src/main/java/org/xtimms/etsudoku/utils/iterator/MappingIterator.kt rename to app/src/main/java/org/xtimms/shirizu/utils/iterator/MappingIterator.kt index 98489e9..aa2ae30 100644 --- a/app/src/main/java/org/xtimms/etsudoku/utils/iterator/MappingIterator.kt +++ b/app/src/main/java/org/xtimms/shirizu/utils/iterator/MappingIterator.kt @@ -1,4 +1,4 @@ -package org.xtimms.etsudoku.utils.iterator +package org.xtimms.shirizu.utils.iterator class MappingIterator( private val upstream: Iterator, diff --git a/app/src/main/java/org/xtimms/etsudoku/utils/lang/Bundle.kt b/app/src/main/java/org/xtimms/shirizu/utils/lang/Bundle.kt similarity index 97% rename from app/src/main/java/org/xtimms/etsudoku/utils/lang/Bundle.kt rename to app/src/main/java/org/xtimms/shirizu/utils/lang/Bundle.kt index dd5f9ef..c9881ab 100644 --- a/app/src/main/java/org/xtimms/etsudoku/utils/lang/Bundle.kt +++ b/app/src/main/java/org/xtimms/shirizu/utils/lang/Bundle.kt @@ -1,4 +1,4 @@ -package org.xtimms.etsudoku.utils.lang +package org.xtimms.shirizu.utils.lang import android.content.Intent import android.os.Build diff --git a/app/src/main/java/org/xtimms/etsudoku/utils/lang/Coil.kt b/app/src/main/java/org/xtimms/shirizu/utils/lang/Coil.kt similarity index 89% rename from app/src/main/java/org/xtimms/etsudoku/utils/lang/Coil.kt rename to app/src/main/java/org/xtimms/shirizu/utils/lang/Coil.kt index b0738e4..5b87b65 100644 --- a/app/src/main/java/org/xtimms/etsudoku/utils/lang/Coil.kt +++ b/app/src/main/java/org/xtimms/shirizu/utils/lang/Coil.kt @@ -1,4 +1,4 @@ -package org.xtimms.etsudoku.utils.lang +package org.xtimms.shirizu.utils.lang import androidx.core.graphics.drawable.toBitmap import coil.request.ErrorResult diff --git a/app/src/main/java/org/xtimms/etsudoku/utils/lang/Collections.kt b/app/src/main/java/org/xtimms/shirizu/utils/lang/Collections.kt similarity index 96% rename from app/src/main/java/org/xtimms/etsudoku/utils/lang/Collections.kt rename to app/src/main/java/org/xtimms/shirizu/utils/lang/Collections.kt index e0e00af..019ea51 100644 --- a/app/src/main/java/org/xtimms/etsudoku/utils/lang/Collections.kt +++ b/app/src/main/java/org/xtimms/shirizu/utils/lang/Collections.kt @@ -1,4 +1,4 @@ -package org.xtimms.etsudoku.utils.lang +package org.xtimms.shirizu.utils.lang import androidx.collection.ArrayMap diff --git a/app/src/main/java/org/xtimms/etsudoku/utils/lang/Coroutines.kt b/app/src/main/java/org/xtimms/shirizu/utils/lang/Coroutines.kt similarity index 92% rename from app/src/main/java/org/xtimms/etsudoku/utils/lang/Coroutines.kt rename to app/src/main/java/org/xtimms/shirizu/utils/lang/Coroutines.kt index 0194a84..f2ad3c0 100644 --- a/app/src/main/java/org/xtimms/etsudoku/utils/lang/Coroutines.kt +++ b/app/src/main/java/org/xtimms/shirizu/utils/lang/Coroutines.kt @@ -1,4 +1,4 @@ -package org.xtimms.etsudoku.utils.lang +package org.xtimms.shirizu.utils.lang import androidx.lifecycle.LifecycleCoroutineScope import androidx.lifecycle.ProcessLifecycleOwner @@ -10,7 +10,7 @@ import kotlinx.coroutines.ExperimentalCoroutinesApi import kotlinx.coroutines.NonCancellable import kotlinx.coroutines.withContext import org.koitharu.kotatsu.parsers.util.runCatchingCancellable -import org.xtimms.etsudoku.utils.RetainedLifecycleCoroutineScope +import org.xtimms.shirizu.utils.RetainedLifecycleCoroutineScope suspend fun withNonCancellableContext(block: suspend CoroutineScope.() -> T) = withContext(NonCancellable, block) diff --git a/app/src/main/java/org/xtimms/etsudoku/utils/lang/Date.kt b/app/src/main/java/org/xtimms/shirizu/utils/lang/Date.kt similarity index 98% rename from app/src/main/java/org/xtimms/etsudoku/utils/lang/Date.kt rename to app/src/main/java/org/xtimms/shirizu/utils/lang/Date.kt index 8a4de24..212a9b1 100644 --- a/app/src/main/java/org/xtimms/etsudoku/utils/lang/Date.kt +++ b/app/src/main/java/org/xtimms/shirizu/utils/lang/Date.kt @@ -1,7 +1,7 @@ -package org.xtimms.etsudoku.utils.lang +package org.xtimms.shirizu.utils.lang import android.content.res.Resources -import org.xtimms.etsudoku.R +import org.xtimms.shirizu.R import java.text.DateFormat import java.time.Instant import java.time.LocalDate diff --git a/app/src/main/java/org/xtimms/etsudoku/utils/lang/EventFlow.kt b/app/src/main/java/org/xtimms/shirizu/utils/lang/EventFlow.kt similarity index 83% rename from app/src/main/java/org/xtimms/etsudoku/utils/lang/EventFlow.kt rename to app/src/main/java/org/xtimms/shirizu/utils/lang/EventFlow.kt index c3fa8c9..535ab01 100644 --- a/app/src/main/java/org/xtimms/etsudoku/utils/lang/EventFlow.kt +++ b/app/src/main/java/org/xtimms/shirizu/utils/lang/EventFlow.kt @@ -1,9 +1,9 @@ -package org.xtimms.etsudoku.utils.lang +package org.xtimms.shirizu.utils.lang import androidx.annotation.AnyThread import kotlinx.coroutines.flow.MutableStateFlow import kotlinx.coroutines.flow.StateFlow -import org.xtimms.etsudoku.utils.Event +import org.xtimms.shirizu.utils.Event @Suppress("FunctionName") fun MutableEventFlow() = MutableStateFlow?>(null) diff --git a/app/src/main/java/org/xtimms/etsudoku/utils/lang/Flow.kt b/app/src/main/java/org/xtimms/shirizu/utils/lang/Flow.kt similarity index 96% rename from app/src/main/java/org/xtimms/etsudoku/utils/lang/Flow.kt rename to app/src/main/java/org/xtimms/shirizu/utils/lang/Flow.kt index 63b03f4..b6efea8 100644 --- a/app/src/main/java/org/xtimms/etsudoku/utils/lang/Flow.kt +++ b/app/src/main/java/org/xtimms/shirizu/utils/lang/Flow.kt @@ -1,4 +1,4 @@ -package org.xtimms.etsudoku.utils.lang +package org.xtimms.shirizu.utils.lang import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.flow diff --git a/app/src/main/java/org/xtimms/etsudoku/utils/lang/FlowObserver.kt b/app/src/main/java/org/xtimms/shirizu/utils/lang/FlowObserver.kt similarity index 93% rename from app/src/main/java/org/xtimms/etsudoku/utils/lang/FlowObserver.kt rename to app/src/main/java/org/xtimms/shirizu/utils/lang/FlowObserver.kt index f069bfe..a5db89f 100644 --- a/app/src/main/java/org/xtimms/etsudoku/utils/lang/FlowObserver.kt +++ b/app/src/main/java/org/xtimms/shirizu/utils/lang/FlowObserver.kt @@ -1,4 +1,4 @@ -package org.xtimms.etsudoku.utils.lang +package org.xtimms.shirizu.utils.lang import androidx.lifecycle.Lifecycle import androidx.lifecycle.LifecycleOwner @@ -9,7 +9,7 @@ import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.FlowCollector import kotlinx.coroutines.flow.StateFlow import kotlinx.coroutines.launch -import org.xtimms.etsudoku.utils.Event +import org.xtimms.shirizu.utils.Event fun Flow.observe(owner: LifecycleOwner, collector: FlowCollector) { val start = if (this is StateFlow) CoroutineStart.UNDISPATCHED else CoroutineStart.DEFAULT diff --git a/app/src/main/java/org/xtimms/etsudoku/utils/lang/IO.kt b/app/src/main/java/org/xtimms/shirizu/utils/lang/IO.kt similarity index 82% rename from app/src/main/java/org/xtimms/etsudoku/utils/lang/IO.kt rename to app/src/main/java/org/xtimms/shirizu/utils/lang/IO.kt index 8bf0913..3f5c817 100644 --- a/app/src/main/java/org/xtimms/etsudoku/utils/lang/IO.kt +++ b/app/src/main/java/org/xtimms/shirizu/utils/lang/IO.kt @@ -1,4 +1,4 @@ -package org.xtimms.etsudoku.utils.lang +package org.xtimms.shirizu.utils.lang import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.Job @@ -8,8 +8,8 @@ import kotlinx.coroutines.withContext import okhttp3.ResponseBody import okio.BufferedSink import okio.Source -import org.xtimms.etsudoku.utils.CancellableSource -import org.xtimms.etsudoku.utils.ProgressResponseBody +import org.xtimms.shirizu.utils.CancellableSource +import org.xtimms.shirizu.utils.ProgressResponseBody fun ResponseBody.withProgress(progressState: MutableStateFlow): ResponseBody { return ProgressResponseBody(this, progressState) diff --git a/app/src/main/java/org/xtimms/etsudoku/utils/lang/Primitive.kt b/app/src/main/java/org/xtimms/shirizu/utils/lang/Primitive.kt similarity index 70% rename from app/src/main/java/org/xtimms/etsudoku/utils/lang/Primitive.kt rename to app/src/main/java/org/xtimms/shirizu/utils/lang/Primitive.kt index ff1216f..0ada14c 100644 --- a/app/src/main/java/org/xtimms/etsudoku/utils/lang/Primitive.kt +++ b/app/src/main/java/org/xtimms/shirizu/utils/lang/Primitive.kt @@ -1,12 +1,12 @@ -package org.xtimms.etsudoku.utils.lang +package org.xtimms.shirizu.utils.lang import androidx.compose.runtime.Composable import androidx.compose.runtime.mutableIntStateOf import androidx.compose.runtime.mutableStateOf import androidx.compose.runtime.remember -import org.xtimms.etsudoku.core.prefs.AppSettings.getBoolean -import org.xtimms.etsudoku.core.prefs.AppSettings.getInt -import org.xtimms.etsudoku.core.prefs.AppSettings.getString +import org.xtimms.shirizu.core.prefs.AppSettings.getBoolean +import org.xtimms.shirizu.core.prefs.AppSettings.getInt +import org.xtimms.shirizu.core.prefs.AppSettings.getString inline val String.booleanState @Composable get() = diff --git a/app/src/main/java/org/xtimms/etsudoku/utils/lang/String.kt b/app/src/main/java/org/xtimms/shirizu/utils/lang/String.kt similarity index 89% rename from app/src/main/java/org/xtimms/etsudoku/utils/lang/String.kt rename to app/src/main/java/org/xtimms/shirizu/utils/lang/String.kt index c9817bc..cb0a4ee 100644 --- a/app/src/main/java/org/xtimms/etsudoku/utils/lang/String.kt +++ b/app/src/main/java/org/xtimms/shirizu/utils/lang/String.kt @@ -1,4 +1,4 @@ -package org.xtimms.etsudoku.utils.lang +package org.xtimms.shirizu.utils.lang import android.net.Uri import kotlinx.serialization.encodeToString diff --git a/app/src/main/java/org/xtimms/etsudoku/utils/lang/WorkManager.kt b/app/src/main/java/org/xtimms/shirizu/utils/lang/WorkManager.kt similarity index 88% rename from app/src/main/java/org/xtimms/etsudoku/utils/lang/WorkManager.kt rename to app/src/main/java/org/xtimms/shirizu/utils/lang/WorkManager.kt index 08f5682..991a069 100644 --- a/app/src/main/java/org/xtimms/etsudoku/utils/lang/WorkManager.kt +++ b/app/src/main/java/org/xtimms/shirizu/utils/lang/WorkManager.kt @@ -1,4 +1,4 @@ -package org.xtimms.etsudoku.utils.lang +package org.xtimms.shirizu.utils.lang import android.annotation.SuppressLint import androidx.work.WorkInfo diff --git a/app/src/main/java/org/xtimms/etsudoku/utils/material/Color.kt b/app/src/main/java/org/xtimms/shirizu/utils/material/Color.kt similarity index 95% rename from app/src/main/java/org/xtimms/etsudoku/utils/material/Color.kt rename to app/src/main/java/org/xtimms/shirizu/utils/material/Color.kt index 9b6f8ea..033390d 100644 --- a/app/src/main/java/org/xtimms/etsudoku/utils/material/Color.kt +++ b/app/src/main/java/org/xtimms/shirizu/utils/material/Color.kt @@ -1,12 +1,12 @@ -package org.xtimms.etsudoku.utils.material +package org.xtimms.shirizu.utils.material import androidx.compose.foundation.isSystemInDarkTheme import androidx.compose.material3.MaterialTheme import androidx.compose.runtime.Composable import androidx.compose.ui.graphics.Color import androidx.compose.ui.graphics.toArgb -import org.xtimms.etsudoku.ui.harmonize.blend.Blend -import org.xtimms.etsudoku.ui.harmonize.palettes.CorePalette +import org.xtimms.shirizu.ui.harmonize.blend.Blend +import org.xtimms.shirizu.ui.harmonize.palettes.CorePalette import kotlin.math.ceil import kotlin.math.floor diff --git a/app/src/main/java/org/xtimms/shirizu/utils/material/Constants.kt b/app/src/main/java/org/xtimms/shirizu/utils/material/Constants.kt new file mode 100644 index 0000000..69644d7 --- /dev/null +++ b/app/src/main/java/org/xtimms/shirizu/utils/material/Constants.kt @@ -0,0 +1,3 @@ +package org.xtimms.shirizu.utils.material + +const val SecondaryItemAlpha = .78f \ No newline at end of file diff --git a/app/src/main/java/org/xtimms/etsudoku/utils/progress/ProgressDeferred.kt b/app/src/main/java/org/xtimms/shirizu/utils/progress/ProgressDeferred.kt similarity index 89% rename from app/src/main/java/org/xtimms/etsudoku/utils/progress/ProgressDeferred.kt rename to app/src/main/java/org/xtimms/shirizu/utils/progress/ProgressDeferred.kt index 3986455..abf9310 100644 --- a/app/src/main/java/org/xtimms/etsudoku/utils/progress/ProgressDeferred.kt +++ b/app/src/main/java/org/xtimms/shirizu/utils/progress/ProgressDeferred.kt @@ -1,4 +1,4 @@ -package org.xtimms.etsudoku.utils.progress +package org.xtimms.shirizu.utils.progress import kotlinx.coroutines.Deferred import kotlinx.coroutines.flow.Flow diff --git a/app/src/main/java/org/xtimms/etsudoku/utils/system/Android.kt b/app/src/main/java/org/xtimms/shirizu/utils/system/Android.kt similarity index 98% rename from app/src/main/java/org/xtimms/etsudoku/utils/system/Android.kt rename to app/src/main/java/org/xtimms/shirizu/utils/system/Android.kt index 522cb0a..89d9800 100644 --- a/app/src/main/java/org/xtimms/etsudoku/utils/system/Android.kt +++ b/app/src/main/java/org/xtimms/shirizu/utils/system/Android.kt @@ -1,4 +1,4 @@ -package org.xtimms.etsudoku.utils.system +package org.xtimms.shirizu.utils.system import android.Manifest import android.app.ActivityManager diff --git a/app/src/main/java/org/xtimms/etsudoku/utils/system/Context.kt b/app/src/main/java/org/xtimms/shirizu/utils/system/Context.kt similarity index 92% rename from app/src/main/java/org/xtimms/etsudoku/utils/system/Context.kt rename to app/src/main/java/org/xtimms/shirizu/utils/system/Context.kt index a982547..b2010af 100644 --- a/app/src/main/java/org/xtimms/etsudoku/utils/system/Context.kt +++ b/app/src/main/java/org/xtimms/shirizu/utils/system/Context.kt @@ -1,4 +1,4 @@ -package org.xtimms.etsudoku.utils.system +package org.xtimms.shirizu.utils.system import android.app.ActivityManager import android.content.Context diff --git a/app/src/main/java/org/xtimms/etsudoku/utils/system/Cursor.kt b/app/src/main/java/org/xtimms/shirizu/utils/system/Cursor.kt similarity index 93% rename from app/src/main/java/org/xtimms/etsudoku/utils/system/Cursor.kt rename to app/src/main/java/org/xtimms/shirizu/utils/system/Cursor.kt index a06d6e9..638d744 100644 --- a/app/src/main/java/org/xtimms/etsudoku/utils/system/Cursor.kt +++ b/app/src/main/java/org/xtimms/shirizu/utils/system/Cursor.kt @@ -1,4 +1,4 @@ -package org.xtimms.etsudoku.utils.system +package org.xtimms.shirizu.utils.system import android.content.ContentValues import android.database.Cursor diff --git a/app/src/main/java/org/xtimms/etsudoku/utils/system/File.kt b/app/src/main/java/org/xtimms/shirizu/utils/system/File.kt similarity index 92% rename from app/src/main/java/org/xtimms/etsudoku/utils/system/File.kt rename to app/src/main/java/org/xtimms/shirizu/utils/system/File.kt index 5538ace..ec0fdff 100644 --- a/app/src/main/java/org/xtimms/etsudoku/utils/system/File.kt +++ b/app/src/main/java/org/xtimms/shirizu/utils/system/File.kt @@ -1,4 +1,4 @@ -package org.xtimms.etsudoku.utils.system +package org.xtimms.shirizu.utils.system import android.content.Context import android.net.Uri @@ -7,8 +7,8 @@ import androidx.core.content.FileProvider import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.runInterruptible import kotlinx.coroutines.withContext -import org.xtimms.etsudoku.BuildConfig -import org.xtimms.etsudoku.utils.FileSequence +import org.xtimms.shirizu.BuildConfig +import org.xtimms.shirizu.utils.FileSequence import java.io.File import java.io.FileFilter import java.nio.file.attribute.BasicFileAttributes diff --git a/app/src/main/java/org/xtimms/etsudoku/utils/system/Http.kt b/app/src/main/java/org/xtimms/shirizu/utils/system/Http.kt similarity index 97% rename from app/src/main/java/org/xtimms/etsudoku/utils/system/Http.kt rename to app/src/main/java/org/xtimms/shirizu/utils/system/Http.kt index 9966a27..e3cf811 100644 --- a/app/src/main/java/org/xtimms/etsudoku/utils/system/Http.kt +++ b/app/src/main/java/org/xtimms/shirizu/utils/system/Http.kt @@ -1,4 +1,4 @@ -package org.xtimms.etsudoku.utils.system +package org.xtimms.shirizu.utils.system import okhttp3.Cookie import okhttp3.HttpUrl diff --git a/app/src/main/java/org/xtimms/etsudoku/utils/system/Intent.kt b/app/src/main/java/org/xtimms/shirizu/utils/system/Intent.kt similarity index 92% rename from app/src/main/java/org/xtimms/etsudoku/utils/system/Intent.kt rename to app/src/main/java/org/xtimms/shirizu/utils/system/Intent.kt index df2887e..a16704c 100644 --- a/app/src/main/java/org/xtimms/etsudoku/utils/system/Intent.kt +++ b/app/src/main/java/org/xtimms/shirizu/utils/system/Intent.kt @@ -1,10 +1,10 @@ -package org.xtimms.etsudoku.utils.system +package org.xtimms.shirizu.utils.system import android.content.ClipData import android.content.Context import android.content.Intent import android.net.Uri -import org.xtimms.etsudoku.R +import org.xtimms.shirizu.R fun Uri.toShareIntent(context: Context, type: String = "image/*", message: String? = null): Intent { val uri = this diff --git a/app/src/main/java/org/xtimms/etsudoku/utils/system/Locale.kt b/app/src/main/java/org/xtimms/shirizu/utils/system/Locale.kt similarity index 95% rename from app/src/main/java/org/xtimms/etsudoku/utils/system/Locale.kt rename to app/src/main/java/org/xtimms/shirizu/utils/system/Locale.kt index 0fe19d5..dccca40 100644 --- a/app/src/main/java/org/xtimms/etsudoku/utils/system/Locale.kt +++ b/app/src/main/java/org/xtimms/shirizu/utils/system/Locale.kt @@ -1,10 +1,10 @@ -package org.xtimms.etsudoku.utils.system +package org.xtimms.shirizu.utils.system import androidx.appcompat.app.AppCompatDelegate import androidx.compose.runtime.Composable import androidx.compose.ui.res.stringResource import androidx.core.os.LocaleListCompat -import org.xtimms.etsudoku.R +import org.xtimms.shirizu.R import java.util.Locale fun LocaleListCompat.toList(): List = List(size()) { i -> getOrThrow(i) } diff --git a/app/src/main/java/org/xtimms/etsudoku/utils/system/Network.kt b/app/src/main/java/org/xtimms/shirizu/utils/system/Network.kt similarity index 93% rename from app/src/main/java/org/xtimms/etsudoku/utils/system/Network.kt rename to app/src/main/java/org/xtimms/shirizu/utils/system/Network.kt index 5fea0c5..54f5c78 100644 --- a/app/src/main/java/org/xtimms/etsudoku/utils/system/Network.kt +++ b/app/src/main/java/org/xtimms/shirizu/utils/system/Network.kt @@ -1,4 +1,4 @@ -package org.xtimms.etsudoku.utils.system +package org.xtimms.shirizu.utils.system import android.content.Context import android.net.ConnectivityManager diff --git a/app/src/main/java/org/xtimms/etsudoku/utils/system/PaddingValues.kt b/app/src/main/java/org/xtimms/shirizu/utils/system/PaddingValues.kt similarity index 95% rename from app/src/main/java/org/xtimms/etsudoku/utils/system/PaddingValues.kt rename to app/src/main/java/org/xtimms/shirizu/utils/system/PaddingValues.kt index 82cc972..08cb903 100644 --- a/app/src/main/java/org/xtimms/etsudoku/utils/system/PaddingValues.kt +++ b/app/src/main/java/org/xtimms/shirizu/utils/system/PaddingValues.kt @@ -1,4 +1,4 @@ -package org.xtimms.etsudoku.utils.system +package org.xtimms.shirizu.utils.system import androidx.compose.foundation.layout.PaddingValues import androidx.compose.foundation.layout.calculateEndPadding diff --git a/app/src/main/java/org/xtimms/etsudoku/utils/system/Preferences.kt b/app/src/main/java/org/xtimms/shirizu/utils/system/Preferences.kt similarity index 92% rename from app/src/main/java/org/xtimms/etsudoku/utils/system/Preferences.kt rename to app/src/main/java/org/xtimms/shirizu/utils/system/Preferences.kt index 865d4df..47ba64e 100644 --- a/app/src/main/java/org/xtimms/etsudoku/utils/system/Preferences.kt +++ b/app/src/main/java/org/xtimms/shirizu/utils/system/Preferences.kt @@ -1,4 +1,4 @@ -package org.xtimms.etsudoku.utils.system +package org.xtimms.shirizu.utils.system import android.content.SharedPreferences diff --git a/app/src/main/java/org/xtimms/etsudoku/utils/system/Throwable.kt b/app/src/main/java/org/xtimms/shirizu/utils/system/Throwable.kt similarity index 85% rename from app/src/main/java/org/xtimms/etsudoku/utils/system/Throwable.kt rename to app/src/main/java/org/xtimms/shirizu/utils/system/Throwable.kt index 5a93a36..61c5fef 100644 --- a/app/src/main/java/org/xtimms/etsudoku/utils/system/Throwable.kt +++ b/app/src/main/java/org/xtimms/shirizu/utils/system/Throwable.kt @@ -1,4 +1,4 @@ -package org.xtimms.etsudoku.utils.system +package org.xtimms.shirizu.utils.system import android.content.ActivityNotFoundException import android.content.res.Resources @@ -9,11 +9,11 @@ import org.koitharu.kotatsu.parsers.exception.AuthRequiredException import org.koitharu.kotatsu.parsers.exception.ContentUnavailableException import org.koitharu.kotatsu.parsers.exception.NotFoundException import org.koitharu.kotatsu.parsers.exception.ParseException -import org.xtimms.etsudoku.R -import org.xtimms.etsudoku.core.exceptions.CloudflareProtectedException -import org.xtimms.etsudoku.core.exceptions.SyncApiException -import org.xtimms.etsudoku.core.exceptions.TooManyRequestExceptions -import org.xtimms.etsudoku.utils.lang.ifNullOrEmpty +import org.xtimms.shirizu.R +import org.xtimms.shirizu.core.exceptions.CloudflareProtectedException +import org.xtimms.shirizu.core.exceptions.SyncApiException +import org.xtimms.shirizu.core.exceptions.TooManyRequestExceptions +import org.xtimms.shirizu.utils.lang.ifNullOrEmpty import java.net.SocketTimeoutException import java.net.UnknownHostException diff --git a/app/src/main/java/org/xtimms/etsudoku/utils/system/Toast.kt b/app/src/main/java/org/xtimms/shirizu/utils/system/Toast.kt similarity index 83% rename from app/src/main/java/org/xtimms/etsudoku/utils/system/Toast.kt rename to app/src/main/java/org/xtimms/shirizu/utils/system/Toast.kt index 3e80b10..2421475 100644 --- a/app/src/main/java/org/xtimms/etsudoku/utils/system/Toast.kt +++ b/app/src/main/java/org/xtimms/shirizu/utils/system/Toast.kt @@ -1,11 +1,11 @@ -package org.xtimms.etsudoku.utils.system +package org.xtimms.shirizu.utils.system import android.content.Context import android.widget.Toast import androidx.annotation.StringRes import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.launch -import org.xtimms.etsudoku.utils.lang.processLifecycleScope +import org.xtimms.shirizu.utils.lang.processLifecycleScope fun Context.toast(message: String) { Toast.makeText(this, message, Toast.LENGTH_SHORT).show() diff --git a/app/src/main/java/org/xtimms/etsudoku/utils/system/Uri.kt b/app/src/main/java/org/xtimms/shirizu/utils/system/Uri.kt similarity index 95% rename from app/src/main/java/org/xtimms/etsudoku/utils/system/Uri.kt rename to app/src/main/java/org/xtimms/shirizu/utils/system/Uri.kt index f2f51af..6731011 100644 --- a/app/src/main/java/org/xtimms/etsudoku/utils/system/Uri.kt +++ b/app/src/main/java/org/xtimms/shirizu/utils/system/Uri.kt @@ -1,4 +1,4 @@ -package org.xtimms.etsudoku.utils.system +package org.xtimms.shirizu.utils.system import android.net.Uri import androidx.core.net.toFile diff --git a/app/src/main/java/org/xtimms/etsudoku/work/PeriodicWorkScheduler.kt b/app/src/main/java/org/xtimms/shirizu/work/PeriodicWorkScheduler.kt similarity index 79% rename from app/src/main/java/org/xtimms/etsudoku/work/PeriodicWorkScheduler.kt rename to app/src/main/java/org/xtimms/shirizu/work/PeriodicWorkScheduler.kt index 73f5083..0584ca3 100644 --- a/app/src/main/java/org/xtimms/etsudoku/work/PeriodicWorkScheduler.kt +++ b/app/src/main/java/org/xtimms/shirizu/work/PeriodicWorkScheduler.kt @@ -1,4 +1,4 @@ -package org.xtimms.etsudoku.work +package org.xtimms.shirizu.work interface PeriodicWorkScheduler { diff --git a/app/src/main/java/org/xtimms/etsudoku/work/WorkScheduleManager.kt b/app/src/main/java/org/xtimms/shirizu/work/WorkScheduleManager.kt similarity index 84% rename from app/src/main/java/org/xtimms/etsudoku/work/WorkScheduleManager.kt rename to app/src/main/java/org/xtimms/shirizu/work/WorkScheduleManager.kt index ace6de1..5c6e4f5 100644 --- a/app/src/main/java/org/xtimms/etsudoku/work/WorkScheduleManager.kt +++ b/app/src/main/java/org/xtimms/shirizu/work/WorkScheduleManager.kt @@ -1,10 +1,10 @@ -package org.xtimms.etsudoku.work +package org.xtimms.shirizu.work import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.launch -import org.xtimms.etsudoku.utils.lang.processLifecycleScope -import org.xtimms.etsudoku.work.suggestions.SuggestionsWorker -import org.xtimms.etsudoku.work.tracker.TrackWorker +import org.xtimms.shirizu.utils.lang.processLifecycleScope +import org.xtimms.shirizu.work.suggestions.SuggestionsWorker +import org.xtimms.shirizu.work.tracker.TrackWorker import javax.inject.Inject import javax.inject.Singleton diff --git a/app/src/main/java/org/xtimms/etsudoku/work/suggestions/SuggestionsWorker.kt b/app/src/main/java/org/xtimms/shirizu/work/suggestions/SuggestionsWorker.kt similarity index 93% rename from app/src/main/java/org/xtimms/etsudoku/work/suggestions/SuggestionsWorker.kt rename to app/src/main/java/org/xtimms/shirizu/work/suggestions/SuggestionsWorker.kt index 21a7935..5c367a6 100644 --- a/app/src/main/java/org/xtimms/etsudoku/work/suggestions/SuggestionsWorker.kt +++ b/app/src/main/java/org/xtimms/shirizu/work/suggestions/SuggestionsWorker.kt @@ -1,4 +1,4 @@ -package org.xtimms.etsudoku.work.suggestions +package org.xtimms.shirizu.work.suggestions import android.annotation.SuppressLint import android.content.Context @@ -47,24 +47,24 @@ import org.koitharu.kotatsu.parsers.model.MangaTag import org.koitharu.kotatsu.parsers.model.SortOrder import org.koitharu.kotatsu.parsers.util.almostEquals import org.koitharu.kotatsu.parsers.util.runCatchingCancellable -import org.xtimms.etsudoku.R -import org.xtimms.etsudoku.core.model.MangaSuggestion -import org.xtimms.etsudoku.core.model.TagsBlacklist -import org.xtimms.etsudoku.core.model.distinctById -import org.xtimms.etsudoku.core.parser.MangaRepository -import org.xtimms.etsudoku.data.repository.FavouritesRepository -import org.xtimms.etsudoku.data.repository.HistoryRepository -import org.xtimms.etsudoku.data.repository.MangaSourcesRepository -import org.xtimms.etsudoku.data.repository.SuggestionRepository -import org.xtimms.etsudoku.utils.lang.asArrayList -import org.xtimms.etsudoku.utils.lang.awaitUniqueWorkInfoByName -import org.xtimms.etsudoku.utils.lang.flatten -import org.xtimms.etsudoku.utils.lang.sanitize -import org.xtimms.etsudoku.utils.lang.takeMostFrequent -import org.xtimms.etsudoku.utils.lang.toBitmapOrNull -import org.xtimms.etsudoku.utils.system.checkNotificationPermission -import org.xtimms.etsudoku.utils.system.trySetForeground -import org.xtimms.etsudoku.work.PeriodicWorkScheduler +import org.xtimms.shirizu.R +import org.xtimms.shirizu.core.model.MangaSuggestion +import org.xtimms.shirizu.core.model.TagsBlacklist +import org.xtimms.shirizu.core.model.distinctById +import org.xtimms.shirizu.core.parser.MangaRepository +import org.xtimms.shirizu.data.repository.FavouritesRepository +import org.xtimms.shirizu.data.repository.HistoryRepository +import org.xtimms.shirizu.data.repository.MangaSourcesRepository +import org.xtimms.shirizu.data.repository.SuggestionRepository +import org.xtimms.shirizu.utils.lang.asArrayList +import org.xtimms.shirizu.utils.lang.awaitUniqueWorkInfoByName +import org.xtimms.shirizu.utils.lang.flatten +import org.xtimms.shirizu.utils.lang.sanitize +import org.xtimms.shirizu.utils.lang.takeMostFrequent +import org.xtimms.shirizu.utils.lang.toBitmapOrNull +import org.xtimms.shirizu.utils.system.checkNotificationPermission +import org.xtimms.shirizu.utils.system.trySetForeground +import org.xtimms.shirizu.work.PeriodicWorkScheduler import java.util.concurrent.TimeUnit import javax.inject.Inject import kotlin.math.pow diff --git a/app/src/main/java/org/xtimms/etsudoku/work/tracker/TrackWorker.kt b/app/src/main/java/org/xtimms/shirizu/work/tracker/TrackWorker.kt similarity index 94% rename from app/src/main/java/org/xtimms/etsudoku/work/tracker/TrackWorker.kt rename to app/src/main/java/org/xtimms/shirizu/work/tracker/TrackWorker.kt index b626976..59dbc97 100644 --- a/app/src/main/java/org/xtimms/etsudoku/work/tracker/TrackWorker.kt +++ b/app/src/main/java/org/xtimms/shirizu/work/tracker/TrackWorker.kt @@ -1,4 +1,4 @@ -package org.xtimms.etsudoku.work.tracker +package org.xtimms.shirizu.work.tracker import android.content.Context import android.content.pm.ServiceInfo @@ -46,19 +46,19 @@ import org.koitharu.kotatsu.parsers.model.Manga import org.koitharu.kotatsu.parsers.model.MangaChapter import org.koitharu.kotatsu.parsers.util.mapToSet import org.koitharu.kotatsu.parsers.util.runCatchingCancellable -import org.xtimms.etsudoku.R -import org.xtimms.etsudoku.core.exceptions.CloudflareProtectedException -import org.xtimms.etsudoku.core.logs.FileLogger -import org.xtimms.etsudoku.core.logs.TrackerLogger -import org.xtimms.etsudoku.core.prefs.AppSettings -import org.xtimms.etsudoku.core.tracker.Tracker -import org.xtimms.etsudoku.core.tracker.model.MangaUpdates -import org.xtimms.etsudoku.utils.lang.awaitUniqueWorkInfoByName -import org.xtimms.etsudoku.utils.lang.onEachIndexed -import org.xtimms.etsudoku.utils.lang.toBitmapOrNull -import org.xtimms.etsudoku.utils.system.checkNotificationPermission -import org.xtimms.etsudoku.utils.system.trySetForeground -import org.xtimms.etsudoku.work.PeriodicWorkScheduler +import org.xtimms.shirizu.R +import org.xtimms.shirizu.core.exceptions.CloudflareProtectedException +import org.xtimms.shirizu.core.logs.FileLogger +import org.xtimms.shirizu.core.logs.TrackerLogger +import org.xtimms.shirizu.core.prefs.AppSettings +import org.xtimms.shirizu.core.tracker.Tracker +import org.xtimms.shirizu.core.tracker.model.MangaUpdates +import org.xtimms.shirizu.utils.lang.awaitUniqueWorkInfoByName +import org.xtimms.shirizu.utils.lang.onEachIndexed +import org.xtimms.shirizu.utils.lang.toBitmapOrNull +import org.xtimms.shirizu.utils.system.checkNotificationPermission +import org.xtimms.shirizu.utils.system.trySetForeground +import org.xtimms.shirizu.work.PeriodicWorkScheduler import java.util.concurrent.TimeUnit import javax.inject.Inject @@ -211,7 +211,7 @@ class TrackWorker @AssistedInject constructor( .build(), ).toBitmapOrNull(), ) - setSmallIcon(R.drawable.ic_stat_etsudoku) + setSmallIcon(R.drawable.ic_stat_shirizu) val style = NotificationCompat.InboxStyle(this) for (chapter in newChapters) { style.addLine(chapter.name) diff --git a/app/src/main/java/org/xtimms/etsudoku/work/tracker/TrackerNotificationChannels.kt b/app/src/main/java/org/xtimms/shirizu/work/tracker/TrackerNotificationChannels.kt similarity index 96% rename from app/src/main/java/org/xtimms/etsudoku/work/tracker/TrackerNotificationChannels.kt rename to app/src/main/java/org/xtimms/shirizu/work/tracker/TrackerNotificationChannels.kt index 218b2d8..15d8910 100644 --- a/app/src/main/java/org/xtimms/etsudoku/work/tracker/TrackerNotificationChannels.kt +++ b/app/src/main/java/org/xtimms/shirizu/work/tracker/TrackerNotificationChannels.kt @@ -1,4 +1,4 @@ -package org.xtimms.etsudoku.work.tracker +package org.xtimms.shirizu.work.tracker import android.app.NotificationManager import android.content.Context @@ -6,8 +6,8 @@ import androidx.core.app.NotificationChannelCompat import androidx.core.app.NotificationChannelGroupCompat import androidx.core.app.NotificationManagerCompat import dagger.hilt.android.qualifiers.ApplicationContext -import org.xtimms.etsudoku.R -import org.xtimms.etsudoku.core.model.FavouriteCategory +import org.xtimms.shirizu.R +import org.xtimms.shirizu.core.model.FavouriteCategory import javax.inject.Inject class TrackerNotificationChannels @Inject constructor( diff --git a/app/src/main/java/org/xtimms/shirizu/work/tracker/TrackingItem.kt b/app/src/main/java/org/xtimms/shirizu/work/tracker/TrackingItem.kt new file mode 100644 index 0000000..edffdbe --- /dev/null +++ b/app/src/main/java/org/xtimms/shirizu/work/tracker/TrackingItem.kt @@ -0,0 +1,8 @@ +package org.xtimms.shirizu.work.tracker + +import org.xtimms.shirizu.core.tracker.model.MangaTracking + +data class TrackingItem( + val tracking: MangaTracking, + val channelId: String?, +) \ No newline at end of file diff --git a/app/src/main/res/drawable-hdpi/ic_stat_etsudoku.png b/app/src/main/res/drawable-hdpi/ic_stat_shirizu.png similarity index 100% rename from app/src/main/res/drawable-hdpi/ic_stat_etsudoku.png rename to app/src/main/res/drawable-hdpi/ic_stat_shirizu.png diff --git a/app/src/main/res/drawable-mdpi/ic_stat_etsudoku.png b/app/src/main/res/drawable-mdpi/ic_stat_shirizu.png similarity index 100% rename from app/src/main/res/drawable-mdpi/ic_stat_etsudoku.png rename to app/src/main/res/drawable-mdpi/ic_stat_shirizu.png diff --git a/app/src/main/res/drawable-night-v31/splash_branding_image.xml b/app/src/main/res/drawable-night-v31/splash_branding_image.xml new file mode 100644 index 0000000..8538892 --- /dev/null +++ b/app/src/main/res/drawable-night-v31/splash_branding_image.xml @@ -0,0 +1,12 @@ + + + diff --git a/app/src/main/res/drawable-night-v31/splash_icon.xml b/app/src/main/res/drawable-night-v31/splash_icon.xml new file mode 100644 index 0000000..b3ceb18 --- /dev/null +++ b/app/src/main/res/drawable-night-v31/splash_icon.xml @@ -0,0 +1,38 @@ + + + + + + + + + + + + + + + diff --git a/app/src/main/res/drawable-night/splash_icon.xml b/app/src/main/res/drawable-night/splash_icon.xml new file mode 100644 index 0000000..0b7e041 --- /dev/null +++ b/app/src/main/res/drawable-night/splash_icon.xml @@ -0,0 +1,13 @@ + + + diff --git a/app/src/main/res/drawable-nodpi/ookami.webp b/app/src/main/res/drawable-nodpi/ookami.webp deleted file mode 100644 index 60d40e2..0000000 Binary files a/app/src/main/res/drawable-nodpi/ookami.webp and /dev/null differ diff --git a/app/src/main/res/drawable-v31/splash_branding_image.xml b/app/src/main/res/drawable-v31/splash_branding_image.xml new file mode 100644 index 0000000..df470f3 --- /dev/null +++ b/app/src/main/res/drawable-v31/splash_branding_image.xml @@ -0,0 +1,12 @@ + + + diff --git a/app/src/main/res/drawable-v31/splash_icon.xml b/app/src/main/res/drawable-v31/splash_icon.xml new file mode 100644 index 0000000..915aff3 --- /dev/null +++ b/app/src/main/res/drawable-v31/splash_icon.xml @@ -0,0 +1,38 @@ + + + + + + + + + + + + + + + diff --git a/app/src/main/res/drawable-xhdpi/ic_stat_etsudoku.png b/app/src/main/res/drawable-xhdpi/ic_stat_shirizu.png similarity index 100% rename from app/src/main/res/drawable-xhdpi/ic_stat_etsudoku.png rename to app/src/main/res/drawable-xhdpi/ic_stat_shirizu.png diff --git a/app/src/main/res/drawable-xxhdpi/ic_stat_etsudoku.png b/app/src/main/res/drawable-xxhdpi/ic_stat_shirizu.png similarity index 100% rename from app/src/main/res/drawable-xxhdpi/ic_stat_etsudoku.png rename to app/src/main/res/drawable-xxhdpi/ic_stat_shirizu.png diff --git a/app/src/main/res/drawable-xxxhdpi/ic_stat_etsudoku.png b/app/src/main/res/drawable-xxxhdpi/ic_stat_shirizu.png similarity index 100% rename from app/src/main/res/drawable-xxxhdpi/ic_stat_etsudoku.png rename to app/src/main/res/drawable-xxxhdpi/ic_stat_shirizu.png diff --git a/app/src/main/res/drawable/splash_icon.xml b/app/src/main/res/drawable/splash_icon.xml new file mode 100644 index 0000000..61dbdd3 --- /dev/null +++ b/app/src/main/res/drawable/splash_icon.xml @@ -0,0 +1,13 @@ + + + diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher.png b/app/src/main/res/mipmap-hdpi/ic_launcher.png index 6e2a2b8..2105a80 100644 Binary files a/app/src/main/res/mipmap-hdpi/ic_launcher.png and b/app/src/main/res/mipmap-hdpi/ic_launcher.png differ diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_background.png b/app/src/main/res/mipmap-hdpi/ic_launcher_background.png index 0e24e2c..1966948 100644 Binary files a/app/src/main/res/mipmap-hdpi/ic_launcher_background.png and b/app/src/main/res/mipmap-hdpi/ic_launcher_background.png differ diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.png b/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.png index 5da522d..633148c 100644 Binary files a/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.png and b/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.png differ diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_monochrome.png b/app/src/main/res/mipmap-hdpi/ic_launcher_monochrome.png index 80e38e2..633148c 100644 Binary files a/app/src/main/res/mipmap-hdpi/ic_launcher_monochrome.png and b/app/src/main/res/mipmap-hdpi/ic_launcher_monochrome.png differ diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher.png b/app/src/main/res/mipmap-mdpi/ic_launcher.png index 736f1f8..1da9cd3 100644 Binary files a/app/src/main/res/mipmap-mdpi/ic_launcher.png and b/app/src/main/res/mipmap-mdpi/ic_launcher.png differ diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher_background.png b/app/src/main/res/mipmap-mdpi/ic_launcher_background.png index e3be312..75025cf 100644 Binary files a/app/src/main/res/mipmap-mdpi/ic_launcher_background.png and b/app/src/main/res/mipmap-mdpi/ic_launcher_background.png differ diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.png b/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.png index 40982c6..1e769fb 100644 Binary files a/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.png and b/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.png differ diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher_monochrome.png b/app/src/main/res/mipmap-mdpi/ic_launcher_monochrome.png index c8aa409..1e769fb 100644 Binary files a/app/src/main/res/mipmap-mdpi/ic_launcher_monochrome.png and b/app/src/main/res/mipmap-mdpi/ic_launcher_monochrome.png differ diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher.png b/app/src/main/res/mipmap-xhdpi/ic_launcher.png index 669ec92..ecd30f3 100644 Binary files a/app/src/main/res/mipmap-xhdpi/ic_launcher.png and b/app/src/main/res/mipmap-xhdpi/ic_launcher.png differ diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher_background.png b/app/src/main/res/mipmap-xhdpi/ic_launcher_background.png index c28aacf..9784f16 100644 Binary files a/app/src/main/res/mipmap-xhdpi/ic_launcher_background.png and b/app/src/main/res/mipmap-xhdpi/ic_launcher_background.png differ diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png b/app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png index 6ba4097..4c4449d 100644 Binary files a/app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png and b/app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png differ diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher_monochrome.png b/app/src/main/res/mipmap-xhdpi/ic_launcher_monochrome.png index 0915b5d..4c4449d 100644 Binary files a/app/src/main/res/mipmap-xhdpi/ic_launcher_monochrome.png and b/app/src/main/res/mipmap-xhdpi/ic_launcher_monochrome.png differ diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher.png b/app/src/main/res/mipmap-xxhdpi/ic_launcher.png index 45b13bd..5bd7b3e 100644 Binary files a/app/src/main/res/mipmap-xxhdpi/ic_launcher.png and b/app/src/main/res/mipmap-xxhdpi/ic_launcher.png differ diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher_background.png b/app/src/main/res/mipmap-xxhdpi/ic_launcher_background.png index 964f314..04ef206 100644 Binary files a/app/src/main/res/mipmap-xxhdpi/ic_launcher_background.png and b/app/src/main/res/mipmap-xxhdpi/ic_launcher_background.png differ diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png b/app/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png index 3741e3c..b2f9e0a 100644 Binary files a/app/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png and b/app/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png differ diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher_monochrome.png b/app/src/main/res/mipmap-xxhdpi/ic_launcher_monochrome.png index 94a7e55..b2f9e0a 100644 Binary files a/app/src/main/res/mipmap-xxhdpi/ic_launcher_monochrome.png and b/app/src/main/res/mipmap-xxhdpi/ic_launcher_monochrome.png differ diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png index f53886c..a44637b 100644 Binary files a/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png and b/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png differ diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_background.png b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_background.png index 5967d81..66a5487 100644 Binary files a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_background.png and b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_background.png differ diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.png b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.png index 2ad258e..496078b 100644 Binary files a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.png and b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.png differ diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_monochrome.png b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_monochrome.png index 7e1bbce..496078b 100644 Binary files a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_monochrome.png and b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_monochrome.png differ diff --git a/app/src/main/res/values-night/splash_theme.xml b/app/src/main/res/values-night/splash_theme.xml new file mode 100644 index 0000000..52e8d48 --- /dev/null +++ b/app/src/main/res/values-night/splash_theme.xml @@ -0,0 +1,11 @@ + + + + + \ No newline at end of file diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml index 7ecc335..4b6ef53 100644 --- a/app/src/main/res/values-ru/strings.xml +++ b/app/src/main/res/values-ru/strings.xml @@ -57,7 +57,7 @@ Создать файл резервной копии Резервная копия сохранена Поддержка бэкапов Kotatsu - Etsudoku также может обрабатывать резервные копии Kotatsu + Shirizu также может обрабатывать резервные копии Kotatsu Лицензии с открытым исходным кодом Нет источников манги Включите источники манги, чтобы читать мангу онлайн diff --git a/app/src/main/res/values-v31/themes.xml b/app/src/main/res/values-v31/themes.xml index 65aabeb..da2b30b 100644 --- a/app/src/main/res/values-v31/themes.xml +++ b/app/src/main/res/values-v31/themes.xml @@ -1,10 +1,4 @@ - + + \ No newline at end of file diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 86f899d..9c0fcca 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -1,5 +1,5 @@ - Etsudoku + Shirizu Settings Feed Search @@ -167,7 +167,7 @@ Create backup file Backup saved Supports Kotatsu backups - Etsudoku can handle Kotatsu backups as well + Shirizu can handle Kotatsu backups as well Open source licenses No manga sources Enable manga sources to read manga online diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml index 14aa48a..da2b30b 100644 --- a/app/src/main/res/values/themes.xml +++ b/app/src/main/res/values/themes.xml @@ -1,10 +1,4 @@ - +