Add the background location disclaimer

Update translation

.idea/codeStyles/Project.xml

@@ -1,6 +1,22 @@
 <component name="ProjectCodeStyleConfiguration">
   <code_scheme name="Project" version="173">
     <JetCodeStyleSettings>
+      <option name="PACKAGES_TO_USE_STAR_IMPORTS">
+        <value>
+          <package name="java.util" alias="false" withSubpackages="false" />
+          <package name="kotlinx.android.synthetic" alias="false" withSubpackages="true" />
+          <package name="io.ktor" alias="false" withSubpackages="true" />
+        </value>
+      </option>
+      <option name="PACKAGES_IMPORT_LAYOUT">
+        <value>
+          <package name="" alias="false" withSubpackages="true" />
+          <package name="java" alias="false" withSubpackages="true" />
+          <package name="javax" alias="false" withSubpackages="true" />
+          <package name="kotlin" alias="false" withSubpackages="true" />
+          <package name="" alias="true" withSubpackages="true" />
+        </value>
+      </option>
       <option name="CODE_STYLE_DEFAULTS" value="KOTLIN_OFFICIAL" />
     </JetCodeStyleSettings>
     <codeStyleSettings language="XML">

.idea/modules.xml

@@ -2,7 +2,7 @@
 <project version="4">
   <component name="ProjectModuleManager">
     <modules>
-      <module fileurl="file://$PROJECT_DIR$/Another Widget.iml" filepath="$PROJECT_DIR$/Another Widget.iml" group="Another Widget" />
+      <module fileurl="file://$PROJECT_DIR$/.idea/modules/Another_Widget.iml" filepath="$PROJECT_DIR$/.idea/modules/Another_Widget.iml" group="Another_Widget" />
       <module fileurl="file://$PROJECT_DIR$/app/app.iml" filepath="$PROJECT_DIR$/app/app.iml" group="Another Widget/app" />
     </modules>
   </component>

app/build.gradle

@@ -18,8 +18,8 @@ android {
         applicationId "com.tommasoberlose.anotherwidget"
         minSdkVersion 23
         targetSdkVersion 29
-        versionCode 96
-        versionName "2.0.9"
+        versionCode 105
+        versionName "2.0.13"
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
@@ -59,13 +59,13 @@ dependencies {
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
     implementation 'androidx.legacy:legacy-support-v4:1.0.0'
     testImplementation 'junit:junit:4.13'
-    androidTestImplementation 'androidx.test.ext:junit:1.1.1'
-    androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0'
+    androidTestImplementation 'androidx.test.ext:junit:1.1.2'
+    androidTestImplementation 'androidx.test.espresso:espresso-core:3.3.0'
 
     // UI
-    implementation 'androidx.appcompat:appcompat:1.1.0'
-    implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
-    implementation 'com.google.android.material:material:1.2.0-alpha06'
+    implementation 'androidx.appcompat:appcompat:1.2.0'
+    implementation 'androidx.constraintlayout:constraintlayout:2.0.1'
+    implementation 'com.google.android.material:material:1.3.0-alpha03'
     implementation 'androidx.browser:browser:1.2.0'
     implementation 'net.idik:slimadapter:2.1.2'
     implementation 'com.google.android:flexbox:2.0.1'
@@ -75,18 +75,18 @@ dependencies {
     implementation 'androidx.lifecycle:lifecycle-viewmodel-ktx:2.2.0'
     implementation 'androidx.lifecycle:lifecycle-extensions:2.2.0'
 
-    implementation "androidx.work:work-runtime-ktx:2.3.4"
+    implementation "androidx.work:work-runtime-ktx:2.4.0"
 
     // EventBus
     implementation 'org.greenrobot:eventbus:3.1.1'
 
     // Navigation
-    implementation 'androidx.navigation:navigation-fragment:2.3.0-alpha05'
-    implementation 'androidx.navigation:navigation-ui-ktx:2.2.2'
+    implementation 'androidx.navigation:navigation-fragment:2.3.0'
+    implementation 'androidx.navigation:navigation-ui-ktx:2.3.0'
 
     // Other
     implementation 'androidx.multidex:multidex:2.0.1'
-    implementation 'joda-time:joda-time:2.9.9'
+    implementation 'joda-time:joda-time:2.10.3'
     implementation 'me.everything:providers-android:1.0.1'
     implementation 'com.github.warkiz.widget:indicatorseekbar:2.1.2'
 
@@ -96,34 +96,30 @@ dependencies {
 
     // Fitness
     implementation 'com.google.android.gms:play-services-fitness:18.0.0'
-    implementation 'com.google.android.gms:play-services-auth:18.0.0'
+    implementation 'com.google.android.gms:play-services-auth:18.1.0'
 
     //Weather
     implementation 'com.github.KwabenBerko:OpenWeatherMap-Android-Library:2.0.2'
-    implementation 'com.google.android.gms:play-services-location:17.0.0'
+    implementation 'com.google.android.gms:play-services-location:17.1.0'
 
     // Billing
-    implementation 'com.android.billingclient:billing:2.2.0'
-    implementation 'com.android.billingclient:billing-ktx:2.2.0'
+    implementation 'com.android.billingclient:billing:3.0.1'
+    implementation 'com.android.billingclient:billing-ktx:3.0.1'
 
     // KTX
-    implementation "androidx.core:core-ktx:1.2.0"
+    implementation "androidx.core:core-ktx:1.3.2"
     implementation "androidx.lifecycle:lifecycle-livedata-ktx:2.2.0"
     implementation "androidx.palette:palette-ktx:1.0.0"
-    implementation 'androidx.core:core-ktx:1.2.0'
+    implementation 'androidx.core:core-ktx:1.3.2'
 
     // Add the Firebase SDK for Crashlytics.
-    implementation 'com.google.firebase:firebase-crashlytics:17.0.0'
+    implementation 'com.google.firebase:firebase-crashlytics:17.2.2'
 
     // Preferences
-    implementation 'com.chibatching.kotpref:kotpref:2.10.0'
+    implementation 'com.chibatching.kotpref:kotpref:2.11.0'
     implementation 'com.chibatching.kotpref:livedata-support:2.10.0'
     implementation 'androidx.preference:preference-ktx:1.1.1'
 
     // Permissions
     implementation 'com.karumi:dexter:6.1.0'
-
-    // Billing
-    implementation 'com.android.billingclient:billing:2.2.0'
-    implementation 'com.android.billingclient:billing-ktx:2.2.0'
 }

app/src/main/AndroidManifest.xml

@@ -145,6 +145,11 @@
                 <action android:name="android.intent.action.BOOT_COMPLETED" />
             </intent-filter>
         </receiver>
+
+        <service
+            android:name=".services.UpdateCalendarJob"
+            android:permission="android.permission.BIND_JOB_SERVICE"
+            android:exported="true"/>
     </application>
 
 </manifest>

app/src/main/java/com/tommasoberlose/anotherwidget/components/FixedFocusScrollView.kt

@@ -0,0 +1,24 @@
+package com.tommasoberlose.anotherwidget.components
+
+import android.content.Context
+import android.graphics.Rect
+import android.util.AttributeSet
+import android.util.Log
+import android.view.View
+import android.widget.ScrollView
+
+
+class FixedFocusScrollView @JvmOverloads constructor(
+    context: Context,
+    attrs: AttributeSet? = null,
+    defStyle: Int = 0
+) : ScrollView(context, attrs, defStyle) {
+
+    var isScrollable = true
+
+    override fun scrollTo(x: Int, y: Int) {
+        if (isScrollable) {
+            super.scrollTo(x, y)
+        }
+    }
+}

app/src/main/java/com/tommasoberlose/anotherwidget/components/IconPackSelector.kt

@@ -0,0 +1,57 @@
+package com.tommasoberlose.anotherwidget.components
+
+import android.content.Context
+import android.view.View
+import android.widget.ImageView
+import androidx.core.content.ContextCompat
+import androidx.core.view.isVisible
+import com.google.android.material.bottomsheet.BottomSheetDialog
+import com.tommasoberlose.anotherwidget.R
+import com.tommasoberlose.anotherwidget.global.Constants
+import com.tommasoberlose.anotherwidget.global.Preferences
+import com.tommasoberlose.anotherwidget.helpers.WeatherHelper
+import kotlinx.android.synthetic.main.bottom_sheet_menu.view.*
+import kotlinx.android.synthetic.main.bottom_sheet_menu.view.header
+import kotlinx.android.synthetic.main.fragment_weather_settings.*
+import kotlinx.android.synthetic.main.icon_pack_menu_item.view.*
+
+class IconPackSelector(context: Context, private val header: String? = null) : BottomSheetDialog(context, R.style.BottomSheetDialogTheme) {
+
+    override fun show() {
+        val view = View.inflate(context, R.layout.bottom_sheet_menu, null)
+
+        // Header
+        view.header.isVisible = header != null
+        view.header_text.text = header ?: ""
+
+        view.warning_text.isVisible = false
+
+        // Menu
+        for (item in Constants.WeatherIconPack.values()) {
+            val itemView = View.inflate(context, R.layout.icon_pack_menu_item, null)
+            itemView.label.text = context.getString(R.string.settings_weather_icon_pack_default).format(item.value + 1)
+            itemView.isSelected = item.value == Preferences.weatherIconPack
+
+            itemView.icon_1.setImageDrawable(ContextCompat.getDrawable(context, WeatherHelper.getWeatherIconResource("01d", item.value)))
+            itemView.icon_2.setImageDrawable(ContextCompat.getDrawable(context, WeatherHelper.getWeatherIconResource("01n", item.value)))
+            itemView.icon_3.setImageDrawable(ContextCompat.getDrawable(context, WeatherHelper.getWeatherIconResource("10d", item.value)))
+            itemView.icon_4.setImageDrawable(ContextCompat.getDrawable(context, WeatherHelper.getWeatherIconResource("09n", item.value)))
+
+            listOf<ImageView>(itemView.icon_1, itemView.icon_2, itemView.icon_3, itemView.icon_4).forEach {
+                if (item == Constants.WeatherIconPack.MINIMAL) {
+                    it.setColorFilter(ContextCompat.getColor(context, R.color.colorPrimaryText))
+                } else {
+                    it.setColorFilter(ContextCompat.getColor(context, android.R.color.transparent))
+                }
+            }
+
+            itemView.setOnClickListener {
+                Preferences.weatherIconPack = item.value
+                this.dismiss()
+            }
+            view.menu.addView(itemView)
+        }
+        setContentView(view)
+        super.show()
+    }
+}

app/src/main/java/com/tommasoberlose/anotherwidget/components/MaterialBottomSheetDialog.kt

@@ -11,8 +11,8 @@ typealias DialogCallback = () -> Unit
 
 class MaterialBottomSheetDialog(
     context: Context,
-    private val title: String? = "",
-    private val message: String? = ""
+    private val title: String? = null,
+    private val message: String? = null
 ) : BottomSheetDialog(context, R.style.BottomSheetDialogTheme) {
 
     private var positiveButtonLabel: String? = null
@@ -36,7 +36,7 @@ class MaterialBottomSheetDialog(
         val view = View.inflate(context, R.layout.bottom_sheet_dialog, null)
 
         // Header
-        view.message.isVisible = title != null
+        view.title.isVisible = title != null
         view.title.text = title ?: ""
 
         view.message.isVisible = message != null

app/src/main/java/com/tommasoberlose/anotherwidget/components/MenuItem.kt

@@ -0,0 +1,21 @@
+package com.tommasoberlose.anotherwidget.components
+
+import android.view.View
+import android.widget.CompoundButton
+
+class MenuItem (
+    val icon: Int,
+    val getIcon: (() -> Int)? = null,
+    val title: String,
+    val label: String = "",
+    val getLabel: (() -> String)? = null,
+    val isEnabled: (() -> Boolean) = fun (): Boolean { return true },
+    val onClick: View.OnClickListener? = null,
+    val onLongClick: View.OnLongClickListener? = null,
+    val showToggle: Boolean = false,
+    val toggleValue: (() -> Boolean) = fun (): Boolean { return false },
+    val onToggle: CompoundButton.OnCheckedChangeListener? = null,
+    val showPermission: (() -> Boolean) = fun (): Boolean { return false },
+    val onPermissionClickListener: View.OnClickListener? = null,
+    val render: ((view: View) -> Unit)? = null
+)

app/src/main/java/com/tommasoberlose/anotherwidget/db/EventRepository.kt

@@ -1,15 +1,18 @@
 package com.tommasoberlose.anotherwidget.db
 
 import android.content.Context
+import android.provider.CalendarContract
 import android.util.Log
 import com.chibatching.kotpref.bulk
 import com.tommasoberlose.anotherwidget.global.Preferences
+import com.tommasoberlose.anotherwidget.helpers.CalendarHelper.applyFilters
 import com.tommasoberlose.anotherwidget.models.Event
 import com.tommasoberlose.anotherwidget.receivers.UpdatesReceiver
 import com.tommasoberlose.anotherwidget.ui.widgets.MainWidget
 import io.realm.Realm
 import io.realm.RealmResults
 import java.util.*
+import kotlin.Comparator
 import kotlin.collections.ArrayList
 
 class EventRepository(val context: Context) {
@@ -67,7 +70,7 @@ class EventRepository(val context: Context) {
             val events = getEvents()
             if (events.isNotEmpty()) {
                 val newNextEvent = events.first()
-                Preferences.nextEventId = newNextEvent!!.eventID
+                Preferences.nextEventId = newNextEvent.eventID
                 newNextEvent
             } else {
                 resetNextEventData()
@@ -95,9 +98,9 @@ class EventRepository(val context: Context) {
         if (eventList.isNotEmpty()) {
             val index = eventList.indexOfFirst { it.eventID == Preferences.nextEventId }
             if (index > -1 && index < eventList.size - 1) {
-                Preferences.nextEventId = eventList[index + 1]!!.eventID
+                Preferences.nextEventId = eventList[index + 1].eventID
             } else {
-                Preferences.nextEventId = eventList.first()!!.eventID
+                Preferences.nextEventId = eventList.first().eventID
             }
         } else {
             resetNextEventData()
@@ -111,9 +114,9 @@ class EventRepository(val context: Context) {
         if (eventList.isNotEmpty()) {
             val index = eventList.indexOfFirst { it.eventID == Preferences.nextEventId }
             if (index > 0) {
-                Preferences.nextEventId = eventList[index - 1]!!.eventID
+                Preferences.nextEventId = eventList[index - 1].eventID
             } else {
-                Preferences.nextEventId = eventList.last()!!.eventID
+                Preferences.nextEventId = eventList.last().eventID
             }
         } else {
             resetNextEventData()
@@ -122,13 +125,17 @@ class EventRepository(val context: Context) {
         MainWidget.updateWidget(context)
     }
 
-    fun getFutureEvents(): RealmResults<Event> {
+    fun getFutureEvents(): List<Event> {
         val now = Calendar.getInstance().timeInMillis
         realm.refresh()
-        return realm.where(Event::class.java).greaterThan("endDate", now).findAll()
+        return realm
+            .where(Event::class.java)
+            .greaterThan("endDate", now)
+            .findAll()
+            .applyFilters()
     }
 
-    private fun getEvents(): RealmResults<Event> {
+    private fun getEvents(): List<Event> {
         val now = Calendar.getInstance().timeInMillis
         val limit = Calendar.getInstance().apply {
             timeInMillis = now
@@ -145,7 +152,12 @@ class EventRepository(val context: Context) {
             }
         }
         realm.refresh()
-        return realm.where(Event::class.java).greaterThan("endDate", now).lessThanOrEqualTo("startDate", limit.timeInMillis).findAll()
+        return realm
+            .where(Event::class.java)
+            .greaterThan("endDate", now)
+            .lessThanOrEqualTo("startDate", limit.timeInMillis)
+            .findAll()
+            .applyFilters()
     }
 
     fun getEventsCount(): Int = getEvents().size

app/src/main/java/com/tommasoberlose/anotherwidget/global/Constants.kt

@@ -15,6 +15,13 @@ object Constants {
         LARGE(3)
     }
 
+    enum class SecondRowTopMargin(val value: Int) {
+        NONE(0),
+        SMALL(1),
+        MEDIUM(2),
+        LARGE(3)
+    }
+
     enum class GlanceProviderId(val id: String) {
         PLAYING_SONG("PLAYING_SONG"),
         NEXT_CLOCK_ALARM("NEXT_CLOCK_ALARM"),
@@ -31,6 +38,8 @@ object Constants {
 
     enum class WeatherIconPack(val value: Int) {
         DEFAULT(0),
-        MINIMAL(1)
+        MINIMAL(1),
+        COOL(2),
+        GOOGLE_NEWS(3)
     }
 }

app/src/main/java/com/tommasoberlose/anotherwidget/global/Preferences.kt

@@ -31,6 +31,7 @@ object Preferences : KotprefModel() {
     var customLocationAdd by stringPref(key = "PREF_CUSTOM_LOCATION_ADD", default = "")
     var dateFormat by stringPref(default = "")
     var isDateCapitalize by booleanPref(default = true)
+    var isDateUppercase by booleanPref(default = false)
     var weatherRefreshPeriod by intPref(key = "PREF_WEATHER_REFRESH_PERIOD", default = 1)
     var showUntil by intPref(key = "PREF_SHOW_UNTIL", default = 1)
     var calendarAppName by stringPref(key = "PREF_CALENDAR_APP_NAME", default = "")
@@ -55,6 +56,20 @@ object Preferences : KotprefModel() {
 
     var clockTextColor by stringPref(default = "#FFFFFF")
     var clockTextAlpha by stringPref(default = "FF")
+
+    var textGlobalColorDark by stringPref(default = "#FFFFFF")
+    var textGlobalAlphaDark by stringPref(default = "FF")
+
+    var textSecondaryColorDark by stringPref(default = "#FFFFFF")
+    var textSecondaryAlphaDark by stringPref(default = "FF")
+
+    var backgroundCardColorDark by stringPref(default = "#000000")
+    var backgroundCardAlphaDark by stringPref(default = "00")
+
+    var clockTextColorDark by stringPref(default = "#FFFFFF")
+    var clockTextAlphaDark by stringPref(default = "FF")
+
+
     var showAMPMIndicator by booleanPref(default = true)
 
     var weatherIconPack by intPref(default = Constants.WeatherIconPack.DEFAULT.value)
@@ -64,12 +79,17 @@ object Preferences : KotprefModel() {
     var textSecondSize by floatPref(key = "PREF_TEXT_SECOND_SIZE", default = 18f)
     var clockTextSize by floatPref(key = "PREF_TEXT_CLOCK_SIZE", default = 90f)
     var clockBottomMargin by intPref(default = Constants.ClockBottomMargin.MEDIUM.value)
+    var secondRowTopMargin by intPref(default = Constants.SecondRowTopMargin.NONE.value)
     var showClock by booleanPref(key = "PREF_SHOW_CLOCK", default = false)
     var clockAppName by stringPref(key = "PREF_CLOCK_APP_NAME", default = "")
     var clockAppPackage by stringPref(key = "PREF_CLOCK_APP_PACKAGE", default = "")
     var textShadow by intPref(key = "PREF_TEXT_SHADOW", default = 1)
+    var textShadowDark by intPref(default = 1)
     var showDiffTime by booleanPref(key = "PREF_SHOW_DIFF_TIME", default = true)
     var showDeclinedEvents by booleanPref(key = "PREF_SHOW_DECLINED_EVENTS", default = false)
+    var showInvitedEvents by booleanPref(default = false)
+    var showAcceptedEvents by booleanPref(default = true)
+    var showOnlyBusyEvents by booleanPref(default = false)
     var secondRowInformation by intPref(key = "PREF_SECOND_ROW_INFORMATION", default = 0)
     var customFont by intPref(key = "PREF_CUSTOM_FONT", default = Constants.CUSTOM_FONT_PRODUCT_SANS)
     var customFontFile by stringPref(key = "PREF_CUSTOM_FONT_FILE")

app/src/main/java/com/tommasoberlose/anotherwidget/helpers/AlarmHelper.kt

@@ -12,8 +12,7 @@ object AlarmHelper {
         val alarm = nextAlarmClock
         return if (
             alarm != null
-            && alarm.triggerTime - Calendar.getInstance().timeInMillis > 10 * 60 * 1000
-            && alarm.triggerTime - Calendar.getInstance().timeInMillis < 12 * 60 * 60 * 1000
+            && alarm.triggerTime - Calendar.getInstance().timeInMillis > 5 * 60 * 1000
         ) {
             "%s %s".format(
                 SimpleDateFormat("EEE", Locale.getDefault()).format(alarm.triggerTime),

app/src/main/java/com/tommasoberlose/anotherwidget/helpers/BitmapHelper.kt

@@ -104,13 +104,12 @@ object BitmapHelper {
     }
 
     fun drawableToBitmap(drawable: Drawable): Bitmap? {
-        var bitmap: Bitmap? = null
         if (drawable is BitmapDrawable) {
             if (drawable.bitmap != null) {
                 return drawable.bitmap
             }
         }
-        bitmap = if (drawable.intrinsicWidth <= 0 || drawable.intrinsicHeight <= 0) {
+        val bitmap: Bitmap = if (drawable.intrinsicWidth <= 0 || drawable.intrinsicHeight <= 0) {
             Bitmap.createBitmap(
                 1,
                 1,

app/src/main/java/com/tommasoberlose/anotherwidget/helpers/CalendarHelper.kt

@@ -1,8 +1,14 @@
 package com.tommasoberlose.anotherwidget.helpers
 
 import android.Manifest
+import android.app.job.JobInfo
+import android.app.job.JobParameters
+import android.app.job.JobScheduler
+import android.app.job.JobService
+import android.content.ComponentName
 import android.content.ContentUris
 import android.content.Context
+import android.content.Intent
 import android.provider.CalendarContract
 import android.util.Log
 import com.tommasoberlose.anotherwidget.services.EventListenerJob
@@ -10,6 +16,7 @@ import com.tommasoberlose.anotherwidget.db.EventRepository
 import com.tommasoberlose.anotherwidget.models.Event
 import com.tommasoberlose.anotherwidget.global.Preferences
 import com.tommasoberlose.anotherwidget.receivers.UpdatesReceiver
+import com.tommasoberlose.anotherwidget.services.UpdateCalendarJob
 import com.tommasoberlose.anotherwidget.ui.fragments.MainFragment
 import com.tommasoberlose.anotherwidget.ui.widgets.MainWidget
 import com.tommasoberlose.anotherwidget.utils.checkGrantedPermission
@@ -24,106 +31,8 @@ import kotlin.collections.ArrayList
  */
 
 object CalendarHelper {
-
     fun updateEventList(context: Context) {
-        val eventRepository = EventRepository(context)
-        if (Preferences.showEvents) {
-            val eventList = ArrayList<Event>()
-
-            val now = Calendar.getInstance()
-            val begin = Calendar.getInstance().apply {
-                set(Calendar.MILLISECOND, 0)
-                set(Calendar.SECOND, 0)
-                set(Calendar.MINUTE, 0)
-                set(Calendar.HOUR_OF_DAY, 0)
-            }
-            val limit = Calendar.getInstance().apply {
-                timeInMillis = begin.timeInMillis
-                add(Calendar.DAY_OF_YEAR, 2)
-            }
-
-            if (!context.checkGrantedPermission(
-                    Manifest.permission.READ_CALENDAR
-                )
-            ) {
-                eventRepository.resetNextEventData()
-            } else {
-                try {
-                    val provider = CalendarProvider(context)
-                    val data = provider.getInstances(begin.timeInMillis, limit.timeInMillis)
-                    if (data != null) {
-                        val instances = data.list
-                        for (instance in instances) {
-                            try {
-                                val e = provider.getEvent(instance.eventId)
-                                if (e != null && !e.deleted && instance.begin <= limit.timeInMillis && now.timeInMillis < instance.end && (Preferences.calendarAllDay || !e.allDay) && !getFilteredCalendarIdList().contains(
-                                        e.calendarId
-                                    ) && (Preferences.showDeclinedEvents || e.selfAttendeeStatus.toInt() != CalendarContract.Attendees.ATTENDEE_STATUS_DECLINED)
-                                ) {
-                                    if (e.allDay) {
-                                        val start = Calendar.getInstance()
-                                        start.timeInMillis = instance.begin
-                                        val end = Calendar.getInstance()
-                                        end.timeInMillis = instance.end
-                                        instance.begin =
-                                            start.timeInMillis - start.timeZone.getOffset(start.timeInMillis)
-                                        instance.end =
-                                            end.timeInMillis - end.timeZone.getOffset(end.timeInMillis)
-                                    }
-                                    eventList.add(
-                                        Event(
-                                            instance.id,
-                                            e.id,
-                                            e.title ?: "",
-                                            instance.begin,
-                                            instance.end,
-                                            e.calendarId.toInt(),
-                                            e.allDay,
-                                            e.eventLocation ?: ""
-                                        )
-                                    )
-                                }
-                            } catch (ignored: Exception) {
-                            }
-                        }
-                    }
-
-                    if (eventList.isEmpty()) {
-                        eventRepository.resetNextEventData()
-                        eventRepository.clearEvents()
-                    } else {
-                        eventList.sortWith(Comparator { event: Event, event1: Event ->
-                            if (event.allDay && event1.allDay) {
-                                event.startDate.compareTo(event1.startDate)
-                            } else if (event.allDay) {
-                                1
-                            } else if (event1.allDay) {
-                                -1
-                            } else {
-                                event1.startDate.compareTo(event.startDate)
-                            }
-                        })
-                        eventList.reverse()
-                        eventRepository.saveEvents(
-                            eventList
-                        )
-                        eventRepository.saveNextEventData(
-                            eventList[0]
-                        )
-                    }
-                } catch (ignored: java.lang.Exception) {
-
-                }
-            }
-        } else {
-            eventRepository.resetNextEventData()
-        }
-
-        UpdatesReceiver.setUpdates(context)
-        MainWidget.updateWidget(context)
-
-        EventBus.getDefault().post(MainFragment.UpdateUiMessageEvent())
-        eventRepository.close()
+        UpdateCalendarJob.enqueueWork(context, Intent())
     }
 
     fun getCalendarList(context: Context): List<me.everything.providers.android.calendar.Calendar> {
@@ -145,7 +54,8 @@ object CalendarHelper {
     }
 
     fun getFilteredCalendarIdList(): List<Long> {
-        return Preferences.calendarFilter.split(",").map { it.replace(" ", "") }.filter { it != "" }.map { it.toLong() }
+        return Preferences.calendarFilter.split(",").map { it.replace(" ", "") }
+            .filter { it != "" }.map { it.toLong() }
     }
 
     fun filterCalendar(list: List<Long>) {
@@ -159,4 +69,15 @@ object CalendarHelper {
     fun removeEventUpdatesAndroidN(context: Context) {
         EventListenerJob.remove(context)
     }
+
+    fun List<Event>.applyFilters() : List<Event> {
+        return this
+            .asSequence()
+            .filter { (Preferences.showDeclinedEvents || it.selfAttendeeStatus != CalendarContract.Attendees.ATTENDEE_STATUS_DECLINED) }
+            .filter { (Preferences.showAcceptedEvents || it.selfAttendeeStatus != CalendarContract.Attendees.ATTENDEE_STATUS_ACCEPTED) }
+            .filter { (Preferences.showInvitedEvents || it.selfAttendeeStatus != CalendarContract.Attendees.ATTENDEE_STATUS_INVITED) }
+            .filter { (Preferences.calendarAllDay || !it.allDay) }
+            .filter { (!Preferences.showOnlyBusyEvents || it.availability != CalendarContract.EventsEntity.AVAILABILITY_FREE) }
+            .toList()
+    }
 }

app/src/main/java/com/tommasoberlose/anotherwidget/helpers/ColorHelper.kt

@@ -7,97 +7,97 @@ import com.tommasoberlose.anotherwidget.global.Preferences
 import kotlin.math.roundToInt
 
 object ColorHelper {
-    fun getFontColor(): Int {
+    fun getFontColor(isDark: Boolean): Int {
         return try {
-            Color.parseColor("#%s%s".format(Preferences.textGlobalAlpha, Preferences.textGlobalColor.replace("#", "")))
+            Color.parseColor("#%s%s".format(if (!isDark) Preferences.textGlobalAlpha else Preferences.textGlobalAlphaDark, (if (!isDark) Preferences.textGlobalColor else Preferences.textGlobalColorDark).replace("#", "")))
         } catch (e: Exception) {
             Color.parseColor("#FFFFFFFF")
         }
     }
 
-    fun getFontColorAlpha(): Int {
+    fun getFontColorAlpha(isDark: Boolean): Int {
         return try {
-            Preferences.textGlobalAlpha.toIntValue().toDouble() * 255 / 100
+            (if (!isDark) Preferences.textGlobalAlpha else Preferences.textGlobalAlphaDark).toIntValue().toDouble() * 255 / 100
         } catch (e: Exception) {
             "FF".toIntValue().toDouble() * 255 / 100
         }.roundToInt()
     }
 
-    fun getFontColorRgb(): Int {
+    fun getFontColorRgb(isDark: Boolean): Int {
         return try {
-            Color.parseColor(Preferences.textGlobalColor)
+            Color.parseColor((if (!isDark) Preferences.textGlobalColor else Preferences.textGlobalColorDark))
         } catch (e: Exception) {
             Color.parseColor("#000000")
         }
     }
 
-    fun getSecondaryFontColor(): Int {
+    fun getSecondaryFontColor(isDark: Boolean): Int {
         return try {
-            Color.parseColor("#%s%s".format(Preferences.textSecondaryAlpha, Preferences.textSecondaryColor.replace("#", "")))
+            Color.parseColor("#%s%s".format((if (!isDark) Preferences.textSecondaryAlpha else Preferences.textSecondaryAlphaDark), (if (!isDark) Preferences.textSecondaryColor else Preferences.textSecondaryColorDark).replace("#", "")))
         } catch (e: Exception) {
             Color.parseColor("#FFFFFFFF")
         }
     }
 
-    fun getSecondaryFontColorAlpha(): Int {
+    fun getSecondaryFontColorAlpha(isDark: Boolean): Int {
         return try {
-            Preferences.textSecondaryAlpha.toIntValue().toDouble() * 255 / 100
+            (if (!isDark) Preferences.textSecondaryAlpha else Preferences.textSecondaryAlphaDark).toIntValue().toDouble() * 255 / 100
         } catch (e: Exception) {
             "FF".toIntValue().toDouble() * 255 / 100
         }.roundToInt()
     }
 
-    fun getSecondaryFontColorRgb(): Int {
+    fun getSecondaryFontColorRgb(isDark: Boolean): Int {
         return try {
-            Color.parseColor(Preferences.textSecondaryColor)
+            Color.parseColor((if (!isDark) Preferences.textSecondaryColor else Preferences.textSecondaryColorDark))
         } catch (e: Exception) {
             Color.parseColor("#000000")
         }
     }
 
-    fun getClockFontColor(): Int {
+    fun getClockFontColor(isDark: Boolean): Int {
         return try {
-            Color.parseColor("#%s%s".format(Preferences.clockTextAlpha, Preferences.clockTextColor.replace("#", "")))
+            Color.parseColor("#%s%s".format((if (!isDark) Preferences.clockTextAlpha else Preferences.clockTextAlphaDark), (if (!isDark) Preferences.clockTextColor else Preferences.clockTextColorDark).replace("#", "")))
         } catch (e: Exception) {
             Color.parseColor("#FFFFFFFF")
         }
     }
 
-    fun getClockFontColorAlpha(): Int {
+    fun getClockFontColorAlpha(isDark: Boolean): Int {
         return try {
-            Preferences.clockTextAlpha.toIntValue().toDouble() * 255 / 100
+            (if (!isDark) Preferences.clockTextAlpha else Preferences.clockTextAlphaDark).toIntValue().toDouble() * 255 / 100
         } catch (e: Exception) {
             "FF".toIntValue().toDouble() * 255 / 100
         }.roundToInt()
     }
 
-    fun getClockFontColorRgb(): Int {
+    fun getClockFontColorRgb(isDark: Boolean): Int {
         return try {
-            Color.parseColor(Preferences.clockTextColor)
+            Color.parseColor((if (!isDark) Preferences.clockTextColor else Preferences.clockTextColorDark))
         } catch (e: Exception) {
             Color.parseColor("#000000")
         }
     }
 
-    fun getBackgroundColor(): Int {
+    fun getBackgroundColor(isDark: Boolean): Int {
         return try {
-            Color.parseColor("#%s%s".format(Preferences.backgroundCardAlpha, Preferences.backgroundCardColor.replace("#", "")))
+            Color.parseColor("#%s%s".format((if (!isDark) Preferences.backgroundCardAlpha else Preferences.backgroundCardAlphaDark), (if (!isDark) Preferences.backgroundCardColor else Preferences.backgroundCardColorDark).replace("#", "")))
         } catch (e: Exception) {
             Color.parseColor("#00000000")
         }
     }
 
-    fun getBackgroundAlpha(): Int {
+    fun getBackgroundAlpha(isDark: Boolean): Int {
         return try {
-            Preferences.backgroundCardAlpha.toIntValue().toDouble() * 255 / 100
+            (if (!isDark) Preferences.backgroundCardAlpha else Preferences.backgroundCardAlphaDark).toIntValue().toDouble() * 255 / 100
         } catch (e: Exception) {
             "00".toIntValue().toDouble() * 255 / 100
         }.roundToInt()
     }
 
-    fun getBackgroundColorRgb(): Int {
+    fun getBackgroundColorRgb(isDark: Boolean): Int {
         return try {
-            Color.parseColor(Preferences.backgroundCardColor)
+            Color.parseColor((if (!isDark) Preferences.backgroundCardColor else Preferences.backgroundCardColorDark))
         } catch (e: Exception) {
             Color.parseColor("#000000")
         }

app/src/main/java/com/tommasoberlose/anotherwidget/helpers/DateHelper.kt

@@ -2,7 +2,6 @@ package com.tommasoberlose.anotherwidget.helpers
 
 import android.content.Context
 import android.text.format.DateUtils
-import android.util.Log
 import com.tommasoberlose.anotherwidget.global.Preferences
 import com.tommasoberlose.anotherwidget.utils.getCapWordString
 import java.lang.Exception
@@ -17,7 +16,11 @@ object DateHelper {
             } catch (e: Exception) {
                 getDefaultDateText(context, date)
             }
-            if (Preferences.isDateCapitalize) text.getCapWordString() else text
+            when {
+                Preferences.isDateUppercase -> text.toUpperCase(Locale.getDefault())
+                Preferences.isDateCapitalize -> text.getCapWordString()
+                else -> text
+            }
         } else {
             val flags: Int =
                 DateUtils.FORMAT_SHOW_DATE or DateUtils.FORMAT_NO_YEAR or DateUtils.FORMAT_ABBREV_MONTH
@@ -25,17 +28,20 @@ object DateHelper {
                 SimpleDateFormat("EEEE", Locale.getDefault()).format(date.time),
                 DateUtils.formatDateTime(context, date.timeInMillis, flags)
             )
-            if (Preferences.isDateCapitalize) text.getCapWordString() else text
+            when {
+                Preferences.isDateUppercase -> text.toUpperCase(Locale.getDefault())
+                Preferences.isDateCapitalize -> text.getCapWordString()
+                else -> text
+            }
         }
     }
 
     fun getDefaultDateText(context: Context, date: Calendar): String {
         val flags: Int =
             DateUtils.FORMAT_SHOW_DATE or DateUtils.FORMAT_NO_YEAR or DateUtils.FORMAT_ABBREV_MONTH
-        val text = "%s, %s".format(
+        return "%s, %s".format(
             SimpleDateFormat("EEEE", Locale.getDefault()).format(date.time),
             DateUtils.formatDateTime(context, date.timeInMillis, flags)
         )
-        return if (Preferences.isDateCapitalize) text.getCapWordString() else text
     }
 }

app/src/main/java/com/tommasoberlose/anotherwidget/helpers/GlanceProviderHelper.kt

@@ -1,6 +1,7 @@
 package com.tommasoberlose.anotherwidget.helpers
 
 import android.content.Context
+import android.util.Log
 import com.tommasoberlose.anotherwidget.R
 import com.tommasoberlose.anotherwidget.db.EventRepository
 import com.tommasoberlose.anotherwidget.global.Constants
@@ -80,13 +81,14 @@ object GlanceProviderHelper {
     fun showGlanceProviders(context: Context): Boolean {
         val eventRepository = EventRepository(context)
         BatteryHelper.updateBatteryInfo(context)
-        val showGlance = Preferences.showGlance && eventRepository.getEventsCount() == 0 && (
+
+        val showGlance = Preferences.showGlance && (eventRepository.getEventsCount() == 0 || !Preferences.showEvents) && (
                 (Preferences.showNextAlarm && AlarmHelper.getNextAlarm(context) != "") ||
-                        (MediaPlayerHelper.isSomeonePlaying(context)) ||
-                        (Preferences.showBatteryCharging && Preferences.isCharging || Preferences.isBatteryLevelLow) ||
-                        (Preferences.customNotes.isNotEmpty()) ||
-                        (Preferences.showDailySteps && Preferences.googleFitSteps > 0)
-                )
+                (MediaPlayerHelper.isSomeonePlaying(context)) ||
+                (Preferences.showBatteryCharging && Preferences.isCharging || Preferences.isBatteryLevelLow) ||
+                (Preferences.customNotes.isNotEmpty()) ||
+                (Preferences.showDailySteps && Preferences.googleFitSteps > 0)
+        )
         eventRepository.close()
         return showGlance
     }

app/src/main/java/com/tommasoberlose/anotherwidget/helpers/IntentHelper.kt

@@ -11,9 +11,11 @@ import android.provider.AlarmClock
 import android.provider.CalendarContract
 import android.provider.CalendarContract.Events
 import android.util.Log
+import com.tommasoberlose.anotherwidget.R
 import com.tommasoberlose.anotherwidget.global.Preferences
 import com.tommasoberlose.anotherwidget.models.Event
 import com.tommasoberlose.anotherwidget.ui.widgets.MainWidget
+import com.tommasoberlose.anotherwidget.utils.toast
 import java.util.*
 
 
@@ -64,12 +66,8 @@ object IntentHelper {
                         flags = Intent.FLAG_ACTIVITY_NEW_TASK
                     }
                 } catch (e: Exception) {
-                    Intent(Intent.ACTION_VIEW).apply {
-                        addCategory(Intent.CATEGORY_DEFAULT)
-                        flags = Intent.FLAG_ACTIVITY_NEW_TASK
-                        data = Uri.parse("dynact://velour/weather/ProxyActivity")
-                        component = ComponentName("com.google.android.googlequicksearchbox", "com.google.android.apps.gsa.velour.DynamicActivityTrampoline")
-                    }
+                    context.toast(context.getString(R.string.error_opening_app))
+                    Intent()
                 }
             }
         }
@@ -98,10 +96,8 @@ object IntentHelper {
                         data = calendarUri
                     }
                 } catch (e: Exception) {
-                    e.printStackTrace()
-                    Intent(Intent.ACTION_VIEW).apply {
-                        data = calendarUri
-                    }
+                    context.toast(context.getString(R.string.error_opening_app))
+                    Intent()
                 }
             }
         }
@@ -128,30 +124,38 @@ object IntentHelper {
 
                             putExtra(CalendarContract.EXTRA_EVENT_BEGIN_TIME, e.startDate + start.timeZone.getOffset(start.timeInMillis))
                             putExtra(CalendarContract.EXTRA_EVENT_END_TIME, e.endDate + end.timeZone.getOffset(end.timeInMillis))
-//                            putExtra(CalendarContract.EXTRA_EVENT_ALL_DAY, 1)
-                        }
-
-                        Log.d("ciao", "intent: ${this} - extras: ${this.extras}")
-                    }
-                } else {
-                    getCalendarIntent(context).apply {
-                        action = Intent.ACTION_VIEW
-                        data = uri
-                        if (!e.allDay) {
-                            putExtra(CalendarContract.EXTRA_EVENT_BEGIN_TIME, e.startDate)
-                            putExtra(CalendarContract.EXTRA_EVENT_END_TIME, e.endDate)
-                        } else {
-                            val start = Calendar.getInstance().apply {
-                                timeInMillis = e.startDate
-                            }
-                            val end = Calendar.getInstance().apply {
-                                timeInMillis = e.endDate
-                            }
-                            putExtra(CalendarContract.EXTRA_EVENT_BEGIN_TIME, start.timeInMillis + start.timeZone.getOffset(start.timeInMillis))
-                            putExtra(CalendarContract.EXTRA_EVENT_END_TIME, end.timeInMillis + end.timeZone.getOffset(end.timeInMillis))
                             putExtra(CalendarContract.EXTRA_EVENT_ALL_DAY, 1)
                         }
                     }
+                } else {
+                    val calendarIntent = getCalendarIntent(context)
+                    if (calendarIntent.action == Intent.ACTION_VIEW) {
+                        calendarIntent.apply {
+                            data = uri
+                            if (!e.allDay) {
+                                putExtra(CalendarContract.EXTRA_EVENT_BEGIN_TIME, e.startDate)
+                                putExtra(CalendarContract.EXTRA_EVENT_END_TIME, e.endDate)
+                            } else {
+                                val start = Calendar.getInstance().apply {
+                                    timeInMillis = e.startDate
+                                }
+                                val end = Calendar.getInstance().apply {
+                                    timeInMillis = e.endDate
+                                }
+                                putExtra(
+                                    CalendarContract.EXTRA_EVENT_BEGIN_TIME,
+                                    start.timeInMillis + start.timeZone.getOffset(start.timeInMillis)
+                                )
+                                putExtra(
+                                    CalendarContract.EXTRA_EVENT_END_TIME,
+                                    end.timeInMillis + end.timeZone.getOffset(end.timeInMillis)
+                                )
+                                putExtra(CalendarContract.EXTRA_EVENT_ALL_DAY, 1)
+                            }
+                        }
+                    } else {
+                        Intent()
+                    }
                 }
             }
             false -> {
@@ -177,9 +181,8 @@ object IntentHelper {
                         addCategory(Intent.CATEGORY_LAUNCHER)
                     }
                 } catch (e: Exception) {
-                    Intent(AlarmClock.ACTION_SHOW_ALARMS).apply {
-                        flags = Intent.FLAG_ACTIVITY_NEW_TASK
-                    }
+                    context.toast(context.getString(R.string.error_opening_app))
+                    Intent()
                 }
             }
         }
@@ -201,6 +204,7 @@ object IntentHelper {
                         addCategory(Intent.CATEGORY_LAUNCHER)
                     }
                 } catch (e: Exception) {
+                    context.toast(context.getString(R.string.error_opening_app))
                     Intent()
                 }
             }
@@ -214,6 +218,7 @@ object IntentHelper {
                 addCategory(Intent.CATEGORY_LAUNCHER)
             }
         } catch (e: Exception) {
+            context.toast(context.getString(R.string.error_opening_app))
             Intent()
         }
     }

app/src/main/java/com/tommasoberlose/anotherwidget/helpers/MediaPlayerHelper.kt

@@ -10,6 +10,8 @@ import android.media.session.MediaSessionManager
 import android.media.session.PlaybackState
 import android.util.Log
 import androidx.core.app.NotificationManagerCompat
+import com.chibatching.kotpref.Kotpref
+import com.chibatching.kotpref.blockingBulk
 import com.chibatching.kotpref.bulk
 import com.tommasoberlose.anotherwidget.global.Preferences
 import com.tommasoberlose.anotherwidget.receivers.MusicNotificationListener
@@ -28,6 +30,7 @@ object MediaPlayerHelper {
     }
 
     fun updatePlayingMediaInfo(context: Context) {
+        Kotpref.init(context)
         if (NotificationManagerCompat.getEnabledListenerPackages(context).contains(context.packageName)) {
             val list = try {
                 (context.getSystemService(Context.MEDIA_SESSION_SERVICE) as MediaSessionManager).getActiveSessions(
@@ -65,20 +68,21 @@ object MediaPlayerHelper {
                 }
 
                 if (!isSomeonePlaying) {
-                    removeMediaInfo()
+                    removeMediaInfo(context)
                 }
 
             } else {
-                removeMediaInfo()
+                removeMediaInfo(context)
             }
         } else {
-            removeMediaInfo()
+            removeMediaInfo(context)
         }
         MainWidget.updateWidget(context)
     }
 
-    private fun removeMediaInfo() {
-        Preferences.bulk {
+    private fun removeMediaInfo(context: Context) {
+        Kotpref.init(context)
+        Preferences.blockingBulk {
             remove(Preferences::mediaPlayerTitle)
             remove(Preferences::mediaPlayerArtist)
             remove(Preferences::mediaPlayerAlbum)

app/src/main/java/com/tommasoberlose/anotherwidget/helpers/WeatherHelper.kt

@@ -46,82 +46,202 @@ object WeatherHelper {
         MainWidget.updateWidget(context)
     }
 
-    fun getWeatherIconResource(icon: String): Int {
-        when (icon) {
+    fun getWeatherIconResource(icon: String, style: Int = Preferences.weatherIconPack): Int {
+        return when (icon) {
             "01d" -> {
-                return if (Preferences.weatherIconPack == Constants.WeatherIconPack.DEFAULT.value) R.drawable.clear_day else R.drawable.clear_day_2
+                when (style) {
+                    Constants.WeatherIconPack.COOL.value -> R.drawable.clear_day_3
+                    Constants.WeatherIconPack.MINIMAL.value -> R.drawable.clear_day_2
+                    Constants.WeatherIconPack.GOOGLE_NEWS.value -> R.drawable.clear_day_4
+                    else -> R.drawable.clear_day
+                }
             }
             "02d" -> {
-                return if (Preferences.weatherIconPack == Constants.WeatherIconPack.DEFAULT.value) R.drawable.partly_cloudy else R.drawable.partly_cloudy_2
+                when (style) {
+                    Constants.WeatherIconPack.COOL.value -> R.drawable.partly_cloudy_3
+                    Constants.WeatherIconPack.MINIMAL.value -> R.drawable.partly_cloudy_2
+                    Constants.WeatherIconPack.GOOGLE_NEWS.value -> R.drawable.partly_cloudy_4
+                    else -> R.drawable.partly_cloudy
+                }
             }
             "03d" -> {
-                return if (Preferences.weatherIconPack == Constants.WeatherIconPack.DEFAULT.value) R.drawable.mostly_cloudy else R.drawable.mostly_cloudy_2
+                when (style) {
+                    Constants.WeatherIconPack.COOL.value -> R.drawable.mostly_cloudy_3
+                    Constants.WeatherIconPack.MINIMAL.value -> R.drawable.mostly_cloudy_2
+                    Constants.WeatherIconPack.GOOGLE_NEWS.value -> R.drawable.mostly_cloudy_4
+                    else -> R.drawable.mostly_cloudy
+                }
             }
             "04d" -> {
-                return if (Preferences.weatherIconPack == Constants.WeatherIconPack.DEFAULT.value) R.drawable.cloudy_weather else R.drawable.cloudy_weather_2
+                when (style) {
+                    Constants.WeatherIconPack.COOL.value -> R.drawable.cloudy_weather_3
+                    Constants.WeatherIconPack.MINIMAL.value -> R.drawable.cloudy_weather_2
+                    Constants.WeatherIconPack.GOOGLE_NEWS.value -> R.drawable.cloudy_weather_4
+                    else -> R.drawable.cloudy_weather
+                }
             }
             "09d" -> {
-                return if (Preferences.weatherIconPack == Constants.WeatherIconPack.DEFAULT.value) R.drawable.storm_weather_day else R.drawable.storm_weather_day_2
+                when (style) {
+                    Constants.WeatherIconPack.COOL.value -> R.drawable.storm_weather_day_3
+                    Constants.WeatherIconPack.MINIMAL.value -> R.drawable.storm_weather_day_2
+                    Constants.WeatherIconPack.GOOGLE_NEWS.value -> R.drawable.storm_weather_day_4
+                    else -> R.drawable.storm_weather_day
+                }
             }
             "10d" -> {
-                return if (Preferences.weatherIconPack == Constants.WeatherIconPack.DEFAULT.value) R.drawable.rainy_day else R.drawable.rainy_day_2
+                when (style) {
+                    Constants.WeatherIconPack.COOL.value -> R.drawable.rainy_day_3
+                    Constants.WeatherIconPack.MINIMAL.value -> R.drawable.rainy_day_2
+                    Constants.WeatherIconPack.GOOGLE_NEWS.value -> R.drawable.rainy_day_4
+                    else -> R.drawable.rainy_day
+                }
             }
             "11d" -> {
-                return if (Preferences.weatherIconPack == Constants.WeatherIconPack.DEFAULT.value) R.drawable.thunder_day else R.drawable.thunder_day_2
+                when (style) {
+                    Constants.WeatherIconPack.COOL.value -> R.drawable.thunder_day_3
+                    Constants.WeatherIconPack.MINIMAL.value -> R.drawable.thunder_day_2
+                    Constants.WeatherIconPack.GOOGLE_NEWS.value -> R.drawable.thunder_day_4
+                    else -> R.drawable.thunder_day
+                }
             }
             "13d" -> {
-                return if (Preferences.weatherIconPack == Constants.WeatherIconPack.DEFAULT.value) R.drawable.snow_day else R.drawable.snow_day_2
+                when (style) {
+                    Constants.WeatherIconPack.COOL.value -> R.drawable.snow_day_3
+                    Constants.WeatherIconPack.MINIMAL.value -> R.drawable.snow_day_2
+                    Constants.WeatherIconPack.GOOGLE_NEWS.value -> R.drawable.snow_day_4
+                    else -> R.drawable.snow_day
+                }
             }
             "50d" -> {
-                return if (Preferences.weatherIconPack == Constants.WeatherIconPack.DEFAULT.value) R.drawable.haze_day else R.drawable.haze_day_2
+                when (style) {
+                    Constants.WeatherIconPack.COOL.value -> R.drawable.haze_day_3
+                    Constants.WeatherIconPack.MINIMAL.value -> R.drawable.haze_day_2
+                    Constants.WeatherIconPack.GOOGLE_NEWS.value -> R.drawable.haze_day_4
+                    else -> R.drawable.haze_day
+                }
             }
             "80d" -> {
-                return if (Preferences.weatherIconPack == Constants.WeatherIconPack.DEFAULT.value) R.drawable.windy_day else R.drawable.windy_day_2
+                when (style) {
+                    Constants.WeatherIconPack.COOL.value -> R.drawable.windy_day_3
+                    Constants.WeatherIconPack.MINIMAL.value -> R.drawable.windy_day_2
+                    Constants.WeatherIconPack.GOOGLE_NEWS.value -> R.drawable.windy_day_4
+                    else -> R.drawable.windy_day
+                }
             }
             "81d" -> {
-                return if (Preferences.weatherIconPack == Constants.WeatherIconPack.DEFAULT.value) R.drawable.rain_snow_day else R.drawable.rain_snow_day_2
+                when (style) {
+                    Constants.WeatherIconPack.COOL.value -> R.drawable.rain_snow_day_3
+                    Constants.WeatherIconPack.MINIMAL.value -> R.drawable.rain_snow_day_2
+                    Constants.WeatherIconPack.GOOGLE_NEWS.value -> R.drawable.rain_snow_day_4
+                    else -> R.drawable.rain_snow_day
+                }
             }
             "82d" -> {
-                return if (Preferences.weatherIconPack == Constants.WeatherIconPack.DEFAULT.value) R.drawable.haze_weather else R.drawable.haze_weather_2
+                when (style) {
+                    Constants.WeatherIconPack.COOL.value -> R.drawable.haze_weather_3
+                    Constants.WeatherIconPack.MINIMAL.value -> R.drawable.haze_weather_2
+                    Constants.WeatherIconPack.GOOGLE_NEWS.value -> R.drawable.haze_weather_4
+                    else -> R.drawable.haze_weather
+                }
             }
 
 
 
             "01n" -> {
-                return if (Preferences.weatherIconPack == Constants.WeatherIconPack.DEFAULT.value) R.drawable.clear_night else R.drawable.clear_night_2
+                when (style) {
+                    Constants.WeatherIconPack.COOL.value -> R.drawable.clear_night_3
+                    Constants.WeatherIconPack.MINIMAL.value -> R.drawable.clear_night_2
+                    Constants.WeatherIconPack.GOOGLE_NEWS.value -> R.drawable.clear_night_4
+                    else -> R.drawable.clear_night
+                }
             }
             "02n" -> {
-                return if (Preferences.weatherIconPack == Constants.WeatherIconPack.DEFAULT.value) R.drawable.partly_cloudy_night else R.drawable.partly_cloudy_night_2
+                when (style) {
+                    Constants.WeatherIconPack.COOL.value -> R.drawable.partly_cloudy_night_3
+                    Constants.WeatherIconPack.MINIMAL.value -> R.drawable.partly_cloudy_night_2
+                    Constants.WeatherIconPack.GOOGLE_NEWS.value -> R.drawable.partly_cloudy_night_4
+                    else -> R.drawable.partly_cloudy_night
+                }
             }
             "03n" -> {
-                return if (Preferences.weatherIconPack == Constants.WeatherIconPack.DEFAULT.value) R.drawable.mostly_cloudy_night else R.drawable.mostly_cloudy_night_2
+                when (style) {
+                    Constants.WeatherIconPack.COOL.value -> R.drawable.mostly_cloudy_night_3
+                    Constants.WeatherIconPack.MINIMAL.value -> R.drawable.mostly_cloudy_night_2
+                    Constants.WeatherIconPack.GOOGLE_NEWS.value -> R.drawable.mostly_cloudy_night_4
+                    else -> R.drawable.mostly_cloudy_night
+                }
             }
             "04n" -> {
-                return if (Preferences.weatherIconPack == Constants.WeatherIconPack.DEFAULT.value) R.drawable.cloudy_weather else R.drawable.cloudy_weather_2
+                when (style) {
+                    Constants.WeatherIconPack.COOL.value -> R.drawable.cloudy_weather_3
+                    Constants.WeatherIconPack.MINIMAL.value -> R.drawable.cloudy_weather_2
+                    Constants.WeatherIconPack.GOOGLE_NEWS.value -> R.drawable.cloudy_weather_4
+                    else -> R.drawable.cloudy_weather
+                }
             }
             "09n" -> {
-                return if (Preferences.weatherIconPack == Constants.WeatherIconPack.DEFAULT.value) R.drawable.storm_weather_night else R.drawable.storm_weather_night_2
+                when (style) {
+                    Constants.WeatherIconPack.COOL.value -> R.drawable.storm_weather_night_3
+                    Constants.WeatherIconPack.MINIMAL.value -> R.drawable.storm_weather_night_2
+                    Constants.WeatherIconPack.GOOGLE_NEWS.value -> R.drawable.storm_weather_night_4
+                    else -> R.drawable.storm_weather_night
+                }
             }
             "10n" -> {
-                return if (Preferences.weatherIconPack == Constants.WeatherIconPack.DEFAULT.value) R.drawable.rainy_night else R.drawable.rainy_night_2
+                when (style) {
+                    Constants.WeatherIconPack.COOL.value -> R.drawable.rainy_night_3
+                    Constants.WeatherIconPack.MINIMAL.value -> R.drawable.rainy_night_2
+                    Constants.WeatherIconPack.GOOGLE_NEWS.value -> R.drawable.rainy_night_4
+                    else -> R.drawable.rainy_night
+                }
             }
             "11n" -> {
-                return if (Preferences.weatherIconPack == Constants.WeatherIconPack.DEFAULT.value) R.drawable.thunder_night else R.drawable.thunder_night_2
+                when (style) {
+                    Constants.WeatherIconPack.COOL.value -> R.drawable.thunder_night_3
+                    Constants.WeatherIconPack.MINIMAL.value -> R.drawable.thunder_night_2
+                    Constants.WeatherIconPack.GOOGLE_NEWS.value -> R.drawable.thunder_night_4
+                    else -> R.drawable.thunder_night
+                }
             }
             "13n" -> {
-                return if (Preferences.weatherIconPack == Constants.WeatherIconPack.DEFAULT.value) R.drawable.snow_night else R.drawable.snow_night_2
+                when (style) {
+                    Constants.WeatherIconPack.COOL.value -> R.drawable.snow_night_3
+                    Constants.WeatherIconPack.MINIMAL.value -> R.drawable.snow_night_2
+                    Constants.WeatherIconPack.GOOGLE_NEWS.value -> R.drawable.snow_night_4
+                    else -> R.drawable.snow_night
+                }
             }
             "50n" -> {
-                return if (Preferences.weatherIconPack == Constants.WeatherIconPack.DEFAULT.value) R.drawable.haze_night else R.drawable.haze_night_2
+                when (style) {
+                    Constants.WeatherIconPack.COOL.value -> R.drawable.haze_night_3
+                    Constants.WeatherIconPack.MINIMAL.value -> R.drawable.haze_night_2
+                    Constants.WeatherIconPack.GOOGLE_NEWS.value -> R.drawable.haze_night_4
+                    else -> R.drawable.haze_night
+                }
             }
             "80n" -> {
-                return if (Preferences.weatherIconPack == Constants.WeatherIconPack.DEFAULT.value) R.drawable.windy_night else R.drawable.windy_night_2
+                when (style) {
+                    Constants.WeatherIconPack.COOL.value -> R.drawable.windy_night_3
+                    Constants.WeatherIconPack.MINIMAL.value -> R.drawable.windy_night_2
+                    Constants.WeatherIconPack.GOOGLE_NEWS.value -> R.drawable.windy_night_4
+                    else -> R.drawable.windy_night
+                }
             }
             "81n" -> {
-                return if (Preferences.weatherIconPack == Constants.WeatherIconPack.DEFAULT.value) R.drawable.rain_snow_night else R.drawable.rain_snow_night_2
+                when (style) {
+                    Constants.WeatherIconPack.COOL.value -> R.drawable.rain_snow_night_3
+                    Constants.WeatherIconPack.MINIMAL.value -> R.drawable.rain_snow_night_2
+                    Constants.WeatherIconPack.GOOGLE_NEWS.value -> R.drawable.rain_snow_night_4
+                    else -> R.drawable.rain_snow_night
+                }
             }
             "82n" -> {
-                return if (Preferences.weatherIconPack == Constants.WeatherIconPack.DEFAULT.value) R.drawable.haze_weather else R.drawable.haze_weather_2
+                when (style) {
+                    Constants.WeatherIconPack.COOL.value -> R.drawable.haze_weather_3
+                    Constants.WeatherIconPack.MINIMAL.value -> R.drawable.haze_weather_2
+                    Constants.WeatherIconPack.GOOGLE_NEWS.value -> R.drawable.haze_weather_4
+                    else -> R.drawable.haze_weather
+                }
             }
             else -> {
                 return R.drawable.unknown

app/src/main/java/com/tommasoberlose/anotherwidget/models/Event.kt

@@ -1,5 +1,6 @@
 package com.tommasoberlose.anotherwidget.models
 
+import android.provider.CalendarContract
 import io.realm.RealmObject
 import java.util.Date
 
@@ -7,14 +8,18 @@ import java.util.Date
  * Created by tommaso on 05/10/17.
  */
 
-open class Event(var id: Long = 0,
-                 var eventID: Long = 0,
-            var title: String = "",
-            var startDate: Long = 0,
-            var endDate: Long = 0,
-            var calendarID: Int = 0,
-            var allDay: Boolean = false,
-            var address: String = "") : RealmObject() {
+open class Event(
+    var id: Long = 0,
+    var eventID: Long = 0,
+    var title: String = "",
+    var startDate: Long = 0,
+    var endDate: Long = 0,
+    var calendarID: Int = 0,
+    var allDay: Boolean = false,
+    var address: String = "",
+    var selfAttendeeStatus: Int = CalendarContract.Attendees.ATTENDEE_STATUS_NONE,
+    var availability: Int = CalendarContract.EventsEntity.AVAILABILITY_BUSY
+) : RealmObject() {
     override fun toString(): String {
         return "Event:\nEVENT ID: " + eventID + "\nTITLE: " + title + "\nSTART DATE: " + Date(startDate) + "\nEND DATE: " + Date(endDate) + "\nCAL ID: " + calendarID  + "\nADDRESS: " + address
     }

app/src/main/java/com/tommasoberlose/anotherwidget/receivers/ActivityDetectionReceiver.kt

@@ -8,6 +8,7 @@ import android.content.Context
 import android.content.Intent
 import android.os.Build
 import android.util.Log
+import com.chibatching.kotpref.Kotpref
 import com.google.android.gms.auth.api.signin.GoogleSignIn
 import com.google.android.gms.auth.api.signin.GoogleSignInAccount
 import com.google.android.gms.fitness.Fitness
@@ -35,15 +36,16 @@ class ActivityDetectionReceiver : BroadcastReceiver() {
             }
         } else {
             if (intent.action == Intent.ACTION_BOOT_COMPLETED || intent.action == Intent.ACTION_MY_PACKAGE_REPLACED && Preferences.showDailySteps && Build.VERSION.SDK_INT < Build.VERSION_CODES.Q || context.checkGrantedPermission(Manifest.permission.ACTIVITY_RECOGNITION)) {
-                resetDailySteps()
+                resetDailySteps(context)
                 registerFence(context)
             } else {
-                resetDailySteps()
+                resetDailySteps(context)
             }
         }
     }
 
-    private fun resetDailySteps() {
+    private fun resetDailySteps(context: Context) {
+        Kotpref.init(context)
         Preferences.googleFitSteps = -1
     }
 
@@ -54,6 +56,7 @@ class ActivityDetectionReceiver : BroadcastReceiver() {
             .build()
 
         fun registerFence(context: Context) {
+            Kotpref.init(context)
             if (Build.VERSION.SDK_INT < Build.VERSION_CODES.Q || context.checkGrantedPermission(
                     Manifest.permission.ACTIVITY_RECOGNITION)) {
                 val transitions = mutableListOf<ActivityTransition>()
@@ -116,6 +119,7 @@ class ActivityDetectionReceiver : BroadcastReceiver() {
         }
 
         fun requestDailySteps(context: Context) {
+            Kotpref.init(context)
 
             val account: GoogleSignInAccount? = GoogleSignIn.getLastSignedInAccount(context)
             if (account != null && GoogleSignIn.hasPermissions(account, FITNESS_OPTIONS)) {

app/src/main/java/com/tommasoberlose/anotherwidget/services/BatteryListenerJob.kt

@@ -52,7 +52,7 @@ class BatteryListenerJob : JobService() {
             }
         }
 
-        fun remove(context: Context) {
+        private fun remove(context: Context) {
             val js = context.getSystemService(JobScheduler::class.java)
             js?.cancel(chargingJobId)
             js?.cancel(notChargingJobId)

app/src/main/java/com/tommasoberlose/anotherwidget/services/UpdateCalendarJob.kt

@@ -0,0 +1,143 @@
+package com.tommasoberlose.anotherwidget.services
+
+import android.Manifest
+import android.content.Context
+import android.content.Intent
+import android.provider.CalendarContract
+import android.util.Log
+import androidx.core.app.JobIntentService
+import com.tommasoberlose.anotherwidget.db.EventRepository
+import com.tommasoberlose.anotherwidget.global.Preferences
+import com.tommasoberlose.anotherwidget.helpers.CalendarHelper
+import com.tommasoberlose.anotherwidget.helpers.CalendarHelper.applyFilters
+import com.tommasoberlose.anotherwidget.models.Event
+import com.tommasoberlose.anotherwidget.receivers.UpdatesReceiver
+import com.tommasoberlose.anotherwidget.ui.fragments.MainFragment
+import com.tommasoberlose.anotherwidget.ui.widgets.MainWidget
+import com.tommasoberlose.anotherwidget.utils.checkGrantedPermission
+import me.everything.providers.android.calendar.CalendarProvider
+import org.greenrobot.eventbus.EventBus
+import java.util.*
+import kotlin.Comparator
+import kotlin.collections.ArrayList
+
+class UpdateCalendarJob : JobIntentService() {
+
+    companion object {
+        private const val jobId = 1200
+
+        fun enqueueWork(context: Context, work: Intent) {
+            enqueueWork(context, UpdateCalendarJob::class.java, jobId, work)
+        }
+    }
+
+    override fun onHandleWork(intent: Intent) {
+        val eventRepository = EventRepository(this)
+        if (Preferences.showEvents) {
+            val eventList = ArrayList<Event>()
+
+            val now = Calendar.getInstance()
+            val begin = Calendar.getInstance().apply {
+                set(Calendar.MILLISECOND, 0)
+                set(Calendar.SECOND, 0)
+                set(Calendar.MINUTE, 0)
+                set(Calendar.HOUR_OF_DAY, 0)
+            }
+            val limit = Calendar.getInstance().apply {
+                timeInMillis = begin.timeInMillis
+                add(Calendar.DAY_OF_YEAR, 2)
+            }
+
+            if (!checkGrantedPermission(
+                    Manifest.permission.READ_CALENDAR
+                )
+            ) {
+                eventRepository.resetNextEventData()
+            } else {
+                try {
+                    val provider = CalendarProvider(this)
+                    val data = provider.getInstances(begin.timeInMillis, limit.timeInMillis)
+                    if (data != null) {
+                        val instances = data.list
+                        for (instance in instances) {
+                            try {
+                                val e = provider.getEvent(instance.eventId)
+                                if (e != null && !e.deleted && instance.begin <= limit.timeInMillis && now.timeInMillis < instance.end && !CalendarHelper.getFilteredCalendarIdList()
+                                        .contains(e.calendarId)
+                                ) {
+                                    if (e.allDay) {
+                                        val start = Calendar.getInstance()
+                                        start.timeInMillis = instance.begin
+                                        val end = Calendar.getInstance()
+                                        end.timeInMillis = instance.end
+                                        instance.begin =
+                                            start.timeInMillis - start.timeZone.getOffset(start.timeInMillis)
+                                        instance.end =
+                                            end.timeInMillis - end.timeZone.getOffset(end.timeInMillis)
+                                    }
+                                    eventList.add(
+                                        Event(
+                                            id = instance.id,
+                                            eventID = e.id,
+                                            title = e.title ?: "",
+                                            startDate = instance.begin,
+                                            endDate = instance.end,
+                                            calendarID = e.calendarId.toInt(),
+                                            allDay = e.allDay,
+                                            address = e.eventLocation ?: "",
+                                            selfAttendeeStatus = e.selfAttendeeStatus.toInt(),
+                                            availability = e.availability
+                                        )
+                                    )
+                                }
+                            } catch (ignored: Exception) {
+                            }
+                        }
+                    }
+
+                    val filteredEventList = eventList
+                        .applyFilters()
+
+                    if (filteredEventList.isEmpty()) {
+                        eventRepository.resetNextEventData()
+                        eventRepository.clearEvents()
+                    } else {
+                        eventList.sortWith(Comparator { event: Event, event1: Event ->
+                            val date = Calendar.getInstance().apply { timeInMillis = event.startDate }
+                            val date1 = Calendar.getInstance().apply { timeInMillis = event1.startDate }
+
+                            if (date.get(Calendar.DAY_OF_YEAR) == date1.get(Calendar.DAY_OF_YEAR) && date.get(Calendar.YEAR) == date1.get(Calendar.YEAR)) {
+                                if (event.allDay && event1.allDay) {
+                                    event1.startDate.compareTo(event.startDate)
+                                } else if (event.allDay) {
+                                    -1
+                                } else if (event1.allDay) {
+                                    1
+                                } else {
+                                    event1.startDate.compareTo(event.startDate)
+                                }
+                            } else {
+                                event1.startDate.compareTo(event.startDate)
+                            }
+                        })
+                        eventList.reverse()
+                        eventRepository.saveEvents(
+                            eventList
+                        )
+                        eventRepository.saveNextEventData(filteredEventList.first())
+                    }
+                } catch (ignored: java.lang.Exception) {
+
+                }
+            }
+        } else {
+            eventRepository.resetNextEventData()
+        }
+
+        UpdatesReceiver.setUpdates(this)
+        MainWidget.updateWidget(this)
+
+        EventBus.getDefault().post(MainFragment.UpdateUiMessageEvent())
+        eventRepository.close()
+    }
+}

app/src/main/java/com/tommasoberlose/anotherwidget/ui/activities/CustomDateActivity.kt

@@ -6,12 +6,14 @@ import android.os.Bundle
 import android.util.Log
 import android.view.View
 import androidx.appcompat.app.AppCompatActivity
+import androidx.core.content.ContextCompat
 import androidx.core.view.isVisible
 import androidx.databinding.DataBindingUtil
 import androidx.lifecycle.Observer
 import androidx.lifecycle.ViewModelProvider
 import androidx.lifecycle.lifecycleScope
 import androidx.recyclerview.widget.LinearLayoutManager
+import com.chibatching.kotpref.blockingBulk
 import com.chibatching.kotpref.bulk
 import com.tommasoberlose.anotherwidget.R
 import com.tommasoberlose.anotherwidget.databinding.ActivityCustomDateBinding
@@ -90,10 +92,14 @@ class CustomDateActivity  : AppCompatActivity() {
                     "__"
                 }
 
-                if (Preferences.isDateCapitalize) {
+                if (viewModel.isDateCapitalize.value == true) {
                     text = text.getCapWordString()
                 }
 
+                if (viewModel.isDateUppercase.value == true) {
+                    text = text.toUpperCase(Locale.getDefault())
+                }
+
                 withContext(Dispatchers.Main) {
                     action_save.isVisible = text != ERROR_STRING
                     loader.visibility = View.INVISIBLE
@@ -105,8 +111,30 @@ class CustomDateActivity  : AppCompatActivity() {
 
         viewModel.isDateCapitalize.observe(this, Observer {
             viewModel.dateInput.value = viewModel.dateInput.value
-            binding.isdCapitalizeEnabled = it
+            updateCapitalizeUi()
         })
+
+        viewModel.isDateUppercase.observe(this, Observer {
+            viewModel.dateInput.value = viewModel.dateInput.value
+            updateCapitalizeUi()
+        })
+    }
+
+    private fun updateCapitalizeUi() {
+        when {
+            viewModel.isDateUppercase.value == true -> {
+                action_capitalize.setImageDrawable(ContextCompat.getDrawable(this@CustomDateActivity, R.drawable.round_publish))
+                action_capitalize.alpha = 1f
+            }
+            viewModel.isDateCapitalize.value == true -> {
+                action_capitalize.setImageDrawable(ContextCompat.getDrawable(this@CustomDateActivity, R.drawable.ic_capitalize))
+                action_capitalize.alpha = 1f
+            }
+            else -> {
+                action_capitalize.setImageDrawable(ContextCompat.getDrawable(this@CustomDateActivity, R.drawable.round_publish))
+                action_capitalize.alpha = 0.3f
+            }
+        }
     }
 
     private fun setupListener() {
@@ -115,12 +143,29 @@ class CustomDateActivity  : AppCompatActivity() {
         }
 
         action_save.setOnClickListener {
-            Preferences.dateFormat = viewModel.dateInput.value ?: ""
+            Preferences.blockingBulk {
+                dateFormat = viewModel.dateInput.value ?: ""
+                isDateCapitalize = viewModel.isDateCapitalize.value ?: true
+                isDateUppercase = viewModel.isDateUppercase.value ?: false
+            }
             finish()
         }
 
         action_capitalize.setOnClickListener {
-            Preferences.isDateCapitalize = !Preferences.isDateCapitalize
+            when {
+                viewModel.isDateUppercase.value == true -> {
+                    viewModel.isDateCapitalize.value = false
+                    viewModel.isDateUppercase.value = false
+                }
+                viewModel.isDateCapitalize.value == true -> {
+                    viewModel.isDateCapitalize.value = false
+                    viewModel.isDateUppercase.value = true
+                }
+                else -> {
+                    viewModel.isDateCapitalize.value = true
+                    viewModel.isDateUppercase.value = false
+                }
+            }
         }
 
         action_capitalize.setOnLongClickListener {

app/src/main/java/com/tommasoberlose/anotherwidget/ui/activities/CustomLocationActivity.kt

@@ -28,6 +28,7 @@ import com.karumi.dexter.MultiplePermissionsReport
 import com.karumi.dexter.PermissionToken
 import com.karumi.dexter.listener.PermissionRequest
 import com.karumi.dexter.listener.multi.MultiplePermissionsListener
+import com.tommasoberlose.anotherwidget.components.MaterialBottomSheetDialog
 import com.tommasoberlose.anotherwidget.databinding.ActivityChooseApplicationBinding
 import com.tommasoberlose.anotherwidget.databinding.ActivityCustomLocationBinding
 import com.tommasoberlose.anotherwidget.global.Preferences
@@ -62,7 +63,11 @@ class CustomLocationActivity : AppCompatActivity() {
                 injector
                     .text(R.id.text, getString(R.string.custom_location_gps))
                     .clicked(R.id.text) {
-                        requirePermission()
+                        MaterialBottomSheetDialog(this, message = getString(R.string.background_location_warning))
+                            .setPositiveButton(getString(android.R.string.ok)) {
+                                requirePermission()
+                            }
+                            .show()
                     }
             }
             .register<Address>(R.layout.custom_location_item) { item, injector ->

app/src/main/java/com/tommasoberlose/anotherwidget/ui/fragments/CalendarTabFragment.kt

@@ -4,7 +4,7 @@ import android.Manifest
 import android.app.Activity
 import android.content.Intent
 import android.os.Bundle
-import android.util.Log
+import android.provider.CalendarContract
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
@@ -31,16 +31,15 @@ import com.tommasoberlose.anotherwidget.ui.activities.ChooseApplicationActivity
 import com.tommasoberlose.anotherwidget.ui.activities.MainActivity
 import com.tommasoberlose.anotherwidget.ui.viewmodels.MainViewModel
 import com.tommasoberlose.anotherwidget.helpers.CalendarHelper
-import com.tommasoberlose.anotherwidget.helpers.DateHelper
+import com.tommasoberlose.anotherwidget.helpers.IntentHelper
 import com.tommasoberlose.anotherwidget.helpers.SettingsStringHelper
-import com.tommasoberlose.anotherwidget.ui.activities.CustomDateActivity
 import com.tommasoberlose.anotherwidget.utils.checkGrantedPermission
+import com.tommasoberlose.anotherwidget.utils.isDefaultSet
 import com.tommasoberlose.anotherwidget.utils.toast
 import kotlinx.android.synthetic.main.fragment_calendar_settings.*
 import kotlinx.android.synthetic.main.fragment_calendar_settings.scrollView
 import kotlinx.coroutines.delay
 import kotlinx.coroutines.launch
-import java.util.*
 import kotlin.Comparator
 
 class CalendarTabFragment : Fragment() {
@@ -74,6 +73,11 @@ class CalendarTabFragment : Fragment() {
     override fun onActivityCreated(savedInstanceState: Bundle?) {
         super.onActivityCreated(savedInstanceState)
 
+        show_all_day_toggle.isChecked = Preferences.calendarAllDay
+        show_only_busy_events_toggle.isChecked = Preferences.showOnlyBusyEvents
+        show_diff_time_toggle.isChecked = Preferences.showDiffTime
+        show_multiple_events_toggle.isChecked = Preferences.showNextEvent
+
         setupListener()
     }
 
@@ -82,6 +86,7 @@ class CalendarTabFragment : Fragment() {
         viewModel: MainViewModel
     ) {
         binding.isCalendarEnabled = Preferences.showEvents
+        binding.isDiffEnabled = Preferences.showDiffTime || !Preferences.showEvents
 
         viewModel.showEvents.observe(viewLifecycleOwner, Observer {
             maintainScrollPosition {
@@ -92,8 +97,10 @@ class CalendarTabFragment : Fragment() {
                 } else {
                     CalendarHelper.removeEventUpdatesAndroidN(requireContext())
                 }
+                binding.isDiffEnabled = Preferences.showDiffTime || !it
             }
             checkReadEventsPermission()
+            updateCalendar()
         })
 
         viewModel.calendarAllDay.observe(viewLifecycleOwner, Observer {
@@ -101,14 +108,6 @@ class CalendarTabFragment : Fragment() {
                 all_day_label?.text =
                     if (it) getString(R.string.settings_visible) else getString(R.string.settings_not_visible)
             }
-            checkReadEventsPermission()
-        })
-
-        viewModel.showDeclinedEvents.observe(viewLifecycleOwner, Observer {
-            maintainScrollPosition {
-                show_declined_events_label?.text = if (it) getString(R.string.settings_visible) else getString(R.string.settings_not_visible)
-            }
-            checkReadEventsPermission()
         })
 
         viewModel.secondRowInformation.observe(viewLifecycleOwner, Observer {
@@ -120,6 +119,7 @@ class CalendarTabFragment : Fragment() {
         viewModel.showDiffTime.observe(viewLifecycleOwner, Observer {
             maintainScrollPosition {
                 show_diff_time_label?.text = if (it) getString(R.string.settings_visible) else getString(R.string.settings_not_visible)
+                binding.isDiffEnabled = it || !Preferences.showEvents
             }
         })
 
@@ -138,7 +138,7 @@ class CalendarTabFragment : Fragment() {
             maintainScrollPosition {
                 show_until_label?.text = getString(SettingsStringHelper.getShowUntilString(it))
             }
-            checkReadEventsPermission()
+            updateCalendar()
         })
 
         viewModel.showNextEvent.observe(viewLifecycleOwner, Observer {
@@ -150,7 +150,18 @@ class CalendarTabFragment : Fragment() {
 
         viewModel.calendarAppName.observe(viewLifecycleOwner, Observer {
             maintainScrollPosition {
-                calendar_app_label?.text = if (it != "") it else getString(R.string.default_calendar_app)
+                calendar_app_label?.text = when {
+                    Preferences.clockAppName != "" -> Preferences.clockAppName
+                    else -> {
+                        if (IntentHelper.getCalendarIntent(requireContext()).isDefaultSet(requireContext())) {
+                            getString(
+                                R.string.default_calendar_app
+                            )
+                        } else {
+                            getString(R.string.nothing)
+                        }
+                    }
+                }
             }
         })
 
@@ -222,7 +233,7 @@ class CalendarTabFragment : Fragment() {
 
                 dialog.addOnMultipleSelectItemListener { values ->
                     CalendarHelper.filterCalendar(calendarSelectorList.map { it.id }.filter { !values.contains(it) })
-                    checkReadEventsPermission()
+                    updateCalendar()
                 }.show()
             } else {
                 activity?.toast(getString(R.string.calendar_settings_list_error))
@@ -231,50 +242,94 @@ class CalendarTabFragment : Fragment() {
 
         action_show_all_day.setOnClickListener {
             if (Preferences.showEvents) {
-                BottomSheetMenu<Boolean>(requireContext(), header = getString(R.string.settings_all_day_title)).setSelectedValue(Preferences.calendarAllDay)
-                    .addItem(getString(R.string.settings_visible), true)
-                    .addItem(getString(R.string.settings_not_visible), false)
-                    .addOnSelectItemListener { value ->
-                        Preferences.calendarAllDay = value
-                    }.show()
+                show_all_day_toggle.isChecked = !show_all_day_toggle.isChecked
             }
         }
 
-        action_show_declined_events.setOnClickListener {
+        show_all_day_toggle.setOnCheckedChangeListener { _, isChecked ->
             if (Preferences.showEvents) {
-                BottomSheetMenu<Boolean>(requireContext(), header = getString(R.string.settings_show_declined_events_title)).setSelectedValue(Preferences.showDeclinedEvents)
-                    .addItem(getString(R.string.settings_visible), true)
-                    .addItem(getString(R.string.settings_not_visible), false)
-                    .addOnSelectItemListener { value ->
-                        Preferences.showDeclinedEvents = value
-                    }.show()
+                Preferences.calendarAllDay = isChecked
+                updateCalendar()
+            }
+        }
+
+        action_change_attendee_filter.setOnClickListener {
+            if (Preferences.showEvents) {
+                val selectedValues = emptyList<Int>().toMutableList()
+                if (Preferences.showDeclinedEvents) {
+                    selectedValues.add(CalendarContract.Attendees.ATTENDEE_STATUS_DECLINED)
+                }
+                if (Preferences.showInvitedEvents) {
+                    selectedValues.add(CalendarContract.Attendees.ATTENDEE_STATUS_INVITED)
+                }
+                if (Preferences.showAcceptedEvents) {
+                    selectedValues.add(CalendarContract.Attendees.ATTENDEE_STATUS_ACCEPTED)
+                }
+
+                val dialog = BottomSheetMenu<Int>(requireContext(), header = getString(R.string.settings_attendee_status_title), isMultiSelection = true)
+                    .setSelectedValues(selectedValues)
+
+                dialog.addItem(
+                    getString(R.string.attendee_status_invited),
+                    CalendarContract.Attendees.ATTENDEE_STATUS_INVITED
+                )
+                dialog.addItem(
+                    getString(R.string.attendee_status_accepted),
+                    CalendarContract.Attendees.ATTENDEE_STATUS_ACCEPTED
+                )
+                dialog.addItem(
+                    getString(R.string.attendee_status_declined),
+                    CalendarContract.Attendees.ATTENDEE_STATUS_DECLINED
+                )
+
+                dialog.addOnMultipleSelectItemListener { values ->
+                    Preferences.showDeclinedEvents = values.contains(CalendarContract.Attendees.ATTENDEE_STATUS_DECLINED)
+                    Preferences.showAcceptedEvents = values.contains(CalendarContract.Attendees.ATTENDEE_STATUS_ACCEPTED)
+                    Preferences.showInvitedEvents = values.contains(CalendarContract.Attendees.ATTENDEE_STATUS_INVITED)
+                    updateCalendar()
+                }.show()
+            }
+        }
+
+        action_show_only_busy_events.setOnClickListener {
+            if (Preferences.showEvents) {
+                show_only_busy_events_toggle.isChecked = !show_only_busy_events_toggle.isChecked
+            }
+        }
+
+        show_only_busy_events_toggle.setOnCheckedChangeListener { _, isChecked ->
+            if (Preferences.showEvents) {
+                Preferences.showOnlyBusyEvents = isChecked
+                updateCalendar()
             }
         }
 
         action_show_multiple_events.setOnClickListener {
             if (Preferences.showEvents) {
-                BottomSheetMenu<Boolean>(requireContext(), header = getString(R.string.settings_show_multiple_events_title)).setSelectedValue(Preferences.showNextEvent)
-                    .addItem(getString(R.string.settings_visible), true)
-                    .addItem(getString(R.string.settings_not_visible), false)
-                    .addOnSelectItemListener { value ->
-                        Preferences.showNextEvent = value
-                    }.show()
+                show_multiple_events_toggle.isChecked = !show_multiple_events_toggle.isChecked
+            }
+        }
+
+        show_multiple_events_toggle.setOnCheckedChangeListener { _, isChecked ->
+            if (Preferences.showEvents) {
+                Preferences.showNextEvent = isChecked
             }
         }
 
         action_show_diff_time.setOnClickListener {
             if (Preferences.showEvents) {
-                BottomSheetMenu<Boolean>(requireContext(), header = getString(R.string.settings_show_diff_time_title)).setSelectedValue(Preferences.showDiffTime)
-                    .addItem(getString(R.string.settings_visible), true)
-                    .addItem(getString(R.string.settings_not_visible), false)
-                    .addOnSelectItemListener { value ->
-                        Preferences.showDiffTime = value
-                    }.show()
+                show_diff_time_toggle.isChecked = !show_diff_time_toggle.isChecked
+            }
+        }
+
+        show_diff_time_toggle.setOnCheckedChangeListener { _, isChecked ->
+            if (Preferences.showEvents) {
+                Preferences.showDiffTime = isChecked
             }
         }
 
         action_widget_update_frequency.setOnClickListener {
-            if (Preferences.showEvents) {
+            if (Preferences.showEvents && Preferences.showDiffTime) {
                 BottomSheetMenu<Int>(requireContext(), header = getString(R.string.settings_widget_update_frequency_title), message = getString(R.string.settings_widget_update_frequency_subtitle)).setSelectedValue(Preferences.widgetUpdateFrequency)
                     .addItem(getString(R.string.settings_widget_update_frequency_high), Constants.WidgetUpdateFrequency.HIGH.value)
                     .addItem(getString(R.string.settings_widget_update_frequency_default), Constants.WidgetUpdateFrequency.DEFAULT.value)
@@ -300,7 +355,7 @@ class CalendarTabFragment : Fragment() {
         action_show_until.setOnClickListener {
             if (Preferences.showEvents) {
                 val dialog = BottomSheetMenu<Int>(requireContext(), header = getString(R.string.settings_show_until_title)).setSelectedValue(Preferences.showUntil)
-                intArrayOf(6,7,0,1,2,3).forEach {
+                intArrayOf(6,7,0,1,2,3, 4, 5).forEach {
                     dialog.addItem(getString(SettingsStringHelper.getShowUntilString(it)), it)
                 }
                 dialog.addOnSelectItemListener { value ->
@@ -329,7 +384,6 @@ class CalendarTabFragment : Fragment() {
         if (activity?.checkGrantedPermission(Manifest.permission.READ_CALENDAR) == true) {
             show_events_label?.text = if (showEvents) getString(R.string.show_events_visible) else getString(R.string.show_events_not_visible)
             read_calendar_permission_alert?.isVisible = false
-            CalendarHelper.updateEventList(requireContext())
         } else {
             show_events_label?.text = if (showEvents) getString(R.string.description_permission_calendar) else getString(R.string.show_events_not_visible)
             read_calendar_permission_alert?.isVisible = showEvents
@@ -339,6 +393,12 @@ class CalendarTabFragment : Fragment() {
         }
     }
 
+    private fun updateCalendar() {
+        if (activity?.checkGrantedPermission(Manifest.permission.READ_CALENDAR) == true) {
+            CalendarHelper.updateEventList(requireContext())
+        }
+    }
+
     private fun requirePermission() {
         Dexter.withContext(requireContext())
             .withPermissions(
@@ -386,11 +446,11 @@ class CalendarTabFragment : Fragment() {
     }
 
     private fun maintainScrollPosition(callback: () -> Unit) {
-        val scrollPosition = scrollView.scrollY
+        scrollView.isScrollable = false
         callback.invoke()
         lifecycleScope.launch {
             delay(200)
-            scrollView.smoothScrollTo(0, scrollPosition)
+            scrollView.isScrollable = true
         }
     }
 }

app/src/main/java/com/tommasoberlose/anotherwidget/ui/fragments/ClockTabFragment.kt

@@ -8,6 +8,8 @@ import android.content.Intent
 import android.content.IntentFilter
 import android.content.pm.PackageManager
 import android.os.Bundle
+import android.text.format.DateFormat
+import android.util.Log
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
@@ -21,6 +23,7 @@ import com.chibatching.kotpref.bulk
 import com.tommasoberlose.anotherwidget.R
 import com.tommasoberlose.anotherwidget.components.BottomSheetColorPicker
 import com.tommasoberlose.anotherwidget.components.BottomSheetMenu
+import com.tommasoberlose.anotherwidget.components.FixedFocusScrollView
 import com.tommasoberlose.anotherwidget.databinding.FragmentClockSettingsBinding
 import com.tommasoberlose.anotherwidget.global.Constants
 import com.tommasoberlose.anotherwidget.global.Preferences
@@ -29,9 +32,12 @@ import com.tommasoberlose.anotherwidget.helpers.AlarmHelper
 import com.tommasoberlose.anotherwidget.helpers.ColorHelper
 import com.tommasoberlose.anotherwidget.helpers.ColorHelper.toHexValue
 import com.tommasoberlose.anotherwidget.helpers.ColorHelper.toIntValue
+import com.tommasoberlose.anotherwidget.helpers.IntentHelper
 import com.tommasoberlose.anotherwidget.ui.activities.ChooseApplicationActivity
 import com.tommasoberlose.anotherwidget.ui.activities.MainActivity
 import com.tommasoberlose.anotherwidget.ui.viewmodels.MainViewModel
+import com.tommasoberlose.anotherwidget.utils.isDarkTheme
+import com.tommasoberlose.anotherwidget.utils.isDefaultSet
 import kotlinx.android.synthetic.main.fragment_clock_settings.*
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.delay
@@ -48,6 +54,7 @@ class ClockTabFragment : Fragment() {
 
     private lateinit var viewModel: MainViewModel
     private lateinit var colors: IntArray
+    private lateinit var binding: FragmentClockSettingsBinding
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
@@ -59,7 +66,7 @@ class ClockTabFragment : Fragment() {
     ): View {
 
         viewModel = ViewModelProvider(activity as MainActivity).get(MainViewModel::class.java)
-        val binding = DataBindingUtil.inflate<FragmentClockSettingsBinding>(inflater, R.layout.fragment_clock_settings, container, false)
+        binding = DataBindingUtil.inflate<FragmentClockSettingsBinding>(inflater, R.layout.fragment_clock_settings, container, false)
 
         subscribeUi(binding, viewModel)
 
@@ -72,6 +79,8 @@ class ClockTabFragment : Fragment() {
     override fun onActivityCreated(savedInstanceState: Bundle?) {
         super.onActivityCreated(savedInstanceState)
 
+        ampm_indicator_toggle.isChecked = Preferences.showAMPMIndicator
+
         lifecycleScope.launch(Dispatchers.IO) {
             val lazyColors = requireContext().resources.getIntArray(R.array.material_colors)
             withContext(Dispatchers.Main) {
@@ -86,6 +95,8 @@ class ClockTabFragment : Fragment() {
         viewModel: MainViewModel
     ) {
         binding.isClockVisible = Preferences.showClock
+        binding.is24Format = DateFormat.is24HourFormat(requireContext())
+        binding.isDarkModeEnabled = activity?.isDarkTheme() == true
 
         viewModel.showBigClockWarning.observe(viewLifecycleOwner, Observer {
             large_clock_warning?.isVisible = it
@@ -118,7 +129,18 @@ class ClockTabFragment : Fragment() {
                     clock_text_color_label?.text = getString(R.string.transparent)
                 } else {
                     clock_text_color_label?.text =
-                        "#%s".format(Integer.toHexString(ColorHelper.getClockFontColor())).toUpperCase()
+                        "#%s".format(Integer.toHexString(ColorHelper.getClockFontColor(activity?.isDarkTheme() == true))).toUpperCase()
+                }
+            }
+        })
+
+        viewModel.clockTextColorDark.observe(viewLifecycleOwner, Observer {
+            maintainScrollPosition {
+                if (Preferences.clockTextAlphaDark == "00") {
+                    clock_text_color_label?.text = getString(R.string.transparent)
+                } else {
+                    clock_text_color_label?.text =
+                        "#%s".format(Integer.toHexString(ColorHelper.getClockFontColor(activity?.isDarkTheme() == true))).toUpperCase()
                 }
             }
         })
@@ -129,7 +151,18 @@ class ClockTabFragment : Fragment() {
                     clock_text_color_label?.text = getString(R.string.transparent)
                 } else {
                     clock_text_color_label?.text =
-                        "#%s".format(Integer.toHexString(ColorHelper.getClockFontColor())).toUpperCase()
+                        "#%s".format(Integer.toHexString(ColorHelper.getClockFontColor(activity?.isDarkTheme() == true))).toUpperCase()
+                }
+            }
+        })
+
+        viewModel.clockTextAlphaDark.observe(viewLifecycleOwner, Observer {
+            maintainScrollPosition {
+                if (Preferences.clockTextAlphaDark == "00") {
+                    clock_text_color_label?.text = getString(R.string.transparent)
+                } else {
+                    clock_text_color_label?.text =
+                        "#%s".format(Integer.toHexString(ColorHelper.getClockFontColor(activity?.isDarkTheme() == true))).toUpperCase()
                 }
             }
         })
@@ -147,8 +180,18 @@ class ClockTabFragment : Fragment() {
 
         viewModel.clockAppName.observe(viewLifecycleOwner, Observer {
             maintainScrollPosition {
-                clock_app_label?.text =
-                    if (Preferences.clockAppName != "") Preferences.clockAppName else getString(R.string.default_clock_app)
+                clock_app_label?.text = when {
+                    Preferences.clockAppName != "" -> Preferences.clockAppName
+                    else -> {
+                        if (IntentHelper.getClockIntent(requireContext()).isDefaultSet(requireContext())) {
+                            getString(
+                                R.string.default_clock_app
+                            )
+                        } else {
+                            getString(R.string.nothing)
+                        }
+                    }
+                }
             }
         })
     }
@@ -167,57 +210,97 @@ class ClockTabFragment : Fragment() {
         }
 
         action_clock_text_size.setOnClickListener {
-            val dialog = BottomSheetMenu<Float>(requireContext(), header = getString(R.string.settings_clock_text_size_title)).setSelectedValue(Preferences.clockTextSize)
-            (46 downTo 12).filter { it % 2 == 0 }.forEach {
-                dialog.addItem("${it}sp", it.toFloat())
+            if (Preferences.showClock) {
+                val dialog = BottomSheetMenu<Float>(
+                    requireContext(),
+                    header = getString(R.string.settings_clock_text_size_title)
+                ).setSelectedValue(Preferences.clockTextSize)
+                (46 downTo 12).filter { it % 2 == 0 }.forEach {
+                    dialog.addItem("${it}sp", it.toFloat())
+                }
+                dialog.addOnSelectItemListener { value ->
+                    Preferences.clockTextSize = value
+                }.show()
             }
-            dialog.addOnSelectItemListener { value ->
-                Preferences.clockTextSize = value
-            }.show()
         }
 
         action_ampm_indicator_size.setOnClickListener {
-            BottomSheetMenu<Boolean>(requireContext(), header = getString(R.string.settings_ampm_indicator_title)).setSelectedValue(Preferences.showAMPMIndicator)
-                .addItem(getString(R.string.settings_visible), true)
-                .addItem(getString(R.string.settings_not_visible), false)
-                .addOnSelectItemListener { value ->
-                    Preferences.showAMPMIndicator = value
-                }.show()
+            if (Preferences.showClock) {
+                ampm_indicator_toggle.isChecked = !ampm_indicator_toggle.isChecked
+            }
+        }
+
+        ampm_indicator_toggle.setOnCheckedChangeListener { _, isChecked ->
+            if (Preferences.showClock) {
+                Preferences.showAMPMIndicator = isChecked
+            }
         }
 
         action_clock_text_color.setOnClickListener {
-            BottomSheetColorPicker(requireContext(),
-                colors = colors,
-                header = getString(R.string.settings_font_color_title),
-                getSelected = ColorHelper::getClockFontColorRgb,
-                onColorSelected = { color: Int ->
-                    val colorString = Integer.toHexString(color)
-                    Preferences.clockTextColor = "#" + if (colorString.length > 6) colorString.substring(2) else colorString
-                },
-                showAlphaSelector = true,
-                alpha = Preferences.clockTextAlpha.toIntValue(),
-                onAlphaChangeListener = { alpha ->
-                    Preferences.clockTextAlpha = alpha.toHexValue()
-                }
-            ).show()
+            if (Preferences.showClock) {
+                BottomSheetColorPicker(requireContext(),
+                    colors = colors,
+                    header = getString(R.string.settings_font_color_title),
+                    getSelected = { ColorHelper.getClockFontColorRgb(activity?.isDarkTheme() == true) },
+                    onColorSelected = { color: Int ->
+                        val colorString = Integer.toHexString(color)
+                        if (activity?.isDarkTheme() == true) {
+                            Preferences.clockTextColorDark =
+                                "#" + if (colorString.length > 6) colorString.substring(2) else colorString
+                        } else {
+                            Preferences.clockTextColor =
+                                "#" + if (colorString.length > 6) colorString.substring(2) else colorString
+                        }
+                    },
+                    showAlphaSelector = true,
+                    alpha = if (activity?.isDarkTheme() == true) Preferences.clockTextAlphaDark.toIntValue() else Preferences.clockTextAlpha.toIntValue(),
+                    onAlphaChangeListener = { alpha ->
+                        if (activity?.isDarkTheme() == true) {
+                            Preferences.clockTextAlphaDark = alpha.toHexValue()
+                        } else {
+                            Preferences.clockTextAlpha = alpha.toHexValue()
+                        }
+                    }
+                ).show()
+            }
         }
 
         action_clock_bottom_margin_size.setOnClickListener {
-            BottomSheetMenu<Int>(requireContext(), header = getString(R.string.settings_clock_bottom_margin_title)).setSelectedValue(Preferences.clockBottomMargin)
-                .addItem(getString(R.string.settings_clock_bottom_margin_subtitle_none), Constants.ClockBottomMargin.NONE.value)
-                .addItem(getString(R.string.settings_clock_bottom_margin_subtitle_small), Constants.ClockBottomMargin.SMALL.value)
-                .addItem(getString(R.string.settings_clock_bottom_margin_subtitle_medium), Constants.ClockBottomMargin.MEDIUM.value)
-                .addItem(getString(R.string.settings_clock_bottom_margin_subtitle_large), Constants.ClockBottomMargin.LARGE.value)
-                .addOnSelectItemListener { value ->
-                    Preferences.clockBottomMargin = value
-                }.show()
+            if (Preferences.showClock) {
+                BottomSheetMenu<Int>(
+                    requireContext(),
+                    header = getString(R.string.settings_clock_bottom_margin_title)
+                ).setSelectedValue(Preferences.clockBottomMargin)
+                    .addItem(
+                        getString(R.string.settings_clock_bottom_margin_subtitle_none),
+                        Constants.ClockBottomMargin.NONE.value
+                    )
+                    .addItem(
+                        getString(R.string.settings_clock_bottom_margin_subtitle_small),
+                        Constants.ClockBottomMargin.SMALL.value
+                    )
+                    .addItem(
+                        getString(R.string.settings_clock_bottom_margin_subtitle_medium),
+                        Constants.ClockBottomMargin.MEDIUM.value
+                    )
+                    .addItem(
+                        getString(R.string.settings_clock_bottom_margin_subtitle_large),
+                        Constants.ClockBottomMargin.LARGE.value
+                    )
+                    .addOnSelectItemListener { value ->
+                        Preferences.clockBottomMargin = value
+                    }.show()
+            }
         }
 
         action_clock_app.setOnClickListener {
             if (Preferences.showClock) {
-                startActivityForResult(Intent(requireContext(), ChooseApplicationActivity::class.java),
-                    RequestCode.CLOCK_APP_REQUEST_CODE.code
-                )
+                if (Preferences.showClock) {
+                    startActivityForResult(
+                        Intent(requireContext(), ChooseApplicationActivity::class.java),
+                        RequestCode.CLOCK_APP_REQUEST_CODE.code
+                    )
+                }
             }
         }
     }
@@ -232,12 +315,17 @@ class ClockTabFragment : Fragment() {
         super.onActivityResult(requestCode, resultCode, data)
     }
 
+    override fun onResume() {
+        binding.is24Format = DateFormat.is24HourFormat(requireContext())
+        super.onResume()
+    }
+
     private fun maintainScrollPosition(callback: () -> Unit) {
-        val scrollPosition = scrollView.scrollY
+        scrollView.isScrollable = false
         callback.invoke()
         lifecycleScope.launch {
             delay(200)
-            scrollView.smoothScrollTo(0, scrollPosition)
+            scrollView.isScrollable = true
         }
     }
 }

app/src/main/java/com/tommasoberlose/anotherwidget/ui/fragments/GeneralTabFragment.kt

@@ -12,10 +12,12 @@ import androidx.fragment.app.Fragment
 import androidx.lifecycle.Observer
 import androidx.lifecycle.ViewModelProvider
 import androidx.lifecycle.lifecycleScope
+import com.chibatching.kotpref.blockingBulk
 import com.tommasoberlose.anotherwidget.R
 import com.tommasoberlose.anotherwidget.components.BottomSheetColorPicker
 import com.tommasoberlose.anotherwidget.components.BottomSheetMenu
 import com.tommasoberlose.anotherwidget.databinding.FragmentGeneralSettingsBinding
+import com.tommasoberlose.anotherwidget.global.Constants
 import com.tommasoberlose.anotherwidget.global.Preferences
 import com.tommasoberlose.anotherwidget.global.RequestCode
 import com.tommasoberlose.anotherwidget.helpers.ColorHelper
@@ -26,7 +28,10 @@ import com.tommasoberlose.anotherwidget.helpers.SettingsStringHelper
 import com.tommasoberlose.anotherwidget.ui.activities.CustomDateActivity
 import com.tommasoberlose.anotherwidget.ui.activities.MainActivity
 import com.tommasoberlose.anotherwidget.ui.viewmodels.MainViewModel
+import com.tommasoberlose.anotherwidget.utils.isDarkTheme
+import kotlinx.android.synthetic.main.fragment_clock_settings.*
 import kotlinx.android.synthetic.main.fragment_general_settings.*
+import kotlinx.android.synthetic.main.fragment_general_settings.scrollView
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.delay
 import kotlinx.coroutines.launch
@@ -60,6 +65,7 @@ class GeneralTabFragment : Fragment() {
 
         binding.lifecycleOwner = this
         binding.viewModel = viewModel
+        binding.isDarkModeEnabled = activity?.isDarkTheme() == true
 
         return binding.root
     }
@@ -67,6 +73,8 @@ class GeneralTabFragment : Fragment() {
     override fun onActivityCreated(savedInstanceState: Bundle?) {
         super.onActivityCreated(savedInstanceState)
 
+        show_dividers_toggle.isChecked = Preferences.showDividers
+
         setupListener()
         lifecycleScope.launch(Dispatchers.IO) {
             val lazyColors = requireContext().resources.getIntArray(R.array.material_colors)
@@ -100,7 +108,18 @@ class GeneralTabFragment : Fragment() {
                     font_color_label?.text = getString(R.string.transparent)
                 } else {
                     font_color_label?.text =
-                        "#%s".format(Integer.toHexString(ColorHelper.getFontColor())).toUpperCase()
+                        "#%s".format(Integer.toHexString(ColorHelper.getFontColor(activity?.isDarkTheme() == true))).toUpperCase()
+                }
+            }
+        })
+
+        viewModel.textGlobalColorDark.observe(viewLifecycleOwner, Observer {
+            maintainScrollPosition {
+                if (Preferences.textGlobalAlphaDark == "00") {
+                    font_color_label?.text = getString(R.string.transparent)
+                } else {
+                    font_color_label?.text =
+                        "#%s".format(Integer.toHexString(ColorHelper.getFontColor(activity?.isDarkTheme() == true))).toUpperCase()
                 }
             }
         })
@@ -111,7 +130,18 @@ class GeneralTabFragment : Fragment() {
                     font_color_label?.text = getString(R.string.transparent)
                 } else {
                     font_color_label?.text =
-                        "#%s".format(Integer.toHexString(ColorHelper.getFontColor())).toUpperCase()
+                        "#%s".format(Integer.toHexString(ColorHelper.getFontColor(activity?.isDarkTheme() == true))).toUpperCase()
+                }
+            }
+        })
+
+        viewModel.textGlobalAlphaDark.observe(viewLifecycleOwner, Observer {
+            maintainScrollPosition {
+                if (Preferences.textGlobalAlphaDark == "00") {
+                    font_color_label?.text = getString(R.string.transparent)
+                } else {
+                    font_color_label?.text =
+                        "#%s".format(Integer.toHexString(ColorHelper.getFontColor(activity?.isDarkTheme() == true))).toUpperCase()
                 }
             }
         })
@@ -122,7 +152,18 @@ class GeneralTabFragment : Fragment() {
                     secondary_font_color_label?.text = getString(R.string.transparent)
                 } else {
                     secondary_font_color_label?.text =
-                        "#%s".format(Integer.toHexString(ColorHelper.getSecondaryFontColor())).toUpperCase()
+                        "#%s".format(Integer.toHexString(ColorHelper.getSecondaryFontColor(activity?.isDarkTheme() == true))).toUpperCase()
+                }
+            }
+        })
+
+        viewModel.textSecondaryColorDark.observe(viewLifecycleOwner, Observer {
+            maintainScrollPosition {
+                if (Preferences.textSecondaryAlphaDark == "00") {
+                    secondary_font_color_label?.text = getString(R.string.transparent)
+                } else {
+                    secondary_font_color_label?.text =
+                        "#%s".format(Integer.toHexString(ColorHelper.getSecondaryFontColor(activity?.isDarkTheme() == true))).toUpperCase()
                 }
             }
         })
@@ -133,7 +174,29 @@ class GeneralTabFragment : Fragment() {
                     secondary_font_color_label?.text = getString(R.string.transparent)
                 } else {
                     secondary_font_color_label?.text =
-                        "#%s".format(Integer.toHexString(ColorHelper.getSecondaryFontColor())).toUpperCase()
+                        "#%s".format(Integer.toHexString(ColorHelper.getSecondaryFontColor(activity?.isDarkTheme() == true))).toUpperCase()
+                }
+            }
+        })
+
+        viewModel.textSecondaryAlphaDark.observe(viewLifecycleOwner, Observer {
+            maintainScrollPosition {
+                if (Preferences.textSecondaryAlphaDark == "00") {
+                    secondary_font_color_label?.text = getString(R.string.transparent)
+                } else {
+                    secondary_font_color_label?.text =
+                        "#%s".format(Integer.toHexString(ColorHelper.getSecondaryFontColor(activity?.isDarkTheme() == true))).toUpperCase()
+                }
+            }
+        })
+
+        viewModel.secondRowTopMargin.observe(viewLifecycleOwner, Observer {
+            maintainScrollPosition {
+                second_row_top_margin_label?.text = when (it) {
+                    Constants.SecondRowTopMargin.NONE.value -> getString(R.string.settings_clock_bottom_margin_subtitle_none)
+                    Constants.SecondRowTopMargin.SMALL.value -> getString(R.string.settings_clock_bottom_margin_subtitle_small)
+                    Constants.SecondRowTopMargin.LARGE.value -> getString(R.string.settings_clock_bottom_margin_subtitle_large)
+                    else -> getString(R.string.settings_clock_bottom_margin_subtitle_medium)
                 }
             }
         })
@@ -144,7 +207,18 @@ class GeneralTabFragment : Fragment() {
                     background_color_label?.text = getString(R.string.transparent)
                 } else {
                     background_color_label?.text =
-                        "#%s".format(Integer.toHexString(ColorHelper.getBackgroundColor())).toUpperCase()
+                        "#%s".format(Integer.toHexString(ColorHelper.getBackgroundColor(activity?.isDarkTheme() == true))).toUpperCase()
+                }
+            }
+        })
+
+        viewModel.backgroundCardColorDark.observe(viewLifecycleOwner, Observer {
+            maintainScrollPosition {
+                if (Preferences.backgroundCardAlphaDark == "00") {
+                    background_color_label?.text = getString(R.string.transparent)
+                } else {
+                    background_color_label?.text =
+                        "#%s".format(Integer.toHexString(ColorHelper.getBackgroundColor(activity?.isDarkTheme() == true))).toUpperCase()
                 }
             }
         })
@@ -155,14 +229,37 @@ class GeneralTabFragment : Fragment() {
                     background_color_label?.text = getString(R.string.transparent)
                 } else {
                     background_color_label?.text =
-                        "#%s".format(Integer.toHexString(ColorHelper.getBackgroundColor())).toUpperCase()
+                        "#%s".format(Integer.toHexString(ColorHelper.getBackgroundColor(activity?.isDarkTheme() == true))).toUpperCase()
+                }
+            }
+        })
+
+        viewModel.backgroundCardAlphaDark.observe(viewLifecycleOwner, Observer {
+            maintainScrollPosition {
+                if (Preferences.backgroundCardAlphaDark == "00") {
+                    background_color_label?.text = getString(R.string.transparent)
+                } else {
+                    background_color_label?.text =
+                        "#%s".format(Integer.toHexString(ColorHelper.getBackgroundColor(activity?.isDarkTheme() == true))).toUpperCase()
                 }
             }
         })
 
         viewModel.textShadow.observe(viewLifecycleOwner, Observer {
             maintainScrollPosition {
-                text_shadow_label?.text = getString(SettingsStringHelper.getTextShadowString(it))
+                if (activity?.isDarkTheme() != true) {
+                    text_shadow_label?.text =
+                        getString(SettingsStringHelper.getTextShadowString(it))
+                }
+            }
+        })
+
+        viewModel.textShadowDark.observe(viewLifecycleOwner, Observer {
+            maintainScrollPosition {
+                if (activity?.isDarkTheme() == true) {
+                    text_shadow_label?.text =
+                        getString(SettingsStringHelper.getTextShadowString(it))
+                }
             }
         })
 
@@ -186,15 +283,6 @@ class GeneralTabFragment : Fragment() {
         })
     }
 
-    private fun maintainScrollPosition(callback: () -> Unit) {
-        val scrollPosition = scrollView.scrollY
-        callback.invoke()
-        lifecycleScope.launch {
-            delay(200)
-            scrollView.smoothScrollTo(0, scrollPosition)
-        }
-    }
-
     private fun setupListener() {
         action_main_text_size.setOnClickListener {
             val dialog = BottomSheetMenu<Float>(requireContext(), header = getString(R.string.title_main_text_size)).setSelectedValue(Preferences.textMainSize)
@@ -220,15 +308,23 @@ class GeneralTabFragment : Fragment() {
             BottomSheetColorPicker(requireContext(),
                 colors = colors,
                 header = getString(R.string.settings_font_color_title),
-                getSelected = ColorHelper::getFontColorRgb,
+                getSelected = { ColorHelper.getFontColorRgb(activity?.isDarkTheme() == true) },
                 onColorSelected = { color: Int ->
                     val colorString = Integer.toHexString(color)
-                    Preferences.textGlobalColor = "#" + if (colorString.length > 6) colorString.substring(2) else colorString
+                    if (activity?.isDarkTheme() == true) {
+                        Preferences.textGlobalColorDark = "#" + if (colorString.length > 6) colorString.substring(2) else colorString
+                    } else {
+                        Preferences.textGlobalColor = "#" + if (colorString.length > 6) colorString.substring(2) else colorString
+                    }
                 },
                 showAlphaSelector = true,
-                alpha = Preferences.textGlobalAlpha.toIntValue(),
+                alpha = if (activity?.isDarkTheme() == true) Preferences.textGlobalAlphaDark.toIntValue() else Preferences.textGlobalAlpha.toIntValue(),
                 onAlphaChangeListener = { alpha ->
-                    Preferences.textGlobalAlpha = alpha.toHexValue()
+                    if (activity?.isDarkTheme() == true) {
+                        Preferences.textGlobalAlphaDark = alpha.toHexValue()
+                    } else {
+                        Preferences.textGlobalAlpha = alpha.toHexValue()
+                    }
                 }
             ).show()
         }
@@ -237,64 +333,122 @@ class GeneralTabFragment : Fragment() {
             BottomSheetColorPicker(requireContext(),
                 colors = colors,
                 header = getString(R.string.settings_secondary_font_color_title),
-                getSelected = ColorHelper::getSecondaryFontColorRgb,
+                getSelected = { ColorHelper.getSecondaryFontColorRgb(activity?.isDarkTheme() == true) },
                 onColorSelected = { color: Int ->
                     val colorString = Integer.toHexString(color)
-                    Preferences.textSecondaryColor = "#" + if (colorString.length > 6) colorString.substring(2) else colorString
+                    if (activity?.isDarkTheme() == true) {
+                        Preferences.textSecondaryColorDark =
+                            "#" + if (colorString.length > 6) colorString.substring(2) else colorString
+                    } else {
+                        Preferences.textSecondaryColor =
+                            "#" + if (colorString.length > 6) colorString.substring(2) else colorString
+                    }
                 },
                 showAlphaSelector = true,
-                alpha = Preferences.textSecondaryAlpha.toIntValue(),
+                alpha = if (activity?.isDarkTheme() == true) Preferences.textSecondaryAlphaDark.toIntValue() else Preferences.textSecondaryAlpha.toIntValue(),
                 onAlphaChangeListener = { alpha ->
-                    Preferences.textSecondaryAlpha = alpha.toHexValue()
+                    if (activity?.isDarkTheme() == true) {
+                        Preferences.textSecondaryAlphaDark = alpha.toHexValue()
+                    } else {
+                        Preferences.textSecondaryAlpha = alpha.toHexValue()
+                    }
                 }
             ).show()
         }
 
+        action_second_row_top_margin_size.setOnClickListener {
+            BottomSheetMenu<Int>(
+                requireContext(),
+                header = getString(R.string.settings_secondary_row_top_margin_title)
+            ).setSelectedValue(Preferences.secondRowTopMargin)
+                .addItem(
+                    getString(R.string.settings_clock_bottom_margin_subtitle_none),
+                    Constants.SecondRowTopMargin.NONE.value
+                )
+                .addItem(
+                    getString(R.string.settings_clock_bottom_margin_subtitle_small),
+                    Constants.SecondRowTopMargin.SMALL.value
+                )
+                .addItem(
+                    getString(R.string.settings_clock_bottom_margin_subtitle_medium),
+                    Constants.SecondRowTopMargin.MEDIUM.value
+                )
+                .addItem(
+                    getString(R.string.settings_clock_bottom_margin_subtitle_large),
+                    Constants.SecondRowTopMargin.LARGE.value
+                )
+                .addOnSelectItemListener { value ->
+                    Preferences.secondRowTopMargin = value
+                }.show()
+        }
+
         action_date_format.setOnClickListener {
-            if (Preferences.showEvents) {
-                val now = Calendar.getInstance()
-                val dialog = BottomSheetMenu<String>(requireContext(), header = getString(R.string.settings_date_format_title)).setSelectedValue(Preferences.dateFormat)
+            val now = Calendar.getInstance()
+            val dialog = BottomSheetMenu<String>(requireContext(), header = getString(R.string.settings_date_format_title)).setSelectedValue(Preferences.dateFormat)
 
-                dialog.addItem(DateHelper.getDefaultDateText(requireContext(), now), "")
-                if (Preferences.dateFormat != "") {
-                    dialog.addItem(DateHelper.getDateText(requireContext(), now), Preferences.dateFormat)
-                }
-                dialog.addItem(getString(R.string.custom_date_format), "-")
+            dialog.addItem(DateHelper.getDefaultDateText(requireContext(), now), "")
+            if (Preferences.dateFormat != "") {
+                dialog.addItem(DateHelper.getDateText(requireContext(), now), Preferences.dateFormat)
+            }
+            dialog.addItem(getString(R.string.custom_date_format), "-")
 
-                dialog.addOnSelectItemListener { value ->
-                    if (value == "-") {
+            dialog.addOnSelectItemListener { value ->
+                when (value) {
+                    "-" -> {
                         startActivity(Intent(requireContext(), CustomDateActivity::class.java))
-                    } else {
+                    }
+                    "" -> {
+                        Preferences.blockingBulk {
+                            isDateCapitalize = false
+                            isDateUppercase = false
+                        }
                         Preferences.dateFormat = value
                     }
-                }.show()
-            }
+                    else -> {
+                        Preferences.dateFormat = value
+                    }
+                }
+            }.show()
         }
 
         action_background_color.setOnClickListener {
             BottomSheetColorPicker(requireContext(),
                 colors = colors,
                 header = getString(R.string.settings_background_color_title),
-                getSelected = { ColorHelper.getBackgroundColorRgb() },
+                getSelected = { ColorHelper.getBackgroundColorRgb(activity?.isDarkTheme() == true) },
                 onColorSelected = { color: Int ->
                     val colorString = Integer.toHexString(color)
-                    Preferences.backgroundCardColor = "#" + if (colorString.length > 6) colorString.substring(2) else colorString
+                    if (activity?.isDarkTheme() == true) {
+                        Preferences.backgroundCardColorDark =
+                            "#" + if (colorString.length > 6) colorString.substring(2) else colorString
+                    } else {
+                        Preferences.backgroundCardColor =
+                            "#" + if (colorString.length > 6) colorString.substring(2) else colorString
+                    }
                 },
                 showAlphaSelector = true,
-                alpha = Preferences.backgroundCardAlpha.toIntValue(),
+                alpha = if (activity?.isDarkTheme() == true) Preferences.backgroundCardAlphaDark.toIntValue() else Preferences.backgroundCardAlpha.toIntValue(),
                 onAlphaChangeListener = { alpha ->
-                    Preferences.backgroundCardAlpha = alpha.toHexValue()
+                    if (activity?.isDarkTheme() == true) {
+                        Preferences.backgroundCardAlphaDark = alpha.toHexValue()
+                    } else {
+                        Preferences.backgroundCardAlpha = alpha.toHexValue()
+                    }
                 }
             ).show()
         }
 
         action_text_shadow.setOnClickListener {
-            val dialog = BottomSheetMenu<Int>(requireContext(), header = getString(R.string.title_text_shadow)).setSelectedValue(Preferences.textShadow)
+            val dialog = BottomSheetMenu<Int>(requireContext(), header = getString(R.string.title_text_shadow)).setSelectedValue(if (activity?.isDarkTheme() == true) Preferences.textShadowDark else Preferences.textShadow)
             (2 downTo 0).forEach {
                 dialog.addItem(getString(SettingsStringHelper.getTextShadowString(it)), it)
             }
             dialog.addOnSelectItemListener { value ->
-                Preferences.textShadow = value
+                if (activity?.isDarkTheme() == true) {
+                    Preferences.textShadowDark = value
+                } else {
+                    Preferences.textShadow = value
+                }
             }.show()
         }
 
@@ -321,12 +475,11 @@ class GeneralTabFragment : Fragment() {
         }
 
         action_show_dividers.setOnClickListener {
-            BottomSheetMenu<Boolean>(requireContext(), header = getString(R.string.settings_show_dividers_title)).setSelectedValue(Preferences.showDividers)
-                .addItem(getString(R.string.settings_visible), true)
-                .addItem(getString(R.string.settings_not_visible), false)
-                .addOnSelectItemListener { value ->
-                    Preferences.showDividers = value
-                }.show()
+            show_dividers_toggle.isChecked = !show_dividers_toggle.isChecked
+        }
+
+        show_dividers_toggle.setOnCheckedChangeListener { _, isChecked ->
+            Preferences.showDividers = isChecked
         }
     }
 
@@ -348,4 +501,13 @@ class GeneralTabFragment : Fragment() {
         }
         super.onActivityResult(requestCode, resultCode, data)
     }
+
+    private fun maintainScrollPosition(callback: () -> Unit) {
+        scrollView.isScrollable = false
+        callback.invoke()
+        lifecycleScope.launch {
+            delay(200)
+            scrollView.isScrollable = true
+        }
+    }
 }

app/src/main/java/com/tommasoberlose/anotherwidget/ui/fragments/GlanceTabFragment.kt

@@ -8,8 +8,10 @@ import android.content.Context
 import android.content.Intent
 import android.content.IntentFilter
 import android.content.pm.PackageManager
+import android.net.Uri
 import android.os.Build
 import android.os.Bundle
+import android.provider.Settings
 import android.util.Log
 import android.view.LayoutInflater
 import android.view.View
@@ -34,6 +36,7 @@ import com.tommasoberlose.anotherwidget.R
 import com.tommasoberlose.anotherwidget.components.BottomSheetMenu
 import com.tommasoberlose.anotherwidget.components.CustomNotesDialog
 import com.tommasoberlose.anotherwidget.components.GlanceProviderSortMenu
+import com.tommasoberlose.anotherwidget.components.MaterialBottomSheetDialog
 import com.tommasoberlose.anotherwidget.databinding.FragmentGlanceSettingsBinding
 import com.tommasoberlose.anotherwidget.global.Preferences
 import com.tommasoberlose.anotherwidget.helpers.AlarmHelper
@@ -188,7 +191,9 @@ class GlanceTabFragment : Fragment() {
                     } catch (e: Exception) {
                         alarm.showIntent?.creatorPackage ?: ""
                     }
-                    activity?.toast(getString(R.string.next_alarm_warning).format(appNameOrPackage), long = true)
+                    MaterialBottomSheetDialog(requireContext(), message = getString(R.string.next_alarm_warning).format(appNameOrPackage))
+                        .setPositiveButton(getString(android.R.string.ok))
+                        .show()
                 }
             }
             true
@@ -274,19 +279,23 @@ class GlanceTabFragment : Fragment() {
     }
 
     private fun checkNotificationPermission() {
-        if (NotificationManagerCompat.getEnabledListenerPackages(requireContext()).contains(requireContext().packageName)) {
-            notification_permission_alert?.isVisible = false
-            MediaPlayerHelper.updatePlayingMediaInfo(requireContext())
-            show_music_label?.text = if (Preferences.showMusic) getString(R.string.settings_visible) else getString(R.string.settings_not_visible)
-        } else if (Preferences.showMusic) {
-            notification_permission_alert?.isVisible = true
-            show_music_label?.text = getString(R.string.settings_request_notification_access)
-            notification_permission_alert?.setOnClickListener {
-                activity?.startActivity(Intent("android.settings.ACTION_NOTIFICATION_LISTENER_SETTINGS"))
+        when {
+            NotificationManagerCompat.getEnabledListenerPackages(requireContext()).contains(requireContext().packageName) -> {
+                notification_permission_alert?.isVisible = false
+                MediaPlayerHelper.updatePlayingMediaInfo(requireContext())
+                show_music_label?.text = if (Preferences.showMusic) getString(R.string.settings_visible) else getString(R.string.settings_not_visible)
+            }
+            Preferences.showMusic -> {
+                notification_permission_alert?.isVisible = true
+                show_music_label?.text = getString(R.string.settings_request_notification_access)
+                notification_permission_alert?.setOnClickListener {
+                    activity?.startActivity(Intent("android.settings.ACTION_NOTIFICATION_LISTENER_SETTINGS"))
+                }
+            }
+            else -> {
+                show_music_label?.text = getString(R.string.settings_not_visible)
+                notification_permission_alert?.isVisible = false
             }
-        } else {
-            show_music_label?.text = getString(R.string.settings_not_visible)
-            notification_permission_alert?.isVisible = false
         }
     }
 
@@ -373,11 +382,11 @@ class GlanceTabFragment : Fragment() {
     }
 
     private fun maintainScrollPosition(callback: () -> Unit) {
-        val scrollPosition = scrollView.scrollY
+        scrollView.isScrollable = false
         callback.invoke()
         lifecycleScope.launch {
             delay(200)
-            scrollView.smoothScrollTo(0, scrollPosition)
+            scrollView.isScrollable = true
         }
     }
 

app/src/main/java/com/tommasoberlose/anotherwidget/ui/fragments/MainFragment.kt

@@ -2,6 +2,8 @@ package com.tommasoberlose.anotherwidget.ui.fragments
 
 import android.Manifest
 import android.animation.ValueAnimator
+import android.appwidget.AppWidgetManager
+import android.appwidget.AppWidgetProviderInfo
 import android.content.Intent
 import android.content.SharedPreferences
 import android.net.Uri
@@ -14,7 +16,6 @@ import android.util.TypedValue
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
-import android.widget.ImageView
 import android.widget.RelativeLayout
 import androidx.core.animation.addListener
 import androidx.core.app.NotificationManagerCompat
@@ -36,12 +37,12 @@ import com.tommasoberlose.anotherwidget.helpers.BitmapHelper
 import com.tommasoberlose.anotherwidget.helpers.ColorHelper
 import com.tommasoberlose.anotherwidget.helpers.ColorHelper.isColorDark
 import com.tommasoberlose.anotherwidget.ui.activities.MainActivity
-import com.tommasoberlose.anotherwidget.ui.activities.SupportDevActivity
 import com.tommasoberlose.anotherwidget.ui.adapters.ViewPagerAdapter
 import com.tommasoberlose.anotherwidget.ui.viewmodels.MainViewModel
 import com.tommasoberlose.anotherwidget.ui.widgets.MainWidget
 import com.tommasoberlose.anotherwidget.utils.checkGrantedPermission
 import com.tommasoberlose.anotherwidget.utils.getCurrentWallpaper
+import com.tommasoberlose.anotherwidget.utils.isDarkTheme
 import com.tommasoberlose.anotherwidget.utils.toPixel
 import kotlinx.android.synthetic.main.fragment_app_main.*
 import kotlinx.android.synthetic.main.the_widget_sans.*
@@ -62,8 +63,8 @@ class MainFragment  : Fragment(), SharedPreferences.OnSharedPreferenceChangeList
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
 
-        enterTransition = MaterialSharedAxis.create(MaterialSharedAxis.X, true)
-        reenterTransition = MaterialSharedAxis.create(MaterialSharedAxis.X, false)
+        enterTransition = MaterialSharedAxis(MaterialSharedAxis.X, true)
+        reenterTransition = MaterialSharedAxis(MaterialSharedAxis.X, false)
     }
 
     override fun onCreateView(
@@ -93,9 +94,9 @@ class MainFragment  : Fragment(), SharedPreferences.OnSharedPreferenceChangeList
         }.attach()
 
         // Init clock
-        time.setTextColor(ColorHelper.getClockFontColor())
+        time.setTextColor(ColorHelper.getClockFontColor(activity?.isDarkTheme() == true))
         time.setTextSize(TypedValue.COMPLEX_UNIT_SP, Preferences.clockTextSize.toPixel(requireContext()))
-        time_am_pm.setTextColor(ColorHelper.getClockFontColor())
+        time_am_pm.setTextColor(ColorHelper.getClockFontColor(activity?.isDarkTheme() == true))
         time_am_pm.setTextSize(TypedValue.COMPLEX_UNIT_SP, Preferences.clockTextSize.toPixel(requireContext()) / 5 * 2)
         time_container.isVisible = Preferences.showClock
 
@@ -134,7 +135,7 @@ class MainFragment  : Fragment(), SharedPreferences.OnSharedPreferenceChangeList
             preview?.setCardBackgroundColor(
                 ContextCompat.getColor(
                     requireContext(),
-                    if (ColorHelper.getFontColor()
+                    if (ColorHelper.getFontColor(activity?.isDarkTheme() == true)
                             .isColorDark()
                     ) android.R.color.white else R.color.colorAccent
                 )
@@ -143,7 +144,7 @@ class MainFragment  : Fragment(), SharedPreferences.OnSharedPreferenceChangeList
                 BitmapHelper.getTintedDrawable(
                     requireContext(),
                     R.drawable.card_background,
-                    ColorHelper.getBackgroundColor()
+                    ColorHelper.getBackgroundColor(activity?.isDarkTheme() == true)
                 )
             )
             uiJob = lifecycleScope.launch(Dispatchers.IO) {
@@ -165,8 +166,8 @@ class MainFragment  : Fragment(), SharedPreferences.OnSharedPreferenceChangeList
                 }
                 withContext(Dispatchers.Main) {
                     // Clock
-                    time?.setTextColor(ColorHelper.getClockFontColor())
-                    time_am_pm?.setTextColor(ColorHelper.getClockFontColor())
+                    time?.setTextColor(ColorHelper.getClockFontColor(activity?.isDarkTheme() == true))
+                    time_am_pm?.setTextColor(ColorHelper.getClockFontColor(activity?.isDarkTheme() == true))
                     time?.setTextSize(
                         TypedValue.COMPLEX_UNIT_SP,
                         Preferences.clockTextSize.toPixel(requireContext())
@@ -372,7 +373,7 @@ class MainFragment  : Fragment(), SharedPreferences.OnSharedPreferenceChangeList
         super.onPause()
     }
 
-    var delayJob: Job? = null
+    private var delayJob: Job? = null
 
     override fun onSharedPreferenceChanged(preferences: SharedPreferences, p1: String) {
         delayJob?.cancel()

app/src/main/java/com/tommasoberlose/anotherwidget/ui/fragments/SettingsFragment.kt

@@ -50,8 +50,8 @@ class SettingsFragment : Fragment() {
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
-        enterTransition = MaterialSharedAxis.create(MaterialSharedAxis.X, true)
-        returnTransition = MaterialSharedAxis.create(MaterialSharedAxis.X, false)
+        enterTransition = MaterialSharedAxis(MaterialSharedAxis.X, true)
+        returnTransition = MaterialSharedAxis(MaterialSharedAxis.X, false)
     }
 
     override fun onCreateView(
@@ -65,6 +65,8 @@ class SettingsFragment : Fragment() {
         binding.lifecycleOwner = this
         binding.viewModel = viewModel
 
+        subscribeUi(viewModel)
+
         return binding.root
     }
 
@@ -75,7 +77,8 @@ class SettingsFragment : Fragment() {
             Navigation.findNavController(it).popBackStack()
         }
 
-        subscribeUi(viewModel)
+        show_widget_preview_toggle.isChecked = Preferences.showPreview
+        show_wallpaper_toggle.isChecked = Preferences.showWallpaper
 
         setupListener()
 
@@ -120,44 +123,26 @@ class SettingsFragment : Fragment() {
     }
 
     private fun setupListener() {
-
         action_show_widget_preview.setOnClickListener {
-            maintainScrollPosition {
-                BottomSheetMenu<Boolean>(requireContext(), header = getString(R.string.action_show_widget_preview))
-                    .setSelectedValue(Preferences.showPreview)
-                    .addItem(
-                        getString(R.string.settings_visible),
-                        true
-                    )
-                    .addItem(
-                        getString(R.string.settings_not_visible),
-                        false
-                    )
-                    .addOnSelectItemListener { value ->
-                        Preferences.showPreview = value
-                    }.show()
-            }
+            show_widget_preview_toggle.isChecked = !show_widget_preview_toggle.isChecked
+        }
+
+        show_widget_preview_toggle.setOnCheckedChangeListener { _, isChecked ->
+            Preferences.showPreview = isChecked
         }
 
         action_show_wallpaper.setOnClickListener {
-            maintainScrollPosition {
-                BottomSheetMenu<Boolean>(requireContext(), header = getString(R.string.settings_title_show_wallpaper))
-                    .setSelectedValue(Preferences.showWallpaper && activity?.checkGrantedPermission(Manifest.permission.READ_EXTERNAL_STORAGE) == true)
-                    .addItem(
-                        getString(R.string.settings_visible),
-                        true
-                    )
-                    .addItem(
-                        getString(R.string.settings_not_visible),
-                        false
-                    )
-                    .addOnSelectItemListener { value ->
-                        if (value) {
-                            requirePermission()
-                        } else {
-                            Preferences.showWallpaper = value
-                        }
-                    }.show()
+        }
+
+        action_show_wallpaper.setOnClickListener {
+            show_wallpaper_toggle.isChecked = !show_wallpaper_toggle.isChecked
+        }
+
+        show_wallpaper_toggle.setOnCheckedChangeListener { _, isChecked ->
+            if (isChecked) {
+                requirePermission()
+            } else {
+                Preferences.showWallpaper = isChecked
             }
         }
 
@@ -211,11 +196,11 @@ class SettingsFragment : Fragment() {
     }
 
     private fun maintainScrollPosition(callback: () -> Unit) {
-        val scrollPosition = scrollView.scrollY
+        scrollView.isScrollable = false
         callback.invoke()
         lifecycleScope.launch {
             delay(200)
-            scrollView.smoothScrollTo(0, scrollPosition)
+            scrollView.isScrollable = true
         }
     }
 
@@ -226,8 +211,11 @@ class SettingsFragment : Fragment() {
             ).withListener(object: MultiplePermissionsListener {
                 override fun onPermissionsChecked(report: MultiplePermissionsReport?) {
                     report?.let {
-                        Preferences.showWallpaper = false
-                        Preferences.showWallpaper = report.areAllPermissionsGranted()
+                        if (report.areAllPermissionsGranted()) {
+                            Preferences.showWallpaper = true
+                        } else {
+                            show_wallpaper_toggle?.isChecked = false
+                        }
                     }
                 }
                 override fun onPermissionRationaleShouldBeShown(

app/src/main/java/com/tommasoberlose/anotherwidget/ui/fragments/WeatherTabFragment.kt

@@ -10,6 +10,7 @@ import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import androidx.core.content.ContextCompat
+import androidx.core.os.BuildCompat
 import androidx.core.view.isVisible
 import androidx.databinding.DataBindingUtil
 import androidx.fragment.app.Fragment
@@ -24,11 +25,15 @@ import com.karumi.dexter.listener.PermissionRequest
 import com.karumi.dexter.listener.multi.MultiplePermissionsListener
 import com.tommasoberlose.anotherwidget.R
 import com.tommasoberlose.anotherwidget.components.BottomSheetMenu
+import com.tommasoberlose.anotherwidget.components.IconPackSelector
+import com.tommasoberlose.anotherwidget.components.MaterialBottomSheetDialog
 import com.tommasoberlose.anotherwidget.databinding.FragmentWeatherSettingsBinding
 import com.tommasoberlose.anotherwidget.global.Constants
 import com.tommasoberlose.anotherwidget.global.Preferences
 import com.tommasoberlose.anotherwidget.global.RequestCode
+import com.tommasoberlose.anotherwidget.helpers.ColorHelper
 import com.tommasoberlose.anotherwidget.helpers.SettingsStringHelper
+import com.tommasoberlose.anotherwidget.helpers.WeatherHelper
 import com.tommasoberlose.anotherwidget.receivers.WeatherReceiver
 import com.tommasoberlose.anotherwidget.ui.activities.ChooseApplicationActivity
 import com.tommasoberlose.anotherwidget.ui.activities.CustomLocationActivity
@@ -106,6 +111,7 @@ class WeatherTabFragment : Fragment() {
 
         viewModel.customLocationAdd.observe(viewLifecycleOwner, Observer {
             maintainScrollPosition {
+                background_location_warning.isVisible = it == ""
                 label_custom_location?.text =
                     if (it == "") getString(R.string.custom_location_gps) else it
             }
@@ -129,10 +135,13 @@ class WeatherTabFragment : Fragment() {
 
         viewModel.weatherIconPack.observe(viewLifecycleOwner, Observer {
             maintainScrollPosition {
-                label_weather_icon_pack?.text = when (it) {
-                    Constants.WeatherIconPack.MINIMAL.value -> getString(R.string.settings_weather_icon_pack_minimal)
-                    else -> getString(R.string.settings_weather_icon_pack_default)
-                }
+                label_weather_icon_pack?.text = getString(R.string.settings_weather_icon_pack_default).format((it + 1))
+//                weather_icon_pack.setImageDrawable(ContextCompat.getDrawable(requireContext(), WeatherHelper.getWeatherIconResource("02d")))
+//                if (it == Constants.WeatherIconPack.MINIMAL.value) {
+//                    weather_icon_pack.setColorFilter(ContextCompat.getColor(requireContext(), R.color.colorPrimaryText))
+//                } else {
+//                    weather_icon_pack.setColorFilter(ContextCompat.getColor(requireContext(), android.R.color.transparent))
+//                }
             }
             checkLocationPermission()
         })
@@ -157,7 +166,11 @@ class WeatherTabFragment : Fragment() {
         } else if (Preferences.showWeather && Preferences.customLocationAdd == "") {
             location_permission_alert?.isVisible = true
             location_permission_alert?.setOnClickListener {
-                requirePermission()
+                MaterialBottomSheetDialog(requireContext(), message = getString(R.string.background_location_warning))
+                    .setPositiveButton(getString(android.R.string.ok)) {
+                        requirePermission()
+                    }
+                    .show()
             }
         } else {
             location_permission_alert?.isVisible = false
@@ -209,6 +222,9 @@ class WeatherTabFragment : Fragment() {
                     .addItem(getString(R.string.fahrenheit), "F")
                     .addItem(getString(R.string.celsius), "C")
                     .addOnSelectItemListener { value ->
+                        if (value != Preferences.weatherTempUnit) {
+                            WeatherHelper.updateWeather(requireContext())
+                        }
                         Preferences.weatherTempUnit = value
                     }.show()
             }
@@ -230,12 +246,7 @@ class WeatherTabFragment : Fragment() {
 
         action_weather_icon_pack.setOnClickListener {
             if (Preferences.showWeather) {
-                BottomSheetMenu<Int>(requireContext(), header = getString(R.string.settings_weather_icon_pack_title)).setSelectedValue(Preferences.weatherIconPack)
-                    .addItem(getString(R.string.settings_weather_icon_pack_default), Constants.WeatherIconPack.DEFAULT.value)
-                    .addItem(getString(R.string.settings_weather_icon_pack_minimal), Constants.WeatherIconPack.MINIMAL.value)
-                    .addOnSelectItemListener { value ->
-                        Preferences.weatherIconPack = value
-                    }.show()
+                IconPackSelector(requireContext(), header = getString(R.string.settings_weather_icon_pack_title)).show()
             }
         }
 
@@ -296,11 +307,11 @@ class WeatherTabFragment : Fragment() {
     }
 
     private fun maintainScrollPosition(callback: () -> Unit) {
-        val scrollPosition = scrollView.scrollY
+        scrollView.isScrollable = false
         callback.invoke()
         lifecycleScope.launch {
             delay(200)
-            scrollView.smoothScrollTo(0, scrollPosition)
+            scrollView.isScrollable = true
         }
     }
 }

app/src/main/java/com/tommasoberlose/anotherwidget/ui/viewmodels/CustomDateViewModel.kt

@@ -8,5 +8,6 @@ import com.tommasoberlose.anotherwidget.global.Preferences
 
 class CustomDateViewModel(application: Application) : AndroidViewModel(application) {
     val dateInput: MutableLiveData<String> = MutableLiveData(if (Preferences.dateFormat == "") "EEEE, MMM dd" else Preferences.dateFormat)
-    val isDateCapitalize = Preferences.asLiveData(Preferences::isDateCapitalize)
+    val isDateCapitalize = MutableLiveData<Boolean>(Preferences.isDateCapitalize)
+    val isDateUppercase = MutableLiveData<Boolean>(Preferences.isDateUppercase)
 }

app/src/main/java/com/tommasoberlose/anotherwidget/ui/viewmodels/MainViewModel.kt

@@ -13,12 +13,20 @@ class MainViewModel : ViewModel() {
     val textSecondaryAlpha = Preferences.asLiveData(Preferences::textSecondaryAlpha)
     val backgroundCardColor = Preferences.asLiveData(Preferences::backgroundCardColor)
     val backgroundCardAlpha = Preferences.asLiveData(Preferences::backgroundCardAlpha)
+    val textGlobalColorDark = Preferences.asLiveData(Preferences::textGlobalColorDark)
+    val textGlobalAlphaDark = Preferences.asLiveData(Preferences::textGlobalAlphaDark)
+    val textSecondaryColorDark = Preferences.asLiveData(Preferences::textSecondaryColorDark)
+    val textSecondaryAlphaDark = Preferences.asLiveData(Preferences::textSecondaryAlphaDark)
+    val backgroundCardColorDark = Preferences.asLiveData(Preferences::backgroundCardColorDark)
+    val backgroundCardAlphaDark = Preferences.asLiveData(Preferences::backgroundCardAlphaDark)
     val textMainSize = Preferences.asLiveData(Preferences::textMainSize)
     val textSecondSize = Preferences.asLiveData(Preferences::textSecondSize)
     val textShadow = Preferences.asLiveData(Preferences::textShadow)
+    val textShadowDark = Preferences.asLiveData(Preferences::textShadowDark)
     val customFont = Preferences.asLiveData(Preferences::customFont)
     val secondRowInformation = Preferences.asLiveData(Preferences::secondRowInformation)
     val showDividers = Preferences.asLiveData(Preferences::showDividers)
+    val secondRowTopMargin = Preferences.asLiveData(Preferences::secondRowTopMargin)
 
     // Calendar Settings
     val showEvents = Preferences.asLiveData(Preferences::showEvents)
@@ -30,12 +38,15 @@ class MainViewModel : ViewModel() {
     val openEventDetails = Preferences.asLiveData(Preferences::openEventDetails)
     val calendarAppName = Preferences.asLiveData(Preferences::calendarAppName)
     val widgetUpdateFrequency = Preferences.asLiveData(Preferences::widgetUpdateFrequency)
+    val showOnlyBusyEvents = Preferences.asLiveData(Preferences::showOnlyBusyEvents)
 
     // Clock Settings
     val showClock = Preferences.asLiveData(Preferences::showClock)
     val clockTextSize = Preferences.asLiveData(Preferences::clockTextSize)
     val clockTextColor = Preferences.asLiveData(Preferences::clockTextColor)
     val clockTextAlpha = Preferences.asLiveData(Preferences::clockTextAlpha)
+    val clockTextColorDark = Preferences.asLiveData(Preferences::clockTextColorDark)
+    val clockTextAlphaDark = Preferences.asLiveData(Preferences::clockTextAlphaDark)
     val showAMPMIndicator = Preferences.asLiveData(Preferences::showAMPMIndicator)
 
     val clockAppName = Preferences.asLiveData(Preferences::clockAppName)

app/src/main/java/com/tommasoberlose/anotherwidget/ui/widgets/MainWidget.kt

@@ -15,9 +15,7 @@ import android.text.format.DateUtils
 import android.util.Log
 import android.util.TypedValue
 import android.view.View
-import android.widget.ImageView
-import android.widget.RemoteViews
-import android.widget.TextView
+import android.widget.*
 import androidx.core.content.ContextCompat
 import androidx.core.view.isVisible
 import com.tommasoberlose.anotherwidget.R
@@ -26,9 +24,11 @@ import com.tommasoberlose.anotherwidget.global.Actions
 import com.tommasoberlose.anotherwidget.global.Constants
 import com.tommasoberlose.anotherwidget.global.Preferences
 import com.tommasoberlose.anotherwidget.helpers.*
+import com.tommasoberlose.anotherwidget.helpers.ColorHelper.toIntValue
 import com.tommasoberlose.anotherwidget.receivers.*
 import com.tommasoberlose.anotherwidget.utils.checkGrantedPermission
 import com.tommasoberlose.anotherwidget.utils.getCapWordString
+import com.tommasoberlose.anotherwidget.utils.isDarkTheme
 import com.tommasoberlose.anotherwidget.utils.toPixel
 import kotlinx.android.synthetic.main.the_widget.view.*
 import java.lang.Exception
@@ -101,12 +101,12 @@ class MainWidget : AppWidgetProvider() {
                 views.setInt(
                     R.id.widget_shape_background,
                     "setColorFilter",
-                    ColorHelper.getBackgroundColorRgb()
+                    ColorHelper.getBackgroundColorRgb(context.isDarkTheme())
                 )
                 views.setInt(
                     R.id.widget_shape_background,
                     "setImageAlpha",
-                    ColorHelper.getBackgroundAlpha()
+                    ColorHelper.getBackgroundAlpha(context.isDarkTheme())
                 )
                 val refreshIntent = PendingIntent.getActivity(
                     context,
@@ -263,7 +263,21 @@ class MainWidget : AppWidgetProvider() {
 
                     views.setViewVisibility(R.id.empty_layout_rect, View.GONE)
                     views.setViewVisibility(R.id.calendar_layout_rect, View.VISIBLE)
+
+                    views.setViewVisibility(
+                        R.id.second_row_top_margin_small_sans,
+                        if (Preferences.secondRowTopMargin == Constants.SecondRowTopMargin.SMALL.value) View.VISIBLE else View.GONE
+                    )
+                    views.setViewVisibility(
+                        R.id.second_row_top_margin_medium_sans,
+                        if (Preferences.secondRowTopMargin == Constants.SecondRowTopMargin.MEDIUM.value) View.VISIBLE else View.GONE
+                    )
+                    views.setViewVisibility(
+                        R.id.second_row_top_margin_large_sans,
+                        if (Preferences.secondRowTopMargin == Constants.SecondRowTopMargin.LARGE.value) View.VISIBLE else View.GONE
+                    )
                 } else if (GlanceProviderHelper.showGlanceProviders(context) && v.calendar_layout.isVisible) {
+                    var showSomething = false
                     loop@ for (provider:Constants.GlanceProviderId in GlanceProviderHelper.getGlanceProviders(context)) {
                         when (provider) {
                             Constants.GlanceProviderId.PLAYING_SONG -> {
@@ -275,6 +289,7 @@ class MainWidget : AppWidgetProvider() {
                                         PendingIntent.FLAG_UPDATE_CURRENT
                                     )
                                     views.setOnClickPendingIntent(R.id.second_row_rect, musicIntent)
+                                    showSomething = true
                                     break@loop
                                 }
                             }
@@ -287,6 +302,7 @@ class MainWidget : AppWidgetProvider() {
                                         PendingIntent.FLAG_UPDATE_CURRENT
                                     )
                                     views.setOnClickPendingIntent(R.id.second_row_rect, alarmIntent)
+                                    showSomething = true
                                     break@loop
                                 }
                             }
@@ -301,6 +317,7 @@ class MainWidget : AppWidgetProvider() {
                                             PendingIntent.FLAG_UPDATE_CURRENT
                                         )
                                         views.setOnClickPendingIntent(R.id.second_row_rect, batteryIntent)
+                                        showSomething = true
                                         break@loop
                                     }
                                 }
@@ -319,26 +336,44 @@ class MainWidget : AppWidgetProvider() {
                                         PendingIntent.FLAG_UPDATE_CURRENT
                                     )
                                     views.setOnClickPendingIntent(R.id.second_row_rect, fitIntent)
+                                    showSomething = true
                                     break@loop
                                 }
                             }
                         }
                     }
 
-                    views.setImageViewBitmap(
-                        R.id.next_event_rect,
-                        BitmapHelper.getBitmapFromView(v.next_event, draw = false)
-                    )
 
-                    views.setImageViewBitmap(
-                        R.id.second_row_rect,
-                        BitmapHelper.getBitmapFromView(v.second_row, draw = false)
-                    )
+                    if (showSomething) {
+                        views.setImageViewBitmap(
+                            R.id.next_event_rect,
+                            BitmapHelper.getBitmapFromView(v.next_event, draw = false)
+                        )
 
-                    views.setViewVisibility(R.id.second_row_rect, View.VISIBLE)
-                    views.setViewVisibility(R.id.empty_layout_rect, View.GONE)
-                    views.setViewVisibility(R.id.calendar_layout_rect, View.VISIBLE)
-                    views.setOnClickPendingIntent(R.id.next_event_rect, calPIntent)
+                        views.setImageViewBitmap(
+                            R.id.second_row_rect,
+                            BitmapHelper.getBitmapFromView(v.second_row, draw = false)
+                        )
+
+                        views.setViewVisibility(R.id.second_row_rect, View.VISIBLE)
+                        views.setViewVisibility(R.id.empty_layout_rect, View.GONE)
+                        views.setViewVisibility(R.id.calendar_layout_rect, View.VISIBLE)
+                        views.setOnClickPendingIntent(R.id.next_event_rect, calPIntent)
+
+
+                        views.setViewVisibility(
+                            R.id.second_row_top_margin_small_sans,
+                            if (Preferences.secondRowTopMargin == Constants.SecondRowTopMargin.SMALL.value) View.VISIBLE else View.GONE
+                        )
+                        views.setViewVisibility(
+                            R.id.second_row_top_margin_medium_sans,
+                            if (Preferences.secondRowTopMargin == Constants.SecondRowTopMargin.MEDIUM.value) View.VISIBLE else View.GONE
+                        )
+                        views.setViewVisibility(
+                            R.id.second_row_top_margin_large_sans,
+                            if (Preferences.secondRowTopMargin == Constants.SecondRowTopMargin.LARGE.value) View.VISIBLE else View.GONE
+                        )
+                    }
                 }
             } catch (ex: Exception) {
                 ex.printStackTrace()
@@ -407,8 +442,8 @@ class MainWidget : AppWidgetProvider() {
                     views.setViewVisibility(R.id.clock_bottom_margin_medium, View.GONE)
                     views.setViewVisibility(R.id.clock_bottom_margin_large, View.GONE)
                 } else {
-                    views.setTextColor(R.id.time, ColorHelper.getClockFontColor())
-                    views.setTextColor(R.id.time_am_pm, ColorHelper.getClockFontColor())
+                    views.setTextColor(R.id.time, ColorHelper.getClockFontColor(context.isDarkTheme()))
+                    views.setTextColor(R.id.time_am_pm, ColorHelper.getClockFontColor(context.isDarkTheme()))
                     views.setTextViewTextSize(
                         R.id.time,
                         TypedValue.COMPLEX_UNIT_SP,
@@ -536,6 +571,10 @@ class MainWidget : AppWidgetProvider() {
 
                 v.empty_layout.visibility = View.GONE
                 v.calendar_layout.visibility = View.VISIBLE
+
+                v.second_row_top_margin_small.visibility = if (Preferences.secondRowTopMargin == Constants.SecondRowTopMargin.SMALL.value) View.VISIBLE else View.GONE
+                v.second_row_top_margin_medium.visibility = if (Preferences.secondRowTopMargin == Constants.SecondRowTopMargin.MEDIUM.value) View.VISIBLE else View.GONE
+                v.second_row_top_margin_large.visibility = if (Preferences.secondRowTopMargin == Constants.SecondRowTopMargin.LARGE.value) View.VISIBLE else View.GONE
             } else if (GlanceProviderHelper.showGlanceProviders(context)) {
                 v.second_row_icon.isVisible = true
                 var showSomething = false
@@ -614,6 +653,10 @@ class MainWidget : AppWidgetProvider() {
                     v.next_event.text = DateHelper.getDateText(context, now)
                     v.empty_layout.visibility = View.GONE
                     v.calendar_layout.visibility = View.VISIBLE
+
+                    v.second_row_top_margin_small.visibility = if (Preferences.secondRowTopMargin == Constants.SecondRowTopMargin.SMALL.value) View.VISIBLE else View.GONE
+                    v.second_row_top_margin_medium.visibility = if (Preferences.secondRowTopMargin == Constants.SecondRowTopMargin.MEDIUM.value) View.VISIBLE else View.GONE
+                    v.second_row_top_margin_large.visibility = if (Preferences.secondRowTopMargin == Constants.SecondRowTopMargin.LARGE.value) View.VISIBLE else View.GONE
                 } else {
                     v.second_row_icon.isVisible = false
                 }
@@ -622,27 +665,29 @@ class MainWidget : AppWidgetProvider() {
 
             // Color
             listOf<TextView>(v.empty_date, v.divider1, v.temp, v.next_event, v.next_event_difference_time, v.divider3, v.special_temp).forEach {
-                it.setTextColor(ColorHelper.getFontColor())
+                it.setTextColor(ColorHelper.getFontColor(context.applicationContext.isDarkTheme()))
             }
 
-            if (Preferences.weatherIconPack == Constants.WeatherIconPack.DEFAULT.value) {
+            if (Preferences.weatherIconPack != Constants.WeatherIconPack.MINIMAL.value) {
                 listOf<ImageView>(v.action_next, v.action_previous)
             } else {
                 listOf<ImageView>(v.action_next, v.action_previous, v.empty_weather_icon, v.special_weather_icon)
             }.forEach {
-                it.setColorFilter(ColorHelper.getFontColor())
+                it.setColorFilter(ColorHelper.getFontColorRgb(context.applicationContext.isDarkTheme()))
+                it.alpha = (if (context.isDarkTheme()) Preferences.textGlobalAlphaDark.toIntValue().toFloat() else Preferences.textGlobalAlpha.toIntValue().toFloat()) / 100
             }
 
             listOf<TextView>(v.next_event_date, v.divider2, v.calendar_temp).forEach {
-                it.setTextColor(ColorHelper.getSecondaryFontColor())
+                it.setTextColor(ColorHelper.getSecondaryFontColor(context.applicationContext.isDarkTheme()))
             }
 
-            if (Preferences.weatherIconPack == Constants.WeatherIconPack.DEFAULT.value) {
+            if (Preferences.weatherIconPack != Constants.WeatherIconPack.MINIMAL.value) {
                 listOf<ImageView>(v.second_row_icon)
             } else {
                 listOf<ImageView>(v.second_row_icon, v.weather_icon)
             }.forEach {
-                it.setColorFilter(ColorHelper.getSecondaryFontColor())
+                it.setColorFilter(ColorHelper.getSecondaryFontColorRgb(context.applicationContext.isDarkTheme()))
+                it.alpha = (if (context.isDarkTheme()) Preferences.textSecondaryAlphaDark.toIntValue().toFloat() else Preferences.textSecondaryAlpha.toIntValue().toFloat()) / 100
             }
 
             // Text Size
@@ -682,19 +727,19 @@ class MainWidget : AppWidgetProvider() {
 
 
             // Shadows
-            val shadowRadius = when (Preferences.textShadow) {
+            val shadowRadius = when (if (context.isDarkTheme()) Preferences.textShadowDark else Preferences.textShadow) {
                 0 -> 0f
                 1 -> 5f
                 2 -> 5f
                 else -> 5f
             }
-            val shadowColor =  when (Preferences.textShadow) {
+            val shadowColor =  when (if (context.isDarkTheme()) Preferences.textShadowDark else Preferences.textShadow) {
                 0 -> Color.TRANSPARENT
                 1 -> R.color.black_50
                 2 -> Color.BLACK
                 else -> R.color.black_50
             }
-            val shadowDy =  when (Preferences.textShadow) {
+            val shadowDy =  when (if (context.isDarkTheme()) Preferences.textShadowDark else Preferences.textShadow) {
                 0 -> 0f
                 1 -> 0f
                 2 -> 1f

app/src/main/java/com/tommasoberlose/anotherwidget/utils/Extensions.kt

@@ -143,11 +143,11 @@ fun Context.isTablet(): Boolean {
 }
 
 fun String.md5(): String {
-    val MD5 = "MD5"
+    val mD5 = "MD5"
     try {
         // Create MD5 Hash
         val digest = java.security.MessageDigest
-            .getInstance(MD5)
+            .getInstance(mD5)
         digest.update(toByteArray())
         val messageDigest = digest.digest()
 
@@ -172,7 +172,7 @@ fun String.isValidEmail(): Boolean
         = this.isNotEmpty() &&
         Patterns.EMAIL_ADDRESS.matcher(this).matches()
 
-fun Activity.isDarkTheme(): Boolean {
+fun Context.isDarkTheme(): Boolean {
     return resources.configuration.uiMode and Configuration.UI_MODE_NIGHT_MASK == Configuration.UI_MODE_NIGHT_YES
 }
 
@@ -221,4 +221,13 @@ fun Context.checkIfFitInstalled(): Boolean {
     } catch (e: Exception) {
         false
     }
+}
+
+fun Intent.isDefaultSet(context: Context): Boolean {
+    val pm = context.packageManager
+    return try {
+        resolveActivity(pm) != null && resolveActivity(pm).packageName.isNotBlank()
+    } catch (ex: java.lang.Exception) {
+        false
+    }
 }