Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
259 commits
Select commit Hold shift + click to select a range
da9d3c6
Merge pull request #3 from ParkSorry/Shalendar1.0
JINKOO May 1, 2019
55f4820
게시판 틀
Novjoon May 1, 2019
ef3b467
Merge pull request #4 from Novjoon/Shalendar1.0
JINKOO May 1, 2019
895c479
일정등록화면
JINKOO May 1, 2019
13feea5
일정 등록/로그인/게시판
JINKOO May 1, 2019
b9ee26e
로그인/ 일정등록/ 게시판
JINKOO May 1, 2019
68e833f
Merge pull request #5 from JINKOO/Shalendar1.0
JINKOO May 1, 2019
65e8a30
.
Novjoon May 2, 2019
6a203f5
Merge branch 'Shalendar1.0' of https://github.com/shalendar/Shalendar…
Novjoon May 2, 2019
c257eae
합본
Novjoon May 3, 2019
86ef079
게시판 boarderAdapter분리
Novjoon May 3, 2019
4933a7c
로그인 기능 수정, TimePicker수정완료
JINKOO May 8, 2019
7fc002c
Merge pull request #6 from JINKOO/Shalendar1.0
JINKOO May 8, 2019
b0dfbfd
게시판 글 화면틀 완성
Novjoon May 8, 2019
dd41916
Merge branch 'Shalendar1.0' of https://github.com/shalendar/Shalendar…
Novjoon May 8, 2019
3987892
Merge pull request #7 from Novjoon/Shalendar1.0
JINKOO May 8, 2019
1737518
네비게이션 뷰 디자인 바꿈
ParkSorry May 8, 2019
38f11cf
그냥 오늘 뭐 오월팔일 병합
ParkSorry May 8, 2019
06565c2
메인 drawer 30%완성/일정상세보기 layout까지/로그인 기능/ TimePicker수정
JINKOO May 8, 2019
c3858cf
plandetail 디자인 적용
Novjoon May 15, 2019
68deb9f
Merge pull request #9 from Novjoon/Shalendar1.0
JINKOO May 15, 2019
8581e39
설정 화면
ParkSorry May 15, 2019
ee9cb69
Merge pull request #10 from ParkSorry/Shalendar1.0
JINKOO May 15, 2019
92fb874
설정/공지사항
JINKOO May 15, 2019
4cb1db6
탭 레이아웃
JINKOO May 15, 2019
1646ccb
공시사항
JINKOO May 17, 2019
1025b4e
공지사항까지~
JINKOO May 17, 2019
c5bf7bd
Merge pull request #13 from JINKOO/Shalendar1.0
JINKOO May 17, 2019
55ed754
검색화면
Novjoon May 22, 2019
f7434fe
Merge pull request #14 from Novjoon/Shalendar1.0
JINKOO May 22, 2019
dbcb975
캘린더 생성뷰
ParkSorry May 22, 2019
8890d0b
검색&공유달력 추가
ParkSorry May 22, 2019
34e0cea
Merge pull request #15 from ParkSorry/Shalendar1.0
JINKOO May 22, 2019
aeb3fce
팀원 추가
JINKOO May 22, 2019
d2643ea
검색, 공유달력 생성, 멤버초대
JINKOO May 22, 2019
b5727b5
Merge pull request #16 from JINKOO/Shalendar1.0
JINKOO May 22, 2019
4f40aa7
상태바 색깔 지정, demo파일 이름수정
JINKOO May 25, 2019
9068cf9
Merge pull request #17 from JINKOO/Shalendar1.0
JINKOO May 25, 2019
1991e9c
추천시간 받기
Novjoon Jul 10, 2019
931ebaf
Merge pull request #18 from Novjoon/Shalendar1.0
Novjoon Jul 10, 2019
f4cf443
버튼 조금 바꿈
ParkSorry Jul 10, 2019
7475d04
추천시간 수정
Novjoon Jul 10, 2019
f4a954f
Merge pull request #19 from Novjoon/Shalendar1.0
Novjoon Jul 10, 2019
7ff4e99
사이드바
ParkSorry Jul 10, 2019
3dcd22c
Merge branch 'Shalendar1.0' of https://github.com/shalendar/Shalendar…
ParkSorry Jul 10, 2019
965553c
사이드바 수정
Novjoon Jul 10, 2019
0950365
Merge pull request #20 from Novjoon/Shalendar1.0
Novjoon Jul 10, 2019
23f7f29
Merge branch 'Shalendar1.0' of https://github.com/shalendar/Shalendar…
ParkSorry Jul 11, 2019
6ed25ef
Board수정
Novjoon Jul 15, 2019
460390a
Merge pull request #21 from Novjoon/Shalendar1.0
Novjoon Jul 15, 2019
dcf1355
plandetail 사이드바 구현
Novjoon Jul 15, 2019
b04c573
Merge pull request #22 from Novjoon/Shalendar1.0
Novjoon Jul 15, 2019
481ef63
달력 입힘
JINKOO Jul 15, 2019
97b3aed
Merge pull request #23 from JINKOO/Shalendar1.1
JINKOO Jul 15, 2019
1ba1073
사이드바 디자인 변경
ParkSorry Jul 16, 2019
f93f3c1
Merge branch 'Shalendar1.0' into Shalendar1.0
ParkSorry Jul 18, 2019
043df2d
Merge pull request #24 from ParkSorry/Shalendar1.0
ParkSorry Jul 18, 2019
811e872
달력 입힘
ParkSorry Jul 18, 2019
0b3b719
애니메이션 수정
Novjoon Jul 18, 2019
a313afb
메인화면 애니메이션 적용
Novjoon Jul 19, 2019
47f2139
Merge pull request #25 from Novjoon/Shalendar1.0
Novjoon Jul 19, 2019
4e45f8f
변경사항
ParkSorry Jul 19, 2019
7da3ef3
애니메이션+사이드바 디자인
ParkSorry Jul 19, 2019
e66f98a
Merge pull request #26 from ParkSorry/Shalendar1.0
ParkSorry Jul 19, 2019
56695e5
수정
Novjoon Jul 19, 2019
17efaac
일부 수정
JINKOO Jul 19, 2019
cf788fa
회원가입 통신 성공, 로그인 통신코드입힘
JINKOO Jul 19, 2019
0f74c1c
회원가입 통신 성공, 로그인 통신 시도
JINKOO Jul 19, 2019
66cb8e3
메인 하단화면 구현
Novjoon Jul 20, 2019
591c56b
Merge branch 'Shalendar1.0' of
Novjoon Jul 20, 2019
37aa7b1
화면 하단 수정
Novjoon Jul 20, 2019
abcb564
Merge pull request #29 from Novjoon/Shalendar1.0
Novjoon Jul 20, 2019
b077677
로그인 통신 코드 까지
JINKOO Jul 20, 2019
fb7f30f
Merge branch 'Shalendar1.0' of https://github.com/shalendar/Shalendar…
JINKOO Jul 20, 2019
d439940
[속보]애니메이션 99%완료//로그인 통신 시도//공유달력 생성 통신코드 입혀야..
JINKOO Jul 20, 2019
ac4aa18
사이드바 캘린더부분 구현
Novjoon Jul 22, 2019
50e4e1b
Merge pull request #31 from Novjoon/Shalendar1.0
Novjoon Jul 22, 2019
848e171
캘린더 생성 통신 성공(이미지 제외)
JINKOO Jul 22, 2019
83c724e
캘린더 생성까지 통신 완료(이미지제외..)
JINKOO Jul 22, 2019
9388b0b
캘린더 생성 통신(이미지 제외), 사이드 바
JINKOO Jul 22, 2019
14bcb0a
캘린더 생성 통신(이미지 제외), 사이드 바 90%
JINKOO Jul 22, 2019
4900517
수정0722
ParkSorry Jul 22, 2019
fe246fc
통신코드 병합
ParkSorry Jul 22, 2019
225bc0d
Merge pull request #34 from ParkSorry/Shalendar1.0
ParkSorry Jul 22, 2019
4b9710e
0725수정
Novjoon Jul 25, 2019
5efc189
Merge branch 'Shalendar1.0' of https://github.com/shalendar/Shalendar…
Novjoon Jul 25, 2019
20b08ff
일정 등록 통신까지
JINKOO Jul 26, 2019
194718d
일정 등록 통신까지
JINKOO Jul 26, 2019
2e9884c
일정 상세보기 통신 완료
JINKOO Jul 27, 2019
76f70b7
Merge pull request #36 from JINKOO/Shalendar1.3
JINKOO Jul 27, 2019
fd77a03
지상이꺼
ParkSorry Jul 27, 2019
b453c08
병합
ParkSorry Jul 27, 2019
e78d746
0727
Novjoon Jul 27, 2019
5959135
0727수정
Novjoon Jul 27, 2019
47bc16b
사이드 바 통신까지
JINKOO Jul 29, 2019
1e70200
Merge pull request #37 from JINKOO/Shalendar1.3
JINKOO Jul 29, 2019
395f0a0
0729
Novjoon Jul 29, 2019
4590845
사이드바 통신 버그해결
JINKOO Jul 29, 2019
d8f0898
Merge pull request #38 from JINKOO/Shalendar1.3
JINKOO Jul 29, 2019
3f98e7e
boarderadapter 통신 수정
Novjoon Aug 7, 2019
4d82cd1
Merge pull request #39 from Novjoon/Shalendar1.0
Novjoon Aug 7, 2019
8620ff3
보더 통신 수정
Novjoon Aug 7, 2019
1c06bd9
Merge pull request #40 from Novjoon/Shalendar1.0
Novjoon Aug 7, 2019
c43aa38
boarder 통신수정 및 header값 수신 완료
Novjoon Aug 7, 2019
a223d54
Merge pull request #41 from Novjoon/Shalendar1.0
Novjoon Aug 7, 2019
a3a9ffc
NoticeActivity BackButton
ParkSorry Aug 8, 2019
3e35635
0808
ParkSorry Aug 8, 2019
2855757
Merge pull request #42 from ParkSorry/Shalendar1.0
ParkSorry Aug 8, 2019
a5cffcc
main통신 중
JINKOO Aug 8, 2019
cae54c4
Main통신 구현 중임
JINKOO Aug 8, 2019
452fd2d
MainCode 통신 구현 중
JINKOO Aug 8, 2019
cadcfea
Merge pull request #43 from JINKOO/Shalendar1.3
JINKOO Aug 8, 2019
dd0defd
0811
Novjoon Aug 11, 2019
28326d3
Merge branch 'Shalendar1.0' of https://github.com/shalendar/Shalendar…
Novjoon Aug 11, 2019
77f3a4d
0811 댓글 통신
Novjoon Aug 11, 2019
19fed58
Merge pull request #44 from Novjoon/Shalendar1.0
Novjoon Aug 11, 2019
2eb5b77
이상 무
ParkSorry Aug 20, 2019
3011524
Merge branch 'Shalendar1.0' of https://github.com/shalendar/Shalendar…
ParkSorry Aug 20, 2019
773712a
사이드바 이미지 통신 완료
JINKOO Aug 20, 2019
b255363
Merge branch 'Shalendar1.0' of https://github.com/shalendar/Shalendar…
JINKOO Aug 20, 2019
ddfb4e7
사이드바 이미지 통신 완료
JINKOO Aug 20, 2019
4bd802d
앱바 수정
ParkSorry Aug 20, 2019
9c61998
초대알림함
ParkSorry Aug 20, 2019
ff863ae
Merge pull request #46 from ParkSorry/Shalendar1.0
ParkSorry Aug 20, 2019
3556cc1
초대 대기목록 생성
Novjoon Aug 20, 2019
48db7e5
초대대기화면 초안 완성
Novjoon Aug 20, 2019
f8888ee
Merge pull request #47 from Novjoon/Shalendar1.0
Novjoon Aug 20, 2019
bd8a240
사이드바 메뉴 이미지통신~
JINKOO Aug 20, 2019
99da7cf
Merge branch 'Shalendar1.0' of https://github.com/shalendar/Shalendar…
JINKOO Aug 20, 2019
dc7b90b
초대화면 수정
Novjoon Aug 20, 2019
98d5dc2
Merge pull request #48 from Novjoon/Shalendar1.0
Novjoon Aug 20, 2019
fbc8501
수락/거절 뷰 연결해야
JINKOO Aug 20, 2019
6be832e
Merge branch 'Shalendar1.0' of https://github.com/shalendar/Shalendar…
JINKOO Aug 20, 2019
00a6153
Merge pull request #49 from JINKOO/Shalendar1.3
JINKOO Aug 20, 2019
ee48576
아이콘 수정
ParkSorry Aug 20, 2019
7080238
아이콘 수정!
ParkSorry Aug 20, 2019
9065f9c
Merge pull request #50 from ParkSorry/Shalendar1.0
ParkSorry Aug 20, 2019
49067af
사이드바 프로필 통신 진행중
ParkSorry Aug 26, 2019
69f5634
Merge pull request #51 from ParkSorry/Shalendar1.0
ParkSorry Aug 26, 2019
91225bb
사이드바 프로필 이미지 통신 중~
JINKOO Aug 26, 2019
9b4274d
Merge branch 'Shalendar1.0' of https://github.com/shalendar/Shalendar…
JINKOO Aug 26, 2019
5ee668c
프로필 이미지 통신 중(사이드바)~
JINKOO Aug 26, 2019
06c82c7
Merge pull request #52 from JINKOO/Shalendar1.3
JINKOO Aug 26, 2019
9644148
이미지 진짜 완성/ 초대 수락 통신 중
JINKOO Aug 27, 2019
4936275
Merge pull request #53 from JINKOO/Shalendar1.3
JINKOO Aug 27, 2019
33758f0
초대대기 뷰 통신 절반 완성
JINKOO Aug 27, 2019
8e2365b
이번주 안에 끝내자
JINKOO Aug 27, 2019
d10a0e3
백 버튼 수정
ParkSorry Aug 27, 2019
0a69d7e
초대대기 백버튼
ParkSorry Aug 28, 2019
dfe1bdf
Merge pull request #55 from ParkSorry/Shalendar1.0
ParkSorry Aug 28, 2019
8f71a83
초대 수락/거절 완성
JINKOO Aug 28, 2019
545f01d
초대 대기 백버튼/수락거절통신/완료
JINKOO Aug 28, 2019
bfa79e6
Merge pull request #56 from JINKOO/Shalendar1.3
JINKOO Aug 28, 2019
c65910d
이미지 통신 수정(null일때 디폴트 이미지 지정)
JINKOO Aug 29, 2019
1e7bcdd
Merge pull request #57 from JINKOO/Shalendar1.3
JINKOO Aug 29, 2019
2f269c3
버튼 이미지 수정
ParkSorry Aug 29, 2019
ba3c472
Merge pull request #58 from ParkSorry/Shalendar1.0
ParkSorry Aug 29, 2019
2f170a3
초대대기 뷰 디자인
ParkSorry Aug 29, 2019
fa1e982
Merge pull request #59 from ParkSorry/Shalendar1.0
ParkSorry Aug 29, 2019
5edd4a2
디자인 일부 개선
JINKOO Aug 29, 2019
f23f71d
Merge branch 'Shalendar1.0' of https://github.com/shalendar/Shalendar…
JINKOO Aug 29, 2019
73b8320
디자인 일부 수정/댓글, planDetail해야
JINKOO Aug 29, 2019
a1eea44
Merge pull request #60 from JINKOO/Shalendar1.3
JINKOO Aug 29, 2019
a6c3ae1
0830수정
Novjoon Aug 30, 2019
c6f285a
0830 수정본
Novjoon Aug 30, 2019
c3bb4ba
댓글기능구현
Novjoon Aug 30, 2019
6c1c068
Merge pull request #61 from Novjoon/Shalendar1.0
Novjoon Aug 30, 2019
afb8353
디자인 및 짜잘한 버그 수정
ParkSorry Aug 30, 2019
6473f25
버튼 인탠드
ParkSorry Aug 30, 2019
1d3954a
Merge pull request #62 from ParkSorry/Shalendar1.0
ParkSorry Aug 30, 2019
db42a2e
사이드바 수정기능
Novjoon Sep 1, 2019
bf21a93
0901합본
Novjoon Sep 1, 2019
9869001
Merge pull request #63 from Novjoon/Shalendar1.0
Novjoon Sep 1, 2019
8d7f94d
0901
ParkSorry Sep 1, 2019
9bfa964
Merge branch 'Shalendar1.0' of https://github.com/shalendar/Shalendar…
ParkSorry Sep 1, 2019
3a7b8f8
검색 디자인
ParkSorry Sep 1, 2019
e8d35e9
Merge pull request #64 from ParkSorry/Shalendar1.0
ParkSorry Sep 1, 2019
a153d03
검색뷰 리사이클러뷰
Novjoon Sep 1, 2019
1f84ff7
Merge branch 'Shalendar1.0' of https://github.com/shalendar/Shalendar…
Novjoon Sep 1, 2019
083c5ed
일정 수정 기능 오나성
Novjoon Sep 1, 2019
50da453
Merge pull request #66 from Novjoon/Shalendar1.0
Novjoon Sep 1, 2019
1970ab3
검색기능 보완
Novjoon Sep 1, 2019
f9453ae
Merge pull request #67 from Novjoon/Shalendar1.0
Novjoon Sep 1, 2019
4f9bd7d
전반적인 디자인 수정
ParkSorry Sep 1, 2019
7529dca
updateActivity충돌 해결
ParkSorry Sep 1, 2019
dabb808
Merge pull request #68 from ParkSorry/Shalendar1.0
ParkSorry Sep 1, 2019
287b55e
메인 점찍기 완성
JINKOO Sep 1, 2019
7d08c91
Merge branch 'Shalendar1.0' of https://github.com/shalendar/Shalendar…
JINKOO Sep 1, 2019
22c4bb9
Merge pull request #69 from JINKOO/Shalendar1.3
JINKOO Sep 1, 2019
523a49e
0902
Novjoon Sep 2, 2019
433c0cc
Merge branch 'Shalendar1.0' of https://github.com/shalendar/Shalendar…
Novjoon Sep 2, 2019
175eb20
메인 애니메이션data parse 완료
JINKOO Sep 2, 2019
dc3c53a
Merge pull request #70 from JINKOO/Shalendar1.3
JINKOO Sep 2, 2019
eac9ff1
디자인 일부 개선
ParkSorry Sep 2, 2019
f51b3e8
디자인 일부 개선2
ParkSorry Sep 2, 2019
55793b9
Merge pull request #71 from ParkSorry/Shalendar1.0
ParkSorry Sep 2, 2019
471b7b0
Main Animation Intent걸어놈
JINKOO Sep 5, 2019
350f659
Merge pull request #72 from JINKOO/Shalendar1.3
JINKOO Sep 5, 2019
4748fac
boarder깨짐 수정
Novjoon Sep 5, 2019
7004ae9
사이드바 수정
Novjoon Sep 5, 2019
dbbd83e
Merge pull request #73 from Novjoon/Shalendar1.0
Novjoon Sep 5, 2019
abae1f2
화면전환 수정
Novjoon Sep 6, 2019
28a2a73
Merge branch 'Shalendar1.0' of https://github.com/shalendar/Shalendar…
Novjoon Sep 6, 2019
a5c0e0b
Merge pull request #74 from Novjoon/Shalendar1.0
Novjoon Sep 6, 2019
4fc0bf4
캘린더 생성 코드 수정
Novjoon Sep 6, 2019
80315ef
Merge pull request #75 from Novjoon/Shalendar1.0
Novjoon Sep 6, 2019
4bd8eae
디자인 수정
ParkSorry Sep 6, 2019
c354d18
오류 수정
ParkSorry Sep 6, 2019
a85482b
Merge pull request #76 from ParkSorry/Shalendar1.0
ParkSorry Sep 6, 2019
92bf9d0
추천시간 적용중
JINKOO Sep 6, 2019
d3d984c
Merge branch 'Shalendar1.0' of https://github.com/shalendar/Shalendar…
JINKOO Sep 6, 2019
ca2cf0d
애니메이션 배경 수정
Novjoon Sep 6, 2019
9195e68
Merge pull request #77 from JINKOO/Shalendar1.3
JINKOO Sep 6, 2019
215ea76
Merge branch 'Shalendar1.0' of https://github.com/shalendar/Shalendar…
Novjoon Sep 6, 2019
cedacdf
달력 수정 뷰
JINKOO Sep 8, 2019
4eef802
Merge pull request #78 from JINKOO/Shalendar1.3
JINKOO Sep 8, 2019
631dfd2
새로고침 수정
Novjoon Sep 9, 2019
cef6c87
댓글 새로고침 수정
Novjoon Sep 9, 2019
569ad36
Merge pull request #79 from Novjoon/Shalendar1.0
Novjoon Sep 9, 2019
692b7bb
일정 수정 해야
JINKOO Sep 9, 2019
bee11f6
Merge branch 'Shalendar1.0' of https://github.com/shalendar/Shalendar…
JINKOO Sep 9, 2019
d2a6e19
일정 작성 수정(이전 data받아오기)
JINKOO Sep 9, 2019
cb3615c
Merge pull request #80 from JINKOO/Shalendar1.3
JINKOO Sep 9, 2019
ab53cf0
일정화면 swiperefresh입힘
Novjoon Sep 9, 2019
c5935d3
Merge branch 'Shalendar1.0' of https://github.com/shalendar/Shalendar…
Novjoon Sep 9, 2019
bb771e9
0910
Novjoon Sep 10, 2019
447c0bc
메인 애니메이션 수정
Novjoon Sep 10, 2019
b7e2371
Merge pull request #81 from Novjoon/Shalendar1.0
Novjoon Sep 10, 2019
79d0c90
애니메이션 이미지 파싱 성공
JINKOO Sep 10, 2019
2bd95ac
검색 뷰 수정해야
JINKOO Sep 10, 2019
3307b5e
Merge pull request #82 from JINKOO/Shalendar1.3
JINKOO Sep 10, 2019
06b2868
애니메이션 닫기 버튼
Novjoon Sep 11, 2019
c7d6d29
Merge pull request #83 from Novjoon/Shalendar1.0
Novjoon Sep 11, 2019
ea1ef0f
통신코드 수정
JINKOO Sep 11, 2019
64855b0
Merge branch 'Shalendar1.0' of https://github.com/shalendar/Shalendar…
JINKOO Sep 11, 2019
f7ef12d
코드1차 완성본
JINKOO Sep 11, 2019
e12145c
Merge pull request #84 from JINKOO/Shalendar1.3
JINKOO Sep 11, 2019
c79962c
팀원간 이미지 크기 조정
Novjoon Sep 11, 2019
48a9300
Merge branch 'Shalendar1.0' of https://github.com/shalendar/Shalendar…
Novjoon Sep 11, 2019
49779b0
Merge pull request #85 from Novjoon/Shalendar1.0
Novjoon Sep 11, 2019
b10d856
예외처리 어느정도 함(2차최종)
JINKOO Sep 12, 2019
3ac4d0d
Merge pull request #86 from JINKOO/Shalendar1.3
JINKOO Sep 12, 2019
3967cae
0912
Novjoon Sep 12, 2019
8c029d3
update 19.10.01
Novjoon Oct 1, 2019
04c4cf0
토스트 메세지 및 주석 수정
Novjoon Oct 3, 2019
5561496
Merge pull request #87 from Novjoon/Shalendar1.0
Novjoon Oct 3, 2019
6ae9024
주석 제거 및 일부코드 수정
JINKOO Oct 3, 2019
d0e4deb
코드 및 주석 제거, 수정
JINKOO Oct 3, 2019
1507491
전체 코드, 주석 수정
JINKOO Oct 3, 2019
77cfb4e
Merge branch 'shalendar:master' into Shalendar1.3
JINKOO May 3, 2022
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
  •  
  •  
  •  
11 changes: 11 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
*.iml
.gradle
/local.properties
/.idea/caches/build_file_checksums.ser
/.idea/libraries
/.idea/modules.xml
/.idea/workspace.xml
.DS_Store
/build
/captures
.externalNativeBuild
11 changes: 11 additions & 0 deletions .gitignore.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
*.iml
.gradle
/local.properties
/.idea/caches/build_file_checksums.ser
/.idea/libraries
/.idea/modules.xml
/.idea/workspace.xml
.DS_Store
/build
/captures
.externalNativeBuild
Binary file added .idea/caches/gradle_models.ser
Binary file not shown.
29 changes: 29 additions & 0 deletions .idea/codeStyles/Project.xml

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

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

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

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

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

12 changes: 12 additions & 0 deletions .idea/runConfigurations.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/vcs.xml

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

1 change: 1 addition & 0 deletions app/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
/build
76 changes: 76 additions & 0 deletions app/build.gradle
Original file line number Diff line number Diff line change
@@ -0,0 +1,76 @@
apply plugin: 'com.android.application'

android {
compileSdkVersion 28
defaultConfig {
applicationId "kr.ac.smu.cs.shalendar_java"
// minSdkVersion 15
minSdkVersion 16
targetSdkVersion 28
versionCode 1
versionName "1.0"
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"

}
buildTypes {
release {
minifyEnabled false
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
}
}
}

configurations.all {
resolutionStrategy.eachDependency { details ->
def requested = details.requested
if (requested.group == "com.android.support") {
if (!requested.name.startsWith("multidex")) {
details.useVersion "26.+"
}
// } else if (requested.group == "com.google.android.gms") {
// details.useVersion '11.8.0'
// } else if (requested.group == "com.google.firebase") {
// details.useVersion '11.8.0'
}
}
}

dependencies {
implementation fileTree(dir: 'libs', include: ['*.jar'])
implementation 'com.android.support:appcompat-v7:28.0.0'
implementation 'com.android.support:recyclerview-v7:28.0.0'
implementation 'com.android.support.constraint:constraint-layout:1.1.3'
// implementation 'com.android.support:support-v4:28+'
implementation 'com.android.support:design:28.0.0'
testImplementation 'junit:junit:4.12'

androidTestImplementation 'com.android.support.test:runner:1.0.2'
androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2'
implementation 'com.android.support:mediarouter-v7:28.0.0'

//add ExpandableTextView Library
implementation 'com.ms-square:expandableTextView:0.1.4'

//materialCalendarView
implementation 'com.prolificinteractive:material-calendarview:1.4.3'

//JSON
//implementation files('libs/json-simple-1.1.1.jar')

//Ion Library
implementation 'com.koushikdutta.ion:ion:2.+'

//Firbase 추가
// implementation 'com.google.firebase:firebase-core:17.0.0'

//Firebase FCM추가
// implementation 'com.google.firebase:firebase-messaging:19.0.1'
implementation 'com.google.firebase:firebase-messaging:17.3.4'

// 원 이미지 추가
implementation 'de.hdodenhof:circleimageview:2.2.0'

}

// Add to the bottom of the file
apply plugin: 'com.google.gms.google-services'
40 changes: 40 additions & 0 deletions app/google-services.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
{
"project_info": {
"project_number": "571052306999",
"firebase_url": "https://shalendar-7ff5c.firebaseio.com",
"project_id": "shalendar-7ff5c",
"storage_bucket": "shalendar-7ff5c.appspot.com"
},
"client": [
{
"client_info": {
"mobilesdk_app_id": "1:571052306999:android:34967914e68aa1d2",
"android_client_info": {
"package_name": "kr.ac.smu.cs.shalendar_java"
}
},
"oauth_client": [
{
"client_id": "571052306999-vl8vlrk63bqeimutg6tgm3u6n103flo4.apps.googleusercontent.com",
"client_type": 3
}
],
"api_key": [
{
"current_key": "AIzaSyDZTen7bzjIV2SVRxvJUYa9xJBI6h3Z0Dc"
}
],
"services": {
"appinvite_service": {
"other_platform_oauth_client": [
{
"client_id": "571052306999-vl8vlrk63bqeimutg6tgm3u6n103flo4.apps.googleusercontent.com",
"client_type": 3
}
]
}
}
}
],
"configuration_version": "1"
}
Binary file added app/libs/json-simple-1.1.1.jar
Binary file not shown.
21 changes: 21 additions & 0 deletions app/proguard-rules.pro
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
# Add project specific ProGuard rules here.
# You can control the set of applied configuration files using the
# proguardFiles setting in build.gradle.
#
# For more details, see
# http://developer.android.com/guide/developing/tools/proguard.html

# If your project uses WebView with JS, uncomment the following
# and specify the fully qualified class name to the JavaScript interface
# class:
#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
# public *;
#}

# Uncomment this to preserve the line number information for
# debugging stack traces.
#-keepattributes SourceFile,LineNumberTable

# If you keep the line number information, uncomment this to
# hide the original source file name.
#-renamesourcefileattribute SourceFile
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
package kr.ac.smu.cs.shalendar_java;

import android.content.Context;
import android.support.test.InstrumentationRegistry;
import android.support.test.runner.AndroidJUnit4;

import org.junit.Test;
import org.junit.runner.RunWith;

import static org.junit.Assert.*;

/**
* Instrumented test, which will execute on an Android device.
*
* @see <a href="http://d.android.com/tools/testing">Testing documentation</a>
*/
@RunWith(AndroidJUnit4.class)
public class ExampleInstrumentedTest {
@Test
public void useAppContext() {
// Context of the app under test.
Context appContext = InstrumentationRegistry.getTargetContext();

assertEquals("kr.ac.smu.cs.shalendar_java", appContext.getPackageName());
}
}
Loading