diff --git a/.editorconfig b/.editorconfig
index e39c63dcd..999845632 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -5,11 +5,11 @@ charset = utf-8
end_of_line = lf
indent_size = 4
indent_style = tab
-insert_final_newline = false
+insert_final_newline = true
max_line_length = 120
tab_width = 4
# noinspection EditorConfigKeyCorrectness
-disabled_rules=no-wildcard-imports,no-unused-imports
+disabled_rules = no-wildcard-imports, no-unused-imports
[{*.ant,*.fxml,*.jhm,*.jnlp,*.jrxml,*.rng,*.tld,*.wsdl,*.xml,*.xsd,*.xsl,*.xslt,*.xul}]
ij_continuation_indent_size = 4
diff --git a/.idea/inspectionProfiles/Project_Default.xml b/.idea/inspectionProfiles/Project_Default.xml
index 2bcd23609..38963f65d 100644
--- a/.idea/inspectionProfiles/Project_Default.xml
+++ b/.idea/inspectionProfiles/Project_Default.xml
@@ -3,6 +3,9 @@
+
+
+
diff --git a/README.md b/README.md
index 82e4fada7..a97f2a74c 100644
--- a/README.md
+++ b/README.md
@@ -21,11 +21,12 @@ Download APK directly from GitHub:
* Reading history and bookmarks
* Favourites organized by user-defined categories
* Downloading manga and reading it offline. Third-party CBZ archives also supported
-* Tablet-optimized material design UI
+* Tablet-optimized Material You UI
* Standard and Webtoon-optimized reader
* Notifications about new chapters with updates feed
* Shikimori integration (manga tracking)
* Password/fingerprint protect access to the app
+* History and favourites synchronization across devices (coming soon)
### Screenshots
diff --git a/app/build.gradle b/app/build.gradle
index 117ab9138..61a46bf01 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -3,6 +3,7 @@ plugins {
id 'kotlin-android'
id 'kotlin-kapt'
id 'kotlin-parcelize'
+ id 'dagger.hilt.android.plugin'
}
android {
@@ -28,6 +29,10 @@ android {
// define this values in your local.properties file
buildConfigField 'String', 'SHIKIMORI_CLIENT_ID', "\"${localProperty('shikimori.clientId')}\""
buildConfigField 'String', 'SHIKIMORI_CLIENT_SECRET', "\"${localProperty('shikimori.clientSecret')}\""
+
+ if (currentBranch().startsWith("feature/nextgen")) {
+ applicationIdSuffix = '.next'
+ }
}
buildTypes {
debug {
@@ -114,8 +119,13 @@ dependencies {
implementation 'com.hannesdorfmann:adapterdelegates4-kotlin-dsl:4.3.2'
implementation 'com.hannesdorfmann:adapterdelegates4-kotlin-dsl-viewbinding:4.3.2'
- implementation 'io.insert-koin:koin-android:3.2.0'
+ implementation "com.google.dagger:hilt-android:2.42"
+ kapt "com.google.dagger:hilt-compiler:2.42"
+ implementation 'androidx.hilt:hilt-work:1.0.0'
+ kapt 'androidx.hilt:hilt-compiler:1.0.0'
+
implementation 'io.coil-kt:coil-base:2.1.0'
+ implementation 'io.coil-kt:coil-svg:2.1.0'
implementation 'com.davemorrissey.labs:subsampling-scale-image-view-androidx:3.10.0'
implementation 'com.github.solkin:disk-lru-cache:1.4'
@@ -134,9 +144,10 @@ dependencies {
androidTestImplementation 'androidx.test.ext:junit-ktx:1.1.3'
androidTestImplementation 'org.jetbrains.kotlinx:kotlinx-coroutines-test:1.6.4'
- androidTestImplementation 'io.insert-koin:koin-test:3.2.0'
- androidTestImplementation 'io.insert-koin:koin-test-junit4:3.2.0'
androidTestImplementation 'androidx.room:room-testing:2.4.3'
androidTestImplementation 'com.squareup.moshi:moshi-kotlin:1.13.0'
-}
\ No newline at end of file
+
+ androidTestImplementation 'com.google.dagger:hilt-android-testing:2.42'
+ kaptAndroidTest 'com.google.dagger:hilt-android-compiler:2.42'
+}
diff --git a/app/sampledata/covers/Forget-me-not Volume 1.jpg b/app/sampledata/covers/Forget-me-not Volume 1.jpg
new file mode 100644
index 000000000..f5bbc36e5
Binary files /dev/null and b/app/sampledata/covers/Forget-me-not Volume 1.jpg differ
diff --git a/app/sampledata/covers/Forget-me-not Volume 2.jpg b/app/sampledata/covers/Forget-me-not Volume 2.jpg
new file mode 100644
index 000000000..fea5eaaba
Binary files /dev/null and b/app/sampledata/covers/Forget-me-not Volume 2.jpg differ
diff --git a/app/sampledata/covers/La Pomme Prisoinniere.jpg b/app/sampledata/covers/La Pomme Prisoinniere.jpg
new file mode 100644
index 000000000..f82af29a7
Binary files /dev/null and b/app/sampledata/covers/La Pomme Prisoinniere.jpg differ
diff --git a/app/sampledata/covers/Momo Kanchou no Himitsu Kichi.jpg b/app/sampledata/covers/Momo Kanchou no Himitsu Kichi.jpg
new file mode 100644
index 000000000..6a5207cf7
Binary files /dev/null and b/app/sampledata/covers/Momo Kanchou no Himitsu Kichi.jpg differ
diff --git a/app/sampledata/covers/Omoide Emanon.jpg b/app/sampledata/covers/Omoide Emanon.jpg
new file mode 100644
index 000000000..b078f670a
Binary files /dev/null and b/app/sampledata/covers/Omoide Emanon.jpg differ
diff --git a/app/sampledata/covers/Sasurai Emanon Volume 1.jpg b/app/sampledata/covers/Sasurai Emanon Volume 1.jpg
new file mode 100644
index 000000000..4a185e835
Binary files /dev/null and b/app/sampledata/covers/Sasurai Emanon Volume 1.jpg differ
diff --git a/app/sampledata/covers/Sasurai Emanon Volume 2.jpg b/app/sampledata/covers/Sasurai Emanon Volume 2.jpg
new file mode 100644
index 000000000..f7f745f23
Binary files /dev/null and b/app/sampledata/covers/Sasurai Emanon Volume 2.jpg differ
diff --git a/app/sampledata/covers/Sasurai Emanon Volume 3.jpg b/app/sampledata/covers/Sasurai Emanon Volume 3.jpg
new file mode 100644
index 000000000..714538ff8
Binary files /dev/null and b/app/sampledata/covers/Sasurai Emanon Volume 3.jpg differ
diff --git a/app/sampledata/covers/Wandering Island Volume 1.jpg b/app/sampledata/covers/Wandering Island Volume 1.jpg
new file mode 100644
index 000000000..2d6edccee
Binary files /dev/null and b/app/sampledata/covers/Wandering Island Volume 1.jpg differ
diff --git a/app/sampledata/covers/Wandering Island Volume 2.jpg b/app/sampledata/covers/Wandering Island Volume 2.jpg
new file mode 100644
index 000000000..52e1e5562
Binary files /dev/null and b/app/sampledata/covers/Wandering Island Volume 2.jpg differ
diff --git a/app/sampledata/genres b/app/sampledata/genres
new file mode 100644
index 000000000..017d3ee73
--- /dev/null
+++ b/app/sampledata/genres
@@ -0,0 +1,10 @@
+Slice of Life, Mystery
+Slice of Life, Mystery
+Psychological, Romance, Comedy, Slice of Life, Supernatural
+Sci-Fi, Comedy
+Reincarnation, Sci-Fi, Historical, Psychological, Drama, Slice of Life, Supernatural, Mystery
+Reincarnation, Sci-Fi, Historical, Psychological, Drama, Slice of Life, Supernatural, Mystery
+Reincarnation, Sci-Fi, Historical, Psychological, Drama, Slice of Life, Supernatural, Mystery
+Reincarnation, Sci-Fi, Historical, Psychological, Drama, Slice of Life, Supernatural, Mystery
+Adventure, Slice of Life, Mystery
+Adventure, Slice of Life, Mystery
diff --git a/app/sampledata/titles b/app/sampledata/titles
new file mode 100644
index 000000000..9bdeb7594
--- /dev/null
+++ b/app/sampledata/titles
@@ -0,0 +1,10 @@
+Forget-me-not Vol. 1
+Forget-me-not Vol. 2
+La Pomme Prisoinniere
+Momo Kanchou no Himitsu Kichi
+Omoide Emanon
+Sasurai Emanon Vol. 1
+Sasurai Emanon Vol. 2
+Sasurai Emanon Vol. 3
+Wandering Island Vol. 1
+Wandering Island Vol. 2
diff --git a/app/src/androidTest/assets/categories/simple.json b/app/src/androidTest/assets/categories/simple.json
index 90f6ecf1a..58a2ab058 100644
--- a/app/src/androidTest/assets/categories/simple.json
+++ b/app/src/androidTest/assets/categories/simple.json
@@ -4,5 +4,6 @@
"sortKey": 1,
"order": "NEWEST",
"createdAt": 1335906000000,
- "isTrackingEnabled": true
-}
\ No newline at end of file
+ "isTrackingEnabled": true,
+ "isVisibleInLibrary": true
+}
diff --git a/app/src/androidTest/assets/kotatsu_test.bak b/app/src/androidTest/assets/kotatsu_test.bak
new file mode 100755
index 000000000..a6eae4cdc
Binary files /dev/null and b/app/src/androidTest/assets/kotatsu_test.bak differ
diff --git a/app/src/androidTest/java/org/koitharu/kotatsu/Instrumentation.kt b/app/src/androidTest/java/org/koitharu/kotatsu/Instrumentation.kt
index b9ef582c1..dbf4ec642 100644
--- a/app/src/androidTest/java/org/koitharu/kotatsu/Instrumentation.kt
+++ b/app/src/androidTest/java/org/koitharu/kotatsu/Instrumentation.kt
@@ -6,4 +6,4 @@ import kotlin.coroutines.suspendCoroutine
suspend fun Instrumentation.awaitForIdle() = suspendCoroutine { cont ->
waitForIdle { cont.resume(Unit) }
-}
\ No newline at end of file
+}
diff --git a/app/src/androidTest/java/org/koitharu/kotatsu/core/db/MangaDatabaseTest.kt b/app/src/androidTest/java/org/koitharu/kotatsu/core/db/MangaDatabaseTest.kt
index 23c8b9796..b7e4a07f5 100644
--- a/app/src/androidTest/java/org/koitharu/kotatsu/core/db/MangaDatabaseTest.kt
+++ b/app/src/androidTest/java/org/koitharu/kotatsu/core/db/MangaDatabaseTest.kt
@@ -3,10 +3,10 @@ package org.koitharu.kotatsu.core.db
import androidx.room.testing.MigrationTestHelper
import androidx.test.ext.junit.runners.AndroidJUnit4
import androidx.test.platform.app.InstrumentationRegistry
+import org.junit.Assert.assertEquals
import org.junit.Rule
import org.junit.Test
import org.junit.runner.RunWith
-import kotlin.test.assertEquals
@RunWith(AndroidJUnit4::class)
class MangaDatabaseTest {
@@ -37,7 +37,7 @@ class MangaDatabaseTest {
TEST_DB,
migration.endVersion,
true,
- migration
+ migration,
).close()
}
}
diff --git a/app/src/androidTest/java/org/koitharu/kotatsu/core/os/ShortcutsUpdaterTest.kt b/app/src/androidTest/java/org/koitharu/kotatsu/core/os/ShortcutsUpdaterTest.kt
index ec4c04edc..4b1784bed 100644
--- a/app/src/androidTest/java/org/koitharu/kotatsu/core/os/ShortcutsUpdaterTest.kt
+++ b/app/src/androidTest/java/org/koitharu/kotatsu/core/os/ShortcutsUpdaterTest.kt
@@ -6,28 +6,40 @@ import android.os.Build
import androidx.core.content.getSystemService
import androidx.test.ext.junit.runners.AndroidJUnit4
import androidx.test.platform.app.InstrumentationRegistry
+import dagger.hilt.android.testing.HiltAndroidRule
+import dagger.hilt.android.testing.HiltAndroidTest
+import javax.inject.Inject
import kotlinx.coroutines.test.runTest
+import org.junit.Assert.assertEquals
+import org.junit.Assert.assertTrue
import org.junit.Before
+import org.junit.Rule
import org.junit.Test
import org.junit.runner.RunWith
-import org.koin.test.KoinTest
-import org.koin.test.inject
import org.koitharu.kotatsu.SampleData
import org.koitharu.kotatsu.awaitForIdle
import org.koitharu.kotatsu.core.db.MangaDatabase
import org.koitharu.kotatsu.history.domain.HistoryRepository
-import kotlin.test.assertEquals
-import kotlin.test.assertTrue
+@HiltAndroidTest
@RunWith(AndroidJUnit4::class)
-class ShortcutsUpdaterTest : KoinTest {
+class ShortcutsUpdaterTest {
- private val historyRepository by inject()
- private val shortcutsUpdater by inject()
- private val database by inject()
+ @get:Rule
+ var hiltRule = HiltAndroidRule(this)
+
+ @Inject
+ lateinit var historyRepository: HistoryRepository
+
+ @Inject
+ lateinit var shortcutsUpdater: ShortcutsUpdater
+
+ @Inject
+ lateinit var database: MangaDatabase
@Before
fun setUp() {
+ hiltRule.inject()
database.clearAllTables()
}
@@ -43,7 +55,7 @@ class ShortcutsUpdaterTest : KoinTest {
chapterId = SampleData.chapter.id,
page = 4,
scroll = 2,
- percent = 0.3f
+ percent = 0.3f,
)
awaitUpdate()
@@ -62,4 +74,4 @@ class ShortcutsUpdaterTest : KoinTest {
instrumentation.awaitForIdle()
shortcutsUpdater.await()
}
-}
\ No newline at end of file
+}
diff --git a/app/src/androidTest/java/org/koitharu/kotatsu/settings/backup/AppBackupAgentTest.kt b/app/src/androidTest/java/org/koitharu/kotatsu/settings/backup/AppBackupAgentTest.kt
index 1d0ca5498..f4448baa4 100644
--- a/app/src/androidTest/java/org/koitharu/kotatsu/settings/backup/AppBackupAgentTest.kt
+++ b/app/src/androidTest/java/org/koitharu/kotatsu/settings/backup/AppBackupAgentTest.kt
@@ -1,36 +1,53 @@
package org.koitharu.kotatsu.settings.backup
+import android.content.res.AssetManager
import androidx.test.ext.junit.runners.AndroidJUnit4
+import androidx.test.platform.app.InstrumentationRegistry
+import dagger.hilt.android.testing.HiltAndroidRule
+import dagger.hilt.android.testing.HiltAndroidTest
+import java.io.File
+import javax.inject.Inject
+import kotlinx.coroutines.flow.first
import kotlinx.coroutines.test.runTest
+import org.junit.Assert.*
import org.junit.Before
+import org.junit.Rule
import org.junit.Test
import org.junit.runner.RunWith
-import org.koin.test.KoinTest
-import org.koin.test.get
-import org.koin.test.inject
import org.koitharu.kotatsu.SampleData
import org.koitharu.kotatsu.core.backup.BackupRepository
import org.koitharu.kotatsu.core.db.MangaDatabase
import org.koitharu.kotatsu.core.db.entity.toMangaTags
import org.koitharu.kotatsu.favourites.domain.FavouritesRepository
import org.koitharu.kotatsu.history.domain.HistoryRepository
-import kotlin.test.*
+@HiltAndroidTest
@RunWith(AndroidJUnit4::class)
-class AppBackupAgentTest : KoinTest {
+class AppBackupAgentTest {
- private val historyRepository by inject()
- private val favouritesRepository by inject()
- private val backupRepository by inject()
- private val database by inject()
+ @get:Rule
+ var hiltRule = HiltAndroidRule(this)
+
+ @Inject
+ lateinit var historyRepository: HistoryRepository
+
+ @Inject
+ lateinit var favouritesRepository: FavouritesRepository
+
+ @Inject
+ lateinit var backupRepository: BackupRepository
+
+ @Inject
+ lateinit var database: MangaDatabase
@Before
fun setUp() {
+ hiltRule.inject()
database.clearAllTables()
}
@Test
- fun testBackupRestore() = runTest {
+ fun backupAndRestore() = runTest {
val category = favouritesRepository.createCategory(
title = SampleData.favouriteCategory.title,
sortOrder = SampleData.favouriteCategory.order,
@@ -47,7 +64,10 @@ class AppBackupAgentTest : KoinTest {
val history = checkNotNull(historyRepository.getOne(SampleData.manga))
val agent = AppBackupAgent()
- val backup = agent.createBackupFile(get(), backupRepository)
+ val backup = agent.createBackupFile(
+ context = InstrumentationRegistry.getInstrumentation().targetContext,
+ repository = backupRepository,
+ )
database.clearAllTables()
assertTrue(favouritesRepository.getAllManga().isEmpty())
@@ -59,9 +79,30 @@ class AppBackupAgentTest : KoinTest {
assertEquals(category, favouritesRepository.getCategory(category.id))
assertEquals(history, historyRepository.getOne(SampleData.manga))
- assertContentEquals(listOf(SampleData.manga), favouritesRepository.getManga(category.id))
+ assertEquals(listOf(SampleData.manga), favouritesRepository.getManga(category.id))
val allTags = database.tagsDao.findTags(SampleData.tag.source.name).toMangaTags()
- assertContains(allTags, SampleData.tag)
+ assertTrue(SampleData.tag in allTags)
+ }
+
+ @Test
+ fun restoreOldBackup() {
+ val agent = AppBackupAgent()
+ val backup = File.createTempFile("backup_", ".tmp")
+ InstrumentationRegistry.getInstrumentation().context.assets
+ .open("kotatsu_test.bak", AssetManager.ACCESS_STREAMING)
+ .use { input ->
+ backup.outputStream().use { output ->
+ input.copyTo(output)
+ }
+ }
+ backup.inputStream().use {
+ agent.restoreBackupFile(it.fd, backup.length(), backupRepository)
+ }
+ runTest {
+ assertEquals(6, historyRepository.observeAll().first().size)
+ assertEquals(2, favouritesRepository.observeCategories().first().size)
+ assertEquals(15, favouritesRepository.getAllManga().size)
+ }
}
-}
\ No newline at end of file
+}
diff --git a/app/src/androidTest/java/org/koitharu/kotatsu/tracker/domain/TrackerTest.kt b/app/src/androidTest/java/org/koitharu/kotatsu/tracker/domain/TrackerTest.kt
index a1ea460f6..37b5ebf02 100644
--- a/app/src/androidTest/java/org/koitharu/kotatsu/tracker/domain/TrackerTest.kt
+++ b/app/src/androidTest/java/org/koitharu/kotatsu/tracker/domain/TrackerTest.kt
@@ -1,24 +1,39 @@
package org.koitharu.kotatsu.tracker.domain
import androidx.test.ext.junit.runners.AndroidJUnit4
+import dagger.hilt.android.testing.HiltAndroidRule
+import dagger.hilt.android.testing.HiltAndroidTest
+import javax.inject.Inject
+import junit.framework.TestCase.*
import kotlinx.coroutines.test.runTest
+import org.junit.Before
+import org.junit.Rule
import org.junit.Test
import org.junit.runner.RunWith
-import org.koin.test.KoinTest
-import org.koin.test.inject
import org.koitharu.kotatsu.SampleData
import org.koitharu.kotatsu.base.domain.MangaDataRepository
import org.koitharu.kotatsu.parsers.model.Manga
-import kotlin.test.assertEquals
-import kotlin.test.assertFalse
-import kotlin.test.assertTrue
+@HiltAndroidTest
@RunWith(AndroidJUnit4::class)
-class TrackerTest : KoinTest {
+class TrackerTest {
- private val repository by inject()
- private val dataRepository by inject()
- private val tracker by inject()
+ @get:Rule
+ var hiltRule = HiltAndroidRule(this)
+
+ @Inject
+ lateinit var repository: TrackingRepository
+
+ @Inject
+ lateinit var dataRepository: MangaDataRepository
+
+ @Inject
+ lateinit var tracker: Tracker
+
+ @Before
+ fun setUp() {
+ hiltRule.inject()
+ }
@Test
fun noUpdates() = runTest {
@@ -180,4 +195,4 @@ class TrackerTest : KoinTest {
dataRepository.storeManga(manga)
return manga
}
-}
\ No newline at end of file
+}
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 22bad7dd9..e064f604c 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -10,6 +10,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -77,8 +98,8 @@
android:configChanges="orientation|screenSize|screenLayout|keyboardHidden"
android:windowSoftInputMode="adjustResize" />
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
\ No newline at end of file
+
diff --git a/app/src/main/java/org/koitharu/kotatsu/KotatsuApp.kt b/app/src/main/java/org/koitharu/kotatsu/KotatsuApp.kt
index 23b3df2c6..c5ebfae04 100644
--- a/app/src/main/java/org/koitharu/kotatsu/KotatsuApp.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/KotatsuApp.kt
@@ -3,78 +3,55 @@ package org.koitharu.kotatsu
import android.app.Application
import android.content.Context
import android.os.StrictMode
+import androidx.annotation.WorkerThread
import androidx.appcompat.app.AppCompatDelegate
import androidx.fragment.app.strictmode.FragmentStrictMode
+import androidx.hilt.work.HiltWorkerFactory
import androidx.room.InvalidationTracker
+import androidx.work.Configuration
+import dagger.hilt.android.HiltAndroidApp
+import javax.inject.Inject
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.launch
import org.acra.ReportField
import org.acra.config.dialog
import org.acra.config.mailSender
import org.acra.data.StringFormat
import org.acra.ktx.initAcra
-import org.koin.android.ext.android.get
-import org.koin.android.ext.android.getKoin
-import org.koin.android.ext.koin.androidContext
-import org.koin.core.context.startKoin
-import org.koitharu.kotatsu.bookmarks.bookmarksModule
import org.koitharu.kotatsu.core.db.MangaDatabase
-import org.koitharu.kotatsu.core.db.databaseModule
-import org.koitharu.kotatsu.core.github.githubModule
-import org.koitharu.kotatsu.core.network.networkModule
import org.koitharu.kotatsu.core.prefs.AppSettings
-import org.koitharu.kotatsu.core.ui.uiModule
-import org.koitharu.kotatsu.details.detailsModule
-import org.koitharu.kotatsu.favourites.favouritesModule
-import org.koitharu.kotatsu.history.historyModule
import org.koitharu.kotatsu.local.data.PagesCache
import org.koitharu.kotatsu.local.domain.LocalMangaRepository
-import org.koitharu.kotatsu.local.localModule
-import org.koitharu.kotatsu.main.mainModule
import org.koitharu.kotatsu.parsers.MangaLoaderContext
-import org.koitharu.kotatsu.reader.readerModule
-import org.koitharu.kotatsu.remotelist.remoteListModule
-import org.koitharu.kotatsu.scrobbling.shikimori.shikimoriModule
-import org.koitharu.kotatsu.search.searchModule
-import org.koitharu.kotatsu.settings.settingsModule
-import org.koitharu.kotatsu.suggestions.suggestionsModule
-import org.koitharu.kotatsu.tracker.trackerModule
-import org.koitharu.kotatsu.widget.appWidgetModule
+import org.koitharu.kotatsu.utils.ext.processLifecycleScope
-class KotatsuApp : Application() {
+@HiltAndroidApp
+class KotatsuApp : Application(), Configuration.Provider {
+
+ @Inject
+ lateinit var databaseObservers: Set<@JvmSuppressWildcards InvalidationTracker.Observer>
+
+ @Inject
+ lateinit var activityLifecycleCallbacks: Set<@JvmSuppressWildcards ActivityLifecycleCallbacks>
+
+ @Inject
+ lateinit var database: MangaDatabase
+
+ @Inject
+ lateinit var settings: AppSettings
+
+ @Inject
+ lateinit var workerFactory: HiltWorkerFactory
override fun onCreate() {
super.onCreate()
if (BuildConfig.DEBUG) {
enableStrictMode()
}
- initKoin()
- AppCompatDelegate.setDefaultNightMode(get().theme)
+ AppCompatDelegate.setDefaultNightMode(settings.theme)
setupActivityLifecycleCallbacks()
- setupDatabaseObservers()
- }
-
- private fun initKoin() {
- startKoin {
- androidContext(this@KotatsuApp)
- modules(
- networkModule,
- databaseModule,
- githubModule,
- uiModule,
- mainModule,
- searchModule,
- localModule,
- favouritesModule,
- historyModule,
- remoteListModule,
- detailsModule,
- trackerModule,
- settingsModule,
- readerModule,
- appWidgetModule,
- suggestionsModule,
- shikimoriModule,
- bookmarksModule
- )
+ processLifecycleScope.launch(Dispatchers.Default) {
+ setupDatabaseObservers()
}
}
@@ -91,7 +68,8 @@ class KotatsuApp : Application() {
ReportField.PHONE_MODEL,
ReportField.CRASH_CONFIGURATION,
ReportField.STACK_TRACE,
- ReportField.SHARED_PREFERENCES
+ ReportField.CUSTOM_DATA,
+ ReportField.SHARED_PREFERENCES,
)
dialog {
text = getString(R.string.crash_text)
@@ -108,18 +86,22 @@ class KotatsuApp : Application() {
}
}
+ override fun getWorkManagerConfiguration(): Configuration {
+ return Configuration.Builder()
+ .setWorkerFactory(workerFactory)
+ .build()
+ }
+
+ @WorkerThread
private fun setupDatabaseObservers() {
- val observers = getKoin().getAll()
- val database = get()
val tracker = database.invalidationTracker
- observers.forEach {
+ databaseObservers.forEach {
tracker.addObserver(it)
}
}
private fun setupActivityLifecycleCallbacks() {
- val callbacks = getKoin().getAll()
- callbacks.forEach {
+ activityLifecycleCallbacks.forEach {
registerActivityLifecycleCallbacks(it)
}
}
@@ -129,7 +111,7 @@ class KotatsuApp : Application() {
StrictMode.ThreadPolicy.Builder()
.detectAll()
.penaltyLog()
- .build()
+ .build(),
)
StrictMode.setVmPolicy(
StrictMode.VmPolicy.Builder()
@@ -138,7 +120,7 @@ class KotatsuApp : Application() {
.setClassInstanceLimit(PagesCache::class.java, 1)
.setClassInstanceLimit(MangaLoaderContext::class.java, 1)
.penaltyLog()
- .build()
+ .build(),
)
FragmentStrictMode.defaultPolicy = FragmentStrictMode.Policy.Builder()
.penaltyDeath()
@@ -149,4 +131,4 @@ class KotatsuApp : Application() {
.detectFragmentTagUsage()
.build()
}
-}
\ No newline at end of file
+}
diff --git a/app/src/main/java/org/koitharu/kotatsu/base/domain/MangaDataRepository.kt b/app/src/main/java/org/koitharu/kotatsu/base/domain/MangaDataRepository.kt
index 179d87868..9bc5c08dc 100644
--- a/app/src/main/java/org/koitharu/kotatsu/base/domain/MangaDataRepository.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/base/domain/MangaDataRepository.kt
@@ -1,14 +1,35 @@
package org.koitharu.kotatsu.base.domain
+import android.graphics.BitmapFactory
+import android.net.Uri
+import android.util.Size
import androidx.room.withTransaction
+import java.io.File
+import java.io.InputStream
+import java.util.zip.ZipFile
+import javax.inject.Inject
+import kotlin.math.roundToInt
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.runInterruptible
+import okhttp3.OkHttpClient
+import okhttp3.Request
import org.koitharu.kotatsu.core.db.MangaDatabase
import org.koitharu.kotatsu.core.db.entity.*
+import org.koitharu.kotatsu.core.network.CommonHeaders
+import org.koitharu.kotatsu.core.parser.MangaRepository
import org.koitharu.kotatsu.core.prefs.ReaderMode
import org.koitharu.kotatsu.parsers.model.Manga
+import org.koitharu.kotatsu.parsers.model.MangaPage
import org.koitharu.kotatsu.parsers.model.MangaSource
import org.koitharu.kotatsu.parsers.model.MangaTag
+import org.koitharu.kotatsu.parsers.util.await
-class MangaDataRepository(private val db: MangaDatabase) {
+private const val MIN_WEBTOON_RATIO = 2
+
+class MangaDataRepository @Inject constructor(
+ private val okHttpClient: OkHttpClient,
+ private val db: MangaDatabase,
+) {
suspend fun savePreferences(manga: Manga, mode: ReaderMode) {
val tags = manga.tags.toEntities()
@@ -18,8 +39,8 @@ class MangaDataRepository(private val db: MangaDatabase) {
db.preferencesDao.upsert(
MangaPrefsEntity(
mangaId = manga.id,
- mode = mode.id
- )
+ mode = mode.id,
+ ),
)
}
}
@@ -49,4 +70,59 @@ class MangaDataRepository(private val db: MangaDatabase) {
suspend fun findTags(source: MangaSource): Set {
return db.tagsDao.findTags(source.name).toMangaTags()
}
-}
\ No newline at end of file
+
+ /**
+ * Automatic determine type of manga by page size
+ * @return ReaderMode.WEBTOON if page is wide
+ */
+ suspend fun determineMangaIsWebtoon(repository: MangaRepository, pages: List): Boolean {
+ val pageIndex = (pages.size * 0.3).roundToInt()
+ val page = requireNotNull(pages.getOrNull(pageIndex)) { "No pages" }
+ val url = repository.getPageUrl(page)
+ val uri = Uri.parse(url)
+ val size = if (uri.scheme == "cbz") {
+ runInterruptible(Dispatchers.IO) {
+ val zip = ZipFile(uri.schemeSpecificPart)
+ val entry = zip.getEntry(uri.fragment)
+ zip.getInputStream(entry).use {
+ getBitmapSize(it)
+ }
+ }
+ } else {
+ val request = Request.Builder()
+ .url(url)
+ .get()
+ .header(CommonHeaders.REFERER, page.referer)
+ .cacheControl(CommonHeaders.CACHE_CONTROL_DISABLED)
+ .build()
+ okHttpClient.newCall(request).await().use {
+ runInterruptible(Dispatchers.IO) {
+ getBitmapSize(it.body?.byteStream())
+ }
+ }
+ }
+ return size.width * MIN_WEBTOON_RATIO < size.height
+ }
+
+ companion object {
+
+ suspend fun getImageMimeType(file: File): String? = runInterruptible(Dispatchers.IO) {
+ val options = BitmapFactory.Options().apply {
+ inJustDecodeBounds = true
+ }
+ BitmapFactory.decodeFile(file.path, options)?.recycle()
+ options.outMimeType
+ }
+
+ private fun getBitmapSize(input: InputStream?): Size {
+ val options = BitmapFactory.Options().apply {
+ inJustDecodeBounds = true
+ }
+ BitmapFactory.decodeStream(input, null, options)?.recycle()
+ val imageHeight: Int = options.outHeight
+ val imageWidth: Int = options.outWidth
+ check(imageHeight > 0 && imageWidth > 0)
+ return Size(imageWidth, imageHeight)
+ }
+ }
+}
diff --git a/app/src/main/java/org/koitharu/kotatsu/base/domain/MangaUtils.kt b/app/src/main/java/org/koitharu/kotatsu/base/domain/MangaUtils.kt
deleted file mode 100644
index b3b32dc1f..000000000
--- a/app/src/main/java/org/koitharu/kotatsu/base/domain/MangaUtils.kt
+++ /dev/null
@@ -1,76 +0,0 @@
-package org.koitharu.kotatsu.base.domain
-
-import android.graphics.BitmapFactory
-import android.net.Uri
-import android.util.Size
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.runInterruptible
-import okhttp3.OkHttpClient
-import okhttp3.Request
-import org.koin.core.component.KoinComponent
-import org.koin.core.component.get
-import org.koitharu.kotatsu.core.network.CommonHeaders
-import org.koitharu.kotatsu.core.parser.MangaRepository
-import org.koitharu.kotatsu.parsers.model.MangaPage
-import org.koitharu.kotatsu.parsers.util.await
-import java.io.File
-import java.io.InputStream
-import java.util.zip.ZipFile
-import kotlin.math.roundToInt
-
-object MangaUtils : KoinComponent {
-
- private const val MIN_WEBTOON_RATIO = 2
-
- /**
- * Automatic determine type of manga by page size
- * @return ReaderMode.WEBTOON if page is wide
- */
- suspend fun determineMangaIsWebtoon(pages: List): Boolean {
- val pageIndex = (pages.size * 0.3).roundToInt()
- val page = requireNotNull(pages.getOrNull(pageIndex)) { "No pages" }
- val url = MangaRepository(page.source).getPageUrl(page)
- val uri = Uri.parse(url)
- val size = if (uri.scheme == "cbz") {
- runInterruptible(Dispatchers.IO) {
- val zip = ZipFile(uri.schemeSpecificPart)
- val entry = zip.getEntry(uri.fragment)
- zip.getInputStream(entry).use {
- getBitmapSize(it)
- }
- }
- } else {
- val request = Request.Builder()
- .url(url)
- .get()
- .header(CommonHeaders.REFERER, page.referer)
- .cacheControl(CommonHeaders.CACHE_CONTROL_DISABLED)
- .build()
- get().newCall(request).await().use {
- runInterruptible(Dispatchers.IO) {
- getBitmapSize(it.body?.byteStream())
- }
- }
- }
- return size.width * MIN_WEBTOON_RATIO < size.height
- }
-
- suspend fun getImageMimeType(file: File): String? = runInterruptible(Dispatchers.IO) {
- val options = BitmapFactory.Options().apply {
- inJustDecodeBounds = true
- }
- BitmapFactory.decodeFile(file.path, options)?.recycle()
- options.outMimeType
- }
-
- private fun getBitmapSize(input: InputStream?): Size {
- val options = BitmapFactory.Options().apply {
- inJustDecodeBounds = true
- }
- BitmapFactory.decodeStream(input, null, options)?.recycle()
- val imageHeight: Int = options.outHeight
- val imageWidth: Int = options.outWidth
- check(imageHeight > 0 && imageWidth > 0)
- return Size(imageWidth, imageHeight)
- }
-}
\ No newline at end of file
diff --git a/app/src/main/java/org/koitharu/kotatsu/base/domain/ReversibleHandle.kt b/app/src/main/java/org/koitharu/kotatsu/base/domain/ReversibleHandle.kt
index 43c9bf7e4..d416216f4 100644
--- a/app/src/main/java/org/koitharu/kotatsu/base/domain/ReversibleHandle.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/base/domain/ReversibleHandle.kt
@@ -2,6 +2,7 @@ package org.koitharu.kotatsu.base.domain
import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.launch
+import org.koitharu.kotatsu.utils.ext.printStackTraceDebug
import org.koitharu.kotatsu.utils.ext.processLifecycleScope
fun interface ReversibleHandle {
@@ -10,7 +11,11 @@ fun interface ReversibleHandle {
}
fun ReversibleHandle.reverseAsync() = processLifecycleScope.launch(Dispatchers.Default) {
- reverse()
+ runCatching {
+ reverse()
+ }.onFailure {
+ it.printStackTraceDebug()
+ }
}
operator fun ReversibleHandle.plus(other: ReversibleHandle) = ReversibleHandle {
diff --git a/app/src/main/java/org/koitharu/kotatsu/base/ui/BaseActivity.kt b/app/src/main/java/org/koitharu/kotatsu/base/ui/BaseActivity.kt
index 9cdce9654..4f87f334d 100644
--- a/app/src/main/java/org/koitharu/kotatsu/base/ui/BaseActivity.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/base/ui/BaseActivity.kt
@@ -13,23 +13,32 @@ import androidx.appcompat.view.ActionMode
import androidx.appcompat.widget.ActionBarContextView
import androidx.appcompat.widget.Toolbar
import androidx.core.app.ActivityCompat
+import androidx.core.content.ContextCompat
+import androidx.core.graphics.ColorUtils
import androidx.core.view.ViewCompat
import androidx.core.view.WindowCompat
import androidx.core.view.WindowInsetsCompat
import androidx.core.view.updateLayoutParams
import androidx.viewbinding.ViewBinding
-import org.koin.android.ext.android.get
+import dagger.hilt.android.EntryPointAccessors
+import javax.inject.Inject
import org.koitharu.kotatsu.BuildConfig
import org.koitharu.kotatsu.R
import org.koitharu.kotatsu.base.ui.util.ActionModeDelegate
+import org.koitharu.kotatsu.base.ui.util.BaseActivityEntryPoint
import org.koitharu.kotatsu.base.ui.util.WindowInsetsDelegate
+import org.koitharu.kotatsu.base.ui.util.inject
import org.koitharu.kotatsu.core.exceptions.resolve.ExceptionResolver
import org.koitharu.kotatsu.core.prefs.AppSettings
+import org.koitharu.kotatsu.utils.ext.getThemeColor
abstract class BaseActivity :
AppCompatActivity(),
WindowInsetsDelegate.WindowInsetsListener {
+ @Inject
+ lateinit var settings: AppSettings
+
protected lateinit var binding: B
private set
@@ -42,7 +51,7 @@ abstract class BaseActivity :
val actionModeDelegate = ActionModeDelegate()
override fun onCreate(savedInstanceState: Bundle?) {
- val settings = get()
+ EntryPointAccessors.fromApplication(this, BaseActivityEntryPoint::class.java).inject(this)
val isAmoled = settings.isAmoledTheme
val isDynamic = settings.isDynamicTheme
// TODO support DialogWhenLarge theme
@@ -96,25 +105,33 @@ abstract class BaseActivity :
protected fun isDarkAmoledTheme(): Boolean {
val uiMode = resources.configuration.uiMode
val isNight = uiMode and Configuration.UI_MODE_NIGHT_MASK == Configuration.UI_MODE_NIGHT_YES
- return isNight && get().isAmoledTheme
+ return isNight && settings.isAmoledTheme
}
@CallSuper
override fun onSupportActionModeStarted(mode: ActionMode) {
super.onSupportActionModeStarted(mode)
actionModeDelegate.onSupportActionModeStarted(mode)
+ val actionModeColor = ColorUtils.compositeColors(
+ ContextCompat.getColor(this, com.google.android.material.R.color.m3_appbar_overlay_color),
+ getThemeColor(com.google.android.material.R.attr.colorSurface),
+ )
val insets = ViewCompat.getRootWindowInsets(binding.root)
?.getInsets(WindowInsetsCompat.Type.systemBars()) ?: return
- val view = findViewById(androidx.appcompat.R.id.action_mode_bar)
- view?.updateLayoutParams {
- topMargin = insets.top
+ findViewById(androidx.appcompat.R.id.action_mode_bar).apply {
+ setBackgroundColor(actionModeColor)
+ updateLayoutParams {
+ topMargin = insets.top
+ }
}
+ window.statusBarColor = actionModeColor
}
@CallSuper
override fun onSupportActionModeFinished(mode: ActionMode) {
super.onSupportActionModeFinished(mode)
actionModeDelegate.onSupportActionModeFinished(mode)
+ window.statusBarColor = getThemeColor(android.R.attr.statusBarColor)
}
override fun onBackPressed() {
@@ -128,4 +145,4 @@ abstract class BaseActivity :
super.onBackPressed()
}
}
-}
\ No newline at end of file
+}
diff --git a/app/src/main/java/org/koitharu/kotatsu/base/ui/BaseBottomSheet.kt b/app/src/main/java/org/koitharu/kotatsu/base/ui/BaseBottomSheet.kt
index c8c4051b3..1bba104b8 100644
--- a/app/src/main/java/org/koitharu/kotatsu/base/ui/BaseBottomSheet.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/base/ui/BaseBottomSheet.kt
@@ -9,13 +9,13 @@ import android.view.ViewGroup
import android.view.ViewGroup.LayoutParams
import androidx.core.view.updateLayoutParams
import androidx.viewbinding.ViewBinding
+import com.google.android.material.R as materialR
import com.google.android.material.bottomsheet.BottomSheetBehavior
import com.google.android.material.bottomsheet.BottomSheetDialog
import com.google.android.material.bottomsheet.BottomSheetDialogFragment
import org.koitharu.kotatsu.R
import org.koitharu.kotatsu.base.ui.dialog.AppBottomSheetDialog
import org.koitharu.kotatsu.utils.ext.displayCompat
-import com.google.android.material.R as materialR
abstract class BaseBottomSheet : BottomSheetDialogFragment() {
@@ -30,7 +30,7 @@ abstract class BaseBottomSheet : BottomSheetDialogFragment() {
final override fun onCreateView(
inflater: LayoutInflater,
container: ViewGroup?,
- savedInstanceState: Bundle?
+ savedInstanceState: Bundle?,
): View {
val binding = onInflateView(inflater, container)
viewBinding = binding
@@ -83,4 +83,4 @@ abstract class BaseBottomSheet : BottomSheetDialogFragment() {
}
b.isDraggable = !isLocked
}
-}
\ No newline at end of file
+}
diff --git a/app/src/main/java/org/koitharu/kotatsu/base/ui/BaseFragment.kt b/app/src/main/java/org/koitharu/kotatsu/base/ui/BaseFragment.kt
index 17c8931b1..fbd4b8d3a 100644
--- a/app/src/main/java/org/koitharu/kotatsu/base/ui/BaseFragment.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/base/ui/BaseFragment.kt
@@ -52,4 +52,4 @@ abstract class BaseFragment :
protected fun bindingOrNull() = viewBinding
protected abstract fun onInflateView(inflater: LayoutInflater, container: ViewGroup?): B
-}
\ No newline at end of file
+}
diff --git a/app/src/main/java/org/koitharu/kotatsu/base/ui/BasePreferenceFragment.kt b/app/src/main/java/org/koitharu/kotatsu/base/ui/BasePreferenceFragment.kt
index 7db0f6e22..e71dcd005 100644
--- a/app/src/main/java/org/koitharu/kotatsu/base/ui/BasePreferenceFragment.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/base/ui/BasePreferenceFragment.kt
@@ -8,18 +8,21 @@ import androidx.core.graphics.Insets
import androidx.core.view.updatePadding
import androidx.preference.PreferenceFragmentCompat
import androidx.recyclerview.widget.RecyclerView
-import org.koin.android.ext.android.inject
+import dagger.hilt.android.AndroidEntryPoint
+import javax.inject.Inject
import org.koitharu.kotatsu.base.ui.util.RecyclerViewOwner
import org.koitharu.kotatsu.base.ui.util.WindowInsetsDelegate
import org.koitharu.kotatsu.core.prefs.AppSettings
import org.koitharu.kotatsu.settings.SettingsHeadersFragment
+@AndroidEntryPoint
abstract class BasePreferenceFragment(@StringRes private val titleId: Int) :
PreferenceFragmentCompat(),
WindowInsetsDelegate.WindowInsetsListener,
RecyclerViewOwner {
- protected val settings by inject(mode = LazyThreadSafetyMode.NONE)
+ @Inject
+ lateinit var settings: AppSettings
@Suppress("LeakingThis")
protected val insetsDelegate = WindowInsetsDelegate(this)
@@ -48,7 +51,7 @@ abstract class BasePreferenceFragment(@StringRes private val titleId: Int) :
@CallSuper
override fun onWindowInsetsChanged(insets: Insets) {
listView.updatePadding(
- bottom = insets.bottom
+ bottom = insets.bottom,
)
}
@@ -57,4 +60,4 @@ abstract class BasePreferenceFragment(@StringRes private val titleId: Int) :
(parentFragment as? SettingsHeadersFragment)?.setTitle(title)
?: activity?.setTitle(title)
}
-}
\ No newline at end of file
+}
diff --git a/app/src/main/java/org/koitharu/kotatsu/base/ui/CoroutineIntentService.kt b/app/src/main/java/org/koitharu/kotatsu/base/ui/CoroutineIntentService.kt
index 241d13f94..0e63b3950 100644
--- a/app/src/main/java/org/koitharu/kotatsu/base/ui/CoroutineIntentService.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/base/ui/CoroutineIntentService.kt
@@ -15,7 +15,7 @@ abstract class CoroutineIntentService : BaseService() {
private val mutex = Mutex()
protected open val dispatcher: CoroutineDispatcher = Dispatchers.Default
- override fun onStartCommand(intent: Intent?, flags: Int, startId: Int): Int {
+ final override fun onStartCommand(intent: Intent?, flags: Int, startId: Int): Int {
super.onStartCommand(intent, flags, startId)
launchCoroutine(intent, startId)
return Service.START_REDELIVER_INTENT
@@ -34,4 +34,4 @@ abstract class CoroutineIntentService : BaseService() {
}
protected abstract suspend fun processIntent(intent: Intent?)
-}
\ No newline at end of file
+}
diff --git a/app/src/main/java/org/koitharu/kotatsu/base/ui/dialog/RememberSelectionDialogListener.kt b/app/src/main/java/org/koitharu/kotatsu/base/ui/dialog/RememberSelectionDialogListener.kt
new file mode 100644
index 000000000..7783a564b
--- /dev/null
+++ b/app/src/main/java/org/koitharu/kotatsu/base/ui/dialog/RememberSelectionDialogListener.kt
@@ -0,0 +1,13 @@
+package org.koitharu.kotatsu.base.ui.dialog
+
+import android.content.DialogInterface
+
+class RememberSelectionDialogListener(initialValue: Int) : DialogInterface.OnClickListener {
+
+ var selection: Int = initialValue
+ private set
+
+ override fun onClick(dialog: DialogInterface?, which: Int) {
+ selection = which
+ }
+}
\ No newline at end of file
diff --git a/app/src/main/java/org/koitharu/kotatsu/base/ui/list/ListSelectionController.kt b/app/src/main/java/org/koitharu/kotatsu/base/ui/list/ListSelectionController.kt
index b3171a9df..5cadc9c6f 100644
--- a/app/src/main/java/org/koitharu/kotatsu/base/ui/list/ListSelectionController.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/base/ui/list/ListSelectionController.kt
@@ -12,9 +12,9 @@ import androidx.lifecycle.LifecycleOwner
import androidx.recyclerview.widget.RecyclerView
import androidx.savedstate.SavedStateRegistry
import androidx.savedstate.SavedStateRegistryOwner
+import kotlin.coroutines.EmptyCoroutineContext
import kotlinx.coroutines.Dispatchers
import org.koitharu.kotatsu.base.ui.list.decor.AbstractSelectionItemDecoration
-import kotlin.coroutines.EmptyCoroutineContext
private const val KEY_SELECTION = "selection"
private const val PROVIDER_NAME = "selection_decoration"
@@ -23,15 +23,18 @@ class ListSelectionController(
private val activity: Activity,
private val decoration: AbstractSelectionItemDecoration,
private val registryOwner: SavedStateRegistryOwner,
- private val callback: Callback,
+ private val callback: Callback2,
) : ActionMode.Callback, SavedStateRegistry.SavedStateProvider {
private var actionMode: ActionMode? = null
- private val stateEventObserver = StateEventObserver()
val count: Int
get() = decoration.checkedItemsCount
+ init {
+ registryOwner.lifecycle.addObserver(StateEventObserver())
+ }
+
fun snapshot(): Set {
return peekCheckedIds().toSet()
}
@@ -55,7 +58,6 @@ class ListSelectionController(
fun attachToRecyclerView(recyclerView: RecyclerView) {
recyclerView.addItemDecoration(decoration)
- registryOwner.lifecycle.addObserver(stateEventObserver)
}
override fun saveState(): Bundle {
@@ -87,19 +89,19 @@ class ListSelectionController(
}
override fun onCreateActionMode(mode: ActionMode, menu: Menu): Boolean {
- return callback.onCreateActionMode(mode, menu)
+ return callback.onCreateActionMode(this, mode, menu)
}
override fun onPrepareActionMode(mode: ActionMode, menu: Menu): Boolean {
- return callback.onPrepareActionMode(mode, menu)
+ return callback.onPrepareActionMode(this, mode, menu)
}
override fun onActionItemClicked(mode: ActionMode, item: MenuItem): Boolean {
- return callback.onActionItemClicked(mode, item)
+ return callback.onActionItemClicked(this, mode, item)
}
override fun onDestroyActionMode(mode: ActionMode) {
- callback.onDestroyActionMode(mode)
+ callback.onDestroyActionMode(this, mode)
clear()
actionMode = null
}
@@ -112,7 +114,7 @@ class ListSelectionController(
private fun notifySelectionChanged() {
val count = decoration.checkedItemsCount
- callback.onSelectionChanged(count)
+ callback.onSelectionChanged(this, count)
if (count == 0) {
actionMode?.finish()
} else {
@@ -129,17 +131,56 @@ class ListSelectionController(
notifySelectionChanged()
}
- interface Callback : ActionMode.Callback {
+ @Deprecated("")
+ interface Callback : Callback2 {
fun onSelectionChanged(count: Int)
- override fun onCreateActionMode(mode: ActionMode, menu: Menu): Boolean
+ fun onCreateActionMode(mode: ActionMode, menu: Menu): Boolean
+
+ fun onPrepareActionMode(mode: ActionMode, menu: Menu): Boolean
+
+ fun onActionItemClicked(mode: ActionMode, item: MenuItem): Boolean
+
+ fun onDestroyActionMode(mode: ActionMode) = Unit
+
+ override fun onSelectionChanged(controller: ListSelectionController, count: Int) {
+ onSelectionChanged(count)
+ }
+
+ override fun onCreateActionMode(controller: ListSelectionController, mode: ActionMode, menu: Menu): Boolean {
+ return onCreateActionMode(mode, menu)
+ }
+
+ override fun onPrepareActionMode(controller: ListSelectionController, mode: ActionMode, menu: Menu): Boolean {
+ return onPrepareActionMode(mode, menu)
+ }
+
+ override fun onActionItemClicked(
+ controller: ListSelectionController,
+ mode: ActionMode,
+ item: MenuItem,
+ ): Boolean = onActionItemClicked(mode, item)
+
+ override fun onDestroyActionMode(controller: ListSelectionController, mode: ActionMode) {
+ onDestroyActionMode(mode)
+ }
+ }
- override fun onPrepareActionMode(mode: ActionMode, menu: Menu): Boolean
+ interface Callback2 {
+
+ fun onSelectionChanged(controller: ListSelectionController, count: Int)
+
+ fun onCreateActionMode(controller: ListSelectionController, mode: ActionMode, menu: Menu): Boolean
+
+ fun onPrepareActionMode(controller: ListSelectionController, mode: ActionMode, menu: Menu): Boolean {
+ mode.title = controller.count.toString()
+ return true
+ }
- override fun onActionItemClicked(mode: ActionMode, item: MenuItem): Boolean
+ fun onActionItemClicked(controller: ListSelectionController, mode: ActionMode, item: MenuItem): Boolean
- override fun onDestroyActionMode(mode: ActionMode) = Unit
+ fun onDestroyActionMode(controller: ListSelectionController, mode: ActionMode) = Unit
}
private inner class StateEventObserver : LifecycleEventObserver {
@@ -159,4 +200,4 @@ class ListSelectionController(
}
}
}
-}
\ No newline at end of file
+}
diff --git a/app/src/main/java/org/koitharu/kotatsu/base/ui/list/SectionedSelectionController.kt b/app/src/main/java/org/koitharu/kotatsu/base/ui/list/SectionedSelectionController.kt
new file mode 100644
index 000000000..5e96cd066
--- /dev/null
+++ b/app/src/main/java/org/koitharu/kotatsu/base/ui/list/SectionedSelectionController.kt
@@ -0,0 +1,225 @@
+package org.koitharu.kotatsu.base.ui.list
+
+import android.app.Activity
+import android.os.Bundle
+import android.util.ArrayMap
+import android.view.Menu
+import android.view.MenuItem
+import androidx.appcompat.app.AppCompatActivity
+import androidx.appcompat.view.ActionMode
+import androidx.lifecycle.Lifecycle
+import androidx.lifecycle.LifecycleEventObserver
+import androidx.lifecycle.LifecycleOwner
+import androidx.recyclerview.widget.RecyclerView
+import androidx.savedstate.SavedStateRegistry
+import androidx.savedstate.SavedStateRegistryOwner
+import kotlin.coroutines.EmptyCoroutineContext
+import kotlinx.coroutines.Dispatchers
+import org.koitharu.kotatsu.base.ui.list.decor.AbstractSelectionItemDecoration
+
+private const val PROVIDER_NAME = "selection_decoration_sectioned"
+
+class SectionedSelectionController(
+ private val activity: Activity,
+ private val owner: SavedStateRegistryOwner,
+ private val callback: Callback,
+) : ActionMode.Callback, SavedStateRegistry.SavedStateProvider {
+
+ private var actionMode: ActionMode? = null
+
+ private var pendingData: MutableMap>? = null
+ private val decorations = ArrayMap()
+
+ val count: Int
+ get() = decorations.values.sumOf { it.checkedItemsCount }
+
+ init {
+ owner.lifecycle.addObserver(StateEventObserver())
+ }
+
+ fun snapshot(): Map> {
+ return decorations.mapValues { it.value.checkedItemsIds.toSet() }
+ }
+
+ fun peekCheckedIds(): Map> {
+ return decorations.mapValues { it.value.checkedItemsIds }
+ }
+
+ fun clear() {
+ decorations.values.forEach {
+ it.clearSelection()
+ }
+ notifySelectionChanged()
+ }
+
+ fun attachToRecyclerView(section: T, recyclerView: RecyclerView) {
+ val decoration = getDecoration(section)
+ val pendingIds = pendingData?.remove(section.toString())
+ if (!pendingIds.isNullOrEmpty()) {
+ decoration.checkAll(pendingIds)
+ startActionMode()
+ notifySelectionChanged()
+ }
+ recyclerView.addItemDecoration(decoration)
+ if (pendingData?.isEmpty() == true) {
+ pendingData = null
+ }
+ }
+
+ override fun saveState(): Bundle {
+ val bundle = Bundle(decorations.size)
+ for ((k, v) in decorations) {
+ bundle.putLongArray(k.toString(), v.checkedItemsIds.toLongArray())
+ }
+ return bundle
+ }
+
+ fun onItemClick(section: T, id: Long): Boolean {
+ val decoration = getDecoration(section)
+ if (isInSelectionMode()) {
+ decoration.toggleItemChecked(id)
+ if (isInSelectionMode()) {
+ actionMode?.invalidate()
+ } else {
+ actionMode?.finish()
+ }
+ notifySelectionChanged()
+ return true
+ }
+ return false
+ }
+
+ fun onItemLongClick(section: T, id: Long): Boolean {
+ val decoration = getDecoration(section)
+ startActionMode()
+ return actionMode?.also {
+ decoration.setItemIsChecked(id, true)
+ notifySelectionChanged()
+ } != null
+ }
+
+ fun getSectionCount(section: T): Int {
+ return decorations[section]?.checkedItemsCount ?: 0
+ }
+
+ fun addToSelection(section: T, ids: Collection): Boolean {
+ val decoration = getDecoration(section)
+ startActionMode()
+ return actionMode?.also {
+ decoration.checkAll(ids)
+ notifySelectionChanged()
+ } != null
+ }
+
+ fun clearSelection(section: T) {
+ decorations[section]?.clearSelection() ?: return
+ notifySelectionChanged()
+ }
+
+ override fun onCreateActionMode(mode: ActionMode, menu: Menu): Boolean {
+ return callback.onCreateActionMode(this, mode, menu)
+ }
+
+ override fun onPrepareActionMode(mode: ActionMode, menu: Menu): Boolean {
+ return callback.onPrepareActionMode(this, mode, menu)
+ }
+
+ override fun onActionItemClicked(mode: ActionMode, item: MenuItem): Boolean {
+ return callback.onActionItemClicked(this, mode, item)
+ }
+
+ override fun onDestroyActionMode(mode: ActionMode) {
+ callback.onDestroyActionMode(this, mode)
+ clear()
+ actionMode = null
+ }
+
+ private fun startActionMode() {
+ if (actionMode == null) {
+ actionMode = (activity as? AppCompatActivity)?.startSupportActionMode(this)
+ }
+ }
+
+ private fun isInSelectionMode(): Boolean {
+ return decorations.values.any { x -> x.checkedItemsCount > 0 }
+ }
+
+ private fun notifySelectionChanged() {
+ val count = this.count
+ callback.onSelectionChanged(this, count)
+ if (count == 0) {
+ actionMode?.finish()
+ } else {
+ actionMode?.invalidate()
+ }
+ }
+
+ private fun restoreState(ids: MutableMap>) {
+ if (ids.isEmpty() || isInSelectionMode()) {
+ return
+ }
+ for ((k, v) in decorations) {
+ val items = ids.remove(k.toString())
+ if (!items.isNullOrEmpty()) {
+ v.checkAll(items)
+ }
+ }
+ pendingData = ids
+ if (isInSelectionMode()) {
+ startActionMode()
+ notifySelectionChanged()
+ }
+ }
+
+ private fun getDecoration(section: T): AbstractSelectionItemDecoration {
+ return decorations.getOrPut(section) {
+ callback.onCreateItemDecoration(this, section)
+ }
+ }
+
+ interface Callback {
+
+ fun onSelectionChanged(controller: SectionedSelectionController, count: Int)
+
+ fun onCreateActionMode(controller: SectionedSelectionController, mode: ActionMode, menu: Menu): Boolean
+
+ fun onPrepareActionMode(controller: SectionedSelectionController, mode: ActionMode, menu: Menu): Boolean {
+ mode.title = controller.count.toString()
+ return true
+ }
+
+ fun onDestroyActionMode(controller: SectionedSelectionController, mode: ActionMode) = Unit
+
+ fun onActionItemClicked(
+ controller: SectionedSelectionController,
+ mode: ActionMode,
+ item: MenuItem,
+ ): Boolean
+
+ fun onCreateItemDecoration(
+ controller: SectionedSelectionController,
+ section: T,
+ ): AbstractSelectionItemDecoration
+ }
+
+ private inner class StateEventObserver : LifecycleEventObserver {
+
+ override fun onStateChanged(source: LifecycleOwner, event: Lifecycle.Event) {
+ if (event == Lifecycle.Event.ON_CREATE) {
+ val registry = owner.savedStateRegistry
+ registry.registerSavedStateProvider(PROVIDER_NAME, this@SectionedSelectionController)
+ val state = registry.consumeRestoredStateForKey(PROVIDER_NAME)
+ if (state != null) {
+ Dispatchers.Main.dispatch(EmptyCoroutineContext) { // == Handler.post
+ if (source.lifecycle.currentState.isAtLeast(Lifecycle.State.CREATED)) {
+ restoreState(
+ state.keySet()
+ .associateWithTo(HashMap()) { state.getLongArray(it)?.toList().orEmpty() },
+ )
+ }
+ }
+ }
+ }
+ }
+ }
+}
diff --git a/app/src/main/java/org/koitharu/kotatsu/base/ui/list/decor/SpacingItemDecoration.kt b/app/src/main/java/org/koitharu/kotatsu/base/ui/list/decor/SpacingItemDecoration.kt
index b86a87dce..5b9fbde29 100644
--- a/app/src/main/java/org/koitharu/kotatsu/base/ui/list/decor/SpacingItemDecoration.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/base/ui/list/decor/SpacingItemDecoration.kt
@@ -11,8 +11,8 @@ class SpacingItemDecoration(@Px private val spacing: Int) : RecyclerView.ItemDec
outRect: Rect,
view: View,
parent: RecyclerView,
- state: RecyclerView.State
+ state: RecyclerView.State,
) {
outRect.set(spacing, spacing, spacing, spacing)
}
-}
\ No newline at end of file
+}
diff --git a/app/src/main/java/org/koitharu/kotatsu/base/ui/list/fastscroll/BubbleAnimator.kt b/app/src/main/java/org/koitharu/kotatsu/base/ui/list/fastscroll/BubbleAnimator.kt
new file mode 100644
index 000000000..591fd6b99
--- /dev/null
+++ b/app/src/main/java/org/koitharu/kotatsu/base/ui/list/fastscroll/BubbleAnimator.kt
@@ -0,0 +1,82 @@
+package org.koitharu.kotatsu.base.ui.list.fastscroll
+
+import android.animation.Animator
+import android.animation.AnimatorListenerAdapter
+import android.view.View
+import android.view.ViewAnimationUtils
+import android.view.animation.AccelerateInterpolator
+import android.view.animation.DecelerateInterpolator
+import androidx.core.view.isInvisible
+import androidx.core.view.isVisible
+import org.koitharu.kotatsu.utils.ext.animatorDurationScale
+import org.koitharu.kotatsu.utils.ext.measureWidth
+import kotlin.math.hypot
+
+class BubbleAnimator(
+ private val bubble: View,
+) {
+
+ private val animationDuration = (bubble.resources.getInteger(android.R.integer.config_shortAnimTime) *
+ bubble.context.animatorDurationScale).toLong()
+ private var animator: Animator? = null
+ private var isHiding = false
+
+ fun show() {
+ if (bubble.isVisible && !isHiding) {
+ return
+ }
+ isHiding = false
+ animator?.cancel()
+ animator = ViewAnimationUtils.createCircularReveal(
+ bubble,
+ bubble.measureWidth(),
+ bubble.measuredHeight,
+ 0f,
+ hypot(bubble.width.toDouble(), bubble.height.toDouble()).toFloat(),
+ ).apply {
+ bubble.isVisible = true
+ duration = animationDuration
+ interpolator = DecelerateInterpolator()
+ start()
+ }
+ }
+
+ fun hide() {
+ if (!bubble.isVisible || isHiding) {
+ return
+ }
+ animator?.cancel()
+ isHiding = true
+ animator = ViewAnimationUtils.createCircularReveal(
+ bubble,
+ bubble.width,
+ bubble.height,
+ hypot(bubble.width.toDouble(), bubble.height.toDouble()).toFloat(),
+ 0f,
+ ).apply {
+ duration = animationDuration
+ interpolator = AccelerateInterpolator()
+ addListener(HideListener())
+ start()
+ }
+ }
+
+ private inner class HideListener : AnimatorListenerAdapter() {
+
+ private var isCancelled = false
+
+ override fun onAnimationCancel(animation: Animator?) {
+ super.onAnimationCancel(animation)
+ isCancelled = true
+ }
+
+ override fun onAnimationEnd(animation: Animator?) {
+ super.onAnimationEnd(animation)
+ if (!isCancelled && animation === this@BubbleAnimator.animator) {
+ bubble.isInvisible = true
+ isHiding = false
+ this@BubbleAnimator.animator = null
+ }
+ }
+ }
+}
\ No newline at end of file
diff --git a/app/src/main/java/org/koitharu/kotatsu/base/ui/list/fastscroll/FastScrollRecyclerView.kt b/app/src/main/java/org/koitharu/kotatsu/base/ui/list/fastscroll/FastScrollRecyclerView.kt
new file mode 100644
index 000000000..5a7c1274e
--- /dev/null
+++ b/app/src/main/java/org/koitharu/kotatsu/base/ui/list/fastscroll/FastScrollRecyclerView.kt
@@ -0,0 +1,45 @@
+package org.koitharu.kotatsu.base.ui.list.fastscroll
+
+import android.content.Context
+import android.util.AttributeSet
+import android.view.ViewGroup
+import androidx.annotation.AttrRes
+import androidx.recyclerview.widget.RecyclerView
+import org.koitharu.kotatsu.R
+
+class FastScrollRecyclerView @JvmOverloads constructor(
+ context: Context,
+ attrs: AttributeSet? = null,
+ @AttrRes defStyleAttr: Int = androidx.recyclerview.R.attr.recyclerViewStyle,
+) : RecyclerView(context, attrs, defStyleAttr) {
+
+ val fastScroller = FastScroller(context, attrs)
+
+ init {
+ fastScroller.id = R.id.fast_scroller
+ fastScroller.layoutParams = ViewGroup.LayoutParams(
+ ViewGroup.LayoutParams.WRAP_CONTENT,
+ ViewGroup.LayoutParams.MATCH_PARENT,
+ )
+ }
+
+ override fun setAdapter(adapter: Adapter<*>?) {
+ super.setAdapter(adapter)
+ fastScroller.setSectionIndexer(adapter as? FastScroller.SectionIndexer)
+ }
+
+ override fun setVisibility(visibility: Int) {
+ super.setVisibility(visibility)
+ fastScroller.visibility = visibility
+ }
+
+ override fun onAttachedToWindow() {
+ super.onAttachedToWindow()
+ fastScroller.attachRecyclerView(this)
+ }
+
+ override fun onDetachedFromWindow() {
+ fastScroller.detachRecyclerView()
+ super.onDetachedFromWindow()
+ }
+}
\ No newline at end of file
diff --git a/app/src/main/java/org/koitharu/kotatsu/base/ui/list/fastscroll/FastScroller.kt b/app/src/main/java/org/koitharu/kotatsu/base/ui/list/fastscroll/FastScroller.kt
new file mode 100644
index 000000000..23c79d7a2
--- /dev/null
+++ b/app/src/main/java/org/koitharu/kotatsu/base/ui/list/fastscroll/FastScroller.kt
@@ -0,0 +1,521 @@
+package org.koitharu.kotatsu.base.ui.list.fastscroll
+
+import android.annotation.SuppressLint
+import android.content.Context
+import android.content.res.TypedArray
+import android.graphics.Color
+import android.graphics.drawable.Drawable
+import android.util.AttributeSet
+import android.util.TypedValue
+import android.view.LayoutInflater
+import android.view.MotionEvent
+import android.view.ViewGroup
+import android.widget.*
+import androidx.annotation.*
+import androidx.constraintlayout.widget.ConstraintLayout
+import androidx.constraintlayout.widget.ConstraintSet
+import androidx.coordinatorlayout.widget.CoordinatorLayout
+import androidx.core.content.ContextCompat
+import androidx.core.content.withStyledAttributes
+import androidx.core.view.GravityCompat
+import androidx.core.view.isGone
+import androidx.core.view.isVisible
+import androidx.recyclerview.widget.RecyclerView
+import org.koitharu.kotatsu.R
+import org.koitharu.kotatsu.databinding.FastScrollerBinding
+import org.koitharu.kotatsu.utils.ext.getThemeColor
+import org.koitharu.kotatsu.utils.ext.isLayoutReversed
+import kotlin.math.roundToInt
+import com.google.android.material.R as materialR
+
+private const val SCROLLBAR_HIDE_DELAY = 1000L
+private const val TRACK_SNAP_RANGE = 5
+
+@Suppress("MemberVisibilityCanBePrivate", "unused")
+class FastScroller @JvmOverloads constructor(
+ context: Context,
+ attrs: AttributeSet? = null,
+ @AttrRes defStyleAttr: Int = R.attr.fastScrollerStyle,
+) : LinearLayout(context, attrs, defStyleAttr) {
+
+ enum class BubbleSize(@DrawableRes val drawableId: Int, @DimenRes val textSizeId: Int) {
+ NORMAL(R.drawable.fastscroll_bubble, R.dimen.fastscroll_bubble_text_size),
+ SMALL(R.drawable.fastscroll_bubble_small, R.dimen.fastscroll_bubble_text_size_small)
+ }
+
+ private val binding = FastScrollerBinding.inflate(LayoutInflater.from(context), this)
+
+ private val scrollbarPaddingEnd = context.resources.getDimension(R.dimen.fastscroll_scrollbar_padding_end)
+
+ @ColorInt
+ private var bubbleColor = 0
+
+ @ColorInt
+ private var handleColor = 0
+
+ private var bubbleHeight = 0
+ private var handleHeight = 0
+ private var viewHeight = 0
+ private var hideScrollbar = true
+ private var showBubble = true
+ private var showBubbleAlways = false
+ private var bubbleSize = BubbleSize.NORMAL
+ private var bubbleImage: Drawable? = null
+ private var handleImage: Drawable? = null
+ private var trackImage: Drawable? = null
+ private var recyclerView: RecyclerView? = null
+ private val scrollbarAnimator = ScrollbarAnimator(binding.scrollbar, scrollbarPaddingEnd)
+ private val bubbleAnimator = BubbleAnimator(binding.bubble)
+
+ private var fastScrollListener: FastScrollListener? = null
+ private var sectionIndexer: SectionIndexer? = null
+
+ private val scrollbarHider = Runnable {
+ hideBubble()
+ hideScrollbar()
+ }
+
+ private val scrollListener: RecyclerView.OnScrollListener = object : RecyclerView.OnScrollListener() {
+ override fun onScrolled(recyclerView: RecyclerView, dx: Int, dy: Int) {
+ if (!binding.thumb.isSelected && isEnabled) {
+ val y = recyclerView.scrollProportion
+ setViewPositions(y)
+
+ if (showBubbleAlways) {
+ val targetPos = getRecyclerViewTargetPosition(y)
+ sectionIndexer?.let { binding.bubble.text = it.getSectionText(recyclerView.context, targetPos) }
+ }
+ }
+ }
+
+ override fun onScrollStateChanged(recyclerView: RecyclerView, newState: Int) {
+ super.onScrollStateChanged(recyclerView, newState)
+
+ if (isEnabled) {
+ when (newState) {
+ RecyclerView.SCROLL_STATE_DRAGGING -> {
+ handler.removeCallbacks(scrollbarHider)
+ showScrollbar()
+ if (showBubbleAlways && sectionIndexer != null) showBubble()
+ }
+ RecyclerView.SCROLL_STATE_IDLE -> if (hideScrollbar && !binding.thumb.isSelected) {
+ handler.postDelayed(scrollbarHider, SCROLLBAR_HIDE_DELAY)
+ }
+ }
+ }
+ }
+ }
+
+ private val RecyclerView.scrollProportion: Float
+ get() {
+ val rangeDiff = computeVerticalScrollRange() - computeVerticalScrollExtent()
+ val proportion = computeVerticalScrollOffset() / if (rangeDiff > 0) rangeDiff.toFloat() else 1f
+ return viewHeight * proportion
+ }
+
+ init {
+ clipChildren = false
+ orientation = HORIZONTAL
+
+ @ColorInt var bubbleColor = context.getThemeColor(materialR.attr.colorControlNormal, Color.DKGRAY)
+ @ColorInt var handleColor = bubbleColor
+ @ColorInt var trackColor = context.getThemeColor(materialR.attr.colorOutline, Color.LTGRAY)
+ @ColorInt var textColor = context.getThemeColor(android.R.attr.textColorPrimaryInverse, Color.WHITE)
+
+ var showTrack = false
+
+ context.withStyledAttributes(attrs, R.styleable.FastScroller, defStyleAttr) {
+ bubbleColor = getColor(R.styleable.FastScroller_bubbleColor, bubbleColor)
+ handleColor = getColor(R.styleable.FastScroller_thumbColor, handleColor)
+ trackColor = getColor(R.styleable.FastScroller_trackColor, trackColor)
+ textColor = getColor(R.styleable.FastScroller_bubbleTextColor, textColor)
+ hideScrollbar = getBoolean(R.styleable.FastScroller_hideScrollbar, hideScrollbar)
+ showBubble = getBoolean(R.styleable.FastScroller_showBubble, showBubble)
+ showBubbleAlways = getBoolean(R.styleable.FastScroller_showBubbleAlways, showBubbleAlways)
+ showTrack = getBoolean(R.styleable.FastScroller_showTrack, showTrack)
+ bubbleSize = getBubbleSize(R.styleable.FastScroller_bubbleSize, BubbleSize.NORMAL)
+ val textSize = getDimension(R.styleable.FastScroller_bubbleTextSize, bubbleSize.textSize)
+ binding.bubble.setTextSize(TypedValue.COMPLEX_UNIT_PX, textSize)
+ }
+
+ setTrackColor(trackColor)
+ setHandleColor(handleColor)
+ setBubbleColor(bubbleColor)
+ setBubbleTextColor(textColor)
+ setHideScrollbar(hideScrollbar)
+ setBubbleVisible(showBubble, showBubbleAlways)
+ setTrackVisible(showTrack)
+ }
+
+ override fun onSizeChanged(w: Int, h: Int, oldW: Int, oldH: Int) {
+ super.onSizeChanged(w, h, oldW, oldH)
+ viewHeight = h
+ }
+
+ @SuppressLint("ClickableViewAccessibility")
+ override fun onTouchEvent(event: MotionEvent): Boolean {
+ val setYPositions: () -> Unit = {
+ val y = event.y
+ setViewPositions(y)
+ setRecyclerViewPosition(y)
+ }
+
+ when (event.actionMasked) {
+ MotionEvent.ACTION_DOWN -> {
+ if (event.x.toInt() !in binding.scrollbar.left..binding.scrollbar.right) return false
+
+ requestDisallowInterceptTouchEvent(true)
+ setHandleSelected(true)
+
+ handler.removeCallbacks(scrollbarHider)
+ showScrollbar()
+ if (showBubble && sectionIndexer != null) showBubble()
+
+ fastScrollListener?.onFastScrollStart(this)
+
+ setYPositions()
+ return true
+ }
+ MotionEvent.ACTION_MOVE -> {
+ setYPositions()
+ return true
+ }
+ MotionEvent.ACTION_UP, MotionEvent.ACTION_CANCEL -> {
+ requestDisallowInterceptTouchEvent(false)
+ setHandleSelected(false)
+
+ if (hideScrollbar) handler.postDelayed(scrollbarHider, SCROLLBAR_HIDE_DELAY)
+ if (!showBubbleAlways) hideBubble()
+
+ fastScrollListener?.onFastScrollStop(this)
+
+ return true
+ }
+ }
+
+ return super.onTouchEvent(event)
+ }
+
+ /**
+ * Set the enabled state of this view.
+ *
+ * @param enabled True if this view is enabled, false otherwise
+ */
+ override fun setEnabled(enabled: Boolean) {
+ super.setEnabled(enabled)
+ isVisible = enabled
+ }
+
+ /**
+ * Set the [ViewGroup.LayoutParams] associated with this view. These supply
+ * parameters to the *parent* of this view specifying how it should be arranged.
+ *
+ * @param params The [ViewGroup.LayoutParams] for this view, cannot be null
+ */
+ override fun setLayoutParams(params: ViewGroup.LayoutParams) {
+ params.width = LayoutParams.WRAP_CONTENT
+ super.setLayoutParams(params)
+ }
+
+ /**
+ * Set the [ViewGroup.LayoutParams] associated with this view. These supply
+ * parameters to the *parent* of this view specifying how it should be arranged.
+ *
+ * @param viewGroup The parent [ViewGroup] for this view, cannot be null
+ */
+ fun setLayoutParams(viewGroup: ViewGroup) {
+ val recyclerViewId = recyclerView?.id ?: NO_ID
+ val marginTop = resources.getDimensionPixelSize(R.dimen.fastscroll_scrollbar_margin_top)
+ val marginBottom = resources.getDimensionPixelSize(R.dimen.fastscroll_scrollbar_margin_bottom)
+
+ require(recyclerViewId != NO_ID) { "RecyclerView must have a view ID" }
+
+ when (viewGroup) {
+ is ConstraintLayout -> {
+ val endId = if (recyclerView?.parent === parent) recyclerViewId else ConstraintSet.PARENT_ID
+ val startId = id
+
+ ConstraintSet().apply {
+ clone(viewGroup)
+ connect(startId, ConstraintSet.TOP, endId, ConstraintSet.TOP)
+ connect(startId, ConstraintSet.BOTTOM, endId, ConstraintSet.BOTTOM)
+ connect(startId, ConstraintSet.END, endId, ConstraintSet.END)
+ applyTo(viewGroup)
+ }
+
+ layoutParams = (layoutParams as ConstraintLayout.LayoutParams).apply {
+ height = 0
+ setMargins(0, marginTop, 0, marginBottom)
+ }
+ }
+ is CoordinatorLayout -> layoutParams = (layoutParams as CoordinatorLayout.LayoutParams).apply {
+ height = LayoutParams.MATCH_PARENT
+ anchorGravity = GravityCompat.END
+ anchorId = recyclerViewId
+ setMargins(0, marginTop, 0, marginBottom)
+ }
+ is FrameLayout -> layoutParams = (layoutParams as FrameLayout.LayoutParams).apply {
+ height = LayoutParams.MATCH_PARENT
+ gravity = GravityCompat.END
+ setMargins(0, marginTop, 0, marginBottom)
+ }
+ is RelativeLayout -> layoutParams = (layoutParams as RelativeLayout.LayoutParams).apply {
+ height = 0
+ addRule(RelativeLayout.ALIGN_TOP, recyclerViewId)
+ addRule(RelativeLayout.ALIGN_BOTTOM, recyclerViewId)
+ addRule(RelativeLayout.ALIGN_END, recyclerViewId)
+ setMargins(0, marginTop, 0, marginBottom)
+ }
+ else -> throw IllegalArgumentException("Parent ViewGroup must be a ConstraintLayout, CoordinatorLayout, FrameLayout, or RelativeLayout")
+ }
+
+ updateViewHeights()
+ }
+
+ /**
+ * Set the [RecyclerView] associated with this [FastScroller]. This allows the
+ * FastScroller to set its layout parameters and listen for scroll changes.
+ *
+ * @param recyclerView The [RecyclerView] to attach, cannot be null
+ * @see detachRecyclerView
+ */
+ fun attachRecyclerView(recyclerView: RecyclerView) {
+ if (this.recyclerView != null) {
+ detachRecyclerView()
+ }
+ this.recyclerView = recyclerView
+
+ if (parent is ViewGroup) {
+ setLayoutParams(parent as ViewGroup)
+ } else if (recyclerView.parent is ViewGroup) {
+ val viewGroup = recyclerView.parent as ViewGroup
+ viewGroup.addView(this)
+ setLayoutParams(viewGroup)
+ }
+
+ recyclerView.addOnScrollListener(scrollListener)
+
+ // set initial positions for bubble and thumb
+ post { setViewPositions(this.recyclerView?.scrollProportion ?: 0f) }
+ }
+
+ /**
+ * Clears references to the attached [RecyclerView] and stops listening for scroll changes.
+ *
+ * @see attachRecyclerView
+ */
+ fun detachRecyclerView() {
+ recyclerView?.removeOnScrollListener(scrollListener)
+ recyclerView = null
+ }
+
+ /**
+ * Set a new [FastScrollListener] that will listen to fast scroll events.
+ *
+ * @param fastScrollListener The new [FastScrollListener] to set, or null to set none
+ */
+ fun setFastScrollListener(fastScrollListener: FastScrollListener?) {
+ this.fastScrollListener = fastScrollListener
+ }
+
+ /**
+ * Set a new [SectionIndexer] that provides section text for this [FastScroller].
+ *
+ * @param sectionIndexer The new [SectionIndexer] to set, or null to set none
+ */
+ fun setSectionIndexer(sectionIndexer: SectionIndexer?) {
+ this.sectionIndexer = sectionIndexer
+ }
+
+ /**
+ * Hide the scrollbar when not scrolling.
+ *
+ * @param hideScrollbar True to hide the scrollbar, false to show
+ */
+ fun setHideScrollbar(hideScrollbar: Boolean) {
+ if (this.hideScrollbar != hideScrollbar) {
+ this.hideScrollbar = hideScrollbar
+ binding.scrollbar.isGone = hideScrollbar
+ }
+ }
+
+ /**
+ * Show the scroll track while scrolling.
+ *
+ * @param visible True to show scroll track, false to hide
+ */
+ fun setTrackVisible(visible: Boolean) {
+ binding.track.isVisible = visible
+ }
+
+ /**
+ * Set the color of the scroll track.
+ *
+ * @param color The color for the scroll track
+ */
+ fun setTrackColor(@ColorInt color: Int) {
+ if (trackImage == null) {
+ trackImage = ContextCompat.getDrawable(context, R.drawable.fastscroll_track)
+ }
+
+ trackImage?.let {
+ it.setTint(color)
+ binding.track.setImageDrawable(it)
+ }
+ }
+
+ /**
+ * Set the color of the scroll thumb.
+ *
+ * @param color The color for the scroll thumb
+ */
+ fun setHandleColor(@ColorInt color: Int) {
+ handleColor = color
+
+ if (handleImage == null) {
+ handleImage = ContextCompat.getDrawable(context, R.drawable.fastscroll_handle)
+ }
+
+ handleImage?.let {
+ it.setTint(handleColor)
+ binding.thumb.setImageDrawable(it)
+ }
+ }
+
+ /**
+ * Show the section bubble while scrolling.
+ *
+ * @param visible True to show the bubble, false to hide
+ * @param always True to always show the bubble, false to only show on thumb touch
+ */
+ @JvmOverloads
+ fun setBubbleVisible(visible: Boolean, always: Boolean = false) {
+ showBubble = visible
+ showBubbleAlways = visible && always
+ }
+
+ /**
+ * Set the background color of the section bubble.
+ *
+ * @param color The background color for the section bubble
+ */
+ fun setBubbleColor(@ColorInt color: Int) {
+ bubbleColor = color
+
+ if (bubbleImage == null) {
+ bubbleImage = ContextCompat.getDrawable(context, bubbleSize.drawableId)
+ }
+
+ bubbleImage?.let {
+ it.setTint(bubbleColor)
+ binding.bubble.background = it
+ }
+ }
+
+ /**
+ * Set the text color of the section bubble.
+ *
+ * @param color The text color for the section bubble
+ */
+ fun setBubbleTextColor(@ColorInt color: Int) = binding.bubble.setTextColor(color)
+
+ /**
+ * Set the scaled pixel text size of the section bubble.
+ *
+ * @param size The scaled pixel text size for the section bubble
+ */
+ fun setBubbleTextSize(size: Int) {
+ binding.bubble.textSize = size.toFloat()
+ }
+
+ private fun getRecyclerViewTargetPosition(y: Float) = recyclerView?.let { recyclerView ->
+ val itemCount = recyclerView.adapter?.itemCount ?: 0
+
+ val proportion = when {
+ binding.thumb.y == 0f -> 0f
+ binding.thumb.y + handleHeight >= viewHeight - TRACK_SNAP_RANGE -> 1f
+ else -> y / viewHeight.toFloat()
+ }
+
+ var scrolledItemCount = (proportion * itemCount).roundToInt()
+
+ if (recyclerView.layoutManager.isLayoutReversed) {
+ scrolledItemCount = itemCount - scrolledItemCount
+ }
+
+ if (itemCount > 0) scrolledItemCount.coerceIn(0, itemCount - 1) else 0
+ } ?: 0
+
+ private fun setRecyclerViewPosition(y: Float) {
+ val layoutManager = recyclerView?.layoutManager ?: return
+ val targetPos = getRecyclerViewTargetPosition(y)
+ layoutManager.scrollToPosition(targetPos)
+ if (showBubble) sectionIndexer?.let { binding.bubble.text = it.getSectionText(context, targetPos) }
+ }
+
+ private fun setViewPositions(y: Float) {
+ bubbleHeight = binding.bubble.measuredHeight
+ handleHeight = binding.thumb.measuredHeight
+
+ val bubbleHandleHeight = bubbleHeight + handleHeight / 2f
+
+ if (showBubble && viewHeight >= bubbleHandleHeight) {
+ binding.bubble.y = (y - bubbleHeight).coerceIn(0f, viewHeight - bubbleHandleHeight)
+ }
+
+ if (viewHeight >= handleHeight) {
+ binding.thumb.y = (y - handleHeight / 2).coerceIn(0f, viewHeight - handleHeight.toFloat())
+ }
+ }
+
+ private fun updateViewHeights() {
+ val measureSpec = MeasureSpec.makeMeasureSpec(MeasureSpec.UNSPECIFIED, MeasureSpec.UNSPECIFIED)
+ binding.bubble.measure(measureSpec, measureSpec)
+ bubbleHeight = binding.bubble.measuredHeight
+ binding.thumb.measure(measureSpec, measureSpec)
+ handleHeight = binding.thumb.measuredHeight
+ }
+
+ private fun showBubble() {
+ bubbleAnimator.show()
+ }
+
+ private fun hideBubble() {
+ bubbleAnimator.hide()
+ }
+
+ private fun showScrollbar() {
+ if (recyclerView?.run { canScrollVertically(1) || canScrollVertically(-1) } == true) {
+ scrollbarAnimator.show()
+ }
+ }
+
+ private fun hideScrollbar() {
+ scrollbarAnimator.hide()
+ }
+
+ private fun setHandleSelected(selected: Boolean) {
+ binding.thumb.isSelected = selected
+ handleImage?.setTint(if (selected) bubbleColor else handleColor)
+ }
+
+ private fun TypedArray.getBubbleSize(@StyleableRes index: Int, defaultValue: BubbleSize): BubbleSize {
+ val ordinal = getInt(index, -1)
+ return BubbleSize.values().getOrNull(ordinal) ?: defaultValue
+ }
+
+ private val BubbleSize.textSize
+ @Px get() = resources.getDimension(textSizeId)
+
+ interface FastScrollListener {
+
+ fun onFastScrollStart(fastScroller: FastScroller)
+
+ fun onFastScrollStop(fastScroller: FastScroller)
+ }
+
+ interface SectionIndexer {
+
+ fun getSectionText(context: Context, position: Int): CharSequence
+ }
+}
\ No newline at end of file
diff --git a/app/src/main/java/org/koitharu/kotatsu/base/ui/list/fastscroll/ScrollbarAnimator.kt b/app/src/main/java/org/koitharu/kotatsu/base/ui/list/fastscroll/ScrollbarAnimator.kt
new file mode 100644
index 000000000..a00fc90b9
--- /dev/null
+++ b/app/src/main/java/org/koitharu/kotatsu/base/ui/list/fastscroll/ScrollbarAnimator.kt
@@ -0,0 +1,69 @@
+package org.koitharu.kotatsu.base.ui.list.fastscroll
+
+import android.animation.Animator
+import android.animation.AnimatorListenerAdapter
+import android.view.View
+import android.view.ViewPropertyAnimator
+import androidx.core.view.isInvisible
+import androidx.core.view.isVisible
+import org.koitharu.kotatsu.R
+import org.koitharu.kotatsu.utils.ext.animatorDurationScale
+
+class ScrollbarAnimator(
+ private val scrollbar: View,
+ private val scrollbarPaddingEnd: Float,
+) {
+
+ private val animationDuration = (scrollbar.resources.getInteger(R.integer.config_defaultAnimTime) *
+ scrollbar.context.animatorDurationScale).toLong()
+ private var animator: ViewPropertyAnimator? = null
+ private var isHiding = false
+
+ fun show() {
+ if (scrollbar.isVisible && !isHiding) {
+ return
+ }
+ isHiding = false
+ animator?.cancel()
+ scrollbar.translationX = scrollbarPaddingEnd
+ scrollbar.isVisible = true
+ animator = scrollbar
+ .animate()
+ .translationX(0f)
+ .alpha(1f)
+ .setDuration(animationDuration)
+ }
+
+ fun hide() {
+ if (!scrollbar.isVisible || isHiding) {
+ return
+ }
+ animator?.cancel()
+ isHiding = true
+ animator = scrollbar
+ .animate()
+ .translationX(scrollbarPaddingEnd)
+ .alpha(0f)
+ .setDuration(animationDuration)
+ .setListener(HideListener())
+ }
+
+ private inner class HideListener : AnimatorListenerAdapter() {
+
+ private var isCancelled = false
+
+ override fun onAnimationCancel(animation: Animator?) {
+ super.onAnimationCancel(animation)
+ isCancelled = true
+ }
+
+ override fun onAnimationEnd(animation: Animator?) {
+ super.onAnimationEnd(animation)
+ if (!isCancelled && animation === this@ScrollbarAnimator.animator) {
+ scrollbar.isInvisible = true
+ isHiding = false
+ this@ScrollbarAnimator.animator = null
+ }
+ }
+ }
+}
\ No newline at end of file
diff --git a/app/src/main/java/org/koitharu/kotatsu/base/ui/util/ActivityRecreationHandle.kt b/app/src/main/java/org/koitharu/kotatsu/base/ui/util/ActivityRecreationHandle.kt
index f072da2fa..985205ed6 100644
--- a/app/src/main/java/org/koitharu/kotatsu/base/ui/util/ActivityRecreationHandle.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/base/ui/util/ActivityRecreationHandle.kt
@@ -4,8 +4,11 @@ import android.app.Activity
import android.app.Application.ActivityLifecycleCallbacks
import android.os.Bundle
import java.util.*
+import javax.inject.Inject
+import javax.inject.Singleton
-class ActivityRecreationHandle : ActivityLifecycleCallbacks {
+@Singleton
+class ActivityRecreationHandle @Inject constructor() : ActivityLifecycleCallbacks {
private val activities = WeakHashMap()
@@ -31,4 +34,4 @@ class ActivityRecreationHandle : ActivityLifecycleCallbacks {
val snapshot = activities.keys.toList()
snapshot.forEach { it.recreate() }
}
-}
\ No newline at end of file
+}
diff --git a/app/src/main/java/org/koitharu/kotatsu/base/ui/util/BaseActivityEntryPoint.kt b/app/src/main/java/org/koitharu/kotatsu/base/ui/util/BaseActivityEntryPoint.kt
new file mode 100644
index 000000000..232529d52
--- /dev/null
+++ b/app/src/main/java/org/koitharu/kotatsu/base/ui/util/BaseActivityEntryPoint.kt
@@ -0,0 +1,18 @@
+package org.koitharu.kotatsu.base.ui.util
+
+import dagger.hilt.EntryPoint
+import dagger.hilt.InstallIn
+import dagger.hilt.components.SingletonComponent
+import org.koitharu.kotatsu.base.ui.BaseActivity
+import org.koitharu.kotatsu.core.prefs.AppSettings
+
+@EntryPoint
+@InstallIn(SingletonComponent::class)
+interface BaseActivityEntryPoint {
+ val settings: AppSettings
+}
+
+// Hilt cannot inject into parametrized classes
+fun BaseActivityEntryPoint.inject(activity: BaseActivity<*>) {
+ activity.settings = settings
+}
diff --git a/app/src/main/java/org/koitharu/kotatsu/base/ui/util/ReversibleAction.kt b/app/src/main/java/org/koitharu/kotatsu/base/ui/util/ReversibleAction.kt
new file mode 100644
index 000000000..57bb80a78
--- /dev/null
+++ b/app/src/main/java/org/koitharu/kotatsu/base/ui/util/ReversibleAction.kt
@@ -0,0 +1,9 @@
+package org.koitharu.kotatsu.base.ui.util
+
+import androidx.annotation.StringRes
+import org.koitharu.kotatsu.base.domain.ReversibleHandle
+
+class ReversibleAction(
+ @StringRes val stringResId: Int,
+ val handle: ReversibleHandle?,
+)
\ No newline at end of file
diff --git a/app/src/main/java/org/koitharu/kotatsu/base/ui/util/StatusBarDimHelper.kt b/app/src/main/java/org/koitharu/kotatsu/base/ui/util/StatusBarDimHelper.kt
new file mode 100644
index 000000000..7a8bf28d4
--- /dev/null
+++ b/app/src/main/java/org/koitharu/kotatsu/base/ui/util/StatusBarDimHelper.kt
@@ -0,0 +1,42 @@
+package org.koitharu.kotatsu.base.ui.util
+
+import android.animation.ValueAnimator
+import android.view.animation.AccelerateDecelerateInterpolator
+import com.google.android.material.R as materialR
+import com.google.android.material.appbar.AppBarLayout
+import com.google.android.material.shape.MaterialShapeDrawable
+import org.koitharu.kotatsu.utils.ext.getAnimationDuration
+
+class StatusBarDimHelper : AppBarLayout.OnOffsetChangedListener {
+
+ private var animator: ValueAnimator? = null
+ private val interpolator = AccelerateDecelerateInterpolator()
+
+ override fun onOffsetChanged(appBarLayout: AppBarLayout, verticalOffset: Int) {
+ val foreground = appBarLayout.statusBarForeground ?: return
+ val start = foreground.alpha
+ val collapsed = verticalOffset != 0
+ val end = if (collapsed) 255 else 0
+ animator?.cancel()
+ if (start == end) {
+ animator = null
+ return
+ }
+ animator = ValueAnimator.ofInt(start, end).apply {
+ duration = appBarLayout.context.getAnimationDuration(materialR.integer.app_bar_elevation_anim_duration)
+ interpolator = this@StatusBarDimHelper.interpolator
+ addUpdateListener {
+ foreground.alpha = it.animatedValue as Int
+ }
+ start()
+ }
+ }
+
+ fun attachToAppBar(appBarLayout: AppBarLayout) {
+ appBarLayout.addOnOffsetChangedListener(this)
+ appBarLayout.statusBarForeground =
+ MaterialShapeDrawable.createWithElevationOverlay(appBarLayout.context).apply {
+ alpha = 0
+ }
+ }
+}
diff --git a/app/src/main/java/org/koitharu/kotatsu/base/ui/widgets/BottomSheetHeaderBar.kt b/app/src/main/java/org/koitharu/kotatsu/base/ui/widgets/BottomSheetHeaderBar.kt
new file mode 100644
index 000000000..3aaa7270d
--- /dev/null
+++ b/app/src/main/java/org/koitharu/kotatsu/base/ui/widgets/BottomSheetHeaderBar.kt
@@ -0,0 +1,271 @@
+package org.koitharu.kotatsu.base.ui.widgets
+
+import android.animation.LayoutTransition
+import android.content.Context
+import android.transition.AutoTransition
+import android.transition.TransitionManager
+import android.util.AttributeSet
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import android.view.WindowInsets
+import android.view.animation.AccelerateDecelerateInterpolator
+import android.view.animation.DecelerateInterpolator
+import androidx.annotation.AttrRes
+import androidx.annotation.StringRes
+import androidx.appcompat.widget.Toolbar
+import androidx.coordinatorlayout.widget.CoordinatorLayout
+import androidx.core.content.withStyledAttributes
+import androidx.core.view.*
+import androidx.lifecycle.Lifecycle
+import androidx.lifecycle.LifecycleOwner
+import com.google.android.material.R as materialR
+import com.google.android.material.appbar.AppBarLayout
+import com.google.android.material.appbar.MaterialToolbar
+import com.google.android.material.bottomsheet.BottomSheetBehavior
+import java.util.*
+import org.koitharu.kotatsu.R
+import org.koitharu.kotatsu.databinding.LayoutSheetHeaderBinding
+import org.koitharu.kotatsu.utils.ext.getAnimationDuration
+import org.koitharu.kotatsu.utils.ext.getThemeDrawable
+import org.koitharu.kotatsu.utils.ext.parents
+
+class BottomSheetHeaderBar @JvmOverloads constructor(
+ context: Context,
+ attrs: AttributeSet? = null,
+ @AttrRes defStyleAttr: Int = materialR.attr.appBarLayoutStyle,
+) : AppBarLayout(context, attrs, defStyleAttr), MenuHost {
+
+ private val binding = LayoutSheetHeaderBinding.inflate(LayoutInflater.from(context), this)
+ private val closeDrawable = context.getThemeDrawable(materialR.attr.actionModeCloseDrawable)
+ private val bottomSheetCallback = Callback()
+ private var bottomSheetBehavior: BottomSheetBehavior<*>? = null
+ private val locationBuffer = IntArray(2)
+ private val expansionListeners = LinkedList()
+ private var fitStatusBar = false
+ private var transition: AutoTransition? = null
+
+ @Deprecated("")
+ val toolbar: MaterialToolbar
+ get() = binding.toolbar
+
+ var title: CharSequence?
+ get() = binding.toolbar.title
+ set(value) {
+ binding.toolbar.title = value
+ }
+
+ var subtitle: CharSequence?
+ get() = binding.toolbar.subtitle
+ set(value) {
+ binding.toolbar.subtitle = value
+ }
+
+ init {
+ setBackgroundResource(R.drawable.sheet_toolbar_background)
+ layoutTransition = LayoutTransition().apply {
+ setDuration(context.getAnimationDuration(R.integer.config_tinyAnimTime))
+ }
+ context.withStyledAttributes(attrs, R.styleable.BottomSheetHeaderBar, defStyleAttr) {
+ binding.toolbar.title = getString(R.styleable.BottomSheetHeaderBar_title)
+ fitStatusBar = getBoolean(R.styleable.BottomSheetHeaderBar_fitStatusBar, fitStatusBar)
+ val menuResId = getResourceId(R.styleable.BottomSheetHeaderBar_menu, 0)
+ if (menuResId != 0) {
+ binding.toolbar.inflateMenu(menuResId)
+ }
+ }
+ binding.toolbar.setNavigationOnClickListener(bottomSheetCallback)
+ }
+
+ override fun onAttachedToWindow() {
+ super.onAttachedToWindow()
+ setBottomSheetBehavior(findParentBottomSheetBehavior())
+ }
+
+ override fun onDetachedFromWindow() {
+ setBottomSheetBehavior(null)
+ super.onDetachedFromWindow()
+ }
+
+ override fun addView(child: View?, index: Int) {
+ if (shouldAddView(child)) {
+ super.addView(child, index)
+ } else {
+ binding.toolbar.addView(child, index)
+ }
+ }
+
+ override fun addView(child: View?, width: Int, height: Int) {
+ if (shouldAddView(child)) {
+ super.addView(child, width, height)
+ } else {
+ binding.toolbar.addView(child, width, height)
+ }
+ }
+
+ override fun addView(child: View?, index: Int, params: ViewGroup.LayoutParams?) {
+ if (shouldAddView(child)) {
+ super.addView(child, index, params)
+ } else {
+ binding.toolbar.addView(child, index, convertLayoutParams(params))
+ }
+ }
+
+ override fun onApplyWindowInsets(insets: WindowInsets?): WindowInsets {
+ dispatchInsets(if (insets != null) WindowInsetsCompat.toWindowInsetsCompat(insets) else null)
+ return super.onApplyWindowInsets(insets)
+ }
+
+ override fun addMenuProvider(provider: MenuProvider) {
+ binding.toolbar.addMenuProvider(provider)
+ }
+
+ override fun addMenuProvider(provider: MenuProvider, owner: LifecycleOwner) {
+ binding.toolbar.addMenuProvider(provider, owner)
+ }
+
+ override fun addMenuProvider(provider: MenuProvider, owner: LifecycleOwner, state: Lifecycle.State) {
+ binding.toolbar.addMenuProvider(provider, owner, state)
+ }
+
+ override fun removeMenuProvider(provider: MenuProvider) {
+ binding.toolbar.removeMenuProvider(provider)
+ }
+
+ override fun invalidateMenu() {
+ binding.toolbar.invalidateMenu()
+ }
+
+ fun setNavigationOnClickListener(onClickListener: OnClickListener) {
+ binding.toolbar.setNavigationOnClickListener(onClickListener)
+ }
+
+ fun addOnExpansionChangeListener(listener: OnExpansionChangeListener) {
+ expansionListeners.add(listener)
+ }
+
+ fun removeOnExpansionChangeListener(listener: OnExpansionChangeListener) {
+ expansionListeners.remove(listener)
+ }
+
+ fun setTitle(@StringRes resId: Int) {
+ binding.toolbar.setTitle(resId)
+ }
+
+ fun setSubtitle(@StringRes resId: Int) {
+ binding.toolbar.setSubtitle(resId)
+ }
+
+ private fun setBottomSheetBehavior(behavior: BottomSheetBehavior<*>?) {
+ bottomSheetBehavior?.removeBottomSheetCallback(bottomSheetCallback)
+ bottomSheetBehavior = behavior
+ if (behavior != null) {
+ onBottomSheetStateChanged(behavior.state)
+ behavior.addBottomSheetCallback(bottomSheetCallback)
+ }
+ }
+
+ private fun onBottomSheetStateChanged(newState: Int) {
+ val isExpanded = newState == BottomSheetBehavior.STATE_EXPANDED && isOnTopOfScreen()
+ if (isExpanded == binding.dragHandle.isGone) {
+ return
+ }
+ TransitionManager.beginDelayedTransition(this, getTransition())
+ binding.toolbar.navigationIcon = (if (isExpanded) closeDrawable else null)
+ binding.dragHandle.isGone = isExpanded
+ expansionListeners.forEach { it.onExpansionStateChanged(this, isExpanded) }
+ dispatchInsets(ViewCompat.getRootWindowInsets(this))
+ }
+
+ private fun dispatchInsets(insets: WindowInsetsCompat?) {
+ if (!fitStatusBar) {
+ return
+ }
+ val isExpanded = binding.dragHandle.isGone
+ if (isExpanded) {
+ val topInset = insets?.getInsets(WindowInsetsCompat.Type.systemBars())?.top ?: 0
+ updatePadding(top = topInset)
+ } else {
+ updatePadding(top = 0)
+ }
+ }
+
+ private fun findParentBottomSheetBehavior(): BottomSheetBehavior<*>? {
+ for (p in parents) {
+ val layoutParams = (p as? View)?.layoutParams
+ if (layoutParams is CoordinatorLayout.LayoutParams) {
+ val behavior = layoutParams.behavior
+ if (behavior is BottomSheetBehavior<*>) {
+ return behavior
+ }
+ }
+ }
+ return null
+ }
+
+ private fun isOnTopOfScreen(): Boolean {
+ getLocationInWindow(locationBuffer)
+ val topInset = ViewCompat.getRootWindowInsets(this)
+ ?.getInsets(WindowInsetsCompat.Type.systemBars())?.top ?: 0
+ val zeroTop = (layoutParams as? MarginLayoutParams)?.topMargin ?: 0
+ return (locationBuffer[1] - topInset) <= zeroTop
+ }
+
+ private fun dismissBottomSheet() {
+ val behavior = bottomSheetBehavior ?: return
+ if (behavior.isHideable) {
+ behavior.state = BottomSheetBehavior.STATE_HIDDEN
+ } else {
+ behavior.state = BottomSheetBehavior.STATE_COLLAPSED
+ }
+ }
+
+ private fun shouldAddView(child: View?): Boolean {
+ if (child == null) {
+ return true
+ }
+ val viewId = child.id
+ return viewId == R.id.dragHandle || viewId == R.id.toolbar || viewId == R.id.frame
+ }
+
+ private fun convertLayoutParams(params: ViewGroup.LayoutParams?): Toolbar.LayoutParams? {
+ return when (params) {
+ null -> null
+ is MarginLayoutParams -> {
+ val lp = Toolbar.LayoutParams(params)
+ if (params is LayoutParams) {
+ lp.gravity = params.gravity
+ }
+ lp
+ }
+ else -> Toolbar.LayoutParams(params)
+ }
+ }
+
+ private fun getTransition(): AutoTransition {
+ transition?.let { return it }
+ val t = AutoTransition()
+ t.duration = context.getAnimationDuration(android.R.integer.config_shortAnimTime)
+ t.addTarget(binding.dragHandle)
+ transition = t
+ return t
+ }
+
+ private inner class Callback : BottomSheetBehavior.BottomSheetCallback(), View.OnClickListener {
+
+ override fun onStateChanged(bottomSheet: View, newState: Int) {
+ onBottomSheetStateChanged(newState)
+ }
+
+ override fun onSlide(bottomSheet: View, slideOffset: Float) = Unit
+
+ override fun onClick(v: View?) {
+ dismissBottomSheet()
+ }
+ }
+
+ fun interface OnExpansionChangeListener {
+
+ fun onExpansionStateChanged(headerBar: BottomSheetHeaderBar, isExpanded: Boolean)
+ }
+}
diff --git a/app/src/main/java/org/koitharu/kotatsu/base/ui/widgets/CheckableButtonGroup.kt b/app/src/main/java/org/koitharu/kotatsu/base/ui/widgets/CheckableButtonGroup.kt
index 77d4acc2c..f159a56cd 100644
--- a/app/src/main/java/org/koitharu/kotatsu/base/ui/widgets/CheckableButtonGroup.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/base/ui/widgets/CheckableButtonGroup.kt
@@ -8,23 +8,33 @@ import android.widget.LinearLayout
import androidx.annotation.AttrRes
import androidx.annotation.IdRes
import androidx.core.view.children
+import com.google.android.material.R as materialR
import com.google.android.material.button.MaterialButton
+import com.google.android.material.shape.ShapeAppearanceModel
class CheckableButtonGroup @JvmOverloads constructor(
context: Context,
attrs: AttributeSet? = null,
- @AttrRes defStyleAttr: Int = 0,
-) : LinearLayout(context, attrs, defStyleAttr), View.OnClickListener {
+ @AttrRes defStyleAttr: Int = materialR.attr.materialButtonToggleGroupStyle,
+) : LinearLayout(context, attrs, defStyleAttr, materialR.style.Widget_MaterialComponents_MaterialButtonToggleGroup),
+ View.OnClickListener {
+
+ private val originalCornerData = ArrayList()
var onCheckedChangeListener: OnCheckedChangeListener? = null
override fun addView(child: View?, index: Int, params: ViewGroup.LayoutParams?) {
if (child is MaterialButton) {
- child.setOnClickListener(this)
+ setupButton(child)
}
super.addView(child, index, params)
}
+ override fun onFinishInflate() {
+ super.onFinishInflate()
+ updateChildShapes()
+ }
+
override fun onClick(v: View) {
setCheckedId(v.id)
}
@@ -36,7 +46,74 @@ class CheckableButtonGroup @JvmOverloads constructor(
onCheckedChangeListener?.onCheckedChanged(this, viewRes)
}
+ private fun updateChildShapes() {
+ val childCount = childCount
+ val firstVisibleChildIndex = 0
+ val lastVisibleChildIndex = childCount - 1
+ for (i in 0 until childCount) {
+ val button: MaterialButton = getChildAt(i) as? MaterialButton ?: continue
+ if (button.visibility == GONE) {
+ continue
+ }
+ val builder = button.shapeAppearanceModel.toBuilder()
+ val newCornerData: CornerData? =
+ getNewCornerData(i, firstVisibleChildIndex, lastVisibleChildIndex)
+ updateBuilderWithCornerData(builder, newCornerData)
+ button.shapeAppearanceModel = builder.build()
+ }
+ }
+
+ private fun setupButton(button: MaterialButton) {
+ button.setOnClickListener(this)
+ button.isElegantTextHeight = false
+ // Saves original corner data
+ val shapeAppearanceModel: ShapeAppearanceModel = button.shapeAppearanceModel
+ originalCornerData.add(
+ CornerData(
+ shapeAppearanceModel.topLeftCornerSize,
+ shapeAppearanceModel.bottomLeftCornerSize,
+ shapeAppearanceModel.topRightCornerSize,
+ shapeAppearanceModel.bottomRightCornerSize,
+ ),
+ )
+ }
+
+ private fun getNewCornerData(
+ index: Int,
+ firstVisibleChildIndex: Int,
+ lastVisibleChildIndex: Int,
+ ): CornerData? {
+ val cornerData: CornerData = originalCornerData.get(index)
+
+ // If only one (visible) child exists, use its original corners
+ if (firstVisibleChildIndex == lastVisibleChildIndex) {
+ return cornerData
+ }
+ val isHorizontal = orientation == HORIZONTAL
+ if (index == firstVisibleChildIndex) {
+ return if (isHorizontal) cornerData.start(this) else cornerData.top()
+ }
+ return if (index == lastVisibleChildIndex) {
+ if (isHorizontal) cornerData.end(this) else cornerData.bottom()
+ } else null
+ }
+
+ private fun updateBuilderWithCornerData(
+ shapeAppearanceModelBuilder: ShapeAppearanceModel.Builder,
+ cornerData: CornerData?,
+ ) {
+ if (cornerData == null) {
+ shapeAppearanceModelBuilder.setAllCornerSizes(0f)
+ return
+ }
+ shapeAppearanceModelBuilder
+ .setTopLeftCornerSize(cornerData.topLeft)
+ .setBottomLeftCornerSize(cornerData.bottomLeft)
+ .setTopRightCornerSize(cornerData.topRight)
+ .setBottomRightCornerSize(cornerData.bottomRight)
+ }
+
fun interface OnCheckedChangeListener {
fun onCheckedChanged(group: CheckableButtonGroup, checkedId: Int)
}
-}
\ No newline at end of file
+}
diff --git a/app/src/main/java/org/koitharu/kotatsu/base/ui/widgets/ChipsView.kt b/app/src/main/java/org/koitharu/kotatsu/base/ui/widgets/ChipsView.kt
index c20b615cf..809add879 100644
--- a/app/src/main/java/org/koitharu/kotatsu/base/ui/widgets/ChipsView.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/base/ui/widgets/ChipsView.kt
@@ -5,23 +5,26 @@ import android.util.AttributeSet
import android.view.View.OnClickListener
import androidx.annotation.DrawableRes
import androidx.core.view.children
+import com.google.android.material.R as materialR
import com.google.android.material.chip.Chip
import com.google.android.material.chip.ChipDrawable
import com.google.android.material.chip.ChipGroup
import org.koitharu.kotatsu.R
+import org.koitharu.kotatsu.utils.ext.castOrNull
+import org.koitharu.kotatsu.utils.ext.getThemeColorStateList
class ChipsView @JvmOverloads constructor(
context: Context,
attrs: AttributeSet? = null,
- defStyleAttr: Int = com.google.android.material.R.attr.chipGroupStyle
+ defStyleAttr: Int = com.google.android.material.R.attr.chipGroupStyle,
) : ChipGroup(context, attrs, defStyleAttr) {
private var isLayoutSuppressedCompat = false
private var isLayoutCalledOnSuppressed = false
- private var chipOnClickListener = OnClickListener {
+ private val chipOnClickListener = OnClickListener {
onChipClickListener?.onChipClick(it as Chip, it.tag)
}
- private var chipOnCloseListener = OnClickListener {
+ private val chipOnCloseListener = OnClickListener {
onChipCloseClickListener?.onChipCloseClick(it as Chip, it.tag)
}
var onChipClickListener: OnChipClickListener? = null
@@ -60,15 +63,27 @@ class ChipsView @JvmOverloads constructor(
}
}
+ fun getCheckedData(cls: Class): Set {
+ val result = LinkedHashSet(childCount)
+ for (child in children) {
+ if (child is Chip && child.isChecked) {
+ result += cls.castOrNull(child.tag) ?: continue
+ }
+ }
+ return result
+ }
+
private fun bindChip(chip: Chip, model: ChipModel) {
chip.text = model.title
if (model.icon == 0) {
chip.isChipIconVisible = false
} else {
- chip.isCheckedIconVisible = true
+ chip.isChipIconVisible = true
chip.setChipIconResource(model.icon)
}
- chip.isClickable = onChipClickListener != null
+ chip.isClickable = onChipClickListener != null || model.isCheckable
+ chip.isCheckable = model.isCheckable
+ chip.isChecked = model.isChecked
chip.tag = model.data
}
@@ -76,11 +91,13 @@ class ChipsView @JvmOverloads constructor(
val chip = Chip(context)
val drawable = ChipDrawable.createFromAttributes(context, null, 0, R.style.Widget_Kotatsu_Chip)
chip.setChipDrawable(drawable)
+ chip.isCheckedIconVisible = true
+ chip.setCheckedIconResource(R.drawable.ic_check)
+ chip.checkedIconTint = context.getThemeColorStateList(materialR.attr.colorControlNormal)
chip.isCloseIconVisible = onChipCloseClickListener != null
chip.setOnCloseIconClickListener(chipOnCloseListener)
chip.setEnsureMinTouchTargetSize(false)
chip.setOnClickListener(chipOnClickListener)
- chip.isCheckable = false
addView(chip)
return chip
}
@@ -98,7 +115,9 @@ class ChipsView @JvmOverloads constructor(
class ChipModel(
@DrawableRes val icon: Int,
val title: CharSequence,
- val data: Any? = null
+ val isCheckable: Boolean,
+ val isChecked: Boolean,
+ val data: Any? = null,
) {
override fun equals(other: Any?): Boolean {
@@ -109,6 +128,8 @@ class ChipsView @JvmOverloads constructor(
if (icon != other.icon) return false
if (title != other.title) return false
+ if (isCheckable != other.isCheckable) return false
+ if (isChecked != other.isChecked) return false
if (data != other.data) return false
return true
@@ -117,7 +138,9 @@ class ChipsView @JvmOverloads constructor(
override fun hashCode(): Int {
var result = icon
result = 31 * result + title.hashCode()
- result = 31 * result + data.hashCode()
+ result = 31 * result + isCheckable.hashCode()
+ result = 31 * result + isChecked.hashCode()
+ result = 31 * result + (data?.hashCode() ?: 0)
return result
}
}
@@ -131,4 +154,4 @@ class ChipsView @JvmOverloads constructor(
fun onChipCloseClick(chip: Chip, data: Any?)
}
-}
\ No newline at end of file
+}
diff --git a/app/src/main/java/org/koitharu/kotatsu/base/ui/widgets/CornerData.kt b/app/src/main/java/org/koitharu/kotatsu/base/ui/widgets/CornerData.kt
new file mode 100644
index 000000000..9818d1f27
--- /dev/null
+++ b/app/src/main/java/org/koitharu/kotatsu/base/ui/widgets/CornerData.kt
@@ -0,0 +1,47 @@
+package org.koitharu.kotatsu.base.ui.widgets
+
+import android.view.View
+import androidx.core.view.ViewCompat
+import com.google.android.material.shape.AbsoluteCornerSize
+import com.google.android.material.shape.CornerSize
+
+class CornerData(
+ var topLeft: CornerSize,
+ var bottomLeft: CornerSize,
+ var topRight: CornerSize,
+ var bottomRight: CornerSize,
+) {
+
+ fun start(view: View): CornerData {
+ return if (isLayoutRtl(view)) right() else left()
+ }
+
+ fun end(view: View): CornerData {
+ return if (isLayoutRtl(view)) left() else right()
+ }
+
+ fun left(): CornerData {
+ return CornerData(topLeft, bottomLeft, noCorner, noCorner)
+ }
+
+ fun right(): CornerData {
+ return CornerData(noCorner, noCorner, topRight, bottomRight)
+ }
+
+ fun top(): CornerData {
+ return CornerData(topLeft, noCorner, topRight, noCorner)
+ }
+
+ fun bottom(): CornerData {
+ return CornerData(noCorner, bottomLeft, noCorner, bottomRight)
+ }
+
+ private companion object {
+
+ val noCorner: CornerSize = AbsoluteCornerSize(0f)
+
+ fun isLayoutRtl(view: View): Boolean {
+ return ViewCompat.getLayoutDirection(view) == ViewCompat.LAYOUT_DIRECTION_RTL
+ }
+ }
+}
diff --git a/app/src/main/java/org/koitharu/kotatsu/base/ui/widgets/FadingSnackbar.kt b/app/src/main/java/org/koitharu/kotatsu/base/ui/widgets/FadingSnackbar.kt
deleted file mode 100644
index 909252b48..000000000
--- a/app/src/main/java/org/koitharu/kotatsu/base/ui/widgets/FadingSnackbar.kt
+++ /dev/null
@@ -1,133 +0,0 @@
-/*
- * Copyright 2018 Google LLC
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.koitharu.kotatsu.base.ui.widgets
-
-import android.content.Context
-import android.content.res.ColorStateList
-import android.graphics.drawable.Drawable
-import android.util.AttributeSet
-import android.view.LayoutInflater
-import android.widget.FrameLayout
-import androidx.annotation.ColorInt
-import androidx.annotation.StringRes
-import androidx.core.graphics.drawable.DrawableCompat
-import androidx.core.view.postDelayed
-import com.google.android.material.color.MaterialColors
-import com.google.android.material.shape.MaterialShapeDrawable
-import com.google.android.material.shape.ShapeAppearanceModel
-import com.google.android.material.snackbar.Snackbar
-import org.koitharu.kotatsu.databinding.FadingSnackbarLayoutBinding
-import org.koitharu.kotatsu.utils.ext.getThemeColorStateList
-import com.google.android.material.R as materialR
-
-private const val ENTER_DURATION = 300L
-private const val EXIT_DURATION = 200L
-private const val SHORT_DURATION_MS = 1_500L
-private const val LONG_DURATION_MS = 2_750L
-
-/**
- * A custom snackbar implementation allowing more control over placement and entry/exit animations.
- *
- * Xtimms: Well, my sufferings over the Snackbar in [DetailsActivity] will go away forever... Thanks, Google.
- *
- * https://github.com/google/iosched/blob/main/mobile/src/main/java/com/google/samples/apps/iosched/widget/FadingSnackbar.kt
- */
-class FadingSnackbar @JvmOverloads constructor(
- context: Context,
- attrs: AttributeSet? = null,
- defStyleAttr: Int = 0,
-) : FrameLayout(context, attrs, defStyleAttr) {
-
- private val binding = FadingSnackbarLayoutBinding.inflate(LayoutInflater.from(context), this)
-
- init {
- binding.snackbarLayout.background = createThemedBackground()
- }
-
- fun dismiss() {
- if (visibility == VISIBLE && alpha == 1f) {
- animate()
- .alpha(0f)
- .withEndAction { visibility = GONE }
- .duration = EXIT_DURATION
- }
- }
-
- fun show(
- messageText: CharSequence?,
- @StringRes actionId: Int = 0,
- duration: Int = Snackbar.LENGTH_SHORT,
- onActionClick: (FadingSnackbar.() -> Unit)? = null,
- onDismiss: (() -> Unit)? = null,
- ) {
- binding.snackbarText.text = messageText
- if (actionId != 0) {
- with(binding.snackbarAction) {
- visibility = VISIBLE
- text = context.getString(actionId)
- setOnClickListener {
- onActionClick?.invoke(this@FadingSnackbar) ?: dismiss()
- }
- }
- } else {
- binding.snackbarAction.visibility = GONE
- }
- alpha = 0f
- visibility = VISIBLE
- animate()
- .alpha(1f)
- .duration = ENTER_DURATION
- if (duration == Snackbar.LENGTH_INDEFINITE) {
- return
- }
- val durationMs = ENTER_DURATION + if (duration == Snackbar.LENGTH_LONG) LONG_DURATION_MS else SHORT_DURATION_MS
- postDelayed(durationMs) {
- dismiss()
- onDismiss?.invoke()
- }
- }
-
- private fun createThemedBackground(): Drawable {
- val backgroundColor = MaterialColors.layer(this, materialR.attr.colorSurface, materialR.attr.colorOnSurface, 1f)
- val shapeAppearanceModel = ShapeAppearanceModel.builder(
- context,
- materialR.style.ShapeAppearance_Material3_Corner_ExtraSmall,
- 0
- ).build()
- val background = createMaterialShapeDrawableBackground(
- backgroundColor,
- shapeAppearanceModel,
- )
- val backgroundTint = context.getThemeColorStateList(materialR.attr.colorSurfaceInverse)
- return if (backgroundTint != null) {
- val wrappedDrawable = DrawableCompat.wrap(background)
- DrawableCompat.setTintList(wrappedDrawable, backgroundTint)
- wrappedDrawable
- } else {
- DrawableCompat.wrap(background)
- }
- }
-
- private fun createMaterialShapeDrawableBackground(
- @ColorInt backgroundColor: Int,
- shapeAppearanceModel: ShapeAppearanceModel,
- ): MaterialShapeDrawable {
- val background = MaterialShapeDrawable(shapeAppearanceModel)
- background.fillColor = ColorStateList.valueOf(backgroundColor)
- return background
- }
-}
\ No newline at end of file
diff --git a/app/src/main/java/org/koitharu/kotatsu/base/ui/widgets/HideBottomNavigationOnScrollBehavior.kt b/app/src/main/java/org/koitharu/kotatsu/base/ui/widgets/HideBottomNavigationOnScrollBehavior.kt
new file mode 100644
index 000000000..b1742420a
--- /dev/null
+++ b/app/src/main/java/org/koitharu/kotatsu/base/ui/widgets/HideBottomNavigationOnScrollBehavior.kt
@@ -0,0 +1,101 @@
+package org.koitharu.kotatsu.base.ui.widgets
+
+import android.animation.ValueAnimator
+import android.content.Context
+import android.util.AttributeSet
+import android.view.View
+import android.view.animation.DecelerateInterpolator
+import androidx.coordinatorlayout.widget.CoordinatorLayout
+import androidx.core.view.ViewCompat
+import com.google.android.material.appbar.AppBarLayout
+import com.google.android.material.bottomnavigation.BottomNavigationView
+import org.koitharu.kotatsu.R
+import org.koitharu.kotatsu.utils.ext.getAnimationDuration
+import org.koitharu.kotatsu.utils.ext.measureHeight
+
+class HideBottomNavigationOnScrollBehavior @JvmOverloads constructor(
+ context: Context? = null,
+ attrs: AttributeSet? = null,
+) : CoordinatorLayout.Behavior(context, attrs) {
+
+ @ViewCompat.NestedScrollType
+ private var lastStartedType: Int = 0
+
+ private var offsetAnimator: ValueAnimator? = null
+
+ private var dyRatio = 1F
+
+ override fun layoutDependsOn(parent: CoordinatorLayout, child: BottomNavigationView, dependency: View): Boolean {
+ return dependency is AppBarLayout
+ }
+
+ override fun onDependentViewChanged(
+ parent: CoordinatorLayout,
+ child: BottomNavigationView,
+ dependency: View,
+ ): Boolean {
+ val appBarSize = dependency.measureHeight()
+ dyRatio = if (appBarSize > 0) {
+ child.measureHeight().toFloat() / appBarSize
+ } else {
+ 1F
+ }
+ return false
+ }
+
+ override fun onStartNestedScroll(
+ coordinatorLayout: CoordinatorLayout,
+ child: BottomNavigationView,
+ directTargetChild: View,
+ target: View,
+ axes: Int,
+ type: Int,
+ ): Boolean {
+ if (axes != ViewCompat.SCROLL_AXIS_VERTICAL) {
+ return false
+ }
+ lastStartedType = type
+ offsetAnimator?.cancel()
+ return true
+ }
+
+ override fun onNestedPreScroll(
+ coordinatorLayout: CoordinatorLayout,
+ child: BottomNavigationView,
+ target: View,
+ dx: Int,
+ dy: Int,
+ consumed: IntArray,
+ type: Int,
+ ) {
+ super.onNestedPreScroll(coordinatorLayout, child, target, dx, dy, consumed, type)
+ child.translationY = (child.translationY + (dy * dyRatio)).coerceIn(0F, child.height.toFloat())
+ }
+
+ override fun onStopNestedScroll(
+ coordinatorLayout: CoordinatorLayout,
+ child: BottomNavigationView,
+ target: View,
+ type: Int,
+ ) {
+ if (lastStartedType == ViewCompat.TYPE_TOUCH || type == ViewCompat.TYPE_NON_TOUCH) {
+ animateBottomNavigationVisibility(child, child.translationY < child.height / 2)
+ }
+ }
+
+ private fun animateBottomNavigationVisibility(child: BottomNavigationView, isVisible: Boolean) {
+ offsetAnimator?.cancel()
+ offsetAnimator = ValueAnimator().apply {
+ interpolator = DecelerateInterpolator()
+ duration = child.context.getAnimationDuration(R.integer.config_shorterAnimTime)
+ addUpdateListener {
+ child.translationY = it.animatedValue as Float
+ }
+ }
+ offsetAnimator?.setFloatValues(
+ child.translationY,
+ if (isVisible) 0F else child.height.toFloat(),
+ )
+ offsetAnimator?.start()
+ }
+}
diff --git a/app/src/main/java/org/koitharu/kotatsu/base/ui/widgets/ListItemTextView.kt b/app/src/main/java/org/koitharu/kotatsu/base/ui/widgets/ListItemTextView.kt
index bdaf8f476..e51509920 100644
--- a/app/src/main/java/org/koitharu/kotatsu/base/ui/widgets/ListItemTextView.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/base/ui/widgets/ListItemTextView.kt
@@ -9,16 +9,17 @@ import android.graphics.drawable.Drawable
import android.graphics.drawable.InsetDrawable
import android.graphics.drawable.RippleDrawable
import android.graphics.drawable.ShapeDrawable
-import android.graphics.drawable.shapes.RectShape
+import android.graphics.drawable.shapes.RoundRectShape
import android.util.AttributeSet
import androidx.annotation.AttrRes
import androidx.appcompat.widget.AppCompatCheckedTextView
+import androidx.core.content.ContextCompat
import androidx.core.content.withStyledAttributes
import com.google.android.material.ripple.RippleUtils
import com.google.android.material.shape.MaterialShapeDrawable
import com.google.android.material.shape.ShapeAppearanceModel
import org.koitharu.kotatsu.R
-import org.koitharu.kotatsu.utils.ext.getThemeColorStateList
+import org.koitharu.kotatsu.utils.ext.resolveDp
@SuppressLint("RestrictedApi")
class ListItemTextView @JvmOverloads constructor(
@@ -38,10 +39,11 @@ class ListItemTextView @JvmOverloads constructor(
context.withStyledAttributes(attrs, R.styleable.ListItemTextView, defStyleAttr) {
val itemRippleColor = getRippleColor(context)
val shape = createShapeDrawable(this)
+ val roundCorners = FloatArray(8) { resources.resolveDp(32f) }
background = RippleDrawable(
RippleUtils.sanitizeRippleDrawableColor(itemRippleColor),
shape,
- ShapeDrawable(RectShape()),
+ ShapeDrawable(RoundRectShape(roundCorners, null, null)),
)
checkedDrawableStart = getDrawable(R.styleable.ListItemTextView_checkedDrawableStart)
checkedDrawableEnd = getDrawable(R.styleable.ListItemTextView_checkedDrawableEnd)
@@ -118,7 +120,7 @@ class ListItemTextView @JvmOverloads constructor(
}
private fun getRippleColor(context: Context): ColorStateList {
- return context.getThemeColorStateList(android.R.attr.colorControlHighlight)
+ return ContextCompat.getColorStateList(context, R.color.selector_overlay)
?: ColorStateList.valueOf(Color.TRANSPARENT)
}
-}
\ No newline at end of file
+}
diff --git a/app/src/main/java/org/koitharu/kotatsu/base/ui/widgets/SegmentedBarView.kt b/app/src/main/java/org/koitharu/kotatsu/base/ui/widgets/SegmentedBarView.kt
new file mode 100644
index 000000000..aed43d75b
--- /dev/null
+++ b/app/src/main/java/org/koitharu/kotatsu/base/ui/widgets/SegmentedBarView.kt
@@ -0,0 +1,123 @@
+package org.koitharu.kotatsu.base.ui.widgets
+
+import android.content.Context
+import android.graphics.Canvas
+import android.graphics.Outline
+import android.graphics.Paint
+import android.util.AttributeSet
+import android.view.View
+import android.view.ViewOutlineProvider
+import androidx.annotation.ColorInt
+import androidx.annotation.FloatRange
+import androidx.core.graphics.ColorUtils
+import com.google.android.material.R as materialR
+import kotlin.random.Random
+import org.koitharu.kotatsu.parsers.util.replaceWith
+import org.koitharu.kotatsu.utils.ext.getThemeColor
+import org.koitharu.kotatsu.utils.ext.resolveDp
+
+class SegmentedBarView @JvmOverloads constructor(
+ context: Context,
+ attrs: AttributeSet? = null,
+ defStyleAttr: Int = 0,
+) : View(context, attrs, defStyleAttr) {
+
+ private val paint = Paint(Paint.ANTI_ALIAS_FLAG)
+ private val segmentsData = ArrayList()
+ private val segmentsSizes = ArrayList()
+ private val outlineColor = context.getThemeColor(materialR.attr.colorOutline)
+ private var cornerSize = 0f
+
+ var segments: List
+ get() = segmentsData
+ set(value) {
+ segmentsData.replaceWith(value)
+ updateSizes()
+ invalidate()
+ }
+
+ init {
+ paint.strokeWidth = context.resources.resolveDp(1f)
+ outlineProvider = OutlineProvider()
+ clipToOutline = true
+
+ if (isInEditMode) {
+ segments = List(Random.nextInt(3, 5)) {
+ Segment(
+ percent = Random.nextFloat(),
+ color = ColorUtils.HSLToColor(floatArrayOf(Random.nextInt(0, 360).toFloat(), 0.5f, 0.5f)),
+ )
+ }
+ }
+ }
+
+ override fun onSizeChanged(w: Int, h: Int, oldw: Int, oldh: Int) {
+ super.onSizeChanged(w, h, oldw, oldh)
+ cornerSize = h / 2f
+ updateSizes()
+ }
+
+ override fun onDraw(canvas: Canvas) {
+ if (segmentsSizes.isEmpty()) {
+ return
+ }
+ val w = width.toFloat()
+ var x = w - segmentsSizes.last()
+ for (i in (0 until segmentsData.size).reversed()) {
+ val segment = segmentsData[i]
+ paint.color = segment.color
+ paint.style = Paint.Style.FILL
+ val segmentWidth = segmentsSizes[i]
+ canvas.drawRoundRect(0f, 0f, x + cornerSize, height.toFloat(), cornerSize, cornerSize, paint)
+ paint.color = outlineColor
+ paint.style = Paint.Style.STROKE
+ canvas.drawRoundRect(0f, 0f, x + cornerSize, height.toFloat(), cornerSize, cornerSize, paint)
+ x -= segmentWidth
+ }
+ paint.color = outlineColor
+ paint.style = Paint.Style.STROKE
+ canvas.drawRoundRect(0f, 0f, w, height.toFloat(), cornerSize, cornerSize, paint)
+ }
+
+ private fun updateSizes() {
+ segmentsSizes.clear()
+ segmentsSizes.ensureCapacity(segmentsData.size + 1)
+ var w = width.toFloat()
+ for (segment in segmentsData) {
+ val segmentWidth = (w * segment.percent).coerceAtLeast(cornerSize)
+ segmentsSizes.add(segmentWidth)
+ w -= segmentWidth
+ }
+ segmentsSizes.add(w)
+ }
+
+ class Segment(
+ @FloatRange(from = 0.0, to = 1.0) val percent: Float,
+ @ColorInt val color: Int,
+ ) {
+
+ override fun equals(other: Any?): Boolean {
+ if (this === other) return true
+ if (javaClass != other?.javaClass) return false
+
+ other as Segment
+
+ if (percent != other.percent) return false
+ if (color != other.color) return false
+
+ return true
+ }
+
+ override fun hashCode(): Int {
+ var result = percent.hashCode()
+ result = 31 * result + color
+ return result
+ }
+ }
+
+ private class OutlineProvider : ViewOutlineProvider() {
+ override fun getOutline(view: View, outline: Outline) {
+ outline.setRoundRect(0, 0, view.width, view.height, view.height / 2f)
+ }
+ }
+}
diff --git a/app/src/main/java/org/koitharu/kotatsu/base/ui/widgets/SlidingBottomNavigationView.kt b/app/src/main/java/org/koitharu/kotatsu/base/ui/widgets/SlidingBottomNavigationView.kt
new file mode 100644
index 000000000..f012d9a95
--- /dev/null
+++ b/app/src/main/java/org/koitharu/kotatsu/base/ui/widgets/SlidingBottomNavigationView.kt
@@ -0,0 +1,142 @@
+package org.koitharu.kotatsu.base.ui.widgets
+
+import android.animation.Animator
+import android.animation.AnimatorListenerAdapter
+import android.animation.TimeInterpolator
+import android.content.Context
+import android.os.Parcel
+import android.os.Parcelable
+import android.util.AttributeSet
+import android.view.ViewPropertyAnimator
+import androidx.annotation.AttrRes
+import androidx.annotation.StyleRes
+import androidx.coordinatorlayout.widget.CoordinatorLayout
+import androidx.customview.view.AbsSavedState
+import androidx.interpolator.view.animation.FastOutLinearInInterpolator
+import androidx.interpolator.view.animation.LinearOutSlowInInterpolator
+import com.google.android.material.R as materialR
+import com.google.android.material.bottomnavigation.BottomNavigationView
+import org.koitharu.kotatsu.utils.ext.applySystemAnimatorScale
+import org.koitharu.kotatsu.utils.ext.measureHeight
+
+private const val STATE_DOWN = 1
+private const val STATE_UP = 2
+
+private const val SLIDE_UP_ANIMATION_DURATION = 225L
+private const val SLIDE_DOWN_ANIMATION_DURATION = 175L
+
+class SlidingBottomNavigationView @JvmOverloads constructor(
+ context: Context,
+ attrs: AttributeSet? = null,
+ @AttrRes defStyleAttr: Int = materialR.attr.bottomNavigationStyle,
+ @StyleRes defStyleRes: Int = materialR.style.Widget_Design_BottomNavigationView,
+) : BottomNavigationView(context, attrs, defStyleAttr, defStyleRes),
+ CoordinatorLayout.AttachedBehavior {
+
+ private var currentAnimator: ViewPropertyAnimator? = null
+
+ private var currentState = STATE_UP
+ private var behavior = HideBottomNavigationOnScrollBehavior()
+
+ override fun getBehavior(): CoordinatorLayout.Behavior<*> {
+ return behavior
+ }
+
+ override fun onSaveInstanceState(): Parcelable {
+ val superState = super.onSaveInstanceState()
+ return SavedState(superState, currentState, translationY)
+ }
+
+ override fun onRestoreInstanceState(state: Parcelable?) {
+ if (state is SavedState) {
+ super.onRestoreInstanceState(state.superState)
+ super.setTranslationY(state.translationY)
+ currentState = state.currentState
+ } else {
+ super.onRestoreInstanceState(state)
+ }
+ }
+
+ override fun setTranslationY(translationY: Float) {
+ // Disallow translation change when state down
+ if (currentState != STATE_DOWN) {
+ super.setTranslationY(translationY)
+ }
+ }
+
+ fun show() {
+ currentAnimator?.cancel()
+ clearAnimation()
+
+ currentState = STATE_UP
+ animateTranslation(
+ 0F,
+ SLIDE_UP_ANIMATION_DURATION,
+ LinearOutSlowInInterpolator(),
+ )
+ }
+
+ fun hide() {
+ currentAnimator?.cancel()
+ clearAnimation()
+
+ currentState = STATE_DOWN
+ val target = measureHeight()
+ if (target == 0) {
+ return
+ }
+ animateTranslation(
+ target.toFloat(),
+ SLIDE_DOWN_ANIMATION_DURATION,
+ FastOutLinearInInterpolator(),
+ )
+ }
+
+ private fun animateTranslation(targetY: Float, duration: Long, interpolator: TimeInterpolator) {
+ currentAnimator = animate()
+ .translationY(targetY)
+ .setInterpolator(interpolator)
+ .setDuration(duration)
+ .applySystemAnimatorScale(context)
+ .setListener(
+ object : AnimatorListenerAdapter() {
+ override fun onAnimationEnd(animation: Animator?) {
+ currentAnimator = null
+ postInvalidate()
+ }
+ },
+ )
+ }
+
+ internal class SavedState : AbsSavedState {
+ var currentState = STATE_UP
+ var translationY = 0F
+
+ constructor(superState: Parcelable, currentState: Int, translationY: Float) : super(superState) {
+ this.currentState = currentState
+ this.translationY = translationY
+ }
+
+ constructor(source: Parcel, loader: ClassLoader?) : super(source, loader) {
+ currentState = source.readInt()
+ translationY = source.readFloat()
+ }
+
+ override fun writeToParcel(out: Parcel, flags: Int) {
+ super.writeToParcel(out, flags)
+ out.writeInt(currentState)
+ out.writeFloat(translationY)
+ }
+
+ companion object {
+
+ @Suppress("unused")
+ @JvmField
+ val CREATOR: Parcelable.Creator = object : Parcelable.Creator {
+ override fun createFromParcel(`in`: Parcel) = SavedState(`in`, SavedState::class.java.classLoader)
+
+ override fun newArray(size: Int): Array = arrayOfNulls(size)
+ }
+ }
+ }
+}
diff --git a/app/src/main/java/org/koitharu/kotatsu/base/ui/widgets/SquareLayout.kt b/app/src/main/java/org/koitharu/kotatsu/base/ui/widgets/SquareLayout.kt
deleted file mode 100644
index 589d75382..000000000
--- a/app/src/main/java/org/koitharu/kotatsu/base/ui/widgets/SquareLayout.kt
+++ /dev/null
@@ -1,14 +0,0 @@
-package org.koitharu.kotatsu.base.ui.widgets
-
-import android.content.Context
-import android.util.AttributeSet
-import android.widget.FrameLayout
-
-class SquareLayout @JvmOverloads constructor(
- context: Context, attrs: AttributeSet? = null, defStyleAttr: Int = 0
-) : FrameLayout(context, attrs, defStyleAttr) {
-
- public override fun onMeasure(widthMeasureSpec: Int, heightMeasureSpec: Int) {
- super.onMeasure(widthMeasureSpec, widthMeasureSpec)
- }
-}
\ No newline at end of file
diff --git a/app/src/main/java/org/koitharu/kotatsu/base/ui/widgets/WindowInsetHolder.kt b/app/src/main/java/org/koitharu/kotatsu/base/ui/widgets/WindowInsetHolder.kt
index 0d915dc4f..3279dfc06 100644
--- a/app/src/main/java/org/koitharu/kotatsu/base/ui/widgets/WindowInsetHolder.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/base/ui/widgets/WindowInsetHolder.kt
@@ -1,6 +1,5 @@
package org.koitharu.kotatsu.base.ui.widgets
-import android.annotation.SuppressLint
import android.content.Context
import android.util.AttributeSet
import android.view.Gravity
@@ -21,8 +20,7 @@ class WindowInsetHolder @JvmOverloads constructor(
private var desiredHeight = 0
private var desiredWidth = 0
- @SuppressLint("RtlHardcoded")
- override fun dispatchApplyWindowInsets(insets: WindowInsets): WindowInsets {
+ override fun onApplyWindowInsets(insets: WindowInsets): WindowInsets {
val barsInsets = WindowInsetsCompat.toWindowInsetsCompat(insets, this)
.getInsets(WindowInsetsCompat.Type.systemBars())
val gravity = getLayoutGravity()
@@ -41,24 +39,26 @@ class WindowInsetHolder @JvmOverloads constructor(
desiredHeight = newHeight
requestLayout()
}
- return super.dispatchApplyWindowInsets(insets)
+ return super.onApplyWindowInsets(insets)
}
override fun onMeasure(widthMeasureSpec: Int, heightMeasureSpec: Int) {
val widthMode = MeasureSpec.getMode(widthMeasureSpec)
+ val widthSize = MeasureSpec.getSize(widthMeasureSpec)
val heightMode = MeasureSpec.getMode(heightMeasureSpec)
- super.onMeasure(
- if (desiredWidth == 0 || widthMode == MeasureSpec.EXACTLY) {
- widthMeasureSpec
- } else {
- MeasureSpec.makeMeasureSpec(desiredWidth, widthMode)
- },
- if (desiredHeight == 0 || heightMode == MeasureSpec.EXACTLY) {
- heightMeasureSpec
- } else {
- MeasureSpec.makeMeasureSpec(desiredHeight, heightMode)
- },
- )
+ val heightSize = MeasureSpec.getSize(heightMeasureSpec)
+
+ val width: Int = when (widthMode) {
+ MeasureSpec.EXACTLY -> widthSize
+ MeasureSpec.AT_MOST -> minOf(desiredWidth, widthSize)
+ else -> desiredWidth
+ }
+ val height = when (heightMode) {
+ MeasureSpec.EXACTLY -> heightSize
+ MeasureSpec.AT_MOST -> minOf(desiredHeight, heightSize)
+ else -> desiredHeight
+ }
+ setMeasuredDimension(width, height)
}
private fun getLayoutGravity(): Int {
@@ -69,4 +69,4 @@ class WindowInsetHolder @JvmOverloads constructor(
else -> Gravity.NO_GRAVITY
}
}
-}
\ No newline at end of file
+}
diff --git a/app/src/main/java/org/koitharu/kotatsu/bookmarks/BookmarksModule.kt b/app/src/main/java/org/koitharu/kotatsu/bookmarks/BookmarksModule.kt
deleted file mode 100644
index 4a8294765..000000000
--- a/app/src/main/java/org/koitharu/kotatsu/bookmarks/BookmarksModule.kt
+++ /dev/null
@@ -1,10 +0,0 @@
-package org.koitharu.kotatsu.bookmarks
-
-import org.koin.dsl.module
-import org.koitharu.kotatsu.bookmarks.domain.BookmarksRepository
-
-val bookmarksModule
- get() = module {
-
- factory { BookmarksRepository(get()) }
- }
\ No newline at end of file
diff --git a/app/src/main/java/org/koitharu/kotatsu/bookmarks/data/BookmarkWithManga.kt b/app/src/main/java/org/koitharu/kotatsu/bookmarks/data/BookmarkWithManga.kt
deleted file mode 100644
index 4bd63d65d..000000000
--- a/app/src/main/java/org/koitharu/kotatsu/bookmarks/data/BookmarkWithManga.kt
+++ /dev/null
@@ -1,23 +0,0 @@
-package org.koitharu.kotatsu.bookmarks.data
-
-import androidx.room.Embedded
-import androidx.room.Junction
-import androidx.room.Relation
-import org.koitharu.kotatsu.core.db.entity.MangaEntity
-import org.koitharu.kotatsu.core.db.entity.MangaTagsEntity
-import org.koitharu.kotatsu.core.db.entity.TagEntity
-
-class BookmarkWithManga(
- @Embedded val bookmark: BookmarkEntity,
- @Relation(
- parentColumn = "manga_id",
- entityColumn = "manga_id"
- )
- val manga: MangaEntity,
- @Relation(
- parentColumn = "manga_id",
- entityColumn = "tag_id",
- associateBy = Junction(MangaTagsEntity::class)
- )
- val tags: List,
-)
\ No newline at end of file
diff --git a/app/src/main/java/org/koitharu/kotatsu/bookmarks/data/BookmarksDao.kt b/app/src/main/java/org/koitharu/kotatsu/bookmarks/data/BookmarksDao.kt
index dd023be7a..076b19a3c 100644
--- a/app/src/main/java/org/koitharu/kotatsu/bookmarks/data/BookmarksDao.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/bookmarks/data/BookmarksDao.kt
@@ -1,20 +1,27 @@
package org.koitharu.kotatsu.bookmarks.data
-import androidx.room.Dao
-import androidx.room.Delete
-import androidx.room.Insert
-import androidx.room.Query
+import androidx.room.*
import kotlinx.coroutines.flow.Flow
+import org.koitharu.kotatsu.core.db.entity.MangaWithTags
@Dao
abstract class BookmarksDao {
+ @Query("SELECT * FROM bookmarks WHERE manga_id = :mangaId AND page_id = :pageId")
+ abstract suspend fun find(mangaId: Long, pageId: Long): BookmarkEntity?
+
@Query("SELECT * FROM bookmarks WHERE manga_id = :mangaId AND chapter_id = :chapterId AND page = :page")
abstract fun observe(mangaId: Long, chapterId: Long, page: Int): Flow
@Query("SELECT * FROM bookmarks WHERE manga_id = :mangaId ORDER BY created_at DESC")
abstract fun observe(mangaId: Long): Flow>
+ @Transaction
+ @Query(
+ "SELECT * FROM manga JOIN bookmarks ON bookmarks.manga_id = manga.manga_id ORDER BY bookmarks.created_at"
+ )
+ abstract fun observe(): Flow>>
+
@Insert
abstract suspend fun insert(entity: BookmarkEntity)
diff --git a/app/src/main/java/org/koitharu/kotatsu/bookmarks/data/EntityMapping.kt b/app/src/main/java/org/koitharu/kotatsu/bookmarks/data/EntityMapping.kt
index 0ab69dd18..a8b2e0912 100644
--- a/app/src/main/java/org/koitharu/kotatsu/bookmarks/data/EntityMapping.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/bookmarks/data/EntityMapping.kt
@@ -1,15 +1,9 @@
package org.koitharu.kotatsu.bookmarks.data
import org.koitharu.kotatsu.bookmarks.domain.Bookmark
-import org.koitharu.kotatsu.core.db.entity.toManga
-import org.koitharu.kotatsu.core.db.entity.toMangaTags
import org.koitharu.kotatsu.parsers.model.Manga
import java.util.*
-fun BookmarkWithManga.toBookmark() = bookmark.toBookmark(
- manga.toManga(tags.toMangaTags())
-)
-
fun BookmarkEntity.toBookmark(manga: Manga) = Bookmark(
manga = manga,
pageId = pageId,
@@ -30,4 +24,10 @@ fun Bookmark.toEntity() = BookmarkEntity(
imageUrl = imageUrl,
createdAt = createdAt.time,
percent = percent,
-)
\ No newline at end of file
+)
+
+fun Collection.toBookmarks(manga: Manga) = map {
+ it.toBookmark(manga)
+}
+
+fun Collection.ids() = map { it.pageId }
\ No newline at end of file
diff --git a/app/src/main/java/org/koitharu/kotatsu/bookmarks/domain/BookmarksRepository.kt b/app/src/main/java/org/koitharu/kotatsu/bookmarks/domain/BookmarksRepository.kt
index df63c03aa..9ba79d92b 100644
--- a/app/src/main/java/org/koitharu/kotatsu/bookmarks/domain/BookmarksRepository.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/bookmarks/domain/BookmarksRepository.kt
@@ -1,17 +1,24 @@
package org.koitharu.kotatsu.bookmarks.domain
+import android.database.SQLException
import androidx.room.withTransaction
+import javax.inject.Inject
import kotlinx.coroutines.flow.Flow
import kotlinx.coroutines.flow.map
+import org.koitharu.kotatsu.base.domain.ReversibleHandle
+import org.koitharu.kotatsu.bookmarks.data.BookmarkEntity
import org.koitharu.kotatsu.bookmarks.data.toBookmark
+import org.koitharu.kotatsu.bookmarks.data.toBookmarks
import org.koitharu.kotatsu.bookmarks.data.toEntity
import org.koitharu.kotatsu.core.db.MangaDatabase
import org.koitharu.kotatsu.core.db.entity.toEntities
import org.koitharu.kotatsu.core.db.entity.toEntity
+import org.koitharu.kotatsu.core.db.entity.toManga
import org.koitharu.kotatsu.parsers.model.Manga
import org.koitharu.kotatsu.utils.ext.mapItems
+import org.koitharu.kotatsu.utils.ext.printStackTraceDebug
-class BookmarksRepository(
+class BookmarksRepository @Inject constructor(
private val db: MangaDatabase,
) {
@@ -23,6 +30,17 @@ class BookmarksRepository(
return db.bookmarksDao.observe(manga.id).mapItems { it.toBookmark(manga) }
}
+ fun observeBookmarks(): Flow>> {
+ return db.bookmarksDao.observe().map { map ->
+ val res = LinkedHashMap>(map.size)
+ for ((k, v) in map) {
+ val manga = k.toManga()
+ res[manga] = v.toBookmarks(manga)
+ }
+ res
+ }
+ }
+
suspend fun addBookmark(bookmark: Bookmark) {
db.withTransaction {
val tags = bookmark.manga.tags.toEntities()
@@ -35,4 +53,38 @@ class BookmarksRepository(
suspend fun removeBookmark(mangaId: Long, pageId: Long) {
db.bookmarksDao.delete(mangaId, pageId)
}
-}
\ No newline at end of file
+
+ suspend fun removeBookmarks(ids: Map>): ReversibleHandle {
+ val entities = ArrayList(ids.size)
+ db.withTransaction {
+ val dao = db.bookmarksDao
+ for ((manga, idSet) in ids) {
+ for (pageId in idSet) {
+ val e = dao.find(manga.id, pageId)
+ if (e != null) {
+ entities.add(e)
+ }
+ dao.delete(manga.id, pageId)
+ }
+ }
+ }
+ return BookmarksRestorer(entities)
+ }
+
+ private inner class BookmarksRestorer(
+ private val entities: Collection,
+ ) : ReversibleHandle {
+
+ override suspend fun reverse() {
+ db.withTransaction {
+ for (e in entities) {
+ try {
+ db.bookmarksDao.insert(e)
+ } catch (e: SQLException) {
+ e.printStackTraceDebug()
+ }
+ }
+ }
+ }
+ }
+}
diff --git a/app/src/main/java/org/koitharu/kotatsu/bookmarks/ui/BookmarksActivity.kt b/app/src/main/java/org/koitharu/kotatsu/bookmarks/ui/BookmarksActivity.kt
new file mode 100644
index 000000000..1bcc16d2e
--- /dev/null
+++ b/app/src/main/java/org/koitharu/kotatsu/bookmarks/ui/BookmarksActivity.kt
@@ -0,0 +1,56 @@
+package org.koitharu.kotatsu.bookmarks.ui
+
+import android.content.Context
+import android.content.Intent
+import android.os.Bundle
+import android.view.ViewGroup
+import androidx.coordinatorlayout.widget.CoordinatorLayout
+import androidx.core.graphics.Insets
+import androidx.core.view.updateLayoutParams
+import androidx.core.view.updatePadding
+import androidx.fragment.app.commit
+import com.google.android.material.appbar.AppBarLayout
+import dagger.hilt.android.AndroidEntryPoint
+import org.koitharu.kotatsu.R
+import org.koitharu.kotatsu.base.ui.BaseActivity
+import org.koitharu.kotatsu.databinding.ActivityContainerBinding
+import org.koitharu.kotatsu.main.ui.owners.AppBarOwner
+import org.koitharu.kotatsu.main.ui.owners.SnackbarOwner
+
+@AndroidEntryPoint
+class BookmarksActivity :
+ BaseActivity(),
+ AppBarOwner,
+ SnackbarOwner {
+
+ override val appBar: AppBarLayout
+ get() = binding.appbar
+
+ override val snackbarHost: CoordinatorLayout
+ get() = binding.root
+
+ override fun onCreate(savedInstanceState: Bundle?) {
+ super.onCreate(savedInstanceState)
+ setContentView(ActivityContainerBinding.inflate(layoutInflater))
+ supportActionBar?.setDisplayHomeAsUpEnabled(true)
+ val fm = supportFragmentManager
+ if (fm.findFragmentById(R.id.container) == null) {
+ fm.commit {
+ val fragment = BookmarksFragment.newInstance()
+ replace(R.id.container, fragment)
+ }
+ }
+ }
+
+ override fun onWindowInsetsChanged(insets: Insets) {
+ binding.root.updatePadding(
+ left = insets.left,
+ right = insets.right,
+ )
+ }
+
+ companion object {
+
+ fun newIntent(context: Context) = Intent(context, BookmarksActivity::class.java)
+ }
+}
diff --git a/app/src/main/java/org/koitharu/kotatsu/bookmarks/ui/BookmarksFragment.kt b/app/src/main/java/org/koitharu/kotatsu/bookmarks/ui/BookmarksFragment.kt
new file mode 100644
index 000000000..870996d83
--- /dev/null
+++ b/app/src/main/java/org/koitharu/kotatsu/bookmarks/ui/BookmarksFragment.kt
@@ -0,0 +1,200 @@
+package org.koitharu.kotatsu.bookmarks.ui
+
+import android.os.Bundle
+import android.view.*
+import androidx.appcompat.view.ActionMode
+import androidx.core.graphics.Insets
+import androidx.core.view.updateLayoutParams
+import androidx.core.view.updatePadding
+import androidx.fragment.app.viewModels
+import coil.ImageLoader
+import com.google.android.material.snackbar.Snackbar
+import dagger.hilt.android.AndroidEntryPoint
+import javax.inject.Inject
+import org.koitharu.kotatsu.R
+import org.koitharu.kotatsu.base.domain.reverseAsync
+import org.koitharu.kotatsu.base.ui.BaseFragment
+import org.koitharu.kotatsu.base.ui.list.OnListItemClickListener
+import org.koitharu.kotatsu.base.ui.list.SectionedSelectionController
+import org.koitharu.kotatsu.base.ui.list.decor.AbstractSelectionItemDecoration
+import org.koitharu.kotatsu.base.ui.list.decor.SpacingItemDecoration
+import org.koitharu.kotatsu.base.ui.list.fastscroll.FastScroller
+import org.koitharu.kotatsu.base.ui.util.ReversibleAction
+import org.koitharu.kotatsu.bookmarks.data.ids
+import org.koitharu.kotatsu.bookmarks.domain.Bookmark
+import org.koitharu.kotatsu.bookmarks.ui.adapter.BookmarksGroupAdapter
+import org.koitharu.kotatsu.bookmarks.ui.model.BookmarksGroup
+import org.koitharu.kotatsu.databinding.FragmentListSimpleBinding
+import org.koitharu.kotatsu.details.ui.DetailsActivity
+import org.koitharu.kotatsu.list.ui.adapter.ListStateHolderListener
+import org.koitharu.kotatsu.list.ui.model.ListModel
+import org.koitharu.kotatsu.main.ui.owners.AppBarOwner
+import org.koitharu.kotatsu.main.ui.owners.SnackbarOwner
+import org.koitharu.kotatsu.parsers.model.Manga
+import org.koitharu.kotatsu.reader.ui.ReaderActivity
+import org.koitharu.kotatsu.utils.ext.getDisplayMessage
+import org.koitharu.kotatsu.utils.ext.invalidateNestedItemDecorations
+import org.koitharu.kotatsu.utils.ext.scaleUpActivityOptionsOf
+
+@AndroidEntryPoint
+class BookmarksFragment :
+ BaseFragment(),
+ ListStateHolderListener,
+ OnListItemClickListener,
+ SectionedSelectionController.Callback,
+ FastScroller.FastScrollListener {
+
+ @Inject
+ lateinit var coil: ImageLoader
+
+ private val viewModel by viewModels()
+ private var adapter: BookmarksGroupAdapter? = null
+ private var selectionController: SectionedSelectionController? = null
+
+ override fun onInflateView(inflater: LayoutInflater, container: ViewGroup?): FragmentListSimpleBinding {
+ return FragmentListSimpleBinding.inflate(inflater, container, false)
+ }
+
+ override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+ super.onViewCreated(view, savedInstanceState)
+ selectionController = SectionedSelectionController(
+ activity = requireActivity(),
+ owner = this,
+ callback = this,
+ )
+ adapter = BookmarksGroupAdapter(
+ lifecycleOwner = viewLifecycleOwner,
+ coil = coil,
+ listener = this,
+ selectionController = checkNotNull(selectionController),
+ bookmarkClickListener = this,
+ groupClickListener = OnGroupClickListener(),
+ )
+ binding.recyclerView.adapter = adapter
+ binding.recyclerView.setHasFixedSize(true)
+ val spacingDecoration = SpacingItemDecoration(view.resources.getDimensionPixelOffset(R.dimen.grid_spacing))
+ binding.recyclerView.addItemDecoration(spacingDecoration)
+
+ viewModel.content.observe(viewLifecycleOwner, ::onListChanged)
+ viewModel.onError.observe(viewLifecycleOwner, ::onError)
+ viewModel.onActionDone.observe(viewLifecycleOwner, ::onActionDone)
+ }
+
+ override fun onDestroyView() {
+ super.onDestroyView()
+ adapter = null
+ selectionController = null
+ }
+
+ override fun onItemClick(item: Bookmark, view: View) {
+ if (selectionController?.onItemClick(item.manga, item.pageId) != true) {
+ val intent = ReaderActivity.newIntent(view.context, item)
+ startActivity(intent, scaleUpActivityOptionsOf(view).toBundle())
+ }
+ }
+
+ override fun onItemLongClick(item: Bookmark, view: View): Boolean {
+ return selectionController?.onItemLongClick(item.manga, item.pageId) ?: false
+ }
+
+ override fun onRetryClick(error: Throwable) = Unit
+
+ override fun onEmptyActionClick() = Unit
+
+ override fun onFastScrollStart(fastScroller: FastScroller) {
+ (activity as? AppBarOwner)?.appBar?.setExpanded(false, true)
+ }
+
+ override fun onFastScrollStop(fastScroller: FastScroller) = Unit
+
+ override fun onSelectionChanged(controller: SectionedSelectionController, count: Int) {
+ binding.recyclerView.invalidateNestedItemDecorations()
+ }
+
+ override fun onCreateActionMode(
+ controller: SectionedSelectionController,
+ mode: ActionMode,
+ menu: Menu,
+ ): Boolean {
+ mode.menuInflater.inflate(R.menu.mode_bookmarks, menu)
+ return true
+ }
+
+ override fun onActionItemClicked(
+ controller: SectionedSelectionController,
+ mode: ActionMode,
+ item: MenuItem,
+ ): Boolean {
+ return when (item.itemId) {
+ R.id.action_remove -> {
+ val ids = selectionController?.snapshot() ?: return false
+ viewModel.removeBookmarks(ids)
+ mode.finish()
+ true
+ }
+ else -> false
+ }
+ }
+
+ override fun onCreateItemDecoration(
+ controller: SectionedSelectionController,
+ section: Manga,
+ ): AbstractSelectionItemDecoration = BookmarksSelectionDecoration(requireContext())
+
+ override fun onWindowInsetsChanged(insets: Insets) {
+ binding.recyclerView.updatePadding(
+ bottom = insets.bottom,
+ )
+ binding.recyclerView.fastScroller.updateLayoutParams {
+ bottomMargin = insets.bottom
+ }
+ }
+
+ private fun onListChanged(list: List) {
+ adapter?.items = list
+ }
+
+ private fun onError(e: Throwable) {
+ Snackbar.make(
+ binding.recyclerView,
+ e.getDisplayMessage(resources),
+ Snackbar.LENGTH_SHORT,
+ ).show()
+ }
+
+ private fun onActionDone(action: ReversibleAction) {
+ val handle = action.handle
+ val length = if (handle == null) Snackbar.LENGTH_SHORT else Snackbar.LENGTH_LONG
+ val snackbar = Snackbar.make((activity as SnackbarOwner).snackbarHost, action.stringResId, length)
+ if (handle != null) {
+ snackbar.setAction(R.string.undo) { handle.reverseAsync() }
+ }
+ snackbar.show()
+ }
+
+ private inner class OnGroupClickListener : OnListItemClickListener {
+
+ override fun onItemClick(item: BookmarksGroup, view: View) {
+ val controller = selectionController
+ if (controller != null && controller.count > 0) {
+ if (controller.getSectionCount(item.manga) == item.bookmarks.size) {
+ controller.clearSelection(item.manga)
+ } else {
+ controller.addToSelection(item.manga, item.bookmarks.ids())
+ }
+ return
+ }
+ val intent = DetailsActivity.newIntent(view.context, item.manga)
+ startActivity(intent)
+ }
+
+ override fun onItemLongClick(item: BookmarksGroup, view: View): Boolean {
+ return selectionController?.addToSelection(item.manga, item.bookmarks.ids()) ?: false
+ }
+ }
+
+ companion object {
+
+ fun newInstance() = BookmarksFragment()
+ }
+}
diff --git a/app/src/main/java/org/koitharu/kotatsu/bookmarks/ui/BookmarksSelectionDecoration.kt b/app/src/main/java/org/koitharu/kotatsu/bookmarks/ui/BookmarksSelectionDecoration.kt
new file mode 100644
index 000000000..025acb882
--- /dev/null
+++ b/app/src/main/java/org/koitharu/kotatsu/bookmarks/ui/BookmarksSelectionDecoration.kt
@@ -0,0 +1,18 @@
+package org.koitharu.kotatsu.bookmarks.ui
+
+import android.content.Context
+import android.view.View
+import androidx.recyclerview.widget.RecyclerView
+import org.koitharu.kotatsu.bookmarks.domain.Bookmark
+import org.koitharu.kotatsu.list.ui.MangaSelectionDecoration
+import org.koitharu.kotatsu.utils.ext.getItem
+
+class BookmarksSelectionDecoration(context: Context) : MangaSelectionDecoration(context) {
+
+ override fun getItemId(parent: RecyclerView, child: View): Long {
+ val holder = parent.getChildViewHolder(child) ?: return RecyclerView.NO_ID
+ val item = holder.getItem(Bookmark::class.java) ?: return RecyclerView.NO_ID
+ return item.pageId
+ }
+
+}
\ No newline at end of file
diff --git a/app/src/main/java/org/koitharu/kotatsu/bookmarks/ui/BookmarksViewModel.kt b/app/src/main/java/org/koitharu/kotatsu/bookmarks/ui/BookmarksViewModel.kt
new file mode 100644
index 000000000..4c6d48a55
--- /dev/null
+++ b/app/src/main/java/org/koitharu/kotatsu/bookmarks/ui/BookmarksViewModel.kt
@@ -0,0 +1,54 @@
+package org.koitharu.kotatsu.bookmarks.ui
+
+import androidx.lifecycle.LiveData
+import androidx.lifecycle.viewModelScope
+import dagger.hilt.android.lifecycle.HiltViewModel
+import javax.inject.Inject
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.flow.catch
+import kotlinx.coroutines.flow.map
+import org.koitharu.kotatsu.R
+import org.koitharu.kotatsu.base.ui.BaseViewModel
+import org.koitharu.kotatsu.base.ui.util.ReversibleAction
+import org.koitharu.kotatsu.bookmarks.domain.BookmarksRepository
+import org.koitharu.kotatsu.bookmarks.ui.model.BookmarksGroup
+import org.koitharu.kotatsu.list.ui.model.EmptyState
+import org.koitharu.kotatsu.list.ui.model.ListModel
+import org.koitharu.kotatsu.list.ui.model.LoadingState
+import org.koitharu.kotatsu.list.ui.model.toErrorState
+import org.koitharu.kotatsu.parsers.model.Manga
+import org.koitharu.kotatsu.utils.SingleLiveEvent
+import org.koitharu.kotatsu.utils.ext.asLiveDataDistinct
+
+@HiltViewModel
+class BookmarksViewModel @Inject constructor(
+ private val repository: BookmarksRepository,
+) : BaseViewModel() {
+
+ val onActionDone = SingleLiveEvent()
+
+ val content: LiveData> = repository.observeBookmarks()
+ .map { list ->
+ if (list.isEmpty()) {
+ listOf(
+ EmptyState(
+ icon = R.drawable.ic_empty_favourites,
+ textPrimary = R.string.no_bookmarks_yet,
+ textSecondary = R.string.no_bookmarks_summary,
+ actionStringRes = 0,
+ ),
+ )
+ } else list.map { (manga, bookmarks) ->
+ BookmarksGroup(manga, bookmarks)
+ }
+ }
+ .catch { e -> e.toErrorState(canRetry = false) }
+ .asLiveDataDistinct(viewModelScope.coroutineContext + Dispatchers.Default, listOf(LoadingState))
+
+ fun removeBookmarks(ids: Map>) {
+ launchJob(Dispatchers.Default) {
+ val handle = repository.removeBookmarks(ids)
+ onActionDone.postCall(ReversibleAction(R.string.bookmarks_removed, handle))
+ }
+ }
+}
diff --git a/app/src/main/java/org/koitharu/kotatsu/bookmarks/ui/BookmarkListAD.kt b/app/src/main/java/org/koitharu/kotatsu/bookmarks/ui/adapter/BookmarkListAD.kt
similarity index 92%
rename from app/src/main/java/org/koitharu/kotatsu/bookmarks/ui/BookmarkListAD.kt
rename to app/src/main/java/org/koitharu/kotatsu/bookmarks/ui/adapter/BookmarkListAD.kt
index 38d749c10..79ce1e06b 100644
--- a/app/src/main/java/org/koitharu/kotatsu/bookmarks/ui/BookmarkListAD.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/bookmarks/ui/adapter/BookmarkListAD.kt
@@ -1,4 +1,4 @@
-package org.koitharu.kotatsu.bookmarks.ui
+package org.koitharu.kotatsu.bookmarks.ui.adapter
import androidx.lifecycle.LifecycleOwner
import coil.ImageLoader
@@ -18,9 +18,8 @@ fun bookmarkListAD(
lifecycleOwner: LifecycleOwner,
clickListener: OnListItemClickListener,
) = adapterDelegateViewBinding(
- { inflater, parent -> ItemBookmarkBinding.inflate(inflater, parent, false) }
+ { inflater, parent -> ItemBookmarkBinding.inflate(inflater, parent, false) },
) {
-
val listener = AdapterDelegateClickListenerAdapter(this, clickListener)
binding.root.setOnClickListener(listener)
@@ -31,7 +30,7 @@ fun bookmarkListAD(
referer(item.manga.publicUrl)
placeholder(R.drawable.ic_placeholder)
fallback(R.drawable.ic_placeholder)
- error(R.drawable.ic_placeholder)
+ error(R.drawable.ic_error_placeholder)
allowRgb565(true)
lifecycle(lifecycleOwner)
enqueueWith(coil)
@@ -41,4 +40,4 @@ fun bookmarkListAD(
onViewRecycled {
binding.imageViewThumb.disposeImageRequest()
}
-}
\ No newline at end of file
+}
diff --git a/app/src/main/java/org/koitharu/kotatsu/bookmarks/ui/BookmarksAdapter.kt b/app/src/main/java/org/koitharu/kotatsu/bookmarks/ui/adapter/BookmarksAdapter.kt
similarity index 86%
rename from app/src/main/java/org/koitharu/kotatsu/bookmarks/ui/BookmarksAdapter.kt
rename to app/src/main/java/org/koitharu/kotatsu/bookmarks/ui/adapter/BookmarksAdapter.kt
index 92040bc97..2f3022b8e 100644
--- a/app/src/main/java/org/koitharu/kotatsu/bookmarks/ui/BookmarksAdapter.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/bookmarks/ui/adapter/BookmarksAdapter.kt
@@ -1,4 +1,4 @@
-package org.koitharu.kotatsu.bookmarks.ui
+package org.koitharu.kotatsu.bookmarks.ui.adapter
import androidx.lifecycle.LifecycleOwner
import androidx.recyclerview.widget.DiffUtil
@@ -19,7 +19,7 @@ class BookmarksAdapter(
private class DiffCallback : DiffUtil.ItemCallback() {
override fun areItemsTheSame(oldItem: Bookmark, newItem: Bookmark): Boolean {
- return oldItem.manga.id == newItem.manga.id && oldItem.chapterId == newItem.chapterId
+ return oldItem.manga.id == newItem.manga.id && oldItem.pageId == newItem.pageId
}
override fun areContentsTheSame(oldItem: Bookmark, newItem: Bookmark): Boolean {
diff --git a/app/src/main/java/org/koitharu/kotatsu/bookmarks/ui/adapter/BookmarksGroupAD.kt b/app/src/main/java/org/koitharu/kotatsu/bookmarks/ui/adapter/BookmarksGroupAD.kt
new file mode 100644
index 000000000..7927ed287
--- /dev/null
+++ b/app/src/main/java/org/koitharu/kotatsu/bookmarks/ui/adapter/BookmarksGroupAD.kt
@@ -0,0 +1,64 @@
+package org.koitharu.kotatsu.bookmarks.ui.adapter
+
+import android.view.View
+import androidx.lifecycle.LifecycleOwner
+import androidx.recyclerview.widget.RecyclerView
+import coil.ImageLoader
+import com.hannesdorfmann.adapterdelegates4.dsl.adapterDelegateViewBinding
+import org.koitharu.kotatsu.R
+import org.koitharu.kotatsu.base.ui.list.OnListItemClickListener
+import org.koitharu.kotatsu.base.ui.list.SectionedSelectionController
+import org.koitharu.kotatsu.base.ui.list.decor.SpacingItemDecoration
+import org.koitharu.kotatsu.bookmarks.domain.Bookmark
+import org.koitharu.kotatsu.bookmarks.ui.model.BookmarksGroup
+import org.koitharu.kotatsu.databinding.ItemBookmarksGroupBinding
+import org.koitharu.kotatsu.list.ui.model.ListModel
+import org.koitharu.kotatsu.parsers.model.Manga
+import org.koitharu.kotatsu.utils.ext.*
+
+fun bookmarksGroupAD(
+ coil: ImageLoader,
+ lifecycleOwner: LifecycleOwner,
+ sharedPool: RecyclerView.RecycledViewPool,
+ selectionController: SectionedSelectionController,
+ bookmarkClickListener: OnListItemClickListener,
+ groupClickListener: OnListItemClickListener,
+) = adapterDelegateViewBinding(
+ { layoutInflater, parent -> ItemBookmarksGroupBinding.inflate(layoutInflater, parent, false) },
+) {
+ val viewListenerAdapter = object : View.OnClickListener, View.OnLongClickListener {
+ override fun onClick(v: View) = groupClickListener.onItemClick(item, v)
+ override fun onLongClick(v: View) = groupClickListener.onItemLongClick(item, v)
+ }
+
+ val adapter = BookmarksAdapter(coil, lifecycleOwner, bookmarkClickListener)
+ binding.recyclerView.setRecycledViewPool(sharedPool)
+ binding.recyclerView.adapter = adapter
+ val spacingDecoration = SpacingItemDecoration(context.resources.getDimensionPixelOffset(R.dimen.grid_spacing))
+ binding.recyclerView.addItemDecoration(spacingDecoration)
+ binding.root.setOnClickListener(viewListenerAdapter)
+ binding.root.setOnLongClickListener(viewListenerAdapter)
+
+ bind { payloads ->
+ if (payloads.isEmpty()) {
+ binding.recyclerView.clearItemDecorations()
+ binding.recyclerView.addItemDecoration(spacingDecoration)
+ selectionController.attachToRecyclerView(item.manga, binding.recyclerView)
+ }
+ binding.imageViewCover.newImageRequest(item.manga.coverUrl)?.run {
+ referer(item.manga.publicUrl)
+ placeholder(R.drawable.ic_placeholder)
+ fallback(R.drawable.ic_placeholder)
+ error(R.drawable.ic_error_placeholder)
+ allowRgb565(true)
+ lifecycle(lifecycleOwner)
+ enqueueWith(coil)
+ }
+ binding.textViewTitle.text = item.manga.title
+ adapter.items = item.bookmarks
+ }
+
+ onViewRecycled {
+ binding.imageViewCover.disposeImageRequest()
+ }
+}
diff --git a/app/src/main/java/org/koitharu/kotatsu/bookmarks/ui/adapter/BookmarksGroupAdapter.kt b/app/src/main/java/org/koitharu/kotatsu/bookmarks/ui/adapter/BookmarksGroupAdapter.kt
new file mode 100644
index 000000000..c34b2fe54
--- /dev/null
+++ b/app/src/main/java/org/koitharu/kotatsu/bookmarks/ui/adapter/BookmarksGroupAdapter.kt
@@ -0,0 +1,67 @@
+package org.koitharu.kotatsu.bookmarks.ui.adapter
+
+import androidx.lifecycle.LifecycleOwner
+import androidx.recyclerview.widget.DiffUtil
+import androidx.recyclerview.widget.RecyclerView
+import coil.ImageLoader
+import com.hannesdorfmann.adapterdelegates4.AsyncListDifferDelegationAdapter
+import org.koitharu.kotatsu.base.ui.list.OnListItemClickListener
+import org.koitharu.kotatsu.base.ui.list.SectionedSelectionController
+import org.koitharu.kotatsu.bookmarks.domain.Bookmark
+import org.koitharu.kotatsu.bookmarks.ui.model.BookmarksGroup
+import org.koitharu.kotatsu.list.ui.adapter.*
+import org.koitharu.kotatsu.list.ui.model.ListModel
+import org.koitharu.kotatsu.parsers.model.Manga
+import kotlin.jvm.internal.Intrinsics
+
+class BookmarksGroupAdapter(
+ coil: ImageLoader,
+ lifecycleOwner: LifecycleOwner,
+ selectionController: SectionedSelectionController,
+ listener: ListStateHolderListener,
+ bookmarkClickListener: OnListItemClickListener,
+ groupClickListener: OnListItemClickListener,
+) : AsyncListDifferDelegationAdapter(DiffCallback()) {
+
+ init {
+ val pool = RecyclerView.RecycledViewPool()
+ delegatesManager
+ .addDelegate(
+ bookmarksGroupAD(
+ coil = coil,
+ lifecycleOwner = lifecycleOwner,
+ sharedPool = pool,
+ selectionController = selectionController,
+ bookmarkClickListener = bookmarkClickListener,
+ groupClickListener = groupClickListener,
+ )
+ )
+ .addDelegate(loadingStateAD())
+ .addDelegate(loadingFooterAD())
+ .addDelegate(emptyStateListAD(listener))
+ .addDelegate(errorStateListAD(listener))
+ }
+
+ private class DiffCallback : DiffUtil.ItemCallback() {
+
+ override fun areItemsTheSame(oldItem: ListModel, newItem: ListModel): Boolean {
+ return when {
+ oldItem is BookmarksGroup && newItem is BookmarksGroup -> {
+ oldItem.manga.id == newItem.manga.id
+ }
+ else -> oldItem.javaClass == newItem.javaClass
+ }
+ }
+
+ override fun areContentsTheSame(oldItem: ListModel, newItem: ListModel): Boolean {
+ return Intrinsics.areEqual(oldItem, newItem)
+ }
+
+ override fun getChangePayload(oldItem: ListModel, newItem: ListModel): Any? {
+ return when {
+ oldItem is BookmarksGroup && newItem is BookmarksGroup -> Unit
+ else -> super.getChangePayload(oldItem, newItem)
+ }
+ }
+ }
+}
\ No newline at end of file
diff --git a/app/src/main/java/org/koitharu/kotatsu/bookmarks/ui/model/BookmarksGroup.kt b/app/src/main/java/org/koitharu/kotatsu/bookmarks/ui/model/BookmarksGroup.kt
new file mode 100644
index 000000000..c9dc2e129
--- /dev/null
+++ b/app/src/main/java/org/koitharu/kotatsu/bookmarks/ui/model/BookmarksGroup.kt
@@ -0,0 +1,31 @@
+package org.koitharu.kotatsu.bookmarks.ui.model
+
+import org.koitharu.kotatsu.bookmarks.domain.Bookmark
+import org.koitharu.kotatsu.list.ui.model.ListModel
+import org.koitharu.kotatsu.parsers.model.Manga
+import org.koitharu.kotatsu.parsers.util.areItemsEquals
+
+class BookmarksGroup(
+ val manga: Manga,
+ val bookmarks: List,
+) : ListModel {
+
+ override fun equals(other: Any?): Boolean {
+ if (this === other) return true
+ if (javaClass != other?.javaClass) return false
+
+ other as BookmarksGroup
+
+ if (manga != other.manga) return false
+
+ return bookmarks.areItemsEquals(other.bookmarks) { a, b ->
+ a.imageUrl == b.imageUrl
+ }
+ }
+
+ override fun hashCode(): Int {
+ var result = manga.hashCode()
+ result = 31 * result + bookmarks.sumOf { it.imageUrl.hashCode() }
+ return result
+ }
+}
\ No newline at end of file
diff --git a/app/src/main/java/org/koitharu/kotatsu/browser/BrowserActivity.kt b/app/src/main/java/org/koitharu/kotatsu/browser/BrowserActivity.kt
index 442808bad..81968d794 100644
--- a/app/src/main/java/org/koitharu/kotatsu/browser/BrowserActivity.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/browser/BrowserActivity.kt
@@ -8,8 +8,10 @@ import android.net.Uri
import android.os.Bundle
import android.view.Menu
import android.view.MenuItem
+import android.view.ViewGroup
import androidx.core.graphics.Insets
import androidx.core.view.isVisible
+import androidx.core.view.updateLayoutParams
import androidx.core.view.updatePadding
import com.google.android.material.R as materialR
import org.koitharu.kotatsu.R
@@ -42,7 +44,7 @@ class BrowserActivity : BaseActivity(), BrowserCallback
} else {
onTitleChanged(
intent?.getStringExtra(EXTRA_TITLE) ?: getString(R.string.loading_),
- url
+ url,
)
binding.webView.loadUrl(url)
}
@@ -59,8 +61,9 @@ class BrowserActivity : BaseActivity(), BrowserCallback
}
override fun onCreateOptionsMenu(menu: Menu): Boolean {
+ super.onCreateOptionsMenu(menu)
menuInflater.inflate(R.menu.opt_browser, menu)
- return super.onCreateOptionsMenu(menu)
+ return true
}
override fun onOptionsItemSelected(item: MenuItem): Boolean = when (item.itemId) {
@@ -116,8 +119,6 @@ class BrowserActivity : BaseActivity(), BrowserCallback
override fun onWindowInsetsChanged(insets: Insets) {
binding.appbar.updatePadding(
top = insets.top,
- left = insets.left,
- right = insets.right,
)
binding.root.updatePadding(
left = insets.left,
@@ -136,4 +137,4 @@ class BrowserActivity : BaseActivity(), BrowserCallback
.putExtra(EXTRA_TITLE, title)
}
}
-}
\ No newline at end of file
+}
diff --git a/app/src/main/java/org/koitharu/kotatsu/browser/cloudflare/CloudFlareDialog.kt b/app/src/main/java/org/koitharu/kotatsu/browser/cloudflare/CloudFlareDialog.kt
index 8c1de2625..683d8abb0 100644
--- a/app/src/main/java/org/koitharu/kotatsu/browser/cloudflare/CloudFlareDialog.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/browser/cloudflare/CloudFlareDialog.kt
@@ -11,21 +11,27 @@ import android.webkit.WebSettings
import androidx.core.view.isInvisible
import androidx.fragment.app.setFragmentResult
import com.google.android.material.dialog.MaterialAlertDialogBuilder
-import org.koin.android.ext.android.get
+import dagger.hilt.android.AndroidEntryPoint
+import javax.inject.Inject
import org.koitharu.kotatsu.base.ui.AlertDialogFragment
+import org.koitharu.kotatsu.core.network.AndroidCookieJar
import org.koitharu.kotatsu.core.network.UserAgentInterceptor
import org.koitharu.kotatsu.databinding.FragmentCloudflareBinding
import org.koitharu.kotatsu.utils.ext.stringArgument
import org.koitharu.kotatsu.utils.ext.withArgs
+@AndroidEntryPoint
class CloudFlareDialog : AlertDialogFragment(), CloudFlareCallback {
private val url by stringArgument(ARG_URL)
private val pendingResult = Bundle(1)
+ @Inject
+ lateinit var cookieJar: AndroidCookieJar
+
override fun onInflateView(
inflater: LayoutInflater,
- container: ViewGroup?
+ container: ViewGroup?,
) = FragmentCloudflareBinding.inflate(inflater, container, false)
@SuppressLint("SetJavaScriptEnabled")
@@ -38,7 +44,7 @@ class CloudFlareDialog : AlertDialogFragment(), Cloud
databaseEnabled = true
userAgentString = UserAgentInterceptor.userAgent
}
- binding.webView.webViewClient = CloudFlareClient(get(), this, url.orEmpty())
+ binding.webView.webViewClient = CloudFlareClient(cookieJar, this, url.orEmpty())
CookieManager.getInstance().setAcceptThirdPartyCookies(binding.webView, true)
if (url.isNullOrEmpty()) {
dismissAllowingStateLoss()
@@ -90,4 +96,4 @@ class CloudFlareDialog : AlertDialogFragment(), Cloud
putString(ARG_URL, url)
}
}
-}
\ No newline at end of file
+}
diff --git a/app/src/main/java/org/koitharu/kotatsu/core/AppModule.kt b/app/src/main/java/org/koitharu/kotatsu/core/AppModule.kt
new file mode 100644
index 000000000..1b9c8109c
--- /dev/null
+++ b/app/src/main/java/org/koitharu/kotatsu/core/AppModule.kt
@@ -0,0 +1,160 @@
+package org.koitharu.kotatsu.core
+
+import android.app.Application
+import android.content.Context
+import android.provider.SearchRecentSuggestions
+import android.text.Html
+import androidx.collection.arraySetOf
+import androidx.room.InvalidationTracker
+import coil.ComponentRegistry
+import coil.ImageLoader
+import coil.decode.SvgDecoder
+import coil.disk.DiskCache
+import coil.util.DebugLogger
+import dagger.Binds
+import dagger.Module
+import dagger.Provides
+import dagger.hilt.InstallIn
+import dagger.hilt.android.qualifiers.ApplicationContext
+import dagger.hilt.components.SingletonComponent
+import dagger.multibindings.ElementsIntoSet
+import java.util.concurrent.TimeUnit
+import javax.inject.Singleton
+import kotlinx.coroutines.Dispatchers
+import okhttp3.CookieJar
+import okhttp3.OkHttpClient
+import org.koitharu.kotatsu.BuildConfig
+import org.koitharu.kotatsu.base.ui.util.ActivityRecreationHandle
+import org.koitharu.kotatsu.core.db.MangaDatabase
+import org.koitharu.kotatsu.core.network.*
+import org.koitharu.kotatsu.core.os.ShortcutsUpdater
+import org.koitharu.kotatsu.core.parser.MangaLoaderContextImpl
+import org.koitharu.kotatsu.core.parser.MangaRepository
+import org.koitharu.kotatsu.core.parser.favicon.FaviconFetcher
+import org.koitharu.kotatsu.core.prefs.AppSettings
+import org.koitharu.kotatsu.local.data.CacheDir
+import org.koitharu.kotatsu.local.data.CbzFetcher
+import org.koitharu.kotatsu.local.data.LocalStorageManager
+import org.koitharu.kotatsu.main.ui.protect.AppProtectHelper
+import org.koitharu.kotatsu.parsers.MangaLoaderContext
+import org.koitharu.kotatsu.search.ui.MangaSuggestionsProvider
+import org.koitharu.kotatsu.settings.backup.BackupObserver
+import org.koitharu.kotatsu.sync.domain.SyncController
+import org.koitharu.kotatsu.utils.ext.isLowRamDevice
+import org.koitharu.kotatsu.utils.image.CoilImageGetter
+import org.koitharu.kotatsu.widget.WidgetUpdater
+
+@Module
+@InstallIn(SingletonComponent::class)
+interface AppModule {
+
+ @Binds
+ fun bindCookieJar(androidCookieJar: AndroidCookieJar): CookieJar
+
+ @Binds
+ fun bindMangaLoaderContext(mangaLoaderContextImpl: MangaLoaderContextImpl): MangaLoaderContext
+
+ @Binds
+ fun bindImageGetter(coilImageGetter: CoilImageGetter): Html.ImageGetter
+
+ companion object {
+
+ @Provides
+ @Singleton
+ fun provideOkHttpClient(
+ localStorageManager: LocalStorageManager,
+ cookieJar: CookieJar,
+ settings: AppSettings,
+ ): OkHttpClient {
+ val cache = localStorageManager.createHttpCache()
+ return OkHttpClient.Builder().apply {
+ connectTimeout(20, TimeUnit.SECONDS)
+ readTimeout(60, TimeUnit.SECONDS)
+ writeTimeout(20, TimeUnit.SECONDS)
+ cookieJar(cookieJar)
+ dns(DoHManager(cache, settings))
+ cache(cache)
+ addInterceptor(GZipInterceptor())
+ addInterceptor(UserAgentInterceptor())
+ addInterceptor(CloudFlareInterceptor())
+ }.build()
+ }
+
+ @Provides
+ @Singleton
+ fun provideMangaDatabase(
+ @ApplicationContext context: Context,
+ ): MangaDatabase {
+ return MangaDatabase(context)
+ }
+
+ @Provides
+ @Singleton
+ fun provideCoil(
+ @ApplicationContext context: Context,
+ okHttpClient: OkHttpClient,
+ mangaRepositoryFactory: MangaRepository.Factory,
+ ): ImageLoader {
+ val httpClientFactory = {
+ okHttpClient.newBuilder()
+ .cache(null)
+ .build()
+ }
+ val diskCacheFactory = {
+ val rootDir = context.externalCacheDir ?: context.cacheDir
+ DiskCache.Builder()
+ .directory(rootDir.resolve(CacheDir.THUMBS.dir))
+ .build()
+ }
+ return ImageLoader.Builder(context)
+ .okHttpClient(httpClientFactory)
+ .interceptorDispatcher(Dispatchers.Default)
+ .fetcherDispatcher(Dispatchers.IO)
+ .decoderDispatcher(Dispatchers.Default)
+ .transformationDispatcher(Dispatchers.Default)
+ .diskCache(diskCacheFactory)
+ .logger(if (BuildConfig.DEBUG) DebugLogger() else null)
+ .allowRgb565(isLowRamDevice(context))
+ .components(
+ ComponentRegistry.Builder()
+ .add(SvgDecoder.Factory())
+ .add(CbzFetcher.Factory())
+ .add(FaviconFetcher.Factory(context, okHttpClient, mangaRepositoryFactory))
+ .build(),
+ ).build()
+ }
+
+ @Provides
+ fun provideSearchSuggestions(
+ @ApplicationContext context: Context,
+ ): SearchRecentSuggestions {
+ return MangaSuggestionsProvider.createSuggestions(context)
+ }
+
+ @Provides
+ @Singleton
+ @ElementsIntoSet
+ fun provideDatabaseObservers(
+ widgetUpdater: WidgetUpdater,
+ shortcutsUpdater: ShortcutsUpdater,
+ backupObserver: BackupObserver,
+ syncController: SyncController,
+ ): Set<@JvmSuppressWildcards InvalidationTracker.Observer> = arraySetOf(
+ widgetUpdater,
+ shortcutsUpdater,
+ backupObserver,
+ syncController,
+ )
+
+ @Provides
+ @Singleton
+ @ElementsIntoSet
+ fun provideActivityLifecycleCallbacks(
+ appProtectHelper: AppProtectHelper,
+ activityRecreationHandle: ActivityRecreationHandle,
+ ): Set<@JvmSuppressWildcards Application.ActivityLifecycleCallbacks> = arraySetOf(
+ appProtectHelper,
+ activityRecreationHandle,
+ )
+ }
+}
diff --git a/app/src/main/java/org/koitharu/kotatsu/core/backup/BackupRepository.kt b/app/src/main/java/org/koitharu/kotatsu/core/backup/BackupRepository.kt
index 27dd10255..11e16e192 100644
--- a/app/src/main/java/org/koitharu/kotatsu/core/backup/BackupRepository.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/core/backup/BackupRepository.kt
@@ -1,6 +1,7 @@
package org.koitharu.kotatsu.core.backup
import androidx.room.withTransaction
+import javax.inject.Inject
import org.json.JSONArray
import org.json.JSONObject
import org.koitharu.kotatsu.BuildConfig
@@ -10,7 +11,7 @@ import org.koitharu.kotatsu.parsers.util.json.mapJSON
private const val PAGE_SIZE = 10
-class BackupRepository(private val db: MangaDatabase) {
+class BackupRepository @Inject constructor(private val db: MangaDatabase) {
suspend fun dumpHistory(): BackupEntry {
var offset = 0
@@ -125,4 +126,4 @@ class BackupRepository(private val db: MangaDatabase) {
}
return result
}
-}
\ No newline at end of file
+}
diff --git a/app/src/main/java/org/koitharu/kotatsu/core/backup/JsonDeserializer.kt b/app/src/main/java/org/koitharu/kotatsu/core/backup/JsonDeserializer.kt
index 96463e4a5..42aa846b1 100644
--- a/app/src/main/java/org/koitharu/kotatsu/core/backup/JsonDeserializer.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/core/backup/JsonDeserializer.kt
@@ -9,6 +9,7 @@ import org.koitharu.kotatsu.history.data.HistoryEntity
import org.koitharu.kotatsu.parsers.model.SortOrder
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
class JsonDeserializer(private val json: JSONObject) {
@@ -16,7 +17,9 @@ class JsonDeserializer(private val json: JSONObject) {
fun toFavouriteEntity() = FavouriteEntity(
mangaId = json.getLong("manga_id"),
categoryId = json.getLong("category_id"),
+ sortKey = json.getIntOrDefault("sort_key", 0),
createdAt = json.getLong("created_at"),
+ deletedAt = 0L,
)
fun toMangaEntity() = MangaEntity(
@@ -49,6 +52,7 @@ class JsonDeserializer(private val json: JSONObject) {
page = json.getInt("page"),
scroll = json.getDouble("scroll").toFloat(),
percent = json.getFloatOrDefault("percent", -1f),
+ deletedAt = 0L,
)
fun toFavouriteCategoryEntity() = FavouriteCategoryEntity(
@@ -58,5 +62,7 @@ class JsonDeserializer(private val json: JSONObject) {
title = json.getString("title"),
order = json.getStringOrNull("order") ?: SortOrder.NEWEST.name,
track = json.getBooleanOrDefault("track", true),
+ isVisibleInLibrary = json.getBooleanOrDefault("show_in_lib", true),
+ deletedAt = 0L,
)
-}
\ No newline at end of file
+}
diff --git a/app/src/main/java/org/koitharu/kotatsu/core/backup/JsonSerializer.kt b/app/src/main/java/org/koitharu/kotatsu/core/backup/JsonSerializer.kt
index b6a035e87..3d4d2f068 100644
--- a/app/src/main/java/org/koitharu/kotatsu/core/backup/JsonSerializer.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/core/backup/JsonSerializer.kt
@@ -13,6 +13,7 @@ class JsonSerializer private constructor(private val json: JSONObject) {
JSONObject().apply {
put("manga_id", e.mangaId)
put("category_id", e.categoryId)
+ put("sort_key", e.sortKey)
put("created_at", e.createdAt)
}
)
@@ -25,6 +26,7 @@ class JsonSerializer private constructor(private val json: JSONObject) {
put("title", e.title)
put("order", e.order)
put("track", e.track)
+ put("show_in_lib", e.isVisibleInLibrary)
}
)
diff --git a/app/src/main/java/org/koitharu/kotatsu/core/db/DatabaseModule.kt b/app/src/main/java/org/koitharu/kotatsu/core/db/DatabaseModule.kt
deleted file mode 100644
index 215d02259..000000000
--- a/app/src/main/java/org/koitharu/kotatsu/core/db/DatabaseModule.kt
+++ /dev/null
@@ -1,9 +0,0 @@
-package org.koitharu.kotatsu.core.db
-
-import org.koin.android.ext.koin.androidContext
-import org.koin.dsl.module
-
-val databaseModule
- get() = module {
- single { MangaDatabase(androidContext()) }
- }
\ No newline at end of file
diff --git a/app/src/main/java/org/koitharu/kotatsu/core/db/DatabasePrePopulateCallback.kt b/app/src/main/java/org/koitharu/kotatsu/core/db/DatabasePrePopulateCallback.kt
index 6257a8456..e13b0d26a 100644
--- a/app/src/main/java/org/koitharu/kotatsu/core/db/DatabasePrePopulateCallback.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/core/db/DatabasePrePopulateCallback.kt
@@ -10,8 +10,16 @@ class DatabasePrePopulateCallback(private val resources: Resources) : RoomDataba
override fun onCreate(db: SupportSQLiteDatabase) {
db.execSQL(
- "INSERT INTO favourite_categories (created_at, sort_key, title, `order`, track) VALUES (?,?,?,?,?)",
- arrayOf(System.currentTimeMillis(), 1, resources.getString(R.string.read_later), SortOrder.NEWEST.name, 1)
+ "INSERT INTO favourite_categories (created_at, sort_key, title, `order`, track, show_in_lib, `deleted_at`) VALUES (?,?,?,?,?,?,?)",
+ arrayOf(
+ System.currentTimeMillis(),
+ 1,
+ resources.getString(R.string.read_later),
+ SortOrder.NEWEST.name,
+ 1,
+ 1,
+ 0L,
+ )
)
}
-}
\ No newline at end of file
+}
diff --git a/app/src/main/java/org/koitharu/kotatsu/core/db/MangaDatabase.kt b/app/src/main/java/org/koitharu/kotatsu/core/db/MangaDatabase.kt
index d3dff3cc6..5cbc17385 100644
--- a/app/src/main/java/org/koitharu/kotatsu/core/db/MangaDatabase.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/core/db/MangaDatabase.kt
@@ -2,9 +2,13 @@ package org.koitharu.kotatsu.core.db
import android.content.Context
import androidx.room.Database
+import androidx.room.InvalidationTracker
import androidx.room.Room
import androidx.room.RoomDatabase
import androidx.room.migration.Migration
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.isActive
+import kotlinx.coroutines.launch
import org.koitharu.kotatsu.bookmarks.data.BookmarkEntity
import org.koitharu.kotatsu.bookmarks.data.BookmarksDao
import org.koitharu.kotatsu.core.db.dao.MangaDao
@@ -29,8 +33,9 @@ import org.koitharu.kotatsu.suggestions.data.SuggestionEntity
import org.koitharu.kotatsu.tracker.data.TrackEntity
import org.koitharu.kotatsu.tracker.data.TrackLogEntity
import org.koitharu.kotatsu.tracker.data.TracksDao
+import org.koitharu.kotatsu.utils.ext.processLifecycleScope
-const val DATABASE_VERSION = 12
+const val DATABASE_VERSION = 14
@Database(
entities = [
@@ -79,10 +84,21 @@ val databaseMigrations: Array
Migration9To10(),
Migration10To11(),
Migration11To12(),
+ Migration12To13(),
+ Migration13To14(),
)
fun MangaDatabase(context: Context): MangaDatabase = Room
.databaseBuilder(context, MangaDatabase::class.java, "kotatsu-db")
.addMigrations(*databaseMigrations)
.addCallback(DatabasePrePopulateCallback(context.resources))
- .build()
\ No newline at end of file
+ .build()
+
+fun InvalidationTracker.removeObserverAsync(observer: InvalidationTracker.Observer) {
+ val scope = processLifecycleScope
+ if (scope.isActive) {
+ processLifecycleScope.launch(Dispatchers.Default) {
+ removeObserver(observer)
+ }
+ }
+}
diff --git a/app/src/main/java/org/koitharu/kotatsu/core/db/Tables.kt b/app/src/main/java/org/koitharu/kotatsu/core/db/Tables.kt
index 28920a626..7fd8c8786 100644
--- a/app/src/main/java/org/koitharu/kotatsu/core/db/Tables.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/core/db/Tables.kt
@@ -1,6 +1,5 @@
package org.koitharu.kotatsu.core.db
-
const val TABLE_FAVOURITES = "favourites"
const val TABLE_MANGA = "manga"
const val TABLE_TAGS = "tags"
diff --git a/app/src/main/java/org/koitharu/kotatsu/core/db/entity/MangaEntity.kt b/app/src/main/java/org/koitharu/kotatsu/core/db/entity/MangaEntity.kt
index 36e534c71..e2c474399 100644
--- a/app/src/main/java/org/koitharu/kotatsu/core/db/entity/MangaEntity.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/core/db/entity/MangaEntity.kt
@@ -20,4 +20,4 @@ data class MangaEntity(
@ColumnInfo(name = "state") val state: String?,
@ColumnInfo(name = "author") val author: String?,
@ColumnInfo(name = "source") val source: String,
-)
\ No newline at end of file
+)
diff --git a/app/src/main/java/org/koitharu/kotatsu/core/db/entity/MangaTagsEntity.kt b/app/src/main/java/org/koitharu/kotatsu/core/db/entity/MangaTagsEntity.kt
index e7a59c5d0..bc343f784 100644
--- a/app/src/main/java/org/koitharu/kotatsu/core/db/entity/MangaTagsEntity.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/core/db/entity/MangaTagsEntity.kt
@@ -13,13 +13,13 @@ import org.koitharu.kotatsu.core.db.TABLE_MANGA_TAGS
entity = MangaEntity::class,
parentColumns = ["manga_id"],
childColumns = ["manga_id"],
- onDelete = ForeignKey.CASCADE
+ onDelete = ForeignKey.CASCADE,
),
ForeignKey(
entity = TagEntity::class,
parentColumns = ["tag_id"],
childColumns = ["tag_id"],
- onDelete = ForeignKey.CASCADE
+ onDelete = ForeignKey.CASCADE,
)
]
)
diff --git a/app/src/main/java/org/koitharu/kotatsu/core/db/entity/MangaWithTags.kt b/app/src/main/java/org/koitharu/kotatsu/core/db/entity/MangaWithTags.kt
index 8c35c376e..dd814dace 100644
--- a/app/src/main/java/org/koitharu/kotatsu/core/db/entity/MangaWithTags.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/core/db/entity/MangaWithTags.kt
@@ -12,4 +12,23 @@ class MangaWithTags(
associateBy = Junction(MangaTagsEntity::class)
)
val tags: List,
-)
\ No newline at end of file
+) {
+
+ override fun equals(other: Any?): Boolean {
+ if (this === other) return true
+ if (javaClass != other?.javaClass) return false
+
+ other as MangaWithTags
+
+ if (manga != other.manga) return false
+ if (tags != other.tags) return false
+
+ return true
+ }
+
+ override fun hashCode(): Int {
+ var result = manga.hashCode()
+ result = 31 * result + tags.hashCode()
+ return result
+ }
+}
\ No newline at end of file
diff --git a/app/src/main/java/org/koitharu/kotatsu/core/db/entity/TagEntity.kt b/app/src/main/java/org/koitharu/kotatsu/core/db/entity/TagEntity.kt
index 7f147c992..6c7907da6 100644
--- a/app/src/main/java/org/koitharu/kotatsu/core/db/entity/TagEntity.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/core/db/entity/TagEntity.kt
@@ -12,4 +12,4 @@ data class TagEntity(
@ColumnInfo(name = "title") val title: String,
@ColumnInfo(name = "key") val key: String,
@ColumnInfo(name = "source") val source: String,
-)
\ No newline at end of file
+)
diff --git a/app/src/main/java/org/koitharu/kotatsu/core/db/migrations/Migration11To12.kt b/app/src/main/java/org/koitharu/kotatsu/core/db/migrations/Migration11To12.kt
index 9d13d2420..ae82764b2 100644
--- a/app/src/main/java/org/koitharu/kotatsu/core/db/migrations/Migration11To12.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/core/db/migrations/Migration11To12.kt
@@ -24,4 +24,4 @@ class Migration11To12 : Migration(11, 12) {
database.execSQL("ALTER TABLE history ADD COLUMN `percent` REAL NOT NULL DEFAULT -1")
database.execSQL("ALTER TABLE bookmarks ADD COLUMN `percent` REAL NOT NULL DEFAULT -1")
}
-}
\ No newline at end of file
+}
diff --git a/app/src/main/java/org/koitharu/kotatsu/core/db/migrations/Migration12To13.kt b/app/src/main/java/org/koitharu/kotatsu/core/db/migrations/Migration12To13.kt
new file mode 100644
index 000000000..9f8fa723a
--- /dev/null
+++ b/app/src/main/java/org/koitharu/kotatsu/core/db/migrations/Migration12To13.kt
@@ -0,0 +1,12 @@
+package org.koitharu.kotatsu.core.db.migrations
+
+import androidx.room.migration.Migration
+import androidx.sqlite.db.SupportSQLiteDatabase
+
+class Migration12To13 : Migration(12, 13) {
+
+ override fun migrate(database: SupportSQLiteDatabase) {
+ database.execSQL("ALTER TABLE favourite_categories ADD COLUMN `show_in_lib` INTEGER NOT NULL DEFAULT 1")
+ database.execSQL("ALTER TABLE favourites ADD COLUMN `sort_key` INTEGER NOT NULL DEFAULT 0")
+ }
+}
\ No newline at end of file
diff --git a/app/src/main/java/org/koitharu/kotatsu/core/db/migrations/Migration13To14.kt b/app/src/main/java/org/koitharu/kotatsu/core/db/migrations/Migration13To14.kt
new file mode 100644
index 000000000..204e20843
--- /dev/null
+++ b/app/src/main/java/org/koitharu/kotatsu/core/db/migrations/Migration13To14.kt
@@ -0,0 +1,13 @@
+package org.koitharu.kotatsu.core.db.migrations
+
+import androidx.room.migration.Migration
+import androidx.sqlite.db.SupportSQLiteDatabase
+
+class Migration13To14 : Migration(13, 14) {
+
+ override fun migrate(database: SupportSQLiteDatabase) {
+ database.execSQL("ALTER TABLE favourite_categories ADD COLUMN `deleted_at` INTEGER NOT NULL DEFAULT 0")
+ database.execSQL("ALTER TABLE favourites ADD COLUMN `deleted_at` INTEGER NOT NULL DEFAULT 0")
+ database.execSQL("ALTER TABLE history ADD COLUMN `deleted_at` INTEGER NOT NULL DEFAULT 0")
+ }
+}
diff --git a/app/src/main/java/org/koitharu/kotatsu/core/exceptions/SyncApiException.kt b/app/src/main/java/org/koitharu/kotatsu/core/exceptions/SyncApiException.kt
new file mode 100644
index 000000000..b314d1b59
--- /dev/null
+++ b/app/src/main/java/org/koitharu/kotatsu/core/exceptions/SyncApiException.kt
@@ -0,0 +1,6 @@
+package org.koitharu.kotatsu.core.exceptions
+
+class SyncApiException(
+ message: String,
+ val code: Int,
+) : RuntimeException(message)
diff --git a/app/src/main/java/org/koitharu/kotatsu/core/github/AppUpdateRepository.kt b/app/src/main/java/org/koitharu/kotatsu/core/github/AppUpdateRepository.kt
new file mode 100644
index 000000000..62ea43d64
--- /dev/null
+++ b/app/src/main/java/org/koitharu/kotatsu/core/github/AppUpdateRepository.kt
@@ -0,0 +1,95 @@
+package org.koitharu.kotatsu.core.github
+
+import android.annotation.SuppressLint
+import android.content.Context
+import android.content.pm.PackageManager
+import dagger.hilt.android.qualifiers.ApplicationContext
+import java.io.ByteArrayInputStream
+import java.io.InputStream
+import java.security.MessageDigest
+import java.security.cert.CertificateFactory
+import java.security.cert.X509Certificate
+import javax.inject.Inject
+import javax.inject.Singleton
+import kotlinx.coroutines.flow.MutableStateFlow
+import kotlinx.coroutines.flow.asStateFlow
+import okhttp3.OkHttpClient
+import okhttp3.Request
+import org.koitharu.kotatsu.BuildConfig
+import org.koitharu.kotatsu.parsers.util.await
+import org.koitharu.kotatsu.parsers.util.byte2HexFormatted
+import org.koitharu.kotatsu.parsers.util.json.mapJSONNotNull
+import org.koitharu.kotatsu.parsers.util.parseJsonArray
+import org.koitharu.kotatsu.utils.ext.asArrayList
+import org.koitharu.kotatsu.utils.ext.printStackTraceDebug
+
+private const val CERT_SHA1 = "2C:19:C7:E8:07:61:2B:8E:94:51:1B:FD:72:67:07:64:5D:C2:58:AE"
+
+@Singleton
+class AppUpdateRepository @Inject constructor(
+ @ApplicationContext private val context: Context,
+ private val okHttp: OkHttpClient,
+) {
+
+ private val availableUpdate = MutableStateFlow(null)
+
+ fun observeAvailableUpdate() = availableUpdate.asStateFlow()
+
+ suspend fun getAvailableVersions(): List {
+ val request = Request.Builder()
+ .get()
+ .url("https://api.github.com/repos/KotatsuApp/Kotatsu/releases?page=1&per_page=10")
+ val jsonArray = okHttp.newCall(request.build()).await().parseJsonArray()
+ return jsonArray.mapJSONNotNull { json ->
+ val asset = json.optJSONArray("assets")?.optJSONObject(0) ?: return@mapJSONNotNull null
+ AppVersion(
+ id = json.getLong("id"),
+ url = json.getString("html_url"),
+ name = json.getString("name").removePrefix("v"),
+ apkSize = asset.getLong("size"),
+ apkUrl = asset.getString("browser_download_url"),
+ description = json.getString("body"),
+ )
+ }
+ }
+
+ suspend fun fetchUpdate(): AppVersion? {
+ if (!isUpdateSupported()) {
+ return null
+ }
+ return runCatching {
+ val currentVersion = VersionId(BuildConfig.VERSION_NAME)
+ val available = getAvailableVersions().asArrayList()
+ available.sortBy { it.versionId }
+ if (currentVersion.isStable) {
+ available.retainAll { it.versionId.isStable }
+ }
+ available.maxByOrNull { it.versionId }
+ ?.takeIf { it.versionId > currentVersion }
+ }.onFailure {
+ it.printStackTraceDebug()
+ }.onSuccess {
+ availableUpdate.value = it
+ }.getOrNull()
+ }
+
+ fun isUpdateSupported(): Boolean {
+ return BuildConfig.DEBUG || getCertificateSHA1Fingerprint() == CERT_SHA1
+ }
+
+ @Suppress("DEPRECATION")
+ @SuppressLint("PackageManagerGetSignatures")
+ private fun getCertificateSHA1Fingerprint(): String? = runCatching {
+ val packageInfo = context.packageManager.getPackageInfo(context.packageName, PackageManager.GET_SIGNATURES)
+ val signatures = requireNotNull(packageInfo?.signatures)
+ val cert: ByteArray = signatures.first().toByteArray()
+ val input: InputStream = ByteArrayInputStream(cert)
+ val cf = CertificateFactory.getInstance("X509")
+ val c = cf.generateCertificate(input) as X509Certificate
+ val md: MessageDigest = MessageDigest.getInstance("SHA1")
+ val publicKey: ByteArray = md.digest(c.encoded)
+ return publicKey.byte2HexFormatted()
+ }.onFailure { error ->
+ error.printStackTraceDebug()
+ }.getOrNull()
+}
diff --git a/app/src/main/java/org/koitharu/kotatsu/core/github/AppVersion.kt b/app/src/main/java/org/koitharu/kotatsu/core/github/AppVersion.kt
index ff6babc95..1dcf7e26f 100644
--- a/app/src/main/java/org/koitharu/kotatsu/core/github/AppVersion.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/core/github/AppVersion.kt
@@ -1,6 +1,7 @@
package org.koitharu.kotatsu.core.github
import android.os.Parcelable
+import kotlinx.parcelize.IgnoredOnParcel
import kotlinx.parcelize.Parcelize
@Parcelize
@@ -10,5 +11,9 @@ data class AppVersion(
val url: String,
val apkSize: Long,
val apkUrl: String,
- val description: String
-) : Parcelable
\ No newline at end of file
+ val description: String,
+) : Parcelable {
+
+ @IgnoredOnParcel
+ val versionId = VersionId(name)
+}
diff --git a/app/src/main/java/org/koitharu/kotatsu/core/github/GithubModule.kt b/app/src/main/java/org/koitharu/kotatsu/core/github/GithubModule.kt
deleted file mode 100644
index 58d8d22c6..000000000
--- a/app/src/main/java/org/koitharu/kotatsu/core/github/GithubModule.kt
+++ /dev/null
@@ -1,8 +0,0 @@
-package org.koitharu.kotatsu.core.github
-
-import org.koin.dsl.module
-
-val githubModule
- get() = module {
- factory { GithubRepository(get()) }
- }
\ No newline at end of file
diff --git a/app/src/main/java/org/koitharu/kotatsu/core/github/GithubRepository.kt b/app/src/main/java/org/koitharu/kotatsu/core/github/GithubRepository.kt
deleted file mode 100644
index 0176823db..000000000
--- a/app/src/main/java/org/koitharu/kotatsu/core/github/GithubRepository.kt
+++ /dev/null
@@ -1,25 +0,0 @@
-package org.koitharu.kotatsu.core.github
-
-import okhttp3.OkHttpClient
-import okhttp3.Request
-import org.koitharu.kotatsu.parsers.util.await
-import org.koitharu.kotatsu.parsers.util.parseJson
-
-class GithubRepository(private val okHttp: OkHttpClient) {
-
- suspend fun getLatestVersion(): AppVersion {
- val request = Request.Builder()
- .get()
- .url("https://api.github.com/repos/KotatsuApp/Kotatsu/releases/latest")
- val json = okHttp.newCall(request.build()).await().parseJson()
- val asset = json.getJSONArray("assets").getJSONObject(0)
- return AppVersion(
- id = json.getLong("id"),
- url = json.getString("html_url"),
- name = json.getString("name").removePrefix("v"),
- apkSize = asset.getLong("size"),
- apkUrl = asset.getString("browser_download_url"),
- description = json.getString("body")
- )
- }
-}
\ No newline at end of file
diff --git a/app/src/main/java/org/koitharu/kotatsu/core/github/VersionId.kt b/app/src/main/java/org/koitharu/kotatsu/core/github/VersionId.kt
index 88304755b..4080b8c76 100644
--- a/app/src/main/java/org/koitharu/kotatsu/core/github/VersionId.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/core/github/VersionId.kt
@@ -63,6 +63,9 @@ class VersionId(
}
}
+val VersionId.isStable: Boolean
+ get() = variantType.isEmpty()
+
fun VersionId(versionName: String): VersionId {
val parts = versionName.substringBeforeLast('-').split('.')
val variant = versionName.substringAfterLast('-', "")
@@ -73,4 +76,4 @@ fun VersionId(versionName: String): VersionId {
variantType = variant.filter(Char::isLetter),
variantNumber = variant.filter(Char::isDigit).toIntOrNull() ?: 0,
)
-}
\ No newline at end of file
+}
diff --git a/app/src/main/java/org/koitharu/kotatsu/core/model/FavouriteCategory.kt b/app/src/main/java/org/koitharu/kotatsu/core/model/FavouriteCategory.kt
index 798ec2fbd..307cb50cd 100644
--- a/app/src/main/java/org/koitharu/kotatsu/core/model/FavouriteCategory.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/core/model/FavouriteCategory.kt
@@ -1,9 +1,9 @@
package org.koitharu.kotatsu.core.model
import android.os.Parcelable
-import java.util.*
import kotlinx.parcelize.Parcelize
import org.koitharu.kotatsu.parsers.model.SortOrder
+import java.util.*
@Parcelize
data class FavouriteCategory(
@@ -13,4 +13,5 @@ data class FavouriteCategory(
val order: SortOrder,
val createdAt: Date,
val isTrackingEnabled: Boolean,
+ val isVisibleInLibrary: Boolean,
) : Parcelable
\ No newline at end of file
diff --git a/app/src/main/java/org/koitharu/kotatsu/core/network/AndroidCookieJar.kt b/app/src/main/java/org/koitharu/kotatsu/core/network/AndroidCookieJar.kt
index fb806bda1..bb221d743 100644
--- a/app/src/main/java/org/koitharu/kotatsu/core/network/AndroidCookieJar.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/core/network/AndroidCookieJar.kt
@@ -1,13 +1,16 @@
package org.koitharu.kotatsu.core.network
import android.webkit.CookieManager
+import javax.inject.Inject
+import javax.inject.Singleton
+import kotlin.coroutines.resume
+import kotlin.coroutines.suspendCoroutine
import okhttp3.Cookie
import okhttp3.CookieJar
import okhttp3.HttpUrl
-import kotlin.coroutines.resume
-import kotlin.coroutines.suspendCoroutine
-class AndroidCookieJar : CookieJar {
+@Singleton
+class AndroidCookieJar @Inject constructor() : CookieJar {
private val cookieManager = CookieManager.getInstance()
@@ -31,4 +34,4 @@ class AndroidCookieJar : CookieJar {
suspend fun clear() = suspendCoroutine { continuation ->
cookieManager.removeAllCookies(continuation::resume)
}
-}
\ No newline at end of file
+}
diff --git a/app/src/main/java/org/koitharu/kotatsu/core/network/CommonHeaders.kt b/app/src/main/java/org/koitharu/kotatsu/core/network/CommonHeaders.kt
index f377404c8..9b27ccfc2 100644
--- a/app/src/main/java/org/koitharu/kotatsu/core/network/CommonHeaders.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/core/network/CommonHeaders.kt
@@ -9,6 +9,7 @@ object CommonHeaders {
const val ACCEPT = "Accept"
const val CONTENT_DISPOSITION = "Content-Disposition"
const val COOKIE = "Cookie"
+ const val CONTENT_ENCODING = "Content-Encoding"
const val AUTHORIZATION = "Authorization"
val CACHE_CONTROL_DISABLED: CacheControl
diff --git a/app/src/main/java/org/koitharu/kotatsu/core/network/GZipInterceptor.kt b/app/src/main/java/org/koitharu/kotatsu/core/network/GZipInterceptor.kt
new file mode 100644
index 000000000..1e53a4e7e
--- /dev/null
+++ b/app/src/main/java/org/koitharu/kotatsu/core/network/GZipInterceptor.kt
@@ -0,0 +1,14 @@
+package org.koitharu.kotatsu.core.network
+
+import okhttp3.Interceptor
+import okhttp3.Response
+import org.koitharu.kotatsu.core.network.CommonHeaders.CONTENT_ENCODING
+
+class GZipInterceptor : Interceptor {
+
+ override fun intercept(chain: Interceptor.Chain): Response {
+ val newRequest = chain.request().newBuilder()
+ newRequest.addHeader(CONTENT_ENCODING, "gzip")
+ return chain.proceed(newRequest.build())
+ }
+}
diff --git a/app/src/main/java/org/koitharu/kotatsu/core/network/NetworkModule.kt b/app/src/main/java/org/koitharu/kotatsu/core/network/NetworkModule.kt
deleted file mode 100644
index 2af4c215e..000000000
--- a/app/src/main/java/org/koitharu/kotatsu/core/network/NetworkModule.kt
+++ /dev/null
@@ -1,29 +0,0 @@
-package org.koitharu.kotatsu.core.network
-
-import okhttp3.CookieJar
-import okhttp3.OkHttpClient
-import org.koin.dsl.bind
-import org.koin.dsl.module
-import org.koitharu.kotatsu.core.parser.MangaLoaderContextImpl
-import org.koitharu.kotatsu.local.data.LocalStorageManager
-import org.koitharu.kotatsu.parsers.MangaLoaderContext
-import java.util.concurrent.TimeUnit
-
-val networkModule
- get() = module {
- single { AndroidCookieJar() } bind CookieJar::class
- single {
- val cache = get().createHttpCache()
- OkHttpClient.Builder().apply {
- connectTimeout(20, TimeUnit.SECONDS)
- readTimeout(60, TimeUnit.SECONDS)
- writeTimeout(20, TimeUnit.SECONDS)
- cookieJar(get())
- dns(DoHManager(cache, get()))
- cache(cache)
- addInterceptor(UserAgentInterceptor())
- addInterceptor(CloudFlareInterceptor())
- }.build()
- }
- single { MangaLoaderContextImpl(get(), get(), get()) }
- }
\ No newline at end of file
diff --git a/app/src/main/java/org/koitharu/kotatsu/core/os/ShortcutsUpdater.kt b/app/src/main/java/org/koitharu/kotatsu/core/os/ShortcutsUpdater.kt
index a201295c5..c7eb5bbf9 100644
--- a/app/src/main/java/org/koitharu/kotatsu/core/os/ShortcutsUpdater.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/core/os/ShortcutsUpdater.kt
@@ -13,6 +13,9 @@ import androidx.core.graphics.drawable.IconCompat
import androidx.room.InvalidationTracker
import coil.ImageLoader
import coil.request.ImageRequest
+import dagger.hilt.android.qualifiers.ApplicationContext
+import javax.inject.Inject
+import javax.inject.Singleton
import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.Job
import kotlinx.coroutines.launch
@@ -26,8 +29,9 @@ import org.koitharu.kotatsu.utils.ext.printStackTraceDebug
import org.koitharu.kotatsu.utils.ext.processLifecycleScope
import org.koitharu.kotatsu.utils.ext.requireBitmap
-class ShortcutsUpdater(
- private val context: Context,
+@Singleton
+class ShortcutsUpdater @Inject constructor(
+ @ApplicationContext private val context: Context,
private val coil: ImageLoader,
private val historyRepository: HistoryRepository,
private val mangaRepository: MangaDataRepository,
@@ -37,6 +41,9 @@ class ShortcutsUpdater(
private var shortcutsUpdateJob: Job? = null
override fun onInvalidated(tables: MutableSet) {
+ if (Build.VERSION.SDK_INT < Build.VERSION_CODES.N_MR1) {
+ return
+ }
val prevJob = shortcutsUpdateJob
shortcutsUpdateJob = processLifecycleScope.launch(Dispatchers.Default) {
prevJob?.join()
@@ -48,7 +55,7 @@ class ShortcutsUpdater(
return ShortcutManagerCompat.requestPinShortcut(
context,
buildShortcutInfo(manga).build(),
- null
+ null,
)
}
@@ -73,12 +80,12 @@ class ShortcutsUpdater(
ImageRequest.Builder(context)
.data(manga.coverUrl)
.size(iconSize.width, iconSize.height)
- .build()
+ .build(),
).requireBitmap()
ThumbnailUtils.extractThumbnail(bmp, iconSize.width, iconSize.height, 0)
}.fold(
onSuccess = { IconCompat.createWithAdaptiveBitmap(it) },
- onFailure = { IconCompat.createWithResource(context, R.drawable.ic_shortcut_default) }
+ onFailure = { IconCompat.createWithResource(context, R.drawable.ic_shortcut_default) },
)
mangaRepository.storeManga(manga)
return ShortcutInfoCompat.Builder(context, manga.id.toString())
@@ -87,7 +94,7 @@ class ShortcutsUpdater(
.setIcon(icon)
.setIntent(
ReaderActivity.newIntent(context, manga.id)
- .setAction(ReaderActivity.ACTION_MANGA_READ)
+ .setAction(ReaderActivity.ACTION_MANGA_READ),
)
}
@@ -102,4 +109,4 @@ class ShortcutsUpdater(
}
}
}
-}
\ No newline at end of file
+}
diff --git a/app/src/main/java/org/koitharu/kotatsu/core/parser/FaviconMapper.kt b/app/src/main/java/org/koitharu/kotatsu/core/parser/FaviconMapper.kt
deleted file mode 100644
index 0f994ecaa..000000000
--- a/app/src/main/java/org/koitharu/kotatsu/core/parser/FaviconMapper.kt
+++ /dev/null
@@ -1,20 +0,0 @@
-package org.koitharu.kotatsu.core.parser
-
-import android.net.Uri
-import coil.map.Mapper
-import coil.request.Options
-import okhttp3.HttpUrl
-import okhttp3.HttpUrl.Companion.toHttpUrl
-import org.koitharu.kotatsu.core.model.MangaSource
-
-class FaviconMapper : Mapper {
-
- override fun map(data: Uri, options: Options): HttpUrl? {
- if (data.scheme != "favicon") {
- return null
- }
- val mangaSource = MangaSource(data.schemeSpecificPart) ?: return null
- val repo = MangaRepository(mangaSource) as RemoteMangaRepository
- return repo.getFaviconUrl().toHttpUrl()
- }
-}
\ No newline at end of file
diff --git a/app/src/main/java/org/koitharu/kotatsu/core/parser/MangaLoaderContextImpl.kt b/app/src/main/java/org/koitharu/kotatsu/core/parser/MangaLoaderContextImpl.kt
index ffacb6c6e..1d4d9784f 100644
--- a/app/src/main/java/org/koitharu/kotatsu/core/parser/MangaLoaderContextImpl.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/core/parser/MangaLoaderContextImpl.kt
@@ -5,6 +5,12 @@ import android.content.Context
import android.util.Base64
import android.webkit.WebView
import androidx.core.os.LocaleListCompat
+import dagger.hilt.android.qualifiers.ApplicationContext
+import java.util.*
+import javax.inject.Inject
+import javax.inject.Singleton
+import kotlin.coroutines.resume
+import kotlin.coroutines.suspendCoroutine
import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.withContext
import okhttp3.OkHttpClient
@@ -14,14 +20,12 @@ import org.koitharu.kotatsu.parsers.MangaLoaderContext
import org.koitharu.kotatsu.parsers.config.MangaSourceConfig
import org.koitharu.kotatsu.parsers.model.MangaSource
import org.koitharu.kotatsu.utils.ext.toList
-import java.util.*
-import kotlin.coroutines.resume
-import kotlin.coroutines.suspendCoroutine
-class MangaLoaderContextImpl(
+@Singleton
+class MangaLoaderContextImpl @Inject constructor(
override val httpClient: OkHttpClient,
override val cookieJar: AndroidCookieJar,
- private val androidContext: Context,
+ @ApplicationContext private val androidContext: Context,
) : MangaLoaderContext() {
@SuppressLint("SetJavaScriptEnabled")
@@ -50,4 +54,4 @@ class MangaLoaderContextImpl(
override fun getPreferredLocales(): List {
return LocaleListCompat.getAdjustedDefault().toList()
}
-}
\ No newline at end of file
+}
diff --git a/app/src/main/java/org/koitharu/kotatsu/core/parser/MangaRepository.kt b/app/src/main/java/org/koitharu/kotatsu/core/parser/MangaRepository.kt
index 90c84d5a8..5c1c71e82 100644
--- a/app/src/main/java/org/koitharu/kotatsu/core/parser/MangaRepository.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/core/parser/MangaRepository.kt
@@ -2,9 +2,11 @@ package org.koitharu.kotatsu.core.parser
import java.lang.ref.WeakReference
import java.util.*
-import org.koin.core.component.KoinComponent
-import org.koin.core.component.get
+import javax.inject.Inject
+import javax.inject.Singleton
+import kotlin.collections.set
import org.koitharu.kotatsu.local.domain.LocalMangaRepository
+import org.koitharu.kotatsu.parsers.MangaLoaderContext
import org.koitharu.kotatsu.parsers.model.*
interface MangaRepository {
@@ -25,21 +27,25 @@ interface MangaRepository {
suspend fun getTags(): Set
- companion object : KoinComponent {
+ @Singleton
+ class Factory @Inject constructor(
+ private val localMangaRepository: LocalMangaRepository,
+ private val loaderContext: MangaLoaderContext,
+ ) {
private val cache = EnumMap>(MangaSource::class.java)
- operator fun invoke(source: MangaSource): MangaRepository {
+ fun create(source: MangaSource): MangaRepository {
if (source == MangaSource.LOCAL) {
- return get()
+ return localMangaRepository
}
cache[source]?.get()?.let { return it }
return synchronized(cache) {
cache[source]?.get()?.let { return it }
- val repository = RemoteMangaRepository(MangaParser(source, get()))
+ val repository = RemoteMangaRepository(MangaParser(source, loaderContext))
cache[source] = WeakReference(repository)
repository
}
}
}
-}
\ No newline at end of file
+}
diff --git a/app/src/main/java/org/koitharu/kotatsu/core/parser/RemoteMangaRepository.kt b/app/src/main/java/org/koitharu/kotatsu/core/parser/RemoteMangaRepository.kt
index 999ecb09b..f98634436 100644
--- a/app/src/main/java/org/koitharu/kotatsu/core/parser/RemoteMangaRepository.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/core/parser/RemoteMangaRepository.kt
@@ -36,7 +36,7 @@ class RemoteMangaRepository(private val parser: MangaParser) : MangaRepository {
override suspend fun getTags(): Set = parser.getTags()
- fun getFaviconUrl(): String = parser.getFaviconUrl()
+ suspend fun getFavicons(): Favicons = parser.getFavicons()
fun getAuthProvider(): MangaParserAuthProvider? = parser as? MangaParserAuthProvider
diff --git a/app/src/main/java/org/koitharu/kotatsu/core/parser/favicon/FaviconFetcher.kt b/app/src/main/java/org/koitharu/kotatsu/core/parser/favicon/FaviconFetcher.kt
new file mode 100644
index 000000000..957b1c846
--- /dev/null
+++ b/app/src/main/java/org/koitharu/kotatsu/core/parser/favicon/FaviconFetcher.kt
@@ -0,0 +1,162 @@
+package org.koitharu.kotatsu.core.parser.favicon
+
+import android.content.Context
+import android.net.Uri
+import android.webkit.MimeTypeMap
+import coil.ImageLoader
+import coil.decode.DataSource
+import coil.decode.ImageSource
+import coil.disk.DiskCache
+import coil.fetch.FetchResult
+import coil.fetch.Fetcher
+import coil.fetch.SourceResult
+import coil.network.HttpException
+import coil.request.Options
+import coil.size.Size
+import coil.size.pxOrElse
+import java.net.HttpURLConnection
+import okhttp3.OkHttpClient
+import okhttp3.Request
+import okhttp3.Response
+import okhttp3.ResponseBody
+import okhttp3.internal.closeQuietly
+import org.koitharu.kotatsu.core.model.MangaSource
+import org.koitharu.kotatsu.core.network.CommonHeaders
+import org.koitharu.kotatsu.core.parser.MangaRepository
+import org.koitharu.kotatsu.core.parser.RemoteMangaRepository
+import org.koitharu.kotatsu.local.data.CacheDir
+import org.koitharu.kotatsu.parsers.model.MangaSource
+import org.koitharu.kotatsu.parsers.util.await
+
+private const val FALLBACK_SIZE = 9999 // largest icon
+
+class FaviconFetcher(
+ private val okHttpClient: OkHttpClient,
+ private val diskCache: Lazy,
+ private val mangaSource: MangaSource,
+ private val options: Options,
+ private val mangaRepositoryFactory: MangaRepository.Factory,
+) : Fetcher {
+
+ private val diskCacheKey
+ get() = options.diskCacheKey ?: "${mangaSource.name}[${mangaSource.ordinal}]x${options.size.toCacheKey()}"
+
+ private val fileSystem
+ get() = checkNotNull(diskCache.value).fileSystem
+
+ override suspend fun fetch(): FetchResult {
+ getCached(options)?.let { return it }
+ val repo = mangaRepositoryFactory.create(mangaSource) as RemoteMangaRepository
+ val favicons = repo.getFavicons()
+ val sizePx = maxOf(
+ options.size.width.pxOrElse { FALLBACK_SIZE },
+ options.size.height.pxOrElse { FALLBACK_SIZE },
+ )
+ val icon = checkNotNull(favicons.find(sizePx)) { "No favicons found" }
+ val response = loadIcon(icon.url, favicons.referer)
+ val responseBody = response.requireBody()
+ val source = writeToDiskCache(responseBody)?.toImageSource() ?: responseBody.toImageSource()
+ return SourceResult(
+ source = source,
+ mimeType = MimeTypeMap.getSingleton().getMimeTypeFromExtension(icon.type),
+ dataSource = response.toDataSource(),
+ )
+ }
+
+ private suspend fun loadIcon(url: String, referer: String): Response {
+ val request = Request.Builder()
+ .url(url)
+ .get()
+ .header(CommonHeaders.REFERER, referer)
+ @Suppress("UNCHECKED_CAST")
+ options.tags.asMap().forEach { request.tag(it.key as Class, it.value) }
+ val response = okHttpClient.newCall(request.build()).await()
+ if (!response.isSuccessful && response.code != HttpURLConnection.HTTP_NOT_MODIFIED) {
+ response.body?.closeQuietly()
+ throw HttpException(response)
+ }
+ return response
+ }
+
+ private fun getCached(options: Options): SourceResult? {
+ if (!options.diskCachePolicy.readEnabled) {
+ return null
+ }
+ val snapshot = diskCache.value?.get(diskCacheKey) ?: return null
+ return SourceResult(
+ source = snapshot.toImageSource(),
+ mimeType = null,
+ dataSource = DataSource.DISK,
+ )
+ }
+
+ private fun writeToDiskCache(body: ResponseBody): DiskCache.Snapshot? {
+ if (!options.diskCachePolicy.writeEnabled || body.contentLength() == 0L) {
+ return null
+ }
+ val editor = diskCache.value?.edit(diskCacheKey) ?: return null
+ try {
+ fileSystem.write(editor.data) {
+ body.source().readAll(this)
+ }
+ return editor.commitAndGet()
+ } catch (e: Throwable) {
+ try {
+ editor.abort()
+ } catch (abortingError: Throwable) {
+ e.addSuppressed(abortingError)
+ }
+ body.closeQuietly()
+ throw e
+ } finally {
+ body.closeQuietly()
+ }
+ }
+
+ private fun DiskCache.Snapshot.toImageSource(): ImageSource {
+ return ImageSource(data, fileSystem, diskCacheKey, this)
+ }
+
+ private fun ResponseBody.toImageSource(): ImageSource {
+ return ImageSource(source(), options.context, FaviconMetadata(mangaSource))
+ }
+
+ private fun Response.toDataSource(): DataSource {
+ return if (networkResponse != null) DataSource.NETWORK else DataSource.DISK
+ }
+
+ private fun Response.requireBody(): ResponseBody {
+ return checkNotNull(body) { "response body == null" }
+ }
+
+ private fun Size.toCacheKey() = buildString {
+ append(width.toString())
+ append('x')
+ append(height.toString())
+ }
+
+ class Factory(
+ context: Context,
+ private val okHttpClient: OkHttpClient,
+ private val mangaRepositoryFactory: MangaRepository.Factory,
+ ) : Fetcher.Factory {
+
+ private val diskCache = lazy {
+ val rootDir = context.externalCacheDir ?: context.cacheDir
+ DiskCache.Builder()
+ .directory(rootDir.resolve(CacheDir.FAVICONS.dir))
+ .build()
+ }
+
+ override fun create(data: Uri, options: Options, imageLoader: ImageLoader): Fetcher? {
+ return if (data.scheme == URI_SCHEME_FAVICON) {
+ val mangaSource = MangaSource(data.schemeSpecificPart) ?: return null
+ FaviconFetcher(okHttpClient, diskCache, mangaSource, options, mangaRepositoryFactory)
+ } else {
+ null
+ }
+ }
+ }
+
+ class FaviconMetadata(val source: MangaSource) : ImageSource.Metadata()
+}
diff --git a/app/src/main/java/org/koitharu/kotatsu/core/parser/favicon/FaviconUri.kt b/app/src/main/java/org/koitharu/kotatsu/core/parser/favicon/FaviconUri.kt
new file mode 100644
index 000000000..48f393325
--- /dev/null
+++ b/app/src/main/java/org/koitharu/kotatsu/core/parser/favicon/FaviconUri.kt
@@ -0,0 +1,8 @@
+package org.koitharu.kotatsu.core.parser.favicon
+
+import android.net.Uri
+import org.koitharu.kotatsu.parsers.model.MangaSource
+
+const val URI_SCHEME_FAVICON = "favicon"
+
+fun MangaSource.faviconUri(): Uri = Uri.fromParts(URI_SCHEME_FAVICON, name, null)
\ No newline at end of file
diff --git a/app/src/main/java/org/koitharu/kotatsu/core/prefs/AppSettings.kt b/app/src/main/java/org/koitharu/kotatsu/core/prefs/AppSettings.kt
index cd9c8a07a..53360ca0a 100644
--- a/app/src/main/java/org/koitharu/kotatsu/core/prefs/AppSettings.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/core/prefs/AppSettings.kt
@@ -10,13 +10,7 @@ import androidx.collection.arraySetOf
import androidx.core.content.edit
import androidx.preference.PreferenceManager
import com.google.android.material.color.DynamicColors
-import java.io.File
-import java.text.DateFormat
-import java.text.SimpleDateFormat
-import java.util.*
-import kotlinx.coroutines.channels.awaitClose
-import kotlinx.coroutines.channels.trySendBlocking
-import kotlinx.coroutines.flow.callbackFlow
+import dagger.hilt.android.qualifiers.ApplicationContext
import org.koitharu.kotatsu.BuildConfig
import org.koitharu.kotatsu.core.model.ZoomMode
import org.koitharu.kotatsu.core.network.DoHProvider
@@ -25,8 +19,15 @@ import org.koitharu.kotatsu.utils.ext.getEnumValue
import org.koitharu.kotatsu.utils.ext.observe
import org.koitharu.kotatsu.utils.ext.putEnumValue
import org.koitharu.kotatsu.utils.ext.toUriOrNull
+import java.io.File
+import java.text.DateFormat
+import java.text.SimpleDateFormat
+import java.util.*
+import javax.inject.Inject
+import javax.inject.Singleton
-class AppSettings(context: Context) {
+@Singleton
+class AppSettings @Inject constructor(@ApplicationContext context: Context) {
private val prefs = PreferenceManager.getDefaultSharedPreferences(context)
@@ -115,6 +116,10 @@ class AppSettings(context: Context) {
val isHistoryExcludeNsfw: Boolean
get() = prefs.getBoolean(KEY_HISTORY_EXCLUDE_NSFW, false)
+ var isIncognitoModeEnabled: Boolean
+ get() = prefs.getBoolean(KEY_INCOGNITO_MODE, false)
+ set(value) = prefs.edit { putBoolean(KEY_INCOGNITO_MODE, value) }
+
var chaptersReverse: Boolean
get() = prefs.getBoolean(KEY_REVERSE_CHAPTERS, false)
set(value) = prefs.edit { putBoolean(KEY_REVERSE_CHAPTERS, value) }
@@ -133,6 +138,9 @@ class AppSettings(context: Context) {
get() = prefs.getBoolean(KEY_PROTECT_APP_BIOMETRIC, true)
set(value) = prefs.edit { putBoolean(KEY_PROTECT_APP_BIOMETRIC, value) }
+ val isExitConfirmationEnabled: Boolean
+ get() = prefs.getBoolean(KEY_EXIT_CONFIRM, false)
+
var sourcesOrder: List
get() = prefs.getString(KEY_SOURCES_ORDER, null)
?.split('|')
@@ -195,9 +203,8 @@ class AppSettings(context: Context) {
val isSuggestionsExcludeNsfw: Boolean
get() = prefs.getBoolean(KEY_SUGGESTIONS_EXCLUDE_NSFW, false)
- var isSearchSingleSource: Boolean
- get() = prefs.getBoolean(KEY_SEARCH_SINGLE_SOURCE, false)
- set(value) = prefs.edit { putBoolean(KEY_SEARCH_SINGLE_SOURCE, value) }
+ val isReaderBarEnabled: Boolean
+ get() = prefs.getBoolean(KEY_READER_BAR, true)
val dnsOverHttps: DoHProvider
get() = prefs.getEnumValue(KEY_DOH, DoHProvider.NONE)
@@ -308,12 +315,15 @@ class AppSettings(context: Context) {
const val KEY_SUGGESTIONS = "suggestions"
const val KEY_SUGGESTIONS_EXCLUDE_NSFW = "suggestions_exclude_nsfw"
const val KEY_SUGGESTIONS_EXCLUDE_TAGS = "suggestions_exclude_tags"
- const val KEY_SEARCH_SINGLE_SOURCE = "search_single_source"
const val KEY_SHIKIMORI = "shikimori"
const val KEY_DOWNLOADS_PARALLELISM = "downloads_parallelism"
const val KEY_DOWNLOADS_SLOWDOWN = "downloads_slowdown"
const val KEY_ALL_FAVOURITES_VISIBLE = "all_favourites_visible"
const val KEY_DOH = "doh"
+ const val KEY_EXIT_CONFIRM = "exit_confirm"
+ const val KEY_INCOGNITO_MODE = "incognito"
+ const val KEY_SYNC = "sync"
+ const val KEY_READER_BAR = "reader_bar"
// About
const val KEY_APP_UPDATE = "app_update"
@@ -324,4 +334,4 @@ class AppSettings(context: Context) {
private const val NETWORK_ALWAYS = 1
private const val NETWORK_NON_METERED = 2
}
-}
\ No newline at end of file
+}
diff --git a/app/src/main/java/org/koitharu/kotatsu/core/prefs/AppSettingsObserver.kt b/app/src/main/java/org/koitharu/kotatsu/core/prefs/AppSettingsObserver.kt
index 88c62514c..a8e46ccc2 100644
--- a/app/src/main/java/org/koitharu/kotatsu/core/prefs/AppSettingsObserver.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/core/prefs/AppSettingsObserver.kt
@@ -21,7 +21,7 @@ fun AppSettings.observeAsFlow(key: String, valueProducer: AppSettings.() ->
fun AppSettings.observeAsLiveData(
context: CoroutineContext,
key: String,
- valueProducer: AppSettings.() -> T
+ valueProducer: AppSettings.() -> T,
) = liveData(context) {
emit(valueProducer())
observe().collect {
@@ -32,4 +32,4 @@ fun AppSettings.observeAsLiveData(
}
}
}
-}
\ No newline at end of file
+}
diff --git a/app/src/main/java/org/koitharu/kotatsu/core/ui/DateTimeAgo.kt b/app/src/main/java/org/koitharu/kotatsu/core/ui/DateTimeAgo.kt
index 03bafa077..614c9d3b7 100644
--- a/app/src/main/java/org/koitharu/kotatsu/core/ui/DateTimeAgo.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/core/ui/DateTimeAgo.kt
@@ -15,6 +15,8 @@ sealed class DateTimeAgo : ListModel {
override fun format(resources: Resources): String {
return resources.getString(R.string.just_now)
}
+
+ override fun toString() = "just_now"
}
class MinutesAgo(val minutes: Int) : DateTimeAgo() {
@@ -31,6 +33,8 @@ sealed class DateTimeAgo : ListModel {
}
override fun hashCode(): Int = minutes
+
+ override fun toString() = "minutes_ago_$minutes"
}
class HoursAgo(val hours: Int) : DateTimeAgo() {
@@ -46,18 +50,24 @@ sealed class DateTimeAgo : ListModel {
}
override fun hashCode(): Int = hours
+
+ override fun toString() = "hours_ago_$hours"
}
object Today : DateTimeAgo() {
override fun format(resources: Resources): String {
return resources.getString(R.string.today)
}
+
+ override fun toString() = "today"
}
object Yesterday : DateTimeAgo() {
override fun format(resources: Resources): String {
return resources.getString(R.string.yesterday)
}
+
+ override fun toString() = "yesterday"
}
class DaysAgo(val days: Int) : DateTimeAgo() {
@@ -73,6 +83,8 @@ sealed class DateTimeAgo : ListModel {
}
override fun hashCode(): Int = days
+
+ override fun toString() = "days_ago_$days"
}
class Absolute(private val date: Date) : DateTimeAgo() {
@@ -97,11 +109,15 @@ sealed class DateTimeAgo : ListModel {
override fun hashCode(): Int {
return day
}
+
+ override fun toString() = "abs_$day"
}
object LongAgo : DateTimeAgo() {
override fun format(resources: Resources): String {
return resources.getString(R.string.long_ago)
}
+
+ override fun toString() = "long_ago"
}
}
\ No newline at end of file
diff --git a/app/src/main/java/org/koitharu/kotatsu/core/ui/uiModule.kt b/app/src/main/java/org/koitharu/kotatsu/core/ui/uiModule.kt
deleted file mode 100644
index c9168abaf..000000000
--- a/app/src/main/java/org/koitharu/kotatsu/core/ui/uiModule.kt
+++ /dev/null
@@ -1,46 +0,0 @@
-package org.koitharu.kotatsu.core.ui
-
-import android.text.Html
-import coil.ComponentRegistry
-import coil.ImageLoader
-import coil.disk.DiskCache
-import kotlinx.coroutines.Dispatchers
-import okhttp3.OkHttpClient
-import org.koin.android.ext.koin.androidContext
-import org.koin.dsl.module
-import org.koitharu.kotatsu.core.parser.FaviconMapper
-import org.koitharu.kotatsu.local.data.CacheDir
-import org.koitharu.kotatsu.local.data.CbzFetcher
-import org.koitharu.kotatsu.utils.image.CoilImageGetter
-
-val uiModule
- get() = module {
- single {
- val httpClientFactory = {
- get().newBuilder()
- .cache(null)
- .build()
- }
- val diskCacheFactory = {
- val context = androidContext()
- val rootDir = context.externalCacheDir ?: context.cacheDir
- DiskCache.Builder()
- .directory(rootDir.resolve(CacheDir.THUMBS.dir))
- .build()
- }
- ImageLoader.Builder(androidContext())
- .okHttpClient(httpClientFactory)
- .interceptorDispatcher(Dispatchers.Default)
- .fetcherDispatcher(Dispatchers.IO)
- .decoderDispatcher(Dispatchers.Default)
- .transformationDispatcher(Dispatchers.Default)
- .diskCache(diskCacheFactory)
- .components(
- ComponentRegistry.Builder()
- .add(CbzFetcher.Factory())
- .add(FaviconMapper())
- .build()
- ).build()
- }
- factory { CoilImageGetter(androidContext(), get()) }
- }
\ No newline at end of file
diff --git a/app/src/main/java/org/koitharu/kotatsu/details/DetailsModule.kt b/app/src/main/java/org/koitharu/kotatsu/details/DetailsModule.kt
deleted file mode 100644
index 5091ee0e0..000000000
--- a/app/src/main/java/org/koitharu/kotatsu/details/DetailsModule.kt
+++ /dev/null
@@ -1,13 +0,0 @@
-package org.koitharu.kotatsu.details
-
-import org.koin.androidx.viewmodel.dsl.viewModel
-import org.koin.dsl.module
-import org.koitharu.kotatsu.details.ui.DetailsViewModel
-
-val detailsModule
- get() = module {
-
- viewModel { intent ->
- DetailsViewModel(intent.get(), get(), get(), get(), get(), get(), get(), get(), get(), get())
- }
- }
\ No newline at end of file
diff --git a/app/src/main/java/org/koitharu/kotatsu/details/ui/ChaptersBottomSheetMediator.kt b/app/src/main/java/org/koitharu/kotatsu/details/ui/ChaptersBottomSheetMediator.kt
new file mode 100644
index 000000000..d40cb7195
--- /dev/null
+++ b/app/src/main/java/org/koitharu/kotatsu/details/ui/ChaptersBottomSheetMediator.kt
@@ -0,0 +1,63 @@
+package org.koitharu.kotatsu.details.ui
+
+import android.view.View
+import android.view.View.OnLayoutChangeListener
+import androidx.activity.OnBackPressedCallback
+import androidx.appcompat.view.ActionMode
+import com.google.android.material.bottomsheet.BottomSheetBehavior
+import org.koitharu.kotatsu.base.ui.util.ActionModeListener
+import org.koitharu.kotatsu.base.ui.widgets.BottomSheetHeaderBar
+
+class ChaptersBottomSheetMediator(
+ bottomSheet: View,
+) : OnBackPressedCallback(false),
+ ActionModeListener,
+ BottomSheetHeaderBar.OnExpansionChangeListener,
+ OnLayoutChangeListener {
+
+ private val behavior = BottomSheetBehavior.from(bottomSheet)
+ private var lockCounter = 0
+
+ override fun handleOnBackPressed() {
+ behavior.state = BottomSheetBehavior.STATE_COLLAPSED
+ }
+
+ override fun onActionModeStarted(mode: ActionMode) {
+ lock()
+ }
+
+ override fun onActionModeFinished(mode: ActionMode) {
+ unlock()
+ }
+
+ override fun onExpansionStateChanged(headerBar: BottomSheetHeaderBar, isExpanded: Boolean) {
+ isEnabled = isExpanded
+ }
+
+ override fun onLayoutChange(
+ v: View?,
+ left: Int,
+ top: Int,
+ right: Int,
+ bottom: Int,
+ oldLeft: Int,
+ oldTop: Int,
+ oldRight: Int,
+ oldBottom: Int,
+ ) {
+ val height = bottom - top
+ if (height != behavior.peekHeight) {
+ behavior.peekHeight = height
+ }
+ }
+
+ fun lock() {
+ lockCounter++
+ behavior.isDraggable = lockCounter <= 0
+ }
+
+ fun unlock() {
+ lockCounter--
+ behavior.isDraggable = lockCounter <= 0
+ }
+}
diff --git a/app/src/main/java/org/koitharu/kotatsu/details/ui/ChaptersFragment.kt b/app/src/main/java/org/koitharu/kotatsu/details/ui/ChaptersFragment.kt
index 9f1ad93e9..832972db0 100644
--- a/app/src/main/java/org/koitharu/kotatsu/details/ui/ChaptersFragment.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/details/ui/ChaptersFragment.kt
@@ -1,24 +1,22 @@
package org.koitharu.kotatsu.details.ui
-import android.app.ActivityOptions
import android.os.Bundle
import android.view.*
-import android.widget.AdapterView
-import android.widget.Spinner
import androidx.appcompat.view.ActionMode
-import androidx.appcompat.widget.SearchView
+import androidx.coordinatorlayout.widget.CoordinatorLayout
import androidx.core.graphics.Insets
-import androidx.core.view.MenuProvider
import androidx.core.view.isVisible
+import androidx.core.view.updateLayoutParams
import androidx.core.view.updatePadding
+import androidx.fragment.app.activityViewModels
+import com.google.android.material.bottomsheet.BottomSheetBehavior
import com.google.android.material.snackbar.Snackbar
-import org.koin.androidx.viewmodel.ext.android.sharedViewModel
+import kotlin.math.roundToInt
import org.koitharu.kotatsu.R
import org.koitharu.kotatsu.base.ui.BaseFragment
import org.koitharu.kotatsu.base.ui.list.ListSelectionController
import org.koitharu.kotatsu.base.ui.list.OnListItemClickListener
import org.koitharu.kotatsu.databinding.FragmentChaptersBinding
-import org.koitharu.kotatsu.details.ui.adapter.BranchesAdapter
import org.koitharu.kotatsu.details.ui.adapter.ChaptersAdapter
import org.koitharu.kotatsu.details.ui.adapter.ChaptersSelectionDecoration
import org.koitharu.kotatsu.details.ui.model.ChapterListItem
@@ -28,25 +26,22 @@ import org.koitharu.kotatsu.parsers.model.MangaSource
import org.koitharu.kotatsu.reader.ui.ReaderActivity
import org.koitharu.kotatsu.reader.ui.ReaderState
import org.koitharu.kotatsu.utils.RecyclerViewScrollCallback
-import org.koitharu.kotatsu.utils.ext.addMenuProvider
-import kotlin.math.roundToInt
+import org.koitharu.kotatsu.utils.ext.parents
+import org.koitharu.kotatsu.utils.ext.scaleUpActivityOptionsOf
class ChaptersFragment :
BaseFragment(),
OnListItemClickListener,
- AdapterView.OnItemSelectedListener,
- MenuItem.OnActionExpandListener,
- SearchView.OnQueryTextListener,
- ListSelectionController.Callback {
+ ListSelectionController.Callback2 {
- private val viewModel by sharedViewModel()
+ private val viewModel by activityViewModels()
private var chaptersAdapter: ChaptersAdapter? = null
private var selectionController: ListSelectionController? = null
override fun onInflateView(
inflater: LayoutInflater,
- container: ViewGroup?
+ container: ViewGroup?,
) = FragmentChaptersBinding.inflate(inflater, container, false)
override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
@@ -63,23 +58,16 @@ class ChaptersFragment :
setHasFixedSize(true)
adapter = chaptersAdapter
}
- binding.spinnerBranches?.let(::initSpinner)
viewModel.isLoading.observe(viewLifecycleOwner, this::onLoadingStateChanged)
viewModel.chapters.observe(viewLifecycleOwner, this::onChaptersChanged)
- viewModel.isChaptersReversed.observe(viewLifecycleOwner) {
- activity?.invalidateOptionsMenu()
- }
viewModel.isChaptersEmpty.observe(viewLifecycleOwner) {
binding.textViewHolder.isVisible = it
- activity?.invalidateOptionsMenu()
}
- addMenuProvider(ChaptersMenuProvider())
}
override fun onDestroyView() {
chaptersAdapter = null
selectionController = null
- binding.spinnerBranches?.adapter = null
super.onDestroyView()
}
@@ -91,14 +79,13 @@ class ChaptersFragment :
(activity as? DetailsActivity)?.showChapterMissingDialog(item.chapter.id)
return
}
- val options = ActivityOptions.makeScaleUpAnimation(view, 0, 0, view.width, view.height)
startActivity(
ReaderActivity.newIntent(
context = view.context,
manga = viewModel.manga.value ?: return,
state = ReaderState(item.chapter.id, 0, 0),
),
- options.toBundle()
+ scaleUpActivityOptionsOf(view).toBundle(),
)
}
@@ -106,7 +93,7 @@ class ChaptersFragment :
return selectionController?.onItemLongClick(item.chapter.id) ?: false
}
- override fun onActionItemClicked(mode: ActionMode, item: MenuItem): Boolean {
+ override fun onActionItemClicked(controller: ListSelectionController, mode: ActionMode, item: MenuItem): Boolean {
return when (item.itemId) {
R.id.action_save -> {
DownloadService.start(
@@ -128,7 +115,7 @@ class ChaptersFragment :
Snackbar.make(
binding.recyclerViewChapters,
R.string.chapters_will_removed_background,
- Snackbar.LENGTH_LONG
+ Snackbar.LENGTH_LONG,
).show()
}
}
@@ -136,7 +123,6 @@ class ChaptersFragment :
true
}
R.id.action_select_range -> {
- val controller = selectionController ?: return false
val items = chaptersAdapter?.items ?: return false
val ids = HashSet(controller.peekCheckedIds())
val buffer = HashSet()
@@ -164,19 +150,12 @@ class ChaptersFragment :
}
}
- override fun onItemSelected(parent: AdapterView<*>?, view: View?, position: Int, id: Long) {
- val spinner = binding.spinnerBranches ?: return
- viewModel.setSelectedBranch(spinner.selectedItem as String?)
- }
-
- override fun onNothingSelected(parent: AdapterView<*>?) = Unit
-
- override fun onCreateActionMode(mode: ActionMode, menu: Menu): Boolean {
+ override fun onCreateActionMode(controller: ListSelectionController, mode: ActionMode, menu: Menu): Boolean {
mode.menuInflater.inflate(R.menu.mode_chapters, menu)
return true
}
- override fun onPrepareActionMode(mode: ActionMode, menu: Menu): Boolean {
+ override fun onPrepareActionMode(controller: ListSelectionController, mode: ActionMode, menu: Menu): Boolean {
val selectedIds = selectionController?.peekCheckedIds() ?: return false
val allItems = chaptersAdapter?.items.orEmpty()
val items = allItems.withIndex().filter { (_, x) -> x.chapter.id in selectedIds }
@@ -199,45 +178,11 @@ class ChaptersFragment :
return true
}
- override fun onSelectionChanged(count: Int) {
+ override fun onSelectionChanged(controller: ListSelectionController, count: Int) {
binding.recyclerViewChapters.invalidateItemDecorations()
}
- override fun onMenuItemActionExpand(item: MenuItem?): Boolean = true
-
- override fun onMenuItemActionCollapse(item: MenuItem?): Boolean {
- (item?.actionView as? SearchView)?.setQuery("", false)
- viewModel.performChapterSearch(null)
- return true
- }
-
- override fun onQueryTextSubmit(query: String?): Boolean = false
-
- override fun onQueryTextChange(newText: String?): Boolean {
- viewModel.performChapterSearch(newText)
- return true
- }
-
- override fun onWindowInsetsChanged(insets: Insets) {
- binding.recyclerViewChapters.updatePadding(
- bottom = insets.bottom + (binding.spinnerBranches?.height ?: 0),
- )
- }
-
- private fun initSpinner(spinner: Spinner) {
- val branchesAdapter = BranchesAdapter()
- spinner.adapter = branchesAdapter
- spinner.onItemSelectedListener = this
- viewModel.branches.observe(viewLifecycleOwner) {
- branchesAdapter.setItems(it)
- spinner.isVisible = it.size > 1
- }
- viewModel.selectedBranchIndex.observe(viewLifecycleOwner) {
- if (it != -1 && it != spinner.selectedItemPosition) {
- spinner.setSelection(it)
- }
- }
- }
+ override fun onWindowInsetsChanged(insets: Insets) = Unit
private fun onChaptersChanged(list: List) {
val adapter = chaptersAdapter ?: return
@@ -258,29 +203,17 @@ class ChaptersFragment :
binding.progressBar.isVisible = isLoading
}
- private inner class ChaptersMenuProvider : MenuProvider {
-
- override fun onCreateMenu(menu: Menu, menuInflater: MenuInflater) {
- menuInflater.inflate(R.menu.opt_chapters, menu)
- val searchMenuItem = menu.findItem(R.id.action_search)
- searchMenuItem.setOnActionExpandListener(this@ChaptersFragment)
- val searchView = searchMenuItem.actionView as SearchView
- searchView.setOnQueryTextListener(this@ChaptersFragment)
- searchView.setIconifiedByDefault(false)
- searchView.queryHint = searchMenuItem.title
- }
-
- override fun onPrepareMenu(menu: Menu) {
- menu.findItem(R.id.action_reversed).isChecked = viewModel.isChaptersReversed.value == true
- menu.findItem(R.id.action_search).isVisible = viewModel.isChaptersEmpty.value == false
- }
-
- override fun onMenuItemSelected(menuItem: MenuItem): Boolean = when (menuItem.itemId) {
- R.id.action_reversed -> {
- viewModel.setChaptersReversed(!menuItem.isChecked)
- true
+ private fun findBottomSheetBehavior(): BottomSheetBehavior<*>? {
+ val v = view ?: return null
+ for (p in v.parents) {
+ val layoutParams = (p as? View)?.layoutParams
+ if (layoutParams is CoordinatorLayout.LayoutParams) {
+ val behavior = layoutParams.behavior
+ if (behavior is BottomSheetBehavior<*>) {
+ return behavior
+ }
}
- else -> false
}
+ return null
}
-}
\ No newline at end of file
+}
diff --git a/app/src/main/java/org/koitharu/kotatsu/details/ui/ChaptersMenuProvider.kt b/app/src/main/java/org/koitharu/kotatsu/details/ui/ChaptersMenuProvider.kt
new file mode 100644
index 000000000..d9ca082ee
--- /dev/null
+++ b/app/src/main/java/org/koitharu/kotatsu/details/ui/ChaptersMenuProvider.kt
@@ -0,0 +1,56 @@
+package org.koitharu.kotatsu.details.ui
+
+import android.view.Menu
+import android.view.MenuInflater
+import android.view.MenuItem
+import androidx.appcompat.widget.SearchView
+import androidx.core.view.MenuProvider
+import org.koitharu.kotatsu.R
+
+class ChaptersMenuProvider(
+ private val viewModel: DetailsViewModel,
+ private val bottomSheetMediator: ChaptersBottomSheetMediator?,
+) : MenuProvider, SearchView.OnQueryTextListener, MenuItem.OnActionExpandListener {
+
+ override fun onCreateMenu(menu: Menu, menuInflater: MenuInflater) {
+ menuInflater.inflate(R.menu.opt_chapters, menu)
+ val searchMenuItem = menu.findItem(R.id.action_search)
+ searchMenuItem.setOnActionExpandListener(this)
+ val searchView = searchMenuItem.actionView as SearchView
+ searchView.setOnQueryTextListener(this)
+ searchView.setIconifiedByDefault(false)
+ searchView.queryHint = searchMenuItem.title
+ }
+
+ override fun onPrepareMenu(menu: Menu) {
+ menu.findItem(R.id.action_reversed).isChecked = viewModel.isChaptersReversed.value == true
+ menu.findItem(R.id.action_search).isVisible = viewModel.isChaptersEmpty.value == false
+ }
+
+ override fun onMenuItemSelected(menuItem: MenuItem): Boolean = when (menuItem.itemId) {
+ R.id.action_reversed -> {
+ viewModel.setChaptersReversed(!menuItem.isChecked)
+ true
+ }
+ else -> false
+ }
+
+ override fun onMenuItemActionExpand(item: MenuItem?): Boolean {
+ bottomSheetMediator?.lock()
+ return true
+ }
+
+ override fun onMenuItemActionCollapse(item: MenuItem?): Boolean {
+ (item?.actionView as? SearchView)?.setQuery("", false)
+ viewModel.performChapterSearch(null)
+ bottomSheetMediator?.unlock()
+ return true
+ }
+
+ override fun onQueryTextSubmit(query: String?): Boolean = false
+
+ override fun onQueryTextChange(newText: String?): Boolean {
+ viewModel.performChapterSearch(newText)
+ return true
+ }
+}
diff --git a/app/src/main/java/org/koitharu/kotatsu/details/ui/DetailsActivity.kt b/app/src/main/java/org/koitharu/kotatsu/details/ui/DetailsActivity.kt
index ee07a41d0..25b43c7c2 100644
--- a/app/src/main/java/org/koitharu/kotatsu/details/ui/DetailsActivity.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/details/ui/DetailsActivity.kt
@@ -6,57 +6,59 @@ import android.content.Intent
import android.content.IntentFilter
import android.os.Bundle
import android.view.Menu
-import android.view.MenuItem
import android.view.View
-import android.view.ViewGroup
-import android.widget.AdapterView
-import android.widget.Spinner
import android.widget.Toast
-import androidx.appcompat.view.ActionMode
-import androidx.core.content.pm.ShortcutManagerCompat
+import androidx.appcompat.widget.PopupMenu
import androidx.core.graphics.Insets
+import androidx.core.view.isGone
import androidx.core.view.isVisible
-import androidx.core.view.updateLayoutParams
import androidx.core.view.updatePadding
-import androidx.fragment.app.commit
import androidx.lifecycle.lifecycleScope
+import com.google.android.material.badge.BadgeDrawable
import com.google.android.material.dialog.MaterialAlertDialogBuilder
import com.google.android.material.snackbar.Snackbar
-import com.google.android.material.tabs.TabLayout
-import com.google.android.material.tabs.TabLayoutMediator
+import dagger.hilt.android.AndroidEntryPoint
+import javax.inject.Inject
import kotlinx.coroutines.launch
-import org.koin.android.ext.android.get
-import org.koin.androidx.viewmodel.ext.android.viewModel
-import org.koin.core.parameter.parametersOf
import org.koitharu.kotatsu.R
import org.koitharu.kotatsu.base.domain.MangaIntent
import org.koitharu.kotatsu.base.ui.BaseActivity
-import org.koitharu.kotatsu.browser.BrowserActivity
+import org.koitharu.kotatsu.base.ui.widgets.BottomSheetHeaderBar
import org.koitharu.kotatsu.core.exceptions.resolve.ExceptionResolver
import org.koitharu.kotatsu.core.model.parcelable.ParcelableManga
import org.koitharu.kotatsu.core.os.ShortcutsUpdater
import org.koitharu.kotatsu.databinding.ActivityDetailsBinding
-import org.koitharu.kotatsu.details.ui.adapter.BranchesAdapter
+import org.koitharu.kotatsu.details.ui.model.HistoryInfo
import org.koitharu.kotatsu.download.ui.service.DownloadService
+import org.koitharu.kotatsu.list.ui.adapter.bindBadge
+import org.koitharu.kotatsu.main.ui.owners.NoModalBottomSheetOwner
import org.koitharu.kotatsu.parsers.model.Manga
-import org.koitharu.kotatsu.parsers.model.MangaSource
-import org.koitharu.kotatsu.parsers.util.mapNotNullToSet
import org.koitharu.kotatsu.reader.ui.ReaderActivity
import org.koitharu.kotatsu.reader.ui.ReaderState
-import org.koitharu.kotatsu.scrobbling.ui.selector.ScrobblingSelectorBottomSheet
-import org.koitharu.kotatsu.search.ui.multi.MultiSearchActivity
-import org.koitharu.kotatsu.utils.ext.getDisplayMessage
-import org.koitharu.kotatsu.utils.ext.isReportable
-import org.koitharu.kotatsu.utils.ext.report
+import org.koitharu.kotatsu.utils.ext.*
+@AndroidEntryPoint
class DetailsActivity :
BaseActivity(),
- TabLayoutMediator.TabConfigurationStrategy,
- AdapterView.OnItemSelectedListener {
+ View.OnClickListener,
+ BottomSheetHeaderBar.OnExpansionChangeListener,
+ NoModalBottomSheetOwner {
- private val viewModel by viewModel {
- parametersOf(MangaIntent(intent))
+ override val bsHeader: BottomSheetHeaderBar?
+ get() = binding.headerChapters
+
+ @Inject
+ lateinit var viewModelFactory: DetailsViewModel.Factory
+
+ @Inject
+ lateinit var shortcutsUpdater: ShortcutsUpdater
+
+ private var badge: BadgeDrawable? = null
+
+ private val viewModel: DetailsViewModel by assistedViewModels {
+ viewModelFactory.create(MangaIntent(intent))
}
+ private lateinit var chaptersMenuProvider: ChaptersMenuProvider
private val downloadReceiver = object : BroadcastReceiver() {
override fun onReceive(context: Context?, intent: Intent?) {
@@ -72,23 +74,51 @@ class DetailsActivity :
setDisplayHomeAsUpEnabled(true)
setDisplayShowTitleEnabled(false)
}
- val pager = binding.pager
- if (pager != null) {
- pager.adapter = MangaDetailsAdapter(this)
- TabLayoutMediator(checkNotNull(binding.tabs), pager, this).attach()
+ binding.buttonRead.setOnClickListener(this)
+ binding.buttonDropdown.setOnClickListener(this)
+
+ chaptersMenuProvider = if (binding.layoutBottom != null) {
+ val bsMediator = ChaptersBottomSheetMediator(checkNotNull(binding.layoutBottom))
+ actionModeDelegate.addListener(bsMediator)
+ checkNotNull(binding.headerChapters).addOnExpansionChangeListener(bsMediator)
+ checkNotNull(binding.headerChapters).addOnLayoutChangeListener(bsMediator)
+ onBackPressedDispatcher.addCallback(bsMediator)
+ ChaptersMenuProvider(viewModel, bsMediator)
+ } else {
+ ChaptersMenuProvider(viewModel, null)
}
- gcFragments()
- binding.spinnerBranches?.let(::initSpinner)
viewModel.manga.observe(this, ::onMangaUpdated)
viewModel.newChaptersCount.observe(this, ::onNewChaptersChanged)
viewModel.onMangaRemoved.observe(this, ::onMangaRemoved)
viewModel.onError.observe(this, ::onError)
viewModel.onShowToast.observe(this) {
- binding.snackbar.show(messageText = getString(it))
+ }
+ viewModel.historyInfo.observe(this, ::onHistoryChanged)
+ viewModel.selectedBranchName.observe(this) {
+ binding.headerChapters?.subtitle = it
+ binding.textViewSubtitle?.textAndVisible = it
+ }
+ viewModel.isChaptersReversed.observe(this) {
+ binding.headerChapters?.invalidateMenu() ?: invalidateOptionsMenu()
+ }
+ viewModel.favouriteCategories.observe(this) {
+ invalidateOptionsMenu()
+ }
+ viewModel.branches.observe(this) {
+ binding.buttonDropdown.isVisible = it.size > 1
}
registerReceiver(downloadReceiver, IntentFilter(DownloadService.ACTION_DOWNLOAD_COMPLETE))
+ addMenuProvider(
+ DetailsMenuProvider(
+ activity = this,
+ viewModel = viewModel,
+ snackbarHost = binding.containerChapters,
+ shortcutsUpdater = shortcutsUpdater,
+ ),
+ )
+ binding.headerChapters?.addOnExpansionChangeListener(this) ?: addMenuProvider(chaptersMenuProvider)
}
override fun onDestroy() {
@@ -96,8 +126,39 @@ class DetailsActivity :
super.onDestroy()
}
+ override fun onClick(v: View) {
+ val manga = viewModel.manga.value ?: return
+ when (v.id) {
+ R.id.button_read -> {
+ val chapterId = viewModel.historyInfo.value?.history?.chapterId
+ if (chapterId != null && manga.chapters?.none { x -> x.id == chapterId } == true) {
+ showChapterMissingDialog(chapterId)
+ } else {
+ startActivity(
+ ReaderActivity.newIntent(
+ context = this,
+ manga = manga,
+ branch = viewModel.selectedBranchValue,
+ ),
+ )
+ }
+ }
+ R.id.button_dropdown -> showBranchPopupMenu()
+ }
+ }
+
+ override fun onExpansionStateChanged(headerBar: BottomSheetHeaderBar, isExpanded: Boolean) {
+ if (isExpanded) {
+ headerBar.addMenuProvider(chaptersMenuProvider)
+ } else {
+ headerBar.removeMenuProvider(chaptersMenuProvider)
+ }
+ binding.buttonRead.isGone = isExpanded
+ }
+
private fun onMangaUpdated(manga: Manga) {
title = manga.title
+ binding.buttonRead.isEnabled = !manga.chapters.isNullOrEmpty()
invalidateOptionsMenu()
}
@@ -119,152 +180,67 @@ class DetailsActivity :
Toast.makeText(this, e.getDisplayMessage(resources), Toast.LENGTH_LONG).show()
finishAfterTransition()
}
- e.isReportable() -> {
- binding.snackbar.show(
- messageText = e.getDisplayMessage(resources),
- actionId = R.string.report,
- duration = if (viewModel.manga.value?.chapters == null) {
+ else -> {
+ val snackbar = Snackbar.make(
+ binding.containerDetails,
+ e.getDisplayMessage(resources),
+ if (viewModel.manga.value?.chapters == null) {
Snackbar.LENGTH_INDEFINITE
} else {
Snackbar.LENGTH_LONG
},
- onActionClick = {
- e.report("DetailsActivity::onError")
- dismiss()
- },
)
- }
- else -> {
- binding.snackbar.show(e.getDisplayMessage(resources))
+ snackbar.anchorView = binding.headerChapters
+ if (e.isReportable()) {
+ snackbar.setAction(R.string.report) {
+ e.report("DetailsActivity::onError")
+ }
+ }
+ snackbar.show()
}
}
}
override fun onWindowInsetsChanged(insets: Insets) {
- binding.snackbar.updatePadding(
- bottom = insets.bottom,
- )
- binding.toolbar.updateLayoutParams {
- topMargin = insets.top
- }
binding.root.updatePadding(
left = insets.left,
right = insets.right,
)
- }
-
- private fun onNewChaptersChanged(newChapters: Int) {
- val tab = binding.tabs?.getTabAt(1) ?: return
- if (newChapters == 0) {
- tab.removeBadge()
- } else {
- val badge = tab.orCreateBadge
- badge.maxCharacterCount = 3
- badge.number = newChapters
- badge.isVisible = true
+ if (insets.bottom > 0) {
+ window.setNavigationBarTransparentCompat(this, binding.layoutBottom?.elevation ?: 0f, 0.9f)
}
}
- override fun onCreateOptionsMenu(menu: Menu): Boolean {
- menuInflater.inflate(R.menu.opt_details, menu)
- return super.onCreateOptionsMenu(menu)
- }
-
- override fun onPrepareOptionsMenu(menu: Menu): Boolean {
- val manga = viewModel.manga.value
- menu.findItem(R.id.action_save).isVisible = manga?.source != null && manga.source != MangaSource.LOCAL
- menu.findItem(R.id.action_delete).isVisible = manga?.source == MangaSource.LOCAL
- menu.findItem(R.id.action_browser).isVisible = manga?.source != MangaSource.LOCAL
- menu.findItem(R.id.action_shortcut).isVisible = ShortcutManagerCompat.isRequestPinShortcutSupported(this)
- menu.findItem(R.id.action_shiki_track).isVisible = viewModel.isScrobblingAvailable
- return super.onPrepareOptionsMenu(menu)
- }
-
- override fun onOptionsItemSelected(item: MenuItem) = when (item.itemId) {
- R.id.action_delete -> {
- val title = viewModel.manga.value?.title.orEmpty()
- MaterialAlertDialogBuilder(this)
- .setTitle(R.string.delete_manga)
- .setMessage(getString(R.string.text_delete_local_manga, title))
- .setPositiveButton(R.string.delete) { _, _ ->
- viewModel.deleteLocal()
- }
- .setNegativeButton(android.R.string.cancel, null)
- .show()
- true
- }
- R.id.action_save -> {
- viewModel.manga.value?.let {
- val chaptersCount = it.chapters?.size ?: 0
- val branches = viewModel.branches.value.orEmpty()
- if (chaptersCount > 5 || branches.size > 1) {
- showSaveConfirmation(it, chaptersCount, branches)
- } else {
- DownloadService.start(this, it)
- }
+ private fun onHistoryChanged(info: HistoryInfo?) {
+ with(binding.buttonRead) {
+ if (info?.history != null) {
+ setText(R.string._continue)
+ setIconResource(R.drawable.ic_play)
+ } else {
+ setText(R.string.read)
+ setIconResource(R.drawable.ic_read)
}
- true
}
- R.id.action_browser -> {
- viewModel.manga.value?.let {
- startActivity(BrowserActivity.newIntent(this, it.publicUrl, it.title))
- }
- true
+ val text = when {
+ info == null -> getString(R.string.loading_)
+ info.currentChapter >= 0 -> getString(R.string.chapter_d_of_d, info.currentChapter + 1, info.totalChapters)
+ info.totalChapters == 0 -> getString(R.string.no_chapters)
+ else -> resources.getQuantityString(R.plurals.chapters, info.totalChapters, info.totalChapters)
}
- R.id.action_related -> {
- viewModel.manga.value?.let {
- startActivity(MultiSearchActivity.newIntent(this, it.title))
- }
- true
- }
- R.id.action_shiki_track -> {
- viewModel.manga.value?.let {
- ScrobblingSelectorBottomSheet.show(supportFragmentManager, it)
- }
- true
- }
- R.id.action_shortcut -> {
- viewModel.manga.value?.let {
- lifecycleScope.launch {
- if (!get().requestPinShortcut(it)) {
- binding.snackbar.show(getString(R.string.operation_not_supported))
- }
- }
- }
- true
- }
- else -> super.onOptionsItemSelected(item)
- }
-
- override fun onConfigureTab(tab: TabLayout.Tab, position: Int) {
- tab.text = when (position) {
- 0 -> getString(R.string.details)
- 1 -> getString(R.string.chapters)
- else -> null
- }
- }
-
- override fun onSupportActionModeStarted(mode: ActionMode) {
- super.onSupportActionModeStarted(mode)
- binding.pager?.isUserInputEnabled = false
- }
-
- override fun onSupportActionModeFinished(mode: ActionMode) {
- super.onSupportActionModeFinished(mode)
- binding.pager?.isUserInputEnabled = true
+ binding.headerChapters?.title = text
+ binding.textViewTitle?.text = text
}
- override fun onItemSelected(parent: AdapterView<*>?, view: View?, position: Int, id: Long) {
- val spinner = binding.spinnerBranches ?: return
- viewModel.setSelectedBranch(spinner.selectedItem as String?)
+ private fun onNewChaptersChanged(newChapters: Int) {
+ badge = binding.buttonRead.bindBadge(badge, newChapters)
}
- override fun onNothingSelected(parent: AdapterView<*>?) = Unit
-
fun showChapterMissingDialog(chapterId: Long) {
val remoteManga = viewModel.getRemoteManga()
if (remoteManga == null) {
- binding.snackbar.show(getString(R.string.chapter_is_missing))
+ val snackbar = Snackbar.make(binding.containerDetails, R.string.chapter_is_missing, Snackbar.LENGTH_SHORT)
+ snackbar.anchorView = binding.headerChapters
+ snackbar.show()
return
}
MaterialAlertDialogBuilder(this).apply {
@@ -287,19 +263,19 @@ class DetailsActivity :
}.show()
}
- private fun initSpinner(spinner: Spinner) {
- val branchesAdapter = BranchesAdapter()
- spinner.adapter = branchesAdapter
- spinner.onItemSelectedListener = this
- viewModel.branches.observe(this) {
- branchesAdapter.setItems(it)
- spinner.isVisible = it.size > 1
+ private fun showBranchPopupMenu() {
+ val menu = PopupMenu(this, binding.headerChapters ?: binding.buttonDropdown)
+ val currentBranch = viewModel.selectedBranchValue
+ for (branch in viewModel.branches.value ?: return) {
+ val item = menu.menu.add(R.id.group_branches, Menu.NONE, Menu.NONE, branch)
+ item.isChecked = branch == currentBranch
}
- viewModel.selectedBranchIndex.observe(this) {
- if (it != -1 && it != spinner.selectedItemPosition) {
- spinner.setSelection(it)
- }
+ menu.menu.setGroupCheckable(R.id.group_branches, true, true)
+ menu.setOnMenuItemClickListener { item ->
+ viewModel.setSelectedBranch(item.title?.toString())
+ true
}
+ menu.show()
}
private fun resolveError(e: Throwable) {
@@ -313,52 +289,7 @@ class DetailsActivity :
}
}
- private fun gcFragments() {
- val mustHaveId = binding.pager == null
- val fm = supportFragmentManager
- val fragmentsToRemove = fm.fragments.filter { f ->
- (f.id == 0) == mustHaveId
- }
- if (fragmentsToRemove.isEmpty()) {
- return
- }
- fm.commit {
- setReorderingAllowed(true)
- for (f in fragmentsToRemove) {
- remove(f)
- }
- }
- }
-
- private fun showSaveConfirmation(manga: Manga, chaptersCount: Int, branches: List) {
- val dialogBuilder = MaterialAlertDialogBuilder(this)
- .setTitle(R.string.save_manga)
- .setNegativeButton(android.R.string.cancel, null)
- if (branches.size > 1) {
- val items = Array(branches.size) { i -> branches[i].orEmpty() }
- val currentBranch = viewModel.selectedBranchIndex.value ?: -1
- val checkedIndices = BooleanArray(branches.size) { i -> i == currentBranch }
- dialogBuilder.setMultiChoiceItems(items, checkedIndices) { _, i, checked ->
- checkedIndices[i] = checked
- }.setPositiveButton(R.string.save) { _, _ ->
- val selectedBranches = branches.filterIndexedTo(HashSet()) { i, _ -> checkedIndices[i] }
- val chaptersIds = manga.chapters?.mapNotNullToSet { c ->
- if (c.branch in selectedBranches) c.id else null
- }
- DownloadService.start(this, manga, chaptersIds)
- }
- } else {
- dialogBuilder.setMessage(
- getString(
- R.string.large_manga_save_confirm,
- resources.getQuantityString(R.plurals.chapters, chaptersCount, chaptersCount),
- ),
- ).setPositiveButton(R.string.save) { _, _ ->
- DownloadService.start(this, manga)
- }
- }
- dialogBuilder.show()
- }
+ private fun isTabletLayout() = binding.layoutBottom == null
companion object {
@@ -372,4 +303,4 @@ class DetailsActivity :
.putExtra(MangaIntent.KEY_ID, mangaId)
}
}
-}
\ No newline at end of file
+}
diff --git a/app/src/main/java/org/koitharu/kotatsu/details/ui/DetailsFragment.kt b/app/src/main/java/org/koitharu/kotatsu/details/ui/DetailsFragment.kt
index 677d7e3f1..6275a49f1 100644
--- a/app/src/main/java/org/koitharu/kotatsu/details/ui/DetailsFragment.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/details/ui/DetailsFragment.kt
@@ -1,39 +1,39 @@
package org.koitharu.kotatsu.details.ui
-import android.app.ActivityOptions
import android.os.Bundle
import android.text.method.LinkMovementMethod
-import android.view.*
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
import androidx.appcompat.widget.PopupMenu
import androidx.core.content.ContextCompat
import androidx.core.graphics.Insets
-import androidx.core.net.toFile
import androidx.core.net.toUri
-import androidx.core.view.MenuProvider
import androidx.core.view.isGone
import androidx.core.view.isVisible
import androidx.core.view.updatePadding
+import androidx.fragment.app.activityViewModels
import coil.ImageLoader
import coil.request.ImageRequest
import coil.util.CoilUtils
import com.google.android.material.chip.Chip
+import dagger.hilt.android.AndroidEntryPoint
+import javax.inject.Inject
import kotlinx.coroutines.launch
-import org.koin.android.ext.android.inject
-import org.koin.androidx.viewmodel.ext.android.sharedViewModel
import org.koitharu.kotatsu.R
import org.koitharu.kotatsu.base.ui.BaseFragment
import org.koitharu.kotatsu.base.ui.list.OnListItemClickListener
import org.koitharu.kotatsu.base.ui.list.decor.SpacingItemDecoration
import org.koitharu.kotatsu.base.ui.widgets.ChipsView
import org.koitharu.kotatsu.bookmarks.domain.Bookmark
-import org.koitharu.kotatsu.bookmarks.ui.BookmarksAdapter
+import org.koitharu.kotatsu.bookmarks.ui.adapter.BookmarksAdapter
import org.koitharu.kotatsu.core.model.MangaHistory
import org.koitharu.kotatsu.databinding.FragmentDetailsBinding
import org.koitharu.kotatsu.details.ui.model.ChapterListItem
import org.koitharu.kotatsu.details.ui.scrobbling.ScrobblingInfoBottomSheet
-import org.koitharu.kotatsu.favourites.ui.categories.select.FavouriteCategoriesBottomSheet
import org.koitharu.kotatsu.history.domain.PROGRESS_NONE
import org.koitharu.kotatsu.image.ui.ImageActivity
+import org.koitharu.kotatsu.main.ui.owners.NoModalBottomSheetOwner
import org.koitharu.kotatsu.parsers.model.Manga
import org.koitharu.kotatsu.parsers.model.MangaSource
import org.koitharu.kotatsu.parsers.model.MangaState
@@ -44,10 +44,10 @@ import org.koitharu.kotatsu.scrobbling.domain.model.ScrobblingInfo
import org.koitharu.kotatsu.search.ui.MangaListActivity
import org.koitharu.kotatsu.search.ui.SearchActivity
import org.koitharu.kotatsu.utils.FileSize
-import org.koitharu.kotatsu.utils.ShareHelper
import org.koitharu.kotatsu.utils.ext.*
import org.koitharu.kotatsu.utils.image.CoverSizeResolver
+@AndroidEntryPoint
class DetailsFragment :
BaseFragment(),
View.OnClickListener,
@@ -55,8 +55,10 @@ class DetailsFragment :
ChipsView.OnChipClickListener,
OnListItemClickListener {
- private val viewModel by sharedViewModel()
- private val coil by inject(mode = LazyThreadSafetyMode.NONE)
+ @Inject
+ lateinit var coil: ImageLoader
+
+ private val viewModel by activityViewModels()
override fun onInflateView(
inflater: LayoutInflater,
@@ -66,27 +68,24 @@ class DetailsFragment :
override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
super.onViewCreated(view, savedInstanceState)
binding.textViewAuthor.setOnClickListener(this)
- binding.buttonFavorite.setOnClickListener(this)
- binding.buttonRead.setOnClickListener(this)
- binding.buttonRead.setOnLongClickListener(this)
binding.imageViewCover.setOnClickListener(this)
binding.scrobblingLayout.root.setOnClickListener(this)
binding.textViewDescription.movementMethod = LinkMovementMethod.getInstance()
binding.chipsTags.onChipClickListener = this
viewModel.manga.observe(viewLifecycleOwner, ::onMangaUpdated)
viewModel.isLoading.observe(viewLifecycleOwner, ::onLoadingStateChanged)
- viewModel.favouriteCategories.observe(viewLifecycleOwner, ::onFavouriteChanged)
viewModel.readingHistory.observe(viewLifecycleOwner, ::onHistoryChanged)
viewModel.bookmarks.observe(viewLifecycleOwner, ::onBookmarksChanged)
viewModel.scrobblingInfo.observe(viewLifecycleOwner, ::onScrobblingInfoChanged)
viewModel.description.observe(viewLifecycleOwner, ::onDescriptionChanged)
viewModel.chapters.observe(viewLifecycleOwner, ::onChaptersChanged)
- addMenuProvider(DetailsMenuProvider())
}
override fun onItemClick(item: Bookmark, view: View) {
- val options = ActivityOptions.makeScaleUpAnimation(view, 0, 0, view.width, view.height)
- startActivity(ReaderActivity.newIntent(view.context, item), options.toBundle())
+ startActivity(
+ ReaderActivity.newIntent(view.context, item),
+ scaleUpActivityOptionsOf(view).toBundle(),
+ )
}
override fun onItemLongClick(item: Bookmark, view: View): Boolean {
@@ -109,27 +108,27 @@ class DetailsFragment :
textViewTitle.text = manga.title
textViewSubtitle.textAndVisible = manga.altTitle
textViewAuthor.textAndVisible = manga.author
+ if (manga.hasRating) {
+ ratingBar.rating = manga.rating * ratingBar.numStars
+ ratingBar.isVisible = true
+ } else {
+ ratingBar.isVisible = false
+ }
+
when (manga.state) {
MangaState.FINISHED -> {
- textViewState.apply {
+ infoLayout.textViewState.apply {
textAndVisible = resources.getString(R.string.state_finished)
- drawableStart = ContextCompat.getDrawable(context, R.drawable.ic_state_finished)
+ drawableTop = ContextCompat.getDrawable(context, R.drawable.ic_state_finished)
}
}
MangaState.ONGOING -> {
- textViewState.apply {
+ infoLayout.textViewState.apply {
textAndVisible = resources.getString(R.string.state_ongoing)
- drawableStart = ContextCompat.getDrawable(context, R.drawable.ic_state_ongoing)
+ drawableTop = ContextCompat.getDrawable(context, R.drawable.ic_state_ongoing)
}
}
- else -> textViewState.isVisible = false
- }
-
- if (manga.hasRating) {
- infoLayout.textViewRating.text = String.format("%.1f", manga.rating * 5)
- infoLayout.ratingContainer.isVisible = true
- } else {
- infoLayout.ratingContainer.isVisible = false
+ else -> infoLayout.textViewState.isVisible = false
}
if (manga.source == MangaSource.LOCAL) {
infoLayout.textViewSource.isVisible = false
@@ -168,8 +167,6 @@ class DetailsFragment :
chapters.size,
)
}
- // Buttons
- binding.buttonRead.isEnabled = !chapters.isNullOrEmpty()
}
private fun onDescriptionChanged(description: CharSequence?) {
@@ -181,27 +178,9 @@ class DetailsFragment :
}
private fun onHistoryChanged(history: MangaHistory?) {
- with(binding.buttonRead) {
- if (history == null) {
- setText(R.string.read)
- setIconResource(R.drawable.ic_read)
- } else {
- setText(R.string._continue)
- setIconResource(R.drawable.ic_play)
- }
- }
binding.progressView.setPercent(history?.percent ?: PROGRESS_NONE, animate = true)
}
- private fun onFavouriteChanged(isFavourite: Boolean) {
- val iconRes = if (isFavourite) {
- R.drawable.ic_heart
- } else {
- R.drawable.ic_heart_outline
- }
- binding.buttonFavorite.setIconResource(iconRes)
- }
-
private fun onLoadingStateChanged(isLoading: Boolean) {
if (isLoading) {
binding.progressBar.show()
@@ -234,7 +213,7 @@ class DetailsFragment :
imageViewCover.newImageRequest(scrobbling.coverUrl)?.run {
placeholder(R.drawable.ic_placeholder)
fallback(R.drawable.ic_placeholder)
- error(R.drawable.ic_placeholder)
+ error(R.drawable.ic_error_placeholder)
lifecycle(viewLifecycleOwner)
enqueueWith(coil)
}
@@ -250,26 +229,9 @@ class DetailsFragment :
override fun onClick(v: View) {
val manga = viewModel.manga.value ?: return
when (v.id) {
- R.id.button_favorite -> {
- FavouriteCategoriesBottomSheet.show(childFragmentManager, manga)
- }
R.id.scrobbling_layout -> {
ScrobblingInfoBottomSheet.show(childFragmentManager)
}
- R.id.button_read -> {
- val chapterId = viewModel.readingHistory.value?.chapterId
- if (chapterId != null && manga.chapters?.none { x -> x.id == chapterId } == true) {
- (activity as? DetailsActivity)?.showChapterMissingDialog(chapterId)
- } else {
- startActivity(
- ReaderActivity.newIntent(
- context = context ?: return,
- manga = manga,
- branch = viewModel.selectedBranchValue,
- ),
- )
- }
- }
R.id.textView_author -> {
startActivity(
SearchActivity.newIntent(
@@ -280,10 +242,9 @@ class DetailsFragment :
)
}
R.id.imageView_cover -> {
- val options = ActivityOptions.makeScaleUpAnimation(v, 0, 0, v.width, v.height)
startActivity(
ImageActivity.newIntent(v.context, manga.largeCoverUrl.ifNullOrEmpty { manga.coverUrl }),
- options.toBundle(),
+ scaleUpActivityOptionsOf(v).toBundle(),
)
}
}
@@ -331,7 +292,11 @@ class DetailsFragment :
override fun onWindowInsetsChanged(insets: Insets) {
binding.root.updatePadding(
- bottom = insets.bottom,
+ bottom = (
+ (activity as? NoModalBottomSheetOwner)?.bsHeader?.measureHeight()
+ ?.plus(insets.bottom)?.plus(resources.resolveDp(16))
+ )
+ ?: insets.bottom,
)
}
@@ -342,6 +307,8 @@ class DetailsFragment :
title = tag.title,
icon = 0,
data = tag,
+ isCheckable = false,
+ isChecked = false,
)
},
)
@@ -357,7 +324,7 @@ class DetailsFragment :
.target(binding.imageViewCover)
.size(CoverSizeResolver(binding.imageViewCover))
.data(imageUrl)
- .crossfade(true)
+ .crossfade(context)
.referer(manga.publicUrl)
.lifecycle(viewLifecycleOwner)
.placeholderMemoryCacheKey(manga.coverUrl)
@@ -369,30 +336,8 @@ class DetailsFragment :
} else {
request.fallback(R.drawable.ic_placeholder)
.placeholder(R.drawable.ic_placeholder)
- .error(R.drawable.ic_placeholder)
+ .error(R.drawable.ic_error_placeholder)
}
request.enqueueWith(coil)
}
-
- private inner class DetailsMenuProvider : MenuProvider {
-
- override fun onCreateMenu(menu: Menu, menuInflater: MenuInflater) {
- menuInflater.inflate(R.menu.opt_details_info, menu)
- }
-
- override fun onMenuItemSelected(menuItem: MenuItem): Boolean = when (menuItem.itemId) {
- R.id.action_share -> {
- viewModel.manga.value?.let {
- val context = requireContext()
- if (it.source == MangaSource.LOCAL) {
- ShareHelper(context).shareCbz(listOf(it.url.toUri().toFile()))
- } else {
- ShareHelper(context).shareMangaLink(it)
- }
- }
- true
- }
- else -> false
- }
- }
-}
\ No newline at end of file
+}
diff --git a/app/src/main/java/org/koitharu/kotatsu/details/ui/DetailsMenuProvider.kt b/app/src/main/java/org/koitharu/kotatsu/details/ui/DetailsMenuProvider.kt
new file mode 100644
index 000000000..561ebbb36
--- /dev/null
+++ b/app/src/main/java/org/koitharu/kotatsu/details/ui/DetailsMenuProvider.kt
@@ -0,0 +1,149 @@
+package org.koitharu.kotatsu.details.ui
+
+import android.view.Menu
+import android.view.MenuInflater
+import android.view.MenuItem
+import android.view.View
+import androidx.core.content.pm.ShortcutManagerCompat
+import androidx.core.net.toFile
+import androidx.core.net.toUri
+import androidx.core.view.MenuProvider
+import androidx.fragment.app.FragmentActivity
+import androidx.lifecycle.lifecycleScope
+import com.google.android.material.dialog.MaterialAlertDialogBuilder
+import com.google.android.material.snackbar.Snackbar
+import kotlinx.coroutines.launch
+import org.koitharu.kotatsu.R
+import org.koitharu.kotatsu.browser.BrowserActivity
+import org.koitharu.kotatsu.core.os.ShortcutsUpdater
+import org.koitharu.kotatsu.download.ui.service.DownloadService
+import org.koitharu.kotatsu.favourites.ui.categories.select.FavouriteCategoriesBottomSheet
+import org.koitharu.kotatsu.parsers.model.Manga
+import org.koitharu.kotatsu.parsers.model.MangaSource
+import org.koitharu.kotatsu.parsers.util.mapNotNullToSet
+import org.koitharu.kotatsu.scrobbling.ui.selector.ScrobblingSelectorBottomSheet
+import org.koitharu.kotatsu.search.ui.multi.MultiSearchActivity
+import org.koitharu.kotatsu.utils.ShareHelper
+
+class DetailsMenuProvider(
+ private val activity: FragmentActivity,
+ private val viewModel: DetailsViewModel,
+ private val snackbarHost: View,
+ private val shortcutsUpdater: ShortcutsUpdater,
+) : MenuProvider {
+
+ override fun onCreateMenu(menu: Menu, menuInflater: MenuInflater) {
+ menuInflater.inflate(R.menu.opt_details, menu)
+ }
+
+ override fun onPrepareMenu(menu: Menu) {
+ val manga = viewModel.manga.value
+ menu.findItem(R.id.action_save).isVisible = manga?.source != null && manga.source != MangaSource.LOCAL
+ menu.findItem(R.id.action_delete).isVisible = manga?.source == MangaSource.LOCAL
+ menu.findItem(R.id.action_browser).isVisible = manga?.source != MangaSource.LOCAL
+ menu.findItem(R.id.action_shortcut).isVisible = ShortcutManagerCompat.isRequestPinShortcutSupported(activity)
+ menu.findItem(R.id.action_shiki_track).isVisible = viewModel.isScrobblingAvailable
+ menu.findItem(R.id.action_favourite).setIcon(
+ if (viewModel.favouriteCategories.value == true) R.drawable.ic_heart else R.drawable.ic_heart_outline,
+ )
+ }
+
+ override fun onMenuItemSelected(menuItem: MenuItem): Boolean {
+ when (menuItem.itemId) {
+ R.id.action_share -> {
+ viewModel.manga.value?.let {
+ val shareHelper = ShareHelper(activity)
+ if (it.source == MangaSource.LOCAL) {
+ shareHelper.shareCbz(listOf(it.url.toUri().toFile()))
+ } else {
+ shareHelper.shareMangaLink(it)
+ }
+ }
+ }
+ R.id.action_favourite -> {
+ viewModel.manga.value?.let {
+ FavouriteCategoriesBottomSheet.show(activity.supportFragmentManager, it)
+ }
+ }
+ R.id.action_delete -> {
+ val title = viewModel.manga.value?.title.orEmpty()
+ MaterialAlertDialogBuilder(activity)
+ .setTitle(R.string.delete_manga)
+ .setMessage(activity.getString(R.string.text_delete_local_manga, title))
+ .setPositiveButton(R.string.delete) { _, _ ->
+ viewModel.deleteLocal()
+ }
+ .setNegativeButton(android.R.string.cancel, null)
+ .show()
+ }
+ R.id.action_save -> {
+ viewModel.manga.value?.let {
+ val chaptersCount = it.chapters?.size ?: 0
+ val branches = viewModel.branches.value.orEmpty()
+ if (chaptersCount > 5 || branches.size > 1) {
+ showSaveConfirmation(it, chaptersCount, branches)
+ } else {
+ DownloadService.start(activity, it)
+ }
+ }
+ }
+ R.id.action_browser -> {
+ viewModel.manga.value?.let {
+ activity.startActivity(BrowserActivity.newIntent(activity, it.publicUrl, it.title))
+ }
+ }
+ R.id.action_related -> {
+ viewModel.manga.value?.let {
+ activity.startActivity(MultiSearchActivity.newIntent(activity, it.title))
+ }
+ }
+ R.id.action_shiki_track -> {
+ viewModel.manga.value?.let {
+ ScrobblingSelectorBottomSheet.show(activity.supportFragmentManager, it)
+ }
+ }
+ R.id.action_shortcut -> {
+ viewModel.manga.value?.let {
+ activity.lifecycleScope.launch {
+ if (!shortcutsUpdater.requestPinShortcut(it)) {
+ Snackbar.make(snackbarHost, R.string.operation_not_supported, Snackbar.LENGTH_SHORT)
+ .show()
+ }
+ }
+ }
+ }
+ else -> return false
+ }
+ return true
+ }
+
+ private fun showSaveConfirmation(manga: Manga, chaptersCount: Int, branches: List) {
+ val dialogBuilder = MaterialAlertDialogBuilder(activity)
+ .setTitle(R.string.save_manga)
+ .setNegativeButton(android.R.string.cancel, null)
+ if (branches.size > 1) {
+ val items = Array(branches.size) { i -> branches[i].orEmpty() }
+ val currentBranch = viewModel.selectedBranchIndex.value ?: -1
+ val checkedIndices = BooleanArray(branches.size) { i -> i == currentBranch }
+ dialogBuilder.setMultiChoiceItems(items, checkedIndices) { _, i, checked ->
+ checkedIndices[i] = checked
+ }.setPositiveButton(R.string.save) { _, _ ->
+ val selectedBranches = branches.filterIndexedTo(HashSet()) { i, _ -> checkedIndices[i] }
+ val chaptersIds = manga.chapters?.mapNotNullToSet { c ->
+ if (c.branch in selectedBranches) c.id else null
+ }
+ DownloadService.start(activity, manga, chaptersIds)
+ }
+ } else {
+ dialogBuilder.setMessage(
+ activity.getString(
+ R.string.large_manga_save_confirm,
+ activity.resources.getQuantityString(R.plurals.chapters, chaptersCount, chaptersCount),
+ ),
+ ).setPositiveButton(R.string.save) { _, _ ->
+ DownloadService.start(activity, manga)
+ }
+ }
+ dialogBuilder.show()
+ }
+}
diff --git a/app/src/main/java/org/koitharu/kotatsu/details/ui/DetailsViewModel.kt b/app/src/main/java/org/koitharu/kotatsu/details/ui/DetailsViewModel.kt
index a8bade779..e83fd1ae7 100644
--- a/app/src/main/java/org/koitharu/kotatsu/details/ui/DetailsViewModel.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/details/ui/DetailsViewModel.kt
@@ -10,6 +10,9 @@ import androidx.lifecycle.LiveData
import androidx.lifecycle.asFlow
import androidx.lifecycle.asLiveData
import androidx.lifecycle.viewModelScope
+import dagger.assisted.Assisted
+import dagger.assisted.AssistedFactory
+import dagger.assisted.AssistedInject
import java.io.IOException
import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.Job
@@ -22,10 +25,12 @@ import org.koitharu.kotatsu.base.domain.MangaIntent
import org.koitharu.kotatsu.base.ui.BaseViewModel
import org.koitharu.kotatsu.bookmarks.domain.Bookmark
import org.koitharu.kotatsu.bookmarks.domain.BookmarksRepository
+import org.koitharu.kotatsu.core.parser.MangaRepository
import org.koitharu.kotatsu.core.prefs.AppSettings
import org.koitharu.kotatsu.core.prefs.observeAsFlow
import org.koitharu.kotatsu.details.domain.BranchComparator
import org.koitharu.kotatsu.details.ui.model.ChapterListItem
+import org.koitharu.kotatsu.details.ui.model.HistoryInfo
import org.koitharu.kotatsu.favourites.domain.FavouritesRepository
import org.koitharu.kotatsu.history.domain.HistoryRepository
import org.koitharu.kotatsu.local.domain.LocalMangaRepository
@@ -36,11 +41,12 @@ import org.koitharu.kotatsu.scrobbling.domain.Scrobbler
import org.koitharu.kotatsu.scrobbling.domain.model.ScrobblingStatus
import org.koitharu.kotatsu.tracker.domain.TrackingRepository
import org.koitharu.kotatsu.utils.SingleLiveEvent
+import org.koitharu.kotatsu.utils.asFlowLiveData
import org.koitharu.kotatsu.utils.ext.asLiveDataDistinct
import org.koitharu.kotatsu.utils.ext.printStackTraceDebug
-class DetailsViewModel(
- intent: MangaIntent,
+class DetailsViewModel @AssistedInject constructor(
+ @Assisted intent: MangaIntent,
private val historyRepository: HistoryRepository,
favouritesRepository: FavouritesRepository,
private val localMangaRepository: LocalMangaRepository,
@@ -48,16 +54,20 @@ class DetailsViewModel(
mangaDataRepository: MangaDataRepository,
private val bookmarksRepository: BookmarksRepository,
private val settings: AppSettings,
- private val scrobbler: Scrobbler,
+ scrobblers: Set<@JvmSuppressWildcards Scrobbler>,
private val imageGetter: Html.ImageGetter,
+ mangaRepositoryFactory: MangaRepository.Factory,
) : BaseViewModel() {
+ private val scrobbler = scrobblers.first() // TODO support multiple scrobblers
+
private val delegate = MangaDetailsDelegate(
intent = intent,
settings = settings,
mangaDataRepository = mangaDataRepository,
historyRepository = historyRepository,
localMangaRepository = localMangaRepository,
+ mangaRepositoryFactory = mangaRepositoryFactory,
)
private var loadingJob: Job
@@ -81,9 +91,18 @@ class DetailsViewModel(
val manga = delegate.manga.filterNotNull().asLiveData(viewModelScope.coroutineContext)
val favouriteCategories = favourite.asLiveData(viewModelScope.coroutineContext)
val newChaptersCount = newChapters.asLiveData(viewModelScope.coroutineContext)
+
+ @Deprecated("")
val readingHistory = history.asLiveData(viewModelScope.coroutineContext)
val isChaptersReversed = chaptersReversed.asLiveData(viewModelScope.coroutineContext)
+ val historyInfo = combine(
+ delegate.manga,
+ history,
+ ) { m, h ->
+ HistoryInfo(m, h)
+ }.asFlowLiveData(viewModelScope.coroutineContext + Dispatchers.Default, null)
+
val bookmarks = delegate.manga.flatMapLatest {
if (it != null) bookmarksRepository.observeBookmarks(it) else flowOf(emptyList())
}.asLiveDataDistinct(viewModelScope.coroutineContext + Dispatchers.Default, emptyList())
@@ -110,14 +129,17 @@ class DetailsViewModel(
val branches: LiveData> = delegate.manga.map {
val chapters = it?.chapters ?: return@map emptyList()
chapters.mapToSet { x -> x.branch }.sortedWith(BranchComparator())
- }.asLiveDataDistinct(viewModelScope.coroutineContext + Dispatchers.Default)
+ }.asFlowLiveData(viewModelScope.coroutineContext + Dispatchers.Default, emptyList())
val selectedBranchIndex = combine(
branches.asFlow(),
delegate.selectedBranch,
) { branches, selected ->
branches.indexOf(selected)
- }.asLiveDataDistinct(viewModelScope.coroutineContext + Dispatchers.Default)
+ }.asLiveDataDistinct(viewModelScope.coroutineContext + Dispatchers.Default, -1)
+
+ val selectedBranchName = delegate.selectedBranch
+ .asFlowLiveData(viewModelScope.coroutineContext, null)
val isChaptersEmpty: LiveData = combine(
delegate.manga,
@@ -255,4 +277,10 @@ class DetailsViewModel(
}
return spannable.trim()
}
-}
\ No newline at end of file
+
+ @AssistedFactory
+ interface Factory {
+
+ fun create(intent: MangaIntent): DetailsViewModel
+ }
+}
diff --git a/app/src/main/java/org/koitharu/kotatsu/details/ui/MangaDetailsDelegate.kt b/app/src/main/java/org/koitharu/kotatsu/details/ui/MangaDetailsDelegate.kt
index 49bbde5ce..0f7a320a3 100644
--- a/app/src/main/java/org/koitharu/kotatsu/details/ui/MangaDetailsDelegate.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/details/ui/MangaDetailsDelegate.kt
@@ -24,6 +24,7 @@ class MangaDetailsDelegate(
private val mangaDataRepository: MangaDataRepository,
private val historyRepository: HistoryRepository,
private val localMangaRepository: LocalMangaRepository,
+ private val mangaRepositoryFactory: MangaRepository.Factory,
) {
private val mangaData = MutableStateFlow(intent.manga)
@@ -39,7 +40,7 @@ class MangaDetailsDelegate(
suspend fun doLoad() {
var manga = mangaDataRepository.resolveIntent(intent) ?: throw NotFoundException("Cannot find manga", "")
mangaData.value = manga
- manga = MangaRepository(manga.source).getDetails(manga)
+ manga = mangaRepositoryFactory.create(manga.source).getDetails(manga)
// find default branch
val hist = historyRepository.getOne(manga)
selectedBranch.value = manga.getPreferredBranch(hist)
@@ -47,7 +48,7 @@ class MangaDetailsDelegate(
relatedManga.value = runCatching {
if (manga.source == MangaSource.LOCAL) {
val m = localMangaRepository.getRemoteManga(manga) ?: return@runCatching null
- MangaRepository(m.source).getDetails(m)
+ mangaRepositoryFactory.create(m.source).getDetails(m)
} else {
localMangaRepository.findSavedManga(manga)
}
@@ -161,4 +162,4 @@ class MangaDetailsDelegate(
}
return result
}
-}
\ No newline at end of file
+}
diff --git a/app/src/main/java/org/koitharu/kotatsu/details/ui/adapter/ChaptersAdapter.kt b/app/src/main/java/org/koitharu/kotatsu/details/ui/adapter/ChaptersAdapter.kt
index 033b9ed92..766ffb0e3 100644
--- a/app/src/main/java/org/koitharu/kotatsu/details/ui/adapter/ChaptersAdapter.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/details/ui/adapter/ChaptersAdapter.kt
@@ -1,14 +1,16 @@
package org.koitharu.kotatsu.details.ui.adapter
+import android.content.Context
import androidx.recyclerview.widget.DiffUtil
import com.hannesdorfmann.adapterdelegates4.AsyncListDifferDelegationAdapter
import org.koitharu.kotatsu.base.ui.list.OnListItemClickListener
+import org.koitharu.kotatsu.base.ui.list.fastscroll.FastScroller
import org.koitharu.kotatsu.details.ui.model.ChapterListItem
import kotlin.jvm.internal.Intrinsics
class ChaptersAdapter(
onItemClickListener: OnListItemClickListener,
-) : AsyncListDifferDelegationAdapter(DiffCallback()) {
+) : AsyncListDifferDelegationAdapter(DiffCallback()), FastScroller.SectionIndexer {
init {
setHasStableIds(true)
@@ -39,4 +41,8 @@ class ChaptersAdapter(
return null
}
}
+
+ override fun getSectionText(context: Context, position: Int): CharSequence {
+ return items[position].chapter.number.toString()
+ }
}
\ No newline at end of file
diff --git a/app/src/main/java/org/koitharu/kotatsu/details/ui/adapter/ChaptersSelectionDecoration.kt b/app/src/main/java/org/koitharu/kotatsu/details/ui/adapter/ChaptersSelectionDecoration.kt
index 0ff2fbc94..469ae6514 100644
--- a/app/src/main/java/org/koitharu/kotatsu/details/ui/adapter/ChaptersSelectionDecoration.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/details/ui/adapter/ChaptersSelectionDecoration.kt
@@ -6,10 +6,11 @@ import android.graphics.Color
import android.graphics.Paint
import android.graphics.RectF
import android.view.View
+import androidx.core.graphics.ColorUtils
import androidx.recyclerview.widget.RecyclerView
+import com.google.android.material.R as materialR
import org.koitharu.kotatsu.base.ui.list.decor.AbstractSelectionItemDecoration
import org.koitharu.kotatsu.utils.ext.getThemeColor
-import com.google.android.material.R as materialR
class ChaptersSelectionDecoration(context: Context) : AbstractSelectionItemDecoration() {
@@ -17,7 +18,10 @@ class ChaptersSelectionDecoration(context: Context) : AbstractSelectionItemDecor
private val radius = context.resources.getDimension(materialR.dimen.abc_control_corner_material)
init {
- paint.color = context.getThemeColor(materialR.attr.colorSecondaryContainer, Color.LTGRAY)
+ paint.color = ColorUtils.setAlphaComponent(
+ context.getThemeColor(materialR.attr.colorPrimary, Color.DKGRAY),
+ 98,
+ )
paint.style = Paint.Style.FILL
}
@@ -30,4 +34,4 @@ class ChaptersSelectionDecoration(context: Context) : AbstractSelectionItemDecor
) {
canvas.drawRoundRect(bounds, radius, radius, paint)
}
-}
\ No newline at end of file
+}
diff --git a/app/src/main/java/org/koitharu/kotatsu/details/ui/model/ChapterListItem.kt b/app/src/main/java/org/koitharu/kotatsu/details/ui/model/ChapterListItem.kt
index c3e39efec..7de226908 100644
--- a/app/src/main/java/org/koitharu/kotatsu/details/ui/model/ChapterListItem.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/details/ui/model/ChapterListItem.kt
@@ -66,4 +66,4 @@ class ChapterListItem(
const val FLAG_DOWNLOADED = 32
const val MASK_STATUS = FLAG_UNREAD or FLAG_CURRENT
}
-}
\ No newline at end of file
+}
diff --git a/app/src/main/java/org/koitharu/kotatsu/details/ui/model/HistoryInfo.kt b/app/src/main/java/org/koitharu/kotatsu/details/ui/model/HistoryInfo.kt
new file mode 100644
index 000000000..a3fd7f9fa
--- /dev/null
+++ b/app/src/main/java/org/koitharu/kotatsu/details/ui/model/HistoryInfo.kt
@@ -0,0 +1,45 @@
+package org.koitharu.kotatsu.details.ui.model
+
+import org.koitharu.kotatsu.core.model.MangaHistory
+import org.koitharu.kotatsu.parsers.model.Manga
+
+class HistoryInfo(
+ val totalChapters: Int,
+ val currentChapter: Int,
+ val history: MangaHistory?,
+) {
+
+ override fun equals(other: Any?): Boolean {
+ if (this === other) return true
+ if (javaClass != other?.javaClass) return false
+
+ other as HistoryInfo
+
+ if (totalChapters != other.totalChapters) return false
+ if (currentChapter != other.currentChapter) return false
+ if (history != other.history) return false
+
+ return true
+ }
+
+ override fun hashCode(): Int {
+ var result = totalChapters
+ result = 31 * result + currentChapter
+ result = 31 * result + (history?.hashCode() ?: 0)
+ return result
+ }
+}
+
+@Suppress("FunctionName")
+fun HistoryInfo(manga: Manga?, history: MangaHistory?): HistoryInfo? {
+ val chapters = manga?.chapters ?: return null
+ return HistoryInfo(
+ totalChapters = chapters.size,
+ currentChapter = if (history != null) {
+ chapters.indexOfFirst { it.id == history.chapterId }
+ } else {
+ -1
+ },
+ history = history,
+ )
+}
diff --git a/app/src/main/java/org/koitharu/kotatsu/details/ui/scrobbling/ScrobblingInfoBottomSheet.kt b/app/src/main/java/org/koitharu/kotatsu/details/ui/scrobbling/ScrobblingInfoBottomSheet.kt
index 8347b0a7e..0ec3b545a 100644
--- a/app/src/main/java/org/koitharu/kotatsu/details/ui/scrobbling/ScrobblingInfoBottomSheet.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/details/ui/scrobbling/ScrobblingInfoBottomSheet.kt
@@ -1,6 +1,5 @@
package org.koitharu.kotatsu.details.ui.scrobbling
-import android.app.ActivityOptions
import android.content.Intent
import android.os.Bundle
import android.text.method.LinkMovementMethod
@@ -14,11 +13,11 @@ import android.widget.Toast
import androidx.appcompat.widget.PopupMenu
import androidx.core.net.toUri
import androidx.fragment.app.FragmentManager
+import androidx.fragment.app.activityViewModels
import coil.ImageLoader
import coil.request.ImageRequest
-import coil.size.Scale
-import org.koin.android.ext.android.inject
-import org.koin.androidx.viewmodel.ext.android.sharedViewModel
+import dagger.hilt.android.AndroidEntryPoint
+import javax.inject.Inject
import org.koitharu.kotatsu.R
import org.koitharu.kotatsu.base.ui.BaseBottomSheet
import org.koitharu.kotatsu.databinding.SheetScrobblingBinding
@@ -27,9 +26,12 @@ import org.koitharu.kotatsu.image.ui.ImageActivity
import org.koitharu.kotatsu.scrobbling.domain.model.ScrobblingInfo
import org.koitharu.kotatsu.scrobbling.domain.model.ScrobblingStatus
import org.koitharu.kotatsu.scrobbling.ui.selector.ScrobblingSelectorBottomSheet
+import org.koitharu.kotatsu.utils.ext.crossfade
import org.koitharu.kotatsu.utils.ext.enqueueWith
import org.koitharu.kotatsu.utils.ext.getDisplayMessage
+import org.koitharu.kotatsu.utils.ext.scaleUpActivityOptionsOf
+@AndroidEntryPoint
class ScrobblingInfoBottomSheet :
BaseBottomSheet(),
AdapterView.OnItemSelectedListener,
@@ -37,8 +39,10 @@ class ScrobblingInfoBottomSheet :
View.OnClickListener,
PopupMenu.OnMenuItemClickListener {
- private val viewModel by sharedViewModel()
- private val coil by inject(mode = LazyThreadSafetyMode.NONE)
+ private val viewModel by activityViewModels()
+
+ @Inject
+ lateinit var coil: ImageLoader
private var menu: PopupMenu? = null
override fun onInflateView(inflater: LayoutInflater, container: ViewGroup?): SheetScrobblingBinding {
@@ -92,7 +96,7 @@ class ScrobblingInfoBottomSheet :
R.id.button_menu -> menu?.show()
R.id.imageView_cover -> {
val coverUrl = viewModel.scrobblingInfo.value?.coverUrl ?: return
- val options = ActivityOptions.makeScaleUpAnimation(v, 0, 0, v.width, v.height)
+ val options = scaleUpActivityOptionsOf(v)
startActivity(ImageActivity.newIntent(v.context, coverUrl), options.toBundle())
}
}
@@ -110,12 +114,11 @@ class ScrobblingInfoBottomSheet :
ImageRequest.Builder(context ?: return)
.target(binding.imageViewCover)
.data(scrobbling.coverUrl)
- .crossfade(true)
+ .crossfade(context)
.lifecycle(viewLifecycleOwner)
.placeholder(R.drawable.ic_placeholder)
.fallback(R.drawable.ic_placeholder)
- .error(R.drawable.ic_placeholder)
- .scale(Scale.FILL)
+ .error(R.drawable.ic_error_placeholder)
.enqueueWith(coil)
}
@@ -132,7 +135,7 @@ class ScrobblingInfoBottomSheet :
val url = viewModel.scrobblingInfo.value?.externalUrl ?: return false
val intent = Intent(Intent.ACTION_VIEW, url.toUri())
startActivity(
- Intent.createChooser(intent, getString(R.string.open_in_browser))
+ Intent.createChooser(intent, getString(R.string.open_in_browser)),
)
}
R.id.action_unregister -> {
@@ -147,4 +150,4 @@ class ScrobblingInfoBottomSheet :
}
return true
}
-}
\ No newline at end of file
+}
diff --git a/app/src/main/java/org/koitharu/kotatsu/download/domain/DownloadManager.kt b/app/src/main/java/org/koitharu/kotatsu/download/domain/DownloadManager.kt
index 9f5b34dd4..e2802c6c6 100644
--- a/app/src/main/java/org/koitharu/kotatsu/download/domain/DownloadManager.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/download/domain/DownloadManager.kt
@@ -4,7 +4,10 @@ import android.content.Context
import android.webkit.MimeTypeMap
import coil.ImageLoader
import coil.request.ImageRequest
-import coil.size.Scale
+import dagger.assisted.Assisted
+import dagger.assisted.AssistedFactory
+import dagger.assisted.AssistedInject
+import dagger.hilt.android.qualifiers.ApplicationContext
import java.io.File
import kotlinx.coroutines.*
import kotlinx.coroutines.flow.MutableStateFlow
@@ -32,21 +35,22 @@ private const val MAX_FAILSAFE_ATTEMPTS = 2
private const val DOWNLOAD_ERROR_DELAY = 500L
private const val SLOWDOWN_DELAY = 200L
-class DownloadManager(
- private val coroutineScope: CoroutineScope,
- private val context: Context,
+class DownloadManager @AssistedInject constructor(
+ @Assisted private val coroutineScope: CoroutineScope,
+ @ApplicationContext private val context: Context,
private val imageLoader: ImageLoader,
private val okHttp: OkHttpClient,
private val cache: PagesCache,
private val localMangaRepository: LocalMangaRepository,
private val settings: AppSettings,
+ private val mangaRepositoryFactory: MangaRepository.Factory,
) {
private val coverWidth = context.resources.getDimensionPixelSize(
- androidx.core.R.dimen.compat_notification_large_icon_max_width
+ androidx.core.R.dimen.compat_notification_large_icon_max_width,
)
private val coverHeight = context.resources.getDimensionPixelSize(
- androidx.core.R.dimen.compat_notification_large_icon_max_height
+ androidx.core.R.dimen.compat_notification_large_icon_max_height,
)
private val semaphore = Semaphore(settings.downloadsParallelism)
@@ -56,7 +60,7 @@ class DownloadManager(
startId: Int,
): PausingProgressJob {
val stateFlow = MutableStateFlow(
- DownloadState.Queued(startId = startId, manga = manga, cover = null)
+ DownloadState.Queued(startId = startId, manga = manga, cover = null),
)
val pausingHandle = PausingHandle()
val job = downloadMangaImpl(manga, chaptersIds?.takeUnless { it.isEmpty() }, stateFlow, pausingHandle, startId)
@@ -87,7 +91,7 @@ class DownloadManager(
if (manga.source == MangaSource.LOCAL) {
manga = localMangaRepository.getRemoteManga(manga) ?: error("Cannot obtain remote manga instance")
}
- val repo = MangaRepository(manga.source)
+ val repo = mangaRepositoryFactory.create(manga.source)
outState.value = DownloadState.Preparing(startId, manga, cover)
val data = if (manga.chapters.isNullOrEmpty()) repo.getDetails(manga) else manga
output = CbzMangaOutput.get(destination, data)
@@ -100,7 +104,7 @@ class DownloadManager(
data.chapters
} else {
data.chapters?.filter { x -> chaptersIdsSet.remove(x.id) }
- }
+ },
) { "Chapters list must not be null" }
check(chapters.isNotEmpty()) { "Chapters list must not be empty" }
check(chaptersIdsSet.isNullOrEmpty()) {
@@ -118,7 +122,7 @@ class DownloadManager(
chapter = chapter,
file = file,
pageNumber = pageIndex,
- ext = MimeTypeMap.getFileExtensionFromUrl(url)
+ ext = MimeTypeMap.getFileExtensionFromUrl(url),
)
}
outState.value = DownloadState.Progress(
@@ -128,7 +132,7 @@ class DownloadManager(
totalChapters = chapters.size,
currentChapter = chapterIndex,
totalPages = pages.size,
- currentPage = pageIndex
+ currentPage = pageIndex,
)
if (settings.isDownloadsSlowdownEnabled) {
@@ -209,7 +213,7 @@ class DownloadManager(
manga = prevValue.manga,
cover = prevValue.cover,
error = throwable,
- canRetry = false
+ canRetry = false,
)
}
@@ -219,28 +223,13 @@ class DownloadManager(
.data(manga.coverUrl)
.referer(manga.publicUrl)
.size(coverWidth, coverHeight)
- .scale(Scale.FILL)
- .build()
+ .build(),
).drawable
}.getOrNull()
- class Factory(
- private val context: Context,
- private val imageLoader: ImageLoader,
- private val okHttp: OkHttpClient,
- private val cache: PagesCache,
- private val localMangaRepository: LocalMangaRepository,
- private val settings: AppSettings,
- ) {
+ @AssistedFactory
+ interface Factory {
- fun create(coroutineScope: CoroutineScope) = DownloadManager(
- coroutineScope = coroutineScope,
- context = context,
- imageLoader = imageLoader,
- okHttp = okHttp,
- cache = cache,
- localMangaRepository = localMangaRepository,
- settings = settings
- )
+ fun create(coroutineScope: CoroutineScope): DownloadManager
}
-}
\ No newline at end of file
+}
diff --git a/app/src/main/java/org/koitharu/kotatsu/download/domain/DownloadState.kt b/app/src/main/java/org/koitharu/kotatsu/download/domain/DownloadState.kt
index d7f86abfb..4ed75b514 100644
--- a/app/src/main/java/org/koitharu/kotatsu/download/domain/DownloadState.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/download/domain/DownloadState.kt
@@ -108,34 +108,6 @@ sealed interface DownloadState {
}
}
- @Deprecated("TODO: remove")
- class WaitingForNetwork(
- override val startId: Int,
- override val manga: Manga,
- override val cover: Drawable?,
- ) : DownloadState {
-
- override fun equals(other: Any?): Boolean {
- if (this === other) return true
- if (javaClass != other?.javaClass) return false
-
- other as WaitingForNetwork
-
- if (startId != other.startId) return false
- if (manga != other.manga) return false
- if (cover != other.cover) return false
-
- return true
- }
-
- override fun hashCode(): Int {
- var result = startId
- result = 31 * result + manga.hashCode()
- result = 31 * result + (cover?.hashCode() ?: 0)
- return result
- }
- }
-
class Done(
override val startId: Int,
override val manga: Manga,
@@ -252,4 +224,4 @@ sealed interface DownloadState {
return result
}
}
-}
\ No newline at end of file
+}
diff --git a/app/src/main/java/org/koitharu/kotatsu/download/ui/DownloadItemAD.kt b/app/src/main/java/org/koitharu/kotatsu/download/ui/DownloadItemAD.kt
index 476f6efb6..4d24c9104 100644
--- a/app/src/main/java/org/koitharu/kotatsu/download/ui/DownloadItemAD.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/download/ui/DownloadItemAD.kt
@@ -1,5 +1,6 @@
package org.koitharu.kotatsu.download.ui
+import android.view.View
import androidx.core.view.isVisible
import coil.ImageLoader
import com.hannesdorfmann.adapterdelegates4.dsl.adapterDelegateViewBinding
@@ -9,21 +10,33 @@ import kotlinx.coroutines.flow.launchIn
import kotlinx.coroutines.flow.onEach
import org.koitharu.kotatsu.R
import org.koitharu.kotatsu.databinding.ItemDownloadBinding
+import org.koitharu.kotatsu.details.ui.DetailsActivity
import org.koitharu.kotatsu.download.domain.DownloadState
import org.koitharu.kotatsu.parsers.util.format
import org.koitharu.kotatsu.utils.ext.*
-import org.koitharu.kotatsu.utils.progress.ProgressJob
fun downloadItemAD(
scope: CoroutineScope,
coil: ImageLoader,
-) = adapterDelegateViewBinding, ProgressJob, ItemDownloadBinding>(
- { inflater, parent -> ItemDownloadBinding.inflate(inflater, parent, false) }
+) = adapterDelegateViewBinding(
+ { inflater, parent -> ItemDownloadBinding.inflate(inflater, parent, false) },
) {
-
var job: Job? = null
val percentPattern = context.resources.getString(R.string.percent_string_pattern)
+ val clickListener = View.OnClickListener { v ->
+ when (v.id) {
+ R.id.button_cancel -> item.cancel()
+ R.id.button_resume -> item.resume()
+ else -> context.startActivity(
+ DetailsActivity.newIntent(context, item.progressValue.manga),
+ )
+ }
+ }
+ binding.buttonCancel.setOnClickListener(clickListener)
+ binding.buttonResume.setOnClickListener(clickListener)
+ itemView.setOnClickListener(clickListener)
+
bind {
job?.cancel()
job = item.progressAsFlow().onFirst { state ->
@@ -31,7 +44,7 @@ fun downloadItemAD(
referer(state.manga.publicUrl)
placeholder(state.cover)
fallback(R.drawable.ic_placeholder)
- error(R.drawable.ic_placeholder)
+ error(R.drawable.ic_error_placeholder)
allowRgb565(true)
enqueueWith(coil)
}
@@ -44,6 +57,8 @@ fun downloadItemAD(
binding.progressBar.isVisible = true
binding.textViewPercent.isVisible = false
binding.textViewDetails.isVisible = false
+ binding.buttonCancel.isVisible = false
+ binding.buttonResume.isVisible = false
}
is DownloadState.Done -> {
binding.textViewStatus.setText(R.string.download_complete)
@@ -51,6 +66,8 @@ fun downloadItemAD(
binding.progressBar.isVisible = false
binding.textViewPercent.isVisible = false
binding.textViewDetails.isVisible = false
+ binding.buttonCancel.isVisible = false
+ binding.buttonResume.isVisible = false
}
is DownloadState.Error -> {
binding.textViewStatus.setText(R.string.error_occurred)
@@ -59,6 +76,8 @@ fun downloadItemAD(
binding.textViewPercent.isVisible = false
binding.textViewDetails.text = state.error.getDisplayMessage(context.resources)
binding.textViewDetails.isVisible = true
+ binding.buttonCancel.isVisible = state.canRetry
+ binding.buttonResume.isVisible = state.canRetry
}
is DownloadState.PostProcessing -> {
binding.textViewStatus.setText(R.string.processing_)
@@ -66,6 +85,8 @@ fun downloadItemAD(
binding.progressBar.isVisible = true
binding.textViewPercent.isVisible = false
binding.textViewDetails.isVisible = false
+ binding.buttonCancel.isVisible = false
+ binding.buttonResume.isVisible = false
}
is DownloadState.Preparing -> {
binding.textViewStatus.setText(R.string.preparing_)
@@ -73,6 +94,8 @@ fun downloadItemAD(
binding.progressBar.isVisible = true
binding.textViewPercent.isVisible = false
binding.textViewDetails.isVisible = false
+ binding.buttonCancel.isVisible = true
+ binding.buttonResume.isVisible = false
}
is DownloadState.Progress -> {
binding.textViewStatus.setText(R.string.manga_downloading_)
@@ -83,6 +106,8 @@ fun downloadItemAD(
binding.textViewPercent.text = percentPattern.format((state.percent * 100f).format(1))
binding.textViewPercent.isVisible = true
binding.textViewDetails.isVisible = false
+ binding.buttonCancel.isVisible = true
+ binding.buttonResume.isVisible = false
}
is DownloadState.Queued -> {
binding.textViewStatus.setText(R.string.queued)
@@ -90,13 +115,8 @@ fun downloadItemAD(
binding.progressBar.isVisible = false
binding.textViewPercent.isVisible = false
binding.textViewDetails.isVisible = false
- }
- is DownloadState.WaitingForNetwork -> {
- binding.textViewStatus.setText(R.string.waiting_for_network)
- binding.progressBar.isIndeterminate = false
- binding.progressBar.isVisible = false
- binding.textViewPercent.isVisible = false
- binding.textViewDetails.isVisible = false
+ binding.buttonCancel.isVisible = true
+ binding.buttonResume.isVisible = false
}
}
}.launchIn(scope)
@@ -106,4 +126,4 @@ fun downloadItemAD(
job?.cancel()
job = null
}
-}
\ No newline at end of file
+}
diff --git a/app/src/main/java/org/koitharu/kotatsu/download/ui/DownloadsActivity.kt b/app/src/main/java/org/koitharu/kotatsu/download/ui/DownloadsActivity.kt
index a0c6c63dd..f5e1c4996 100644
--- a/app/src/main/java/org/koitharu/kotatsu/download/ui/DownloadsActivity.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/download/ui/DownloadsActivity.kt
@@ -7,23 +7,33 @@ import androidx.core.graphics.Insets
import androidx.core.view.isVisible
import androidx.core.view.updatePadding
import androidx.lifecycle.lifecycleScope
+import coil.ImageLoader
+import dagger.hilt.android.AndroidEntryPoint
+import javax.inject.Inject
import kotlinx.coroutines.flow.flatMapLatest
import kotlinx.coroutines.flow.flowOf
import kotlinx.coroutines.flow.launchIn
import kotlinx.coroutines.flow.onEach
-import org.koin.android.ext.android.get
+import org.koitharu.kotatsu.R
import org.koitharu.kotatsu.base.ui.BaseActivity
+import org.koitharu.kotatsu.base.ui.list.decor.SpacingItemDecoration
import org.koitharu.kotatsu.databinding.ActivityDownloadsBinding
import org.koitharu.kotatsu.download.ui.service.DownloadService
import org.koitharu.kotatsu.utils.bindServiceWithLifecycle
+@AndroidEntryPoint
class DownloadsActivity : BaseActivity() {
+ @Inject
+ lateinit var coil: ImageLoader
+
override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState)
setContentView(ActivityDownloadsBinding.inflate(layoutInflater))
supportActionBar?.setDisplayHomeAsUpEnabled(true)
- val adapter = DownloadsAdapter(lifecycleScope, get())
+ val adapter = DownloadsAdapter(lifecycleScope, coil)
+ val spacing = resources.getDimensionPixelOffset(R.dimen.grid_spacing)
+ binding.recyclerView.addItemDecoration(SpacingItemDecoration(spacing))
binding.recyclerView.setHasFixedSize(true)
binding.recyclerView.adapter = adapter
bindServiceWithLifecycle(
@@ -39,14 +49,12 @@ class DownloadsActivity : BaseActivity() {
}
override fun onWindowInsetsChanged(insets: Insets) {
- binding.recyclerView.updatePadding(
+ binding.root.updatePadding(
left = insets.left,
right = insets.right,
- bottom = insets.bottom
)
- binding.toolbar.updatePadding(
- left = insets.left,
- right = insets.right
+ binding.recyclerView.updatePadding(
+ bottom = insets.bottom,
)
}
@@ -54,4 +62,4 @@ class DownloadsActivity : BaseActivity() {
fun newIntent(context: Context) = Intent(context, DownloadsActivity::class.java)
}
-}
\ No newline at end of file
+}
diff --git a/app/src/main/java/org/koitharu/kotatsu/download/ui/DownloadsAdapter.kt b/app/src/main/java/org/koitharu/kotatsu/download/ui/DownloadsAdapter.kt
index 0c3629d1b..de75277bf 100644
--- a/app/src/main/java/org/koitharu/kotatsu/download/ui/DownloadsAdapter.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/download/ui/DownloadsAdapter.kt
@@ -5,12 +5,14 @@ import coil.ImageLoader
import com.hannesdorfmann.adapterdelegates4.AsyncListDifferDelegationAdapter
import kotlinx.coroutines.CoroutineScope
import org.koitharu.kotatsu.download.domain.DownloadState
-import org.koitharu.kotatsu.utils.progress.ProgressJob
+import org.koitharu.kotatsu.utils.progress.PausingProgressJob
+
+typealias DownloadItem = PausingProgressJob
class DownloadsAdapter(
scope: CoroutineScope,
coil: ImageLoader,
-) : AsyncListDifferDelegationAdapter>(DiffCallback()) {
+) : AsyncListDifferDelegationAdapter(DiffCallback()) {
init {
delegatesManager.addDelegate(downloadItemAD(scope, coil))
@@ -21,20 +23,24 @@ class DownloadsAdapter(
return items[position].progressValue.startId.toLong()
}
- private class DiffCallback : DiffUtil.ItemCallback>() {
+ private class DiffCallback : DiffUtil.ItemCallback() {
override fun areItemsTheSame(
- oldItem: ProgressJob,
- newItem: ProgressJob,
+ oldItem: DownloadItem,
+ newItem: DownloadItem,
): Boolean {
return oldItem.progressValue.startId == newItem.progressValue.startId
}
override fun areContentsTheSame(
- oldItem: ProgressJob,
- newItem: ProgressJob,
+ oldItem: DownloadItem,
+ newItem: DownloadItem,
): Boolean {
- return oldItem.progressValue == newItem.progressValue
+ return oldItem.progressValue == newItem.progressValue && oldItem.isPaused == newItem.isPaused
+ }
+
+ override fun getChangePayload(oldItem: DownloadItem, newItem: DownloadItem): Any {
+ return Unit
}
}
-}
\ No newline at end of file
+}
diff --git a/app/src/main/java/org/koitharu/kotatsu/download/ui/service/DownloadNotification.kt b/app/src/main/java/org/koitharu/kotatsu/download/ui/service/DownloadNotification.kt
index 399340aa3..b5f4d90d3 100644
--- a/app/src/main/java/org/koitharu/kotatsu/download/ui/service/DownloadNotification.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/download/ui/service/DownloadNotification.kt
@@ -31,8 +31,8 @@ class DownloadNotification(private val context: Context, startId: Int) {
context,
startId * 2,
DownloadService.getCancelIntent(startId),
- PendingIntent.FLAG_CANCEL_CURRENT or PendingIntentCompat.FLAG_IMMUTABLE
- )
+ PendingIntent.FLAG_CANCEL_CURRENT or PendingIntentCompat.FLAG_IMMUTABLE,
+ ),
)
private val retryAction = NotificationCompat.Action(
R.drawable.ic_restart_black,
@@ -41,14 +41,14 @@ class DownloadNotification(private val context: Context, startId: Int) {
context,
startId * 2 + 1,
DownloadService.getResumeIntent(startId),
- PendingIntent.FLAG_CANCEL_CURRENT or PendingIntentCompat.FLAG_IMMUTABLE
- )
+ PendingIntent.FLAG_CANCEL_CURRENT or PendingIntentCompat.FLAG_IMMUTABLE,
+ ),
)
private val listIntent = PendingIntent.getActivity(
context,
REQUEST_LIST,
DownloadsActivity.newIntent(context),
- PendingIntentCompat.FLAG_IMMUTABLE
+ PendingIntentCompat.FLAG_IMMUTABLE,
)
init {
@@ -73,7 +73,7 @@ class DownloadNotification(private val context: Context, startId: Int) {
NotificationCompat.VISIBILITY_PRIVATE
} else {
NotificationCompat.VISIBILITY_PUBLIC
- }
+ },
)
when (state) {
is DownloadState.Cancelled -> {
@@ -142,13 +142,6 @@ class DownloadNotification(private val context: Context, startId: Int) {
builder.setOngoing(true)
builder.addAction(cancelAction)
}
- is DownloadState.WaitingForNetwork -> {
- builder.setProgress(0, 0, false)
- builder.setContentText(context.getString(R.string.waiting_for_network))
- builder.setStyle(null)
- builder.setOngoing(true)
- builder.addAction(cancelAction)
- }
}
return builder.build()
}
@@ -157,7 +150,7 @@ class DownloadNotification(private val context: Context, startId: Int) {
context,
manga.hashCode(),
DetailsActivity.newIntent(context, manga),
- PendingIntent.FLAG_CANCEL_CURRENT or PendingIntentCompat.FLAG_IMMUTABLE
+ PendingIntent.FLAG_CANCEL_CURRENT or PendingIntentCompat.FLAG_IMMUTABLE,
)
companion object {
@@ -172,7 +165,7 @@ class DownloadNotification(private val context: Context, startId: Int) {
val channel = NotificationChannel(
CHANNEL_ID,
context.getString(R.string.downloads),
- NotificationManager.IMPORTANCE_LOW
+ NotificationManager.IMPORTANCE_LOW,
)
channel.enableVibration(false)
channel.enableLights(false)
@@ -182,4 +175,4 @@ class DownloadNotification(private val context: Context, startId: Int) {
}
}
}
-}
\ No newline at end of file
+}
diff --git a/app/src/main/java/org/koitharu/kotatsu/download/ui/service/DownloadService.kt b/app/src/main/java/org/koitharu/kotatsu/download/ui/service/DownloadService.kt
index 96a3a4c55..9b10346fd 100644
--- a/app/src/main/java/org/koitharu/kotatsu/download/ui/service/DownloadService.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/download/ui/service/DownloadService.kt
@@ -9,39 +9,42 @@ import android.os.IBinder
import android.os.PowerManager
import android.widget.Toast
import androidx.core.content.ContextCompat
+import androidx.lifecycle.DefaultLifecycleObserver
+import androidx.lifecycle.LifecycleOwner
import androidx.lifecycle.lifecycleScope
import com.google.android.material.dialog.MaterialAlertDialogBuilder
+import dagger.hilt.android.AndroidEntryPoint
import java.util.concurrent.TimeUnit
+import javax.inject.Inject
+import kotlin.collections.set
import kotlinx.coroutines.flow.*
import kotlinx.coroutines.launch
import kotlinx.coroutines.plus
-import org.koin.android.ext.android.get
-import org.koin.core.context.GlobalContext
import org.koitharu.kotatsu.BuildConfig
import org.koitharu.kotatsu.R
import org.koitharu.kotatsu.base.ui.BaseService
-import org.koitharu.kotatsu.base.ui.dialog.CheckBoxAlertDialog
import org.koitharu.kotatsu.core.model.parcelable.ParcelableManga
-import org.koitharu.kotatsu.core.prefs.AppSettings
import org.koitharu.kotatsu.download.domain.DownloadManager
import org.koitharu.kotatsu.download.domain.DownloadState
import org.koitharu.kotatsu.download.domain.WakeLockNode
import org.koitharu.kotatsu.parsers.model.Manga
-import org.koitharu.kotatsu.utils.ext.connectivityManager
import org.koitharu.kotatsu.utils.ext.throttle
import org.koitharu.kotatsu.utils.progress.PausingProgressJob
import org.koitharu.kotatsu.utils.progress.ProgressJob
import org.koitharu.kotatsu.utils.progress.TimeLeftEstimator
+@AndroidEntryPoint
class DownloadService : BaseService() {
private lateinit var downloadManager: DownloadManager
private lateinit var notificationSwitcher: ForegroundNotificationSwitcher
+ @Inject
+ lateinit var downloadManagerFactory: DownloadManager.Factory
+
private val jobs = LinkedHashMap>()
private val jobCount = MutableStateFlow(0)
private val controlReceiver = ControlReceiver()
- private var binder: DownloadBinder? = null
override fun onCreate() {
super.onCreate()
@@ -49,8 +52,8 @@ class DownloadService : BaseService() {
notificationSwitcher = ForegroundNotificationSwitcher(this)
val wakeLock = (getSystemService(Context.POWER_SERVICE) as PowerManager)
.newWakeLock(PowerManager.PARTIAL_WAKE_LOCK, "kotatsu:downloading")
- downloadManager = get().create(
- coroutineScope = lifecycleScope + WakeLockNode(wakeLock, TimeUnit.HOURS.toMillis(1))
+ downloadManager = downloadManagerFactory.create(
+ coroutineScope = lifecycleScope + WakeLockNode(wakeLock, TimeUnit.HOURS.toMillis(1)),
)
DownloadNotification.createChannel(this)
val intentFilter = IntentFilter()
@@ -75,17 +78,11 @@ class DownloadService : BaseService() {
override fun onBind(intent: Intent): IBinder {
super.onBind(intent)
- return binder ?: DownloadBinder(this).also { binder = it }
- }
-
- override fun onUnbind(intent: Intent?): Boolean {
- binder = null
- return super.onUnbind(intent)
+ return DownloadBinder(this)
}
override fun onDestroy() {
unregisterReceiver(controlReceiver)
- binder = null
isRunning = false
super.onDestroy()
}
@@ -126,7 +123,7 @@ class DownloadService : BaseService() {
(job.progressValue as? DownloadState.Done)?.let {
sendBroadcast(
Intent(ACTION_DOWNLOAD_COMPLETE)
- .putExtra(EXTRA_MANGA, ParcelableManga(it.localManga, withChapters = false))
+ .putExtra(EXTRA_MANGA, ParcelableManga(it.localManga, withChapters = false)),
)
}
notificationSwitcher.detach(
@@ -135,8 +132,10 @@ class DownloadService : BaseService() {
null
} else {
notification.create(job.progressValue, -1L)
- }
+ },
)
+ jobs.remove(job.progressValue.startId)
+ jobCount.value = jobs.size
stopSelf(startId)
}
}
@@ -156,8 +155,7 @@ class DownloadService : BaseService() {
when (intent?.action) {
ACTION_DOWNLOAD_CANCEL -> {
val cancelId = intent.getIntExtra(EXTRA_CANCEL_ID, 0)
- jobs.remove(cancelId)?.cancel()
- jobCount.value = jobs.size
+ jobs[cancelId]?.cancel()
}
ACTION_DOWNLOAD_RESUME -> {
val cancelId = intent.getIntExtra(EXTRA_CANCEL_ID, 0)
@@ -167,10 +165,25 @@ class DownloadService : BaseService() {
}
}
- class DownloadBinder(private val service: DownloadService) : Binder() {
+ class DownloadBinder(service: DownloadService) : Binder(), DefaultLifecycleObserver {
+
+ private var downloadsStateFlow = MutableStateFlow>>(emptyList())
+
+ init {
+ service.lifecycle.addObserver(this)
+ service.jobCount.onEach {
+ downloadsStateFlow.value = service.jobs.values
+ }.launchIn(service.lifecycleScope)
+ }
+
+ override fun onDestroy(owner: LifecycleOwner) {
+ owner.lifecycle.removeObserver(this)
+ downloadsStateFlow.value = emptyList()
+ super.onDestroy(owner)
+ }
- val downloads: Flow>>
- get() = service.jobCount.mapLatest { service.jobs.values }
+ val downloads
+ get() = downloadsStateFlow.asStateFlow()
}
companion object {
@@ -178,12 +191,13 @@ class DownloadService : BaseService() {
var isRunning: Boolean = false
private set
+ @Deprecated("Use LocalMangaRepository.watchReadableDirs instead")
const val ACTION_DOWNLOAD_COMPLETE = "${BuildConfig.APPLICATION_ID}.action.ACTION_DOWNLOAD_COMPLETE"
private const val ACTION_DOWNLOAD_CANCEL = "${BuildConfig.APPLICATION_ID}.action.ACTION_DOWNLOAD_CANCEL"
private const val ACTION_DOWNLOAD_RESUME = "${BuildConfig.APPLICATION_ID}.action.ACTION_DOWNLOAD_RESUME"
- private const val EXTRA_MANGA = "manga"
+ const val EXTRA_MANGA = "manga"
private const val EXTRA_CHAPTERS_IDS = "chapters_ids"
private const val EXTRA_CANCEL_ID = "cancel_id"
@@ -191,27 +205,23 @@ class DownloadService : BaseService() {
if (chaptersIds?.isEmpty() == true) {
return
}
- confirmDataTransfer(context) {
- val intent = Intent(context, DownloadService::class.java)
- intent.putExtra(EXTRA_MANGA, ParcelableManga(manga, withChapters = false))
- if (chaptersIds != null) {
- intent.putExtra(EXTRA_CHAPTERS_IDS, chaptersIds.toLongArray())
- }
- ContextCompat.startForegroundService(context, intent)
- Toast.makeText(context, R.string.manga_downloading_, Toast.LENGTH_SHORT).show()
+ val intent = Intent(context, DownloadService::class.java)
+ intent.putExtra(EXTRA_MANGA, ParcelableManga(manga, withChapters = false))
+ if (chaptersIds != null) {
+ intent.putExtra(EXTRA_CHAPTERS_IDS, chaptersIds.toLongArray())
}
+ ContextCompat.startForegroundService(context, intent)
+ Toast.makeText(context, R.string.manga_downloading_, Toast.LENGTH_SHORT).show()
}
fun start(context: Context, manga: Collection) {
if (manga.isEmpty()) {
return
}
- confirmDataTransfer(context) {
- for (item in manga) {
- val intent = Intent(context, DownloadService::class.java)
- intent.putExtra(EXTRA_MANGA, ParcelableManga(item, withChapters = false))
- ContextCompat.startForegroundService(context, intent)
- }
+ for (item in manga) {
+ val intent = Intent(context, DownloadService::class.java)
+ intent.putExtra(EXTRA_MANGA, ParcelableManga(item, withChapters = false))
+ ContextCompat.startForegroundService(context, intent)
}
}
@@ -237,24 +247,5 @@ class DownloadService : BaseService() {
}
return null
}
-
- private fun confirmDataTransfer(context: Context, callback: () -> Unit) {
- val settings = GlobalContext.get().get()
- if (context.connectivityManager.isActiveNetworkMetered && settings.isTrafficWarningEnabled) {
- CheckBoxAlertDialog.Builder(context)
- .setTitle(R.string.warning)
- .setMessage(R.string.network_consumption_warning)
- .setCheckBoxText(R.string.dont_ask_again)
- .setCheckBoxChecked(false)
- .setNegativeButton(android.R.string.cancel, null)
- .setPositiveButton(R.string._continue) { _, doNotAsk ->
- settings.isTrafficWarningEnabled = !doNotAsk
- callback()
- }.create()
- .show()
- } else {
- callback()
- }
- }
}
-}
\ No newline at end of file
+}
diff --git a/app/src/main/java/org/koitharu/kotatsu/explore/domain/ExploreRepository.kt b/app/src/main/java/org/koitharu/kotatsu/explore/domain/ExploreRepository.kt
new file mode 100644
index 000000000..f8bc28e98
--- /dev/null
+++ b/app/src/main/java/org/koitharu/kotatsu/explore/domain/ExploreRepository.kt
@@ -0,0 +1,42 @@
+package org.koitharu.kotatsu.explore.domain
+
+import javax.inject.Inject
+import org.koitharu.kotatsu.core.parser.MangaRepository
+import org.koitharu.kotatsu.core.prefs.AppSettings
+import org.koitharu.kotatsu.history.domain.HistoryRepository
+import org.koitharu.kotatsu.parsers.model.Manga
+import org.koitharu.kotatsu.parsers.model.SortOrder
+
+class ExploreRepository @Inject constructor(
+ private val settings: AppSettings,
+ private val historyRepository: HistoryRepository,
+ private val mangaRepositoryFactory: MangaRepository.Factory,
+) {
+
+ suspend fun findRandomManga(tagsLimit: Int): Manga {
+ val blacklistTagRegex = settings.getSuggestionsTagsBlacklistRegex()
+ val allTags = historyRepository.getPopularTags(tagsLimit).filterNot {
+ blacklistTagRegex?.containsMatchIn(it.title) ?: false
+ }
+ val tag = allTags.randomOrNull()
+ val source = checkNotNull(tag?.source ?: settings.getMangaSources(includeHidden = false).randomOrNull()) {
+ "No sources found"
+ }
+ val repo = mangaRepositoryFactory.create(source)
+ val list = repo.getList(
+ offset = 0,
+ sortOrder = if (SortOrder.UPDATED in repo.sortOrders) SortOrder.UPDATED else null,
+ tags = setOfNotNull(tag),
+ ).shuffled()
+ for (item in list) {
+ if (settings.isSuggestionsExcludeNsfw && item.isNsfw) {
+ continue
+ }
+ if (blacklistTagRegex != null && item.tags.any { x -> blacklistTagRegex.containsMatchIn(x.title) }) {
+ continue
+ }
+ return item
+ }
+ return list.random()
+ }
+}
diff --git a/app/src/main/java/org/koitharu/kotatsu/explore/ui/ExploreFragment.kt b/app/src/main/java/org/koitharu/kotatsu/explore/ui/ExploreFragment.kt
new file mode 100644
index 000000000..bcb83c411
--- /dev/null
+++ b/app/src/main/java/org/koitharu/kotatsu/explore/ui/ExploreFragment.kt
@@ -0,0 +1,131 @@
+package org.koitharu.kotatsu.explore.ui
+
+import android.os.Bundle
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import androidx.core.graphics.Insets
+import androidx.core.view.updatePadding
+import androidx.fragment.app.viewModels
+import androidx.recyclerview.widget.RecyclerView
+import coil.ImageLoader
+import com.google.android.material.snackbar.Snackbar
+import dagger.hilt.android.AndroidEntryPoint
+import javax.inject.Inject
+import org.koitharu.kotatsu.R
+import org.koitharu.kotatsu.base.ui.BaseFragment
+import org.koitharu.kotatsu.base.ui.list.OnListItemClickListener
+import org.koitharu.kotatsu.base.ui.util.RecyclerViewOwner
+import org.koitharu.kotatsu.bookmarks.ui.BookmarksActivity
+import org.koitharu.kotatsu.databinding.FragmentExploreBinding
+import org.koitharu.kotatsu.details.ui.DetailsActivity
+import org.koitharu.kotatsu.explore.ui.adapter.ExploreAdapter
+import org.koitharu.kotatsu.explore.ui.adapter.ExploreListEventListener
+import org.koitharu.kotatsu.explore.ui.model.ExploreItem
+import org.koitharu.kotatsu.favourites.ui.categories.FavouriteCategoriesActivity
+import org.koitharu.kotatsu.history.ui.HistoryActivity
+import org.koitharu.kotatsu.main.ui.owners.BottomNavOwner
+import org.koitharu.kotatsu.parsers.model.Manga
+import org.koitharu.kotatsu.parsers.model.MangaSource
+import org.koitharu.kotatsu.search.ui.MangaListActivity
+import org.koitharu.kotatsu.settings.SettingsActivity
+import org.koitharu.kotatsu.suggestions.ui.SuggestionsActivity
+import org.koitharu.kotatsu.utils.ext.getDisplayMessage
+
+@AndroidEntryPoint
+class ExploreFragment :
+ BaseFragment(),
+ RecyclerViewOwner,
+ ExploreListEventListener,
+ OnListItemClickListener {
+
+ @Inject
+ lateinit var coil: ImageLoader
+
+ private val viewModel by viewModels()
+ private var exploreAdapter: ExploreAdapter? = null
+ private var paddingHorizontal = 0
+
+ override val recyclerView: RecyclerView
+ get() = binding.recyclerView
+
+ override fun onInflateView(inflater: LayoutInflater, container: ViewGroup?): FragmentExploreBinding {
+ return FragmentExploreBinding.inflate(inflater, container, false)
+ }
+
+ override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+ super.onViewCreated(view, savedInstanceState)
+ exploreAdapter = ExploreAdapter(coil, viewLifecycleOwner, this, this)
+ with(binding.recyclerView) {
+ adapter = exploreAdapter
+ setHasFixedSize(true)
+ val spacing = resources.getDimensionPixelOffset(R.dimen.list_spacing)
+ paddingHorizontal = spacing
+ }
+ viewModel.content.observe(viewLifecycleOwner) {
+ exploreAdapter?.items = it
+ }
+ viewModel.onError.observe(viewLifecycleOwner, ::onError)
+ viewModel.onOpenManga.observe(viewLifecycleOwner, ::onOpenManga)
+ }
+
+ override fun onDestroyView() {
+ super.onDestroyView()
+ exploreAdapter = null
+ }
+
+ override fun onWindowInsetsChanged(insets: Insets) {
+ binding.recyclerView.updatePadding(
+ bottom = insets.bottom,
+ )
+ }
+
+ override fun onManageClick(view: View) {
+ startActivity(SettingsActivity.newManageSourcesIntent(view.context))
+ }
+
+ override fun onClick(v: View) {
+ val intent = when (v.id) {
+ R.id.button_history -> HistoryActivity.newIntent(v.context)
+ R.id.button_local -> MangaListActivity.newIntent(v.context, MangaSource.LOCAL)
+ R.id.button_bookmarks -> BookmarksActivity.newIntent(v.context)
+ R.id.button_suggestions -> SuggestionsActivity.newIntent(v.context)
+ R.id.button_favourites -> FavouriteCategoriesActivity.newIntent(v.context)
+ R.id.button_random -> {
+ viewModel.openRandom()
+ return
+ }
+ else -> return
+ }
+ startActivity(intent)
+ }
+
+ override fun onItemClick(item: ExploreItem.Source, view: View) {
+ val intent = MangaListActivity.newIntent(view.context, item.source)
+ startActivity(intent)
+ }
+
+ override fun onRetryClick(error: Throwable) = Unit
+
+ override fun onEmptyActionClick() = onManageClick(requireView())
+
+ private fun onError(e: Throwable) {
+ val snackbar = Snackbar.make(
+ binding.recyclerView,
+ e.getDisplayMessage(resources),
+ Snackbar.LENGTH_SHORT,
+ )
+ snackbar.anchorView = (activity as? BottomNavOwner)?.bottomNav
+ snackbar.show()
+ }
+
+ private fun onOpenManga(manga: Manga) {
+ val intent = DetailsActivity.newIntent(context ?: return, manga)
+ startActivity(intent)
+ }
+
+ companion object {
+
+ fun newInstance() = ExploreFragment()
+ }
+}
diff --git a/app/src/main/java/org/koitharu/kotatsu/explore/ui/ExploreViewModel.kt b/app/src/main/java/org/koitharu/kotatsu/explore/ui/ExploreViewModel.kt
new file mode 100644
index 000000000..122c14b21
--- /dev/null
+++ b/app/src/main/java/org/koitharu/kotatsu/explore/ui/ExploreViewModel.kt
@@ -0,0 +1,72 @@
+package org.koitharu.kotatsu.explore.ui
+
+import androidx.lifecycle.LiveData
+import androidx.lifecycle.asFlow
+import androidx.lifecycle.viewModelScope
+import dagger.hilt.android.lifecycle.HiltViewModel
+import javax.inject.Inject
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.flow.*
+import org.koitharu.kotatsu.R
+import org.koitharu.kotatsu.base.ui.BaseViewModel
+import org.koitharu.kotatsu.core.prefs.AppSettings
+import org.koitharu.kotatsu.explore.domain.ExploreRepository
+import org.koitharu.kotatsu.explore.ui.model.ExploreItem
+import org.koitharu.kotatsu.parsers.model.Manga
+import org.koitharu.kotatsu.parsers.model.MangaSource
+import org.koitharu.kotatsu.utils.SingleLiveEvent
+import org.koitharu.kotatsu.utils.ext.asLiveDataDistinct
+
+@HiltViewModel
+class ExploreViewModel @Inject constructor(
+ private val settings: AppSettings,
+ private val exploreRepository: ExploreRepository,
+) : BaseViewModel() {
+
+ val onOpenManga = SingleLiveEvent()
+
+ val content: LiveData> = isLoading.asFlow().flatMapLatest { loading ->
+ if (loading) {
+ flowOf(listOf(ExploreItem.Loading))
+ } else {
+ createContentFlow()
+ }
+ }.asLiveDataDistinct(viewModelScope.coroutineContext + Dispatchers.Default, listOf(ExploreItem.Loading))
+
+ fun openRandom() {
+ launchLoadingJob(Dispatchers.Default) {
+ val manga = exploreRepository.findRandomManga(tagsLimit = 8)
+ onOpenManga.postCall(manga)
+ }
+ }
+
+ private fun createContentFlow() = settings.observe()
+ .filter {
+ it == AppSettings.KEY_SOURCES_HIDDEN ||
+ it == AppSettings.KEY_SOURCES_ORDER ||
+ it == AppSettings.KEY_SUGGESTIONS
+ }
+ .onStart { emit("") }
+ .map { settings.getMangaSources(includeHidden = false) }
+ .distinctUntilChanged()
+ .map { buildList(it) }
+
+ private fun buildList(sources: List): List {
+ val result = ArrayList(sources.size + 3)
+ result += ExploreItem.Buttons(
+ isSuggestionsEnabled = settings.isSuggestionsEnabled,
+ )
+ result += ExploreItem.Header(R.string.remote_sources, sources.isNotEmpty())
+ if (sources.isNotEmpty()) {
+ sources.mapTo(result) { ExploreItem.Source(it) }
+ } else {
+ result += ExploreItem.EmptyHint(
+ icon = R.drawable.ic_empty_search,
+ textPrimary = R.string.no_manga_sources,
+ textSecondary = R.string.no_manga_sources_text,
+ actionStringRes = R.string.manage,
+ )
+ }
+ return result
+ }
+}
diff --git a/app/src/main/java/org/koitharu/kotatsu/explore/ui/adapter/ExploreAdapter.kt b/app/src/main/java/org/koitharu/kotatsu/explore/ui/adapter/ExploreAdapter.kt
new file mode 100644
index 000000000..10a40c900
--- /dev/null
+++ b/app/src/main/java/org/koitharu/kotatsu/explore/ui/adapter/ExploreAdapter.kt
@@ -0,0 +1,21 @@
+package org.koitharu.kotatsu.explore.ui.adapter
+
+import androidx.lifecycle.LifecycleOwner
+import coil.ImageLoader
+import com.hannesdorfmann.adapterdelegates4.AsyncListDifferDelegationAdapter
+import org.koitharu.kotatsu.base.ui.list.OnListItemClickListener
+import org.koitharu.kotatsu.explore.ui.model.ExploreItem
+
+class ExploreAdapter(
+ coil: ImageLoader,
+ lifecycleOwner: LifecycleOwner,
+ listener: ExploreListEventListener,
+ clickListener: OnListItemClickListener,
+) : AsyncListDifferDelegationAdapter(
+ ExploreDiffCallback(),
+ exploreButtonsAD(listener),
+ exploreSourcesHeaderAD(listener),
+ exploreSourceItemAD(coil, clickListener, lifecycleOwner),
+ exploreEmptyHintListAD(listener),
+ exploreLoadingAD(),
+)
\ No newline at end of file
diff --git a/app/src/main/java/org/koitharu/kotatsu/explore/ui/adapter/ExploreAdapterDelegates.kt b/app/src/main/java/org/koitharu/kotatsu/explore/ui/adapter/ExploreAdapterDelegates.kt
new file mode 100644
index 000000000..6712ab46e
--- /dev/null
+++ b/app/src/main/java/org/koitharu/kotatsu/explore/ui/adapter/ExploreAdapterDelegates.kt
@@ -0,0 +1,108 @@
+package org.koitharu.kotatsu.explore.ui.adapter
+
+import android.view.View
+import androidx.core.view.isVisible
+import androidx.lifecycle.LifecycleOwner
+import coil.ImageLoader
+import com.hannesdorfmann.adapterdelegates4.dsl.adapterDelegate
+import com.hannesdorfmann.adapterdelegates4.dsl.adapterDelegateViewBinding
+import org.koitharu.kotatsu.R
+import org.koitharu.kotatsu.base.ui.list.AdapterDelegateClickListenerAdapter
+import org.koitharu.kotatsu.base.ui.list.OnListItemClickListener
+import org.koitharu.kotatsu.core.parser.favicon.faviconUri
+import org.koitharu.kotatsu.databinding.ItemEmptyCardBinding
+import org.koitharu.kotatsu.databinding.ItemExploreButtonsBinding
+import org.koitharu.kotatsu.databinding.ItemExploreSourceBinding
+import org.koitharu.kotatsu.databinding.ItemHeaderButtonBinding
+import org.koitharu.kotatsu.explore.ui.model.ExploreItem
+import org.koitharu.kotatsu.list.ui.adapter.ListStateHolderListener
+import org.koitharu.kotatsu.utils.ext.disposeImageRequest
+import org.koitharu.kotatsu.utils.ext.enqueueWith
+import org.koitharu.kotatsu.utils.ext.newImageRequest
+import org.koitharu.kotatsu.utils.ext.setTextAndVisible
+import org.koitharu.kotatsu.utils.image.FaviconFallbackDrawable
+
+fun exploreButtonsAD(
+ clickListener: View.OnClickListener,
+) = adapterDelegateViewBinding(
+ { layoutInflater, parent -> ItemExploreButtonsBinding.inflate(layoutInflater, parent, false) }
+) {
+
+ binding.buttonBookmarks.setOnClickListener(clickListener)
+ binding.buttonHistory.setOnClickListener(clickListener)
+ binding.buttonLocal.setOnClickListener(clickListener)
+ binding.buttonSuggestions.setOnClickListener(clickListener)
+ binding.buttonFavourites.setOnClickListener(clickListener)
+ binding.buttonRandom.setOnClickListener(clickListener)
+
+ bind {
+ binding.buttonSuggestions.isVisible = item.isSuggestionsEnabled
+ }
+}
+
+fun exploreSourcesHeaderAD(
+ listener: ExploreListEventListener,
+) = adapterDelegateViewBinding(
+ { layoutInflater, parent -> ItemHeaderButtonBinding.inflate(layoutInflater, parent, false) }
+) {
+
+ val listenerAdapter = View.OnClickListener {
+ listener.onManageClick(itemView)
+ }
+
+ binding.buttonMore.setOnClickListener(listenerAdapter)
+
+ bind {
+ binding.textViewTitle.setText(item.titleResId)
+ binding.buttonMore.isVisible = item.isButtonVisible
+ }
+}
+
+fun exploreSourceItemAD(
+ coil: ImageLoader,
+ listener: OnListItemClickListener,
+ lifecycleOwner: LifecycleOwner,
+) = adapterDelegateViewBinding(
+ { layoutInflater, parent -> ItemExploreSourceBinding.inflate(layoutInflater, parent, false) },
+ on = { item, _, _ -> item is ExploreItem.Source }
+) {
+
+ val eventListener = AdapterDelegateClickListenerAdapter(this, listener)
+
+ binding.root.setOnClickListener(eventListener)
+ binding.root.setOnLongClickListener(eventListener)
+
+ bind {
+ binding.textViewTitle.text = item.source.title
+ val fallbackIcon = FaviconFallbackDrawable(context, item.source.name)
+ binding.imageViewIcon.newImageRequest(item.source.faviconUri())?.run {
+ fallback(fallbackIcon)
+ placeholder(fallbackIcon)
+ error(fallbackIcon)
+ lifecycle(lifecycleOwner)
+ enqueueWith(coil)
+ }
+ }
+
+ onViewRecycled {
+ binding.imageViewIcon.disposeImageRequest()
+ }
+}
+
+fun exploreEmptyHintListAD(
+ listener: ListStateHolderListener,
+) = adapterDelegateViewBinding(
+ { inflater, parent -> ItemEmptyCardBinding.inflate(inflater, parent, false) }
+) {
+
+ binding.buttonRetry.setOnClickListener { listener.onEmptyActionClick() }
+
+ bind {
+ binding.icon.setImageResource(item.icon)
+ binding.textPrimary.setText(item.textPrimary)
+ binding.textSecondary.setTextAndVisible(item.textSecondary)
+ binding.buttonRetry.setTextAndVisible(item.actionStringRes)
+ }
+}
+
+fun exploreLoadingAD() = adapterDelegate(R.layout.item_loading_state) {}
diff --git a/app/src/main/java/org/koitharu/kotatsu/explore/ui/adapter/ExploreDiffCallback.kt b/app/src/main/java/org/koitharu/kotatsu/explore/ui/adapter/ExploreDiffCallback.kt
new file mode 100644
index 000000000..352edd401
--- /dev/null
+++ b/app/src/main/java/org/koitharu/kotatsu/explore/ui/adapter/ExploreDiffCallback.kt
@@ -0,0 +1,27 @@
+package org.koitharu.kotatsu.explore.ui.adapter
+
+import androidx.recyclerview.widget.DiffUtil
+import org.koitharu.kotatsu.explore.ui.model.ExploreItem
+
+class ExploreDiffCallback : DiffUtil.ItemCallback() {
+
+ override fun areItemsTheSame(oldItem: ExploreItem, newItem: ExploreItem): Boolean {
+ return when {
+ oldItem.javaClass != newItem.javaClass -> false
+ oldItem is ExploreItem.Buttons && newItem is ExploreItem.Buttons -> true
+ oldItem is ExploreItem.Loading && newItem is ExploreItem.Loading -> true
+ oldItem is ExploreItem.EmptyHint && newItem is ExploreItem.EmptyHint -> true
+ oldItem is ExploreItem.Source && newItem is ExploreItem.Source -> {
+ oldItem.source == newItem.source
+ }
+ oldItem is ExploreItem.Header && newItem is ExploreItem.Header -> {
+ oldItem.titleResId == newItem.titleResId
+ }
+ else -> false
+ }
+ }
+
+ override fun areContentsTheSame(oldItem: ExploreItem, newItem: ExploreItem): Boolean {
+ return oldItem == newItem
+ }
+}
\ No newline at end of file
diff --git a/app/src/main/java/org/koitharu/kotatsu/explore/ui/adapter/ExploreListEventListener.kt b/app/src/main/java/org/koitharu/kotatsu/explore/ui/adapter/ExploreListEventListener.kt
new file mode 100644
index 000000000..4bd122086
--- /dev/null
+++ b/app/src/main/java/org/koitharu/kotatsu/explore/ui/adapter/ExploreListEventListener.kt
@@ -0,0 +1,9 @@
+package org.koitharu.kotatsu.explore.ui.adapter
+
+import android.view.View
+import org.koitharu.kotatsu.list.ui.adapter.ListStateHolderListener
+
+interface ExploreListEventListener : ListStateHolderListener, View.OnClickListener {
+
+ fun onManageClick(view: View)
+}
\ No newline at end of file
diff --git a/app/src/main/java/org/koitharu/kotatsu/explore/ui/model/ExploreItem.kt b/app/src/main/java/org/koitharu/kotatsu/explore/ui/model/ExploreItem.kt
new file mode 100644
index 000000000..dcf871c8d
--- /dev/null
+++ b/app/src/main/java/org/koitharu/kotatsu/explore/ui/model/ExploreItem.kt
@@ -0,0 +1,84 @@
+package org.koitharu.kotatsu.explore.ui.model
+
+import android.net.Uri
+import androidx.annotation.DrawableRes
+import androidx.annotation.StringRes
+import org.koitharu.kotatsu.list.ui.model.EmptyState
+import org.koitharu.kotatsu.list.ui.model.ListModel
+import org.koitharu.kotatsu.parsers.model.MangaSource
+
+sealed interface ExploreItem : ListModel {
+
+ class Buttons(
+ val isSuggestionsEnabled: Boolean
+ ) : ExploreItem {
+
+ override fun equals(other: Any?): Boolean {
+ if (this === other) return true
+ if (javaClass != other?.javaClass) return false
+
+ other as Buttons
+
+ if (isSuggestionsEnabled != other.isSuggestionsEnabled) return false
+
+ return true
+ }
+
+ override fun hashCode(): Int {
+ return isSuggestionsEnabled.hashCode()
+ }
+ }
+
+ class Header(
+ @StringRes val titleResId: Int,
+ val isButtonVisible: Boolean,
+ ) : ExploreItem {
+
+ override fun equals(other: Any?): Boolean {
+ if (this === other) return true
+ if (javaClass != other?.javaClass) return false
+
+ other as Header
+
+ if (titleResId != other.titleResId) return false
+ if (isButtonVisible != other.isButtonVisible) return false
+
+ return true
+ }
+
+ override fun hashCode(): Int {
+ var result = titleResId
+ result = 31 * result + isButtonVisible.hashCode()
+ return result
+ }
+ }
+
+ class Source(
+ val source: MangaSource,
+ ) : ExploreItem {
+
+ override fun equals(other: Any?): Boolean {
+ if (this === other) return true
+ if (javaClass != other?.javaClass) return false
+
+ other as Source
+
+ if (source != other.source) return false
+
+ return true
+ }
+
+ override fun hashCode(): Int {
+ return source.hashCode()
+ }
+ }
+
+ class EmptyHint(
+ @DrawableRes icon: Int,
+ @StringRes textPrimary: Int,
+ @StringRes textSecondary: Int,
+ @StringRes actionStringRes: Int,
+ ) : EmptyState(icon, textPrimary, textSecondary, actionStringRes), ExploreItem
+
+ object Loading : ExploreItem
+}
\ No newline at end of file
diff --git a/app/src/main/java/org/koitharu/kotatsu/favourites/FavouritesModule.kt b/app/src/main/java/org/koitharu/kotatsu/favourites/FavouritesModule.kt
deleted file mode 100644
index f3bc159a8..000000000
--- a/app/src/main/java/org/koitharu/kotatsu/favourites/FavouritesModule.kt
+++ /dev/null
@@ -1,24 +0,0 @@
-package org.koitharu.kotatsu.favourites
-
-import org.koin.androidx.viewmodel.dsl.viewModel
-import org.koin.dsl.module
-import org.koitharu.kotatsu.favourites.domain.FavouritesRepository
-import org.koitharu.kotatsu.favourites.ui.categories.FavouritesCategoriesViewModel
-import org.koitharu.kotatsu.favourites.ui.categories.edit.FavouritesCategoryEditViewModel
-import org.koitharu.kotatsu.favourites.ui.categories.select.MangaCategoriesViewModel
-import org.koitharu.kotatsu.favourites.ui.list.FavouritesListViewModel
-
-val favouritesModule
- get() = module {
-
- single { FavouritesRepository(get(), get()) }
-
- viewModel { categoryId ->
- FavouritesListViewModel(categoryId.get(), get(), get(), get(), get())
- }
- viewModel { FavouritesCategoriesViewModel(get(), get()) }
- viewModel { manga ->
- MangaCategoriesViewModel(manga.get(), get())
- }
- viewModel { params -> FavouritesCategoryEditViewModel(params[0], get(), get()) }
- }
\ No newline at end of file
diff --git a/app/src/main/java/org/koitharu/kotatsu/favourites/data/EntityMapping.kt b/app/src/main/java/org/koitharu/kotatsu/favourites/data/EntityMapping.kt
index c6a65c78e..36308d4c6 100644
--- a/app/src/main/java/org/koitharu/kotatsu/favourites/data/EntityMapping.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/favourites/data/EntityMapping.kt
@@ -1,9 +1,9 @@
package org.koitharu.kotatsu.favourites.data
-import java.util.*
import org.koitharu.kotatsu.core.db.entity.SortOrder
import org.koitharu.kotatsu.core.model.FavouriteCategory
import org.koitharu.kotatsu.parsers.model.SortOrder
+import java.util.*
fun FavouriteCategoryEntity.toFavouriteCategory(id: Long = categoryId.toLong()) = FavouriteCategory(
id = id,
@@ -12,4 +12,5 @@ fun FavouriteCategoryEntity.toFavouriteCategory(id: Long = categoryId.toLong())
order = SortOrder(order, SortOrder.NEWEST),
createdAt = Date(createdAt),
isTrackingEnabled = track,
+ isVisibleInLibrary = isVisibleInLibrary,
)
\ No newline at end of file
diff --git a/app/src/main/java/org/koitharu/kotatsu/favourites/data/FavouriteCategoriesDao.kt b/app/src/main/java/org/koitharu/kotatsu/favourites/data/FavouriteCategoriesDao.kt
index 148dfd820..88325d1bb 100644
--- a/app/src/main/java/org/koitharu/kotatsu/favourites/data/FavouriteCategoriesDao.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/favourites/data/FavouriteCategoriesDao.kt
@@ -6,16 +6,16 @@ import kotlinx.coroutines.flow.Flow
@Dao
abstract class FavouriteCategoriesDao {
- @Query("SELECT * FROM favourite_categories WHERE category_id = :id")
+ @Query("SELECT * FROM favourite_categories WHERE category_id = :id AND deleted_at = 0")
abstract suspend fun find(id: Int): FavouriteCategoryEntity
- @Query("SELECT * FROM favourite_categories ORDER BY sort_key")
+ @Query("SELECT * FROM favourite_categories WHERE deleted_at = 0 ORDER BY sort_key")
abstract suspend fun findAll(): List
- @Query("SELECT * FROM favourite_categories ORDER BY sort_key")
+ @Query("SELECT * FROM favourite_categories WHERE deleted_at = 0 ORDER BY sort_key")
abstract fun observeAll(): Flow>
- @Query("SELECT * FROM favourite_categories WHERE category_id = :id")
+ @Query("SELECT * FROM favourite_categories WHERE category_id = :id AND deleted_at = 0")
abstract fun observe(id: Long): Flow
@Insert(onConflict = OnConflictStrategy.ABORT)
@@ -24,11 +24,7 @@ abstract class FavouriteCategoriesDao {
@Update
abstract suspend fun update(category: FavouriteCategoryEntity): Int
- @Query("DELETE FROM favourite_categories WHERE category_id = :id")
- abstract suspend fun delete(id: Long)
-
- @Query("UPDATE favourite_categories SET title = :title WHERE category_id = :id")
- abstract suspend fun updateTitle(id: Long, title: String)
+ suspend fun delete(id: Long) = setDeletedAt(id, System.currentTimeMillis())
@Query("UPDATE favourite_categories SET title = :title, `order` = :order, `track` = :tracker WHERE category_id = :id")
abstract suspend fun update(id: Long, title: String, order: String, tracker: Boolean)
@@ -39,10 +35,16 @@ abstract class FavouriteCategoriesDao {
@Query("UPDATE favourite_categories SET `track` = :isEnabled WHERE category_id = :id")
abstract suspend fun updateTracking(id: Long, isEnabled: Boolean)
+ @Query("UPDATE favourite_categories SET `show_in_lib` = :isEnabled WHERE category_id = :id")
+ abstract suspend fun updateLibVisibility(id: Long, isEnabled: Boolean)
+
@Query("UPDATE favourite_categories SET sort_key = :sortKey WHERE category_id = :id")
abstract suspend fun updateSortKey(id: Long, sortKey: Int)
- @Query("SELECT MAX(sort_key) FROM favourite_categories")
+ @Query("DELETE FROM favourite_categories WHERE deleted_at != 0 AND deleted_at < :maxDeletionTime")
+ abstract suspend fun gc(maxDeletionTime: Long)
+
+ @Query("SELECT MAX(sort_key) FROM favourite_categories WHERE deleted_at = 0")
protected abstract suspend fun getMaxSortKey(): Int?
suspend fun getNextSortKey(): Int {
@@ -55,4 +57,7 @@ abstract class FavouriteCategoriesDao {
insert(entity)
}
}
-}
\ No newline at end of file
+
+ @Query("UPDATE favourite_categories SET deleted_at = :deletedAt WHERE category_id = :id")
+ protected abstract suspend fun setDeletedAt(id: Long, deletedAt: Long)
+}
diff --git a/app/src/main/java/org/koitharu/kotatsu/favourites/data/FavouriteCategoryEntity.kt b/app/src/main/java/org/koitharu/kotatsu/favourites/data/FavouriteCategoryEntity.kt
index 4f4f594e9..befd29a72 100644
--- a/app/src/main/java/org/koitharu/kotatsu/favourites/data/FavouriteCategoryEntity.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/favourites/data/FavouriteCategoryEntity.kt
@@ -14,4 +14,35 @@ data class FavouriteCategoryEntity(
@ColumnInfo(name = "title") val title: String,
@ColumnInfo(name = "order") val order: String,
@ColumnInfo(name = "track") val track: Boolean,
-)
\ No newline at end of file
+ @ColumnInfo(name = "show_in_lib") val isVisibleInLibrary: Boolean,
+ @ColumnInfo(name = "deleted_at") val deletedAt: Long,
+) {
+
+ override fun equals(other: Any?): Boolean {
+ if (this === other) return true
+ if (javaClass != other?.javaClass) return false
+
+ other as FavouriteCategoryEntity
+
+ if (categoryId != other.categoryId) return false
+ if (createdAt != other.createdAt) return false
+ if (sortKey != other.sortKey) return false
+ if (title != other.title) return false
+ if (order != other.order) return false
+ if (track != other.track) return false
+ if (isVisibleInLibrary != other.isVisibleInLibrary) return false
+
+ return true
+ }
+
+ override fun hashCode(): Int {
+ var result = categoryId
+ result = 31 * result + createdAt.hashCode()
+ result = 31 * result + sortKey
+ result = 31 * result + title.hashCode()
+ result = 31 * result + order.hashCode()
+ result = 31 * result + track.hashCode()
+ result = 31 * result + isVisibleInLibrary.hashCode()
+ return result
+ }
+}
diff --git a/app/src/main/java/org/koitharu/kotatsu/favourites/data/FavouriteEntity.kt b/app/src/main/java/org/koitharu/kotatsu/favourites/data/FavouriteEntity.kt
index 860465814..87f8afa55 100644
--- a/app/src/main/java/org/koitharu/kotatsu/favourites/data/FavouriteEntity.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/favourites/data/FavouriteEntity.kt
@@ -27,5 +27,7 @@ import org.koitharu.kotatsu.core.db.entity.MangaEntity
data class FavouriteEntity(
@ColumnInfo(name = "manga_id", index = true) val mangaId: Long,
@ColumnInfo(name = "category_id", index = true) val categoryId: Long,
+ @ColumnInfo(name = "sort_key") val sortKey: Int,
@ColumnInfo(name = "created_at") val createdAt: Long,
-)
\ No newline at end of file
+ @ColumnInfo(name = "deleted_at") val deletedAt: Long,
+)
diff --git a/app/src/main/java/org/koitharu/kotatsu/favourites/data/FavouritesDao.kt b/app/src/main/java/org/koitharu/kotatsu/favourites/data/FavouritesDao.kt
index 89fcc92fb..18bfef6cf 100644
--- a/app/src/main/java/org/koitharu/kotatsu/favourites/data/FavouritesDao.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/favourites/data/FavouritesDao.kt
@@ -4,73 +4,139 @@ import androidx.room.*
import androidx.sqlite.db.SimpleSQLiteQuery
import androidx.sqlite.db.SupportSQLiteQuery
import kotlinx.coroutines.flow.Flow
+import org.intellij.lang.annotations.Language
import org.koitharu.kotatsu.core.db.entity.MangaEntity
import org.koitharu.kotatsu.parsers.model.SortOrder
@Dao
abstract class FavouritesDao {
+ /** SELECT **/
+
@Transaction
- @Query("SELECT * FROM favourites GROUP BY manga_id ORDER BY created_at DESC")
+ @Query("SELECT * FROM favourites WHERE deleted_at = 0 GROUP BY manga_id ORDER BY created_at DESC")
abstract suspend fun findAll(): List
fun observeAll(order: SortOrder): Flow> {
val orderBy = getOrderBy(order)
+
+ @Language("RoomSql")
val query = SimpleSQLiteQuery(
- "SELECT * FROM favourites LEFT JOIN manga ON favourites.manga_id = manga.manga_id GROUP BY favourites.manga_id ORDER BY $orderBy",
+ "SELECT * FROM favourites LEFT JOIN manga ON favourites.manga_id = manga.manga_id " +
+ "WHERE favourites.deleted_at = 0 GROUP BY favourites.manga_id ORDER BY $orderBy",
)
- return observeAllRaw(query)
+ return observeAllImpl(query)
}
@Transaction
- @Query("SELECT * FROM favourites GROUP BY manga_id ORDER BY created_at DESC LIMIT :limit OFFSET :offset")
+ @Query(
+ "SELECT * FROM favourites WHERE deleted_at = 0 " +
+ "GROUP BY manga_id ORDER BY created_at DESC LIMIT :limit OFFSET :offset",
+ )
abstract suspend fun findAll(offset: Int, limit: Int): List
@Transaction
- @Query("SELECT * FROM favourites WHERE category_id = :categoryId GROUP BY manga_id ORDER BY created_at DESC")
+ @Query(
+ "SELECT * FROM favourites WHERE category_id = :categoryId AND deleted_at = 0 " +
+ "GROUP BY manga_id ORDER BY created_at DESC",
+ )
abstract suspend fun findAll(categoryId: Long): List
fun observeAll(categoryId: Long, order: SortOrder): Flow> {
val orderBy = getOrderBy(order)
+
+ @Language("RoomSql")
val query = SimpleSQLiteQuery(
- "SELECT * FROM favourites LEFT JOIN manga ON favourites.manga_id = manga.manga_id WHERE category_id = ? GROUP BY favourites.manga_id ORDER BY $orderBy",
+ "SELECT * FROM favourites LEFT JOIN manga ON favourites.manga_id = manga.manga_id " +
+ "WHERE category_id = ? AND deleted_at = 0 GROUP BY favourites.manga_id ORDER BY $orderBy",
arrayOf(categoryId),
)
- return observeAllRaw(query)
+ return observeAllImpl(query)
}
@Transaction
- @Query("SELECT * FROM favourites WHERE category_id = :categoryId GROUP BY manga_id ORDER BY created_at DESC LIMIT :limit OFFSET :offset")
+ @Query(
+ "SELECT * FROM favourites WHERE category_id = :categoryId AND deleted_at = 0 " +
+ "GROUP BY manga_id ORDER BY created_at DESC LIMIT :limit OFFSET :offset",
+ )
abstract suspend fun findAll(categoryId: Long, offset: Int, limit: Int): List
- @Query("SELECT * FROM manga WHERE manga_id IN (SELECT manga_id FROM favourites WHERE category_id = :categoryId)")
+ @Query(
+ "SELECT * FROM manga WHERE manga_id IN " +
+ "(SELECT manga_id FROM favourites WHERE category_id = :categoryId AND deleted_at = 0)",
+ )
abstract suspend fun findAllManga(categoryId: Int): List
- @Query("SELECT * FROM manga WHERE manga_id IN (SELECT manga_id FROM favourites)")
+ suspend fun findCovers(categoryId: Long, order: SortOrder): List {
+ val orderBy = getOrderBy(order)
+
+ @Language("RoomSql")
+ val query = SimpleSQLiteQuery(
+ "SELECT m.cover_url FROM favourites AS f LEFT JOIN manga AS m ON f.manga_id = m.manga_id " +
+ "WHERE f.category_id = ? AND deleted_at = 0 ORDER BY $orderBy",
+ arrayOf(categoryId),
+ )
+ return findCoversImpl(query)
+ }
+
+ @Query("SELECT * FROM manga WHERE manga_id IN (SELECT manga_id FROM favourites WHERE deleted_at = 0)")
abstract suspend fun findAllManga(): List
@Transaction
- @Query("SELECT * FROM favourites WHERE manga_id = :id GROUP BY manga_id")
+ @Query("SELECT * FROM favourites WHERE manga_id = :id AND deleted_at = 0 GROUP BY manga_id")
abstract suspend fun find(id: Long): FavouriteManga?
@Transaction
- @Query("SELECT * FROM favourites WHERE manga_id = :id GROUP BY manga_id")
+ @Deprecated("Ignores order")
+ @Query("SELECT * FROM favourites WHERE manga_id = :id AND deleted_at = 0 GROUP BY manga_id")
abstract fun observe(id: Long): Flow
- @Query("SELECT DISTINCT category_id FROM favourites WHERE manga_id = :id")
+ @Query("SELECT DISTINCT category_id FROM favourites WHERE manga_id = :id AND deleted_at = 0")
abstract fun observeIds(id: Long): Flow>
- @Insert(onConflict = OnConflictStrategy.IGNORE)
+ /** INSERT **/
+
+ @Insert(onConflict = OnConflictStrategy.REPLACE)
abstract suspend fun insert(favourite: FavouriteEntity)
+ /** UPDATE **/
+
@Update
abstract suspend fun update(favourite: FavouriteEntity): Int
- @Query("DELETE FROM favourites WHERE manga_id = :mangaId")
- abstract suspend fun delete(mangaId: Long)
+ /** DELETE **/
+
+ suspend fun delete(mangaId: Long) = setDeletedAt(
+ mangaId = mangaId,
+ deletedAt = System.currentTimeMillis(),
+ )
+
+ suspend fun delete(mangaId: Long, categoryId: Long) = setDeletedAt(
+ categoryId = categoryId,
+ mangaId = mangaId,
+ deletedAt = System.currentTimeMillis(),
+ )
+
+ suspend fun deleteAll(categoryId: Long) = setDeletedAtAll(
+ categoryId = categoryId,
+ deletedAt = System.currentTimeMillis(),
+ )
+
+ suspend fun recover(mangaId: Long) = setDeletedAt(
+ mangaId = mangaId,
+ deletedAt = 0L,
+ )
+
+ suspend fun recover(categoryId: Long, mangaId: Long) = setDeletedAt(
+ categoryId = categoryId,
+ mangaId = mangaId,
+ deletedAt = 0L,
+ )
- @Query("DELETE FROM favourites WHERE manga_id = :mangaId AND category_id = :categoryId")
- abstract suspend fun delete(categoryId: Long, mangaId: Long)
+ @Query("DELETE FROM favourites WHERE deleted_at != 0 AND deleted_at < :maxDeletionTime")
+ abstract suspend fun gc(maxDeletionTime: Long)
+
+ /** TOOLS **/
@Transaction
open suspend fun upsert(entity: FavouriteEntity) {
@@ -81,13 +147,26 @@ abstract class FavouritesDao {
@Transaction
@RawQuery(observedEntities = [FavouriteEntity::class])
- protected abstract fun observeAllRaw(query: SupportSQLiteQuery): Flow>
+ protected abstract fun observeAllImpl(query: SupportSQLiteQuery): Flow>
+
+ @RawQuery
+ protected abstract suspend fun findCoversImpl(query: SupportSQLiteQuery): List
+
+ @Query("UPDATE favourites SET deleted_at = :deletedAt WHERE manga_id = :mangaId")
+ protected abstract suspend fun setDeletedAt(mangaId: Long, deletedAt: Long)
+
+ @Query("UPDATE favourites SET deleted_at = :deletedAt WHERE manga_id = :mangaId AND category_id = :categoryId")
+ abstract suspend fun setDeletedAt(categoryId: Long, mangaId: Long, deletedAt: Long)
+
+ @Query("UPDATE favourites SET deleted_at = :deletedAt WHERE category_id = :categoryId AND deleted_at = 0")
+ protected abstract suspend fun setDeletedAtAll(categoryId: Long, deletedAt: Long)
- private fun getOrderBy(sortOrder: SortOrder) = when(sortOrder) {
+ private fun getOrderBy(sortOrder: SortOrder) = when (sortOrder) {
SortOrder.RATING -> "rating DESC"
SortOrder.NEWEST,
- SortOrder.UPDATED -> "created_at DESC"
+ SortOrder.UPDATED,
+ -> "created_at DESC"
SortOrder.ALPHABETICAL -> "title ASC"
else -> throw IllegalArgumentException("Sort order $sortOrder is not supported")
}
-}
\ No newline at end of file
+}
diff --git a/app/src/main/java/org/koitharu/kotatsu/favourites/domain/FavouritesRepository.kt b/app/src/main/java/org/koitharu/kotatsu/favourites/domain/FavouritesRepository.kt
index 13a4c92c4..1c391de8a 100644
--- a/app/src/main/java/org/koitharu/kotatsu/favourites/domain/FavouritesRepository.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/favourites/domain/FavouritesRepository.kt
@@ -1,7 +1,10 @@
package org.koitharu.kotatsu.favourites.domain
import androidx.room.withTransaction
+import javax.inject.Inject
+import javax.inject.Singleton
import kotlinx.coroutines.flow.*
+import org.koitharu.kotatsu.base.domain.ReversibleHandle
import org.koitharu.kotatsu.core.db.MangaDatabase
import org.koitharu.kotatsu.core.db.entity.*
import org.koitharu.kotatsu.core.model.FavouriteCategory
@@ -13,7 +16,8 @@ import org.koitharu.kotatsu.parsers.model.SortOrder
import org.koitharu.kotatsu.tracker.work.TrackerNotificationChannels
import org.koitharu.kotatsu.utils.ext.mapItems
-class FavouritesRepository(
+@Singleton
+class FavouritesRepository @Inject constructor(
private val db: MangaDatabase,
private val channels: TrackerNotificationChannels,
) {
@@ -49,17 +53,28 @@ class FavouritesRepository(
}.distinctUntilChanged()
}
+ fun observeCategoriesWithCovers(): Flow>> {
+ return db.favouriteCategoriesDao.observeAll()
+ .map {
+ db.withTransaction {
+ val res = LinkedHashMap>()
+ for (entity in it) {
+ val cat = entity.toFavouriteCategory()
+ res[cat] = db.favouritesDao.findCovers(
+ categoryId = cat.id,
+ order = cat.order,
+ )
+ }
+ res
+ }
+ }
+ }
+
fun observeCategory(id: Long): Flow {
return db.favouriteCategoriesDao.observe(id)
.map { it?.toFavouriteCategory() }
}
- fun observeCategories(mangaId: Long): Flow> {
- return db.favouritesDao.observe(mangaId).map { entity ->
- entity?.categories?.map { it.toFavouriteCategory() }.orEmpty()
- }.distinctUntilChanged()
- }
-
fun observeCategoriesIds(mangaId: Long): Flow> {
return db.favouritesDao.observeIds(mangaId).map { it.toSet() }
}
@@ -76,6 +91,8 @@ class FavouritesRepository(
categoryId = 0,
order = sortOrder.name,
track = isTrackerEnabled,
+ deletedAt = 0L,
+ isVisibleInLibrary = true,
)
val id = db.favouriteCategoriesDao.insert(entity)
val category = entity.toFavouriteCategory(id)
@@ -87,37 +104,37 @@ class FavouritesRepository(
db.favouriteCategoriesDao.update(id, title, sortOrder.name, isTrackerEnabled)
}
- suspend fun addCategory(title: String): FavouriteCategory {
- val entity = FavouriteCategoryEntity(
- title = title,
- createdAt = System.currentTimeMillis(),
- sortKey = db.favouriteCategoriesDao.getNextSortKey(),
- categoryId = 0,
- order = SortOrder.NEWEST.name,
- track = true,
- )
- val id = db.favouriteCategoriesDao.insert(entity)
- val category = entity.toFavouriteCategory(id)
- channels.createChannel(category)
- return category
+ suspend fun updateCategory(id: Long, isVisibleInLibrary: Boolean) {
+ db.favouriteCategoriesDao.updateLibVisibility(id, isVisibleInLibrary)
}
- suspend fun renameCategory(id: Long, title: String) {
- db.favouriteCategoriesDao.updateTitle(id, title)
- channels.renameChannel(id, title)
+ suspend fun updateCategoryTracking(id: Long, isTrackingEnabled: Boolean) {
+ db.favouriteCategoriesDao.updateTracking(id, isTrackingEnabled)
}
suspend fun removeCategory(id: Long) {
- db.favouriteCategoriesDao.delete(id)
+ db.withTransaction {
+ db.favouriteCategoriesDao.delete(id)
+ db.favouritesDao.deleteAll(id)
+ }
channels.deleteChannel(id)
}
- suspend fun setCategoryOrder(id: Long, order: SortOrder) {
- db.favouriteCategoriesDao.updateOrder(id, order.name)
+ suspend fun removeCategories(ids: Collection) {
+ db.withTransaction {
+ for (id in ids) {
+ db.favouriteCategoriesDao.delete(id)
+ db.favouritesDao.deleteAll(id)
+ }
+ }
+ // run after transaction success
+ for (id in ids) {
+ channels.deleteChannel(id)
+ }
}
- suspend fun setCategoryTracking(id: Long, isEnabled: Boolean) {
- db.favouriteCategoriesDao.updateTracking(id, isEnabled)
+ suspend fun setCategoryOrder(id: Long, order: SortOrder) {
+ db.favouriteCategoriesDao.updateOrder(id, order.name)
}
suspend fun reorderCategories(orderedIds: List) {
@@ -135,26 +152,34 @@ class FavouritesRepository(
val tags = manga.tags.toEntities()
db.tagsDao.upsert(tags)
db.mangaDao.upsert(manga.toEntity(), tags)
- val entity = FavouriteEntity(manga.id, categoryId, System.currentTimeMillis())
+ val entity = FavouriteEntity(
+ mangaId = manga.id,
+ categoryId = categoryId,
+ createdAt = System.currentTimeMillis(),
+ sortKey = 0,
+ deletedAt = 0L,
+ )
db.favouritesDao.insert(entity)
}
}
}
- suspend fun removeFromFavourites(ids: Collection) {
+ suspend fun removeFromFavourites(ids: Collection): ReversibleHandle {
db.withTransaction {
for (id in ids) {
- db.favouritesDao.delete(id)
+ db.favouritesDao.delete(mangaId = id)
}
}
+ return ReversibleHandle { recoverToFavourites(ids) }
}
- suspend fun removeFromCategory(categoryId: Long, ids: Collection) {
+ suspend fun removeFromCategory(categoryId: Long, ids: Collection): ReversibleHandle {
db.withTransaction {
for (id in ids) {
- db.favouritesDao.delete(categoryId, id)
+ db.favouritesDao.delete(categoryId = categoryId, mangaId = id)
}
}
+ return ReversibleHandle { recoverToCategory(categoryId, ids) }
}
private fun observeOrder(categoryId: Long): Flow {
@@ -163,4 +188,20 @@ class FavouritesRepository(
.map { x -> SortOrder(x.order, SortOrder.NEWEST) }
.distinctUntilChanged()
}
-}
\ No newline at end of file
+
+ private suspend fun recoverToFavourites(ids: Collection) {
+ db.withTransaction {
+ for (id in ids) {
+ db.favouritesDao.recover(mangaId = id)
+ }
+ }
+ }
+
+ private suspend fun recoverToCategory(categoryId: Long, ids: Collection) {
+ db.withTransaction {
+ for (id in ids) {
+ db.favouritesDao.recover(mangaId = id, categoryId = categoryId)
+ }
+ }
+ }
+}
diff --git a/app/src/main/java/org/koitharu/kotatsu/favourites/ui/FavouritesActivity.kt b/app/src/main/java/org/koitharu/kotatsu/favourites/ui/FavouritesActivity.kt
new file mode 100644
index 000000000..8f0ffe33f
--- /dev/null
+++ b/app/src/main/java/org/koitharu/kotatsu/favourites/ui/FavouritesActivity.kt
@@ -0,0 +1,55 @@
+package org.koitharu.kotatsu.favourites.ui
+
+import android.content.Context
+import android.content.Intent
+import android.os.Bundle
+import androidx.core.graphics.Insets
+import androidx.core.view.updatePadding
+import androidx.fragment.app.commit
+import dagger.hilt.android.AndroidEntryPoint
+import org.koitharu.kotatsu.R
+import org.koitharu.kotatsu.base.ui.BaseActivity
+import org.koitharu.kotatsu.core.model.FavouriteCategory
+import org.koitharu.kotatsu.databinding.ActivityContainerBinding
+import org.koitharu.kotatsu.favourites.ui.list.FavouritesListFragment
+import org.koitharu.kotatsu.favourites.ui.list.FavouritesListFragment.Companion.NO_ID
+
+@AndroidEntryPoint
+class FavouritesActivity : BaseActivity() {
+
+ override fun onCreate(savedInstanceState: Bundle?) {
+ super.onCreate(savedInstanceState)
+ setContentView(ActivityContainerBinding.inflate(layoutInflater))
+ supportActionBar?.setDisplayHomeAsUpEnabled(true)
+ val categoryTitle = intent.getStringExtra(EXTRA_TITLE)
+ if (categoryTitle != null) {
+ title = categoryTitle
+ }
+ val fm = supportFragmentManager
+ if (fm.findFragmentById(R.id.container) == null) {
+ fm.commit {
+ val fragment = FavouritesListFragment.newInstance(intent.getLongExtra(EXTRA_CATEGORY_ID, NO_ID))
+ replace(R.id.container, fragment)
+ }
+ }
+ }
+
+ override fun onWindowInsetsChanged(insets: Insets) {
+ binding.root.updatePadding(
+ left = insets.left,
+ right = insets.right,
+ )
+ }
+
+ companion object {
+
+ private const val EXTRA_CATEGORY_ID = "cat_id"
+ private const val EXTRA_TITLE = "title"
+
+ fun newIntent(context: Context) = Intent(context, FavouritesActivity::class.java)
+
+ fun newIntent(context: Context, category: FavouriteCategory) = Intent(context, FavouritesActivity::class.java)
+ .putExtra(EXTRA_CATEGORY_ID, category.id)
+ .putExtra(EXTRA_TITLE, category.title)
+ }
+}
diff --git a/app/src/main/java/org/koitharu/kotatsu/favourites/ui/FavouritesContainerFragment.kt b/app/src/main/java/org/koitharu/kotatsu/favourites/ui/FavouritesContainerFragment.kt
deleted file mode 100644
index bd12423c0..000000000
--- a/app/src/main/java/org/koitharu/kotatsu/favourites/ui/FavouritesContainerFragment.kt
+++ /dev/null
@@ -1,193 +0,0 @@
-package org.koitharu.kotatsu.favourites.ui
-
-import android.os.Bundle
-import android.view.LayoutInflater
-import android.view.View
-import android.view.ViewGroup
-import androidx.appcompat.view.ActionMode
-import androidx.appcompat.widget.PopupMenu
-import androidx.core.graphics.Insets
-import androidx.core.view.children
-import androidx.core.view.isVisible
-import androidx.core.view.updateLayoutParams
-import androidx.core.view.updatePadding
-import com.google.android.material.snackbar.Snackbar
-import com.google.android.material.tabs.TabLayout
-import com.google.android.material.tabs.TabLayoutMediator
-import org.koin.androidx.viewmodel.ext.android.viewModel
-import org.koitharu.kotatsu.R
-import org.koitharu.kotatsu.base.ui.BaseFragment
-import org.koitharu.kotatsu.base.ui.util.ActionModeListener
-import org.koitharu.kotatsu.core.model.FavouriteCategory
-import org.koitharu.kotatsu.databinding.FragmentFavouritesBinding
-import org.koitharu.kotatsu.databinding.ItemEmptyStateBinding
-import org.koitharu.kotatsu.favourites.ui.categories.CategoriesEditDelegate
-import org.koitharu.kotatsu.favourites.ui.categories.FavouritesCategoriesViewModel
-import org.koitharu.kotatsu.favourites.ui.categories.adapter.CategoryListModel
-import org.koitharu.kotatsu.favourites.ui.categories.edit.FavouritesCategoryEditActivity
-import org.koitharu.kotatsu.main.ui.AppBarOwner
-import org.koitharu.kotatsu.utils.ext.addMenuProvider
-import org.koitharu.kotatsu.utils.ext.getDisplayMessage
-import org.koitharu.kotatsu.utils.ext.measureHeight
-import org.koitharu.kotatsu.utils.ext.resolveDp
-
-class FavouritesContainerFragment :
- BaseFragment(),
- FavouritesTabLongClickListener,
- CategoriesEditDelegate.CategoriesEditCallback,
- ActionModeListener,
- View.OnClickListener {
-
- private val viewModel by viewModel()
- private val editDelegate by lazy(LazyThreadSafetyMode.NONE) {
- CategoriesEditDelegate(requireContext(), this)
- }
- private var pagerAdapter: FavouritesPagerAdapter? = null
- private var stubBinding: ItemEmptyStateBinding? = null
-
- override fun onInflateView(
- inflater: LayoutInflater,
- container: ViewGroup?
- ) = FragmentFavouritesBinding.inflate(inflater, container, false)
-
- override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
- super.onViewCreated(view, savedInstanceState)
- val adapter = FavouritesPagerAdapter(this, this)
- viewModel.visibleCategories.value?.let(::onCategoriesChanged)
- binding.pager.adapter = adapter
- pagerAdapter = adapter
- TabLayoutMediator(binding.tabs, binding.pager, adapter).attach()
- actionModeDelegate.addListener(this, viewLifecycleOwner)
- addMenuProvider(FavouritesContainerMenuProvider(view.context))
-
- viewModel.visibleCategories.observe(viewLifecycleOwner, ::onCategoriesChanged)
- viewModel.onError.observe(viewLifecycleOwner, ::onError)
- }
-
- override fun onDestroyView() {
- pagerAdapter = null
- stubBinding = null
- super.onDestroyView()
- }
-
- override fun onActionModeStarted(mode: ActionMode) {
- binding.pager.isUserInputEnabled = false
- binding.tabs.setTabsEnabled(false)
- }
-
- override fun onActionModeFinished(mode: ActionMode) {
- binding.pager.isUserInputEnabled = true
- binding.tabs.setTabsEnabled(true)
- }
-
- override fun onWindowInsetsChanged(insets: Insets) {
- val headerHeight = (activity as? AppBarOwner)?.appBar?.measureHeight() ?: insets.top
- binding.root.updatePadding(
- top = headerHeight - insets.top
- )
- binding.pager.updatePadding(
- // 8 dp is needed so that the top of the list is not attached to tabs (visible when ActionMode is active)
- top = -headerHeight + resources.resolveDp(8)
- )
- binding.tabs.apply {
- updatePadding(
- left = insets.left,
- right = insets.right
- )
- updateLayoutParams {
- topMargin = insets.top
- }
- }
- }
-
- private fun onCategoriesChanged(categories: List) {
- pagerAdapter?.replaceData(categories)
- if (categories.isEmpty()) {
- binding.pager.isVisible = false
- binding.tabs.isVisible = false
- showStub()
- } else {
- binding.pager.isVisible = true
- binding.tabs.isVisible = true
- (stubBinding?.root ?: binding.stubEmptyState).isVisible = false
- }
- }
-
- private fun onError(e: Throwable) {
- Snackbar.make(binding.pager, e.getDisplayMessage(resources), Snackbar.LENGTH_LONG).show()
- }
-
- override fun onTabLongClick(tabView: View, item: CategoryListModel): Boolean {
- when (item) {
- is CategoryListModel.All -> showAllCategoriesMenu(tabView)
- is CategoryListModel.CategoryItem -> showCategoryMenu(tabView, item.category)
- }
- return true
- }
-
- override fun onClick(v: View) {
- when (v.id) {
- R.id.button_retry -> startActivity(FavouritesCategoryEditActivity.newIntent(v.context))
- }
- }
-
- override fun onDeleteCategory(category: FavouriteCategory) {
- viewModel.deleteCategory(category.id)
- }
-
- private fun TabLayout.setTabsEnabled(enabled: Boolean) {
- val tabStrip = getChildAt(0) as? ViewGroup ?: return
- for (tab in tabStrip.children) {
- tab.isEnabled = enabled
- }
- }
-
- private fun showCategoryMenu(tabView: View, category: FavouriteCategory) {
- val menu = PopupMenu(tabView.context, tabView)
- menu.inflate(R.menu.popup_category)
- menu.setOnMenuItemClickListener {
- when (it.itemId) {
- R.id.action_remove -> editDelegate.deleteCategory(category)
- R.id.action_edit -> startActivity(
- FavouritesCategoryEditActivity.newIntent(
- tabView.context,
- category.id
- )
- )
- else -> return@setOnMenuItemClickListener false
- }
- true
- }
- menu.show()
- }
-
- private fun showAllCategoriesMenu(tabView: View) {
- val menu = PopupMenu(tabView.context, tabView)
- menu.inflate(R.menu.popup_category_all)
- menu.setOnMenuItemClickListener {
- when (it.itemId) {
- R.id.action_create -> startActivity(FavouritesCategoryEditActivity.newIntent(requireContext()))
- R.id.action_hide -> viewModel.setAllCategoriesVisible(false)
- }
- true
- }
- menu.show()
- }
-
- private fun showStub() {
- val stub = stubBinding ?: ItemEmptyStateBinding.bind(binding.stubEmptyState.inflate())
- stub.root.isVisible = true
- stub.icon.setImageResource(R.drawable.ic_empty_favourites)
- stub.textPrimary.setText(R.string.text_empty_holder_primary)
- stub.textSecondary.setText(R.string.empty_favourite_categories)
- stub.buttonRetry.setText(R.string.add)
- stub.buttonRetry.isVisible = true
- stub.buttonRetry.setOnClickListener(this)
- stubBinding = stub
- }
-
- companion object {
-
- fun newInstance() = FavouritesContainerFragment()
- }
-}
\ No newline at end of file
diff --git a/app/src/main/java/org/koitharu/kotatsu/favourites/ui/FavouritesContainerMenuProvider.kt b/app/src/main/java/org/koitharu/kotatsu/favourites/ui/FavouritesContainerMenuProvider.kt
deleted file mode 100644
index 1b07f535d..000000000
--- a/app/src/main/java/org/koitharu/kotatsu/favourites/ui/FavouritesContainerMenuProvider.kt
+++ /dev/null
@@ -1,28 +0,0 @@
-package org.koitharu.kotatsu.favourites.ui
-
-import android.content.Context
-import android.view.Menu
-import android.view.MenuInflater
-import android.view.MenuItem
-import androidx.core.view.MenuProvider
-import org.koitharu.kotatsu.R
-import org.koitharu.kotatsu.favourites.ui.categories.CategoriesActivity
-
-class FavouritesContainerMenuProvider(
- private val context: Context,
-) : MenuProvider {
-
- override fun onCreateMenu(menu: Menu, menuInflater: MenuInflater) {
- menuInflater.inflate(R.menu.opt_favourites, menu)
- }
-
- override fun onMenuItemSelected(menuItem: MenuItem): Boolean {
- return when (menuItem.itemId) {
- R.id.action_categories -> {
- context.startActivity(CategoriesActivity.newIntent(context))
- true
- }
- else -> false
- }
- }
-}
\ No newline at end of file
diff --git a/app/src/main/java/org/koitharu/kotatsu/favourites/ui/FavouritesPagerAdapter.kt b/app/src/main/java/org/koitharu/kotatsu/favourites/ui/FavouritesPagerAdapter.kt
deleted file mode 100644
index 329e06751..000000000
--- a/app/src/main/java/org/koitharu/kotatsu/favourites/ui/FavouritesPagerAdapter.kt
+++ /dev/null
@@ -1,76 +0,0 @@
-package org.koitharu.kotatsu.favourites.ui
-
-import android.view.View
-import androidx.fragment.app.Fragment
-import androidx.recyclerview.widget.AsyncListDiffer
-import androidx.recyclerview.widget.DiffUtil
-import androidx.viewpager2.adapter.FragmentStateAdapter
-import com.google.android.material.tabs.TabLayout
-import com.google.android.material.tabs.TabLayoutMediator
-import org.koitharu.kotatsu.R
-import org.koitharu.kotatsu.favourites.ui.categories.adapter.CategoryListModel
-import org.koitharu.kotatsu.favourites.ui.list.FavouritesListFragment
-
-class FavouritesPagerAdapter(
- fragment: Fragment,
- private val longClickListener: FavouritesTabLongClickListener
-) : FragmentStateAdapter(fragment.childFragmentManager, fragment.viewLifecycleOwner.lifecycle),
- TabLayoutMediator.TabConfigurationStrategy,
- View.OnLongClickListener {
-
- private val differ = AsyncListDiffer(this, DiffCallback())
-
- override fun getItemCount() = differ.currentList.size
-
- override fun createFragment(position: Int): Fragment {
- val item = differ.currentList[position]
- return FavouritesListFragment.newInstance(item.id)
- }
-
- override fun getItemId(position: Int): Long {
- return differ.currentList[position].id
- }
-
- override fun containsItem(itemId: Long): Boolean {
- return differ.currentList.any { it.id == itemId }
- }
-
- override fun onConfigureTab(tab: TabLayout.Tab, position: Int) {
- val item = differ.currentList[position]
- tab.text = when (item) {
- is CategoryListModel.All -> tab.view.context.getString(R.string.all_favourites)
- is CategoryListModel.CategoryItem -> item.category.title
- }
- tab.view.tag = item.id
- tab.view.setOnLongClickListener(this)
- }
-
- fun replaceData(data: List) {
- differ.submitList(data)
- }
-
- override fun onLongClick(v: View): Boolean {
- val itemId = v.tag as? Long ?: return false
- val item = differ.currentList.find { x -> x.id == itemId } ?: return false
- return longClickListener.onTabLongClick(v, item)
- }
-
- private class DiffCallback : DiffUtil.ItemCallback() {
-
- override fun areItemsTheSame(
- oldItem: CategoryListModel,
- newItem: CategoryListModel
- ): Boolean = when {
- oldItem is CategoryListModel.All && newItem is CategoryListModel.All -> true
- oldItem is CategoryListModel.CategoryItem && newItem is CategoryListModel.CategoryItem -> {
- oldItem.category.id == newItem.category.id
- }
- else -> false
- }
-
- override fun areContentsTheSame(
- oldItem: CategoryListModel,
- newItem: CategoryListModel
- ): Boolean = oldItem == newItem
- }
-}
\ No newline at end of file
diff --git a/app/src/main/java/org/koitharu/kotatsu/favourites/ui/FavouritesTabLongClickListener.kt b/app/src/main/java/org/koitharu/kotatsu/favourites/ui/FavouritesTabLongClickListener.kt
deleted file mode 100644
index 13fca87c9..000000000
--- a/app/src/main/java/org/koitharu/kotatsu/favourites/ui/FavouritesTabLongClickListener.kt
+++ /dev/null
@@ -1,9 +0,0 @@
-package org.koitharu.kotatsu.favourites.ui
-
-import android.view.View
-import org.koitharu.kotatsu.favourites.ui.categories.adapter.CategoryListModel
-
-fun interface FavouritesTabLongClickListener {
-
- fun onTabLongClick(tabView: View, item: CategoryListModel): Boolean
-}
\ No newline at end of file
diff --git a/app/src/main/java/org/koitharu/kotatsu/favourites/ui/categories/AllCategoriesToggleListener.kt b/app/src/main/java/org/koitharu/kotatsu/favourites/ui/categories/AllCategoriesToggleListener.kt
deleted file mode 100644
index 380722b84..000000000
--- a/app/src/main/java/org/koitharu/kotatsu/favourites/ui/categories/AllCategoriesToggleListener.kt
+++ /dev/null
@@ -1,6 +0,0 @@
-package org.koitharu.kotatsu.favourites.ui.categories
-
-interface AllCategoriesToggleListener {
-
- fun onAllCategoriesToggle(isVisible: Boolean)
-}
\ No newline at end of file
diff --git a/app/src/main/java/org/koitharu/kotatsu/favourites/ui/categories/CategoriesActivity.kt b/app/src/main/java/org/koitharu/kotatsu/favourites/ui/categories/CategoriesActivity.kt
deleted file mode 100644
index 80fd2a137..000000000
--- a/app/src/main/java/org/koitharu/kotatsu/favourites/ui/categories/CategoriesActivity.kt
+++ /dev/null
@@ -1,157 +0,0 @@
-package org.koitharu.kotatsu.favourites.ui.categories
-
-import android.content.Context
-import android.content.Intent
-import android.os.Bundle
-import android.view.View
-import android.view.ViewGroup
-import androidx.appcompat.widget.PopupMenu
-import androidx.core.graphics.Insets
-import androidx.core.view.isVisible
-import androidx.core.view.updateLayoutParams
-import androidx.core.view.updatePadding
-import androidx.recyclerview.widget.ItemTouchHelper
-import androidx.recyclerview.widget.RecyclerView
-import com.google.android.material.snackbar.Snackbar
-import org.koin.androidx.viewmodel.ext.android.viewModel
-import org.koitharu.kotatsu.R
-import org.koitharu.kotatsu.base.ui.BaseActivity
-import org.koitharu.kotatsu.base.ui.list.OnListItemClickListener
-import org.koitharu.kotatsu.core.model.FavouriteCategory
-import org.koitharu.kotatsu.databinding.ActivityCategoriesBinding
-import org.koitharu.kotatsu.favourites.ui.categories.adapter.CategoryListModel
-import org.koitharu.kotatsu.favourites.ui.categories.edit.FavouritesCategoryEditActivity
-import org.koitharu.kotatsu.parsers.model.SortOrder
-import org.koitharu.kotatsu.utils.ext.getDisplayMessage
-import org.koitharu.kotatsu.utils.ext.measureHeight
-
-class CategoriesActivity :
- BaseActivity(),
- OnListItemClickListener,
- View.OnClickListener,
- CategoriesEditDelegate.CategoriesEditCallback,
- AllCategoriesToggleListener {
-
- private val viewModel by viewModel()
-
- private lateinit var adapter: CategoriesAdapter
- private lateinit var reorderHelper: ItemTouchHelper
- private lateinit var editDelegate: CategoriesEditDelegate
-
- override fun onCreate(savedInstanceState: Bundle?) {
- super.onCreate(savedInstanceState)
- setContentView(ActivityCategoriesBinding.inflate(layoutInflater))
- supportActionBar?.setDisplayHomeAsUpEnabled(true)
- adapter = CategoriesAdapter(this, this)
- editDelegate = CategoriesEditDelegate(this, this)
- binding.recyclerView.setHasFixedSize(true)
- binding.recyclerView.adapter = adapter
- binding.fabAdd.setOnClickListener(this)
- reorderHelper = ItemTouchHelper(ReorderHelperCallback())
- reorderHelper.attachToRecyclerView(binding.recyclerView)
-
- viewModel.allCategories.observe(this, ::onCategoriesChanged)
- viewModel.onError.observe(this, ::onError)
- }
-
- override fun onClick(v: View) {
- when (v.id) {
- R.id.fab_add -> startActivity(FavouritesCategoryEditActivity.newIntent(this))
- }
- }
-
- override fun onItemClick(item: FavouriteCategory, view: View) {
- val menu = PopupMenu(view.context, view)
- menu.inflate(R.menu.popup_category)
- menu.setOnMenuItemClickListener { menuItem ->
- when (menuItem.itemId) {
- R.id.action_remove -> editDelegate.deleteCategory(item)
- R.id.action_edit -> startActivity(FavouritesCategoryEditActivity.newIntent(this, item.id))
- }
- true
- }
- menu.show()
- }
-
- override fun onItemLongClick(item: FavouriteCategory, view: View): Boolean {
- val viewHolder = binding.recyclerView.findContainingViewHolder(view) ?: return false
- reorderHelper.startDrag(viewHolder)
- return true
- }
-
- override fun onAllCategoriesToggle(isVisible: Boolean) {
- viewModel.setAllCategoriesVisible(isVisible)
- }
-
- override fun onWindowInsetsChanged(insets: Insets) {
- binding.fabAdd.updateLayoutParams {
- rightMargin = topMargin + insets.right
- leftMargin = topMargin + insets.left
- bottomMargin = topMargin + insets.bottom
- }
- binding.recyclerView.updatePadding(
- left = insets.left,
- right = insets.right,
- bottom = 2 * insets.bottom + binding.fabAdd.measureHeight(),
- )
- }
-
- private fun onCategoriesChanged(categories: List) {
- adapter.items = categories
- binding.textViewHolder.isVisible = categories.isEmpty()
- }
-
- private fun onError(e: Throwable) {
- Snackbar.make(binding.recyclerView, e.getDisplayMessage(resources), Snackbar.LENGTH_LONG)
- .show()
- }
-
- override fun onDeleteCategory(category: FavouriteCategory) {
- viewModel.deleteCategory(category.id)
- }
-
- private inner class ReorderHelperCallback : ItemTouchHelper.SimpleCallback(
- ItemTouchHelper.DOWN or ItemTouchHelper.UP, 0
- ) {
-
- override fun onSwiped(viewHolder: RecyclerView.ViewHolder, direction: Int) = Unit
-
- override fun onMove(
- recyclerView: RecyclerView,
- viewHolder: RecyclerView.ViewHolder,
- target: RecyclerView.ViewHolder,
- ): Boolean = viewHolder.itemViewType == target.itemViewType
-
- override fun canDropOver(
- recyclerView: RecyclerView,
- current: RecyclerView.ViewHolder,
- target: RecyclerView.ViewHolder,
- ): Boolean = current.itemViewType == target.itemViewType
-
- override fun onMoved(
- recyclerView: RecyclerView,
- viewHolder: RecyclerView.ViewHolder,
- fromPos: Int,
- target: RecyclerView.ViewHolder,
- toPos: Int,
- x: Int,
- y: Int,
- ) {
- super.onMoved(recyclerView, viewHolder, fromPos, target, toPos, x, y)
- viewModel.reorderCategories(fromPos, toPos)
- }
-
- override fun isLongPressDragEnabled(): Boolean = false
- }
-
- companion object {
-
- val SORT_ORDERS = arrayOf(
- SortOrder.ALPHABETICAL,
- SortOrder.NEWEST,
- SortOrder.RATING,
- )
-
- fun newIntent(context: Context) = Intent(context, CategoriesActivity::class.java)
- }
-}
\ No newline at end of file
diff --git a/app/src/main/java/org/koitharu/kotatsu/favourites/ui/categories/CategoriesAdapter.kt b/app/src/main/java/org/koitharu/kotatsu/favourites/ui/categories/CategoriesAdapter.kt
deleted file mode 100644
index 7a5620158..000000000
--- a/app/src/main/java/org/koitharu/kotatsu/favourites/ui/categories/CategoriesAdapter.kt
+++ /dev/null
@@ -1,49 +0,0 @@
-package org.koitharu.kotatsu.favourites.ui.categories
-
-import androidx.recyclerview.widget.DiffUtil
-import com.hannesdorfmann.adapterdelegates4.AsyncListDifferDelegationAdapter
-import org.koitharu.kotatsu.base.ui.list.OnListItemClickListener
-import org.koitharu.kotatsu.core.model.FavouriteCategory
-import org.koitharu.kotatsu.favourites.ui.categories.adapter.CategoryListModel
-import org.koitharu.kotatsu.favourites.ui.categories.adapter.allCategoriesAD
-import org.koitharu.kotatsu.favourites.ui.categories.adapter.categoryAD
-
-class CategoriesAdapter(
- onItemClickListener: OnListItemClickListener,
- allCategoriesToggleListener: AllCategoriesToggleListener,
-) : AsyncListDifferDelegationAdapter(DiffCallback()) {
-
- init {
- delegatesManager.addDelegate(categoryAD(onItemClickListener))
- .addDelegate(allCategoriesAD(allCategoriesToggleListener))
- setHasStableIds(true)
- }
-
- override fun getItemId(position: Int): Long {
- return items[position].id
- }
-
- private class DiffCallback : DiffUtil.ItemCallback() {
-
- override fun areItemsTheSame(
- oldItem: CategoryListModel,
- newItem: CategoryListModel,
- ): Boolean = oldItem.id == newItem.id
-
- override fun areContentsTheSame(
- oldItem: CategoryListModel,
- newItem: CategoryListModel,
- ): Boolean = oldItem == newItem
-
- override fun getChangePayload(
- oldItem: CategoryListModel,
- newItem: CategoryListModel,
- ): Any? = when {
- oldItem is CategoryListModel.All && newItem is CategoryListModel.All -> Unit
- oldItem is CategoryListModel.CategoryItem &&
- newItem is CategoryListModel.CategoryItem &&
- oldItem.category.title != newItem.category.title -> null
- else -> Unit
- }
- }
-}
\ No newline at end of file
diff --git a/app/src/main/java/org/koitharu/kotatsu/favourites/ui/categories/CategoriesEditDelegate.kt b/app/src/main/java/org/koitharu/kotatsu/favourites/ui/categories/CategoriesEditDelegate.kt
deleted file mode 100644
index cece6607f..000000000
--- a/app/src/main/java/org/koitharu/kotatsu/favourites/ui/categories/CategoriesEditDelegate.kt
+++ /dev/null
@@ -1,30 +0,0 @@
-package org.koitharu.kotatsu.favourites.ui.categories
-
-import android.content.Context
-import com.google.android.material.dialog.MaterialAlertDialogBuilder
-import org.koitharu.kotatsu.R
-import org.koitharu.kotatsu.core.model.FavouriteCategory
-import com.google.android.material.R as materialR
-
-class CategoriesEditDelegate(
- private val context: Context,
- private val callback: CategoriesEditCallback
-) {
-
- fun deleteCategory(category: FavouriteCategory) {
- MaterialAlertDialogBuilder(context, materialR.style.ThemeOverlay_Material3_MaterialAlertDialog_Centered)
- .setMessage(context.getString(R.string.category_delete_confirm, category.title))
- .setTitle(R.string.remove_category)
- .setIcon(R.drawable.ic_delete)
- .setNegativeButton(android.R.string.cancel, null)
- .setPositiveButton(R.string.remove) { _, _ ->
- callback.onDeleteCategory(category)
- }.create()
- .show()
- }
-
- interface CategoriesEditCallback {
-
- fun onDeleteCategory(category: FavouriteCategory)
- }
-}
\ No newline at end of file
diff --git a/app/src/main/java/org/koitharu/kotatsu/favourites/ui/categories/CategoriesSelectionCallback.kt b/app/src/main/java/org/koitharu/kotatsu/favourites/ui/categories/CategoriesSelectionCallback.kt
new file mode 100644
index 000000000..c6cbd4be7
--- /dev/null
+++ b/app/src/main/java/org/koitharu/kotatsu/favourites/ui/categories/CategoriesSelectionCallback.kt
@@ -0,0 +1,64 @@
+package org.koitharu.kotatsu.favourites.ui.categories
+
+import android.view.Menu
+import android.view.MenuItem
+import androidx.appcompat.view.ActionMode
+import androidx.recyclerview.widget.RecyclerView
+import com.google.android.material.dialog.MaterialAlertDialogBuilder
+import org.koitharu.kotatsu.R
+import org.koitharu.kotatsu.base.ui.list.ListSelectionController
+import org.koitharu.kotatsu.favourites.ui.categories.edit.FavouritesCategoryEditActivity
+import com.google.android.material.R as materialR
+
+class CategoriesSelectionCallback(
+ private val recyclerView: RecyclerView,
+ private val viewModel: FavouritesCategoriesViewModel,
+) : ListSelectionController.Callback2 {
+
+ override fun onSelectionChanged(controller: ListSelectionController, count: Int) {
+ recyclerView.invalidateItemDecorations()
+ }
+
+ override fun onCreateActionMode(controller: ListSelectionController, mode: ActionMode, menu: Menu): Boolean {
+ mode.menuInflater.inflate(R.menu.mode_category, menu)
+ return true
+ }
+
+ override fun onPrepareActionMode(controller: ListSelectionController, mode: ActionMode, menu: Menu): Boolean {
+ val isOneItem = controller.count == 1
+ menu.findItem(R.id.action_edit)?.isVisible = isOneItem
+ mode.title = controller.count.toString()
+ return true
+ }
+
+ override fun onActionItemClicked(controller: ListSelectionController, mode: ActionMode, item: MenuItem): Boolean {
+ return when (item.itemId) {
+ R.id.action_edit -> {
+ val id = controller.peekCheckedIds().singleOrNull() ?: return false
+ val context = recyclerView.context
+ val intent = FavouritesCategoryEditActivity.newIntent(context, id)
+ context.startActivity(intent)
+ mode.finish()
+ true
+ }
+ R.id.action_remove -> {
+ confirmDeleteCategories(controller.snapshot(), mode)
+ true
+ }
+ else -> false
+ }
+ }
+
+ private fun confirmDeleteCategories(ids: Set, mode: ActionMode) {
+ val context = recyclerView.context
+ MaterialAlertDialogBuilder(context, materialR.style.ThemeOverlay_Material3_MaterialAlertDialog_Centered)
+ .setMessage(R.string.categories_delete_confirm)
+ .setTitle(R.string.remove_category)
+ .setIcon(R.drawable.ic_delete)
+ .setNegativeButton(android.R.string.cancel, null)
+ .setPositiveButton(R.string.remove) { _, _ ->
+ viewModel.deleteCategories(ids)
+ mode.finish()
+ }.show()
+ }
+}
\ No newline at end of file
diff --git a/app/src/main/java/org/koitharu/kotatsu/favourites/ui/categories/CategoriesSelectionDecoration.kt b/app/src/main/java/org/koitharu/kotatsu/favourites/ui/categories/CategoriesSelectionDecoration.kt
new file mode 100644
index 000000000..ebeaf648a
--- /dev/null
+++ b/app/src/main/java/org/koitharu/kotatsu/favourites/ui/categories/CategoriesSelectionDecoration.kt
@@ -0,0 +1,57 @@
+package org.koitharu.kotatsu.favourites.ui.categories
+
+import android.content.Context
+import android.graphics.Canvas
+import android.graphics.Color
+import android.graphics.Paint
+import android.graphics.RectF
+import android.view.View
+import androidx.core.graphics.ColorUtils
+import androidx.recyclerview.widget.RecyclerView
+import org.koitharu.kotatsu.R
+import org.koitharu.kotatsu.base.ui.list.decor.AbstractSelectionItemDecoration
+import org.koitharu.kotatsu.favourites.ui.categories.adapter.CategoryListModel
+import org.koitharu.kotatsu.utils.ext.getItem
+import org.koitharu.kotatsu.utils.ext.getThemeColor
+import com.google.android.material.R as materialR
+
+class CategoriesSelectionDecoration(context: Context) : AbstractSelectionItemDecoration() {
+
+ private val paint = Paint(Paint.ANTI_ALIAS_FLAG)
+ private val radius = context.resources.getDimension(R.dimen.list_selector_corner)
+ private val strokeColor = context.getThemeColor(materialR.attr.colorPrimary, Color.RED)
+ private val fillColor = ColorUtils.setAlphaComponent(
+ ColorUtils.blendARGB(strokeColor, context.getThemeColor(materialR.attr.colorSurface), 0.8f),
+ 0x74
+ )
+ private val padding = context.resources.getDimension(R.dimen.grid_spacing_outer)
+
+ init {
+ paint.strokeWidth = context.resources.getDimension(R.dimen.selection_stroke_width)
+ hasForeground = true
+ hasBackground = false
+ isIncludeDecorAndMargins = false
+ }
+
+ override fun getItemId(parent: RecyclerView, child: View): Long {
+ val holder = parent.getChildViewHolder(child) ?: return RecyclerView.NO_ID
+ val item = holder.getItem(CategoryListModel::class.java) ?: return RecyclerView.NO_ID
+ return item.category.id
+ }
+
+ override fun onDrawForeground(
+ canvas: Canvas,
+ parent: RecyclerView,
+ child: View,
+ bounds: RectF,
+ state: RecyclerView.State,
+ ) {
+ bounds.inset(padding, padding)
+ paint.color = fillColor
+ paint.style = Paint.Style.FILL
+ canvas.drawRoundRect(bounds, radius, radius, paint)
+ paint.color = strokeColor
+ paint.style = Paint.Style.STROKE
+ canvas.drawRoundRect(bounds, radius, radius, paint)
+ }
+}
\ No newline at end of file
diff --git a/app/src/main/java/org/koitharu/kotatsu/favourites/ui/categories/FavouriteCategoriesActivity.kt b/app/src/main/java/org/koitharu/kotatsu/favourites/ui/categories/FavouriteCategoriesActivity.kt
new file mode 100644
index 000000000..470876014
--- /dev/null
+++ b/app/src/main/java/org/koitharu/kotatsu/favourites/ui/categories/FavouriteCategoriesActivity.kt
@@ -0,0 +1,224 @@
+package org.koitharu.kotatsu.favourites.ui.categories
+
+import android.content.Context
+import android.content.Intent
+import android.os.Bundle
+import android.transition.Fade
+import android.transition.TransitionManager
+import android.view.Menu
+import android.view.MenuItem
+import android.view.View
+import android.view.ViewGroup
+import androidx.activity.viewModels
+import androidx.core.graphics.Insets
+import androidx.core.view.isVisible
+import androidx.core.view.updateLayoutParams
+import androidx.core.view.updatePadding
+import androidx.recyclerview.widget.ItemTouchHelper
+import androidx.recyclerview.widget.RecyclerView
+import coil.ImageLoader
+import com.google.android.material.snackbar.Snackbar
+import dagger.hilt.android.AndroidEntryPoint
+import javax.inject.Inject
+import org.koitharu.kotatsu.R
+import org.koitharu.kotatsu.base.ui.BaseActivity
+import org.koitharu.kotatsu.base.ui.list.ListSelectionController
+import org.koitharu.kotatsu.core.model.FavouriteCategory
+import org.koitharu.kotatsu.databinding.ActivityCategoriesBinding
+import org.koitharu.kotatsu.favourites.ui.FavouritesActivity
+import org.koitharu.kotatsu.favourites.ui.categories.adapter.CategoriesAdapter
+import org.koitharu.kotatsu.favourites.ui.categories.edit.FavouritesCategoryEditActivity
+import org.koitharu.kotatsu.list.ui.adapter.ListStateHolderListener
+import org.koitharu.kotatsu.list.ui.model.ListModel
+import org.koitharu.kotatsu.parsers.model.SortOrder
+import org.koitharu.kotatsu.utils.ext.getDisplayMessage
+import org.koitharu.kotatsu.utils.ext.measureHeight
+import org.koitharu.kotatsu.utils.ext.scaleUpActivityOptionsOf
+
+@AndroidEntryPoint
+class FavouriteCategoriesActivity :
+ BaseActivity(),
+ FavouriteCategoriesListListener,
+ View.OnClickListener,
+ ListStateHolderListener {
+
+ @Inject
+ lateinit var coil: ImageLoader
+
+ private val viewModel by viewModels()
+
+ private lateinit var adapter: CategoriesAdapter
+ private lateinit var selectionController: ListSelectionController
+ private var reorderHelper: ItemTouchHelper? = null
+
+ override fun onCreate(savedInstanceState: Bundle?) {
+ super.onCreate(savedInstanceState)
+ setContentView(ActivityCategoriesBinding.inflate(layoutInflater))
+ supportActionBar?.setDisplayHomeAsUpEnabled(true)
+ adapter = CategoriesAdapter(coil, this, this, this)
+ selectionController = ListSelectionController(
+ activity = this,
+ decoration = CategoriesSelectionDecoration(this),
+ registryOwner = this,
+ callback = CategoriesSelectionCallback(binding.recyclerView, viewModel),
+ )
+ binding.buttonDone.setOnClickListener(this)
+ selectionController.attachToRecyclerView(binding.recyclerView)
+ binding.recyclerView.setHasFixedSize(true)
+ binding.recyclerView.adapter = adapter
+ binding.fabAdd.setOnClickListener(this)
+
+ viewModel.detalizedCategories.observe(this, ::onCategoriesChanged)
+ viewModel.onError.observe(this, ::onError)
+ viewModel.isInReorderMode.observe(this, ::onReorderModeChanged)
+ }
+
+ override fun onCreateOptionsMenu(menu: Menu): Boolean {
+ super.onCreateOptionsMenu(menu)
+ menuInflater.inflate(R.menu.opt_categories, menu)
+ return true
+ }
+
+ override fun onPrepareOptionsMenu(menu: Menu): Boolean {
+ menu.findItem(R.id.action_reorder)?.isVisible = !viewModel.isInReorderMode() && !viewModel.isEmpty()
+ return super.onPrepareOptionsMenu(menu)
+ }
+
+ override fun onOptionsItemSelected(item: MenuItem): Boolean {
+ return when (item.itemId) {
+ R.id.action_reorder -> {
+ viewModel.setReorderMode(true)
+ true
+ }
+ else -> super.onOptionsItemSelected(item)
+ }
+ }
+
+ override fun onBackPressed() {
+ if (viewModel.isInReorderMode()) {
+ viewModel.setReorderMode(false)
+ } else {
+ super.onBackPressed()
+ }
+ }
+
+ override fun onClick(v: View) {
+ when (v.id) {
+ R.id.button_done -> viewModel.setReorderMode(false)
+ R.id.fab_add -> startActivity(FavouritesCategoryEditActivity.newIntent(this))
+ }
+ }
+
+ override fun onItemClick(item: FavouriteCategory, view: View) {
+ if (viewModel.isInReorderMode() || selectionController.onItemClick(item.id)) {
+ return
+ }
+ val intent = FavouritesActivity.newIntent(this, item)
+ val options = scaleUpActivityOptionsOf(view)
+ startActivity(intent, options.toBundle())
+ }
+
+ override fun onItemLongClick(item: FavouriteCategory, view: View): Boolean {
+ return !viewModel.isInReorderMode() && selectionController.onItemLongClick(item.id)
+ }
+
+ override fun onDragHandleTouch(holder: RecyclerView.ViewHolder): Boolean {
+ return reorderHelper?.startDrag(holder) != null
+ }
+
+ override fun onRetryClick(error: Throwable) = Unit
+
+ override fun onEmptyActionClick() = Unit
+
+ override fun onWindowInsetsChanged(insets: Insets) {
+ binding.fabAdd.updateLayoutParams