From 1f4c3c24db77ff45f5cb447975bc43c2c50f6006 Mon Sep 17 00:00:00 2001
From: BAEK0111 <143854581+BAEK0111@users.noreply.github.com>
Date: Wed, 5 Jun 2024 20:30:18 +0900
Subject: [PATCH] =?UTF-8?q?[Simba/#38]=20feat=20::=208=EC=A3=BC=EC=B0=A8?=
 =?UTF-8?q?=20=EC=99=84=EB=A3=8C=20(#42)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* [simba/#38] feat:: 회원가입, 로그인 구현

* [simba/#38] feat:: 회원가입, 로그인 구현2

* [simba/#38] feat:: 회원가입, 로그인 구현2

* [simba/#38] feat:: 특정 위치로 스크롤하기
---
 UMC_6th/app/src/main/AndroidManifest.xml      |   3 +
 .../main/java/com/example/umc_6th/AlbumDao.kt |  12 +
 .../java/com/example/umc_6th/AlbumFragment.kt |  49 +++
 .../src/main/java/com/example/umc_6th/Like.kt |  12 +
 .../example/umc_6th/LockerAlbumRVAdapter.kt   |  10 +-
 .../com/example/umc_6th/LockerFragment.kt     |  39 +++
 .../java/com/example/umc_6th/LoginActivity.kt |  65 ++++
 .../java/com/example/umc_6th/LookFragment.kt  | 102 +++++-
 .../java/com/example/umc_6th/MainActivity.kt  |  10 +-
 .../com/example/umc_6th/SavedAlbumFragment.kt |  35 ++
 .../example/umc_6th/SavedAlbumRVAdapter.kt    |  60 ++++
 .../com/example/umc_6th/SignUpActivity.kt     |  49 +++
 .../java/com/example/umc_6th/SongActivity.kt  |  14 +-
 .../java/com/example/umc_6th/SongDatabase.kt  |   4 +-
 .../src/main/java/com/example/umc_6th/User.kt |  12 +
 .../main/java/com/example/umc_6th/UserDao.kt  |  17 +
 .../main/res/drawable/not_selected_button.xml |   6 +
 .../src/main/res/drawable/selected_button.xml |   6 +
 .../src/main/res/layout/activity_login.xml    | 319 ++++++++++++++++++
 .../src/main/res/layout/activity_signup.xml   | 223 ++++++++++++
 .../res/layout/fragment_locker_savedalbum.xml |  23 +-
 .../app/src/main/res/layout/fragment_look.xml | 290 +++++++++++++++-
 22 files changed, 1324 insertions(+), 36 deletions(-)
 create mode 100644 UMC_6th/app/src/main/java/com/example/umc_6th/Like.kt
 create mode 100644 UMC_6th/app/src/main/java/com/example/umc_6th/LoginActivity.kt
 create mode 100644 UMC_6th/app/src/main/java/com/example/umc_6th/SavedAlbumRVAdapter.kt
 create mode 100644 UMC_6th/app/src/main/java/com/example/umc_6th/SignUpActivity.kt
 create mode 100644 UMC_6th/app/src/main/java/com/example/umc_6th/User.kt
 create mode 100644 UMC_6th/app/src/main/java/com/example/umc_6th/UserDao.kt
 create mode 100644 UMC_6th/app/src/main/res/drawable/not_selected_button.xml
 create mode 100644 UMC_6th/app/src/main/res/drawable/selected_button.xml
 create mode 100644 UMC_6th/app/src/main/res/layout/activity_login.xml
 create mode 100644 UMC_6th/app/src/main/res/layout/activity_signup.xml

diff --git a/UMC_6th/app/src/main/AndroidManifest.xml b/UMC_6th/app/src/main/AndroidManifest.xml
index 13e6aad..e996aa9 100644
--- a/UMC_6th/app/src/main/AndroidManifest.xml
+++ b/UMC_6th/app/src/main/AndroidManifest.xml
@@ -21,6 +21,9 @@
             android:enabled="true"
             android:exported="true"></service>
 
+        <activity android:name=".SignUpActivity"/>
+        <activity android:name=".LoginActivity"/>
+
         <activity
             android:name=".MainActivity"
             android:exported="true"
diff --git a/UMC_6th/app/src/main/java/com/example/umc_6th/AlbumDao.kt b/UMC_6th/app/src/main/java/com/example/umc_6th/AlbumDao.kt
index 11eadc9..84b6742 100644
--- a/UMC_6th/app/src/main/java/com/example/umc_6th/AlbumDao.kt
+++ b/UMC_6th/app/src/main/java/com/example/umc_6th/AlbumDao.kt
@@ -23,4 +23,16 @@ interface AlbumDao {
     @Query("SELECT * FROM AlbumTable WHERE id = :id")
     fun getAlbum(id : Int): Album
 
+    @Insert
+    fun likeAlbum(like : Like)
+
+    @Query("select id from LikeTable where userId =:userId and albumId = :albumId")
+    fun isLikedAlbum(userId : Int, albumId : Int) : Int?
+
+    @Query("delete from LikeTable where userId =:userId and albumId = :albumId")
+    fun dislikedAlbum(userId : Int, albumId : Int)
+
+    @Query("select at.* from LikeTable as lt left join AlbumTable as at on lt.albumId = at.id where lt.userId = :userId")
+    fun getLikedAlbums(userId : Int) : List<Album>
+
 }
\ No newline at end of file
diff --git a/UMC_6th/app/src/main/java/com/example/umc_6th/AlbumFragment.kt b/UMC_6th/app/src/main/java/com/example/umc_6th/AlbumFragment.kt
index 979ab75..48daa6a 100644
--- a/UMC_6th/app/src/main/java/com/example/umc_6th/AlbumFragment.kt
+++ b/UMC_6th/app/src/main/java/com/example/umc_6th/AlbumFragment.kt
@@ -5,6 +5,7 @@ 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 androidx.fragment.app.setFragmentResultListener
 import com.example.umc_6th.databinding.FragmentAlbumBinding
@@ -18,7 +19,9 @@ class AlbumFragment : Fragment() {
     lateinit var binding : FragmentAlbumBinding
     private var gson : Gson = Gson()
 
+    private var isLiked : Boolean = false
     private  val information = arrayListOf("수록곡","상세정보","영상")
+
     override fun onCreateView(
         inflater: LayoutInflater,
         container: ViewGroup?,
@@ -28,7 +31,9 @@ class AlbumFragment : Fragment() {
 
         val albumJson = arguments?.getString("album")
         val album = gson.fromJson(albumJson, Album::class.java)
+        isLiked = isLikedAlbum(album.id)
         setInit(album)
+        setOnClickListener(album)
 
         binding.albumBackIv.setOnClickListener{
             (context as MainActivity).supportFragmentManager.beginTransaction().
@@ -36,6 +41,8 @@ class AlbumFragment : Fragment() {
             commitAllowingStateLoss()
         }
 
+
+
         val albumAdapter = AlbumVPAdapter(this)
         binding.albumContentVp.adapter = albumAdapter
 
@@ -84,4 +91,46 @@ class AlbumFragment : Fragment() {
         binding.albumSingerNameTv.text = album.singer.toString()
     }
 
+    private fun getJwt() : Int {
+        val spf = requireActivity().getSharedPreferences("auth", AppCompatActivity.MODE_PRIVATE)
+        return spf.getInt("jwt", 0)
+    }
+
+    private fun likeAlbum(userId : Int, albumId : Int) {
+        val songDB = SongDatabase.getInstance(requireActivity())!!
+        val like = Like(userId, albumId)
+
+        songDB.albumDao().likeAlbum(like)
+    }
+
+    private fun isLikedAlbum(albumId : Int) : Boolean {
+        val songDB = SongDatabase.getInstance(requireActivity())!!
+        val userId = getJwt()
+
+        val likeId : Int? = songDB.albumDao().isLikedAlbum(userId, albumId)
+        return likeId != null
+    }
+
+    private fun disLikeAlbum(albumId : Int) {
+        val songDB = SongDatabase.getInstance(requireActivity())!!
+        val userId = getJwt()
+
+        songDB.albumDao().dislikedAlbum(userId, albumId)
+    }
+
+    private fun setOnClickListener(album : Album) {
+        val userId = getJwt()
+        binding.albumLikeIv.setOnClickListener {
+            if(isLiked) {
+                binding.albumLikeIv.setImageResource(R.drawable.ic_my_like_off)
+                disLikeAlbum(album.id)
+            }
+
+            else {
+                binding.albumLikeIv.setImageResource((R.drawable.ic_my_like_on))
+                likeAlbum(userId, album.id)
+            }
+        }
+
+    }
 }
\ No newline at end of file
diff --git a/UMC_6th/app/src/main/java/com/example/umc_6th/Like.kt b/UMC_6th/app/src/main/java/com/example/umc_6th/Like.kt
new file mode 100644
index 0000000..3d48b17
--- /dev/null
+++ b/UMC_6th/app/src/main/java/com/example/umc_6th/Like.kt
@@ -0,0 +1,12 @@
+package com.example.umc_6th
+
+import androidx.room.Entity
+import androidx.room.PrimaryKey
+
+@Entity(tableName = "LikeTable")
+data class Like(
+    var userId : Int,
+    var albumId : Int
+){
+    @PrimaryKey(autoGenerate = true) var id : Int = 0
+}
diff --git a/UMC_6th/app/src/main/java/com/example/umc_6th/LockerAlbumRVAdapter.kt b/UMC_6th/app/src/main/java/com/example/umc_6th/LockerAlbumRVAdapter.kt
index b88a30d..33b6c75 100644
--- a/UMC_6th/app/src/main/java/com/example/umc_6th/LockerAlbumRVAdapter.kt
+++ b/UMC_6th/app/src/main/java/com/example/umc_6th/LockerAlbumRVAdapter.kt
@@ -12,6 +12,7 @@ class LockerAlbumRVAdapter () : RecyclerView.Adapter<LockerAlbumRVAdapter.ViewHo
 
     private val switchStatus = SparseBooleanArray()
     private val songs = ArrayList<Song>()
+    private var isGrayOverlayEnabled = false
 
     override fun onCreateViewHolder(
         parent: ViewGroup,
@@ -31,6 +32,14 @@ class LockerAlbumRVAdapter () : RecyclerView.Adapter<LockerAlbumRVAdapter.ViewHo
             removeSong(position) // 화면에서 아이템 제거
         }
 
+        // 항목 배경색 변경
+//        if (isGrayOverlayEnabled) {
+//            holder.binding.root.setBackgroundColor(holder.binding.root.context.getColor(R.color.gray_transparent))
+//        } else {
+//            holder.binding.root.setBackgroundColor(holder.binding.root.context.getColor(R.color.transparent))
+//        }
+
+
         val switch = holder.binding.switchRV
         switch.isChecked = switchStatus[position]
         switch.setOnClickListener {
@@ -78,5 +87,4 @@ class LockerAlbumRVAdapter () : RecyclerView.Adapter<LockerAlbumRVAdapter.ViewHo
         songs.removeAt(position)
         notifyDataSetChanged()
     }
-
 }
\ No newline at end of file
diff --git a/UMC_6th/app/src/main/java/com/example/umc_6th/LockerFragment.kt b/UMC_6th/app/src/main/java/com/example/umc_6th/LockerFragment.kt
index fc4edd9..ab6dae6 100644
--- a/UMC_6th/app/src/main/java/com/example/umc_6th/LockerFragment.kt
+++ b/UMC_6th/app/src/main/java/com/example/umc_6th/LockerFragment.kt
@@ -1,10 +1,12 @@
 package com.example.umc_6th
 
+import android.content.Intent
 import android.os.Bundle
 import androidx.fragment.app.Fragment
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
+import androidx.appcompat.app.AppCompatActivity
 import com.example.umc_6th.databinding.FragmentLockerBinding
 import com.google.android.material.tabs.TabLayoutMediator
 
@@ -37,6 +39,43 @@ class LockerFragment : Fragment() {
             bottomSheetFragment.show(requireFragmentManager(),"BottomSheetDialog")
         }
 
+        binding.lockerLoginTv.setOnClickListener {
+            startActivity(Intent(activity, LoginActivity::class.java))
+        }
+
         return binding.root
     }
+    override fun onStart() {
+        super.onStart()
+        initViews()
+    }
+    private fun getJwt() : Int {
+        val spf = requireActivity().getSharedPreferences("auth", AppCompatActivity.MODE_PRIVATE)
+        return spf!!.getInt("jwt", 0)
+    }
+
+    private fun initViews() {
+        val jwt : Int = getJwt()
+        if (jwt == 0) {
+            binding.lockerLoginTv.text="로그인"
+            binding.lockerLoginTv.setOnClickListener {
+                startActivity(Intent(requireActivity(), LoginActivity::class.java))
+            }
+        }
+
+        else {
+            binding.lockerLoginTv.text = "로그아웃"
+            binding.lockerLoginTv.setOnClickListener {
+                logout()
+                startActivity(Intent(requireActivity(), MainActivity::class.java))
+            }
+        }
+    }
+
+    private fun logout() {
+        val spf = activity?.getSharedPreferences("auth", AppCompatActivity.MODE_PRIVATE)
+        val editor = spf!!.edit()
+        editor.remove("jwt")
+        editor.apply()
+    }
 }
\ No newline at end of file
diff --git a/UMC_6th/app/src/main/java/com/example/umc_6th/LoginActivity.kt b/UMC_6th/app/src/main/java/com/example/umc_6th/LoginActivity.kt
new file mode 100644
index 0000000..8052100
--- /dev/null
+++ b/UMC_6th/app/src/main/java/com/example/umc_6th/LoginActivity.kt
@@ -0,0 +1,65 @@
+package com.example.umc_6th
+
+import android.content.Intent
+import android.os.Bundle
+import android.util.Log
+import android.widget.Toast
+import androidx.appcompat.app.AppCompatActivity
+import com.example.umc_6th.databinding.ActivityLoginBinding
+
+class LoginActivity:AppCompatActivity() {
+
+    lateinit var binding : ActivityLoginBinding
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        binding = ActivityLoginBinding.inflate(layoutInflater)
+        setContentView(binding.root)
+
+        binding.loginSignUpTv.setOnClickListener {
+            startActivity(Intent(this, SignUpActivity::class.java))
+        }
+        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
+        }
+
+        if (binding.loginPasswordEt.text.toString().isEmpty()) {
+            Toast.makeText(this, "비밀번호를 입력해주세요", Toast.LENGTH_SHORT).show()
+            return
+        }
+
+        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()
+        }
+    }
+
+    private fun startMainActivity() {
+        val intent = Intent(this, MainActivity::class.java)
+        startActivity(intent)
+    }
+    private fun saveJwt(jwt: Int) {
+        val spf = getSharedPreferences("auth", MODE_PRIVATE)
+        val editor = spf.edit()
+
+        editor.putInt("jwt", jwt)
+        editor.apply()
+    }
+
+}
\ No newline at end of file
diff --git a/UMC_6th/app/src/main/java/com/example/umc_6th/LookFragment.kt b/UMC_6th/app/src/main/java/com/example/umc_6th/LookFragment.kt
index 6cff4ae..4e86200 100644
--- a/UMC_6th/app/src/main/java/com/example/umc_6th/LookFragment.kt
+++ b/UMC_6th/app/src/main/java/com/example/umc_6th/LookFragment.kt
@@ -1,13 +1,43 @@
-package com.example.umc_6th
-
 import android.os.Bundle
-import androidx.fragment.app.Fragment
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
+import android.widget.Button
+import android.widget.ScrollView
+import android.widget.TextView
+import androidx.fragment.app.Fragment
+import androidx.recyclerview.widget.LinearLayoutManager
+import com.example.umc_6th.LockerAlbumRVAdapter
+import com.example.umc_6th.R
+import com.example.umc_6th.Song
+import com.example.umc_6th.SongDatabase
+import com.example.umc_6th.databinding.FragmentLookBinding
 
 class LookFragment : Fragment() {
 
+    lateinit var binding: FragmentLookBinding
+    private lateinit var songDB: SongDatabase
+
+    private lateinit var chartBtn : Button
+    private lateinit var videoBtn : Button
+    private lateinit var genreBtn : Button
+    private lateinit var situationBtn : Button
+    private lateinit var audioBtn : Button
+    private lateinit var atmosphereBtn : Button
+
+    private lateinit var buttonList: List<Button>
+
+    private lateinit var chartTv : TextView
+    private lateinit var videoTv : TextView
+    private lateinit var genreTv : TextView
+    private lateinit var situationTv : TextView
+    private lateinit var audioTv : TextView
+    private lateinit var atmosphereTv : TextView
+
+    private lateinit var textList: List<TextView>
+
+    lateinit var scrollView : ScrollView
+
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
     }
@@ -16,7 +46,69 @@ class LookFragment : Fragment() {
         inflater: LayoutInflater, container: ViewGroup?,
         savedInstanceState: Bundle?
     ): View? {
-        // Inflate the layout for this fragment
-        return inflater.inflate(R.layout.fragment_look, container, false)
+        binding = FragmentLookBinding.inflate(inflater, container, false)
+        songDB = SongDatabase.getInstance(requireContext())!!
+
+        // 스크롤 뷰 초기화
+        scrollView = binding.lookSv
+
+        // 버튼 초기화
+        chartBtn = binding.lookChartBtn
+        videoBtn =  binding.lookVideoBtn
+        genreBtn =  binding.lookGenreBtn
+        situationBtn =  binding.lookSituationBtn
+        audioBtn =  binding.lookAudioBtn
+        atmosphereBtn =  binding.lookAtmostphereBtn
+
+        buttonList = listOf(chartBtn, videoBtn, genreBtn, situationBtn, audioBtn, atmosphereBtn)
+
+        // 텍스트 초기화
+        chartTv = binding.lookChartTv
+        videoTv = binding.lookVideoTv
+        genreTv = binding.lookGenreTv
+        situationTv = binding.lookSituationTv
+        audioTv = binding.lookAudioTv
+        atmosphereTv = binding.lookAtmostphereTv
+
+        textList = listOf(chartTv, videoTv, genreTv, situationTv, audioTv, atmosphereTv)
+
+        setButtonClickListeners()
+
+        return binding.root
+    }
+
+    override fun onStart() {
+        super.onStart()
+        initRecyclerview()
+    }
+
+    private fun initRecyclerview(){
+        val recyclerView = binding.lookChartSongRv
+        recyclerView.layoutManager = LinearLayoutManager(requireActivity())
+        val lookAlbumRVAdapter = LockerAlbumRVAdapter()
+
+        binding.lookChartSongRv.adapter = lookAlbumRVAdapter
+        lookAlbumRVAdapter.addSongs(songDB.songDao().getSongs() as ArrayList<Song>)
+    }
+
+    private fun setButtonClickListeners() {
+        for (i in buttonList.indices) {
+            val button = buttonList[i]
+
+            button.setOnClickListener {
+                initButton(i)
+            }
+        }
+    }
+
+    private fun initButton(idx : Int) {
+        for(presentBtn : Button in buttonList) {
+            if(presentBtn == buttonList[idx]) {
+                presentBtn.setBackgroundResource(R.drawable.selected_button)
+            } else {
+                presentBtn.setBackgroundResource(R.drawable.not_selected_button)
+            }
+        }
+        scrollView.smoothScrollTo(0, textList[idx].top)
     }
 }
\ No newline at end of file
diff --git a/UMC_6th/app/src/main/java/com/example/umc_6th/MainActivity.kt b/UMC_6th/app/src/main/java/com/example/umc_6th/MainActivity.kt
index 6d899eb..89b9be8 100644
--- a/UMC_6th/app/src/main/java/com/example/umc_6th/MainActivity.kt
+++ b/UMC_6th/app/src/main/java/com/example/umc_6th/MainActivity.kt
@@ -1,5 +1,6 @@
 package com.example.umc_6th
 
+import LookFragment
 import androidx.appcompat.app.AppCompatActivity
 import android.content.Intent
 import android.os.Bundle
@@ -45,13 +46,6 @@ class MainActivity : AppCompatActivity() {
             }
 
         binding.mainPlayerCl.setOnClickListener {
-//            val intent = Intent(this, SongActivity::class.java)
-//            intent.putExtra("title", song.title)
-//            intent.putExtra("singer", song.singer)
-//            intent.putExtra("second", song.second)
-//            intent.putExtra("playTime", song.playTime)
-//            intent.putExtra("isPlaying", song.isPlaying)
-//            intent.putExtra("music",song.music)
             val editor = getSharedPreferences("song", MODE_PRIVATE).edit()
             editor.putInt("songId", song.id)
             editor.apply()
@@ -235,7 +229,7 @@ class MainActivity : AppCompatActivity() {
                 0,
                 240,
                 false,
-                "music_bbom",
+                "music_bboom",
                 R.drawable.img_album_exp5,
                 false,
                 4
diff --git a/UMC_6th/app/src/main/java/com/example/umc_6th/SavedAlbumFragment.kt b/UMC_6th/app/src/main/java/com/example/umc_6th/SavedAlbumFragment.kt
index 4ca14a0..2edf4af 100644
--- a/UMC_6th/app/src/main/java/com/example/umc_6th/SavedAlbumFragment.kt
+++ b/UMC_6th/app/src/main/java/com/example/umc_6th/SavedAlbumFragment.kt
@@ -1,15 +1,19 @@
 package com.example.umc_6th
 
 import android.os.Bundle
+import android.util.Log
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
+import androidx.appcompat.app.AppCompatActivity
 import androidx.fragment.app.Fragment
+import androidx.recyclerview.widget.LinearLayoutManager
 import com.example.umc_6th.databinding.FragmentLockerSavedalbumBinding
 
 class SavedAlbumFragment : Fragment() {
 
     lateinit var binding: FragmentLockerSavedalbumBinding
+    lateinit var albumDB: SongDatabase
 
     override fun onCreateView(
         inflater: LayoutInflater,
@@ -17,7 +21,38 @@ class SavedAlbumFragment : Fragment() {
         savedInstanceState: Bundle?
     ): View? {
         binding = FragmentLockerSavedalbumBinding.inflate(inflater,container,false)
+
+        albumDB = SongDatabase.getInstance(requireContext())!!
+
         return binding.root
     }
+    override fun onStart() {
+        super.onStart()
+        initRecyclerview()
+    }
+
+    private fun initRecyclerview(){
+        binding.lockerSavedSongRecyclerView.layoutManager = LinearLayoutManager(context, LinearLayoutManager.VERTICAL, false)
+
+        val albumRVAdapter = SavedAlbumRVAdapter()
+        //리스너 객체 생성 및 전달
+
+        albumRVAdapter.setMyItemClickListener(object : SavedAlbumRVAdapter.MyItemClickListener{
+            override fun onRemoveSong(songId: Int) {
+                albumDB.albumDao().getLikedAlbums(getJwt())
+            }
+        })
 
+        binding.lockerSavedSongRecyclerView.adapter = albumRVAdapter
+
+        albumRVAdapter.addAlbums(albumDB.albumDao().getLikedAlbums(getJwt()) as ArrayList)
+    }
+
+    private fun getJwt() : Int {
+        val spf = activity?.getSharedPreferences("auth" , AppCompatActivity.MODE_PRIVATE)
+        val jwt = spf!!.getInt("jwt", 0)
+        Log.d("MAIN_ACT/GET_JWT", "jwt_token: $jwt")
+
+        return jwt
+    }
 }
\ No newline at end of file
diff --git a/UMC_6th/app/src/main/java/com/example/umc_6th/SavedAlbumRVAdapter.kt b/UMC_6th/app/src/main/java/com/example/umc_6th/SavedAlbumRVAdapter.kt
new file mode 100644
index 0000000..f240878
--- /dev/null
+++ b/UMC_6th/app/src/main/java/com/example/umc_6th/SavedAlbumRVAdapter.kt
@@ -0,0 +1,60 @@
+package com.example.umc_6th
+
+import android.annotation.SuppressLint
+import android.view.LayoutInflater
+import android.view.ViewGroup
+import androidx.recyclerview.widget.RecyclerView
+import com.example.umc_6th.databinding.ItemLockerAlbumBinding
+
+
+class SavedAlbumRVAdapter (): RecyclerView.Adapter<SavedAlbumRVAdapter.ViewHolder>() {
+    private val albums = ArrayList<Album>()
+
+    interface MyItemClickListener{
+        fun onRemoveSong(songId: Int)
+    }
+
+    private lateinit var mItemClickListener: MyItemClickListener
+
+    fun setMyItemClickListener(itemClickListener: MyItemClickListener){
+        mItemClickListener = itemClickListener
+    }
+
+    override fun onCreateViewHolder(viewGroup: ViewGroup, viewType: Int): SavedAlbumRVAdapter.ViewHolder {
+        val binding: ItemLockerAlbumBinding = ItemLockerAlbumBinding.inflate(LayoutInflater.from(viewGroup.context), viewGroup, false)
+
+        return ViewHolder(binding)
+    }
+
+    override fun onBindViewHolder(holder: SavedAlbumRVAdapter.ViewHolder, position: Int) {
+        holder.bind(albums[position])
+        holder.binding.itemLockerAlbumMoreIv.setOnClickListener {
+            mItemClickListener.onRemoveSong(albums[position].id)
+            removeSong(position)
+        }
+    }
+
+    override fun getItemCount(): Int = albums.size
+
+    @SuppressLint("NotifyDataSetChanged")
+    fun addAlbums(albums: ArrayList<Album>) {
+        this.albums.clear()
+        this.albums.addAll(albums)
+
+        notifyDataSetChanged()
+    }
+
+    fun removeSong(position: Int){
+        albums.removeAt(position)
+        notifyDataSetChanged()
+    }
+
+    inner class ViewHolder(val binding: ItemLockerAlbumBinding) : RecyclerView.ViewHolder(binding.root){
+        fun bind(album: Album){
+            binding.itemLockerAlbumCoverImgIv.setImageResource(album.coverImg!!)
+            binding.itemLockerAlbumTitleTv.text = album.title
+            binding.itemLockerAlbumSingerTv.text = album.singer
+        }
+    }
+
+}
\ No newline at end of file
diff --git a/UMC_6th/app/src/main/java/com/example/umc_6th/SignUpActivity.kt b/UMC_6th/app/src/main/java/com/example/umc_6th/SignUpActivity.kt
new file mode 100644
index 0000000..30301db
--- /dev/null
+++ b/UMC_6th/app/src/main/java/com/example/umc_6th/SignUpActivity.kt
@@ -0,0 +1,49 @@
+package com.example.umc_6th
+
+import android.os.Bundle
+import android.util.Log
+import android.widget.Toast
+import androidx.appcompat.app.AppCompatActivity
+import com.example.umc_6th.databinding.ActivitySignupBinding
+
+class SignUpActivity : AppCompatActivity(){
+
+    lateinit var binding : ActivitySignupBinding
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        binding = ActivitySignupBinding.inflate(layoutInflater)
+        setContentView(binding.root)
+
+        binding.signUpSignUpBtn.setOnClickListener{
+            signUp()
+        }
+    }
+
+    private fun getUser() : User{
+        val email : String = binding.signUpIdEt.text.toString() + "@" + binding.signUpDirectInputEt.text.toString()
+        val pwd : String = binding.signUpPasswordEt.text.toString()
+
+        return User(email, pwd)
+    }
+
+    private fun signUp() {
+        if (binding.signUpIdEt.text.toString().isEmpty() || binding.signUpDirectInputEt.text.toString().isEmpty()){
+            Toast.makeText(this,"이메일 형식이 잘못되었습니다.",Toast.LENGTH_SHORT).show()
+            return
+        }
+        if (binding.signUpPasswordEt.text.toString() !=  binding.signUpPasswordCheckEt.text.toString()){
+            Toast.makeText(this,"비밀번호가 일치하지 않습니다",Toast.LENGTH_SHORT).show()
+            return
+        }
+
+        val userDB = SongDatabase.getInstance(this)!!
+        userDB.userDao().insert(getUser())
+
+        val user = userDB.userDao().getUsers()
+        Log.d("Sign-up",user.toString())
+
+        Toast.makeText(this,"회원가입이 완료되었습니다.",Toast.LENGTH_SHORT).show()
+        return
+    }
+}
\ No newline at end of file
diff --git a/UMC_6th/app/src/main/java/com/example/umc_6th/SongActivity.kt b/UMC_6th/app/src/main/java/com/example/umc_6th/SongActivity.kt
index ec92cba..357cabb 100644
--- a/UMC_6th/app/src/main/java/com/example/umc_6th/SongActivity.kt
+++ b/UMC_6th/app/src/main/java/com/example/umc_6th/SongActivity.kt
@@ -1,5 +1,6 @@
 package com.example.umc_6th
 
+import android.annotation.SuppressLint
 import android.app.ActivityManager
 import android.content.Context
 import android.content.Intent
@@ -47,9 +48,6 @@ class SongActivity : AppCompatActivity() {
 //        setPlayer(song)
         initClickListener()
 
-        var title : String? = null
-        var singer : String? = null
-
 //        if(intent.hasExtra("title") && intent.hasExtra("singer")){
 //            title = intent.getStringExtra("title")
 //            singer = intent.getStringExtra("singer")
@@ -176,6 +174,8 @@ class SongActivity : AppCompatActivity() {
     }
 
     private fun moveSong(direct: Int){
+        Log.d("moveSong", "현재 위치: $nowPos, 이동 방향: $direct, 총 곡 수: ${songs.size}")
+
         if(nowPos + direct < 0){
 //            nowPos = songs.size -1
             CustomSnackbar.make(binding.root, "처음 곡입니다.").show()
@@ -215,6 +215,13 @@ class SongActivity : AppCompatActivity() {
         binding.songProgressSb.progress = (song.second * 1000 / song.playTime)
 
         val music = resources.getIdentifier(song.music,"raw",this.packageName)
+
+        Log.d("setPlayer", "음악 리소스 ID: $music")
+        if (music == 0) {
+            Log.e("setPlayer", "음악 리소스 ID를 찾을 수 없습니다: ${song.music}")
+            return
+        }
+
         mediaPlayer = MediaPlayer.create(this,music)
 
         if(song.isLike){
@@ -222,7 +229,6 @@ class SongActivity : AppCompatActivity() {
         } else{
             binding.songLikeIv.setImageResource(R.drawable.ic_my_like_off)
         }
-
         setPlayerStatus(song.isPlaying)
     }
 
diff --git a/UMC_6th/app/src/main/java/com/example/umc_6th/SongDatabase.kt b/UMC_6th/app/src/main/java/com/example/umc_6th/SongDatabase.kt
index 8bb2233..be55d68 100644
--- a/UMC_6th/app/src/main/java/com/example/umc_6th/SongDatabase.kt
+++ b/UMC_6th/app/src/main/java/com/example/umc_6th/SongDatabase.kt
@@ -5,11 +5,11 @@ import androidx.room.Database
 import androidx.room.Room
 import androidx.room.RoomDatabase
 
-@Database(entities = [Song::class, Album::class], version = 1)
+@Database(entities = [Song::class, Album::class, User::class,Like::class], version = 1)
 abstract class SongDatabase: RoomDatabase() {
     abstract fun songDao(): SongDao
     abstract fun albumDao() : AlbumDao
-
+    abstract fun userDao() : UserDao
     companion object{
         private var instance: SongDatabase? = null
 
diff --git a/UMC_6th/app/src/main/java/com/example/umc_6th/User.kt b/UMC_6th/app/src/main/java/com/example/umc_6th/User.kt
new file mode 100644
index 0000000..017dfb8
--- /dev/null
+++ b/UMC_6th/app/src/main/java/com/example/umc_6th/User.kt
@@ -0,0 +1,12 @@
+package com.example.umc_6th
+
+import androidx.room.Entity
+import androidx.room.PrimaryKey
+
+@Entity(tableName = "UserTable")
+data class User(
+    var email : String,
+    var password : String
+){
+    @PrimaryKey(autoGenerate = true) var id : Int = 0
+}
diff --git a/UMC_6th/app/src/main/java/com/example/umc_6th/UserDao.kt b/UMC_6th/app/src/main/java/com/example/umc_6th/UserDao.kt
new file mode 100644
index 0000000..bb15eca
--- /dev/null
+++ b/UMC_6th/app/src/main/java/com/example/umc_6th/UserDao.kt
@@ -0,0 +1,17 @@
+package com.example.umc_6th
+
+import androidx.room.Dao
+import androidx.room.Insert
+import androidx.room.Query
+
+@Dao
+interface UserDao {
+    @Insert
+    fun insert(user : User)
+
+    @Query("SELECT * FROM UserTable")
+    fun getUsers() : List<User>
+
+    @Query("SELECT * FROM usertable WHERE email = :email AND password = :password")
+    fun getUser(email : String ,password : String) : User?
+}
\ No newline at end of file
diff --git a/UMC_6th/app/src/main/res/drawable/not_selected_button.xml b/UMC_6th/app/src/main/res/drawable/not_selected_button.xml
new file mode 100644
index 0000000..4a3ab47
--- /dev/null
+++ b/UMC_6th/app/src/main/res/drawable/not_selected_button.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+    <corners android:radius="40dp" />
+    <solid android:color="@color/song_player_bg" />
+</shape>
\ No newline at end of file
diff --git a/UMC_6th/app/src/main/res/drawable/selected_button.xml b/UMC_6th/app/src/main/res/drawable/selected_button.xml
new file mode 100644
index 0000000..6d2e9bf
--- /dev/null
+++ b/UMC_6th/app/src/main/res/drawable/selected_button.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+    <corners android:radius="40dp" />
+    <solid android:color="@color/select_color" />
+</shape>
\ No newline at end of file
diff --git a/UMC_6th/app/src/main/res/layout/activity_login.xml b/UMC_6th/app/src/main/res/layout/activity_login.xml
new file mode 100644
index 0000000..5dbeaa3
--- /dev/null
+++ b/UMC_6th/app/src/main/res/layout/activity_login.xml
@@ -0,0 +1,319 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+    <ImageView
+        android:id="@+id/login_close_iv"
+        android:layout_width="30dp"
+        android:layout_height="30dp"
+        android:layout_marginTop="20dp"
+        android:layout_marginEnd="5dp"
+        android:src="@drawable/btn_actionbar_close"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintTop_toTopOf="parent"/>
+
+    <ImageView
+        android:id="@+id/login_flo_logo_iv"
+        android:layout_width="80dp"
+        android:layout_height="30dp"
+        android:src="@drawable/ic_flo_logo"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/login_close_iv"/>
+
+    <EditText
+        android:id="@+id/login_id_et"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="20dp"
+        android:layout_marginTop="80dp"
+        android:layout_marginEnd="5dp"
+        android:background="@null"
+        android:hint="아이디(이메일)"
+        android:inputType="text"
+        android:textSize="16sp"
+        app:layout_constraintEnd_toStartOf="@id/login_at_sign_tv"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/login_flo_logo_iv"/>
+
+    <View
+        android:id="@+id/login_id_underscore_view"
+        android:layout_width="0dp"
+        android:layout_height="1px"
+        android:layout_marginTop="15dp"
+        android:background="#a8a8a8"
+        app:layout_constraintEnd_toEndOf="@+id/login_id_et"
+        app:layout_constraintStart_toStartOf="@+id/login_id_et"
+        app:layout_constraintTop_toBottomOf="@+id/login_id_et"/>
+
+    <TextView
+        android:id="@+id/login_at_sign_tv"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:textSize="14sp"
+        android:textColor="@color/black"
+        android:textStyle="bold"
+        android:text="\@"
+        app:layout_constraintBottom_toBottomOf="@+id/login_id_et"
+        app:layout_constraintEnd_toEndOf="@+id/login_flo_logo_iv"
+        app:layout_constraintStart_toStartOf="@+id/login_flo_logo_iv"
+        app:layout_constraintTop_toTopOf="@+id/login_id_et" />
+
+    <EditText
+        android:id="@+id/login_direct_input_et"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="5dp"
+        android:layout_marginEnd="20dp"
+        android:background="@null"
+        android:hint="직접입력"
+        android:inputType="textEmailAddress"
+        android:textSize="16sp"
+        app:layout_constraintBottom_toBottomOf="@id/login_id_et"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toEndOf="@id/login_at_sign_tv"
+        app:layout_constraintTop_toTopOf="@id/login_id_et"/>
+
+    <View
+        android:id="@+id/login_address_underscore_view"
+        android:layout_width="0dp"
+        android:layout_height="1px"
+        android:layout_marginTop="15dp"
+        android:background="#a8a8a8"
+        app:layout_constraintEnd_toEndOf="@+id/login_direct_input_et"
+        app:layout_constraintStart_toStartOf="@+id/login_direct_input_et"
+        app:layout_constraintTop_toBottomOf="@+id/login_direct_input_et"/>
+
+    <ImageView
+        android:id="@+id/login_email_list_iv"
+        android:layout_width="15dp"
+        android:layout_height="15dp"
+        android:layout_marginEnd="5dp"
+        android:src="@drawable/nugu_btn_down"
+        app:layout_constraintBottom_toBottomOf="@id/login_direct_input_et"
+        app:layout_constraintEnd_toEndOf="@id/login_direct_input_et"
+        app:layout_constraintTop_toTopOf="@id/login_direct_input_et"/>
+
+    <EditText
+        android:id="@+id/login_password_et"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="20dp"
+        android:layout_marginTop="40dp"
+        android:layout_marginEnd="20dp"
+        android:background="@null"
+        android:hint="비밀번호"
+        android:inputType="textPassword"
+        android:textSize="16sp"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/login_id_underscore_view"/>
+
+    <View
+        android:id="@+id/login_password_underscore_view"
+        android:layout_width="0dp"
+        android:layout_height="1px"
+        android:layout_marginTop="15dp"
+        android:background="#a8a8a8"
+        app:layout_constraintEnd_toEndOf="@+id/login_password_et"
+        app:layout_constraintStart_toStartOf="@+id/login_password_et"
+        app:layout_constraintTop_toBottomOf="@+id/login_password_et"/>
+
+    <ImageView
+        android:id="@+id/login_hide_password_iv"
+        android:layout_width="30dp"
+        android:layout_height="30dp"
+        android:layout_marginEnd="5dp"
+        android:src="@drawable/btn_input_password"
+        app:layout_constraintBottom_toBottomOf="@+id/login_password_et"
+        app:layout_constraintEnd_toEndOf="@+id/login_password_et"
+        app:layout_constraintTop_toTopOf="@+id/login_password_et" />
+
+    <EditText
+        android:id="@+id/login_check_password_et"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="20dp"
+        android:layout_marginTop="40dp"
+        android:layout_marginEnd="20dp"
+        android:background="@null"
+        android:hint="비밀번호 확인"
+        android:inputType="textPassword"
+        android:textSize="16sp"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/login_password_underscore_view"/>
+
+    <View
+        android:id="@+id/login_check_password_underscore_view"
+        android:layout_width="0dp"
+        android:layout_height="1px"
+        android:layout_marginTop="15dp"
+        android:background="#a8a8a8"
+        app:layout_constraintEnd_toEndOf="@+id/login_check_password_et"
+        app:layout_constraintStart_toStartOf="@+id/login_check_password_et"
+        app:layout_constraintTop_toBottomOf="@+id/login_check_password_et"/>
+
+    <ImageView
+        android:id="@+id/login_hide_check_password_iv"
+        android:layout_width="30dp"
+        android:layout_height="30dp"
+        android:layout_marginEnd="5dp"
+        android:src="@drawable/btn_input_password"
+        app:layout_constraintBottom_toBottomOf="@+id/login_check_password_et"
+        app:layout_constraintEnd_toEndOf="@+id/login_check_password_et"
+        app:layout_constraintTop_toTopOf="@+id/login_check_password_et" />
+
+    <androidx.appcompat.widget.AppCompatButton
+        android:id="@+id/login_sign_in_btn"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="20dp"
+        android:layout_marginTop="40dp"
+        android:layout_marginEnd="20dp"
+        android:background="@drawable/button_background_flo_color"
+        android:text="로그인"
+        android:textColor="@color/white"
+        android:textSize="16sp"
+        android:textStyle="bold"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/login_password_underscore_view" />
+
+    <TextView
+        android:id="@+id/login_find_id_tv"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="10dp"
+        android:text="아이디 찾기"
+        app:layout_constraintStart_toStartOf="@+id/login_sign_in_btn"
+        app:layout_constraintTop_toBottomOf="@+id/login_sign_in_btn" />
+
+    <TextView
+        android:id="@+id/login_division_tv"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="5dp"
+        android:text="|"
+        app:layout_constraintBottom_toBottomOf="@+id/login_find_id_tv"
+        app:layout_constraintStart_toEndOf="@+id/login_find_id_tv"
+        app:layout_constraintTop_toTopOf="@+id/login_find_id_tv" />
+
+    <TextView
+        android:id="@+id/login_find_password_tv"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="5dp"
+        android:text="비밀번호 찾기"
+        app:layout_constraintBottom_toBottomOf="@+id/login_division_tv"
+        app:layout_constraintStart_toEndOf="@+id/login_division_tv"
+        app:layout_constraintTop_toTopOf="@+id/login_division_tv" />
+
+    <TextView
+        android:id="@+id/login_sign_up_tv"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="10dp"
+        android:text="회원가입"
+        android:textColor="@color/black"
+        android:textStyle="bold"
+        app:layout_constraintEnd_toEndOf="@+id/login_sign_in_btn"
+        app:layout_constraintTop_toBottomOf="@+id/login_sign_in_btn" />
+
+    <LinearLayout
+        android:id="@+id/login_t_world_login_layout"
+        android:layout_width="0dp"
+        android:layout_height="50dp"
+        android:layout_marginStart="20dp"
+        android:layout_marginTop="35dp"
+        android:layout_marginEnd="20dp"
+        android:background="@drawable/button_background_black_color"
+        android:gravity="center"
+        android:orientation="horizontal"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/login_find_id_tv">
+
+        <ImageView
+            android:layout_width="25dp"
+            android:layout_height="25dp"
+            android:layout_marginEnd="4dp"
+            android:src="@drawable/ico_20_logo_tid_white" />
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="아이디로 로그인"
+            android:textColor="@color/white"
+            android:textSize="16sp"
+            android:textStyle="bold" />
+
+    </LinearLayout>
+
+    <LinearLayout
+        android:id="@+id/login_phone_number_login_layout"
+        android:layout_width="0dp"
+        android:layout_height="50dp"
+        android:layout_marginStart="20dp"
+        android:layout_marginTop="10dp"
+        android:layout_marginEnd="20dp"
+        android:background="@drawable/button_background_white_color"
+        android:gravity="center"
+        android:orientation="horizontal"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/login_t_world_login_layout">
+
+        <ImageView
+            android:layout_width="25dp"
+            android:layout_height="25dp"
+            android:layout_marginEnd="4dp"
+            android:scaleType="fitXY"
+            android:src="@drawable/btn_setting_phone" />
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="휴대폰 번호 로그인"
+            android:textColor="@color/black"
+            android:textSize="16sp"
+            android:textStyle="bold" />
+
+    </LinearLayout>
+
+
+    <LinearLayout
+        android:id="@+id/login_social_login_layout"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="40dp"
+        android:orientation="horizontal"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/login_phone_number_login_layout">
+
+        <ImageView
+            android:id="@+id/login_naver_login_iv"
+            android:layout_width="45dp"
+            android:layout_height="45dp"
+            android:src="@drawable/naver_44" />
+
+        <ImageView
+            android:id="@+id/login_kakako_login_iv"
+            android:layout_width="45dp"
+            android:layout_height="45dp"
+            android:layout_marginStart="15dp"
+            android:layout_marginEnd="15dp"
+            android:src="@drawable/kakako_44" />
+
+        <ImageView
+            android:id="@+id/login_apple_login_iv"
+            android:layout_width="45dp"
+            android:layout_height="45dp"
+            android:src="@drawable/apple_44" />
+    </LinearLayout>
+
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/UMC_6th/app/src/main/res/layout/activity_signup.xml b/UMC_6th/app/src/main/res/layout/activity_signup.xml
new file mode 100644
index 0000000..3e803d8
--- /dev/null
+++ b/UMC_6th/app/src/main/res/layout/activity_signup.xml
@@ -0,0 +1,223 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+    <TextView
+        android:id="@+id/sign_up_sign_up_tv"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="50dp"
+        android:text="회원가입"
+        android:textColor="@color/black"
+        android:textSize="18sp"
+        android:textStyle="bold"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
+
+    <EditText
+        android:id="@+id/sign_up_id_et"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="20dp"
+        android:layout_marginTop="50dp"
+        android:layout_marginEnd="5dp"
+        android:background="@null"
+        android:hint="아이디(이메일)"
+        android:inputType="text"
+        android:textSize="16sp"
+        app:layout_constraintEnd_toStartOf="@+id/sign_up_at_sign_tv"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/sign_up_sign_up_tv" />
+
+    <View
+        android:id="@+id/sign_up_id_underscore_view"
+        android:layout_width="0dp"
+        android:layout_height="1px"
+        android:layout_marginTop="15dp"
+        android:background="#a8a8a8"
+        app:layout_constraintEnd_toEndOf="@+id/sign_up_id_et"
+        app:layout_constraintStart_toStartOf="@+id/sign_up_id_et"
+        app:layout_constraintTop_toBottomOf="@+id/sign_up_id_et"/>
+
+    <TextView
+        android:id="@+id/sign_up_at_sign_tv"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="\@"
+        android:textColor="@color/black"
+        android:textSize="14sp"
+        android:textStyle="bold"
+        app:layout_constraintBottom_toBottomOf="@+id/sign_up_id_et"
+        app:layout_constraintEnd_toEndOf="@+id/sign_up_sign_up_tv"
+        app:layout_constraintStart_toStartOf="@+id/sign_up_sign_up_tv"
+        app:layout_constraintTop_toTopOf="@+id/sign_up_id_et" />
+
+    <EditText
+        android:id="@+id/sign_up_direct_input_et"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="5dp"
+        android:layout_marginEnd="20dp"
+        android:background="@null"
+        android:hint="직접입력"
+        android:inputType="textWebEmailAddress"
+        android:textSize="16sp"
+        app:layout_constraintBottom_toBottomOf="@+id/sign_up_id_et"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toEndOf="@+id/sign_up_at_sign_tv"
+        app:layout_constraintTop_toTopOf="@+id/sign_up_at_sign_tv" />
+
+    <View
+        android:id="@+id/sign_up_address_underscore_view"
+        android:layout_width="0dp"
+        android:layout_height="1px"
+        android:layout_marginTop="15dp"
+        android:background="#a8a8a8"
+        app:layout_constraintEnd_toEndOf="@+id/sign_up_direct_input_et"
+        app:layout_constraintStart_toStartOf="@+id/sign_up_direct_input_et"
+        app:layout_constraintTop_toBottomOf="@+id/sign_up_direct_input_et"/>
+
+    <ImageView
+        android:id="@+id/sign_up_email_list_iv"
+        android:layout_width="15dp"
+        android:layout_height="15dp"
+        android:layout_marginEnd="5dp"
+        android:src="@drawable/nugu_btn_down"
+        app:layout_constraintBottom_toBottomOf="@+id/sign_up_direct_input_et"
+        app:layout_constraintEnd_toEndOf="@+id/sign_up_direct_input_et"
+        app:layout_constraintTop_toTopOf="@+id/sign_up_direct_input_et" />
+
+    <TextView
+        android:id="@+id/sign_up_email_error_tv"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:textColor="@color/form_error"
+        android:textSize="14sp"
+        android:textStyle="bold"
+        android:layout_marginTop="10dp"
+        android:layout_marginStart="20dp"
+        android:visibility="gone"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/sign_up_id_underscore_view"/>
+
+    <EditText
+        android:id="@+id/sign_up_name_et"
+        android:layout_width="150dp"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="20dp"
+        android:layout_marginTop="30dp"
+        android:layout_marginEnd="20dp"
+        android:background="@null"
+        android:hint="이름"
+        android:inputType="textPersonName"
+        android:textSize="16sp"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/sign_up_email_error_tv" />
+
+    <View
+        android:id="@+id/sign_up_name_underscore_view"
+        android:layout_width="150dp"
+        android:layout_height="1px"
+        android:layout_marginTop="15dp"
+        android:background="#a8a8a8"
+        app:layout_constraintStart_toStartOf="@+id/sign_up_password_et"
+        app:layout_constraintTop_toBottomOf="@+id/sign_up_name_et"/>
+
+    <EditText
+        android:id="@+id/sign_up_password_et"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="20dp"
+        android:layout_marginTop="40dp"
+        android:layout_marginEnd="20dp"
+        android:background="@null"
+        android:hint="비밀번호"
+        android:inputType="textPassword"
+        android:textSize="16sp"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/sign_up_name_et" />
+
+    <View
+        android:id="@+id/sign_up_password_underscore_view"
+        android:layout_width="0dp"
+        android:layout_height="1px"
+        android:layout_marginTop="15dp"
+        android:background="#a8a8a8"
+        app:layout_constraintEnd_toEndOf="@+id/sign_up_password_et"
+        app:layout_constraintStart_toStartOf="@+id/sign_up_password_et"
+        app:layout_constraintTop_toBottomOf="@+id/sign_up_password_et"/>
+
+    <ImageView
+        android:id="@+id/sign_up_hide_password_iv"
+        android:layout_width="30dp"
+        android:layout_height="30dp"
+        android:layout_marginEnd="5dp"
+        android:src="@drawable/btn_input_password"
+        app:layout_constraintBottom_toBottomOf="@+id/sign_up_password_et"
+        app:layout_constraintEnd_toEndOf="@+id/sign_up_password_et"
+        app:layout_constraintTop_toTopOf="@+id/sign_up_password_et" />
+
+    <EditText
+        android:id="@+id/sign_up_password_check_et"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="20dp"
+        android:layout_marginTop="40dp"
+        android:layout_marginEnd="20dp"
+        android:background="@null"
+        android:hint="비밀번호 확인"
+        android:inputType="textPassword"
+        android:textSize="16sp"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/sign_up_password_underscore_view" />
+
+    <View
+        android:id="@+id/sign_up_password_check_underscore_view"
+        android:layout_width="0dp"
+        android:layout_height="1px"
+        android:layout_marginTop="15dp"
+        android:background="#a8a8a8"
+        app:layout_constraintEnd_toEndOf="@+id/sign_up_password_check_et"
+        app:layout_constraintStart_toStartOf="@+id/sign_up_password_check_et"
+        app:layout_constraintTop_toBottomOf="@+id/sign_up_password_check_et"/>
+
+    <ImageView
+        android:id="@+id/sign_up_hide_password_check_iv"
+        android:layout_width="30dp"
+        android:layout_height="30dp"
+        android:layout_marginEnd="5dp"
+        android:src="@drawable/btn_input_password"
+        app:layout_constraintBottom_toBottomOf="@+id/sign_up_password_check_et"
+        app:layout_constraintEnd_toEndOf="@+id/sign_up_password_check_et"
+        app:layout_constraintTop_toTopOf="@+id/sign_up_password_check_et" />
+
+    <androidx.appcompat.widget.AppCompatButton
+        android:id="@+id/sign_up_sign_up_btn"
+        android:layout_width="match_parent"
+        android:layout_height="50dp"
+        android:background="@drawable/button_background_flo_color"
+        android:text="가입완료"
+        android:textColor="@color/white"
+        android:textSize="16sp"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent" />
+
+    <ProgressBar
+        android:id="@+id/sign_up_loading_pb"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginBottom="8dp"
+        android:indeterminateTint="@color/flo"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        android:visibility="gone"/>
+
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/UMC_6th/app/src/main/res/layout/fragment_locker_savedalbum.xml b/UMC_6th/app/src/main/res/layout/fragment_locker_savedalbum.xml
index 04bf526..2f7e2d0 100644
--- a/UMC_6th/app/src/main/res/layout/fragment_locker_savedalbum.xml
+++ b/UMC_6th/app/src/main/res/layout/fragment_locker_savedalbum.xml
@@ -1,17 +1,18 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.constraintlayout.widget.ConstraintLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    xmlns:app="http://schemas.android.com/apk/res-auto">
+    android:layout_height="match_parent">
 
-    <TextView
+    <androidx.recyclerview.widget.RecyclerView
+        android:id="@+id/locker_savedSong_recyclerView"
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:text="저장한 앨범이 없습니다."
-        android:textSize="30sp"
-        app:layout_constraintTop_toTopOf="parent"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"/>
+        android:layout_height="match_parent"
+        tools:listitem="@layout/item_locker_album"
+        android:overScrollMode="never"
+        android:orientation="vertical"
+        app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"/>
 
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/UMC_6th/app/src/main/res/layout/fragment_look.xml b/UMC_6th/app/src/main/res/layout/fragment_look.xml
index 596af50..4cc8cf8 100644
--- a/UMC_6th/app/src/main/res/layout/fragment_look.xml
+++ b/UMC_6th/app/src/main/res/layout/fragment_look.xml
@@ -1,14 +1,294 @@
 <?xml version="1.0" encoding="utf-8"?>
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.constraintlayout.widget.ConstraintLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     tools:context=".LookFragment">
 
-    <!-- TODO: Update blank fragment layout -->
     <TextView
+        android:id="@+id/textView2"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="20dp"
+        android:layout_marginTop="20dp"
+        android:gravity="center"
+        android:text="둘러보기"
+        android:textColor="@color/black"
+        android:textSize="25sp"
+        android:textStyle="bold"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
+
+    <HorizontalScrollView
+        android:id="@+id/horizontalScrollView"
         android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:text="@string/hello_blank_fragment" />
+        android:layout_height="wrap_content"
+        android:paddingVertical="20dp"
+        android:scrollbars="none"
+        app:layout_constraintTop_toBottomOf="@+id/textView2">
+
+        <LinearLayout
+            android:layout_width="wrap_content"
+            android:layout_height="match_parent"
+            android:orientation="horizontal">
+
+            <android.widget.Button
+                android:id="@+id/look_chart_btn"
+                android:layout_width="wrap_content"
+                android:layout_height="40dp"
+                android:layout_marginLeft="25dp"
+                android:background="@drawable/selected_button"
+                android:text="차트"
+                android:textColor="@color/white"
+                android:textSize="15sp"
+                android:textStyle="bold" />
+
+            <android.widget.Button
+                android:id="@+id/look_video_btn"
+                android:layout_width="wrap_content"
+                android:layout_height="40dp"
+                android:layout_marginLeft="10dp"
+                android:background="@drawable/not_selected_button"
+                android:text="비디오"
+                android:textColor="@color/white"
+                android:textSize="15sp"
+                android:textStyle="bold" />
+
+            <android.widget.Button
+                android:id="@+id/look_genre_btn"
+                android:layout_width="wrap_content"
+                android:layout_height="40dp"
+                android:layout_marginLeft="10dp"
+                android:background="@drawable/not_selected_button"
+                android:text="장르"
+                android:textColor="@color/white"
+                android:textSize="15sp"
+                android:textStyle="bold" />
+
+            <android.widget.Button
+                android:id="@+id/look_situation_btn"
+                android:layout_width="wrap_content"
+                android:layout_height="40dp"
+                android:layout_marginLeft="10dp"
+                android:background="@drawable/not_selected_button"
+                android:text="상황"
+                android:textColor="@color/white"
+                android:textSize="15sp"
+                android:textStyle="bold" />
+
+            <android.widget.Button
+                android:id="@+id/look_audio_btn"
+                android:layout_width="wrap_content"
+                android:layout_height="40dp"
+                android:layout_marginLeft="10dp"
+                android:background="@drawable/not_selected_button"
+                android:text="오디오"
+                android:textColor="@color/white"
+                android:textSize="15sp"
+                android:textStyle="bold" />
+
+            <android.widget.Button
+                android:id="@+id/look_atmostphere_btn"
+                android:layout_width="wrap_content"
+                android:layout_height="40dp"
+                android:layout_marginRight="20dp"
+                android:layout_marginLeft="10dp"
+                android:background="@drawable/not_selected_button"
+                android:text="분위기"
+                android:textColor="@color/white"
+                android:textSize="15sp"
+                android:textStyle="bold" />
+        </LinearLayout>
+    </HorizontalScrollView>
+
+    <ScrollView
+        android:id="@+id/look_sv"
+        android:layout_width="match_parent"
+        android:layout_height="0dp"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/horizontalScrollView">
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="vertical">
+
+            <TextView
+                android:id="@+id/look_chart_tv"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginStart="20dp"
+                android:layout_marginTop="30dp"
+                android:text="차트"
+                android:textColor="@color/black"
+                android:textSize="25sp"
+                android:textStyle="bold" />
+
+            <androidx.cardview.widget.CardView
+                android:id="@+id/cardView"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginHorizontal="20dp"
+                android:layout_marginTop="20dp"
+                app:cardCornerRadius="8dp"
+                app:cardElevation="4dp"
+                app:layout_constraintTop_toBottomOf="@+id/look_chart_tv"
+                tools:layout_editor_absoluteX="20dp">
+
+                <androidx.recyclerview.widget.RecyclerView
+                    android:id="@+id/look_chart_song_rv"
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent"
+                    android:layout_marginTop="10dp"
+                    android:orientation="vertical"
+                    android:overScrollMode="never"
+                    app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
+                    app:layout_constraintBottom_toBottomOf="parent"
+                    app:layout_constraintTop_toTopOf="parent"
+                    tools:listitem="@layout/item_locker_album" />
+
+            </androidx.cardview.widget.CardView>
+
+            <TextView
+                android:id="@+id/look_video_tv"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginStart="20dp"
+                android:layout_marginTop="20dp"
+                android:text="비디오"
+                android:textColor="@color/black"
+                android:textSize="25sp"
+                android:textStyle="bold"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toBottomOf="@+id/cardView" />
+
+            <TextView
+                android:id="@+id/look_video_contents_tv"
+                android:layout_width="match_parent"
+                android:layout_height="500dp"
+                android:layout_marginStart="20dp"
+                android:layout_marginVertical="20dp"
+                android:text="비디오 섹션"
+                android:gravity="center"
+                android:textColor="@color/black"
+                android:textSize="25sp"
+                android:textStyle="bold"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toBottomOf="@+id/cardView" />
+
+            <TextView
+                android:id="@+id/look_genre_tv"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginStart="20dp"
+                android:layout_marginTop="20dp"
+                android:text="장르"
+                android:textColor="@color/black"
+                android:textSize="25sp"
+                android:textStyle="bold"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toBottomOf="@+id/look_video_contents_tv" />
+
+            <TextView
+                android:id="@+id/look_genre_contents_tv"
+                android:layout_width="match_parent"
+                android:layout_height="500dp"
+                android:layout_marginStart="20dp"
+                android:layout_marginVertical="20dp"
+                android:text="장르 섹션"
+                android:gravity="center"
+                android:textColor="@color/black"
+                android:textSize="25sp"
+                android:textStyle="bold"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toBottomOf="@+id/look_video_contents_tv" />
+
+            <TextView
+                android:id="@+id/look_situation_tv"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginStart="20dp"
+                android:layout_marginTop="20dp"
+                android:text="상황"
+                android:textColor="@color/black"
+                android:textSize="25sp"
+                android:textStyle="bold"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toBottomOf="@+id/look_genre_contents_tv" />
+
+            <TextView
+                android:id="@+id/look_situation_contents_tv"
+                android:layout_width="match_parent"
+                android:layout_height="500dp"
+                android:layout_marginStart="20dp"
+                android:layout_marginVertical="20dp"
+                android:text="상황 섹션"
+                android:gravity="center"
+                android:textColor="@color/black"
+                android:textSize="25sp"
+                android:textStyle="bold"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toBottomOf="@+id/look_genre_contents_tv" />
+
+            <TextView
+                android:id="@+id/look_audio_tv"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginStart="20dp"
+                android:layout_marginTop="20dp"
+                android:text="오디오"
+                android:textColor="@color/black"
+                android:textSize="25sp"
+                android:textStyle="bold"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toBottomOf="@+id/look_genre_contents_tv" />
+
+            <TextView
+                android:id="@+id/look_audio_contents_tv"
+                android:layout_width="match_parent"
+                android:layout_height="500dp"
+                android:layout_marginStart="20dp"
+                android:layout_marginVertical="20dp"
+                android:text="오디오 섹션"
+                android:gravity="center"
+                android:textColor="@color/black"
+                android:textSize="25sp"
+                android:textStyle="bold"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toBottomOf="@+id/look_genre_contents_tv" />
+
+            <TextView
+                android:id="@+id/look_atmostphere_tv"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginStart="20dp"
+                android:layout_marginTop="20dp"
+                android:text="분위기"
+                android:textColor="@color/black"
+                android:textSize="25sp"
+                android:textStyle="bold"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toBottomOf="@+id/look_genre_contents_tv" />
+
+            <TextView
+                android:id="@+id/look_atmostphere_contents_tv"
+                android:layout_width="match_parent"
+                android:layout_height="500dp"
+                android:layout_marginStart="20dp"
+                android:layout_marginVertical="20dp"
+                android:text="분위기 섹션"
+                android:gravity="center"
+                android:textColor="@color/black"
+                android:textSize="25sp"
+                android:textStyle="bold"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toBottomOf="@+id/look_genre_contents_tv" />
+
+        </LinearLayout>
 
-</FrameLayout>
\ No newline at end of file
+    </ScrollView>
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file