Feat: MainActivity <-> SongActivity 간 전환 기능 구현

Author: modzivv

Heather/FLOClone/app/src/main/java/com/example/floclone/AlbumFragment.kt

@@ -5,6 +5,7 @@ import androidx.fragment.app.Fragment
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
+import android.widget.Toast
 import com.example.floclone.databinding.FragmentAlbumBinding
 
 class AlbumFragment : Fragment() {
@@ -23,6 +24,9 @@ class AlbumFragment : Fragment() {
                 .replace(R.id.main_frm, HomeFragment()).commitAllowingStateLoss()
         }
 
+        binding.songLalacLayout.setOnClickListener {
+            Toast.makeText(activity, "LILAC", Toast.LENGTH_SHORT).show()
+        }
 
         return binding.root
     }

Heather/FLOClone/app/src/main/java/com/example/floclone/MainActivity.kt

@@ -2,24 +2,49 @@ package com.example.floclone
 
 import android.content.Intent
 import android.os.Bundle
+import android.util.Log
+import android.widget.Toast
+import androidx.activity.result.contract.ActivityResultContracts
 import androidx.appcompat.app.AppCompatActivity
 import com.example.floclone.databinding.ActivityMainBinding
 
 class MainActivity : AppCompatActivity() {
 
     lateinit var binding: ActivityMainBinding
 
+    // ActivityResultLauncher 설정
+    private val songActivityLauncher = registerForActivityResult(ActivityResultContracts.StartActivityForResult()) { result ->
+        if (result.resultCode == RESULT_OK) {
+            val songTitle = result.data?.getStringExtra("songTitle")
+            // 노래 제목을 Toast 메시지로 출력
+            songTitle?.let {
+                Toast.makeText(this, "$it", Toast.LENGTH_SHORT).show()
+            }
+        }
+    }
+
+
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         binding = ActivityMainBinding.inflate(layoutInflater)
         setContentView(binding.root)
 
+        val song = Song(binding.mainMiniplayerTitleTv.text.toString(), binding.mainMiniplayerSingerTv.text.toString())
+
         binding.mainPlayerCl.setOnClickListener {
-            startActivity(Intent(this, SongActivity::class.java))
+            //startActivity(Intent(this, SongActivity::class.java))
+
+            // 미니플레이어 클릭 시 SongActivity로 이동하면서 노래 제목과 가수 이름 전달
+            val intent = Intent(this, SongActivity::class.java)
+            intent.putExtra("title", song.title)
+            intent.putExtra("singer", song.singer)
+            songActivityLauncher.launch(intent)  // ActivityResultLauncher를 통해 SongActivity 실행
         }
 
         initBottomNavigation()
 
+        Log.d("Song", song.title + song.singer)
+
     }
 
     private fun initBottomNavigation(){

Heather/FLOClone/app/src/main/java/com/example/floclone/Song.kt

@@ -0,0 +1,6 @@
+package com.example.floclone
+
+data class Song(
+    val title : String = "",
+    val singer : String = "",
+)

Heather/FLOClone/app/src/main/java/com/example/floclone/SongActivity.kt

@@ -1,5 +1,6 @@
 package com.example.floclone
 
+import android.content.Intent
 import android.os.Bundle
 import android.view.View
 import androidx.appcompat.app.AppCompatActivity
@@ -17,6 +18,7 @@ class SongActivity : AppCompatActivity() {
 
         // 내리기 버튼 클릭 시 현재 액티비티 종료
         binding.songDownIb.setOnClickListener {
+            returnSongTitle()  // 노래 제목 반환
             finish()
         }
 
@@ -26,6 +28,12 @@ class SongActivity : AppCompatActivity() {
         binding.songPauseIv.setOnClickListener {
             setPlayerStatus(true)
         }
+
+        // MainActivity에서 전달받은 노래 제목과 가수 이름으로 TextView 값 변경
+        if (intent.hasExtra("title") && intent.hasExtra("singer")) {
+            binding.songMusicTitleTv.text = intent.getStringExtra("title")
+            binding.songSingerNameTv.text = intent.getStringExtra("singer")
+        }
     }
 
     // 재생 버튼의 상태를 바꿔주는 메서드
@@ -38,4 +46,18 @@ class SongActivity : AppCompatActivity() {
             binding.songPauseIv.visibility = View.VISIBLE
         }
     }
+
+    // 노래 제목을 MainActivity로 반환하는 메서드
+    private fun returnSongTitle() {
+        val returnIntent = Intent()
+        val songTitle = binding.songMusicTitleTv.text.toString()
+        returnIntent.putExtra("songTitle", songTitle)
+        setResult(RESULT_OK, returnIntent)
+    }
+
+    override fun onBackPressed() {
+        returnSongTitle()  // 뒤로가기 눌렀을 때도 데이터 반환
+        super.onBackPressed()
+    }
+
 }

Heather/FLOClone/app/src/main/res/layout/activity_main.xml

@@ -33,18 +33,19 @@
             app:layout_constraintTop_toTopOf="parent">
 
             <TextView
+                android:id="@+id/main_miniplayer_title_tv"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:textSize="13sp"
-                android:text="제목"
+                android:text="라일락"
                 android:textColor="@color/black" />
 
             <TextView
+                android:id="@+id/main_miniplayer_singer_tv"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:textSize="12sp"
-
-                android:text="가수"/>
+                android:text="아이유 (IU)" />
 
         </LinearLayout>