add name trim

Razeeman · Jan 11, 2025 · a1de6f4 · a1de6f4
1 parent 8c18ff2
commit a1de6f4
Show file tree

Hide file tree

Showing 6 changed files with 20 additions and 14 deletions.
diff --git a/core/src/main/java/com/example/util/simpletimetracker/core/extension/OtherExtensions.kt b/core/src/main/java/com/example/util/simpletimetracker/core/extension/OtherExtensions.kt
@@ -3,9 +3,7 @@ package com.example.util.simpletimetracker.core.extension
 import android.content.BroadcastReceiver
 import android.graphics.Rect
 import android.os.StrictMode
-import android.text.Spanned
 import android.view.View
-import androidx.core.text.HtmlCompat
 import androidx.lifecycle.LifecycleOwner
 import androidx.viewpager2.widget.ViewPager2
 import com.example.util.simpletimetracker.core.utils.getLifecycleObserverAdapter
@@ -134,7 +132,3 @@ fun View.getCoordinates(): Coordinates {
         bottom = rect.bottom,
     )
 }
-
-fun String.fromHtml(): Spanned {
-    return HtmlCompat.fromHtml(this, HtmlCompat.FROM_HTML_MODE_LEGACY)
-}
diff --git a/core/src/main/java/com/example/util/simpletimetracker/core/extension/StringExtensions.kt b/core/src/main/java/com/example/util/simpletimetracker/core/extension/StringExtensions.kt
@@ -0,0 +1,12 @@
+package com.example.util.simpletimetracker.core.extension
+
+import android.text.Spanned
+import androidx.core.text.HtmlCompat
+
+fun String.fromHtml(): Spanned {
+    return HtmlCompat.fromHtml(this, HtmlCompat.FROM_HTML_MODE_LEGACY)
+}
+
+fun String.trimIfNotBlank(): String {
+    return if (this.isNotBlank()) return this.trim() else this
+}
diff --git a/...mpletimetracker/feature_change_activity_filter/viewModel/ChangeActivityFilterViewModel.kt b/...mpletimetracker/feature_change_activity_filter/viewModel/ChangeActivityFilterViewModel.kt
@@ -8,6 +8,7 @@ import com.example.util.simpletimetracker.core.delegates.colorSelection.ColorSel
 import com.example.util.simpletimetracker.core.delegates.colorSelection.ColorSelectionViewModelDelegateImpl
 import com.example.util.simpletimetracker.domain.extension.addOrRemove
 import com.example.util.simpletimetracker.core.extension.set
+import com.example.util.simpletimetracker.core.extension.trimIfNotBlank
 import com.example.util.simpletimetracker.core.interactor.SnackBarMessageNavigationInteractor
 import com.example.util.simpletimetracker.core.mapper.ActivityFilterViewDataMapper
 import com.example.util.simpletimetracker.core.view.ViewChooserStateDelegate
@@ -171,7 +172,7 @@ class ChangeActivityFilterViewModel @Inject constructor(
                 id = filterId,
                 selectedIds = newSelectedIds,
                 type = newType,
-                name = newName,
+                name = newName.trimIfNotBlank(),
                 color = colorSelectionViewModelDelegateImpl.newColor,
                 selected = wasSelected,
             ).let {

diff --git a/...ample/util/simpletimetracker/feature_change_category/viewModel/ChangeCategoryViewModel.kt b/...ample/util/simpletimetracker/feature_change_category/viewModel/ChangeCategoryViewModel.kt
@@ -8,6 +8,7 @@ import com.example.util.simpletimetracker.core.base.ViewModelDelegate
 import com.example.util.simpletimetracker.core.delegates.colorSelection.ColorSelectionViewModelDelegate
 import com.example.util.simpletimetracker.core.delegates.colorSelection.ColorSelectionViewModelDelegateImpl
 import com.example.util.simpletimetracker.core.extension.set
+import com.example.util.simpletimetracker.core.extension.trimIfNotBlank
 import com.example.util.simpletimetracker.core.interactor.SnackBarMessageNavigationInteractor
 import com.example.util.simpletimetracker.core.interactor.StatisticsDetailNavigationInteractor
 import com.example.util.simpletimetracker.core.mapper.CategoryViewDataMapper
@@ -202,7 +203,7 @@ class ChangeCategoryViewModel @Inject constructor(
             // Zero id creates new record
             Category(
                 id = categoryId,
-                name = newName,
+                name = newName.trimIfNotBlank(),
                 color = colorSelectionViewModelDelegateImpl.newColor,
                 note = newNote,
             ).let {

diff --git a/...le/util/simpletimetracker/feature_change_record_tag/viewModel/ChangeRecordTagViewModel.kt b/...le/util/simpletimetracker/feature_change_record_tag/viewModel/ChangeRecordTagViewModel.kt
@@ -9,6 +9,7 @@ import com.example.util.simpletimetracker.core.delegates.colorSelection.ColorSel
 import com.example.util.simpletimetracker.core.delegates.iconSelection.viewModelDelegate.IconSelectionViewModelDelegate
 import com.example.util.simpletimetracker.core.delegates.iconSelection.viewModelDelegate.IconSelectionViewModelDelegateImpl
 import com.example.util.simpletimetracker.core.extension.set
+import com.example.util.simpletimetracker.core.extension.trimIfNotBlank
 import com.example.util.simpletimetracker.core.interactor.SnackBarMessageNavigationInteractor
 import com.example.util.simpletimetracker.core.interactor.StatisticsDetailNavigationInteractor
 import com.example.util.simpletimetracker.core.mapper.CategoryViewDataMapper
@@ -272,7 +273,7 @@ class ChangeRecordTagViewModel @Inject constructor(
             // Zero id creates new record
             RecordTag(
                 id = recordTagId,
-                name = newName,
+                name = newName.trimIfNotBlank(),
                 icon = iconSelectionViewModelDelegateImpl.newIcon,
                 color = colorSelectionViewModelDelegateImpl.newColor,
                 iconColorSource = newIconColorSource,

diff --git a/.../util/simpletimetracker/feature_change_record_type/viewModel/ChangeRecordTypeViewModel.kt b/.../util/simpletimetracker/feature_change_record_type/viewModel/ChangeRecordTypeViewModel.kt
@@ -10,6 +10,7 @@ import com.example.util.simpletimetracker.core.delegates.colorSelection.ColorSel
 import com.example.util.simpletimetracker.core.delegates.iconSelection.viewModelDelegate.IconSelectionViewModelDelegate
 import com.example.util.simpletimetracker.core.delegates.iconSelection.viewModelDelegate.IconSelectionViewModelDelegateImpl
 import com.example.util.simpletimetracker.core.extension.set
+import com.example.util.simpletimetracker.core.extension.trimIfNotBlank
 import com.example.util.simpletimetracker.core.interactor.SnackBarMessageNavigationInteractor
 import com.example.util.simpletimetracker.core.interactor.StatisticsDetailNavigationInteractor
 import com.example.util.simpletimetracker.core.mapper.RecordTypeViewDataMapper
@@ -19,7 +20,6 @@ import com.example.util.simpletimetracker.core.view.ViewChooserStateDelegate
 import com.example.util.simpletimetracker.domain.extension.addOrRemove
 import com.example.util.simpletimetracker.domain.extension.orZero
 import com.example.util.simpletimetracker.domain.activityFilter.interactor.ActivityFilterInteractor
-import com.example.util.simpletimetracker.domain.notifications.interactor.NotificationTypeInteractor
 import com.example.util.simpletimetracker.domain.prefs.interactor.PrefsInteractor
 import com.example.util.simpletimetracker.domain.category.interactor.RecordTypeCategoryInteractor
 import com.example.util.simpletimetracker.domain.recordType.interactor.RecordTypeInteractor
@@ -28,7 +28,6 @@ import com.example.util.simpletimetracker.domain.record.interactor.RemoveRunning
 import com.example.util.simpletimetracker.domain.record.interactor.RunningRecordInteractor
 import com.example.util.simpletimetracker.domain.notifications.interactor.UpdateExternalViewsInteractor
 import com.example.util.simpletimetracker.domain.color.model.AppColor
-import com.example.util.simpletimetracker.domain.wear.WearInteractor
 import com.example.util.simpletimetracker.domain.statistics.model.ChartFilterType
 import com.example.util.simpletimetracker.domain.recordType.model.RecordType
 import com.example.util.simpletimetracker.domain.recordType.model.RecordTypeGoal
@@ -62,8 +61,6 @@ class ChangeRecordTypeViewModel @Inject constructor(
     private val viewDataInteractor: ChangeRecordTypeViewDataInteractor,
     private val recordTypeCategoryInteractor: RecordTypeCategoryInteractor,
     private val activityFilterInteractor: ActivityFilterInteractor,
-    private val wearInteractor: WearInteractor,
-    private val notificationTypeInteractor: NotificationTypeInteractor,
     private val externalViewsInteractor: UpdateExternalViewsInteractor,
     private val prefsInteractor: PrefsInteractor,
     private val recordTypeViewDataMapper: RecordTypeViewDataMapper,
@@ -398,7 +395,7 @@ class ChangeRecordTypeViewModel @Inject constructor(
     private suspend fun saveRecordType(): Long {
         val recordType = RecordType(
             id = recordTypeId,
-            name = newName,
+            name = newName.trimIfNotBlank(),
             icon = iconSelectionViewModelDelegateImpl.newIcon,
             color = colorSelectionViewModelDelegateImpl.newColor,
             defaultDuration = newDefaultDuration,