From ae5014eec769ab0e2c1759131399c01da197c676 Mon Sep 17 00:00:00 2001 From: crownjoe Date: Thu, 11 Jan 2024 04:39:22 +0900 Subject: [PATCH 1/8] =?UTF-8?q?[FEAT/#70]=20=EC=97=AC=ED=96=89=20=EC=9E=85?= =?UTF-8?q?=EC=9E=A5=20=EC=99=84=EB=A3=8C=20=EB=B7=B0=20UI=20=EA=B5=AC?= =?UTF-8?q?=ED=98=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../invitefinish/InviteFinishActivity.kt | 11 ++ .../main/res/layout/activity_enter_trip.xml | 2 +- .../res/layout/activity_invite_finish.xml | 136 ++++++++++++++++++ presentation/src/main/res/values/strings.xml | 5 + 4 files changed, 153 insertions(+), 1 deletion(-) create mode 100644 presentation/src/main/java/com/going/presentation/entertrip/invitefinish/InviteFinishActivity.kt create mode 100644 presentation/src/main/res/layout/activity_invite_finish.xml diff --git a/presentation/src/main/java/com/going/presentation/entertrip/invitefinish/InviteFinishActivity.kt b/presentation/src/main/java/com/going/presentation/entertrip/invitefinish/InviteFinishActivity.kt new file mode 100644 index 00000000..7d705ba1 --- /dev/null +++ b/presentation/src/main/java/com/going/presentation/entertrip/invitefinish/InviteFinishActivity.kt @@ -0,0 +1,11 @@ +package com.going.presentation.entertrip.invitefinish + +import com.going.presentation.R +import com.going.presentation.databinding.ActivityEnterTripBinding +import com.going.ui.base.BaseActivity + + +class InviteFinishActivity : + BaseActivity(R.layout.activity_invite_finish) { +} + diff --git a/presentation/src/main/res/layout/activity_enter_trip.xml b/presentation/src/main/res/layout/activity_enter_trip.xml index 408c671e..fd4a0ef6 100644 --- a/presentation/src/main/res/layout/activity_enter_trip.xml +++ b/presentation/src/main/res/layout/activity_enter_trip.xml @@ -61,7 +61,7 @@ android:layout_marginStart="24dp" android:layout_marginTop="40dp" android:text="@string/enter_trip_tv_invite_code" - android:textColor="@color/black_000" + android:textColor="@color/gray_700" app:layout_constraintStart_toStartOf="@id/layout_enter_trip" app:layout_constraintTop_toBottomOf="@id/layout_enter_trip" /> 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..4e1dc851 --- /dev/null +++ b/presentation/src/main/res/layout/activity_invite_finish.xml @@ -0,0 +1,136 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ 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 bc083c4e..2c778077 100644 --- a/presentation/src/main/res/values/strings.xml +++ b/presentation/src/main/res/values/strings.xml @@ -149,4 +149,9 @@ 잘못된 초대코드예요. 다음 + + 멋진 여행에 초대받으셨네요! + 입장하기 + + From 5d552a56831c6e5f5fb222be960af31563d0d90f Mon Sep 17 00:00:00 2001 From: crownjoe Date: Thu, 11 Jan 2024 06:15:06 +0900 Subject: [PATCH 2/8] =?UTF-8?q?[FEAT/#70]=20=EC=97=AC=ED=96=89=20=EC=9E=85?= =?UTF-8?q?=EC=9E=A5=20=EC=99=84=EB=A3=8C=20=EC=B5=9C=EC=A2=85=20=EB=B7=B0?= =?UTF-8?q?=20UI=20=EA=B5=AC=ED=98=84=20=EC=99=84=EB=A3=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/src/main/AndroidManifest.xml | 10 +- .../res/drawable/ic_invite_finish_doorips.xml | 208 ++++++++++++++++++ .../res/drawable/ic_invite_finish_letter.xml | 31 +++ .../res/layout/activity_invite_finish.xml | 87 ++++---- 4 files changed, 286 insertions(+), 50 deletions(-) create mode 100644 presentation/src/main/res/drawable/ic_invite_finish_doorips.xml create mode 100644 presentation/src/main/res/drawable/ic_invite_finish_letter.xml diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 4759323b..f7967cd2 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -97,7 +97,7 @@ + android:screenOrientation="portrait" /> + android:screenOrientation="portrait" /> + android:name="com.going.presentation.enter.entertrip.EnterTripActivity" + android:exported="true" + android:screenOrientation="portrait" /> 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..e4b3ea37 --- /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/layout/activity_invite_finish.xml b/presentation/src/main/res/layout/activity_invite_finish.xml index 4e1dc851..4eb624d3 100644 --- a/presentation/src/main/res/layout/activity_invite_finish.xml +++ b/presentation/src/main/res/layout/activity_invite_finish.xml @@ -7,18 +7,19 @@ + type="com.going.presentation.enter.invitefinish.InviteFinishViewModel" /> + + tools:context=".enter.invitefinish.InviteFinishActivity"> + + + + + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toBottomOf="@id/layout_invite_finish_trip" /> + app:layout_constraintTop_toTopOf="@id/iv_invite_finish_letter" /> + app:layout_constraintTop_toBottomOf="@id/tv_invite_finish_day_left" /> - - - - - + app:layout_constraintTop_toBottomOf="@id/tv_invite_finish_name" /> - \ No newline at end of file + From a22800d6bdef4b94f7cd7896353e17e84d96ebe8 Mon Sep 17 00:00:00 2001 From: crownjoe Date: Thu, 11 Jan 2024 08:45:40 +0900 Subject: [PATCH 3/8] =?UTF-8?q?[FEAT/#70]=20=EC=B5=9C=EC=A2=85=20UI=20?= =?UTF-8?q?=EA=B5=AC=ED=98=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/src/main/AndroidManifest.xml | 5 + .../entertrip/EnterTripActivity.kt | 10 +- .../entertrip/EnterTripViewModel.kt | 4 +- .../invitefinish/InviteFinishActivity.kt | 45 +++ .../invitefinish/InviteFinishViewModel.kt | 6 + .../invitefinish/InviteFinishActivity.kt | 11 - .../res/drawable/ic_finish_trip_doorips.xml | 208 ++++++++++++ .../res/drawable/ic_invite_finish_doorips.xml | 6 +- ...ayer_list_preference_tag_gray100_line.xml} | 2 +- .../main/res/layout/activity_create_trip.xml | 4 +- .../main/res/layout/activity_enter_trip.xml | 17 +- .../main/res/layout/activity_finish_trip.xml | 305 +++++++++--------- .../res/layout/activity_invite_finish.xml | 4 +- .../res/layout/activity_preference_tag.xml | 4 +- .../src/main/res/layout/activity_profile.xml | 2 +- .../src/main/res/layout/activity_setting.xml | 2 +- .../res/layout/activity_start_trip_splash.xml | 4 +- presentation/src/main/res/values/strings.xml | 9 +- 18 files changed, 444 insertions(+), 204 deletions(-) rename presentation/src/main/java/com/going/presentation/{ => enter}/entertrip/EnterTripActivity.kt (93%) rename presentation/src/main/java/com/going/presentation/{ => enter}/entertrip/EnterTripViewModel.kt (96%) create mode 100644 presentation/src/main/java/com/going/presentation/enter/invitefinish/InviteFinishActivity.kt create mode 100644 presentation/src/main/java/com/going/presentation/enter/invitefinish/InviteFinishViewModel.kt delete mode 100644 presentation/src/main/java/com/going/presentation/entertrip/invitefinish/InviteFinishActivity.kt create mode 100644 presentation/src/main/res/drawable/ic_finish_trip_doorips.xml rename presentation/src/main/res/drawable/{layer_list_preference_tag_gray200_line.xml => layer_list_preference_tag_gray100_line.xml} (90%) diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index f7967cd2..c200c9f9 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -136,6 +136,11 @@ + + 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..c04b5574 --- /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() + initNextBtnClickListener() + + } + + private fun initBackBtnClickListener() { + binding.btnInviteFinishBack.setOnSingleClickListener { + Intent(this, EnterTripActivity::class.java).apply { + startActivity(this) + } + } + } + + private fun initNextBtnClickListener() { + 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/java/com/going/presentation/entertrip/invitefinish/InviteFinishActivity.kt b/presentation/src/main/java/com/going/presentation/entertrip/invitefinish/InviteFinishActivity.kt deleted file mode 100644 index 7d705ba1..00000000 --- a/presentation/src/main/java/com/going/presentation/entertrip/invitefinish/InviteFinishActivity.kt +++ /dev/null @@ -1,11 +0,0 @@ -package com.going.presentation.entertrip.invitefinish - -import com.going.presentation.R -import com.going.presentation.databinding.ActivityEnterTripBinding -import com.going.ui.base.BaseActivity - - -class InviteFinishActivity : - BaseActivity(R.layout.activity_invite_finish) { -} - 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 index e4b3ea37..5f14cd73 100644 --- a/presentation/src/main/res/drawable/ic_invite_finish_doorips.xml +++ b/presentation/src/main/res/drawable/ic_invite_finish_doorips.xml @@ -1,7 +1,7 @@ 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_create_trip.xml b/presentation/src/main/res/layout/activity_create_trip.xml index c6851036..26cb4bf7 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"> @@ -179,4 +179,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 fd4a0ef6..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..17e68751 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,183 +16,172 @@ android:background="@color/gray_50" tools:context=".starttrip.finishtrip.FinishTripActivity"> - - - - + app:layout_constraintTop_toTopOf="parent"> - - - - - + - + + android:gravity="center" + android:text="@string/finish_trip_tv_title" + android:textColor="@color/gray_700" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toBottomOf="@id/laylout_finish_trip_all" /> - - - + + + + + + + + + + - + android:layout_marginHorizontal="24dp" + android:background="@drawable/shape_rect_8_white000_fill_gray100_line" + android:paddingVertical="22dp" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toBottomOf="@id/layout_finish_trip_info"> + + + + + + + + + + + + + + + - - - - - - - - - - \ 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 index 4eb624d3..aa492dbe 100644 --- a/presentation/src/main/res/layout/activity_invite_finish.xml +++ b/presentation/src/main/res/layout/activity_invite_finish.xml @@ -55,7 +55,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginEnd="16dp" - android:layout_marginBottom="22dp" + android:layout_marginBottom="-22dp" android:src="@drawable/ic_invite_finish_doorips" app:layout_constraintBottom_toBottomOf="@id/iv_invite_finish_letter" app:layout_constraintEnd_toEndOf="parent" /> @@ -68,7 +68,6 @@ android:layout_marginTop="86dp" android:gravity="center" android:text="@string/invite_finish_tv_title" - android:textColor="@color/gray_700" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@id/layout_invite_finish_trip" /> @@ -95,7 +94,6 @@ android:layout_height="wrap_content" android:layout_marginTop="8dp" android:text="굉굉이랑 스페인" - android:textColor="@color/gray_700" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@id/tv_invite_finish_day_left" /> 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..6f788e4a 100644 --- a/presentation/src/main/res/layout/activity_start_trip_splash.xml +++ b/presentation/src/main/res/layout/activity_start_trip_splash.xml @@ -16,7 +16,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"> @@ -91,4 +91,4 @@ app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" /> - \ 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 2c778077..373e8df9 100644 --- a/presentation/src/main/res/values/strings.xml +++ b/presentation/src/main/res/values/strings.xml @@ -145,13 +145,12 @@ 여행 입장하기 초대코드 - 초대코드를 입력해주세요. + 친구에게 받은 초대 코드 6자리를 입력해 주세요 잘못된 초대코드예요. - 다음 + 초대코드 확인하기 - 멋진 여행에 초대받으셨네요! - 입장하기 - + 초대받은 여행이 맞는지\n 확인해 주세요 + 초대받은 여행이 맞아요! From 46e0ddd101ce59d7ddd9e1bb19486e02b0a46415 Mon Sep 17 00:00:00 2001 From: crownjoe Date: Thu, 11 Jan 2024 17:48:58 +0900 Subject: [PATCH 4/8] =?UTF-8?q?[FEAT/#70]=20finish=20trip=20=EB=B7=B0=20?= =?UTF-8?q?=EC=B5=9C=EC=A2=85=20UI=20=EA=B5=AC=ED=98=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/res/layout/activity_finish_trip.xml | 281 ++++++++++-------- 1 file changed, 158 insertions(+), 123 deletions(-) diff --git a/presentation/src/main/res/layout/activity_finish_trip.xml b/presentation/src/main/res/layout/activity_finish_trip.xml index 17e68751..909bec44 100644 --- a/presentation/src/main/res/layout/activity_finish_trip.xml +++ b/presentation/src/main/res/layout/activity_finish_trip.xml @@ -37,151 +37,184 @@ + + + app:layout_constraintTop_toBottomOf="@id/iv_finish_trip_icon"> + + + app:layout_constraintTop_toBottomOf="@id/tv_finish_trip_day_left" /> - - - - - - - - - - - + + + + + + + + + + - - - - - - - - - - - - - - - + app:layout_constraintTop_toBottomOf="@id/layout_finish_trip_info_bottom" /> + + + + + + + + + + + + + + + + + + + + From 1a8f4ecda694fae6b4d52993cc878aac675c5a88 Mon Sep 17 00:00:00 2001 From: crownjoe Date: Thu, 11 Jan 2024 19:15:02 +0900 Subject: [PATCH 5/8] =?UTF-8?q?[FEAT/#70]=20start=5Ftrip=5Fsplash,=20finis?= =?UTF-8?q?h=5Ftrip,=20enter=5Ffinis=20=20=EB=B7=B0=20=EC=B5=9C=EC=A2=85?= =?UTF-8?q?=20UI=20=EA=B5=AC=ED=98=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/src/main/AndroidManifest.xml | 3 +- .../drawable/ic_start_trip_splash_doorips.xml | 208 ++++++++++++++++++ .../res/layout/activity_check_friends.xml | 2 +- .../main/res/layout/activity_create_trip.xml | 2 - .../main/res/layout/activity_finish_trip.xml | 21 +- .../res/layout/activity_start_trip_splash.xml | 13 +- presentation/src/main/res/values/strings.xml | 18 +- 7 files changed, 238 insertions(+), 29 deletions(-) create mode 100644 presentation/src/main/res/drawable/ic_start_trip_splash_doorips.xml diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 696c65f0..5381bfe7 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -135,10 +135,9 @@ android:screenOrientation="portrait"/> - android:screenOrientation="portrait" /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 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 26cb4bf7..7529c0d9 100644 --- a/presentation/src/main/res/layout/activity_create_trip.xml +++ b/presentation/src/main/res/layout/activity_create_trip.xml @@ -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" /> diff --git a/presentation/src/main/res/layout/activity_finish_trip.xml b/presentation/src/main/res/layout/activity_finish_trip.xml index 909bec44..98235c3f 100644 --- a/presentation/src/main/res/layout/activity_finish_trip.xml +++ b/presentation/src/main/res/layout/activity_finish_trip.xml @@ -59,6 +59,7 @@ android:layout_marginHorizontal="24dp" android:layout_marginTop="-26dp" android:background="@drawable/shape_rect_8_white000_fill_gray100_line" + android:paddingBottom="35dp" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@id/iv_finish_trip_icon"> @@ -96,7 +97,6 @@ android:layout_width="0dp" android:layout_height="wrap_content" android:layout_marginTop="2dp" - android:layout_marginBottom="35dp" android:gravity="center" android:maxLines="2" android:text="2023.03.24 - 2023.03.31" @@ -122,7 +122,7 @@ android:layout_height="wrap_content" android:layout_marginHorizontal="24dp" android:background="@drawable/shape_rect_8_white000_fill_gray100_line" - android:paddingVertical="22dp" + android:paddingVertical="20dp" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@id/layout_finish_trip_info_top"> @@ -142,27 +142,31 @@ style="@style/TextAppearance.Doorip.Head4" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_marginTop="50dp" + android:layout_marginBottom="2dp" android:text="a1b2c3" app:layout_constraintBottom_toTopOf="@id/iv_finish_trip_copy" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" - app:layout_constraintTop_toBottomOf="@id/layout_finish_trip_info_bottom" /> + app:layout_constraintTop_toTopOf="parent" /> + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toTopOf="parent" + tools:ignore="MissingConstraints" /> + app:layout_constraintBottom_toBottomOf="@id/layout_finish_trip_info_top" + app:layout_constraintStart_toStartOf="parent" /> @@ -51,12 +51,13 @@ android:id="@+id/iv_start_trip_splash" android:layout_width="0dp" android:layout_height="wrap_content" - android:layout_marginHorizontal="80dp" - android:src="@drawable/img_sign_in_main" - app:layout_constraintBottom_toBottomOf="parent" + android:layout_marginStart="8dp" + android:layout_marginBottom="100dp" + android:src="@drawable/ic_start_trip_splash_doorips" + app:layout_constraintBottom_toTopOf="@id/btn_start_trip_splash_new_trip" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" - app:layout_constraintTop_toTopOf="parent" /> + app:layout_constraintTop_toBottomOf="@id/tb_start_trip_splash" /> 이미지로 저장 - 여행 생성하기 - 여행 이름 + 새로운 여행 만들기 + 어떤 여행인가요? 여행 이름을 입력해주세요 - 한줄 소개 + 여행 일정을 알려주세요 시작일 - 종료일 다음 %1$d.%2$d.%3$d - 시작일과 종료일을 다시 확인해주세요! + 여행 종료일보다 여행 시작일이 빨라요! 확인 @@ -106,17 +106,17 @@ 나의 투두 - 여행을 시작해보세요. - 새로운 여행 시작하기 - 여행 입장하기 + doorip으로\n 모두가 함께 하는 여행! + 새로운 여행 만들기 + 초대받은 여행 입장하기 새로운 여행이 생성되었어요! 굉굉이랑 스페인 친구 초대코드 초대코드 복사하기 - 카카오톡으로 초대코드 보내기 - 입장하기 + 친구에게 초대코드 보내기 + 바로 여행 시작하기 초대코드가 복사되었어요. From bd5ba39c45e2202f4a849f3892f79fb2f02055b4 Mon Sep 17 00:00:00 2001 From: crownjoe Date: Thu, 11 Jan 2024 21:04:24 +0900 Subject: [PATCH 6/8] =?UTF-8?q?[FEAT/#70]=20start=5Ftrip=5Fsplash,=20finis?= =?UTF-8?q?h=5Ftrip,=20enter=5Ffinis=20=20=EB=B7=B0=20=EC=B5=9C=EC=A2=85?= =?UTF-8?q?=20UI=20=EA=B5=AC=ED=98=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/src/main/AndroidManifest.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 5381bfe7..b6c3ddeb 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -141,7 +141,7 @@ Date: Thu, 11 Jan 2024 21:15:26 +0900 Subject: [PATCH 7/8] =?UTF-8?q?[FEAT/#70]=20create=5Ftrip=20=EB=B7=B0=20?= =?UTF-8?q?=EC=B5=9C=EC=A2=85=20UI=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- presentation/src/main/res/layout/activity_create_trip.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/presentation/src/main/res/layout/activity_create_trip.xml b/presentation/src/main/res/layout/activity_create_trip.xml index 7529c0d9..8a09c453 100644 --- a/presentation/src/main/res/layout/activity_create_trip.xml +++ b/presentation/src/main/res/layout/activity_create_trip.xml @@ -164,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" From b1d12acceee2190494e8c7912ba8161b6b955b9a Mon Sep 17 00:00:00 2001 From: crownjoe Date: Thu, 11 Jan 2024 21:58:38 +0900 Subject: [PATCH 8/8] =?UTF-8?q?[FEAT/#70]=20start=5Ftrip=5Fsplash=20?= =?UTF-8?q?=EB=B7=B0=20=EC=B5=9C=EC=A2=85=20UI=20=EC=BD=94=EB=93=9C?= =?UTF-8?q?=EB=A6=AC=EB=B7=B0=20=EB=B0=98=EC=98=81=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/src/main/AndroidManifest.xml | 2 +- .../invitefinish/InviteFinishActivity.kt | 4 +- .../main/res/layout/activity_finish_trip.xml | 2 +- .../res/layout/activity_start_trip_splash.xml | 51 +++++++++++-------- 4 files changed, 34 insertions(+), 25 deletions(-) diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index b6c3ddeb..e9b03d99 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -132,7 +132,7 @@ + android:screenOrientation="portrait" /> 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 43478b8d..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 @@ - @@ -34,30 +33,40 @@ - - - + app:layout_constraintTop_toBottomOf="@id/tb_start_trip_splash"> + + + + + + +