Merge branch 'Razeeman:dev' into dev

Author: ldmpub

.github/workflows/github_actions.yml

@@ -1,4 +1,4 @@
-name: Tests
+name: Check
 on:
   pull_request:
     branches:
@@ -11,7 +11,7 @@ on:
     paths-ignore:
       - '**.md'
 jobs:
-  tests:
+  check:
     runs-on: ubuntu-latest
     timeout-minutes: 60
 
@@ -23,50 +23,10 @@ jobs:
         uses: actions/setup-java@v4
         with:
           distribution: 'zulu'
-          java-version: '17'
+          java-version: '21'
 
       - name: Run style check
         run: ./gradlew ktlintCheck
 
       - name: Run tests
         run: ./gradlew test testDebugUnitTest --stacktrace
-
-  android_tests:
-    runs-on: ubuntu-latest
-    timeout-minutes: 120
-    strategy:
-      fail-fast: false
-      matrix:
-        api-level: [21, 23, 29, 32, 34]
-
-    steps:
-      - name: Check out code
-        uses: actions/checkout@v4
-        
-      - name: Setup Java
-        uses: actions/setup-java@v4
-        with:
-          distribution: 'zulu'
-          java-version: '17'
-
-      - name: Enable KVM
-        run: |
-          echo 'KERNEL=="kvm", GROUP="kvm", MODE="0666", OPTIONS+="static_node=kvm"' | sudo tee /etc/udev/rules.d/99-kvm4all.rules
-          sudo udevadm control --reload-rules
-          sudo udevadm trigger --name-match=kvm
-
-      - name: Setup Android SDK
-        uses: android-actions/setup-android@v3
-
-      - name: Run tests
-        uses: reactivecircus/android-emulator-runner@v2
-        with:
-          api-level: ${{ matrix.api-level }}
-          target: google_apis
-          arch: x86_64
-          disable-animations: true
-          script: |
-            adb shell settings put global window_animation_scale 0
-            adb shell settings put global transition_animation_scale 0
-            adb shell settings put global animator_duration_scale 0
-            ./gradlew app:connectedPlayDebugAndroidTest --stacktrace

.github/workflows/github_check_ui.yml

@@ -0,0 +1,43 @@
+name: Check_UI
+on:
+  workflow_dispatch
+jobs:
+  check_ui:
+    runs-on: ubuntu-latest
+    timeout-minutes: 120
+    strategy:
+      fail-fast: false
+      matrix:
+        api-level: [21, 23, 29, 32, 34]
+
+    steps:
+      - name: Check out code
+        uses: actions/checkout@v4
+
+      - name: Setup Java
+        uses: actions/setup-java@v4
+        with:
+          distribution: 'zulu'
+          java-version: '21'
+
+      - name: Enable KVM
+        run: |
+          echo 'KERNEL=="kvm", GROUP="kvm", MODE="0666", OPTIONS+="static_node=kvm"' | sudo tee /etc/udev/rules.d/99-kvm4all.rules
+          sudo udevadm control --reload-rules
+          sudo udevadm trigger --name-match=kvm
+
+      - name: Setup Android SDK
+        uses: android-actions/setup-android@v3
+
+      - name: Run tests
+        uses: reactivecircus/android-emulator-runner@v2
+        with:
+          api-level: ${{ matrix.api-level }}
+          target: google_apis
+          arch: x86_64
+          disable-animations: true
+          script: |
+            adb shell settings put global window_animation_scale 0
+            adb shell settings put global transition_animation_scale 0
+            adb shell settings put global animator_duration_scale 0
+            ./gradlew app:connectedPlayDebugAndroidTest --stacktrace

core/src/main/java/com/example/util/simpletimetracker/core/base/BaseActivity.kt

@@ -6,6 +6,7 @@ import android.view.LayoutInflater
 import androidx.appcompat.app.AppCompatActivity
 import androidx.lifecycle.LiveData
 import androidx.viewbinding.ViewBinding
+import com.example.util.simpletimetracker.core.extension.allowDiskRead
 import com.example.util.simpletimetracker.core.extension.allowDiskWrite
 import com.example.util.simpletimetracker.core.manager.ThemeManager
 import com.example.util.simpletimetracker.core.provider.ContextProvider
@@ -26,7 +27,7 @@ abstract class BaseActivity<T : ViewBinding> : AppCompatActivity() {
     }
 
     override fun onCreate(savedInstanceState: Bundle?) {
-        super.onCreate(savedInstanceState)
+        allowDiskRead { super.onCreate(savedInstanceState) }
         contextProvider.attach(this)
         themeManager.setTheme(this)
         _binding = inflater(layoutInflater)

core/src/main/java/com/example/util/simpletimetracker/core/base/BaseViewModel.kt

@@ -5,10 +5,16 @@ import androidx.lifecycle.viewModelScope
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Job
 
-abstract class BaseViewModel : ViewModel(), ScopeHolder, Throttler {
+abstract class BaseViewModel :
+    ViewModel(),
+    ScopeHolder,
+    Throttler,
+    DelayLoadHandler {
 
     override var throttleJob: Job? = null
 
+    override var delayDataLoad: Boolean = true
+
     override fun getScope(): CoroutineScope {
         return viewModelScope
     }

core/src/main/java/com/example/util/simpletimetracker/core/base/DelayLoadHandler.kt

@@ -0,0 +1,17 @@
+package com.example.util.simpletimetracker.core.base
+
+import com.example.util.simpletimetracker.core.utils.DELAY_DATA_LOAD_MS
+import kotlinx.coroutines.delay
+
+interface DelayLoadHandler {
+
+    var delayDataLoad: Boolean
+
+    suspend fun delayLoad() {
+        if (delayDataLoad) {
+            // Delay data set on view to avoid screen open lag.
+            delay(DELAY_DATA_LOAD_MS)
+            delayDataLoad = false
+        }
+    }
+}

core/src/main/java/com/example/util/simpletimetracker/core/interactor/GetCurrentRecordsDurationInteractor.kt

@@ -5,6 +5,7 @@ import com.example.util.simpletimetracker.domain.record.mapper.RangeMapper
 import com.example.util.simpletimetracker.domain.record.model.Range
 import com.example.util.simpletimetracker.domain.statistics.model.RangeLength
 import com.example.util.simpletimetracker.domain.record.model.Record
+import com.example.util.simpletimetracker.domain.record.model.RecordBase
 import com.example.util.simpletimetracker.domain.record.model.RunningRecord
 import java.lang.Long.max
 import javax.inject.Inject
@@ -22,18 +23,6 @@ class GetCurrentRecordsDurationInteractor @Inject constructor(
         return getRangeCurrent(typeId, runningRecord, RangeLength.Day)
     }
 
-    suspend fun getDailyCurrent(runningRecord: RunningRecord): Result {
-        return getRangeCurrent(runningRecord.id, runningRecord, RangeLength.Day)
-    }
-
-    suspend fun getWeeklyCurrent(runningRecord: RunningRecord): Result {
-        return getRangeCurrent(runningRecord.id, runningRecord, RangeLength.Week)
-    }
-
-    suspend fun getMonthlyCurrent(runningRecord: RunningRecord): Result {
-        return getRangeCurrent(runningRecord.id, runningRecord, RangeLength.Month)
-    }
-
     suspend fun getAllCurrents(
         typeIds: List<Long>,
         runningRecords: List<RunningRecord>,
@@ -48,8 +37,30 @@ class GetCurrentRecordsDurationInteractor @Inject constructor(
 
         return typeIds.associateWith { typeId ->
             getRangeCurrent(
-                filterRecords = { records -> records.filter { it.typeId == typeId } },
-                runningRecords = runningRecords.filter { it.id == typeId },
+                filter = { record -> typeId in record.typeIds },
+                allRunningRecords = runningRecords,
+                range = range,
+                rangeRecords = rangeRecords,
+            )
+        }
+    }
+
+    suspend fun getAllCategoryCurrents(
+        recordTypeCategories: Map<Long, List<Long>>,
+        runningRecords: List<RunningRecord>,
+        rangeLength: RangeLength,
+    ): Map<Long, Result> {
+        val range = getRange(rangeLength)
+        val rangeRecords = getRangeRecords(
+            rangeLength = rangeLength,
+            range = range,
+            typeIds = recordTypeCategories.values.flatten().distinct(),
+        )
+
+        return recordTypeCategories.mapValues { (_, typeIds) ->
+            getRangeCurrent(
+                filter = { record -> record.typeIds.any { it in typeIds } },
+                allRunningRecords = runningRecords,
                 range = range,
                 rangeRecords = rangeRecords,
             )
@@ -67,12 +78,8 @@ class GetCurrentRecordsDurationInteractor @Inject constructor(
 
         return tagIds.associateWith { tagId ->
             getRangeCurrent(
-                filterRecords = { records ->
-                    records.filter { record -> record.tags.any { it.tagId == tagId } }
-                },
-                runningRecords = runningRecords.filter { record ->
-                    record.tags.any { it.tagId in tagIds }
-                },
+                filter = { record -> record.tags.any { it.tagId == tagId } },
+                allRunningRecords = runningRecords,
                 range = range,
                 rangeRecords = rangeRecords,
             )
@@ -90,22 +97,10 @@ class GetCurrentRecordsDurationInteractor @Inject constructor(
         )
     }
 
-    private suspend fun getRangeCurrent(
+    suspend fun getRangeCurrent(
         typeId: Long,
         runningRecord: RunningRecord?,
         rangeLength: RangeLength,
-    ): Result {
-        return getRangeCurrent(
-            typeId = typeId,
-            runningRecords = listOfNotNull(runningRecord),
-            rangeLength = rangeLength,
-        )
-    }
-
-    private suspend fun getRangeCurrent(
-        typeId: Long,
-        runningRecords: List<RunningRecord>,
-        rangeLength: RangeLength,
     ): Result {
         val range = getRange(rangeLength)
         val rangeRecords = getRangeRecords(
@@ -115,19 +110,20 @@ class GetCurrentRecordsDurationInteractor @Inject constructor(
         )
 
         return getRangeCurrent(
-            filterRecords = { records -> records.filter { it.typeId == typeId } },
-            runningRecords = runningRecords,
+            filter = { record -> typeId in record.typeIds },
+            allRunningRecords = listOfNotNull(runningRecord),
             range = range,
             rangeRecords = rangeRecords,
         )
     }
 
     private fun getRangeCurrent(
-        filterRecords: (List<Record>) -> List<Record>,
-        runningRecords: List<RunningRecord>,
+        filter: (RecordBase) -> Boolean,
+        allRunningRecords: List<RunningRecord>,
         range: Range,
         rangeRecords: List<Record>,
     ): Result {
+        val runningRecords = allRunningRecords.filter(filter)
         val current = System.currentTimeMillis()
         val currentRunning = runningRecords.sumOf { runningRecord ->
             current - runningRecord.timeStarted
@@ -137,7 +133,7 @@ class GetCurrentRecordsDurationInteractor @Inject constructor(
         }
         val currentRunningCount = runningRecords.size
 
-        val records = filterRecords(rangeRecords)
+        val records = rangeRecords.filter(filter)
             .map { rangeMapper.clampToRange(it, range) }
         val duration = records
             .let(rangeMapper::mapToDuration)

core/src/main/java/com/example/util/simpletimetracker/core/interactor/GetRunningRecordViewDataMediator.kt

@@ -29,7 +29,7 @@ class GetRunningRecordViewDataMediator @Inject constructor(
         showSeconds: Boolean,
     ): RunningRecordViewData {
         val dailyCurrent = if ((goals.getDaily() != null && goalsVisible) || totalDurationVisible) {
-            getCurrentRecordsDurationInteractor.getDailyCurrent(record)
+            getCurrentRecordsDurationInteractor.getDailyCurrent(typeId = record.id, runningRecord = record)
         } else {
             null
         }

core/src/main/java/com/example/util/simpletimetracker/core/sharedViewModel/RemoveRecordViewModel.kt

@@ -11,6 +11,7 @@ import com.example.util.simpletimetracker.domain.record.interactor.AddRecordMedi
 import com.example.util.simpletimetracker.domain.record.interactor.RecordInteractor
 import com.example.util.simpletimetracker.domain.record.interactor.RemoveRecordMediator
 import com.example.util.simpletimetracker.domain.record.model.Record
+import com.example.util.simpletimetracker.domain.record.model.RecordBase
 import com.example.util.simpletimetracker.domain.recordType.interactor.RecordTypeInteractor
 import com.example.util.simpletimetracker.navigation.params.notification.SnackBarParams
 import com.example.util.simpletimetracker.navigation.params.screen.ChangeRecordParams
@@ -45,8 +46,10 @@ class RemoveRecordViewModel @Inject constructor(
 
         val typeIds = removedRecords.map(Record::typeId).distinct()
         removeRecordMediator.remove(
-            recordIds = removedRecords.map { it.id },
+            recordIds = removedRecords.map(Record::id),
             typeIds = typeIds,
+            tagIds = removedRecords.map(Record::tags).flatten()
+                .map(RecordBase.Tag::tagId).distinct(),
         )
 
         val removedRecordsCount = removedRecords.size

core/src/main/java/com/example/util/simpletimetracker/core/utils/CoreConsts.kt

@@ -33,4 +33,6 @@ const val EXTRA_RECORD_COMMENT_MODE = "extra_record_comment_mode" // set, append
 const val EXTRA_FIND_RECORD_MODE = "extra_find_record_mode" // current_or_last, current, last
 const val EXTRA_FIND_RECORD_WITH_ACTIVITY_NAME = "extra_find_record_with_activity_name"
 const val EXTRA_GOAL_TYPE = "extra_goal_type" // duration, count
-const val EXTRA_GOAL_VALUE = "extra_goal_value"
+const val EXTRA_GOAL_VALUE = "extra_goal_value"
+
+const val DELAY_DATA_LOAD_MS = 300L // Same as @integer/screen_animation_time

data_local/src/main/java/com/example/util/simpletimetracker/data_local/recordType/RecordTypeGoalDao.kt

@@ -15,27 +15,9 @@ interface RecordTypeGoalDao {
     @Query("SELECT * FROM recordTypeGoals WHERE id = :id LIMIT 1")
     suspend fun get(id: Long): RecordTypeGoalDBO?
 
-    @Query("SELECT * FROM recordTypeGoals WHERE owner_type == 0")
-    suspend fun getAllTypeGoals(): List<RecordTypeGoalDBO>
-
-    @Query("SELECT * FROM recordTypeGoals WHERE owner_type == 1")
-    suspend fun getAllCategoryGoals(): List<RecordTypeGoalDBO>
-
-    // TODO TAG GOAL remove owner_type checking, should not depend on it.
-    @Query("SELECT * FROM recordTypeGoals WHERE owner_type == 2")
-    suspend fun getAllTagGoals(): List<RecordTypeGoalDBO>
-
-    @Transaction
-    @Query("SELECT * FROM recordTypeGoals WHERE owner_type == 0 AND owner_id = :typeId")
-    suspend fun getByType(typeId: Long): List<RecordTypeGoalDBO>
-
-    @Transaction
-    @Query("SELECT * FROM recordTypeGoals WHERE owner_type == 1 AND owner_id = :categoryId")
-    suspend fun getByCategory(categoryId: Long): List<RecordTypeGoalDBO>
-
     @Transaction
-    @Query("SELECT * FROM recordTypeGoals WHERE owner_type == 2 AND owner_id = :tagId")
-    suspend fun getByTag(tagId: Long): List<RecordTypeGoalDBO>
+    @Query("SELECT * FROM recordTypeGoals WHERE owner_id = :ownerId")
+    suspend fun getByOwnerId(ownerId: Long): List<RecordTypeGoalDBO>
 
     @Insert(onConflict = OnConflictStrategy.REPLACE)
     suspend fun insert(recordTypeGoal: RecordTypeGoalDBO): Long