Skip to content

Commit fe6088b

Browse files
committed
feat: photo scale
1 parent cbe36c5 commit fe6088b

4 files changed

Lines changed: 334 additions & 156 deletions

File tree

‎photo/src/main/java/com/qmuiteam/photo/activity/QMUIPhotoViewerActivity.kt‎

Lines changed: 38 additions & 155 deletions
Original file line numberDiff line numberDiff line change
@@ -22,27 +22,18 @@ import androidx.activity.ComponentActivity
2222
import androidx.activity.compose.setContent
2323
import androidx.activity.viewModels
2424
import androidx.appcompat.app.AppCompatActivity
25-
import androidx.compose.animation.AnimatedContent
26-
import androidx.compose.animation.AnimatedVisibility
27-
import androidx.compose.animation.core.*
28-
import androidx.compose.animation.fadeIn
29-
import androidx.compose.animation.fadeOut
3025
import androidx.compose.foundation.Image
31-
import androidx.compose.foundation.background
32-
import androidx.compose.foundation.gestures.transformable
33-
import androidx.compose.foundation.layout.*
26+
import androidx.compose.foundation.layout.Box
27+
import androidx.compose.foundation.layout.BoxWithConstraints
28+
import androidx.compose.foundation.layout.fillMaxSize
3429
import androidx.compose.material.Text
3530
import androidx.compose.runtime.*
36-
import androidx.compose.runtime.saveable.rememberSaveable
3731
import androidx.compose.ui.Alignment
3832
import androidx.compose.ui.Modifier
39-
import androidx.compose.ui.draw.alpha
4033
import androidx.compose.ui.geometry.Rect
41-
import androidx.compose.ui.graphics.Color
4234
import androidx.compose.ui.graphics.asImageBitmap
4335
import androidx.compose.ui.graphics.painter.BitmapPainter
4436
import androidx.compose.ui.layout.ContentScale
45-
import androidx.compose.ui.platform.LocalDensity
4637
import androidx.compose.ui.unit.toSize
4738
import androidx.core.graphics.drawable.toBitmap
4839
import androidx.core.view.WindowCompat
@@ -52,8 +43,8 @@ import androidx.lifecycle.ViewModel
5243
import com.google.accompanist.pager.ExperimentalPagerApi
5344
import com.google.accompanist.pager.HorizontalPager
5445
import com.google.accompanist.pager.rememberPagerState
46+
import com.qmuiteam.photo.compose.GesturePhoto
5547
import com.qmuiteam.photo.data.*
56-
import com.qmuiteam.photo.data.PhotoTransitionDelivery
5748
import com.qmuiteam.photo.util.asBitmap
5849

5950
private const val PHOTO_CURRENT_INDEX = "qmui_photo_current_index"
@@ -67,8 +58,6 @@ class PhotoViewerViewModel(val state: SavedStateHandle) : ViewModel() {
6758
val enterIndex = state.get<Int>(PHOTO_CURRENT_INDEX) ?: 0
6859
val data: PhotoViewerData?
6960

70-
var isEnterTransitionFinished: Boolean = false
71-
7261
private val transitionDeliverKey = state.get<Long>(PHOTO_TRANSITION_DELIVERY_KEY) ?: -1
7362

7463
init {
@@ -187,147 +176,31 @@ open class QMUIPhotoViewerActivity : AppCompatActivity() {
187176
count = list.size,
188177
state = pagerState
189178
) { page ->
190-
PhotoPager(list[page], page == index && !viewModel.isEnterTransitionFinished)
191-
}
192-
}
193-
194-
@Composable
195-
protected open fun PhotoPager(
196-
photoTransition: QMUIPhotoTransition,
197-
animateEnterTarget: Boolean,
198-
) {
199-
var transitionStartOffset = photoTransition.offsetInWindow
200-
var transitionStartSize = photoTransition.size
201-
val transitionStartPhoto = photoTransition.photo
202-
val radio = photoTransition.photoProvider.ratio()
203-
val transitionDurationMs = 1000
204-
PhotoBackgroundWithTransition(animateEnterTarget, transitionDurationMs)
205-
if(transitionStartOffset == null ||
206-
transitionStartSize == null ||
207-
transitionStartPhoto == null ||
208-
radio <= 0f
209-
){
210-
PhotoContentWithAlphaTransition(photoTransition, animateEnterTarget, transitionDurationMs)
211-
}else{
179+
val item = list[page]
180+
val transitionStartOffset = item.offsetInWindow
181+
val transitionStartSize = item.size?.toSize()
182+
val initRect = if (transitionStartOffset != null && transitionStartSize != null) {
183+
Rect(transitionStartOffset, transitionStartSize)
184+
} else null
212185
BoxWithConstraints(modifier = Modifier.fillMaxSize()) {
213-
val targetViewRatio = constraints.maxWidth * 1f / constraints.maxHeight
214-
val targetWidth = if(radio >= targetViewRatio){
215-
constraints.maxWidth.toFloat()
216-
} else {
217-
constraints.maxHeight * radio
186+
GesturePhoto(
187+
containerWidth = maxWidth,
188+
containerHeight = maxHeight,
189+
imageRatio = item.photoProvider.ratio(),
190+
isLongImage = item.photoProvider.isLongImage(),
191+
initRect = initRect,
192+
transitionEnter = page == index
193+
) {
194+
PhotoContent(photoTransition = item)
218195
}
219-
val targetHeight = if(radio >= targetViewRatio){
220-
constraints.maxWidth / radio
221-
}else{
222-
constraints.maxHeight.toFloat()
223-
}
224-
val targetLeft = (constraints.maxWidth - targetWidth) / 2f
225-
val targetTop = (constraints.maxHeight - targetHeight) / 2f
226-
PhotoContentWithRectTransition(
227-
photoTransition = photoTransition,
228-
initRect = Rect(transitionStartOffset, transitionStartSize.toSize()),
229-
targetRect = Rect(
230-
targetLeft,
231-
targetTop,
232-
targetLeft + targetWidth,
233-
targetTop + targetHeight
234-
),
235-
transitionDurationMs = transitionDurationMs
236-
)
237196
}
238197
}
239198
}
240199

241-
242-
@Composable
243-
protected open fun PhotoBackgroundWithTransition(
244-
animateEnterTarget: Boolean,
245-
transitionDurationMs: Int
246-
){
247-
val alphaTransitionState = remember {
248-
MutableTransitionState(if(animateEnterTarget) 0f else 1f)
249-
}
250-
alphaTransitionState.targetState = 1f
251-
val transition = updateTransition(transitionState = alphaTransitionState, label = "")
252-
val alpha = transition.animateFloat(
253-
transitionSpec = { tween(durationMillis = transitionDurationMs) },
254-
label = ""
255-
) {
256-
it
257-
}
258-
Box(modifier = Modifier
259-
.fillMaxSize()
260-
.background(Color.Black)
261-
.alpha(alpha.value)
262-
)
263-
}
264-
265-
@Composable
266-
protected open fun PhotoContentWithRectTransition(
267-
photoTransition: QMUIPhotoTransition,
268-
initRect: Rect,
269-
targetRect: Rect,
270-
transitionDurationMs: Int
271-
){
272-
val alphaTransitionState = remember {
273-
MutableTransitionState(initRect)
274-
}
275-
alphaTransitionState.targetState = targetRect
276-
val transition = updateTransition(transitionState = alphaTransitionState, label = "")
277-
val rect = transition.animateRect(
278-
transitionSpec = { tween(durationMillis = transitionDurationMs) },
279-
label = ""
280-
) {
281-
it
282-
}
283-
val left = with(LocalDensity.current){
284-
rect.value.left.toDp()
285-
}
286-
val top = with(LocalDensity.current){
287-
rect.value.top.toDp()
288-
}
289-
val width = with(LocalDensity.current){
290-
rect.value.width.toDp()
291-
}
292-
val height = with(LocalDensity.current){
293-
rect.value.height.toDp()
294-
}
295-
Box(
296-
modifier = Modifier.offset(left, top).width(width).height(height)
297-
){
298-
PhotoContent(photoTransition)
299-
}
300-
}
301-
302-
@Composable
303-
protected open fun PhotoContentWithAlphaTransition(
304-
photoTransition: QMUIPhotoTransition,
305-
animateEnterTarget: Boolean,
306-
transitionDurationMs: Int
307-
){
308-
val alphaTransitionState = remember {
309-
MutableTransitionState(if(animateEnterTarget) 0f else 1f)
310-
}
311-
alphaTransitionState.targetState = 1f
312-
val transition = updateTransition(transitionState = alphaTransitionState, label = "")
313-
val alpha = transition.animateFloat(
314-
transitionSpec = { tween(durationMillis = transitionDurationMs) },
315-
label = ""
316-
) {
317-
it
318-
}
319-
Box(modifier = Modifier
320-
.fillMaxSize()
321-
.alpha(alpha.value)
322-
){
323-
PhotoContent(photoTransition)
324-
}
325-
}
326-
327200
@Composable
328201
protected open fun PhotoContent(
329202
photoTransition: QMUIPhotoTransition
330-
){
203+
) {
331204
Box(modifier = Modifier.fillMaxSize()) {
332205
var isPhotoLoadSuccess by remember {
333206
mutableStateOf(false)
@@ -339,14 +212,24 @@ open class QMUIPhotoViewerActivity : AppCompatActivity() {
339212
onSuccess = { isPhotoLoadSuccess = true },
340213
onError = null
341214
)
342-
if(!isPhotoLoadSuccess){
343-
photoTransition.photoProvider.thumbnail()?.Compose(
344-
contentScale = ContentScale.Fit,
345-
isContainerFixed = true,
346-
isLongImage = false,
347-
onSuccess = null,
348-
onError = null
349-
)
215+
if (!isPhotoLoadSuccess) {
216+
val transitionPhoto = photoTransition.photo
217+
if (transitionPhoto != null) {
218+
Image(
219+
painter = BitmapPainter(transitionPhoto.toBitmap().asImageBitmap()),
220+
contentDescription = "",
221+
contentScale = ContentScale.Fit,
222+
modifier = Modifier.fillMaxSize()
223+
)
224+
} else {
225+
photoTransition.photoProvider.thumbnail()?.Compose(
226+
contentScale = ContentScale.Fit,
227+
isContainerFixed = true,
228+
isLongImage = false,
229+
onSuccess = null,
230+
onError = null
231+
)
232+
}
350233
}
351234
}
352235
}

0 commit comments

Comments
 (0)