[maro/#47] feat :: 패키지 구조화

UMC_6th/app/src/main/AndroidManifest.xml

@@ -22,7 +22,7 @@
         <activity android:name=".LoginActivity"/>
 
         <activity
-            android:name=".MainActivity"
+            android:name=".ui.MainActivity"
             android:exported="true"
             android:theme="@style/SplashTheme">
             <intent-filter>
@@ -32,7 +32,7 @@
             </intent-filter>
         </activity>
         <activity
-            android:name=".SongActivity"
+            android:name=".music.SongActivity"
             android:exported="true" />
     </application>
 

UMC_6th/app/src/main/java/com/example/umc_6th/AlbumRVAdapter.kt → UMC_6th/app/src/main/java/com/example/umc_6th/adapters/AlbumRVAdapter.kt

@@ -1,9 +1,10 @@
-package com.example.umc_6th
+package com.example.umc_6th.adapters
 
 import android.view.LayoutInflater
 import android.view.ViewGroup
 import androidx.recyclerview.widget.RecyclerView
 import com.example.umc_6th.databinding.ItemAlbumBinding
+import com.example.umc_6th.music.Album
 
 class AlbumRVAdapter(private val albumList:ArrayList<Album>) : RecyclerView.Adapter<AlbumRVAdapter.ViewHolder>() {
 
@@ -32,13 +33,13 @@ class AlbumRVAdapter(private val albumList:ArrayList<Album>) : RecyclerView.Adap
         notifyDataSetChanged()
     }
 
-    override fun onCreateViewHolder(viewGroup: ViewGroup, viewType: Int): AlbumRVAdapter.ViewHolder {
+    override fun onCreateViewHolder(viewGroup: ViewGroup, viewType: Int): ViewHolder {
         val binding: ItemAlbumBinding = ItemAlbumBinding.inflate(LayoutInflater.from(viewGroup.context),viewGroup,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{
             mItemClickListener.onItemClick(albumList[position]) }

UMC_6th/app/src/main/java/com/example/umc_6th/AlbumVPAdapter.kt → UMC_6th/app/src/main/java/com/example/umc_6th/adapters/AlbumVPAdapter.kt

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

UMC_6th/app/src/main/java/com/example/umc_6th/BannerVPAdapter.kt → UMC_6th/app/src/main/java/com/example/umc_6th/adapters/BannerVPAdapter.kt

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

UMC_6th/app/src/main/java/com/example/umc_6th/LockerAlbumRVAdapter.kt → UMC_6th/app/src/main/java/com/example/umc_6th/adapters/LockerAlbumRVAdapter.kt

@@ -1,12 +1,12 @@
-package com.example.umc_6th
+package com.example.umc_6th.adapters
 
 import android.annotation.SuppressLint
 import android.util.SparseBooleanArray
 import android.view.LayoutInflater
 import android.view.ViewGroup
 import androidx.recyclerview.widget.RecyclerView
-import androidx.recyclerview.widget.RecyclerView.Recycler
 import com.example.umc_6th.databinding.ItemLockerAlbumBinding
+import com.example.umc_6th.music.Song
 
 class LockerAlbumRVAdapter () : RecyclerView.Adapter<LockerAlbumRVAdapter.ViewHolder>(){
 
@@ -16,14 +16,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.itemLockerAlbumMoreIv.setOnClickListener {

UMC_6th/app/src/main/java/com/example/umc_6th/LockerVPAdapter.kt → UMC_6th/app/src/main/java/com/example/umc_6th/adapters/LockerVPAdapter.kt

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

UMC_6th/app/src/main/java/com/example/umc_6th/PannelVPAdapter.kt → UMC_6th/app/src/main/java/com/example/umc_6th/adapters/PannelVPAdapter.kt

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

UMC_6th/app/src/main/java/com/example/umc_6th/SavedAlbumRVAdapter.kt → UMC_6th/app/src/main/java/com/example/umc_6th/adapters/SavedAlbumRVAdapter.kt

@@ -1,10 +1,11 @@
-package com.example.umc_6th
+package com.example.umc_6th.adapters
 
 import android.annotation.SuppressLint
 import android.view.LayoutInflater
 import android.view.ViewGroup
 import androidx.recyclerview.widget.RecyclerView
 import com.example.umc_6th.databinding.ItemLockerAlbumBinding
+import com.example.umc_6th.music.Album
 
 class SavedAlbumRVAdapter (): RecyclerView.Adapter<SavedAlbumRVAdapter.ViewHolder>() {
     private val albums = ArrayList<Album>()
@@ -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.itemLockerAlbumMoreIv.setOnClickListener {
             mItemClickListener.onRemoveSong(albums[position].id)

UMC_6th/app/src/main/java/com/example/umc_6th/SongRVAdapter.kt → UMC_6th/app/src/main/java/com/example/umc_6th/adapters/SongRVAdapter.kt

@@ -1,27 +1,26 @@
-package com.example.umc_6th
+package com.example.umc_6th.adapters
 
-import android.annotation.SuppressLint
 import android.content.Context
 import android.util.Log
 import android.view.LayoutInflater
 import android.view.ViewGroup
 import android.widget.ImageView
 import android.widget.TextView
-import androidx.appcompat.widget.AppCompatTextView
 import androidx.recyclerview.widget.RecyclerView
 import com.bumptech.glide.Glide
+import com.example.umc_6th.models.FloChartResult
 import com.example.umc_6th.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/umc_6th/AuthApi.kt → UMC_6th/app/src/main/java/com/example/umc_6th/auth/AuthApi.kt

@@ -1,5 +1,7 @@
-package com.example.umc_6th
+package com.example.umc_6th.auth
 
+import com.example.umc_6th.models.BaseResponse
+import com.example.umc_6th.models.User
 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/auth/AuthService.kt

@@ -1,11 +1,9 @@
-package com.chrome.umcflo
+package com.example.umc_6th.auth
 
 import android.util.Log
-import com.example.umc_6th.BaseResponse
-import com.example.umc_6th.LoginView
-import com.example.umc_6th.RetrofitInstance
-import com.example.umc_6th.SignUpView
-import com.example.umc_6th.User
+import com.example.umc_6th.models.BaseResponse
+import com.example.umc_6th.util.RetrofitInstance
+import com.example.umc_6th.models.User
 import retrofit2.Call
 import retrofit2.Callback
 import retrofit2.Response

UMC_6th/app/src/main/java/com/example/umc_6th/LoginActivity.kt → UMC_6th/app/src/main/java/com/example/umc_6th/auth/LoginActivity.kt

@@ -1,13 +1,12 @@
-package com.chrome.umcflo
-import com.example.umc_6th.Result
+package com.example.umc_6th.auth
+import com.example.umc_6th.models.Result
 
 import android.content.Intent
 import androidx.appcompat.app.AppCompatActivity
 import android.os.Bundle
 import android.widget.Toast
-import com.example.umc_6th.LoginView
-import com.example.umc_6th.MainActivity
-import com.example.umc_6th.User
+import com.example.umc_6th.ui.MainActivity
+import com.example.umc_6th.models.User
 import com.example.umc_6th.databinding.ActivityLoginBinding
 
 

UMC_6th/app/src/main/java/com/example/umc_6th/LoginView.kt → UMC_6th/app/src/main/java/com/example/umc_6th/auth/LoginView.kt

@@ -1,4 +1,6 @@
-package com.example.umc_6th
+package com.example.umc_6th.auth
+
+import com.example.umc_6th.models.Result
 
 interface LoginView {
     fun onLoginSuccess(code : Int, result : Result)

UMC_6th/app/src/main/java/com/example/umc_6th/LookView.kt → UMC_6th/app/src/main/java/com/example/umc_6th/auth/LookView.kt

@@ -1,4 +1,6 @@
-package com.example.umc_6th
+package com.example.umc_6th.auth
+
+import com.example.umc_6th.models.FloChartResult
 
 interface LookView {
     fun onGetSongLoading()

UMC_6th/app/src/main/java/com/example/umc_6th/SignUpActivity.kt → UMC_6th/app/src/main/java/com/example/umc_6th/auth/SignUpActivity.kt

@@ -1,12 +1,10 @@
-package com.chrome.umcflo
+package com.example.umc_6th.auth
 
 import android.os.Bundle
-import android.util.Log
 import android.view.View
 import android.widget.Toast
 import androidx.appcompat.app.AppCompatActivity
-import com.example.umc_6th.SignUpView
-import com.example.umc_6th.User
+import com.example.umc_6th.models.User
 import com.example.umc_6th.databinding.ActivitySignUpBinding
 
 

UMC_6th/app/src/main/java/com/example/umc_6th/SignUpView.kt → UMC_6th/app/src/main/java/com/example/umc_6th/auth/SignUpView.kt

@@ -1,4 +1,4 @@
-package com.example.umc_6th
+package com.example.umc_6th.auth
 
 interface SignUpView {
     fun onSignUpSuccess()

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

@@ -1,11 +1,13 @@
 
-package com.example.umc_6th
+package com.example.umc_6th.database
 
 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.models.Like
+import com.example.umc_6th.music.Album
 
 @Dao
 interface AlbumDao {

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

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

UMC_6th/app/src/main/java/com/example/umc_6th/SongApi.kt → UMC_6th/app/src/main/java/com/example/umc_6th/database/SongApi.kt

@@ -1,5 +1,6 @@
-package com.example.umc_6th
+package com.example.umc_6th.database
 
+import com.example.umc_6th.models.SongResponse
 import retrofit2.http.GET
 import retrofit2.Call
 

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

@@ -1,10 +1,11 @@
-package com.example.umc_6th
+package com.example.umc_6th.database
 
 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.music.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/database/SongDatabase.kt

@@ -1,9 +1,13 @@
-package com.example.umc_6th
+package com.example.umc_6th.database
 
 import android.content.Context
 import androidx.room.Database
 import androidx.room.Room
 import androidx.room.RoomDatabase
+import com.example.umc_6th.models.Like
+import com.example.umc_6th.models.User
+import com.example.umc_6th.music.Album
+import com.example.umc_6th.music.Song
 
 @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/SongService.kt → UMC_6th/app/src/main/java/com/example/umc_6th/database/SongService.kt

@@ -1,6 +1,9 @@
-package com.example.umc_6th
+package com.example.umc_6th.database
 
 import android.util.Log
+import com.example.umc_6th.auth.LookView
+import com.example.umc_6th.util.RetrofitInstance
+import com.example.umc_6th.models.SongResponse
 import retrofit2.Call
 import retrofit2.Callback
 import retrofit2.Response

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

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

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

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

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

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

UMC_6th/app/src/main/java/com/example/umc_6th/SongResponnse.kt → UMC_6th/app/src/main/java/com/example/umc_6th/models/SongResponnse.kt

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

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

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

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

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

UMC_6th/app/src/main/java/com/example/umc_6th/AlbumFragment.kt → UMC_6th/app/src/main/java/com/example/umc_6th/music/AlbumFragment.kt

@@ -1,4 +1,4 @@
-package com.example.umc_6th
+package com.example.umc_6th.music
 
 import android.os.Bundle
 import android.view.LayoutInflater
@@ -7,8 +7,14 @@ import android.view.ViewGroup
 import androidx.appcompat.app.AppCompatActivity
 import androidx.fragment.app.Fragment
 import androidx.fragment.app.setFragmentResultListener
+import com.example.umc_6th.adapters.AlbumVPAdapter
+import com.example.umc_6th.models.Like
+import com.example.umc_6th.R
+import com.example.umc_6th.database.SongDatabase
 import com.example.umc_6th.databinding.FragmentAlbumBinding
 import com.example.umc_6th.databinding.FragmentAlbumBinding.inflate
+import com.example.umc_6th.ui.HomeFragment
+import com.example.umc_6th.ui.MainActivity
 import com.google.android.material.tabs.TabLayoutMediator
 import com.google.gson.Gson
 
@@ -34,7 +40,7 @@ class AlbumFragment : Fragment() {
 
         binding.albumBackIv.setOnClickListener{
             (context as MainActivity).supportFragmentManager.beginTransaction().
-            replace(R.id.main_frm,HomeFragment()).
+            replace(R.id.main_frm, HomeFragment()).
             commitAllowingStateLoss()
         }