From 3bb5ce5ca747283c6b304ebc4f803f098cc32f0e Mon Sep 17 00:00:00 2001
From: Odweta <code.62rdl@aleeas.com>
Date: Sun, 15 Dec 2024 10:42:14 +0100
Subject: [PATCH] fixed incorrect color in MarksDetail regarding the average
 field

---
 .../src/main/java/com/odweta/solon/Marks.kt   |  8 +++---
 .../main/java/com/odweta/solon/Timetable.kt   | 25 ++++++-------------
 2 files changed, 12 insertions(+), 21 deletions(-)

diff --git a/mobile/app/src/main/java/com/odweta/solon/Marks.kt b/mobile/app/src/main/java/com/odweta/solon/Marks.kt
index dc48891..7882e5a 100644
--- a/mobile/app/src/main/java/com/odweta/solon/Marks.kt
+++ b/mobile/app/src/main/java/com/odweta/solon/Marks.kt
@@ -472,7 +472,7 @@ fun MarksDetail() {
                 ),
                 modifier = Modifier
                     .border(
-                        width = 5.dp,
+                        width = borderWidthDimen,
                         shape = RoundedCornerShape(roundedCornerDimen),
                         color = PastelYellow
                     )
@@ -493,9 +493,9 @@ fun MarksDetail() {
                     .width(70.dp)
                     .height(70.dp)
                     .border(
-                        width = 5.dp,
+                        width = borderWidthDimen,
                         color = getAvgColor(
-                            Util.avg(marks[subjectToShow]!!),
+                            Util.avg(mutableListOf(markToShow)),
                             true
                         ),
                         shape = RoundedCornerShape(roundedCornerDimen)
@@ -505,7 +505,7 @@ fun MarksDetail() {
                             Color.Black
                         } else {
                             getAvgColor(
-                                Util.avg(marks[subjectToShow]!!)
+                                Util.avg(mutableListOf(markToShow))
                             )
                         }
                     )
diff --git a/mobile/app/src/main/java/com/odweta/solon/Timetable.kt b/mobile/app/src/main/java/com/odweta/solon/Timetable.kt
index be58c4a..eaed3d8 100644
--- a/mobile/app/src/main/java/com/odweta/solon/Timetable.kt
+++ b/mobile/app/src/main/java/com/odweta/solon/Timetable.kt
@@ -1,22 +1,21 @@
 package com.odweta.solon
 
 import android.annotation.SuppressLint
-import android.util.Log
 import androidx.compose.foundation.ExperimentalFoundationApi
+import androidx.compose.foundation.Image
 import androidx.compose.foundation.background
+import androidx.compose.foundation.border
+import androidx.compose.foundation.clickable
 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.Spacer
+import androidx.compose.foundation.layout.fillMaxHeight
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.height
 import androidx.compose.foundation.layout.padding
-import androidx.compose.foundation.Image
-import androidx.compose.foundation.border
-import androidx.compose.foundation.clickable
-import androidx.compose.foundation.layout.Box
-import androidx.compose.foundation.layout.Spacer
-import androidx.compose.foundation.layout.fillMaxHeight
 import androidx.compose.foundation.layout.width
 import androidx.compose.foundation.pager.HorizontalPager
 import androidx.compose.foundation.pager.rememberPagerState
@@ -24,18 +23,12 @@ import androidx.compose.foundation.rememberScrollState
 import androidx.compose.foundation.shape.RoundedCornerShape
 import androidx.compose.foundation.text.selection.TextSelectionColors
 import androidx.compose.foundation.verticalScroll
-import androidx.compose.material3.AlertDialog
-import androidx.compose.material3.BasicAlertDialog
 import androidx.compose.material3.ExperimentalMaterial3Api
 import androidx.compose.material3.Text
 import androidx.compose.material3.TextField
-import androidx.compose.material3.TextFieldColors
 import androidx.compose.material3.TextFieldDefaults
 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.graphics.Color
@@ -53,11 +46,9 @@ import com.odweta.solon.ui.theme.PastelRed
 import com.odweta.solon.ui.theme.PastelRedTransparent
 import com.odweta.solon.ui.theme.PastelYellow
 import com.odweta.solon.ui.theme.PastelYellowTransparent
-import java.security.MessageDigest
 import java.time.LocalDate
 import java.time.LocalTime
 import java.time.format.DateTimeFormatter
-import kotlin.math.abs
 
 var showDetailDialog = mutableStateOf(false)
 
@@ -78,7 +69,7 @@ fun TimetableScreen() {
 @SuppressLint("UnrememberedMutableState")
 @OptIn(ExperimentalMaterial3Api::class)
 @Composable
-fun DetailDialog(modifier: Modifier = Modifier) {
+fun DetailDialog() {
     Dialog(
         onDismissRequest = { showDetailDialog.value = false },  // Close the dialog on dismiss
         properties = DialogProperties(
@@ -125,7 +116,7 @@ fun DetailDialog(modifier: Modifier = Modifier) {
 
 @OptIn(ExperimentalFoundationApi::class)
 @Composable
-fun DayPager(modifier: Modifier = Modifier) {
+fun DayPager() {
     val pagerState = rememberPagerState(pageCount = { days.size })
     HorizontalPager(
         state = pagerState,