diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 8ffe6cf..41c8650 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -15,11 +15,6 @@
@style/Theme.UMC_6th
-
-
- @style/Theme.UMC_6th
-
-
@style/Theme.UMC_6th
@@ -96,12 +91,9 @@
-
+
-
-
-
-
+
@@ -111,7 +103,7 @@
-
+
@@ -206,28 +198,28 @@
- {
+ "keyToString": {
+ "RunOnceActivity.OpenProjectViewOnStart": "true",
+ "RunOnceActivity.ShowReadmeOnStart": "true",
+ "RunOnceActivity.cidr.known.project.marker": "true",
+ "SHARE_PROJECT_CONFIGURATION_FILES": "true",
+ "cf.first.check.clang-format": "false",
+ "cidr.known.project.marker": "true",
+ "git-widget-placeholder": "maro/#18",
+ "last_opened_file_path": "C:/android/MARO_HW1/UMC_6th/app/src/main/res/drawable",
+ "project.structure.last.edited": "Modules",
+ "project.structure.proportion": "0.17",
+ "project.structure.side.proportion": "0.2",
+ "settings.editor.selected.configurable": "configurable.group.appearance"
},
- "keyToStringList": {
- "com.intellij.ide.scratch.ScratchImplUtil$2/New Scratch File": [
- "HgIgnore",
- "GitIgnore"
+ "keyToStringList": {
+ "com.intellij.ide.scratch.ScratchImplUtil$2/New Scratch File": [
+ "HgIgnore",
+ "GitIgnore"
]
}
-}]]>
+}
@@ -695,7 +687,15 @@
1715004760625
-
+
+
+ 1715005497177
+
+
+
+ 1715005497177
+
+
@@ -733,6 +733,7 @@
-
+
+
\ 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 2765905..8f65f00 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
@@ -79,6 +79,9 @@ class SongActivity : AppCompatActivity() {
fun setPlayerStatus (isPlaying : Boolean){
+ song.isPlaying = isPlaying
+ timer.isPlaying = isPlaying
+
if(isPlaying){ // 재생중
binding.songMiniplayerIv.visibility = View.GONE
binding.songPauseIv.visibility = View.VISIBLE