Fix log

tim06 · May 17, 2023 · 0c30570 · 0c30570
1 parent 311e1d8
commit 0c30570
Show file tree

Hide file tree

Showing 2 changed files with 43 additions and 18 deletions.
diff --git a/...github/tim06/wallet_contest/ui/feature/main/tonconnect/transfer/ConnectTransferContent.kt b/...github/tim06/wallet_contest/ui/feature/main/tonconnect/transfer/ConnectTransferContent.kt
@@ -5,28 +5,38 @@ import androidx.compose.animation.core.animateFloat
 import androidx.compose.animation.core.tween
 import androidx.compose.animation.core.updateTransition
 import androidx.compose.foundation.background
-import androidx.compose.foundation.layout.*
+import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.PaddingValues
+import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.Spacer
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.height
+import androidx.compose.foundation.layout.offset
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.size
+import androidx.compose.foundation.layout.width
 import androidx.compose.foundation.shape.RoundedCornerShape
 import androidx.compose.material.CircularProgressIndicator
 import androidx.compose.material.Icon
 import androidx.compose.material.MaterialTheme
 import androidx.compose.material.Text
-import androidx.compose.runtime.*
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.remember
+import androidx.compose.runtime.setValue
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.draw.alpha
-import androidx.compose.ui.draw.drawWithContent
-import androidx.compose.ui.geometry.Offset
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.graphics.StrokeCap
 import androidx.compose.ui.layout.onGloballyPositioned
-import androidx.compose.ui.layout.positionInParent
 import androidx.compose.ui.layout.positionInRoot
 import androidx.compose.ui.platform.LocalConfiguration
-import androidx.compose.ui.platform.LocalDensity
 import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.res.stringResource
-import androidx.compose.ui.text.font.FontFamily
 import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.unit.DpSize
 import androidx.compose.ui.unit.dp
@@ -40,13 +50,12 @@ import com.github.tim06.wallet_contest.ui.theme.BalanceBigTextStyle
 import com.github.tim06.wallet_contest.ui.theme.InterRegular
 import com.github.tim06.wallet_contest.ui.theme.RobotoMonoRegular
 import com.github.tim06.wallet_contest.ui.theme.TonBlue10
-import com.github.tim06.wallet_contest.util.transformAddress
 
 @Composable
 fun ConnectTransferContent() {
-    var tonCount by remember { mutableStateOf("2") }
-    var recipientAddress by remember { mutableStateOf("EQCcqweqweqweqwewq9ZLD".transformAddress()) }
-    var fee by remember { mutableStateOf("≈ 0.004 TON") }
+    val tonCount by remember { mutableStateOf("2") }
+    val recipientAddress by remember { mutableStateOf("") }
+    val fee by remember { mutableStateOf("≈ 0.004 TON") }
     Box(
         modifier = Modifier.background(
             color = MaterialTheme.colors.background,

diff --git a/...m06/wallet_contest/ui/feature/tonConnect/transfer/TonConnectBottomSheetTransferContent.kt b/...m06/wallet_contest/ui/feature/tonConnect/transfer/TonConnectBottomSheetTransferContent.kt
@@ -5,13 +5,34 @@ import androidx.compose.animation.core.animateFloat
 import androidx.compose.animation.core.tween
 import androidx.compose.animation.core.updateTransition
 import androidx.compose.foundation.background
-import androidx.compose.foundation.layout.*
+import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.BoxScope
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.PaddingValues
+import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.Spacer
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.height
+import androidx.compose.foundation.layout.navigationBarsPadding
+import androidx.compose.foundation.layout.offset
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.size
+import androidx.compose.foundation.layout.width
 import androidx.compose.foundation.shape.RoundedCornerShape
 import androidx.compose.material.CircularProgressIndicator
 import androidx.compose.material.Icon
 import androidx.compose.material.MaterialTheme
 import androidx.compose.material.Text
-import androidx.compose.runtime.*
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.DisposableEffect
+import androidx.compose.runtime.SideEffect
+import androidx.compose.runtime.collectAsState
+import androidx.compose.runtime.derivedStateOf
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.remember
+import androidx.compose.runtime.setValue
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.draw.alpha
@@ -22,11 +43,9 @@ import androidx.compose.ui.layout.positionInRoot
 import androidx.compose.ui.platform.LocalConfiguration
 import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.res.stringResource
-import androidx.compose.ui.text.font.FontFamily
 import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.unit.DpSize
 import androidx.compose.ui.unit.dp
-import androidx.lifecycle.viewmodel.compose.LocalViewModelStoreOwner
 import androidx.lifecycle.viewmodel.compose.viewModel
 import com.github.tim06.wallet_contest.R
 import com.github.tim06.wallet_contest.ton.TonWalletClient
@@ -35,12 +54,10 @@ import com.github.tim06.wallet_contest.ui.components.button.TonButton
 import com.github.tim06.wallet_contest.ui.components.rlottie.LottieIcon
 import com.github.tim06.wallet_contest.ui.components.row.TonRow
 import com.github.tim06.wallet_contest.ui.components.title.TonTitle
-import com.github.tim06.wallet_contest.ui.feature.tonConnect.ButtonState
 import com.github.tim06.wallet_contest.ui.theme.BalanceBigTextStyle
 import com.github.tim06.wallet_contest.ui.theme.InterRegular
 import com.github.tim06.wallet_contest.ui.theme.RobotoMonoRegular
 import com.github.tim06.wallet_contest.ui.theme.TonBlue10
-import com.github.tim06.wallet_contest.util.transformAddress
 
 @Composable
 fun TonConnectBottomSheetTransferContent(
@@ -239,7 +256,6 @@ private fun Buttons(
             buttonState is TonConnectTransferButtonState.Success
         }
     }
-    println("qweqwebuttonState: ${buttonState} // ${connected}")
 
     val transition = updateTransition(
         targetState = connected,