diff --git a/app/src/main/kotlin/com/simplemobiletools/calendar/pro/activities/MainActivity.kt b/app/src/main/kotlin/com/simplemobiletools/calendar/pro/activities/MainActivity.kt
index c05a973bc..d41d392da 100644
--- a/app/src/main/kotlin/com/simplemobiletools/calendar/pro/activities/MainActivity.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/calendar/pro/activities/MainActivity.kt
@@ -81,6 +81,7 @@ class MainActivity : SimpleActivity(), RefreshRecyclerViewListener {
private var mStoredUse24HourFormat = false
private var mStoredDimPastEvents = true
private var mStoredHighlightWeekends = false
+ private var mStoredStartWeeklyViewWithCurrentDate = false
override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState)
@@ -122,7 +123,7 @@ class MainActivity : SimpleActivity(), RefreshRecyclerViewListener {
}
if (!config.wasUpgradedFromFreeShown && isPackageInstalled("com.simplemobiletools.calendar")) {
- ConfirmationDialog(this, "", R.string.upgraded_from_free, R.string.ok, 0, false) {}
+ ConfirmationDialog(this, "", R.string.upgraded_from_free, R.string.ok, 0) {}
config.wasUpgradedFromFreeShown = true
}
}
@@ -143,7 +144,8 @@ class MainActivity : SimpleActivity(), RefreshRecyclerViewListener {
}
if (config.storedView == WEEKLY_VIEW) {
- if (mStoredIsSundayFirst != config.isSundayFirst || mStoredUse24HourFormat != config.use24HourFormat || mStoredMidnightSpan != config.showMidnightSpanningEventsAtTop) {
+ if (mStoredIsSundayFirst != config.isSundayFirst || mStoredUse24HourFormat != config.use24HourFormat
+ || mStoredMidnightSpan != config.showMidnightSpanningEventsAtTop || mStoredStartWeeklyViewWithCurrentDate != config.startWeeklyViewWithCurrentDate) {
updateViewPager()
}
}
@@ -258,6 +260,7 @@ class MainActivity : SimpleActivity(), RefreshRecyclerViewListener {
mStoredDimPastEvents = dimPastEvents
mStoredHighlightWeekends = highlightWeekends
mStoredMidnightSpan = showMidnightSpanningEventsAtTop
+ mStoredStartWeeklyViewWithCurrentDate = startWeeklyViewWithCurrentDate
}
mStoredAdjustedPrimaryColor = getAdjustedPrimaryColor()
mStoredDayCode = Formatter.getTodayCode()
@@ -816,15 +819,19 @@ class MainActivity : SimpleActivity(), RefreshRecyclerViewListener {
}
private fun getThisWeekDateTime(): String {
- val currentOffsetHours = TimeZone.getDefault().rawOffset / 1000 / 60 / 60
+ return if(! config.startWeeklyViewWithCurrentDate) {
+ val currentOffsetHours = TimeZone.getDefault().rawOffset / 1000 / 60 / 60
- // not great, not terrible
- val useHours = if (currentOffsetHours >= 10) 8 else 12
- var thisweek = DateTime().withZone(DateTimeZone.UTC).withDayOfWeek(1).withHourOfDay(useHours).minusDays(if (config.isSundayFirst) 1 else 0)
- if (DateTime().minusDays(7).seconds() > thisweek.seconds()) {
- thisweek = thisweek.plusDays(7)
+ // not great, not terrible
+ val useHours = if (currentOffsetHours >= 10) 8 else 12
+ var thisweek = DateTime().withZone(DateTimeZone.UTC).withDayOfWeek(1).withHourOfDay(useHours).minusDays(if (config.isSundayFirst) 1 else 0)
+ if (DateTime().minusDays(7).seconds() > thisweek.seconds()) {
+ thisweek = thisweek.plusDays(7)
+ }
+ thisweek.toString()
+ } else {
+ DateTime().withZone(DateTimeZone.UTC).toString()
}
- return thisweek.toString()
}
private fun getFragmentsHolder() = when (config.storedView) {
diff --git a/app/src/main/kotlin/com/simplemobiletools/calendar/pro/activities/SettingsActivity.kt b/app/src/main/kotlin/com/simplemobiletools/calendar/pro/activities/SettingsActivity.kt
index 0d343cb8e..48adfb591 100644
--- a/app/src/main/kotlin/com/simplemobiletools/calendar/pro/activities/SettingsActivity.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/calendar/pro/activities/SettingsActivity.kt
@@ -58,6 +58,7 @@ class SettingsActivity : SimpleActivity() {
setupWeeklyStart()
setupMidnightSpanEvents()
setupAllowCustomiseDayCount()
+ setupStartWeeklyViewWithCurrentDate()
setupVibrate()
setupReminderSound()
setupReminderAudioStream()
@@ -358,6 +359,13 @@ class SettingsActivity : SimpleActivity() {
}
}
+ private fun setupStartWeeklyViewWithCurrentDate() {
+ settings_start_weekly_view_with_current_date.isChecked = config.startWeeklyViewWithCurrentDate
+ settings_start_weekly_view_with_current_date.setOnClickListener {
+ config.startWeeklyViewWithCurrentDate = settings_start_weekly_view_with_current_date.isChecked
+ }
+ }
+
private fun setupWeekNumbers() {
settings_week_numbers.isChecked = config.showWeekNumbers
settings_week_numbers_holder.setOnClickListener {
diff --git a/app/src/main/kotlin/com/simplemobiletools/calendar/pro/helpers/Config.kt b/app/src/main/kotlin/com/simplemobiletools/calendar/pro/helpers/Config.kt
index 0f882145c..7633ed0ec 100644
--- a/app/src/main/kotlin/com/simplemobiletools/calendar/pro/helpers/Config.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/calendar/pro/helpers/Config.kt
@@ -23,6 +23,10 @@ class Config(context: Context) : BaseConfig(context) {
get() = prefs.getInt(START_WEEKLY_AT, 7)
set(startWeeklyAt) = prefs.edit().putInt(START_WEEKLY_AT, startWeeklyAt).apply()
+ var startWeeklyViewWithCurrentDate: Boolean
+ get() = prefs.getBoolean(START_WEEKLY_VIEW_WITH_CURRENT_DATE, false)
+ set(startWeeklyViewWithCurrentDate) = prefs.edit().putBoolean(START_WEEKLY_VIEW_WITH_CURRENT_DATE, startWeeklyViewWithCurrentDate).apply()
+
var showMidnightSpanningEventsAtTop: Boolean
get() = prefs.getBoolean(SHOW_MIDNIGHT_SPANNING_EVENTS_AT_TOP, true)
set(midnightSpanning) = prefs.edit().putBoolean(SHOW_MIDNIGHT_SPANNING_EVENTS_AT_TOP, midnightSpanning).apply()
diff --git a/app/src/main/kotlin/com/simplemobiletools/calendar/pro/helpers/Constants.kt b/app/src/main/kotlin/com/simplemobiletools/calendar/pro/helpers/Constants.kt
index 9e3d612be..b58e38bb0 100644
--- a/app/src/main/kotlin/com/simplemobiletools/calendar/pro/helpers/Constants.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/calendar/pro/helpers/Constants.kt
@@ -45,6 +45,7 @@ const val YEAR = 31536000
// Shared Preferences
const val WEEK_NUMBERS = "week_numbers"
const val START_WEEKLY_AT = "start_weekly_at"
+const val START_WEEKLY_VIEW_WITH_CURRENT_DATE = "start_weekly_with_current_date"
const val SHOW_MIDNIGHT_SPANNING_EVENTS_AT_TOP = "show_midnight_spanning_events_at_top"
const val ALLOW_CUSTOMIZE_DAY_COUNT = "allow_customise_day_count"
const val VIBRATE = "vibrate"
diff --git a/app/src/main/res/layout/activity_settings.xml b/app/src/main/res/layout/activity_settings.xml
index 6aa354db3..8377c3100 100644
--- a/app/src/main/res/layout/activity_settings.xml
+++ b/app/src/main/res/layout/activity_settings.xml
@@ -744,6 +744,28 @@
+
+
+
+
+
+
أسبوع
+ Start week with the current day
أنواع الأحداث
diff --git a/app/src/main/res/values-az/strings.xml b/app/src/main/res/values-az/strings.xml
index 35617f858..5f2856202 100644
--- a/app/src/main/res/values-az/strings.xml
+++ b/app/src/main/res/values-az/strings.xml
@@ -135,6 +135,7 @@
Həftə
+ Start week with the current day
Hadisə tipləri
diff --git a/app/src/main/res/values-bn/strings.xml b/app/src/main/res/values-bn/strings.xml
index c3de6da7b..f0f8aef11 100644
--- a/app/src/main/res/values-bn/strings.xml
+++ b/app/src/main/res/values-bn/strings.xml
@@ -139,6 +139,7 @@
সপ্তাহ
+ Start week with the current day
ইভেন্ট টাইপগুলি
diff --git a/app/src/main/res/values-br/strings.xml b/app/src/main/res/values-br/strings.xml
index 3997e1813..27e1b2015 100644
--- a/app/src/main/res/values-br/strings.xml
+++ b/app/src/main/res/values-br/strings.xml
@@ -135,6 +135,7 @@
Sizhun
+ Start week with the current day
Doareoù an darvoud
diff --git a/app/src/main/res/values-cs/strings.xml b/app/src/main/res/values-cs/strings.xml
index d5f0a7640..fc8a992bd 100644
--- a/app/src/main/res/values-cs/strings.xml
+++ b/app/src/main/res/values-cs/strings.xml
@@ -135,6 +135,7 @@
Týden
+ Start week with the current day
Typy událostí
diff --git a/app/src/main/res/values-da/strings.xml b/app/src/main/res/values-da/strings.xml
index 37696698c..27c380db1 100644
--- a/app/src/main/res/values-da/strings.xml
+++ b/app/src/main/res/values-da/strings.xml
@@ -135,6 +135,7 @@
Uge
+ Start week with the current day
Begivenhedstyper
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index 853850aba..8132bf011 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -135,6 +135,7 @@
Woche
+ Start week with the current day
Termintypen
diff --git a/app/src/main/res/values-el/strings.xml b/app/src/main/res/values-el/strings.xml
index 54a1c04a6..306834d7a 100644
--- a/app/src/main/res/values-el/strings.xml
+++ b/app/src/main/res/values-el/strings.xml
@@ -135,6 +135,7 @@
Εβδομάδα
+ Start week with the current day
Τύποι εκδηλώσεων
diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml
index 98383c8de..fb3416514 100644
--- a/app/src/main/res/values-es/strings.xml
+++ b/app/src/main/res/values-es/strings.xml
@@ -135,6 +135,7 @@
Semana
+ Start week with the current day
Tipos de eventos
diff --git a/app/src/main/res/values-eu/strings.xml b/app/src/main/res/values-eu/strings.xml
index af246e57c..43b3e22b1 100644
--- a/app/src/main/res/values-eu/strings.xml
+++ b/app/src/main/res/values-eu/strings.xml
@@ -135,6 +135,7 @@
Astea
+ Start week with the current day
Gertaera motak
diff --git a/app/src/main/res/values-fi/strings.xml b/app/src/main/res/values-fi/strings.xml
index a2c8b30b4..e63b48b4a 100644
--- a/app/src/main/res/values-fi/strings.xml
+++ b/app/src/main/res/values-fi/strings.xml
@@ -135,6 +135,7 @@
Viikko
+ Start week with the current day
Tapahtuma tyypit
diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
index 5394e377e..66345fa02 100644
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -136,6 +136,7 @@
Semaine
+ Start week with the current day
Type d\’événement
diff --git a/app/src/main/res/values-gl/strings.xml b/app/src/main/res/values-gl/strings.xml
index 36c01e1db..ee837995c 100644
--- a/app/src/main/res/values-gl/strings.xml
+++ b/app/src/main/res/values-gl/strings.xml
@@ -135,6 +135,7 @@
Semana
+ Start week with the current day
Tipos de eventos
diff --git a/app/src/main/res/values-he/strings.xml b/app/src/main/res/values-he/strings.xml
index 6ef7fefc4..e1480bddf 100644
--- a/app/src/main/res/values-he/strings.xml
+++ b/app/src/main/res/values-he/strings.xml
@@ -135,6 +135,7 @@
שבוע
+ Start week with the current day
סוגי אירוע
diff --git a/app/src/main/res/values-hi-rIN/strings.xml b/app/src/main/res/values-hi-rIN/strings.xml
index 6ebe70729..048f07b0c 100644
--- a/app/src/main/res/values-hi-rIN/strings.xml
+++ b/app/src/main/res/values-hi-rIN/strings.xml
@@ -135,6 +135,7 @@
Week
+ Start week with the current day
Event types
diff --git a/app/src/main/res/values-hr/strings.xml b/app/src/main/res/values-hr/strings.xml
index 80ed7be2e..d901c63cb 100644
--- a/app/src/main/res/values-hr/strings.xml
+++ b/app/src/main/res/values-hr/strings.xml
@@ -135,6 +135,7 @@
Tjedan
+ Start week with the current day
Vrste događaja
diff --git a/app/src/main/res/values-hu/strings.xml b/app/src/main/res/values-hu/strings.xml
index 494551d8b..1c7f44194 100644
--- a/app/src/main/res/values-hu/strings.xml
+++ b/app/src/main/res/values-hu/strings.xml
@@ -135,6 +135,7 @@
Week
+ Start week with the current day
Event types
diff --git a/app/src/main/res/values-id/strings.xml b/app/src/main/res/values-id/strings.xml
index 0369e219c..c51cdee32 100644
--- a/app/src/main/res/values-id/strings.xml
+++ b/app/src/main/res/values-id/strings.xml
@@ -135,6 +135,7 @@
Minggu
+ Start week with the current day
Kategori acara
diff --git a/app/src/main/res/values-in/strings.xml b/app/src/main/res/values-in/strings.xml
index 0369e219c..c51cdee32 100644
--- a/app/src/main/res/values-in/strings.xml
+++ b/app/src/main/res/values-in/strings.xml
@@ -135,6 +135,7 @@
Minggu
+ Start week with the current day
Kategori acara
diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml
index eb796210e..c09f7fbb9 100644
--- a/app/src/main/res/values-it/strings.xml
+++ b/app/src/main/res/values-it/strings.xml
@@ -135,6 +135,7 @@
Settimana
+ Start week with the current day
Tipi di evento
diff --git a/app/src/main/res/values-iw/strings.xml b/app/src/main/res/values-iw/strings.xml
index ef7a52e68..8261c0ad7 100644
--- a/app/src/main/res/values-iw/strings.xml
+++ b/app/src/main/res/values-iw/strings.xml
@@ -135,6 +135,7 @@
שבוע
+ Start week with the current day
סוגי אירוע
diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml
index a6842d5d9..d5b7479a3 100644
--- a/app/src/main/res/values-ja/strings.xml
+++ b/app/src/main/res/values-ja/strings.xml
@@ -135,6 +135,7 @@
週
+ Start week with the current day
予定の種類
diff --git a/app/src/main/res/values-ko/strings.xml b/app/src/main/res/values-ko/strings.xml
index 161fe413b..ab62b39de 100644
--- a/app/src/main/res/values-ko/strings.xml
+++ b/app/src/main/res/values-ko/strings.xml
@@ -135,6 +135,7 @@
주
+ Start week with the current day
일정 유형
diff --git a/app/src/main/res/values-lt/strings.xml b/app/src/main/res/values-lt/strings.xml
index d2ab37607..5ae8fc8c2 100644
--- a/app/src/main/res/values-lt/strings.xml
+++ b/app/src/main/res/values-lt/strings.xml
@@ -135,6 +135,7 @@
Savaitė
+ Start week with the current day
Įvykių tipai
diff --git a/app/src/main/res/values-lv/strings.xml b/app/src/main/res/values-lv/strings.xml
index b214e111e..325422dfc 100644
--- a/app/src/main/res/values-lv/strings.xml
+++ b/app/src/main/res/values-lv/strings.xml
@@ -135,6 +135,7 @@
Nedēļa
+ Start week with the current day
Notikumu tipi
diff --git a/app/src/main/res/values-nb/strings.xml b/app/src/main/res/values-nb/strings.xml
index c8a236628..cef32c481 100644
--- a/app/src/main/res/values-nb/strings.xml
+++ b/app/src/main/res/values-nb/strings.xml
@@ -135,6 +135,7 @@
Uke
+ Start week with the current day
Hendelsestyper
diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml
index 94a5ca58a..4fcdce20d 100644
--- a/app/src/main/res/values-nl/strings.xml
+++ b/app/src/main/res/values-nl/strings.xml
@@ -135,6 +135,7 @@
Week
+ Start week with the current day
Afspraaktypes
diff --git a/app/src/main/res/values-no/strings.xml b/app/src/main/res/values-no/strings.xml
index a88e1b2b2..e2237b470 100644
--- a/app/src/main/res/values-no/strings.xml
+++ b/app/src/main/res/values-no/strings.xml
@@ -135,6 +135,7 @@
Uke
+ Start week with the current day
Hendelsestyper
diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml
index 4b6011e0b..befb3f2b2 100644
--- a/app/src/main/res/values-pl/strings.xml
+++ b/app/src/main/res/values-pl/strings.xml
@@ -135,6 +135,7 @@
Tydzień
+ Start week with the current day
Typy wydarzeń
diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml
index 521391404..195cb383d 100644
--- a/app/src/main/res/values-pt-rBR/strings.xml
+++ b/app/src/main/res/values-pt-rBR/strings.xml
@@ -135,6 +135,7 @@
Semana
+ Start week with the current day
Tipos de evento
diff --git a/app/src/main/res/values-pt/strings.xml b/app/src/main/res/values-pt/strings.xml
index 570780961..fdd0ecf4f 100644
--- a/app/src/main/res/values-pt/strings.xml
+++ b/app/src/main/res/values-pt/strings.xml
@@ -135,6 +135,7 @@
Semana
+ Start week with the current day
Tipos de eventos
diff --git a/app/src/main/res/values-ro/strings.xml b/app/src/main/res/values-ro/strings.xml
index 8adb4bcb8..6bd8e1b31 100644
--- a/app/src/main/res/values-ro/strings.xml
+++ b/app/src/main/res/values-ro/strings.xml
@@ -135,6 +135,7 @@
Săptămână
+ Start week with the current day
Tipuri de eveniment
diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml
index 9ebeaf29d..c647fb20e 100644
--- a/app/src/main/res/values-ru/strings.xml
+++ b/app/src/main/res/values-ru/strings.xml
@@ -135,6 +135,7 @@
Неделя
+ Start week with the current day
Типы событий
diff --git a/app/src/main/res/values-sk/strings.xml b/app/src/main/res/values-sk/strings.xml
index cbff8206c..3fa79bae2 100644
--- a/app/src/main/res/values-sk/strings.xml
+++ b/app/src/main/res/values-sk/strings.xml
@@ -135,6 +135,7 @@
Týždeň
+ Start week with the current day
Typy udalostí
diff --git a/app/src/main/res/values-sv/strings.xml b/app/src/main/res/values-sv/strings.xml
index 71bf4a5cb..5f39d021e 100644
--- a/app/src/main/res/values-sv/strings.xml
+++ b/app/src/main/res/values-sv/strings.xml
@@ -135,6 +135,7 @@
Vecka
+ Start week with the current day
Händelsetyper
diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml
index 6fbb30bb1..571d03577 100644
--- a/app/src/main/res/values-tr/strings.xml
+++ b/app/src/main/res/values-tr/strings.xml
@@ -135,6 +135,7 @@
Hafta
+ Start week with the current day
Etkinlik türleri
diff --git a/app/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml
index 72caccd0a..fbda9552f 100644
--- a/app/src/main/res/values-uk/strings.xml
+++ b/app/src/main/res/values-uk/strings.xml
@@ -135,6 +135,7 @@
Тиждень
+ Start week with the current day
Типи подій
diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml
index ad51f3408..314e9fe99 100644
--- a/app/src/main/res/values-zh-rCN/strings.xml
+++ b/app/src/main/res/values-zh-rCN/strings.xml
@@ -135,6 +135,7 @@
周数
+ Start week with the current day
活动类型
diff --git a/app/src/main/res/values-zh-rHK/strings.xml b/app/src/main/res/values-zh-rHK/strings.xml
index ae16a5580..6e49c46ce 100644
--- a/app/src/main/res/values-zh-rHK/strings.xml
+++ b/app/src/main/res/values-zh-rHK/strings.xml
@@ -135,6 +135,7 @@
週數
+ Start week with the current day
活動類型
diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml
index 1d8feadc0..6dccb3df7 100644
--- a/app/src/main/res/values-zh-rTW/strings.xml
+++ b/app/src/main/res/values-zh-rTW/strings.xml
@@ -135,6 +135,7 @@
週數
+ Start week with the current day
活動類型
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index c847b6ba9..f99c23610 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -135,6 +135,7 @@
Week
+ Start week with the current day
Event types