Bookmarks feature

app/build.gradle

@@ -57,7 +57,7 @@ android {
 	}
 	lint {
 		abortOnError false
-		disable 'MissingTranslation', 'PrivateResource'
+		disable 'MissingTranslation', 'PrivateResource', 'NotifyDataSetChanged'
 	}
 	testOptions {
 		unitTests.includeAndroidResources = true
@@ -96,12 +96,12 @@ dependencies {
 	kapt 'androidx.room:room-compiler:2.4.2'
 
 	implementation 'com.squareup.okhttp3:okhttp:4.9.3'
-	implementation 'com.squareup.okio:okio:3.0.0'
+	implementation 'com.squareup.okio:okio:3.1.0'
 
 	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.1.6'
+	implementation 'io.insert-koin:koin-android:3.2.0'
 	implementation 'io.coil-kt:coil-base:2.0.0-rc03'
 	implementation 'com.davemorrissey.labs:subsampling-scale-image-view-androidx:3.10.0'
 	implementation 'com.github.solkin:disk-lru-cache:1.4'
@@ -110,7 +110,7 @@ dependencies {
 
 	testImplementation 'junit:junit:4.13.2'
 	testImplementation 'org.jetbrains.kotlinx:kotlinx-coroutines-test:1.6.1'
-	testImplementation 'io.insert-koin:koin-test-junit4:3.1.5'
+	testImplementation 'io.insert-koin:koin-test-junit4:3.2.0'
 
 	androidTestImplementation 'androidx.test:runner:1.4.0'
 	androidTestImplementation 'androidx.test:rules:1.4.0'

app/src/main/java/org/koitharu/kotatsu/KotatsuApp.kt

@@ -7,6 +7,7 @@ import androidx.fragment.app.strictmode.FragmentStrictMode
 import org.koin.android.ext.android.get
 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.databaseModule
 import org.koitharu.kotatsu.core.github.githubModule
 import org.koitharu.kotatsu.core.network.networkModule
@@ -67,6 +68,7 @@ class KotatsuApp : Application() {
 				readerModule,
 				appWidgetModule,
 				suggestionsModule,
+				bookmarksModule,
 			)
 		}
 	}

app/src/main/java/org/koitharu/kotatsu/base/ui/list/AdapterDelegateClickListenerAdapter.kt

@@ -0,0 +1,20 @@
+package org.koitharu.kotatsu.base.ui.list
+
+import android.view.View
+import android.view.View.OnClickListener
+import android.view.View.OnLongClickListener
+import com.hannesdorfmann.adapterdelegates4.dsl.AdapterDelegateViewBindingViewHolder
+
+class AdapterDelegateClickListenerAdapter<I>(
+	private val adapterDelegate: AdapterDelegateViewBindingViewHolder<I, *>,
+	private val clickListener: OnListItemClickListener<I>,
+) : OnClickListener, OnLongClickListener {
+
+	override fun onClick(v: View) {
+		clickListener.onItemClick(adapterDelegate.item, v)
+	}
+
+	override fun onLongClick(v: View): Boolean {
+		return clickListener.onItemLongClick(adapterDelegate.item, v)
+	}
+}

app/src/main/java/org/koitharu/kotatsu/bookmarks/BookmarksModule.kt

@@ -0,0 +1,10 @@
+package org.koitharu.kotatsu.bookmarks
+
+import org.koin.dsl.module
+import org.koitharu.kotatsu.bookmarks.domain.BookmarksRepository
+
+val bookmarksModule
+	get() = module {
+
+		factory { BookmarksRepository(get()) }
+	}

app/src/main/java/org/koitharu/kotatsu/bookmarks/data/BookmarkEntity.kt

@@ -0,0 +1,28 @@
+package org.koitharu.kotatsu.bookmarks.data
+
+import androidx.room.ColumnInfo
+import androidx.room.Entity
+import androidx.room.ForeignKey
+import org.koitharu.kotatsu.core.db.entity.MangaEntity
+
+@Entity(
+	tableName = "bookmarks",
+	primaryKeys = ["manga_id", "page_id"],
+	foreignKeys = [
+		ForeignKey(
+			entity = MangaEntity::class,
+			parentColumns = ["manga_id"],
+			childColumns = ["manga_id"],
+			onDelete = ForeignKey.CASCADE
+		),
+	]
+)
+class BookmarkEntity(
+	@ColumnInfo(name = "manga_id", index = true) val mangaId: Long,
+	@ColumnInfo(name = "page_id", index = true) val pageId: Long,
+	@ColumnInfo(name = "chapter_id") val chapterId: Long,
+	@ColumnInfo(name = "page") val page: Int,
+	@ColumnInfo(name = "scroll") val scroll: Int,
+	@ColumnInfo(name = "image") val imageUrl: String,
+	@ColumnInfo(name = "created_at") val createdAt: Long,
+)

app/src/main/java/org/koitharu/kotatsu/bookmarks/data/BookmarkWithManga.kt

@@ -0,0 +1,23 @@
+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<TagEntity>,
+)

app/src/main/java/org/koitharu/kotatsu/bookmarks/data/BookmarksDao.kt

@@ -0,0 +1,26 @@
+package org.koitharu.kotatsu.bookmarks.data
+
+import androidx.room.Dao
+import androidx.room.Delete
+import androidx.room.Insert
+import androidx.room.Query
+import kotlinx.coroutines.flow.Flow
+
+@Dao
+abstract class BookmarksDao {
+
+	@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<BookmarkEntity?>
+
+	@Query("SELECT * FROM bookmarks WHERE manga_id = :mangaId ORDER BY created_at DESC")
+	abstract fun observe(mangaId: Long): Flow<List<BookmarkEntity>>
+
+	@Insert
+	abstract suspend fun insert(entity: BookmarkEntity)
+
+	@Delete
+	abstract suspend fun delete(entity: BookmarkEntity)
+
+	@Query("DELETE FROM bookmarks WHERE manga_id = :mangaId AND page_id = :pageId")
+	abstract suspend fun delete(mangaId: Long, pageId: Long)
+}

app/src/main/java/org/koitharu/kotatsu/bookmarks/data/EntityMapping.kt

@@ -0,0 +1,31 @@
+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,
+	chapterId = chapterId,
+	page = page,
+	scroll = scroll,
+	imageUrl = imageUrl,
+	createdAt = Date(createdAt),
+)
+
+fun Bookmark.toEntity() = BookmarkEntity(
+	mangaId = manga.id,
+	pageId = pageId,
+	chapterId = chapterId,
+	page = page,
+	scroll = scroll,
+	imageUrl = imageUrl,
+	createdAt = createdAt.time,
+)

app/src/main/java/org/koitharu/kotatsu/bookmarks/domain/Bookmark.kt

@@ -0,0 +1,43 @@
+package org.koitharu.kotatsu.bookmarks.domain
+
+import org.koitharu.kotatsu.parsers.model.Manga
+import java.util.*
+
+class Bookmark(
+	val manga: Manga,
+	val pageId: Long,
+	val chapterId: Long,
+	val page: Int,
+	val scroll: Int,
+	val imageUrl: String,
+	val createdAt: Date,
+) {
+
+	override fun equals(other: Any?): Boolean {
+		if (this === other) return true
+		if (javaClass != other?.javaClass) return false
+
+		other as Bookmark
+
+		if (manga != other.manga) return false
+		if (pageId != other.pageId) return false
+		if (chapterId != other.chapterId) return false
+		if (page != other.page) return false
+		if (scroll != other.scroll) return false
+		if (imageUrl != other.imageUrl) return false
+		if (createdAt != other.createdAt) return false
+
+		return true
+	}
+
+	override fun hashCode(): Int {
+		var result = manga.hashCode()
+		result = 31 * result + pageId.hashCode()
+		result = 31 * result + chapterId.hashCode()
+		result = 31 * result + page
+		result = 31 * result + scroll
+		result = 31 * result + imageUrl.hashCode()
+		result = 31 * result + createdAt.hashCode()
+		return result
+	}
+}

app/src/main/java/org/koitharu/kotatsu/bookmarks/domain/BookmarksRepository.kt

@@ -0,0 +1,38 @@
+package org.koitharu.kotatsu.bookmarks.domain
+
+import androidx.room.withTransaction
+import kotlinx.coroutines.flow.Flow
+import kotlinx.coroutines.flow.map
+import org.koitharu.kotatsu.bookmarks.data.toBookmark
+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.parsers.model.Manga
+import org.koitharu.kotatsu.utils.ext.mapItems
+
+class BookmarksRepository(
+	private val db: MangaDatabase,
+) {
+
+	fun observeBookmark(manga: Manga, chapterId: Long, page: Int): Flow<Bookmark?> {
+		return db.bookmarksDao.observe(manga.id, chapterId, page).map { it?.toBookmark(manga) }
+	}
+
+	fun observeBookmarks(manga: Manga): Flow<List<Bookmark>> {
+		return db.bookmarksDao.observe(manga.id).mapItems { it.toBookmark(manga) }
+	}
+
+	suspend fun addBookmark(bookmark: Bookmark) {
+		db.withTransaction {
+			val tags = bookmark.manga.tags.toEntities()
+			db.tagsDao.upsert(tags)
+			db.mangaDao.upsert(bookmark.manga.toEntity(), tags)
+			db.bookmarksDao.insert(bookmark.toEntity())
+		}
+	}
+
+	suspend fun removeBookmark(mangaId: Long, pageId: Long) {
+		db.bookmarksDao.delete(mangaId, pageId)
+	}
+}

app/src/main/java/org/koitharu/kotatsu/bookmarks/ui/BookmarkListAD.kt

@@ -0,0 +1,51 @@
+package org.koitharu.kotatsu.bookmarks.ui
+
+import androidx.lifecycle.LifecycleOwner
+import coil.ImageLoader
+import coil.request.Disposable
+import coil.size.Scale
+import coil.util.CoilUtils
+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.bookmarks.domain.Bookmark
+import org.koitharu.kotatsu.databinding.ItemBookmarkBinding
+import org.koitharu.kotatsu.utils.ext.enqueueWith
+import org.koitharu.kotatsu.utils.ext.newImageRequest
+import org.koitharu.kotatsu.utils.ext.referer
+
+fun bookmarkListAD(
+	coil: ImageLoader,
+	lifecycleOwner: LifecycleOwner,
+	clickListener: OnListItemClickListener<Bookmark>,
+) = adapterDelegateViewBinding<Bookmark, Bookmark, ItemBookmarkBinding>(
+	{ inflater, parent -> ItemBookmarkBinding.inflate(inflater, parent, false) }
+) {
+
+	var imageRequest: Disposable? = null
+	val listener = AdapterDelegateClickListenerAdapter(this, clickListener)
+
+	binding.root.setOnClickListener(listener)
+	binding.root.setOnLongClickListener(listener)
+
+	bind {
+		imageRequest?.dispose()
+		imageRequest = binding.imageViewThumb.newImageRequest(item.imageUrl)
+			.referer(item.manga.publicUrl)
+			.placeholder(R.drawable.ic_placeholder)
+			.fallback(R.drawable.ic_placeholder)
+			.error(R.drawable.ic_placeholder)
+			.allowRgb565(true)
+			.scale(Scale.FILL)
+			.lifecycle(lifecycleOwner)
+			.enqueueWith(coil)
+	}
+
+	onViewRecycled {
+		imageRequest?.dispose()
+		imageRequest = null
+		CoilUtils.dispose(binding.imageViewThumb)
+		binding.imageViewThumb.setImageDrawable(null)
+	}
+}

app/src/main/java/org/koitharu/kotatsu/bookmarks/ui/BookmarksAdapter.kt

@@ -0,0 +1,30 @@
+package org.koitharu.kotatsu.bookmarks.ui
+
+import androidx.lifecycle.LifecycleOwner
+import androidx.recyclerview.widget.DiffUtil
+import coil.ImageLoader
+import com.hannesdorfmann.adapterdelegates4.AsyncListDifferDelegationAdapter
+import org.koitharu.kotatsu.base.ui.list.OnListItemClickListener
+import org.koitharu.kotatsu.bookmarks.domain.Bookmark
+
+class BookmarksAdapter(
+	coil: ImageLoader,
+	lifecycleOwner: LifecycleOwner,
+	clickListener: OnListItemClickListener<Bookmark>,
+) : AsyncListDifferDelegationAdapter<Bookmark>(
+	DiffCallback(),
+	bookmarkListAD(coil, lifecycleOwner, clickListener)
+) {
+
+	private class DiffCallback : DiffUtil.ItemCallback<Bookmark>() {
+
+		override fun areItemsTheSame(oldItem: Bookmark, newItem: Bookmark): Boolean {
+			return oldItem.manga.id == newItem.manga.id && oldItem.chapterId == newItem.chapterId
+		}
+
+		override fun areContentsTheSame(oldItem: Bookmark, newItem: Bookmark): Boolean {
+			return oldItem.imageUrl == newItem.imageUrl
+		}
+
+	}
+}

app/src/main/java/org/koitharu/kotatsu/core/db/MangaDatabase.kt

@@ -4,6 +4,8 @@ import android.content.Context
 import androidx.room.Database
 import androidx.room.Room
 import androidx.room.RoomDatabase
+import org.koitharu.kotatsu.bookmarks.data.BookmarkEntity
+import org.koitharu.kotatsu.bookmarks.data.BookmarksDao
 import org.koitharu.kotatsu.core.db.dao.*
 import org.koitharu.kotatsu.core.db.entity.*
 import org.koitharu.kotatsu.core.db.migrations.*
@@ -20,9 +22,9 @@ import org.koitharu.kotatsu.suggestions.data.SuggestionEntity
 	entities = [
 		MangaEntity::class, TagEntity::class, HistoryEntity::class, MangaTagsEntity::class,
 		FavouriteCategoryEntity::class, FavouriteEntity::class, MangaPrefsEntity::class,
-		TrackEntity::class, TrackLogEntity::class, SuggestionEntity::class
+		TrackEntity::class, TrackLogEntity::class, SuggestionEntity::class, BookmarkEntity::class,
 	],
-	version = 10
+	version = 11,
 )
 abstract class MangaDatabase : RoomDatabase() {
 
@@ -43,6 +45,8 @@ abstract class MangaDatabase : RoomDatabase() {
 	abstract val trackLogsDao: TrackLogsDao
 
 	abstract val suggestionDao: SuggestionDao
+
+	abstract val bookmarksDao: BookmarksDao
 }
 
 fun MangaDatabase(context: Context): MangaDatabase = Room.databaseBuilder(
@@ -59,6 +63,7 @@ fun MangaDatabase(context: Context): MangaDatabase = Room.databaseBuilder(
 	Migration7To8(),
 	Migration8To9(),
 	Migration9To10(),
+	Migration10To11(),
 ).addCallback(
 	DatabasePrePopulateCallback(context.resources)
 ).build()

app/src/main/java/org/koitharu/kotatsu/core/db/migrations/Migration10To11.kt

@@ -0,0 +1,26 @@
+package org.koitharu.kotatsu.core.db.migrations
+
+import androidx.room.migration.Migration
+import androidx.sqlite.db.SupportSQLiteDatabase
+
+class Migration10To11 : Migration(10, 11) {
+
+	override fun migrate(database: SupportSQLiteDatabase) {
+		database.execSQL(
+			"""
+			CREATE TABLE IF NOT EXISTS `bookmarks` (
+				`manga_id` INTEGER NOT NULL,
+				`page_id` INTEGER NOT NULL,
+				`chapter_id` INTEGER NOT NULL, 
+				`page` INTEGER NOT NULL,
+				`scroll` INTEGER NOT NULL,
+				`image` TEXT NOT NULL,
+				`created_at` INTEGER NOT NULL,
+				PRIMARY KEY(`manga_id`, `page_id`),
+				FOREIGN KEY(`manga_id`) REFERENCES `manga`(`manga_id`) ON UPDATE NO ACTION ON DELETE CASCADE )
+			""".trimIndent()
+		)
+		database.execSQL("CREATE INDEX IF NOT EXISTS `index_bookmarks_manga_id` ON `bookmarks` (`manga_id`)")
+		database.execSQL("CREATE INDEX IF NOT EXISTS `index_bookmarks_page_id` ON `bookmarks` (`page_id`)")
+	}
+}

app/src/main/java/org/koitharu/kotatsu/details/DetailsModule.kt

@@ -8,6 +8,6 @@ val detailsModule
 	get() = module {
 
 		viewModel { intent ->
-			DetailsViewModel(intent.get(), get(), get(), get(), get(), get(), get())
+			DetailsViewModel(intent.get(), get(), get(), get(), get(), get(), get(), get())
 		}
 	}

app/src/main/java/org/koitharu/kotatsu/details/ui/DetailsActivity.kt

@@ -83,6 +83,9 @@ class DetailsActivity :
 		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), longDuration = false)
+		}
 
 		registerReceiver(downloadReceiver, IntentFilter(DownloadService.ACTION_DOWNLOAD_COMPLETE))
 	}

app/src/main/java/org/koitharu/kotatsu/details/ui/DetailsFragment.kt

@@ -10,6 +10,7 @@ import androidx.core.content.ContextCompat
 import androidx.core.graphics.Insets
 import androidx.core.net.toUri
 import androidx.core.text.parseAsHtml
+import androidx.core.view.isGone
 import androidx.core.view.isVisible
 import androidx.core.view.updatePadding
 import coil.ImageLoader
@@ -21,7 +22,11 @@ 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.core.model.MangaHistory
 import org.koitharu.kotatsu.databinding.FragmentDetailsBinding
 import org.koitharu.kotatsu.favourites.ui.categories.select.FavouriteCategoriesBottomSheet
@@ -41,7 +46,8 @@ class DetailsFragment :
 	BaseFragment<FragmentDetailsBinding>(),
 	View.OnClickListener,
 	View.OnLongClickListener,
-	ChipsView.OnChipClickListener {
+	ChipsView.OnChipClickListener,
+	OnListItemClickListener<Bookmark> {
 
 	private val viewModel by sharedViewModel<DetailsViewModel>()
 	private val coil by inject<ImageLoader>(mode = LazyThreadSafetyMode.NONE)
@@ -69,6 +75,7 @@ class DetailsFragment :
 		viewModel.isLoading.observe(viewLifecycleOwner, ::onLoadingStateChanged)
 		viewModel.favouriteCategories.observe(viewLifecycleOwner, ::onFavouriteChanged)
 		viewModel.readingHistory.observe(viewLifecycleOwner, ::onHistoryChanged)
+		viewModel.bookmarks.observe(viewLifecycleOwner, ::onBookmarksChanged)
 	}
 
 	override fun onCreateOptionsMenu(menu: Menu, inflater: MenuInflater) {
@@ -76,6 +83,24 @@ class DetailsFragment :
 		inflater.inflate(R.menu.opt_details_info, menu)
 	}
 
+	override fun onItemClick(item: Bookmark, view: View) {
+		val options = ActivityOptions.makeScaleUpAnimation(view, 0, 0, view.measuredWidth, view.measuredHeight)
+		startActivity(ReaderActivity.newIntent(view.context, item), options.toBundle())
+	}
+
+	override fun onItemLongClick(item: Bookmark, view: View): Boolean {
+		val menu = PopupMenu(view.context, view)
+		menu.inflate(R.menu.popup_bookmark)
+		menu.setOnMenuItemClickListener { menuItem ->
+			when (menuItem.itemId) {
+				R.id.action_remove -> viewModel.removeBookmark(item)
+			}
+			true
+		}
+		menu.show()
+		return true
+	}
+
 	private fun onMangaUpdated(manga: Manga) {
 		with(binding) {
 			// Main
@@ -176,6 +201,20 @@ class DetailsFragment :
 		}
 	}
 
+	private fun onBookmarksChanged(bookmarks: List<Bookmark>) {
+		var adapter = binding.recyclerViewBookmarks.adapter as? BookmarksAdapter
+		binding.groupBookmarks.isGone = bookmarks.isEmpty()
+		if (adapter != null) {
+			adapter.items = bookmarks
+		} else {
+			adapter = BookmarksAdapter(coil, viewLifecycleOwner, this)
+			adapter.items = bookmarks
+			binding.recyclerViewBookmarks.adapter = adapter
+			val spacing = resources.getDimensionPixelOffset(R.dimen.bookmark_list_spacing)
+			binding.recyclerViewBookmarks.addItemDecoration(SpacingItemDecoration(spacing))
+		}
+	}
+
 	override fun onClick(v: View) {
 		val manga = viewModel.manga.value ?: return
 		when (v.id) {

app/src/main/java/org/koitharu/kotatsu/details/ui/DetailsViewModel.kt

@@ -10,9 +10,12 @@ import kotlinx.coroutines.flow.*
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.plus
 import org.koitharu.kotatsu.BuildConfig
+import org.koitharu.kotatsu.R
 import org.koitharu.kotatsu.base.domain.MangaDataRepository
 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.exceptions.MangaNotFoundException
 import org.koitharu.kotatsu.core.parser.MangaRepository
 import org.koitharu.kotatsu.core.prefs.AppSettings
@@ -39,6 +42,7 @@ class DetailsViewModel(
 	private val localMangaRepository: LocalMangaRepository,
 	private val trackingRepository: TrackingRepository,
 	private val mangaDataRepository: MangaDataRepository,
+	private val bookmarksRepository: BookmarksRepository,
 	private val settings: AppSettings,
 ) : BaseViewModel() {
 
@@ -46,6 +50,8 @@ class DetailsViewModel(
 	private val mangaData = MutableStateFlow(intent.manga)
 	private val selectedBranch = MutableStateFlow<String?>(null)
 
+	val onShowToast = SingleLiveEvent<Int>()
+
 	private val history = mangaData.mapNotNull { it?.id }
 		.distinctUntilChanged()
 		.flatMapLatest { mangaId ->
@@ -85,6 +91,10 @@ class DetailsViewModel(
 	val isChaptersReversed = chaptersReversed
 		.asLiveData(viewModelScope.coroutineContext)
 
+	val bookmarks = mangaData.flatMapLatest {
+		if (it != null) bookmarksRepository.observeBookmarks(it) else flowOf(emptyList())
+	}.asLiveDataDistinct(viewModelScope.coroutineContext + Dispatchers.Default)
+
 	val onMangaRemoved = SingleLiveEvent<Manga>()
 
 	val branches = mangaData.map {
@@ -149,6 +159,13 @@ class DetailsViewModel(
 		}
 	}
 
+	fun removeBookmark(bookmark: Bookmark) {
+		launchJob {
+			bookmarksRepository.removeBookmark(bookmark.manga.id, bookmark.pageId)
+			onShowToast.call(R.string.bookmark_removed)
+		}
+	}
+
 	fun setChaptersReversed(newValue: Boolean) {
 		settings.chaptersReverse = newValue
 	}

app/src/main/java/org/koitharu/kotatsu/details/ui/adapter/ChapterListItemAD.kt

@@ -1,9 +1,9 @@
 package org.koitharu.kotatsu.details.ui.adapter
 
-import android.view.View
 import androidx.core.view.isVisible
 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.databinding.ItemChapterBinding
 import org.koitharu.kotatsu.details.ui.model.ChapterListItem
@@ -21,11 +21,7 @@ fun chapterListItemAD(
 	{ inflater, parent -> ItemChapterBinding.inflate(inflater, parent, false) }
 ) {
 
-	val eventListener = object : View.OnClickListener, View.OnLongClickListener {
+	val eventListener = AdapterDelegateClickListenerAdapter(this, clickListener)
-		override fun onClick(v: View) = clickListener.onItemClick(item, v)
-		override fun onLongClick(v: View) = clickListener.onItemLongClick(item, v)
-	}
-
 	itemView.setOnClickListener(eventListener)
 	itemView.setOnLongClickListener(eventListener)
 

app/src/main/java/org/koitharu/kotatsu/list/ui/filter/FilterBottomSheet.kt

@@ -6,7 +6,6 @@ import android.os.Bundle
 import android.view.*
 import androidx.appcompat.widget.SearchView
 import androidx.fragment.app.FragmentManager
-import org.koin.androidx.viewmodel.ViewModelOwner.Companion.from
 import org.koin.androidx.viewmodel.ext.android.sharedViewModel
 import org.koitharu.kotatsu.R
 import org.koitharu.kotatsu.base.ui.BaseBottomSheet
@@ -14,11 +13,14 @@ import org.koitharu.kotatsu.databinding.SheetFilterBinding
 import org.koitharu.kotatsu.remotelist.ui.RemoteListViewModel
 import org.koitharu.kotatsu.utils.BottomSheetToolbarController
 
-class FilterBottomSheet : BaseBottomSheet<SheetFilterBinding>(), MenuItem.OnActionExpandListener,
+class FilterBottomSheet :
-	SearchView.OnQueryTextListener, DialogInterface.OnKeyListener {
+	BaseBottomSheet<SheetFilterBinding>(),
+	MenuItem.OnActionExpandListener,
+	SearchView.OnQueryTextListener,
+	DialogInterface.OnKeyListener {
 
 	private val viewModel by sharedViewModel<RemoteListViewModel>(
-		owner = { from(requireParentFragment(), requireParentFragment()) }
+		owner = { requireParentFragment() }
 	)
 
 	override fun onCreateDialog(savedInstanceState: Bundle?): Dialog {

app/src/main/java/org/koitharu/kotatsu/reader/ReaderModule.kt

@@ -26,6 +26,7 @@ val readerModule
 				shortcutsRepository = get(),
 				settings = get(),
 				pageSaveHelper = get(),
+				bookmarksRepository = get(),
 			)
 		}
 	}

app/src/main/java/org/koitharu/kotatsu/reader/ui/ReaderActivity.kt

@@ -29,6 +29,7 @@ import org.koitharu.kotatsu.BuildConfig
 import org.koitharu.kotatsu.R
 import org.koitharu.kotatsu.base.domain.MangaIntent
 import org.koitharu.kotatsu.base.ui.BaseFullscreenActivity
+import org.koitharu.kotatsu.bookmarks.domain.Bookmark
 import org.koitharu.kotatsu.core.exceptions.resolve.ExceptionResolver
 import org.koitharu.kotatsu.core.model.parcelable.ParcelableManga
 import org.koitharu.kotatsu.core.prefs.ReaderMode
@@ -103,6 +104,12 @@ class ReaderActivity :
 			onLoadingStateChanged(viewModel.isLoading.value == true)
 		}
 		viewModel.isScreenshotsBlockEnabled.observe(this, this::setWindowSecure)
+		viewModel.isBookmarkAdded.observe(this, this::onBookmarkStateChanged)
+		viewModel.onShowToast.observe(this) { msgId ->
+			Snackbar.make(binding.container, msgId, Snackbar.LENGTH_SHORT)
+				.setAnchorView(binding.appbarBottom)
+				.show()
+		}
 	}
 
 	private fun onInitReader(mode: ReaderMode) {
@@ -189,6 +196,13 @@ class ReaderActivity :
 					viewModel.saveCurrentPage(page, savePageRequest)
 				} ?: showWaitWhileLoading()
 			}
+			R.id.action_bookmark -> {
+				if (viewModel.isBookmarkAdded.value == true) {
+					viewModel.removeBookmark()
+				} else {
+					viewModel.addBookmark()
+				}
+			}
 			else -> return super.onOptionsItemSelected(item)
 		}
 		return true
@@ -309,8 +323,8 @@ class ReaderActivity :
 			val transition = TransitionSet()
 				.setOrdering(TransitionSet.ORDERING_TOGETHER)
 				.addTransition(Slide(Gravity.TOP).addTarget(binding.appbarTop))
-			binding.appbarBottom?.let { botomBar ->
+			binding.appbarBottom?.let { bottomBar ->
-				transition.addTransition(Slide(Gravity.BOTTOM).addTarget(botomBar))
+				transition.addTransition(Slide(Gravity.BOTTOM).addTarget(bottomBar))
 			}
 			TransitionManager.beginDelayedTransition(binding.root, transition)
 			binding.appbarTop.isVisible = isUiVisible
@@ -351,6 +365,12 @@ class ReaderActivity :
 		setUiIsVisible(!binding.appbarTop.isVisible)
 	}
 
+	private fun onBookmarkStateChanged(isAdded: Boolean) {
+		val menuItem = binding.toolbarBottom.menu.findItem(R.id.action_bookmark) ?: return
+		menuItem.setTitle(if (isAdded) R.string.bookmark_remove else R.string.bookmark_add)
+		menuItem.setIcon(if (isAdded) R.drawable.ic_bookmark_added else R.drawable.ic_bookmark)
+	}
+
 	private fun onUiStateChanged(uiState: ReaderUiState, previous: ReaderUiState?) {
 		title = uiState.chapterName ?: uiState.mangaName ?: getString(R.string.loading_)
 		supportActionBar?.subtitle = if (uiState.chapterNumber in 1..uiState.chaptersTotal) {
@@ -419,6 +439,11 @@ class ReaderActivity :
 				.putExtra(EXTRA_STATE, state)
 		}
 
+		fun newIntent(context: Context, bookmark: Bookmark): Intent {
+			val state = ReaderState(bookmark.chapterId, bookmark.page, bookmark.scroll)
+			return newIntent(context, bookmark.manga, state)
+		}
+
 		fun newIntent(context: Context, mangaId: Long): Intent {
 			return Intent(context, ReaderActivity::class.java)
 				.putExtra(MangaIntent.KEY_ID, mangaId)

app/src/main/java/org/koitharu/kotatsu/reader/ui/ReaderState.kt

@@ -9,23 +9,20 @@ import org.koitharu.kotatsu.parsers.model.Manga
 data class ReaderState(
 	val chapterId: Long,
 	val page: Int,
-	val scroll: Int
+	val scroll: Int,
 ) : Parcelable {
 
-	companion object {
+	constructor(history: MangaHistory) : this(
-
-		fun from(history: MangaHistory) = ReaderState(
 		chapterId = history.chapterId,
 		page = history.page,
-			scroll = history.scroll
+		scroll = history.scroll,
 	)
 
-		fun initial(manga: Manga, branch: String?) = ReaderState(
+	constructor(manga: Manga, branch: String?) : this(
 		chapterId = manga.chapters?.firstOrNull {
 			it.branch == branch
 		}?.id ?: error("Cannot find first chapter"),
 		page = 0,
-			scroll = 0
+		scroll = 0,
 	)
 }
-}

app/src/main/java/org/koitharu/kotatsu/reader/ui/ReaderViewModel.kt

@@ -3,6 +3,7 @@ package org.koitharu.kotatsu.reader.ui
 import android.net.Uri
 import android.util.LongSparseArray
 import androidx.activity.result.ActivityResultLauncher
+import androidx.lifecycle.LiveData
 import androidx.lifecycle.MutableLiveData
 import androidx.lifecycle.viewModelScope
 import kotlinx.coroutines.*
@@ -10,10 +11,13 @@ import kotlinx.coroutines.flow.*
 import org.koin.core.component.KoinComponent
 import org.koin.core.component.get
 import org.koitharu.kotatsu.BuildConfig
+import org.koitharu.kotatsu.R
 import org.koitharu.kotatsu.base.domain.MangaDataRepository
 import org.koitharu.kotatsu.base.domain.MangaIntent
 import org.koitharu.kotatsu.base.domain.MangaUtils
 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.exceptions.MangaNotFoundException
 import org.koitharu.kotatsu.core.os.ShortcutsRepository
 import org.koitharu.kotatsu.core.parser.MangaRepository
@@ -31,6 +35,7 @@ import org.koitharu.kotatsu.utils.SingleLiveEvent
 import org.koitharu.kotatsu.utils.ext.IgnoreErrors
 import org.koitharu.kotatsu.utils.ext.asLiveDataDistinct
 import org.koitharu.kotatsu.utils.ext.processLifecycleScope
+import java.util.*
 
 class ReaderViewModel(
 	private val intent: MangaIntent,
@@ -39,12 +44,14 @@ class ReaderViewModel(
 	private val dataRepository: MangaDataRepository,
 	private val historyRepository: HistoryRepository,
 	private val shortcutsRepository: ShortcutsRepository,
+	private val bookmarksRepository: BookmarksRepository,
 	private val settings: AppSettings,
 	private val pageSaveHelper: PageSaveHelper,
 ) : BaseViewModel() {
 
 	private var loadingJob: Job? = null
 	private var pageSaveJob: Job? = null
+	private var bookmarkJob: Job? = null
 	private val currentState = MutableStateFlow(initialState)
 	private val mangaData = MutableStateFlow(intent.manga)
 	private val chapters = LongSparseArray<MangaChapter>()
@@ -53,6 +60,7 @@ class ReaderViewModel(
 
 	val readerMode = MutableLiveData<ReaderMode>()
 	val onPageSaved = SingleLiveEvent<Uri?>()
+	val onShowToast = SingleLiveEvent<Int>()
 	val uiState = combine(
 		mangaData,
 		currentState,
@@ -89,6 +97,16 @@ class ReaderViewModel(
 
 	val onZoomChanged = SingleLiveEvent<Unit>()
 
+	val isBookmarkAdded: LiveData<Boolean> = currentState.flatMapLatest { state ->
+		val manga = mangaData.value
+		if (state == null || manga == null) {
+			flowOf(false)
+		} else {
+			bookmarksRepository.observeBookmark(manga, state.chapterId, state.page)
+				.map { it != null }
+		}
+	}.asLiveDataDistinct(viewModelScope.coroutineContext + Dispatchers.Default)
+
 	init {
 		loadImpl()
 		subscribeToSettings()
@@ -187,10 +205,9 @@ class ReaderViewModel(
 
 	fun onCurrentPageChanged(position: Int) {
 		val pages = content.value?.pages ?: return
-		pages.getOrNull(position)?.let {
+		pages.getOrNull(position)?.let { page ->
-			val currentValue = currentState.value
+			currentState.update { cs ->
-			if (currentValue != null && currentValue.chapterId != it.chapterId) {
+				cs?.copy(chapterId = page.chapterId, page = page.index)
-				currentState.value = currentValue.copy(chapterId = it.chapterId)
 			}
 		}
 		if (pages.isEmpty() || loadingJob?.isActive == true) {
@@ -207,6 +224,41 @@ class ReaderViewModel(
 		}
 	}
 
+	fun addBookmark() {
+		if (bookmarkJob?.isActive == true) {
+			return
+		}
+		bookmarkJob = launchJob {
+			loadingJob?.join()
+			val state = checkNotNull(currentState.value)
+			val page = checkNotNull(getCurrentPage()) { "Page not found" }
+			val bookmark = Bookmark(
+				manga = checkNotNull(mangaData.value),
+				pageId = page.id,
+				chapterId = state.chapterId,
+				page = state.page,
+				scroll = state.scroll,
+				imageUrl = page.preview ?: pageLoader.getPageUrl(page),
+				createdAt = Date(),
+			)
+			bookmarksRepository.addBookmark(bookmark)
+			onShowToast.call(R.string.bookmark_added)
+		}
+	}
+
+	fun removeBookmark() {
+		if (bookmarkJob?.isActive == true) {
+			return
+		}
+		bookmarkJob = launchJob {
+			loadingJob?.join()
+			val manga = checkNotNull(mangaData.value)
+			val page = checkNotNull(getCurrentPage()) { "Page not found" }
+			bookmarksRepository.removeBookmark(manga.id, page.id)
+			onShowToast.call(R.string.bookmark_removed)
+		}
+	}
+
 	private fun loadImpl() {
 		loadingJob = launchLoadingJob(Dispatchers.Default) {
 			var manga = dataRepository.resolveIntent(intent) ?: throw MangaNotFoundException("Cannot find manga")
@@ -229,8 +281,8 @@ class ReaderViewModel(
 			// obtain state
 			if (currentState.value == null) {
 				currentState.value = historyRepository.getOne(manga)?.let {
-					ReaderState.from(it)
+					ReaderState(it)
-				} ?: ReaderState.initial(manga, preselectedBranch)
+				} ?: ReaderState(manga, preselectedBranch)
 			}
 
 			val branch = chapters[currentState.value?.chapterId ?: 0L].branch
@@ -259,7 +311,7 @@ class ReaderViewModel(
 		val chapter = checkNotNull(chapters[chapterId]) { "Requested chapter not found" }
 		val repo = MangaRepository(manga.source)
 		return repo.getPages(chapter).mapIndexed { index, page ->
-			ReaderPage.from(page, index, chapterId)
+			ReaderPage(page, index, chapterId)
 		}
 	}
 

app/src/main/java/org/koitharu/kotatsu/reader/ui/pager/ReaderPage.kt

@@ -13,27 +13,24 @@ data class ReaderPage(
 	val preview: String?,
 	val chapterId: Long,
 	val index: Int,
-	val source: MangaSource
+	val source: MangaSource,
 ) : Parcelable {
 
-	fun toMangaPage() = MangaPage(
+	constructor(page: MangaPage, index: Int, chapterId: Long) : this(
-		id = id,
-		url = url,
-		referer = referer,
-		preview = preview,
-		source = source
-	)
-
-	companion object {
-
-		fun from(page: MangaPage, index: Int, chapterId: Long) = ReaderPage(
 		id = page.id,
 		url = page.url,
 		referer = page.referer,
 		preview = page.preview,
 		chapterId = chapterId,
 		index = index,
-			source = page.source
+		source = page.source,
+	)
+
+	fun toMangaPage() = MangaPage(
+		id = id,
+		url = url,
+		referer = referer,
+		preview = preview,
+		source = source,
 	)
-	}
 }

app/src/main/res/drawable/ic_bookmark.xml

@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector
+	xmlns:android="http://schemas.android.com/apk/res/android"
+	android:width="24dp"
+	android:height="24dp"
+	android:tint="?attr/colorControlNormal"
+	android:viewportWidth="24"
+	android:viewportHeight="24">
+	<path
+		android:fillColor="#000"
+		android:pathData="M17,18L12,15.82L7,18V5H17M17,3H7A2,2 0 0,0 5,5V21L12,18L19,21V5C19,3.89 18.1,3 17,3Z" />
+</vector>

app/src/main/res/drawable/ic_bookmark_added.xml

@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector
+	xmlns:android="http://schemas.android.com/apk/res/android"
+	android:width="24dp"
+	android:height="24dp"
+	android:tint="?attr/colorControlNormal"
+	android:viewportWidth="24"
+	android:viewportHeight="24">
+	<path
+		android:fillColor="#000"
+		android:pathData="M9.47 9.65L8.06 11.07L11 14L16.19 8.82L14.78 7.4L11 11.18M17 3H7C5.9 3 5 3.9 5 5L5 21L12 18L19 21V5C19 3.9 18.1 3 17 3M17 18L12 15.82L7 18V5H17Z" />
+</vector>

app/src/main/res/layout-w600dp/fragment_details.xml

@@ -157,6 +157,37 @@
 			app:layout_constraintStart_toStartOf="parent"
 			app:layout_constraintTop_toBottomOf="@+id/layout_titles" />
 
+		<TextView
+			android:id="@+id/textView_bookmarks"
+			android:layout_width="0dp"
+			android:layout_height="wrap_content"
+			android:layout_marginTop="16dp"
+			android:gravity="center_vertical|start"
+			android:paddingStart="16dp"
+			android:paddingEnd="16dp"
+			android:singleLine="true"
+			android:text="@string/bookmarks"
+			android:textAppearance="@style/TextAppearance.Kotatsu.SectionHeader"
+			app:layout_constraintEnd_toEndOf="parent"
+			app:layout_constraintStart_toStartOf="parent"
+			app:layout_constraintTop_toBottomOf="@id/chips_tags" />
+
+		<androidx.recyclerview.widget.RecyclerView
+			android:id="@+id/recyclerView_bookmarks"
+			android:layout_width="0dp"
+			android:layout_height="wrap_content"
+			android:layout_marginTop="4dp"
+			android:layout_marginBottom="6dp"
+			android:clipToPadding="false"
+			android:orientation="horizontal"
+			android:paddingStart="12dp"
+			android:paddingEnd="12dp"
+			app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
+			app:layout_constraintEnd_toEndOf="parent"
+			app:layout_constraintStart_toStartOf="parent"
+			app:layout_constraintTop_toBottomOf="@id/textView_bookmarks"
+			tools:listitem="@layout/item_bookmark" />
+
 		<TextView
 			android:id="@+id/textView_description"
 			android:layout_width="0dp"
@@ -171,7 +202,7 @@
 			app:layout_constraintBottom_toBottomOf="parent"
 			app:layout_constraintEnd_toEndOf="parent"
 			app:layout_constraintStart_toStartOf="parent"
-			app:layout_constraintTop_toBottomOf="@id/chips_tags"
+			app:layout_constraintTop_toBottomOf="@id/recyclerView_bookmarks"
 			tools:ignore="UnusedAttribute"
 			tools:text="@tools:sample/lorem/random[250]" />
 
@@ -189,6 +220,14 @@
 			app:showAnimationBehavior="inward"
 			tools:visibility="visible" />
 
+		<androidx.constraintlayout.widget.Group
+			android:id="@+id/group_bookmarks"
+			android:layout_width="wrap_content"
+			android:layout_height="wrap_content"
+			android:visibility="gone"
+			app:constraint_referenced_ids="recyclerView_bookmarks,textView_bookmarks"
+			tools:visibility="visible" />
+
 	</androidx.constraintlayout.widget.ConstraintLayout>
 
 </androidx.core.widget.NestedScrollView>

app/src/main/res/layout/fragment_details.xml

@@ -161,6 +161,37 @@
 			app:layout_constraintStart_toStartOf="parent"
 			app:layout_constraintTop_toBottomOf="@+id/button_read" />
 
+		<TextView
+			android:id="@+id/textView_bookmarks"
+			android:layout_width="0dp"
+			android:layout_height="wrap_content"
+			android:layout_marginTop="16dp"
+			android:gravity="center_vertical|start"
+			android:paddingStart="16dp"
+			android:paddingEnd="16dp"
+			android:singleLine="true"
+			android:text="@string/bookmarks"
+			android:textAppearance="@style/TextAppearance.Kotatsu.SectionHeader"
+			app:layout_constraintEnd_toEndOf="parent"
+			app:layout_constraintStart_toStartOf="parent"
+			app:layout_constraintTop_toBottomOf="@id/chips_tags" />
+
+		<androidx.recyclerview.widget.RecyclerView
+			android:id="@+id/recyclerView_bookmarks"
+			android:layout_width="0dp"
+			android:layout_height="wrap_content"
+			android:layout_marginTop="4dp"
+			android:layout_marginBottom="6dp"
+			android:clipToPadding="false"
+			android:orientation="horizontal"
+			android:paddingStart="12dp"
+			android:paddingEnd="12dp"
+			app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
+			app:layout_constraintEnd_toEndOf="parent"
+			app:layout_constraintStart_toStartOf="parent"
+			app:layout_constraintTop_toBottomOf="@id/textView_bookmarks"
+			tools:listitem="@layout/item_bookmark" />
+
 		<TextView
 			android:id="@+id/textView_description"
 			android:layout_width="0dp"
@@ -175,7 +206,7 @@
 			app:layout_constraintBottom_toBottomOf="parent"
 			app:layout_constraintEnd_toEndOf="parent"
 			app:layout_constraintStart_toStartOf="parent"
-			app:layout_constraintTop_toBottomOf="@id/chips_tags"
+			app:layout_constraintTop_toBottomOf="@id/recyclerView_bookmarks"
 			tools:ignore="UnusedAttribute"
 			tools:text="@tools:sample/lorem/random[250]" />
 
@@ -193,6 +224,14 @@
 			app:showAnimationBehavior="inward"
 			tools:visibility="visible" />
 
+		<androidx.constraintlayout.widget.Group
+			android:id="@+id/group_bookmarks"
+			android:layout_width="wrap_content"
+			android:layout_height="wrap_content"
+			android:visibility="gone"
+			app:constraint_referenced_ids="recyclerView_bookmarks,textView_bookmarks"
+			tools:visibility="visible" />
+
 	</androidx.constraintlayout.widget.ConstraintLayout>
 
 </androidx.core.widget.NestedScrollView>

app/src/main/res/layout/item_bookmark.xml

@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<com.google.android.material.card.MaterialCardView
+	xmlns:android="http://schemas.android.com/apk/res/android"
+	xmlns:app="http://schemas.android.com/apk/res-auto"
+	xmlns:tools="http://schemas.android.com/tools"
+	style="@style/Widget.Material3.CardView.Outlined"
+	android:layout_width="wrap_content"
+	android:layout_height="@dimen/bookmark_item_height"
+	app:cardCornerRadius="12dp">
+
+	<org.koitharu.kotatsu.base.ui.widgets.CoverImageView
+		android:id="@+id/imageView_thumb"
+		android:layout_width="wrap_content"
+		android:layout_height="match_parent"
+		android:orientation="vertical"
+		android:scaleType="centerCrop"
+		tools:src="@drawable/ic_placeholder" />
+
+</com.google.android.material.card.MaterialCardView>

app/src/main/res/menu/opt_reader_bottom.xml

@@ -6,10 +6,9 @@
 	tools:ignore="AlwaysShowAction">
 
 	<item
-		android:id="@+id/action_screen_rotate"
+		android:id="@+id/action_bookmark"
-		android:icon="@drawable/ic_screen_rotation"
+		android:icon="@drawable/ic_bookmark"
-		android:title="@string/rotate_screen"
+		android:title="@string/bookmark_add"
-		android:visible="false"
 		app:showAsAction="always" />
 
 	<item
@@ -18,6 +17,13 @@
 		android:title="@string/pages"
 		app:showAsAction="always" />
 
+	<item
+		android:id="@+id/action_screen_rotate"
+		android:icon="@drawable/ic_screen_rotation"
+		android:title="@string/rotate_screen"
+		android:visible="false"
+		app:showAsAction="always" />
+
 	<item
 		android:id="@+id/action_reader_mode"
 		android:icon="@drawable/ic_loading"

app/src/main/res/menu/popup_bookmark.xml

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<menu
+	xmlns:android="http://schemas.android.com/apk/res/android">
+
+	<item
+		android:id="@+id/action_remove"
+		android:title="@string/remove" />
+
+</menu>

app/src/main/res/values/dimens.xml

@@ -13,6 +13,8 @@
 	<dimen name="grid_spacing_outer">2dp</dimen>
 	<dimen name="manga_list_item_height">86dp</dimen>
 	<dimen name="manga_list_details_item_height">120dp</dimen>
+	<dimen name="bookmark_item_height">120dp</dimen>
+	<dimen name="bookmark_list_spacing">4dp</dimen>
 	<dimen name="chapter_list_item_height">62dp</dimen>
 	<dimen name="preferred_grid_width">120dp</dimen>
 	<dimen name="header_height">48dp</dimen>

app/src/main/res/values/strings.xml

@@ -288,4 +288,9 @@
 	<string name="edit">Edit</string>
 	<string name="edit_category">Edit category</string>
 	<string name="empty_favourite_categories">No favourite categories</string>
+	<string name="bookmark_add">Add bookmark</string>
+	<string name="bookmark_remove">Remove bookmark</string>
+	<string name="bookmarks">Bookmarks</string>
+	<string name="bookmark_removed">Bookmark removed</string>
+	<string name="bookmark_added">Bookmark added</string>
 </resources>