From b5b32059718448a4c38a5e1596a9faca7fd5ebed Mon Sep 17 00:00:00 2001
From: lbarraga <lukas.barragantorres@ugent.be>
Date: Sun, 7 May 2023 16:59:23 +0200
Subject: [PATCH] #74 UI Refactor

---
 .../be/ugent/sel/studeez/screens/home/Feed.kt | 43 ++++++++++++-------
 1 file changed, 27 insertions(+), 16 deletions(-)

diff --git a/app/src/main/java/be/ugent/sel/studeez/screens/home/Feed.kt b/app/src/main/java/be/ugent/sel/studeez/screens/home/Feed.kt
index 62f285a..4a254ac 100644
--- a/app/src/main/java/be/ugent/sel/studeez/screens/home/Feed.kt
+++ b/app/src/main/java/be/ugent/sel/studeez/screens/home/Feed.kt
@@ -1,7 +1,5 @@
 package be.ugent.sel.studeez.screens.home
 
-import android.icu.text.DateFormat
-import android.icu.text.SimpleDateFormat
 import androidx.compose.foundation.background
 import androidx.compose.foundation.layout.*
 import androidx.compose.foundation.lazy.LazyColumn
@@ -9,17 +7,13 @@ import androidx.compose.foundation.lazy.items
 import androidx.compose.foundation.shape.CircleShape
 import androidx.compose.material.Card
 import androidx.compose.material.Divider
-import androidx.compose.material.Icon
 import androidx.compose.material.Text
-import androidx.compose.material.icons.Icons
-import androidx.compose.material.icons.filled.List
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.collectAsState
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.draw.clip
 import androidx.compose.ui.graphics.Color
-import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.text.style.TextOverflow
 import androidx.compose.ui.unit.dp
@@ -27,12 +21,9 @@ import androidx.compose.ui.unit.sp
 import androidx.hilt.navigation.compose.hiltViewModel
 import be.ugent.sel.studeez.R
 import be.ugent.sel.studeez.common.composable.StealthButton
+import be.ugent.sel.studeez.common.ext.spacer
 import be.ugent.sel.studeez.data.local.models.FeedEntry
-import be.ugent.sel.studeez.data.local.models.task.Subject
 import be.ugent.sel.studeez.data.local.models.timer_functional.HoursMinutesSeconds
-import com.google.type.Date
-import java.time.temporal.TemporalField
-import java.util.*
 
 @Composable
 fun Feed(
@@ -44,21 +35,41 @@ fun Feed(
     LazyColumn {
 
         items(feedEntries.value.toList()) {(date, feedEntries) ->
-            Text(
-                text = date,
-                fontWeight = FontWeight.Bold,
-                fontSize = 20.sp,
-                modifier = Modifier.padding(horizontal = 10.dp)
-            )
+            Row(
+                horizontalArrangement = Arrangement.SpaceBetween,
+                modifier = Modifier
+                    .fillMaxWidth()
+                    .padding(10.dp),
+                verticalAlignment = Alignment.CenterVertically
+            ) {
+                val totalDayStudyTime: Int = feedEntries.sumOf { it.totalStudyTime }
+                DateText(date = date)
+                Text(
+                    text = "${HoursMinutesSeconds(totalDayStudyTime)}",
+                    fontSize = 15.sp,
+                    fontWeight = FontWeight.Bold
+                )
+            }
             feedEntries.forEach { feedEntry ->
                 FeedEntryCard(feedEntry = feedEntry) {
                     viewModel.continueWithTask(open, feedEntry.subjectId, feedEntry.taskId)
                 }
             }
+            Spacer(modifier = Modifier.height(20.dp))
         }
     }
 }
 
+@Composable
+fun DateText(date: String) {
+    Text(
+        text = date,
+        fontWeight = FontWeight.Bold,
+        fontSize = 20.sp,
+        modifier = Modifier.padding(horizontal = 10.dp)
+    )
+}
+
 @Composable
 fun FeedEntryCard(
     feedEntry: FeedEntry,