From 055aabe908b5026423f73c7766c83cf354ec06bc Mon Sep 17 00:00:00 2001
From: leesumin0526 <leesumin0526@gmail.com>
Date: Tue, 25 Jun 2024 00:38:14 +0900
Subject: [PATCH] =?UTF-8?q?[maro/#47]=20feat=20::=20=EC=B9=B4=EC=B9=B4?=
 =?UTF-8?q?=EC=98=A4=20=EB=A1=9C=EA=B7=B8=EC=9D=B8=20=EA=B5=AC=ED=98=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .idea/workspace.xml                           |  74 ++++--------
 UMC_6th/app/build.gradle.kts                  |   5 +
 UMC_6th/app/src/main/AndroidManifest.xml      |   9 +-
 .../com/example/umc_6th/GlobalApplication.kt  |  13 ++
 .../com/example/umc_6th/auth/LoginActivity.kt | 113 ++++++++----------
 .../com/example/umc_6th/ui/LockerFragment.kt  |   2 +-
 .../com/example/umc_6th/ui/LookFragment.kt    |   1 +
 .../src/main/res/layout/activity_login.xml    |   1 +
 UMC_6th/settings.gradle.kts                   |   3 +-
 9 files changed, 101 insertions(+), 120 deletions(-)
 create mode 100644 UMC_6th/app/src/main/java/com/example/umc_6th/GlobalApplication.kt

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 69daa53..98d7ca3 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -131,54 +131,15 @@
     <option name="autoReloadType" value="NONE" />
   </component>
   <component name="ChangeListManager">
-    <list default="true" id="2a0892f6-22ae-44d0-9c68-5f47b708a220" name="Changes" comment="[maro/#43] feat :: 9주차 구현 완료">
+    <list default="true" id="2a0892f6-22ae-44d0-9c68-5f47b708a220" name="Changes" comment="[maro/#47] feat :: 패키지 구조화">
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/UMC_6th/app/build.gradle.kts" beforeDir="false" afterPath="$PROJECT_DIR$/UMC_6th/app/build.gradle.kts" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/UMC_6th/app/src/main/AndroidManifest.xml" beforeDir="false" afterPath="$PROJECT_DIR$/UMC_6th/app/src/main/AndroidManifest.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/UMC_6th/app/src/main/java/com/example/umc_6th/Album.kt" beforeDir="false" afterPath="$PROJECT_DIR$/UMC_6th/app/src/main/java/com/example/umc_6th/music/Album.kt" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/UMC_6th/app/src/main/java/com/example/umc_6th/AlbumDao.kt" beforeDir="false" afterPath="$PROJECT_DIR$/UMC_6th/app/src/main/java/com/example/umc_6th/database/AlbumDao.kt" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/UMC_6th/app/src/main/java/com/example/umc_6th/AlbumFragment.kt" beforeDir="false" afterPath="$PROJECT_DIR$/UMC_6th/app/src/main/java/com/example/umc_6th/music/AlbumFragment.kt" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/UMC_6th/app/src/main/java/com/example/umc_6th/AlbumRVAdapter.kt" beforeDir="false" afterPath="$PROJECT_DIR$/UMC_6th/app/src/main/java/com/example/umc_6th/adapters/AlbumRVAdapter.kt" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/UMC_6th/app/src/main/java/com/example/umc_6th/AlbumVPAdapter.kt" beforeDir="false" afterPath="$PROJECT_DIR$/UMC_6th/app/src/main/java/com/example/umc_6th/adapters/AlbumVPAdapter.kt" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/UMC_6th/app/src/main/java/com/example/umc_6th/ApiRepository.kt" beforeDir="false" afterPath="$PROJECT_DIR$/UMC_6th/app/src/main/java/com/example/umc_6th/database/ApiRepository.kt" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/UMC_6th/app/src/main/java/com/example/umc_6th/AuthApi.kt" beforeDir="false" afterPath="$PROJECT_DIR$/UMC_6th/app/src/main/java/com/example/umc_6th/auth/AuthApi.kt" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/UMC_6th/app/src/main/java/com/example/umc_6th/AuthService.kt" beforeDir="false" afterPath="$PROJECT_DIR$/UMC_6th/app/src/main/java/com/example/umc_6th/auth/AuthService.kt" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/UMC_6th/app/src/main/java/com/example/umc_6th/BannerFragment.kt" beforeDir="false" afterPath="$PROJECT_DIR$/UMC_6th/app/src/main/java/com/example/umc_6th/ui/BannerFragment.kt" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/UMC_6th/app/src/main/java/com/example/umc_6th/BannerVPAdapter.kt" beforeDir="false" afterPath="$PROJECT_DIR$/UMC_6th/app/src/main/java/com/example/umc_6th/adapters/BannerVPAdapter.kt" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/UMC_6th/app/src/main/java/com/example/umc_6th/BottomSheetFragment.kt" beforeDir="false" afterPath="$PROJECT_DIR$/UMC_6th/app/src/main/java/com/example/umc_6th/util/BottomSheetFragment.kt" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/UMC_6th/app/src/main/java/com/example/umc_6th/Constant.kt" beforeDir="false" afterPath="$PROJECT_DIR$/UMC_6th/app/src/main/java/com/example/umc_6th/util/Constant.kt" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/UMC_6th/app/src/main/java/com/example/umc_6th/CustomSnackbar.kt" beforeDir="false" afterPath="$PROJECT_DIR$/UMC_6th/app/src/main/java/com/example/umc_6th/util/CustomSnackbar.kt" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/UMC_6th/app/src/main/java/com/example/umc_6th/DetailFragment.kt" beforeDir="false" afterPath="$PROJECT_DIR$/UMC_6th/app/src/main/java/com/example/umc_6th/ui/DetailFragment.kt" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/UMC_6th/app/src/main/java/com/example/umc_6th/ForegroundService.kt" beforeDir="false" afterPath="$PROJECT_DIR$/UMC_6th/app/src/main/java/com/example/umc_6th/util/ForegroundService.kt" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/UMC_6th/app/src/main/java/com/example/umc_6th/HomeFragment.kt" beforeDir="false" afterPath="$PROJECT_DIR$/UMC_6th/app/src/main/java/com/example/umc_6th/ui/HomeFragment.kt" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/UMC_6th/app/src/main/java/com/example/umc_6th/LockerAlbumRVAdapter.kt" beforeDir="false" afterPath="$PROJECT_DIR$/UMC_6th/app/src/main/java/com/example/umc_6th/adapters/LockerAlbumRVAdapter.kt" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/UMC_6th/app/src/main/java/com/example/umc_6th/LockerFragment.kt" beforeDir="false" afterPath="$PROJECT_DIR$/UMC_6th/app/src/main/java/com/example/umc_6th/LockerFragment.kt" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/UMC_6th/app/src/main/java/com/example/umc_6th/LockerVPAdapter.kt" beforeDir="false" afterPath="$PROJECT_DIR$/UMC_6th/app/src/main/java/com/example/umc_6th/adapters/LockerVPAdapter.kt" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/UMC_6th/app/src/main/java/com/example/umc_6th/LoginActivity.kt" beforeDir="false" afterPath="$PROJECT_DIR$/UMC_6th/app/src/main/java/com/example/umc_6th/auth/LoginActivity.kt" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/UMC_6th/app/src/main/java/com/example/umc_6th/LoginView.kt" beforeDir="false" afterPath="$PROJECT_DIR$/UMC_6th/app/src/main/java/com/example/umc_6th/auth/LoginView.kt" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/UMC_6th/app/src/main/java/com/example/umc_6th/LookFragment.kt" beforeDir="false" afterPath="$PROJECT_DIR$/UMC_6th/app/src/main/java/com/example/umc_6th/ui/LookFragment.kt" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/UMC_6th/app/src/main/java/com/example/umc_6th/MainActivity.kt" beforeDir="false" afterPath="$PROJECT_DIR$/UMC_6th/app/src/main/java/com/example/umc_6th/ui/MainActivity.kt" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/UMC_6th/app/src/main/java/com/example/umc_6th/MusicFileFragment.kt" beforeDir="false" afterPath="$PROJECT_DIR$/UMC_6th/app/src/main/java/com/example/umc_6th/music/MusicFileFragment.kt" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/UMC_6th/app/src/main/java/com/example/umc_6th/PannelVPAdapter.kt" beforeDir="false" afterPath="$PROJECT_DIR$/UMC_6th/app/src/main/java/com/example/umc_6th/adapters/PannelVPAdapter.kt" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/UMC_6th/app/src/main/java/com/example/umc_6th/RetrofitInstance.kt" beforeDir="false" afterPath="$PROJECT_DIR$/UMC_6th/app/src/main/java/com/example/umc_6th/util/RetrofitInstance.kt" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/UMC_6th/app/src/main/java/com/example/umc_6th/SavedAlbumFragment.kt" beforeDir="false" afterPath="$PROJECT_DIR$/UMC_6th/app/src/main/java/com/example/umc_6th/SavedAlbumFragment.kt" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/UMC_6th/app/src/main/java/com/example/umc_6th/SavedAlbumRVAdapter.kt" beforeDir="false" afterPath="$PROJECT_DIR$/UMC_6th/app/src/main/java/com/example/umc_6th/adapters/SavedAlbumRVAdapter.kt" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/UMC_6th/app/src/main/java/com/example/umc_6th/SavedSongFragment.kt" beforeDir="false" afterPath="$PROJECT_DIR$/UMC_6th/app/src/main/java/com/example/umc_6th/SavedSongFragment.kt" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/UMC_6th/app/src/main/java/com/example/umc_6th/SignUpActivity.kt" beforeDir="false" afterPath="$PROJECT_DIR$/UMC_6th/app/src/main/java/com/example/umc_6th/auth/SignUpActivity.kt" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/UMC_6th/app/src/main/java/com/example/umc_6th/SignUpView.kt" beforeDir="false" afterPath="$PROJECT_DIR$/UMC_6th/app/src/main/java/com/example/umc_6th/auth/SignUpView.kt" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/UMC_6th/app/src/main/java/com/example/umc_6th/Song.kt" beforeDir="false" afterPath="$PROJECT_DIR$/UMC_6th/app/src/main/java/com/example/umc_6th/music/Song.kt" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/UMC_6th/app/src/main/java/com/example/umc_6th/SongActivity.kt" beforeDir="false" afterPath="$PROJECT_DIR$/UMC_6th/app/src/main/java/com/example/umc_6th/music/SongActivity.kt" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/UMC_6th/app/src/main/java/com/example/umc_6th/SongApi.kt" beforeDir="false" afterPath="$PROJECT_DIR$/UMC_6th/app/src/main/java/com/example/umc_6th/database/SongApi.kt" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/UMC_6th/app/src/main/java/com/example/umc_6th/SongDao.kt" beforeDir="false" afterPath="$PROJECT_DIR$/UMC_6th/app/src/main/java/com/example/umc_6th/database/SongDao.kt" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/UMC_6th/app/src/main/java/com/example/umc_6th/SongDatabase.kt" beforeDir="false" afterPath="$PROJECT_DIR$/UMC_6th/app/src/main/java/com/example/umc_6th/database/SongDatabase.kt" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/UMC_6th/app/src/main/java/com/example/umc_6th/SongFragment.kt" beforeDir="false" afterPath="$PROJECT_DIR$/UMC_6th/app/src/main/java/com/example/umc_6th/music/SongFragment.kt" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/UMC_6th/app/src/main/java/com/example/umc_6th/SongRVAdapter.kt" beforeDir="false" afterPath="$PROJECT_DIR$/UMC_6th/app/src/main/java/com/example/umc_6th/adapters/SongRVAdapter.kt" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/UMC_6th/app/src/main/java/com/example/umc_6th/SongService.kt" beforeDir="false" afterPath="$PROJECT_DIR$/UMC_6th/app/src/main/java/com/example/umc_6th/database/SongService.kt" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/UMC_6th/app/src/main/java/com/example/umc_6th/UserDao.kt" beforeDir="false" afterPath="$PROJECT_DIR$/UMC_6th/app/src/main/java/com/example/umc_6th/database/UserDao.kt" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/UMC_6th/app/src/main/java/com/example/umc_6th/VideoFragment.kt" beforeDir="false" afterPath="$PROJECT_DIR$/UMC_6th/app/src/main/java/com/example/umc_6th/ui/VideoFragment.kt" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/UMC_6th/app/src/main/res/layout/activity_main.xml" beforeDir="false" afterPath="$PROJECT_DIR$/UMC_6th/app/src/main/res/layout/activity_main.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/UMC_6th/app/src/main/res/layout/fragment_bottom_sheet.xml" beforeDir="false" afterPath="$PROJECT_DIR$/UMC_6th/app/src/main/res/layout/fragment_bottom_sheet.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/UMC_6th/app/src/main/res/layout/fragment_home.xml" beforeDir="false" afterPath="$PROJECT_DIR$/UMC_6th/app/src/main/res/layout/fragment_home.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/UMC_6th/app/src/main/res/layout/fragment_music_file.xml" beforeDir="false" afterPath="$PROJECT_DIR$/UMC_6th/app/src/main/res/layout/fragment_music_file.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/UMC_6th/app/src/main/java/com/example/umc_6th/auth/LoginActivity.kt" beforeDir="false" afterPath="$PROJECT_DIR$/UMC_6th/app/src/main/java/com/example/umc_6th/auth/LoginActivity.kt" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/UMC_6th/app/src/main/java/com/example/umc_6th/ui/LockerFragment.kt" beforeDir="false" afterPath="$PROJECT_DIR$/UMC_6th/app/src/main/java/com/example/umc_6th/ui/LockerFragment.kt" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/UMC_6th/app/src/main/java/com/example/umc_6th/ui/LookFragment.kt" beforeDir="false" afterPath="$PROJECT_DIR$/UMC_6th/app/src/main/java/com/example/umc_6th/ui/LookFragment.kt" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/UMC_6th/app/src/main/res/layout/activity_login.xml" beforeDir="false" afterPath="$PROJECT_DIR$/UMC_6th/app/src/main/res/layout/activity_login.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/UMC_6th/settings.gradle.kts" beforeDir="false" afterPath="$PROJECT_DIR$/UMC_6th/settings.gradle.kts" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -316,6 +277,7 @@
       <recent name="C:\android\MARO_HW1\UMC_6th\app\src\main\res\layout" />
     </key>
     <key name="MoveFile.RECENT_KEYS">
+      <recent name="C:\android\MARO_HW1\UMC_6th\app\src\main\java\com\example\umc_6th\models" />
       <recent name="C:\android\MARO_HW1\UMC_6th\app\src\main\res\drawable" />
       <recent name="C:\android\MARO_HW1\UMC_6th\app\src\main\res\raw" />
     </key>
@@ -323,11 +285,11 @@
       <recent name="com.example.umc_6th" />
     </key>
     <key name="MoveKotlinTopLevelDeclarationsDialog.RECENTS_KEY">
+      <recent name="com.example.umc_6th.auth" />
+      <recent name="com.example.umc_6th.ui" />
+      <recent name="com.example.umc_6th.fragments" />
       <recent name="com.example.umc_6th.adapters" />
       <recent name="com.example.umc_6th.util" />
-      <recent name="com.example.umc_6th.database" />
-      <recent name="com.example.umc_6th.music" />
-      <recent name="com.example.umc_6th.ui" />
     </key>
   </component>
   <component name="RunManager" selected="Android App.app">
@@ -967,7 +929,15 @@
       <option name="project" value="LOCAL" />
       <updated>1719237181690</updated>
     </task>
-    <option name="localTasksCounter" value="37" />
+    <task id="LOCAL-00037" summary="[maro/#47] feat :: 패키지 구조화">
+      <option name="closed" value="true" />
+      <created>1719238543674</created>
+      <option name="number" value="00037" />
+      <option name="presentableId" value="LOCAL-00037" />
+      <option name="project" value="LOCAL" />
+      <updated>1719238543674</updated>
+    </task>
+    <option name="localTasksCounter" value="38" />
     <servers />
   </component>
   <component name="Vcs.Log.Tabs.Properties">
@@ -992,7 +962,6 @@
     </option>
   </component>
   <component name="VcsManagerConfiguration">
-    <MESSAGE value="[maro/#7] fix : binding 버그 수정" />
     <MESSAGE value="[maro/#13] feat : ViewPager Banner" />
     <MESSAGE value="[maro/#13] feat : ViewPager Background" />
     <MESSAGE value="[maro/#13] feat : ViewPager Indicator, CircleIndicator, Auto Slide" />
@@ -1017,6 +986,7 @@
     <MESSAGE value="[maro/#38] feat :: 저장 앨범 탭, 둘러보기 페이지 제작" />
     <MESSAGE value="[maro/#38] feat :: 8주차 구현 완료" />
     <MESSAGE value="[maro/#43] feat :: 9주차 구현 완료" />
-    <option name="LAST_COMMIT_MESSAGE" value="[maro/#43] feat :: 9주차 구현 완료" />
+    <MESSAGE value="[maro/#47] feat :: 패키지 구조화" />
+    <option name="LAST_COMMIT_MESSAGE" value="[maro/#47] feat :: 패키지 구조화" />
   </component>
 </project>
\ No newline at end of file
diff --git a/UMC_6th/app/build.gradle.kts b/UMC_6th/app/build.gradle.kts
index f1f6d04..0d9d219 100644
--- a/UMC_6th/app/build.gradle.kts
+++ b/UMC_6th/app/build.gradle.kts
@@ -4,6 +4,8 @@ plugins {
     id("kotlin-kapt")
 }
 
+
+
 android {
     namespace = "com.example.umc_6th"
     compileSdk = 34
@@ -16,6 +18,7 @@ android {
         dataBinding = true
     }
 
+
     defaultConfig {
         applicationId = "com.example.umc_6th"
         minSdk = 24
@@ -43,9 +46,11 @@ android {
         jvmTarget = JavaVersion.VERSION_1_8.toString()
     }
 
+
 }
 
 dependencies {
+    implementation("com.kakao.sdk:v2-user:2.12.1")
     implementation("com.google.android.material:material:1.10.0")
     implementation("androidx.room:room-migration:2.6.0")
     implementation("androidx.room:room-runtime:2.6.0")
diff --git a/UMC_6th/app/src/main/AndroidManifest.xml b/UMC_6th/app/src/main/AndroidManifest.xml
index 3f5d35c..2143b63 100644
--- a/UMC_6th/app/src/main/AndroidManifest.xml
+++ b/UMC_6th/app/src/main/AndroidManifest.xml
@@ -8,6 +8,7 @@
     <uses-permission android:name="android.permission.INTERNET" />
 
     <application
+        android:name=".GlobalApplication"
         android:allowBackup="true"
         android:dataExtractionRules="@xml/data_extraction_rules"
         android:fullBackupContent="@xml/backup_rules"
@@ -17,9 +18,13 @@
         android:supportsRtl="true"
         android:theme="@style/Theme.UMC_6th"
         tools:targetApi="31">
+        <meta-data
+            android:name="com.kakao.sdk.AppKey"
+            android:value="9869def2f21ef97ba7f905ec34960cbb"/>
 
-        <activity android:name=".SignUpActivity" />
-        <activity android:name=".LoginActivity"/>
+        <activity android:name=".auth.SignUpActivity" />
+        <activity android:name=".auth.LoginActivity"/>
+        <activity android:name=".GlobalApplication"/>
 
         <activity
             android:name=".ui.MainActivity"
diff --git a/UMC_6th/app/src/main/java/com/example/umc_6th/GlobalApplication.kt b/UMC_6th/app/src/main/java/com/example/umc_6th/GlobalApplication.kt
new file mode 100644
index 0000000..4113f23
--- /dev/null
+++ b/UMC_6th/app/src/main/java/com/example/umc_6th/GlobalApplication.kt
@@ -0,0 +1,13 @@
+package com.example.umc_6th
+
+import android.app.Application
+import com.kakao.sdk.common.KakaoSdk
+
+class GlobalApplication : Application() {
+    override fun onCreate() {
+        super.onCreate()
+
+        // Kakao Sdk 초기화
+        KakaoSdk.init(this, "9869def2f21ef97ba7f905ec34960cbb")
+    }
+}
\ No newline at end of file
diff --git a/UMC_6th/app/src/main/java/com/example/umc_6th/auth/LoginActivity.kt b/UMC_6th/app/src/main/java/com/example/umc_6th/auth/LoginActivity.kt
index d20a64a..002320f 100644
--- a/UMC_6th/app/src/main/java/com/example/umc_6th/auth/LoginActivity.kt
+++ b/UMC_6th/app/src/main/java/com/example/umc_6th/auth/LoginActivity.kt
@@ -1,92 +1,77 @@
-package com.example.umc_6th.auth
-import com.example.umc_6th.models.Result
+package com.example.yourapp
 
 import android.content.Intent
-import androidx.appcompat.app.AppCompatActivity
 import android.os.Bundle
+import android.util.Log
+import android.widget.ImageView
 import android.widget.Toast
-import com.example.umc_6th.ui.MainActivity
-import com.example.umc_6th.models.User
+import androidx.appcompat.app.AppCompatActivity
+import com.example.umc_6th.auth.SignUpActivity
 import com.example.umc_6th.databinding.ActivityLoginBinding
+import com.example.umc_6th.ui.MainActivity
+import com.kakao.sdk.auth.model.OAuthToken
+import com.kakao.sdk.user.UserApiClient
 
+class LoginActivity : AppCompatActivity() {
 
-class LoginActivity : AppCompatActivity(), LoginView {
-
-    lateinit var binding : ActivityLoginBinding
+    lateinit var binding: ActivityLoginBinding
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         binding = ActivityLoginBinding.inflate(layoutInflater)
         setContentView(binding.root)
 
-        binding.loginSignUpTv.setOnClickListener {
-            val intent = Intent(this, SignUpActivity::class.java)
-            startActivity(intent)
-        }
-
+        // 기존 로그인 버튼 클릭 이벤트
         binding.loginSignInBtn.setOnClickListener {
             login()
         }
-    }
 
-    private fun login() {
-        if (binding.loginIdEt.text.toString().isEmpty() || binding.loginDirectInputEt.text.toString().isEmpty()) {
-            Toast.makeText(this, "이메일을 입력해주세요", Toast.LENGTH_SHORT).show()
-            return
+        // 회원가입 버튼 클릭 이벤트
+        binding.loginSignUpTv.setOnClickListener {
+            startActivity(Intent(this, SignUpActivity::class.java))
         }
 
-        if (binding.loginPasswordEt.text.toString().isEmpty()) {
-            Toast.makeText(this, "비밀번호를 입력해주세요", Toast.LENGTH_SHORT).show()
-            return
+        // 카카오 로그인 버튼 클릭 이벤트
+        binding.loginKakakoLoginIv.setOnClickListener {
+            loginWithKakao()
         }
-
-        val email : String = binding.loginIdEt.text.toString() + "@" + binding.loginDirectInputEt.text.toString()
-        val pwd : String = binding.loginPasswordEt.text.toString()
-
-//        val songDB = SongDatabase.getInstance(this)!!
-//        val user = songDB.userDao().getUser(email, pwd)
-//
-//        if (user != null) {
-//            Log.d("LoginActivity", user.id.toString())
-//            saveJwt(user.id)
-//            startMainActivity()
-//        } else {
-//            Toast.makeText(this, "회원 정보가 존재하지 않습니다", Toast.LENGTH_SHORT).show()
-//        }
-
-        val authService = AuthService()
-        authService.setLoginView(this)
-
-        authService.login(User(email, pwd, ""))
     }
 
-    private fun saveJwt(jwt : Int) {
-        val spf = getSharedPreferences("auth", MODE_PRIVATE)
-        val editor = spf.edit()
-
-        editor.putInt("jwt", jwt)
-        editor.apply()
-    }
-
-    private fun saveJwtFromServer(jwt : String) {
-        val spf = getSharedPreferences("auth2", MODE_PRIVATE)
-        val editor = spf.edit()
-
-        editor.putString("jwt", jwt)
-        editor.apply()
-    }
+    private fun login() {
+        // 기존 로그인 로직
+        if (binding.loginIdEt.text.toString().isEmpty() || binding.loginPasswordEt.text.toString().isEmpty()) {
+            Toast.makeText(this, "이메일과 비밀번호를 입력해주세요", Toast.LENGTH_SHORT).show()
+            return
+        }
 
-    private fun startMainActivity() {
-        val intent = Intent(this, MainActivity::class.java)
-        startActivity(intent)
+        // 로그인 검증 로직, 서버 통신 등
+        // 로그인 성공 후 메인 액티비티로 이동 예시
+        startActivity(Intent(this, MainActivity::class.java))
+        finish()
     }
 
-    override fun onLoginSuccess(code : Int, result: Result) {
-        saveJwtFromServer(result.jwt)
-        startMainActivity()
+    private fun loginWithKakao() {
+        if (UserApiClient.instance.isKakaoTalkLoginAvailable(this)) {
+            UserApiClient.instance.loginWithKakaoTalk(this) { token, error ->
+                handleLoginResult(token, error)
+            }
+        } else {
+            UserApiClient.instance.loginWithKakaoAccount(this) { token, error ->
+                handleLoginResult(token, error)
+            }
+        }
     }
 
-    override fun onLoginFailure(message : String) {
-        Toast.makeText(this, message, Toast.LENGTH_SHORT).show()
+    private fun handleLoginResult(token: OAuthToken?, error: Throwable?) {
+        if (error != null) {
+            Log.e("LoginActivity", "카카오 로그인 실패", error)
+            Toast.makeText(this, "로그인 실패: ${error.localizedMessage}", Toast.LENGTH_SHORT).show()
+        } else if (token != null) {
+            Log.i("LoginActivity", "카카오 로그인 성공 ${token.accessToken}")
+            Toast.makeText(this, "로그인 성공", Toast.LENGTH_SHORT).show()
+            // 로그인 성공 시 MainActivity로 이동
+            startActivity(Intent(this, MainActivity::class.java))
+            finish()
+        }
     }
-}
\ No newline at end of file
+}
diff --git a/UMC_6th/app/src/main/java/com/example/umc_6th/ui/LockerFragment.kt b/UMC_6th/app/src/main/java/com/example/umc_6th/ui/LockerFragment.kt
index 580efd3..eb7d771 100644
--- a/UMC_6th/app/src/main/java/com/example/umc_6th/ui/LockerFragment.kt
+++ b/UMC_6th/app/src/main/java/com/example/umc_6th/ui/LockerFragment.kt
@@ -8,9 +8,9 @@ import android.view.View
 import android.view.ViewGroup
 import androidx.appcompat.app.AppCompatActivity
 import com.example.umc_6th.adapters.LockerVPAdapter
-import com.example.umc_6th.auth.LoginActivity
 import com.example.umc_6th.databinding.FragmentLockerBinding
 import com.example.umc_6th.util.BottomSheetFragment
+import com.example.yourapp.LoginActivity
 import com.google.android.material.tabs.TabLayoutMediator
 
 class LockerFragment : Fragment() {
diff --git a/UMC_6th/app/src/main/java/com/example/umc_6th/ui/LookFragment.kt b/UMC_6th/app/src/main/java/com/example/umc_6th/ui/LookFragment.kt
index 9fa7f07..34a2e2b 100644
--- a/UMC_6th/app/src/main/java/com/example/umc_6th/ui/LookFragment.kt
+++ b/UMC_6th/app/src/main/java/com/example/umc_6th/ui/LookFragment.kt
@@ -13,6 +13,7 @@ import com.example.umc_6th.adapters.SongRVAdapter
 import com.example.umc_6th.database.SongService
 import com.example.umc_6th.databinding.FragmentLookBinding
 
+
 class LookFragment : Fragment(), LookView {
 
     lateinit var binding: FragmentLookBinding
diff --git a/UMC_6th/app/src/main/res/layout/activity_login.xml b/UMC_6th/app/src/main/res/layout/activity_login.xml
index 7a3b16f..ba3c8fb 100644
--- a/UMC_6th/app/src/main/res/layout/activity_login.xml
+++ b/UMC_6th/app/src/main/res/layout/activity_login.xml
@@ -272,6 +272,7 @@
             android:layout_height="45dp"
             android:layout_marginStart="15dp"
             android:layout_marginEnd="15dp"
+            android:onClick="loginWithKakao"
             android:src="@drawable/kakako_44" />
 
         <ImageView
diff --git a/UMC_6th/settings.gradle.kts b/UMC_6th/settings.gradle.kts
index c68b8ae..d67fd9d 100644
--- a/UMC_6th/settings.gradle.kts
+++ b/UMC_6th/settings.gradle.kts
@@ -10,9 +10,10 @@ dependencyResolutionManagement {
     repositories {
         google()
         mavenCentral()
+        maven { url = uri("https://devrepo.kakao.com/nexus/content/groups/public/")
     }
 }
 
 rootProject.name = "UMC_6th"
-include(":app")
+include(":app")}
  
\ No newline at end of file