-
Notifications
You must be signed in to change notification settings - Fork 4
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
New features: - Page image can now be viewed in full screen Bug fixes: - Fixed page text reset after device orientation change Dev: - Upgrade AGP and Compose versions
- Loading branch information
Showing
11 changed files
with
295 additions
and
95 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
118 changes: 118 additions & 0 deletions
118
app/src/main/java/org/nsh07/wikireader/ui/FullScreenImage.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,118 @@ | ||
| package org.nsh07.wikireader.ui | ||
|
|
||
| import androidx.compose.foundation.gestures.animateZoomBy | ||
| import androidx.compose.foundation.gestures.detectTapGestures | ||
| import androidx.compose.foundation.gestures.rememberTransformableState | ||
| import androidx.compose.foundation.gestures.transformable | ||
| import androidx.compose.foundation.layout.Box | ||
| import androidx.compose.foundation.layout.fillMaxSize | ||
| import androidx.compose.material.icons.Icons | ||
| import androidx.compose.material.icons.automirrored.outlined.ArrowBack | ||
| import androidx.compose.material3.ExperimentalMaterial3Api | ||
| import androidx.compose.material3.Icon | ||
| import androidx.compose.material3.IconButton | ||
| import androidx.compose.material3.Scaffold | ||
| import androidx.compose.material3.Text | ||
| import androidx.compose.material3.TopAppBar | ||
| import androidx.compose.material3.TopAppBarDefaults | ||
| import androidx.compose.runtime.Composable | ||
| import androidx.compose.runtime.getValue | ||
| import androidx.compose.runtime.mutableFloatStateOf | ||
| import androidx.compose.runtime.mutableStateOf | ||
| import androidx.compose.runtime.remember | ||
| import androidx.compose.runtime.rememberCoroutineScope | ||
| import androidx.compose.runtime.setValue | ||
| import androidx.compose.ui.Alignment | ||
| import androidx.compose.ui.Modifier | ||
| import androidx.compose.ui.geometry.Offset | ||
| import androidx.compose.ui.graphics.Color | ||
| import androidx.compose.ui.graphics.graphicsLayer | ||
| import androidx.compose.ui.input.pointer.pointerInput | ||
| import androidx.compose.ui.layout.ContentScale | ||
| import androidx.compose.ui.layout.onSizeChanged | ||
| import androidx.compose.ui.res.stringResource | ||
| import androidx.compose.ui.unit.IntSize | ||
| import kotlinx.coroutines.launch | ||
| import org.nsh07.wikireader.R | ||
| import org.nsh07.wikireader.data.WikiPhoto | ||
| import org.nsh07.wikireader.data.WikiPhotoDesc | ||
|
|
||
| @OptIn(ExperimentalMaterial3Api::class) | ||
| @Composable | ||
| fun FullScreenImage( | ||
| photo: WikiPhoto, | ||
| photoDesc: WikiPhotoDesc, | ||
| onBack: () -> Unit, | ||
| modifier: Modifier = Modifier | ||
| ) { | ||
| Scaffold( | ||
| topBar = { | ||
| TopAppBar( | ||
| title = { Text(photoDesc.label[0]) }, | ||
| navigationIcon = { | ||
| IconButton(onClick = onBack) { | ||
| Icon( | ||
| Icons.AutoMirrored.Outlined.ArrowBack, | ||
| contentDescription = stringResource(R.string.back) | ||
| ) | ||
| } | ||
| }, | ||
| colors = TopAppBarDefaults.topAppBarColors( | ||
| containerColor = Color(0f, 0f, 0f, 0.5f), | ||
| titleContentColor = Color.White, | ||
| navigationIconContentColor = Color.White | ||
| ) | ||
| ) | ||
| }, | ||
| containerColor = Color.Black, | ||
| modifier = modifier | ||
| ) { _ -> | ||
| var scale by remember { mutableFloatStateOf(1f) } | ||
| var offset by remember { mutableStateOf(Offset.Zero) } | ||
| var size by remember { mutableStateOf(IntSize.Zero) } | ||
|
|
||
| // Zoom/Offset logic. Also prevents image from going out of bounds | ||
| val state = rememberTransformableState { scaleChange, offsetChange, _ -> | ||
| val maxX = (size.width * (scale - 1) / 2f) | ||
| val maxY = (size.height * (scale - 1) / 2f) | ||
|
|
||
| scale = (scale * scaleChange).coerceIn(1f..8f) | ||
|
|
||
| offset += offsetChange.times(scale) | ||
| offset = Offset( | ||
| offset.x.coerceIn(-maxX, maxX), | ||
| offset.y.coerceIn(-maxY, maxY) | ||
| ) | ||
| } | ||
|
|
||
| val coroutineScope = rememberCoroutineScope() | ||
|
|
||
| Box(modifier = Modifier.fillMaxSize()) { | ||
| PageImage( | ||
| photo = photo, | ||
| photoDesc = photoDesc, | ||
| contentScale = ContentScale.Inside, | ||
| modifier = Modifier | ||
| .onSizeChanged { size = it } | ||
| .graphicsLayer( | ||
| scaleX = scale, | ||
| scaleY = scale, | ||
| translationX = offset.x, | ||
| translationY = offset.y | ||
| ) | ||
| .transformable(state = state) | ||
| .align(Alignment.Center) | ||
| .pointerInput(Unit) { | ||
| detectTapGestures(onDoubleTap = { | ||
| coroutineScope.launch { | ||
| if (scale == 1f) // Zoom in only if the image is zoomed out | ||
| state.animateZoomBy(4f) | ||
| else | ||
| state.animateZoomBy(0.25f) | ||
| } | ||
| }) | ||
| } | ||
| ) | ||
| } | ||
| } | ||
| } |
Oops, something went wrong.