Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
bf8b6b0
move to naver map ㅎㅎ
7dngur7 Nov 18, 2023
a133b20
파이어스토어 연결, 마커 생성, 마커에 정보
7dngur7 Nov 19, 2023
137cbfa
파이어스토어에 인원 정보를 활용한 마커 위치 변경, infowindow에 정보표시
7dngur7 Nov 20, 2023
de77b87
collection안에 있는 모든 member들의 위치 마커로 띄우기, 위치 업데이트 버튼 만들어서 클릭할 때마다 위치 새로고침
7dngur7 Nov 25, 2023
6fa6399
document 개수 만큼 버튼 생성하기(카메라 위치 조정 미완)
7dngur7 Nov 25, 2023
8b187c0
버튼마다 마커 연결, 목표지점 도착시 체크, 도로명주소로 길찾기, 위치로 업로드,경로 빨간 선으로 표시하기 완료, (미완)두…
7dngur7 Nov 28, 2023
f6ea6a1
commit_gwanrok
ggwanrok Dec 3, 2023
37f30a9
지도 병합 완료
7dngur7 Dec 3, 2023
a780266
약속 리스트 구분해서 출력하기
7dngur7 Dec 3, 2023
bfbc86e
약속 생성시 users 컬렉션에 약속 정보 남기기
7dngur7 Dec 3, 2023
e572f92
약속 생성시 users 컬렉션에 약속 정보 남기기
7dngur7 Dec 5, 2023
10c6486
1차 merge
7dngur7 Dec 5, 2023
17fdc45
Merge remote-tracking branch 'origin/gwanrok' into woohyuk
7dngur7 Dec 5, 2023
fec22b6
채팅 및 친구 병합
7dngur7 Dec 5, 2023
b039fa3
채팅 및 친구 병합
7dngur7 Dec 5, 2023
b8ffc07
before 약속 수락, 약속거절
7dngur7 Dec 9, 2023
759ffd4
약속생성 병합 전
7dngur7 Dec 9, 2023
38b7adc
Merge remote-tracking branch 'origin/woohyuk' into woohyuk
7dngur7 Dec 13, 2023
4523b81
플젝 완성!!!!!!!!!!!!!
7dngur7 Dec 14, 2023
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
15 changes: 15 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
*.iml
.gradle
/local.properties
/.idea/caches
/.idea/libraries
/.idea/modules.xml
/.idea/workspace.xml
/.idea/navEditor.xml
/.idea/assetWizardSettings.xml
.DS_Store
/build
/captures
.externalNativeBuild
.cxx
local.properties
File renamed without changes.
1 change: 1 addition & 0 deletions .idea/.name

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.

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

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

1 change: 0 additions & 1 deletion TeamProjects/.idea/vcs.xml → .idea/vcs.xml

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

1 change: 0 additions & 1 deletion README.md

This file was deleted.

10 changes: 0 additions & 10 deletions TeamProjects/.idea/deploymentTargetDropDown.xml

This file was deleted.

3 changes: 2 additions & 1 deletion TeamProjects/.idea/gradle.xml

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

10 changes: 0 additions & 10 deletions TeamProjects/.idea/migrations.xml

This file was deleted.

6 changes: 0 additions & 6 deletions TeamProjects/.idea/render.experimental.xml

This file was deleted.

20 changes: 20 additions & 0 deletions TeamProjects/app/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -66,4 +66,24 @@ dependencies {

// Add the dependencies for any other desired Firebase products
// https://firebase.google.com/docs/android/setup#available-libraries
// Add the dependency for the Firebase Authentication library
// When using the BoM, you don't specify versions in Firebase library dependencies
implementation("com.google.firebase:firebase-auth")

// Declare the dependency for the Cloud Firestore library
// When using the BoM, you don't specify versions in Firebase library dependencies
implementation("com.google.firebase:firebase-firestore")

// FirebaseUI for Cloud Firestore
implementation ("com.firebaseui:firebase-ui-firestore:8.0.0")
implementation ("androidx.paging:paging-runtime:3.2.1")

// 네이버 지도 SDK
implementation("com.naver.maps:map-sdk:3.17.0")
//위치받아오기 구글서비스
implementation("com.google.android.gms:play-services-location:21.0.1")
//gson - geocoding 사용에 필요
implementation("com.squareup.retrofit2:retrofit:2.9.0")
implementation ("com.squareup.retrofit2:converter-gson:2.9.0")

}
40 changes: 36 additions & 4 deletions TeamProjects/app/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
@@ -1,6 +1,10 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools" >
xmlns:tools="http://schemas.android.com/tools">

<uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
<uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
<uses-permission android:name="android.permission.INTERNET" />

<application
android:allowBackup="true"
Expand All @@ -11,15 +15,21 @@
android:roundIcon="@mipmap/ic_launcher_round"
android:supportsRtl="true"
android:theme="@style/Theme.MyApplication"
tools:targetApi="31" >
tools:targetApi="31">
<activity
android:name=".map.NaverMapShowPromisePlace"
android:exported="false" />
<activity
android:name=".chat.ChatActivity"
android:exported="true" />
<activity
android:name=".initial_screen.sign_in"
android:exported="false"
android:label="@string/title_activity_sing_in"
android:theme="@style/Theme.MyApplication" />
<activity
android:name=".initial_screen.log_in"
android:exported="true" >
android:exported="true">
<intent-filter>
<action android:name="android.intent.action.MAIN" />

Expand All @@ -31,13 +41,35 @@
android:exported="false" />
<activity
android:name=".initial_screen.MainActivity"
android:exported="true" >
android:exported="true">
<intent-filter>
<action android:name="android.intent.action.MAIN" />

<category android:name="android.intent.category.LAUNCHER" />
</intent-filter>
</activity>
<activity
android:name=".map.NaverMapRealNew"
android:exported="true">
<intent-filter>
<action android:name="android.intent.action.MAIN" />

<category android:name="android.intent.category.LAUNCHER" />
</intent-filter>
</activity>
<activity
android:name=".map.NaverMapGeoCodingTest"
android:exported="true">
<intent-filter>
<action android:name="android.intent.action.MAIN" />

<category android:name="android.intent.category.LAUNCHER" />
</intent-filter>
</activity>

<meta-data
android:name="com.naver.maps.map.CLIENT_ID"
android:value="uilhyth3w8" />
</application>

</manifest>
Loading