react-native-readium 1.0.0-alpha.1 → 1.0.0-alpha.2

package/README.md

@@ -10,10 +10,14 @@ A react-native wrapper for https://readium.org/
 - [Release](#release)
 - [License](#license)
 
-## Installation
+| Dark Mode| Light Mode |
+|---|---|
+| ![Dark Mode](https://github.com/5-stones/react-native-readium/blob/main/docs/demo-dark-mode.gif) | ![Light Mode](https://github.com/5-stones/react-native-readium/blob/main/docs/demo-light-mode.gif) |
 
+## Installation
 
 #### Install Module
+
 **NPM**
 
 ```sh
@@ -26,8 +30,13 @@ npm install react-native-readium
 yarn add react-native-readium
 ```
 
+#### iOS
+
+###### Requirements
+
+This project requires an iOS target >= `13.0`.
 
-#### Pod Install
+###### Pod Install
 
 Due to the current state of the `Readium` swift libraries you need to manually
 update your `Podfile` ([see more on that here](https://github.com/readium/swift-toolkit/issues/38)).
@@ -43,7 +52,6 @@ target 'ExampleApp' do
   pod 'R2Shared', podspec: 'https://raw.githubusercontent.com/readium/swift-toolkit/2.2.0/Support/CocoaPods/ReadiumShared.podspec'
   pod 'R2Streamer', podspec: 'https://raw.githubusercontent.com/readium/swift-toolkit/2.2.0/Support/CocoaPods/ReadiumStreamer.podspec'
   pod 'R2Navigator', podspec: 'https://raw.githubusercontent.com/readium/swift-toolkit/2.2.0/Support/CocoaPods/ReadiumNavigator.podspec'
-  pod 'ReadiumOPDS', podspec: 'https://raw.githubusercontent.com/readium/swift-toolkit/2.2.0/Support/CocoaPods/ReadiumOPDS.podspec'
   pod 'Minizip', modular_headers: true
   ...
 end

package/android/src/main/java/com/reactnativereadium/reader/BaseReaderFragment.kt

@@ -8,7 +8,6 @@ import kotlinx.coroutines.flow.launchIn
 import kotlinx.coroutines.flow.onEach
 import org.readium.r2.navigator.*
 import org.readium.r2.shared.publication.Locator
-import com.reactnativereadium.R
 import com.reactnativereadium.utils.EventChannel
 import kotlinx.coroutines.channels.Channel
 
@@ -48,26 +47,6 @@ abstract class BaseReaderFragment : Fragment() {
         requireActivity().invalidateOptionsMenu()
     }
 
-    // TODO: this should probably be removed
-    override fun onCreateOptionsMenu(menu: Menu, menuInflater: MenuInflater) {
-        menuInflater.inflate(R.menu.menu_reader, menu)
-        menu.findItem(R.id.drm).isVisible = false
-    }
-
-    override fun onOptionsItemSelected(item: MenuItem): Boolean {
-        return when (item.itemId) {
-            R.id.toc -> {
-                model.channel.send(ReaderViewModel.Event.OpenOutlineRequested)
-                true
-            }
-            R.id.drm -> {
-                model.channel.send(ReaderViewModel.Event.OpenDrmManagementRequested)
-                true
-            }
-            else -> false
-        }
-    }
-
     fun go(locator: Locator, animated: Boolean): Boolean {
       // don't attempt to navigate if we're already there
       val currentLocator = navigator.currentLocator.value

package/android/src/main/java/com/reactnativereadium/reader/EpubReaderFragment.kt

@@ -97,28 +97,6 @@ class EpubReaderFragment : VisualReaderFragment(), EpubNavigatorFragment.Listene
                     /* selectionActionModeCallback = customSelectionActionModeCallback */
                 }
             )
-// TODO: add search back in
-//        childFragmentManager.setFragmentResultListener(
-//            SearchFragment::class.java.name,
-//            this,
-//            FragmentResultListener { _, result ->
-//                menuSearch.collapseActionView()
-//                result.getParcelable<Locator>(SearchFragment::class.java.name)?.let {
-//                    navigatorFragment.go(it)
-//                }
-//            }
-//        )
-// TODO: add TTS back in
-//        childFragmentManager.setFragmentResultListener(
-//            ScreenReaderContract.REQUEST_KEY,
-//            this,
-//            FragmentResultListener { _, result ->
-//                val locator = ScreenReaderContract.parseResult(result).locator
-//                if (locator.href != navigator.currentLocator.value.href) {
-//                    navigator.go(locator)
-//                }
-//            }
-//        )
 
         setHasOptionsMenu(true)
 
@@ -182,134 +160,16 @@ class EpubReaderFragment : VisualReaderFragment(), EpubNavigatorFragment.Listene
         }
     }
 
-    override fun onCreateOptionsMenu(menu: Menu, menuInflater: MenuInflater) {
-        super.onCreateOptionsMenu(menu, menuInflater)
-        menuInflater.inflate(R.menu.menu_epub, menu)
-
-        menuScreenReader = menu.findItem(R.id.screen_reader)
-        menuSearch = menu.findItem(R.id.search)
-        menuSearchView = menuSearch.actionView as SearchView
-
-        /* connectSearch() */
-        if (!isSearchViewIconified) menuSearch.expandActionView()
-    }
-
     override fun onSaveInstanceState(outState: Bundle) {
         super.onSaveInstanceState(outState)
         outState.putBoolean(IS_SCREEN_READER_VISIBLE_KEY, isScreenReaderVisible)
         outState.putBoolean(IS_SEARCH_VIEW_ICONIFIED, isSearchViewIconified)
     }
-// TODO: add search
-//    private fun connectSearch() {
-//        menuSearch.setOnActionExpandListener(object : MenuItem.OnActionExpandListener {
-//
-//            override fun onMenuItemActionExpand(item: MenuItem?): Boolean {
-//                if (isSearchViewIconified) { // It is not a state restoration.
-//                    showSearchFragment()
-//                }
-//
-//                isSearchViewIconified = false
-//                return true
-//            }
-//
-//            override fun onMenuItemActionCollapse(item: MenuItem?): Boolean {
-//                isSearchViewIconified = true
-//                childFragmentManager.popBackStack()
-//                menuSearchView.clearFocus()
-//
-//                return true
-//            }
-//        })
-//
-//        menuSearchView.setOnQueryTextListener(object : SearchView.OnQueryTextListener {
-//
-//            override fun onQueryTextSubmit(query: String): Boolean {
-//                model.search(query)
-//                menuSearchView.clearFocus()
-//
-//                return false
-//            }
-//
-//            override fun onQueryTextChange(s: String): Boolean {
-//                return false
-//            }
-//        })
-//
-//        menuSearchView.findViewById<ImageView>(R.id.search_close_btn).setOnClickListener {
-//            menuSearchView.requestFocus()
-//            model.cancelSearch()
-//            menuSearchView.setQuery("", false)
-//
-//            (activity?.getSystemService(Context.INPUT_METHOD_SERVICE) as? InputMethodManager)?.showSoftInput(
-//                this.view, InputMethodManager.SHOW_FORCED
-//            )
-//        }
-//    }
-
-    override fun onOptionsItemSelected(item: MenuItem): Boolean {
-        if (super.onOptionsItemSelected(item)) {
-            return true
-        }
-
-       return when (item.itemId) {
-           R.id.settings -> {
-               /* TODO: this should be stripped out */
-               /* userSettings.userSettingsPopUp().showAsDropDown(requireActivity().findViewById(R.id.settings), 0, 0, Gravity.END) */
-               true
-           }
-           R.id.search -> {
-               super.onOptionsItemSelected(item)
-           }
-
-           android.R.id.home -> {
-               menuSearch.collapseActionView()
-               true
-           }
-
-//         TODO: tts
-//           R.id.screen_reader -> {
-//               if (isScreenReaderVisible) {
-//                   closeScreenReaderFragment()
-//               } else {
-//                   showScreenReaderFragment()
-//               }
-//               true
-//           }
-            else -> false
-        }
-    }
 
     override fun onTap(point: PointF): Boolean {
         requireActivity().toggleSystemUi()
         return true
     }
-// TODO: search
-//    private fun showSearchFragment() {
-//        childFragmentManager.commit {
-//            childFragmentManager.findFragmentByTag(SEARCH_FRAGMENT_TAG)?.let { remove(it) }
-//            add(R.id.fragment_reader_container, SearchFragment::class.java, Bundle(), SEARCH_FRAGMENT_TAG)
-//            hide(navigatorFragment)
-//            addToBackStack(SEARCH_FRAGMENT_TAG)
-//        }
-//    }
-
-//  TODO: tts
-//    private fun showScreenReaderFragment() {
-//        menuScreenReader.title = resources.getString(R.string.epubactivity_read_aloud_stop)
-//        isScreenReaderVisible = true
-//        val arguments = ScreenReaderContract.createArguments(navigator.currentLocator.value)
-//        childFragmentManager.commit {
-//            add(R.id.fragment_reader_container, ScreenReaderFragment::class.java, arguments)
-//            hide(navigatorFragment)
-//            addToBackStack(null)
-//        }
-//    }
-//
-//    private fun closeScreenReaderFragment() {
-//        menuScreenReader.title = resources.getString(R.string.epubactivity_read_aloud_start)
-//        isScreenReaderVisible = false
-//        childFragmentManager.popBackStack()
-//    }
 
     companion object {
 
@@ -330,46 +190,3 @@ class EpubReaderFragment : VisualReaderFragment(), EpubNavigatorFragment.Listene
         }
     }
 }
-
-/* TODO: remove */
-// /**
-//  * Example of an HTML template for a custom Decoration Style.
-//  *
-//  * This one will display a tinted "pen" icon in the page margin to show that a highlight has an
-//  * associated note.
-//  */
-// @OptIn(ExperimentalDecorator::class)
-// private fun annotationMarkTemplate(context: Context, @ColorInt defaultTint: Int = Color.YELLOW): HtmlDecorationTemplate {
-//     // Converts the pen icon to a base 64 data URL, to be embedded in the decoration stylesheet.
-//     // Alternatively, serve the image with the local HTTP server and use its URL.
-//     val imageUrl = ContextCompat.getDrawable(context, R.drawable.ic_baseline_edit_24)
-//         ?.toBitmap()?.toDataUrl()
-//     requireNotNull(imageUrl)
-//
-//     val className = "testapp-annotation-mark"
-//     return HtmlDecorationTemplate(
-//         layout = HtmlDecorationTemplate.Layout.BOUNDS,
-//         width = HtmlDecorationTemplate.Width.PAGE,
-//         element = { decoration ->
-//             val style = decoration.style as? DecorationStyleAnnotationMark
-//             val tint = style?.tint ?: defaultTint
-//             // Using `data-activable=1` prevents the whole decoration container from being
-//             // clickable. Only the icon will respond to activation events.
-//             """
-//             <div><div data-activable="1" class="$className" style="background-color: ${tint.toCss()} !important"/></div>"
-//             """
-//         },
-//         stylesheet = """
-//             .$className {
-//                 float: left;
-//                 margin-left: 8px;
-//                 width: 30px;
-//                 height: 30px;
-//                 border-radius: 50%;
-//                 background: url('$imageUrl') no-repeat center;
-//                 background-size: auto 50%;
-//                 opacity: 0.8;
-//             }
-//             """
-//     )
-// }

package/android/src/main/res/values/strings.xml

@@ -1,200 +1,3 @@
-<!--
-  ~ Module: r2-testapp-kotlin
-  ~ Developers: Aferdita Muriqi, Clément Baumann
-  ~
-  ~ Copyright (c) 2018. European Digital Reading Lab. All rights reserved.
-  ~ Licensed to the Readium Foundation under one or more contributor license agreements.
-  ~ Use of this source code is governed by a BSD-style license which is detailed in the
-  ~ LICENSE file present in the project repository where this source code is maintained.
-  -->
-
 <resources>
-    <string name="app_name" translatable="false">R2 Reader</string>
-    <string name="menu_item_show_epub_list">Show List</string>
-    <string name="menu_item_add_epub">Add ePub</string>
-    <string name="menu_item_filter">Filter</string>
-    <string name="progress_wait_while_searching_book">Please wait.</string>
-    <string name="progress_wait">Please wait.</string>
-    <string name="progress_wait_while_downloading_book">Please wait while your publication is being downloaded.</string>
-    <string name="progress_wait_while_preparing_book">Please wait while your publication is being prepared.</string>
-    <string name="progress_wait_while_preparing_audiobook">Please wait while your audiobook is being prepared.</string>
-    <string name="progress_wait_while_loading_feed">Please wait while your feed is loading.</string>
-    <string name="error_invalid_epub">Invalid Epub</string>
-    <string name="fallback_no_description">No description</string>
-    <string name="button_dismiss">DISMISS</string>
-
-    <string name="epubactivity_drm_info">DRM Info</string>
-    <string name="epubactivity_set_bookmark">Add a bookmark</string>
-    <string name="epubactivity_settings">User Settings</string>
-    <string name="epubactivity_book_nav_options">Book navigation menu</string>
-    <string name="epubactivity_read_aloud_start">Read Aloud</string>
-    <string name="epubactivity_read_aloud_stop">Stop Read Aloud</string>
-    <string name="epubactivity_search">Search</string>
-
-    <string name="epubactivity_accessibility">Accessibility</string>
-    <string name="epubactivity_accessibility_screen_reader_start">Start Screen Reader</string>
-    <string name="epubactivity_accessibility_screen_reader_pause">Pause Screen Reader</string>
-    <string name="epubactivity_accessibility_screen_reader_resume">Resume Screen Reader</string>
-    <string name="epubactivity_accessibility_screen_reader_stop">Stop Screen Reader</string>
-
-    <string name="title_activity_opdscatalog">OPDS Catalog</string>
-    <string name="action_settings">Settings</string>
-    <string name="title_activity_r2_about">About R2 Reader</string>
-    <string name="title_activity_opds_list">OPDS Feeds</string>
-    <string name="title_activity_opds_detail">Detail</string>
-    <string name="title_fragment_drm_management">DRM Management</string>
-    <string name="title_activity_epub">Detail</string>
-    <string name="floating_button_add_book">Add a Book</string>
-    <string name="floating_button_add_feed">Add a OPDS Feed</string>
-    <string name="about_r2_reader">About R2 Reader</string>
-    <string name="more_options">More Options</string>
-    <string name="opds_feeds">OPDS Feeds</string>
-    <string name="popup_delete_button">DELETE</string>
-    <string name="add_publication_to_library">Add a publication to your library</string>
-    <string name="select_from_your_device">select from your device</string>
-    <string name="download_from_url">download from a url</string>
-
-    <string name="app_version_header">Version</string>
-    <string name="app_version_label">App Version:</string>
-    <string name="app_version">2.2.0</string>
-    <string name="github_tab_label">GitHub Tag:</string>
-    <string name="github_tag">2.2.0</string>
-
-    <string name="copyright_label">Copyright</string>
-    <string name="copyright">\@ 2019 European Digital Reading Lab</string>
-    <string name="bsd_license_label">[BSD-3 license]</string>
-    <string name="bsd_license_label_accessible">[B S D 3 license]</string>
-    <string name="acknowledgements_label">Acknowledgements</string>
-    <string name="acknowledgements_french_state">R2 Reader wouldn\'t have been developed without the financial help of the French state.</string>
-    <string name="catalog_list_more">More</string>
-    <string name="catalog_detail_download_button">Download</string>
-
-
-    <string name="menu_label_drm">DRM</string>
-    <string name="menu_label_settings">Settings</string>
-    <string name="menu_label_toc">TOC</string>
-    <string name="usersettings_label_font">Font</string>
-    <string name="usersettings_appearance_default">Default</string>
-    <string name="usersettings_appearance_sepia">Sepia</string>
-    <string name="usersettings_appearance_night">Night</string>
-    <string name="usersettings_label_scroll_mode">Scroll mode</string>
-    <string name="usersettings_publisher_default">"Publisher's Default"</string>
-    <string name="usersettings_publisher_default_accessibility">"Publisher's Default Settings"</string>
-    <string name="usersettings_label_columns">Columns</string>
-    <string name="usersettings_auto">Auto</string>
-    <string name="usersettings_column_one">1</string>
-    <string name="usersettings_column_two">2</string>
-    <string name="usersettings_label_page_margins">Page Margins</string>
-    <string name="usersettings_page_margin_default">0.75</string>
-    <string name="usersettings_label_word_spacing">Word Spacing</string>
-    <string name="usersettings_label_letter_spacing">Letter Spacing</string>
-    <string name="usersettings_label_line_height">Line Height</string>
-    <string name="usersettings_label_TTS_speech_speed">TTS speed</string>
-
-    <!-- Accessibility -->
-
-    <string name="usersettings_description_TTS_speech_speed">Set TTS speech speed</string>
-    <string name="usersettings_description_brightness">Set Brightness</string>
-    <string name="usersettings_description_font_increase">Increase Font Size</string>
-    <string name="usersettings_description_font_decrease">Decrease Font Size</string>
-    <string name="usersettings_description_pm_increase">Increase Page Margins Size</string>
-    <string name="usersettings_description_pm_decrease">Decrease Page Margins Size</string>
-    <string name="usersettings_description_ws_increase">Increase Word Spacing</string>
-    <string name="usersettings_description_ws_decrease">Decrease Word Spacing</string>
-    <string name="usersettings_description_ls_increase">Increase Letter Spacing</string>
-    <string name="usersettings_description_ls_decrease">Decrease Letter Spacing</string>
-    <string name="usersettings_description_lh_increase">Increase Line Height</string>
-    <string name="usersettings_description_lh_decrease">Decrease Line Height</string>
-
-    <string name="drm_information_header">INFORMATION</string>
-    <string name="drm_label_license_type">License Type</string>
-    <string name="drm_label_state">State</string>
-    <string name="drm_label_provider">Provider</string>
-    <string name="drm_label_issued">Issued</string>
-    <string name="drm_label_updated">Updated</string>
-    <string name="drm_label_rights">RIGHTS</string>
-    <string name="drm_label_prints_left">Prints left</string>
-    <string name="drm_label_copies_left">Copies left</string>
-    <string name="drm_label_start">Start</string>
-    <string name="drm_label_end">End</string>
-    <string name="drm_label_potential_right_end">Potential right end</string>
-    <string name="drm_label_actions">ACTIONS</string>
-    <string name="drm_label_renew">RENEW</string>
-    <string name="drm_label_return">RETURN</string>
-    <string name="zero">00:00</string>
-    <string name="chapter">Chapter</string>
-    <string name="chapter_page">Chapter / Page</string>
-    <string name="progression">Progression</string>
-    <string name="timestamp">Timestamp</string>
-
-    <!-- Outlines -->
-    <string name="contents_tab_label">Contents</string>
-    <string name="bookmarks_tab_label">Bookmarks</string>
-    <string name="highlights_tab_label">Highlights</string>
-    <string name="pagelist_tab_label">Page List</string>
-    <string name="landmarks_tab_label">Landmarks</string>
-    <string name="action_mode_menu_highlight">Highlight</string>
-    <string name="action_mode_menu_underline">Underline</string>
-    <string name="action_mode_menu_note">Note</string>
-    <string name="bookmark_added">Bookmark added</string>
-    <string name="bookmark_exists">Bookmark already exists</string>
-
-    <string name="title_catalogs">Catalogs</string>
-    <string name="title_bookshelf">Bookshelf</string>
-    <string name="title_about">About</string>
-    <string name="cover_image">Cover Image</string>
-    <string name="repfr">repfr</string>
-
-    <string name="delete">Delete</string>
-    <string name="cancel">Cancel</string>
-    <string name="confirm_delete_book_title">Delete Book?</string>
-    <string name="confirm_delete_book_text">Are you sure you want to delete this book?</string>
-    <string name="confirm_delete_catalog_title">Delete Catalog?</string>
-    <string name="confirm_delete_catalog_text">Are you sure you want to delete this Catalog feed?</string>
-
-    <string name="add_book">Add a Book</string>
-    <string name="add_catalog">Add an Catalog Feed</string>
-    <string name="ok">OK</string>
-    <string name="save">Save</string>
-    <string name="enter_title">Enter the Title</string>
-    <string name="enter_url">Enter the URL</string>
-    <string name="invalid_title">Please enter a title</string>
-    <string name="invalid_url">Please enter a valid URL</string>
-    <string name="catalog_parse_error">Error parsing Catalog feed. Please check the URL and try again</string>
-
-    <string name="publication_image_description">Cover image for %1$s</string>
-
-    <string name="return_publication">This will return the publication</string>
-    <string name="return_button">Return</string>
-
-    <string name="end_of_chapter">End of chapter</string>
-
-    <string name="unable_to_move_pub">Unable to move publication into the library</string>
-    <string name="import_publication_success">Publication added to your library</string>
-    <string name="unable_add_pub_database">Unable to add publication to the database</string>
-    <string name="failed_parsing_catalog">Failed parsing Catalog</string>
-    <string name="next_chapter">Next chapter</string>
-    <string name="next_sentence">Next sentence</string>
-    <string name="play_and_pause">Play and pause</string>
-    <string name="previous_sentence">Previous sentence</string>
-    <string name="previous_chapter">Previous chapter</string>
-    <string name="brightness_lower">Brightness lower</string>
-    <string name="brightness_higher">Brightness higher</string>
-    <string name="tts_slower">TTS slower</string>
-    <string name="tts_faster">TTS faster</string>
     <string name="no_result">No result</string>
-    <string name="note">Note</string>
-    <string name="add_a_note">Add a note</string>
-    <string name="add_an_annotation">Add an annotation</string>
-    <string name="delete_highlight_or_annotation">Delete highlight or annotation</string>
-    <string name="yellow">Yellow</string>
-    <string name="green">Green</string>
-    <string name="blue">Blue</string>
-    <string name="red">Red</string>
-    <string name="purple">Purple</string>
-    <string name="seek_bar">Seek bar</string>
-    <string name="go_backward_30_seconds">Go backward 30 seconds</string>
-    <string name="play_or_pause">Play or pause</string>
-    <string name="go_forward_30_seconds">Go forward 30 seconds</string>
-    <string name="select_a_font">Select a font</string>
 </resources>

package/ios/App/AppModule.swift

@@ -20,7 +20,6 @@ final class AppModule {
 
   // App modules
   var reader: ReaderModuleAPI! = nil
-  // var opds: OPDSModuleAPI! = nil
 
   init() throws {
     guard let server = PublicationServer() else {
@@ -29,7 +28,6 @@ final class AppModule {
     }
 
     reader = ReaderModule(delegate: self, resourcesServer: server)
-    // opds = OPDSModule(delegate: self)
 
     // Set Readium 2's logging minimum level.
     R2EnableLog(withMinimumSeverityLevel: .debug)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-readium",
-  "version": "1.0.0-alpha.1",
+  "version": "1.0.0-alpha.2",
   "description": "A react-native wrapper for https://readium.org/",
   "main": "lib/commonjs/index",
   "module": "lib/module/index",
@@ -33,7 +33,7 @@
     "version": "yarn changelog && git add CHANGELOG.md",
     "postversion": "npm run publish:git && npm run publish:npm",
     "publish:git": "git push && git push --tags",
-    "publish:npm": "yarn publish --access public --new-version $npm_package_version",
+    "publish:npm": "npm run prepare && npm publish --access public",
     "changelog": "conventional-changelog -p angular -i CHANGELOG.md -s -r 0"
   },
   "keywords": [

package/react-native-readium.podspec

@@ -15,11 +15,12 @@ Pod::Spec.new do |s|
 
   s.source_files = "ios/**/*.{h,m,mm,swift}"
 
+  s.swift_version = "5.0"
+
   s.dependency "React-Core"
 
   # this is an issue as these aren't currently published on cocoapods.org
   s.dependency "R2Shared"
   s.dependency "R2Streamer"
   s.dependency "R2Navigator"
-  s.dependency "ReadiumOPDS"
 end

package/android/src/main/java/com/reactnativereadium/reader/ImageReaderFragment.kt

@@ -1,68 +0,0 @@
-/*
- * Copyright 2021 Readium Foundation. All rights reserved.
- * Use of this source code is governed by the BSD-style license
- * available in the top-level LICENSE file of the project.
- */
-
-package com.reactnativereadium.reader
-
-import android.graphics.PointF
-import android.os.Bundle
-import android.view.LayoutInflater
-import android.view.View
-import android.view.ViewGroup
-import androidx.fragment.app.commitNow
-import androidx.lifecycle.ViewModelProvider
-import org.readium.r2.navigator.Navigator
-import org.readium.r2.navigator.image.ImageNavigatorFragment
-import org.readium.r2.shared.publication.Publication
-import com.reactnativereadium.R
-import com.reactnativereadium.utils.toggleSystemUi
-
-class ImageReaderFragment : VisualReaderFragment(), ImageNavigatorFragment.Listener {
-
-    override lateinit var model: ReaderViewModel
-    override lateinit var navigator: Navigator
-    private lateinit var publication: Publication
-
-    override fun onCreate(savedInstanceState: Bundle?) {
-        ViewModelProvider(requireActivity()).get(ReaderViewModel::class.java).let {
-            model = it
-            publication = it.publication
-        }
-
-        childFragmentManager.fragmentFactory =
-            ImageNavigatorFragment.createFactory(publication, model.initialLocation, this)
-
-        super.onCreate(savedInstanceState)
-    }
-
-    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
-        val view =  super.onCreateView(inflater, container, savedInstanceState)
-        if (savedInstanceState == null) {
-            childFragmentManager.commitNow {
-                add(R.id.fragment_reader_container, ImageNavigatorFragment::class.java, Bundle(), NAVIGATOR_FRAGMENT_TAG)
-            }
-        }
-        navigator = childFragmentManager.findFragmentByTag(NAVIGATOR_FRAGMENT_TAG)!! as Navigator
-        return view
-    }
-
-    override fun onTap(point: PointF): Boolean {
-        val viewWidth = requireView().width
-        val leftRange = 0.0..(0.2 * viewWidth)
-
-        when {
-            leftRange.contains(point.x) -> navigator.goBackward(animated = true)
-            leftRange.contains(viewWidth - point.x) -> navigator.goForward(animated = true)
-            else -> requireActivity().toggleSystemUi()
-        }
-
-        return true
-    }
-
-    companion object {
-
-        const val NAVIGATOR_FRAGMENT_TAG = "navigator"
-    }
-}