[Nunu/#47] feat: 10주차 구현 (#49)

* [nunu/#47] update : 파일구조화

data(Model) / ui(View, Controller) / utils 구분

* [nunu/#47] feat: 카카오 로그인 구현

- gradle 설정
- 카카오 해시값 설정
- 카카오 로그인 구현
- 카카오 로그인 성공시 이동

UMC_6th/app/build.gradle.kts

@@ -92,4 +92,7 @@ dependencies {
     //Glide
     implementation("com.github.bumptech.glide:glide:4.11.0")
     annotationProcessor("com.github.bumptech.glide:compiler:4.11.0")
+
+    //카카오
+    implementation ("com.kakao.sdk:v2-user:2.20.1")
 }

UMC_6th/app/src/main/AndroidManifest.xml

@@ -8,6 +8,7 @@
     <uses-permission android:name="android.permission.POST_NOTIFICATIONS" />
 
     <application
+        android:name=".GlobalApplication"
         android:allowBackup="true"
         android:dataExtractionRules="@xml/data_extraction_rules"
         android:fullBackupContent="@xml/backup_rules"
@@ -19,13 +20,13 @@
         android:theme="@style/Theme.UMC_6th"
         tools:targetApi="31">
         <service
-            android:name=".ForegroundService"
+            android:name=".utils.ForegroundService"
             android:enabled="true"
             android:exported="false"
             android:foregroundServiceType="mediaPlayback"></service>
 
         <activity
-            android:name=".SplashActivity"
+            android:name=".ui.splash.SplashActivity"
             android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
@@ -34,16 +35,29 @@
             </intent-filter>
         </activity>
         <activity
-            android:name=".MainActivity"
+            android:name=".ui.main.MainActivity"
             android:exported="true"></activity>
         <activity
-            android:name=".SongActivity"
+            android:name=".ui.song.SongActivity"
             android:exported="true"
             android:hardwareAccelerated="true"
             android:label="@string/title_activity_song"
             android:theme="@style/Theme.UMC_6th"></activity>
-        <activity android:name=".LoginActivity"/>
-        <activity android:name=".SignUpActivity"/>
+        <activity android:name=".ui.login.LoginActivity"/>
+        <activity android:name=".ui.signup.SignUpActivity"/>
+        <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" />
+
+                <!-- Redirect URI: "kakao${NATIVE_APP_KEY}://oauth" -->
+                <data android:host="oauth"
+                    android:scheme="kakao9d12108978063874c1db2eef7e2b81de" />
+            </intent-filter>
+        </activity>
     </application>
 
 </manifest>

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, "9d12108978063874c1db2eef7e2b81de")
+    }
+}

UMC_6th/app/src/main/java/com/example/umc_6th/Album.kt → UMC_6th/app/src/main/java/com/example/umc_6th/data/entities/Album.kt

@@ -1,4 +1,4 @@
-package com.example.umc_6th
+package com.example.umc_6th.data.entities
 
 
 import androidx.room.Entity

UMC_6th/app/src/main/java/com/example/umc_6th/Like.kt → UMC_6th/app/src/main/java/com/example/umc_6th/data/entities/Like.kt

@@ -1,4 +1,4 @@
-package com.example.umc_6th
+package com.example.umc_6th.data.entities
 
 import androidx.room.Entity
 import androidx.room.PrimaryKey

UMC_6th/app/src/main/java/com/example/umc_6th/Song.kt → UMC_6th/app/src/main/java/com/example/umc_6th/data/entities/Song.kt

@@ -1,4 +1,4 @@
-package com.example.umc_6th
+package com.example.umc_6th.data.entities
 
 import androidx.room.Entity
 import androidx.room.PrimaryKey

UMC_6th/app/src/main/java/com/example/umc_6th/User.kt → UMC_6th/app/src/main/java/com/example/umc_6th/data/entities/User.kt

@@ -1,4 +1,4 @@
-package com.example.umc_6th
+package com.example.umc_6th.data.entities
 
 import androidx.room.Entity
 import androidx.room.PrimaryKey

UMC_6th/app/src/main/java/com/example/umc_6th/AlbumDao.kt → UMC_6th/app/src/main/java/com/example/umc_6th/data/local/AlbumDao.kt

@@ -1,6 +1,8 @@
-package com.example.umc_6th
+package com.example.umc_6th.data.local
 
 import androidx.room.*
+import com.example.umc_6th.data.entities.Album
+import com.example.umc_6th.data.entities.Like
 
 @Dao
 interface AlbumDao {

UMC_6th/app/src/main/java/com/example/umc_6th/SongDao.kt → UMC_6th/app/src/main/java/com/example/umc_6th/data/local/SongDao.kt

@@ -1,10 +1,11 @@
-package com.example.umc_6th
+package com.example.umc_6th.data.local
 
 import androidx.room.Dao
 import androidx.room.Delete
 import androidx.room.Insert
 import androidx.room.Query
 import androidx.room.Update
+import com.example.umc_6th.data.entities.Song
 
 @Dao
 interface SongDao {

UMC_6th/app/src/main/java/com/example/umc_6th/SongDatabase.kt → UMC_6th/app/src/main/java/com/example/umc_6th/data/local/SongDatabase.kt

@@ -1,9 +1,13 @@
-package com.example.umc_6th
+package com.example.umc_6th.data.local
 
 import android.content.Context
 import androidx.room.Database
 import androidx.room.Room
 import androidx.room.RoomDatabase
+import com.example.umc_6th.data.entities.Album
+import com.example.umc_6th.data.entities.Like
+import com.example.umc_6th.data.entities.Song
+import com.example.umc_6th.data.entities.User
 
 @Database(entities = [Song::class, Album::class, User::class, Like::class], version = 1)
 abstract class SongDatabase: RoomDatabase() {

UMC_6th/app/src/main/java/com/example/umc_6th/UserDao.kt → UMC_6th/app/src/main/java/com/example/umc_6th/data/local/UserDao.kt

@@ -1,8 +1,9 @@
-package com.example.umc_6th
+package com.example.umc_6th.data.local
 
 import androidx.room.Dao
 import androidx.room.Insert
 import androidx.room.Query
+import com.example.umc_6th.data.entities.User
 
 @Dao
 interface UserDao {

UMC_6th/app/src/main/java/com/example/umc_6th/ApiRepository.kt → UMC_6th/app/src/main/java/com/example/umc_6th/data/remote/ApiRepository.kt

@@ -1,4 +1,4 @@
-package com.example.umc_6th
+package com.example.umc_6th.data.remote
 
 class ApiRepository {
     companion object {

UMC_6th/app/src/main/java/com/example/umc_6th/BaseResponse.kt → UMC_6th/app/src/main/java/com/example/umc_6th/data/remote/BaseResponse.kt

@@ -1,4 +1,4 @@
-package com.example.umc_6th
+package com.example.umc_6th.data.remote
 
 import com.google.gson.annotations.SerializedName
 

UMC_6th/app/src/main/java/com/example/umc_6th/AlbumApi.kt → UMC_6th/app/src/main/java/com/example/umc_6th/data/remote/album/AlbumApi.kt

@@ -1,4 +1,4 @@
-package com.example.umc_6th
+package com.example.umc_6th.data.remote.album
 
 import retrofit2.Call
 import retrofit2.http.GET

UMC_6th/app/src/main/java/com/example/umc_6th/AlbumResponse.kt → UMC_6th/app/src/main/java/com/example/umc_6th/data/remote/album/AlbumResponse.kt

@@ -1,11 +1,12 @@
-package com.example.umc_6th
+package com.example.umc_6th.data.remote.album
 
 import com.google.gson.annotations.SerializedName
 
 data class AlbumResponse(    @SerializedName("isSuccess") val isSuccess: Boolean,
                              @SerializedName("code") val code: Int,
                              @SerializedName("message") val message: String,
-                             @SerializedName("result") val result: TodayAlbumResult)
+                             @SerializedName("result") val result: TodayAlbumResult
+)
 
 
 data class TodayAlbumResult(

UMC_6th/app/src/main/java/com/example/umc_6th/AlbumService.kt → UMC_6th/app/src/main/java/com/example/umc_6th/data/remote/album/AlbumService.kt

@@ -1,6 +1,8 @@
-package com.example.umc_6th
+package com.example.umc_6th.data.remote.album
 
 import android.util.Log
+import com.example.umc_6th.ui.main.home.HomeAlbumView
+import com.example.umc_6th.data.remote.auth.RetrofitInstance
 import retrofit2.Call
 import retrofit2.Callback
 import retrofit2.Response

UMC_6th/app/src/main/java/com/example/umc_6th/AuthApi.kt → UMC_6th/app/src/main/java/com/example/umc_6th/data/remote/auth/AuthApi.kt

@@ -1,5 +1,7 @@
-package com.example.umc_6th
+package com.example.umc_6th.data.remote.auth
 
+import com.example.umc_6th.data.entities.User
+import com.example.umc_6th.data.remote.BaseResponse
 import retrofit2.Call
 import retrofit2.http.Body
 import retrofit2.http.POST

UMC_6th/app/src/main/java/com/example/umc_6th/AuthService.kt → UMC_6th/app/src/main/java/com/example/umc_6th/data/remote/auth/AuthService.kt

@@ -1,6 +1,10 @@
-package com.example.umc_6th
+package com.example.umc_6th.data.remote.auth
 
 import android.util.Log
+import com.example.umc_6th.ui.login.LoginView
+import com.example.umc_6th.ui.signup.SignUpView
+import com.example.umc_6th.data.entities.User
+import com.example.umc_6th.data.remote.BaseResponse
 import retrofit2.Call
 import retrofit2.Callback
 import retrofit2.Response

UMC_6th/app/src/main/java/com/example/umc_6th/RetrofitInstance.kt → UMC_6th/app/src/main/java/com/example/umc_6th/data/remote/auth/RetrofitInstance.kt

@@ -1,5 +1,8 @@
-package com.example.umc_6th
+package com.example.umc_6th.data.remote.auth
 
+import com.example.umc_6th.data.remote.album.AlbumApi
+import com.example.umc_6th.data.remote.ApiRepository
+import com.example.umc_6th.data.remote.song.SongApi
 import retrofit2.Retrofit
 import retrofit2.converter.gson.GsonConverterFactory
 

UMC_6th/app/src/main/java/com/example/umc_6th/SongApi.kt → UMC_6th/app/src/main/java/com/example/umc_6th/data/remote/song/SongApi.kt

@@ -1,4 +1,4 @@
-package com.example.umc_6th
+package com.example.umc_6th.data.remote.song
 
 import retrofit2.Call
 import retrofit2.http.GET

UMC_6th/app/src/main/java/com/example/umc_6th/SongResponse.kt → UMC_6th/app/src/main/java/com/example/umc_6th/data/remote/song/SongResponse.kt

@@ -1,4 +1,4 @@
-package com.example.umc_6th
+package com.example.umc_6th.data.remote.song
 
 import com.google.gson.annotations.SerializedName
 

UMC_6th/app/src/main/java/com/example/umc_6th/SongService.kt → UMC_6th/app/src/main/java/com/example/umc_6th/data/remote/song/SongService.kt

@@ -1,6 +1,8 @@
-package com.example.umc_6th
+package com.example.umc_6th.data.remote.song
 
 import android.util.Log
+import com.example.umc_6th.ui.main.look.LookView
+import com.example.umc_6th.data.remote.auth.RetrofitInstance
 import retrofit2.Call
 import retrofit2.Callback
 import retrofit2.Response

UMC_6th/app/src/main/java/com/example/umc_6th/adapter/AlbumPagerAdapter.kt → UMC_6th/app/src/main/java/com/example/umc_6th/ui/adapter/AlbumPagerAdapter.kt

@@ -1,11 +1,11 @@
-package com.example.umc_6th.adapter
+package com.example.umc_6th.ui.adapter
 
 import androidx.fragment.app.Fragment
 import androidx.viewpager2.adapter.FragmentStateAdapter
-import com.example.umc_6th.AlbumDetailFragment
-import com.example.umc_6th.AlbumSongsFragment
-import com.example.umc_6th.AlbumVideoFragment
-import com.example.umc_6th.HomeFragment
+import com.example.umc_6th.ui.main.album.AlbumDetailFragment
+import com.example.umc_6th.ui.main.album.AlbumSongsFragment
+import com.example.umc_6th.ui.main.album.AlbumVideoFragment
+import com.example.umc_6th.ui.main.home.HomeFragment
 
 
 class AlbumPagerAdapter(fragment: Fragment) : FragmentStateAdapter(fragment) {