[Kara/#47] feat : 10주차 구현

UMC_6th/app/src/main/AndroidManifest.xml

@@ -13,10 +13,10 @@
         android:supportsRtl="true"
         android:theme="@style/Theme.MyApplication"
         tools:targetApi="31">
-        <activity android:name=".LoginActivity"></activity>
-        <activity android:name=".SignUpActivity"></activity>
+        <activity android:name=".ui.signin.LoginActivity"></activity>
+        <activity android:name=".ui.singup.SignUpActivity"></activity>
         <activity
-            android:name=".MainActivity"
+            android:name=".ui.main.MainActivity"
             android:exported="true"
             android:theme="@style/SplashTheme">
             <intent-filter>
@@ -26,7 +26,7 @@
             </intent-filter>
         </activity>
         <activity
-            android:name=".SongActivity"
+            android:name=".ui.song.SongActivity"
             android:exported="true"></activity>
     </application>
 

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

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

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

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

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

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

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

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

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

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

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

@@ -1,6 +1,7 @@
-package com.example.myfirstapp
+package com.example.myfirstapp.data.local
 
 import androidx.room.*
+import com.example.myfirstapp.data.entities.Song
 
 @Dao
 interface SongDao {

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

@@ -1,9 +1,13 @@
-package com.example.myfirstapp
+package com.example.myfirstapp.data.local
 
 import android.content.Context
 import androidx.room.Database
 import androidx.room.Room
 import androidx.room.RoomDatabase
+import com.example.myfirstapp.data.entities.Album
+import com.example.myfirstapp.data.entities.Like
+import com.example.myfirstapp.data.entities.Song
+import com.example.myfirstapp.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/myfirstapp/UserDao.kt → UMC_6th/app/src/main/java/com/example/myfirstapp/data/local/UserDao.kt

@@ -1,6 +1,7 @@
-package com.example.myfirstapp
+package com.example.myfirstapp.data.local
 
 import androidx.room.*
+import com.example.myfirstapp.data.entities.User
 
 @Dao
 interface UserDao {

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

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

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

@@ -1,6 +1,7 @@
-package com.example.myfirstapp
+package com.example.myfirstapp.data.remote
 
 
+import com.example.myfirstapp.data.entities.User
 import retrofit2.Call
 import retrofit2.http.*
 

UMC_6th/app/src/main/java/com/example/myfirstapp/AuthResponse.kt → UMC_6th/app/src/main/java/com/example/myfirstapp/data/remote/AuthResponse.kt

@@ -1,3 +1,3 @@
-package com.example.myfirstapp
+package com.example.myfirstapp.data.remote
 
 data class AuthResponse(val isSucess:Boolean, val code:Int, val message:String)

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

@@ -1,6 +1,9 @@
-package com.example.myfirstapp
+package com.example.myfirstapp.data.remote
 
 import android.util.Log
+import com.example.myfirstapp.ui.signin.LoginView
+import com.example.myfirstapp.ui.singup.SignUpView
+import com.example.myfirstapp.data.entities.User
 import retrofit2.Call
 import retrofit2.Callback
 import retrofit2.Response

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

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

UMC_6th/app/src/main/java/com/example/myfirstapp/data/remote/CommunicationInterface.kt

@@ -0,0 +1,7 @@
+package com.example.myfirstapp.data.remote
+
+import com.example.myfirstapp.data.entities.Album
+
+interface CommunicationInterface {
+    fun sendData(album: Album)
+}

UMC_6th/app/src/main/java/com/example/myfirstapp/Result.kt → UMC_6th/app/src/main/java/com/example/myfirstapp/data/remote/Result.kt

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

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

@@ -1,4 +1,4 @@
-package com.example.myfirstapp
+package com.example.myfirstapp.data.remote
 
 import retrofit2.Retrofit
 import retrofit2.converter.gson.GsonConverterFactory

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

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

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

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

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

@@ -1,6 +1,7 @@
-package com.example.myfirstapp
+package com.example.myfirstapp.data.remote
 
 import android.util.Log
+import com.example.myfirstapp.ui.main.look.LookView
 import retrofit2.Call
 import retrofit2.Callback
 import retrofit2.Response

UMC_6th/app/src/main/java/com/example/myfirstapp/AlbumRVAdapter.kt → UMC_6th/app/src/main/java/com/example/myfirstapp/ui/adapter/AlbumRVAdapter.kt

@@ -1,8 +1,9 @@
-package com.example.myfirstapp
+package com.example.myfirstapp.ui.adapter
 
 import android.view.LayoutInflater
 import android.view.ViewGroup
 import androidx.recyclerview.widget.RecyclerView
+import com.example.myfirstapp.data.entities.Album
 import com.example.myfirstapp.databinding.ItemAlbumBinding
 
 class AlbumRVAdapter(private val albumlist: ArrayList<Album>): RecyclerView.Adapter<AlbumRVAdapter.ViewHolder>() {
@@ -27,12 +28,12 @@ class AlbumRVAdapter(private val albumlist: ArrayList<Album>): RecyclerView.Adap
         albumlist.removeAt(position)
         notifyDataSetChanged()
     }
-    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): AlbumRVAdapter.ViewHolder {
+    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ViewHolder {
         val binding : ItemAlbumBinding = ItemAlbumBinding.inflate(LayoutInflater.from(parent.context), parent, false)
         return ViewHolder(binding)
     }
 
-    override fun onBindViewHolder(holder: AlbumRVAdapter.ViewHolder, position: Int) {
+    override fun onBindViewHolder(holder: ViewHolder, position: Int) {
         holder.bind(albumlist[position])
         holder.itemView.setOnClickListener{
             myItemClickListener.onItemClick(albumlist[position])

UMC_6th/app/src/main/java/com/example/myfirstapp/AlbumVpAdapter.kt → UMC_6th/app/src/main/java/com/example/myfirstapp/ui/adapter/AlbumVpAdapter.kt

@@ -1,7 +1,10 @@
-package com.example.myfirstapp
+package com.example.myfirstapp.ui.adapter
 
 import androidx.fragment.app.Fragment
 import androidx.viewpager2.adapter.FragmentStateAdapter
+import com.example.myfirstapp.ui.main.album.DetailFragment
+import com.example.myfirstapp.ui.main.album.SongFragment
+import com.example.myfirstapp.ui.main.album.VideoFragment
 
 class AlbumVpAdapter(fragment: Fragment) : FragmentStateAdapter(fragment) {
     override fun getItemCount(): Int = 3

UMC_6th/app/src/main/java/com/example/myfirstapp/BannerVPAdapter.kt → UMC_6th/app/src/main/java/com/example/myfirstapp/ui/adapter/BannerVPAdapter.kt

@@ -1,4 +1,4 @@
-package com.example.myfirstapp
+package com.example.myfirstapp.ui.adapter
 
 import androidx.fragment.app.Fragment
 import androidx.viewpager2.adapter.FragmentStateAdapter

UMC_6th/app/src/main/java/com/example/myfirstapp/LockerAlbumRVAdapter.kt → UMC_6th/app/src/main/java/com/example/myfirstapp/ui/adapter/LockerAlbumRVAdapter.kt

@@ -1,9 +1,10 @@
-package com.example.myfirstapp
+package com.example.myfirstapp.ui.adapter
 
 import android.util.SparseBooleanArray
 import android.view.LayoutInflater
 import android.view.ViewGroup
 import androidx.recyclerview.widget.RecyclerView
+import com.example.myfirstapp.data.entities.Song
 import com.example.myfirstapp.databinding.ItemLockerAlbumBinding
 
 class LockerAlbumRVAdapter () : RecyclerView.Adapter<LockerAlbumRVAdapter.ViewHolder>() {
@@ -13,14 +14,14 @@ class LockerAlbumRVAdapter () : RecyclerView.Adapter<LockerAlbumRVAdapter.ViewHo
     override fun onCreateViewHolder(
         parent: ViewGroup,
         viewType: Int
-    ): LockerAlbumRVAdapter.ViewHolder {
+    ): ViewHolder {
         val binding: ItemLockerAlbumBinding = ItemLockerAlbumBinding
             .inflate(LayoutInflater.from(parent.context), parent, false)
 
         return ViewHolder(binding)
     }
 
-    override fun onBindViewHolder(holder: LockerAlbumRVAdapter.ViewHolder, position: Int) {
+    override fun onBindViewHolder(holder: ViewHolder, position: Int) {
         holder.bind(songs[position])
 
         holder.binding.itemAlbumMoreIv.setOnClickListener {

UMC_6th/app/src/main/java/com/example/myfirstapp/LockerVPAdapter.kt → UMC_6th/app/src/main/java/com/example/myfirstapp/ui/adapter/LockerVPAdapter.kt

@@ -1,7 +1,10 @@
-package com.example.myfirstapp
+package com.example.myfirstapp.ui.adapter
 
 import androidx.fragment.app.Fragment
 import androidx.viewpager2.adapter.FragmentStateAdapter
+import com.example.myfirstapp.ui.main.locker.MusicFileFragment
+import com.example.myfirstapp.ui.main.locker.SavedAlbumFragment
+import com.example.myfirstapp.ui.main.locker.SavedSongFragment
 
 class LockerVPAdapter (fragment: Fragment) : FragmentStateAdapter(fragment){
     override fun getItemCount(): Int = 3

UMC_6th/app/src/main/java/com/example/myfirstapp/PannelVPAdapter.kt → UMC_6th/app/src/main/java/com/example/myfirstapp/ui/adapter/PannelVPAdapter.kt

@@ -1,4 +1,4 @@
-package com.example.myfirstapp
+package com.example.myfirstapp.ui.adapter
 
 import androidx.fragment.app.Fragment
 import androidx.viewpager2.adapter.FragmentStateAdapter

UMC_6th/app/src/main/java/com/example/myfirstapp/SavedAlbumRVAdapter.kt → UMC_6th/app/src/main/java/com/example/myfirstapp/ui/adapter/SavedAlbumRVAdapter.kt

@@ -1,9 +1,10 @@
-package com.example.myfirstapp
+package com.example.myfirstapp.ui.adapter
 
 import android.annotation.SuppressLint
 import android.view.LayoutInflater
 import android.view.ViewGroup
 import androidx.recyclerview.widget.RecyclerView
+import com.example.myfirstapp.data.entities.Album
 import com.example.myfirstapp.databinding.ItemLockerAlbumBinding
 
 class SavedAlbumRVAdapter (): RecyclerView.Adapter<SavedAlbumRVAdapter.ViewHolder>() {
@@ -19,13 +20,13 @@ class SavedAlbumRVAdapter (): RecyclerView.Adapter<SavedAlbumRVAdapter.ViewHolde
         mItemClickListener = itemClickListener
     }
 
-    override fun onCreateViewHolder(viewGroup: ViewGroup, viewType: Int): SavedAlbumRVAdapter.ViewHolder {
+    override fun onCreateViewHolder(viewGroup: ViewGroup, viewType: Int): ViewHolder {
         val binding: ItemLockerAlbumBinding = ItemLockerAlbumBinding.inflate(LayoutInflater.from(viewGroup.context), viewGroup, false)
 
         return ViewHolder(binding)
     }
 
-    override fun onBindViewHolder(holder: SavedAlbumRVAdapter.ViewHolder, position: Int) {
+    override fun onBindViewHolder(holder: ViewHolder, position: Int) {
         holder.bind(albums[position])
         holder.binding.itemAlbumMoreIv.setOnClickListener {
             mItemClickListener.onRemoveSong(albums[position].id)

UMC_6th/app/src/main/java/com/example/myfirstapp/SongRVAdapter.kt → UMC_6th/app/src/main/java/com/example/myfirstapp/ui/adapter/SongRVAdapter.kt

@@ -1,4 +1,4 @@
-package com.example.myfirstapp
+package com.example.myfirstapp.ui.adapter
 
 import android.content.Context
 import android.util.Log
@@ -8,18 +8,19 @@ import android.widget.ImageView
 import android.widget.TextView
 import androidx.recyclerview.widget.RecyclerView
 import com.bumptech.glide.Glide
+import com.example.myfirstapp.data.remote.FloChartResult
 import com.example.myfirstapp.databinding.ItemSongBinding
 
 class SongRVAdapter(val context: Context, val result : FloChartResult) : RecyclerView.Adapter<SongRVAdapter.ViewHolder>() {
 
 
-    override fun onCreateViewHolder(viewGroup: ViewGroup, viewType: Int): SongRVAdapter.ViewHolder {
+    override fun onCreateViewHolder(viewGroup: ViewGroup, viewType: Int): ViewHolder {
         val binding: ItemSongBinding = ItemSongBinding.inflate(LayoutInflater.from(viewGroup.context), viewGroup, false)
 
         return ViewHolder(binding)
     }
 
-    override fun onBindViewHolder(holder: SongRVAdapter.ViewHolder, position: Int) {
+    override fun onBindViewHolder(holder: ViewHolder, position: Int) {
         //holder.bind(result.songs[position])
 
         if(result.songs[position].coverImgUrl == "" || result.songs[position].coverImgUrl == null){

UMC_6th/app/src/main/java/com/example/myfirstapp/MainActivity.kt → UMC_6th/app/src/main/java/com/example/myfirstapp/ui/main/MainActivity.kt

@@ -1,4 +1,4 @@
-package com.example.myfirstapp
+package com.example.myfirstapp.ui.main
 
 import android.content.Intent
 import android.os.Bundle
@@ -7,8 +7,16 @@ import android.widget.Toast
 import androidx.activity.result.ActivityResultLauncher
 import androidx.activity.result.contract.ActivityResultContracts
 import androidx.appcompat.app.AppCompatActivity
+import com.example.myfirstapp.R
+import com.example.myfirstapp.ui.main.search.SearchFragment
+import com.example.myfirstapp.ui.song.SongActivity
+import com.example.myfirstapp.data.local.SongDatabase
+import com.example.myfirstapp.data.entities.Album
+import com.example.myfirstapp.data.entities.Song
 import com.example.myfirstapp.databinding.ActivityMainBinding
-import com.google.gson.Gson
+import com.example.myfirstapp.ui.main.home.HomeFragment
+import com.example.myfirstapp.ui.main.locker.LockerFragment
+import com.example.myfirstapp.ui.main.look.LookFragment
 
 class MainActivity : AppCompatActivity() {
 
@@ -48,7 +56,7 @@ class MainActivity : AppCompatActivity() {
             editor.putInt("songId", songs[nowPos].id)
             editor.apply()
 
-            val intent = Intent(this,SongActivity::class.java)
+            val intent = Intent(this, SongActivity::class.java)
             activityResultLauncher.launch(intent)
         }
 

UMC_6th/app/src/main/java/com/example/myfirstapp/AlbumFragment.kt → UMC_6th/app/src/main/java/com/example/myfirstapp/ui/main/album/AlbumFragment.kt

@@ -1,12 +1,18 @@
-package com.example.myfirstapp
+package com.example.myfirstapp.ui.main.album
 
 import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
-import android.widget.Toast
 import androidx.appcompat.app.AppCompatActivity
 import androidx.fragment.app.Fragment
+import com.example.myfirstapp.ui.adapter.AlbumVpAdapter
+import com.example.myfirstapp.ui.main.home.HomeFragment
+import com.example.myfirstapp.ui.main.MainActivity
+import com.example.myfirstapp.R
+import com.example.myfirstapp.data.local.SongDatabase
+import com.example.myfirstapp.data.entities.Album
+import com.example.myfirstapp.data.entities.Like
 import com.example.myfirstapp.databinding.FragmentAlbumBinding
 import com.google.android.material.tabs.TabLayoutMediator
 import com.google.gson.Gson
@@ -34,7 +40,10 @@ class AlbumFragment : Fragment() {
         setOnClickListener(album)
 
         binding.albumBackIv.setOnClickListener{
-            (context as MainActivity).supportFragmentManager.beginTransaction().replace(R.id.main_container,HomeFragment()).commitAllowingStateLoss()
+            (context as MainActivity).supportFragmentManager.beginTransaction().replace(
+                R.id.main_container,
+                HomeFragment()
+            ).commitAllowingStateLoss()
         }
 
         val albumVpAdapter = AlbumVpAdapter(this)

UMC_6th/app/src/main/java/com/example/myfirstapp/DetailFragment.kt → UMC_6th/app/src/main/java/com/example/myfirstapp/ui/main/album/DetailFragment.kt

@@ -1,4 +1,4 @@
-package com.example.myfirstapp
+package com.example.myfirstapp.ui.main.album
 
 import android.os.Bundle
 import android.view.LayoutInflater