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.

Sign up for GitHub

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

[FIX/#137] 유빈 담당 뷰 / 이슈 대응 #142

Merged
merged 8 commits into from
Jan 16, 2024
Merged

[FIX/#137] 유빈 담당 뷰 / 이슈 대응 #142

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
17ebef9
[FIX/#137] 여행 제목 UI 수정
leeeyubin Jan 16, 2024
e6e4983
Merge branch 'develop' of https://github.com/Team-Going/Going-Android…
leeeyubin Jan 16, 2024
5d2cff9
[FIX/#137] 설정 UI 수정
leeeyubin Jan 16, 2024
5fa4695
[FIX/#137] 날짜 뷰 조정
leeeyubin Jan 16, 2024
ced7840
[FIX/#137] 제목 UI 수정
leeeyubin Jan 16, 2024
9c7e329
[FIX/#137] 여행 친구 조회 뷰 UI 수정
leeeyubin Jan 16, 2024
a02be91
[FIX/#137] 대시보드 Empty 뷰 UI 수정
leeeyubin Jan 16, 2024
0de00a7
[FIX/#137] 취향 태그 뷰 UI 수정
leeeyubin Jan 16, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 5 additions & 2 deletions .../src/main/java/com/going/presentation/dashboard/triplist/completed/CompletedViewHolder.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,11 @@ class CompletedViewHolder(

binding.run {
tvDashboardTripTitle.text = item.title
tvDashboardDateStart.text = item.startDate
tvDashboardDateEnd.text = item.endDate
tvDashboardDate.text = String.format(
itemView.context.getString(R.string.dashboard_tv_start_end_date),
item.startDate,
item.endDate
)
tvDashboardDeadlineCompleted.text =
itemView.context.getString(R.string.dashboard_tv_completed_trip)

Expand Down
7 changes: 5 additions & 2 deletions ...tion/src/main/java/com/going/presentation/dashboard/triplist/ongoing/OngoingViewHolder.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,11 @@ class OngoingViewHolder(
fun onBind(item: DashBoardTripModel) {
binding.run {
tvDashboardTripTitle.text = item.title
tvDashboardDateStart.text = item.startDate
tvDashboardDateEnd.text = item.endDate
tvDashboardDate.text = String.format(
itemView.context.getString(R.string.dashboard_tv_start_end_date),
item.startDate,
item.endDate
)

if (item.day <= 0) {
tvDashboardDeadline.text =
Expand Down
5 changes: 0 additions & 5 deletions presentation/src/main/res/layout/activity_check_friends.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,6 @@
style="@style/TextAppearance.Doorip.Body3.Bold"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginHorizontal="108dp"
android:layout_marginTop="20dp"
android:gravity="center"
android:text="@string/check_friends_preference_1_title"
Expand Down Expand Up @@ -199,7 +198,6 @@
style="@style/TextAppearance.Doorip.Body3.Bold"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginHorizontal="108dp"
android:layout_marginTop="10dp"
android:gravity="center"
android:text="@string/check_friends_preference_2_title"
Expand Down Expand Up @@ -278,7 +276,6 @@
style="@style/TextAppearance.Doorip.Body3.Bold"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginHorizontal="108dp"
android:layout_marginTop="10dp"
android:gravity="center"
android:text="@string/check_friends_preference_3_title"
Expand Down Expand Up @@ -358,7 +355,6 @@
style="@style/TextAppearance.Doorip.Body3.Bold"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginHorizontal="108dp"
android:layout_marginTop="10dp"
android:gravity="center"
android:text="@string/check_friends_preference_4_title"
Expand Down Expand Up @@ -438,7 +434,6 @@
style="@style/TextAppearance.Doorip.Body3.Bold"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginHorizontal="108dp"
android:layout_marginTop="10dp"
android:gravity="center"
android:text="@string/check_friends_preference_5_title"
Expand Down
525 changes: 271 additions & 254 deletions presentation/src/main/res/layout/activity_setting.xml
View file
Open in desktop

Large diffs are not rendered by default.

3 changes: 2 additions & 1 deletion presentation/src/main/res/layout/activity_trip_dash_board.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,11 @@
<TextView
android:id="@+id/tv_dashboard_title"
style="@style/TextAppearance.Doorip.Head1"
android:layout_width="wrap_content"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginStart="24dp"
android:layout_marginTop="44dp"
app:layout_constraintBottom_toTopOf="@id/tab_dashboard"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
tools:text="@string/dashboard_tv_title" />
Expand Down
6 changes: 4 additions & 2 deletions presentation/src/main/res/layout/fragment_completed_trip.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,13 +38,15 @@
<TextView
android:id="@+id/tv_dashboard_empty"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_height="0dp"
android:layout_marginBottom="28dp"
android:gravity="bottom"
android:text="@string/dashboard_tv_empty"
android:textColor="@color/gray_200"
app:layout_constraintBottom_toTopOf="@id/iv_dashboard_empty"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent" />
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />

<ImageView
android:id="@+id/iv_dashboard_empty"
Expand Down
6 changes: 4 additions & 2 deletions presentation/src/main/res/layout/fragment_ongoing_trip.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,13 +38,15 @@
<TextView
android:id="@+id/tv_dashboard_empty"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_height="0dp"
android:layout_marginBottom="28dp"
android:gravity="bottom"
android:text="@string/dashboard_tv_empty"
android:textColor="@color/gray_200"
app:layout_constraintBottom_toTopOf="@id/iv_dashboard_empty"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent" />
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />

<ImageView
android:id="@+id/iv_dashboard_empty"
Expand Down
49 changes: 13 additions & 36 deletions presentation/src/main/res/layout/item_dash_board_completed.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,11 +19,12 @@
<TextView
android:id="@+id/tv_dashboard_trip_title"
style="@style/TextAppearance.Doorip.Body3.Medi"
android:layout_width="wrap_content"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginStart="16dp"
android:layout_marginTop="16dp"
android:textColor="@color/gray_300"
app:layout_constraintEnd_toStartOf="@id/layout_dashboard_day_completed"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
tools:text="굉굉이들이랑 합숙" />
Expand All @@ -33,49 +34,25 @@
android:id="@+id/iv_dashboard_calendar"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginEnd="4dp"
android:layout_marginStart="16dp"
android:src="@drawable/ic_calendar"
app:layout_constraintBottom_toBottomOf="@id/tv_dashboard_date_start"
app:layout_constraintEnd_toStartOf="@id/tv_dashboard_date_start"
app:layout_constraintTop_toTopOf="@id/tv_dashboard_date_start" />
app:layout_constraintBottom_toBottomOf="@id/tv_dashboard_date"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="@id/tv_dashboard_date" />

<TextView
android:id="@+id/tv_dashboard_date_start"
android:id="@+id/tv_dashboard_date"
style="@style/TextAppearance.Doorip.Detail3.Regular"
android:layout_width="wrap_content"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginStart="16dp"
android:layout_marginTop="4dp"
android:layout_marginStart="4dp"
android:layout_marginBottom="16dp"
android:text="@string/dashboard_tv_start_end_date"
android:textColor="@color/gray_300"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toStartOf="@id/tv_dashboard_trip_title"
app:layout_constraintTop_toBottomOf="@id/tv_dashboard_trip_title"
tools:text="2024 .03 .24" />

<TextView
android:id="@+id/tv_dashboard_date_dash"
style="@style/TextAppearance.Doorip.Detail3.Regular"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="2dp"
android:textColor="@color/gray_300"
app:layout_constraintBottom_toBottomOf="@id/tv_dashboard_date_start"
app:layout_constraintStart_toEndOf="@id/tv_dashboard_date_start"
app:layout_constraintTop_toTopOf="@id/tv_dashboard_date_start"
tools:text="@string/dashboard_tv_dash" />

<TextView
android:id="@+id/tv_dashboard_date_end"
style="@style/TextAppearance.Doorip.Detail3.Regular"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="2dp"
android:textColor="@color/gray_300"
app:layout_constraintBottom_toBottomOf="@id/tv_dashboard_date_dash"
app:layout_constraintStart_toEndOf="@id/tv_dashboard_date_dash"
app:layout_constraintTop_toTopOf="@id/tv_dashboard_date_dash"
tools:text="2024 .03 .31" />
app:layout_constraintEnd_toStartOf="@id/layout_dashboard_day_completed"
app:layout_constraintStart_toEndOf="@id/iv_dashboard_calendar"
app:layout_constraintTop_toBottomOf="@id/tv_dashboard_trip_title" />

<androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/layout_dashboard_day_completed"
Expand Down
50 changes: 13 additions & 37 deletions presentation/src/main/res/layout/item_dash_board_ongoing.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,62 +19,38 @@
<TextView
android:id="@+id/tv_dashboard_trip_title"
style="@style/TextAppearance.Doorip.Body3.Medi"
android:layout_width="wrap_content"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginStart="16dp"
android:layout_marginTop="16dp"
app:layout_constraintEnd_toStartOf="@id/tv_dashboard_deadline"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
tools:text="굉굉이들이랑 합숙" />


<ImageView
android:id="@+id/iv_dashboard_calendar"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginEnd="4dp"
android:layout_marginStart="16dp"
android:src="@drawable/ic_calendar"
app:layout_constraintBottom_toBottomOf="@id/tv_dashboard_date_start"
app:layout_constraintEnd_toStartOf="@id/tv_dashboard_date_start"
app:layout_constraintTop_toTopOf="@id/tv_dashboard_date_start" />
app:layout_constraintBottom_toBottomOf="@id/tv_dashboard_date"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="@id/tv_dashboard_date" />

<TextView
android:id="@+id/tv_dashboard_date_start"
android:id="@+id/tv_dashboard_date"
style="@style/TextAppearance.Doorip.Detail3.Regular"
android:layout_width="wrap_content"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginStart="16dp"
android:layout_marginTop="4dp"
android:layout_marginStart="4dp"
android:layout_marginBottom="16dp"
android:text="@string/dashboard_tv_start_end_date"
android:textColor="@color/gray_300"
app:layout_constraintEnd_toStartOf="@id/tv_dashboard_deadline"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toStartOf="@id/tv_dashboard_trip_title"
app:layout_constraintTop_toBottomOf="@id/tv_dashboard_trip_title"
tools:text="2024 .03 .24" />

<TextView
android:id="@+id/tv_dashboard_date_dash"
style="@style/TextAppearance.Doorip.Detail3.Regular"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="2dp"
android:text="@string/dashboard_tv_dash"
android:textColor="@color/gray_300"
app:layout_constraintBottom_toBottomOf="@id/tv_dashboard_date_start"
app:layout_constraintStart_toEndOf="@id/tv_dashboard_date_start"
app:layout_constraintTop_toTopOf="@id/tv_dashboard_date_start" />

<TextView
android:id="@+id/tv_dashboard_date_end"
style="@style/TextAppearance.Doorip.Detail3.Regular"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="2dp"
android:textColor="@color/gray_300"
app:layout_constraintBottom_toBottomOf="@id/tv_dashboard_date_dash"
app:layout_constraintStart_toEndOf="@id/tv_dashboard_date_dash"
app:layout_constraintTop_toTopOf="@id/tv_dashboard_date_dash"
tools:text="2024 .03 .31" />
app:layout_constraintStart_toEndOf="@id/iv_dashboard_calendar"
app:layout_constraintTop_toBottomOf="@id/tv_dashboard_trip_title" />

<TextView
android:id="@+id/tv_dashboard_deadline"
Expand Down
59 changes: 42 additions & 17 deletions presentation/src/main/res/layout/item_preference_tag.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,30 +17,53 @@
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent">

<TextView
android:id="@+id/tv_preference_number"
style="@style/TextAppearance.Doorip.Detail2.Regular"
<androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/layout_preference_number"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="16dp"
android:background="@drawable/ic_preference_union"
android:gravity="center"
android:textColor="@color/white_000"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
tools:text="01" />
app:layout_constraintTop_toTopOf="parent">

<ImageView
android:id="@+id/iv_preference_number"
android:layout_width="wrap_content"
android:adjustViewBounds="true"
android:layout_height="0dp"
android:paddingVertical="2dp"
android:src="@drawable/ic_preference_union"
app:layout_constraintTop_toTopOf="@id/tv_preference_number"
app:layout_constraintBottom_toBottomOf="@id/tv_preference_number"
app:layout_constraintStart_toStartOf="@id/tv_preference_number"
app:layout_constraintEnd_toEndOf="@id/tv_preference_number"/>

<TextView
android:id="@+id/tv_preference_number"
style="@style/TextAppearance.Doorip.Detail2.Regular"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:gravity="center"
android:textColor="@color/white_000"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
tools:text="01" />

</androidx.constraintlayout.widget.ConstraintLayout>

<TextView
android:id="@+id/tv_preference_question"
style="@style/TextAppearance.Doorip.Body3.Medi"
android:layout_width="wrap_content"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginTop="4dp"
android:gravity="center"
android:textColor="@color/gray_700"
app:layout_constraintEnd_toEndOf="@id/tv_preference_number"
app:layout_constraintStart_toStartOf="@id/tv_preference_number"
app:layout_constraintTop_toBottomOf="@id/tv_preference_number"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/layout_preference_number"
tools:text="계획은 얼만큼 짤까요?" />

<RadioGroup
Expand Down Expand Up @@ -104,13 +127,14 @@
<TextView
android:id="@+id/tv_preference_tag1"
style="@style/TextAppearance.Doorip.Detail2.Regular"
android:layout_width="wrap_content"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginStart="20dp"
android:layout_marginTop="4dp"
android:layout_marginBottom="16dp"
android:textColor="@color/gray_700"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toStartOf="@id/tv_preference_tag2"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/rg_preference_tag"
tools:text="철저하게" />
Expand All @@ -125,25 +149,26 @@
android:text="@string/preference_no_matter"
android:textColor="@color/gray_700"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toStartOf="@id/tv_preference_tag3"
app:layout_constraintStart_toEndOf="@id/tv_preference_tag1"
app:layout_constraintTop_toBottomOf="@id/rg_preference_tag" />

<TextView
android:id="@+id/tv_preference_tag3"
style="@style/TextAppearance.Doorip.Detail2.Regular"
android:layout_width="wrap_content"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginTop="4dp"
android:layout_marginEnd="20dp"
android:layout_marginBottom="16dp"
android:gravity="end"
android:textColor="@color/gray_700"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toEndOf="@id/tv_preference_tag2"
app:layout_constraintTop_toBottomOf="@id/rg_preference_tag"
tools:text="즉흥으로" />

</androidx.constraintlayout.widget.ConstraintLayout>

</androidx.constraintlayout.widget.ConstraintLayout>

2 changes: 1 addition & 1 deletion presentation/src/main/res/values/strings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,7 @@
<string name="dashboard_tv_empty">새로운 여행을 시작해 보세요</string>
<string name="dashboard_btn_create_trip">여행 추가하기</string>
<string name="dashboard_tv_completed_trip">여행종료</string>
<string name="dashboard_tv_dash">-</string>
<string name="dashboard_tv_start_end_date">%s - %s</string>
<string name="dashboard_tv_deadline">D - %d</string>
<string name="dashboard_tv_traveling">여행중</string>

Expand Down