From bb30679348b007e59d349efe564f936593b67e82 Mon Sep 17 00:00:00 2001
From: Xaver <xdxaverdrabik>
Date: Tue, 14 Jan 2025 16:14:59 +0100
Subject: [PATCH] edit screen ui

---
 .../main/java/at/xaxa/ledger/ui/LedgerApp.kt  |  4 +++-
 .../main/java/at/xaxa/ledger/ui/add/AddUI.kt  |  7 ------
 .../java/at/xaxa/ledger/ui/edit/EditUI.kt     | 24 ++++++++++++++-----
 .../java/at/xaxa/ledger/ui/home/HomeUI.kt     |  3 ++-
 4 files changed, 23 insertions(+), 15 deletions(-)

diff --git a/Ledger/app/src/main/java/at/xaxa/ledger/ui/LedgerApp.kt b/Ledger/app/src/main/java/at/xaxa/ledger/ui/LedgerApp.kt
index 1e9a419..582e843 100644
--- a/Ledger/app/src/main/java/at/xaxa/ledger/ui/LedgerApp.kt
+++ b/Ledger/app/src/main/java/at/xaxa/ledger/ui/LedgerApp.kt
@@ -1,5 +1,6 @@
 package at.xaxa.ledger.ui
 
+import android.util.Log
 import androidx.compose.foundation.layout.padding
 import androidx.compose.material3.Scaffold
 import androidx.compose.runtime.Composable
@@ -41,7 +42,7 @@ fun LedgerApp(modifier: Modifier = Modifier){
                     onButtonClick = {
                         navController.navigate("add")
                     }
-                    )
+                )
             }
 
             composable(AppRoutes.Add.route) {
@@ -56,6 +57,7 @@ fun LedgerApp(modifier: Modifier = Modifier){
                 })
             ) {
                     backStackEntry ->
+                Log.w("xaver", "edit")
                 Edit(
                     modifier = Modifier,
                     onCardClick = {
diff --git a/Ledger/app/src/main/java/at/xaxa/ledger/ui/add/AddUI.kt b/Ledger/app/src/main/java/at/xaxa/ledger/ui/add/AddUI.kt
index f08e978..bfe037f 100644
--- a/Ledger/app/src/main/java/at/xaxa/ledger/ui/add/AddUI.kt
+++ b/Ledger/app/src/main/java/at/xaxa/ledger/ui/add/AddUI.kt
@@ -130,14 +130,7 @@ fun Add(
                 modifier = Modifier,
                 "Add Transaction",
                 onClick = {
-                    Log.d("Kraushosdsdddad", "entryName " +entryName)
-                    Log.d("Kraushosdsdddad", "entryAmount " +entryAmount)
-                    Log.d("Kraushosdsdddad", "entryDate " +entryDate)
-                    Log.d("Kraushosdsdddad", "category " +category)
-
-
                     if (name.isNotBlank() && spending.toFloat() != 0f && selectedDate != 0L && selectedCategory != -1) {
-                        Log.d("Kraushosdsdddad", "BITTTTEEEEEE")
                         val newEntry = Entry(
                             id = 0,
                             name = name,
diff --git a/Ledger/app/src/main/java/at/xaxa/ledger/ui/edit/EditUI.kt b/Ledger/app/src/main/java/at/xaxa/ledger/ui/edit/EditUI.kt
index 1c2282f..ac40274 100644
--- a/Ledger/app/src/main/java/at/xaxa/ledger/ui/edit/EditUI.kt
+++ b/Ledger/app/src/main/java/at/xaxa/ledger/ui/edit/EditUI.kt
@@ -1,7 +1,9 @@
 package at.xaxa.ledger.ui.edit
 
+import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.Row
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.padding
@@ -17,6 +19,7 @@ import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
 import androidx.compose.runtime.setValue
 import androidx.compose.ui.Alignment
+import androidx.compose.ui.BiasAlignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.unit.dp
 import androidx.lifecycle.viewmodel.compose.viewModel
@@ -100,13 +103,22 @@ fun Edit(modifier: Modifier = Modifier, onCardClick: (Int) -> Unit, HomeViewMode
             }
         }
 
-        Box(
-            modifier = Modifier
-                .fillMaxWidth(),
-            contentAlignment = Alignment.Center
+        Column(
+            modifier = Modifier.fillMaxWidth(),
+            horizontalAlignment = Alignment.CenterHorizontally // Center buttons horizontally
         ) {
-            ButtonDanger(modifier = Modifier, "Delete Transaction", onClick = { print("test") })
-            ButtonSuccess(modifier = Modifier, "Add Transaction", onClick = { print("test") })
+            ButtonDanger(
+                modifier = Modifier
+                    .fillMaxWidth()
+                    .padding(bottom = 8.dp),
+                text = "Delete Transaction",
+                onClick = { print("test") }
+            )
+            ButtonSuccess(
+                modifier = Modifier.fillMaxWidth(), // Add spacing between buttons
+                text = "Add Transaction",
+                onClick = { print("test") }
+            )
         }
     }
 }
diff --git a/Ledger/app/src/main/java/at/xaxa/ledger/ui/home/HomeUI.kt b/Ledger/app/src/main/java/at/xaxa/ledger/ui/home/HomeUI.kt
index 5b4b11f..618f2cb 100644
--- a/Ledger/app/src/main/java/at/xaxa/ledger/ui/home/HomeUI.kt
+++ b/Ledger/app/src/main/java/at/xaxa/ledger/ui/home/HomeUI.kt
@@ -19,6 +19,7 @@ import at.xaxa.ledger.ui.AppViewModelProvider
 import at.xaxa.ledger.ui.ButtonSuccess
 import at.xaxa.ledger.ui.HeaderCard
 import at.xaxa.ledger.ui.HorizontalCard
+import at.xaxa.ledger.ui.convertMillisToDate
 
 @OptIn(ExperimentalFoundationApi::class)
 @Composable
@@ -46,7 +47,7 @@ fun Home(modifier: Modifier = Modifier, onCardClick: (Int) -> Unit, onButtonClic
                     HorizontalCard(
                         modifier = modifier,
                         name = item.name,
-                        date = item.date.toString(),
+                        date = convertMillisToDate(item.date),
                         amount = item.amount.toString()+"€",
                         onClick = { onCardClick(item.id) }
                     )