From ca3ed59c28c888f6b9fb841c9faeb9cb97649489 Mon Sep 17 00:00:00 2001
From: BAEK0111 <baekjw111@gmail.com>
Date: Sun, 19 May 2024 16:12:12 +0900
Subject: [PATCH] =?UTF-8?q?[simba/#28]=20feat::=EB=A6=AC=EC=82=AC=EC=9D=B4?=
 =?UTF-8?q?=ED=81=B4=EB=9F=AC=EB=B7=B0=20=EA=B5=AC=ED=98=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../shelved.patch"                            | 314 ++++++++++++++++++
 ..._Checkout_at_5_18_24__7_44PM__Changes_.xml |   4 +
 .../shelved.patch"                            |  15 -
 ...e_Checkout_at_5_1_24__6_28PM__Changes_.xml |   4 -
 .../main/java/com/example/umc_6th/Album.kt    |  10 +
 .../com/example/umc_6th/AlbumRVAdapter.kt     |  32 ++
 .../java/com/example/umc_6th/HomeFragment.kt  |  24 +-
 .../app/src/main/res/layout/fragment_home.xml | 306 ++++++++---------
 .../app/src/main/res/layout/item_album.xml    |   4 +-
 9 files changed, 530 insertions(+), 183 deletions(-)
 create mode 100644 "UMC_6th/.idea/shelf/Uncommitted_changes_before_Checkout_at_5_18_24,_7_44\342\200\257PM_[Changes]/shelved.patch"
 create mode 100644 UMC_6th/.idea/shelf/Uncommitted_changes_before_Checkout_at_5_18_24__7_44PM__Changes_.xml
 delete mode 100644 "UMC_6th/.idea/shelf/Uncommitted_changes_before_Checkout_at_5_1_24,_6_28\342\200\257PM_[Changes]/shelved.patch"
 delete mode 100644 UMC_6th/.idea/shelf/Uncommitted_changes_before_Checkout_at_5_1_24__6_28PM__Changes_.xml
 create mode 100644 UMC_6th/app/src/main/java/com/example/umc_6th/Album.kt
 create mode 100644 UMC_6th/app/src/main/java/com/example/umc_6th/AlbumRVAdapter.kt

diff --git "a/UMC_6th/.idea/shelf/Uncommitted_changes_before_Checkout_at_5_18_24,_7_44\342\200\257PM_[Changes]/shelved.patch" "b/UMC_6th/.idea/shelf/Uncommitted_changes_before_Checkout_at_5_18_24,_7_44\342\200\257PM_[Changes]/shelved.patch"
new file mode 100644
index 0000000..fb11067
--- /dev/null
+++ "b/UMC_6th/.idea/shelf/Uncommitted_changes_before_Checkout_at_5_18_24,_7_44\342\200\257PM_[Changes]/shelved.patch"
@@ -0,0 +1,314 @@
+Index: app/src/main/java/com/example/umc_6th/MemoCheckActivity.kt
+===================================================================
+diff --git a/app/src/main/java/com/example/umc_6th/MemoCheckActivity.kt b/app/src/main/java/com/example/umc_6th/MemoCheckActivity.kt
+deleted file mode 100644
+--- a/app/src/main/java/com/example/umc_6th/MemoCheckActivity.kt	(revision 64c266d85ab319ac4c7c3a26cefb02bb1f06820c)
++++ /dev/null	(revision 64c266d85ab319ac4c7c3a26cefb02bb1f06820c)
+@@ -1,20 +0,0 @@
+-package com.example.umc_6th
+-
+-import android.os.Bundle
+-import androidx.appcompat.app.AppCompatActivity
+-import com.example.umc_6th.databinding.ActivityMemoCheckBinding
+-
+-class MemoCheckActivity : AppCompatActivity() {
+-    lateinit var binding : ActivityMemoCheckBinding
+-
+-    override fun onCreate(savedInstanceState: Bundle?) {
+-        super.onCreate(savedInstanceState)
+-
+-        binding = ActivityMemoCheckBinding.inflate(layoutInflater)
+-        setContentView(binding.root)
+-
+-        if(intent.hasExtra("memo")) {
+-            binding.memoCheckText.text = intent.getStringExtra("memo")!!
+-        }
+-    }
+-}
+\ No newline at end of file
+Index: app/src/main/java/com/example/umc_6th/MemoActivity.kt
+===================================================================
+diff --git a/app/src/main/java/com/example/umc_6th/MemoActivity.kt b/app/src/main/java/com/example/umc_6th/MemoActivity.kt
+deleted file mode 100644
+--- a/app/src/main/java/com/example/umc_6th/MemoActivity.kt	(revision 64c266d85ab319ac4c7c3a26cefb02bb1f06820c)
++++ /dev/null	(revision 64c266d85ab319ac4c7c3a26cefb02bb1f06820c)
+@@ -1,48 +0,0 @@
+-package com.example.umc_6th
+-
+-import android.content.Intent
+-import android.os.Bundle
+-import android.util.Log
+-import androidx.appcompat.app.AppCompatActivity
+-import com.example.umc_6th.databinding.ActivityMemoBinding
+-
+-class MemoActivity : AppCompatActivity() {
+-
+-    lateinit var binding : ActivityMemoBinding
+-
+-    override fun onCreate(savedInstanceState: Bundle?) {
+-        super.onCreate(savedInstanceState)
+-        binding = ActivityMemoBinding.inflate(layoutInflater)
+-        setContentView(binding.root)
+-
+-        binding.nextBtn.setOnClickListener {
+-            val intent = Intent(this, MemoCheckActivity::class.java)
+-            val memoTxt = binding.memoEt.text.toString()
+-            intent.putExtra("memo", memoTxt)
+-            startActivity(intent)
+-        }
+-    }
+-
+-    override fun onPause() {
+-        super.onPause()
+-        val sharedPreferences = getSharedPreferences("memo", MODE_PRIVATE)
+-        val editor = sharedPreferences.edit()
+-        val tempMemo = binding.memoEt.text.toString()
+-
+-        if(tempMemo.isNotEmpty()) {
+-            editor.putString("tempMemo", tempMemo)
+-            Log.d("tempMemo", tempMemo)
+-            editor.apply()
+-        }
+-    }
+-
+-    override fun onResume() {
+-        super.onResume()
+-        val sharedPreferences = getSharedPreferences("memo", MODE_PRIVATE)
+-        val tempMemo = sharedPreferences.getString("tempMemo", null)
+-
+-        if(tempMemo != null) {
+-            binding.memoEt.setText(tempMemo)
+-        }
+-    }
+-}
+\ No newline at end of file
+Index: app/src/main/res/layout/activity_memo_check.xml
+===================================================================
+diff --git a/app/src/main/res/layout/activity_memo_check.xml b/app/src/main/res/layout/activity_memo_check.xml
+deleted file mode 100644
+--- a/app/src/main/res/layout/activity_memo_check.xml	(revision 64c266d85ab319ac4c7c3a26cefb02bb1f06820c)
++++ /dev/null	(revision 64c266d85ab319ac4c7c3a26cefb02bb1f06820c)
+@@ -1,32 +0,0 @@
+-<?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"
+-    tools:context=".MemoCheckActivity">
+-
+-    <TextView
+-        android:layout_width="match_parent"
+-        android:layout_height="wrap_content"
+-        android:layout_margin="20dp"
+-        android:text="My Memo Check"
+-        android:textSize="30sp"
+-        android:textStyle="bold"
+-        app:layout_constraintStart_toStartOf="parent"
+-        app:layout_constraintTop_toTopOf="parent" />
+-
+-    <TextView
+-        android:id="@+id/memo_check_text"
+-        android:text="memo text"
+-        android:gravity="center"
+-        android:textSize="30sp"
+-        android:textStyle="bold"
+-        android:layout_width="match_parent"
+-        android:layout_height="wrap_content"
+-        app:layout_constraintBottom_toBottomOf="parent"
+-        app:layout_constraintEnd_toEndOf="parent"
+-        app:layout_constraintStart_toStartOf="parent"
+-        app:layout_constraintTop_toTopOf="parent" />
+-
+-</androidx.constraintlayout.widget.ConstraintLayout>
+\ No newline at end of file
+Index: app/src/main/res/layout/dialog.xml
+===================================================================
+diff --git a/app/src/main/res/layout/dialog.xml b/app/src/main/res/layout/dialog.xml
+deleted file mode 100644
+--- a/app/src/main/res/layout/dialog.xml	(revision 64c266d85ab319ac4c7c3a26cefb02bb1f06820c)
++++ /dev/null	(revision 64c266d85ab319ac4c7c3a26cefb02bb1f06820c)
+@@ -1,76 +0,0 @@
+-<?xml version="1.0" encoding="utf-8"?>
+-<LinearLayout
+-    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"
+-    android:orientation="vertical">
+-
+-    <TextView
+-        android:id="@+id/dialog_question"
+-        android:layout_width="match_parent"
+-        android:layout_height="wrap_content"
+-        android:layout_marginHorizontal="10dp"
+-        android:layout_marginTop="10dp"
+-        android:text="기존에 작성 중인던\n메모가 있습니다."
+-        android:textSize="25sp"
+-        android:textStyle="bold"
+-        android:textColor="#000000"
+-        android:gravity="center"
+-        android:background="@android:color/transparent"/>
+-
+-    <TextView
+-        android:layout_width="match_parent"
+-        android:layout_height="wrap_content"
+-        android:layout_marginHorizontal="10dp"
+-        android:layout_marginTop="10dp"
+-        android:text="복원하시겠습니까?"
+-        android:textSize="20sp"
+-        android:textColor="#000000"
+-        android:gravity="center"
+-        android:background="@android:color/transparent"/>
+-
+-    <androidx.constraintlayout.widget.ConstraintLayout
+-        android:layout_width="match_parent"
+-        android:layout_height="100dp">
+-
+-        <LinearLayout
+-            android:layout_width="match_parent"
+-            android:layout_height="wrap_content"
+-            android:gravity="center"
+-            android:layout_marginTop="30dp"
+-            app:layout_constraintEnd_toEndOf="parent"
+-            app:layout_constraintStart_toStartOf="parent"
+-            app:layout_constraintTop_toTopOf="parent">
+-
+-            <Button
+-                android:id="@+id/yes"
+-                android:layout_width="0dp"
+-                android:layout_height="wrap_content"
+-                android:layout_marginLeft="30dp"
+-                android:layout_marginRight="10dp"
+-                android:layout_weight="1"
+-                android:text="Yes"
+-                android:textSize="20sp"
+-                app:layout_constraintEnd_toEndOf="parent"
+-                app:layout_constraintStart_toStartOf="parent"
+-                app:layout_constraintTop_toTopOf="parent" />
+-
+-            <Button
+-                android:id="@+id/no"
+-                android:layout_width="0dp"
+-                android:layout_height="wrap_content"
+-                android:layout_marginRight="30dp"
+-                android:layout_marginLeft="10dp"
+-                android:layout_weight="1"
+-                android:text="No"
+-                android:textSize="20sp"
+-                app:layout_constraintEnd_toEndOf="parent"
+-                app:layout_constraintStart_toStartOf="parent"
+-                app:layout_constraintTop_toTopOf="parent" />
+-
+-        </LinearLayout>
+-
+-    </androidx.constraintlayout.widget.ConstraintLayout>
+-
+-</LinearLayout>
+\ No newline at end of file
+Index: app/src/main/res/layout/activity_memo.xml
+===================================================================
+diff --git a/app/src/main/res/layout/activity_memo.xml b/app/src/main/res/layout/activity_memo.xml
+deleted file mode 100644
+--- a/app/src/main/res/layout/activity_memo.xml	(revision 64c266d85ab319ac4c7c3a26cefb02bb1f06820c)
++++ /dev/null	(revision 64c266d85ab319ac4c7c3a26cefb02bb1f06820c)
+@@ -1,50 +0,0 @@
+-<?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"
+-    tools:context=".MemoActivity">
+-
+-    <TextView
+-        android:id="@+id/textView"
+-        android:layout_width="match_parent"
+-        android:layout_height="wrap_content"
+-        android:layout_margin="20dp"
+-        android:text="My Memo"
+-        android:textSize="30sp"
+-        android:textStyle="bold"
+-        app:layout_constraintStart_toStartOf="parent"
+-        app:layout_constraintTop_toTopOf="parent" />
+-
+-    <com.google.android.material.textfield.TextInputLayout
+-        android:layout_width="match_parent"
+-        android:layout_height="wrap_content"
+-        android:layout_marginHorizontal="20dp"
+-        android:layout_marginTop="100dp"
+-        app:counterMaxLength="200"
+-        app:counterEnabled="true"
+-        app:layout_constraintStart_toStartOf="parent"
+-        app:layout_constraintTop_toTopOf="parent">
+-
+-        <com.google.android.material.textfield.TextInputEditText
+-            android:id="@+id/memo_et"
+-            android:layout_width="match_parent"
+-            android:layout_height="wrap_content"
+-            android:hint="메모를 입력하세요" />
+-
+-    </com.google.android.material.textfield.TextInputLayout>
+-
+-    <Button
+-        android:id="@+id/next_btn"
+-        android:layout_width="match_parent"
+-        android:layout_height="wrap_content"
+-        android:layout_marginHorizontal="20dp"
+-        android:layout_marginBottom="20dp"
+-        android:text="작성 완료"
+-        android:textSize="25sp"
+-        app:layout_constraintBottom_toBottomOf="parent"
+-        app:layout_constraintEnd_toEndOf="parent"
+-        app:layout_constraintStart_toStartOf="parent" />
+-
+-</androidx.constraintlayout.widget.ConstraintLayout>
+\ No newline at end of file
+Index: app/src/main/java/com/example/umc_6th/HomeFragment.kt
+IDEA additional info:
+Subsystem: com.intellij.openapi.diff.impl.patch.BaseRevisionTextPatchEP
+<+>package com.example.umc_6th\n\nimport android.content.Intent\nimport android.os.Bundle\nimport android.os.Handler\nimport android.os.Looper\nimport androidx.fragment.app.Fragment\nimport android.view.LayoutInflater\nimport android.view.View\nimport android.view.ViewGroup\nimport android.widget.Button\nimport androidx.appcompat.app.AlertDialog\nimport androidx.appcompat.app.AppCompatActivity\nimport androidx.core.os.bundleOf\nimport androidx.fragment.app.setFragmentResult\nimport androidx.viewpager2.widget.ViewPager2\nimport com.example.umc_6th.databinding.FragmentHomeBinding\nimport java.util.Timer\nimport java.util.TimerTask\n\nclass HomeFragment : Fragment() {\n\n    lateinit var binding: FragmentHomeBinding\n\n    private val timer = Timer()\n    private val handler = Handler(Looper.getMainLooper())\n\n    override fun onCreate(savedInstanceState: Bundle?) {\n        super.onCreate(savedInstanceState)\n    }\n\n    override fun onCreateView(\n        inflater: LayoutInflater, container: ViewGroup?,\n        savedInstanceState: Bundle?\n    ): View? {\n        binding = FragmentHomeBinding.inflate(inflater,container,false)\n\n        binding.homeAlbumImg01Iv1.setOnClickListener{\n            setFragmentResult(\"TitleInfo\", bundleOf(\"title\" to binding.titleLilac.text.toString()))\n            setFragmentResult(\"SingerInfo\", bundleOf(\"singer\" to binding.singerIu.text.toString()))\n            (context as MainActivity).supportFragmentManager.beginTransaction().replace(R.id.main_frm,AlbumFragment()).commitAllowingStateLoss()\n        }\n\n        binding.homePannelBtnMemoIv.setOnClickListener{\n            val intent = Intent(requireActivity(), MemoActivity::class.java)\n            val activity = requireActivity() // fragment에서 SharedPreferences에 접근하려면 context가 필요함.\n            val sharedPreferences = activity.getSharedPreferences(\"memo\", AppCompatActivity.MODE_PRIVATE)\n            val tempMemo = sharedPreferences.getString(\"tempMemo\", null)\n\n            if(tempMemo != null) {\n                val dialogView = LayoutInflater.from(activity).inflate(R.layout.dialog, null)\n                val builder = AlertDialog.Builder(activity)\n                    .setView(dialogView)\n                    .setTitle(\"메모 복원하기\")\n\n                val alertDialog = builder.show()\n                val yesBtn = alertDialog.findViewById<Button>(R.id.yes)\n                val noBtn = alertDialog.findViewById<Button>(R.id.no)\n\n                yesBtn!!.setOnClickListener {\n                    startActivity(intent)\n                }\n\n                noBtn!!.setOnClickListener {\n                    val editor = sharedPreferences.edit()\n                    editor.remove(\"tempMemo\")\n                    editor.apply()\n                    startActivity(intent)\n                }\n\n            } else {\n                startActivity(intent)\n            }\n        }\n\n        val bannerAdapter = BannerVPAdapter(this)\n        bannerAdapter.addFragment(BannerFragment(R.drawable.img_home_viewpager_exp))\n        bannerAdapter.addFragment(BannerFragment(R.drawable.img_home_viewpager_exp2))\n\n        binding.homeBannerVp.adapter = bannerAdapter\n        binding.homeBannerVp.orientation = ViewPager2.ORIENTATION_HORIZONTAL\n\n        binding.homeBannerIndicator.setViewPager(binding.homeBannerVp)\n\n        autoSlide(bannerAdapter)\n\n        val pannelVPAdapter = PannelVPAdapter(this)\n        pannelVPAdapter.addFragment(PannelFragment(R.drawable.img_first_album_default))\n        pannelVPAdapter.addFragment(PannelFragment(R.drawable.img_first_album_default))\n\n        binding.homePannelBackgroundVp.adapter = pannelVPAdapter\n        binding.homeBannerVp.orientation = ViewPager2.ORIENTATION_HORIZONTAL\n\n        binding.homePannelIndicator.setViewPager(binding.homePannelBackgroundVp)\n\n        return binding.root\n    }\n    private fun autoSlide(adapter: BannerVPAdapter) {\n        timer.scheduleAtFixedRate(object : TimerTask() {\n            override fun run() {\n                handler.post {\n                    val nextItem = binding.homeBannerVp.currentItem + 1\n                    if (nextItem < adapter.itemCount) {\n                        binding.homeBannerVp.currentItem = nextItem\n                    } else {\n                        binding.homeBannerVp.currentItem = 0 // 순환\n                    }\n                }\n            }\n        }, 3000, 3000)\n    }\n\n}
+Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
+<+>UTF-8
+===================================================================
+diff --git a/app/src/main/java/com/example/umc_6th/HomeFragment.kt b/app/src/main/java/com/example/umc_6th/HomeFragment.kt
+--- a/app/src/main/java/com/example/umc_6th/HomeFragment.kt	(revision 64c266d85ab319ac4c7c3a26cefb02bb1f06820c)
++++ b/app/src/main/java/com/example/umc_6th/HomeFragment.kt	(date 1715761352577)
+@@ -41,37 +41,6 @@
+             (context as MainActivity).supportFragmentManager.beginTransaction().replace(R.id.main_frm,AlbumFragment()).commitAllowingStateLoss()
+         }
+ 
+-        binding.homePannelBtnMemoIv.setOnClickListener{
+-            val intent = Intent(requireActivity(), MemoActivity::class.java)
+-            val activity = requireActivity() // fragment에서 SharedPreferences에 접근하려면 context가 필요함.
+-            val sharedPreferences = activity.getSharedPreferences("memo", AppCompatActivity.MODE_PRIVATE)
+-            val tempMemo = sharedPreferences.getString("tempMemo", null)
+-
+-            if(tempMemo != null) {
+-                val dialogView = LayoutInflater.from(activity).inflate(R.layout.dialog, null)
+-                val builder = AlertDialog.Builder(activity)
+-                    .setView(dialogView)
+-                    .setTitle("메모 복원하기")
+-
+-                val alertDialog = builder.show()
+-                val yesBtn = alertDialog.findViewById<Button>(R.id.yes)
+-                val noBtn = alertDialog.findViewById<Button>(R.id.no)
+-
+-                yesBtn!!.setOnClickListener {
+-                    startActivity(intent)
+-                }
+-
+-                noBtn!!.setOnClickListener {
+-                    val editor = sharedPreferences.edit()
+-                    editor.remove("tempMemo")
+-                    editor.apply()
+-                    startActivity(intent)
+-                }
+-
+-            } else {
+-                startActivity(intent)
+-            }
+-        }
+ 
+         val bannerAdapter = BannerVPAdapter(this)
+         bannerAdapter.addFragment(BannerFragment(R.drawable.img_home_viewpager_exp))
diff --git a/UMC_6th/.idea/shelf/Uncommitted_changes_before_Checkout_at_5_18_24__7_44PM__Changes_.xml b/UMC_6th/.idea/shelf/Uncommitted_changes_before_Checkout_at_5_18_24__7_44PM__Changes_.xml
new file mode 100644
index 0000000..96b5b02
--- /dev/null
+++ b/UMC_6th/.idea/shelf/Uncommitted_changes_before_Checkout_at_5_18_24__7_44PM__Changes_.xml
@@ -0,0 +1,4 @@
+<changelist name="Uncommitted_changes_before_Checkout_at_5_18_24,_7_44 PM_[Changes]" date="1716029047126" recycled="true" deleted="true">
+  <option name="PATH" value="$PROJECT_DIR$/.idea/shelf/Uncommitted_changes_before_Checkout_at_5_18_24,_7_44 PM_[Changes]/shelved.patch" />
+  <option name="DESCRIPTION" value="Uncommitted changes before Checkout at 5/18/24, 7:44 PM [Changes]" />
+</changelist>
\ No newline at end of file
diff --git "a/UMC_6th/.idea/shelf/Uncommitted_changes_before_Checkout_at_5_1_24,_6_28\342\200\257PM_[Changes]/shelved.patch" "b/UMC_6th/.idea/shelf/Uncommitted_changes_before_Checkout_at_5_1_24,_6_28\342\200\257PM_[Changes]/shelved.patch"
deleted file mode 100644
index 634edc4..0000000
--- "a/UMC_6th/.idea/shelf/Uncommitted_changes_before_Checkout_at_5_1_24,_6_28\342\200\257PM_[Changes]/shelved.patch"
+++ /dev/null
@@ -1,15 +0,0 @@
-Index: .idea/misc.xml
-IDEA additional info:
-Subsystem: com.intellij.openapi.diff.impl.patch.BaseRevisionTextPatchEP
-<+><?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<project version=\"4\">\n  <component name=\"ExternalStorageConfigurationManager\" enabled=\"true\" />\n  <component name=\"ProjectRootManager\" version=\"2\" languageLevel=\"JDK_17\" default=\"true\" project-jdk-name=\"jbr-17\" project-jdk-type=\"JavaSDK\">\n    <output url=\"file://$PROJECT_DIR$/build/classes\" />\n  </component>\n  <component name=\"ProjectType\">\n    <option name=\"id\" value=\"Android\" />\n  </component>\n</project>
-Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
-<+>UTF-8
-===================================================================
-diff --git a/.idea/misc.xml b/.idea/misc.xml
---- a/.idea/misc.xml	(revision 9b0e4dfd39a0d809871cce76e037daca604882d8)
-+++ b/.idea/misc.xml	(date 1714555718657)
-@@ -1,4 +1,3 @@
--<?xml version="1.0" encoding="UTF-8"?>
- <project version="4">
-   <component name="ExternalStorageConfigurationManager" enabled="true" />
-   <component name="ProjectRootManager" version="2" languageLevel="JDK_17" default="true" project-jdk-name="jbr-17" project-jdk-type="JavaSDK">
diff --git a/UMC_6th/.idea/shelf/Uncommitted_changes_before_Checkout_at_5_1_24__6_28PM__Changes_.xml b/UMC_6th/.idea/shelf/Uncommitted_changes_before_Checkout_at_5_1_24__6_28PM__Changes_.xml
deleted file mode 100644
index 670425e..0000000
--- a/UMC_6th/.idea/shelf/Uncommitted_changes_before_Checkout_at_5_1_24__6_28PM__Changes_.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<changelist name="Uncommitted_changes_before_Checkout_at_5_1_24,_6_28 PM_[Changes]" date="1714555732322" recycled="true" deleted="true">
-  <option name="PATH" value="$PROJECT_DIR$/.idea/shelf/Uncommitted_changes_before_Checkout_at_5_1_24,_6_28 PM_[Changes]/shelved.patch" />
-  <option name="DESCRIPTION" value="Uncommitted changes before Checkout at 5/1/24, 6:28 PM [Changes]" />
-</changelist>
\ No newline at end of file
diff --git a/UMC_6th/app/src/main/java/com/example/umc_6th/Album.kt b/UMC_6th/app/src/main/java/com/example/umc_6th/Album.kt
new file mode 100644
index 0000000..03f7794
--- /dev/null
+++ b/UMC_6th/app/src/main/java/com/example/umc_6th/Album.kt
@@ -0,0 +1,10 @@
+package com.example.umc_6th
+
+import java.util.ArrayList
+
+data class Album(
+    var title: String? = "",
+    var singer: String? = "",
+    var coverImg: Int? = null,
+    var songs: ArrayList<Song>? = null
+)
diff --git a/UMC_6th/app/src/main/java/com/example/umc_6th/AlbumRVAdapter.kt b/UMC_6th/app/src/main/java/com/example/umc_6th/AlbumRVAdapter.kt
new file mode 100644
index 0000000..7116d92
--- /dev/null
+++ b/UMC_6th/app/src/main/java/com/example/umc_6th/AlbumRVAdapter.kt
@@ -0,0 +1,32 @@
+package com.example.umc_6th
+
+import android.view.LayoutInflater
+import android.view.ViewGroup
+import androidx.recyclerview.widget.RecyclerView
+import com.example.umc_6th.databinding.ItemAlbumBinding
+
+class AlbumRVAdapter(private val albumlist:ArrayList<Album>) : RecyclerView.Adapter<AlbumRVAdapter.ViewHolder>() {
+
+    override fun onCreateViewHolder(viewGroup: ViewGroup, viewType: Int): AlbumRVAdapter.ViewHolder {
+        val binding: ItemAlbumBinding = ItemAlbumBinding.inflate(LayoutInflater.from(viewGroup.context),viewGroup,false)
+
+        return ViewHolder(binding)
+    }
+
+    override fun onBindViewHolder(holder: AlbumRVAdapter.ViewHolder, position: Int) {
+        holder.bind(albumlist[position])
+    }
+
+    override fun getItemCount(): Int  = albumlist.size
+
+    inner class ViewHolder(val binding:ItemAlbumBinding): RecyclerView.ViewHolder(binding.root){
+        fun bind(album: Album){
+            binding.itemAlbumTitleTv.text = album.title
+            binding.itemAlbumSingerTv.text = album.singer
+            binding.itemAlbumCoverImgIv.setImageResource(album.coverImg!!)
+        }
+    }
+
+
+
+}
\ No newline at end of file
diff --git a/UMC_6th/app/src/main/java/com/example/umc_6th/HomeFragment.kt b/UMC_6th/app/src/main/java/com/example/umc_6th/HomeFragment.kt
index f6d26a8..93a7adf 100644
--- a/UMC_6th/app/src/main/java/com/example/umc_6th/HomeFragment.kt
+++ b/UMC_6th/app/src/main/java/com/example/umc_6th/HomeFragment.kt
@@ -9,8 +9,10 @@ import android.view.View
 import android.view.ViewGroup
 import androidx.core.os.bundleOf
 import androidx.fragment.app.setFragmentResult
+import androidx.recyclerview.widget.LinearLayoutManager
 import androidx.viewpager2.widget.ViewPager2
 import com.example.umc_6th.databinding.FragmentHomeBinding
+import java.util.ArrayList
 import java.util.Timer
 import java.util.TimerTask
 
@@ -20,6 +22,7 @@ class HomeFragment : Fragment() {
 
     private val timer = Timer()
     private val handler = Handler(Looper.getMainLooper())
+    private var albumDatas = ArrayList<Album>()
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
@@ -31,12 +34,25 @@ class HomeFragment : Fragment() {
     ): View? {
         binding = FragmentHomeBinding.inflate(inflater,container,false)
 
-        binding.homeAlbumImg01Iv1.setOnClickListener{
-            setFragmentResult("TitleInfo", bundleOf("title" to binding.titleLilac.text.toString()))
-            setFragmentResult("SingerInfo", bundleOf("singer" to binding.singerIu.text.toString()))
-            (context as MainActivity).supportFragmentManager.beginTransaction().replace(R.id.main_frm,AlbumFragment()).commitAllowingStateLoss()
+//        binding.homeAlbumImg01Iv1.setOnClickListener{
+//            setFragmentResult("TitleInfo", bundleOf("title" to binding.titleLilac.text.toString()))
+//            setFragmentResult("SingerInfo", bundleOf("singer" to binding.singerIu.text.toString()))
+//            (context as MainActivity).supportFragmentManager.beginTransaction().replace(R.id.main_frm,AlbumFragment()).commitAllowingStateLoss()
+//        }
+
+        albumDatas.apply{
+            add(Album("Butter","방탄소년단(BTS)",R.drawable.img_album_exp))
+            add(Album("Lilac","아이유(IU)",R.drawable.img_album_exp2))
+            add(Album("Next Level","에스파(AESPA)",R.drawable.img_album_exp3))
+            add(Album("Boy with Luv","방탄소년단(BTS)",R.drawable.img_album_exp4))
+            add(Album("BBoom BBoom","모모랜드(MOMOLAND)",R.drawable.img_album_exp5))
+            add(Album("Weekend","태연(Tae Yeon)",R.drawable.img_album_exp6))
         }
 
+        val albumRVAdapter = AlbumRVAdapter(albumDatas)
+        binding.homeTodayMusicAlbumRv.adapter = albumRVAdapter
+        binding.homeTodayMusicAlbumRv.layoutManager = LinearLayoutManager(context,LinearLayoutManager.HORIZONTAL,false)
+
 
         val bannerAdapter = BannerVPAdapter(this)
         bannerAdapter.addFragment(BannerFragment(R.drawable.img_home_viewpager_exp))
diff --git a/UMC_6th/app/src/main/res/layout/fragment_home.xml b/UMC_6th/app/src/main/res/layout/fragment_home.xml
index 78c78b3..abbd8dc 100644
--- a/UMC_6th/app/src/main/res/layout/fragment_home.xml
+++ b/UMC_6th/app/src/main/res/layout/fragment_home.xml
@@ -31,7 +31,6 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintEnd_toEndOf="parent"/>
 
-
 <!--        <ImageView-->
 <!--            android:id="@+id/home_pannel_background_iv"-->
 <!--            android:layout_width="match_parent"-->
@@ -233,147 +232,155 @@
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintTop_toBottomOf="@id/home_pannel_background_vp"/>
 
-        <HorizontalScrollView
-            android:id="@+id/home_today_music_oversea_hs"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
+<!--        <HorizontalScrollView-->
+<!--            android:id="@+id/home_today_music_oversea_hs"-->
+<!--            android:layout_width="wrap_content"-->
+<!--            android:layout_height="wrap_content"-->
+<!--            android:layout_marginTop="10dp"-->
+<!--            android:layout_marginBottom="20dp"-->
+<!--            android:orientation="horizontal"-->
+<!--            android:scrollbars="none"-->
+<!--            android:overScrollMode="never"-->
+<!--            app:layout_constraintEnd_toEndOf="parent"-->
+<!--            app:layout_constraintStart_toStartOf="parent"-->
+<!--            app:layout_constraintTop_toBottomOf="@id/home_today_music_oversea_tv">-->
+
+<!--            <LinearLayout-->
+<!--                android:layout_width="wrap_content"-->
+<!--                android:layout_height="wrap_content"-->
+<!--                android:orientation="horizontal">-->
+
+<!--                <LinearLayout-->
+<!--                    android:layout_width="wrap_content"-->
+<!--                    android:layout_height="wrap_content"-->
+<!--                    android:layout_marginStart="20dp"-->
+<!--                    android:orientation="vertical">-->
+
+<!--                    <androidx.constraintlayout.widget.ConstraintLayout-->
+<!--                        android:layout_width="wrap_content"-->
+<!--                        android:layout_height="wrap_content">-->
+
+<!--                        <ImageView-->
+<!--                            android:id="@+id/home_album_img_01_iv1"-->
+<!--                            android:layout_width="150dp"-->
+<!--                            android:layout_height="150dp"-->
+<!--                            android:scaleType="fitCenter"-->
+<!--                            android:src="@drawable/img_album_exp2"-->
+<!--                            app:layout_constraintBottom_toBottomOf="parent"-->
+<!--                            app:layout_constraintEnd_toEndOf="parent"-->
+<!--                            app:layout_constraintStart_toStartOf="parent"-->
+<!--                            app:layout_constraintTop_toTopOf="parent"/>-->
+
+<!--                        <ImageView-->
+<!--                            android:layout_width="40dp"-->
+<!--                            android:layout_height="40dp"-->
+<!--                            android:layout_marginEnd="8dp"-->
+<!--                            android:layout_marginBottom="5dp"-->
+<!--                            android:src="@drawable/widget_black_play"-->
+<!--                            app:layout_constraintBottom_toBottomOf="parent"-->
+<!--                            app:layout_constraintEnd_toEndOf="parent"/>-->
+
+<!--                    </androidx.constraintlayout.widget.ConstraintLayout>-->
+
+<!--                    <TextView-->
+<!--                        android:id="@+id/title_lilac"-->
+<!--                        android:layout_width="wrap_content"-->
+<!--                        android:layout_height="wrap_content"-->
+<!--                        android:text="LILAC"-->
+<!--                        android:layout_marginTop="10dp"-->
+<!--                        android:textSize="16sp"-->
+<!--                        android:textColor="@color/black"/>-->
+
+<!--                    <TextView-->
+<!--                        android:id="@+id/singer_iu"-->
+<!--                        android:layout_width="wrap_content"-->
+<!--                        android:layout_height="wrap_content"-->
+<!--                        android:layout_marginTop="3dp"-->
+<!--                        android:text="아이유(IU)"-->
+<!--                        android:textSize="13sp"-->
+<!--                        android:textColor="#a8a8a8"/>-->
+
+<!--                </LinearLayout>-->
+
+<!--                <LinearLayout-->
+<!--                    android:layout_width="wrap_content"-->
+<!--                    android:layout_height="wrap_content"-->
+<!--                    android:layout_marginStart="20dp"-->
+<!--                    android:orientation="vertical">-->
+
+<!--                    <ImageView-->
+<!--                        android:layout_width="150dp"-->
+<!--                        android:layout_height="150dp"-->
+<!--                        android:scaleType="fitCenter"-->
+<!--                        android:src="@drawable/img_album_exp" />-->
+
+<!--                    <TextView-->
+<!--                        android:layout_width="wrap_content"-->
+<!--                        android:layout_height="wrap_content"-->
+<!--                        android:text="BUTTER"-->
+<!--                        android:layout_marginTop="10dp"-->
+<!--                        android:textSize="16sp"-->
+<!--                        android:textColor="@color/black"/>-->
+
+<!--                    <TextView-->
+<!--                        android:layout_width="wrap_content"-->
+<!--                        android:layout_height="wrap_content"-->
+<!--                        android:layout_marginTop="3dp"-->
+<!--                        android:text="방탄소년단(BTS)"-->
+<!--                        android:textSize="13sp"-->
+<!--                        android:textColor="#a8a8a8"/>-->
+<!--                </LinearLayout>-->
+
+<!--                <LinearLayout-->
+<!--                    android:layout_width="wrap_content"-->
+<!--                    android:layout_height="wrap_content"-->
+<!--                    android:layout_marginStart="20dp"-->
+<!--                    android:orientation="vertical">-->
+
+<!--                    <ImageView-->
+<!--                        android:layout_width="150dp"-->
+<!--                        android:layout_height="150dp"-->
+<!--                        android:scaleType="fitCenter"-->
+<!--                        android:src="@drawable/img_album_exp"/>-->
+
+<!--                    <TextView-->
+<!--                        android:layout_width="wrap_content"-->
+<!--                        android:layout_height="wrap_content"-->
+<!--                        android:text="BUTTER"-->
+<!--                        android:layout_marginTop="10dp"-->
+<!--                        android:textSize="16sp"-->
+<!--                        android:textColor="@color/black"/>-->
+
+<!--                    <TextView-->
+<!--                        android:layout_width="wrap_content"-->
+<!--                        android:layout_height="wrap_content"-->
+<!--                        android:layout_marginTop="3dp"-->
+<!--                        android:text="방탄소년단(BTS)"-->
+<!--                        android:textSize="13sp"-->
+<!--                        android:textColor="#a8a8a8"/>-->
+
+<!--                </LinearLayout>-->
+<!--            </LinearLayout>-->
+<!--        </HorizontalScrollView>-->
+
+        <androidx.recyclerview.widget.RecyclerView
+            android:id="@+id/home_today_music_album_rv"
+            android:layout_width="match_parent"
+            android:layout_height="210dp"
             android:layout_marginTop="10dp"
-            android:layout_marginBottom="20dp"
+            tools:listitem="@layout/item_album"
+            app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
             android:orientation="horizontal"
-            android:scrollbars="none"
-            android:overScrollMode="never"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/home_today_music_oversea_tv">
-
-            <LinearLayout
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:orientation="horizontal">
-
-                <LinearLayout
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_marginStart="20dp"
-                    android:orientation="vertical">
-
-                    <androidx.constraintlayout.widget.ConstraintLayout
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content">
-
-                        <ImageView
-                            android:id="@+id/home_album_img_01_iv1"
-                            android:layout_width="150dp"
-                            android:layout_height="150dp"
-                            android:scaleType="fitCenter"
-                            android:src="@drawable/img_album_exp2"
-                            app:layout_constraintBottom_toBottomOf="parent"
-                            app:layout_constraintEnd_toEndOf="parent"
-                            app:layout_constraintStart_toStartOf="parent"
-                            app:layout_constraintTop_toTopOf="parent"/>
-
-                        <ImageView
-                            android:layout_width="40dp"
-                            android:layout_height="40dp"
-                            android:layout_marginEnd="8dp"
-                            android:layout_marginBottom="5dp"
-                            android:src="@drawable/widget_black_play"
-                            app:layout_constraintBottom_toBottomOf="parent"
-                            app:layout_constraintEnd_toEndOf="parent"/>
-
-                    </androidx.constraintlayout.widget.ConstraintLayout>
-
-                    <TextView
-                        android:id="@+id/title_lilac"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:text="LILAC"
-                        android:layout_marginTop="10dp"
-                        android:textSize="16sp"
-                        android:textColor="@color/black"/>
-
-                    <TextView
-                        android:id="@+id/singer_iu"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_marginTop="3dp"
-                        android:text="아이유(IU)"
-                        android:textSize="13sp"
-                        android:textColor="#a8a8a8"/>
-
-                </LinearLayout>
-
-                <LinearLayout
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_marginStart="20dp"
-                    android:orientation="vertical">
-
-                    <ImageView
-                        android:layout_width="150dp"
-                        android:layout_height="150dp"
-                        android:scaleType="fitCenter"
-                        android:src="@drawable/img_album_exp" />
-
-                    <TextView
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:text="BUTTER"
-                        android:layout_marginTop="10dp"
-                        android:textSize="16sp"
-                        android:textColor="@color/black"/>
-
-                    <TextView
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_marginTop="3dp"
-                        android:text="방탄소년단(BTS)"
-                        android:textSize="13sp"
-                        android:textColor="#a8a8a8"/>
-                </LinearLayout>
-
-                <LinearLayout
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_marginStart="20dp"
-                    android:orientation="vertical">
-
-                    <ImageView
-                        android:layout_width="150dp"
-                        android:layout_height="150dp"
-                        android:scaleType="fitCenter"
-                        android:src="@drawable/img_album_exp"/>
-
-                    <TextView
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:text="BUTTER"
-                        android:layout_marginTop="10dp"
-                        android:textSize="16sp"
-                        android:textColor="@color/black"/>
-
-                    <TextView
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_marginTop="3dp"
-                        android:text="방탄소년단(BTS)"
-                        android:textSize="13sp"
-                        android:textColor="#a8a8a8"/>
+            app:layout_constraintTop_toBottomOf="@id/home_today_music_total_tv"/>
 
-                </LinearLayout>
-            </LinearLayout>
-        </HorizontalScrollView>
-
-<!--        <ImageView-->
-<!--            android:id="@+id/home_banner_vp"-->
-<!--            android:layout_width="match_parent"-->
-<!--            android:layout_height="0dp"-->
-<!--            android:adjustViewBounds="true"-->
-<!--            android:src="@drawable/img_home_viewpager_exp"-->
-<!--            android:layout_marginTop="15dp"-->
-<!--            app:layout_constraintStart_toStartOf="parent"-->
-<!--            app:layout_constraintEnd_toEndOf="parent"-->
-<!--            app:layout_constraintTop_toBottomOf="@id/home_today_music_oversea_hs"/>-->
+        <!--        <androidx.viewpager2.widget.ViewPager2-->
+        <!--            android:id="@+id/home_banner_vp"-->
+        <!--            android:layout_width="match_parent"-->
+        <!--            android:layout_height="100dp"-->
+        <!--            android:layout_marginTop="15dp"-->
+        <!--            app:layout_constraintStart_toStartOf="parent"-->
+        <!--            app:layout_constraintEnd_toEndOf="parent"-->
+        <!--            app:layout_constraintTop_toBottomOf="@id/home_today_music_album_rv" />-->
 
         <androidx.viewpager2.widget.ViewPager2
             android:id="@+id/home_banner_vp"
@@ -382,7 +389,7 @@
             android:layout_marginTop="15dp"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/home_today_music_oversea_hs"/>
+            app:layout_constraintTop_toBottomOf="@id/home_today_music_album_rv"/>
 
         <me.relex.circleindicator.CircleIndicator3
             android:id="@+id/home_banner_indicator"
@@ -395,25 +402,6 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintEnd_toEndOf="parent"/>
 
-<!--        <androidx.recyclerview.widget.RecyclerView-->
-<!--            android:id="@+id/home_today_music_album_rv"-->
-<!--            android:layout_width="match_parent"-->
-<!--            android:layout_height="210dp"-->
-<!--            android:layout_marginTop="10dp"-->
-<!--            tools:listitem="@layout/item_album"-->
-<!--            app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"-->
-<!--            android:orientation="horizontal"-->
-<!--            app:layout_constraintTop_toBottomOf="@id/home_today_music_total_tv"/>-->
-
-<!--        <androidx.viewpager2.widget.ViewPager2-->
-<!--            android:id="@+id/home_banner_vp"-->
-<!--            android:layout_width="match_parent"-->
-<!--            android:layout_height="100dp"-->
-<!--            android:layout_marginTop="15dp"-->
-<!--            app:layout_constraintStart_toStartOf="parent"-->
-<!--            app:layout_constraintEnd_toEndOf="parent"-->
-<!--            app:layout_constraintTop_toBottomOf="@id/home_today_music_album_rv" />-->
-
         <TextView
             android:id="@+id/home_daily_music_title_tv"
             android:layout_width="wrap_content"
diff --git a/UMC_6th/app/src/main/res/layout/item_album.xml b/UMC_6th/app/src/main/res/layout/item_album.xml
index 80038f6..39f6695 100644
--- a/UMC_6th/app/src/main/res/layout/item_album.xml
+++ b/UMC_6th/app/src/main/res/layout/item_album.xml
@@ -2,10 +2,12 @@
 <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="150dp"
+    android:layout_width="wrap_content"
     android:layout_height="wrap_content"
     android:layout_marginLeft="20dp">
 
+
+<!--    cardview는 모서리 둥그렇게 하는 용도-->
     <androidx.cardview.widget.CardView
         android:id="@+id/item_album_cover_img_cardView"
         android:layout_width="150dp"