Support RTL in drawPastOverlay

davidtakac · Jan 29, 2025 · 1b67bd3 · 1b67bd3
1 parent 07f1e73
commit 1b67bd3
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 6 deletions.
diff --git a/app/src/main/java/com/davidtakac/bura/graphs/common/DrawPastOverlay.kt b/app/src/main/java/com/davidtakac/bura/graphs/common/DrawPastOverlay.kt
@@ -15,9 +15,11 @@ package com.davidtakac.bura.graphs.common
 import androidx.compose.ui.geometry.Offset
 import androidx.compose.ui.geometry.Size
 import androidx.compose.ui.graphics.drawscope.DrawScope
+import androidx.compose.ui.unit.LayoutDirection
 
 fun DrawScope.drawPastOverlay(
     nowX: Float,
+    layoutDirection: LayoutDirection = LayoutDirection.Ltr,
     args: GraphArgs
 ) {
     drawLine(
@@ -26,17 +28,20 @@ fun DrawScope.drawPastOverlay(
         end = Offset(x = nowX, y = size.height),
         strokeWidth = 2f
     )
+    val topLeftX = if (layoutDirection == LayoutDirection.Ltr) 0f else nowX
+    val overlayWidth = if (layoutDirection == LayoutDirection.Ltr) nowX else size.width - nowX
     drawRect(
         color = args.pastOverlayColor,
-        topLeft = Offset.Zero,
-        size = Size(width = nowX, height = size.height)
+        topLeft = Offset(topLeftX, 0f),
+        size = Size(width = overlayWidth, height = size.height)
     )
 }
 
 fun DrawScope.drawPastOverlayWithPoint(
     nowCenter: Offset,
+    layoutDirection: LayoutDirection = LayoutDirection.Ltr,
     args: GraphArgs
 ) {
-    drawPastOverlay(nowCenter.x, args)
+    drawPastOverlay(nowCenter.x, layoutDirection, args)
     drawPoint(nowCenter, args)
 }
diff --git a/app/src/main/java/com/davidtakac/bura/graphs/pop/PopGraph.kt b/app/src/main/java/com/davidtakac/bura/graphs/pop/PopGraph.kt
@@ -149,7 +149,7 @@ private fun DrawScope.drawHorizontalAxisAndPlot(
         )
     }
     nowCenter?.let {
-        drawPastOverlayWithPoint(it, args)
+        drawPastOverlayWithPoint(nowCenter = it, args = args)
     }
 }
 

diff --git a/app/src/main/java/com/davidtakac/bura/graphs/precipitation/PrecipitationGraph.kt b/app/src/main/java/com/davidtakac/bura/graphs/precipitation/PrecipitationGraph.kt
@@ -174,7 +174,7 @@ private fun DrawScope.drawHorizontalAxisAndBars(
     }
 
     nowX?.let {
-        drawPastOverlay(it, args)
+        drawPastOverlay(nowX = it, args = args)
     }
 }
 

diff --git a/app/src/main/java/com/davidtakac/bura/graphs/temperature/TemperatureGraph.kt b/app/src/main/java/com/davidtakac/bura/graphs/temperature/TemperatureGraph.kt
@@ -215,7 +215,7 @@ private fun DrawScope.drawHorizontalAxisAndPlot(
         )
     }
     nowCenter?.let {
-        drawPastOverlayWithPoint(it, args)
+        drawPastOverlayWithPoint(it, layoutDirection, args)
     }
 }
-Original file line number
+Diff line change
@@ Expand Up / @@ -149,7 +149,7 @@ private fun DrawScope.drawHorizontalAxisAndPlot( @@
             )
         }
         nowCenter?.let {
-            drawPastOverlayWithPoint(it, args)
+            drawPastOverlayWithPoint(nowCenter = it, args = args)
         }
     }
@@ Expand Down @@