@@ -50,7 +50,6 @@ import androidx.compose.ui.ExperimentalComposeUiApi
5050import androidx.compose.ui.Modifier
5151import androidx.compose.ui.draw.clip
5252import androidx.compose.ui.graphics.Color
53- import androidx.compose.ui.graphics.asAndroidBitmap
5453import androidx.compose.ui.graphics.vector.ImageVector
5554import androidx.compose.ui.input.pointer.pointerInteropFilter
5655import androidx.compose.ui.layout.onSizeChanged
@@ -570,14 +569,7 @@ private fun EditMenuContent(
570569 viewModel.strokeSliderExpanded = ! viewModel.strokeSliderExpanded
571570 },
572571 imageVector = ImageVector .vectorResource(R .drawable.ic_line_weight),
573- tint = if (
574- ! editManager.isRotateMode.value &&
575- ! editManager.isResizeMode.value &&
576- ! editManager.isCropMode.value &&
577- ! editManager.isEyeDropperMode.value &&
578- ! editManager.isBlurMode.value
579- ) editManager.paintColor.value
580- else Color .Black ,
572+ tint = if (editManager.isEligibleForUndoOrRedo()) editManager.paintColor.value else Color .Black ,
581573 contentDescription = null
582574 )
583575 Icon (
@@ -674,24 +666,8 @@ private fun EditMenuContent(
674666 .size(40 .dp)
675667 .clip(CircleShape )
676668 .clickable {
677- editManager.apply {
678- if (isEligibleForResizeMode()
679- )
680- toggleResizeMode()
681- else return @clickable
682- viewModel.menusVisible = ! isResizeMode.value
683- if (isResizeMode.value) {
684- setBackgroundImage2()
685- val imgBitmap = viewModel.getEditedImage()
686- backgroundImage.value = imgBitmap
687- resizeOperation.init (
688- imgBitmap.asAndroidBitmap()
689- )
690- return @clickable
691- }
692- cancelResizeMode()
693- scaleToFit()
694- }
669+ editManager.enterResizeMode()
670+ viewModel.menusVisible = ! editManager.isResizeMode.value
695671 },
696672 imageVector = ImageVector
697673 .vectorResource(R .drawable.ic_aspect_ratio),
@@ -707,19 +683,7 @@ private fun EditMenuContent(
707683 .size(40 .dp)
708684 .clip(CircleShape )
709685 .clickable {
710- editManager.apply {
711- if (isEligibleForBlurMode() &&
712- ! viewModel.strokeSliderExpanded
713- ) toggleBlurMode()
714- if (isBlurMode.value) {
715- setBackgroundImage2()
716- backgroundImage.value = viewModel.getEditedImage()
717- blurOperation.init ()
718- return @clickable
719- }
720- blurOperation.cancel()
721- scaleToFit()
722- }
686+ editManager.enterBlurMode(viewModel.strokeSliderExpanded)
723687 },
724688 imageVector = ImageVector
725689 .vectorResource(R .drawable.ic_blur_on),
@@ -731,9 +695,7 @@ private fun EditMenuContent(
731695 )
732696 }
733697 }
734- viewModel.bottomButtonsScrollIsAtStart.value = scrollState.value == 0
735- viewModel.bottomButtonsScrollIsAtEnd.value =
736- scrollState.value == scrollState.maxValue
698+ viewModel.onBottomButtonStateChange(scrollState.value, 0 , scrollState.maxValue)
737699}
738700
739701@Composable
0 commit comments