fix: rework current time indicator (#1294)

Refs: #99

Author: naveensingh

CHANGELOG.md

@@ -11,6 +11,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Changed
 - Updated holiday data
+- Updated current time indicator in weekly view
 
 ### Fixed
 - Fixed CalDAV sync not consistently working on Android 11+ ([#656])

app/src/main/kotlin/org/fossify/calendar/fragments/WeekFragment.kt

@@ -16,7 +16,6 @@ import android.view.MotionEvent
 import android.view.ScaleGestureDetector
 import android.view.View
 import android.view.ViewGroup
-import android.widget.ImageView
 import android.widget.RelativeLayout
 import androidx.collection.LongSparseArray
 import androidx.fragment.app.Fragment
@@ -61,6 +60,7 @@ import org.fossify.calendar.interfaces.WeekFragmentListener
 import org.fossify.calendar.interfaces.WeeklyCalendar
 import org.fossify.calendar.models.Event
 import org.fossify.calendar.models.EventWeeklyView
+import org.fossify.calendar.views.CurrentTimeIndicatorView
 import org.fossify.calendar.views.MyScrollView
 import org.fossify.commons.dialogs.RadioGroupDialog
 import org.fossify.commons.extensions.adjustAlpha
@@ -72,6 +72,7 @@ import org.fossify.commons.extensions.getContrastColor
 import org.fossify.commons.extensions.getProperPrimaryColor
 import org.fossify.commons.extensions.getProperTextColor
 import org.fossify.commons.extensions.hideKeyboard
+import org.fossify.commons.extensions.isRTLLayout
 import org.fossify.commons.extensions.onGlobalLayout
 import org.fossify.commons.extensions.realScreenSize
 import org.fossify.commons.extensions.removeBit
@@ -123,7 +124,7 @@ class WeekFragment : Fragment(), WeeklyCalendar {
     private var wasScaled = false
     private var isPrintVersion = false
     private var selectedGrid: View? = null
-    private var currentTimeView: ImageView? = null
+    private var currentTimeView: CurrentTimeIndicatorView? = null
     private var fadeOutHandler = Handler()
     private var allDayHolders = ArrayList<RelativeLayout>()
     private var allDayRows = ArrayList<HashSet<Int>>()
@@ -863,43 +864,45 @@ class WeekFragment : Fragment(), WeeklyCalendar {
     }
 
     private fun addCurrentTimeIndicator() {
-        if (todayColumnIndex != -1) {
-            val calendar = Calendar.getInstance()
-            val minutes = calendar.get(Calendar.HOUR_OF_DAY) * 60 + calendar.get(Calendar.MINUTE)
-            if (todayColumnIndex >= dayColumns.size) {
-                currentTimeView?.alpha = 0f
-                return
-            }
-
-            if (currentTimeView != null) {
-                binding.weekEventsHolder.removeView(currentTimeView)
-            }
+        if (todayColumnIndex == -1) {
+            return
+        }
 
-            if (isPrintVersion) {
-                return
-            }
+        val calendar = Calendar.getInstance()
+        val minutes = calendar.get(Calendar.HOUR_OF_DAY) * 60 + calendar.get(Calendar.MINUTE)
+        if (todayColumnIndex >= dayColumns.size) {
+            currentTimeView?.alpha = 0f
+            return
+        }
 
-            val weeklyViewDays = config.weeklyViewDays
-            currentTimeView = WeekNowMarkerBinding.inflate(layoutInflater).root.apply {
-                applyColorFilter(primaryColor)
-                binding.weekEventsHolder.addView(this)
-                val extraWidth =
-                    res.getDimension(org.fossify.commons.R.dimen.activity_margin).toInt()
-                val markerHeight = res.getDimension(R.dimen.weekly_view_now_height).toInt()
-                val minuteHeight = rowHeight / 60
-                (layoutParams as RelativeLayout.LayoutParams).apply {
-                    width = (binding.root.width / weeklyViewDays) + extraWidth
-                    height = markerHeight
-                }
+        if (currentTimeView != null) {
+            binding.weekEventsHolder.removeView(currentTimeView)
+        }
 
-                x = if (weeklyViewDays == 1) {
-                    0f
-                } else {
-                    (binding.root.width / weeklyViewDays * todayColumnIndex).toFloat() - extraWidth / 2f
-                }
+        if (isPrintVersion) {
+            return
+        }
 
-                y = minutes * minuteHeight - markerHeight / 2
+        currentTimeView = WeekNowMarkerBinding.inflate(layoutInflater).root.apply {
+            binding.weekEventsHolder.addView(this)
+            val todayColumn = dayColumns[todayColumnIndex]
+            val dotSize = res.getDimension(R.dimen.weekly_view_now_dot_size)
+            val dotRadius = dotSize / 2f
+            val isRtl = requireContext().isRTLLayout
+            val leftOverflow = if (isRtl) dotRadius else dotSize
+            val rightOverflow = if (isRtl) dotSize else dotRadius
+            val markerLeft = (todayColumn.left - leftOverflow).coerceAtLeast(0f)
+            val markerRight = (todayColumn.right + rightOverflow).coerceAtMost(binding.weekEventsHolder.width.toFloat())
+            val markerHeight = res.getDimensionPixelSize(R.dimen.weekly_view_now_height)
+            val minuteHeight = rowHeight / 60
+            (layoutParams as RelativeLayout.LayoutParams).apply {
+                addRule(RelativeLayout.ALIGN_PARENT_LEFT)
+                width = (markerRight - markerLeft).roundToInt()
+                height = markerHeight
             }
+
+            x = markerLeft
+            y = minutes * minuteHeight - markerHeight / 2
         }
     }
 

app/src/main/kotlin/org/fossify/calendar/views/CurrentTimeIndicatorView.kt

@@ -0,0 +1,38 @@
+package org.fossify.calendar.views
+
+import android.content.Context
+import android.graphics.Canvas
+import android.graphics.Paint
+import android.util.AttributeSet
+import android.view.View
+import org.fossify.calendar.R
+import org.fossify.commons.extensions.getProperTextColor
+
+class CurrentTimeIndicatorView(context: Context, attrs: AttributeSet, defStyle: Int) : View(context, attrs, defStyle) {
+    companion object {
+        private const val LINE_WIDTH_DP = 1.5f
+        private const val DOT_OVERLAP_DP = 1f
+    }
+
+    private val density = resources.displayMetrics.density
+    private val paint = Paint(Paint.ANTI_ALIAS_FLAG).apply {
+        color = context.getProperTextColor()
+        strokeCap = Paint.Cap.ROUND
+        strokeWidth = LINE_WIDTH_DP * density
+    }
+    private val dotRadius = resources.getDimension(R.dimen.weekly_view_now_dot_size) / 2f
+    private val dotOverlap = DOT_OVERLAP_DP * density
+
+    constructor(context: Context, attrs: AttributeSet) : this(context, attrs, 0)
+
+    override fun onDraw(canvas: Canvas) {
+        super.onDraw(canvas)
+        val centerY = height / 2f
+        val isRtl = layoutDirection == LAYOUT_DIRECTION_RTL
+        val dotCenterX = if (isRtl) width - dotRadius - dotOverlap else dotRadius + dotOverlap
+        val lineEndX = if (isRtl) 0f else width.toFloat()
+
+        canvas.drawLine(dotCenterX, centerY, lineEndX, centerY, paint)
+        canvas.drawCircle(dotCenterX, centerY, dotRadius, paint)
+    }
+}

app/src/main/res/drawable-hdpi/weekly_now.9.png

@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<ImageView xmlns:android="http://schemas.android.com/apk/res/android"
+<org.fossify.calendar.views.CurrentTimeIndicatorView xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:scaleType="fitXY"
-    android:src="@drawable/weekly_now" />
+    android:importantForAccessibility="no" />

app/src/main/res/drawable-xhdpi/weekly_now.9.png

@@ -11,7 +11,8 @@
 
     <dimen name="weekly_view_row_height">60dp</dimen>
     <dimen name="weekly_view_minimal_event_height">10dp</dimen>
-    <dimen name="weekly_view_now_height">10dp</dimen>
+    <dimen name="weekly_view_now_height">12dp</dimen>
+    <dimen name="weekly_view_now_dot_size">10dp</dimen>
     <dimen name="weekly_view_min_day_label">50dp</dimen>
 
     <dimen name="min_widget_width">250dp</dimen>