null2264/yokai
1
0
Fork 0
mirror of https://github.com/null2264/yokai.git synced 2025-06-21 10:44:42 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

chore: Some more effort moving widget to its own module

Browse source
This commit is contained in:
Ahmad Ansori Palembani 2024-06-17 13:21:27 +07:00
parent 79b5494307
commit 4a9a7813e0
Signed by: null2264
GPG key ID: BA64F8B60AF3EFB6
34 changed files with 205 additions and 64 deletions
Download patch file Download diff file Expand all files Collapse all files

2
app/build.gradle.kts
View file

@ -155,7 +155,9 @@ android {
dependencies {
implementation(projects.core)
implementation(projects.data)
implementation(projects.i18n)
implementation(projects.presentation.core)
implementation(projects.sourceApi)
// Compose

27
app/src/main/java/eu/kanade/tachiyomi/data/database/DatabaseAdapter.kt
View file

@ -1,27 +0,0 @@
package eu.kanade.tachiyomi.data.database
import eu.kanade.tachiyomi.source.model.UpdateStrategy
import java.util.Date
// TODO: Move to dev.yokai.data.DatabaseAdapter
val updateStrategyAdapter = object : ColumnAdapter<UpdateStrategy, Int> {
private val enumValues by lazy { UpdateStrategy.entries }
override fun decode(databaseValue: Int): UpdateStrategy =
enumValues.getOrElse(databaseValue) { UpdateStrategy.ALWAYS_UPDATE }
override fun encode(value: UpdateStrategy): Int = value.ordinal
}
interface ColumnAdapter<T : Any, S> {
/**
* @return [databaseValue] decoded as type [T].
*/
fun decode(databaseValue: S): T
/**
* @return [value] encoded as database type [S].
*/
fun encode(value: T): S
}

12
app/src/main/java/eu/kanade/tachiyomi/ui/main/MainActivity.kt
View file

@ -141,6 +141,7 @@ import kotlinx.coroutines.withContext
import uy.kohesive.injekt.injectLazy
import yokai.core.migration.Migrator
import yokai.domain.base.BasePreferences
import yokai.presentation.core.Constants
import yokai.presentation.extension.repo.ExtensionRepoController
import yokai.presentation.onboarding.OnboardingController
import kotlin.collections.set
@ -1596,17 +1597,20 @@ open class MainActivity : BaseActivity<MainActivityBinding>() {
private const val SWIPE_THRESHOLD = 100
private const val SWIPE_VELOCITY_THRESHOLD = 100
const val MAIN_ACTIVITY = "eu.kanade.tachiyomi.ui.main.MainActivity"
const val MAIN_ACTIVITY = Constants.MAIN_ACTIVITY
// Shortcut actions
const val SHORTCUT_LIBRARY = "eu.kanade.tachiyomi.SHOW_LIBRARY"
const val SHORTCUT_RECENTS = "eu.kanade.tachiyomi.SHOW_RECENTS"
@Deprecated
val SHORTCUT_RECENTS = Constants.SHORTCUT_RECENTS
const val SHORTCUT_RECENTLY_UPDATED = "eu.kanade.tachiyomi.SHOW_RECENTLY_UPDATED"
const val SHORTCUT_RECENTLY_READ = "eu.kanade.tachiyomi.SHOW_RECENTLY_READ"
const val SHORTCUT_BROWSE = "eu.kanade.tachiyomi.SHOW_BROWSE"
const val SHORTCUT_DOWNLOADS = "eu.kanade.tachiyomi.SHOW_DOWNLOADS"
const val SHORTCUT_MANGA = "eu.kanade.tachiyomi.SHOW_MANGA"
const val SHORTCUT_MANGA_BACK = "eu.kanade.tachiyomi.SHOW_MANGA_BACK"
@Deprecated
const val SHORTCUT_MANGA = Constants.SHORTCUT_MANGA
@Deprecated
const val SHORTCUT_MANGA_BACK = Constants.SHORTCUT_MANGA_BACK
const val SHORTCUT_UPDATE_NOTES = "eu.kanade.tachiyomi.SHOW_UPDATE_NOTES"
const val SHORTCUT_SOURCE = "eu.kanade.tachiyomi.SHOW_SOURCE"
const val SHORTCUT_READER_SETTINGS = "eu.kanade.tachiyomi.READER_SETTINGS"

12
app/src/main/java/eu/kanade/tachiyomi/ui/main/SearchActivity.kt
View file

@ -30,6 +30,7 @@ import uy.kohesive.injekt.Injekt
import uy.kohesive.injekt.api.get
import uy.kohesive.injekt.injectLazy
import yokai.domain.chapter.interactor.GetChapters
import yokai.presentation.core.util.IntentCommon
class SearchActivity : MainActivity() {
private val getChapters: GetChapters by injectLazy()
@ -199,15 +200,8 @@ class SearchActivity : MainActivity() {
}
companion object {
fun openMangaIntent(context: Context, id: Long?, canReturnToMain: Boolean = false) = Intent(
context,
SearchActivity::class
.java,
)
.apply {
action = if (canReturnToMain) SHORTCUT_MANGA_BACK else SHORTCUT_MANGA
putExtra(MangaDetailsController.MANGA_EXTRA, id)
}
fun openMangaIntent(context: Context, id: Long?, canReturnToMain: Boolean = false) =
IntentCommon.openManga(context, id, canReturnToMain)
fun openReaderSettings(context: Context) = Intent(
context,

4
app/src/main/java/eu/kanade/tachiyomi/ui/manga/MangaDetailsController.kt
View file

@ -133,6 +133,7 @@ import kotlinx.coroutines.runBlocking
import kotlinx.coroutines.withTimeoutOrNull
import uy.kohesive.injekt.Injekt
import uy.kohesive.injekt.api.get
import yokai.presentation.core.Constants
import java.io.File
import java.io.IOException
import java.util.*
@ -1843,7 +1844,8 @@ class MangaDetailsController :
const val SMART_SEARCH_CONFIG_EXTRA = "smartSearchConfig"
const val FROM_CATALOGUE_EXTRA = "from_catalogue"
const val MANGA_EXTRA = "manga"
@Deprecated
const val MANGA_EXTRA = Constants.MANGA_EXTRA
private enum class RangeMode {
Download,

4
app/src/main/res/values/colors.xml
View file

@ -23,8 +23,6 @@
<color name="tachiyomi_inverseSurface">#303033</color>
<color name="tachiyomi_primaryInverse">#AEC6FF</color>
<color name="cover_placeholder">#1F888888</color>
<!-- Application Colors -->
<color name="primaryVariantTachiyomi">#E5ECF4</color>
<color name="colorPrimaryInactive">#C2424242</color>
@ -192,4 +190,4 @@
<color name="tabBarIconColorDoki">@color/secondaryDoki</color>
<color name="rippleColorDoki">#1FEABD62</color>
<color name="backgroundDoki">#040716</color>
</resources>
</resources>