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

[feat/api_friend] : 마이탭 마시멜로 api 연결 및 분기처리 #18

Closed
wants to merge 349 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
349 commits
Select commit Hold shift + click to select a range
989e4b8
feat : 감정 남기기 뷰 구현
hanseul-Choi Jan 16, 2023
e5ba07c
feat : 목표 종료하기 기록 프래그먼트 뷰 추가 구현
hanseul-Choi Jan 16, 2023
0e91e59
feat : 목표 남겼어요 뷰 구현
hanseul-Choi Jan 16, 2023
9daed4b
feat : 목표 완료 뷰 구현 (다이얼로그 제외)
hanseul-Choi Jan 17, 2023
7101298
feat : 목표 완료 뷰 구현 (다이얼로그 포함)
hanseul-Choi Jan 17, 2023
2684861
Merge branch 'feat/records' into develop
hanseul-Choi Jan 17, 2023
8f69bde
임시로 merge 에러 해결
hanseul-Choi Jan 17, 2023
8d68de7
feat : backup small card view custom
choilotte Jan 18, 2023
ad60b33
feat : multiDexEnabled true
choilotte Jan 20, 2023
45d2242
feat : PomeSmallGoalCardView 구현
choilotte Jan 20, 2023
06bc42c
feat : bind로 처리작업 진행
hanseul-Choi Jan 20, 2023
e529888
[feat] mipmap 잘못들어간 부분 삭제
SsongSik Jan 20, 2023
ecda91f
feat : bind로 처리작업 추가 진행, small_goal_card에서 goal_card로 변경
hanseul-Choi Jan 20, 2023
156d066
[feat] 잘못들어가부분 수정
SsongSik Jan 20, 2023
0db8b48
Merge pull request #8 from PomeTeam/feat/mypage
SsongSik Jan 20, 2023
3ff13f9
feat : pomeBigGoalCardView 구현
hanseul-Choi Jan 21, 2023
c0b46b4
feat : pomeBigGoalCardView 구현 및 적용
hanseul-Choi Jan 21, 2023
4e107d3
feat : pomeEditText 구현 및 적용
hanseul-Choi Jan 21, 2023
96ea8da
fix : more button 보이게 처리
hanseul-Choi Jan 21, 2023
f71b695
feat : Dialog 공통 처리 (CommonUtil.makePomeDialog)
hanseul-Choi Jan 21, 2023
f7d6142
feat : view code align 작업 진행 및 고정 style 적용 (lineSpacingExtra 3sp, let…
hanseul-Choi Jan 21, 2023
de75a4b
fix : BindingAdapter Build Warning 제거
hanseul-Choi Jan 21, 2023
926b95b
feat : statusBar color 수정 및 GlobalScope -> MainScope 변경
hanseul-Choi Jan 21, 2023
9e7292e
[feat] MyPage Click 구현
SsongSik Jan 23, 2023
56c0da0
Merge pull request #9 from PomeTeam/feat/mypage
SsongSik Jan 23, 2023
499745c
[feat] mypage -> record tab 구현
SsongSik Jan 23, 2023
62570e7
feat : 기본 네비게이션 백스택 작업 구현(record_fragment 혹은 splash_fragment 사이의 스택제거)
hanseul-Choi Jan 23, 2023
44bdecc
fix : splash 디자인 변경 및 navigation action 정리
hanseul-Choi Jan 23, 2023
f497e0a
fix : mint color calender icon으로 변경
hanseul-Choi Jan 23, 2023
0c6506d
fix : device size deprecated 수정
hanseul-Choi Jan 23, 2023
d86ea5a
fix : getBitmap, DEPRECATION 어노테이션 추가
hanseul-Choi Jan 23, 2023
3fa352e
fix : kotlin-kapt plugin 위치 변경
hanseul-Choi Jan 23, 2023
3c9d9ac
fix : 안쓰는 매개변수 _ 처리
hanseul-Choi Jan 23, 2023
8a388f5
feat: Base Network Module 구현
hanseul-Choi Jan 25, 2023
5b0c2a7
Merge branch 'feat/refact' into develop
hanseul-Choi Jan 25, 2023
3564f4a
[feat] 배경색 변경
SsongSik Jan 26, 2023
6030441
Merge pull request #10 from PomeTeam/feat/mytab
SsongSik Jan 26, 2023
cf83600
feat : BaseFragment -> initView() 추가
choilotte Jan 26, 2023
b88cfa2
feat : BaseViewModel 구현 (Repository API 호출 간편화)
choilotte Jan 26, 2023
da25733
feat : ApiResponse 구현
choilotte Jan 26, 2023
62a5df0
feat : BasePomeResponse 로 변경
choilotte Jan 26, 2023
b3af0d3
feat : Token 작업 관련 구현 백업
choilotte Jan 26, 2023
c178f0e
feat : ApiRequestFlow 추가
choilotte Jan 26, 2023
ae428e3
feat: 이름 필드 삭제
hanseul-Choi Jan 26, 2023
8267583
feat: 회원가입 번호 요청 작업 진행
hanseul-Choi Jan 26, 2023
27c68ef
feat : 어제 작성한 내용 주석 추가
choilotte Jan 27, 2023
86daacc
[feat] 마이탭 뷰 카드뷰 RV 구현
SsongSik Jan 27, 2023
ff9749c
Merge pull request #11 from PomeTeam/feat/mytab
SsongSik Jan 27, 2023
27a5435
feat : 닉네임 중복 체크 구현
choilotte Jan 27, 2023
f6401fa
feat : RegisterRepository 수정
choilotte Jan 27, 2023
d35fa72
feat : PresignedUrl 받아오는 작업 구현
choilotte Jan 27, 2023
2e5fca7
fix : BigGoalCardView Null Safety 처리
hanseul-Choi Jan 28, 2023
6d58d8d
feat : PresignedUrl UserManager에 추가
choilotte Jan 30, 2023
3a486d3
feat : RegisterProfileFragment에서 userManager 이용
choilotte Jan 30, 2023
6041e1c
feat : PresignedImage 전송 전문 구현
choilotte Jan 30, 2023
408d65a
feat : image file byteArray로 변경하여 Api에 추가
choilotte Jan 30, 2023
4d3b38a
feat : imageUrlInterceptor 추가 (baseUrl 동적 변경)
choilotte Jan 30, 2023
fd0b5b8
feat : error 나는 부분 변경 (suspend 키워드 추가, HttpLoggingCLient 추가)
choilotte Jan 30, 2023
f445818
feat : apiRequestFlow Log추가, Random Seed값 설정
choilotte Jan 30, 2023
7988db9
feat : presigned Image upload 수행
choilotte Jan 30, 2023
6950203
feat : deprecated 정리
hanseul-Choi Jan 30, 2023
d181407
fix: 주석제거 및 api 시간초과 20초 처리
hanseul-Choi Jan 30, 2023
6c63e73
feat: user profile id preferences 추가
hanseul-Choi Jan 30, 2023
6c384ef
feat: register 구현
hanseul-Choi Jan 30, 2023
565fe6a
fix : 주석 수정 : image file to byteArray
hanseul-Choi Jan 30, 2023
90fd54d
fix : 회원가입시 토큰 저장 진행
hanseul-Choi Jan 30, 2023
519c625
fix : 회원가입시 토큰 저장 TokenViewModel 이용
hanseul-Choi Jan 30, 2023
895ce18
feat : Splash 작업 주석 설정
choilotte Jan 30, 2023
e2fd814
feat : Hilt Qualifier 추가
choilotte Jan 31, 2023
18dc9eb
feat : Splash Login 구현 -> signIn에 따른 뷰이동 분기처리
choilotte Jan 31, 2023
26fb420
feat : Token쪽 임시 수정 (주소 추가, 서버전문 맞춤)
choilotte Jan 31, 2023
b9d4d15
feat : UserId 정보 저장
choilotte Jan 31, 2023
7aa4216
feat : Token 적용 구현 및 Test용 recordByUserId Api 구현
choilotte Jan 31, 2023
3b51aec
fix : navigation 뒤로가기 버튼 크래시 확인 후 처리(스플래시 로그인)
choilotte Jan 31, 2023
7078433
fix : fragment register 번호 입력 시나리오 및 버튼 활성화 처리
choilotte Jan 31, 2023
96b640d
fix : registerTerms 관련 뷰 개선
choilotte Jan 31, 2023
d818e47
fix : RegisterProfileFragment 뷰 개선
choilotte Jan 31, 2023
7bb9ccb
feat : 임시 Loading Progress 구현
choilotte Jan 31, 2023
017b0fa
feat : loading dialog 적용
choilotte Jan 31, 2023
78edc36
feat : 이미지 삭제 버튼 클릭시 default로 key 저장
choilotte Jan 31, 2023
5d86340
fix : Test 코드 삭제
choilotte Jan 31, 2023
b2033d9
Merge remote-tracking branch 'origin/feat/base' into develop
choilotte Jan 31, 2023
d4c8d86
feat: findFriends Api 생성 , 현재 Token 에러 발생
choilotte Jan 31, 2023
d2990f5
fix :token Header 변경
hanseul-Choi Jan 31, 2023
60c6d7f
feat : AddFriendsData 추가
hanseul-Choi Jan 31, 2023
c25bfd2
feat : view 몇가지 수정 (splash ~ addFriendsView)
hanseul-Choi Jan 31, 2023
e42c2fc
feat : 친구찾기 api 구현
hanseul-Choi Jan 31, 2023
4047912
feat : 친구 추가 완료 뷰 구현
hanseul-Choi Jan 31, 2023
553505a
feat : 친구 추가 완료 api 구현
hanseul-Choi Jan 31, 2023
767dcfd
feat : 친구 추가 완료 api 구현, 이미 팔로우된 친구도 추가완료 표시
hanseul-Choi Jan 31, 2023
00314e2
feat : test 제거
hanseul-Choi Jan 31, 2023
f001f65
fix : model 정리 (Test 삭제 및 ListResponse 패키지 위치 변경)
choilotte Feb 1, 2023
7ddea4e
fix : model package 변경
hanseul-Choi Feb 1, 2023
38432d7
feat : GoalService 추가
hanseul-Choi Feb 1, 2023
ead0902
feat : getGoalByGoalId Api 구현
choilotte Feb 2, 2023
092e3ce
fix : BasePomeListResponse 삭제
choilotte Feb 3, 2023
afcaaae
feat : GoalState 추가
choilotte Feb 3, 2023
4cfcc53
feat : GoalCategory data Transform 작업 진행
choilotte Feb 3, 2023
c097405
feat : BuildConfig로 url설정
choilotte Feb 3, 2023
1a60959
feat : category data 연결
hanseul-Choi Feb 4, 2023
3231a22
feat : AddGoalCalendar data 작업
hanseul-Choi Feb 5, 2023
76da65d
feat : viewModel package 작업
hanseul-Choi Feb 5, 2023
d9b922b
feat : 목표 추가 data 작업 진행
hanseul-Choi Feb 5, 2023
3a98626
feat : Goal Category 생성 구현
choilotte Feb 6, 2023
db4a57a
fix : ApiRequestFlow 처리 : BasePomeResponse의 인스턴스일 때, Success여부 확인
choilotte Feb 6, 2023
b6c03d6
[feat] friend tab api connect
Feb 6, 2023
d25d795
[feat] friend tab api connect
SsongSik Feb 6, 2023
e171a7f
Merge remote-tracking branch 'origin/feat/api/mytab_friend' into feat…
SsongSik Feb 6, 2023
5945f4d
Merge remote-tracking branch 'origin/feat/api/mytab_friend' into feat…
SsongSik Feb 6, 2023
eacc7f4
Merge remote-tracking branch 'origin/feat/api/mytab_friend' into feat…
android-seongsik Feb 6, 2023
9c0e9c5
[test] git account test
Feb 6, 2023
0969905
[test] g test
SsongSik Feb 6, 2023
5d69951
fix : ApiRequestFlow Failure 처리 변경 (200으로 떨어져도 BasePomeResponse의 Succ…
choilotte Feb 6, 2023
5ff61e4
feat : RecordFragment GoalDetails data 연결
choilotte Feb 6, 2023
e56c66a
feat : record Goal D-day data 연결
hanseul-Choi Feb 6, 2023
d41dbba
feat : record refresh 메소드 구현
hanseul-Choi Feb 6, 2023
a9b2ca6
feat : 목표 삭제하기 구현
hanseul-Choi Feb 6, 2023
85e276c
feat : pome loading 적용
hanseul-Choi Feb 6, 2023
2841269
feat : 기록 작성시 이전 목표 디폴트 설정
hanseul-Choi Feb 6, 2023
cde170a
feat : 소비 작성 시 목표 카테고리 리스트 전달
hanseul-Choi Feb 6, 2023
577a038
feat : 소비 기록 쓰기 데이터 연결
hanseul-Choi Feb 6, 2023
bd97260
feat : 소비 기록 쓰기 api 연결 작업
hanseul-Choi Feb 6, 2023
d195b80
feat : 기록 작성 api 구현
choilotte Feb 7, 2023
bd1d4a9
[feat] git test
SsongSik Feb 7, 2023
8e873c3
feat : test 삭제 및 recyclerview 생명주기 관련 주석 추가
hanseul-Choi Feb 7, 2023
fb3b680
fix : GoalCategoryResponse의 ui data인 GoalCategory 추가
hanseul-Choi Feb 7, 2023
0081259
fix : 버그 수정 (이미지 로딩 화면 및 GoalCategory 처리)
hanseul-Choi Feb 7, 2023
dc956cf
feat : BaseAllData 추가
hanseul-Choi Feb 7, 2023
ff8b5a6
feat : Record 조회 추가 (서버의 경우 현재 문의중)
hanseul-Choi Feb 7, 2023
da38e87
fix : 기록 페이징 조회 url 수정
hanseul-Choi Feb 7, 2023
a0c3c17
fix : 기록 페이징 조회 url 및 record data 수정
hanseul-Choi Feb 7, 2023
078d1bf
fix : record 뷰 및 데이터 연결 수정
hanseul-Choi Feb 7, 2023
15fbd10
fix : Emotion Enum 분리 및 first_emotion, last_emotion 제거 및 empy_emotion…
choilotte Feb 8, 2023
2e249cd
feat : 시간 전 계산하는 메소드 구현
choilotte Feb 8, 2023
f78e4de
feat : item Record Card databinding 구현
choilotte Feb 8, 2023
d3c0b70
feat : item Record Card data 연결
choilotte Feb 8, 2023
cc56b3d
[feat] 친구목록조회api connect
SsongSik Feb 8, 2023
d7c8852
fix : 버그 및 뷰 수정
hanseul-Choi Feb 8, 2023
1a6274c
feat : category 선택 작업 구현
hanseul-Choi Feb 8, 2023
954d890
feat : weekData 구현
hanseul-Choi Feb 8, 2023
0eb73f4
Merge branch 'develop' into feat/api/mytab_friend
hanseul-Choi Feb 9, 2023
56c940a
Merge pull request #13 from PomeTeam/feat/api/mytab_friend
hanseul-Choi Feb 9, 2023
bad94b0
feat : RecyclerView Adapter 버그 관련 주석
hanseul-Choi Feb 9, 2023
9963f3e
fix : import getFriends
hanseul-Choi Feb 9, 2023
a7fd060
fix : 임시 처리, 데이터 변경 시 새로운 어댑터 객체 생성
choilotte Feb 13, 2023
1a67476
fix : 로그 제거
choilotte Feb 13, 2023
9cbe7e1
feat : 목표 10개까지 생성으로 변경
choilotte Feb 13, 2023
7812402
feat : CalendarView 뷰 개선
choilotte Feb 13, 2023
a5dc455
feat : ModifyRecord 뷰 구현
choilotte Feb 13, 2023
5e30d34
feat : ModifyRecord 데이터 api 구현
choilotte Feb 13, 2023
73b9c21
feat : record recyclerview margin bottom 설정
choilotte Feb 13, 2023
e39673f
fix : 기록 남기지 않았어요 center처리
choilotte Feb 13, 2023
87f1387
feat : end 상태의 category 처리
choilotte Feb 13, 2023
2f11660
feat : record Modify 간단한 데이터 연결 작업 구현
choilotte Feb 13, 2023
fba80ee
feat : oneWeekRecordData 개수 구현
choilotte Feb 13, 2023
08662b6
feat : 알림 뷰 invisible 처리
choilotte Feb 13, 2023
ff4af3e
feat : RecordLeaveEmotionFragment 뷰 및 데이터 구현
hanseul-Choi Feb 13, 2023
cefb2d0
feat : 두번째 감정 남기기 뷰 및 데이터 구현
hanseul-Choi Feb 13, 2023
3ba140e
feat : End 상태 조건 변경
hanseul-Choi Feb 13, 2023
c0a19f7
feat : navigateUp -> popBackStack
hanseul-Choi Feb 13, 2023
321dbab
feat : 목표 종료하기 뷰 구현
hanseul-Choi Feb 13, 2023
438cd5e
feat : SingleLiveEvent 구현
choilotte Feb 14, 2023
68031fd
Merge remote-tracking branch 'origin/feat/api/record' into develop
hanseul-Choi Feb 14, 2023
19243d4
feat : 친구 목록 api 연결
SsongSik Feb 14, 2023
5f007ef
Merge remote-tracking branch 'origin/develop' into feat/api/friend
SsongSik Feb 14, 2023
17e119b
test
SsongSik Feb 14, 2023
5d0dcbe
friend api
SsongSik Feb 14, 2023
e22b243
fix : RecyclerView bug 수정
hanseul-Choi Feb 14, 2023
39f4aa7
Merge remote-tracking branch 'origin/feat/api/friend' into feat/api/f…
hanseul-Choi Feb 14, 2023
a450af8
feat : BaseAllData의 content가 null인 경우 code 204를 뱉음
choilotte Feb 15, 2023
a030c3e
Revert "feat : BaseAllData의 content가 null인 경우 code 204를 뱉음"
hanseul-Choi Feb 15, 2023
5f30b17
Revert "Revert "feat : BaseAllData의 content가 null인 경우 code 204를 뱉음""
hanseul-Choi Feb 15, 2023
06c623f
fix : Loading 처리 구현
hanseul-Choi Feb 15, 2023
9eb9aed
fix : 감정을 남겨주세요 뷰 조정
hanseul-Choi Feb 15, 2023
d272a69
feat : 첫 목표에서 글 작성 시 불가 다이얼로그 띄움
hanseul-Choi Feb 15, 2023
099d409
fix : BaseAllData content Nullable로 변경 및 관련 버그 수정
choilotte Feb 16, 2023
1c5fb9b
feat : bindingAdapter Image Url add
SsongSik Feb 16, 2023
ad99248
Merge branch 'feat/api/record' into develop
choilotte Feb 16, 2023
360a58e
feat : pome 로그인 프로세스 추가
choilotte Feb 16, 2023
54142d9
feat : image upload부분 수정
choilotte Feb 16, 2023
80ed6b5
feat : 이미지 업로드 svg형태 가능하게 변경
hanseul-Choi Feb 16, 2023
c172e38
feat : 목표 종료하기 목표 카드뷰 설정 작업
hanseul-Choi Feb 16, 2023
1845922
feat : 목표 종료하기 목표 기록 데이터 받는 작업 구현
hanseul-Choi Feb 16, 2023
1601dac
feat : 목표 종료하기 목표 기록 데이터 받는 작업 수정 및 구현
hanseul-Choi Feb 16, 2023
77bf876
feat : 목표 종료하기 뷰 및 데이터 구현
hanseul-Choi Feb 16, 2023
ba8d473
feat : 친구 이미지 추가 부분 수정
choilotte Feb 17, 2023
569574e
feat : 목표 삭제 기능 추가
choilotte Feb 17, 2023
3ec969c
feat : 목표 종료 구현
choilotte Feb 17, 2023
c58f449
feat : 목표 종료 alert 구현
choilotte Feb 17, 2023
85c0f35
feat : remindTestData 제거 및 뷰 조정
choilotte Feb 17, 2023
2b2651a
feat : remind Category 연결
choilotte Feb 17, 2023
43674b3
feat : remind 목표 뷰 및 데이터 구현
choilotte Feb 17, 2023
39571a4
feat : remind item 리스트 구현
choilotte Feb 17, 2023
5eb421d
feat : remind item 데이터 종료된 기록 api로 변경
choilotte Feb 17, 2023
2414db6
fix : Card item view 수정
hanseul-Choi Feb 18, 2023
2b240eb
feat : remind api 연결
hanseul-Choi Feb 18, 2023
eb32a26
fix : snake case 변경
hanseul-Choi Feb 18, 2023
3e235a4
feat : 바인딩 어댑터 글라이드 추가
SsongSik Feb 18, 2023
60c7d31
Merge remote-tracking branch 'origin/develop' into feat/api/friend
SsongSik Feb 18, 2023
f1f2eb9
feat : 친구 기록 조회 추가
SsongSik Feb 18, 2023
a6aaf52
feat : 마이탭 마시멜로우 연결
SsongSik Feb 18, 2023
10cbdd9
feat : 마이탭 마시멜로우 추가
SsongSik Feb 18, 2023
3fb938c
feat : backup paging
hanseul-Choi Feb 19, 2023
89d008b
feat : 마이탭에서 친구 삭제
SsongSik Feb 19, 2023
d4ac227
feat : 탈퇴하기 뷰 추가
SsongSik Feb 19, 2023
8bfd7d7
fix : RecyclerViewAdapter 메모리 누수 우려 수정
choilotte Feb 20, 2023
42566d3
fix : Duplication class error 수정
choilotte Feb 20, 2023
06038e8
fix : 서버 api 변경에 따른 GoalCategoryResponse 제거
hanseul-Choi Feb 28, 2023
9da497b
feat : token refresh관련 주석 추가
hanseul-Choi Mar 1, 2023
24a7779
fix : enableOnBackInvokedCallback="true" 추가
hanseul-Choi Mar 1, 2023
7c5c276
feat : backup RecordPagingSource
choilotte Mar 2, 2023
1a06eb6
feat : backup Paging3
choilotte Mar 6, 2023
4e38183
feat : RecordPagingData 임시 구현 (현재 데이터가 전부 불리는 문제)
hanseul-Choi Mar 6, 2023
b583915
feat : backup Paging3 에러 확인 후 변경 (뷰 구조 배치 변경 필요)
choilotte Mar 7, 2023
0acbbcc
feat : RecordFragment api 요청 관련 리팩토링
choilotte Mar 8, 2023
81c33fb
refact : RecordView 변환 -> NestedScrollView 문제 해결(Paging 문제 해결)
hanseul-Choi Mar 8, 2023
7097d9b
fix : Record View 수정
hanseul-Choi Mar 8, 2023
f26ecbc
fix : 감정 남기기 버그 수정
choilotte Mar 9, 2023
43dc0a8
refact : package 이동
hanseul-Choi Mar 9, 2023
ea3b8f1
feat : 기록한 씀씀이 뷰 처리
hanseul-Choi Mar 9, 2023
716a6d1
fix : snapshot 대신 itemCount로 설정
hanseul-Choi Mar 9, 2023
d24214b
feat : 감정 남기기 adpater 생성
hanseul-Choi Mar 9, 2023
9b2ea89
fix : 연도가 4자리인 경우, 2자리로 변환하여 날짜 계산
hanseul-Choi Mar 9, 2023
62866c5
fix : PagingConfig 설정 책임 viewModel 위임
choilotte Mar 10, 2023
2ffcf20
feat : 인증번호 문구 추가 및 토스트 삭제
choilotte Mar 10, 2023
1f158d7
feat : 웹 페이지 이동추가
choilotte Mar 10, 2023
0bfbd36
fix : MANAGE_EXTERNAL_STORAGE 권한 제거(Playstore 배포 문제)
choilotte Mar 13, 2023
3154d7a
fix : Fragment Memory Leak 개선
choilotte Mar 13, 2023
f3df16e
fix : Category chip 가려짐 개선
choilotte Mar 13, 2023
f961b13
fix : PagingData Empty일 때도 처리
choilotte Mar 13, 2023
89e2a53
feat : 목표 날짜 선택 (한달 전만 가능) 표시
choilotte Mar 13, 2023
f0d558c
fix: inputType 및 다음 editFocus 설정
choilotte Mar 13, 2023
7ddf83c
feat : Register EditText 개선
choilotte Mar 14, 2023
7c49adf
fix : CalendarView MinDate 설정 추가
choilotte Mar 14, 2023
98015fa
feat : 첫 register image 선택시 Camera 및 갤러리 호출
choilotte Mar 14, 2023
cf24dc2
feat : Record Contents 친구 감정까지 나오는 Card로 변경
hanseul-Choi Mar 14, 2023
122d161
feat : Record Progress 초과 처리
hanseul-Choi Mar 14, 2023
12adb11
feat : 기록 삭제하기 구현
hanseul-Choi Mar 14, 2023
3ed1d24
feat : Network 연결 상태 확인 후 Alert 표시
choilotte Mar 15, 2023
d6db54f
fix : 닉네임 검증 부분 수정
choilotte Mar 15, 2023
68903a8
feat : Camera BottomSheetDialog 수정
choilotte Mar 15, 2023
3292048
feat : Single Click 적용
choilotte Mar 15, 2023
48d2b55
fix : networkErrorDialog 변수명 수정 및 plus 버튼 상시 활성화, 카메라 icon Visible 처리
choilotte Mar 15, 2023
87c3c50
refact : kts로 마이그레이션 작업 진행
choilotte Mar 17, 2023
79bde8f
[feat] : MySettingFragment 작업
SsongSik Mar 19, 2023
366d4c6
[feat] : 마이탭 마시멜로연결
SsongSik Mar 19, 2023
27c2b53
Merge remote-tracking branch 'origin/refact/selfQA' into feat/api/friend
SsongSik May 14, 2023
9c4a0a8
[feat/api_friend] : #16 마이탭 마시멜로우 분기처리
SsongSik May 14, 2023
4aca2df
[feat] : #16 마시멜로 레벨, 카테고리 분기처리
SsongSik May 15, 2023
c6b1f0c
[feat] : #16 마시멜로 itemDecoration 추가
SsongSik May 15, 2023
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
  •  
  •  
  •  
83 changes: 0 additions & 83 deletions app/build.gradle

This file was deleted.

116 changes: 116 additions & 0 deletions app/build.gradle.kts
Original file line number Diff line number Diff line change
@@ -0,0 +1,116 @@
plugins {
id("com.android.application")
id("org.jetbrains.kotlin.android")
id("kotlin-parcelize")
id("androidx.navigation.safeargs.kotlin")
id("dagger.hilt.android.plugin")
id("kotlin-kapt")
}

android {
compileSdk = 33

defaultConfig {
applicationId = "com.teampome.pome"
minSdk = 23
targetSdk = 33
versionCode = 1
versionName = "1.0"

multiDexEnabled = true
testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
}

buildTypes {
debug {
isMinifyEnabled = false
proguardFiles(
getDefaultProguardFile("proguard-android-optimize.txt"),
"proguard-rules.pro"
)
buildConfigField("String", "BASE_URL", "\"http://13.125.237.136:8085/\"")
buildConfigField("String", "IMAGE_BASE_URL", "\"http://image-main-server.ap-northeast-2.elasticbeanstalk.com/\"")
}
release {
isMinifyEnabled = false
proguardFiles(
getDefaultProguardFile("proguard-android-optimize.txt"),
"proguard-rules.pro"
)
buildConfigField("String", "BASE_URL", "\"http://52.79.89.129/\"")
buildConfigField("String", "IMAGE_BASE_URL", "\"http://image-main-server.ap-northeast-2.elasticbeanstalk.com/\"")
}
}
compileOptions {
sourceCompatibility = JavaVersion.VERSION_11
targetCompatibility = JavaVersion.VERSION_11
}
kotlinOptions {
jvmTarget = "1.8"
}
dataBinding {
enable = true
}
}

dependencies {
implementation("androidx.core:core-ktx:1.9.0")
implementation("androidx.appcompat:appcompat:1.5.1")
implementation("com.google.android.material:material:1.7.0")
implementation("androidx.constraintlayout:constraintlayout:2.1.4")
testImplementation("junit:junit:4.13.2")
androidTestImplementation("androidx.test.ext:junit:1.1.3")
androidTestImplementation("androidx.test.espresso:espresso-core:3.4.0")

// Fragment ViewModel
val fragmentKtxVersion = "1.5.3"
implementation("androidx.fragment:fragment-ktx:$fragmentKtxVersion")

// Retrofit
val retrofitVersion = "2.9.0"
implementation("com.squareup.retrofit2:retrofit:$retrofitVersion")
implementation("com.google.code.gson:gson:$retrofitVersion")
implementation("com.squareup.retrofit2:converter-gson:$retrofitVersion")

val okhttp_version = "4.10.0"
implementation("com.squareup.okhttp3:okhttp:$okhttp_version")
implementation("com.squareup.okhttp3:logging-interceptor:$okhttp_version")

// Glide
val glide_version = "4.13.2"
implementation("com.github.bumptech.glide:glide:$glide_version")
kapt("com.github.bumptech.glide:compiler:$glide_version")
implementation("com.github.bumptech.glide:okhttp3-integration:$glide_version"){
exclude(group = "glide-parent")
}
implementation("com.github.bumptech.glide:annotations:$glide_version")
annotationProcessor("com.github.bumptech.glide:compiler:$glide_version")
implementation("com.caverock:androidsvg-aar:1.4")

// Glide Tranform
implementation("jp.wasabeef:glide-transformations:4.3.0")

// Navigation
val navVersion = "2.5.2"
implementation("androidx.navigation:navigation-fragment-ktx:$navVersion")
implementation("androidx.navigation:navigation-ui-ktx:$navVersion")

// Hilt
val hiltVersion = "2.44"
implementation("com.google.dagger:hilt-android:$hiltVersion")
kapt("com.google.dagger:hilt-android-compiler:$hiltVersion")

val kotlinxMetadataJvmVersion = "0.5.0"
implementation("org.jetbrains.kotlinx:kotlinx-metadata-jvm:$kotlinxMetadataJvmVersion")

// Calendar
implementation("com.github.prolificinteractive:material-calendarview:2.0.1")
implementation("com.jakewharton.threetenabp:threetenabp:1.1.1")

// DataStore
implementation("androidx.datastore:datastore-preferences:1.0.0")

// Paging
val pagingVersion = "3.1.1"
implementation("androidx.paging:paging-runtime:$pagingVersion")
}
2 changes: 1 addition & 1 deletion app/proguard-rules.pro
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Add project specific ProGuard rules here.
# You can control the set of applied configuration files using the
# proguardFiles setting in build.gradle.
# proguardFiles setting in build.gradle.kts.
#
# For more details, see
# http://developer.android.com/guide/developing/tools/proguard.html
Expand Down
Binary file added app/src/debug/ic_love_emotion-playstore.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added app/src/debug/res/drawable/flag_mint.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
10 changes: 10 additions & 0 deletions app/src/debug/res/drawable/item_pink6_r8_background.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle">

<solid
android:color="@color/pink_8"/>

<corners
android:radius="12dp"/>
</shape>
4 changes: 4 additions & 0 deletions app/src/debug/res/drawable/item_pink_oval.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="oval">
<stroke android:width="1dp" android:color="#FF908A"/>
</shape>
8 changes: 8 additions & 0 deletions app/src/debug/res/drawable/pome_seekbar_custom_over_thumb.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle"
android:useLevel="false">
<solid android:color="@color/red_over"/>
<size android:width="35dp" android:height="20dp"/>
<corners android:radius="10dp"/>
</shape>
20 changes: 20 additions & 0 deletions app/src/debug/res/drawable/pome_seekbar_over_custom.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
<?xml version="1.0" encoding="utf-8"?>
<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
<item android:id="@+id/background_red">
<shape android:shape="rectangle">
<stroke android:color="@color/red_over"/>
<solid android:color="@color/red_over"/>
<corners android:radius="4dp"/>
</shape>
</item>

<item android:id="@+id/progress_horizontal">
<clip>
<shape android:shape="rectangle">
<stroke android:color="@color/red_over"/>
<solid android:color="@color/red_over"/>
<corners android:radius="4dp"/>
</shape>
</clip>
</item>
</layer-list>
15 changes: 13 additions & 2 deletions app/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,8 @@
tools:ignore="LockedOrientationActivity"
package="com.teampome.pome">

<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
<uses-permission android:name="android.permission.INTERNET" />
<uses-permission android:name="android.permission.MANAGE_EXTERNAL_STORAGE"
tools:ignore="ScopedStorage" />
<uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE"/>

<application
Expand All @@ -23,6 +22,7 @@
android:theme="@style/Theme.Pome"
tools:targetApi="33"
android:usesCleartextTraffic="true"
android:enableOnBackInvokedCallback="true"
android:name=".PomeApplication">
<activity
android:name=".MainActivity"
Expand All @@ -34,6 +34,17 @@
<category android:name="android.intent.category.LAUNCHER" />
</intent-filter>
</activity>

<provider
android:name="androidx.core.content.FileProvider"
android:authorities="com.teampome.pome.fileprovider"
android:exported="false"
android:grantUriPermissions="true">
<meta-data
android:name="android.support.FILE_PROVIDER_PATHS"
android:resource="@xml/file_paths">
</meta-data>
</provider>
</application>

</manifest>
Loading