diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryController.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryController.kt index b699069b7..806b31b9e 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryController.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryController.kt @@ -138,8 +138,8 @@ class LibraryController( super.onViewCreated(view) adapter = LibraryAdapter(this) - view_pager.adapter = adapter - view_pager.pageSelections().skip(1).subscribeUntilDestroy { + library_pager.adapter = adapter + library_pager.pageSelections().skip(1).subscribeUntilDestroy { preferences.lastUsedCategory().set(it) activeCategory = it } @@ -158,7 +158,7 @@ class LibraryController( override fun onChangeStarted(handler: ControllerChangeHandler, type: ControllerChangeType) { super.onChangeStarted(handler, type) if (type.isEnter) { - activity?.tabs?.setupWithViewPager(view_pager) + activity?.tabs?.setupWithViewPager(library_pager) presenter.subscribeLibrary() } } @@ -232,7 +232,7 @@ class LibraryController( // Get the current active category. val activeCat = if (adapter.categories.isNotEmpty()) - view_pager.currentItem + library_pager.currentItem else activeCategory @@ -240,14 +240,14 @@ class LibraryController( adapter.categories = categories // Restore active category. - view_pager.setCurrentItem(activeCat, false) + library_pager.setCurrentItem(activeCat, false) tabsVisibilityRelay.call(categories.size > 1) // Delay the scroll position to allow the view to be properly measured. view.post { if (isAttached) { - activity?.tabs?.setScrollPosition(view_pager.currentItem, 0f, true) + activity?.tabs?.setScrollPosition(library_pager.currentItem, 0f, true) } } @@ -292,11 +292,11 @@ class LibraryController( private fun reattachAdapter() { val adapter = adapter ?: return - val position = view_pager.currentItem + val position = library_pager.currentItem adapter.recycle = false - view_pager.adapter = adapter - view_pager.currentItem = position + library_pager.adapter = adapter + library_pager.currentItem = position adapter.recycle = true } diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/manga/MangaController.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/manga/MangaController.kt index 467848aac..ed9636f6b 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/manga/MangaController.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/manga/MangaController.kt @@ -87,11 +87,11 @@ class MangaController : RxController, TabbedController { requestPermissionsSafe(arrayOf(WRITE_EXTERNAL_STORAGE), 301) adapter = MangaDetailAdapter() - view_pager.offscreenPageLimit = 3 - view_pager.adapter = adapter + manga_pager.offscreenPageLimit = 3 + manga_pager.adapter = adapter if (!fromCatalogue) - view_pager.currentItem = CHAPTERS_CONTROLLER + manga_pager.currentItem = CHAPTERS_CONTROLLER } override fun onDestroyView(view: View) { @@ -102,7 +102,7 @@ class MangaController : RxController, TabbedController { override fun onChangeStarted(handler: ControllerChangeHandler, type: ControllerChangeType) { super.onChangeStarted(handler, type) if (type.isEnter) { - activity?.tabs?.setupWithViewPager(view_pager) + activity?.tabs?.setupWithViewPager(manga_pager) trackingIconSubscription = trackingIconRelay.subscribe { setTrackingIconInternal(it) } } } diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/reader/viewer/pager/PagerReader.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/reader/viewer/pager/PagerReader.kt index a5a4e71d4..1bd7b0b80 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/reader/viewer/pager/PagerReader.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/reader/viewer/pager/PagerReader.kt @@ -118,7 +118,7 @@ abstract class PagerReader : BaseReader() { this.pager = pager.apply { setLayoutParams(ViewGroup.LayoutParams(MATCH_PARENT, MATCH_PARENT)) setOffscreenPageLimit(1) - setId(R.id.view_pager) + setId(R.id.reader_pager) setOnChapterBoundariesOutListener(object : OnChapterBoundariesOutListener { override fun onFirstPageOutEvent() { readerActivity.requestPreviousChapter() diff --git a/app/src/main/res/layout/library_controller.xml b/app/src/main/res/layout/library_controller.xml index 24e3d9af4..e315b9b92 100644 --- a/app/src/main/res/layout/library_controller.xml +++ b/app/src/main/res/layout/library_controller.xml @@ -8,7 +8,7 @@ + android:id="@+id/library_pager"/> \ No newline at end of file diff --git a/app/src/main/res/values/ids.xml b/app/src/main/res/values/ids.xml index 912dfd017..a28b6bb7e 100644 --- a/app/src/main/res/values/ids.xml +++ b/app/src/main/res/values/ids.xml @@ -3,4 +3,6 @@ + + \ No newline at end of file