Skip to content

Commit

Permalink
[FIX/#144] 데이트 피커 로직 수정 완료
Browse files Browse the repository at this point in the history
  • Loading branch information
crownjoe committed Jan 17, 2024
1 parent fbcc708 commit 59741f3
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 50 deletions.
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
package com.going.presentation.entertrip.createtrip.choosedate

import android.os.Bundle
import android.os.Handler
import android.os.Looper
import android.view.View
import com.going.presentation.R
import com.going.presentation.databinding.FragmentBottomSheetDateContentBinding
Expand All @@ -23,18 +21,9 @@ class BottomSheetDateContentFragment(val viewModel: CreateTripViewModel, val isS
override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
super.onViewCreated(view, savedInstanceState)
binding.lifecycleOwner = viewLifecycleOwner
destroyToast()
initFinishBtnClickListener()
}


private fun destroyToast() {
dialog?.setOnDismissListener {
binding.tvErrorToast.visibility = View.GONE
}
}


private fun customDate() {
val datePicker = binding.dpCreateTripDate
val calendar = Calendar.getInstance()
Expand Down Expand Up @@ -86,7 +75,6 @@ class BottomSheetDateContentFragment(val viewModel: CreateTripViewModel, val isS

private fun initFinishBtnClickListener() {
binding.btnCreateTripFinish.setOnSingleClickListener {
destroyToast()
sendDateInfo()
if (viewModel.isStartDateAvailable.value == true && viewModel.isEndDateAvailable.value == true) {

Expand All @@ -106,20 +94,6 @@ class BottomSheetDateContentFragment(val viewModel: CreateTripViewModel, val isS
viewModel.checkStartDateAvailable()
viewModel.checkEndDateAvailable()
dismiss()
} else {
viewModel.apply {
startYear.value = null
endYear.value = null
checkStartDateAvailable()
checkEndDateAvailable()
}
binding.viewBlank.visibility = View.VISIBLE
binding.tvErrorToast.visibility = View.VISIBLE
Handler(Looper.getMainLooper()).postDelayed({
if (view != null) {
binding.tvErrorToast.visibility = View.GONE
}
}, 2000)
}
} else
dismiss()
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
<?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:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools">

<data>

Expand All @@ -11,28 +12,6 @@
android:layout_height="wrap_content"
android:background="@color/transparent_60">

<TextView
android:id="@+id/tv_error_toast"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:background="@drawable/shape_rect_4_gray700_fill"
android:paddingHorizontal="12dp"
android:paddingVertical="10dp"
android:text="@string/create_trip_toast_error"
android:textColor="@color/white_000"
android:visibility="gone"
android:layout_marginBottom="22dp"
app:layout_constraintBottom_toTopOf="@id/view_blank"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent" />

<View
android:id="@+id/view_blank"
android:visibility="gone"
app:layout_constraintBottom_toTopOf="@+id/layout_date_picker"
android:layout_width="match_parent"
android:layout_height="22dp"/>

<androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/layout_date_picker"
android:layout_width="match_parent"
Expand All @@ -41,7 +20,7 @@
android:paddingBottom="22dp"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/tv_error_toast">
tools:ignore="MissingConstraints">

<DatePicker
android:id="@+id/dp_create_trip_date"
Expand Down

0 comments on commit 59741f3

Please sign in to comment.