Merge pull request #157 from Promise-of-Blood/dev

씨앗 테스트 버전 1
Promise-of-Blood · Sep 12, 2024 · a3cd0b5 · a3cd0b5
2 parents ada70a5 + f0f4665
commit a3cd0b5
Show file tree

Hide file tree

Showing 362 changed files with 16,911 additions and 48 deletions.
diff --git a/.github/issue_template.md b/.github/issue_template.md
@@ -0,0 +1,14 @@
+## 🫠 설명
+
+<!-- 추가하려는 기능에 대해 간결하게 설명해주세요. -->
+>
+
+## ✨ 작업 내용
+
+<!-- 작업 상세 내용에 대해 작성해주세요. -->
+- [ ] TODO
+- [ ] TODO
+- [ ] TODO
+
+## 🏷️ 기타 (선택)
+<!-- 추가로 작성하고 싶은 내용이 있다면 작성해주세요. (선택) -->
diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md
@@ -0,0 +1,18 @@
+## 🏷️ 관련 이슈
+
+<!-- 관련된 이슈의 번호를 작성해주세요. -->
+- close #[이슈 번호]
+
+## 🔎 작업 내용
+
+<!-- 작업에 대해 상세히 설명해주세요. -->
+- 
+
+## 결과 화면
+
+<!-- 스크린샷 또는 GIF를 첨부해주세요. -->
+
+
+## 🥕 기타 (기타)
+
+<!-- 추가로 작성하고 싶은 내용이 있다면 작성해주세요. (선택) -->
diff --git a/.gitignore b/.gitignore
@@ -13,3 +13,4 @@
 .externalNativeBuild
 .cxx
 local.properties
+.idea
diff --git a/.idea/deploymentTargetSelector.xml b/.idea/deploymentTargetSelector.xml
diff --git a/.idea/git_toolbox_blame.xml b/.idea/git_toolbox_blame.xml
diff --git a/.idea/git_toolbox_prj.xml b/.idea/git_toolbox_prj.xml
diff --git a/.idea/gradle.xml b/.idea/gradle.xml
diff --git a/.idea/kotlinc.xml b/.idea/kotlinc.xml
diff --git a/.idea/misc.xml b/.idea/misc.xml
diff --git a/.idea/other.xml b/.idea/other.xml
diff --git a/.kotlin/errors/errors-1725541425852.log b/.kotlin/errors/errors-1725541425852.log
@@ -0,0 +1,46 @@
+kotlin version: 2.0.0
+error message: java.nio.file.NoSuchFileException: C:\Users\a4cro\AndroidStudioProjects\SeeAt\app\build\kspCaches\debug\backups\java\byRounds\1\hilt_aggregated_deps\_com_pob_seeat_di_NaverMapModule.java
+	at java.base/sun.nio.fs.WindowsException.translateToIOException(WindowsException.java:85)
+	at java.base/sun.nio.fs.WindowsException.rethrowAsIOException(WindowsException.java:103)
+	at java.base/sun.nio.fs.WindowsException.rethrowAsIOException(WindowsException.java:108)
+	at java.base/sun.nio.fs.WindowsFileCopy.copy(WindowsFileCopy.java:99)
+	at java.base/sun.nio.fs.WindowsFileSystemProvider.copy(WindowsFileSystemProvider.java:284)
+	at java.base/java.nio.file.Files.copy(Files.java:1305)
+	at com.google.devtools.ksp.common.IncrementalUtilKt.copyWithTimestamp(IncrementalUtil.kt:73)
+	at com.google.devtools.ksp.common.IncrementalContextBase.updateOutputs(IncrementalContextBase.kt:354)
+	at com.google.devtools.ksp.common.IncrementalContextBase.updateCachesAndOutputs(IncrementalContextBase.kt:478)
+	at com.google.devtools.ksp.AbstractKotlinSymbolProcessingExtension.doAnalysis(KotlinSymbolProcessingExtension.kt:362)
+	at org.jetbrains.kotlin.cli.jvm.compiler.TopDownAnalyzerFacadeForJVM.analyzeFilesWithJavaIntegration(TopDownAnalyzerFacadeForJVM.kt:112)
+	at org.jetbrains.kotlin.cli.jvm.compiler.TopDownAnalyzerFacadeForJVM.analyzeFilesWithJavaIntegration$default(TopDownAnalyzerFacadeForJVM.kt:75)
+	at org.jetbrains.kotlin.cli.jvm.compiler.KotlinToJVMBytecodeCompiler.analyze$lambda$12(KotlinToJVMBytecodeCompiler.kt:373)
+	at org.jetbrains.kotlin.cli.common.messages.AnalyzerWithCompilerReport.analyzeAndReport(AnalyzerWithCompilerReport.kt:115)
+	at org.jetbrains.kotlin.cli.jvm.compiler.KotlinToJVMBytecodeCompiler.analyze(KotlinToJVMBytecodeCompiler.kt:364)
+	at org.jetbrains.kotlin.cli.jvm.compiler.KotlinToJVMBytecodeCompiler.repeatAnalysisIfNeeded(KotlinToJVMBytecodeCompiler.kt:282)
+	at org.jetbrains.kotlin.cli.jvm.compiler.KotlinToJVMBytecodeCompiler.repeatAnalysisIfNeeded(KotlinToJVMBytecodeCompiler.kt:282)
+	at org.jetbrains.kotlin.cli.jvm.compiler.KotlinToJVMBytecodeCompiler.runFrontendAndGenerateIrUsingClassicFrontend(KotlinToJVMBytecodeCompiler.kt:195)
+	at org.jetbrains.kotlin.cli.jvm.compiler.KotlinToJVMBytecodeCompiler.compileModules$cli(KotlinToJVMBytecodeCompiler.kt:106)
+	at org.jetbrains.kotlin.cli.jvm.K2JVMCompiler.doExecute(K2JVMCompiler.kt:176)
+	at org.jetbrains.kotlin.cli.jvm.K2JVMCompiler.doExecute(K2JVMCompiler.kt:50)
+	at org.jetbrains.kotlin.cli.common.CLICompiler.execImpl(CLICompiler.kt:104)
+	at org.jetbrains.kotlin.cli.common.CLICompiler.execImpl(CLICompiler.kt:48)
+	at org.jetbrains.kotlin.cli.common.CLITool.exec(CLITool.kt:101)
+	at org.jetbrains.kotlin.daemon.CompileServiceImpl.compile(CompileServiceImpl.kt:1556)
+	at java.base/jdk.internal.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
+	at java.base/jdk.internal.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:77)
+	at java.base/jdk.internal.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)
+	at java.base/java.lang.reflect.Method.invoke(Method.java:568)
+	at java.rmi/sun.rmi.server.UnicastServerRef.dispatch(UnicastServerRef.java:360)
+	at java.rmi/sun.rmi.transport.Transport$1.run(Transport.java:200)
+	at java.rmi/sun.rmi.transport.Transport$1.run(Transport.java:197)
+	at java.base/java.security.AccessController.doPrivileged(AccessController.java:712)
+	at java.rmi/sun.rmi.transport.Transport.serviceCall(Transport.java:196)
+	at java.rmi/sun.rmi.transport.tcp.TCPTransport.handleMessages(TCPTransport.java:587)
+	at java.rmi/sun.rmi.transport.tcp.TCPTransport$ConnectionHandler.run0(TCPTransport.java:828)
+	at java.rmi/sun.rmi.transport.tcp.TCPTransport$ConnectionHandler.lambda$run$0(TCPTransport.java:705)
+	at java.base/java.security.AccessController.doPrivileged(AccessController.java:399)
+	at java.rmi/sun.rmi.transport.tcp.TCPTransport$ConnectionHandler.run(TCPTransport.java:704)
+	at java.base/java.util.concurrent.ThreadPoolExecutor.runWorker(ThreadPoolExecutor.java:1136)
+	at java.base/java.util.concurrent.ThreadPoolExecutor$Worker.run(ThreadPoolExecutor.java:635)
+	at java.base/java.lang.Thread.run(Thread.java:840)
+
+
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
@@ -7,6 +7,9 @@ plugins {
     alias(libs.plugins.kotlin.parcelize)
     alias(libs.plugins.google.services)
     alias(libs.plugins.ksp)
+    id("com.google.dagger.hilt.android")
+    id("com.google.android.gms.oss-licenses-plugin")
+    id("androidx.navigation.safeargs.kotlin")
 }
 
 val properties = Properties().apply {
@@ -29,8 +32,21 @@ android {
         buildConfigField(
             "String",
             "KAKAO_APP_KEY",
-            properties["KAKAO_APP_KEY"] as String
+            "\"${properties["KAKAO_APP_KEY"]}\""
         )
+
+        buildConfigField(
+            "String",
+            "NAVER_CLIENT_SECRET",
+            "\"${properties["NAVER_CLIENT_SECRET"]}\""
+        )
+
+        buildConfigField(
+            "String",
+            "WEB_CLIENT_ID",
+            "\"${properties["WEB_CLIENT_ID"]}\""
+        )
+
     }
 
     buildTypes {
@@ -67,6 +83,9 @@ dependencies {
     implementation(libs.material)
     implementation(libs.androidx.activity)
     implementation(libs.androidx.constraintlayout)
+    implementation(libs.androidx.navigation.fragment.ktx)
+    implementation(libs.androidx.navigation.ui.ktx)
+    implementation(libs.firebase.storage.ktx)
     testImplementation(libs.junit)
     androidTestImplementation(libs.androidx.junit)
     androidTestImplementation(libs.androidx.espresso.core)
@@ -93,6 +112,7 @@ dependencies {
 
     // glide
     implementation(libs.glide)
+    annotationProcessor(libs.glide.compiler)
 
     // kakao
     implementation(libs.kakao.maps)
@@ -101,4 +121,35 @@ dependencies {
     // naver
     implementation(libs.naver.login)
     implementation(libs.naver.map)
+    implementation(libs.play.services.location)
+
+    //google
+    implementation(libs.play.services.auth)
+
+    // oss
+    implementation(libs.play.services.oss.licenses)
+
+    // timber
+    implementation(libs.timber)
+
+    //image implement
+    implementation(libs.android.image.cropper)
+
+    // ViewPager2 Indicator
+    implementation(libs.circleindicator)
+
+    // PhotoView
+    implementation(libs.photoview)
+
+    implementation(libs.switchbutton.library)
+
+    // room
+    implementation(libs.androidx.room.ktx)
+    implementation(libs.androidx.room.runtime)
+    annotationProcessor(libs.androidx.room.compiler)
+    ksp(libs.androidx.room.compiler)
+    testImplementation(libs.androidx.room.testing)
+
+    // pull to refresh
+    implementation(libs.androidx.swiperefreshlayout)
 }
diff --git a/app/google-services.json b/app/google-services.json
@@ -1,26 +1,68 @@
 {
   "project_info": {
-    "project_number": "557859659489",
-    "project_id": "sampleproject-e6950",
-    "storage_bucket": "sampleproject-e6950.appspot.com"
+    "project_number": "569674873919",
+    "project_id": "see-at",
+    "storage_bucket": "see-at.appspot.com"
   },
   "client": [
     {
       "client_info": {
-        "mobilesdk_app_id": "1:557859659489:android:ec9e9ac35be4e3f39da1a0",
+        "mobilesdk_app_id": "1:569674873919:android:80eb1ad6d0888425544c8a",
         "android_client_info": {
           "package_name": "com.pob.seeat"
         }
       },
-      "oauth_client": [],
+      "oauth_client": [
+        {
+          "client_id": "569674873919-5oemq798lmtu23ji71sqlaf45nrc3s6a.apps.googleusercontent.com",
+          "client_type": 1,
+          "android_info": {
+            "package_name": "com.pob.seeat",
+            "certificate_hash": "b58bc0a33dcc56624513f21efdf8474519980d2e"
+          }
+        },
+        {
+          "client_id": "569674873919-7s4vc6njqqf20p15fn43vqmaq76l23ad.apps.googleusercontent.com",
+          "client_type": 1,
+          "android_info": {
+            "package_name": "com.pob.seeat",
+            "certificate_hash": "fa814c47b7249e429f6248d94f095661efd76fe6"
+          }
+        },
+        {
+          "client_id": "569674873919-c733qqddopu783icu9g6lbgrko51mc6g.apps.googleusercontent.com",
+          "client_type": 1,
+          "android_info": {
+            "package_name": "com.pob.seeat",
+            "certificate_hash": "c973ca6c6e52038c8db6f11223a6faf8053ff2f2"
+          }
+        },
+        {
+          "client_id": "569674873919-jpknocl3dbr3li8pgs488bt4fr4sgrj6.apps.googleusercontent.com",
+          "client_type": 1,
+          "android_info": {
+            "package_name": "com.pob.seeat",
+            "certificate_hash": "bd30d987ed77bd4ba369c6b8c76c1ded6293f25a"
+          }
+        },
+        {
+          "client_id": "569674873919-9dv0m1mrtpa74hitddb88pniasgp8up7.apps.googleusercontent.com",
+          "client_type": 3
+        }
+      ],
       "api_key": [
         {
-          "current_key": "AIzaSyCmn5q3B1NNqH-5f-pTTf70bjCEZqwiHSo"
+          "current_key": "AIzaSyDn1vMeD5uiUAUI83ZU2lnAQ536LFsHZFQ"
         }
       ],
       "services": {
         "appinvite_service": {
-          "other_platform_oauth_client": []
+          "other_platform_oauth_client": [
+            {
+              "client_id": "569674873919-9dv0m1mrtpa74hitddb88pniasgp8up7.apps.googleusercontent.com",
+              "client_type": 3
+            }
+          ]
         }
       }
     }

diff --git a/app/proguard-rules.pro b/app/proguard-rules.pro
@@ -18,4 +18,21 @@
 
 # If you keep the line number information, uncomment this to
 # hide the original source file name.
-#-renamesourcefileattribute SourceFile
+#-renamesourcefileattribute SourceFile
+
+    # Add this global rule
+    -keepattributes Signature
+
+    # This rule will properly ProGuard all the model classes in
+    # the package com.yourcompany.models.
+    # Modify this rule to fit the structure of your app.
+    -keepclassmembers class com.yourcompany.models.** {
+      *;
+    }
+
+    -keepclassmembers class * {
+        public <init>(...);
+    }
+    -keepnames class com.pob.seeat.data.model.chat.ChatsChattingModel {
+        public <init>(...);
+    }
-Original file line number
+Diff line change
@@ Expand Up / @@ -13,3 +13,4 @@ @@
     .externalNativeBuild
     .cxx
     local.properties
+    .idea