-
Notifications
You must be signed in to change notification settings - Fork 47
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Zoom level is reset after editing annotation Closes #199,
Making PdfAnnotationScreen, PdfAnnotationMoreScreen and PdfSettingsScreen to be regular views instead to avoid reinitializing pspdfkit’s PdfView after making annotation changes hence avoiding navigating away from a selected annotation Upping versionCode to 123
- Loading branch information
1 parent
084ce27
commit ca91c26
Showing
15 changed files
with
390 additions
and
69 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
67 changes: 67 additions & 0 deletions
67
app/src/main/java/org/zotero/android/pdf/annotation/sidebar/PdfAnnotationNavigationView.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,67 @@ | ||
| package org.zotero.android.pdf.annotation.sidebar | ||
|
|
||
| import androidx.compose.animation.AnimatedContent | ||
| import androidx.compose.animation.AnimatedContentTransitionScope | ||
| import androidx.compose.animation.ContentTransform | ||
| import androidx.compose.animation.SizeTransform | ||
| import androidx.compose.animation.core.tween | ||
| import androidx.compose.animation.slideInHorizontally | ||
| import androidx.compose.animation.slideOutHorizontally | ||
| import androidx.compose.animation.with | ||
| import androidx.compose.foundation.background | ||
| import androidx.compose.foundation.gestures.detectTapGestures | ||
| import androidx.compose.foundation.layout.Column | ||
| import androidx.compose.foundation.layout.fillMaxSize | ||
| import androidx.compose.runtime.Composable | ||
| import androidx.compose.ui.Modifier | ||
| import androidx.compose.ui.input.pointer.pointerInput | ||
| import androidx.compose.ui.unit.IntOffset | ||
| import org.zotero.android.pdf.annotation.PdfAnnotationNavigation | ||
| import org.zotero.android.pdf.reader.PdfReaderViewModel | ||
| import org.zotero.android.pdf.reader.PdfReaderViewState | ||
| import org.zotero.android.uicomponents.theme.CustomTheme | ||
|
|
||
| @Composable | ||
| internal fun PdfAnnotationNavigationView( | ||
| viewState: PdfReaderViewState, | ||
| viewModel: PdfReaderViewModel | ||
| ) { | ||
| AnimatedContent( | ||
| targetState = viewState.pdfAnnotationArgs != null, | ||
| transitionSpec = { | ||
| createAnnotationTransitionSpec() | ||
| }, label = "" | ||
| ) { showView -> | ||
| if (showView) { | ||
| Column( | ||
| modifier = Modifier | ||
| .fillMaxSize() | ||
| .background(CustomTheme.colors.pdfAnnotationsFormBackground) | ||
| .pointerInput(Unit) { | ||
| detectTapGestures { | ||
| //Prevent tap to be propagated to composables behind this screen. | ||
| } | ||
| }) { | ||
| val args = viewState.pdfAnnotationArgs | ||
| if (args != null) { | ||
| PdfAnnotationNavigation( | ||
| args = args, | ||
| onBack = viewModel::hidePdfAnnotationView | ||
| ) | ||
| } | ||
| } | ||
| } | ||
| } | ||
| } | ||
|
|
||
| private fun AnimatedContentTransitionScope<Boolean>.createAnnotationTransitionSpec(): ContentTransform { | ||
| val intOffsetSpec = tween<IntOffset>() | ||
| return (slideInHorizontally(intOffsetSpec) { it } with | ||
| slideOutHorizontally(intOffsetSpec) { it }).using( | ||
| // Disable clipping since the faded slide-in/out should | ||
| // be displayed out of bounds. | ||
| SizeTransform( | ||
| clip = false, | ||
| sizeAnimationSpec = { _, _ -> tween() } | ||
| )) | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.