diff --git a/app/src/main/java/com/ftw/hometerview/ui/review/first/CreateReviewFirstStepSelectFloorFragment.kt b/app/src/main/java/com/ftw/hometerview/ui/review/first/CreateReviewFirstStepSelectFloorFragment.kt index 5696e2d..bc7a156 100644 --- a/app/src/main/java/com/ftw/hometerview/ui/review/first/CreateReviewFirstStepSelectFloorFragment.kt +++ b/app/src/main/java/com/ftw/hometerview/ui/review/first/CreateReviewFirstStepSelectFloorFragment.kt @@ -21,7 +21,9 @@ import kotlinx.coroutines.launch import kotlinx.parcelize.Parcelize @AndroidEntryPoint -class CreateReviewFirstStepSelectFloorFragment : Fragment(), SelectResidentialFloorBottomSheet.Listener { +class CreateReviewFirstStepSelectFloorFragment : + Fragment(), + SelectResidentialFloorBottomSheet.Listener { companion object { private const val ARGUMENT_KEY = "CREATE_REVIEW_SECOND_STEP_ARGUMENT_KEY" fun newInstance(address: String): CreateReviewFirstStepSelectFloorFragment { @@ -86,6 +88,7 @@ class CreateReviewFirstStepSelectFloorFragment : Fragment(), SelectResidentialFl when (event) { CreateReviewFirstStepSelectFloorViewModel.Event.Nothing -> {} CreateReviewFirstStepSelectFloorViewModel.Event.OnClickResidentialFloor -> showSelectResidentialFloorBottomSheet() + CreateReviewFirstStepSelectFloorViewModel.Event.OnClickBack -> activity?.onBackPressed() is CreateReviewFirstStepSelectFloorViewModel.Event.OnClickNext -> { (activity as? Listener)?.onClickNextFromFirstStepResidentialFloor( event.address, diff --git a/app/src/main/java/com/ftw/hometerview/ui/review/first/CreateReviewFirstStepSelectFloorViewModel.kt b/app/src/main/java/com/ftw/hometerview/ui/review/first/CreateReviewFirstStepSelectFloorViewModel.kt index 1e083d8..c0cdbca 100644 --- a/app/src/main/java/com/ftw/hometerview/ui/review/first/CreateReviewFirstStepSelectFloorViewModel.kt +++ b/app/src/main/java/com/ftw/hometerview/ui/review/first/CreateReviewFirstStepSelectFloorViewModel.kt @@ -9,6 +9,7 @@ class CreateReviewFirstStepSelectFloorViewModel { sealed class Event { object Nothing : Event() object OnClickResidentialFloor : Event() + object OnClickBack : Event() class OnClickNext(val address: String, val floor: String) : Event() } @@ -33,6 +34,11 @@ class CreateReviewFirstStepSelectFloorViewModel { _event.value = Event.Nothing } + fun onClickBack() { + _event.value = Event.OnClickBack + _event.value = Event.Nothing + } + fun onClickNext() { _event.value = Event.OnClickNext(address.value, residentialFloor.value) _event.value = Event.Nothing diff --git a/app/src/main/java/com/ftw/hometerview/ui/review/second/CreateReviewSecondStepReviewFragment.kt b/app/src/main/java/com/ftw/hometerview/ui/review/second/CreateReviewSecondStepReviewFragment.kt index 4dc4a51..59cb469 100644 --- a/app/src/main/java/com/ftw/hometerview/ui/review/second/CreateReviewSecondStepReviewFragment.kt +++ b/app/src/main/java/com/ftw/hometerview/ui/review/second/CreateReviewSecondStepReviewFragment.kt @@ -75,6 +75,9 @@ class CreateReviewSecondStepReviewFragment : Fragment(), TextListBottomSheet.Lis TextListBottomSheet.newInstance(getResidentialPeriods(event.periods)) .show(childFragmentManager, TextListBottomSheet::class.simpleName) } + CreateReviewSecondStepReviewViewModel.State.OnClickBack -> { + activity?.onBackPressed() + } is CreateReviewSecondStepReviewViewModel.State.OnClickNext -> { (activity as? Listener)?.onClickNextFromSecondStepReview( event.rating, diff --git a/app/src/main/java/com/ftw/hometerview/ui/review/second/CreateReviewSecondStepReviewViewModel.kt b/app/src/main/java/com/ftw/hometerview/ui/review/second/CreateReviewSecondStepReviewViewModel.kt index e27b62e..55ffc4e 100644 --- a/app/src/main/java/com/ftw/hometerview/ui/review/second/CreateReviewSecondStepReviewViewModel.kt +++ b/app/src/main/java/com/ftw/hometerview/ui/review/second/CreateReviewSecondStepReviewViewModel.kt @@ -10,6 +10,7 @@ class CreateReviewSecondStepReviewViewModel { sealed class State { object None : State() class OnClickResidentialPeriod(val periods: List) : State() + object OnClickBack : State() class OnClickNext( val rating: Int, val leftAt: Date, @@ -37,6 +38,10 @@ class CreateReviewSecondStepReviewViewModel { ) } + fun onClickBack() { + _event.value = State.OnClickBack + } + fun onClickNext() { _event.value = State.OnClickNext( rating.value.toInt(), diff --git a/app/src/main/java/com/ftw/hometerview/ui/review/third/CreateReviewThirdStepSearchCompanyFragment.kt b/app/src/main/java/com/ftw/hometerview/ui/review/third/CreateReviewThirdStepSearchCompanyFragment.kt index 1b1021b..54228a4 100644 --- a/app/src/main/java/com/ftw/hometerview/ui/review/third/CreateReviewThirdStepSearchCompanyFragment.kt +++ b/app/src/main/java/com/ftw/hometerview/ui/review/third/CreateReviewThirdStepSearchCompanyFragment.kt @@ -81,6 +81,7 @@ class CreateReviewThirdStepSearchCompanyFragment : Fragment() { when (event) { CreateReviewThirdStepSearchCompanyViewModel.Event.None -> {} CreateReviewThirdStepSearchCompanyViewModel.Event.OnClickSearchCompany -> showSearchCompanyActivity() + CreateReviewThirdStepSearchCompanyViewModel.Event.OnClickBack -> activity?.onBackPressed() is CreateReviewThirdStepSearchCompanyViewModel.Event.OnClickNext -> { (activity as? Listener)?.onClickNextFromThirdStepSearchCompany(event.company) } diff --git a/app/src/main/java/com/ftw/hometerview/ui/review/third/CreateReviewThirdStepSearchCompanyViewModel.kt b/app/src/main/java/com/ftw/hometerview/ui/review/third/CreateReviewThirdStepSearchCompanyViewModel.kt index 845cfcd..e8d0c8b 100644 --- a/app/src/main/java/com/ftw/hometerview/ui/review/third/CreateReviewThirdStepSearchCompanyViewModel.kt +++ b/app/src/main/java/com/ftw/hometerview/ui/review/third/CreateReviewThirdStepSearchCompanyViewModel.kt @@ -8,6 +8,7 @@ class CreateReviewThirdStepSearchCompanyViewModel { sealed class Event { object None : Event() object OnClickSearchCompany : Event() + object OnClickBack : Event() class OnClickNext(val company: String) : Event() } @@ -21,6 +22,11 @@ class CreateReviewThirdStepSearchCompanyViewModel { _event.value = Event.None } + fun onClickBack() { + _event.value = Event.OnClickBack + _event.value = Event.None + } + fun onClickNext() { _event.value = Event.OnClickNext(company.value) _event.value = Event.None diff --git a/app/src/main/res/layout/fragment_create_review_second_step_review.xml b/app/src/main/res/layout/fragment_create_review_second_step_review.xml index 2785570..0c7ac67 100644 --- a/app/src/main/res/layout/fragment_create_review_second_step_review.xml +++ b/app/src/main/res/layout/fragment_create_review_second_step_review.xml @@ -46,6 +46,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginStart="@dimen/dp_size_14" + android:onClick="@{() -> viewModel.onClickBack()}" app:srcCompat="@drawable/icon_back" app:layout_constraintTop_toTopOf="parent" app:layout_constraintBottom_toBottomOf="parent" diff --git a/app/src/main/res/layout/fragment_create_review_third_setp_search_company.xml b/app/src/main/res/layout/fragment_create_review_third_setp_search_company.xml index ea6d1ef..9592629 100644 --- a/app/src/main/res/layout/fragment_create_review_third_setp_search_company.xml +++ b/app/src/main/res/layout/fragment_create_review_third_setp_search_company.xml @@ -48,6 +48,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginStart="@dimen/dp_size_14" + android:onClick="@{() -> viewModel.onClickBack()}" app:srcCompat="@drawable/icon_back" app:layout_constraintTop_toTopOf="parent" app:layout_constraintBottom_toBottomOf="parent"