Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1436 commits
Select commit Hold shift + click to select a range
5701d28
[chore] #213 네이밍 변경 (지도 API)
jihyunniiii Mar 3, 2024
e73c45e
[chore] #213 메인 리스트 뷰에서 카드 초기화 시 카드 접히도록 설정
jihyunniiii Mar 3, 2024
05777ae
[chore] #213 메인 리스트 뷰에서 아이템 재사용으로 인해 카드 expanded가 잘 되지 않는 문제 해결
jihyunniiii Mar 3, 2024
4b759d0
[feat] #213 메인 리스트 뷰 재로딩 시 rv 최상단으로 이동
jihyunniiii Mar 3, 2024
edcc05c
[chore] #213 메인 리스트 뷰 워딩 수정 (최신순 -> 최신등록순)
jihyunniiii Mar 3, 2024
971bf19
[feat] #213 검색 시 제일 처음에 뜨는 핀 위치로 카메라 이동
jihyunniiii Mar 3, 2024
c3120d3
[chore] #213 화면 이동 후 돌아왔을 시 지도 카드 유지
jihyunniiii Mar 3, 2024
8acfac9
[chore] #213 지도 뷰 검색 결과가 없을 경우 카메라 이동 X
jihyunniiii Mar 3, 2024
26b5dcb
[feat] #213 지도 뷰에서 검색 결과가 없을 경우에 대한 분기처리
jihyunniiii Mar 3, 2024
4f270c1
[feat] #213 리스트뷰 핑글 참여, 삭제에 대한 로직 처리
jihyunniiii Mar 3, 2024
14abb61
[feat] #206 단체 생성 API 연결 - 중간커밋
Doreminwoo Mar 3, 2024
89da575
[mod] #206 actvitiyViewModel 변경
Doreminwoo Mar 3, 2024
3529313
Merge branch 'develop' into feat-my-group-api
HAJIEUN02 Mar 3, 2024
0d4e66b
[feat] #213 ktlintFormat
jihyunniiii Mar 3, 2024
a19d563
[chore] #213 log 삭제
jihyunniiii Mar 3, 2024
957564d
[feat] #206 email 유효성 검사
Doreminwoo Mar 3, 2024
34d80a1
[feat] #206 단체명 중복확인 버튼에 따른 분기처리
Doreminwoo Mar 3, 2024
1a80532
[chore] #206 ktlint 적용
Doreminwoo Mar 3, 2024
5cbeee9
[chore] #206 ktlint적용
Doreminwoo Mar 3, 2024
a34daba
[feat] #206 초대코드 복사, 공유하기 기능
Doreminwoo Mar 3, 2024
5161a6f
[chore] #206 코드정렬
Doreminwoo Mar 3, 2024
69af820
[feat] #213 메인 리스트 뷰 핑글 참여/참여 취소 로직 구현
jihyunniiii Mar 3, 2024
1baf595
[mod] #209 코드리뷰 반영 및 로직 수정
HAJIEUN02 Mar 3, 2024
f2b865c
[chore] #209 ktlintFormat 적용
HAJIEUN02 Mar 3, 2024
536988e
[add] #215 이미지 리소스 추가
HAJIEUN02 Mar 3, 2024
cf8b00e
[feat] #215 CustomSnackbar CHECK Type 추가
HAJIEUN02 Mar 3, 2024
9176b7c
[feat] #215 copyGroupCode 확장함수에 Snackbar 호출부 추가
HAJIEUN02 Mar 3, 2024
49039c9
[chore] #215 코드리뷰 반영
HAJIEUN02 Mar 3, 2024
d9c33d3
[chore] #215 ktlintFormat 적용
HAJIEUN02 Mar 3, 2024
00015a8
[fix] #213 메인 리스트 뷰 핀이 커지는 시간과 카드가 뜨는 시간 사이 딜레이가 발생하는 문제 해결
jihyunniiii Mar 3, 2024
1753cc9
[chore] #213 ktlintFormat
jihyunniiii Mar 3, 2024
db12f40
[feat] #206 그룹 초대 코드 복사하기 및 공유하기
Doreminwoo Mar 3, 2024
479eb86
[chore] #206 ktlint 적용
Doreminwoo Mar 3, 2024
749c241
[feat] #213 공백만 입력한 경우에도 SearchActivity에서 화면 전환 가능하도록 구현
jihyunniiii Mar 4, 2024
e76780b
[feat] #213 main list 공백 검색 처리
jihyunniiii Mar 4, 2024
aae19ba
[feat] #213 지도뷰 공백 검색 처리
jihyunniiii Mar 4, 2024
8ee1cb2
[chore] #213 메인 리스트 뷰 mainListPingleListState collect 시점 수정
jihyunniiii Mar 4, 2024
9570433
[chore] #213 ktlintFormat
jihyunniiii Mar 4, 2024
18b5504
[feat] #213 검색 완료 후 chip 초기화
jihyunniiii Mar 4, 2024
7bbb6bd
[chore] #213 ktlintFormat
jihyunniiii Mar 4, 2024
6ca9e13
[add] #218 Amplitude dependency 추가
jihyunniiii Mar 4, 2024
1a181e4
[feat] #218 Amplitude 관련 권한 추가
jihyunniiii Mar 4, 2024
f5cf20f
[feat] #218 AmplitudeUtils 추가
jihyunniiii Mar 4, 2024
eba7cb2
[feat] #218 Amplitude 초기 세팅
jihyunniiii Mar 4, 2024
1578357
[feat] #218 pr_builder.yml (AMPLITUDE_API_KEY)
jihyunniiii Mar 4, 2024
c10e6df
[chore] #218 ktlintFormat
jihyunniiii Mar 4, 2024
00b360c
[chore] #210 sharePingle 수정
HAJIEUN02 Mar 4, 2024
8e61153
Merge branch 'develop' into mod-open-link-validity
Doreminwoo Mar 4, 2024
a558a13
Merge pull request #219 from TeamPINGLE/init-amplitude
jihyunniiii Mar 4, 2024
217c93e
[chore] #206 코드리뷰 1차 반영
Doreminwoo Mar 4, 2024
7a17ea0
[mod] #211 단체명이 긴 경우를 고려해 수정
HAJIEUN02 Mar 5, 2024
46b4db7
[mod] #211 공유하기 컨텐츠 적용
HAJIEUN02 Mar 5, 2024
a665509
[mod] #211 나의 단체 뷰 테두리 안 보이도록 수정
HAJIEUN02 Mar 5, 2024
9d95e21
[chore] #211 ktlintFormat 적용
HAJIEUN02 Mar 5, 2024
f0d1e8d
Merge branch 'develop' into feat-custom-snackbar-check-type
HAJIEUN02 Mar 5, 2024
7023510
[chore] #211 코드리뷰 반영
HAJIEUN02 Mar 5, 2024
ebe0dfc
Merge branch 'develop' into feat-my-group-api
HAJIEUN02 Mar 5, 2024
7e1d3ac
Merge pull request #216 from TeamPINGLE/feat-custom-snackbar-check-type
HAJIEUN02 Mar 5, 2024
9a01c3a
[chore] #213 오타 수정
jihyunniiii Mar 5, 2024
b4fada1
[chore] #209 코드리뷰 반영
HAJIEUN02 Mar 5, 2024
747ea56
[chore] #209 ktlintFormat 적용
HAJIEUN02 Mar 5, 2024
ee0143b
Merge branch 'develop' into feat-my-group-api
HAJIEUN02 Mar 5, 2024
4e6c6ca
[chore] #209 ktlintFormat 적용
HAJIEUN02 Mar 5, 2024
aee7edc
[chore] #213 PARTICIPANT_COUNT_STEP 상수화
jihyunniiii Mar 5, 2024
4e41d50
[chore] #213 with(binding)
jihyunniiii Mar 5, 2024
3ff3191
[feat] #220 Amplitude 개발 프로젝트 분리
jihyunniiii Mar 5, 2024
8ac1fef
[chore] #220 update pr_builder.yml (AMPLITUDE_API_KEY)
jihyunniiii Mar 5, 2024
8454914
[chore] #213 {} 삭제
jihyunniiii Mar 6, 2024
ce690d4
[chore] #213 참여, 참여 취소 로직 수정
jihyunniiii Mar 6, 2024
6dab9ea
Merge pull request #214 from TeamPINGLE/feat-main-list-api-connection
jihyunniiii Mar 6, 2024
aadda3b
[chore] #206 코드리뷰 반영
Doreminwoo Mar 6, 2024
a3801b0
Merge pull request #221 from TeamPINGLE/feat-dev-amplitude
jihyunniiii Mar 6, 2024
e8aba1f
Merge branch 'develop' into feat-my-group-api
HAJIEUN02 Mar 6, 2024
b5a47ec
[del] #209 인자에서 adapter 제거
HAJIEUN02 Mar 6, 2024
4f670f6
[del] #209 사용하지 않는 함수 제거
HAJIEUN02 Mar 6, 2024
29e2bce
[del] #209 clickedEntity let 제거
HAJIEUN02 Mar 6, 2024
d399d95
[del] #209 중복된 submitList 삭제
HAJIEUN02 Mar 6, 2024
c0a72b2
Merge pull request #210 from TeamPINGLE/feat-my-group-api
HAJIEUN02 Mar 6, 2024
4076c98
Merge branch 'develop' into mod-my-group
HAJIEUN02 Mar 6, 2024
b520e47
[fix] #206 단체명 입력 화면 - 버튼활성화 로직 수정
Doreminwoo Mar 6, 2024
30580e1
Merge branch 'develop' into mod-open-link-validity
Doreminwoo Mar 6, 2024
56bd2ab
[feat] #200 오픈채팅방 링크 유효성검사
Doreminwoo Mar 6, 2024
5b15b9d
[chore] #200 코드리뷰 반영
Doreminwoo Mar 7, 2024
003633f
Merge pull request #204 from TeamPINGLE/mod-open-link-validity
Doreminwoo Mar 7, 2024
baf5e08
[chore] #206 코드리뷰 반영
Doreminwoo Mar 7, 2024
1b94cb2
Merge branch 'develop' into feat-new-group-api
Doreminwoo Mar 7, 2024
792b127
Merge branch 'develop' into mod-my-group
HAJIEUN02 Mar 7, 2024
4cac451
[chore] #209 type CHECK로 수정
HAJIEUN02 Mar 7, 2024
7836e1c
[chore] #209 로직 정리
HAJIEUN02 Mar 7, 2024
a694fba
[chore] #206 코드리뷰 반영
Doreminwoo Mar 7, 2024
b6c782f
[add] #222 핑글 카드 에러 분기 처리를 위한 String 리소스 추가
jihyunniiii Mar 8, 2024
7902df2
[feat] #222 PingleCardErrorType 생성
jihyunniiii Mar 8, 2024
943909a
[chore] #222 Error 분기처리를 위한 UiState 수정
jihyunniiii Mar 8, 2024
22371df
[chore] #222 단체장 분기처리 code 사용
jihyunniiii Mar 8, 2024
0fca64f
[refactor] #222 핑글 참여, 삭제 Flow -> Result
jihyunniiii Mar 8, 2024
25ae6c5
[feat] #224 엠플리튜드 트래킹 이벤트 코드 심기
HAJIEUN02 Mar 8, 2024
c747555
[chore] #224 상수화 진행
HAJIEUN02 Mar 8, 2024
ccb0906
[feat] #226 더보기 뷰 엠플리튜드 트래킹 이벤트 코드 심기
HAJIEUN02 Mar 8, 2024
3609bcc
[feat] #226 나의 단체 뷰 엠플리튜드 트래킹 이벤트 코드 심기
HAJIEUN02 Mar 8, 2024
1817d8e
[chore] #211 플레이스토어 링크 string에 추가
HAJIEUN02 Mar 8, 2024
1529119
[chore] #222 UiState Error data 추가
jihyunniiii Mar 8, 2024
b5a1762
[del] #222 불필요한 String 리소스 제거
jihyunniiii Mar 8, 2024
c791c6c
[chore] #222 PingleCardErrorType 수정
jihyunniiii Mar 8, 2024
1835f0e
[chore] #211 코드리뷰 반영
HAJIEUN02 Mar 8, 2024
96eb2a9
[feat] #222 updateMainListPingleModelCompleted 함수 생성
jihyunniiii Mar 8, 2024
da331f9
[chore] #222 네이밍 변경
jihyunniiii Mar 8, 2024
717c3ba
[chore] #222 핑글 참여, 참여 취소 실패 로직 변경 (Home)
jihyunniiii Mar 8, 2024
f98d1cc
[chore] #222 리스트 뷰 핑글 카드 에러 분기 처리
jihyunniiii Mar 8, 2024
0877bdd
[feat] #222 Home 뷰 에러 처리 관련 companion object 추가
jihyunniiii Mar 8, 2024
47ddcec
[feat] #222 지도 뷰 핑글 카드 에러 분기처리
jihyunniiii Mar 8, 2024
122b325
[chore] #222 runCatching 제거
jihyunniiii Mar 8, 2024
2c8fe78
[chore] #222 핑글 참여 취소 실패 로직 변경 (마이핑글)
jihyunniiii Mar 8, 2024
baf023f
[feat] #222 마이핑글 핑글 카드 에러 분기처리
jihyunniiii Mar 8, 2024
05caaf2
[chore] #222 ktlintFormat
jihyunniiii Mar 8, 2024
61171cd
Merge pull request #217 from TeamPINGLE/feat-new-group-api
Doreminwoo Mar 8, 2024
12813dd
[chore] #222 DELETED_PINGLE_MESSAGE 수정
jihyunniiii Mar 8, 2024
b287b1e
[chore] #222 error message 로직 수정 (HomeViewModel)
jihyunniiii Mar 8, 2024
e8c42e9
[chore] #222 error message 로직 수정 (MyPingleViewModel)
jihyunniiii Mar 8, 2024
ce63bd7
[chore] #222 ktlintFormat
jihyunniiii Mar 8, 2024
5c811ec
[feat] #222 분기 처리 후 로직 추가 (지도 뷰 핀 다시 불러오기)
jihyunniiii Mar 8, 2024
a288783
[chore] #222 DELETED_PINGLE_MESSAGE 수정
jihyunniiii Mar 8, 2024
7753850
[chore] #222 errorType 추가
jihyunniiii Mar 8, 2024
71cfd8a
[fix] #230 SearchPingle Focus 문제 해결
jihyunniiii Mar 8, 2024
e8a2415
[feat] #228 앰플리튜드 트래킹 이벤트 코드 심기
Doreminwoo Mar 8, 2024
36a08a7
[fix] #228 초대코드 복사하기 기능 수정
Doreminwoo Mar 8, 2024
641ae3b
Merge pull request #229 from TeamPINGLE/feat-pingle-card-error
jihyunniiii Mar 8, 2024
95670e1
Merge pull request #231 from TeamPINGLE/fix-search-pingle-focus
jihyunniiii Mar 8, 2024
7c80f83
[chore] #228 ktlint formatting
Doreminwoo Mar 8, 2024
16e3a75
[feat] #232 General 엠플리튜드 트래킹 이벤트 코드 심기
jihyunniiii Mar 8, 2024
49414ad
[chore] #228 KeywordName -> KeywordValue로 변경
Doreminwoo Mar 8, 2024
56fde57
[chore] #228 option -> keyword로 변경
Doreminwoo Mar 8, 2024
ed96571
[feat] #234 앰플리튜드 트래킹 이벤트 코드 심기
Doreminwoo Mar 8, 2024
4d21b45
Revert "[feat] #234 앰플리튜드 트래킹 이벤트 코드 심기"
Doreminwoo Mar 8, 2024
376374a
[feat] #234 앰플리튜드 트래킹 이벤트 코드 심기
Doreminwoo Mar 8, 2024
f858673
[chore] #234 상수화 변경
Doreminwoo Mar 8, 2024
909f5df
[chore] #234 private 추가
Doreminwoo Mar 8, 2024
124a4dc
[chore] #228 코드리뷰 반영
Doreminwoo Mar 8, 2024
3013c56
[feat] #236 Home 엠플리튜드 트래킹 이벤트 코드 심기
jihyunniiii Mar 8, 2024
b4c3f24
[feat] #236 MainList 엠플리튜드 트래킹 이벤트 코드 심기
jihyunniiii Mar 8, 2024
5913dd4
[feat] #236 Map 엠플리튜드 트래킹 이벤트 코드 심
jihyunniiii Mar 8, 2024
fc8709e
Merge pull request #233 from TeamPINGLE/feat-onboarding-amplitude
Doreminwoo Mar 8, 2024
a8bb1d9
Merge pull request #235 from TeamPINGLE/feat-general-amplitude
jihyunniiii Mar 8, 2024
a286a5a
[feat] #234 scroll 앰플리튜드 트래킹 이벤트 코드 심기
Doreminwoo Mar 8, 2024
4c4232c
[feat] #239 ranking 엠플리튜드 트래킹 이벤트 코드 심기
jihyunniiii Mar 8, 2024
790cd4f
Merge pull request #238 from TeamPINGLE/click-map-list-amplitude
jihyunniiii Mar 9, 2024
989ad80
Merge pull request #240 from TeamPINGLE/feat-ranking-amplitude
jihyunniiii Mar 9, 2024
de5c869
Merge pull request #223 from TeamPINGLE/mod-my-group
HAJIEUN02 Mar 9, 2024
55717be
Merge branch 'develop' into feat-plan-amplitude
HAJIEUN02 Mar 9, 2024
62e1ed1
[feat] #224 DateTimeUtils Amplitude 형식 확장함수 추가
HAJIEUN02 Mar 9, 2024
ed8fe43
Merge branch 'develop' into feat-more-amplitude
HAJIEUN02 Mar 9, 2024
778f9ff
[chore] #226 상수 private화
HAJIEUN02 Mar 9, 2024
3876f9d
Merge branch 'develop' into feat-plan-amplitude
HAJIEUN02 Mar 9, 2024
b1cb39a
[chore] #224 formatted=false 추가
HAJIEUN02 Mar 9, 2024
d37aa2e
[chore] #224 sharePingle 수정
HAJIEUN02 Mar 9, 2024
46caa1e
[chore] #224 ktlintFormat
jihyunniiii Mar 9, 2024
cf5eea5
[chore] #224 string 형식 지정자 사용
jihyunniiii Mar 9, 2024
c38496c
[chore] #234 코드리뷰 반영
Doreminwoo Mar 9, 2024
57d59aa
Merge branch 'develop' into feat-mypingle-amplitude
Doreminwoo Mar 9, 2024
532a910
Merge pull request #225 from TeamPINGLE/feat-plan-amplitude
HAJIEUN02 Mar 9, 2024
d567df8
Merge branch 'develop' into feat-more-amplitude
HAJIEUN02 Mar 9, 2024
e67f83f
Merge branch 'develop' into feat-mypingle-amplitude
Doreminwoo Mar 9, 2024
90d6f2f
Merge pull request #227 from TeamPINGLE/feat-more-amplitude
HAJIEUN02 Mar 9, 2024
4e63014
Merge pull request #237 from TeamPINGLE/feat-mypingle-amplitude
Doreminwoo Mar 9, 2024
eae8e5d
[chore] #243 랭킹 아이템 숫자 크기 12Bold -> 16Bold
jihyunniiii Mar 10, 2024
a38eca9
[chore] #243 랭킹 데이터 텍소노미 스크롤 시작 시점으로 변경
jihyunniiii Mar 10, 2024
1ed2ef1
[chore] #243 PingleSearch -> EditText가 비었을 시 검색 버튼 비활성화
jihyunniiii Mar 10, 2024
f35c0b3
[chore] #243 지도/리스트 뷰 -> 검색창에서 뒤로가기 클릭 시 검색 취소 + 검색페이지로 이동
jihyunniiii Mar 10, 2024
09fed54
[fix] #242 기존단체입장 단체 키워드 정렬
Doreminwoo Mar 10, 2024
ad12140
[fix] #242 소셜로그인 후 앱 재실행시 입장방식선택화면으로 이동
Doreminwoo Mar 10, 2024
36da641
[fix] #242 소셜로그인 후 앱 재실행시 입장방식선택화면으로 이동
Doreminwoo Mar 10, 2024
6e522f3
[fix] #242 데이터 텍소노미 스크롤 시점으로 변경
Doreminwoo Mar 10, 2024
80efd7d
[fix] #244 온보딩 추가설명 뷰 : 설명 텍스트와 인디케이터가 겹쳐져 있는 이슈 해결
HAJIEUN02 Mar 10, 2024
a9446a1
[fix] #244 나의 단체 뷰 : 단체 변경시 모달에서 단체명 13자 이상일 시에 12자까지만 노출시키고 ‘…’처리
HAJIEUN02 Mar 10, 2024
c4dbae0
[chore] #244 나의 단체 뷰 : const val -> private const val로 수정
HAJIEUN02 Mar 10, 2024
78640d9
[fix] #244 온보딩 추가설명 뷰 : 0개 단체 가입된 사용자 앱 재실행 시 온보딩 추가설명 뷰 입장 방식 선택 뷰가 …
HAJIEUN02 Mar 10, 2024
dab9dae
[chore] #246 토큰 재발급 이슈 해결 (동시에 여러개의 통신 보내지 않도록 로직 수정)
jihyunniiii Mar 10, 2024
4ba3b9c
[chore] #243 ktlintFormat
jihyunniiii Mar 10, 2024
123c4ef
[fix] #244 나의 단체 뷰 : '나의 단체' -> '입장 방식 선택' -> ’나의 단체’ 뷰로 복귀 시 종료 토스트…
HAJIEUN02 Mar 10, 2024
0641f39
[chore] #244 ktlintFormat 적용
HAJIEUN02 Mar 10, 2024
50ba714
[fix] #242 안내페이지 갔다 돌아오면 스낵바 호출되는 현상 해결
Doreminwoo Mar 10, 2024
7b9727c
Merge pull request #247 from TeamPINGLE/fix-reissue
jihyunniiii Mar 10, 2024
7b38cf2
Merge branch 'develop' into fix-3rd-sprint-qa-jieun
HAJIEUN02 Mar 10, 2024
97e117a
[fix] #242 단체명 2줄 처리
Doreminwoo Mar 10, 2024
e4f48cb
[fix] #244 더보기 뷰 : 현재 단체명 2줄인 경우를 고려해 수정
HAJIEUN02 Mar 10, 2024
e9fdc83
Merge branch 'develop' into fix-3rd-sprint-qa-jihyun
jihyunniiii Mar 11, 2024
2aebbd7
[chore] #243 makeEllipsisGroupName when 문으로 수정
jihyunniiii Mar 11, 2024
0f0c84e
[chore] #243 PingleLocalDataSource에 sharedPreference 추가
jihyunniiii Mar 11, 2024
1775e47
[chore] #243 단체 변경 후 홈 화면 진입 시 검색 결과가 유지되어 있는 문제 해결 (OnSharedPreferen…
jihyunniiii Mar 11, 2024
0b48ceb
[chore] #243 검색 + 지도 뷰에서 칩 필터링을 진행하는 경우 검색 결과가 없어도 지도뷰 유지
jihyunniiii Mar 11, 2024
df08dfe
[fix] #244 온보딩 추가설명 뷰 : 인디케이터가 움직이는 이슈 해결
HAJIEUN02 Mar 11, 2024
054c784
[del] #244 온보딩 추가설명 뷰 : 필요없는 변수 삭제
HAJIEUN02 Mar 11, 2024
e1d3841
[chore] #244 온보딩 추가설명 뷰 : match_parent를 0dp로 수정
HAJIEUN02 Mar 11, 2024
ffb89ba
[chore] #244 ktlintFormat 적용
HAJIEUN02 Mar 11, 2024
026363e
[fix] #242 안내페이지, 뒤로가기 시 chip 선택 해제 문제 해결
Doreminwoo Mar 11, 2024
9de8b09
[chore] #242 ktlint 적용
Doreminwoo Mar 11, 2024
0d7ce93
[chore] #242 ktlint 적용
Doreminwoo Mar 11, 2024
011a9b6
[feat] #243 홈 뷰 핑글 정보 조회를 위한 정보를 하나로 관리하기 위한 모델 생성
jihyunniiii Mar 11, 2024
54f60c0
[feat] #243 홈 뷰 핑글 정보 조회를 위한 정보 (카테고리, 검색어, HomeViewType, Order) 하나의 …
jihyunniiii Mar 11, 2024
041e09a
[chore] #243 ktlintFormat
jihyunniiii Mar 11, 2024
c983e64
[fix] #244 나의 단체 뷰 : owner 표시를 테두리가 꽉 찬 에셋으로 변경
HAJIEUN02 Mar 12, 2024
68b04c4
[feat] #244 단체명 13자 이상일 시 12까지만 노출시키고 ... 처리하는 확장함수 구현
HAJIEUN02 Mar 12, 2024
c24d45a
[fix] #244 나의 단체 뷰 : 단체 변경 모달에 makeEllipsisGroupName 적용
HAJIEUN02 Mar 12, 2024
8a6a298
[fix] #244 신규 단체 개설 완료 뷰 : 단체명에 makeEllipsisGroupName 적용
HAJIEUN02 Mar 12, 2024
8eb5406
[fix] #244 기존 단체 입장 완료 뷰 : 단체명에 makeEllipsisGroupName 적용
HAJIEUN02 Mar 12, 2024
009a320
[chore] #244 ktlintFormat 적용
HAJIEUN02 Mar 12, 2024
26c22c9
Merge pull request #248 from TeamPINGLE/fix-3rd-sprint-qa-jieun
HAJIEUN02 Mar 12, 2024
ca2b255
Merge remote-tracking branch 'origin/fix-3rd-sprint-qa-jihyun' into f…
HAJIEUN02 Mar 12, 2024
5dbf5e8
Merge branch 'develop' into fix-3rd-sprint-qa-jihyun
HAJIEUN02 Mar 12, 2024
8c87a8a
Merge branch 'develop' into fix-3rd-sprint-qa-jihyun
jihyunniiii Mar 12, 2024
6471797
[chore] #243 로그아웃/탈퇴 후 이동 화면 수정 (Onboarding)
jihyunniiii Mar 12, 2024
4e27cbf
[chore] #243 Log 삭제
jihyunniiii Mar 12, 2024
1d28f7b
[chore] #243 오타 수정
jihyunniiii Mar 12, 2024
22a28bc
[chore] #243 로그아웃/탈퇴 후 이동 액티비티 수정 (auth)
jihyunniiii Mar 12, 2024
751d77f
[chore] #243 ktlintFormat
jihyunniiii Mar 12, 2024
2cf81e5
Merge remote-tracking branch 'origin/fix-3rd-sprint-qa-jihyun' into f…
HAJIEUN02 Mar 12, 2024
b95ce26
[fix] #243 로그아웃/탈퇴 후 온보딩, 최초 접속 시 온보딩 뒤로가기 버튼 로직 분리
HAJIEUN02 Mar 12, 2024
993395f
[chore] #243 ktlintFormat
HAJIEUN02 Mar 12, 2024
f6fb272
Merge pull request #245 from TeamPINGLE/fix-3rd-sprint-qa-jihyun
jihyunniiii Mar 12, 2024
cfc4b3d
[chore] #241 base.url 개발, 운영 base.url 분리
jihyunniiii Mar 12, 2024
db93e69
[chore] #241 version 업그레이드
jihyunniiii Mar 12, 2024
7bc5070
[chore] #241 버전코드 및 버전네임 업그레이드
jihyunniiii Mar 12, 2024
00f7cad
[chore] #242 코드리뷰 적용
Doreminwoo Mar 12, 2024
a795777
[chore] #242 ktlint 적용
Doreminwoo Mar 12, 2024
f28c8bf
Merge branch 'develop' into fix-3rd-sprint-qa-minwoo
Doreminwoo Mar 12, 2024
efc0c25
Merge pull request #249 from TeamPINGLE/fix-3rd-sprint-qa-minwoo
jihyunniiii Mar 12, 2024
2ba20db
Merge branch 'develop' into chore-2.0.0
jihyunniiii Mar 12, 2024
40c9e5b
[chore] #241 코드 정렬
jihyunniiii Mar 12, 2024
071f23e
[chore] #241 사용하지 않는 파일 제거
jihyunniiii Mar 12, 2024
30bfd63
[feat] #241 setOnSingleClickListener 추가
jihyunniiii Mar 12, 2024
e2e3598
[feat] #241 중복 클릭 막기
jihyunniiii Mar 13, 2024
2fc735f
Merge pull request #250 from TeamPINGLE/chore-2.0.0
jihyunniiii Mar 13, 2024
ab36cc1
[chore] #251 Manifest 수정 (NewGroupInfoActivity 추가)
jihyunniiii Mar 13, 2024
b3ce07f
[chore] #251 네이밍 수정 (isNewGroupBtnCheckName -> isGroupNameDuplicatedC…
jihyunniiii Mar 13, 2024
ea5abd6
[chore] #251 lifecycleOwner 수정
jihyunniiii Mar 13, 2024
136d29f
[feat] #251 중복확인 버튼 클릭 시 단체명 앞뒤 공백 제거
jihyunniiii Mar 13, 2024
11f26bf
[feat] #251 중복확인 버튼 활성화/비활성화 로직 구현
jihyunniiii Mar 13, 2024
ed138d4
[chore] #251 ktlintFormat
jihyunniiii Mar 13, 2024
793214d
[chore] #251 versionCode 업데이트 (16 -> 17)
jihyunniiii Mar 13, 2024
a9551dd
[chore] #251 단체개설완료뷰 뷰 깨지는 문제 해결
jihyunniiii Mar 13, 2024
b463eb0
Merge pull request #252 from TeamPINGLE/hotfix-new-group
jihyunniiii Mar 13, 2024
bf54428
[fix] #253 Snackbar binding.root -> requireView로 변경
Doreminwoo Mar 16, 2024
b55ee7a
Merge pull request #254 from TeamPINGLE/hotfix-snackbar-view
Doreminwoo Mar 17, 2024
78a2749
[chore] #255 초대 코드 입력 글자수 제한 제거
jihyunniiii Mar 19, 2024
ae610ac
[chore] #255 버전 코드 및 버전 네임 수정 (17 -> 18, 2.0.0 -> 2.0.1)
jihyunniiii Mar 19, 2024
6d5e913
Merge pull request #256 from TeamPINGLE/chore-2.0.1
jihyunniiii Mar 20, 2024
0d44dfd
[chore] #257 url 변경
jihyunniiii Jan 9, 2025
9bfc375
[chore] #257 gradle version update
jihyunniiii Jan 9, 2025
80fc0bd
[chore] #257 naverMapSDK url update
jihyunniiii Jan 9, 2025
74ca8d1
[chore] #257 버전 코드 및 버전 네임 수정 (18 -> 19, 2.0.1 -> 2.0.2)
jihyunniiii Jan 9, 2025
591be86
Merge pull request #258 from TeamPINGLE/chore-2.0.2
jihyunniiii Jan 10, 2025
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
  •  
  •  
  •  
4 changes: 4 additions & 0 deletions .editorconfig
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
root = true

[*]
max_line_length = off
1 change: 1 addition & 0 deletions .github/CODEOWNERS
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
* @TeamPINGLE/PINGLE-ANDROID
13 changes: 13 additions & 0 deletions .github/ISSUE_TEMPLATE/issue_template.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
---
name: ISSUE_TEMPLATE
about: "기능, UI, 문서 개선 및 추가 요청을 위한 템플릿입니다 \U0001F680"
title: ''
labels: ''
assignees: ''

---

## What is this issue? 🛠

## Progress 🏃‍♀️
- [ ]
13 changes: 13 additions & 0 deletions .github/pull_request_template.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
## Related issue 🛠
- closed #이슈넘버

## Work Description ✏️
- 작업 내용

## Screenshot 📸
<img src="" width="360"/>

## Uncompleted Tasks 😅
- [ ] Task1

## To Reviewers 📢
109 changes: 109 additions & 0 deletions .github/workflows/pr_builder.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,109 @@
name: Pingle PR Builder
on:
pull_request:
branches: [ develop, main ]
defaults:
run:
shell: bash
working-directory: .
jobs:
build:
name: PR Checker
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@v2
- name: Gradle cache
uses: actions/cache@v2
with:
path: |
~/.gradle/caches
~/.gradle/wrapper
key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle*') }}
restore-keys: |
${{ runner.os }}-gradle-

- name: set up JDK 17
uses: actions/setup-java@v1
with:
java-version: 17

- name: Change gradlew permissions
run: chmod +x ./gradlew

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

- name: Touch local properties
run: touch local.properties

- name: Decode google-services.json
env:
FIREBASE_SECRET: ${{ secrets.FIREBASE_SECRET }}
run: echo $FIREBASE_SECRET > app/google-services.json

- name: Access BASE_URL
env:
HFM_BASE_URL: ${{ secrets.BASE_URL }}
run: echo "dev.base.url=\"$BASE_URL\"" >> local.properties

- name: Access IO_SENTRY_DSN
env:
IO_SENTRY_TOKEN: ${{ secrets.IO_SENTRY_DSN }}
run: echo "io.sentry.dsn=\"$IO_SENTRY_DSN\"" >> local.properties

- name: Access KAKAO_NATIVE_APP_KEY_MANIFEST
env:
KAKAO_NATIVE_APP_KEY_MANIFEST: ${{ secrets.KAKAO_NATIVE_APP_KEY }}
run: echo "kakao.native.app.key.manifest=\"$KAKAO_NATIVE_APP_KEY_MANIFEST\"" >> local.properties

- name: Access KAKAO_NATIVE_APP_KEY
env:
KAKAO_NATIVE_APP_KEY: ${{ secrets.KAKAO_NATIVE_APP_KEY }}
run: echo "kakao.native.app.key=\"$KAKAO_NATIVE_APP_KEY\"" >> local.properties

- name: Access AMPLITUDE_API_KEY
env:
AMPLITUDE_API_KEY: ${{ secrets.AMPLITUDE_API_KEY }}
run: echo "amplitude.dev.api.key=\"AMPLITUDE_API_KEY\"" >> local.properties

- name: Access DEFAULTS_ORG
env:
DEFAULTS_ORG: ${{ secrets.DEFAULTS_ORG }}
run: echo "defaults.org=$DEFAULTS_ORG" >> sentry.properties

- name: Access DEFAULTS_PROJECT
env:
DEFAULTS_PROJECT: ${{ secrets.DEFAULTS_PROJECT }}
run: echo "defaults.project=$DEFAULTS_PROJECT" >> sentry.properties

- name: Access AUTH_TOKEN
env:
AUTH_TOKEN: ${{ secrets.AUTH_TOKEN }}
run: echo "auth.token=$AUTH_TOKEN" >> sentry.properties

- name: Lint Check
run: ./gradlew ktlintCheck -PcompileSdkVersion=34

- name: Build with Gradle
run: ./gradlew build -PcompileSdkVersion=34

- name: Slack Notify - Success
if: ${{ success() }}
uses: rtCamp/action-slack-notify@v2
env:
SLACK_COLOR: '#B7FF1D'
SLACK_WEBHOOK: ${{ secrets.SLACK_WEBHOOK_URL }}
SLACK_TITLE: '✅ PR Success ✅'
SLACK_USERNAME: PINGLE-ANDROID 🌀
SLACK_MESSAGE: 'PR이 완료되었습니다! ➿'

- name: Slack Notify - Failure
if: ${{ failure() }}
uses: rtCamp/action-slack-notify@v2
env:
SLACK_COLOR: '#FF9254'
SLACK_WEBHOOK: ${{ secrets.SLACK_WEBHOOK_URL }}
SLACK_TITLE: '❌ PR Failed ❌'
SLACK_USERNAME: PINGLE-ANDROID 🌀
SLACK_MESSAGE: '에러를 확인해 주세요 😵‍💫'
188 changes: 188 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,188 @@
# Created by https://www.toptal.com/developers/gitignore/api/android,androidstudio,kotlin
# Edit at https://www.toptal.com/developers/gitignore?templates=android,androidstudio,kotlin

### Android ###
# Gradle files
.gradle/
build/

# Local configuration file (sdk path, etc)
local.properties
sentry.properties

# Log/OS Files
*.log

# Android Studio generated files and folders
captures/
.externalNativeBuild/
.cxx/
*.apk
output.json

# IntelliJ
*.iml
.idea/
misc.xml
deploymentTargetDropDown.xml
render.experimental.xml

# Keystore files
*.jks
*.keystore

# Google Services (e.g. APIs or Firebase)
google-services.json

# Android Profiling
*.hprof

### Android Patch ###
gen-external-apklibs

# Replacement of .externalNativeBuild directories introduced
# with Android Studio 3.5.

### Kotlin ###
# Compiled class file
*.class

# Log file

# BlueJ files
*.ctxt

# Mobile Tools for Java (J2ME)
.mtj.tmp/

# Package Files #
*.jar
*.war
*.nar
*.ear
*.zip
*.tar.gz
*.rar

# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
hs_err_pid*
replay_pid*

### AndroidStudio ###
# Covers files to be ignored for android development using Android Studio.

# Built application files
*.ap_
*.aab

# Files for the ART/Dalvik VM
*.dex

# Java class files

# Generated files
bin/
gen/
out/

# Gradle files
.gradle

# Signing files
.signing/

# Local configuration file (sdk path, etc)

# Proguard folder generated by Eclipse
proguard/

# Log Files

# Android Studio
/*/build/
/*/local.properties
/*/out
/*/*/build
/*/*/production
.navigation/
*.ipr
*~
*.swp

# Keystore files

# Google Services (e.g. APIs or Firebase)
# google-services.json

# Android Patch

# External native build folder generated in Android Studio 2.2 and later
.externalNativeBuild

# NDK
obj/

# IntelliJ IDEA
*.iws
/out/

# User-specific configurations
.idea/caches/
.idea/libraries/
.idea/shelf/
.idea/workspace.xml
.idea/tasks.xml
.idea/.name
.idea/compiler.xml
.idea/copyright/profiles_settings.xml
.idea/encodings.xml
.idea/misc.xml
.idea/modules.xml
.idea/scopes/scope_settings.xml
.idea/dictionaries
.idea/vcs.xml
.idea/jsLibraryMappings.xml
.idea/datasources.xml
.idea/dataSources.ids
.idea/sqlDataSources.xml
.idea/dynamic.xml
.idea/uiDesigner.xml
.idea/assetWizardSettings.xml
.idea/gradle.xml
.idea/jarRepositories.xml
.idea/navEditor.xml

# Legacy Eclipse project files
.classpath
.project
.cproject
.settings/

# Mobile Tools for Java (J2ME)

# Package Files #

# virtual machine crash logs (Reference: http://www.java.com/en/download/help/error_hotspot.xml)

## Plugin-specific files:

# mpeltonen/sbt-idea plugin
.idea_modules/

# JIRA plugin
atlassian-ide-plugin.xml

# Mongo Explorer plugin
.idea/mongoSettings.xml

# Crashlytics plugin (for Android Studio and IntelliJ)
com_crashlytics_export_strings.xml
crashlytics.properties
crashlytics-build.properties
fabric.properties

### AndroidStudio Patch ###

!/gradle/wrapper/gradle-wrapper.jar

# End of https://www.toptal.com/developers/gitignore/api/android,androidstudio,kotlin
3 changes: 3 additions & 0 deletions .idea/.gitignore

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 6 additions & 0 deletions .idea/compiler.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

20 changes: 20 additions & 0 deletions .idea/gradle.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 6 additions & 0 deletions .idea/kotlinc.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

17 changes: 17 additions & 0 deletions .idea/misc.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading
Loading