From 8f7e2c51a995101d5fb75b8ec21ebe3a3ab41441 Mon Sep 17 00:00:00 2001
From: amoledwatchfaces <92080649+amoledwatchfaces@users.noreply.github.com>
Date: Sat, 5 Oct 2024 07:17:55 +0000
Subject: [PATCH] * some more fixes

---
 .idea/appInsightsSettings.xml                 |  46 +++++++
 .idea/codeStyles/Project.xml                  | 123 ++++++++++++++++++
 .idea/codeStyles/codeStyleConfig.xml          |   5 +
 .idea/deploymentTargetDropDown.xml            |  26 ++++
 .idea/deploymentTargetSelector.xml            |  29 +++++
 .idea/gradle.xml                              |   1 +
 .idea/icon.svg                                |  44 +++++++
 .idea/inspectionProfiles/Project_Default.xml  |   3 +
 .idea/migrations.xml                          |  10 ++
 .idea/other.xml                               |   6 +
 .idea/runConfigurations.xml                   |  13 ++
 build.gradle.kts                              |   4 +-
 wear/build.gradle.kts                         |   7 +-
 wear/src/main/AndroidManifest.xml             |   5 +-
 .../weartools/weekdayutccomp/MainViewModel.kt |   9 +-
 .../activity/PickDateActivity.kt              |  10 +-
 .../DateCountdownComplicationService.kt       |  45 +++++--
 .../complication/TimerComplicationService.kt  |   3 +
 .../preferences/UserPreferences.kt            |   4 +-
 .../ComplicationTapBroadcastReceiver.kt       |  44 +++++--
 wear/src/main/res/drawable/ic_launch.xml      |   1 -
 .../src/main/res/drawable/ic_notification.xml |   3 +-
 wear/src/main/res/drawable/ic_water.xml       |   3 +-
 23 files changed, 399 insertions(+), 45 deletions(-)
 create mode 100644 .idea/appInsightsSettings.xml
 create mode 100644 .idea/codeStyles/Project.xml
 create mode 100644 .idea/codeStyles/codeStyleConfig.xml
 create mode 100644 .idea/deploymentTargetDropDown.xml
 create mode 100644 .idea/deploymentTargetSelector.xml
 create mode 100644 .idea/icon.svg
 create mode 100644 .idea/migrations.xml
 create mode 100644 .idea/other.xml
 create mode 100644 .idea/runConfigurations.xml

diff --git a/.idea/appInsightsSettings.xml b/.idea/appInsightsSettings.xml
new file mode 100644
index 0000000..f472e84
--- /dev/null
+++ b/.idea/appInsightsSettings.xml
@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="AppInsightsSettings">
+    <option name="selectedTabId" value="Firebase Crashlytics" />
+    <option name="tabSettings">
+      <map>
+        <entry key="Android Vitals">
+          <value>
+            <InsightsFilterSettings>
+              <option name="connection">
+                <ConnectionSetting>
+                  <option name="appId" value="com.weartools.weekdayutccomp" />
+                </ConnectionSetting>
+              </option>
+              <option name="failureTypes">
+                <list>
+                  <option value="FATAL" />
+                </list>
+              </option>
+              <option name="signal" value="SIGNAL_UNSPECIFIED" />
+              <option name="timeIntervalDays" value="SEVEN_DAYS" />
+              <option name="visibilityType" value="ALL" />
+            </InsightsFilterSettings>
+          </value>
+        </entry>
+        <entry key="Firebase Crashlytics">
+          <value>
+            <InsightsFilterSettings>
+              <option name="connection">
+                <ConnectionSetting>
+                  <option name="appId" value="com.weartools.weekdayutccomp" />
+                  <option name="mobileSdkAppId" value="1:928537825190:android:869535ff575046c7448967" />
+                  <option name="projectId" value="weartools-fa8c6" />
+                  <option name="projectNumber" value="928537825190" />
+                </ConnectionSetting>
+              </option>
+              <option name="signal" value="SIGNAL_UNSPECIFIED" />
+              <option name="timeIntervalDays" value="THIRTY_DAYS" />
+              <option name="visibilityType" value="ALL" />
+            </InsightsFilterSettings>
+          </value>
+        </entry>
+      </map>
+    </option>
+  </component>
+</project>
\ No newline at end of file
diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml
new file mode 100644
index 0000000..7643783
--- /dev/null
+++ b/.idea/codeStyles/Project.xml
@@ -0,0 +1,123 @@
+<component name="ProjectCodeStyleConfiguration">
+  <code_scheme name="Project" version="173">
+    <JetCodeStyleSettings>
+      <option name="CODE_STYLE_DEFAULTS" value="KOTLIN_OFFICIAL" />
+    </JetCodeStyleSettings>
+    <codeStyleSettings language="XML">
+      <option name="FORCE_REARRANGE_MODE" value="1" />
+      <indentOptions>
+        <option name="CONTINUATION_INDENT_SIZE" value="4" />
+      </indentOptions>
+      <arrangement>
+        <rules>
+          <section>
+            <rule>
+              <match>
+                <AND>
+                  <NAME>xmlns:android</NAME>
+                  <XML_ATTRIBUTE />
+                  <XML_NAMESPACE>^$</XML_NAMESPACE>
+                </AND>
+              </match>
+            </rule>
+          </section>
+          <section>
+            <rule>
+              <match>
+                <AND>
+                  <NAME>xmlns:.*</NAME>
+                  <XML_ATTRIBUTE />
+                  <XML_NAMESPACE>^$</XML_NAMESPACE>
+                </AND>
+              </match>
+              <order>BY_NAME</order>
+            </rule>
+          </section>
+          <section>
+            <rule>
+              <match>
+                <AND>
+                  <NAME>.*:id</NAME>
+                  <XML_ATTRIBUTE />
+                  <XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE>
+                </AND>
+              </match>
+            </rule>
+          </section>
+          <section>
+            <rule>
+              <match>
+                <AND>
+                  <NAME>.*:name</NAME>
+                  <XML_ATTRIBUTE />
+                  <XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE>
+                </AND>
+              </match>
+            </rule>
+          </section>
+          <section>
+            <rule>
+              <match>
+                <AND>
+                  <NAME>name</NAME>
+                  <XML_ATTRIBUTE />
+                  <XML_NAMESPACE>^$</XML_NAMESPACE>
+                </AND>
+              </match>
+            </rule>
+          </section>
+          <section>
+            <rule>
+              <match>
+                <AND>
+                  <NAME>style</NAME>
+                  <XML_ATTRIBUTE />
+                  <XML_NAMESPACE>^$</XML_NAMESPACE>
+                </AND>
+              </match>
+            </rule>
+          </section>
+          <section>
+            <rule>
+              <match>
+                <AND>
+                  <NAME>.*</NAME>
+                  <XML_ATTRIBUTE />
+                  <XML_NAMESPACE>^$</XML_NAMESPACE>
+                </AND>
+              </match>
+              <order>BY_NAME</order>
+            </rule>
+          </section>
+          <section>
+            <rule>
+              <match>
+                <AND>
+                  <NAME>.*</NAME>
+                  <XML_ATTRIBUTE />
+                  <XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE>
+                </AND>
+              </match>
+              <order>ANDROID_ATTRIBUTE_ORDER</order>
+            </rule>
+          </section>
+          <section>
+            <rule>
+              <match>
+                <AND>
+                  <NAME>.*</NAME>
+                  <XML_ATTRIBUTE />
+                  <XML_NAMESPACE>.*</XML_NAMESPACE>
+                </AND>
+              </match>
+              <order>BY_NAME</order>
+            </rule>
+          </section>
+        </rules>
+      </arrangement>
+    </codeStyleSettings>
+    <codeStyleSettings language="kotlin">
+      <option name="CODE_STYLE_DEFAULTS" value="KOTLIN_OFFICIAL" />
+    </codeStyleSettings>
+  </code_scheme>
+</component>
\ No newline at end of file
diff --git a/.idea/codeStyles/codeStyleConfig.xml b/.idea/codeStyles/codeStyleConfig.xml
new file mode 100644
index 0000000..79ee123
--- /dev/null
+++ b/.idea/codeStyles/codeStyleConfig.xml
@@ -0,0 +1,5 @@
+<component name="ProjectCodeStyleConfiguration">
+  <state>
+    <option name="USE_PER_PROJECT_SETTINGS" value="true" />
+  </state>
+</component>
\ No newline at end of file
diff --git a/.idea/deploymentTargetDropDown.xml b/.idea/deploymentTargetDropDown.xml
new file mode 100644
index 0000000..32627fc
--- /dev/null
+++ b/.idea/deploymentTargetDropDown.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="deploymentTargetDropDown">
+    <value>
+      <entry key="mobile">
+        <State />
+      </entry>
+      <entry key="wear">
+        <State>
+          <targetSelectedWithDropDown>
+            <Target>
+              <type value="QUICK_BOOT_TARGET" />
+              <deviceKey>
+                <Key>
+                  <type value="VIRTUAL_DEVICE_PATH" />
+                  <value value="C:\Users\amoledwatchfaces\.android\avd\Wear_OS_Small_Round_API_33.avd" />
+                </Key>
+              </deviceKey>
+            </Target>
+          </targetSelectedWithDropDown>
+          <timeTargetWasSelectedWithDropDown value="2024-03-07T07:00:15.674903300Z" />
+        </State>
+      </entry>
+    </value>
+  </component>
+</project>
\ No newline at end of file
diff --git a/.idea/deploymentTargetSelector.xml b/.idea/deploymentTargetSelector.xml
new file mode 100644
index 0000000..7f44e80
--- /dev/null
+++ b/.idea/deploymentTargetSelector.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="deploymentTargetSelector">
+    <selectionStates>
+      <SelectionState runConfigName="wear">
+        <option name="selectionMode" value="DROPDOWN" />
+        <DropdownSelection timestamp="2024-09-18T11:49:05.823555200Z">
+          <Target type="DEFAULT_BOOT">
+            <handle>
+              <DeviceId pluginId="PhysicalDevice" identifier="serial=RFAR81XG7GJ" />
+            </handle>
+          </Target>
+        </DropdownSelection>
+        <DialogSelection />
+      </SelectionState>
+      <SelectionState runConfigName="mobile">
+        <option name="selectionMode" value="DROPDOWN" />
+        <DropdownSelection timestamp="2024-10-04T16:20:20.991970300Z">
+          <Target type="DEFAULT_BOOT">
+            <handle>
+              <DeviceId pluginId="LocalEmulator" identifier="path=C:\Users\amoledwatchfaces\.android\avd\Wear_OS_Small_Round_API_33.avd" />
+            </handle>
+          </Target>
+        </DropdownSelection>
+        <DialogSelection />
+      </SelectionState>
+    </selectionStates>
+  </component>
+</project>
\ No newline at end of file
diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index 6d4cc03..18f3847 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -4,6 +4,7 @@
   <component name="GradleSettings">
     <option name="linkedExternalProjectsSettings">
       <GradleProjectSettings>
+        <option name="testRunner" value="CHOOSE_PER_TEST" />
         <option name="externalProjectPath" value="$PROJECT_DIR$" />
         <option name="gradleJvm" value="#JAVA_HOME" />
         <option name="modules">
diff --git a/.idea/icon.svg b/.idea/icon.svg
new file mode 100644
index 0000000..ccccc3a
--- /dev/null
+++ b/.idea/icon.svg
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg id="Complications_Suite" data-name="Complications Suite" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 12 12">
+  <defs>
+    <style>
+      .cls-1 {
+        fill: #ccecff;
+      }
+
+      .cls-1, .cls-2, .cls-3, .cls-4 {
+        stroke-width: 0px;
+      }
+
+      .cls-5 {
+        fill: none;
+        stroke: #000;
+        stroke-miterlimit: 10;
+        stroke-width: .6px;
+      }
+
+      .cls-2 {
+        opacity: .85;
+      }
+
+      .cls-2, .cls-4 {
+        fill: #000;
+      }
+
+      .cls-3 {
+        fill: #c9c5bf;
+      }
+
+      .cls-4 {
+        isolation: isolate;
+        opacity: .55;
+      }
+    </style>
+  </defs>
+  <rect id="BG" class="cls-3" width="12" height="12" rx="3" ry="3"/>
+  <path class="cls-4" d="M5.61,1h.79c.77,0,1.15,0,1.43.22.27.22.36.6.52,1.35l.15.68.08.39c-.66-.72-1.6-1.13-2.58-1.13s-1.94.43-2.58,1.13l.08-.39.15-.68c.17-.75.25-1.13.52-1.35s.66-.22,1.43-.22"/>
+  <path class="cls-4" d="M8.58,8.36c-.66.72-1.6,1.13-2.58,1.13s-1.94-.44-2.58-1.13l.08.39.15.68c.17.75.25,1.13.52,1.35s.66.22,1.43.22h.79c.77,0,1.15,0,1.43-.22s.36-.6.52-1.35l.15-.68.08-.39h.01Z"/>
+  <circle class="cls-2" cx="6" cy="6" r="3"/>
+  <path class="cls-5" d="M6,9.22c1.78,0,3.22-1.44,3.22-3.22s-1.44-3.22-3.22-3.22-3.22,1.44-3.22,3.22,1.44,3.22,3.22,3.22"/>
+  <path class="cls-1" d="M4.42,5.51v-.91s.02-.09.05-.12c.03-.03.07-.05.12-.05h.91s.09.02.12.05c.03.03.05.07.05.12v.91s-.02.09-.05.12-.07.05-.12.05h-.91s-.09-.02-.12-.05c-.03-.03-.05-.07-.05-.12M6.83,5.82l-.65-.65s-.05-.07-.05-.12c0-.05.02-.09.05-.12l.65-.65s.07-.05.12-.05c.05,0,.09.02.12.05l.65.65s.05.07.05.12-.02.09-.05.12l-.65.65s-.07.05-.12.05c-.05,0-.09-.02-.12-.05M6.33,7.41v-.91s.02-.09.05-.12.07-.05.12-.05h.91s.09.02.12.05c.03.03.05.07.05.12v.91s-.02.09-.05.12c-.03.03-.07.05-.12.05h-.91s-.09-.02-.12-.05c-.03-.03-.05-.07-.05-.12M4.42,7.41v-.91s.02-.09.05-.12c.03-.03.07-.05.12-.05h.91s.09.02.12.05c.03.03.05.07.05.12v.91s-.02.09-.05.12c-.03.03-.07.05-.12.05h-.91s-.09-.02-.12-.05c-.03-.03-.05-.07-.05-.12"/>
+</svg>
\ No newline at end of file
diff --git a/.idea/inspectionProfiles/Project_Default.xml b/.idea/inspectionProfiles/Project_Default.xml
index 70160a9..2c064a3 100644
--- a/.idea/inspectionProfiles/Project_Default.xml
+++ b/.idea/inspectionProfiles/Project_Default.xml
@@ -32,6 +32,9 @@
     <inspection_tool class="PreviewApiLevelMustBeValid" enabled="true" level="ERROR" enabled_by_default="true">
       <option name="composableFile" value="true" />
     </inspection_tool>
+    <inspection_tool class="PreviewDeviceShouldUseNewSpec" enabled="true" level="WEAK WARNING" enabled_by_default="true">
+      <option name="composableFile" value="true" />
+    </inspection_tool>
     <inspection_tool class="PreviewDimensionRespectsLimit" enabled="true" level="WARNING" enabled_by_default="true">
       <option name="composableFile" value="true" />
     </inspection_tool>
diff --git a/.idea/migrations.xml b/.idea/migrations.xml
new file mode 100644
index 0000000..f8051a6
--- /dev/null
+++ b/.idea/migrations.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ProjectMigrations">
+    <option name="MigrateToGradleLocalJavaHome">
+      <set>
+        <option value="$PROJECT_DIR$" />
+      </set>
+    </option>
+  </component>
+</project>
\ No newline at end of file
diff --git a/.idea/other.xml b/.idea/other.xml
new file mode 100644
index 0000000..f3d4a2e
--- /dev/null
+++ b/.idea/other.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ScreenshotViewer">
+    <option name="frameScreenshot" value="true" />
+  </component>
+</project>
\ No newline at end of file
diff --git a/.idea/runConfigurations.xml b/.idea/runConfigurations.xml
new file mode 100644
index 0000000..931b96c
--- /dev/null
+++ b/.idea/runConfigurations.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="RunConfigurationProducerService">
+    <option name="ignoredProducers">
+      <set>
+        <option value="com.intellij.execution.junit.AbstractAllInDirectoryConfigurationProducer" />
+        <option value="com.intellij.execution.junit.AllInPackageConfigurationProducer" />
+        <option value="com.intellij.execution.junit.TestInClassConfigurationProducer" />
+        <option value="com.intellij.execution.junit.UniqueIdConfigurationProducer" />
+      </set>
+    </option>
+  </component>
+</project>
\ No newline at end of file
diff --git a/build.gradle.kts b/build.gradle.kts
index 409d0db..d857796 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -14,8 +14,8 @@ tasks.register("clean", Delete::class) {
 buildscript {
 
     /** Set version for wear & mobile modules **/
-    val versionCode by extra(10000362)
-    val versionName by extra("3.6.2")
+    val versionCode by extra(10000363)
+    val versionName by extra("3.6.3")
 
     dependencies {
         classpath ("com.android.tools.build:gradle:8.7.0")
diff --git a/wear/build.gradle.kts b/wear/build.gradle.kts
index 1516c2a..0dfc776 100644
--- a/wear/build.gradle.kts
+++ b/wear/build.gradle.kts
@@ -1,8 +1,6 @@
-@file:Suppress("UnstableApiUsage")
 import java.io.FileInputStream
 import java.util.Properties
 
-
 plugins {
     id ("com.android.application")
     id ("org.jetbrains.kotlin.android")
@@ -76,8 +74,7 @@ android {
 dependencies {
     val composeUiVersion = "1.7.2"
     val composeWearVersion = "1.4.0"
-
-    // NEW MOON / SUNRISE / SUNSET COMP
+    
     //request permission
     implementation ("com.google.accompanist:accompanist-permissions:0.34.0")
     //location
@@ -105,7 +102,7 @@ dependencies {
 
     androidTestImplementation ("androidx.compose.ui:ui-test-junit4:$composeUiVersion")
     debugImplementation ("androidx.compose.ui:ui-tooling:$composeUiVersion")
-    debugImplementation ("androidx.compose.ui:ui-test-manifest:$composeUiVersion")
+    debugImplementation ("androidx.compose.ui:ui-test-manifest:1.7.3")
 
     // DataStore
     implementation ("androidx.datastore:datastore:1.1.1")
diff --git a/wear/src/main/AndroidManifest.xml b/wear/src/main/AndroidManifest.xml
index e8bc913..7b667b4 100644
--- a/wear/src/main/AndroidManifest.xml
+++ b/wear/src/main/AndroidManifest.xml
@@ -225,7 +225,6 @@
                 <action android:name="android.support.wearable.complications.ACTION_COMPLICATION_UPDATE_REQUEST" />
             </intent-filter>
             <meta-data android:name="android.support.wearable.complications.UPDATE_PERIOD_SECONDS" android:value="3600"/>
-
             <meta-data
                 android:name="android.support.wearable.complications.SUPPORTED_TYPES"
                 android:value="SHORT_TEXT,LONG_TEXT" />
@@ -238,8 +237,8 @@
             <intent-filter>
                 <action android:name="android.support.wearable.complications.ACTION_COMPLICATION_UPDATE_REQUEST" />
             </intent-filter>
-
-            <meta-data android:name="android.support.wearable.complications.SUPPORTED_TYPES" android:value="SHORT_TEXT,LONG_TEXT" />
+            <meta-data android:name="android.support.wearable.complications.UPDATE_PERIOD_SECONDS" android:value="3600"/>
+            <meta-data android:name="android.support.wearable.complications.SUPPORTED_TYPES" android:value="SHORT_TEXT,LONG_TEXT,RANGED_VALUE" />
             <meta-data android:name="android.support.wearable.complications.PROVIDER_CONFIG_ACTION" android:value="com.weartools.weekdayutccomp.CONFIG_COMPLICATION" />
         </service>
         <service android:name=".complication.DayAndWeekComplicationService"
diff --git a/wear/src/main/kotlin/com/weartools/weekdayutccomp/MainViewModel.kt b/wear/src/main/kotlin/com/weartools/weekdayutccomp/MainViewModel.kt
index 17ea88a..dcfd3c3 100644
--- a/wear/src/main/kotlin/com/weartools/weekdayutccomp/MainViewModel.kt
+++ b/wear/src/main/kotlin/com/weartools/weekdayutccomp/MainViewModel.kt
@@ -157,7 +157,7 @@ class MainViewModel @Inject constructor(
                             setCoarsePermission()
                             val addressName = addressProvider.getAddressFromLocation(it.latitude,it.longitude)
                             if (addressName != null){
-                                Log.i(ContentValues.TAG, "$addressName")
+                                Log.i(ContentValues.TAG, addressName)
                                 dataStore.updateData { prefs ->
                                     prefs.copy(locationName = addressName)
                                 }
@@ -256,8 +256,11 @@ class MainViewModel @Inject constructor(
         }
     }
 
-    fun setDatePicked(value: String, context: Context) { viewModelScope.launch {
-        dataStore.updateData { it.copy(datePicker = value) }
+    fun setDatePicked(value: Long, context: Context) { viewModelScope.launch {
+        dataStore.updateData { it.copy(
+            startDate = System.currentTimeMillis(),
+            datePicked = value
+        ) }
         context.updateComplication(DateCountdownComplicationService::class.java)
     }}
 
diff --git a/wear/src/main/kotlin/com/weartools/weekdayutccomp/activity/PickDateActivity.kt b/wear/src/main/kotlin/com/weartools/weekdayutccomp/activity/PickDateActivity.kt
index e94798e..bfadd15 100644
--- a/wear/src/main/kotlin/com/weartools/weekdayutccomp/activity/PickDateActivity.kt
+++ b/wear/src/main/kotlin/com/weartools/weekdayutccomp/activity/PickDateActivity.kt
@@ -39,12 +39,12 @@ import androidx.lifecycle.ViewModelProvider
 import com.weartools.weekdayutccomp.MainViewModel
 import com.weartools.weekdayutccomp.presentation.ui.DatePicker
 import dagger.hilt.android.AndroidEntryPoint
-import java.time.LocalDate
+import java.time.Instant
+import java.time.ZoneId
 
 @AndroidEntryPoint
 class PickDateActivity : ComponentActivity(){
 
-    // LocalDate.now().toString()
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         val viewModel = ViewModelProvider(this)[MainViewModel::class.java]
@@ -55,11 +55,13 @@ class PickDateActivity : ComponentActivity(){
             DatePicker(
                 modifier = Modifier.background(color = Color.Black),
                 onDateConfirm = {
-                    viewModel.setDatePicked(it.toString(), context)
+                    viewModel.setDatePicked(it.atStartOfDay(ZoneId.of("UTC")).toInstant().toEpochMilli(), context)
                     setResult(RESULT_OK) // OK! (use whatever code you want)
                     finish()
                 },
-                date = LocalDate.parse(preferences.value.datePicker)
+                date = Instant.ofEpochMilli(preferences.value.datePicked)
+                    .atZone(ZoneId.of("UTC"))
+                    .toLocalDate()
             )
             }
         }
diff --git a/wear/src/main/kotlin/com/weartools/weekdayutccomp/complication/DateCountdownComplicationService.kt b/wear/src/main/kotlin/com/weartools/weekdayutccomp/complication/DateCountdownComplicationService.kt
index ec48ad3..455b545 100644
--- a/wear/src/main/kotlin/com/weartools/weekdayutccomp/complication/DateCountdownComplicationService.kt
+++ b/wear/src/main/kotlin/com/weartools/weekdayutccomp/complication/DateCountdownComplicationService.kt
@@ -39,20 +39,20 @@ import androidx.wear.watchface.complications.data.CountDownTimeReference
 import androidx.wear.watchface.complications.data.LongTextComplicationData
 import androidx.wear.watchface.complications.data.MonochromaticImage
 import androidx.wear.watchface.complications.data.PlainComplicationText
+import androidx.wear.watchface.complications.data.RangedValueComplicationData
 import androidx.wear.watchface.complications.data.ShortTextComplicationData
 import androidx.wear.watchface.complications.data.TimeDifferenceComplicationText
 import androidx.wear.watchface.complications.data.TimeDifferenceStyle
 import androidx.wear.watchface.complications.datasource.ComplicationRequest
 import androidx.wear.watchface.complications.datasource.SuspendingComplicationDataSourceService
-import com.weartools.weekdayutccomp.activity.PickDateActivity
 import com.weartools.weekdayutccomp.R
 import com.weartools.weekdayutccomp.R.drawable
+import com.weartools.weekdayutccomp.activity.PickDateActivity
 import com.weartools.weekdayutccomp.preferences.UserPreferences
 import com.weartools.weekdayutccomp.preferences.UserPreferencesRepository
 import dagger.hilt.android.AndroidEntryPoint
 import kotlinx.coroutines.flow.first
-import java.time.LocalDate
-import java.time.ZoneId
+import java.time.Instant
 import javax.inject.Inject
 
 @AndroidEntryPoint
@@ -90,6 +90,16 @@ class DateCountdownComplicationService : SuspendingComplicationDataSourceService
                 .setMonochromaticImage(MonochromaticImage.Builder(image = createWithResource(this, drawable.ic_date_countdown)).build())
                 .build()
         }
+        ComplicationType.RANGED_VALUE -> {
+            RangedValueComplicationData.Builder(
+                value = 17f,
+                min = 0f,
+                max = 31f,
+                contentDescription = PlainComplicationText.Builder(text = getString(R.string.date_countdown_comp_name)).build())
+                .setText(PlainComplicationText.Builder(text = "17d").build())
+                .setMonochromaticImage(MonochromaticImage.Builder(image = createWithResource(this, drawable.ic_date_countdown)).build())
+                .build()
+        }
 
         else -> {null}
     }
@@ -97,14 +107,13 @@ class DateCountdownComplicationService : SuspendingComplicationDataSourceService
 
     override suspend fun onComplicationRequest(request: ComplicationRequest): ComplicationData? {
 
-    val datePicked = preferences.first().datePicker
-    val timeInstance = LocalDate.parse(datePicked).atStartOfDay(ZoneId.systemDefault()).toInstant()
+    val datePicked = preferences.first().datePicked
+    val timeInstance = Instant.ofEpochMilli(datePicked)
 
-    when (request.complicationType) {
+    return when (request.complicationType) {
 
         ComplicationType.SHORT_TEXT -> {
-
-            return ShortTextComplicationData.Builder(
+            ShortTextComplicationData.Builder(
                 text = TimeDifferenceComplicationText.Builder(TimeDifferenceStyle.SHORT_SINGLE_UNIT, CountDownTimeReference(timeInstance)).build(),
                 contentDescription = PlainComplicationText.Builder(text = "Date Countdown").build())
                 .setMonochromaticImage(MonochromaticImage.Builder(createWithResource(this, drawable.ic_date_countdown)).build())
@@ -112,7 +121,7 @@ class DateCountdownComplicationService : SuspendingComplicationDataSourceService
                 .build()
         }
         ComplicationType.LONG_TEXT -> {
-            return LongTextComplicationData.Builder(
+            LongTextComplicationData.Builder(
                 text = PlainComplicationText.Builder(text = getString(R.string.countdown_text)).build(),
                 contentDescription = PlainComplicationText.Builder(text = "Date Countdown").build())
                 .setMonochromaticImage(MonochromaticImage.Builder(createWithResource(this, drawable.ic_date_countdown)).build())
@@ -123,6 +132,24 @@ class DateCountdownComplicationService : SuspendingComplicationDataSourceService
                 .setTapAction(openScreen())
                 .build()
         }
+        ComplicationType.RANGED_VALUE -> {
+
+            val now = System.currentTimeMillis()
+            val startDate = preferences.first().startDate
+            val timeRange = (datePicked - startDate) / 60000
+            val timePassed = (now - startDate) / 60000
+            val timeLeft = (timeRange - timePassed)
+
+            RangedValueComplicationData.Builder(
+                min = 0f,
+                value = timeLeft.coerceIn(0, timeRange).toFloat(),
+                max = timeRange.toFloat(),
+                contentDescription = PlainComplicationText.Builder(text = "Date Countdown").build())
+                .setText(TimeDifferenceComplicationText.Builder(TimeDifferenceStyle.SHORT_SINGLE_UNIT, CountDownTimeReference(timeInstance)).build())
+                .setMonochromaticImage(MonochromaticImage.Builder(createWithResource(this, drawable.ic_date_countdown)).build())
+                .setTapAction(openScreen())
+                .build()
+        }
 
         else -> {
             if (Log.isLoggable(TAG, Log.WARN)) {
diff --git a/wear/src/main/kotlin/com/weartools/weekdayutccomp/complication/TimerComplicationService.kt b/wear/src/main/kotlin/com/weartools/weekdayutccomp/complication/TimerComplicationService.kt
index 0acbddf..130f2f9 100644
--- a/wear/src/main/kotlin/com/weartools/weekdayutccomp/complication/TimerComplicationService.kt
+++ b/wear/src/main/kotlin/com/weartools/weekdayutccomp/complication/TimerComplicationService.kt
@@ -27,6 +27,7 @@
  */
 package com.weartools.weekdayutccomp.complication
 
+import android.annotation.SuppressLint
 import android.app.PendingIntent
 import android.content.ContentValues.TAG
 import android.content.Intent
@@ -143,6 +144,7 @@ class TimerComplicationService : SuspendingComplicationDataSourceService() {
     }
 }
 
+
     override suspend fun onComplicationRequest(request: ComplicationRequest): ComplicationData? {
 
         val startMillis = preferences.first().startTime
@@ -171,6 +173,7 @@ class TimerComplicationService : SuspendingComplicationDataSourceService() {
             }
 
              */
+            @SuppressLint("RestrictedApi")
             when (request.complicationType) {
                 ComplicationType.RANGED_VALUE -> {
                     val dynamicDuration = getDynamicDuration(targetMillis)
diff --git a/wear/src/main/kotlin/com/weartools/weekdayutccomp/preferences/UserPreferences.kt b/wear/src/main/kotlin/com/weartools/weekdayutccomp/preferences/UserPreferences.kt
index 7e52857..1ce50e5 100644
--- a/wear/src/main/kotlin/com/weartools/weekdayutccomp/preferences/UserPreferences.kt
+++ b/wear/src/main/kotlin/com/weartools/weekdayutccomp/preferences/UserPreferences.kt
@@ -11,7 +11,6 @@ import kotlinx.serialization.SerializationException
 import kotlinx.serialization.json.Json
 import java.io.InputStream
 import java.io.OutputStream
-import java.time.LocalDate
 import javax.inject.Inject
 
 
@@ -60,7 +59,8 @@ data class UserPreferences(
     val locale: String = "en",
 
     // DATE PICKER
-    val datePicker: String = LocalDate.now().toString(),
+    val startDate: Long = System.currentTimeMillis(),
+    val datePicked: Long = System.currentTimeMillis(),
     val notificationAsked: Boolean = false,
 
     // WATER
diff --git a/wear/src/main/kotlin/com/weartools/weekdayutccomp/receiver/ComplicationTapBroadcastReceiver.kt b/wear/src/main/kotlin/com/weartools/weekdayutccomp/receiver/ComplicationTapBroadcastReceiver.kt
index e2571bf..92bbf7d 100644
--- a/wear/src/main/kotlin/com/weartools/weekdayutccomp/receiver/ComplicationTapBroadcastReceiver.kt
+++ b/wear/src/main/kotlin/com/weartools/weekdayutccomp/receiver/ComplicationTapBroadcastReceiver.kt
@@ -32,7 +32,9 @@ import android.content.BroadcastReceiver
 import android.content.ComponentName
 import android.content.Context
 import android.content.Intent
+import android.os.Build
 import android.os.Parcelable
+import android.util.Log
 import androidx.wear.watchface.complications.datasource.ComplicationDataSourceUpdateRequester
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
@@ -44,17 +46,21 @@ class ComplicationTapBroadcastReceiver : BroadcastReceiver() {
     private val scope = CoroutineScope(SupervisorJob() + Dispatchers.Main.immediate)
 
     override fun onReceive(context: Context, intent: Intent) {
-        val args = intent.getArgs()
         val result = goAsync()
 
-        scope.launch {
-            try {
-                ComplicationDataSourceUpdateRequester
-                    .create(context = context, complicationDataSourceComponent = args.providerComponent)
-                    .requestUpdate(args.complicationInstanceId)
-            } finally {
-                result.finish()
+        intent.getArgs()?.let { args -> // This block executes only if args is not null
+            scope.launch {
+                try {
+                    ComplicationDataSourceUpdateRequester
+                        .create(context = context, complicationDataSourceComponent = args.providerComponent)
+                        .requestUpdate(args.complicationInstanceId)
+                } finally {
+                    result.finish()
+                }
             }
+        } ?: run {
+            Log.e("Complication", "Received Intent without valid args")
+            result.finish() // Finish the result if args is null
         }
     }
 
@@ -75,10 +81,24 @@ class ComplicationTapBroadcastReceiver : BroadcastReceiver() {
                 PendingIntent.FLAG_UPDATE_CURRENT or PendingIntent.FLAG_IMMUTABLE
             )
         }
-        private fun Intent.getArgs(): ComplicationToggleArgs = requireNotNull(
-            @Suppress("DEPRECATION")
-            extras?.getParcelable(EXTRA_ARGS)
-        )
+        private fun Intent.getArgs(): ComplicationToggleArgs?{
+            return extras?.let {
+                try {
+                    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
+                        it.getParcelable(EXTRA_ARGS, ComplicationToggleArgs::class.java)
+                    } else {
+                        @Suppress("DEPRECATION")
+                        it.getParcelable(EXTRA_ARGS)
+                    }
+                } catch (e: Exception) {
+                    Log.e("Complication", "Error fetching Parcelable: $e")
+                    null
+                }
+            } ?: run {
+                Log.e("Complication", "Intent without extras")
+                null
+            }
+        }
     }
 }
 
diff --git a/wear/src/main/res/drawable/ic_launch.xml b/wear/src/main/res/drawable/ic_launch.xml
index 9a7fb30..1520135 100644
--- a/wear/src/main/res/drawable/ic_launch.xml
+++ b/wear/src/main/res/drawable/ic_launch.xml
@@ -3,7 +3,6 @@
     android:height="24dp"
     android:viewportWidth="24"
     android:viewportHeight="24"
-    android:tint="?attr/colorControlNormal"
     android:autoMirrored="true">
     <path
         android:fillColor="@android:color/white"
diff --git a/wear/src/main/res/drawable/ic_notification.xml b/wear/src/main/res/drawable/ic_notification.xml
index 6994560..4a2203d 100644
--- a/wear/src/main/res/drawable/ic_notification.xml
+++ b/wear/src/main/res/drawable/ic_notification.xml
@@ -2,8 +2,7 @@
     android:width="24dp"
     android:height="24dp"
     android:viewportWidth="24"
-    android:viewportHeight="24"
-    android:tint="?attr/colorControlNormal">
+    android:viewportHeight="24">
     <path
         android:fillColor="@android:color/white"
         android:pathData="M12,22c1.1,0 2,-0.9 2,-2h-4c0,1.1 0.89,2 2,2zM18,16v-5c0,-3.07 -1.64,-5.64 -4.5,-6.32L13.5,4c0,-0.83 -0.67,-1.5 -1.5,-1.5s-1.5,0.67 -1.5,1.5v0.68C7.63,5.36 6,7.92 6,11v5l-2,2v1h16v-1l-2,-2z"/>
diff --git a/wear/src/main/res/drawable/ic_water.xml b/wear/src/main/res/drawable/ic_water.xml
index 11cb2ee..f20c29e 100644
--- a/wear/src/main/res/drawable/ic_water.xml
+++ b/wear/src/main/res/drawable/ic_water.xml
@@ -2,8 +2,7 @@
     android:width="24dp"
     android:height="24dp"
     android:viewportWidth="24"
-    android:viewportHeight="24"
-    android:tint="?attr/colorControlNormal">
+    android:viewportHeight="24">
     <path
         android:fillColor="@android:color/white"
         android:pathData="M12,2c-5.33,4.55 -8,8.48 -8,11.8c0,4.98 3.8,8.2 8,8.2s8,-3.22 8,-8.2C20,10.48 17.33,6.55 12,2zM7.83,14c0.37,0 0.67,0.26 0.74,0.62c0.41,2.22 2.28,2.98 3.64,2.87c0.43,-0.02 0.79,0.32 0.79,0.75c0,0.4 -0.32,0.73 -0.72,0.75c-2.13,0.13 -4.62,-1.09 -5.19,-4.12C7.01,14.42 7.37,14 7.83,14z"/>