Merge pull request #178 from code-payments/chore/ui-polish

chore(chat): ui polish

Author: bmc08gt

app/src/main/java/com/getcode/navigation/screens/ChatScreens.kt

@@ -9,6 +9,7 @@ import androidx.compose.runtime.remember
 import androidx.compose.ui.platform.LocalLifecycleOwner
 import androidx.compose.ui.res.stringResource
 import androidx.paging.compose.collectAsLazyPagingItems
+import cafe.adriel.voyager.core.lifecycle.LifecycleEffect
 import cafe.adriel.voyager.core.screen.ScreenKey
 import cafe.adriel.voyager.core.screen.uniqueScreenKey
 import cafe.adriel.voyager.hilt.getViewModel
@@ -74,6 +75,16 @@ data object BalanceModal : ChatGraph, ModalRoot {
             lifecycleOwner = LocalLifecycleOwner.current,
             event = AnalyticsManager.Screen.Balance
         )
+
+        LifecycleEffect(
+            onDisposed = {
+                viewModel.dispatchEvent(
+                    BalanceSheetViewModel.Event.OnDebugBucketsVisible(
+                        false
+                    )
+                )
+            }
+        )
     }
 }
 

app/src/main/java/com/getcode/ui/components/chat/MessageNode.kt

@@ -1,11 +1,9 @@
 package com.getcode.ui.components.chat
 
-import android.annotation.SuppressLint
 import androidx.compose.foundation.background
 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.fillMaxWidth
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.shape.CornerBasedShape
@@ -15,13 +13,9 @@ import androidx.compose.runtime.Composable
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.Color
-import androidx.compose.ui.platform.LocalContext
-import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.unit.dp
-import com.getcode.BuildConfig
 import com.getcode.LocalExchange
-import com.getcode.R
 import com.getcode.model.KinAmount
 import com.getcode.model.MessageContent
 import com.getcode.model.Rate
@@ -36,19 +30,6 @@ import kotlinx.datetime.Instant
 
 object MessageNodeDefaults {
 
-    @Composable
-    fun verticalPadding(
-        isPreviousSameMessage: Boolean,
-        isNextSameMessage: Boolean
-    ): PaddingValues {
-        return when {
-            isPreviousSameMessage && isNextSameMessage -> PaddingValues(vertical = CodeTheme.dimens.grid.x1 / 2)
-            isPreviousSameMessage -> PaddingValues(top = CodeTheme.dimens.grid.x1 / 2)
-            isNextSameMessage -> PaddingValues(bottom = CodeTheme.dimens.grid.x1 / 2)
-            else -> PaddingValues(vertical = CodeTheme.dimens.grid.x1)
-        }
-    }
-
     val DefaultShape: CornerBasedShape
         @Composable get() = CodeTheme.shapes.small
     val PreviousSameShape: CornerBasedShape
@@ -67,8 +48,8 @@ object MessageNodeDefaults {
 private val MessageContent.widthFraction: Float
     get() = when (this) {
         is MessageContent.Exchange -> 0.895f
-        is MessageContent.Localized -> 0.8358f
-        MessageContent.SodiumBox -> 0.8358f
+        is MessageContent.Localized -> 0.895f
+        MessageContent.SodiumBox -> 0.895f
     }
 
 @Composable
@@ -81,12 +62,7 @@ fun MessageNode(
 ) {
     Box(
         modifier = modifier
-            .padding(
-                MessageNodeDefaults.verticalPadding(
-                    isPreviousSameMessage = isPreviousSameMessage,
-                    isNextSameMessage = isNextSameMessage
-                )
-            )
+            .padding(vertical = CodeTheme.dimens.grid.x1)
     ) {
         val exchange = LocalExchange.current
 
@@ -196,7 +172,7 @@ private fun MessageText(modifier: Modifier = Modifier, text: String, date: Insta
         Text(
             modifier = Modifier.align(Alignment.End),
             text = date.formatTimeRelatively(),
-            style = CodeTheme.typography.caption,
+            style = CodeTheme.typography.overline,
             color = BrandLight,
         )
     }

app/src/main/java/com/getcode/util/DateUtils.kt

@@ -8,6 +8,7 @@ import kotlinx.datetime.Clock
 import kotlinx.datetime.Instant
 import kotlinx.datetime.TimeZone
 import kotlinx.datetime.daysUntil
+import timber.log.Timber
 import java.util.*
 import kotlin.math.abs
 import kotlin.time.Duration.Companion.days
@@ -31,15 +32,17 @@ object DateUtils {
 
     fun getDateRelatively(millis: Long): String {
         val date = Instant.fromEpochMilliseconds(millis)
-        val weekAgo = date.minus(7.days)
+            .toLocalDate().atStartOfDay()
+        val weekAgo = Clock.System.now()
+            .minus(7.days)
+            .toLocalDate().atStartOfDay()
 
         return if (DateUtils.isToday(millis)) {
             "Today"
         } else if (isYesterday(millis)) {
             "Yesterday"
-        } else if (date.toEpochMilliseconds() < weekAgo.toEpochMilliseconds()) {
-            val daysBetween = abs(date.daysUntil(Clock.System.now(), TimeZone.currentSystemDefault()))
-            "$daysBetween days ago"
+        } else if (date.toEpochMilliseconds() > weekAgo.toEpochMilliseconds()) {
+            getDate(millis, format = "EEEE")
         } else {
             getDate(millis, format = "EEE, MMM dd")
         }

app/src/main/java/com/getcode/util/Instant.kt

@@ -0,0 +1,21 @@
+package com.getcode.util
+
+import kotlinx.datetime.DatePeriod
+import kotlinx.datetime.DateTimeUnit
+import kotlinx.datetime.Instant
+import kotlinx.datetime.LocalDate
+import kotlinx.datetime.TimeZone
+import kotlinx.datetime.atStartOfDayIn
+import kotlinx.datetime.minus
+import kotlinx.datetime.plus
+import kotlinx.datetime.toLocalDateTime
+
+fun Instant.toLocalDate(timeZone: TimeZone = TimeZone.currentSystemDefault()) =
+    toLocalDateTime(timeZone).date
+
+fun LocalDate.atStartOfDay(tz: TimeZone = TimeZone.currentSystemDefault()) = atStartOfDayIn(tz)
+
+fun LocalDate.atEndOfDay(tz: TimeZone = TimeZone.currentSystemDefault()): Instant {
+    val tomorrowAtMidnight = ((this + DatePeriod(days = 1)).atStartOfDayIn(tz))
+    return tomorrowAtMidnight.minus(value = 1, unit = DateTimeUnit.NANOSECOND)
+}

app/src/main/java/com/getcode/view/main/chat/ChatScreen.kt

@@ -134,7 +134,6 @@ fun ChatScreen(
                         positiveText = context.getString(if (state.isMuted) R.string.action_unmute else R.string.action_mute),
                         negativeText = context.getString(R.string.action_nevermind),
                         onPositive = { dispatch(ChatViewModel.Event.OnMuteToggled) },
-                        isDismissible = false,
                     )
                 )
             },