fix: convert to local date before passing current date to the next view (#869)

* fix: convert to local date before passing current date to the next view


* docs: update changelog

Refs: #45

Author: naveensingh

CHANGELOG.md

@@ -8,6 +8,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Changed
 - Updated holiday data
 
+### Fixed
+- Fixed incorrect weekly view start date in some cases ([#45])
+
 ## [1.8.0] - 2025-10-29
 ### Changed
 - Compatibility updates for Android 15 & 16
@@ -150,6 +153,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Initial release
 
 [#34]: https://github.com/FossifyOrg/Calendar/issues/34
+[#45]: https://github.com/FossifyOrg/Calendar/issues/45
 [#49]: https://github.com/FossifyOrg/Calendar/issues/49
 [#135]: https://github.com/FossifyOrg/Calendar/issues/135
 [#138]: https://github.com/FossifyOrg/Calendar/issues/138

app/src/main/kotlin/org/fossify/calendar/activities/MainActivity.kt

@@ -51,6 +51,7 @@ import org.fossify.calendar.helpers.FETCH_INTERVAL
 import org.fossify.calendar.helpers.FLAG_ALL_DAY
 import org.fossify.calendar.helpers.FLAG_MISSING_YEAR
 import org.fossify.calendar.helpers.Formatter
+import org.fossify.calendar.helpers.Formatter.DAYCODE_PATTERN
 import org.fossify.calendar.helpers.HOLIDAY_EVENT
 import org.fossify.calendar.helpers.HolidayHelper
 import org.fossify.calendar.helpers.INITIAL_EVENTS
@@ -1047,8 +1048,14 @@ class MainActivity : SimpleActivity(), RefreshRecyclerViewListener {
     }
 
     private fun fixDayCode(dayCode: String? = null): String? = when {
-        config.storedView == WEEKLY_VIEW && (dayCode?.length == Formatter.DAYCODE_PATTERN.length) -> getFirstDayOfWeek(Formatter.getDateTimeFromCode(dayCode))
-        config.storedView == YEARLY_VIEW && (dayCode?.length == Formatter.DAYCODE_PATTERN.length) -> Formatter.getYearFromDayCode(dayCode)
+        config.storedView == WEEKLY_VIEW && (dayCode?.length == DAYCODE_PATTERN.length) -> {
+            getFirstDayOfWeek(Formatter.getLocalDateTimeFromCode(dayCode))
+        }
+
+        config.storedView == YEARLY_VIEW && (dayCode?.length == DAYCODE_PATTERN.length) -> {
+            Formatter.getYearFromDayCode(dayCode)
+        }
+
         else -> dayCode
     }
 

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

@@ -139,7 +139,7 @@ class DayFragmentsHolder : MyFragmentHolder(), NavigationListener {
 
     override fun getCurrentDate(): DateTime? {
         return if (currentDayCode != "") {
-            Formatter.getDateTimeFromCode(currentDayCode)
+            Formatter.getLocalDateTimeFromCode(currentDayCode)
         } else {
             null
         }

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

@@ -145,7 +145,7 @@ class MonthDayFragmentsHolder : MyFragmentHolder(), NavigationListener {
 
     override fun getCurrentDate(): DateTime? {
         return if (currentDayCode != "") {
-            DateTime(Formatter.getDateTimeFromCode(currentDayCode).toString())
+            Formatter.getLocalDateTimeFromCode(currentDayCode)
         } else {
             null
         }

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

@@ -144,7 +144,7 @@ class MonthFragmentsHolder : MyFragmentHolder(), NavigationListener {
 
     override fun getCurrentDate(): DateTime? {
         return if (currentDayCode != "") {
-            DateTime(Formatter.getDateTimeFromCode(currentDayCode).toString())
+            Formatter.getLocalDateTimeFromCode(currentDayCode)
         } else {
             null
         }