From 86e22d9439212f466b7c5c20b2b5cd8fe1527284 Mon Sep 17 00:00:00 2001
From: Kazuhiro Ito <kzhr@d1.dion.ne.jp>
Date: Thu, 25 Nov 2021 00:49:50 +0900
Subject: [PATCH] Highlight weekends in printed matter too

---
 .../org/fossify/calendar/fragments/WeekFragment.kt  | 13 +++++--------
 .../kotlin/org/fossify/calendar/views/MonthView.kt  | 11 ++++-------
 2 files changed, 9 insertions(+), 15 deletions(-)

diff --git a/app/src/main/kotlin/org/fossify/calendar/fragments/WeekFragment.kt b/app/src/main/kotlin/org/fossify/calendar/fragments/WeekFragment.kt
index 86d046778..53bcb4424 100644
--- a/app/src/main/kotlin/org/fossify/calendar/fragments/WeekFragment.kt
+++ b/app/src/main/kotlin/org/fossify/calendar/fragments/WeekFragment.kt
@@ -219,14 +219,11 @@ class WeekFragment : Fragment(), WeeklyCalendar {
             val dayLetters = res.getStringArray(labelIDs).toMutableList() as ArrayList<String>
             val dayLetter = dayLetters[curDay.dayOfWeek - 1]
 
-            val textColor = if (isPrintVersion) {
-                resources.getColor(org.fossify.commons.R.color.theme_light_text_color)
-            } else if (todayCode == dayCode) {
-                primaryColor
-            } else if (highlightWeekends && isWeekend(curDay.dayOfWeek)) {
-                config.highlightWeekendsColor
-            } else {
-                requireContext().getProperTextColor()
+            val textColor = when {
+                !isPrintVersion && todayCode == dayCode -> primaryColor
+                highlightWeekends && isWeekend(curDay.dayOfWeek) -> config.highlightWeekendsColor
+                isPrintVersion -> resources.getColor(org.fossify.commons.R.color.theme_light_text_color)
+                else -> requireContext().getProperTextColor()
             }
 
             val label = WeeklyViewDayLetterBinding.inflate(layoutInflater, binding.weekLettersHolder, false).root
diff --git a/app/src/main/kotlin/org/fossify/calendar/views/MonthView.kt b/app/src/main/kotlin/org/fossify/calendar/views/MonthView.kt
index ccdfca28c..1603bc243 100644
--- a/app/src/main/kotlin/org/fossify/calendar/views/MonthView.kt
+++ b/app/src/main/kotlin/org/fossify/calendar/views/MonthView.kt
@@ -329,13 +329,10 @@ class MonthView(context: Context, attrs: AttributeSet, defStyle: Int) : View(con
     }
 
     private fun getTextPaint(startDay: DayMonthly): Paint {
-        var paintColor = textColor
-        if (!isPrintVersion) {
-            if (startDay.isToday) {
-                paintColor = primaryColor.getContrastColor()
-            } else if (highlightWeekends && startDay.isWeekend) {
-                paintColor = weekendsTextColor
-            }
+        var paintColor = when {
+            !isPrintVersion && startDay.isToday -> primaryColor.getContrastColor()
+            highlightWeekends && startDay.isWeekend -> weekendsTextColor
+            else -> textColor
         }
 
         if (!startDay.isThisMonth) {