fix(顶部): 输入框横滑问题

Author: jiaoyaning

app/src/main/java/com/jyn/composecalculator/ui/TopResultView.kt

@@ -1,39 +1,25 @@
 package com.jyn.composecalculator.ui
 
 import androidx.compose.foundation.gestures.Orientation
-import androidx.compose.foundation.horizontalScroll
-import androidx.compose.foundation.indication
-import androidx.compose.foundation.interaction.MutableInteractionSource
 import androidx.compose.foundation.layout.*
-import androidx.compose.foundation.rememberScrollState
 import androidx.compose.foundation.shape.RoundedCornerShape
 import androidx.compose.material.ExperimentalMaterialApi
 import androidx.compose.material.FractionalThreshold
 import androidx.compose.material.SwipeableDefaults.resistanceConfig
 import androidx.compose.material.rememberSwipeableState
 import androidx.compose.material.swipeable
 import androidx.compose.material3.Surface
-import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
-import androidx.compose.runtime.LaunchedEffect
-import androidx.compose.runtime.mutableStateOf
-import androidx.compose.runtime.remember
-import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
-import androidx.compose.ui.graphics.Color
-import androidx.compose.ui.layout.onSizeChanged
 import androidx.compose.ui.platform.LocalConfiguration
 import androidx.compose.ui.platform.LocalDensity
-import androidx.compose.ui.text.style.TextAlign
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.IntOffset
 import androidx.compose.ui.unit.dp
-import androidx.compose.ui.unit.sp
 import androidx.lifecycle.viewmodel.compose.viewModel
 import com.apkfuns.logutils.LogUtils
 import com.jyn.composecalculator.BOTTOM_FRACTION
 import com.jyn.composecalculator.DateViewModel
-import com.jyn.composecalculator.ui.view.CursorView
 import com.jyn.composecalculator.ui.view.InputText
 import com.jyn.composecalculator.ui.view.SlideIndicator
 
@@ -106,4 +92,5 @@ fun TextBox(process: Float) {
             SlideIndicator(process)
         }
     }
-}
+}
+

app/src/main/java/com/jyn/composecalculator/ui/view/ItemTextView.kt

@@ -1,8 +1,6 @@
 package com.jyn.composecalculator.ui.view
 
 import androidx.compose.foundation.horizontalScroll
-import androidx.compose.foundation.indication
-import androidx.compose.foundation.interaction.MutableInteractionSource
 import androidx.compose.foundation.layout.*
 import androidx.compose.foundation.rememberScrollState
 import androidx.compose.material3.Text
@@ -15,7 +13,6 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.layout.onSizeChanged
 import androidx.compose.ui.text.style.TextAlign
-import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
 import androidx.lifecycle.viewmodel.compose.viewModel
@@ -26,7 +23,6 @@ import com.jyn.composecalculator.DateViewModel
 fun InputText(input: String) {
     val viewModel = viewModel<DateViewModel>()
 
-    val mutableInteractionSource = remember { MutableInteractionSource() }
     val inputScrollState = rememberScrollState()
     val resultScrollState = rememberScrollState()
     val inputTextWidth = remember { mutableStateOf(0) }
@@ -48,10 +44,6 @@ fun InputText(input: String) {
                 modifier = Modifier
                     .weight(1f)
                     .horizontalScroll(inputScrollState)
-                    .indication( //水波纹效果怎么去除无效呢，bug?
-                        indication = null,
-                        interactionSource = mutableInteractionSource
-                    )
                     .onSizeChanged { inputTextWidth.value = it.width },
                 text = input,
                 maxLines = 1,
@@ -66,7 +58,7 @@ fun InputText(input: String) {
             modifier = Modifier
                 .fillMaxWidth()
                 .padding(end = 5.dp)
-                .horizontalScroll(inputScrollState)
+                .horizontalScroll(resultScrollState)
                 .onSizeChanged { resultTextWidth.value = it.width },
             maxLines = 1,
             fontSize = 30.sp,
@@ -81,10 +73,4 @@ fun ItemText(input: String, result: String) {
     Column(verticalArrangement = Arrangement.Bottom) {
         Text(modifier = Modifier.fillMaxWidth(), text = input, textAlign = TextAlign.End)
     }
-}
-
-@Preview
-@Composable
-fun InputTextPreview() {
-    InputText("12345678")
 }