diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 5ca009dc..e9b03d99 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -135,7 +135,12 @@ android:screenOrientation="portrait" /> + + diff --git a/presentation/src/main/java/com/going/presentation/entertrip/EnterTripActivity.kt b/presentation/src/main/java/com/going/presentation/enter/entertrip/EnterTripActivity.kt similarity index 93% rename from presentation/src/main/java/com/going/presentation/entertrip/EnterTripActivity.kt rename to presentation/src/main/java/com/going/presentation/enter/entertrip/EnterTripActivity.kt index d5a78430..a64b189a 100644 --- a/presentation/src/main/java/com/going/presentation/entertrip/EnterTripActivity.kt +++ b/presentation/src/main/java/com/going/presentation/enter/entertrip/EnterTripActivity.kt @@ -1,4 +1,4 @@ -package com.going.presentation.entertrip +package com.going.presentation.enter.entertrip import android.content.Intent import android.os.Bundle @@ -12,8 +12,7 @@ import com.going.presentation.starttrip.StartTripSplashActivity import com.going.ui.base.BaseActivity import com.going.ui.extension.setOnSingleClickListener -class EnterTripActivity : - BaseActivity(R.layout.activity_enter_trip) { +class EnterTripActivity : BaseActivity(R.layout.activity_enter_trip) { private val viewModel by viewModels() @@ -25,6 +24,7 @@ class EnterTripActivity : observeIsCodeAvailable() initNextBtnClickListener() + } private fun initBackBtnClickListener() { @@ -44,7 +44,7 @@ class EnterTripActivity : viewModel.isCodeAvailable.observe(this) { state -> setColors( false, - viewModel.codeLength.value ?:0, + viewModel.codeLength.value ?: 0, binding.tvCodeCounter, ) { background -> binding.etEnterTripName.background = ResourcesCompat.getDrawable( @@ -82,4 +82,4 @@ class EnterTripActivity : } } -} \ No newline at end of file +} diff --git a/presentation/src/main/java/com/going/presentation/entertrip/EnterTripViewModel.kt b/presentation/src/main/java/com/going/presentation/enter/entertrip/EnterTripViewModel.kt similarity index 96% rename from presentation/src/main/java/com/going/presentation/entertrip/EnterTripViewModel.kt rename to presentation/src/main/java/com/going/presentation/enter/entertrip/EnterTripViewModel.kt index 056b30ad..ce11be42 100644 --- a/presentation/src/main/java/com/going/presentation/entertrip/EnterTripViewModel.kt +++ b/presentation/src/main/java/com/going/presentation/enter/entertrip/EnterTripViewModel.kt @@ -1,4 +1,4 @@ -package com.going.presentation.entertrip +package com.going.presentation.enter.entertrip import androidx.lifecycle.MutableLiveData import androidx.lifecycle.ViewModel @@ -37,4 +37,4 @@ class EnterTripViewModel : ViewModel() { val ENG_NUM_REGEX: Pattern = Pattern.compile(ENG_NUM_PATTERN) const val MAX_INVITE_LEN = 6 } -} \ No newline at end of file +} diff --git a/presentation/src/main/java/com/going/presentation/enter/invitefinish/InviteFinishActivity.kt b/presentation/src/main/java/com/going/presentation/enter/invitefinish/InviteFinishActivity.kt new file mode 100644 index 00000000..e4444cf1 --- /dev/null +++ b/presentation/src/main/java/com/going/presentation/enter/invitefinish/InviteFinishActivity.kt @@ -0,0 +1,45 @@ +package com.going.presentation.enter.invitefinish + +import android.content.Intent +import android.os.Bundle +import androidx.activity.viewModels +import com.going.presentation.R +import com.going.presentation.databinding.ActivityInviteFinishBinding +import com.going.presentation.enter.entertrip.EnterTripActivity +import com.going.presentation.preferencetag.PreferenceTagActivity +import com.going.ui.base.BaseActivity +import com.going.ui.extension.setOnSingleClickListener + + +class InviteFinishActivity : + BaseActivity(R.layout.activity_invite_finish) { + private val viewModel by viewModels() + + + override fun onCreate(savedInstanceState: Bundle?) { + super.onCreate(savedInstanceState) + + initBackBtnClickListener() + initEnterBtnClickListener() + + } + + private fun initBackBtnClickListener() { + binding.btnInviteFinishBack.setOnSingleClickListener { + Intent(this, EnterTripActivity::class.java).apply { + startActivity(this) + } + } + } + + private fun initEnterBtnClickListener() { + binding.btnInviteFinishEnter.setOnSingleClickListener { + Intent(this, PreferenceTagActivity::class.java).apply { + startActivity(this) + } + } + } + + +} + diff --git a/presentation/src/main/java/com/going/presentation/enter/invitefinish/InviteFinishViewModel.kt b/presentation/src/main/java/com/going/presentation/enter/invitefinish/InviteFinishViewModel.kt new file mode 100644 index 00000000..8b15aabb --- /dev/null +++ b/presentation/src/main/java/com/going/presentation/enter/invitefinish/InviteFinishViewModel.kt @@ -0,0 +1,6 @@ +package com.going.presentation.enter.invitefinish + +import androidx.lifecycle.ViewModel + +class InviteFinishViewModel : ViewModel() { +} diff --git a/presentation/src/main/res/drawable/ic_finish_trip_doorips.xml b/presentation/src/main/res/drawable/ic_finish_trip_doorips.xml new file mode 100644 index 00000000..80b54c8b --- /dev/null +++ b/presentation/src/main/res/drawable/ic_finish_trip_doorips.xml @@ -0,0 +1,208 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/presentation/src/main/res/drawable/ic_invite_finish_doorips.xml b/presentation/src/main/res/drawable/ic_invite_finish_doorips.xml new file mode 100644 index 00000000..5f14cd73 --- /dev/null +++ b/presentation/src/main/res/drawable/ic_invite_finish_doorips.xml @@ -0,0 +1,208 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/presentation/src/main/res/drawable/ic_invite_finish_letter.xml b/presentation/src/main/res/drawable/ic_invite_finish_letter.xml new file mode 100644 index 00000000..388c3c9a --- /dev/null +++ b/presentation/src/main/res/drawable/ic_invite_finish_letter.xml @@ -0,0 +1,31 @@ + + + + + + + diff --git a/presentation/src/main/res/drawable/ic_start_trip_splash_doorips.xml b/presentation/src/main/res/drawable/ic_start_trip_splash_doorips.xml new file mode 100644 index 00000000..ae384648 --- /dev/null +++ b/presentation/src/main/res/drawable/ic_start_trip_splash_doorips.xml @@ -0,0 +1,208 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/presentation/src/main/res/drawable/layer_list_preference_tag_gray200_line.xml b/presentation/src/main/res/drawable/layer_list_preference_tag_gray100_line.xml similarity index 90% rename from presentation/src/main/res/drawable/layer_list_preference_tag_gray200_line.xml rename to presentation/src/main/res/drawable/layer_list_preference_tag_gray100_line.xml index 28b5964a..8848327a 100644 --- a/presentation/src/main/res/drawable/layer_list_preference_tag_gray200_line.xml +++ b/presentation/src/main/res/drawable/layer_list_preference_tag_gray100_line.xml @@ -12,7 +12,7 @@ + android:color="@color/gray_100" /> diff --git a/presentation/src/main/res/layout/activity_check_friends.xml b/presentation/src/main/res/layout/activity_check_friends.xml index bea34da6..d3c53160 100644 --- a/presentation/src/main/res/layout/activity_check_friends.xml +++ b/presentation/src/main/res/layout/activity_check_friends.xml @@ -16,7 +16,7 @@ android:id="@+id/toolbar_check_friends" android:layout_width="0dp" android:layout_height="wrap_content" - android:background="@drawable/layer_list_preference_tag_gray200_line" + android:background="@drawable/layer_list_preference_tag_gray100_line" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent"> diff --git a/presentation/src/main/res/layout/activity_create_trip.xml b/presentation/src/main/res/layout/activity_create_trip.xml index c6851036..8a09c453 100644 --- a/presentation/src/main/res/layout/activity_create_trip.xml +++ b/presentation/src/main/res/layout/activity_create_trip.xml @@ -24,7 +24,7 @@ android:id="@+id/tb_create_trip" android:layout_width="0dp" android:layout_height="wrap_content" - android:background="@drawable/layer_list_preference_tag_gray200_line" + android:background="@drawable/layer_list_preference_tag_gray100_line" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent"> @@ -46,7 +46,6 @@ android:layout_height="wrap_content" android:layout_marginStart="4dp" android:text="@string/create_trip_tb_title" - android:textColor="@color/gray_700" app:layout_constraintBottom_toBottomOf="@id/btn_create_back" app:layout_constraintStart_toEndOf="@id/btn_create_back" app:layout_constraintTop_toTopOf="@id/btn_create_back" /> @@ -61,7 +60,6 @@ android:layout_marginStart="24dp" android:layout_marginTop="40dp" android:text="@string/create_trip_name_tv_title" - android:textColor="@color/black_000" app:layout_constraintStart_toStartOf="@id/tb_create_trip" app:layout_constraintTop_toBottomOf="@id/tb_create_trip" /> @@ -166,7 +164,7 @@ android:layout_width="0dp" android:layout_height="wrap_content" android:layout_marginHorizontal="24dp" - android:layout_marginBottom="56dp" + android:layout_marginBottom="22dp" android:background="@drawable/sel_rounded_corner_button" android:enabled="@{viewModel.isCheckTripAvailable()}" android:outlineProvider="none" @@ -179,4 +177,4 @@ app:layout_constraintStart_toStartOf="parent" /> - \ No newline at end of file + diff --git a/presentation/src/main/res/layout/activity_enter_trip.xml b/presentation/src/main/res/layout/activity_enter_trip.xml index 408c671e..9333f401 100644 --- a/presentation/src/main/res/layout/activity_enter_trip.xml +++ b/presentation/src/main/res/layout/activity_enter_trip.xml @@ -11,7 +11,7 @@ + type="com.going.presentation.enter.entertrip.EnterTripViewModel" /> @@ -46,7 +46,6 @@ android:layout_height="wrap_content" android:layout_marginStart="4dp" android:text="@string/enter_trip_tv_layout" - android:textColor="@color/gray_700" app:layout_constraintBottom_toBottomOf="@id/btn_enter_back" app:layout_constraintStart_toEndOf="@id/btn_enter_back" app:layout_constraintTop_toTopOf="@id/btn_enter_back" /> @@ -56,13 +55,14 @@ - \ No newline at end of file + diff --git a/presentation/src/main/res/layout/activity_finish_trip.xml b/presentation/src/main/res/layout/activity_finish_trip.xml index b014ed4b..be0ac22b 100644 --- a/presentation/src/main/res/layout/activity_finish_trip.xml +++ b/presentation/src/main/res/layout/activity_finish_trip.xml @@ -4,6 +4,7 @@ xmlns:tools="http://schemas.android.com/tools"> + @@ -15,182 +16,207 @@ android:background="@color/gray_50" tools:context=".starttrip.finishtrip.FinishTripActivity"> - + app:layout_constraintTop_toTopOf="parent"> + + + + - - + app:layout_constraintTop_toBottomOf="@id/iv_finish_trip_icon"> + android:textColor="@color/red_500" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toTopOf="@id/layout_finish_trip_info_top" /> + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toBottomOf="@id/tv_finish_trip_name" /> - + - + + + + + android:layout_marginEnd="4dp" + android:src="@drawable/ic_finish_trip_copy" + app:layout_constraintBottom_toBottomOf="@id/tv_finish_trip_terms_text" + app:layout_constraintEnd_toStartOf="@id/tv_finish_trip_terms_text" + app:layout_constraintTop_toTopOf="@id/tv_finish_trip_terms_text" /> - - + + + app:layout_constraintEnd_toEndOf="@id/tv_finish_trip_terms_text" + app:layout_constraintStart_toStartOf="@id/iv_finish_trip_copy" + app:layout_constraintTop_toBottomOf="@id/tv_finish_trip_terms_text" /> + - - + android:layout_marginStart="14dp" + android:layout_marginBottom="-9dp" + android:src="@drawable/ic_todo_ticket_left" + app:layout_constraintBottom_toBottomOf="@id/layout_finish_trip_info_top" + app:layout_constraintStart_toStartOf="parent" /> - + app:layout_constraintTop_toBottomOf="@id/layout_finish_trip_info_top" /> - + android:layout_height="wrap_content" + android:background="@color/white_000" + android:paddingVertical="5dp" + app:layout_constraintBottom_toBottomOf="@id/iv_our_trip_left" + app:layout_constraintEnd_toStartOf="@id/iv_our_trip_right" + app:layout_constraintStart_toEndOf="@id/iv_our_trip_left" + app:layout_constraintTop_toTopOf="@id/iv_our_trip_left"> + + + + + - \ No newline at end of file + + diff --git a/presentation/src/main/res/layout/activity_invite_finish.xml b/presentation/src/main/res/layout/activity_invite_finish.xml new file mode 100644 index 00000000..aa492dbe --- /dev/null +++ b/presentation/src/main/res/layout/activity_invite_finish.xml @@ -0,0 +1,131 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/presentation/src/main/res/layout/activity_preference_tag.xml b/presentation/src/main/res/layout/activity_preference_tag.xml index a6f18065..d4865293 100644 --- a/presentation/src/main/res/layout/activity_preference_tag.xml +++ b/presentation/src/main/res/layout/activity_preference_tag.xml @@ -17,7 +17,7 @@ android:id="@+id/toolbar_preference_tag" android:layout_width="0dp" android:layout_height="wrap_content" - android:background="@drawable/layer_list_preference_tag_gray200_line" + android:background="@drawable/layer_list_preference_tag_gray100_line" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent"> @@ -85,4 +85,4 @@ - \ No newline at end of file + diff --git a/presentation/src/main/res/layout/activity_profile.xml b/presentation/src/main/res/layout/activity_profile.xml index f4d16667..fdf57a1a 100644 --- a/presentation/src/main/res/layout/activity_profile.xml +++ b/presentation/src/main/res/layout/activity_profile.xml @@ -15,7 +15,7 @@ android:id="@+id/layout_profile_tag" android:layout_width="0dp" android:layout_height="wrap_content" - android:background="@drawable/layer_list_preference_tag_gray200_line" + android:background="@drawable/layer_list_preference_tag_gray100_line" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent"> diff --git a/presentation/src/main/res/layout/activity_setting.xml b/presentation/src/main/res/layout/activity_setting.xml index 2ca65784..52ce8825 100644 --- a/presentation/src/main/res/layout/activity_setting.xml +++ b/presentation/src/main/res/layout/activity_setting.xml @@ -16,7 +16,7 @@ android:id="@+id/toolbar_preference_tag" android:layout_width="0dp" android:layout_height="wrap_content" - android:background="@drawable/layer_list_preference_tag_gray200_line" + android:background="@drawable/layer_list_preference_tag_gray100_line" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent"> diff --git a/presentation/src/main/res/layout/activity_start_trip_splash.xml b/presentation/src/main/res/layout/activity_start_trip_splash.xml index fe62da43..06e48804 100644 --- a/presentation/src/main/res/layout/activity_start_trip_splash.xml +++ b/presentation/src/main/res/layout/activity_start_trip_splash.xml @@ -1,6 +1,5 @@ - @@ -16,7 +15,7 @@ android:id="@+id/tb_start_trip_splash" android:layout_width="0dp" android:layout_height="wrap_content" - android:background="@drawable/layer_list_preference_tag_gray200_line" + android:background="@drawable/layer_list_preference_tag_gray100_line" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent"> @@ -34,29 +33,40 @@ - - - + app:layout_constraintTop_toBottomOf="@id/tb_start_trip_splash"> + + + + + + + - \ No newline at end of file + diff --git a/presentation/src/main/res/values/strings.xml b/presentation/src/main/res/values/strings.xml index ccb05878..9ab1c5ff 100644 --- a/presentation/src/main/res/values/strings.xml +++ b/presentation/src/main/res/values/strings.xml @@ -45,16 +45,16 @@ 이미지로 저장 - 여행 생성하기 - 여행 이름 + 새로운 여행 만들기 + 어떤 여행인가요? 여행 이름을 입력해주세요 - 한줄 소개 + 여행 일정을 알려주세요 시작일 - 종료일 다음 %1$d.%2$d.%3$d - 시작일과 종료일을 다시 확인해주세요! + 여행 종료일보다 여행 시작일이 빨라요! 확인 @@ -106,17 +106,17 @@ 나의 투두 - 여행을 시작해보세요. - 새로운 여행 시작하기 - 여행 입장하기 + doorip으로\n 모두가 함께 하는 여행! + 새로운 여행 만들기 + 초대받은 여행 입장하기 새로운 여행이 생성되었어요! 굉굉이랑 스페인 친구 초대코드 초대코드 복사하기 - 카카오톡으로 초대코드 보내기 - 입장하기 + 친구에게 초대코드 보내기 + 바로 여행 시작하기 초대코드가 복사되었어요. @@ -145,9 +145,13 @@ 여행 입장하기 초대코드 - 초대코드를 입력해주세요. + 친구에게 받은 초대 코드 6자리를 입력해 주세요 잘못된 초대코드예요. - 다음 + 초대코드 확인하기 + + + 초대받은 여행이 맞는지\n 확인해 주세요 + 초대받은 여행이 맞아요! 여행 친구들