Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[UI/#70] 최종 뷰 GUI 구현 완료 #76

Merged
merged 10 commits into from
Jan 11, 2024
7 changes: 6 additions & 1 deletion app/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
Expand Up @@ -132,10 +132,15 @@
<activity
android:name="com.going.presentation.profile.ProfileActivity"
android:exported="false"
android:screenOrientation="portrait"/>

<activity
android:name="com.going.presentation.enter.entertrip.EnterTripActivity"
android:exported="false"
android:screenOrientation="portrait" />

<activity
android:name="com.going.presentation.entertrip.EnterTripActivity"
android:name="com.going.presentation.enter.invitefinish.InviteFinishActivity"
android:exported="false"
android:screenOrientation="portrait" />

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.going.presentation.entertrip
package com.going.presentation.enter.entertrip

import android.content.Intent
import android.os.Bundle
Expand All @@ -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<ActivityEnterTripBinding>(R.layout.activity_enter_trip) {
class EnterTripActivity : BaseActivity<ActivityEnterTripBinding>(R.layout.activity_enter_trip) {
private val viewModel by viewModels<EnterTripViewModel>()


Expand All @@ -25,6 +24,7 @@ class EnterTripActivity :
observeIsCodeAvailable()
initNextBtnClickListener()


}

private fun initBackBtnClickListener() {
Expand All @@ -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(
Expand Down Expand Up @@ -82,4 +82,4 @@ class EnterTripActivity :
}
}

}
}
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.going.presentation.entertrip
package com.going.presentation.enter.entertrip

import androidx.lifecycle.MutableLiveData
import androidx.lifecycle.ViewModel
Expand Down Expand Up @@ -37,4 +37,4 @@ class EnterTripViewModel : ViewModel() {
val ENG_NUM_REGEX: Pattern = Pattern.compile(ENG_NUM_PATTERN)
const val MAX_INVITE_LEN = 6
}
}
}
Original file line number Diff line number Diff line change
@@ -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<ActivityInviteFinishBinding>(R.layout.activity_invite_finish) {
private val viewModel by viewModels<InviteFinishViewModel>()


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 {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

정말 사소한거긴 한데 함수는 Next이고 버튼네이밍은 Enter이네용!
맞추면 조금 더 조아용~

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

오모나 바로 수정하겟습니다

Intent(this, PreferenceTagActivity::class.java).apply {
startActivity(this)
}
}
}


}

Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
package com.going.presentation.enter.invitefinish

import androidx.lifecycle.ViewModel

class InviteFinishViewModel : ViewModel() {
}
208 changes: 208 additions & 0 deletions presentation/src/main/res/drawable/ic_finish_trip_doorips.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,208 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="202dp"
android:height="123dp"
android:viewportWidth="202"
android:viewportHeight="123">
<path
android:pathData="M187.3,116.8a3.71,3.73 90.01,1 0,7.46 0.23a3.71,3.73 90.01,1 0,-7.46 -0.23z"
android:fillColor="#1D1F29"/>
<path
android:pathData="M174.89,116.42a3.71,3.73 90.01,1 0,7.46 0.23a3.71,3.73 90.01,1 0,-7.46 -0.23z"
android:fillColor="#1D1F29"/>
<path
android:pathData="M152.99,87.91L150.78,92.17C149.87,93.91 150.21,96.04 151.6,97.42L167.64,113.32C170.09,115.75 173.39,117.14 176.84,117.2L193.96,117.52C195.87,117.55 197.6,116.37 198.25,114.58L199.51,111.13C200.38,108.77 199.85,106.13 198.14,104.28L184.14,89.09C181.7,86.44 178.29,84.88 174.68,84.77L159.16,84.3C156.58,84.22 154.18,85.62 152.99,87.91Z"
android:strokeWidth="1.56659"
android:fillColor="#78D6FF"
android:strokeColor="#1D1F29"/>
<path
android:pathData="M150.86,95.68L170.9,96.3C174.33,96.4 177.59,97.82 180.01,100.25L194.82,115.17"
android:strokeWidth="1.56659"
android:fillColor="#00000000"
android:strokeColor="#1D1F29"
android:strokeLineCap="round"/>
<path
android:pathData="M151.72,89.71L173.06,90.37C176.57,90.48 179.9,91.96 182.33,94.49L199,111.85"
android:strokeWidth="1.56659"
android:fillColor="#00000000"
android:strokeColor="#1D1F29"/>
<path
android:pathData="M161.84,100.48L175.73,113.84"
android:strokeWidth="1.56658"
android:fillColor="#00000000"
android:strokeColor="#1D1F29"
android:strokeLineCap="round"/>
<path
android:pathData="M170.61,100.85L184.64,114.07"
android:strokeWidth="1.56659"
android:fillColor="#00000000"
android:strokeColor="#1D1F29"
android:strokeLineCap="round"/>
<path
android:pathData="M176.59,104.41C176.4,104.84 175.87,105.2 174.93,105.3C174.01,105.39 172.83,105.21 171.63,104.67C170.44,104.14 169.51,103.39 168.97,102.65C168.41,101.89 168.33,101.25 168.52,100.82C168.71,100.4 169.24,100.03 170.19,99.94C171.11,99.84 172.29,100.03 173.48,100.56C174.68,101.1 175.6,101.84 176.15,102.59C176.7,103.35 176.78,103.99 176.59,104.41Z"
android:strokeWidth="1.34279"
android:fillColor="#E0FF66"
android:strokeColor="#1D1F29"/>
<path
android:pathData="M170.91,88.02C171.81,88.9 171.77,90.7 170.41,92.06C169.06,93.43 167.25,93.48 166.35,92.6C165.46,91.72 165.49,89.92 166.85,88.56C168.21,87.19 170.01,87.13 170.91,88.02Z"
android:strokeWidth="1.34279"
android:fillColor="#C3C4CE"
android:strokeColor="#1D1F29"/>
<path
android:pathData="M168.95,88.99C169.18,89.21 169.26,89.81 168.72,90.35C168.18,90.89 167.58,90.82 167.35,90.6C167.13,90.38 167.05,89.78 167.59,89.24C168.13,88.7 168.73,88.77 168.95,88.99Z"
android:strokeWidth="1.34279"
android:fillColor="#C3C4CE"
android:strokeColor="#1D1F29"/>
<path
android:pathData="M160.07,87.61C160.96,88.49 160.93,90.29 159.57,91.65C158.22,93.02 156.4,93.07 155.51,92.19C154.61,91.31 154.65,89.51 156.01,88.15C157.36,86.78 159.17,86.72 160.07,87.61Z"
android:strokeWidth="1.34279"
android:fillColor="#C3C4CE"
android:strokeColor="#1D1F29"/>
<path
android:pathData="M158.2,88.58C158.43,88.8 158.51,89.4 157.97,89.94C157.43,90.48 156.83,90.41 156.6,90.19C156.38,89.97 156.3,89.37 156.84,88.83C157.38,88.29 157.98,88.36 158.2,88.58Z"
android:strokeWidth="1.34279"
android:fillColor="#C3C4CE"
android:strokeColor="#1D1F29"/>
<path
android:pathData="M151.38,72.33l1.67,-1.5l16.64,18.3l-1.67,1.5z"
android:fillColor="#1D1F29"/>
<path
android:pathData="M144.96,76.74l1.67,-1.5l12.26,13.48l-1.67,1.5z"
android:fillColor="#1D1F29"/>
<path
android:pathData="M189.5,105.47C189.62,105.2 189.98,105.13 190.2,105.35L196.17,111.56C196.29,111.68 196.32,111.86 196.26,112.02L195.97,112.68C195.85,112.95 195.49,113.02 195.27,112.8L189.3,106.59C189.18,106.47 189.15,106.29 189.21,106.13L189.5,105.47Z"
android:strokeWidth="0.0447596"
android:fillColor="#1D1F29"
android:strokeColor="#1D1F29"/>
<path
android:pathData="M25.15,52.88C25.3,52.25 25.38,51.61 25.38,50.94C25.38,46.28 21.58,42.5 16.89,42.5C12.21,42.5 8.41,46.28 8.41,50.94C8.41,55.5 12.05,59.22 16.61,59.37C21.4,65.01 31.91,73.73 42.47,70.96L31.37,55.97C29.87,55.65 26.93,54.63 25.15,52.88Z"
android:fillColor="#FF4F17"
android:fillType="evenOdd"/>
<group>
<clip-path
android:pathData="M25.15,52.88C25.3,52.25 25.38,51.61 25.38,50.94C25.38,46.28 21.58,42.5 16.89,42.5C12.21,42.5 8.41,46.28 8.41,50.94C8.41,55.5 12.05,59.22 16.61,59.37C21.4,65.01 31.91,73.73 42.47,70.96L31.37,55.97C29.87,55.65 26.93,54.63 25.15,52.88Z"
android:fillType="evenOdd"/>
<path
android:pathData="M25.15,52.88L23.63,52.52L23.42,53.38L24.05,53.99L25.15,52.88ZM16.61,59.37L17.8,58.36L17.35,57.83L16.66,57.81L16.61,59.37ZM42.47,70.96L42.87,72.47L45.11,71.88L43.73,70.02L42.47,70.96ZM31.37,55.97L32.63,55.04L32.28,54.57L31.7,54.44L31.37,55.97ZM23.81,50.94C23.81,51.48 23.75,52.01 23.63,52.52L26.68,53.24C26.85,52.5 26.94,51.73 26.94,50.94H23.81ZM16.89,44.07C20.72,44.07 23.81,47.15 23.81,50.94H26.94C26.94,45.41 22.43,40.94 16.89,40.94V44.07ZM9.97,50.94C9.97,47.15 13.06,44.07 16.89,44.07V40.94C11.35,40.94 6.84,45.41 6.84,50.94H9.97ZM16.66,57.81C12.94,57.68 9.97,54.65 9.97,50.94H6.84C6.84,56.36 11.17,60.76 16.55,60.94L16.66,57.81ZM42.07,69.44C37.33,70.69 32.49,69.38 28.14,66.95C23.79,64.53 20.11,61.07 17.8,58.36L15.41,60.39C17.9,63.31 21.87,67.04 26.61,69.69C31.36,72.33 37.05,74 42.87,72.47L42.07,69.44ZM30.11,56.91L41.21,71.89L43.73,70.02L32.63,55.04L30.11,56.91ZM24.05,53.99C26.15,56.05 29.42,57.15 31.03,57.5L31.7,54.44C30.32,54.14 27.72,53.21 26.25,51.76L24.05,53.99Z"
android:fillColor="#1D1F29"/>
</group>
<path
android:pathData="M21.83,39.39L6.39,23.21L28.82,22.99L21.83,39.39Z"
android:strokeLineJoin="round"
android:strokeWidth="1.56659"
android:fillColor="#E0FF66"
android:strokeColor="#1D1F29"/>
<path
android:pathData="M29.13,22.09L8.59,70.14"
android:strokeWidth="1.79038"
android:fillColor="#00000000"
android:strokeColor="#1D1F29"
android:strokeLineCap="round"/>
<path
android:pathData="M20,49.05C16.99,50.34 15.16,47.91 14.62,46.54C13.6,47.55 11.74,50.64 12.42,54.91C13.09,59.19 17.4,57.38 19.48,55.94C20.9,53.11 23,47.76 20,49.05Z"
android:fillColor="#FF4F17"/>
<path
android:pathData="M81.49,105.57C67.55,103.08 57.78,94.17 54.4,89.59L71.89,82.71C74.81,88.14 88.86,92.75 93.19,93.89C97.51,95.02 96.24,98.37 96.05,99.06C95.89,99.65 94.4,104.47 93.82,106.89C92.27,113.46 91.73,118.41 86.57,118.26C79.5,118.06 80.24,109.71 81.49,105.57Z"
android:fillColor="#FF4F17"/>
<path
android:pathData="M81.49,105.57C67.55,103.08 57.78,94.17 54.4,89.59L71.89,82.71C74.81,88.14 88.86,92.75 93.19,93.89C97.51,95.02 96.24,98.37 96.05,99.06C95.89,99.65 94.4,104.47 93.82,106.89C92.27,113.46 91.73,118.41 86.57,118.26C79.5,118.06 80.24,109.71 81.49,105.57ZM81.49,105.57C83.01,105.84 84.58,106.03 86.19,106.14L81.49,105.57Z"
android:strokeLineJoin="round"
android:strokeWidth="1.56659"
android:fillColor="#00000000"
android:strokeColor="#1D1F29"/>
<path
android:pathData="M62.6,104.73C62.6,97.86 65.84,90.33 67.46,87.42L84.59,81.55C80.22,90.12 77.1,106.11 75.48,112.97C75.96,121.74 71.29,122.59 69.28,121.74L56.04,115.93C53.18,114.72 49.92,110.44 53.18,106.13C55.87,102.56 61.78,104.52 65.41,106.67L62.6,104.73Z"
android:strokeLineJoin="round"
android:strokeWidth="1.56659"
android:fillColor="#FF4F17"
android:strokeColor="#1D1F29"/>
<path
android:pathData="M29.69,56.45C30.47,38.61 45.64,24.77 63.59,25.54C81.54,26.31 95.45,41.41 94.68,59.25C93.9,77.09 78.72,90.93 60.77,90.15C42.83,89.38 28.91,74.29 29.69,56.45Z"
android:strokeWidth="1.56659"
android:fillColor="#FF4F17"
android:strokeColor="#1D1F29"/>
<path
android:pathData="M51.81,45.45C52.73,45.86 53.01,47.21 52.44,48.46C51.88,49.71 50.68,50.4 49.76,49.99C48.84,49.58 48.56,48.23 49.13,46.98C49.69,45.72 50.9,45.04 51.81,45.45Z"
android:fillColor="#1D1F29"/>
<path
android:pathData="M44.24,45.06C45.16,45.47 45.44,46.82 44.87,48.07C44.31,49.32 43.11,50.01 42.19,49.6C41.27,49.19 40.99,47.84 41.56,46.59C42.12,45.34 43.33,44.65 44.24,45.06Z"
android:fillColor="#1D1F29"/>
<path
android:pathData="M122.08,22.18C121.67,22.51 121.03,22.36 120.82,21.87L120.82,21.86L117.01,12.79C117,12.76 116.99,12.72 116.99,12.69L116.21,12.68L116.99,12.69C116.99,12.65 117,12.62 117.01,12.58C117.03,12.55 117.05,12.52 117.07,12.5C117.1,12.47 117.13,12.45 117.16,12.44L117.16,12.44L119.77,11.45C119.77,11.45 119.77,11.45 119.77,11.45C119.77,11.45 119.77,11.45 119.77,11.45C119.83,11.43 119.9,11.43 119.96,11.45C120.01,11.47 120.06,11.5 120.1,11.55L122.42,15.73L122.76,16.35L123.41,16.07C130.47,13.04 134,11.77 136.92,11.27L136.92,11.27C136.99,11.26 137.06,11.27 137.12,11.31C137.18,11.35 137.22,11.41 137.24,11.48L137.24,11.48L137.63,13.34C137.63,13.34 137.63,13.34 137.63,13.34C137.65,13.4 137.64,13.46 137.61,13.52C137.58,13.57 137.53,13.62 137.47,13.64L137.4,13.66L137.4,13.67L137.37,13.68L137.37,13.68L137.36,13.68L137.06,13.81L137.06,13.81L137.05,13.81C135.35,14.53 133.66,15.29 132.01,16.11L132.01,16.11C128.9,17.65 125.06,19.79 122.08,22.18ZM122.08,22.18L122.57,22.79M122.08,22.18L122.57,22.79M122.57,22.79C125.48,20.45 129.26,18.34 132.35,16.81C134,16 135.66,15.24 137.35,14.53L116.29,13.09L120.1,22.17C120.51,23.16 121.76,23.44 122.57,22.79Z"
android:strokeWidth="1.56659"
android:fillColor="#FF4F17"
android:strokeColor="#1D1F29"/>
<path
android:pathData="M130.22,105.57C116.29,103.08 106.52,94.17 103.13,89.59L120.62,82.71C123.54,88.14 137.6,92.75 141.92,93.89C146.25,95.02 144.98,98.37 144.78,99.06C144.62,99.65 143.13,104.47 142.56,106.89C141.01,113.46 140.46,118.41 135.31,118.26C128.24,118.06 128.97,109.71 130.22,105.57Z"
android:fillColor="#FF4F17"/>
<path
android:pathData="M130.22,105.57C116.29,103.08 106.52,94.17 103.13,89.59L120.62,82.71C123.54,88.14 137.6,92.75 141.92,93.89C146.25,95.02 144.98,98.37 144.78,99.06C144.62,99.65 143.13,104.47 142.56,106.89C141.01,113.46 140.46,118.41 135.31,118.26C128.24,118.06 128.97,109.71 130.22,105.57ZM130.22,105.57C131.74,105.84 133.31,106.03 134.93,106.14L130.22,105.57Z"
android:strokeLineJoin="round"
android:strokeWidth="1.56659"
android:fillColor="#00000000"
android:strokeColor="#1D1F29"/>
<path
android:pathData="M111.32,104.73C111.32,97.86 114.56,90.33 116.18,87.42L133.31,81.55C128.94,90.12 125.82,106.11 124.2,112.97C124.68,121.74 120,122.59 118,121.74L104.76,115.93C101.9,114.72 98.64,110.43 101.9,106.13C104.59,102.56 110.5,104.52 114.13,106.67L111.32,104.73Z"
android:strokeLineJoin="round"
android:strokeWidth="1.56659"
android:fillColor="#FF4F17"
android:strokeColor="#1D1F29"/>
<path
android:pathData="M78.4,56.45C79.18,38.61 94.35,24.77 112.3,25.54C130.25,26.31 144.16,41.41 143.39,59.25C142.61,77.09 127.43,90.93 109.49,90.15C91.54,89.38 77.62,74.28 78.4,56.45Z"
android:strokeWidth="1.56659"
android:fillColor="#FF4F17"
android:strokeColor="#1D1F29"/>
<path
android:pathData="M100.55,45.45C101.46,45.86 101.75,47.21 101.18,48.46C100.61,49.71 99.41,50.4 98.49,49.99C97.58,49.58 97.3,48.23 97.86,46.98C98.43,45.72 99.63,45.04 100.55,45.45Z"
android:fillColor="#1D1F29"/>
<path
android:pathData="M92.98,45.06C93.89,45.47 94.17,46.82 93.61,48.07C93.04,49.32 91.84,50.01 90.92,49.6C90.01,49.19 89.72,47.84 90.29,46.59C90.86,45.34 92.06,44.65 92.98,45.06Z"
android:fillColor="#1D1F29"/>
<path
android:pathData="M144.93,74.65C143.08,67.65 135.2,64.09 131.49,63.19L133.31,51.14C144.89,54.09 152.24,62.47 156.06,70.67C159.13,77.23 155.68,80.62 153.58,81.49C151.46,82.12 146.77,81.64 144.93,74.65Z"
android:fillColor="#FF4F17"/>
<path
android:pathData="M134.15,63.88C137.86,64.78 143.06,67.65 144.91,74.65C146.75,81.64 151.44,82.12 153.56,81.49C155.66,80.62 159.11,77.23 156.04,70.67C152.22,62.46 147.55,54.78 135.97,51.84"
android:strokeLineJoin="round"
android:strokeWidth="1.56659"
android:fillColor="#00000000"
android:strokeColor="#1D1F29"
android:strokeLineCap="round"/>
<path
android:pathData="M100.46,59.31C97.71,60.16 94.81,58.69 93.84,56.04L104.07,52.89C104.78,55.62 103.21,58.46 100.46,59.31Z"
android:strokeWidth="1.56659"
android:fillColor="#1D1F29"
android:strokeColor="#1D1F29"/>
<group>
<clip-path
android:pathData="M100.46,59.31C97.71,60.15 94.81,58.69 93.84,56.04L104.07,52.89C104.78,55.62 103.21,58.46 100.46,59.31Z"/>
<path
android:pathData="M99.92,55.36C103.49,54.4 106.85,56.04 107.74,58.76L94.89,62.23C94.28,59.44 96.35,56.33 99.92,55.36Z"
android:strokeWidth="1.56659"
android:fillColor="#FCAD95"
android:strokeColor="#1D1F29"/>
</group>
<path
android:pathData="M100.5,59.42C97.65,60.29 94.64,58.75 93.69,55.97L104.15,52.75C104.94,55.57 103.34,58.54 100.5,59.42Z"
android:strokeWidth="1.34279"
android:fillColor="#00000000"
android:strokeColor="#1D1F29"/>
<path
android:pathData="M51.75,59.31C49,60.15 46.1,58.69 45.13,56.04L55.36,52.89C56.07,55.62 54.5,58.46 51.75,59.31Z"
android:strokeWidth="1.56659"
android:fillColor="#1D1F29"
android:strokeColor="#1D1F29"/>
<group>
<clip-path
android:pathData="M51.75,59.31C49,60.15 46.1,58.69 45.13,56.04L55.36,52.89C56.07,55.62 54.5,58.46 51.75,59.31Z"/>
<path
android:pathData="M51.21,55.36C54.78,54.4 58.14,56.04 59.03,58.76L46.18,62.23C45.57,59.44 47.63,56.33 51.21,55.36Z"
android:strokeWidth="1.56659"
android:fillColor="#FCAD95"
android:strokeColor="#1D1F29"/>
</group>
<path
android:pathData="M51.78,59.42C48.94,60.29 45.93,58.75 44.98,55.97L55.44,52.75C56.23,55.57 54.63,58.54 51.78,59.42Z"
android:strokeWidth="1.34279"
android:fillColor="#00000000"
android:strokeColor="#1D1F29"/>
</vector>
Loading