Merge pull request #81 from SELab1/sessionscreen_ui

Sessionscreen UI

app/src/main/java/be/ugent/sel/studeez/data/local/models/timer_functional/FunctionalCustomTimer.kt

@@ -11,6 +11,11 @@ class FunctionalCustomTimer(studyTime: Int) : FunctionalTimer(studyTime) {
     }
 
     override fun hasEnded(): Boolean {
+        return view == StudyState.DONE
+    }
+
+    override fun hasCurrentCountdownEnded(): Boolean {
         return time.time == 0
     }
+
 }

app/src/main/java/be/ugent/sel/studeez/data/local/models/timer_functional/FunctionalEndlessTimer.kt

@@ -6,6 +6,10 @@ class FunctionalEndlessTimer() : FunctionalTimer(0) {
         return false
     }
 
+    override fun hasCurrentCountdownEnded(): Boolean {
+        return false
+    }
+
     override fun tick() {
         time.plusOne()
     }

app/src/main/java/be/ugent/sel/studeez/data/local/models/timer_functional/FunctionalPomodoroTimer.kt

@@ -31,4 +31,8 @@ class FunctionalPomodoroTimer(
     override fun hasEnded(): Boolean {
         return breaksRemaining == 0 && time.time == 0
     }
+
+    override fun hasCurrentCountdownEnded(): Boolean {
+        return time.time == 0
+    }
 }

app/src/main/java/be/ugent/sel/studeez/data/local/models/timer_functional/FunctionalTimer.kt

@@ -12,6 +12,8 @@ abstract class FunctionalTimer(initialValue: Int) {
 
     abstract fun hasEnded(): Boolean
 
+    abstract fun hasCurrentCountdownEnded(): Boolean
+
     enum class StudyState {
         FOCUS, DONE, BREAK, FOCUS_REMAINING
     }