Activity Folder Today

android/build.gradle.kts

@@ -1,7 +1,7 @@
 plugins {
     kotlin("android")
     id("com.android.application")
-    id("org.jetbrains.kotlin.plugin.compose") version "2.3.20"
+    id("org.jetbrains.kotlin.plugin.compose") version "2.3.21"
 }
 
 android {
@@ -13,8 +13,8 @@ android {
         applicationId = "me.timeto.app"
         minSdk = 26
         targetSdk = 36
-        versionCode = 613
-        versionName = "2026.04.23"
+        versionCode = 614
+        versionName = "2026.06.12"
     }
 
     buildTypes {
@@ -68,6 +68,6 @@ dependencies {
     implementation(project(":shared"))
     implementation("androidx.core:core:1.18.0")
     implementation("androidx.activity:activity-compose:1.13.0")
-    implementation("androidx.compose.material:material:1.11.0")
+    implementation("androidx.compose.material:material:1.11.1")
     implementation("com.google.android.material:material:1.13.0")
 }

android/src/main/java/me/timeto/app/ui/SwipeToAction.kt

@@ -1,26 +1,14 @@
 package me.timeto.app.ui
 
-import androidx.compose.animation.animateColorAsState
-import androidx.compose.foundation.background
-import androidx.compose.foundation.clickable
 import androidx.compose.foundation.layout.*
 import androidx.compose.material.*
 import androidx.compose.runtime.*
-import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
-import androidx.compose.ui.draw.alpha
-import androidx.compose.ui.draw.clip
-import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.platform.LocalViewConfiguration
 import androidx.compose.ui.platform.ViewConfiguration
-import androidx.compose.ui.text.font.FontWeight
-import androidx.compose.ui.text.style.TextOverflow
 import androidx.compose.ui.unit.Dp
 import androidx.compose.ui.unit.dp
-import androidx.compose.ui.unit.sp
-import kotlinx.coroutines.launch
 import me.timeto.app.Haptic
-import me.timeto.app.ui.navigation.LocalNavigationFs
 import kotlin.math.absoluteValue
 
 @OptIn(ExperimentalMaterialApi::class)
@@ -29,7 +17,7 @@ fun SwipeToAction(
     isStartOrEnd: MutableState<Boolean?>,
     modifier: Modifier = Modifier,
     ignoreOneAction: MutableState<Boolean> = remember { mutableStateOf(false) },
-    startView: @Composable () -> Unit,
+    startView: @Composable (DismissState) -> Unit,
     endView: @Composable (DismissState) -> Unit,
     onStart: () -> Boolean, // false - restart state
     onEnd: () -> Boolean, // false - restart state
@@ -109,7 +97,7 @@ fun SwipeToAction(
             },
             background = {
                 when (state.dismissDirection) {
-                    DismissDirection.StartToEnd -> startView()
+                    DismissDirection.StartToEnd -> startView(state)
                     DismissDirection.EndToStart -> endView(state)
                     null -> {}
                 }
@@ -119,102 +107,6 @@ fun SwipeToAction(
     }
 }
 
-@Composable
-fun SwipeToAction__StartView(
-    text: String,
-    bgColor: Color,
-) {
-    val bgAnimate = animateColorAsState(bgColor)
-    Box(
-        modifier = Modifier
-            .fillMaxSize()
-            .background(bgAnimate.value)
-    ) {
-        Text(
-            text,
-            modifier = Modifier
-                .padding(start = 19.dp, bottom = 1.dp)
-                .align(Alignment.CenterStart),
-            color = c.white,
-            fontSize = 15.sp
-        )
-    }
-}
-
-@OptIn(ExperimentalMaterialApi::class)
-@Composable
-fun SwipeToAction__DeleteView(
-    state: DismissState,
-    note: String,
-    deletionConfirmationNote: String? = null,
-    onDelete: () -> Unit,
-) {
-    val scope = rememberCoroutineScope()
-
-    val navigationFs = LocalNavigationFs.current
-
-    Row(
-        modifier = Modifier
-            .fillMaxHeight()
-            .background(c.red),
-        verticalAlignment = Alignment.CenterVertically
-    ) {
-
-        Text(
-            text = note,
-            color = c.white,
-            fontWeight = FontWeight.W300,
-            fontSize = 13.sp,
-            maxLines = 1,
-            overflow = TextOverflow.Ellipsis,
-            modifier = Modifier
-                .padding(start = 16.dp, end = 8.dp)
-                .weight(1f)
-        )
-
-        Text(
-            "Cancel",
-            color = c.white,
-            modifier = Modifier
-                .padding(end = 8.dp)
-                .clip(squircleShape)
-                .clickable {
-                    // С launchEx can be canceled
-                    scope.launch {
-                        state.reset()
-                    }
-                }
-                .padding(horizontal = 10.dp, vertical = 4.dp)
-                .alpha(0.9f),
-            fontSize = 15.sp,
-        )
-
-        Text(
-            text = "Delete",
-            color = c.red,
-            modifier = Modifier
-                .padding(end = 10.dp)
-                .clip(squircleShape)
-                .background(c.white)
-                .clickable {
-                    if (deletionConfirmationNote != null) {
-                        navigationFs.confirmation(
-                            message = deletionConfirmationNote,
-                            buttonText = "Delete",
-                            onConfirm = {
-                                onDelete()
-                            },
-                        )
-                    } else {
-                        onDelete()
-                    }
-                }
-                .padding(start = 10.dp, end = 10.dp, top = 4.dp, bottom = 5.dp),
-            fontWeight = FontWeight.Bold,
-            fontSize = 15.sp
-        )
-    }
-}
 
 private class ActionsContainer(
     val onStart: () -> Boolean,