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

[REFACTOR/#212] 다이얼로그 / 리팩토링 #213

Merged
merged 27 commits into from
Sep 6, 2024
Merged
Show file tree
Hide file tree
Changes from 8 commits
Commits
Show all changes
27 commits
Select commit Hold shift + click to select a range
be7abcb
[MOD/#212] 스크랩 취소 다이얼로그 추출
boiledEgg-s Sep 1, 2024
7a0fa35
[FEAT/#212] 스크랩 취소와 캘린더 연동
boiledEgg-s Sep 1, 2024
5f95377
[UI/#212] 스크랩 취소 프리뷰
boiledEgg-s Sep 1, 2024
337c03c
[MOD
boiledEgg-s Sep 1, 2024
72279a2
[FEAT/#212] 공고 다이얼로그와 달력 연동
boiledEgg-s Sep 1, 2024
610a9a1
[DEL/#212] 스크랩 관리 코드 제거
boiledEgg-s Sep 1, 2024
b483d56
[DEL/#212] 라이브러리 import 정리
boiledEgg-s Sep 1, 2024
0a94565
[CHORE/#212] Resource 의존성 수정
boiledEgg-s Sep 1, 2024
8bb8578
[ADD/#212] 스크랩 색상 추가
boiledEgg-s Sep 3, 2024
4dfff2a
[ADD/#212] 컬러 타입 추가
boiledEgg-s Sep 3, 2024
67dfbf9
[ADD/#212] 컬러 코드 추가
boiledEgg-s Sep 3, 2024
37c8b2b
[FIX/#212] 컬러 타입 수정
boiledEgg-s Sep 3, 2024
a7ccfe7
[FEAT/#212] 컬러 팔레트 수정 및 연동
boiledEgg-s Sep 3, 2024
f856344
[FEAT/#212] 스크랩 다이얼로그 UI 및 기능 수정
boiledEgg-s Sep 3, 2024
cd13ab8
[DEL/#212] 라이브러리 정리
boiledEgg-s Sep 3, 2024
c424ad6
[FIX/#212] 버튼 관련 로직 수정
boiledEgg-s Sep 3, 2024
40156b6
[UI/#212] 스크랩창 기타 UI 수정
boiledEgg-s Sep 3, 2024
dd3d488
[UI/#212] 취소창 기타 UI 수정
boiledEgg-s Sep 3, 2024
6f91c70
[DEL/#212] 라이브러리 정리
boiledEgg-s Sep 3, 2024
222a636
[FIX/#212] 스크랩수정 버튼 오류 해결
boiledEgg-s Sep 3, 2024
ddc1cc1
[DEL/#212] 로그 삭제
boiledEgg-s Sep 3, 2024
536c53c
[DEL/#212] 라이브러리 삭제
boiledEgg-s Sep 3, 2024
05ffbe0
[REFACTOR/#212] 리뷰 기반 코드 수정
boiledEgg-s Sep 4, 2024
49b2275
[DOC/#212] RadioButtonGroups 문서화
boiledEgg-s Sep 4, 2024
0eac245
[CHORE/#212] 리소스 주석 추가
boiledEgg-s Sep 4, 2024
571e43e
[UI/#212] 토스트메시지 추가
boiledEgg-s Sep 4, 2024
52e6c48
Merge remote-tracking branch 'origin/develop' into refactor/#212-dialog
boiledEgg-s Sep 6, 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
6 changes: 3 additions & 3 deletions core/src/main/res/values/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -44,14 +44,14 @@

<!--Dialog-->
<string name="dialog_content_scrap_sub_title">공고를 캘린더에 스크랩하시겠어요?</string>
<string name="dialog_content_color_button">색상</string>
<string name="dialog_content_calendar_color_change">색상 저장하기</string>
<string name="dialog_content_color_button">스크랩 색상</string>
<string name="dialog_content_calendar_color_change">색상 변경하기</string>
<string name="dialog_scrap_button">내 캘린더에 스크랩하기</string>
<string name="dialog_content_scrap_cancel_main_title">관심 공고가 캘린더에서 사라져요!</string>
<string name="dialog_content_scrap_cancel_sub_title">스크랩을 취소하시겠어요?</string>
<string name="dialog_scrap_cancel_button">스크랩 취소하기</string>
<string name="dialog_scrap_mine">내가 스크랩한 관심 공고에요!</string>
<string name="dialog_scrap_move_to_intern">공고 상세 정보 보러가기</string>
<string name="dialog_scrap_move_to_intern">공고 상세 정보 보기</string>
<string name="dialog_today_deadline">오늘 마감되는 공고예요!</string>

<!--Intern-->
Expand Down
1 change: 1 addition & 0 deletions feature/src/main/assets/terning_scrap_cancel.json

Large diffs are not rendered by default.

This file was deleted.

This file was deleted.

Loading
Loading