Revert "Show tentative events as dimmed (same as past events can be s…

…hown) in event list, day, week and month view" This reverts commit c4f583d.
FossifyOrg · Nov 14, 2024 · ec9ebf8 · ec9ebf8
1 parent 3d32bc3
commit ec9ebf8
Show file tree

Hide file tree

Showing 9 changed files with 10 additions and 21 deletions.
diff --git a/app/src/main/kotlin/org/fossify/calendar/adapters/DayEventsAdapter.kt b/app/src/main/kotlin/org/fossify/calendar/adapters/DayEventsAdapter.kt
@@ -117,7 +117,7 @@ class DayEventsAdapter(activity: SimpleActivity, val events: ArrayList<Event>, r
             val adjustAlpha = if (event.isTask()) {
                 dimCompletedTasks && event.isTaskCompleted()
             } else {
-                ((dimPastEvents && event.isPastEvent) || event.isEventTentative()) && !isPrintVersion
+                dimPastEvents && event.isPastEvent && !isPrintVersion
             }
 
             if (adjustAlpha) {

diff --git a/app/src/main/kotlin/org/fossify/calendar/adapters/EventListAdapter.kt b/app/src/main/kotlin/org/fossify/calendar/adapters/EventListAdapter.kt
@@ -163,7 +163,7 @@ class EventListAdapter(
                 val adjustAlpha = if (listEvent.isTask) {
                     dimCompletedTasks && listEvent.isTaskCompleted
                 } else {
-                    ((dimPastEvents && listEvent.isPastEvent) || listEvent.isEventTentative) && !isPrintVersion
+                    dimPastEvents && listEvent.isPastEvent && !isPrintVersion
                 }
                 if (adjustAlpha) {
                     newTextColor = newTextColor.adjustAlpha(MEDIUM_ALPHA)

diff --git a/app/src/main/kotlin/org/fossify/calendar/adapters/EventListWidgetAdapter.kt b/app/src/main/kotlin/org/fossify/calendar/adapters/EventListWidgetAdapter.kt
@@ -238,8 +238,7 @@ class EventListWidgetAdapter(val context: Context, val intent: Intent) : RemoteV
                     isTask = event.isTask(),
                     isTaskCompleted = event.isTaskCompleted(),
                     isAttendeeInviteDeclined = event.isAttendeeInviteDeclined(),
-                    isEventCanceled = event.isEventCanceled(),
-                    isEventTentative = event.isEventTentative()
+                    isEventCanceled = event.isEventCanceled()
                 )
                 listItems.add(listEvent)
             }

diff --git a/app/src/main/kotlin/org/fossify/calendar/extensions/Context.kt b/app/src/main/kotlin/org/fossify/calendar/extensions/Context.kt
@@ -676,8 +676,7 @@ fun Context.getEventListItems(events: List<Event>, addSectionDays: Boolean = tru
                 it.isTask(),
                 it.isTaskCompleted(),
                 it.isAttendeeInviteDeclined(),
-                it.isEventCanceled(),
-                it.isEventTentative()
+                it.isEventCanceled()
             )
         listItems.add(listEvent)
     }

diff --git a/app/src/main/kotlin/org/fossify/calendar/fragments/WeekFragment.kt b/app/src/main/kotlin/org/fossify/calendar/fragments/WeekFragment.kt
@@ -617,7 +617,7 @@ class WeekFragment : Fragment(), WeeklyCalendar {
                         val adjustAlpha = if (event.isTask()) {
                             dimCompletedTasks && event.isTaskCompleted()
                         } else {
-                            ((dimPastEvents && event.isPastEvent) || event.isEventTentative()) && !isPrintVersion
+                            dimPastEvents && event.isPastEvent && !isPrintVersion
                         }
 
                         if (adjustAlpha) {
@@ -771,7 +771,7 @@ class WeekFragment : Fragment(), WeeklyCalendar {
             val adjustAlpha = if (event.isTask()) {
                 dimCompletedTasks && event.isTaskCompleted()
             } else {
-                ((dimPastEvents && event.isPastEvent) || event.isEventTentative()) && !isPrintVersion
+                dimPastEvents && event.isPastEvent && !isPrintVersion
             }
 
             if (adjustAlpha) {

diff --git a/app/src/main/kotlin/org/fossify/calendar/models/Event.kt b/app/src/main/kotlin/org/fossify/calendar/models/Event.kt
@@ -220,8 +220,4 @@ data class Event(
     fun isEventCanceled(): Boolean {
         return status == CalendarContract.Events.STATUS_CANCELED
     }
-
-    fun isEventTentative(): Boolean {
-        return status == CalendarContract.Events.STATUS_TENTATIVE
-    }
 }
diff --git a/app/src/main/kotlin/org/fossify/calendar/models/ListEvent.kt b/app/src/main/kotlin/org/fossify/calendar/models/ListEvent.kt
@@ -14,8 +14,7 @@ data class ListEvent(
     var isTask: Boolean,
     var isTaskCompleted: Boolean,
     var isAttendeeInviteDeclined: Boolean,
-    var isEventCanceled: Boolean,
-    var isEventTentative: Boolean
+    var isEventCanceled: Boolean
 ) : ListItem() {
 
     companion object {
@@ -33,8 +32,7 @@ data class ListEvent(
             isTask = false,
             isTaskCompleted = false,
             isAttendeeInviteDeclined = false,
-            isEventCanceled = false,
-            isEventTentative = false
+            isEventCanceled = false
         )
     }
 }
diff --git a/app/src/main/kotlin/org/fossify/calendar/models/MonthViewEvent.kt b/app/src/main/kotlin/org/fossify/calendar/models/MonthViewEvent.kt
@@ -14,6 +14,5 @@ data class MonthViewEvent(
     val isTask: Boolean,
     val isTaskCompleted: Boolean,
     val isAttendeeInviteDeclined: Boolean,
-    val isEventCanceled: Boolean,
-    val isEventTentative: Boolean
+    val isEventCanceled: Boolean
 )
diff --git a/app/src/main/kotlin/org/fossify/calendar/views/MonthView.kt b/app/src/main/kotlin/org/fossify/calendar/views/MonthView.kt
@@ -157,8 +157,7 @@ class MonthView(context: Context, attrs: AttributeSet, defStyle: Int) : View(con
                         isTask = event.isTask(),
                         isTaskCompleted = event.isTaskCompleted(),
                         isAttendeeInviteDeclined = event.isAttendeeInviteDeclined(),
-                        isEventCanceled = event.isEventCanceled(),
-                        isEventTentative = event.isEventTentative()
+                        isEventCanceled = event.isEventCanceled()
                     )
                     allEvents.add(monthViewEvent)
                 }
@@ -403,7 +402,6 @@ class MonthView(context: Context, attrs: AttributeSet, defStyle: Int) : View(con
         val adjustAlpha = when {
             event.isTask -> dimCompletedTasks && event.isTaskCompleted
             !startDay.isThisMonth && !endDay.isThisMonth -> true
-            event.isEventTentative -> true
             else -> dimPastEvents && event.isPastEvent && !isPrintVersion
         }