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/#265] Todo / 2차 QA 이슈 대응 #266

Merged
merged 4 commits into from
Mar 21, 2024
Merged

[FIX/#265] Todo / 2차 QA 이슈 대응 #266

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
fdd14a7
[FIX/#265] Todo 레이아웃 위치 조정
Marchbreeze Mar 21, 2024
3feae94
[FIX/#265] 조회뷰 counter 삭제
Marchbreeze Mar 21, 2024
0153773
[FIX/#265] 여행 정보 레이아웃 위치 조정
Marchbreeze Mar 21, 2024
a1798de
Merge branch 'develop' of https://github.com/Team-Going/Going-Android…
Marchbreeze Mar 21, 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
2 changes: 0 additions & 2 deletions presentation/src/main/java/com/going/presentation/todo/detail/TodoDetailActivity.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,6 @@ class TodoDetailActivity :
with(binding) {
tvTodoCreateMemoTitle.isVisible = true
etTodoCreateMemo.isVisible = true
tvTodoMemoCounter.isVisible = true
}

if (state.data.memo.isBlank()) {
Expand All @@ -127,7 +126,6 @@ class TodoDetailActivity :
drawableOf(R.drawable.shape_rect_4_gray200_line)
etTodoCreateMemo.text = stringOf(R.string.my_todo_create_tv_memo_hint)
etTodoCreateMemo.setTextColor(colorOf(R.color.gray_200))
tvTodoMemoCounter.isVisible = false
}
}
}
Expand Down
6 changes: 0 additions & 6 deletions presentation/src/main/java/com/going/presentation/todo/detail/TodoDetailViewModel.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,10 +60,4 @@ class TodoDetailViewModel @Inject constructor(
}
}
}

companion object {
const val MAX_TODO_LEN = 15
const val MAX_MEMO_LEN = 1000
}

}
9 changes: 4 additions & 5 deletions presentation/src/main/java/com/going/presentation/todo/edittrip/edit/EditTripActivity.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ class EditTripActivity :
}

private fun initBindingViewModel() {
binding.viewModel = viewModel
binding.vm = viewModel
}

private fun getIntentData() {
Expand All @@ -50,10 +50,9 @@ class EditTripActivity :
when (state) {
is UiState.Success -> {
with(binding) {
tvEditTripName.text = viewModel?.title
tvEditTripInfoStartDate.text = viewModel?.startDate
tvEditTripInfoEndDate.text = viewModel?.endDate
viewModel?.gettitleLength()
tvEditTripName.text = viewModel.title
tvEditTripInfoStartDate.text = viewModel.startDate
tvEditTripInfoEndDate.text = viewModel.endDate
Comment on lines -53 to +55
Copy link
Contributor

Choose a reason for hiding this comment

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

요아이!...배워갑니닷 👍👍

}
}

Expand Down
10 changes: 0 additions & 10 deletions presentation/src/main/java/com/going/presentation/todo/edittrip/edit/EditTripViewModel.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@ import javax.inject.Inject
class EditTripViewModel @Inject constructor(
private val editTripRepository: EditTripRepository
) : ViewModel() {
val titleLength = MutableLiveData(0)

val startYear = MutableLiveData<Int>()
val startMonth = MutableLiveData<Int>()
Expand All @@ -41,10 +40,6 @@ class EditTripViewModel @Inject constructor(
private val _quittripState = MutableSharedFlow<Boolean>()
val quittripState: SharedFlow<Boolean> = _quittripState

fun gettitleLength(){
titleLength.value = title.getGraphemeLength()
}

fun getTripInfoFromServer(tripId: Long) {
_tripInfoState.value = UiState.Loading
viewModelScope.launch {
Expand Down Expand Up @@ -74,9 +69,4 @@ class EditTripViewModel @Inject constructor(
}
}
}

companion object {
const val MAX_TRIP_LEN = 15
}

}
22 changes: 11 additions & 11 deletions presentation/src/main/res/layout/activity_edit_trip.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<data>

<variable
name="viewModel"
name="vm"
type="com.going.presentation.todo.edittrip.edit.EditTripViewModel" />
</data>

Expand Down Expand Up @@ -61,16 +61,17 @@

<TextView
android:id="@+id/tv_edit_trip_name"
style="@style/TextAppearance.Doorip.Body3.Medi"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginHorizontal="24dp"
android:layout_marginTop="8dp"
android:paddingHorizontal="16dp"
android:paddingVertical="16dp"
android:background="@drawable/shape_rect_4_gray700_line"
android:maxLines="3"
android:text="@={viewModel.title}"
android:textAppearance="@style/TextAppearance.Doorip.Body3.Medi"
android:paddingVertical="20dp"
android:paddingStart="16dp"
android:paddingEnd="30dp"
android:text="@={vm.title}"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/tv_edit_trip_name_title" />
Expand All @@ -80,13 +81,12 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="4dp"
android:textAppearance="@style/TextAppearance.Doorip.Detail3.Regular"
android:text="@{@string/counter(viewModel.titleLength, viewModel.MAX_TRIP_LEN)}"
android:textColor="@color/gray_400"
android:text="@string/empty_string"
style="@style/TextAppearance.Doorip.Detail3.Regular"
android:textColor="@color/white_000"
app:layout_constraintEnd_toEndOf="@id/tv_edit_trip_name"
app:layout_constraintTop_toBottomOf="@id/tv_edit_trip_name" />


<TextView
android:id="@+id/tv_edit_trip_on_line_info_title"
style="@style/TextAppearance.Doorip.Body3.Bold"
Expand Down Expand Up @@ -119,7 +119,7 @@
android:maxLines="2"
android:paddingHorizontal="12dp"
android:paddingVertical="16dp"
android:text="@{@string/edit_trip_date(viewModel.startYear, viewModel.startMonth, viewModel.startDay)}"
android:text="@{@string/edit_trip_date(vm.startYear, vm.startMonth, vm.startDay)}"
android:textColor="@color/gray_700" />

<TextView
Expand All @@ -141,7 +141,7 @@
android:maxLines="2"
android:paddingHorizontal="12dp"
android:paddingVertical="16dp"
android:text="@{@string/edit_trip_date(viewModel.endYear, viewModel.endMonth, viewModel.endDay)}"
android:text="@{@string/edit_trip_date(vm.endYear, vm.endMonth, vm.endDay)}"
android:textColor="@color/gray_700" />
</LinearLayout>

Expand Down
27 changes: 5 additions & 22 deletions presentation/src/main/res/layout/activity_todo_detail.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginHorizontal="24dp"
android:layout_marginTop="6dp"
android:layout_marginTop="8dp"
android:background="@drawable/shape_rect_4_gray700_line"
android:paddingVertical="20dp"
android:paddingStart="16dp"
Expand All @@ -107,11 +107,10 @@
android:layout_height="wrap_content"
android:layout_marginTop="4dp"
android:layout_marginEnd="4dp"
android:text="@{@string/counter(vm.todo.length, vm.MAX_TODO_LEN)}"
android:textColor="@color/gray_400"
android:text="@string/empty_string"
android:textColor="@color/white_000"
app:layout_constraintEnd_toEndOf="@id/et_todo_detail_todo"
app:layout_constraintTop_toBottomOf="@id/et_todo_detail_todo"
tools:text="0/15" />
app:layout_constraintTop_toBottomOf="@id/et_todo_detail_todo" />

<TextView
android:id="@+id/tv_todo_detail_date_title"
Expand Down Expand Up @@ -253,7 +252,7 @@
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginHorizontal="24dp"
android:layout_marginTop="6dp"
android:layout_marginTop="8dp"
android:autoLink="web"
android:background="@drawable/shape_rect_4_gray700_line"
android:gravity="top"
Expand All @@ -271,22 +270,6 @@
tools:text="오늘 완전 완전 맛있는 파스타를 먹었는데 완전 아주 그냥 이게 말이지"
tools:visibility="visible" />

<TextView
android:id="@+id/tv_todo_memo_counter"
style="@style/TextAppearance.Doorip.Detail3.Regular"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="4dp"
android:layout_marginEnd="4dp"
android:paddingBottom="20dp"
android:text="@{@string/counter(vm.memo.length, vm.MAX_MEMO_LEN)}"
android:textColor="@color/gray_400"
android:visibility="gone"
app:layout_constraintEnd_toEndOf="@id/et_todo_create_memo"
app:layout_constraintTop_toBottomOf="@id/et_todo_create_memo"
tools:text="0/1000"
tools:visibility="visible" />

</androidx.constraintlayout.widget.ConstraintLayout>

</ScrollView>
Expand Down
2 changes: 1 addition & 1 deletion presentation/src/main/res/layout/fragment_my_todo.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="18dp"
android:layout_marginEnd="10dp"
android:layout_marginEnd="12dp"
android:layout_marginBottom="4dp"
android:src="@drawable/ic_trip_info"
app:layout_constraintBottom_toBottomOf="parent"
Expand Down
1 change: 1 addition & 0 deletions presentation/src/main/res/values/strings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
<string name="adapter_not_initialized_error_msg">Adapter is not initialized</string>
<string name="to_string">%s</string>
<string name="dummy">Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.</string>
<string name="empty_string"> </string>

<string name="server_error">서버 통신에 실패했어요</string>
<string name="name_blank_error">닉네임에는 공백만 입력할 수 없어요</string>
Expand Down
Loading