Merge pull request #35 from Begin-Vegan/feature/BVVER24-98-kakao_login

카카오 로그인 애플리케이션 추가 및 카카오 SDK 추가
Begin-Vegan · Apr 28, 2024 · 80cecb7 · 80cecb7
2 parents 2f9fab6 + 33db349
commit 80cecb7
Show file tree

Hide file tree

Showing 56 changed files with 53 additions and 37 deletions.
diff --git a/.gradle/8.4/checksums/checksums.lock b/.gradle/8.4/checksums/checksums.lock
diff --git a/.gradle/8.4/checksums/md5-checksums.bin b/.gradle/8.4/checksums/md5-checksums.bin
diff --git a/.gradle/8.4/checksums/sha1-checksums.bin b/.gradle/8.4/checksums/sha1-checksums.bin
diff --git a/.gradle/8.4/fileHashes/fileHashes.bin b/.gradle/8.4/fileHashes/fileHashes.bin
diff --git a/.gradle/8.4/fileHashes/fileHashes.lock b/.gradle/8.4/fileHashes/fileHashes.lock
diff --git a/.gradle/8.4/fileHashes/resourceHashesCache.bin b/.gradle/8.4/fileHashes/resourceHashesCache.bin
diff --git a/.gradle/buildOutputCleanup/buildOutputCleanup.lock b/.gradle/buildOutputCleanup/buildOutputCleanup.lock
diff --git a/.gradle/buildOutputCleanup/outputFiles.bin b/.gradle/buildOutputCleanup/outputFiles.bin
diff --git a/.idea/assetWizardSettings.xml b/.idea/assetWizardSettings.xml
diff --git a/buildSrc/.gradle/8.4/executionHistory/executionHistory.bin b/buildSrc/.gradle/8.4/executionHistory/executionHistory.bin
diff --git a/buildSrc/.gradle/8.4/executionHistory/executionHistory.lock b/buildSrc/.gradle/8.4/executionHistory/executionHistory.lock
diff --git a/buildSrc/.gradle/buildOutputCleanup/buildOutputCleanup.lock b/buildSrc/.gradle/buildOutputCleanup/buildOutputCleanup.lock
diff --git a/buildSrc/.gradle/buildOutputCleanup/outputFiles.bin b/buildSrc/.gradle/buildOutputCleanup/outputFiles.bin
diff --git a/buildSrc/build/classes/kotlin/main/Dependencies.class b/buildSrc/build/classes/kotlin/main/Dependencies.class
diff --git a/buildSrc/build/classes/kotlin/main/Versions.class b/buildSrc/build/classes/kotlin/main/Versions.class
diff --git a/buildSrc/build/kotlin/compileKotlin/cacheable/caches-jvm/inputs/source-to-output.tab b/buildSrc/build/kotlin/compileKotlin/cacheable/caches-jvm/inputs/source-to-output.tab
diff --git a/...Src/build/kotlin/compileKotlin/cacheable/caches-jvm/inputs/source-to-output.tab.keystream b/...Src/build/kotlin/compileKotlin/cacheable/caches-jvm/inputs/source-to-output.tab.keystream
diff --git a/...Src/build/kotlin/compileKotlin/cacheable/caches-jvm/inputs/source-to-output.tab.values.at b/...Src/build/kotlin/compileKotlin/cacheable/caches-jvm/inputs/source-to-output.tab.values.at
diff --git a/buildSrc/build/kotlin/compileKotlin/cacheable/caches-jvm/inputs/source-to-output.tab_i b/buildSrc/build/kotlin/compileKotlin/cacheable/caches-jvm/inputs/source-to-output.tab_i
diff --git a/buildSrc/build/kotlin/compileKotlin/cacheable/caches-jvm/jvm/kotlin/class-attributes.tab b/buildSrc/build/kotlin/compileKotlin/cacheable/caches-jvm/jvm/kotlin/class-attributes.tab
diff --git a/...build/kotlin/compileKotlin/cacheable/caches-jvm/jvm/kotlin/class-attributes.tab.values.at b/...build/kotlin/compileKotlin/cacheable/caches-jvm/jvm/kotlin/class-attributes.tab.values.at
diff --git a/...rc/build/kotlin/compileKotlin/cacheable/caches-jvm/jvm/kotlin/class-fq-name-to-source.tab b/...rc/build/kotlin/compileKotlin/cacheable/caches-jvm/jvm/kotlin/class-fq-name-to-source.tab
diff --git a/...otlin/compileKotlin/cacheable/caches-jvm/jvm/kotlin/class-fq-name-to-source.tab.values.at b/...otlin/compileKotlin/cacheable/caches-jvm/jvm/kotlin/class-fq-name-to-source.tab.values.at
diff --git a/buildSrc/build/kotlin/compileKotlin/cacheable/caches-jvm/jvm/kotlin/constants.tab b/buildSrc/build/kotlin/compileKotlin/cacheable/caches-jvm/jvm/kotlin/constants.tab
diff --git a/buildSrc/build/kotlin/compileKotlin/cacheable/caches-jvm/jvm/kotlin/constants.tab.values.at b/buildSrc/build/kotlin/compileKotlin/cacheable/caches-jvm/jvm/kotlin/constants.tab.values.at
diff --git a/...rc/build/kotlin/compileKotlin/cacheable/caches-jvm/jvm/kotlin/internal-name-to-source.tab b/...rc/build/kotlin/compileKotlin/cacheable/caches-jvm/jvm/kotlin/internal-name-to-source.tab
diff --git a/...otlin/compileKotlin/cacheable/caches-jvm/jvm/kotlin/internal-name-to-source.tab.values.at b/...otlin/compileKotlin/cacheable/caches-jvm/jvm/kotlin/internal-name-to-source.tab.values.at
diff --git a/buildSrc/build/kotlin/compileKotlin/cacheable/caches-jvm/jvm/kotlin/proto.tab b/buildSrc/build/kotlin/compileKotlin/cacheable/caches-jvm/jvm/kotlin/proto.tab
diff --git a/buildSrc/build/kotlin/compileKotlin/cacheable/caches-jvm/jvm/kotlin/proto.tab.values.at b/buildSrc/build/kotlin/compileKotlin/cacheable/caches-jvm/jvm/kotlin/proto.tab.values.at
diff --git a/buildSrc/build/kotlin/compileKotlin/cacheable/caches-jvm/jvm/kotlin/source-to-classes.tab b/buildSrc/build/kotlin/compileKotlin/cacheable/caches-jvm/jvm/kotlin/source-to-classes.tab
diff --git a/...uild/kotlin/compileKotlin/cacheable/caches-jvm/jvm/kotlin/source-to-classes.tab.values.at b/...uild/kotlin/compileKotlin/cacheable/caches-jvm/jvm/kotlin/source-to-classes.tab.values.at
diff --git a/buildSrc/build/kotlin/compileKotlin/cacheable/caches-jvm/lookups/counters.tab b/buildSrc/build/kotlin/compileKotlin/cacheable/caches-jvm/lookups/counters.tab
@@ -1,2 +1,2 @@
-5
+6
 0
diff --git a/buildSrc/build/kotlin/compileKotlin/cacheable/caches-jvm/lookups/file-to-id.tab b/buildSrc/build/kotlin/compileKotlin/cacheable/caches-jvm/lookups/file-to-id.tab
diff --git a/buildSrc/build/kotlin/compileKotlin/cacheable/caches-jvm/lookups/file-to-id.tab.values.at b/buildSrc/build/kotlin/compileKotlin/cacheable/caches-jvm/lookups/file-to-id.tab.values.at
diff --git a/buildSrc/build/kotlin/compileKotlin/cacheable/caches-jvm/lookups/id-to-file.tab b/buildSrc/build/kotlin/compileKotlin/cacheable/caches-jvm/lookups/id-to-file.tab
diff --git a/buildSrc/build/kotlin/compileKotlin/cacheable/caches-jvm/lookups/id-to-file.tab.keystream b/buildSrc/build/kotlin/compileKotlin/cacheable/caches-jvm/lookups/id-to-file.tab.keystream
diff --git a/...dSrc/build/kotlin/compileKotlin/cacheable/caches-jvm/lookups/id-to-file.tab.keystream.len b/...dSrc/build/kotlin/compileKotlin/cacheable/caches-jvm/lookups/id-to-file.tab.keystream.len
diff --git a/buildSrc/build/kotlin/compileKotlin/cacheable/caches-jvm/lookups/id-to-file.tab.len b/buildSrc/build/kotlin/compileKotlin/cacheable/caches-jvm/lookups/id-to-file.tab.len
diff --git a/buildSrc/build/kotlin/compileKotlin/cacheable/caches-jvm/lookups/id-to-file.tab.values.at b/buildSrc/build/kotlin/compileKotlin/cacheable/caches-jvm/lookups/id-to-file.tab.values.at
diff --git a/buildSrc/build/kotlin/compileKotlin/cacheable/caches-jvm/lookups/id-to-file.tab_i b/buildSrc/build/kotlin/compileKotlin/cacheable/caches-jvm/lookups/id-to-file.tab_i
diff --git a/buildSrc/build/kotlin/compileKotlin/cacheable/caches-jvm/lookups/lookups.tab b/buildSrc/build/kotlin/compileKotlin/cacheable/caches-jvm/lookups/lookups.tab
diff --git a/buildSrc/build/kotlin/compileKotlin/cacheable/caches-jvm/lookups/lookups.tab.keystream b/buildSrc/build/kotlin/compileKotlin/cacheable/caches-jvm/lookups/lookups.tab.keystream
diff --git a/buildSrc/build/kotlin/compileKotlin/cacheable/caches-jvm/lookups/lookups.tab.keystream.len b/buildSrc/build/kotlin/compileKotlin/cacheable/caches-jvm/lookups/lookups.tab.keystream.len
diff --git a/buildSrc/build/kotlin/compileKotlin/cacheable/caches-jvm/lookups/lookups.tab.len b/buildSrc/build/kotlin/compileKotlin/cacheable/caches-jvm/lookups/lookups.tab.len
diff --git a/buildSrc/build/kotlin/compileKotlin/cacheable/caches-jvm/lookups/lookups.tab.values.at b/buildSrc/build/kotlin/compileKotlin/cacheable/caches-jvm/lookups/lookups.tab.values.at
diff --git a/buildSrc/build/kotlin/compileKotlin/cacheable/caches-jvm/lookups/lookups.tab_i b/buildSrc/build/kotlin/compileKotlin/cacheable/caches-jvm/lookups/lookups.tab_i
diff --git a/buildSrc/build/kotlin/compileKotlin/cacheable/last-build.bin b/buildSrc/build/kotlin/compileKotlin/cacheable/last-build.bin
diff --git a/buildSrc/build/kotlin/compileKotlin/local-state/build-history.bin b/buildSrc/build/kotlin/compileKotlin/local-state/build-history.bin
diff --git a/buildSrc/build/libs/buildSrc.jar b/buildSrc/build/libs/buildSrc.jar
diff --git a/buildSrc/src/main/java/Dependencies.kt b/buildSrc/src/main/java/Dependencies.kt
@@ -66,4 +66,6 @@ object Dependencies {
     const val LOTTIE = "com.airbnb.android:lottie:${Versions.LOTTIE}"
 
     const val TIMBER = "com.jakewharton.timber:timber:${Versions.TIMBER}"
+
+    const val KAKAO_LOGIN ="com.kakao.sdk:v2-all:${Versions.KAKAO_LOGIN}"
 }
diff --git a/buildSrc/src/main/java/Versions.kt b/buildSrc/src/main/java/Versions.kt
@@ -36,4 +36,5 @@ object Versions {
     const val SPLASH_SCREEN = "1.0.0"
     const val LOTTIE = "6.4.0"
     const val TIMBER = "4.7.1"
+    const val KAKAO_LOGIN ="2.11.2"
 }
diff --git a/presentation/build.gradle.kts b/presentation/build.gradle.kts
@@ -121,6 +121,9 @@ dependencies {
 
     // Timber
     implementation(Dependencies.TIMBER)
+
+    implementation(Dependencies.KAKAO_LOGIN)
+
 //    implementation 'androidx.core:core-ktx:1.8.0'
 //    implementation 'androidx.appcompat:appcompat:1.6.1'
 //    implementation 'com.google.android.material:material:1.5.0'

diff --git a/presentation/src/main/AndroidManifest.xml b/presentation/src/main/AndroidManifest.xml
@@ -18,7 +18,21 @@
         android:theme="@style/Theme.Beginvegan"
         android:usesCleartextTraffic="true"
         tools:targetApi="31">
+<!--        카카오 로그인 용 UI 서버 협의 후 어떻게 사용방법에 따라 수정 -->
+<!--        <activity-->
+<!--            android:name="com.kakao.sdk.auth.AuthCodeHandlerActivity"-->
+<!--            android:exported="true">-->
+<!--            <intent-filter>-->
+<!--                <action android:name="android.intent.action.VIEW" />-->
+<!--                <category android:name="android.intent.category.DEFAULT" />-->
+<!--                <category android:name="android.intent.category.BROWSABLE" />-->
 
+<!--                &lt;!&ndash; Redirect URI: "kakao${NATIVE_APP_KEY}://oauth" &ndash;&gt;-->
+<!--                <data-->
+<!--                    android:host="oauth"-->
+<!--                    android:scheme="kakaofb5550ba69a57eb73aae78bc996d8a8e" />-->
+<!--            </intent-filter>-->
+<!--        </activity>-->
         <activity
             android:name=".view.main.SplashActivity"
             android:exported="true"></activity>

diff --git a/presentation/src/main/java/com/example/presentation/view/login/LoginActivity.kt b/presentation/src/main/java/com/example/presentation/view/login/LoginActivity.kt
@@ -277,8 +277,17 @@ class LoginActivity : BaseActivity<ActivityLoginBinding>(R.layout.activity_login
     }
 
     override fun init() {
-
         PermissionDialog().show(supportFragmentManager, "PermissionDialog")
+        setOnClickLogin()
+    }
+
+    private fun setOnClickLogin() {
+        binding.btnLoginKakao.setOnClickListener {
+            // 서버랑 논의하고 kakao 로그인 추가 sdk
+            // kakao Token 운용방식 아직모름 위 코드 참고 할 것
+            // 사전 방식 kakao에서 승인 받고 개인 정보만 받아서 다시 우리쪽 서버에 넘긴 후
+            // access Token , refresh token 발급
+        }
     }
 
 }
diff --git a/presentation/src/main/res/drawable/logo_beginvegan_vector.xml b/presentation/src/main/res/drawable/logo_beginvegan_vector.xml
@@ -0,0 +1,14 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="115dp"
+    android:height="132dp"
+    android:viewportWidth="115"
+    android:viewportHeight="132">
+  <group>
+    <clip-path
+        android:pathData="M44.82,11.98C39.78,8.22 33.65,7 29.66,7.11L29.62,7.11H7.94C7.94,9.4 7.94,13.65 7.94,22.03C7.94,30.31 10.29,36.15 13.65,39.88C16.99,43.58 21.58,45.49 26.71,45.49H47.63L47.65,45.49C49.31,45.51 51.52,45.91 53.67,46.98C53.66,46.89 53.65,46.8 53.63,46.71C53.43,45.51 53.04,43.96 52.28,42.46C51.54,40.97 50.47,39.58 48.94,38.56C47.44,37.56 45.27,36.77 42.07,36.77H31.1C29.17,36.77 27.61,35.21 27.61,33.29C27.61,31.36 29.17,29.8 31.1,29.8H42.07C46.49,29.8 50.04,30.92 52.82,32.77C53.17,33 53.5,33.24 53.82,33.49V32.46C53.82,21.85 49.69,15.62 44.82,11.98ZM53.82,59.16C53.82,56.21 52.71,54.71 51.56,53.84C50.26,52.85 48.61,52.48 47.58,52.46H26.71C19.77,52.46 13.23,49.83 8.46,44.54C3.7,39.26 0.96,31.63 0.96,22.03C0.96,13.07 0.96,8.84 0.96,6.66C0.96,4.47 0.96,4.37 0.96,3.63L0.96,0.14H29.52C34.79,0.01 42.5,1.55 49,6.41C55.04,10.92 59.79,18.13 60.66,28.84C65.71,22.63 73.87,18.1 86.18,18.1H110.01C112.39,18.1 114.3,20.03 114.3,22.38V40.21C114.3,47.13 112.64,55.09 108.27,61.42C103.79,67.93 96.57,72.5 86.18,72.5H64.96L64.96,70.43L64.86,72.5C64.16,72.47 63.05,72.66 62.22,73.25C61.59,73.69 60.8,74.56 60.8,76.72V82.84C60.8,84.95 61.51,85.57 61.85,85.8C62.4,86.17 63.19,86.28 63.71,86.21L63.93,86.19H83.56C84.66,86.19 86.38,86.35 87.67,87.61C89.27,89.17 89.07,91.14 88.75,92.18C88.44,93.19 87.86,94.04 87.42,94.61C86.96,95.2 86.44,95.73 85.98,96.16L52.44,129.63C50.76,131.31 48.72,131.72 46.99,131.46C45.42,131.23 44.15,130.49 43.37,129.84L43.26,129.74L9.56,96.11C8.59,95.14 7.79,94.16 7.28,93.14C6.78,92.14 6.33,90.61 7.02,89C7.69,87.4 9.07,86.72 9.9,86.46C10.71,86.2 11.5,86.16 12.11,86.19H45.98C47.91,86.19 49.47,87.75 49.47,89.67C49.47,91.59 47.91,93.15 45.98,93.15H16.48L47.8,124.42L79.12,93.15H64.35C62.6,93.33 60.1,93.05 57.91,91.55C55.39,89.83 53.82,86.89 53.82,82.84V59.17L53.82,59.16ZM60.8,52.47C64.32,49.21 69.11,46.91 74.82,46.91H86.18C88.1,46.91 89.67,48.47 89.67,50.39C89.67,52.32 88.1,53.88 86.18,53.88H74.82C70.62,53.88 67.13,55.77 64.65,58.49C62.46,60.88 61.19,63.75 60.88,66.18C62.42,65.65 63.92,65.49 65.1,65.54H86.18C94.19,65.54 99.29,62.15 102.52,57.47C105.86,52.63 107.32,46.18 107.32,40.21V25.07H86.18C74.99,25.07 68.73,29.38 65.2,34.39C62.26,38.57 61.04,43.49 60.8,47.45L60.8,48.52L60.8,48.52V50.29V52.47ZM11.79,93.15C11.79,93.15 11.8,93.15 11.81,93.15C11.8,93.15 11.79,93.15 11.79,93.15Z"
+        android:fillType="evenOdd"/>
+    <path
+        android:pathData="M-30.39,-0.39C-30.39,-11.55 -21.39,-20.59 -10.29,-20.59H118.2C129.3,-20.59 138.3,-11.55 138.3,-0.39V127.89C138.3,139.05 129.3,148.09 118.2,148.09H-10.29C-21.39,148.09 -30.39,139.05 -30.39,127.89V-0.39Z"
+        android:fillColor="#009861"/>
+  </group>
+</vector>
diff --git a/presentation/src/main/res/layout/activity_login.xml b/presentation/src/main/res/layout/activity_login.xml
@@ -13,40 +13,13 @@
         <!--    tools:context=".src.ui.view.login.LoginActivity">-->
         <ImageView
             android:id="@+id/iv_logo"
-            android:layout_width="92dp"
-            android:layout_height="92dp"
+            android:layout_width="113dp"
+            android:layout_height="113dp"
             app:layout_constraintTop_toTopOf="parent"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintEnd_toEndOf="parent"
-            android:layout_marginTop="184dp"
-            android:src="@drawable/logo_beginvegan" />
-
-        <TextView
-            android:id="@+id/tv_login_slogan"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:text="비기너에서 \n            로"
-            android:textSize="24sp"
-            android:textColor="@color/color_primary3"
-            android:fontFamily="@font/notosanskr_regular"
-            android:gravity="center"
-            app:layout_constraintTop_toBottomOf="@id/iv_logo"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintEnd_toEndOf="parent"
-            android:layout_marginTop="16dp" />
-
-        <TextView
-            android:id="@+id/tv_login_slogan_veganner"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:text="비거너"
-            android:textColor="@color/color_primary3"
-            android:textSize="24sp"
-            android:fontFamily="@font/notosanskr_bold"
-            app:layout_constraintBottom_toBottomOf="@id/tv_login_slogan"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintEnd_toEndOf="parent"
-            android:layout_marginEnd="30dp" />
+            app:layout_constraintBottom_toBottomOf="parent"
+            android:src="@drawable/logo_beginvegan_vector" />
 
         <ImageButton
             android:id="@+id/btn_login_kakao"
@@ -55,9 +28,9 @@
             android:src="@drawable/b_img_login_kakao"
             android:scaleType="fitCenter"
             android:background="@color/color_transparent"
-            app:layout_constraintTop_toBottomOf="@id/tv_login_slogan"
+            app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintEnd_toEndOf="parent"
-            android:layout_marginTop="132dp" />
+            app:layout_constraintTop_toBottomOf="@id/iv_logo" />
     </androidx.constraintlayout.widget.ConstraintLayout>
 </layout>