adding csv export settings dialog

Razeeman · Razeeman · commit 19fcb3afc834 · 2021-08-22T10:36:53.000+03:00
diff --git a/app/src/main/java/com/example/util/simpletimetracker/navigation/ScreenResolverImpl.kt b/app/src/main/java/com/example/util/simpletimetracker/navigation/ScreenResolverImpl.kt
@@ -176,6 +176,13 @@ class ScreenResolverImpl @Inject constructor() : ScreenResolver {
                     null,
                     navExtras
                 )
+            Screen.CSV_EXPORT_SETTINGS_DIALOG ->
+                navController?.navigate(
+                    R.id.csvExportSettingsDialogFragment,
+                    null,
+                    null,
+                    navExtras
+                )
             else -> {
                 // Do nothing
             }
diff --git a/app/src/main/res/navigation/nav_graph.xml b/app/src/main/res/navigation/nav_graph.xml
@@ -102,6 +102,11 @@
         android:name="com.example.util.simpletimetracker.feature_dialogs.recordTagSelection.RecordTagSelectionDialogFragment"
         android:label="RecordTagSelectionDialogFragment"
         tools:layout="@layout/record_tag_selection_dialog_fragment" />
+    <dialog
+        android:id="@+id/csvExportSettingsDialogFragment"
+        android:name="com.example.util.simpletimetracker.feature_dialogs.csvExportSettings.view.CsvExportSettingsDialogFragment"
+        android:label="CsvExportSettingsDialogFragment"
+        tools:layout="@layout/csv_export_settings_fragment" />
     <fragment
         android:id="@+id/recordsAllFragment"
         android:name="com.example.util.simpletimetracker.feature_records_all.view.RecordsAllFragment"
diff --git a/core/src/main/java/com/example/util/simpletimetracker/core/dialog/CsvExportSettingsDialogListener.kt b/core/src/main/java/com/example/util/simpletimetracker/core/dialog/CsvExportSettingsDialogListener.kt
@@ -0,0 +1,8 @@
+package com.example.util.simpletimetracker.core.dialog
+
+import com.example.util.simpletimetracker.navigation.params.CsvExportSettingsParams
+
+interface CsvExportSettingsDialogListener {
+
+    fun onCsvExportSettingsSelected(data: CsvExportSettingsParams)
+}
diff --git a/core/src/main/java/com/example/util/simpletimetracker/core/viewModel/BackupViewModel.kt b/core/src/main/java/com/example/util/simpletimetracker/core/viewModel/BackupViewModel.kt
@@ -8,10 +8,12 @@ import com.example.util.simpletimetracker.core.R
 import com.example.util.simpletimetracker.core.repo.ResourceRepo
 import com.example.util.simpletimetracker.domain.interactor.BackupInteractor
 import com.example.util.simpletimetracker.domain.interactor.CsvExportInteractor
+import com.example.util.simpletimetracker.domain.model.Range
 import com.example.util.simpletimetracker.domain.resolver.BackupRepo
 import com.example.util.simpletimetracker.domain.resolver.CsvRepo
 import com.example.util.simpletimetracker.navigation.Notification
 import com.example.util.simpletimetracker.navigation.Router
+import com.example.util.simpletimetracker.navigation.params.CsvExportSettingsParams
 import com.example.util.simpletimetracker.navigation.params.ToastParams
 import kotlinx.coroutines.launch
 import javax.inject.Inject
@@ -20,10 +22,11 @@ class BackupViewModel @Inject constructor(
     private val resourceRepo: ResourceRepo,
     private val router: Router,
     private val backupInteractor: BackupInteractor,
-    private val csvExportInteractor: CsvExportInteractor
+    private val csvExportInteractor: CsvExportInteractor,
 ) : ViewModel() {
 
     val progressVisibility: LiveData<Boolean> = MutableLiveData(false)
+    private var csvExportSettingsParams: CsvExportSettingsParams? = null
 
     fun onSaveBackup(uriString: String) = viewModelScope.launch {
         showProgress(true)
@@ -53,10 +56,23 @@ class BackupViewModel @Inject constructor(
         showProgress(false)
     }
 
+    fun onCsvExportSettingsSelected(data: CsvExportSettingsParams) {
+        csvExportSettingsParams = data
+    }
+
     fun onSaveCsvFile(uriString: String) = viewModelScope.launch {
         showProgress(true)
 
-        val resultCode = csvExportInteractor.saveCsvFile(uriString)
+        val range = csvExportSettingsParams?.range?.let {
+            Range(
+                timeStarted = it.rangeStart,
+                timeEnded = it.rangeEnd,
+            )
+        }
+        val resultCode = csvExportInteractor.saveCsvFile(
+            uriString = uriString,
+            range = range
+        )
 
         if (resultCode == CsvRepo.ResultCode.SUCCESS) {
             R.string.message_csv_export_complete
diff --git a/core/src/main/res/drawable/bg_input_field_border_dialog_dark.xml b/core/src/main/res/drawable/bg_input_field_border_dialog_dark.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+    <corners android:radius="8dp" />
+    <stroke
+        android:width="2dp"
+        android:color="@color/inputFieldBorderDialogDark" />
+</shape>
diff --git a/core/src/main/res/values/attrs.xml b/core/src/main/res/values/attrs.xml
@@ -4,12 +4,14 @@
     <attr name="appTextPrimaryColor" format="reference" />
     <attr name="appLightTextColor" format="reference" />
     <attr name="appBackgroundColor" format="reference" />
+    <attr name="appBackgroundDialogColor" format="reference" />
     <attr name="appDialogBackground" format="reference" />
     <attr name="appTextHintColor" format="reference" />
     <attr name="appArrow" format="reference" />
     <attr name="appDividerColor" format="reference" />
     <attr name="appDivider" format="reference" />
     <attr name="appInputFieldBorder" format="reference" />
+    <attr name="appInputFieldBorderDialog" format="reference" />
     <attr name="appInputFieldBorderColor" format="reference" />
     <attr name="appPieChartDividerColor" format="reference" />
     <attr name="appCardBackgroundColor" format="reference" />
diff --git a/core/src/main/res/values/colors.xml b/core/src/main/res/values/colors.xml
@@ -68,5 +68,6 @@
 
     <color name="inputFieldBorder">@color/blue_grey_50</color>
     <color name="inputFieldBorderDark">@color/grey_900</color>
+    <color name="inputFieldBorderDialogDark">@color/grey_800</color>
 
 </resources>
diff --git a/core/src/main/res/values/styles.xml b/core/src/main/res/values/styles.xml
@@ -16,12 +16,14 @@
         <item name="appTextPrimaryColor">@color/textPrimary</item>
         <item name="appLightTextColor">@color/textLight</item>
         <item name="appBackgroundColor">@color/colorBackground</item>
+        <item name="appBackgroundDialogColor">@color/colorDialogBackground</item>
         <item name="appDialogBackground">@drawable/bg_rounded_bottom_sheet</item>
         <item name="appTextHintColor">@color/textHint</item>
         <item name="appArrow">@drawable/arrow</item>
         <item name="appDividerColor">@color/colorDivider</item>
         <item name="appDivider">@drawable/divider_drawable</item>
         <item name="appInputFieldBorder">@drawable/bg_input_field_border</item>
+        <item name="appInputFieldBorderDialog">@drawable/bg_input_field_border</item>
         <item name="appInputFieldBorderColor">@color/inputFieldBorder</item>
         <item name="appPieChartDividerColor">@color/pieChartDivider</item>
         <item name="appCardBackgroundColor">@color/cardBackground</item>
@@ -51,12 +53,14 @@
         <item name="appTextPrimaryColor">@color/textPrimaryDark</item>
         <item name="appLightTextColor">@color/textLightDark</item>
         <item name="appBackgroundColor">@color/colorBackgroundDark</item>
+        <item name="appBackgroundDialogColor">@color/colorDialogBackgroundDark</item>
         <item name="appDialogBackground">@drawable/bg_rounded_bottom_sheet_dark</item>
         <item name="appTextHintColor">@color/textHintDark</item>
         <item name="appArrow">@drawable/arrow_dark</item>
         <item name="appDividerColor">@color/colorDividerDark</item>
         <item name="appDivider">@drawable/divider_drawable_dark</item>
         <item name="appInputFieldBorder">@drawable/bg_input_field_border_dark</item>
+        <item name="appInputFieldBorderDialog">@drawable/bg_input_field_border_dialog_dark</item>
         <item name="appInputFieldBorderColor">@color/inputFieldBorderDark</item>
         <item name="appPieChartDividerColor">@color/pieChartDividerDark</item>
         <item name="appCardBackgroundColor">@color/cardBackgroundDark</item>
@@ -131,6 +135,10 @@
         <item name="android:textSize">16sp</item>
     </style>
 
+    <style name="InputFieldCardDialog" parent="InputFieldCard">
+        <item name="cardBackgroundColor">?appBackgroundDialogColor</item>
+    </style>
+
     <style name="ChangeItemNameEditText">
         <item name="android:textColor">?appTextPrimaryColor</item>
         <item name="android:textSize">16sp</item>
diff --git a/data_local/src/main/java/com/example/util/simpletimetracker/data_local/resolver/CsvRepoImpl.kt b/data_local/src/main/java/com/example/util/simpletimetracker/data_local/resolver/CsvRepoImpl.kt
@@ -4,6 +4,7 @@ import android.content.ContentResolver
 import android.net.Uri
 import android.os.ParcelFileDescriptor
 import com.example.util.simpletimetracker.domain.model.Category
+import com.example.util.simpletimetracker.domain.model.Range
 import com.example.util.simpletimetracker.domain.model.Record
 import com.example.util.simpletimetracker.domain.model.RecordTag
 import com.example.util.simpletimetracker.domain.model.RecordType
@@ -29,7 +30,10 @@ class CsvRepoImpl @Inject constructor(
     private val recordTagRepo: RecordTagRepo
 ) : CsvRepo {
 
-    override suspend fun saveCsvFile(uriString: String): CsvRepo.ResultCode = withContext(Dispatchers.IO) {
+    override suspend fun saveCsvFile(
+        uriString: String,
+        range: Range?,
+    ): CsvRepo.ResultCode = withContext(Dispatchers.IO) {
         var fileDescriptor: ParcelFileDescriptor? = null
         var fileOutputStream: FileOutputStream? = null
 
@@ -46,7 +50,12 @@ class CsvRepoImpl @Inject constructor(
                 .map { it.id to it }.toMap()
 
             // Write data
-            recordRepo.getAll()
+            val records = if (range != null) {
+                recordRepo.getFromRange(range.timeStarted, range.timeEnded)
+            } else {
+                recordRepo.getAll()
+            }
+            records
                 .sortedBy { it.timeStarted }
                 .forEach { record ->
                     val activityTags = recordTypeCategoryRepo.getCategoriesByType(record.typeId)
diff --git a/domain/src/main/java/com/example/util/simpletimetracker/domain/interactor/CsvExportInteractor.kt b/domain/src/main/java/com/example/util/simpletimetracker/domain/interactor/CsvExportInteractor.kt
@@ -1,13 +1,20 @@
 package com.example.util.simpletimetracker.domain.interactor
 
+import com.example.util.simpletimetracker.domain.model.Range
 import com.example.util.simpletimetracker.domain.resolver.CsvRepo
 import javax.inject.Inject
 
 class CsvExportInteractor @Inject constructor(
-    private val csvRepo: CsvRepo
+    private val csvRepo: CsvRepo,
 ) {
 
-    suspend fun saveCsvFile(uriString: String): CsvRepo.ResultCode {
-        return csvRepo.saveCsvFile(uriString)
+    suspend fun saveCsvFile(
+        uriString: String,
+        range: Range?,
+    ): CsvRepo.ResultCode {
+        return csvRepo.saveCsvFile(
+            uriString = uriString,
+            range = range,
+        )
     }
 }
diff --git a/domain/src/main/java/com/example/util/simpletimetracker/domain/resolver/CsvRepo.kt b/domain/src/main/java/com/example/util/simpletimetracker/domain/resolver/CsvRepo.kt
@@ -1,10 +1,15 @@
 package com.example.util.simpletimetracker.domain.resolver
 
+import com.example.util.simpletimetracker.domain.model.Range
+
 interface CsvRepo {
 
     enum class ResultCode {
         SUCCESS, ERROR
     }
 
-    suspend fun saveCsvFile(uriString: String): ResultCode
+    suspend fun saveCsvFile(
+        uriString: String,
+        range: Range?,
+    ): ResultCode
 }
diff --git a/feature_dialogs/src/main/java/com/example/util/simpletimetracker/feature_dialogs/csvExportSettings/view/CsvExportSettingsDialogFragment.kt b/feature_dialogs/src/main/java/com/example/util/simpletimetracker/feature_dialogs/csvExportSettings/view/CsvExportSettingsDialogFragment.kt
@@ -0,0 +1,78 @@
+package com.example.util.simpletimetracker.feature_dialogs.csvExportSettings.view
+
+import android.content.Context
+import android.view.LayoutInflater
+import android.view.ViewGroup
+import androidx.appcompat.app.AppCompatActivity
+import androidx.fragment.app.viewModels
+import com.example.util.simpletimetracker.core.base.BaseBottomSheetFragment
+import com.example.util.simpletimetracker.core.di.BaseViewModelFactory
+import com.example.util.simpletimetracker.core.dialog.CsvExportSettingsDialogListener
+import com.example.util.simpletimetracker.core.dialog.DateTimeDialogListener
+import com.example.util.simpletimetracker.core.extension.getAllFragments
+import com.example.util.simpletimetracker.core.extension.observeOnce
+import com.example.util.simpletimetracker.core.extension.setOnClick
+import com.example.util.simpletimetracker.core.extension.setSkipCollapsed
+import com.example.util.simpletimetracker.feature_dialogs.csvExportSettings.viewModel.CsvExportSettingsViewModel
+import dagger.hilt.android.AndroidEntryPoint
+import javax.inject.Inject
+import com.example.util.simpletimetracker.feature_dialogs.databinding.CsvExportSettingsFragmentBinding as Binding
+
+@AndroidEntryPoint
+class CsvExportSettingsDialogFragment :
+    BaseBottomSheetFragment<Binding>(),
+    DateTimeDialogListener {
+
+    override val inflater: (LayoutInflater, ViewGroup?, Boolean) -> Binding =
+        Binding::inflate
+
+    @Inject
+    lateinit var viewModelFactory: BaseViewModelFactory<CsvExportSettingsViewModel>
+
+    private val viewModel: CsvExportSettingsViewModel by viewModels(
+        factoryProducer = { viewModelFactory }
+    )
+
+    private var dialogListener: CsvExportSettingsDialogListener? = null
+
+    override fun onAttach(context: Context) {
+        super.onAttach(context)
+        when (context) {
+            is CsvExportSettingsDialogListener -> {
+                dialogListener = context
+                return
+            }
+            is AppCompatActivity -> {
+                context.getAllFragments()
+                    .firstOrNull { it is CsvExportSettingsDialogListener && it.isResumed }
+                    ?.let { dialogListener = it as? CsvExportSettingsDialogListener }
+            }
+        }
+    }
+
+    override fun initDialog() {
+        setSkipCollapsed()
+    }
+
+    override fun initUx(): Unit = with(binding) {
+        fieldCsvExportSettingsTimeStarted.setOnClick(viewModel::onRangeStartClick)
+        fieldCsvExportSettingsTimeEnded.setOnClick(viewModel::onRangeEndClick)
+        btnCsvExportSettingsRange.setOnClick(viewModel::onExportRangeClick)
+        btnCsvExportSettingsAll.setOnClick(viewModel::onExportAllClick)
+    }
+
+    override fun initViewModel(): Unit = with(viewModel) {
+        viewData.observe(viewLifecycleOwner) { viewData ->
+            binding.tvCsvExportSettingsTimeStarted.text = viewData.rangeStartString
+            binding.tvCsvExportSettingsTimeEnded.text = viewData.rangeEndString
+        }
+        csvExportSettingsParams.observeOnce(viewLifecycleOwner) { params ->
+            dialogListener?.onCsvExportSettingsSelected(params)
+            dismiss()
+        }
+    }
+
+    override fun onDateTimeSet(timestamp: Long, tag: String?) {
+        viewModel.onDateTimeSet(timestamp, tag)
+    }
+}
diff --git a/feature_dialogs/src/main/java/com/example/util/simpletimetracker/feature_dialogs/csvExportSettings/viewData/CsvExportSettingsViewData.kt b/feature_dialogs/src/main/java/com/example/util/simpletimetracker/feature_dialogs/csvExportSettings/viewData/CsvExportSettingsViewData.kt
@@ -0,0 +1,6 @@
+package com.example.util.simpletimetracker.feature_dialogs.csvExportSettings.viewData
+
+data class CsvExportSettingsViewData(
+    val rangeStartString: String,
+    val rangeEndString: String
+)
diff --git a/feature_dialogs/src/main/java/com/example/util/simpletimetracker/feature_dialogs/csvExportSettings/viewModel/CsvExportSettingsViewModel.kt b/feature_dialogs/src/main/java/com/example/util/simpletimetracker/feature_dialogs/csvExportSettings/viewModel/CsvExportSettingsViewModel.kt
diff --git a/feature_dialogs/src/main/res/layout/csv_export_settings_fragment.xml b/feature_dialogs/src/main/res/layout/csv_export_settings_fragment.xml
diff --git a/feature_settings/src/main/java/com/example/util/simpletimetracker/feature_settings/view/SettingsFragment.kt b/feature_settings/src/main/java/com/example/util/simpletimetracker/feature_settings/view/SettingsFragment.kt
diff --git a/feature_settings/src/main/java/com/example/util/simpletimetracker/feature_settings/viewModel/SettingsViewModel.kt b/feature_settings/src/main/java/com/example/util/simpletimetracker/feature_settings/viewModel/SettingsViewModel.kt
diff --git a/navigation/src/main/java/com/example/util/simpletimetracker/navigation/Screen.kt b/navigation/src/main/java/com/example/util/simpletimetracker/navigation/Screen.kt
diff --git a/navigation/src/main/java/com/example/util/simpletimetracker/navigation/params/CsvExportSettingsParams.kt b/navigation/src/main/java/com/example/util/simpletimetracker/navigation/params/CsvExportSettingsParams.kt

Original file line number	Diff line number	Diff line change
`@@ -176,6 +176,13 @@ class ScreenResolverImpl @Inject constructor() : ScreenResolver {`
`176`	`176`	`null,`
`177`	`177`	`navExtras`
`178`	`178`	`)`
	`179`	`+ Screen.CSV_EXPORT_SETTINGS_DIALOG ->`
	`180`	`+ navController?.navigate(`
	`181`	`+ R.id.csvExportSettingsDialogFragment,`
	`182`	`+ null,`
	`183`	`+ null,`
	`184`	`+ navExtras`
	`185`	`+ )`
`179`	`186`	`else -> {`
`180`	`187`	`// Do nothing`
`181`	`188`	`}`