Merge pull request #59 from TimerTiTi/56-qa-021

close #57 fix : timetable grid
TimerTiTi · Feb 10, 2024 · a97348d · a97348d
2 parents 0fa51fe + 73eceb5
commit a97348d
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 11 deletions.
diff --git a/core/designsystem/src/main/kotlin/com/titi/app/core/designsystem/component/TdsTimeTable.kt b/core/designsystem/src/main/kotlin/com/titi/app/core/designsystem/component/TdsTimeTable.kt
@@ -104,10 +104,10 @@ fun DrawScope.drawGrid() {
     val itemWidth = size.width / 7
     val itemHeight = size.height / 24
 
-    var startX = 0f
-    var startY = 0f
-
     repeat(7 * 24) { idx ->
+        val startX = (idx % 7) * itemWidth
+        val startY = (idx / 7) * itemHeight
+
         drawRect(
             color = Color(0x80626262),
             topLeft = Offset(
@@ -117,12 +117,6 @@ fun DrawScope.drawGrid() {
             size = Size(itemWidth, itemHeight),
             style = Stroke(width = 1f),
         )
-        startX += itemWidth
-
-        if (startX == itemWidth * 7) {
-            startX = 0f
-            startY += itemHeight
-        }
     }
 }
 

diff --git a/feature/log/src/main/kotlin/com/titi/app/feature/log/ui/LogScreen.kt b/feature/log/src/main/kotlin/com/titi/app/feature/log/ui/LogScreen.kt
@@ -1,6 +1,5 @@
 package com.titi.app.feature.log.ui
 
-import android.util.Log
 import androidx.compose.foundation.ExperimentalFoundationApi
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.Spacer
@@ -153,7 +152,7 @@ fun LogScreen(viewModel: LogViewModel = mavericksViewModel()) {
     )
 
     val uiState by viewModel.collectAsState()
-    Log.e("ABC", uiState.graphColors.graphColors.toString())
+
     Column(
         modifier = Modifier
             .fillMaxSize()