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

feat: 알송파트 다크모드 대응 #616

Merged
merged 9 commits into from
Oct 23, 2024
Merged

feat: 알송파트 다크모드 대응 #616

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
996f792
fix: 공모글 작성/수정 제출 버튼 디바운스타임 1200ms로 조정
songpink Oct 22, 2024
9dc7f1e
fix: 공모글 작성/수정 시 총원 조절 버튼 디바운스 해제
songpink Oct 22, 2024
0dd2023
feat: 채팅방 목록의 "채팅" 텍스트에 다크모드 대응 적용
songpink Oct 22, 2024
3e4d226
feat: 공모 작성 및 수정 뷰에 다크모드 대응, 날짜 픽커 취소/확인 버튼 디자인 변경
songpink Oct 22, 2024
5d77a79
feat: Alert 다이얼로그 다크모드 대응
songpink Oct 22, 2024
7882147
feat: 공모상태 변경 다이얼로그에 다크모드 대응
songpink Oct 22, 2024
253c5f3
feat: 로그인 뷰 다크모드 대응
songpink Oct 22, 2024
608a808
feat: develop 머지
songpink Oct 22, 2024
cae7b6b
style: 코드 정렬
songpink Oct 22, 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
4 changes: 2 additions & 2 deletions ...va/com/zzang/chongdae/presentation/view/offeringmodify/OfferingModifyEssentialFragment.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -138,14 +138,14 @@ class OfferingModifyEssentialFragment : Fragment(), OnDateTimeButtonsClickListen
}
}

override fun onDateTimeSubmitButtonClick() {
override fun onConfirmButtonClick() {
viewModel.updateMeetingDate(
dateTimePickerBinding.tvDate.text.toString(),
)
dialog.dismiss()
}

override fun onDateTimeCancelButtonClick() {
override fun onCancelButtonClick() {
dialog.dismiss()
}

Expand Down
4 changes: 2 additions & 2 deletions ...rc/main/java/com/zzang/chongdae/presentation/view/write/OfferingWriteEssentialFragment.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,14 +123,14 @@ class OfferingWriteEssentialFragment : Fragment(), OnDateTimeButtonsClickListene
}
}

override fun onDateTimeSubmitButtonClick() {
override fun onConfirmButtonClick() {
viewModel.updateMeetingDate(
dateTimePickerBinding.tvDate.text.toString(),
)
dialog.dismiss()
}

override fun onDateTimeCancelButtonClick() {
override fun onCancelButtonClick() {
dialog.dismiss()
}

Expand Down
4 changes: 2 additions & 2 deletions ...rc/main/java/com/zzang/chongdae/presentation/view/write/OnDateTimeButtonsClickListener.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package com.zzang.chongdae.presentation.view.write

interface OnDateTimeButtonsClickListener {
fun onDateTimeSubmitButtonClick()
fun onConfirmButtonClick()

fun onDateTimeCancelButtonClick()
fun onCancelButtonClick()
}
3 changes: 1 addition & 2 deletions android/app/src/main/res/layout/activity_login.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,7 @@
<androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/main"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@color/white">
android:layout_height="match_parent">

<TextView
android:id="@+id/tv_start_chongdae_with_kakao"
Expand Down
15 changes: 8 additions & 7 deletions android/app/src/main/res/layout/dialog_alert.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,7 @@
android:layout_width="match_parent"
android:layout_height="@dimen/size_200"
android:layout_marginStart="@dimen/margin_30"
android:layout_marginEnd="@dimen/margin_30"
android:background="@color/white">
android:layout_marginEnd="@dimen/margin_30">

<TextView
android:id="@+id/tv_dialog_message"
Expand All @@ -26,11 +25,13 @@
android:layout_marginTop="@dimen/size_50"
android:layout_marginEnd="@dimen/size_50"
android:fontFamily="@font/suit_bold"
tools:text="다이얼로그 메세지"
android:text="@string/my_page_logout_dialog_description"
android:textColor="@color/gray_500"
android:textSize="@dimen/size_15"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
app:layout_constraintTop_toTopOf="parent"
tools:text="다이얼로그 메세지" />

<androidx.appcompat.widget.AppCompatButton
android:id="@+id/btn_cancel"
Expand All @@ -39,10 +40,10 @@
android:layout_marginTop="@dimen/size_50"
android:background="@color/red_100"
android:fontFamily="@font/suit_medium"
app:debouncedOnClick="@{() -> listener.onClickCancel()}"
android:text="@string/offering_detail_dialog_cancel_text"
android:textColor="@color/main_color"
android:textSize="@dimen/size_15"
app:debouncedOnClick="@{() -> listener.onClickCancel()}"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toStartOf="@id/btn_confirm"
app:layout_constraintStart_toStartOf="parent"
Expand All @@ -58,10 +59,10 @@
android:background="@color/main_color"
android:fontFamily="@font/suit_semibold"
android:text="@string/offering_detail_dialog_confirm_text"
app:debouncedOnClick="@{() -> listener.onClickConfirm()}"
app:debounceTime="@{1200L}"
android:textColor="@color/white"
android:textSize="@dimen/size_15"
app:debounceTime="@{1200L}"
app:debouncedOnClick="@{() -> listener.onClickConfirm()}"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toEndOf="@id/btn_cancel"
Expand Down
51 changes: 28 additions & 23 deletions android/app/src/main/res/layout/dialog_date_picker.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,35 +57,40 @@
app:layout_constraintTop_toTopOf="@id/picker_date"
tools:layout_editor_absoluteX="10dp" />-->

<Button
android:id="@+id/btn_submit"
android:layout_width="164dp"
<androidx.appcompat.widget.AppCompatButton
android:id="@+id/btn_cancel"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginTop="16dp"
android:background="@drawable/btn_rounded"
app:debouncedOnClick="@{() -> onClickListener.onDateTimeSubmitButtonClick()}"
android:text="확인"
android:textColor="@color/white"
android:textSize="16dp"
app:layout_constraintEnd_toEndOf="parent"
android:layout_marginTop="@dimen/size_50"
android:background="@color/red_100"
android:fontFamily="@font/suit_medium"
app:debouncedOnClick="@{() -> onClickListener.onCancelButtonClick()}"
android:text="@string/offering_detail_dialog_cancel_text"
android:textColor="@color/main_color"
android:textSize="@dimen/size_15"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toStartOf="@id/btn_confirm"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/picker_date" />
app:layout_constraintVertical_bias="1.0"
app:layout_constraintWidth_percent="0.5" />

<Button
android:id="@+id/btn_cancel"
android:layout_width="164dp"
<androidx.appcompat.widget.AppCompatButton
android:id="@+id/btn_confirm"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginTop="16dp"
android:layout_marginBottom="25dp"
android:background="@drawable/btn_rounded_gray"
app:debouncedOnClick="@{() -> onClickListener.onDateTimeCancelButtonClick()}"
android:text="취소"
android:textColor="@color/black_700"
android:textSize="16dp"
android:layout_marginTop="@dimen/size_40"
android:background="@color/main_color"
android:fontFamily="@font/suit_semibold"
android:text="@string/offering_detail_dialog_confirm_text"
app:debouncedOnClick="@{() -> onClickListener.onConfirmButtonClick()}"
android:textColor="@color/white"
android:textSize="@dimen/size_15"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/btn_submit" />
app:layout_constraintStart_toEndOf="@id/btn_cancel"
app:layout_constraintTop_toBottomOf="@+id/picker_date"
app:layout_constraintVertical_bias="1"
app:layout_constraintWidth_percent="0.5" />

</androidx.constraintlayout.widget.ConstraintLayout>
</layout>
4 changes: 2 additions & 2 deletions android/app/src/main/res/layout/dialog_date_time_picker.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@
android:layout_height="wrap_content"
android:layout_marginTop="16dp"
android:background="@drawable/btn_rounded"
app:debouncedOnClick="@{() -> onClickListener.onDateTimeSubmitButtonClick()}"
app:debouncedOnClick="@{() -> onClickListener.onConfirmButtonClick()}"
android:text="확인"
android:textColor="@color/white"
android:textSize="16dp"
Expand All @@ -116,7 +116,7 @@
android:layout_marginTop="16dp"
android:layout_marginBottom="10dp"
android:background="@drawable/btn_rounded_gray"
app:debouncedOnClick="@{() -> onClickListener.onDateTimeCancelButtonClick()}"
app:debouncedOnClick="@{() -> onClickListener.onCancelButtonClick()}"
android:text="취소"
android:textColor="@color/black_700"
android:textSize="16dp"
Expand Down
11 changes: 6 additions & 5 deletions android/app/src/main/res/layout/dialog_update_status.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,7 @@
android:layout_width="match_parent"
android:layout_height="@dimen/size_200"
android:layout_marginStart="@dimen/margin_30"
android:layout_marginEnd="@dimen/margin_30"
android:background="@color/white">
android:layout_marginEnd="@dimen/margin_30">

<TextView
android:id="@+id/tv_dialog_message"
Expand All @@ -30,10 +29,12 @@
android:layout_marginEnd="@dimen/size_50"
android:fontFamily="@font/suit_bold"
android:text="@{vm.commentOfferingInfo.message}"
android:textColor="@color/gray_500"
android:textSize="@dimen/size_15"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
app:layout_constraintTop_toTopOf="parent"
tools:text="텍스트" />

<androidx.appcompat.widget.AppCompatButton
android:id="@+id/btn_cancel"
Expand All @@ -42,10 +43,10 @@
android:layout_marginTop="@dimen/size_50"
android:background="@color/red_100"
android:fontFamily="@font/suit_medium"
app:debouncedOnClick="@{() -> listener.onCancelClick()}"
android:text="@string/all_cancel"
android:textColor="@color/main_color"
android:textSize="@dimen/size_15"
app:debouncedOnClick="@{() -> listener.onCancelClick()}"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toStartOf="@id/btn_confirm"
app:layout_constraintStart_toStartOf="parent"
Expand All @@ -60,10 +61,10 @@
android:layout_marginTop="@dimen/size_40"
android:background="@color/main_color"
android:fontFamily="@font/suit_semibold"
app:debouncedOnClick="@{() -> listener.onSubmitClick()}"
android:text="@string/all_confirm"
android:textColor="@color/white"
android:textSize="@dimen/size_15"
app:debouncedOnClick="@{() -> listener.onSubmitClick()}"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toEndOf="@id/btn_cancel"
Expand Down
4 changes: 3 additions & 1 deletion android/app/src/main/res/values-night/colors.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,12 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<color name="gray_900">#FFFFFFFF</color>
<color name="black_900">#FFFFFFFF</color>
<color name="gray_500">#FFD9D9D9</color>
<color name="black_900">#FFFFFFFF</color>
<color name="offering_detail_background">#FF303030</color>
<color name="default_icon_color">#FFFFFFFF</color>
<color name="my_page_title">#FFFFFFFF</color>
<color name="black_700">#FFFFFFFF</color>
<color name="black_1000">#FFFFFFFF</color>
<color name="black_1100">#FFFFFFFF</color>
</resources>
Loading