From e0f46d676b69a7b7c4b4239f521c9a317a2bc542 Mon Sep 17 00:00:00 2001 From: Lukas Barragan Torres Date: Wed, 3 May 2023 13:53:35 +0200 Subject: [PATCH] changed Time increase and decrease functions --- .../timer_functional/FunctionalCustomTimer.kt | 2 +- .../timer_functional/FunctionalEndlessTimer.kt | 2 +- .../timer_functional/FunctionalPomodoroTimer.kt | 2 +- .../models/timer_functional/FunctionalTimer.kt | 2 +- .../data/local/models/timer_functional/Time.kt | 16 +++++----------- 5 files changed, 9 insertions(+), 15 deletions(-) diff --git a/app/src/main/java/be/ugent/sel/studeez/data/local/models/timer_functional/FunctionalCustomTimer.kt b/app/src/main/java/be/ugent/sel/studeez/data/local/models/timer_functional/FunctionalCustomTimer.kt index 7038c7d..e049054 100644 --- a/app/src/main/java/be/ugent/sel/studeez/data/local/models/timer_functional/FunctionalCustomTimer.kt +++ b/app/src/main/java/be/ugent/sel/studeez/data/local/models/timer_functional/FunctionalCustomTimer.kt @@ -4,7 +4,7 @@ class FunctionalCustomTimer(studyTime: Int) : FunctionalTimer(studyTime) { override fun tick() { if (!hasEnded()) { - time.minOne() + time++ totalStudyTime++ } } diff --git a/app/src/main/java/be/ugent/sel/studeez/data/local/models/timer_functional/FunctionalEndlessTimer.kt b/app/src/main/java/be/ugent/sel/studeez/data/local/models/timer_functional/FunctionalEndlessTimer.kt index 41be874..51ee182 100644 --- a/app/src/main/java/be/ugent/sel/studeez/data/local/models/timer_functional/FunctionalEndlessTimer.kt +++ b/app/src/main/java/be/ugent/sel/studeez/data/local/models/timer_functional/FunctionalEndlessTimer.kt @@ -11,7 +11,7 @@ class FunctionalEndlessTimer : FunctionalTimer(0) { } override fun tick() { - time.plusOne() + time++ totalStudyTime++ } diff --git a/app/src/main/java/be/ugent/sel/studeez/data/local/models/timer_functional/FunctionalPomodoroTimer.kt b/app/src/main/java/be/ugent/sel/studeez/data/local/models/timer_functional/FunctionalPomodoroTimer.kt index 8eeb1c6..6d4f868 100644 --- a/app/src/main/java/be/ugent/sel/studeez/data/local/models/timer_functional/FunctionalPomodoroTimer.kt +++ b/app/src/main/java/be/ugent/sel/studeez/data/local/models/timer_functional/FunctionalPomodoroTimer.kt @@ -22,7 +22,7 @@ class FunctionalPomodoroTimer( } isInBreak = !isInBreak } - time.minOne() + time-- if (!isInBreak) { totalStudyTime++ diff --git a/app/src/main/java/be/ugent/sel/studeez/data/local/models/timer_functional/FunctionalTimer.kt b/app/src/main/java/be/ugent/sel/studeez/data/local/models/timer_functional/FunctionalTimer.kt index e95bbfb..1f4231a 100644 --- a/app/src/main/java/be/ugent/sel/studeez/data/local/models/timer_functional/FunctionalTimer.kt +++ b/app/src/main/java/be/ugent/sel/studeez/data/local/models/timer_functional/FunctionalTimer.kt @@ -4,7 +4,7 @@ import be.ugent.sel.studeez.data.local.models.SessionReport import com.google.firebase.Timestamp abstract class FunctionalTimer(initialValue: Int) { - val time: Time = Time(initialValue) + var time: Time = Time(initialValue) var totalStudyTime: Int = 0 fun getHoursMinutesSeconds(): HoursMinutesSeconds { diff --git a/app/src/main/java/be/ugent/sel/studeez/data/local/models/timer_functional/Time.kt b/app/src/main/java/be/ugent/sel/studeez/data/local/models/timer_functional/Time.kt index ae0d1ef..7260faa 100644 --- a/app/src/main/java/be/ugent/sel/studeez/data/local/models/timer_functional/Time.kt +++ b/app/src/main/java/be/ugent/sel/studeez/data/local/models/timer_functional/Time.kt @@ -1,19 +1,13 @@ package be.ugent.sel.studeez.data.local.models.timer_functional -class Time(initialTime: Int) { +class Time(var time: Int) { + operator fun invoke() = time - var time = initialTime + operator fun inc(): Time = Time(time + 1) - fun minOne() { - time-- - } - - fun plusOne() { - time++ - } + operator fun dec(): Time = Time(time - 1) fun getAsHMS(): HoursMinutesSeconds { return HoursMinutesSeconds(time) } - -} \ No newline at end of file +}