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

v1.0.1배포 #187

Merged
merged 933 commits into from
Aug 29, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
933 commits
Select commit Hold shift + click to select a range
a9aac9c
Merge branch 'develop' into feature/storage_qa_ver2
ddyeon Jul 31, 2024
803d33a
[refactoring] 재변경
Ahn-seokjoo Jul 31, 2024
0b621f2
[fix] 카드 클릭이벤트 위치 변경
ddyeon Jul 31, 2024
01c52be
[fix] QA : 모달 텍스트 정렬
ddyeon Jul 31, 2024
ba70107
Merge pull request #108 from mash-up-kr/feature/fix/header
Ahn-seokjoo Jul 31, 2024
0c28bc5
Merge branch 'develop' into feature/aiclassification/delete
Ahn-seokjoo Jul 31, 2024
a89767e
[fix] QA : 보관함 라인 수정
ddyeon Jul 31, 2024
9f8ecfb
[feature] Chip 전환 캐싱 구현
fbghgus123 Aug 1, 2024
3fabe83
[fix] QA 보관함 탑바 재정렬
ddyeon Aug 1, 2024
f4c8bc8
[fix] 린트 수정
ddyeon Aug 1, 2024
0002732
[fix] 바텀시트 확장코드 빼기
ddyeon Aug 1, 2024
db67a96
[fix] 린트 수정
ddyeon Aug 1, 2024
6359add
[fix] 로딩바 위치 맞추기 위해 수정
ddyeon Aug 1, 2024
d7aef27
[fix] 새폴더 추가에서 다시 돌아왔을 시 리로딩되는 이슈 수정
ddyeon Aug 1, 2024
a9258d9
[feature] 삭제 기능 추가
Ahn-seokjoo Aug 1, 2024
74a90e7
[feature] complete screen 보여주기
Ahn-seokjoo Aug 1, 2024
426bdf3
[feature] 다연이 따라 paging 뺌
Ahn-seokjoo Aug 1, 2024
523494f
[fix] 스크롤 시 탭 상태 변하는 이슈 수정
ddyeon Aug 2, 2024
64da099
[feat] 썸네일, 카테고리 추가
ddyeon Aug 2, 2024
9c3e495
[feat] 피드 카테고리 추가
ddyeon Aug 2, 2024
7d557e5
[fix] Chip 전환시 깜빡이는 현상 수정
fbghgus123 Aug 2, 2024
d82f2c0
[refactor] 리뷰 반영
ddyeon Aug 2, 2024
e5307c1
[feature] 로딩 표시 추가
fbghgus123 Aug 2, 2024
7ebf466
Merge branch 'develop' into feature/storage_qa_ver2
ddyeon Aug 2, 2024
7f7323b
Merge pull request #109 from mash-up-kr/feature/storage_qa_ver2
ddyeon Aug 2, 2024
bc210e9
[feat] 업데이트가 필요한지 체크 후 폴더리스트 호출 로직 추가
ddyeon Aug 2, 2024
4ac045b
[fix] 피드 이미지 사이즈 조정
ddyeon Aug 2, 2024
d28cac0
[refactoring] sample response 사용
Ahn-seokjoo Aug 2, 2024
0cc59d0
Merge pull request #110 from mash-up-kr/feature/aiclassification/delete
Ahn-seokjoo Aug 2, 2024
96a1c70
[refactoring] item 전달로 변경
Ahn-seokjoo Aug 2, 2024
744978d
Merge branch 'develop' into feature/home_api_second
fbghgus123 Aug 2, 2024
e328a3c
[feature] 북마크 훔치기
fbghgus123 Aug 2, 2024
3bfe379
[feat] 홈화면 폴더 이동 로직 추가
ddyeon Aug 2, 2024
8fa3c95
[feature] 하나 이동 추가
Ahn-seokjoo Aug 2, 2024
c83dd26
[feature] 프로그래스바 삭제
fbghgus123 Aug 2, 2024
928e17e
[refactoring] 다묵이 끙아 치우기
Ahn-seokjoo Aug 2, 2024
2626d98
[fix] 피드 순서 최신 올라오도록 수정
fbghgus123 Aug 2, 2024
d2fa7be
[feature] 날짜 0일전 -> 오늘로 변경
fbghgus123 Aug 2, 2024
166547f
[chore] spotless 적용
fbghgus123 Aug 2, 2024
d38b709
[feature] 묵주 리뷰 반영
fbghgus123 Aug 2, 2024
5dc19bf
[feat] 홈화면 피드 새폴더 추가 후 폴더 이동 로직 추가
ddyeon Aug 2, 2024
40b60e2
[fix] 새폴더 생성에서 홈으로 갔을 때 스택 제거
ddyeon Aug 2, 2024
9bb8d58
[refactor] 로그 제거
ddyeon Aug 2, 2024
f4ee860
[feat] 새폴더 생성 후 성공 시 바텀시트 안뜨드록
ddyeon Aug 2, 2024
0440907
Merge pull request #114 from mash-up-kr/feature/move_folder
Ahn-seokjoo Aug 2, 2024
0178acd
[fix] 간단한 리뷰 반영
ddyeon Aug 2, 2024
f1b55e2
[refactoring] 이동 전에 hide keyboard
Ahn-seokjoo Aug 2, 2024
b939c11
Merge branch 'develop' into feeature/storage_refactor
ddyeon Aug 3, 2024
b791938
Merge pull request #117 from mash-up-kr/feature/hide_keyboard
Ahn-seokjoo Aug 3, 2024
b199413
[chore] core-webview 모듈 추가
ddyeon Aug 3, 2024
0edc797
[feat] 공통 도라 웹뷰 만들기 및 네비게이션 설정
ddyeon Aug 3, 2024
0896045
[feat] 홈화면 피드 웹뷰 연결
ddyeon Aug 3, 2024
bca7520
[feat] 보관함 피드 웹뷰 연결
ddyeon Aug 3, 2024
2e111ca
[feat] AI 분류 웹뷰 연결
ddyeon Aug 3, 2024
09e4b7e
Merge branch 'develop' into feature/webview
ddyeon Aug 3, 2024
ef650a9
요약 업데이트 코드 복구
fbghgus123 Aug 3, 2024
9f7e7c3
[feat] AI분류 디자인 적용
ddyeon Aug 3, 2024
8ddea5d
Merge branch 'develop' into feature/storage_refactor
ddyeon Aug 3, 2024
7d4c75a
[feature] 앱 아이콘 변경
fbghgus123 Aug 3, 2024
d4970c9
[feat] 보관함 피드 캐싱할 수 있도록 수정
ddyeon Aug 3, 2024
d48154c
Merge pull request #121 from mash-up-kr/feature/ai-design
ddyeon Aug 3, 2024
8aa6a73
Merge pull request #119 from mash-up-kr/feature/webview
ddyeon Aug 3, 2024
759367b
Merge pull request #123 from mash-up-kr/feature/logo
ddyeon Aug 3, 2024
0760b52
[feat] flipper, retrofit 프로가드 추가
ddyeon Aug 3, 2024
e83bafd
[refactoring] uiModel 수정
Ahn-seokjoo Aug 4, 2024
81f3897
Merge pull request #124 from mash-up-kr/feature/proguard
ddyeon Aug 4, 2024
96eae6f
Revert "[feat] 보관함 피드 캐싱할 수 있도록 수정"
ddyeon Aug 4, 2024
c4de696
[refactoring] sealed class로 수정
Ahn-seokjoo Aug 4, 2024
aedd61f
[feature] separator 하는거 추가
Ahn-seokjoo Aug 4, 2024
d65dc3c
[spoteless] Apply
Ahn-seokjoo Aug 4, 2024
09c3a4a
[feature] uuid 추가
Ahn-seokjoo Aug 4, 2024
82264a1
[feature] 스크롤 + 필터 추가
Ahn-seokjoo Aug 4, 2024
31757ec
[feat] 보관함 페이징 작업중,,,,,
ddyeon Aug 4, 2024
4a4c595
[refactoring] 컨텐츠 타입 수정
Ahn-seokjoo Aug 4, 2024
3faa094
[spotless] Apply
Ahn-seokjoo Aug 4, 2024
36578f8
[feat] 페이징 소스에 보관함 캐싱 적용
ddyeon Aug 5, 2024
507b514
Merge pull request #125 from mash-up-kr/feature/add_header
Ahn-seokjoo Aug 5, 2024
f24058f
[feat] refresh 코드 구현
ddyeon Aug 5, 2024
a653ec6
Merge branch 'develop' into feature/storage_refactor
ddyeon Aug 5, 2024
6e478ce
[fix] 린트체크
ddyeon Aug 5, 2024
3a188fd
[feat] 홈, 피드, AI 읽음 처리 API호출
ddyeon Aug 6, 2024
8eabb3f
[fix] pagersource not 변경
ddyeon Aug 6, 2024
07204f1
Merge pull request #126 from mash-up-kr/feature/scroll_and_filter
Ahn-seokjoo Aug 6, 2024
c4a220b
Merge pull request #116 from mash-up-kr/feature/home_move_folder
ddyeon Aug 6, 2024
dae9113
[feat] 리프레시 시 스크롤 저장할 수 있도록 로직 추가
ddyeon Aug 6, 2024
c275cd7
[fix] 보관함 피드에서 데이터 변경 시 보관함 리프레시 및 토스트 뜨도록 수정
ddyeon Aug 6, 2024
085aee1
[feature] move all 추가
Ahn-seokjoo Aug 6, 2024
57ef888
[feature] lottie 추가
Ahn-seokjoo Aug 6, 2024
5722dc8
[spotless] Apply
Ahn-seokjoo Aug 6, 2024
7b1dcf6
[feature] 무한 로딩 추가
Ahn-seokjoo Aug 6, 2024
539b0df
[fix] 보관함 토스트 로직 수정
ddyeon Aug 6, 2024
cc72e5e
[fix] 보관함 99개 이상일 때 표시 수정
ddyeon Aug 6, 2024
89eaaf1
[feat] 읽음 처리 수정
ddyeon Aug 6, 2024
7bfd443
[fix] 북마크 시 readAt 없어지지 않도록
ddyeon Aug 6, 2024
219acb2
[feature] 로딩 추가
Ahn-seokjoo Aug 6, 2024
7ad3ce8
[feature] modifier 수정
Ahn-seokjoo Aug 7, 2024
89fec48
Merge pull request #129 from mash-up-kr/feature/moveAll
fbghgus123 Aug 7, 2024
3dac302
Merge branch 'feature/storage-read-check' into develop
ddyeon Aug 7, 2024
2f9e655
Revert "Merge branch 'feature/storage-read-check' into develop"
ddyeon Aug 7, 2024
22ef31b
Revert "Revert "Merge branch 'feature/storage-read-check' into develop""
ddyeon Aug 7, 2024
e55ff7c
[fix] request null인 경우 빼고 보낼 수 있도록 추가
ddyeon Aug 7, 2024
54bd512
[fix] 키워드 3개 추출일 때 null제거
ddyeon Aug 7, 2024
b4edcb6
[fix] boolean 처리 수정
ddyeon Aug 7, 2024
8944410
[fix] 한번 폴더 이동 후 선택된 폴더 리프레시 안되는 이슈
ddyeon Aug 7, 2024
4e453c1
[fix] 모달 없을 시 띄어지느 이슈,,수정 추후 다시 수정 필요함
ddyeon Aug 7, 2024
e48e127
[fix] 토스트 잘못뜨는 이슈 수정
ddyeon Aug 7, 2024
9ea15a4
[fix] 보관함 터치 영역 수정
ddyeon Aug 7, 2024
ef60771
[fix] 데이터 한개일 때 에러 처리 빼기!
ddyeon Aug 7, 2024
513d584
Merge pull request #133 from mash-up-kr/feature/feed_read_check
ddyeon Aug 8, 2024
c85116e
Merge pull request #127 from mash-up-kr/feeature/storage_refactor
ddyeon Aug 8, 2024
a3090c5
Merge branch 'develop' into feature/storage_refresh_and_qa
ddyeon Aug 8, 2024
119ac18
[fix] 여러개 클릭시 안사라지는것 수정
Ahn-seokjoo Aug 9, 2024
6754f7a
[fix] 응답값 수정
Ahn-seokjoo Aug 9, 2024
f47e870
Merge pull request #134 from mash-up-kr/feature/bug/fix
fbghgus123 Aug 10, 2024
732cf4c
[feature] 무한 스크롤 기본적인 구현
fbghgus123 Aug 10, 2024
3f4e70a
[feature] 무한 스크롤 북마크 적용
fbghgus123 Aug 10, 2024
ccf0b0f
[feature] 무한 스크롤 삭제 적용
fbghgus123 Aug 10, 2024
80a5858
[feature] 무한 스크롤 로딩 적용
fbghgus123 Aug 10, 2024
d246f31
[feature] 무한 스크롤 요약 완료시 업데이트 적용
fbghgus123 Aug 11, 2024
cbdb7eb
[chore] spotless 적용
fbghgus123 Aug 11, 2024
82f5ce4
Merge branch 'develop' into feature/home_api_third
fbghgus123 Aug 11, 2024
a000e14
[feat] 앱이름 변경
ddyeon Aug 11, 2024
3b098eb
Merge pull request #135 from mash-up-kr/feature/app_name
ddyeon Aug 11, 2024
e836e4b
[fix] 머지 컨플릭트 해결
fbghgus123 Aug 11, 2024
117afd1
[feature] 무한스크롤 폴더 이동 처리
fbghgus123 Aug 11, 2024
3399577
[feat] room 의존성 추가
ddyeon Aug 11, 2024
1a38758
[feat] 룸 데이터베이스 세팅
ddyeon Aug 11, 2024
6305050
[feat] 페이징 remoteMediator 추가
ddyeon Aug 11, 2024
54a7dc3
[feat] 모델 변경
ddyeon Aug 11, 2024
8b8873e
[feat] paging remote에서 가져오도록 수정
ddyeon Aug 11, 2024
f129da1
[refactor] 기존 안쓰는 코드 수정
ddyeon Aug 11, 2024
8e434d5
[feat] 보관함 사용자 폴더 페이징 리모트 적용
ddyeon Aug 11, 2024
a978e60
Merge branch 'develop' into feature/storage_refresh_and_qa
ddyeon Aug 11, 2024
783a478
[fix] spotless 적용
ddyeon Aug 11, 2024
6003ead
[fix] 리뷰반영
ddyeon Aug 11, 2024
30b757a
[feat] target34로 올리기
ddyeon Aug 12, 2024
6834459
[feature] 버전 업
Ahn-seokjoo Aug 11, 2024
56b4f72
Merge pull request #139 from mash-up-kr/feature/target34
ddyeon Aug 13, 2024
d921cd0
[fix] 크래시 대응
Ahn-seokjoo Aug 13, 2024
e81bbdc
[chore] #133 리뷰 반영
fbghgus123 Aug 15, 2024
05766dd
[feat] 웹뷰 유튜브 영상 안보이는 이슈 수정
Ahn-seokjoo Aug 16, 2024
9a6e30b
[fix] 폴더 이름 중복 시 alert안되는 이슈
ddyeon Aug 12, 2024
098c8f1
[fix] 릴리즈에서 non-null 타입되는 이슈 수정
ddyeon Aug 13, 2024
9fa0752
Merge pull request #152 from mash-up-kr/feature/dayeon
ddyeon Aug 17, 2024
a42ec95
[chore] HomeRoute의 postList를 ViewModel로 이동
fbghgus123 Aug 17, 2024
11fa04f
[feature] 기본 이미지 추가
Ahn-seokjoo Aug 15, 2024
4047960
[feature] 실패 케이스 추가
Ahn-seokjoo Aug 15, 2024
255f943
[spotless] Apply + print 제거
Ahn-seokjoo Aug 15, 2024
4ae9ba3
[feature] title 로직 수정
Ahn-seokjoo Aug 15, 2024
df5db0e
[feature] error 로직 수정
Ahn-seokjoo Aug 15, 2024
f86015b
[feature] backstack (뒤로가는거) 수정
Ahn-seokjoo Aug 16, 2024
1775ed2
[spotless] Apply
Ahn-seokjoo Aug 16, 2024
04d0128
[fix] QA : 링크 저장씬 아이콘 적용
ddyeon Aug 13, 2024
739542b
[feature] save쪽에 로딩 추가
Ahn-seokjoo Aug 16, 2024
b9d7b3a
Merge remote-tracking branch 'origin/develop2' into feature/infinity_…
fbghgus123 Aug 18, 2024
3066bd9
[feature] 테스트용 딜레이 제거
Ahn-seokjoo Aug 16, 2024
3596493
[spotless] Apply
Ahn-seokjoo Aug 16, 2024
5694083
Merge pull request #156 from mash-up-kr/feature/default_image
Ahn-seokjoo Aug 18, 2024
c10c814
Merge pull request #157 from mash-up-kr/feature/backstack_edit
Ahn-seokjoo Aug 18, 2024
00fa6af
Merge pull request #159 from mash-up-kr/feature/saveloading
Ahn-seokjoo Aug 18, 2024
d8ec788
[fix] 머지 컨플릭 해결
fbghgus123 Aug 18, 2024
223027d
[chore] spotless 적용
fbghgus123 Aug 18, 2024
b500ef9
[fix] 온보딩 칩 padding 처리
fbghgus123 Aug 11, 2024
6bb9a19
[fix] 홈 피드 카드 마지막 line 미노출 처리
fbghgus123 Aug 11, 2024
4a56880
[fix] 홈 탭뷰 정렬 데이터 미적용 해결
fbghgus123 Aug 18, 2024
e4b0f68
수동빌드 추가
Ahn-seokjoo Aug 16, 2024
73c3952
[feat] 게시물 삭제 폴더 이동 시 토스트 띄우기
ddyeon Aug 18, 2024
1b843a2
[fix] ai피드 모두 이동 시켜도 배너 존재 QA
fbghgus123 Aug 18, 2024
a6b7fb1
Merge pull request #161 from mash-up-kr/feature/build
Ahn-seokjoo Aug 18, 2024
bda8dd4
[feat] 새폴더 추가 후 이동시킨 경우 토스트 띄우도록 수정
ddyeon Aug 18, 2024
3600125
Merge branch 'develop2' into feature/folder-icon
ddyeon Aug 18, 2024
9f3f0dc
[fix] 린트체크
ddyeon Aug 18, 2024
3a8a51a
[fix] 리뷰반영
fbghgus123 Aug 18, 2024
d672bc6
Merge pull request #158 from mash-up-kr/feature/folder-icon
Ahn-seokjoo Aug 18, 2024
2cca372
[feature] move all post 테스트 케이스 추가
Ahn-seokjoo Aug 18, 2024
d0caff9
빌드 조건 추가
Ahn-seokjoo Aug 18, 2024
f2038c0
[spotless] Apply
Ahn-seokjoo Aug 18, 2024
da64ba8
[feature] artifact upload 추가
Ahn-seokjoo Aug 18, 2024
71ca3e1
[chore] 기존 mutableStateListOf인 postList를 State 내부의 immutable하게 관리하도록 변경
fbghgus123 Aug 19, 2024
9185888
[feat] 홈화면 게시글 삭제 시 토스트 띄우기
ddyeon Aug 19, 2024
844abbf
[chore] spotless 반영
fbghgus123 Aug 19, 2024
3860352
[fix] 아직읽지 않은 링크 배너) 화면 연결 잘못되어있어요 QA 해결
fbghgus123 Aug 19, 2024
1af4ef5
Merge pull request #162 from mash-up-kr/feature/add_test_code
Ahn-seokjoo Aug 19, 2024
2975ad4
Merge pull request #164 from mash-up-kr/feature/create_artifact
Ahn-seokjoo Aug 19, 2024
04a9cd3
[feature] repository 테스트 추가
Ahn-seokjoo Aug 19, 2024
0a6da30
[spotless] Apply
Ahn-seokjoo Aug 19, 2024
f9521ea
Merge pull request #165 from mash-up-kr/feature/test/repository
Ahn-seokjoo Aug 19, 2024
4011bf0
[feature] data layer jacoco 추가
Ahn-seokjoo Aug 19, 2024
6c37377
[refactoring] 안바꾼 것 변경
Ahn-seokjoo Aug 19, 2024
36ec2fb
[spotless] Apply
Ahn-seokjoo Aug 19, 2024
6463d1f
[feature] 네이밍 변경 및. 데이터 커버리지 추가
Ahn-seokjoo Aug 19, 2024
33c9c31
[feat] 홈에서 게시물 이동 시 토스트 띄우기
ddyeon Aug 20, 2024
f003742
[feature] 오토 태깅 추가
Ahn-seokjoo Aug 20, 2024
1c9dd06
[feature] 오타 수정
Ahn-seokjoo Aug 20, 2024
3513954
[feature] 불필요 로직 제거
Ahn-seokjoo Aug 20, 2024
22a2ae0
[feat] 홈화면에서 링크 새폴더 추가 후 이동 시 토스트 띄우기
ddyeon Aug 21, 2024
a47f5d4
Merge branch 'develop2' into feature/toast_qa
ddyeon Aug 21, 2024
db2635b
[fix] 홈뷰모델 토스트 코드 삭제
ddyeon Aug 21, 2024
af0f2db
Merge remote-tracking branch 'origin/develop2' into qa/home_onboarding
fbghgus123 Aug 22, 2024
f010299
Merge pull request #160 from mash-up-kr/feature/infinity_scroll
fbghgus123 Aug 22, 2024
167c777
Merge remote-tracking branch 'origin/develop2' into qa/home_onboarding
fbghgus123 Aug 22, 2024
aa930de
[feat] bottomsheet 수정
ddyeon Aug 22, 2024
a1638a2
Merge pull request #166 from mash-up-kr/feature/jacoco/data
Ahn-seokjoo Aug 22, 2024
e626dc8
Merge pull request #170 from mash-up-kr/feature/add_tag
Ahn-seokjoo Aug 22, 2024
ca1f7bc
[fix] 홈화면 새폴더 추가 에러로직 추가
ddyeon Aug 23, 2024
8f07d1f
[feature] 공통화 및 aab 추가, 병렬 실행
Ahn-seokjoo Aug 25, 2024
aeb3a61
[feature] 중복키 제거 테스트
Ahn-seokjoo Aug 26, 2024
68b165a
[fix] nullable 처리 추가
ddyeon Aug 26, 2024
28305f7
[fix] modifier 순서 변경
ddyeon Aug 26, 2024
e161596
[feature] 중복키 제거 테스트 2
Ahn-seokjoo Aug 26, 2024
ea456d0
[feature] 버전 코드 8로 테스트
Ahn-seokjoo Aug 26, 2024
cd4458b
[feature] apk에도 서명 추가
Ahn-seokjoo Aug 26, 2024
e2d4831
[fix] configuration때 토스트 안뜨도록 수정
ddyeon Aug 26, 2024
3d92a26
Merge branch 'develop2' into feature/toast_qa
ddyeon Aug 26, 2024
25ddf6d
[fix] 린트 수정
ddyeon Aug 26, 2024
c95d0ac
[fix] contenttype 추가
ddyeon Aug 26, 2024
e7c0250
[feature] 디렉토리 수정 및 apk 빌드 툴 추가
Ahn-seokjoo Aug 26, 2024
c00dfe3
[fix] 키워드 나오도록 수정
ddyeon Aug 26, 2024
33d008e
[fix] 썸네일 둥글게 변경
ddyeon Aug 26, 2024
0701ee3
[fix] 웹뷰 허용되도록 수정~
ddyeon Aug 26, 2024
6955381
[feature] 불필요 step 제거 및 keystore 수정
Ahn-seokjoo Aug 26, 2024
a1d19e6
[feature] timeout 시간 추가
Ahn-seokjoo Aug 26, 2024
3bc236c
[feature] 테스트용 d2 제거
Ahn-seokjoo Aug 26, 2024
a723f30
[feature] 캐시 수정 및 timeout 추가
Ahn-seokjoo Aug 26, 2024
591fcdb
Merge pull request #176 from mash-up-kr/feature/create/aab
Ahn-seokjoo Aug 27, 2024
7a0f6e6
Merge pull request #181 from mash-up-kr/qa/webview
Ahn-seokjoo Aug 27, 2024
faf3da3
Merge pull request #180 from mash-up-kr/qa/home_feed
Ahn-seokjoo Aug 27, 2024
afc691f
Merge pull request #171 from mash-up-kr/feature/toast_qa
Ahn-seokjoo Aug 27, 2024
bccc7b9
Merge branch 'develop2' into feature/bottomsheet
Ahn-seokjoo Aug 27, 2024
d23e5d3
Merge pull request #174 from mash-up-kr/feature/bottomsheet
Ahn-seokjoo Aug 27, 2024
71109a8
[chore] 묵주 리뷰 반영
fbghgus123 Aug 29, 2024
0d4723a
Merge branch 'develop2' into qa/home_onboarding
fbghgus123 Aug 29, 2024
50f9bf8
[fix] 머지 컨플릭 해결
fbghgus123 Aug 29, 2024
fe6f7e4
Merge pull request #173 from mash-up-kr/qa/home_onboarding
fbghgus123 Aug 29, 2024
0e50cb1
Update README.md
Ahn-seokjoo Aug 29, 2024
bb0dc70
Update README.md
Ahn-seokjoo Aug 29, 2024
09fd6b4
[fix] secret 덮어쓰는 것 제거
Ahn-seokjoo Aug 29, 2024
b16ffae
[fix] 변경사항 반영
Ahn-seokjoo Aug 29, 2024
b66e4ec
[fix] env제거
Ahn-seokjoo Aug 29, 2024
01b3c91
[fix] echo 제거
Ahn-seokjoo Aug 29, 2024
4efef7c
[fix] 한줄로 수정
Ahn-seokjoo Aug 29, 2024
da16b2b
[fix] 수정
Ahn-seokjoo Aug 29, 2024
9e892bf
[fix] 재수정
Ahn-seokjoo Aug 29, 2024
8505994
[fix] 명령어 수정
Ahn-seokjoo Aug 29, 2024
12ea03e
[fix] 명령어 수정
Ahn-seokjoo Aug 29, 2024
6b079eb
[fix] 공백 제거
Ahn-seokjoo Aug 29, 2024
cddba45
[fix] 명령어 수정
Ahn-seokjoo Aug 29, 2024
a48dbe7
Merge pull request #184 from mash-up-kr/feature/fix_bug
Ahn-seokjoo Aug 29, 2024
87e89c0
[feature] 버전업 1.0.1
Ahn-seokjoo Aug 29, 2024
87512fb
Merge pull request #185 from mash-up-kr/feature/version_up
Ahn-seokjoo Aug 29, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
3 changes: 3 additions & 0 deletions .github/PULL_REQUEST_TEMPLATE.md
Original file line number Diff line number Diff line change
Expand Up @@ -13,3 +13,6 @@

## To Reviers
> 리뷰어들에게 전할 말

## Close
close #
67 changes: 67 additions & 0 deletions .github/workflows/auto-tagging.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,67 @@
name: auto-tagging

on:
pull_request:
branches:
- master
types:
- closed

jobs:
auto-tagging:
if: github.event.pull_request.merged == true
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v4
- name: get latest tag
run: |
latest_tag_version=$(git tag --sort=-v:refname | head -n 1)
echo "latest tag version is $latest_tag_version"
echo "LATEST_TAG_VERSION=${latest_tag_version}" >> $GITHUB_ENV

- name: set default tag version
run: |
current_tag=$(echo $LATEST_TAG_VERSION | sed 's/v//')

echo "major=$(echo $current_tag | cut -d. -f1)" >> $GITHUB_ENV
echo "minor=$(echo $current_tag | cut -d. -f2)" >> $GITHUB_ENV
echo "patch=$(echo $current_tag | cut -d. -f3)" >> $GITHUB_ENV

- name: major version up
if: contains(github.event.pull_request.labels.*.name, 'major')
run: |
new_major=$((major + 1))

echo "major=${new_major}" >> $GITHUB_ENV
echo "new major version is $new_major"

- name: minor version up
if: contains(github.event.pull_request.labels.*.name, 'minor')
run: |
new_minor=$((minor + 1))

echo "minor=$new_minor" >> $GITHUB_ENV
echo "new minor version is $new_minor"

- name: patch version up
if: contains(github.event.pull_request.labels.*.name, 'patch')
run: |
new_patch=$((patch + 1))

echo "patch=${new_patch}" >> $GITHUB_ENV
echo "new patch version is $new_patch"

- name: print all version
run: |
echo "update version is v$major.$minor.$patch"
echo "new_tag=v$major.$minor.$patch" >> $GITHUB_ENV

- name: tagging
if: ${{ env.new_tag != env.LATEST_TAG_VERSION }}
run: |
git tag $new_tag
git push origin $new_tag

- name: print current tag
run: git tag
30 changes: 30 additions & 0 deletions .github/workflows/build.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
name: Android CI

on:
workflow_dispatch:
pull_request:
branches: [ "feature**", "hotfix**", "release**", "develop**", "master" ]

jobs:
common_setup:
uses: ./.github/workflows/common-setup.yaml
secrets: inherit

build:
needs: common_setup
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- name: set up JDK 18
uses: actions/setup-java@v3
with:
java-version: '18'
distribution: 'temurin'
cache: 'gradle'
- name: Download common setup files
uses: actions/download-artifact@v4
with:
name: common-setup-files

- name: Build with Gradle
run: ./gradlew assembleDebug
30 changes: 30 additions & 0 deletions .github/workflows/common-setup.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
name: Common Setup

on: workflow_call

jobs:
setup:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4

- name: Grant execute permission for gradlew
run: chmod +x gradlew

- name: Putting Json data
env:
GOOGLE_SERVICES_JSON: ${{ secrets.GOOGLE_SERVICES_JSON }}
run: echo "$GOOGLE_SERVICES_JSON" > /home/runner/work/Dorabangs_Android/Dorabangs_Android/app/google-services.json

- name: Access SERVER_BASE_URL
run: |
echo server_base_url=\"${{ secrets.SERVER_BASE_URL }}\" > local.properties
shell: bash

- name: Upload setup artifacts
uses: actions/upload-artifact@v4
with:
name: common-setup-files
path: |
/home/runner/work/Dorabangs_Android/Dorabangs_Android/local.properties
/home/runner/work/Dorabangs_Android/Dorabangs_Android/app/google-services.json
125 changes: 125 additions & 0 deletions .github/workflows/create_artifact.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,125 @@
name: create artifact
on:
workflow_dispatch:
pull_request:
branches:
- master
types:
- synchronize
- opened

jobs:
common_setup:
uses: ./.github/workflows/common-setup.yaml
secrets: inherit

upload_apk:
needs: common_setup
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- name: set up JDK 18
uses: actions/setup-java@v3
with:
distribution: 'temurin'
java-version: '18'
cache: 'gradle'

- name: Download common setup files
uses: actions/download-artifact@v4
with:
name: common-setup-files

- name: Build with assembleRelease for apk
run: ./gradlew assembleRelease

- name: sign apk
id: sign_app
uses: r0adkll/[email protected]
with:
releaseDirectory: app/build/outputs/apk/release
signingKeyBase64: ${{ secrets.RELEASE_KEYSTORE_JKS }}
alias: ${{ secrets.RELEASE_KEY_ALIAS }}
keyStorePassword: ${{ secrets.RELEASE_KEY_STORE_PASSWORD }}
keyPassword: ${{ secrets.RELEASE_KEY_PASSWORD }}
env:
BUILD_TOOLS_VERSION: "34.0.0"

- name: upload artifact with apk
uses: actions/upload-artifact@v4
with:
name: dora-artifact.apk
path: ./app/build/outputs/apk/release
retention-days: 7
overwrite: true

upload_aab:
needs: common_setup
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- name: set up JDK 18
uses: actions/setup-java@v3
with:
distribution: 'zulu'
java-version: '18'
cache: 'gradle'
- name: Download common setup files
uses: actions/download-artifact@v4
with:
name: common-setup-files

- name: Build with bundleRelease for aab
run: ./gradlew bundleRelease

- name: sign aab
id: sign_app
uses: r0adkll/[email protected]
with:
releaseDirectory: app/build/outputs/bundle/release
signingKeyBase64: ${{ secrets.RELEASE_KEYSTORE_JKS }}
alias: ${{ secrets.RELEASE_KEY_ALIAS }}
keyStorePassword: ${{ secrets.RELEASE_KEY_STORE_PASSWORD }}
keyPassword: ${{ secrets.RELEASE_KEY_PASSWORD }}

- name: upload artifact with aab
uses: actions/upload-artifact@v4
with:
name: dora-artifact.aab
path: ./app/build/outputs/bundle/release
retention-days: 7
overwrite: true

post_github:
needs: [ upload_apk, upload_aab ]
runs-on: ubuntu-latest
steps:
- name: Get artifact ID for apk
id: get-artifact-id
run: |
artifact_id=$(curl -s -H "Authorization: token ${{ secrets.GITHUB_TOKEN }}" \
"https://api.github.com/repos/${{ github.repository }}/actions/runs/${{ github.run_id }}/artifacts" | \
jq -r '.artifacts[] | select(.name == "dora-artifact.apk") | .id')
echo "artifact_id=${artifact_id}" >> $GITHUB_ENV

- name: Get artifact ID for AAB
id: get-artifact-id-aab
run: |
artifact_id=$(curl -s -H "Authorization: token ${{ secrets.GITHUB_TOKEN }}" \
"https://api.github.com/repos/${{ github.repository }}/actions/runs/${{ github.run_id }}/artifacts" | \
jq -r '.artifacts[] | select(.name == "dora-artifact.aab") | .id')
echo "artifact_id_aab=${artifact_id}" >> $GITHUB_ENV

- name: Post comment with artifact link
uses: actions/[email protected]
with:
script: |
const artifact_url_apk = `https://github.com/${process.env.GITHUB_REPOSITORY}/actions/runs/${process.env.GITHUB_RUN_ID}/artifacts/${process.env.artifact_id}`;
const artifact_url_aab = `https://github.com/${process.env.GITHUB_REPOSITORY}/actions/runs/${process.env.GITHUB_RUN_ID}/artifacts/${process.env.artifact_id_aab}`;
const comment_body = `Artifact 생성 성공했 도라 :kissing_smiling_eyes:: [APK Download Link](${artifact_url_apk}), [AAB Downloads Link](${artifact_url_aab})`;
const pull_request_number = context.issue.number;
await github.rest.issues.createComment({
...context.repo,
issue_number: pull_request_number,
body: comment_body
});
31 changes: 31 additions & 0 deletions .github/workflows/lint_check.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
name: Lint Check

on: pull_request

jobs:
lint-check:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v4
- name: set up JDK 18
uses: actions/setup-java@v3
with:
java-version: '18'
distribution: 'temurin'
cache: 'gradle'

- name: Cache Gradle Packages
uses: actions/cache@v3
with:
path: |
~/.gradle/caches
~/.gradle/wrapper
key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle*', '**/gradle-wrapper.properties', '**/buildSrc/**/*.kt') }}
restore-keys: |
${{ runner.os }}-gradle-

- name: Grant execute permission for gradlew
run: chmod +x gradlew
- name: Lint Check
run: ./gradlew spotlessCheck
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@
| 🏗 Architecture | [Clean Architecture](https://blog.cleancoder.com/uncle-bob/2012/08/13/the-clean-architecture.html), MVI |
| 💉 DI (Android) | Hilt|
| 🌊 Async | [Coroutines](https://kotlinlang.org/docs/coroutines-overview.html) + [Flow](https://kotlin.github.io/kotlinx.coroutines/kotlinx-coroutines-core/kotlinx.coroutines.flow/-flow/) |
| 🌐 Networking | [Retrofit](https://square.github.io/retrofit/),|
| 😎 Test |jacoco|
| 🌐 Networking | [Retrofit](https://square.github.io/retrofit/), OkhttpClient|
| 😎 Test |Junit4|


<br/><br/>
Expand Down
Loading
Loading