Skip to content

Make PDF navigator independent from PreferencesEditor #302

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Nov 28, 2022
Merged

Make PDF navigator independent from PreferencesEditor #302

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2ad4844
Make PDF navigator independent from PreferencesEditor
qnga Nov 28, 2022
4c32a0e
Fix unused imports
qnga Nov 28, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions readium/navigator/src/main/java/org/readium/r2/navigator/pdf/PdfNavigatorFragment.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,12 +45,12 @@ import timber.log.Timber
* To use this [Fragment], create a factory with [PdfNavigatorFactory.createFragmentFactory].
*/
@ExperimentalReadiumApi
class PdfNavigatorFragment<S : Configurable.Settings, P : Configurable.Preferences<P>, E : PreferencesEditor<P>> internal constructor(
class PdfNavigatorFragment<S : Configurable.Settings, P : Configurable.Preferences<P>> internal constructor(
override val publication: Publication,
initialLocator: Locator? = null,
initialPreferences: P,
private val listener: Listener?,
private val pdfEngineProvider: PdfEngineProvider<S, P, E>
private val pdfEngineProvider: PdfEngineProvider<S, P, *>
) : Fragment(), VisualNavigator, Configurable<S, P> {

interface Listener : VisualNavigator.Listener {
Expand Down Expand Up @@ -107,7 +107,7 @@ class PdfNavigatorFragment<S : Configurable.Settings, P : Configurable.Preferenc
viewModel.submitPreferences(preferences)
}

private val viewModel: PdfNavigatorViewModel<S, P, E> by viewModels {
private val viewModel: PdfNavigatorViewModel<S, P> by viewModels {
PdfNavigatorViewModel.createFactory(
requireActivity().application,
publication,
Expand Down
4 changes: 2 additions & 2 deletions readium/navigator/src/main/java/org/readium/r2/navigator/pdf/PdfNavigatorViewModel.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,12 +22,12 @@ import org.readium.r2.shared.publication.Publication
import org.readium.r2.shared.publication.services.positions

@OptIn(ExperimentalReadiumApi::class)
internal class PdfNavigatorViewModel<S : Configurable.Settings, P : Configurable.Preferences<P>, E : PreferencesEditor<P>>(
internal class PdfNavigatorViewModel<S : Configurable.Settings, P : Configurable.Preferences<P>>(
application: Application,
private val publication: Publication,
initialLocator: Locator,
initialPreferences: P,
private val pdfEngineProvider: PdfEngineProvider<S, P, E>
private val pdfEngineProvider: PdfEngineProvider<S, P, *>
) : AndroidViewModel(application) {

private val _currentLocator: MutableStateFlow<Locator> =
Expand Down
7 changes: 3 additions & 4 deletions test-app/src/main/java/org/readium/r2/testapp/reader/PdfReaderFragment.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@ import android.view.ViewGroup
import android.widget.Toast
import androidx.fragment.app.commitNow
import org.readium.adapters.pdfium.navigator.PdfiumPreferences
import org.readium.adapters.pdfium.navigator.PdfiumPreferencesEditor
import org.readium.adapters.pdfium.navigator.PdfiumSettings
import org.readium.r2.navigator.pdf.PdfNavigatorFragment
import org.readium.r2.shared.ExperimentalReadiumApi
Expand All @@ -25,7 +24,7 @@ import org.readium.r2.testapp.reader.preferences.UserPreferencesViewModel
@OptIn(ExperimentalReadiumApi::class)
class PdfReaderFragment : VisualReaderFragment(), PdfNavigatorFragment.Listener {

override lateinit var navigator: PdfNavigatorFragment<PdfiumSettings, PdfiumPreferences, PdfiumPreferencesEditor>
override lateinit var navigator: PdfNavigatorFragment<PdfiumSettings, PdfiumPreferences>

override fun onCreate(savedInstanceState: Bundle?) {
val readerData = model.readerInitData as PdfReaderInitData
Expand All @@ -51,9 +50,9 @@ class PdfReaderFragment : VisualReaderFragment(), PdfNavigatorFragment.Listener
replace(R.id.fragment_reader_container, PdfNavigatorFragment::class.java, Bundle(), NAVIGATOR_FRAGMENT_TAG)
}
}
navigator = childFragmentManager.findFragmentByTag(NAVIGATOR_FRAGMENT_TAG)!!
as PdfNavigatorFragment<PdfiumSettings, PdfiumPreferences, PdfiumPreferencesEditor>
@Suppress("Unchecked_cast")
navigator = childFragmentManager.findFragmentByTag(NAVIGATOR_FRAGMENT_TAG)!!
as PdfNavigatorFragment<PdfiumSettings, PdfiumPreferences>
return view
}

Expand Down