From 97c9d31ef52005f76efbcdd0bcbfae24d2981cb3 Mon Sep 17 00:00:00 2001
From: Pavol Franek <>
Date: Mon, 16 Mar 2020 18:46:18 +0100
Subject: [PATCH 1/3] Clock - Make the fragments scrollable
---
app/src/main/res/layout/fragment_timer.xml | 184 +++++++++++----------
1 file changed, 100 insertions(+), 84 deletions(-)
diff --git a/app/src/main/res/layout/fragment_timer.xml b/app/src/main/res/layout/fragment_timer.xml
index 766a14e7..dbb2b178 100644
--- a/app/src/main/res/layout/fragment_timer.xml
+++ b/app/src/main/res/layout/fragment_timer.xml
@@ -6,96 +6,112 @@
android:layout_width="match_parent"
android:layout_height="match_parent">
-
+ app:layout_constraintTop_toTopOf="parent">
-
-
-
-
-
+ android:layout_height="wrap_content">
-
+
-
+
-
+
-
+
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
From e85bbb35e14c1de3889b3ba63046f1965079a155 Mon Sep 17 00:00:00 2001
From: Pavol Franek <>
Date: Mon, 16 Mar 2020 19:41:09 +0100
Subject: [PATCH 2/3] Widget - not always updating time.
---
.../simplemobiletools/clock/extensions/Context.kt | 15 ++++++++++++---
1 file changed, 12 insertions(+), 3 deletions(-)
diff --git a/app/src/main/kotlin/com/simplemobiletools/clock/extensions/Context.kt b/app/src/main/kotlin/com/simplemobiletools/clock/extensions/Context.kt
index 9d2b5a98..af0f8278 100644
--- a/app/src/main/kotlin/com/simplemobiletools/clock/extensions/Context.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/clock/extensions/Context.kt
@@ -6,18 +6,17 @@ import android.appwidget.AppWidgetManager
import android.content.ComponentName
import android.content.Context
import android.content.Intent
-import android.content.SharedPreferences
import android.media.AudioAttributes
import android.media.AudioManager
import android.media.AudioManager.STREAM_ALARM
import android.net.Uri
+import android.os.Build
import android.os.PowerManager
import android.text.SpannableString
import android.text.style.RelativeSizeSpan
import android.widget.Toast
import androidx.core.app.AlarmManagerCompat
import androidx.core.app.NotificationCompat
-import androidx.preference.PreferenceManager
import com.simplemobiletools.clock.R
import com.simplemobiletools.clock.activities.ReminderActivity
import com.simplemobiletools.clock.activities.SnoozeReminderActivity
@@ -38,6 +37,7 @@ import com.simplemobiletools.commons.helpers.isOreoPlus
import java.util.*
import kotlin.math.pow
+
val Context.config: Config get() = Config.newInstance(applicationContext)
val Context.dbHelper: DBHelper get() = DBHelper.newInstance(applicationContext)
@@ -168,7 +168,16 @@ fun Context.scheduleNextWidgetUpdate() {
val alarmManager = getSystemService(Context.ALARM_SERVICE) as AlarmManager
val triggerAtMillis = System.currentTimeMillis() + getMSTillNextMinute()
- alarmManager.setExact(AlarmManager.RTC, triggerAtMillis, pendingIntent)
+
+ when {
+ Build.VERSION.SDK_INT >= Build.VERSION_CODES.M -> {
+ alarmManager.setExactAndAllowWhileIdle(AlarmManager.RTC, triggerAtMillis, pendingIntent)
+ }
+
+ else -> {
+ alarmManager.setExact(AlarmManager.RTC, triggerAtMillis, pendingIntent) //MAYBE RTC_WAKEUP
+ }
+ }
}
fun Context.getFormattedTime(passedSeconds: Int, showSeconds: Boolean, makeAmPmSmaller: Boolean): SpannableString {
From 45822c13596976be8cfa0bc5cb9254dc97bbe90c Mon Sep 17 00:00:00 2001
From: Pavol Franek <>
Date: Mon, 16 Mar 2020 19:51:14 +0100
Subject: [PATCH 3/3] Fixed syntax
---
.../simplemobiletools/clock/extensions/Context.kt | 14 +++-----------
1 file changed, 3 insertions(+), 11 deletions(-)
diff --git a/app/src/main/kotlin/com/simplemobiletools/clock/extensions/Context.kt b/app/src/main/kotlin/com/simplemobiletools/clock/extensions/Context.kt
index af0f8278..d4aa27ea 100644
--- a/app/src/main/kotlin/com/simplemobiletools/clock/extensions/Context.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/clock/extensions/Context.kt
@@ -30,10 +30,7 @@ import com.simplemobiletools.clock.receivers.HideAlarmReceiver
import com.simplemobiletools.clock.receivers.HideTimerReceiver
import com.simplemobiletools.clock.services.SnoozeService
import com.simplemobiletools.commons.extensions.*
-import com.simplemobiletools.commons.helpers.ALARM_SOUND_TYPE_ALARM
-import com.simplemobiletools.commons.helpers.DAY_MINUTES
-import com.simplemobiletools.commons.helpers.SILENT
-import com.simplemobiletools.commons.helpers.isOreoPlus
+import com.simplemobiletools.commons.helpers.*
import java.util.*
import kotlin.math.pow
@@ -170,13 +167,8 @@ fun Context.scheduleNextWidgetUpdate() {
val triggerAtMillis = System.currentTimeMillis() + getMSTillNextMinute()
when {
- Build.VERSION.SDK_INT >= Build.VERSION_CODES.M -> {
- alarmManager.setExactAndAllowWhileIdle(AlarmManager.RTC, triggerAtMillis, pendingIntent)
- }
-
- else -> {
- alarmManager.setExact(AlarmManager.RTC, triggerAtMillis, pendingIntent) //MAYBE RTC_WAKEUP
- }
+ isMarshmallowPlus() -> alarmManager.setExactAndAllowWhileIdle(AlarmManager.RTC, triggerAtMillis, pendingIntent)
+ else -> alarmManager.setExact(AlarmManager.RTC, triggerAtMillis, pendingIntent) //MAYBE RTC_WAKEUP
}
}