✨ add taking time form for step making

android/app/src/main/java/net/pengcook/android/data/repository/making/step/DefaultRecipeStepMakingRepository.kt

@@ -55,7 +55,7 @@ class DefaultRecipeStepMakingRepository
         private fun RecipeStepMaking.toRecipeStepEntity(): RecipeStepEntity =
             RecipeStepEntity(
                 recipeDescriptionId = recipeId,
-                cookingTime = "00:00:00",
+                cookingTime = cookingTime,
                 stepNumber = sequence,
                 description = description.ifEmpty { null },
                 imageUri = imageUri.ifEmpty { null },
@@ -70,5 +70,6 @@ class DefaultRecipeStepMakingRepository
                 description = description ?: "",
                 imageUri = imageUri ?: "",
                 image = imageTitle ?: "",
+                cookingTime = cookingTime ?: "00:00:00",
             )
     }

android/app/src/main/java/net/pengcook/android/data/util/mapper/RecipeMakingMapper.kt

@@ -73,6 +73,7 @@ fun RecipeStepEntity.toRecipeStepMaking(): RecipeStepMaking =
         image = imageTitle ?: "",
         imageUri = imageUri ?: "",
         stepId = id,
+        cookingTime = cookingTime ?: "00:00:00",
     )
 
 fun IngredientEntity.toIngredient(): Ingredient =
@@ -90,7 +91,7 @@ fun Ingredient.toIngredientRequest(): IngredientRequest =
 
 fun RecipeStepMaking.toRecipeStepRequest(): RecipeStepRequest =
     RecipeStepRequest(
-        cookingTime = "00:00:00",
+        cookingTime = cookingTime,
         description = description,
         image = image,
         sequence = sequence,

android/app/src/main/java/net/pengcook/android/presentation/core/model/RecipeStepMaking.kt

@@ -7,4 +7,11 @@ data class RecipeStepMaking(
     val image: String,
     val sequence: Int,
     val imageUri: String,
-)
+    val cookingTime: String,
+) {
+    init {
+        require(cookingTime.matches(Regex("\\d{2}:\\d{2}:\\d{2}"))) {
+            "cookingTime must be in the format of HH:MM:SS"
+        }
+    }
+}

android/app/src/main/java/net/pengcook/android/presentation/follow/FollowPagingSource.kt

@@ -13,8 +13,6 @@ class FollowPagingSource(
         return runCatching {
             val users = fetchUsers()
             val pageData = users.getOrNull() ?: emptyList()
-            println(pageData.size)
-            println(params.loadSize)
             val nextKey = if (pageData.size < params.loadSize) null else pageNumber + 1
             LoadResult.Page(
                 data = pageData,

android/app/src/main/java/net/pengcook/android/presentation/making/RecipeMakingFragment.kt

@@ -202,8 +202,8 @@ class RecipeMakingFragment : Fragment() {
         val etHour = binding.itemTimeRequired.etTimeAmountPicker.etHour
         val etMinute = binding.itemTimeRequired.etTimeAmountPicker.etMinute
         val etSecond = binding.itemTimeRequired.etTimeAmountPicker.etSecond
+        etHour.filters = arrayOf(MinMaxInputFilter(0, 23))
         arrayOf(MinMaxInputFilter(0, 59)).also { filters ->
-            etHour.filters = filters
             etMinute.filters = filters
             etSecond.filters = filters
         }

android/app/src/main/java/net/pengcook/android/presentation/making/step/StepMakingFragment.kt

@@ -24,6 +24,7 @@ import net.pengcook.android.databinding.FragmentMakingStepBinding
 import net.pengcook.android.presentation.core.util.AnalyticsLogging
 import net.pengcook.android.presentation.core.util.FileUtils
 import net.pengcook.android.presentation.core.util.ImageUtils
+import net.pengcook.android.presentation.core.util.MinMaxInputFilter
 import java.io.File
 import javax.inject.Inject
 
@@ -111,6 +112,7 @@ class StepMakingFragment : Fragment() {
     ) {
         super.onViewCreated(view, savedInstanceState)
         initBinding()
+        initTimeFormatInput()
         AnalyticsLogging.viewLogEvent("RecipeMaking")
         observeViewModel()
     }
@@ -127,6 +129,15 @@ class StepMakingFragment : Fragment() {
         binding.appbarEventListener = viewModel
     }
 
+    private fun initTimeFormatInput() {
+        val etMinute = binding.etTimeAmount.etTimeAmountPicker.etMinute
+        val etSecond = binding.etTimeAmount.etTimeAmountPicker.etSecond
+        arrayOf(MinMaxInputFilter(0, 59)).also { filters ->
+            etMinute.filters = filters
+            etSecond.filters = filters
+        }
+    }
+
     private fun observeViewModel() {
         viewModel.uiEvent.observe(viewLifecycleOwner) { event ->
             val newEvent = event.getContentIfNotHandled() ?: return@observe

android/app/src/main/java/net/pengcook/android/presentation/making/step/StepMakingViewModel.kt

@@ -29,6 +29,8 @@ class StepMakingViewModel
     ) : ViewModel(),
         StepMakingEventHandler,
         AppbarDoubleActionEventListener {
+        private val stepTraversalStatus = MutableList(maximumStep) { false }
+
         private val _stepNumber = MutableLiveData<Int>(1)
         val stepNumber: LiveData<Int> get() = _stepNumber
 
@@ -56,8 +58,17 @@ class StepMakingViewModel
         val uiEvent: LiveData<Event<RecipeStepMakingEvent>>
             get() = _uiEvent
 
+        private var completionPressed = false
+
+        private val _errorVisibility: MutableLiveData<Boolean> = MutableLiveData(false)
+        val errorVisibility: LiveData<Boolean>
+            get() = _errorVisibility
+
         private val stepCompletion: MutableMap<Int, Boolean> = mutableMapOf(1 to false)
 
+        val minuteContent = MutableLiveData<String>()
+        val secondContent = MutableLiveData<String>()
+
         init {
             val stepNumber = stepNumber.value
             if (stepNumber != null) {
@@ -72,6 +83,7 @@ class StepMakingViewModel
         override fun moveToNextPage() {
             val imageUploaded = imageUploaded.value
             val introduction = introductionContent.value
+
             if (imageUploaded != true) {
                 _uiEvent.value = Event(RecipeStepMakingEvent.ImageNotUploaded)
                 return
@@ -115,6 +127,9 @@ class StepMakingViewModel
 
         override fun customAction() {
             viewModelScope.launch {
+                completionPressed = true
+                _errorVisibility.value = true
+
                 if (imageSelected.value != true) {
                     _uiEvent.value = Event(RecipeStepMakingEvent.FormNotCompleted)
                     return@launch
@@ -184,6 +199,8 @@ class StepMakingViewModel
         private fun initStepData(stepNumber: Int) {
             viewModelScope.launch {
                 _isLoading.value = true
+                _errorVisibility.value = completionPressed && stepTraversalStatus[stepNumber - 1]
+                stepTraversalStatus[stepNumber - 1] = true
                 _imageUri.value = null
                 fetchRecipeStep(stepNumber)
                 _isLoading.value = false
@@ -214,6 +231,8 @@ class StepMakingViewModel
             _imageUploaded.value = false
             introductionContent.value = ""
             thumbnailTitle = null
+            minuteContent.value = ""
+            secondContent.value = ""
         }
 
         private suspend fun postRecipe(recipeCreation: RecipeCreation) {
@@ -249,7 +268,13 @@ class StepMakingViewModel
                 sequence = stepNumber,
             ).onSuccess { recipeStep ->
                 if (recipeStep == null) return@onSuccess
+                val minute =
+                    recipeStep.cookingTime.split(SEPARATOR_TIME).getOrNull(1) ?: DEFAULT_TIME_STRING
+                val second =
+                    recipeStep.cookingTime.split(SEPARATOR_TIME).getOrNull(2) ?: DEFAULT_TIME_STRING
                 introductionContent.value = recipeStep.description
+                minuteContent.value = if (minute.toIntOrNull() == 0) DEFAULT_TIME_STRING else minute
+                secondContent.value = if (second.toIntOrNull() == 0) DEFAULT_TIME_STRING else second
                 if (recipeStep.imageUri.isNotEmpty()) {
                     _imageUri.value = Uri.parse(recipeStep.imageUri)
                 }
@@ -269,14 +294,23 @@ class StepMakingViewModel
             stepNumber: Int,
             stepAction: StepAction,
         ) {
+            val minute = minuteContent.value
+            val second = secondContent.value
+
             val recipeStep =
                 RecipeStepMaking(
                     recipeId = recipeId,
                     sequence = stepNumber,
-                    description = introductionContent.value ?: "",
-                    image = thumbnailTitle ?: "",
+                    description = introductionContent.value ?: DEFAULT_TIME_STRING,
+                    image = thumbnailTitle ?: DEFAULT_TIME_STRING,
                     stepId = 1L,
-                    imageUri = imageUri.value?.toString() ?: "",
+                    imageUri = imageUri.value?.toString() ?: DEFAULT_IMAGE_URI,
+                    cookingTime =
+                        FORMAT_TIME_REQUIRED.format(
+                            DEFAULT_TIME_VALUE,
+                            minute?.toIntOrNull() ?: DEFAULT_TIME_VALUE,
+                            second?.toIntOrNull() ?: DEFAULT_TIME_VALUE,
+                        ),
                 )
 
             recipeStepMakingRepository.saveRecipeStep(recipeId = recipeId, recipeStep = recipeStep)
@@ -290,6 +324,12 @@ class StepMakingViewModel
         }
 
         companion object {
+            private const val FORMAT_TIME_REQUIRED = "%02d:%02d:%02d"
+            private const val SEPARATOR_TIME = ":"
+            private const val DEFAULT_TIME_STRING = ""
+            private const val DEFAULT_TIME_VALUE = 0
+            private const val DEFAULT_IMAGE_URI = ""
+
             fun provideFactory(
                 assistedFactory: StepMakingViewModelFactory,
                 recipeId: Long,

android/app/src/main/res/layout/fragment_detail_recipe.xml

@@ -96,7 +96,7 @@
                         android:id="@+id/iv_thumbnail_recipe"
                         android:layout_width="0dp"
                         android:layout_height="0dp"
-                        android:scaleType="fitXY"
+                        android:scaleType="centerCrop"
                         app:imageUrl="@{recipe.thumbnail}"
                         app:layout_constraintBottom_toBottomOf="parent"
                         app:layout_constraintEnd_toEndOf="parent"

android/app/src/main/res/layout/fragment_making_step.xml

@@ -84,9 +84,22 @@
 
                 </androidx.constraintlayout.widget.ConstraintLayout>
 
+                <include
+                    android:id="@+id/et_time_amount"
+                    layout="@layout/item_minute_second_picker_with_warning"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginHorizontal="24dp"
+                    android:layout_marginTop="16dp"
+                    app:layout_constraintTop_toBottomOf="@id/cl_btn_add_image"
+                    app:title="@{@string/making_form_time_required}"
+                    app:minute="@={vm.minuteContent}"
+                    app:second="@={vm.secondContent}"
+                    app:visibleCondition="@{vm.errorVisibility}"/>
+
                 <include
                     android:id="@+id/et_guide_step_recipe"
-                    layout="@layout/item_form_multi_text"
+                    layout="@layout/item_form_multi_text_with_warning"
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
                     android:layout_marginHorizontal="24dp"
@@ -95,8 +108,9 @@
                     app:hintContent="@{@string/step_making_hint}"
                     app:layout_constraintEnd_toEndOf="parent"
                     app:layout_constraintStart_toStartOf="parent"
-                    app:layout_constraintTop_toBottomOf="@id/cl_btn_add_image"
-                    app:title="@{String.valueOf(vm.stepNumber)}" />
+                    app:layout_constraintTop_toBottomOf="@id/et_time_amount"
+                    app:title="@{String.valueOf(vm.stepNumber)}"
+                    app:errorVisibility="@{vm.errorVisibility}"/>
 
             </androidx.constraintlayout.widget.ConstraintLayout>
 

android/app/src/main/res/layout/fragment_sign_up.xml

@@ -101,7 +101,7 @@
             android:layout_marginHorizontal="16dp"
             android:layout_marginBottom="12dp"
             app:buttonClickListener="@{viewModel}"
-            app:buttonText="@{(viewModel.imageUploaded == false && viewModel.imageSelected == true) ? @string/making_uploading_image : @string/making_step}"
+            app:buttonText="@{(viewModel.imageUploaded == false && viewModel.imageSelected == true) ? @string/making_uploading_image : @string/signup_button_next}"
             app:enabled="@{true}"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintTop_toBottomOf="@id/sv_sign_up" />

android/app/src/main/res/layout/item_form_multi_text.xml

@@ -20,7 +20,6 @@
     </data>
 
     <androidx.constraintlayout.widget.ConstraintLayout
-        android:layout_margin="16dp"
         android:layout_width="match_parent"
         android:layout_height="wrap_content">
 

android/app/src/main/res/layout/item_form_multi_text_with_warning.xml

@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:bind="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools">
+
+    <data>
+
+        <variable
+            name="title"
+            type="String" />
+
+        <variable
+            name="hintContent"
+            type="String" />
+
+        <variable
+            name="content"
+            type="String" />
+
+        <variable
+            name="errorVisibility"
+            type="Boolean" />
+    </data>
+
+    <androidx.constraintlayout.widget.ConstraintLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content">
+
+        <include
+            android:id="@+id/et_content"
+            layout="@layout/item_form_multi_text"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            app:content="@={content}"
+            app:hintContent="@{hintContent}"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:title="@{title}" />
+
+        <TextView
+            android:id="@+id/tv_alert_message"
+            style="@style/WarningMessageUnfilledForm"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@id/et_content"
+            bind:visibility="@{errorVisibility &amp;&amp; (content == null || content.isEmpty())}" />
+
+    </androidx.constraintlayout.widget.ConstraintLayout>
+</layout>