v.0.16.0

- you can now swipe between days in the calendar tab on phones - updates app icon - updates splash screen theme - fixes multiple swiping issues on tablets - adds delete forever button on tablets - updates translations #39
pablo03v · Apr 4, 2024 · ede97fd · ede97fd
1 parent e124442
commit ede97fd
Show file tree

Hide file tree

Showing 68 changed files with 1,045 additions and 518 deletions.
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
@@ -12,8 +12,8 @@ android {
         applicationId = "cloud.pablos.overload"
         minSdk = 26
         targetSdk = 34
-        versionCode = 150
-        versionName = "0.15.0"
+        versionCode = 160
+        versionName = "0.16.0"
         vectorDrawables.useSupportLibrary = true
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
 

diff --git a/app/release/output-metadata.json b/app/release/output-metadata.json
@@ -11,10 +11,27 @@
       "type": "SINGLE",
       "filters": [],
       "attributes": [],
-      "versionCode": 150,
-      "versionName": "0.15.0",
+      "versionCode": 160,
+      "versionName": "0.16.0",
       "outputFile": "app-release.apk"
     }
   ],
-  "elementType": "File"
+  "elementType": "File",
+  "baselineProfiles": [
+    {
+      "minApi": 28,
+      "maxApi": 30,
+      "baselineProfiles": [
+        "baselineProfiles/1/app-release.dm"
+      ]
+    },
+    {
+      "minApi": 31,
+      "maxApi": 2147483647,
+      "baselineProfiles": [
+        "baselineProfiles/0/app-release.dm"
+      ]
+    }
+  ],
+  "minSdkVersionForDexing": 26
 }
diff --git a/app/src/main/ic_launcher-playstore.png b/app/src/main/ic_launcher-playstore.png
diff --git a/app/src/main/java/cloud/pablos/overload/data/item/ItemDao.kt b/app/src/main/java/cloud/pablos/overload/data/item/ItemDao.kt
@@ -4,6 +4,7 @@ import androidx.room.Dao
 import androidx.room.Delete
 import androidx.room.Query
 import androidx.room.Upsert
+import cloud.pablos.overload.ui.tabs.home.getItemsOfDay
 import cloud.pablos.overload.ui.views.extractDate
 import cloud.pablos.overload.ui.views.parseToLocalDateTime
 import kotlinx.coroutines.flow.Flow
@@ -16,9 +17,9 @@ interface ItemDao {
     suspend fun upsertItem(item: Item)
 
     /*@Upsert
-    suspend fun upsertItems(items: List<Item>)*/
+    suspend fun upsertItems(items: List<Item>)
 
-    /*@Delete
+    @Delete
     suspend fun deleteItem(item: Item)*/
 
     @Delete
@@ -55,11 +56,7 @@ fun startOrStopPause(
 ) {
     val date = LocalDate.now()
 
-    val itemsForToday =
-        state.items.filter { item ->
-            val startTime = parseToLocalDateTime(item.startTime)
-            extractDate(startTime) == date
-        }
+    val itemsForToday = getItemsOfDay(date, state)
     val isFirstToday = itemsForToday.isEmpty()
     val isOngoingToday = itemsForToday.isNotEmpty() && itemsForToday.last().ongoing
 
@@ -73,32 +70,32 @@ fun startOrStopPause(
     if (isOngoingNotToday) {
         onEvent(ItemEvent.SetForgotToStopDialogShown(true))
     } else if (isFirstToday) {
-        onEvent(ItemEvent.SetStart(start = LocalDateTime.now().toString()))
-        onEvent(ItemEvent.SetOngoing(ongoing = true))
-        onEvent(ItemEvent.SetPause(pause = false))
+        onEvent(ItemEvent.SetStart(LocalDateTime.now().toString()))
+        onEvent(ItemEvent.SetOngoing(true))
+        onEvent(ItemEvent.SetPause(false))
         onEvent(ItemEvent.SaveItem)
 
-        onEvent(ItemEvent.SetIsOngoing(isOngoing = true))
+        onEvent(ItemEvent.SetIsOngoing(true))
     } else if (isOngoingToday) {
-        onEvent(ItemEvent.SetId(id = itemsForToday.last().id))
-        onEvent(ItemEvent.SetStart(start = itemsForToday.last().startTime))
-        onEvent(ItemEvent.SetEnd(end = LocalDateTime.now().toString()))
-        onEvent(ItemEvent.SetOngoing(ongoing = false))
+        onEvent(ItemEvent.SetId(itemsForToday.last().id))
+        onEvent(ItemEvent.SetStart(itemsForToday.last().startTime))
+        onEvent(ItemEvent.SetEnd(LocalDateTime.now().toString()))
+        onEvent(ItemEvent.SetOngoing(false))
         onEvent(ItemEvent.SaveItem)
 
-        onEvent(ItemEvent.SetIsOngoing(isOngoing = false))
+        onEvent(ItemEvent.SetIsOngoing(false))
     } else {
-        onEvent(ItemEvent.SetStart(start = itemsForToday.last().endTime))
-        onEvent(ItemEvent.SetEnd(end = LocalDateTime.now().toString()))
-        onEvent(ItemEvent.SetOngoing(ongoing = false))
-        onEvent(ItemEvent.SetPause(pause = true))
+        onEvent(ItemEvent.SetStart(itemsForToday.last().endTime))
+        onEvent(ItemEvent.SetEnd(LocalDateTime.now().toString()))
+        onEvent(ItemEvent.SetOngoing(false))
+        onEvent(ItemEvent.SetPause(true))
         onEvent(ItemEvent.SaveItem)
 
-        onEvent(ItemEvent.SetStart(start = LocalDateTime.now().toString()))
-        onEvent(ItemEvent.SetOngoing(ongoing = true))
-        onEvent(ItemEvent.SetPause(pause = false))
+        onEvent(ItemEvent.SetStart(LocalDateTime.now().toString()))
+        onEvent(ItemEvent.SetOngoing(true))
+        onEvent(ItemEvent.SetPause(false))
         onEvent(ItemEvent.SaveItem)
 
-        onEvent(ItemEvent.SetIsOngoing(isOngoing = true))
+        onEvent(ItemEvent.SetIsOngoing(true))
     }
 }
diff --git a/app/src/main/java/cloud/pablos/overload/ui/MainActivity.kt b/app/src/main/java/cloud/pablos/overload/ui/MainActivity.kt
@@ -18,6 +18,7 @@ import androidx.lifecycle.ViewModel
 import androidx.lifecycle.ViewModelProvider
 import androidx.lifecycle.lifecycleScope
 import androidx.room.Room
+import cloud.pablos.overload.R
 import cloud.pablos.overload.data.item.ItemDatabase
 import cloud.pablos.overload.data.item.ItemViewModel
 import cloud.pablos.overload.ui.tabs.configurations.handleIntent
@@ -48,6 +49,7 @@ class MainActivity : ComponentActivity() {
     @OptIn(ExperimentalMaterial3WindowSizeClassApi::class)
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
+        setTheme(R.style.Theme_Overload)
 
         WindowCompat.setDecorFitsSystemWindows(window, false)