fix code style and tests

Razeeman · May 4, 2024 · bfd22fd · bfd22fd
1 parent 6a7eb79
commit bfd22fd
Show file tree

Hide file tree

Showing 15 changed files with 9 additions and 26 deletions.
diff --git a/...racker/core/delegates/iconSelection/interactor/IconSelectionDelegateViewDataInteractor.kt b/...racker/core/delegates/iconSelection/interactor/IconSelectionDelegateViewDataInteractor.kt
@@ -5,7 +5,6 @@ import com.example.util.simpletimetracker.core.delegates.iconSelection.viewData.
 import com.example.util.simpletimetracker.domain.interactor.FavouriteIconInteractor
 import com.example.util.simpletimetracker.domain.interactor.PrefsInteractor
 import com.example.util.simpletimetracker.domain.model.AppColor
-import com.example.util.simpletimetracker.domain.model.FavouriteIcon
 import com.example.util.simpletimetracker.domain.model.IconImageState
 import com.example.util.simpletimetracker.domain.model.IconType
 import com.example.util.simpletimetracker.feature_base_adapter.ViewHolderType

diff --git a/...example/util/simpletimetracker/core/delegates/iconSelection/mapper/IconSelectionMapper.kt b/...example/util/simpletimetracker/core/delegates/iconSelection/mapper/IconSelectionMapper.kt
@@ -20,7 +20,6 @@ import com.example.util.simpletimetracker.domain.model.IconImage
 import com.example.util.simpletimetracker.domain.model.IconImageState
 import com.example.util.simpletimetracker.domain.model.IconImageType
 import com.example.util.simpletimetracker.domain.model.IconType
-import com.example.util.simpletimetracker.domain.model.RecordType
 import com.example.util.simpletimetracker.feature_base_adapter.ViewHolderType
 import com.example.util.simpletimetracker.feature_base_adapter.emoji.EmojiViewData
 import com.example.util.simpletimetracker.feature_views.viewData.RecordTypeIcon

diff --git a/core/src/main/java/com/example/util/simpletimetracker/core/mapper/IconEmojiMapper.kt b/core/src/main/java/com/example/util/simpletimetracker/core/mapper/IconEmojiMapper.kt
@@ -5,8 +5,6 @@ import com.example.util.simpletimetracker.core.repo.ResourceRepo
 import com.example.util.simpletimetracker.domain.model.IconEmoji
 import com.example.util.simpletimetracker.domain.model.IconEmojiCategory
 import com.example.util.simpletimetracker.domain.model.IconEmojiType
-import com.example.util.simpletimetracker.domain.model.IconImageCategory
-import com.example.util.simpletimetracker.domain.model.IconImageType
 import javax.inject.Inject
 import javax.inject.Singleton
 

diff --git a/core/src/main/java/com/example/util/simpletimetracker/core/mapper/IconImageMapper.kt b/core/src/main/java/com/example/util/simpletimetracker/core/mapper/IconImageMapper.kt
@@ -3,7 +3,6 @@ package com.example.util.simpletimetracker.core.mapper
 import com.example.util.simpletimetracker.core.R
 import com.example.util.simpletimetracker.core.repo.IconImageRepo
 import com.example.util.simpletimetracker.core.repo.ResourceRepo
-import com.example.util.simpletimetracker.domain.model.FavouriteIcon
 import com.example.util.simpletimetracker.domain.model.IconImage
 import com.example.util.simpletimetracker.domain.model.IconImageCategory
 import com.example.util.simpletimetracker.domain.model.IconImageType

diff --git a/core/src/test/java/com/example/util/simpletimetracker/core/mapper/TimeMapperTest.kt b/core/src/test/java/com/example/util/simpletimetracker/core/mapper/TimeMapperTest.kt
@@ -70,10 +70,10 @@ class TimeMapperTest {
             @JvmStatic
             @Parameterized.Parameters
             fun data() = listOf(
-                arrayOf(0, "0s"),
-                arrayOf(100, "0s"),
-                arrayOf(secondInMs, "1s"),
-                arrayOf(14 * secondInMs, "14s"),
+                arrayOf(0, "0m"),
+                arrayOf(100, "0m"),
+                arrayOf(secondInMs, "0m"),
+                arrayOf(14 * secondInMs, "0m"),
 
                 arrayOf(minuteInMs, "1m"),
                 arrayOf(minuteInMs + 100, "1m"),

diff --git a/.../src/main/java/com/example/util/simpletimetracker/data_local/database/FavouriteIconDao.kt b/.../src/main/java/com/example/util/simpletimetracker/data_local/database/FavouriteIconDao.kt
@@ -5,7 +5,6 @@ import androidx.room.Insert
 import androidx.room.OnConflictStrategy
 import androidx.room.Query
 import com.example.util.simpletimetracker.data_local.model.FavouriteIconDBO
-import com.example.util.simpletimetracker.data_local.model.RecordTypeDBO
 
 @Dao
 interface FavouriteIconDao {

diff --git a/...ample/util/simpletimetracker/feature_change_category/viewModel/ChangeCategoryViewModel.kt b/...ample/util/simpletimetracker/feature_change_category/viewModel/ChangeCategoryViewModel.kt
@@ -4,7 +4,6 @@ import androidx.lifecycle.LiveData
 import androidx.lifecycle.MutableLiveData
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
-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

diff --git a/...mpletimetracker/feature_change_record/adapter/ChangeRecordChangePreviewAdapterDelegate.kt b/...mpletimetracker/feature_change_record/adapter/ChangeRecordChangePreviewAdapterDelegate.kt
@@ -1,14 +1,13 @@
 package com.example.util.simpletimetracker.feature_change_record.adapter
 
 import com.example.util.simpletimetracker.feature_base_adapter.createRecyclerBindingAdapterDelegate
-import com.example.util.simpletimetracker.feature_change_record.adapter.ChangeRecordChangePreviewViewData
 import com.example.util.simpletimetracker.feature_change_record.utils.setData
 import com.example.util.simpletimetracker.feature_views.extension.setOnClick
 import com.example.util.simpletimetracker.feature_change_record.adapter.ChangeRecordChangePreviewViewData as ViewData
 import com.example.util.simpletimetracker.feature_change_record.databinding.ChangeRecordPreviewItemBinding as Binding
 
 fun createChangeRecordChangePreviewAdapterDelegate(
-    onCheckboxClicked: (ChangeRecordChangePreviewViewData) -> Unit,
+    onCheckboxClicked: (ViewData) -> Unit,
 ) = createRecyclerBindingAdapterDelegate<ViewData, Binding>(
     Binding::inflate,
 ) { binding, item, _ ->

diff --git a/...in/java/com/example/util/simpletimetracker/feature_change_record/view/ChangeRecordCore.kt b/...in/java/com/example/util/simpletimetracker/feature_change_record/view/ChangeRecordCore.kt
@@ -44,10 +44,8 @@ import com.example.util.simpletimetracker.feature_change_record.viewData.ChangeR
 import com.example.util.simpletimetracker.feature_change_record.viewData.ChangeRecordFavCommentState
 import com.example.util.simpletimetracker.feature_change_record.viewData.ChangeRecordPreview
 import com.example.util.simpletimetracker.feature_change_record.viewData.ChangeRecordSearchCommentState
-import com.example.util.simpletimetracker.feature_change_record.viewData.ChangeRecordSimpleViewData
 import com.example.util.simpletimetracker.feature_change_record.viewData.ChangeRecordTagsViewData
 import com.example.util.simpletimetracker.feature_change_record.viewModel.ChangeRecordBaseViewModel
-import com.example.util.simpletimetracker.feature_views.RecordSimpleView
 import com.example.util.simpletimetracker.feature_views.extension.rotateDown
 import com.example.util.simpletimetracker.feature_views.extension.rotateUp
 import com.example.util.simpletimetracker.feature_views.extension.setOnClick

diff --git a/...ava/com/example/util/simpletimetracker/feature_change_record/view/ChangeRecordFragment.kt b/...ava/com/example/util/simpletimetracker/feature_change_record/view/ChangeRecordFragment.kt
@@ -1,6 +1,5 @@
 package com.example.util.simpletimetracker.feature_change_record.view
 
-import android.annotation.SuppressLint
 import android.content.res.ColorStateList
 import android.os.Bundle
 import android.view.LayoutInflater

diff --git a/...ample/util/simpletimetracker/feature_change_record/viewModel/ChangeRecordBaseViewModel.kt b/...ample/util/simpletimetracker/feature_change_record/viewModel/ChangeRecordBaseViewModel.kt
@@ -4,7 +4,6 @@ import androidx.lifecycle.LiveData
 import androidx.lifecycle.MutableLiveData
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
-import com.example.util.simpletimetracker.core.delegates.iconSelection.viewModelDelegate.IconSelectionViewModelDelegate
 import com.example.util.simpletimetracker.core.extension.addOrRemove
 import com.example.util.simpletimetracker.core.extension.set
 import com.example.util.simpletimetracker.core.extension.toParams
@@ -17,7 +16,6 @@ import com.example.util.simpletimetracker.domain.interactor.FavouriteCommentInte
 import com.example.util.simpletimetracker.domain.interactor.PrefsInteractor
 import com.example.util.simpletimetracker.domain.interactor.RecordInteractor
 import com.example.util.simpletimetracker.domain.interactor.RecordTypeToTagInteractor
-import com.example.util.simpletimetracker.domain.model.AppColor
 import com.example.util.simpletimetracker.domain.model.FavouriteComment
 import com.example.util.simpletimetracker.domain.model.Record
 import com.example.util.simpletimetracker.feature_base_adapter.ViewHolderType

diff --git a/...ample/util/simpletimetracker/feature_change_record/viewModel/ChangeRecordMergeDelegate.kt b/...ample/util/simpletimetracker/feature_change_record/viewModel/ChangeRecordMergeDelegate.kt
@@ -8,8 +8,6 @@ import com.example.util.simpletimetracker.domain.model.Record
 import com.example.util.simpletimetracker.feature_change_record.interactor.ChangeRecordViewDataInteractor
 import com.example.util.simpletimetracker.feature_change_record.mapper.ChangeRecordViewDataMapper
 import com.example.util.simpletimetracker.feature_change_record.viewData.ChangeRecordPreview
-import com.example.util.simpletimetracker.feature_change_record.viewData.ChangeRecordSimpleViewData
-import com.example.util.simpletimetracker.feature_change_record.viewData.ChangeRecordViewData
 import javax.inject.Inject
 
 interface ChangeRecordMergeDelegate {

diff --git a/.../util/simpletimetracker/feature_change_running_record/view/ChangeRunningRecordFragment.kt b/.../util/simpletimetracker/feature_change_running_record/view/ChangeRunningRecordFragment.kt
@@ -1,6 +1,5 @@
 package com.example.util.simpletimetracker.feature_change_running_record.view
 
-import android.annotation.SuppressLint
 import android.content.res.ColorStateList
 import android.os.Bundle
 import android.view.LayoutInflater

diff --git a/...example/util/simpletimetracker/feature_statistics_detail/view/StatisticsDetailFragment.kt b/...example/util/simpletimetracker/feature_statistics_detail/view/StatisticsDetailFragment.kt
@@ -230,7 +230,7 @@ class StatisticsDetailFragment :
     }
 
     private fun setStreaksGoalViewData(
-        viewData: List<ViewHolderType>
+        viewData: List<ViewHolderType>,
     ) = with(binding) {
         buttonsStatisticsDetailStreaksGoal.isVisible = viewData.isNotEmpty()
         buttonsStatisticsDetailStreaksGoal.adapter.replace(viewData)

diff --git a/...s/src/main/java/com/example/util/simpletimetracker/feature_views/pieChart/PieChartView.kt b/...s/src/main/java/com/example/util/simpletimetracker/feature_views/pieChart/PieChartView.kt
@@ -6,7 +6,6 @@ import android.graphics.Bitmap
 import android.graphics.BlurMaskFilter
 import android.graphics.Canvas
 import android.graphics.Color
-import android.graphics.CornerPathEffect
 import android.graphics.Paint
 import android.graphics.Path
 import android.graphics.PorterDuff
@@ -292,9 +291,9 @@ class PieChartView @JvmOverloads constructor(
             innerSweepAngle = sweepAngle - actualInnerAngleGap
             innerSweepAngleRad = Math.toRadians(innerSweepAngle.toDouble()).toFloat()
 
-            ////////////////////////////////
-            // Draw rounded segment shape //
-            ////////////////////////////////
+            /******************************
+             * Draw rounded segment shape *
+             ******************************/
 
             // Start of corner in top left.
             segmentPath.reset()