Merge branch 'Razeeman:dev' into dev

Author: vlzuykov

buildSrc/src/main/kotlin/com/example/util/simpletimetracker/Base.kt

@@ -5,8 +5,8 @@ object Base {
     const val namespace = "com.example.util.simpletimetracker"
 
     // Raise by 2 to account for wear version code.
-    const val versionCode = 89
-    const val versionName = "1.47"
+    const val versionCode = 93
+    const val versionName = "1.48"
     const val minSDK = 21
     const val currentSDK = 34
 

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

@@ -33,8 +33,6 @@ abstract class BaseFragment<T : ViewBinding> : Fragment(), Throttler {
         // This also somehow fixes memory leaks occurring on navigation
         // from main to some edit screen and back.
         // If this ever changes - need to also fix these memory leaks.
-        // Also ViewPagers has isSaveEnabled set to false, to avoid crash
-        // "Expected the adapter to be 'fresh' while restoring state".
         return _binding?.root?.also {
             initialized = true
         } ?: run {

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

@@ -6,6 +6,7 @@ const val SHORTCUT_NAVIGATION_RECORDS = "recordsTab"
 const val SHORTCUT_NAVIGATION_STATISTICS = "statisticsTab"
 const val SHORTCUT_NAVIGATION_SETTINGS = "settingsTab"
 
+// Same values written in manifest.
 const val ACTION_EXTERNAL_START_ACTIVITY = "com.razeeman.util.simpletimetracker.ACTION_START_ACTIVITY"
 const val ACTION_EXTERNAL_STOP_ACTIVITY = "com.razeeman.util.simpletimetracker.ACTION_STOP_ACTIVITY"
 const val ACTION_EXTERNAL_STOP_ALL_ACTIVITIES = "com.razeeman.util.simpletimetracker.ACTION_STOP_ALL_ACTIVITIES"

core/src/main/java/com/example/util/simpletimetracker/core/view/SafeFragmentStateAdapter.kt

@@ -83,6 +83,11 @@ class SafeFragmentStateAdapter(
 
     override fun restoreState(savedState: Parcelable) {
         try {
+            // Restoring is crashing with "Expected the adapter to be 'fresh' while restoring state".
+            // Don't need it anyway, because binding is saved in BaseFragment.
+            // Crash can be avoided with setSaveEnabled,
+            // which would cause skipping of saveState / restoreState,
+            // but it will cause fragments to save themselves which would cause TransactionTooLargeException.
             adapter.restoreState(savedState)
         } catch (e: Exception) {
             Timber.e(e)

features/feature_change_record/src/main/java/com/example/util/simpletimetracker/feature_change_record/adapter/ChangeRecordCommentFieldAdapterDelegate.kt

@@ -21,7 +21,9 @@ fun createChangeRecordCommentFieldAdapterDelegate(
     with(binding) {
         item as ViewData
 
-        if (item.text != etChangeRecordCommentField.text.toString()) {
+        if (item.text != null &&
+            item.text != etChangeRecordCommentField.text.toString()
+        ) {
             etChangeRecordCommentField.setText(item.text)
             etChangeRecordCommentField.setSelection(item.text.length)
         }
@@ -38,7 +40,7 @@ fun createChangeRecordCommentFieldAdapterDelegate(
 
 data class ChangeRecordCommentFieldViewData(
     val id: Long,
-    val text: String,
+    val text: String?,
     @ColorInt val iconColor: Int,
 ) : ViewHolderType {
 

features/feature_change_record/src/main/java/com/example/util/simpletimetracker/feature_change_record/interactor/ChangeRecordViewDataInteractor.kt

@@ -7,10 +7,10 @@ import com.example.util.simpletimetracker.core.view.timeAdjustment.TimeAdjustmen
 import com.example.util.simpletimetracker.domain.favourite.interactor.FavouriteCommentInteractor
 import com.example.util.simpletimetracker.domain.prefs.interactor.PrefsInteractor
 import com.example.util.simpletimetracker.domain.record.interactor.RecordInteractor
-import com.example.util.simpletimetracker.domain.recordTag.interactor.RecordTagInteractor
-import com.example.util.simpletimetracker.domain.recordType.interactor.RecordTypeInteractor
 import com.example.util.simpletimetracker.domain.record.interactor.RunningRecordInteractor
 import com.example.util.simpletimetracker.domain.record.model.Record
+import com.example.util.simpletimetracker.domain.recordTag.interactor.RecordTagInteractor
+import com.example.util.simpletimetracker.domain.recordType.interactor.RecordTypeInteractor
 import com.example.util.simpletimetracker.feature_base_adapter.ViewHolderType
 import com.example.util.simpletimetracker.feature_base_adapter.hint.HintViewData
 import com.example.util.simpletimetracker.feature_change_record.R
@@ -63,6 +63,7 @@ class ChangeRecordViewDataInteractor @Inject constructor(
     suspend fun getCommentsViewData(
         comment: String,
         typeId: Long,
+        fromCommentChange: Boolean,
     ): List<ViewHolderType> {
         data class Data(val timeStarted: Long, val comment: String)
 
@@ -71,8 +72,10 @@ class ChangeRecordViewDataInteractor @Inject constructor(
         val isFavourite = favouriteCommentInteractor.get(comment) != null
 
         ChangeRecordCommentFieldViewData(
-            id = 1L, // Only one at the time.
-            text = comment,
+            // Only one at the time.
+            id = 1L,
+            // Do not update text if update coming from typing.
+            text = if (fromCommentChange) null else comment,
             iconColor = if (isFavourite) {
                 resourceRepo.getColor(R.color.colorSecondary)
             } else {

features/feature_change_record/src/main/java/com/example/util/simpletimetracker/feature_change_record/viewModel/ChangeRecordBaseViewModel.kt

@@ -80,7 +80,7 @@ abstract class ChangeRecordBaseViewModel(
         return@lazy MutableLiveData<List<ViewHolderType>>().let { initial ->
             viewModelScope.launch {
                 initializePreviewViewData()
-                initial.value = loadCommentsViewData()
+                initial.value = loadCommentsViewData(fromCommentChange = false)
             }
             initial
         }
@@ -338,15 +338,21 @@ abstract class ChangeRecordBaseViewModel(
     }
 
     fun onCommentClick(item: ChangeRecordCommentViewData) {
-        onCommentChange(item.text)
+        viewModelScope.launch {
+            if (item.text != newComment) {
+                newComment = item.text
+                updatePreview()
+                updateCommentsViewData()
+            }
+        }
     }
 
     fun onCommentChange(comment: String) {
         viewModelScope.launch {
             if (comment != newComment) {
                 newComment = comment
                 updatePreview()
-                updateCommentsViewData()
+                updateCommentsViewData(fromCommentChange = true)
             }
         }
     }
@@ -845,17 +851,22 @@ abstract class ChangeRecordBaseViewModel(
         )
     }
 
-    private fun updateCommentsViewData() {
+    private fun updateCommentsViewData(
+        fromCommentChange: Boolean = false,
+    ) {
         searchLoadJob?.cancel()
         searchLoadJob = viewModelScope.launch {
-            comments.set(loadCommentsViewData())
+            comments.set(loadCommentsViewData(fromCommentChange))
         }
     }
 
-    private suspend fun loadCommentsViewData(): List<ViewHolderType> {
+    private suspend fun loadCommentsViewData(
+        fromCommentChange: Boolean,
+    ): List<ViewHolderType> {
         return changeRecordViewDataInteractor.getCommentsViewData(
             comment = newComment,
             typeId = newTypeId,
+            fromCommentChange = fromCommentChange,
         )
     }
 

features/feature_main/src/main/java/com/example/util/simpletimetracker/feature_main/view/MainFragment.kt

@@ -79,7 +79,6 @@ class MainFragment : BaseFragment<Binding>() {
     }
 
     private fun setupPager() = with(binding) {
-        mainPager.isSaveEnabled = false // See BaseFragment.
         mainPager.adapter = SafeFragmentStateAdapter(
             MainContentAdapter(
                 fragment = this@MainFragment,

features/feature_notification/src/main/AndroidManifest.xml

@@ -22,6 +22,7 @@
                 <action android:name="com.razeeman.util.simpletimetracker.ACTION_STOP_LONGEST_ACTIVITY" />
                 <action android:name="com.razeeman.util.simpletimetracker.ACTION_RESTART_ACTIVITY" />
                 <action android:name="com.razeeman.util.simpletimetracker.ACTION_ADD_RECORD" />
+                <action android:name="com.razeeman.util.simpletimetracker.ACTION_CHANGE_RECORD" />
 
                 <action android:name="android.app.action.SCHEDULE_EXACT_ALARM_PERMISSION_STATE_CHANGED" />
             </intent-filter>

features/feature_records/src/main/java/com/example/util/simpletimetracker/feature_records/view/RecordsContainerFragment.kt

@@ -55,7 +55,6 @@ class RecordsContainerFragment :
 
     override fun initUi(): Unit = with(binding) {
         pagerRecordsContainer.apply {
-            isSaveEnabled = false // See BaseFragment.
             adapter = SafeFragmentStateAdapter(
                 RecordsContainerAdapter(this@RecordsContainerFragment),
             )

features/feature_statistics/src/main/java/com/example/util/simpletimetracker/feature_statistics/view/StatisticsContainerFragment.kt

@@ -53,7 +53,6 @@ class StatisticsContainerFragment :
 
     override fun initUi(): Unit = with(binding) {
         pagerStatisticsContainer.apply {
-            isSaveEnabled = false // See BaseFragment.
             adapter = SafeFragmentStateAdapter(
                 StatisticsContainerAdapter(this@StatisticsContainerFragment),
             )

metadata/en-US/changelogs/93.txt

@@ -0,0 +1,6 @@
+- Add activity suggestions available from Additional settings
+- Add negative goals
+- Add more detailed statistics
+- Add more quick actions to edit records
+- Add more intents for automated tracking
+- General bug fixes and improvements

resources/src/main/res/values-de/strings.xml

@@ -421,7 +421,7 @@ Beispiel:<br/>
     <string name="message_import_complete">Import abgeschlossen</string>
     <string name="message_import_complete_hint">Hinzugefügte Datensätze: %s</string>
     <string name="message_import_error">Importfehler</string>
-    <string name="message_action_share">Aktie</string>
+    <string name="message_action_share">Teilen</string>
     <string name="message_automatic_backup_error">Bei der automatischen Sicherung ist ein Fehler aufgetreten.</string>
     <string name="message_automatic_export_error">Beim automatischen Export ist ein Fehler aufgetreten.</string>
     <string name="message_automatic_error_hint">Versuchen Sie, einen anderen Ort auszuwählen</string>
@@ -605,4 +605,4 @@ Beispiel:<br/>
     <string name="wear_settings_title">Einstellungen</string>
     <string name="wear_settings_title_show_compact_list">Kompakte Liste anzeigen</string>
 
-</resources>
+</resources>