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

중간과정 #19

Open
wants to merge 51 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
51 commits
Select commit Hold shift + click to select a range
54b9594
Create pull_request_template.md
yoouyoou Aug 9, 2022
cd7b888
layout: 채팅화면,말풍선 파일 생성 및 구현
yoouyoou Aug 10, 2022
06fcf0e
layout: 말풍선 및 팝업창 뷰구현
yoouyoou Aug 15, 2022
daac32c
layout: themes파일 Appcompat으로 변경
yoouyoou Aug 15, 2022
1b90304
layout: 채팅프래그먼트 리사이클러뷰 추
yoouyoou Aug 15, 2022
35f4c8e
layout: mbti 맞추기 화면 구현
yoouyoou Aug 17, 2022
5d6974b
layout: mbit 맞추기 화면 수정
yoouyoou Aug 17, 2022
f33b958
layout: 채팅화면 리사이클러뷰 생성
yoouyoou Aug 17, 2022
ef8eafe
Merge pull request #3 from UMC-Hackathon/feature/chat-view
yoouyoou Aug 17, 2022
e8fe74b
로그인 화면 구현 완료
cherrynana320 Aug 17, 2022
3f23ece
Merge branch 'develop' into feature/login-view
cherrynana320 Aug 17, 2022
4bb9f06
Merge pull request #6 from UMC-Hackathon/feature/login-view
cherrynana320 Aug 17, 2022
e9428a6
마이페이지 코드 추가(어진코드)
yoouyoou Aug 18, 2022
f3a995c
어진코드 추가
yoouyoou Aug 19, 2022
986cac2
Merge pull request #8 from UMC-Hackathon/feature/eojin
yoouyoou Aug 19, 2022
1e5f4d8
feat: 웹소켓 okhttp3이용
yoouyoou Aug 20, 2022
cb1b6aa
feat: 웹소켓 stomp라이브러리 이
yoouyoou Aug 21, 2022
5630915
feat: 채팅관련 레트로핏 파일 생
yoouyoou Aug 21, 2022
466b685
data
eojinny Aug 22, 2022
687b780
Merge pull request #10 from UMC-Hackathon/feature/data
eojinny Aug 23, 2022
eb8811c
feat: 채팅리스트 불러오기
yoouyoou Aug 23, 2022
415ccec
데이터 연결
eojinny Aug 23, 2022
30ad9d1
Merge pull request #12 from UMC-Hackathon/feature/data
eojinny Aug 23, 2022
66fcf01
eun
moongpom Aug 23, 2022
9460236
message/tree R
moongpom Aug 23, 2022
4c05a52
메세지랑 트리 가져옴
moongpom Aug 23, 2022
e840833
카카로 로그인 로그 추가
moongpom Aug 23, 2022
6b41589
Merge pull request #14 from UMC-Hackathon/eun
moongpom Aug 23, 2022
03fc4a0
build.gradle잘못올림
moongpom Aug 23, 2022
0a4d1df
Merge pull request #15 from UMC-Hackathon/eun
moongpom Aug 23, 2022
f4ba9d9
버전 및 오류 수정
moongpom Aug 23, 2022
bb7d2f2
버전 및 오류 수정
moongpom Aug 23, 2022
bd45eaa
버전 TreeService.kt 코드 추가
moongpom Aug 23, 2022
06e4938
Merge pull request #17 from UMC-Hackathon/eun
moongpom Aug 23, 2022
68ee07f
Update LoginActivity.kt
eojinny Aug 23, 2022
6cb2de4
버전카톡친구
moongpom Aug 23, 2022
8c52404
Merge branch 'develop' of https://github.com/UMC-Hackathon/MBTree_And…
moongpom Aug 23, 2022
d96260f
Add files via upload
eojinny Aug 23, 2022
e49bc09
Add files via upload
eojinny Aug 23, 2022
5ad0355
ㅊcherry
moongpom Aug 24, 2022
882b99c
ãcherry 충돌 합침
moongpom Aug 24, 2022
6358331
Merge pull request #20 from UMC-Hackathon/euncherry
moongpom Aug 24, 2022
ac39954
d
moongpom Aug 24, 2022
f82eea2
충돌 수정
moongpom Aug 24, 2022
d7cc4ca
Merge pull request #21 from UMC-Hackathon/eun
moongpom Aug 24, 2022
802ef6b
feat: 실시간 채팅 구현
yoouyoou Aug 24, 2022
7268135
feat: 채팅 퀴즈 불러오기
yoouyoou Aug 24, 2022
afe4a82
merge 충돌 해결
yoouyoou Aug 25, 2022
c671368
Merge pull request #23 from UMC-Hackathon/feature/websocket
yoouyoou Aug 25, 2022
c4e62b2
setting: ignore파일 수정
yoouyoou Aug 25, 2022
ffa147c
Merge pull request #25 from UMC-Hackathon/feature/websocket
yoouyoou Aug 25, 2022
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions .github/pull_request_template.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
### ✅이슈번호
- 샵버튼으로 연동

### ✅변경 사항
- 예시

### ✅참고 사항
- 따로 참고사항 없으면 지워도 됩니다
145 changes: 134 additions & 11 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,15 +1,138 @@
*.iml
.gradle
/local.properties
/.idea/caches
/.idea/libraries
/.idea/modules.xml
/.idea/workspace.xml
/.idea/navEditor.xml
/.idea/assetWizardSettings.xml
# Created by https://www.toptal.com/developers/gitignore/api/kotlin,androidstudio
# Edit at https://www.toptal.com/developers/gitignore?templates=kotlin,androidstudio

.DS_Store
/build
/captures
.externalNativeBuild
.cxx

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

# Log file
*.log

# 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
*.apk
*.ap_
*.aab

# Files for the ART/Dalvik VM
*.dex

# Java class files

# Generated files
bin/
gen/
out/

# Gradle files
.gradle
.gradle/
build/

# Signing files
.signing/

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

# Proguard folder generated by Eclipse
proguard/

# Log Files

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

# Keystore files
*.jks
*.keystore

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

# Android Patch
gen-external-apklibs

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

# NDK
obj/

# IntelliJ IDEA
*.iml
*.iws
/out/

# User-specific configurations
.idea/

# 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/kotlin,androidstudio
3 changes: 0 additions & 3 deletions .idea/.gitignore

This file was deleted.

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

This file was deleted.

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

This file was deleted.

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

This file was deleted.

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

This file was deleted.

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

This file was deleted.

48 changes: 48 additions & 0 deletions app/build.gradle
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
plugins {
id 'com.android.application'
id 'org.jetbrains.kotlin.android'
id 'kotlin-android-extensions'
}

android {
Expand Down Expand Up @@ -33,6 +34,13 @@ android {
kotlinOptions {
jvmTarget = '1.8'
}

// 뷰바인딩 사용
buildFeatures {
viewBinding = true
}

configurations { implementation.exclude group: 'org.jetbrains', module: 'annotations' }
}

dependencies {
Expand All @@ -41,7 +49,47 @@ dependencies {
implementation 'androidx.appcompat:appcompat:1.4.2'
implementation 'com.google.android.material:material:1.6.1'
implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
implementation 'androidx.room:room-common:2.3.0'
implementation 'androidx.room:room-compiler:2.3.0'
implementation 'com.google.ar.sceneform:filament-android:1.17.1'
testImplementation 'junit:junit:4.13.2'
androidTestImplementation 'androidx.test.ext:junit:1.1.3'
androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0'

// 카카오 로그인
implementation "com.kakao.sdk:v2-user:2.11.0"

// 카카오 친구, 메세지
implementation "com.kakao.sdk:v2-talk:2.11.0"

// glide 라이브러리
implementation 'com.github.bumptech.glide:glide:4.12.0'

//circleView
implementation 'de.hdodenhof:circleimageview:3.1.0'

//okhttp
implementation 'com.squareup.okhttp3:okhttp:3.12.6'
implementation 'com.squareup.okhttp3:mockwebserver:3.12.1'


// stomp
implementation 'com.github.NaikSoftware:StompProtocolAndroid:1.6.6'
//rx
implementation 'io.reactivex.rxjava2:rxjava:2.2.5'
implementation 'io.reactivex.rxjava2:rxandroid:2.1.0'

/* Coroutine
implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.6.0'
implementation 'com.squareup.retrofit2:retrofit:2.6.0'
implementation 'com.squareup.retrofit2:converter-gson:2.6.0'
implementation "com.squareup.okhttp3:logging-interceptor:4.5.0"
implementation 'de.hdodenhof:circleimageview:3.1.0'
implementation 'com.squareup.retrofit2:retrofit:2.9.0'
implementation 'com.squareup.retrofit2:converter-gson:2.9.0'
implementation 'com.google.code.gson:gson:2.8.6'
implementation 'com.squareup.okhttp3:okhttp:4.9.1'
implementation 'com.squareup.okhttp3:logging-interceptor:4.9.1'

*/
}
Loading