Merge branch 'feature/nextgen' into feature/sync

2022-07-18 15:05:02 +03:00
parent d5216e3784 3963099053
commit 094cebe674
578 changed files with 17246 additions and 4645 deletions
--- a/app/src/androidTest/assets/categories/simple.json
+++ b/app/src/androidTest/assets/categories/simple.json
@@ -0,0 +1,8 @@
+{
+	"id": 4,
+	"title": "Read later",
+	"sortKey": 1,
+	"order": "NEWEST",
+	"createdAt": 1335906000000,
+	"isTrackingEnabled": true
+}
--- a/app/src/androidTest/assets/manga/bad_ids.json
+++ b/app/src/androidTest/assets/manga/bad_ids.json
@@ -0,0 +1,163 @@
+{
+	"id": -2096681732556647985,
+	"title": "Странствия Эманон",
+	"url": "/stranstviia_emanon",
+	"publicUrl": "https://readmanga.io/stranstviia_emanon",
+	"rating": 0.9400894,
+	"isNsfw": true,
+	"coverUrl": "https://staticrm.rmr.rocks/uploads/pics/01/12/559_p.jpg",
+	"tags": [
+		{
+			"title": "Сверхъестественное",
+			"key": "supernatural",
+			"source": "READMANGA_RU"
+		},
+		{
+			"title": "Сэйнэн",
+			"key": "seinen",
+			"source": "READMANGA_RU"
+		},
+		{
+			"title": "Повседневность",
+			"key": "slice_of_life",
+			"source": "READMANGA_RU"
+		},
+		{
+			"title": "Приключения",
+			"key": "adventure",
+			"source": "READMANGA_RU"
+		}
+	],
+	"state": "FINISHED",
+	"largeCoverUrl": "https://staticrm.rmr.rocks/uploads/pics/01/12/559_o.jpg",
+	"description": "Продолжение истории о загадочной девушке по имени Эманон, которая помнит всё, что происходило на Земле за последние три миллиарда лет. \n<br>Начало истории читайте в \"Воспоминаниях Эманон\". \n<div class=\"clearfix\"></div>",
+	"chapters": [
+		{
+			"id": 1552943969433540704,
+			"name": "1 - 1",
+			"number": 1,
+			"url": "/stranstviia_emanon/vol1/1",
+			"scanlator": "Sad-Robot",
+			"uploadDate": 1342731600000,
+			"source": "READMANGA_RU"
+		},
+		{
+			"id": 1552943969433540705,
+			"name": "1 - 2",
+			"number": 2,
+			"url": "/stranstviia_emanon/vol1/2",
+			"scanlator": "Sad-Robot",
+			"uploadDate": 1342731600000,
+			"source": "READMANGA_RU"
+		},
+		{
+			"id": 1552943969433540706,
+			"name": "1 - 3",
+			"number": 3,
+			"url": "/stranstviia_emanon/vol1/3",
+			"scanlator": "Sad-Robot",
+			"uploadDate": 1342731600000,
+			"source": "READMANGA_RU"
+		},
+		{
+			"id": 1552943969433540707,
+			"name": "1 - 4",
+			"number": 4,
+			"url": "/stranstviia_emanon/vol1/4",
+			"scanlator": "Sad-Robot",
+			"uploadDate": 1342731600000,
+			"source": "READMANGA_RU"
+		},
+		{
+			"id": 1552943969433540708,
+			"name": "1 - 5",
+			"number": 5,
+			"url": "/stranstviia_emanon/vol1/5",
+			"scanlator": "Sad-Robot",
+			"uploadDate": 1342731600000,
+			"source": "READMANGA_RU"
+		},
+		{
+			"id": 1552943969433541665,
+			"name": "2 - 1",
+			"number": 6,
+			"url": "/stranstviia_emanon/vol2/1",
+			"scanlator": "Sup!",
+			"uploadDate": 1415570400000,
+			"source": "READMANGA_RU"
+		},
+		{
+			"id": 1552943969433541666,
+			"name": "2 - 2",
+			"number": 7,
+			"url": "/stranstviia_emanon/vol2/2",
+			"scanlator": "Sup!",
+			"uploadDate": 1419976800000,
+			"source": "READMANGA_RU"
+		},
+		{
+			"id": 1552943969433541667,
+			"name": "2 - 3",
+			"number": 8,
+			"url": "/stranstviia_emanon/vol2/3",
+			"scanlator": "Sup!",
+			"uploadDate": 1427922000000,
+			"source": "READMANGA_RU"
+		},
+		{
+			"id": 1552943969433541668,
+			"name": "2 - 4",
+			"number": 9,
+			"url": "/stranstviia_emanon/vol2/4",
+			"scanlator": "Sup!",
+			"uploadDate": 1436907600000,
+			"source": "READMANGA_RU"
+		},
+		{
+			"id": 1552943969433541669,
+			"name": "2 - 5",
+			"number": 10,
+			"url": "/stranstviia_emanon/vol2/5",
+			"scanlator": "Sup!",
+			"uploadDate": 1446674400000,
+			"source": "READMANGA_RU"
+		},
+		{
+			"id": 1552943969433541670,
+			"name": "2 - 6",
+			"number": 11,
+			"url": "/stranstviia_emanon/vol2/6",
+			"scanlator": "Sup!",
+			"uploadDate": 1451512800000,
+			"source": "READMANGA_RU"
+		},
+		{
+			"id": 1552943969433542626,
+			"name": "3 - 1",
+			"number": 12,
+			"url": "/stranstviia_emanon/vol3/1",
+			"scanlator": "Sup!",
+			"uploadDate": 1461618000000,
+			"source": "READMANGA_RU"
+		},
+		{
+			"id": 1552943969433542627,
+			"name": "3 - 2",
+			"number": 13,
+			"url": "/stranstviia_emanon/vol3/2",
+			"scanlator": "Sup!",
+			"uploadDate": 1461618000000,
+			"source": "READMANGA_RU"
+		},
+		{
+			"id": 1552943969433542628,
+			"name": "3 - 3",
+			"number": 14,
+			"url": "/stranstviia_emanon/vol3/3",
+			"scanlator": "",
+			"uploadDate": 1465851600000,
+			"source": "READMANGA_RU"
+		}
+	],
+	"source": "READMANGA_RU"
+}
--- a/app/src/androidTest/assets/manga/empty.json
+++ b/app/src/androidTest/assets/manga/empty.json
@@ -0,0 +1,36 @@
+{
+	"id": -2096681732556647985,
+	"title": "Странствия Эманон",
+	"url": "/stranstviia_emanon",
+	"publicUrl": "https://readmanga.io/stranstviia_emanon",
+	"rating": 0.9400894,
+	"isNsfw": true,
+	"coverUrl": "https://staticrm.rmr.rocks/uploads/pics/01/12/559_p.jpg",
+	"tags": [
+		{
+			"title": "Сверхъестественное",
+			"key": "supernatural",
+			"source": "READMANGA_RU"
+		},
+		{
+			"title": "Сэйнэн",
+			"key": "seinen",
+			"source": "READMANGA_RU"
+		},
+		{
+			"title": "Повседневность",
+			"key": "slice_of_life",
+			"source": "READMANGA_RU"
+		},
+		{
+			"title": "Приключения",
+			"key": "adventure",
+			"source": "READMANGA_RU"
+		}
+	],
+	"state": "FINISHED",
+	"largeCoverUrl": "https://staticrm.rmr.rocks/uploads/pics/01/12/559_o.jpg",
+	"description": "Продолжение истории о загадочной девушке по имени Эманон, которая помнит всё, что происходило на Земле за последние три миллиарда лет. \n<br>Начало истории читайте в \"Воспоминаниях Эманон\". \n<div class=\"clearfix\"></div>",
+	"chapters": [],
+	"source": "READMANGA_RU"
+}
--- a/app/src/androidTest/assets/manga/first_chapters.json
+++ b/app/src/androidTest/assets/manga/first_chapters.json
@@ -0,0 +1,136 @@
+{
+	"id": -2096681732556647985,
+	"title": "Странствия Эманон",
+	"url": "/stranstviia_emanon",
+	"publicUrl": "https://readmanga.io/stranstviia_emanon",
+	"rating": 0.9400894,
+	"isNsfw": true,
+	"coverUrl": "https://staticrm.rmr.rocks/uploads/pics/01/12/559_p.jpg",
+	"tags": [
+		{
+			"title": "Сверхъестественное",
+			"key": "supernatural",
+			"source": "READMANGA_RU"
+		},
+		{
+			"title": "Сэйнэн",
+			"key": "seinen",
+			"source": "READMANGA_RU"
+		},
+		{
+			"title": "Повседневность",
+			"key": "slice_of_life",
+			"source": "READMANGA_RU"
+		},
+		{
+			"title": "Приключения",
+			"key": "adventure",
+			"source": "READMANGA_RU"
+		}
+	],
+	"state": "FINISHED",
+	"largeCoverUrl": "https://staticrm.rmr.rocks/uploads/pics/01/12/559_o.jpg",
+	"description": "Продолжение истории о загадочной девушке по имени Эманон, которая помнит всё, что происходило на Земле за последние три миллиарда лет. \n<br>Начало истории читайте в \"Воспоминаниях Эманон\". \n<div class=\"clearfix\"></div>",
+	"chapters": [
+		{
+			"id": 3552943969433540704,
+			"name": "1 - 1",
+			"number": 1,
+			"url": "/stranstviia_emanon/vol1/1",
+			"scanlator": "Sad-Robot",
+			"uploadDate": 1342731600000,
+			"source": "READMANGA_RU"
+		},
+		{
+			"id": 3552943969433540705,
+			"name": "1 - 2",
+			"number": 2,
+			"url": "/stranstviia_emanon/vol1/2",
+			"scanlator": "Sad-Robot",
+			"uploadDate": 1342731600000,
+			"source": "READMANGA_RU"
+		},
+		{
+			"id": 3552943969433540706,
+			"name": "1 - 3",
+			"number": 3,
+			"url": "/stranstviia_emanon/vol1/3",
+			"scanlator": "Sad-Robot",
+			"uploadDate": 1342731600000,
+			"source": "READMANGA_RU"
+		},
+		{
+			"id": 3552943969433540707,
+			"name": "1 - 4",
+			"number": 4,
+			"url": "/stranstviia_emanon/vol1/4",
+			"scanlator": "Sad-Robot",
+			"uploadDate": 1342731600000,
+			"source": "READMANGA_RU"
+		},
+		{
+			"id": 3552943969433540708,
+			"name": "1 - 5",
+			"number": 5,
+			"url": "/stranstviia_emanon/vol1/5",
+			"scanlator": "Sad-Robot",
+			"uploadDate": 1342731600000,
+			"source": "READMANGA_RU"
+		},
+		{
+			"id": 3552943969433541665,
+			"name": "2 - 1",
+			"number": 6,
+			"url": "/stranstviia_emanon/vol2/1",
+			"scanlator": "Sup!",
+			"uploadDate": 1415570400000,
+			"source": "READMANGA_RU"
+		},
+		{
+			"id": 3552943969433541666,
+			"name": "2 - 2",
+			"number": 7,
+			"url": "/stranstviia_emanon/vol2/2",
+			"scanlator": "Sup!",
+			"uploadDate": 1419976800000,
+			"source": "READMANGA_RU"
+		},
+		{
+			"id": 3552943969433541667,
+			"name": "2 - 3",
+			"number": 8,
+			"url": "/stranstviia_emanon/vol2/3",
+			"scanlator": "Sup!",
+			"uploadDate": 1427922000000,
+			"source": "READMANGA_RU"
+		},
+		{
+			"id": 3552943969433541668,
+			"name": "2 - 4",
+			"number": 9,
+			"url": "/stranstviia_emanon/vol2/4",
+			"scanlator": "Sup!",
+			"uploadDate": 1436907600000,
+			"source": "READMANGA_RU"
+		},
+		{
+			"id": 3552943969433541669,
+			"name": "2 - 5",
+			"number": 10,
+			"url": "/stranstviia_emanon/vol2/5",
+			"scanlator": "Sup!",
+			"uploadDate": 1446674400000,
+			"source": "READMANGA_RU"
+		},
+		{
+			"id": 3552943969433541670,
+			"name": "2 - 6",
+			"number": 11,
+			"url": "/stranstviia_emanon/vol2/6",
+			"scanlator": "Sup!",
+			"uploadDate": 1451512800000,
+			"source": "READMANGA_RU"
+		}
+	],
+	"source": "READMANGA_RU"
+}
--- a/app/src/androidTest/assets/manga/full.json
+++ b/app/src/androidTest/assets/manga/full.json
@@ -0,0 +1,163 @@
+{
+	"id": -2096681732556647985,
+	"title": "Странствия Эманон",
+	"url": "/stranstviia_emanon",
+	"publicUrl": "https://readmanga.io/stranstviia_emanon",
+	"rating": 0.9400894,
+	"isNsfw": true,
+	"coverUrl": "https://staticrm.rmr.rocks/uploads/pics/01/12/559_p.jpg",
+	"tags": [
+		{
+			"title": "Сверхъестественное",
+			"key": "supernatural",
+			"source": "READMANGA_RU"
+		},
+		{
+			"title": "Сэйнэн",
+			"key": "seinen",
+			"source": "READMANGA_RU"
+		},
+		{
+			"title": "Повседневность",
+			"key": "slice_of_life",
+			"source": "READMANGA_RU"
+		},
+		{
+			"title": "Приключения",
+			"key": "adventure",
+			"source": "READMANGA_RU"
+		}
+	],
+	"state": "FINISHED",
+	"largeCoverUrl": "https://staticrm.rmr.rocks/uploads/pics/01/12/559_o.jpg",
+	"description": "Продолжение истории о загадочной девушке по имени Эманон, которая помнит всё, что происходило на Земле за последние три миллиарда лет. \n<br>Начало истории читайте в \"Воспоминаниях Эманон\". \n<div class=\"clearfix\"></div>",
+	"chapters": [
+		{
+			"id": 3552943969433540704,
+			"name": "1 - 1",
+			"number": 1,
+			"url": "/stranstviia_emanon/vol1/1",
+			"scanlator": "Sad-Robot",
+			"uploadDate": 1342731600000,
+			"source": "READMANGA_RU"
+		},
+		{
+			"id": 3552943969433540705,
+			"name": "1 - 2",
+			"number": 2,
+			"url": "/stranstviia_emanon/vol1/2",
+			"scanlator": "Sad-Robot",
+			"uploadDate": 1342731600000,
+			"source": "READMANGA_RU"
+		},
+		{
+			"id": 3552943969433540706,
+			"name": "1 - 3",
+			"number": 3,
+			"url": "/stranstviia_emanon/vol1/3",
+			"scanlator": "Sad-Robot",
+			"uploadDate": 1342731600000,
+			"source": "READMANGA_RU"
+		},
+		{
+			"id": 3552943969433540707,
+			"name": "1 - 4",
+			"number": 4,
+			"url": "/stranstviia_emanon/vol1/4",
+			"scanlator": "Sad-Robot",
+			"uploadDate": 1342731600000,
+			"source": "READMANGA_RU"
+		},
+		{
+			"id": 3552943969433540708,
+			"name": "1 - 5",
+			"number": 5,
+			"url": "/stranstviia_emanon/vol1/5",
+			"scanlator": "Sad-Robot",
+			"uploadDate": 1342731600000,
+			"source": "READMANGA_RU"
+		},
+		{
+			"id": 3552943969433541665,
+			"name": "2 - 1",
+			"number": 6,
+			"url": "/stranstviia_emanon/vol2/1",
+			"scanlator": "Sup!",
+			"uploadDate": 1415570400000,
+			"source": "READMANGA_RU"
+		},
+		{
+			"id": 3552943969433541666,
+			"name": "2 - 2",
+			"number": 7,
+			"url": "/stranstviia_emanon/vol2/2",
+			"scanlator": "Sup!",
+			"uploadDate": 1419976800000,
+			"source": "READMANGA_RU"
+		},
+		{
+			"id": 3552943969433541667,
+			"name": "2 - 3",
+			"number": 8,
+			"url": "/stranstviia_emanon/vol2/3",
+			"scanlator": "Sup!",
+			"uploadDate": 1427922000000,
+			"source": "READMANGA_RU"
+		},
+		{
+			"id": 3552943969433541668,
+			"name": "2 - 4",
+			"number": 9,
+			"url": "/stranstviia_emanon/vol2/4",
+			"scanlator": "Sup!",
+			"uploadDate": 1436907600000,
+			"source": "READMANGA_RU"
+		},
+		{
+			"id": 3552943969433541669,
+			"name": "2 - 5",
+			"number": 10,
+			"url": "/stranstviia_emanon/vol2/5",
+			"scanlator": "Sup!",
+			"uploadDate": 1446674400000,
+			"source": "READMANGA_RU"
+		},
+		{
+			"id": 3552943969433541670,
+			"name": "2 - 6",
+			"number": 11,
+			"url": "/stranstviia_emanon/vol2/6",
+			"scanlator": "Sup!",
+			"uploadDate": 1451512800000,
+			"source": "READMANGA_RU"
+		},
+		{
+			"id": 3552943969433542626,
+			"name": "3 - 1",
+			"number": 12,
+			"url": "/stranstviia_emanon/vol3/1",
+			"scanlator": "Sup!",
+			"uploadDate": 1461618000000,
+			"source": "READMANGA_RU"
+		},
+		{
+			"id": 3552943969433542627,
+			"name": "3 - 2",
+			"number": 13,
+			"url": "/stranstviia_emanon/vol3/2",
+			"scanlator": "Sup!",
+			"uploadDate": 1461618000000,
+			"source": "READMANGA_RU"
+		},
+		{
+			"id": 3552943969433542628,
+			"name": "3 - 3",
+			"number": 14,
+			"url": "/stranstviia_emanon/vol3/3",
+			"scanlator": "",
+			"uploadDate": 1465851600000,
+			"source": "READMANGA_RU"
+		}
+	],
+	"source": "READMANGA_RU"
+}
--- a/app/src/androidTest/assets/manga/header.json
+++ b/app/src/androidTest/assets/manga/header.json
@@ -0,0 +1,35 @@
+{
+	"id": -2096681732556647985,
+	"title": "Странствия Эманон",
+	"url": "/stranstviia_emanon",
+	"publicUrl": "https://readmanga.io/stranstviia_emanon",
+	"rating": 0.9400894,
+	"isNsfw": true,
+	"coverUrl": "https://staticrm.rmr.rocks/uploads/pics/01/12/559_p.jpg",
+	"tags": [
+		{
+			"title": "Сверхъестественное",
+			"key": "supernatural",
+			"source": "READMANGA_RU"
+		},
+		{
+			"title": "Сэйнэн",
+			"key": "seinen",
+			"source": "READMANGA_RU"
+		},
+		{
+			"title": "Повседневность",
+			"key": "slice_of_life",
+			"source": "READMANGA_RU"
+		},
+		{
+			"title": "Приключения",
+			"key": "adventure",
+			"source": "READMANGA_RU"
+		}
+	],
+	"state": "FINISHED",
+	"largeCoverUrl": "https://staticrm.rmr.rocks/uploads/pics/01/12/559_o.jpg",
+	"description": null,
+	"source": "READMANGA_RU"
+}
--- a/app/src/androidTest/assets/manga/without_middle_chapter.json
+++ b/app/src/androidTest/assets/manga/without_middle_chapter.json
@@ -0,0 +1,154 @@
+{
+	"id": -2096681732556647985,
+	"title": "Странствия Эманон",
+	"url": "/stranstviia_emanon",
+	"publicUrl": "https://readmanga.io/stranstviia_emanon",
+	"rating": 0.9400894,
+	"isNsfw": true,
+	"coverUrl": "https://staticrm.rmr.rocks/uploads/pics/01/12/559_p.jpg",
+	"tags": [
+		{
+			"title": "Сверхъестественное",
+			"key": "supernatural",
+			"source": "READMANGA_RU"
+		},
+		{
+			"title": "Сэйнэн",
+			"key": "seinen",
+			"source": "READMANGA_RU"
+		},
+		{
+			"title": "Повседневность",
+			"key": "slice_of_life",
+			"source": "READMANGA_RU"
+		},
+		{
+			"title": "Приключения",
+			"key": "adventure",
+			"source": "READMANGA_RU"
+		}
+	],
+	"state": "FINISHED",
+	"largeCoverUrl": "https://staticrm.rmr.rocks/uploads/pics/01/12/559_o.jpg",
+	"description": "Продолжение истории о загадочной девушке по имени Эманон, которая помнит всё, что происходило на Земле за последние три миллиарда лет. \n<br>Начало истории читайте в \"Воспоминаниях Эманон\". \n<div class=\"clearfix\"></div>",
+	"chapters": [
+		{
+			"id": 3552943969433540704,
+			"name": "1 - 1",
+			"number": 1,
+			"url": "/stranstviia_emanon/vol1/1",
+			"scanlator": "Sad-Robot",
+			"uploadDate": 1342731600000,
+			"source": "READMANGA_RU"
+		},
+		{
+			"id": 3552943969433540705,
+			"name": "1 - 2",
+			"number": 2,
+			"url": "/stranstviia_emanon/vol1/2",
+			"scanlator": "Sad-Robot",
+			"uploadDate": 1342731600000,
+			"source": "READMANGA_RU"
+		},
+		{
+			"id": 3552943969433540706,
+			"name": "1 - 3",
+			"number": 3,
+			"url": "/stranstviia_emanon/vol1/3",
+			"scanlator": "Sad-Robot",
+			"uploadDate": 1342731600000,
+			"source": "READMANGA_RU"
+		},
+		{
+			"id": 3552943969433540707,
+			"name": "1 - 4",
+			"number": 4,
+			"url": "/stranstviia_emanon/vol1/4",
+			"scanlator": "Sad-Robot",
+			"uploadDate": 1342731600000,
+			"source": "READMANGA_RU"
+		},
+		{
+			"id": 3552943969433540708,
+			"name": "1 - 5",
+			"number": 5,
+			"url": "/stranstviia_emanon/vol1/5",
+			"scanlator": "Sad-Robot",
+			"uploadDate": 1342731600000,
+			"source": "READMANGA_RU"
+		},
+		{
+			"id": 3552943969433541666,
+			"name": "2 - 2",
+			"number": 7,
+			"url": "/stranstviia_emanon/vol2/2",
+			"scanlator": "Sup!",
+			"uploadDate": 1419976800000,
+			"source": "READMANGA_RU"
+		},
+		{
+			"id": 3552943969433541667,
+			"name": "2 - 3",
+			"number": 8,
+			"url": "/stranstviia_emanon/vol2/3",
+			"scanlator": "Sup!",
+			"uploadDate": 1427922000000,
+			"source": "READMANGA_RU"
+		},
+		{
+			"id": 3552943969433541668,
+			"name": "2 - 4",
+			"number": 9,
+			"url": "/stranstviia_emanon/vol2/4",
+			"scanlator": "Sup!",
+			"uploadDate": 1436907600000,
+			"source": "READMANGA_RU"
+		},
+		{
+			"id": 3552943969433541669,
+			"name": "2 - 5",
+			"number": 10,
+			"url": "/stranstviia_emanon/vol2/5",
+			"scanlator": "Sup!",
+			"uploadDate": 1446674400000,
+			"source": "READMANGA_RU"
+		},
+		{
+			"id": 3552943969433541670,
+			"name": "2 - 6",
+			"number": 11,
+			"url": "/stranstviia_emanon/vol2/6",
+			"scanlator": "Sup!",
+			"uploadDate": 1451512800000,
+			"source": "READMANGA_RU"
+		},
+		{
+			"id": 3552943969433542626,
+			"name": "3 - 1",
+			"number": 12,
+			"url": "/stranstviia_emanon/vol3/1",
+			"scanlator": "Sup!",
+			"uploadDate": 1461618000000,
+			"source": "READMANGA_RU"
+		},
+		{
+			"id": 3552943969433542627,
+			"name": "3 - 2",
+			"number": 13,
+			"url": "/stranstviia_emanon/vol3/2",
+			"scanlator": "Sup!",
+			"uploadDate": 1461618000000,
+			"source": "READMANGA_RU"
+		},
+		{
+			"id": 3552943969433542628,
+			"name": "3 - 3",
+			"number": 14,
+			"url": "/stranstviia_emanon/vol3/3",
+			"scanlator": "",
+			"uploadDate": 1465851600000,
+			"source": "READMANGA_RU"
+		}
+	],
+	"source": "READMANGA_RU"
+}
--- a/app/src/androidTest/java/org/koitharu/kotatsu/Instrumentation.kt
+++ b/app/src/androidTest/java/org/koitharu/kotatsu/Instrumentation.kt
@@ -0,0 +1,9 @@
+package org.koitharu.kotatsu
+
+import android.app.Instrumentation
+import kotlin.coroutines.resume
+import kotlin.coroutines.suspendCoroutine
+
+suspend fun Instrumentation.awaitForIdle() = suspendCoroutine<Unit> { cont ->
+	waitForIdle { cont.resume(Unit) }
+}
--- a/app/src/androidTest/java/org/koitharu/kotatsu/SampleData.kt
+++ b/app/src/androidTest/java/org/koitharu/kotatsu/SampleData.kt
@@ -0,0 +1,54 @@
+package org.koitharu.kotatsu
+
+import androidx.test.platform.app.InstrumentationRegistry
+import com.squareup.moshi.*
+import com.squareup.moshi.kotlin.reflect.KotlinJsonAdapterFactory
+import okio.buffer
+import okio.source
+import org.koitharu.kotatsu.core.model.FavouriteCategory
+import org.koitharu.kotatsu.parsers.model.Manga
+import java.util.*
+import kotlin.reflect.KClass
+
+object SampleData {
+
+	private val moshi = Moshi.Builder()
+		.add(DateAdapter())
+		.add(KotlinJsonAdapterFactory())
+		.build()
+
+	val manga: Manga = loadAsset("manga/header.json", Manga::class)
+
+	val mangaDetails: Manga = loadAsset("manga/full.json", Manga::class)
+
+	val tag = mangaDetails.tags.elementAt(2)
+
+	val chapter = checkNotNull(mangaDetails.chapters)[2]
+
+	val favouriteCategory: FavouriteCategory = loadAsset("categories/simple.json", FavouriteCategory::class)
+
+	fun <T : Any> loadAsset(name: String, cls: KClass<T>): T {
+		val assets = InstrumentationRegistry.getInstrumentation().context.assets
+		return assets.open(name).use {
+			moshi.adapter(cls.java).fromJson(it.source().buffer())
+		} ?: throw RuntimeException("Cannot read asset from json \"$name\"")
+	}
+
+	private class DateAdapter : JsonAdapter<Date>() {
+
+		@FromJson
+		override fun fromJson(reader: JsonReader): Date? {
+			val ms = reader.nextLong()
+			return if (ms == 0L) {
+				null
+			} else {
+				Date(ms)
+			}
+		}
+
+		@ToJson
+		override fun toJson(writer: JsonWriter, value: Date?) {
+			writer.value(value?.time ?: 0L)
+		}
+	}
+}
--- a/app/src/androidTest/java/org/koitharu/kotatsu/core/db/MangaDatabaseTest.kt
+++ b/app/src/androidTest/java/org/koitharu/kotatsu/core/db/MangaDatabaseTest.kt
@@ -1,7 +1,6 @@
 package org.koitharu.kotatsu.core.db

 import androidx.room.testing.MigrationTestHelper
-import androidx.sqlite.db.framework.FrameworkSQLiteOpenHelperFactory
 import androidx.test.ext.junit.runners.AndroidJUnit4
 import androidx.test.platform.app.InstrumentationRegistry
 import org.junit.Rule
@@ -9,6 +8,7 @@ import org.junit.Test
 import org.junit.runner.RunWith
 import org.koitharu.kotatsu.core.db.migrations.*
 import java.io.IOException
+import kotlin.test.assertEquals

@RunWith(AndroidJUnit4::class)
 class MangaDatabaseTest {
@@ -16,28 +16,24 @@ class MangaDatabaseTest {
 	@get:Rule
 	val helper: MigrationTestHelper = MigrationTestHelper(
 		InstrumentationRegistry.getInstrumentation(),
-		MangaDatabase::class.java.canonicalName,
-		FrameworkSQLiteOpenHelperFactory()
+		MangaDatabase::class.java,
 	)

 	@Test
 	@Throws(IOException::class)
 	fun migrateAll() {
-		helper.createDatabase(TEST_DB, 1).apply {
-			// TODO execSQL("")
-			close()
-		}
+		assertEquals(DATABASE_VERSION, migrations.last().endVersion)
+		helper.createDatabase(TEST_DB, 1).close()
 		for (migration in migrations) {
 			helper.runMigrationsAndValidate(
 				TEST_DB,
 				migration.endVersion,
 				true,
 				migration
-			)
+			).close()
 		}
 	}

-
 	private companion object {

 		const val TEST_DB = "test-db"
@@ -50,6 +46,12 @@ class MangaDatabaseTest {
 			Migration5To6(),
 			Migration6To7(),
 			Migration7To8(),
+			Migration8To9(),
+			Migration9To10(),
+			Migration10To11(),
+			Migration11To12(),
+			Migration12To13(),
+			Migration13To14(),
 		)
 	}
-}
+}
--- a/app/src/androidTest/java/org/koitharu/kotatsu/core/os/ShortcutsUpdaterTest.kt
+++ b/app/src/androidTest/java/org/koitharu/kotatsu/core/os/ShortcutsUpdaterTest.kt
@@ -0,0 +1,65 @@
+package org.koitharu.kotatsu.core.os
+
+import android.content.pm.ShortcutInfo
+import android.content.pm.ShortcutManager
+import android.os.Build
+import androidx.core.content.getSystemService
+import androidx.test.ext.junit.runners.AndroidJUnit4
+import androidx.test.platform.app.InstrumentationRegistry
+import kotlinx.coroutines.test.runTest
+import org.junit.Before
+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
+
+@RunWith(AndroidJUnit4::class)
+class ShortcutsUpdaterTest : KoinTest {
+
+	private val historyRepository by inject<HistoryRepository>()
+	private val shortcutsUpdater by inject<ShortcutsUpdater>()
+	private val database by inject<MangaDatabase>()
+
+	@Before
+	fun setUp() {
+		database.clearAllTables()
+	}
+
+	@Test
+	fun testUpdateShortcuts() = runTest {
+		if (Build.VERSION.SDK_INT < Build.VERSION_CODES.N_MR1) {
+			return@runTest
+		}
+		awaitUpdate()
+		assertTrue(getShortcuts().isEmpty())
+		historyRepository.addOrUpdate(
+			manga = SampleData.manga,
+			chapterId = SampleData.chapter.id,
+			page = 4,
+			scroll = 2,
+			percent = 0.3f
+		)
+		awaitUpdate()
+
+		val shortcuts = getShortcuts()
+		assertEquals(1, shortcuts.size)
+	}
+
+	private fun getShortcuts(): List<ShortcutInfo> {
+		val context = InstrumentationRegistry.getInstrumentation().targetContext
+		val manager = checkNotNull(context.getSystemService<ShortcutManager>())
+		return manager.dynamicShortcuts.filterNot { it.id == "com.squareup.leakcanary.dynamic_shortcut" }
+	}
+
+	private suspend fun awaitUpdate() {
+		val instrumentation = InstrumentationRegistry.getInstrumentation()
+		instrumentation.awaitForIdle()
+		shortcutsUpdater.await()
+	}
+}
--- a/app/src/androidTest/java/org/koitharu/kotatsu/settings/backup/AppBackupAgentTest.kt
+++ b/app/src/androidTest/java/org/koitharu/kotatsu/settings/backup/AppBackupAgentTest.kt
@@ -0,0 +1,67 @@
+package org.koitharu.kotatsu.settings.backup
+
+import androidx.test.ext.junit.runners.AndroidJUnit4
+import kotlinx.coroutines.test.runTest
+import org.junit.Before
+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.*
+
+@RunWith(AndroidJUnit4::class)
+class AppBackupAgentTest : KoinTest {
+
+	private val historyRepository by inject<HistoryRepository>()
+	private val favouritesRepository by inject<FavouritesRepository>()
+	private val backupRepository by inject<BackupRepository>()
+	private val database by inject<MangaDatabase>()
+
+	@Before
+	fun setUp() {
+		database.clearAllTables()
+	}
+
+	@Test
+	fun testBackupRestore() = runTest {
+		val category = favouritesRepository.createCategory(
+			title = SampleData.favouriteCategory.title,
+			sortOrder = SampleData.favouriteCategory.order,
+			isTrackerEnabled = SampleData.favouriteCategory.isTrackingEnabled,
+		)
+		favouritesRepository.addToCategory(categoryId = category.id, mangas = listOf(SampleData.manga))
+		historyRepository.addOrUpdate(
+			manga = SampleData.mangaDetails,
+			chapterId = SampleData.mangaDetails.chapters!![2].id,
+			page = 3,
+			scroll = 40,
+			percent = 0.2f,
+		)
+		val history = checkNotNull(historyRepository.getOne(SampleData.manga))
+
+		val agent = AppBackupAgent()
+		val backup = agent.createBackupFile(get(), backupRepository)
+
+		database.clearAllTables()
+		assertTrue(favouritesRepository.getAllManga().isEmpty())
+		assertNull(historyRepository.getLastOrNull())
+
+		backup.inputStream().use {
+			agent.restoreBackupFile(it.fd, backup.length(), backupRepository)
+		}
+
+		assertEquals(category, favouritesRepository.getCategory(category.id))
+		assertEquals(history, historyRepository.getOne(SampleData.manga))
+		assertContentEquals(listOf(SampleData.manga), favouritesRepository.getManga(category.id))
+
+		val allTags = database.tagsDao.findTags(SampleData.tag.source.name).toMangaTags()
+		assertContains(allTags, SampleData.tag)
+	}
+}
--- a/app/src/androidTest/java/org/koitharu/kotatsu/tracker/domain/TrackerTest.kt
+++ b/app/src/androidTest/java/org/koitharu/kotatsu/tracker/domain/TrackerTest.kt
@@ -0,0 +1,183 @@
+package org.koitharu.kotatsu.tracker.domain
+
+import androidx.test.ext.junit.runners.AndroidJUnit4
+import kotlinx.coroutines.test.runTest
+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
+
+@RunWith(AndroidJUnit4::class)
+class TrackerTest : KoinTest {
+
+	private val repository by inject<TrackingRepository>()
+	private val dataRepository by inject<MangaDataRepository>()
+	private val tracker by inject<Tracker>()
+
+	@Test
+	fun noUpdates() = runTest {
+		val manga = loadManga("full.json")
+		tracker.deleteTrack(manga.id)
+
+		tracker.checkUpdates(manga, commit = true).apply {
+			assertFalse(isValid)
+			assert(newChapters.isEmpty())
+		}
+		assertEquals(0, repository.getNewChaptersCount(manga.id))
+		tracker.checkUpdates(manga, commit = true).apply {
+			assertTrue(isValid)
+			assert(newChapters.isEmpty())
+		}
+		assertEquals(0, repository.getNewChaptersCount(manga.id))
+	}
+
+	@Test
+	fun hasUpdates() = runTest {
+		val mangaFirst = loadManga("first_chapters.json")
+		val mangaFull = loadManga("full.json")
+		tracker.deleteTrack(mangaFirst.id)
+
+		tracker.checkUpdates(mangaFirst, commit = true).apply {
+			assertFalse(isValid)
+			assert(newChapters.isEmpty())
+		}
+		assertEquals(0, repository.getNewChaptersCount(mangaFirst.id))
+		tracker.checkUpdates(mangaFull, commit = true).apply {
+			assertTrue(isValid)
+			assertEquals(3, newChapters.size)
+		}
+		assertEquals(3, repository.getNewChaptersCount(mangaFirst.id))
+		tracker.checkUpdates(mangaFull, commit = true).apply {
+			assertTrue(isValid)
+			assert(newChapters.isEmpty())
+		}
+		assertEquals(3, repository.getNewChaptersCount(mangaFirst.id))
+	}
+
+	@Test
+	fun badIds() = runTest {
+		val mangaFirst = loadManga("first_chapters.json")
+		val mangaBad = loadManga("bad_ids.json")
+		tracker.deleteTrack(mangaFirst.id)
+
+		tracker.checkUpdates(mangaFirst, commit = true).apply {
+			assertFalse(isValid)
+			assert(newChapters.isEmpty())
+		}
+		assertEquals(0, repository.getNewChaptersCount(mangaFirst.id))
+		tracker.checkUpdates(mangaBad, commit = true).apply {
+			assertFalse(isValid)
+			assert(newChapters.isEmpty())
+		}
+		assertEquals(0, repository.getNewChaptersCount(mangaFirst.id))
+		tracker.checkUpdates(mangaFirst, commit = true).apply {
+			assertFalse(isValid)
+			assert(newChapters.isEmpty())
+		}
+		assertEquals(0, repository.getNewChaptersCount(mangaFirst.id))
+	}
+
+	@Test
+	fun badIds2() = runTest {
+		val mangaFirst = loadManga("first_chapters.json")
+		val mangaBad = loadManga("bad_ids.json")
+		val mangaFull = loadManga("full.json")
+		tracker.deleteTrack(mangaFirst.id)
+
+		tracker.checkUpdates(mangaFirst, commit = true).apply {
+			assertFalse(isValid)
+			assert(newChapters.isEmpty())
+		}
+		assertEquals(0, repository.getNewChaptersCount(mangaFirst.id))
+		tracker.checkUpdates(mangaFull, commit = true).apply {
+			assertTrue(isValid)
+			assertEquals(3, newChapters.size)
+		}
+		assertEquals(3, repository.getNewChaptersCount(mangaFull.id))
+		tracker.checkUpdates(mangaBad, commit = true).apply {
+			assertFalse(isValid)
+			assert(newChapters.isEmpty())
+		}
+		assertEquals(0, repository.getNewChaptersCount(mangaFirst.id))
+	}
+
+	@Test
+	fun fullReset() = runTest {
+		val mangaFull = loadManga("full.json")
+		val mangaFirst = loadManga("first_chapters.json")
+		val mangaEmpty = loadManga("empty.json")
+		tracker.deleteTrack(mangaFull.id)
+
+		assertEquals(0, repository.getNewChaptersCount(mangaFull.id))
+		tracker.checkUpdates(mangaFull, commit = true).apply {
+			assertFalse(isValid)
+			assert(newChapters.isEmpty())
+		}
+		assertEquals(0, repository.getNewChaptersCount(mangaFull.id))
+		tracker.checkUpdates(mangaEmpty, commit = true).apply {
+			assert(newChapters.isEmpty())
+		}
+		assertEquals(0, repository.getNewChaptersCount(mangaFull.id))
+		tracker.checkUpdates(mangaFirst, commit = true).apply {
+			assertFalse(isValid)
+			assert(newChapters.isEmpty())
+		}
+		assertEquals(0, repository.getNewChaptersCount(mangaFull.id))
+		tracker.checkUpdates(mangaFull, commit = true).apply {
+			assertTrue(isValid)
+			assertEquals(3, newChapters.size)
+		}
+		assertEquals(3, repository.getNewChaptersCount(mangaFull.id))
+		tracker.checkUpdates(mangaEmpty, commit = true).apply {
+			assertFalse(isValid)
+			assert(newChapters.isEmpty())
+		}
+		assertEquals(0, repository.getNewChaptersCount(mangaFull.id))
+	}
+
+	@Test
+	fun syncWithHistory() = runTest {
+		val mangaFull = loadManga("full.json")
+		val mangaFirst = loadManga("first_chapters.json")
+		tracker.deleteTrack(mangaFull.id)
+
+		tracker.checkUpdates(mangaFirst, commit = true).apply {
+			assertFalse(isValid)
+			assert(newChapters.isEmpty())
+		}
+		assertEquals(0, repository.getNewChaptersCount(mangaFirst.id))
+		tracker.checkUpdates(mangaFull, commit = true).apply {
+			assertTrue(isValid)
+			assertEquals(3, newChapters.size)
+		}
+		assertEquals(3, repository.getNewChaptersCount(mangaFirst.id))
+
+		var chapter = requireNotNull(mangaFull.chapters).run { get(lastIndex - 1) }
+		repository.syncWithHistory(mangaFull, chapter.id)
+
+		assertEquals(1, repository.getNewChaptersCount(mangaFirst.id))
+
+		chapter = requireNotNull(mangaFull.chapters).run { get(lastIndex) }
+		repository.syncWithHistory(mangaFull, chapter.id)
+
+		assertEquals(0, repository.getNewChaptersCount(mangaFirst.id))
+
+		tracker.checkUpdates(mangaFull, commit = true).apply {
+			assertTrue(isValid)
+			assert(newChapters.isEmpty())
+		}
+		assertEquals(0, repository.getNewChaptersCount(mangaFirst.id))
+	}
+
+	private suspend fun loadManga(name: String): Manga {
+		val manga = SampleData.loadAsset("manga/$name", Manga::class)
+		dataRepository.storeManga(manga)
+		return manga
+	}
+}
--- a/app/src/debug/java/org/koitharu/kotatsu/core/parser/DummyParser.kt
+++ b/app/src/debug/java/org/koitharu/kotatsu/core/parser/DummyParser.kt
@@ -25,7 +25,7 @@ class DummyParser(override val context: MangaLoaderContext) : MangaParser(MangaS
 		offset: Int,
 		query: String?,
 		tags: Set<MangaTag>?,
-		sortOrder: SortOrder?
+		sortOrder: SortOrder,
 	): List<Manga> {
 		TODO("Not yet implemented")
 	}
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -9,6 +9,7 @@
 	<uses-permission android:name="android.permission.WAKE_LOCK" />
 	<uses-permission android:name="android.permission.VIBRATE" />
 	<uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
+	<uses-permission android:name="android.permission.REQUEST_IGNORE_BATTERY_OPTIMIZATIONS" />
 	<uses-permission android:name="android.permission.GET_ACCOUNTS" />
 	<uses-permission android:name="android.permission.MANAGE_ACCOUNTS" />
 	<uses-permission android:name="android.permission.AUTHENTICATE_ACCOUNTS" />
@@ -63,9 +64,31 @@
 		<activity
 			android:name="org.koitharu.kotatsu.search.ui.MangaListActivity"
 			android:label="@string/search_manga" />
+		<activity
+			android:name="org.koitharu.kotatsu.history.ui.HistoryActivity"
+			android:label="@string/history" />
+		<activity
+			android:name="org.koitharu.kotatsu.favourites.ui.FavouritesActivity"
+			android:label="@string/favourites" />
+		<activity
+			android:name="org.koitharu.kotatsu.bookmarks.ui.BookmarksActivity"
+			android:label="@string/bookmarks" />
+		<activity
+			android:name="org.koitharu.kotatsu.suggestions.ui.SuggestionsActivity"
+			android:label="@string/suggestions" />
 		<activity
 			android:name="org.koitharu.kotatsu.settings.SettingsActivity"
-			android:label="@string/settings" />
+			android:exported="true"
+			android:label="@string/settings">
+			<intent-filter>
+				<action android:name="android.intent.action.VIEW" />
+
+				<category android:name="android.intent.category.DEFAULT" />
+				<category android:name="android.intent.category.BROWSABLE" />
+
+				<data android:scheme="kotatsu" />
+			</intent-filter>
+		</activity>
 		<activity
 			android:name="org.koitharu.kotatsu.browser.BrowserActivity"
 			android:configChanges="orientation|screenSize|screenLayout|keyboardHidden"
@@ -75,13 +98,8 @@
 			android:configChanges="orientation|screenSize|screenLayout|keyboardHidden"
 			android:windowSoftInputMode="adjustResize" />
 		<activity
-			android:name="org.koitharu.kotatsu.core.ui.CrashActivity"
-			android:label="@string/error_occurred"
-			android:theme="@android:style/Theme.DeviceDefault"
-			android:windowSoftInputMode="stateAlwaysHidden" />
-		<activity
-			android:name="org.koitharu.kotatsu.favourites.ui.categories.CategoriesActivity"
-			android:label="@string/favourites_categories"
+			android:name="org.koitharu.kotatsu.favourites.ui.categories.FavouriteCategoriesActivity"
+			android:label="@string/favourites"
 			android:windowSoftInputMode="stateAlwaysHidden" />
 		<activity
 			android:name="org.koitharu.kotatsu.widget.shelf.ShelfConfigActivity"
@@ -93,7 +111,7 @@
 			</intent-filter>
 		</activity>
 		<activity
-			android:name="org.koitharu.kotatsu.search.ui.global.GlobalSearchActivity"
+			android:name="org.koitharu.kotatsu.search.ui.multi.MultiSearchActivity"
 			android:label="@string/search" />
 		<activity
 			android:name="org.koitharu.kotatsu.main.ui.protect.ProtectActivity"
@@ -111,8 +129,9 @@
 		<activity
 			android:name="org.koitharu.kotatsu.favourites.ui.categories.edit.FavouritesCategoryEditActivity"
 			android:theme="@style/Theme.Kotatsu.DialogWhenLarge" />
-		<activity android:name="org.koitharu.kotatsu.sync.ui.SyncAuthActivity"
-			android:label="@string/sync"/>
+		<activity
+			android:name="org.koitharu.kotatsu.sync.ui.SyncAuthActivity"
+			android:label="@string/sync" />

 		<service
 			android:name="org.koitharu.kotatsu.download.ui.service.DownloadService"
@@ -218,4 +237,4 @@

 	</application>

-</manifest>
+</manifest>
--- a/app/src/main/java/com/google/android/material/appbar/KotatsuAppBarLayout.kt
+++ b/app/src/main/java/com/google/android/material/appbar/KotatsuAppBarLayout.kt
@@ -0,0 +1,151 @@
+package com.google.android.material.appbar
+
+import android.animation.AnimatorSet
+import android.animation.ValueAnimator
+import android.annotation.SuppressLint
+import android.content.Context
+import android.util.AttributeSet
+import android.widget.TextView
+import androidx.annotation.FloatRange
+import com.google.android.material.animation.AnimationUtils
+import com.google.android.material.appbar.AppBarLayout.OnOffsetChangedListener
+import com.google.android.material.shape.MaterialShapeDrawable
+import org.koitharu.kotatsu.R
+import com.google.android.material.R as materialR
+
+/**
+ * [AppBarLayout] with our own lift state handler and custom title alpha.
+ *
+ * Inside this package to access some package-private methods.
+ */
+class KotatsuAppBarLayout @JvmOverloads constructor(
+	context: Context,
+	attrs: AttributeSet? = null
+) : AppBarLayout(context, attrs) {
+
+	private var lifted = true
+
+	private val toolbar by lazy { findViewById<MaterialToolbar>(R.id.toolbar) }
+
+	@FloatRange(from = 0.0, to = 1.0)
+	var titleTextAlpha = 1F
+		set(value) {
+			field = value
+			titleTextView?.alpha = field
+		}
+
+	private var titleTextView: TextView? = null
+		set(value) {
+			field = value
+			field?.alpha = titleTextAlpha
+		}
+
+	private var animatorSet: AnimatorSet? = null
+
+	private var statusBarForegroundAnimator: ValueAnimator? = null
+	private val offsetListener = OnOffsetChangedListener { appBarLayout, verticalOffset ->
+		// Show status bar foreground when offset
+		val foreground = (appBarLayout?.statusBarForeground as? MaterialShapeDrawable) ?: return@OnOffsetChangedListener
+		val start = foreground.alpha
+		val end = if (verticalOffset != 0) 255 else 0
+
+		statusBarForegroundAnimator?.cancel()
+		if (animatorSet?.isRunning == true) {
+			foreground.alpha = end
+			return@OnOffsetChangedListener
+		}
+		if (start != end) {
+			statusBarForegroundAnimator = ValueAnimator.ofInt(start, end).apply {
+				duration = resources.getInteger(materialR.integer.app_bar_elevation_anim_duration).toLong()
+				interpolator = AnimationUtils.LINEAR_INTERPOLATOR
+				addUpdateListener {
+					foreground.alpha = it.animatedValue as Int
+				}
+				start()
+			}
+		}
+	}
+
+	var isTransparentWhenNotLifted = false
+		set(value) {
+			if (field != value) {
+				field = value
+				updateStates()
+			}
+		}
+
+	override fun isLiftOnScroll(): Boolean = false
+
+	override fun isLifted(): Boolean = lifted
+
+	override fun setLifted(lifted: Boolean): Boolean {
+		return if (this.lifted != lifted) {
+			this.lifted = lifted
+			updateStates()
+			true
+		} else {
+			false
+		}
+	}
+
+	override fun setLiftedState(lifted: Boolean, force: Boolean): Boolean = false
+
+	override fun onAttachedToWindow() {
+		super.onAttachedToWindow()
+		addOnOffsetChangedListener(offsetListener)
+		toolbar.background.alpha = 0 // Use app bar background
+	}
+
+	override fun onDetachedFromWindow() {
+		super.onDetachedFromWindow()
+		removeOnOffsetChangedListener(offsetListener)
+	}
+
+	@SuppressLint("Recycle")
+	private fun updateStates() {
+		val animators = mutableListOf<ValueAnimator>()
+
+		val fromElevation = elevation
+		val toElevation = if (lifted) {
+			resources.getDimension(materialR.dimen.design_appbar_elevation)
+		} else {
+			0F
+		}
+		if (fromElevation != toElevation) {
+			ValueAnimator.ofFloat(fromElevation, toElevation).apply {
+				addUpdateListener {
+					elevation = it.animatedValue as Float
+					(statusBarForeground as? MaterialShapeDrawable)?.elevation = it.animatedValue as Float
+				}
+				animators.add(this)
+			}
+		}
+
+		val transparent = if (lifted) false else isTransparentWhenNotLifted
+		val fromAlpha = (background as? MaterialShapeDrawable)?.alpha ?: background.alpha
+		val toAlpha = if (transparent) 0 else 255
+		if (fromAlpha != toAlpha) {
+			ValueAnimator.ofInt(fromAlpha, toAlpha).apply {
+				addUpdateListener {
+					val value = it.animatedValue as Int
+					background.alpha = value
+				}
+				animators.add(this)
+			}
+		}
+
+		if (animators.isNotEmpty()) {
+			animatorSet?.cancel()
+			animatorSet = AnimatorSet().apply {
+				duration = resources.getInteger(materialR.integer.app_bar_elevation_anim_duration).toLong()
+				interpolator = AnimationUtils.LINEAR_INTERPOLATOR
+				playTogether(*animators.toTypedArray())
+				start()
+			}
+		}
+	}
+
+	init {
+		statusBarForeground = MaterialShapeDrawable.createWithElevationOverlay(context)
+	}
+}
--- a/app/src/main/java/org/koitharu/kotatsu/KotatsuApp.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/KotatsuApp.kt
@@ -1,30 +1,40 @@
 package org.koitharu.kotatsu

 import android.app.Application
+import android.content.Context
 import android.os.StrictMode
 import androidx.appcompat.app.AppCompatDelegate
 import androidx.fragment.app.strictmode.FragmentStrictMode
+import androidx.room.InvalidationTracker
+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.AppCrashHandler
 import org.koitharu.kotatsu.core.ui.uiModule
 import org.koitharu.kotatsu.details.detailsModule
+import org.koitharu.kotatsu.explore.exploreModule
 import org.koitharu.kotatsu.favourites.favouritesModule
 import org.koitharu.kotatsu.history.historyModule
+import org.koitharu.kotatsu.library.libraryModule
 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.main.ui.protect.AppProtectHelper
 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
@@ -40,9 +50,9 @@ class KotatsuApp : Application() {
 			enableStrictMode()
 		}
 		initKoin()
-		Thread.setDefaultUncaughtExceptionHandler(AppCrashHandler(applicationContext))
 		AppCompatDelegate.setDefaultNightMode(get<AppSettings>().theme)
-		registerActivityLifecycleCallbacks(get<AppProtectHelper>())
+		setupActivityLifecycleCallbacks()
+		setupDatabaseObservers()
 	}

 	private fun initKoin() {
@@ -66,11 +76,61 @@ class KotatsuApp : Application() {
 				appWidgetModule,
 				suggestionsModule,
 				syncModule,
+				shikimoriModule,
 				bookmarksModule,
+				libraryModule,
+				exploreModule,
 			)
 		}
 	}

+	override fun attachBaseContext(base: Context?) {
+		super.attachBaseContext(base)
+		initAcra {
+			buildConfigClass = BuildConfig::class.java
+			reportFormat = StringFormat.KEY_VALUE_LIST
+			reportContent = listOf(
+				ReportField.PACKAGE_NAME,
+				ReportField.APP_VERSION_CODE,
+				ReportField.APP_VERSION_NAME,
+				ReportField.ANDROID_VERSION,
+				ReportField.PHONE_MODEL,
+				ReportField.CRASH_CONFIGURATION,
+				ReportField.STACK_TRACE,
+				ReportField.CUSTOM_DATA,
+				ReportField.SHARED_PREFERENCES,
+			)
+			dialog {
+				text = getString(R.string.crash_text)
+				title = getString(R.string.error_occurred)
+				positiveButtonText = getString(R.string.send)
+				resIcon = R.drawable.ic_alert_outline
+				resTheme = android.R.style.Theme_Material_Light_Dialog_Alert
+			}
+			mailSender {
+				mailTo = getString(R.string.email_error_report)
+				reportAsFile = true
+				reportFileName = "stacktrace.txt"
+			}
+		}
+	}
+
+	private fun setupDatabaseObservers() {
+		val observers = getKoin().getAll<InvalidationTracker.Observer>()
+		val database = get<MangaDatabase>()
+		val tracker = database.invalidationTracker
+		observers.forEach {
+			tracker.addObserver(it)
+		}
+	}
+
+	private fun setupActivityLifecycleCallbacks() {
+		val callbacks = getKoin().getAll<ActivityLifecycleCallbacks>()
+		callbacks.forEach {
+			registerActivityLifecycleCallbacks(it)
+		}
+	}
+
 	private fun enableStrictMode() {
 		StrictMode.setThreadPolicy(
 			StrictMode.ThreadPolicy.Builder()
@@ -96,4 +156,4 @@ class KotatsuApp : Application() {
 			.detectFragmentTagUsage()
 			.build()
 	}
-}
+}
--- 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 {
--- a/app/src/main/java/org/koitharu/kotatsu/base/ui/BaseActivity.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/base/ui/BaseActivity.kt
@@ -25,6 +25,7 @@ import org.koitharu.kotatsu.base.ui.util.ActionModeDelegate
 import org.koitharu.kotatsu.base.ui.util.WindowInsetsDelegate
 import org.koitharu.kotatsu.core.exceptions.resolve.ExceptionResolver
 import org.koitharu.kotatsu.core.prefs.AppSettings
+import org.koitharu.kotatsu.settings.SettingsActivity

 abstract class BaseActivity<B : ViewBinding> :
 	AppCompatActivity(),
@@ -43,9 +44,13 @@ abstract class BaseActivity<B : ViewBinding> :

 	override fun onCreate(savedInstanceState: Bundle?) {
 		val settings = get<AppSettings>()
+		val isAmoled = settings.isAmoledTheme
+		val isDynamic = settings.isDynamicTheme
+		// TODO support DialogWhenLarge theme
 		when {
-			settings.isAmoledTheme -> setTheme(R.style.ThemeOverlay_Kotatsu_AMOLED)
-			settings.isDynamicTheme -> setTheme(R.style.Theme_Kotatsu_Monet)
+			isAmoled && isDynamic -> setTheme(R.style.Theme_Kotatsu_Monet_Amoled)
+			isAmoled -> setTheme(R.style.Theme_Kotatsu_Amoled)
+			isDynamic -> setTheme(R.style.Theme_Kotatsu_Monet)
 		}
 		super.onCreate(savedInstanceState)
 		WindowCompat.setDecorFitsSystemWindows(window, false)
--- a/app/src/main/java/org/koitharu/kotatsu/base/ui/BaseBottomSheet.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/base/ui/BaseBottomSheet.kt
@@ -2,11 +2,11 @@ package org.koitharu.kotatsu.base.ui

 import android.app.Dialog
 import android.os.Bundle
+import android.util.DisplayMetrics
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import android.view.ViewGroup.LayoutParams
-import androidx.appcompat.app.AppCompatDialog
 import androidx.core.view.updateLayoutParams
 import androidx.viewbinding.ViewBinding
 import com.google.android.material.bottomsheet.BottomSheetBehavior
@@ -14,6 +14,7 @@ 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<B : ViewBinding> : BottomSheetDialogFragment() {
@@ -33,6 +34,20 @@ abstract class BaseBottomSheet<B : ViewBinding> : BottomSheetDialogFragment() {
 	): View {
 		val binding = onInflateView(inflater, container)
 		viewBinding = binding
+
+		// Enforce max width for tablets
+		val width = resources.getDimensionPixelSize(R.dimen.bottom_sheet_width)
+		if (width > 0) {
+			behavior?.maxWidth = width
+		}
+
+		// Set peek height to 50% display height
+		requireContext().displayCompat?.let {
+			val metrics = DisplayMetrics()
+			it.getRealMetrics(metrics)
+			behavior?.peekHeight = (metrics.heightPixels * 0.4).toInt()
+		}
+
 		return binding.root
 	}

@@ -42,10 +57,15 @@ abstract class BaseBottomSheet<B : ViewBinding> : BottomSheetDialogFragment() {
 	}

 	override fun onCreateDialog(savedInstanceState: Bundle?): Dialog {
-		return if (resources.getBoolean(R.bool.is_tablet)) {
-			AppCompatDialog(context, R.style.Theme_Kotatsu_Dialog)
-		} else {
-			AppBottomSheetDialog(requireContext(), theme)
+		return AppBottomSheetDialog(requireContext(), theme)
+	}
+
+	fun addBottomSheetCallback(callback: BottomSheetBehavior.BottomSheetCallback) {
+		val b = behavior ?: return
+		b.addBottomSheetCallback(callback)
+		val rootView = dialog?.findViewById<View>(materialR.id.design_bottom_sheet)
+		if (rootView != null) {
+			callback.onStateChanged(rootView, b.state)
 		}
 	}

--- a/app/src/main/java/org/koitharu/kotatsu/base/ui/BasePreferenceFragment.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/base/ui/BasePreferenceFragment.kt
@@ -6,14 +6,12 @@ import androidx.annotation.CallSuper
 import androidx.annotation.StringRes
 import androidx.core.graphics.Insets
 import androidx.core.view.updatePadding
-import androidx.fragment.app.Fragment
 import androidx.preference.PreferenceFragmentCompat
 import androidx.recyclerview.widget.RecyclerView
 import org.koin.android.ext.android.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.SettingsActivity
 import org.koitharu.kotatsu.settings.SettingsHeadersFragment

 abstract class BasePreferenceFragment(@StringRes private val titleId: Int) :
--- a/app/src/main/java/org/koitharu/kotatsu/base/ui/dialog/AppBottomSheetDialog.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/base/ui/dialog/AppBottomSheetDialog.kt
@@ -21,7 +21,7 @@ class AppBottomSheetDialog(context: Context, theme: Int) : BottomSheetDialog(con
 			if (drawEdgeToEdge) {
 				// Copied from super.onAttachedToWindow:
 				val edgeToEdgeFlags = View.SYSTEM_UI_FLAG_LAYOUT_HIDE_NAVIGATION or View.SYSTEM_UI_FLAG_LAYOUT_STABLE
-				// Fix super-class's window flag bug by respecting the intial system UI visibility:
+				// Fix super-class's window flag bug by respecting the initial system UI visibility:
 				window.decorView.systemUiVisibility = edgeToEdgeFlags or initialSystemUiVisibility
 			}
 		}
--- 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
@@ -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
+	}
+}
--- a/app/src/main/java/org/koitharu/kotatsu/base/ui/dialog/TextInputDialog.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/base/ui/dialog/TextInputDialog.kt
@@ -1,89 +0,0 @@
-package org.koitharu.kotatsu.base.ui.dialog
-
-import android.content.Context
-import android.content.DialogInterface
-import android.text.InputFilter
-import android.view.LayoutInflater
-import androidx.annotation.StringRes
-import androidx.appcompat.app.AlertDialog
-import com.google.android.material.dialog.MaterialAlertDialogBuilder
-import org.koitharu.kotatsu.databinding.DialogInputBinding
-
-class TextInputDialog private constructor(
-	private val delegate: AlertDialog,
-) : DialogInterface by delegate {
-
-	fun show() = delegate.show()
-
-	class Builder(context: Context) {
-
-		private val binding = DialogInputBinding.inflate(LayoutInflater.from(context))
-
-		private val delegate = MaterialAlertDialogBuilder(context)
-			.setView(binding.root)
-
-		fun setTitle(@StringRes titleResId: Int): Builder {
-			delegate.setTitle(titleResId)
-			return this
-		}
-
-		fun setTitle(title: CharSequence): Builder {
-			delegate.setTitle(title)
-			return this
-		}
-
-		fun setHint(@StringRes hintResId: Int): Builder {
-			binding.inputEdit.hint = binding.root.context.getString(hintResId)
-			return this
-		}
-
-		fun setMaxLength(maxLength: Int, strict: Boolean): Builder {
-			with(binding.inputLayout) {
-				counterMaxLength = maxLength
-				isCounterEnabled = maxLength > 0
-			}
-			if (strict && maxLength > 0) {
-				binding.inputEdit.filters += InputFilter.LengthFilter(maxLength)
-			}
-			return this
-		}
-
-		fun setInputType(inputType: Int): Builder {
-			binding.inputEdit.inputType = inputType
-			return this
-		}
-
-		fun setText(text: String): Builder {
-			binding.inputEdit.setText(text)
-			binding.inputEdit.setSelection(text.length)
-			return this
-		}
-
-		fun setPositiveButton(
-			@StringRes textId: Int,
-			listener: (DialogInterface, String) -> Unit
-		): Builder {
-			delegate.setPositiveButton(textId) { dialog, _ ->
-				listener(dialog, binding.inputEdit.text?.toString().orEmpty())
-			}
-			return this
-		}
-
-		fun setNegativeButton(
-			@StringRes textId: Int,
-			listener: DialogInterface.OnClickListener? = null
-		): Builder {
-			delegate.setNegativeButton(textId, listener)
-			return this
-		}
-
-		fun setOnCancelListener(listener: DialogInterface.OnCancelListener): Builder {
-			delegate.setOnCancelListener(listener)
-			return this
-		}
-
-		fun create() =
-			TextInputDialog(delegate.create())
-
-	}
-}
--- 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
@@ -0,0 +1,200 @@
+package org.koitharu.kotatsu.base.ui.list
+
+import android.app.Activity
+import android.os.Bundle
+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 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"
+
+class ListSelectionController(
+	private val activity: Activity,
+	private val decoration: AbstractSelectionItemDecoration,
+	private val registryOwner: SavedStateRegistryOwner,
+	private val callback: Callback2,
+) : ActionMode.Callback, SavedStateRegistry.SavedStateProvider {
+
+	private var actionMode: ActionMode? = null
+
+	val count: Int
+		get() = decoration.checkedItemsCount
+
+	init {
+		registryOwner.lifecycle.addObserver(StateEventObserver())
+	}
+
+	fun snapshot(): Set<Long> {
+		return peekCheckedIds().toSet()
+	}
+
+	fun peekCheckedIds(): Set<Long> {
+		return decoration.checkedItemsIds
+	}
+
+	fun clear() {
+		decoration.clearSelection()
+		notifySelectionChanged()
+	}
+
+	fun addAll(ids: Collection<Long>) {
+		if (ids.isEmpty()) {
+			return
+		}
+		decoration.checkAll(ids)
+		notifySelectionChanged()
+	}
+
+	fun attachToRecyclerView(recyclerView: RecyclerView) {
+		recyclerView.addItemDecoration(decoration)
+	}
+
+	override fun saveState(): Bundle {
+		val bundle = Bundle(1)
+		bundle.putLongArray(KEY_SELECTION, peekCheckedIds().toLongArray())
+		return bundle
+	}
+
+	fun onItemClick(id: Long): Boolean {
+		if (decoration.checkedItemsCount != 0) {
+			decoration.toggleItemChecked(id)
+			if (decoration.checkedItemsCount == 0) {
+				actionMode?.finish()
+			} else {
+				actionMode?.invalidate()
+			}
+			notifySelectionChanged()
+			return true
+		}
+		return false
+	}
+
+	fun onItemLongClick(id: Long): Boolean {
+		startActionMode()
+		return actionMode?.also {
+			decoration.setItemIsChecked(id, true)
+			notifySelectionChanged()
+		} != null
+	}
+
+	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 notifySelectionChanged() {
+		val count = decoration.checkedItemsCount
+		callback.onSelectionChanged(this, count)
+		if (count == 0) {
+			actionMode?.finish()
+		} else {
+			actionMode?.invalidate()
+		}
+	}
+
+	private fun restoreState(ids: Collection<Long>) {
+		if (ids.isEmpty() || decoration.checkedItemsCount != 0) {
+			return
+		}
+		decoration.checkAll(ids)
+		startActionMode()
+		notifySelectionChanged()
+	}
+
+	@Deprecated("")
+	interface Callback : Callback2 {
+
+		fun onSelectionChanged(count: Int)
+
+		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)
+		}
+	}
+
+	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
+
+		fun onActionItemClicked(controller: ListSelectionController, mode: ActionMode, item: MenuItem): Boolean
+
+		fun onDestroyActionMode(controller: ListSelectionController, mode: ActionMode) = Unit
+	}
+
+	private inner class StateEventObserver : LifecycleEventObserver {
+
+		override fun onStateChanged(source: LifecycleOwner, event: Lifecycle.Event) {
+			if (event == Lifecycle.Event.ON_CREATE) {
+				val registry = registryOwner.savedStateRegistry
+				registry.registerSavedStateProvider(PROVIDER_NAME, this@ListSelectionController)
+				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.getLongArray(KEY_SELECTION)?.toList().orEmpty())
+						}
+					}
+				}
+			}
+		}
+	}
+}
--- 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
@@ -0,0 +1,204 @@
+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 kotlinx.coroutines.Dispatchers
+import org.koitharu.kotatsu.base.ui.list.decor.AbstractSelectionItemDecoration
+import kotlin.coroutines.EmptyCoroutineContext
+
+private const val PROVIDER_NAME = "selection_decoration_sectioned"
+
+class SectionedSelectionController<T : Any>(
+	private val activity: Activity,
+	private val registryOwner: SavedStateRegistryOwner,
+	private val callback: Callback<T>,
+) : ActionMode.Callback, SavedStateRegistry.SavedStateProvider {
+
+	private var actionMode: ActionMode? = null
+
+	private var pendingData: MutableMap<String, Collection<Long>>? = null
+	private val decorations = ArrayMap<T, AbstractSelectionItemDecoration>()
+
+	val count: Int
+		get() = decorations.values.sumOf { it.checkedItemsCount }
+
+	init {
+		registryOwner.lifecycle.addObserver(StateEventObserver())
+	}
+
+	fun snapshot(): Map<T, Set<Long>> {
+		return decorations.mapValues { it.value.checkedItemsIds.toSet() }
+	}
+
+	fun peekCheckedIds(): Map<T, Set<Long>> {
+		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<Long>): 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(mode, menu)
+	}
+
+	override fun onPrepareActionMode(mode: ActionMode, menu: Menu): Boolean {
+		return callback.onPrepareActionMode(mode, menu)
+	}
+
+	override fun onActionItemClicked(mode: ActionMode, item: MenuItem): Boolean {
+		return callback.onActionItemClicked(mode, item)
+	}
+
+	override fun onDestroyActionMode(mode: ActionMode) {
+		callback.onDestroyActionMode(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(count)
+		if (count == 0) {
+			actionMode?.finish()
+		} else {
+			actionMode?.invalidate()
+		}
+	}
+
+	private fun restoreState(ids: MutableMap<String, Collection<Long>>) {
+		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(section)
+		}
+	}
+
+	interface Callback<T> : ListSelectionController.Callback {
+
+		fun onCreateItemDecoration(section: T): AbstractSelectionItemDecoration
+	}
+
+	private inner class StateEventObserver : LifecycleEventObserver {
+
+		override fun onStateChanged(source: LifecycleOwner, event: Lifecycle.Event) {
+			if (event == Lifecycle.Event.ON_CREATE) {
+				val registry = registryOwner.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() }
+							)
+						}
+					}
+				}
+			}
+		}
+	}
+}
--- a/app/src/main/java/org/koitharu/kotatsu/base/ui/list/decor/AbstractSelectionItemDecoration.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/base/ui/list/decor/AbstractSelectionItemDecoration.kt
@@ -12,7 +12,7 @@ abstract class AbstractSelectionItemDecoration : RecyclerView.ItemDecoration() {

 	private val bounds = Rect()
 	private val boundsF = RectF()
-	private val selection = HashSet<Long>()
+	protected val selection = HashSet<Long>()

 	protected var hasBackground: Boolean = true
 	protected var hasForeground: Boolean = false
--- 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
@@ -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
+			}
+		}
+	}
+}
--- 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
@@ -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()
+	}
+}
--- 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
@@ -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
+	}
+}
--- 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
@@ -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
+			}
+		}
+	}
+}
--- 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
@@ -0,0 +1,34 @@
+package org.koitharu.kotatsu.base.ui.util
+
+import android.app.Activity
+import android.app.Application.ActivityLifecycleCallbacks
+import android.os.Bundle
+import java.util.*
+
+class ActivityRecreationHandle : ActivityLifecycleCallbacks {
+
+	private val activities = WeakHashMap<Activity, Unit>()
+
+	override fun onActivityCreated(activity: Activity, savedInstanceState: Bundle?) {
+		activities[activity] = Unit
+	}
+
+	override fun onActivityStarted(activity: Activity) = Unit
+
+	override fun onActivityResumed(activity: Activity) = Unit
+
+	override fun onActivityPaused(activity: Activity) = Unit
+
+	override fun onActivityStopped(activity: Activity) = Unit
+
+	override fun onActivitySaveInstanceState(activity: Activity, outState: Bundle) = Unit
+
+	override fun onActivityDestroyed(activity: Activity) {
+		activities.remove(activity)
+	}
+
+	fun recreateAll() {
+		val snapshot = activities.keys.toList()
+		snapshot.forEach { it.recreate() }
+	}
+}
--- 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
@@ -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?,
+)
--- a/app/src/main/java/org/koitharu/kotatsu/base/ui/util/WindowInsetsDelegate.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/base/ui/util/WindowInsetsDelegate.kt
@@ -16,10 +16,7 @@ class WindowInsetsDelegate(

 	private var lastInsets: Insets? = null

-	override fun onApplyWindowInsets(v: View?, insets: WindowInsetsCompat?): WindowInsetsCompat? {
-		if (insets == null) {
-			return null
-		}
+	override fun onApplyWindowInsets(v: View, insets: WindowInsetsCompat): WindowInsetsCompat {
 		val handledInsets = interceptingWindowInsetsListener?.onApplyWindowInsets(v, insets) ?: insets
 		val newInsets = if (handleImeInsets) {
 			Insets.max(
@@ -49,7 +46,7 @@ class WindowInsetsDelegate(
 	) {
 		view.removeOnLayoutChangeListener(this)
 		if (lastInsets == null) { // Listener may not be called
-			onApplyWindowInsets(view, ViewCompat.getRootWindowInsets(view))
+			onApplyWindowInsets(view, ViewCompat.getRootWindowInsets(view) ?: return)
 		}
 	}

--- 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
@@ -9,6 +9,7 @@ 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

 class ChipsView @JvmOverloads constructor(
 	context: Context,
@@ -18,10 +19,10 @@ class ChipsView @JvmOverloads constructor(

 	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 +61,27 @@ class ChipsView @JvmOverloads constructor(
 		}
 	}

+	fun <T> getCheckedData(cls: Class<T>): Set<T> {
+		val result = LinkedHashSet<T>(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 +89,12 @@ 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.isCloseIconVisible = onChipCloseClickListener != null
 		chip.setOnCloseIconClickListener(chipOnCloseListener)
 		chip.setEnsureMinTouchTargetSize(false)
 		chip.setOnClickListener(chipOnClickListener)
-		chip.isCheckable = false
 		addView(chip)
 		return chip
 	}
@@ -98,7 +112,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 +125,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 +135,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
 		}
 	}
--- 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
@@ -17,19 +17,27 @@
 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.Button
 import android.widget.FrameLayout
-import android.widget.TextView
+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.R
+import org.koitharu.kotatsu.databinding.FadingSnackbarLayoutBinding
+import org.koitharu.kotatsu.utils.ext.getThemeColorStateList
+import com.google.android.material.R as materialR
+
+private const val SHORT_DURATION_MS = 1_500L
+private const val LONG_DURATION_MS = 2_750L

-private const val ENTER_DURATION = 300L
-private const val EXIT_DURATION = 200L
-private const val SHORT_DURATION = 1_500L
-private const val LONG_DURATION = 2_750L
 /**
 * A custom snackbar implementation allowing more control over placement and entry/exit animations.
 *
@@ -40,16 +48,15 @@ private const val LONG_DURATION = 2_750L
 class FadingSnackbar @JvmOverloads constructor(
 	context: Context,
 	attrs: AttributeSet? = null,
-	defStyleAttr: Int = 0
+	defStyleAttr: Int = 0,
 ) : FrameLayout(context, attrs, defStyleAttr) {

-	private val message: TextView
-	private val action: Button
+	private val binding = FadingSnackbarLayoutBinding.inflate(LayoutInflater.from(context), this)
+	private val enterDuration = context.resources.getInteger(R.integer.config_defaultAnimTime).toLong()
+	private val exitDuration = context.resources.getInteger(android.R.integer.config_shortAnimTime).toLong()

 	init {
-		val view = LayoutInflater.from(context).inflate(R.layout.fading_snackbar_layout, this, true)
-		message = view.findViewById(R.id.snackbar_text)
-		action = view.findViewById(R.id.snackbar_action)
+		binding.snackbarLayout.background = createThemedBackground()
 	}

 	fun dismiss() {
@@ -57,38 +64,71 @@ class FadingSnackbar @JvmOverloads constructor(
 			animate()
 				.alpha(0f)
 				.withEndAction { visibility = GONE }
-				.duration = EXIT_DURATION
+				.duration = exitDuration
 		}
 	}

 	fun show(
-		messageText: CharSequence? = null,
-		@StringRes actionId: Int? = null,
-		longDuration: Boolean = true,
-		actionClick: () -> Unit = { dismiss() },
-		dismissListener: () -> Unit = { }
+		messageText: CharSequence?,
+		@StringRes actionId: Int = 0,
+		duration: Int = Snackbar.LENGTH_SHORT,
+		onActionClick: (FadingSnackbar.() -> Unit)? = null,
+		onDismiss: (() -> Unit)? = null,
 	) {
-		message.text = messageText
-		if (actionId != null) {
-			action.run {
+		binding.snackbarText.text = messageText
+		if (actionId != 0) {
+			with(binding.snackbarAction) {
 				visibility = VISIBLE
 				text = context.getString(actionId)
 				setOnClickListener {
-					actionClick()
+					onActionClick?.invoke(this@FadingSnackbar) ?: dismiss()
 				}
 			}
 		} else {
-			action.visibility = GONE
+			binding.snackbarAction.visibility = GONE
 		}
 		alpha = 0f
 		visibility = VISIBLE
 		animate()
 			.alpha(1f)
-			.duration = ENTER_DURATION
-		val showDuration = ENTER_DURATION + if (longDuration) LONG_DURATION else SHORT_DURATION
-		postDelayed(showDuration) {
+			.duration = enterDuration
+		if (duration == Snackbar.LENGTH_INDEFINITE) {
+			return
+		}
+		val durationMs = enterDuration + if (duration == Snackbar.LENGTH_LONG) LONG_DURATION_MS else SHORT_DURATION_MS
+		postDelayed(durationMs) {
 			dismiss()
-			dismissListener()
+			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
+	}
 }
--- 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
@@ -0,0 +1,104 @@
+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.ViewGroup
+import android.view.animation.DecelerateInterpolator
+import androidx.appcompat.widget.Toolbar
+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.utils.ext.animatorDurationScale
+import org.koitharu.kotatsu.utils.ext.findChild
+import org.koitharu.kotatsu.utils.ext.measureHeight
+import kotlin.math.roundToLong
+
+class HideBottomNavigationOnScrollBehavior @JvmOverloads constructor(
+	context: Context? = null,
+	attrs: AttributeSet? = null,
+) : CoordinatorLayout.Behavior<BottomNavigationView>(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 = (150 * child.context.animatorDurationScale).roundToLong()
+			addUpdateListener {
+				child.translationY = it.animatedValue as Float
+			}
+		}
+		offsetAnimator?.setFloatValues(
+			child.translationY,
+			if (isVisible) 0F else child.height.toFloat(),
+		)
+		offsetAnimator?.start()
+	}
+}
--- a/app/src/main/java/org/koitharu/kotatsu/base/ui/widgets/KotatsuBottomNavigationView.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/base/ui/widgets/KotatsuBottomNavigationView.kt
@@ -0,0 +1,156 @@
+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.coordinatorlayout.widget.CoordinatorLayout
+import androidx.core.view.doOnLayout
+import androidx.core.view.updateLayoutParams
+import androidx.customview.view.AbsSavedState
+import androidx.interpolator.view.animation.FastOutLinearInInterpolator
+import androidx.interpolator.view.animation.LinearOutSlowInInterpolator
+import androidx.lifecycle.findViewTreeLifecycleOwner
+import androidx.lifecycle.lifecycleScope
+import com.google.android.material.bottomnavigation.BottomNavigationView
+import org.koitharu.kotatsu.utils.ext.applySystemAnimatorScale
+import com.google.android.material.R as materialR
+
+class KotatsuBottomNavigationView @JvmOverloads constructor(
+	context: Context,
+	attrs: AttributeSet? = null,
+	defStyleAttr: Int = materialR.attr.bottomNavigationStyle,
+	defStyleRes: Int = materialR.style.Widget_Design_BottomNavigationView,
+) : BottomNavigationView(context, attrs, defStyleAttr, defStyleRes) {
+
+	private var currentAnimator: ViewPropertyAnimator? = null
+
+	private var currentState = STATE_UP
+
+	init {
+		// Hide on scroll
+		doOnLayout {
+			findViewTreeLifecycleOwner()?.lifecycleScope?.let {
+				updateLayoutParams<CoordinatorLayout.LayoutParams> {
+					behavior = HideBottomNavigationOnScrollBehavior()
+				}
+			}
+		}
+	}
+
+	override fun onSaveInstanceState(): Parcelable {
+		val superState = super.onSaveInstanceState()
+		return SavedState(superState).also {
+			it.currentState = currentState
+			it.translationY = 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) return
+		super.setTranslationY(translationY)
+	}
+
+	/**
+	 * Shows this view up.
+	 */
+	fun slideUp() = post {
+		currentAnimator?.cancel()
+		clearAnimation()
+
+		currentState = STATE_UP
+		animateTranslation(
+			0F,
+			SLIDE_UP_ANIMATION_DURATION,
+			LinearOutSlowInInterpolator(),
+		)
+	}
+
+	/**
+	 * Hides this view down. [setTranslationY] won't work until [slideUp] is called.
+	 */
+	fun slideDown() = post {
+		currentAnimator?.cancel()
+		clearAnimation()
+
+		currentState = STATE_DOWN
+		animateTranslation(
+			height.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) : super(superState)
+
+		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 {
+			@JvmField
+			val CREATOR: Parcelable.ClassLoaderCreator<SavedState> = object : Parcelable.ClassLoaderCreator<SavedState> {
+				override fun createFromParcel(source: Parcel, loader: ClassLoader): SavedState {
+					return SavedState(source, loader)
+				}
+
+				override fun createFromParcel(source: Parcel): SavedState {
+					return SavedState(source, null)
+				}
+
+				override fun newArray(size: Int): Array<SavedState> {
+					return newArray(size)
+				}
+			}
+		}
+	}
+
+	companion object {
+		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
+	}
+}
--- a/app/src/main/java/org/koitharu/kotatsu/base/ui/widgets/KotatsuCoordinatorLayout.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/base/ui/widgets/KotatsuCoordinatorLayout.kt
@@ -0,0 +1,111 @@
+package org.koitharu.kotatsu.base.ui.widgets
+
+import android.content.Context
+import android.os.Parcel
+import android.os.Parcelable
+import android.util.AttributeSet
+import android.view.View
+import androidx.coordinatorlayout.widget.CoordinatorLayout
+import androidx.core.view.doOnLayout
+import androidx.customview.view.AbsSavedState
+import com.google.android.material.appbar.AppBarLayout
+import org.koitharu.kotatsu.utils.ext.findChild
+
+class KotatsuCoordinatorLayout @JvmOverloads constructor(
+	context: Context,
+	attrs: AttributeSet? = null,
+	defStyleAttr: Int = androidx.coordinatorlayout.R.attr.coordinatorLayoutStyle
+) : CoordinatorLayout(context, attrs, defStyleAttr) {
+
+	private var appBarLayout: AppBarLayout? = null
+
+	/**
+	 * If true, [AppBarLayout] child will be lifted on nested scroll.
+	 */
+	var isLiftAppBarOnScroll = true
+
+	/**
+	 * Internal check
+	 */
+	private val canLiftAppBarOnScroll
+		get() = isLiftAppBarOnScroll
+
+	override fun onNestedScroll(
+		target: View,
+		dxConsumed: Int,
+		dyConsumed: Int,
+		dxUnconsumed: Int,
+		dyUnconsumed: Int,
+		type: Int,
+		consumed: IntArray
+	) {
+		super.onNestedScroll(target, dxConsumed, dyConsumed, dxUnconsumed, dyUnconsumed, type, consumed)
+		if (canLiftAppBarOnScroll) {
+			appBarLayout?.isLifted = dyConsumed != 0 || dyUnconsumed >= 0
+		}
+	}
+
+	override fun onAttachedToWindow() {
+		super.onAttachedToWindow()
+		appBarLayout = findChild()
+	}
+
+	override fun onDetachedFromWindow() {
+		super.onDetachedFromWindow()
+		appBarLayout = null
+	}
+
+	override fun onSaveInstanceState(): Parcelable? {
+		val superState = super.onSaveInstanceState()
+		return if (superState != null) {
+			SavedState(superState).also {
+				it.appBarLifted = appBarLayout?.isLifted ?: false
+			}
+		} else {
+			superState
+		}
+	}
+
+	override fun onRestoreInstanceState(state: Parcelable?) {
+		if (state is SavedState) {
+			super.onRestoreInstanceState(state.superState)
+			doOnLayout {
+				appBarLayout?.isLifted = state.appBarLifted
+			}
+		} else {
+			super.onRestoreInstanceState(state)
+		}
+	}
+
+	internal class SavedState : AbsSavedState {
+		var appBarLifted = false
+
+		constructor(superState: Parcelable) : super(superState)
+
+		constructor(source: Parcel, loader: ClassLoader?) : super(source, loader) {
+			appBarLifted = source.readByte().toInt() == 1
+		}
+
+		override fun writeToParcel(out: Parcel, flags: Int) {
+			super.writeToParcel(out, flags)
+			out.writeByte((if (appBarLifted) 1 else 0).toByte())
+		}
+
+		companion object {
+			@JvmField
+			val CREATOR: Parcelable.ClassLoaderCreator<SavedState> = object : Parcelable.ClassLoaderCreator<SavedState> {
+				override fun createFromParcel(source: Parcel, loader: ClassLoader): SavedState {
+					return SavedState(source, loader)
+				}
+
+				override fun createFromParcel(source: Parcel): SavedState {
+					return SavedState(source, null)
+				}
+
+				override fun newArray(size: Int): Array<SavedState> {
+					return newArray(size)
+				}
+			}
+		}
+	}
+}
--- 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
@@ -0,0 +1,89 @@
+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 org.koitharu.kotatsu.parsers.util.replaceWith
+import org.koitharu.kotatsu.utils.ext.resolveDp
+import kotlin.random.Random
+
+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<Segment>()
+	private val minSegmentSize = context.resources.resolveDp(3f)
+
+	var segments: List<Segment>
+		get() = segmentsData
+		set(value) {
+			segmentsData.replaceWith(value)
+			invalidate()
+		}
+
+	init {
+		paint.style = Paint.Style.FILL
+		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 onDraw(canvas: Canvas) {
+		var x = 0f
+		val w = width.toFloat()
+		for (segment in segmentsData) {
+			paint.color = segment.color
+			val segmentWidth = (w * segment.percent).coerceAtLeast(minSegmentSize)
+			canvas.drawRect(x, 0f, x + segmentWidth, height.toFloat(), paint)
+			x += segmentWidth
+		}
+	}
+
+	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)
+		}
+	}
+}
--- a/app/src/main/java/org/koitharu/kotatsu/bookmarks/BookmarksModule.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/bookmarks/BookmarksModule.kt
@@ -1,10 +1,14 @@
 package org.koitharu.kotatsu.bookmarks

+import org.koin.androidx.viewmodel.dsl.viewModel
 import org.koin.dsl.module
 import org.koitharu.kotatsu.bookmarks.domain.BookmarksRepository
+import org.koitharu.kotatsu.bookmarks.ui.BookmarksViewModel

 val bookmarksModule
 	get() = module {

 		factory { BookmarksRepository(get()) }
+
+		viewModel { BookmarksViewModel(get()) }
 	}
--- a/app/src/main/java/org/koitharu/kotatsu/bookmarks/data/BookmarkEntity.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/bookmarks/data/BookmarkEntity.kt
@@ -17,7 +17,7 @@ import org.koitharu.kotatsu.core.db.entity.MangaEntity
 		),
 	]
 )
-class BookmarkEntity(
+data 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,
@@ -25,4 +25,5 @@ class BookmarkEntity(
 	@ColumnInfo(name = "scroll") val scroll: Int,
 	@ColumnInfo(name = "image") val imageUrl: String,
 	@ColumnInfo(name = "created_at") val createdAt: Long,
+	@ColumnInfo(name = "percent") val percent: Float,
 )
--- 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<BookmarkEntity?>

 	@Query("SELECT * FROM bookmarks WHERE manga_id = :mangaId ORDER BY created_at DESC")
 	abstract fun observe(mangaId: Long): Flow<List<BookmarkEntity>>

+	@Transaction
+	@Query(
+		"SELECT * FROM manga JOIN bookmarks ON bookmarks.manga_id = manga.manga_id ORDER BY bookmarks.created_at"
+	)
+	abstract fun observe(): Flow<Map<MangaWithTags, List<BookmarkEntity>>>
+
 	@Insert
 	abstract suspend fun insert(entity: BookmarkEntity)

--- 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,
@@ -18,6 +12,7 @@ fun BookmarkEntity.toBookmark(manga: Manga) = Bookmark(
 	scroll = scroll,
 	imageUrl = imageUrl,
 	createdAt = Date(createdAt),
+	percent = percent,
 )

 fun Bookmark.toEntity() = BookmarkEntity(
@@ -28,4 +23,11 @@ fun Bookmark.toEntity() = BookmarkEntity(
 	scroll = scroll,
 	imageUrl = imageUrl,
 	createdAt = createdAt.time,
-)
+	percent = percent,
+)
+
+fun Collection<BookmarkEntity>.toBookmarks(manga: Manga) = map {
+	it.toBookmark(manga)
+}
+
+fun Collection<Bookmark>.ids() = map { it.pageId }
--- a/app/src/main/java/org/koitharu/kotatsu/bookmarks/domain/Bookmark.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/bookmarks/domain/Bookmark.kt
@@ -11,6 +11,7 @@ class Bookmark(
 	val scroll: Int,
 	val imageUrl: String,
 	val createdAt: Date,
+	val percent: Float,
 ) {

 	override fun equals(other: Any?): Boolean {
@@ -26,6 +27,7 @@ class Bookmark(
 		if (scroll != other.scroll) return false
 		if (imageUrl != other.imageUrl) return false
 		if (createdAt != other.createdAt) return false
+		if (percent != other.percent) return false

 		return true
 	}
@@ -38,6 +40,7 @@ class Bookmark(
 		result = 31 * result + scroll
 		result = 31 * result + imageUrl.hashCode()
 		result = 31 * result + createdAt.hashCode()
+		result = 31 * result + percent.hashCode()
 		return result
 	}
 }
--- 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,15 +1,21 @@
 package org.koitharu.kotatsu.bookmarks.domain

+import android.database.SQLException
 import androidx.room.withTransaction
 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(
 	private val db: MangaDatabase,
@@ -23,6 +29,17 @@ class BookmarksRepository(
 		return db.bookmarksDao.observe(manga.id).mapItems { it.toBookmark(manga) }
 	}

+	fun observeBookmarks(): Flow<Map<Manga, List<Bookmark>>> {
+		return db.bookmarksDao.observe().map { map ->
+			val res = LinkedHashMap<Manga, List<Bookmark>>(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 +52,38 @@ class BookmarksRepository(
 	suspend fun removeBookmark(mangaId: Long, pageId: Long) {
 		db.bookmarksDao.delete(mangaId, pageId)
 	}
+
+	suspend fun removeBookmarks(ids: Map<Manga, Set<Long>>): ReversibleHandle {
+		val entities = ArrayList<BookmarkEntity>(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<BookmarkEntity>,
+	) : ReversibleHandle {
+
+		override suspend fun reverse() {
+			db.withTransaction {
+				for (e in entities) {
+					try {
+						db.bookmarksDao.insert(e)
+					} catch (e: SQLException) {
+						e.printStackTraceDebug()
+					}
+				}
+			}
+		}
+	}
 }
--- a/app/src/main/java/org/koitharu/kotatsu/bookmarks/ui/BookmarksActivity.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/bookmarks/ui/BookmarksActivity.kt
@@ -0,0 +1,41 @@
+package org.koitharu.kotatsu.bookmarks.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 org.koitharu.kotatsu.R
+import org.koitharu.kotatsu.base.ui.BaseActivity
+import org.koitharu.kotatsu.databinding.ActivityContainerBinding
+
+class BookmarksActivity : BaseActivity<ActivityContainerBinding>() {
+
+	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) {
+		with(binding.toolbar) {
+			updatePadding(
+				left = insets.left,
+				right = insets.right
+			)
+		}
+	}
+
+	companion object {
+
+		fun newIntent(context: Context) = Intent(context, BookmarksActivity::class.java)
+	}
+}
--- a/app/src/main/java/org/koitharu/kotatsu/bookmarks/ui/BookmarksFragment.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/bookmarks/ui/BookmarksFragment.kt
@@ -0,0 +1,177 @@
+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.updatePadding
+import com.google.android.material.snackbar.Snackbar
+import org.koin.android.ext.android.get
+import org.koin.androidx.viewmodel.ext.android.viewModel
+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.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.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
+
+class BookmarksFragment : BaseFragment<FragmentListSimpleBinding>(), ListStateHolderListener,
+	OnListItemClickListener<Bookmark>, SectionedSelectionController.Callback<Manga> {
+
+	private val viewModel by viewModel<BookmarksViewModel>()
+	private var adapter: BookmarksGroupAdapter? = null
+	private var selectionController: SectionedSelectionController<Manga>? = 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(),
+			registryOwner = this,
+			callback = this,
+		)
+		adapter = BookmarksGroupAdapter(
+			lifecycleOwner = viewLifecycleOwner,
+			coil = get(),
+			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 onSelectionChanged(count: Int) {
+		binding.recyclerView.invalidateNestedItemDecorations()
+	}
+
+	override fun onCreateActionMode(mode: ActionMode, menu: Menu): Boolean {
+		mode.menuInflater.inflate(R.menu.mode_bookmarks, menu)
+		return true
+	}
+
+	override fun onPrepareActionMode(mode: ActionMode, menu: Menu): Boolean {
+		mode.title = selectionController?.count?.toString()
+		return true
+	}
+
+	override fun onActionItemClicked(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(section: Manga): AbstractSelectionItemDecoration {
+		return BookmarksSelectionDecoration(requireContext())
+	}
+
+	override fun onWindowInsetsChanged(insets: Insets) {
+		binding.root.updatePadding(
+			left = insets.left,
+			right = insets.right,
+		)
+		binding.recyclerView.updatePadding(
+			bottom = insets.bottom,
+		)
+	}
+
+	private fun onListChanged(list: List<ListModel>) {
+		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(binding.recyclerView, action.stringResId, length)
+		if (handle != null) {
+			snackbar.setAction(R.string.undo) { handle.reverseAsync() }
+		}
+		snackbar.show()
+	}
+
+	private inner class OnGroupClickListener : OnListItemClickListener<BookmarksGroup> {
+
+		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()
+	}
+}
--- a/app/src/main/java/org/koitharu/kotatsu/bookmarks/ui/BookmarksSelectionDecoration.kt
+++ 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
+	}
+
+}
--- a/app/src/main/java/org/koitharu/kotatsu/bookmarks/ui/BookmarksViewModel.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/bookmarks/ui/BookmarksViewModel.kt
@@ -0,0 +1,52 @@
+package org.koitharu.kotatsu.bookmarks.ui
+
+import androidx.lifecycle.LiveData
+import androidx.lifecycle.viewModelScope
+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
+
+class BookmarksViewModel(
+	private val repository: BookmarksRepository,
+) : BaseViewModel() {
+
+	val onActionDone = SingleLiveEvent<ReversibleAction>()
+
+	val content: LiveData<List<ListModel>> = 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<Manga, Set<Long>>) {
+		launchJob(Dispatchers.Default) {
+			val handle = repository.removeBookmarks(ids)
+			onActionDone.postCall(ReversibleAction(R.string.bookmarks_removed, handle))
+		}
+	}
+}
--- a/app/src/main/java/org/koitharu/kotatsu/bookmarks/ui/adapter/BookmarkListAD.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/bookmarks/ui/adapter/BookmarkListAD.kt
@@ -1,16 +1,14 @@
-package org.koitharu.kotatsu.bookmarks.ui
+package org.koitharu.kotatsu.bookmarks.ui.adapter

 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.disposeImageRequest
 import org.koitharu.kotatsu.utils.ext.enqueueWith
 import org.koitharu.kotatsu.utils.ext.newImageRequest
 import org.koitharu.kotatsu.utils.ext.referer
@@ -23,29 +21,24 @@ fun bookmarkListAD(
 	{ 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)
+		binding.imageViewThumb.newImageRequest(item.imageUrl)?.run {
+			referer(item.manga.publicUrl)
+			placeholder(R.drawable.ic_placeholder)
+			fallback(R.drawable.ic_placeholder)
+			error(R.drawable.ic_placeholder)
+			allowRgb565(true)
+			lifecycle(lifecycleOwner)
+			enqueueWith(coil)
+		}
 	}

 	onViewRecycled {
-		imageRequest?.dispose()
-		imageRequest = null
-		CoilUtils.dispose(binding.imageViewThumb)
-		binding.imageViewThumb.setImageDrawable(null)
+		binding.imageViewThumb.disposeImageRequest()
 	}
 }
--- a/app/src/main/java/org/koitharu/kotatsu/bookmarks/ui/adapter/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<Bookmark>() {

 		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 {
--- 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
@@ -0,0 +1,65 @@
+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<Manga>,
+	bookmarkClickListener: OnListItemClickListener<Bookmark>,
+	groupClickListener: OnListItemClickListener<BookmarksGroup>,
+) = adapterDelegateViewBinding<BookmarksGroup, ListModel, ItemBookmarksGroupBinding>(
+	{ 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_placeholder)
+			allowRgb565(true)
+			lifecycle(lifecycleOwner)
+			enqueueWith(coil)
+		}
+		binding.textViewTitle.text = item.manga.title
+		adapter.items = item.bookmarks
+	}
+
+	onViewRecycled {
+		binding.imageViewCover.disposeImageRequest()
+	}
+}
--- 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
@@ -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<Manga>,
+	listener: ListStateHolderListener,
+	bookmarkClickListener: OnListItemClickListener<Bookmark>,
+	groupClickListener: OnListItemClickListener<BookmarksGroup>,
+) : AsyncListDifferDelegationAdapter<ListModel>(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<ListModel>() {
+
+		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)
+			}
+		}
+	}
+}
--- 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
@@ -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<Bookmark>,
+) : 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
+	}
+}
--- a/app/src/main/java/org/koitharu/kotatsu/browser/BrowserActivity.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/browser/BrowserActivity.kt
@@ -11,11 +11,11 @@ import android.view.MenuItem
 import androidx.core.graphics.Insets
 import androidx.core.view.isVisible
 import androidx.core.view.updatePadding
-import com.google.android.material.R as materialR
 import org.koitharu.kotatsu.R
 import org.koitharu.kotatsu.base.ui.BaseActivity
 import org.koitharu.kotatsu.core.network.UserAgentInterceptor
 import org.koitharu.kotatsu.databinding.ActivityBrowserBinding
+import com.google.android.material.R as materialR

@SuppressLint("SetJavaScriptEnabled")
 class BrowserActivity : BaseActivity<ActivityBrowserBinding>(), BrowserCallback {
@@ -59,8 +59,9 @@ class BrowserActivity : BaseActivity<ActivityBrowserBinding>(), 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) {
--- 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,14 +1,12 @@
 package org.koitharu.kotatsu.core.backup

+import androidx.room.withTransaction
 import org.json.JSONArray
 import org.json.JSONObject
 import org.koitharu.kotatsu.BuildConfig
 import org.koitharu.kotatsu.core.db.MangaDatabase
-import org.koitharu.kotatsu.core.db.entity.MangaEntity
-import org.koitharu.kotatsu.core.db.entity.TagEntity
-import org.koitharu.kotatsu.favourites.data.FavouriteCategoryEntity
-import org.koitharu.kotatsu.favourites.data.FavouriteEntity
-import org.koitharu.kotatsu.history.data.HistoryEntity
+import org.koitharu.kotatsu.parsers.util.json.JSONIterator
+import org.koitharu.kotatsu.parsers.util.json.mapJSON

 private const val PAGE_SIZE = 10

@@ -24,11 +22,11 @@ class BackupRepository(private val db: MangaDatabase) {
 			}
 			offset += history.size
 			for (item in history) {
-				val manga = item.manga.toJson()
+				val manga = JsonSerializer(item.manga).toJson()
 				val tags = JSONArray()
-				item.tags.forEach { tags.put(it.toJson()) }
+				item.tags.forEach { tags.put(JsonSerializer(it).toJson()) }
 				manga.put("tags", tags)
-				val json = item.history.toJson()
+				val json = JsonSerializer(item.history).toJson()
 				json.put("manga", manga)
 				entry.data.put(json)
 			}
@@ -40,7 +38,7 @@ class BackupRepository(private val db: MangaDatabase) {
 		val entry = BackupEntry(BackupEntry.CATEGORIES, JSONArray())
 		val categories = db.favouriteCategoriesDao.findAll()
 		for (item in categories) {
-			entry.data.put(item.toJson())
+			entry.data.put(JsonSerializer(item).toJson())
 		}
 		return entry
 	}
@@ -55,11 +53,11 @@ class BackupRepository(private val db: MangaDatabase) {
 			}
 			offset += favourites.size
 			for (item in favourites) {
-				val manga = item.manga.toJson()
+				val manga = JsonSerializer(item.manga).toJson()
 				val tags = JSONArray()
-				item.tags.forEach { tags.put(it.toJson()) }
+				item.tags.forEach { tags.put(JsonSerializer(it).toJson()) }
 				manga.put("tags", tags)
-				val json = item.favourite.toJson()
+				val json = JsonSerializer(item.favourite).toJson()
 				json.put("manga", manga)
 				entry.data.put(json)
 			}
@@ -77,59 +75,54 @@ class BackupRepository(private val db: MangaDatabase) {
 		return entry
 	}

-	private fun MangaEntity.toJson(): JSONObject {
-		val jo = JSONObject()
-		jo.put("id", id)
-		jo.put("title", title)
-		jo.put("alt_title", altTitle)
-		jo.put("url", url)
-		jo.put("public_url", publicUrl)
-		jo.put("rating", rating)
-		jo.put("nsfw", isNsfw)
-		jo.put("cover_url", coverUrl)
-		jo.put("large_cover_url", largeCoverUrl)
-		jo.put("state", state)
-		jo.put("author", author)
-		jo.put("source", source)
-		return jo
+	suspend fun restoreHistory(entry: BackupEntry): CompositeResult {
+		val result = CompositeResult()
+		for (item in entry.data.JSONIterator()) {
+			val mangaJson = item.getJSONObject("manga")
+			val manga = JsonDeserializer(mangaJson).toMangaEntity()
+			val tags = mangaJson.getJSONArray("tags").mapJSON {
+				JsonDeserializer(it).toTagEntity()
+			}
+			val history = JsonDeserializer(item).toHistoryEntity()
+			result += runCatching {
+				db.withTransaction {
+					db.tagsDao.upsert(tags)
+					db.mangaDao.upsert(manga, tags)
+					db.historyDao.upsert(history)
+				}
+			}
+		}
+		return result
 	}

-	private fun TagEntity.toJson(): JSONObject {
-		val jo = JSONObject()
-		jo.put("id", id)
-		jo.put("title", title)
-		jo.put("key", key)
-		jo.put("source", source)
-		return jo
+	suspend fun restoreCategories(entry: BackupEntry): CompositeResult {
+		val result = CompositeResult()
+		for (item in entry.data.JSONIterator()) {
+			val category = JsonDeserializer(item).toFavouriteCategoryEntity()
+			result += runCatching {
+				db.favouriteCategoriesDao.upsert(category)
+			}
+		}
+		return result
 	}

-	private fun HistoryEntity.toJson(): JSONObject {
-		val jo = JSONObject()
-		jo.put("manga_id", mangaId)
-		jo.put("created_at", createdAt)
-		jo.put("updated_at", updatedAt)
-		jo.put("chapter_id", chapterId)
-		jo.put("page", page)
-		jo.put("scroll", scroll)
-		return jo
-	}
-
-	private fun FavouriteCategoryEntity.toJson(): JSONObject {
-		val jo = JSONObject()
-		jo.put("category_id", categoryId)
-		jo.put("created_at", createdAt)
-		jo.put("sort_key", sortKey)
-		jo.put("title", title)
-		jo.put("order", order)
-		jo.put("track", track)
-		return jo
-	}
-
-	private fun FavouriteEntity.toJson(): JSONObject {
-		val jo = JSONObject()
-		jo.put("manga_id", mangaId)
-		jo.put("category_id", categoryId)
-		jo.put("created_at", createdAt)
-		return jo
+	suspend fun restoreFavourites(entry: BackupEntry): CompositeResult {
+		val result = CompositeResult()
+		for (item in entry.data.JSONIterator()) {
+			val mangaJson = item.getJSONObject("manga")
+			val manga = JsonDeserializer(mangaJson).toMangaEntity()
+			val tags = mangaJson.getJSONArray("tags").mapJSON {
+				JsonDeserializer(it).toTagEntity()
+			}
+			val favourite = JsonDeserializer(item).toFavouriteEntity()
+			result += runCatching {
+				db.withTransaction {
+					db.tagsDao.upsert(tags)
+					db.mangaDao.upsert(manga, tags)
+					db.favouritesDao.upsert(favourite)
+				}
+			}
+		}
+		return result
 	}
 }
--- a/app/src/main/java/org/koitharu/kotatsu/core/backup/BackupZipOutput.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/core/backup/BackupZipOutput.kt
@@ -15,11 +15,11 @@ class BackupZipOutput(val file: File) : Closeable {

 	private val output = ZipOutput(file, Deflater.BEST_COMPRESSION)

-	suspend fun put(entry: BackupEntry) {
+	suspend fun put(entry: BackupEntry) = runInterruptible(Dispatchers.IO) {
 		output.put(entry.name, entry.data.toString(2))
 	}

-	suspend fun finish() {
+	suspend fun finish() = runInterruptible(Dispatchers.IO) {
 		output.finish()
 	}

--- a/app/src/main/java/org/koitharu/kotatsu/core/backup/JsonDeserializer.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/core/backup/JsonDeserializer.kt
@@ -0,0 +1,68 @@
+package org.koitharu.kotatsu.core.backup
+
+import org.json.JSONObject
+import org.koitharu.kotatsu.core.db.entity.MangaEntity
+import org.koitharu.kotatsu.core.db.entity.TagEntity
+import org.koitharu.kotatsu.favourites.data.FavouriteCategoryEntity
+import org.koitharu.kotatsu.favourites.data.FavouriteEntity
+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) {
+
+	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(
+		id = json.getLong("id"),
+		title = json.getString("title"),
+		altTitle = json.getStringOrNull("alt_title"),
+		url = json.getString("url"),
+		publicUrl = json.getStringOrNull("public_url").orEmpty(),
+		rating = json.getDouble("rating").toFloat(),
+		isNsfw = json.getBooleanOrDefault("nsfw", false),
+		coverUrl = json.getString("cover_url"),
+		largeCoverUrl = json.getStringOrNull("large_cover_url"),
+		state = json.getStringOrNull("state"),
+		author = json.getStringOrNull("author"),
+		source = json.getString("source")
+	)
+
+	fun toTagEntity() = TagEntity(
+		id = json.getLong("id"),
+		title = json.getString("title"),
+		key = json.getString("key"),
+		source = json.getString("source")
+	)
+
+	fun toHistoryEntity() = HistoryEntity(
+		mangaId = json.getLong("manga_id"),
+		createdAt = json.getLong("created_at"),
+		updatedAt = json.getLong("updated_at"),
+		chapterId = json.getLong("chapter_id"),
+		page = json.getInt("page"),
+		scroll = json.getDouble("scroll").toFloat(),
+		percent = json.getFloatOrDefault("percent", -1f),
+		deletedAt = 0L,
+	)
+
+	fun toFavouriteCategoryEntity() = FavouriteCategoryEntity(
+		categoryId = json.getInt("category_id"),
+		createdAt = json.getLong("created_at"),
+		sortKey = json.getInt("sort_key"),
+		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,
+	)
+}
--- a/app/src/main/java/org/koitharu/kotatsu/core/backup/JsonSerializer.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/core/backup/JsonSerializer.kt
@@ -0,0 +1,72 @@
+package org.koitharu.kotatsu.core.backup
+
+import org.json.JSONObject
+import org.koitharu.kotatsu.core.db.entity.MangaEntity
+import org.koitharu.kotatsu.core.db.entity.TagEntity
+import org.koitharu.kotatsu.favourites.data.FavouriteCategoryEntity
+import org.koitharu.kotatsu.favourites.data.FavouriteEntity
+import org.koitharu.kotatsu.history.data.HistoryEntity
+
+class JsonSerializer private constructor(private val json: JSONObject) {
+
+	constructor(e: FavouriteEntity) : this(
+		JSONObject().apply {
+			put("manga_id", e.mangaId)
+			put("category_id", e.categoryId)
+			put("sort_key", e.sortKey)
+			put("created_at", e.createdAt)
+		}
+	)
+
+	constructor(e: FavouriteCategoryEntity) : this(
+		JSONObject().apply {
+			put("category_id", e.categoryId)
+			put("created_at", e.createdAt)
+			put("sort_key", e.sortKey)
+			put("title", e.title)
+			put("order", e.order)
+			put("track", e.track)
+			put("show_in_lib", e.isVisibleInLibrary)
+		}
+	)
+
+	constructor(e: HistoryEntity) : this(
+		JSONObject().apply {
+			put("manga_id", e.mangaId)
+			put("created_at", e.createdAt)
+			put("updated_at", e.updatedAt)
+			put("chapter_id", e.chapterId)
+			put("page", e.page)
+			put("scroll", e.scroll)
+			put("percent", e.percent)
+		}
+	)
+
+	constructor(e: TagEntity) : this(
+		JSONObject().apply {
+			put("id", e.id)
+			put("title", e.title)
+			put("key", e.key)
+			put("source", e.source)
+		}
+	)
+
+	constructor(e: MangaEntity) : this(
+		JSONObject().apply {
+			put("id", e.id)
+			put("title", e.title)
+			put("alt_title", e.altTitle)
+			put("url", e.url)
+			put("public_url", e.publicUrl)
+			put("rating", e.rating)
+			put("nsfw", e.isNsfw)
+			put("cover_url", e.coverUrl)
+			put("large_cover_url", e.largeCoverUrl)
+			put("state", e.state)
+			put("author", e.author)
+			put("source", e.source)
+		}
+	)
+
+	fun toJson(): JSONObject = json
+}
--- a/app/src/main/java/org/koitharu/kotatsu/core/backup/RestoreRepository.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/core/backup/RestoreRepository.kt
@@ -1,118 +0,0 @@
-package org.koitharu.kotatsu.core.backup
-
-import androidx.room.withTransaction
-import org.json.JSONObject
-import org.koitharu.kotatsu.core.db.MangaDatabase
-import org.koitharu.kotatsu.core.db.entity.MangaEntity
-import org.koitharu.kotatsu.core.db.entity.TagEntity
-import org.koitharu.kotatsu.favourites.data.FavouriteCategoryEntity
-import org.koitharu.kotatsu.favourites.data.FavouriteEntity
-import org.koitharu.kotatsu.history.data.HistoryEntity
-import org.koitharu.kotatsu.parsers.model.SortOrder
-import org.koitharu.kotatsu.parsers.util.json.JSONIterator
-import org.koitharu.kotatsu.parsers.util.json.getBooleanOrDefault
-import org.koitharu.kotatsu.parsers.util.json.getStringOrNull
-import org.koitharu.kotatsu.parsers.util.json.mapJSON
-
-class RestoreRepository(private val db: MangaDatabase) {
-
-	suspend fun upsertHistory(entry: BackupEntry): CompositeResult {
-		val result = CompositeResult()
-		for (item in entry.data.JSONIterator()) {
-			val mangaJson = item.getJSONObject("manga")
-			val manga = parseManga(mangaJson)
-			val tags = mangaJson.getJSONArray("tags").mapJSON {
-				parseTag(it)
-			}
-			val history = parseHistory(item)
-			result += runCatching {
-				db.withTransaction {
-					db.tagsDao.upsert(tags)
-					db.mangaDao.upsert(manga, tags)
-					db.historyDao.upsert(history)
-				}
-			}
-		}
-		return result
-	}
-
-	suspend fun upsertCategories(entry: BackupEntry): CompositeResult {
-		val result = CompositeResult()
-		for (item in entry.data.JSONIterator()) {
-			val category = parseCategory(item)
-			result += runCatching {
-				db.favouriteCategoriesDao.upsert(category)
-			}
-		}
-		return result
-	}
-
-	suspend fun upsertFavourites(entry: BackupEntry): CompositeResult {
-		val result = CompositeResult()
-		for (item in entry.data.JSONIterator()) {
-			val mangaJson = item.getJSONObject("manga")
-			val manga = parseManga(mangaJson)
-			val tags = mangaJson.getJSONArray("tags").mapJSON {
-				parseTag(it)
-			}
-			val favourite = parseFavourite(item)
-			result += runCatching {
-				db.withTransaction {
-					db.tagsDao.upsert(tags)
-					db.mangaDao.upsert(manga, tags)
-					db.favouritesDao.upsert(favourite)
-				}
-			}
-		}
-		return result
-	}
-
-	private fun parseManga(json: JSONObject) = MangaEntity(
-		id = json.getLong("id"),
-		title = json.getString("title"),
-		altTitle = json.getStringOrNull("alt_title"),
-		url = json.getString("url"),
-		publicUrl = json.getStringOrNull("public_url").orEmpty(),
-		rating = json.getDouble("rating").toFloat(),
-		isNsfw = json.getBooleanOrDefault("nsfw", false),
-		coverUrl = json.getString("cover_url"),
-		largeCoverUrl = json.getStringOrNull("large_cover_url"),
-		state = json.getStringOrNull("state"),
-		author = json.getStringOrNull("author"),
-		source = json.getString("source"),
-	)
-
-	private fun parseTag(json: JSONObject) = TagEntity(
-		id = json.getLong("id"),
-		title = json.getString("title"),
-		key = json.getString("key"),
-		source = json.getString("source"),
-	)
-
-	private fun parseHistory(json: JSONObject) = HistoryEntity(
-		mangaId = json.getLong("manga_id"),
-		createdAt = json.getLong("created_at"),
-		updatedAt = json.getLong("updated_at"),
-		chapterId = json.getLong("chapter_id"),
-		page = json.getInt("page"),
-		scroll = json.getDouble("scroll").toFloat(),
-		deletedAt = 0L,
-	)
-
-	private fun parseCategory(json: JSONObject) = FavouriteCategoryEntity(
-		categoryId = json.getInt("category_id"),
-		createdAt = json.getLong("created_at"),
-		sortKey = json.getInt("sort_key"),
-		title = json.getString("title"),
-		order = json.getStringOrNull("order") ?: SortOrder.NEWEST.name,
-		track = json.getBooleanOrDefault("track", true),
-		deletedAt = 0L,
-	)
-
-	private fun parseFavourite(json: JSONObject) = FavouriteEntity(
-		mangaId = json.getLong("manga_id"),
-		categoryId = json.getLong("category_id"),
-		createdAt = json.getLong("created_at"),
-		deletedAt = 0L,
-	)
-}
--- 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`, `deleted_at`) VALUES (?,?,?,?,?,?)",
-			arrayOf(System.currentTimeMillis(), 1, resources.getString(R.string.read_later), SortOrder.NEWEST.name, 1, 0L)
+			"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,
+			)
 		)
 	}
-}
+}
--- a/app/src/main/java/org/koitharu/kotatsu/core/db/MangaDatabase.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/core/db/MangaDatabase.kt
@@ -6,8 +6,14 @@ 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.dao.MangaDao
+import org.koitharu.kotatsu.core.db.dao.PreferencesDao
+import org.koitharu.kotatsu.core.db.dao.TagsDao
+import org.koitharu.kotatsu.core.db.dao.TrackLogsDao
+import org.koitharu.kotatsu.core.db.entity.MangaEntity
+import org.koitharu.kotatsu.core.db.entity.MangaPrefsEntity
+import org.koitharu.kotatsu.core.db.entity.MangaTagsEntity
+import org.koitharu.kotatsu.core.db.entity.TagEntity
 import org.koitharu.kotatsu.core.db.migrations.*
 import org.koitharu.kotatsu.favourites.data.FavouriteCategoriesDao
 import org.koitharu.kotatsu.favourites.data.FavouriteCategoryEntity
@@ -15,16 +21,22 @@ import org.koitharu.kotatsu.favourites.data.FavouriteEntity
 import org.koitharu.kotatsu.favourites.data.FavouritesDao
 import org.koitharu.kotatsu.history.data.HistoryDao
 import org.koitharu.kotatsu.history.data.HistoryEntity
+import org.koitharu.kotatsu.scrobbling.data.ScrobblingDao
+import org.koitharu.kotatsu.scrobbling.data.ScrobblingEntity
 import org.koitharu.kotatsu.suggestions.data.SuggestionDao
 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

-const val DATABASE_VERSION = 12
+const val DATABASE_VERSION = 14

@Database(
 	entities = [
 		MangaEntity::class, TagEntity::class, HistoryEntity::class, MangaTagsEntity::class,
 		FavouriteCategoryEntity::class, FavouriteEntity::class, MangaPrefsEntity::class,
 		TrackEntity::class, TrackLogEntity::class, SuggestionEntity::class, BookmarkEntity::class,
+		ScrobblingEntity::class,
 	],
 	version = DATABASE_VERSION,
 )
@@ -49,6 +61,8 @@ abstract class MangaDatabase : RoomDatabase() {
 	abstract val suggestionDao: SuggestionDao

 	abstract val bookmarksDao: BookmarksDao
+
+	abstract val scrobblingDao: ScrobblingDao
 }

 fun MangaDatabase(context: Context): MangaDatabase = Room.databaseBuilder(
@@ -67,6 +81,8 @@ fun MangaDatabase(context: Context): MangaDatabase = Room.databaseBuilder(
 	Migration9To10(),
 	Migration10To11(),
 	Migration11To12(),
+	Migration12To13(),
+	Migration13To14(),
 ).addCallback(
 	DatabasePrePopulateCallback(context.resources)
-).build()
+).build()
--- a/app/src/main/java/org/koitharu/kotatsu/core/db/Tables.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/core/db/Tables.kt
@@ -5,4 +5,4 @@ const val TABLE_MANGA = "manga"
 const val TABLE_TAGS = "tags"
 const val TABLE_FAVOURITE_CATEGORIES = "favourite_categories"
 const val TABLE_HISTORY = "history"
-const val TABLE_MANGA_TAGS = "manga_tags"
+const val TABLE_MANGA_TAGS = "manga_tags"
--- a/app/src/main/java/org/koitharu/kotatsu/core/db/dao/TrackLogsDao.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/core/db/dao/TrackLogsDao.kt
@@ -1,8 +1,8 @@
 package org.koitharu.kotatsu.core.db.dao

 import androidx.room.*
-import org.koitharu.kotatsu.core.db.entity.TrackLogEntity
-import org.koitharu.kotatsu.core.db.entity.TrackLogWithManga
+import org.koitharu.kotatsu.tracker.data.TrackLogEntity
+import org.koitharu.kotatsu.tracker.data.TrackLogWithManga

@Dao
 interface TrackLogsDao {
@@ -21,7 +21,7 @@ interface TrackLogsDao {
 	suspend fun removeAll(mangaId: Long)

 	@Query("DELETE FROM track_logs WHERE manga_id NOT IN (SELECT manga_id FROM tracks)")
-	suspend fun cleanup()
+	suspend fun gc()

 	@Query("SELECT COUNT(*) FROM track_logs")
 	suspend fun count(): Int
--- a/app/src/main/java/org/koitharu/kotatsu/core/db/entity/EntityMapping.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/core/db/entity/EntityMapping.kt
@@ -1,11 +1,9 @@
 package org.koitharu.kotatsu.core.db.entity

-import java.util.*
-import org.koitharu.kotatsu.core.model.TrackingLogItem
 import org.koitharu.kotatsu.parsers.model.*
-import org.koitharu.kotatsu.parsers.util.longHashCode
 import org.koitharu.kotatsu.parsers.util.mapToSet
 import org.koitharu.kotatsu.parsers.util.toTitleCase
+import org.koitharu.kotatsu.utils.ext.longHashCode

 // Entity to model

@@ -35,13 +33,6 @@ fun MangaEntity.toManga(tags: Set<MangaTag>) = Manga(

 fun MangaWithTags.toManga() = manga.toManga(tags.toMangaTags())

-fun TrackLogWithManga.toTrackingLogItem() = TrackingLogItem(
-	id = trackLog.id,
-	chapters = trackLog.chapters.split('\n').filterNot { x -> x.isEmpty() },
-	manga = manga.toManga(tags.toMangaTags()),
-	createdAt = Date(trackLog.createdAt)
-)
-
 // Model to entity

 fun Manga.toEntity() = MangaEntity(
--- 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
@@ -6,7 +6,7 @@ import androidx.room.PrimaryKey
 import org.koitharu.kotatsu.core.db.TABLE_MANGA

@Entity(tableName = TABLE_MANGA)
-class MangaEntity(
+data class MangaEntity(
 	@PrimaryKey(autoGenerate = false)
 	@ColumnInfo(name = "manga_id") val id: Long,
 	@ColumnInfo(name = "title") val title: String,
@@ -19,5 +19,5 @@ class MangaEntity(
 	@ColumnInfo(name = "large_cover_url") val largeCoverUrl: String?,
 	@ColumnInfo(name = "state") val state: String?,
 	@ColumnInfo(name = "author") val author: String?,
-	@ColumnInfo(name = "source") val source: String
-)
+	@ColumnInfo(name = "source") val source: String,
+)
--- 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<TagEntity>,
-)
+) {
+
+	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
+	}
+}
--- 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
@@ -6,10 +6,10 @@ import androidx.room.PrimaryKey
 import org.koitharu.kotatsu.core.db.TABLE_TAGS

@Entity(tableName = TABLE_TAGS)
-class TagEntity(
+data class TagEntity(
 	@PrimaryKey(autoGenerate = false)
 	@ColumnInfo(name = "tag_id") val id: Long,
 	@ColumnInfo(name = "title") val title: String,
 	@ColumnInfo(name = "key") val key: String,
-	@ColumnInfo(name = "source") val source: String
-)
+	@ColumnInfo(name = "source") val source: String,
+)
--- a/app/src/main/java/org/koitharu/kotatsu/core/db/entity/TrackLogWithManga.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/core/db/entity/TrackLogWithManga.kt
@@ -1,20 +0,0 @@
-package org.koitharu.kotatsu.core.db.entity
-
-import androidx.room.Embedded
-import androidx.room.Junction
-import androidx.room.Relation
-
-class TrackLogWithManga(
-	@Embedded val trackLog: TrackLogEntity,
-	@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>,
-)
--- 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
@@ -6,8 +6,22 @@ import androidx.sqlite.db.SupportSQLiteDatabase
 class Migration11To12 : Migration(11, 12) {

 	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")
+		database.execSQL(
+			"""
+			CREATE TABLE IF NOT EXISTS `scrobblings` (
+				`scrobbler` INTEGER NOT NULL,
+				`id` INTEGER NOT NULL,
+				`manga_id` INTEGER NOT NULL,
+				`target_id` INTEGER NOT NULL, 
+				`status` TEXT,
+				`chapter` INTEGER NOT NULL, 
+				`comment` TEXT,
+				`rating` REAL NOT NULL,
+				PRIMARY KEY(`scrobbler`, `id`, `manga_id`)
+			)
+			""".trimIndent()
+		)
+		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")
 	}
-}
+}
--- 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
@@ -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")
+	}
+}
--- 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
@@ -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")
+	}
+}
--- a/app/src/main/java/org/koitharu/kotatsu/core/exceptions/CloudFlareProtectedException.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/core/exceptions/CloudFlareProtectedException.kt
@@ -1,8 +1,6 @@
 package org.koitharu.kotatsu.core.exceptions

-import androidx.annotation.StringRes
 import okio.IOException
-import org.koitharu.kotatsu.R

 class CloudFlareProtectedException(
 	val url: String
--- a/app/src/main/java/org/koitharu/kotatsu/core/exceptions/CompositeException.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/core/exceptions/CompositeException.kt
@@ -0,0 +1,8 @@
+package org.koitharu.kotatsu.core.exceptions
+
+import org.koitharu.kotatsu.parsers.util.mapNotNullToSet
+
+class CompositeException(val errors: Collection<Throwable>) : Exception() {
+
+	override val message: String = errors.mapNotNullToSet { it.message }.joinToString()
+}
--- a/app/src/main/java/org/koitharu/kotatsu/core/github/GithubRepository.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/core/github/GithubRepository.kt
@@ -10,7 +10,7 @@ class GithubRepository(private val okHttp: OkHttpClient) {
 	suspend fun getLatestVersion(): AppVersion {
 		val request = Request.Builder()
 			.get()
-			.url("https://api.github.com/repos/nv95/Kotatsu/releases/latest")
+			.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(
--- 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
--- a/app/src/main/java/org/koitharu/kotatsu/core/model/MangaHistory.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/core/model/MangaHistory.kt
@@ -11,4 +11,5 @@ data class MangaHistory(
 	val chapterId: Long,
 	val page: Int,
 	val scroll: Int,
+	val percent: Float,
 ) : Parcelable
--- a/app/src/main/java/org/koitharu/kotatsu/core/model/MangaSource.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/core/model/MangaSource.kt
@@ -0,0 +1,10 @@
+package org.koitharu.kotatsu.core.model
+
+import org.koitharu.kotatsu.parsers.model.MangaSource
+import org.koitharu.kotatsu.parsers.util.toTitleCase
+import java.util.*
+
+fun MangaSource.getLocaleTitle(): String? {
+	val lc = Locale(locale ?: return null)
+	return lc.getDisplayLanguage(lc).toTitleCase(lc)
+}
--- a/app/src/main/java/org/koitharu/kotatsu/core/model/MangaTracking.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/core/model/MangaTracking.kt
@@ -1,14 +0,0 @@
-package org.koitharu.kotatsu.core.model
-
-import android.os.Parcelable
-import kotlinx.parcelize.Parcelize
-import org.koitharu.kotatsu.parsers.model.Manga
-import java.util.*
-
-data class MangaTracking(
-	val manga: Manga,
-	val knownChaptersCount: Int,
-	val lastChapterId: Long,
-	val lastNotifiedChapterId: Long,
-	val lastCheck: Date?
-)
--- a/app/src/main/java/org/koitharu/kotatsu/core/model/parcelable/ParcelableMangaChapters.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/core/model/parcelable/ParcelableMangaChapters.kt
@@ -3,14 +3,13 @@ package org.koitharu.kotatsu.core.model.parcelable
 import android.os.Parcel
 import android.os.Parcelable
 import org.koitharu.kotatsu.parsers.model.MangaChapter
-import org.koitharu.kotatsu.utils.ext.createList

 class ParcelableMangaChapters(
 	val chapters: List<MangaChapter>,
 ) : Parcelable {

 	constructor(parcel: Parcel) : this(
-		createList(parcel.readInt()) { parcel.readMangaChapter() }
+		List(parcel.readInt()) { parcel.readMangaChapter() }
 	)

 	override fun writeToParcel(parcel: Parcel, flags: Int) {
--- a/app/src/main/java/org/koitharu/kotatsu/core/model/parcelable/ParcelableMangaPages.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/core/model/parcelable/ParcelableMangaPages.kt
@@ -3,14 +3,13 @@ package org.koitharu.kotatsu.core.model.parcelable
 import android.os.Parcel
 import android.os.Parcelable
 import org.koitharu.kotatsu.parsers.model.MangaPage
-import org.koitharu.kotatsu.utils.ext.createList

 class ParcelableMangaPages(
 	val pages: List<MangaPage>,
 ) : Parcelable {

 	constructor(parcel: Parcel) : this(
-		createList(parcel.readInt()) { parcel.readMangaPage() }
+		List(parcel.readInt()) { parcel.readMangaPage() }
 	)

 	override fun writeToParcel(parcel: Parcel, flags: Int) {
--- a/app/src/main/java/org/koitharu/kotatsu/core/model/parcelable/ParcelableMangaTags.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/core/model/parcelable/ParcelableMangaTags.kt
@@ -3,14 +3,14 @@ package org.koitharu.kotatsu.core.model.parcelable
 import android.os.Parcel
 import android.os.Parcelable
 import org.koitharu.kotatsu.parsers.model.MangaTag
-import org.koitharu.kotatsu.utils.ext.createSet
+import org.koitharu.kotatsu.utils.ext.Set

 class ParcelableMangaTags(
 	val tags: Set<MangaTag>,
 ) : Parcelable {

 	constructor(parcel: Parcel) : this(
-		createSet(parcel.readInt()) { parcel.readMangaTag() }
+		Set(parcel.readInt()) { parcel.readMangaTag() }
 	)

 	override fun writeToParcel(parcel: Parcel, flags: Int) {
--- a/app/src/main/java/org/koitharu/kotatsu/core/network/CloudFlareInterceptor.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/core/network/CloudFlareInterceptor.kt
@@ -17,7 +17,7 @@ class CloudFlareInterceptor : Interceptor {
 		if (response.code == HTTP_FORBIDDEN || response.code == HTTP_UNAVAILABLE) {
 			if (response.header(HEADER_SERVER)?.startsWith(SERVER_CLOUDFLARE) == true) {
 				response.closeQuietly()
-				throw CloudFlareProtectedException(chain.request().url.toString())
+				throw CloudFlareProtectedException(response.request.url.toString())
 			}
 		}
 		return response
--- a/app/src/main/java/org/koitharu/kotatsu/core/network/CommonHeaders.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/core/network/CommonHeaders.kt
@@ -10,6 +10,7 @@ object CommonHeaders {
 	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
 		get() = CacheControl.Builder().noStore().build()
--- a/app/src/main/java/org/koitharu/kotatsu/core/network/GZipInterceptor.kt
+++ 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())
+	}
+}
--- a/app/src/main/java/org/koitharu/kotatsu/core/network/NetworkModule.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/core/network/NetworkModule.kt
@@ -21,9 +21,10 @@ val networkModule
 				cookieJar(get())
 				dns(DoHManager(cache, get()))
 				cache(cache)
+				addInterceptor(GZipInterceptor())
 				addInterceptor(UserAgentInterceptor())
 				addInterceptor(CloudFlareInterceptor())
 			}.build()
 		}
 		single<MangaLoaderContext> { MangaLoaderContextImpl(get(), get(), get()) }
-	}
+	}
--- a/app/src/main/java/org/koitharu/kotatsu/core/os/ShortcutsRepository.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/core/os/ShortcutsRepository.kt
@@ -6,38 +6,42 @@ import android.content.pm.ShortcutManager
 import android.media.ThumbnailUtils
 import android.os.Build
 import android.util.Size
+import androidx.annotation.VisibleForTesting
 import androidx.core.content.pm.ShortcutInfoCompat
 import androidx.core.content.pm.ShortcutManagerCompat
 import androidx.core.graphics.drawable.IconCompat
+import androidx.room.InvalidationTracker
 import coil.ImageLoader
 import coil.request.ImageRequest
 import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.withContext
+import kotlinx.coroutines.Job
+import kotlinx.coroutines.launch
 import org.koitharu.kotatsu.R
 import org.koitharu.kotatsu.base.domain.MangaDataRepository
+import org.koitharu.kotatsu.core.db.TABLE_HISTORY
 import org.koitharu.kotatsu.history.domain.HistoryRepository
 import org.koitharu.kotatsu.parsers.model.Manga
 import org.koitharu.kotatsu.reader.ui.ReaderActivity
+import org.koitharu.kotatsu.utils.ext.printStackTraceDebug
+import org.koitharu.kotatsu.utils.ext.processLifecycleScope
 import org.koitharu.kotatsu.utils.ext.requireBitmap

-class ShortcutsRepository(
+class ShortcutsUpdater(
 	private val context: Context,
 	private val coil: ImageLoader,
 	private val historyRepository: HistoryRepository,
 	private val mangaRepository: MangaDataRepository,
-) {
+) : InvalidationTracker.Observer(TABLE_HISTORY) {

-	private val iconSize by lazy {
-		getIconSize(context)
-	}
+	private val iconSize by lazy { getIconSize(context) }
+	private var shortcutsUpdateJob: Job? = null

-	suspend fun updateShortcuts() {
-		if (Build.VERSION.SDK_INT < Build.VERSION_CODES.N_MR1) return
-		val manager = context.getSystemService(Context.SHORTCUT_SERVICE) as ShortcutManager
-		val shortcuts = historyRepository.getList(0, manager.maxShortcutCountPerActivity)
-			.filter { x -> x.title.isNotEmpty() }
-			.map { buildShortcutInfo(it).build().toShortcutInfo() }
-		manager.dynamicShortcuts = shortcuts
+	override fun onInvalidated(tables: MutableSet<String>) {
+		val prevJob = shortcutsUpdateJob
+		shortcutsUpdateJob = processLifecycleScope.launch(Dispatchers.Default) {
+			prevJob?.join()
+			updateShortcutsImpl()
+		}
 	}

 	suspend fun requestPinShortcut(manga: Manga): Boolean {
@@ -48,17 +52,30 @@ class ShortcutsRepository(
 		)
 	}

+	@VisibleForTesting
+	suspend fun await(): Boolean {
+		return shortcutsUpdateJob?.join() != null
+	}
+
+	private suspend fun updateShortcutsImpl() = runCatching {
+		val manager = context.getSystemService(Context.SHORTCUT_SERVICE) as ShortcutManager
+		val shortcuts = historyRepository.getList(0, manager.maxShortcutCountPerActivity)
+			.filter { x -> x.title.isNotEmpty() }
+			.map { buildShortcutInfo(it).build().toShortcutInfo() }
+		manager.dynamicShortcuts = shortcuts
+	}.onFailure {
+		it.printStackTraceDebug()
+	}
+
 	private suspend fun buildShortcutInfo(manga: Manga): ShortcutInfoCompat.Builder {
 		val icon = runCatching {
-			withContext(Dispatchers.IO) {
-				val bmp = coil.execute(
-					ImageRequest.Builder(context)
-						.data(manga.coverUrl)
-						.size(iconSize.width, iconSize.height)
-						.build()
-				).requireBitmap()
-				ThumbnailUtils.extractThumbnail(bmp, iconSize.width, iconSize.height, 0)
-			}
+			val bmp = coil.execute(
+				ImageRequest.Builder(context)
+					.data(manga.coverUrl)
+					.size(iconSize.width, iconSize.height)
+					.build()
+			).requireBitmap()
+			ThumbnailUtils.extractThumbnail(bmp, iconSize.width, iconSize.height, 0)
 		}.fold(
 			onSuccess = { IconCompat.createWithAdaptiveBitmap(it) },
 			onFailure = { IconCompat.createWithResource(context, R.drawable.ic_shortcut_default) }
--- a/app/src/main/java/org/koitharu/kotatsu/core/parser/FaviconMapper.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/core/parser/FaviconMapper.kt
@@ -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.parsers.model.MangaSource
-
-class FaviconMapper : Mapper<Uri, HttpUrl> {
-
-	override fun map(data: Uri, options: Options): HttpUrl? {
-		if (data.scheme != "favicon") {
-			return null
-		}
-		val mangaSource = MangaSource.valueOf(data.schemeSpecificPart)
-		val repo = MangaRepository(mangaSource) as RemoteMangaRepository
-		return repo.getFaviconUrl().toHttpUrl()
-	}
-}
--- a/app/src/main/java/org/koitharu/kotatsu/core/parser/MangaRepository.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/core/parser/MangaRepository.kt
@@ -13,12 +13,9 @@ interface MangaRepository {

 	val sortOrders: Set<SortOrder>

-	suspend fun getList(
-		offset: Int,
-		query: String? = null,
-		tags: Set<MangaTag>? = null,
-		sortOrder: SortOrder? = null,
-	): List<Manga>
+	suspend fun getList(offset: Int, query: String): List<Manga>
+
+	suspend fun getList(offset: Int, tags: Set<MangaTag>?, sortOrder: SortOrder?): List<Manga>

 	suspend fun getDetails(manga: Manga): Manga

--- a/app/src/main/java/org/koitharu/kotatsu/core/parser/RemoteMangaRepository.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/core/parser/RemoteMangaRepository.kt
@@ -20,12 +20,13 @@ class RemoteMangaRepository(private val parser: MangaParser) : MangaRepository {
 			getConfig().defaultSortOrder = value
 		}

-	override suspend fun getList(
-		offset: Int,
-		query: String?,
-		tags: Set<MangaTag>?,
-		sortOrder: SortOrder?,
-	): List<Manga> = parser.getList(offset, query, tags, sortOrder)
+	override suspend fun getList(offset: Int, query: String): List<Manga> {
+		return parser.getList(offset, query)
+	}
+
+	override suspend fun getList(offset: Int, tags: Set<MangaTag>?, sortOrder: SortOrder?): List<Manga> {
+		return parser.getList(offset, tags, sortOrder)
+	}

 	override suspend fun getDetails(manga: Manga): Manga = parser.getDetails(manga)

@@ -35,7 +36,7 @@ class RemoteMangaRepository(private val parser: MangaParser) : MangaRepository {

 	override suspend fun getTags(): Set<MangaTag> = parser.getTags()

-	fun getFaviconUrl(): String = parser.getFaviconUrl()
+	suspend fun getFavicons(): Favicons = parser.getFavicons()

 	fun getAuthProvider(): MangaParserAuthProvider? = parser as? MangaParserAuthProvider

--- 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
@@ -0,0 +1,159 @@
+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 okhttp3.OkHttpClient
+import okhttp3.Request
+import okhttp3.Response
+import okhttp3.ResponseBody
+import okhttp3.internal.closeQuietly
+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
+import java.net.HttpURLConnection
+
+private const val FALLBACK_SIZE = 9999 // largest icon
+
+class FaviconFetcher(
+	private val okHttpClient: OkHttpClient,
+	private val diskCache: Lazy<DiskCache?>,
+	private val mangaSource: MangaSource,
+	private val options: Options,
+) : 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 = MangaRepository(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<Any>, 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,
+	) : Fetcher.Factory<Uri> {
+
+		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.valueOf(data.schemeSpecificPart)
+				FaviconFetcher(okHttpClient, diskCache, mangaSource, options)
+			} else {
+				null
+			}
+		}
+	}
+
+	class FaviconMetadata(val source: MangaSource) : ImageSource.Metadata()
+}
--- 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
@@ -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)
--- a/app/src/main/java/org/koitharu/kotatsu/core/prefs/AppSettings.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/core/prefs/AppSettings.kt
@@ -4,21 +4,18 @@ import android.content.Context
 import android.content.SharedPreferences
 import android.net.ConnectivityManager
 import android.net.Uri
-import android.os.Build
 import android.provider.Settings
 import androidx.appcompat.app.AppCompatDelegate
 import androidx.collection.arraySetOf
 import androidx.core.content.edit
 import androidx.preference.PreferenceManager
 import com.google.android.material.color.DynamicColors
-import kotlinx.coroutines.channels.awaitClose
-import kotlinx.coroutines.channels.trySendBlocking
-import kotlinx.coroutines.flow.callbackFlow
 import org.koitharu.kotatsu.BuildConfig
 import org.koitharu.kotatsu.core.model.ZoomMode
 import org.koitharu.kotatsu.core.network.DoHProvider
 import org.koitharu.kotatsu.parsers.model.MangaSource
 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
@@ -41,7 +38,7 @@ class AppSettings(context: Context) {
 		get() = Collections.unmodifiableSet(remoteSources)

 	var listMode: ListMode
-		get() = prefs.getEnumValue(KEY_LIST_MODE, ListMode.DETAILED_LIST)
+		get() = prefs.getEnumValue(KEY_LIST_MODE, ListMode.GRID)
 		set(value) = prefs.edit { putEnumValue(KEY_LIST_MODE, value) }

 	var defaultSection: AppSection
@@ -52,7 +49,7 @@ class AppSettings(context: Context) {
 		get() = prefs.getString(KEY_THEME, null)?.toIntOrNull() ?: AppCompatDelegate.MODE_NIGHT_FOLLOW_SYSTEM

 	val isDynamicTheme: Boolean
-		get() = prefs.getBoolean(KEY_DYNAMIC_THEME, false)
+		get() = DynamicColors.isDynamicColorAvailable() && prefs.getBoolean(KEY_DYNAMIC_THEME, false)

 	val isAmoledTheme: Boolean
 		get() = prefs.getBoolean(KEY_THEME_AMOLED, false)
@@ -105,13 +102,20 @@ class AppSettings(context: Context) {
 	val isReaderModeDetectionEnabled: Boolean
 		get() = prefs.getBoolean(KEY_READER_MODE_DETECT, true)

-	var historyGrouping: Boolean
+	var isHistoryGroupingEnabled: Boolean
 		get() = prefs.getBoolean(KEY_HISTORY_GROUPING, true)
 		set(value) = prefs.edit { putBoolean(KEY_HISTORY_GROUPING, value) }

+	val isReadingIndicatorsEnabled: Boolean
+		get() = prefs.getBoolean(KEY_READING_INDICATORS, true)
+
 	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) }
@@ -126,6 +130,13 @@ class AppSettings(context: Context) {
 		get() = prefs.getString(KEY_APP_PASSWORD, null)
 		set(value) = prefs.edit { if (value != null) putString(KEY_APP_PASSWORD, value) else remove(KEY_APP_PASSWORD) }

+	var isBiometricProtectionEnabled: Boolean
+		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<String>
 		get() = prefs.getString(KEY_SOURCES_ORDER, null)
 			?.split('|')
@@ -152,7 +163,7 @@ class AppSettings(context: Context) {
 		}

 	fun markKnownSources(sources: Collection<MangaSource>) {
-		sourcesOrder = sourcesOrder + sources.map { it.name }
+		sourcesOrder = (sourcesOrder + sources.map { it.name }).distinct()
 	}

 	val isPagesNumbersEnabled: Boolean
@@ -188,10 +199,6 @@ 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 dnsOverHttps: DoHProvider
 		get() = prefs.getEnumValue(KEY_DOH, DoHProvider.NONE)

@@ -243,15 +250,7 @@ class AppSettings(context: Context) {
 		prefs.unregisterOnSharedPreferenceChangeListener(listener)
 	}

-	fun observe() = callbackFlow<String> {
-		val listener = SharedPreferences.OnSharedPreferenceChangeListener { _, key ->
-			trySendBlocking(key)
-		}
-		prefs.registerOnSharedPreferenceChangeListener(listener)
-		awaitClose {
-			prefs.unregisterOnSharedPreferenceChangeListener(listener)
-		}
-	}
+	fun observe() = prefs.observe()

 	companion object {

@@ -294,11 +293,13 @@ class AppSettings(context: Context) {
 		const val KEY_READER_MODE_DETECT = "reader_mode_detect"
 		const val KEY_APP_PASSWORD = "app_password"
 		const val KEY_PROTECT_APP = "protect_app"
+		const val KEY_PROTECT_APP_BIOMETRIC = "protect_app_bio"
 		const val KEY_APP_VERSION = "app_version"
 		const val KEY_ZOOM_MODE = "zoom_mode"
 		const val KEY_BACKUP = "backup"
 		const val KEY_RESTORE = "restore"
 		const val KEY_HISTORY_GROUPING = "history_grouping"
+		const val KEY_READING_INDICATORS = "reading_indicators"
 		const val KEY_REVERSE_CHAPTERS = "reverse_chapters"
 		const val KEY_HISTORY_EXCLUDE_NSFW = "history_exclude_nsfw"
 		const val KEY_PAGES_NUMBERS = "pages_numbers"
@@ -307,30 +308,22 @@ 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"

 		// About
 		const val KEY_APP_UPDATE = "app_update"
 		const val KEY_APP_UPDATE_AUTO = "app_update_auto"
 		const val KEY_APP_TRANSLATION = "about_app_translation"
-		const val KEY_FEEDBACK_4PDA = "about_feedback_4pda"
-		const val KEY_FEEDBACK_DISCORD = "about_feedback_discord"
-		const val KEY_FEEDBACK_GITHUB = "about_feedback_github"

 		private const val NETWORK_NEVER = 0
 		private const val NETWORK_ALWAYS = 1
 		private const val NETWORK_NON_METERED = 2
-
-		val isDynamicColorAvailable: Boolean
-			get() = DynamicColors.isDynamicColorAvailable() ||
-				(isSamsung && Build.VERSION.SDK_INT >= Build.VERSION_CODES.S)
-
-		private val isSamsung
-			get() = Build.MANUFACTURER.equals("samsung", ignoreCase = true)
 	}
-}
+}
--- a/app/src/main/java/org/koitharu/kotatsu/core/ui/AppCrashHandler.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/core/ui/AppCrashHandler.kt
@@ -1,22 +0,0 @@
-package org.koitharu.kotatsu.core.ui
-
-import android.content.Context
-import android.content.Intent
-import android.util.Log
-import kotlin.system.exitProcess
-import org.koitharu.kotatsu.utils.ext.printStackTraceDebug
-
-class AppCrashHandler(private val applicationContext: Context) : Thread.UncaughtExceptionHandler {
-
-	override fun uncaughtException(t: Thread, e: Throwable) {
-		val intent = CrashActivity.newIntent(applicationContext, e)
-		intent.flags = (Intent.FLAG_ACTIVITY_CLEAR_TASK or Intent.FLAG_ACTIVITY_NEW_TASK)
-		try {
-			applicationContext.startActivity(intent)
-		} catch (t: Throwable) {
-			t.printStackTraceDebug()
-		}
-		Log.e("CRASH", e.message, e)
-		exitProcess(1)
-	}
-}
--- a/app/src/main/java/org/koitharu/kotatsu/core/ui/CrashActivity.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/core/ui/CrashActivity.kt
@@ -1,83 +0,0 @@
-package org.koitharu.kotatsu.core.ui
-
-import android.app.Activity
-import android.content.ActivityNotFoundException
-import android.content.Context
-import android.content.Intent
-import android.net.Uri
-import android.os.Bundle
-import android.view.Menu
-import android.view.MenuItem
-import android.view.View
-import org.koitharu.kotatsu.R
-import org.koitharu.kotatsu.databinding.ActivityCrashBinding
-import org.koitharu.kotatsu.main.ui.MainActivity
-import org.koitharu.kotatsu.parsers.util.ellipsize
-import org.koitharu.kotatsu.utils.ShareHelper
-
-class CrashActivity : Activity(), View.OnClickListener {
-
-	private lateinit var binding: ActivityCrashBinding
-
-	override fun onCreate(savedInstanceState: Bundle?) {
-		super.onCreate(savedInstanceState)
-		binding = ActivityCrashBinding.inflate(layoutInflater)
-		setContentView(binding.root)
-		binding.textView.text = intent.getStringExtra(Intent.EXTRA_TEXT)
-		binding.buttonClose.setOnClickListener(this)
-		binding.buttonRestart.setOnClickListener(this)
-		binding.buttonReport.setOnClickListener(this)
-	}
-
-	override fun onCreateOptionsMenu(menu: Menu?): Boolean {
-		menuInflater.inflate(R.menu.opt_crash, menu)
-		return super.onCreateOptionsMenu(menu)
-	}
-
-	override fun onOptionsItemSelected(item: MenuItem): Boolean {
-		when (item.itemId) {
-			R.id.action_share -> {
-				ShareHelper(this).shareText(binding.textView.text.toString())
-			}
-			else -> return super.onOptionsItemSelected(item)
-		}
-		return true
-	}
-
-	override fun onClick(v: View) {
-		when (v.id) {
-			R.id.button_close -> {
-				finish()
-			}
-			R.id.button_restart -> {
-				val intent = Intent(applicationContext, MainActivity::class.java)
-				intent.flags = (Intent.FLAG_ACTIVITY_CLEAR_TASK or Intent.FLAG_ACTIVITY_NEW_TASK)
-				startActivity(intent)
-				finish()
-			}
-			R.id.button_report -> {
-				val intent = Intent(Intent.ACTION_VIEW)
-				intent.data = Uri.parse("https://github.com/nv95/Kotatsu/issues")
-				try {
-					startActivity(Intent.createChooser(intent, getString(R.string.report_github)))
-				} catch (_: ActivityNotFoundException) {
-				}
-			}
-		}
-	}
-
-	companion object {
-
-		private const val MAX_TRACE_SIZE = 131071
-
-		fun newIntent(context: Context, error: Throwable): Intent {
-			val crashInfo = error
-				.stackTraceToString()
-				.trimIndent()
-				.ellipsize(MAX_TRACE_SIZE)
-			val intent = Intent(context, CrashActivity::class.java)
-			intent.putExtra(Intent.EXTRA_TEXT, crashInfo)
-			return intent
-		}
-	}
-}
--- 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"
 	}
 }
--- a/app/src/main/java/org/koitharu/kotatsu/core/ui/uiModule.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/core/ui/uiModule.kt
@@ -1,15 +1,21 @@
 package org.koitharu.kotatsu.core.ui

+import android.text.Html
 import coil.ComponentRegistry
 import coil.ImageLoader
+import coil.decode.SvgDecoder
 import coil.disk.DiskCache
+import coil.util.DebugLogger
 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.BuildConfig
+import org.koitharu.kotatsu.core.parser.favicon.FaviconFetcher
 import org.koitharu.kotatsu.local.data.CacheDir
 import org.koitharu.kotatsu.local.data.CbzFetcher
+import org.koitharu.kotatsu.utils.ext.isLowRamDevice
+import org.koitharu.kotatsu.utils.image.CoilImageGetter

 val uiModule
 	get() = module {
@@ -29,12 +35,19 @@ val uiModule
 			ImageLoader.Builder(androidContext())
 				.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(androidContext()))
 				.components(
 					ComponentRegistry.Builder()
+						.add(SvgDecoder.Factory())
 						.add(CbzFetcher.Factory())
-						.add(FaviconMapper())
+						.add(FaviconFetcher.Factory(androidContext(), get()))
 						.build()
 				).build()
 		}
+		factory<Html.ImageGetter> { CoilImageGetter(androidContext(), get()) }
 	}
--- a/app/src/main/java/org/koitharu/kotatsu/details/DetailsModule.kt
+++ b/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(), get())
+			DetailsViewModel(intent.get(), get(), get(), get(), get(), get(), get(), get(), get(), get())
 		}
 	}
--- 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,20 +1,21 @@
 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.app.AppCompatActivity
 import androidx.appcompat.view.ActionMode
 import androidx.appcompat.widget.SearchView
 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 com.google.android.material.snackbar.Snackbar
 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.ListSelectionController
 import org.koitharu.kotatsu.base.ui.list.OnListItemClickListener
 import org.koitharu.kotatsu.databinding.FragmentChaptersBinding
 import org.koitharu.kotatsu.details.ui.adapter.BranchesAdapter
@@ -27,26 +28,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 org.koitharu.kotatsu.utils.ext.scaleUpActivityOptionsOf
 import kotlin.math.roundToInt

 class ChaptersFragment :
 	BaseFragment<FragmentChaptersBinding>(),
 	OnListItemClickListener<ChapterListItem>,
-	ActionMode.Callback,
 	AdapterView.OnItemSelectedListener,
 	MenuItem.OnActionExpandListener,
-	SearchView.OnQueryTextListener {
+	SearchView.OnQueryTextListener,
+	ListSelectionController.Callback {

 	private val viewModel by sharedViewModel<DetailsViewModel>()

 	private var chaptersAdapter: ChaptersAdapter? = null
-	private var actionMode: ActionMode? = null
-	private var selectionDecoration: ChaptersSelectionDecoration? = null
-
-	override fun onCreate(savedInstanceState: Bundle?) {
-		super.onCreate(savedInstanceState)
-		setHasOptionsMenu(true)
-	}
+	private var selectionController: ListSelectionController? = null

 	override fun onInflateView(
 		inflater: LayoutInflater,
@@ -56,9 +53,14 @@ class ChaptersFragment :
 	override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
 		super.onViewCreated(view, savedInstanceState)
 		chaptersAdapter = ChaptersAdapter(this)
-		selectionDecoration = ChaptersSelectionDecoration(view.context)
+		selectionController = ListSelectionController(
+			activity = requireActivity(),
+			decoration = ChaptersSelectionDecoration(view.context),
+			registryOwner = this,
+			callback = this,
+		)
 		with(binding.recyclerViewChapters) {
-			addItemDecoration(selectionDecoration!!)
+			checkNotNull(selectionController).attachToRecyclerView(this)
 			setHasFixedSize(true)
 			adapter = chaptersAdapter
 		}
@@ -72,75 +74,36 @@ class ChaptersFragment :
 			binding.textViewHolder.isVisible = it
 			activity?.invalidateOptionsMenu()
 		}
+		addMenuProvider(ChaptersMenuProvider())
 	}

 	override fun onDestroyView() {
 		chaptersAdapter = null
-		selectionDecoration = null
+		selectionController = null
 		binding.spinnerBranches?.adapter = null
 		super.onDestroyView()
 	}

-	override fun onCreateOptionsMenu(menu: Menu, inflater: MenuInflater) {
-		super.onCreateOptionsMenu(menu, inflater)
-		inflater.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 onPrepareOptionsMenu(menu: Menu) {
-		super.onPrepareOptionsMenu(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 onOptionsItemSelected(item: MenuItem) = when (item.itemId) {
-		R.id.action_reversed -> {
-			viewModel.setChaptersReversed(!item.isChecked)
-			true
-		}
-		else -> super.onOptionsItemSelected(item)
-	}
-
 	override fun onItemClick(item: ChapterListItem, view: View) {
-		if (selectionDecoration?.checkedItemsCount != 0) {
-			selectionDecoration?.toggleItemChecked(item.chapter.id)
-			if (selectionDecoration?.checkedItemsCount == 0) {
-				actionMode?.finish()
-			} else {
-				actionMode?.invalidate()
-				binding.recyclerViewChapters.invalidateItemDecorations()
-			}
+		if (selectionController?.onItemClick(item.chapter.id) == true) {
 			return
 		}
 		if (item.hasFlag(ChapterListItem.FLAG_MISSING)) {
 			(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()
 		)
 	}

 	override fun onItemLongClick(item: ChapterListItem, view: View): Boolean {
-		if (actionMode == null) {
-			actionMode = (activity as? AppCompatActivity)?.startSupportActionMode(this)
-		}
-		return actionMode?.also {
-			selectionDecoration?.setItemIsChecked(item.chapter.id, true)
-			binding.recyclerViewChapters.invalidateItemDecorations()
-			it.invalidate()
-		} != null
+		return selectionController?.onItemLongClick(item.chapter.id) ?: false
 	}

 	override fun onActionItemClicked(mode: ActionMode, item: MenuItem): Boolean {
@@ -149,13 +112,13 @@ class ChaptersFragment :
 				DownloadService.start(
 					context ?: return false,
 					viewModel.getRemoteManga() ?: viewModel.manga.value ?: return false,
-					selectionDecoration?.checkedItemsIds?.toSet()
+					selectionController?.snapshot(),
 				)
 				mode.finish()
 				true
 			}
 			R.id.action_delete -> {
-				val ids = selectionDecoration?.checkedItemsIds
+				val ids = selectionController?.peekCheckedIds()
 				val manga = viewModel.manga.value
 				when {
 					ids.isNullOrEmpty() || manga == null -> Unit
@@ -174,9 +137,7 @@ class ChaptersFragment :
 			}
 			R.id.action_select_all -> {
 				val ids = chaptersAdapter?.items?.map { it.chapter.id } ?: return false
-				selectionDecoration?.checkAll(ids)
-				binding.recyclerViewChapters.invalidateItemDecorations()
-				mode.invalidate()
+				selectionController?.addAll(ids)
 				true
 			}
 			else -> false
@@ -196,7 +157,7 @@ class ChaptersFragment :
 	}

 	override fun onPrepareActionMode(mode: ActionMode, menu: Menu): Boolean {
-		val selectedIds = selectionDecoration?.checkedItemsIds ?: return false
+		val selectedIds = selectionController?.peekCheckedIds() ?: return false
 		val items = chaptersAdapter?.items?.filter { x -> x.chapter.id in selectedIds }.orEmpty()
 		menu.findItem(R.id.action_save).isVisible = items.none { x ->
 			x.chapter.source == MangaSource.LOCAL
@@ -208,10 +169,8 @@ class ChaptersFragment :
 		return true
 	}

-	override fun onDestroyActionMode(mode: ActionMode?) {
-		selectionDecoration?.clearSelection()
+	override fun onSelectionChanged(count: Int) {
 		binding.recyclerViewChapters.invalidateItemDecorations()
-		actionMode = null
 	}

 	override fun onMenuItemActionExpand(item: MenuItem?): Boolean = true
@@ -233,6 +192,9 @@ class ChaptersFragment :
 		binding.recyclerViewChapters.updatePadding(
 			bottom = insets.bottom + (binding.spinnerBranches?.height ?: 0),
 		)
+		binding.recyclerViewChapters.fastScroller.updateLayoutParams<ViewGroup.MarginLayoutParams> {
+			bottomMargin = insets.bottom
+		}
 	}

 	private fun initSpinner(spinner: Spinner) {
@@ -268,4 +230,30 @@ class ChaptersFragment :
 	private fun onLoadingStateChanged(isLoading: Boolean) {
 		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
+			}
+			else -> false
+		}
+	}
 }
--- a/Show More
+++ b/Show More