Skip to content

Commit

Permalink
[FEAT/#70] start_trip_splash 뷰 최종 UI 코드리뷰 반영 수정
Browse files Browse the repository at this point in the history
  • Loading branch information
crownjoe committed Jan 11, 2024
1 parent 8d1fd8b commit b1d12ac
Show file tree
Hide file tree
Showing 4 changed files with 34 additions and 25 deletions.
2 changes: 1 addition & 1 deletion app/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
Expand Up @@ -132,7 +132,7 @@
<activity
android:name="com.going.presentation.profile.ProfileActivity"
android:exported="false"
android:screenOrientation="portrait"/>
android:screenOrientation="portrait" />

<activity
android:name="com.going.presentation.enter.entertrip.EnterTripActivity"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ class InviteFinishActivity :
super.onCreate(savedInstanceState)

initBackBtnClickListener()
initNextBtnClickListener()
initEnterBtnClickListener()

}

Expand All @@ -32,7 +32,7 @@ class InviteFinishActivity :
}
}

private fun initNextBtnClickListener() {
private fun initEnterBtnClickListener() {
binding.btnInviteFinishEnter.setOnSingleClickListener {
Intent(this, PreferenceTagActivity::class.java).apply {
startActivity(this)
Expand Down
2 changes: 1 addition & 1 deletion presentation/src/main/res/layout/activity_finish_trip.xml
Original file line number Diff line number Diff line change
Expand Up @@ -166,8 +166,8 @@
<View
android:layout_width="0dp"
android:layout_height="1dp"
app:layout_constraintBottom_toBottomOf="parent"
android:background="@color/gray_300"
app:layout_constraintBottom_toBottomOf="parent"
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" />
Expand Down
51 changes: 30 additions & 21 deletions presentation/src/main/res/layout/activity_start_trip_splash.xml
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<layout xmlns:tools="http://schemas.android.com/tools"
xmlns:android="http://schemas.android.com/apk/res/android"
<layout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto">

<data>
Expand Down Expand Up @@ -34,30 +33,40 @@

</androidx.constraintlayout.widget.ConstraintLayout>

<TextView
android:id="@+id/tv_start_trip_splash_title"
style="@style/TextAppearance.Doorip.Head3"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="16dp"
android:gravity="center"
android:text="@string/start_trip_splash_title"
android:textColor="@color/gray_700"
app:layout_constraintTop_toBottomOf="@+id/iv_start_trip_splash"
app:layout_constraintEnd_toEndOf="@+id/iv_start_trip_splash"
app:layout_constraintStart_toStartOf="@+id/iv_start_trip_splash" />

<ImageView
android:id="@+id/iv_start_trip_splash"
<androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginStart="8dp"
android:layout_marginBottom="100dp"
android:src="@drawable/ic_start_trip_splash_doorips"
android:layout_marginBottom="22dp"
app:layout_constraintBottom_toTopOf="@id/btn_start_trip_splash_new_trip"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/tb_start_trip_splash" />
app:layout_constraintTop_toBottomOf="@id/tb_start_trip_splash">

<ImageView
android:id="@+id/iv_start_trip_splash"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginStart="8dp"
android:src="@drawable/ic_start_trip_splash_doorips"
app:layout_constraintBottom_toTopOf="@id/tv_start_trip_splash_title"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent" />

<TextView
android:id="@+id/tv_start_trip_splash_title"
style="@style/TextAppearance.Doorip.Head3"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="16dp"
android:gravity="center"
android:text="@string/start_trip_splash_title"
android:textColor="@color/gray_700"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/iv_start_trip_splash" />

</androidx.constraintlayout.widget.ConstraintLayout>


<TextView
android:id="@+id/btn_start_trip_splash_new_trip"
Expand Down

0 comments on commit b1d12ac

Please sign in to comment.