diff --git a/android/app/src/main/java/net/pengcook/android/presentation/making/RecipeMakingViewModel2.kt b/android/app/src/main/java/net/pengcook/android/presentation/making/RecipeMakingViewModel2.kt index d906caf6..1235fc87 100644 --- a/android/app/src/main/java/net/pengcook/android/presentation/making/RecipeMakingViewModel2.kt +++ b/android/app/src/main/java/net/pengcook/android/presentation/making/RecipeMakingViewModel2.kt @@ -246,6 +246,7 @@ class RecipeMakingViewModel2 println("uploaded : ${stepImage.uploaded}") uploadStepImage(stepImage) recipeId?.let { id -> + saveRecipeDescription() saveRecipeSteps(id) } } diff --git a/android/app/src/main/res/drawable/bg_radius.xml b/android/app/src/main/res/drawable/bg_radius.xml index aa5d4dc2..31c33b1c 100644 --- a/android/app/src/main/res/drawable/bg_radius.xml +++ b/android/app/src/main/res/drawable/bg_radius.xml @@ -1,6 +1,6 @@ - + - + diff --git a/android/app/src/main/res/layout/fragment_new_step_making.xml b/android/app/src/main/res/layout/fragment_new_step_making.xml index 80b742db..4de68b4e 100644 --- a/android/app/src/main/res/layout/fragment_new_step_making.xml +++ b/android/app/src/main/res/layout/fragment_new_step_making.xml @@ -37,8 +37,7 @@ app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" - app:layout_constraintTop_toBottomOf="@id/abl_step_making" - android:layout_marginBottom="12dp" /> + app:layout_constraintTop_toBottomOf="@id/abl_step_making" /> diff --git a/android/app/src/main/res/layout/item_step_making.xml b/android/app/src/main/res/layout/item_step_making.xml index 894a47e1..41247c53 100644 --- a/android/app/src/main/res/layout/item_step_making.xml +++ b/android/app/src/main/res/layout/item_step_making.xml @@ -64,7 +64,9 @@ app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@id/et_time_amount" - app:title="@{String.valueOf(recipeStepMaking.sequence)}" /> + app:title="@{String.valueOf(recipeStepMaking.sequence)}" + android:paddingBottom="12dp" + /> diff --git a/android/app/src/main/res/values-night/colors.xml b/android/app/src/main/res/values-night/colors.xml index 8688a9af..8b15c335 100644 --- a/android/app/src/main/res/values-night/colors.xml +++ b/android/app/src/main/res/values-night/colors.xml @@ -23,6 +23,8 @@ #FF555555 #FF222222 #FFB5B5B5 + #FFD4D4DA + #FF9E9E9E #FF4285F4 diff --git a/android/app/src/main/res/values/colors.xml b/android/app/src/main/res/values/colors.xml index 22cfc589..a1b42c7a 100644 --- a/android/app/src/main/res/values/colors.xml +++ b/android/app/src/main/res/values/colors.xml @@ -23,6 +23,7 @@ #FFF7F7FB #FFFFFFFF #FF111111 + #FFD4D4DA #FF9E9E9E