diff --git a/.idea/compiler.xml b/.idea/compiler.xml
index fb7f4a8..61a9130 100644
--- a/.idea/compiler.xml
+++ b/.idea/compiler.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="CompilerConfiguration">
-    <bytecodeTargetLevel target="11" />
+    <bytecodeTargetLevel target="1.8" />
   </component>
 </project>
\ No newline at end of file
diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index 526b4c2..5cd135a 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -4,7 +4,7 @@
   <component name="GradleSettings">
     <option name="linkedExternalProjectsSettings">
       <GradleProjectSettings>
-        <option name="testRunner" value="GRADLE" />
+        <option name="testRunner" value="PLATFORM" />
         <option name="distributionType" value="DEFAULT_WRAPPED" />
         <option name="externalProjectPath" value="$PROJECT_DIR$" />
         <option name="modules">
diff --git a/.idea/runConfigurations.xml b/.idea/runConfigurations.xml
new file mode 100644
index 0000000..797acea
--- /dev/null
+++ b/.idea/runConfigurations.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="RunConfigurationProducerService">
+    <option name="ignoredProducers">
+      <set>
+        <option value="com.android.tools.idea.compose.preview.runconfiguration.ComposePreviewRunConfigurationProducer" />
+      </set>
+    </option>
+  </component>
+</project>
\ No newline at end of file
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 1b82e2b..adc813f 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -3,6 +3,7 @@
     package="com.com.clone_spotify">
 
     <uses-permission android:name="android.permission.INTERNET" />
+    <uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
 
     <application
         android:name=".SpotifyApplication"
@@ -30,6 +31,17 @@
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity>
+        <service android:name=".service.MusicService">
+            <intent-filter>
+                <action android:name="android.media.browse.MediaBrowserService" />
+            </intent-filter>
+        </service>
+
+        <receiver android:name="androidx.media.session.MediaButtonReceiver">
+            <intent-filter>
+                <action android:name="android.intent.action.MEDIA_BUTTON" />
+            </intent-filter>
+        </receiver>
     </application>
 
 </manifest>
\ No newline at end of file
diff --git a/app/src/main/java/com/com/clone_spotify/adapters/LibraryAdapter.java b/app/src/main/java/com/com/clone_spotify/adapters/LibraryAdapter.java
index bba9156..2421188 100644
--- a/app/src/main/java/com/com/clone_spotify/adapters/LibraryAdapter.java
+++ b/app/src/main/java/com/com/clone_spotify/adapters/LibraryAdapter.java
@@ -1,6 +1,7 @@
 package com.com.clone_spotify.adapters;
 
 import android.content.Context;
+import android.support.v4.media.MediaMetadataCompat;
 import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.View;
@@ -12,44 +13,35 @@
 import androidx.recyclerview.widget.RecyclerView;
 
 import com.bumptech.glide.Glide;
-import com.bumptech.glide.request.RequestOptions;
 import com.com.clone_spotify.R;
-import com.com.clone_spotify.model.Library;
-import com.google.firebase.storage.FirebaseStorage;
-import com.google.firebase.storage.StorageReference;
 
-import java.io.IOException;
 import java.util.ArrayList;
 
 public class LibraryAdapter extends RecyclerView.Adapter<LibraryAdapter.LibraryViewHolder> {
 
     private static final String TAG = "LibraryAdapter";
-    private ArrayList<Library> arrayList;
-    private Context context;
+    private ArrayList<MediaMetadataCompat> mMediaList = new ArrayList<>();
+    private Context mContext;
+    private IMediaSelector mIMediaSelector;
+    private int mSelectedIndex;
 
     //private LibraryAdapter mContext;
 
-    public LibraryAdapter(ArrayList<Library> arrayList, Context context) {
-        this.arrayList = arrayList;
-        this.context = context;
+    public LibraryAdapter(Context context, ArrayList<MediaMetadataCompat> mediaList, IMediaSelector mediaSelector) {
+        Log.d(TAG, "PlaylistRecyclerAdapter: called.");
+        this.mMediaList = mediaList;
+        this.mContext = context;
+        this.mIMediaSelector = mediaSelector;
+        mSelectedIndex = -1;
     }
 
-//    public void includesForDownloadFiles() throws IOException {
-//        FirebaseStorage storage = FirebaseStorage.getInstance();
-//
-//        // Create a reference from an HTTPS URL
-//        // Note that in the URL, characters are URL escaped!
-//        StorageReference httpsReference = storage.getReferenceFromUrl("https://firebasestorage.googleapis.com/v0/b/com-cos-clonespotifylogin.appspot.com/o/Bruno%20Mars%2C%20Anderson%20.Paak%2C%20Silk%20Sonic%20-%20Leave%20the%20Door%20Open.png?alt=media&token=157d3b00-7420-4cfd-a455-127df3de0c58");
-//        Log.d(TAG, "includesForDownloadFiles: 다운로드 ");
-//    }
-
 
     @NonNull
     @Override
     // ViewHolder 만듬
     public LibraryViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
         View view = LayoutInflater.from(parent.getContext()).inflate(R.layout.library_item, parent,false);
-        LibraryViewHolder holder = new LibraryViewHolder(view);
+        LibraryViewHolder holder = new LibraryViewHolder(view, mIMediaSelector);
         Log.d(TAG, "onCreateViewHolder: 온크레이트 뷰 홀더 만듬");
 
         return holder;
@@ -64,11 +56,11 @@ public void onBindViewHolder(@NonNull LibraryViewHolder holder, int position) {
         // 글라이드로 앨범 이미지 넣기
         Glide.with(holder.itemView)
                 //.setDefaultRequestOptions(requestOptions)
-                .load(arrayList.get(position).getAlbumImg())
+                .load(mMediaList.get(position).getDescription().getIconUri())
                 .centerCrop()
                 .into(holder.ivAlbumImg);
-        holder.tvSongTitle.setText(arrayList.get(position).getSongTitle());
-        holder.tvArtistName.setText(arrayList.get(position).getArtistName());
+        holder.tvSongTitle.setText(mMediaList.get(position).getDescription().getTitle());
+        holder.tvArtistName.setText(mMediaList.get(position).getDescription().getSubtitle());
         Log.d(TAG, "onBindViewHolder: 글라이드로 앨범 이미지 넣기");
     }
 
@@ -76,20 +68,52 @@ public void onBindViewHolder(@NonNull LibraryViewHolder holder, int position) {
     public int getItemCount() {
         Log.d(TAG, "getItemCount: ");
         // 삼항 연산자
-        return (arrayList != null ? arrayList.size() : 0);
+        return (mMediaList != null ? mMediaList.size() : 0);
+    }
+
+    public void setSelectedIndex(int index){
+        mSelectedIndex = index;
+        notifyDataSetChanged();
+    }
+
+    public int getIndexOfItem(MediaMetadataCompat mediaItem){
+        for(int i = 0; i<mMediaList.size(); i++ ){
+            if(mMediaList.get(i).getDescription().getMediaId().equals(mediaItem.getDescription().getMediaId())){
+                return i;
+            }
+        }
+        return -1;
+    }
+
+    public int getSelectedIndex(){
+        return mSelectedIndex;
     }
 
     public class LibraryViewHolder extends RecyclerView.ViewHolder {
-        ImageView ivAlbumImg;
-        TextView tvSongTitle;
-        TextView tvArtistName;
+        private ImageView ivAlbumImg;
+        private TextView tvSongTitle;
+        private TextView tvArtistName;
+        private IMediaSelector iMediaSelector;
 
-        public LibraryViewHolder(@NonNull View itemView) {
+        public LibraryViewHolder(@NonNull View itemView, IMediaSelector songSelector) {
             super(itemView);
-            this.ivAlbumImg = itemView.findViewById(R.id.ivAlbumImg);
-            this.tvSongTitle = itemView.findViewById(R.id.tvSongTitle);
-            this.tvArtistName = itemView.findViewById(R.id.tvArtistName);
+            ivAlbumImg = itemView.findViewById(R.id.ivAlbumImg);
+            tvSongTitle = itemView.findViewById(R.id.tvSongTitle);
+            tvArtistName = itemView.findViewById(R.id.tvArtistName);
+            iMediaSelector = songSelector;
             Log.d(TAG, "LibraryViewHolder: 라이브러리 뷰 홀더");
+            initLr();
+        }
+
+        public void initLr(){
+            itemView.setOnClickListener(view -> {
+                Log.d(TAG, "initLr: LibraryAdapter 리스트중 곡 선택");
+                iMediaSelector.onMediaSelected(getAdapterPosition());
+            });
         }
     }
+
+    public interface IMediaSelector{
+        void onMediaSelected(int position);
+    }
 }
diff --git a/app/src/main/java/com/com/clone_spotify/adapters/SongAdapter.java b/app/src/main/java/com/com/clone_spotify/adapters/SongAdapter.java
index 7a56929..9ae6a1c 100644
--- a/app/src/main/java/com/com/clone_spotify/adapters/SongAdapter.java
+++ b/app/src/main/java/com/com/clone_spotify/adapters/SongAdapter.java
@@ -1,4 +1,5 @@
 package com.com.clone_spotify.adapters;
 
 public class SongAdapter {
+    // 1곡 재생화면 어댑터 수정 중
 }
diff --git a/app/src/main/java/com/com/clone_spotify/client/MediaBrowserHelper.java b/app/src/main/java/com/com/clone_spotify/client/MediaBrowserHelper.java
index 523ae94..2eb7137 100644
--- a/app/src/main/java/com/com/clone_spotify/client/MediaBrowserHelper.java
+++ b/app/src/main/java/com/com/clone_spotify/client/MediaBrowserHelper.java
@@ -74,7 +74,7 @@ public void subscribeToNewSong(String currentPlaySongId, String newPlatSongId){
         }
         mMediaBrowser.subscribe(newPlatSongId, mMediaBrowserSubscriptionCallback);
     }
-
+        // 최근 재생 플레이 리스트
 //    public void subscribeToNewPlaylist(String currentPlaylistId, String newPlatlistId){
 //        if(!currentPlaylistId.equals("")){
 //            mMediaBrowser.unsubscribe(currentPlaylistId);
diff --git a/app/src/main/java/com/com/clone_spotify/di/AppModule.java b/app/src/main/java/com/com/clone_spotify/di/AppModule.java
deleted file mode 100644
index 042fcf0..0000000
--- a/app/src/main/java/com/com/clone_spotify/di/AppModule.java
+++ /dev/null
@@ -1,61 +0,0 @@
-package com.com.clone_spotify.di;
-
-import android.content.Context;
-
-import com.bumptech.glide.Glide;
-import com.bumptech.glide.RequestManager;
-import com.bumptech.glide.load.engine.DiskCacheStrategy;
-import com.bumptech.glide.request.RequestOptions;
-import com.com.clone_spotify.R;
-
-import javax.inject.Singleton;
-
-import dagger.Module;
-import dagger.Provides;
-import dagger.hilt.InstallIn;
-import dagger.hilt.android.qualifiers.ApplicationContext;
-import dagger.hilt.components.SingletonComponent;
-import retrofit2.Retrofit;
-import retrofit2.converter.gson.GsonConverterFactory;
-
-@Module
-@InstallIn(SingletonComponent.class) //dagger hilt에게 어떤 field가 필요한지 알려줘야한다 어노테이션으로 ( 어플리케이션범위)
-public class AppModule {
-
-    @Singleton
-    @Provides
-    public static RequestOptions provideRequestOptions() {
-        return RequestOptions
-                .placeholderOf(R.drawable.ic_image)
-                .error(R.drawable.ic_image)
-                .diskCacheStrategy(DiskCacheStrategy.DATA);
-    }
-
-    @Singleton
-    @Provides
-    public static RequestManager provideGlideInstance(@ApplicationContext Context context, RequestOptions requestOptions) {
-        return Glide.with(context)
-                .setDefaultRequestOptions(requestOptions);
-    }
-
-    //hilt 인스턴스 삽입
-//    @Provides
-//    public static AnalyticsService provideAnalyticsService(
-//            // Potential dependencies of this type
-//    ) {
-//        return new Retrofit.Builder()
-//                .baseUrl("https://example.com") //서버를 가지고 시작해야하나...?
-//                .build()
-//                .create(AnalyticsService.class);
-
-    //retrofit 사용 userService 에서 -> 참고하시오
-//        Retrofit retrofit = new Retrofit.Builder()
-//                .addConverterFactory(GsonConverterFactory.create())
-//                .baseUrl("http://192.168.0.9:8080")
-//                .build();
-//
-//        UserService service = retrofit.create(UserService.class);
-
-//    }
-
-}
diff --git a/app/src/main/java/com/com/clone_spotify/di/ServiceModule.java b/app/src/main/java/com/com/clone_spotify/di/ServiceModule.java
deleted file mode 100644
index ca5d013..0000000
--- a/app/src/main/java/com/com/clone_spotify/di/ServiceModule.java
+++ /dev/null
@@ -1,47 +0,0 @@
-package com.com.clone_spotify.di;
-
-import android.app.Application;
-
-import com.google.android.exoplayer2.C;
-import com.google.android.exoplayer2.SimpleExoPlayer;
-import com.google.android.exoplayer2.audio.AudioAttributes;
-import com.google.android.exoplayer2.upstream.DataSource;
-import com.google.android.exoplayer2.upstream.DefaultDataSourceFactory;
-import com.google.android.exoplayer2.util.Util;
-
-import dagger.Module;
-import dagger.Provides;
-import dagger.hilt.InstallIn;
-import dagger.hilt.android.components.ServiceComponent;
-import dagger.hilt.android.qualifiers.ApplicationContext;
-import dagger.hilt.android.scopes.ServiceScoped;
-
-@Module
-@InstallIn(ServiceComponent.class)
-public class ServiceModule {
-
-    @ServiceScoped // service 에서만 쓸 싱글톤 손들기
-    @Provides
-    static AudioAttributes provideAudioAttributes(){
-        return new AudioAttributes.Builder()
-                .setContentType(C.CONTENT_TYPE_MUSIC) // 우리는 앱에서 음악을 재생할꺼다
-                .setUsage(C.USAGE_MEDIA) // 미디어 용도
-                .build();
-    }
-
-    @ServiceScoped
-    @Provides
-    static SimpleExoPlayer provideExoPlayer(@ApplicationContext Application application, AudioAttributes audioAttributes) {
-        SimpleExoPlayer simpleExoPlayer = new SimpleExoPlayer.Builder(application)
-                .build();
-        simpleExoPlayer.setAudioAttributes(audioAttributes,true);
-        simpleExoPlayer.setHandleAudioBecomingNoisy(true);
-        return simpleExoPlayer;
-    }
-
-    @ServiceScoped
-    @Provides
-    static DataSource.Factory provideDataSourceFactory(@ApplicationContext Application application) {
-        return new DefaultDataSourceFactory(application, Util.getUserAgent(application, "Clone Spotify"));
-    }
-}
diff --git a/app/src/main/java/com/com/clone_spotify/model/Library.java b/app/src/main/java/com/com/clone_spotify/model/Library.java
index fb777ae..0562a88 100644
--- a/app/src/main/java/com/com/clone_spotify/model/Library.java
+++ b/app/src/main/java/com/com/clone_spotify/model/Library.java
@@ -1,45 +1,16 @@
 package com.com.clone_spotify.model;
 
-import android.widget.Button;
-
+import lombok.AllArgsConstructor;
 import lombok.Data;
+import lombok.NoArgsConstructor;
 
+@AllArgsConstructor
+@NoArgsConstructor
 @Data
 public class Library {
+    private String mediaId;
     private String albumImg;
     private String songTitle;
     private String artistName;
-    //private Button like;
-
-    public String getAlbumImg() {
-        return albumImg;
-    }
-
-    public void setAlbumImg(String albumImg) {
-        this.albumImg = albumImg;
-    }
-
-    public String getSongTitle() {
-        return songTitle;
-    }
-
-    public void setSongTitle(String songTitle) {
-        this.songTitle = songTitle;
-    }
-
-    public String getArtistName() {
-        return artistName;
-    }
-
-    public void setArtistName(String artistName) {
-        this.artistName = artistName;
-    }
-
-//    public Button getLike() {
-//        return like;
-//    }
-//
-//    public void setLike(Button like) {
-//        this.like = like;
-//    }
+    private String songUrl;
 }
diff --git a/app/src/main/java/com/com/clone_spotify/model/Media.java b/app/src/main/java/com/com/clone_spotify/model/Media.java
new file mode 100644
index 0000000..10ac758
--- /dev/null
+++ b/app/src/main/java/com/com/clone_spotify/model/Media.java
@@ -0,0 +1,16 @@
+package com.com.clone_spotify.model;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@AllArgsConstructor
+@NoArgsConstructor
+@Data
+public class Media {
+    private String mediaId;
+    private String albumImg;
+    private String songTitle;
+    private String artistName;
+    private String songUrl;
+}
diff --git a/app/src/main/java/com/com/clone_spotify/repository/SongRepository.java b/app/src/main/java/com/com/clone_spotify/repository/SongRepository.java
deleted file mode 100644
index b1cd4c6..0000000
--- a/app/src/main/java/com/com/clone_spotify/repository/SongRepository.java
+++ /dev/null
@@ -1,69 +0,0 @@
-package com.com.clone_spotify.repository;
-
-import android.util.Log;
-
-import androidx.annotation.NonNull;
-import androidx.lifecycle.LiveData;
-import androidx.lifecycle.MutableLiveData;
-
-import com.com.clone_spotify.model.Song;
-import com.google.android.gms.tasks.OnCompleteListener;
-import com.google.android.gms.tasks.Task;
-import com.google.firebase.firestore.CollectionReference;
-import com.google.firebase.firestore.FirebaseFirestore;
-import com.google.firebase.firestore.QueryDocumentSnapshot;
-import com.google.firebase.firestore.QuerySnapshot;
-
-import org.jetbrains.annotations.NotNull;
-
-import java.lang.reflect.Array;
-import java.util.ArrayList;
-import java.util.List;
-
-import retrofit2.Call;
-
-public class SongRepository {
-    //db에 접근하고 viewModel 에 callback
-    static final String TAG = "SongRepository";
-
-    FirebaseFirestore db = FirebaseFirestore.getInstance();
-    CollectionReference colRef =db.collection("songs");
-
-    private MutableLiveData<List<Song>> allSongs = new MutableLiveData<>();
-
-    public SongRepository(){
-        List<Song> songs = new ArrayList<>();
-        allSongs.setValue(songs);
-
-    }
-
-    public LiveData<List<Song>> findAllSongs(){
-        //db에 접근해서 데이터 가져오기
-        colRef.get()
-                .addOnCompleteListener(new OnCompleteListener<QuerySnapshot>() {
-                    @Override
-                    public void onComplete(@NonNull @NotNull Task<QuerySnapshot> task) {
-                        if(task.isSuccessful()){
-                            //통신에 성공하면
-                            for (QueryDocumentSnapshot document : task.getResult()){
-                                Log.d(TAG, "onComplete: "+document.getData());
-
-                            }
-                        } else{
-                            Log.d(TAG, "onComplete: error"+task.getException());
-                        }
-                    }
-                });
-
-        return allSongs;
-
-    }
-
-
-
-
-
-
-}
-
-
diff --git a/app/src/main/java/com/com/clone_spotify/repository/UserRepository.java b/app/src/main/java/com/com/clone_spotify/repository/UserRepository.java
deleted file mode 100644
index 1381988..0000000
--- a/app/src/main/java/com/com/clone_spotify/repository/UserRepository.java
+++ /dev/null
@@ -1,4 +0,0 @@
-package com.com.clone_spotify.repository;
-
-public interface UserRepository {
-}
diff --git a/app/src/main/java/com/com/clone_spotify/view/InitActivity.java b/app/src/main/java/com/com/clone_spotify/view/InitActivity.java
index ef4400b..b434807 100644
--- a/app/src/main/java/com/com/clone_spotify/view/InitActivity.java
+++ b/app/src/main/java/com/com/clone_spotify/view/InitActivity.java
@@ -4,7 +4,4 @@ public interface InitActivity {
     void init();
     void initLr();
     void initSetting();
-    default void initViewModel(){}
-    default void initAdapter(){}
-    default void initData(){}
 }
diff --git a/app/src/main/java/com/com/clone_spotify/view/InitMainActivity.java b/app/src/main/java/com/com/clone_spotify/view/InitMainActivity.java
index a532bfa..2c31da0 100644
--- a/app/src/main/java/com/com/clone_spotify/view/InitMainActivity.java
+++ b/app/src/main/java/com/com/clone_spotify/view/InitMainActivity.java
@@ -7,15 +7,9 @@
 
 public interface InitMainActivity {
 
-    void hideProgressBar();
-
-    void showPrgressBar();
-
-    //void onCategorySelected(String category);
-
-    //void onArtistSelected(String category, Artist artist);
-
-    void setActionBarTitle(String title);
+//    void hideProgressBar();
+//
+//    void showProgressBar();
 
     void playPause();
 
diff --git a/app/src/main/java/com/com/clone_spotify/view/MainActivity.java b/app/src/main/java/com/com/clone_spotify/view/MainActivity.java
index c1ca28f..c7c8e78 100644
--- a/app/src/main/java/com/com/clone_spotify/view/MainActivity.java
+++ b/app/src/main/java/com/com/clone_spotify/view/MainActivity.java
@@ -1,5 +1,6 @@
 package com.com.clone_spotify.view;
 
+import androidx.annotation.NonNull;
 import androidx.appcompat.app.AppCompatActivity;
 import androidx.fragment.app.Fragment;
 import androidx.fragment.app.FragmentManager;
@@ -8,51 +9,85 @@
 
 import androidx.fragment.app.FragmentContainerView;
 
+import android.content.BroadcastReceiver;
+import android.content.Context;
+import android.content.Intent;
+import android.content.IntentFilter;
+import android.content.res.Configuration;
 import android.os.Bundle;
 import android.support.v4.media.MediaMetadataCompat;
 import android.support.v4.media.session.MediaControllerCompat;
 import android.support.v4.media.session.PlaybackStateCompat;
 import android.util.Log;
+import android.view.View;
 import android.widget.FrameLayout;
+import android.widget.ProgressBar;
+import android.widget.Toast;
 import android.widget.Toolbar;
 
 import com.bumptech.glide.RequestManager;
 import com.com.clone_spotify.R;
 import com.com.clone_spotify.SpotifyApplication;
+import com.com.clone_spotify.client.MediaBrowserHelper;
 import com.com.clone_spotify.client.MediaBrowserHelperCallback;
+import com.com.clone_spotify.model.Media;
+import com.com.clone_spotify.service.MusicService;
 import com.com.clone_spotify.util.MyPreferenceManager;
 import com.com.clone_spotify.view.fragments.HomeFragment;
 import com.com.clone_spotify.view.fragments.LibraryFragment;
+import com.com.clone_spotify.view.fragments.MediaControllerFragment;
+import com.com.clone_spotify.view.fragments.SearchFragment;
 import com.com.clone_spotify.view.fragments.SearchMenuFragment;
 import com.google.android.material.bottomnavigation.BottomNavigationView;
+import com.google.firebase.database.DataSnapshot;
+import com.google.firebase.database.DatabaseError;
+import com.google.firebase.database.DatabaseReference;
+import com.google.firebase.database.FirebaseDatabase;
+import com.google.firebase.database.ValueEventListener;
 
 
+import org.jetbrains.annotations.NotNull;
+
+import java.util.ArrayList;
+import java.util.List;
+
 import javax.inject.Inject;
 
 import dagger.hilt.android.AndroidEntryPoint;
 
+import static com.com.clone_spotify.util.Constants.MEDIA_QUEUE_POSITION;
+import static com.com.clone_spotify.util.Constants.QUEUE_NEW_PLAYLIST;
+import static com.com.clone_spotify.util.Constants.SEEK_BAR_MAX;
+import static com.com.clone_spotify.util.Constants.SEEK_BAR_PROGRESS;
 
-public class MainActivity extends CustomAppBarActivity  implements InitMainActivity, MediaBrowserHelperCallback {
 
-    public RequestManager glide;
+public class MainActivity extends CustomAppBarActivity  implements InitMainActivity, MediaBrowserHelperCallback {
 
     private static final String TAG = "MainActivity2";
     private MainActivity mContext = MainActivity.this;
 
-    private FragmentContainerView nav_host_fragment;
-    private BottomNavigationView bnv;
-
-
     private BottomNavigationView bottomNavigationView;
     private FrameLayout fragmentContainer;
-    private Fragment libraryFragment;
-    private Fragment searchFragment;
-    private Fragment searchMenuFragment ;
-    private RecyclerView reLibrary;
+    final FragmentManager fm = getSupportFragmentManager();
+    final HomeFragment homeFragment = HomeFragment.newInstance();
+    final SearchMenuFragment searchMenuFragment = SearchMenuFragment.newInstance();
+    final SearchFragment searchFragment = SearchFragment.newInstance();
+    final LibraryFragment libraryFragment = LibraryFragment.newInstance();
+    Fragment active = homeFragment;
 
     //appbar
     private Toolbar toolbar;
-
+    //progressBar
+//    private ProgressBar mProgressBar;
+    // musicService
+    private MediaBrowserHelper mMediaBrowserHelper;
+    private SpotifyApplication mMyApplication;
+    private MyPreferenceManager mMyPrefManager;
+    private boolean mIsPlaying;
+    private SeekBarBroadcastReceiver mSeekbarBroadcastReceiver;
+    private UpdateUIBroadcastReceiver mUpdateUIBroadcastReceiver;
+    private boolean mOnAppOpen;
+    private boolean mWasConfigurationChange = false;
 
 
     @Override
@@ -60,14 +95,9 @@ protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_main);
         Log.d(TAG, "onCreate: 온 크레이트 실행 됨");
-        //bottomNavigationView.setSelectedItemId(R.id.bottom_nav);
 
         init();
         initLr();
-
-        //fragment 초기화면 설정 ==> initLr 이 먼저 실행되고 또 newInstance 하기때문에 2번실행이됨. 그래서 주석처리 함.
-        //FragmentTransaction fragmentTransaction = getSupportFragmentManager().beginTransaction();
-        //fragmentTransaction.add(R.id.fragmentContainer, HomeFragment.newInstance()).commit();
         
     }
 
@@ -75,52 +105,54 @@ protected void onCreate(Bundle savedInstanceState) {
 
     public void init(){
         Log.d(TAG, "init: ");
-        bottomNavigationView = findViewById(R.id.bottom_nav);
-        fragmentContainer = findViewById(R.id.fragmentContainer);
         toolbar = findViewById(R.id.toolbarMain);
 
+        // init musicservice util
+        mMyApplication = SpotifyApplication.getInstance();
+        mMyPrefManager = new MyPreferenceManager(this);
+        mMediaBrowserHelper = new MediaBrowserHelper(this, MusicService.class);
+        mMediaBrowserHelper.setMediaBrowserHelperCallback(this);
+
+        // 프레그먼트
+        fragmentContainer = findViewById(R.id.fragmentContainer);
+        bottomNavigationView = findViewById(R.id.bottom_nav);
+        fm.beginTransaction().add(R.id.fragmentContainer, searchFragment, "4").hide(searchFragment).commit();
+        fm.beginTransaction().add(R.id.fragmentContainer, libraryFragment, "3").hide(libraryFragment).commit();
+        fm.beginTransaction().add(R.id.fragmentContainer, searchMenuFragment, "2").hide(searchMenuFragment).commit();
+        fm.beginTransaction().add(R.id.fragmentContainer, homeFragment, "1").commit();
+
     }
 
     public void initLr(){
-        getSupportFragmentManager()
-                .beginTransaction()
-                .add(R.id.fragmentContainer, new HomeFragment())
-                .addToBackStack(null)
-                .commit();
 
         //네비게이션 누르면 각각 화면 뿌리기
         bottomNavigationView.setOnItemSelectedListener(item ->  {
-
-            Fragment selectedFragment = null;
-
-                switch (item.getItemId()) {
-                    case R.id.library:
-                        Log.d(TAG, "initLr: 라이브러리 클릭");
-                        selectedFragment = new LibraryFragment(mContext);
-                        break;
-
-                    case R.id.searchFragment:
-                        Log.d(TAG, "initLr: 서치 프레그먼트 클릭 ");
-                        selectedFragment = new SearchMenuFragment(mContext);
-
-                        break;
-
-                    case R.id.homeFragment:
-                        Log.d(TAG, "initLr: 홈프레그먼트 클릭");
-                        selectedFragment = new HomeFragment(mContext);
-                        break;
-
-                }
-            //뿌려질 화면 위치
-            getSupportFragmentManager().beginTransaction()
-                    .replace(R.id.fragmentContainer, selectedFragment)
-                    .addToBackStack(null)
-                    .commit();
-
-
-             return true;
-
+            // Fragment() 매개변수 제거
+            switch (item.getItemId()) {
+                case R.id.library:
+                    Log.d(TAG, "initLr: 라이브러리 클릭");
+                    fm.beginTransaction().hide(active).show(libraryFragment).commit();
+                    active = libraryFragment;
+                    break;
+
+                case R.id.searchFragment:
+                    Log.d(TAG, "initLr: 서치 프레그먼트 클릭 ");
+                    fm.beginTransaction().hide(active).show(searchMenuFragment).commit();
+                    active = searchMenuFragment;
+                    break;
+
+                case R.id.homeFragment:
+                    Log.d(TAG, "initLr: 홈프레그먼트 클릭");
+                    fm.beginTransaction().hide(active).show(homeFragment).commit();
+                    active = homeFragment;
+                    break;
+            }
+            return true;
+        });
+        bottomNavigationView.setOnItemReselectedListener(item -> {
+            Toast.makeText(MainActivity.this, "Reselected", Toast.LENGTH_SHORT).show();
         });
+
     }
 
 
@@ -142,54 +174,269 @@ public void replaceFragment(Fragment fragment){
 
     }
 
-
     @Override
-    public void onMetadataChanged(MediaMetadataCompat metadata) {
-
+    protected void onSaveInstanceState(@NonNull @NotNull Bundle outState) {
+        super.onSaveInstanceState(outState);
     }
-
+    // mediaController 연결 로직 시작
     @Override
-    public void onPlaybackStateChanged(PlaybackStateCompat state) {
+    public void onMediaControllerConnected(MediaControllerCompat mediaController) {
+        getMediaControllerFragment().getMediaSeekBar().setMediaController(mediaController);
+    }
 
+    private MediaControllerFragment getMediaControllerFragment(){
+        MediaControllerFragment mediaControllerFragment = (MediaControllerFragment)getSupportFragmentManager()
+                .findFragmentById(R.id.bottom_media_controller);
+        if(mediaControllerFragment != null){
+            return mediaControllerFragment;
+        }
+        return null;
     }
+    // mediaController 연결 로직 끝
 
     @Override
-    public void onMediaControllerConnected(MediaControllerCompat mediaController) {
+    protected void onPause() {
+        super.onPause();
+        if(mSeekbarBroadcastReceiver != null){
+            unregisterReceiver(mSeekbarBroadcastReceiver);
+        }
+        if(mUpdateUIBroadcastReceiver != null){
+            unregisterReceiver(mUpdateUIBroadcastReceiver);
+        }
+    }
 
+    @Override
+    protected void onResume() {
+        super.onResume();
+        initSeekBarBroadcastReceiver();
+        initUpdateUIBroadcastReceiver();
     }
 
     @Override
-    public void hideProgressBar() {
+    public void onMetadataChanged(MediaMetadataCompat metadata) {
+        Log.d(TAG, "onMetadataChanged: called");
+        if(metadata == null){
+            return;
+        }
 
+        // Do stuff with new Metadata
+        getMediaControllerFragment().setMediaInfo(metadata);
     }
 
     @Override
-    public void showPrgressBar() {
+    public void onPlaybackStateChanged(PlaybackStateCompat state) {
+        Log.d(TAG, "onPlaybackStateChanged: called.");
+        mIsPlaying = state != null &&
+                state.getState() == PlaybackStateCompat.STATE_PLAYING;
 
+        // update UI
+        if(getMediaControllerFragment() != null){
+            getMediaControllerFragment().setIsPlaying(mIsPlaying);
+        }
     }
 
+
+//    // progressBar 작동 메서드 시작
+//    @Override
+//    public void hideProgressBar() {
+//        mProgressBar.setVisibility(View.GONE);
+//    }
+//
+//    @Override
+//    public void showProgressBar() {
+//        mProgressBar.setVisibility(View.VISIBLE);
+//    }
+
+
     @Override
-    public void setActionBarTitle(String title) {
+    public void playPause() {
+        if(mOnAppOpen){
+            if (mIsPlaying) {
+                mMediaBrowserHelper.getTransportControls().pause();
+            }
+            else {
+                mMediaBrowserHelper.getTransportControls().play();
+
+            }
+        } else {
+            if(!getMyPreferenceManager().getLastPlayedMedia().equals("")){
+                onMediaSelected(
+                        mMyApplication.getMediaItem(getMyPreferenceManager().getLastPlayedMedia()),
+                        getMyPreferenceManager().getQueuePosition());
+            } else {
+                Toast.makeText(this, "select something to play", Toast.LENGTH_SHORT).show();
+            }
+        }
+    }
 
+    @Override
+    protected void onStart() {
+        super.onStart();
+        if(!getMyPreferenceManager().getLastPlayedMedia().equals("")){
+            prepareLastPlayedMedia();
+        }
+        else{
+            mMediaBrowserHelper.onStart(mWasConfigurationChange);
+        }
     }
 
     @Override
-    public void playPause() {
+    protected void onStop() {
+        super.onStop();
+        mMediaBrowserHelper.onStop();
+        getMediaControllerFragment().getMediaSeekBar().disconnectController();
+    }
 
+    @Override
+    public void onConfigurationChanged(@NonNull @NotNull Configuration newConfig) {
+        super.onConfigurationChanged(newConfig);
+        mWasConfigurationChange = true;
     }
 
     @Override
     public SpotifyApplication getMyApplicationInstance() {
-        return null;
+        return mMyApplication;
     }
 
     @Override
-    public void onMediaSelected(MediaMetadataCompat mediaItem, int position) {
-
+    public void onMediaSelected(MediaMetadataCompat mediaItem, int queuePosition) {
+        if(mediaItem != null){
+            Log.d(TAG, "onMediaSelected: CALLED: " + mediaItem.getDescription().getMediaId());
+
+            String currentPlaySongId = getMyPreferenceManager().getLastPlayedMedia();
+
+            Bundle bundle = new Bundle();
+            bundle.putInt(MEDIA_QUEUE_POSITION, queuePosition);
+            if(mediaItem.getDescription().getMediaId().equals(currentPlaySongId)){
+                mMediaBrowserHelper.getTransportControls().playFromMediaId(mediaItem.getDescription().getMediaId(), bundle);
+            }
+            else{
+                bundle.putBoolean(QUEUE_NEW_PLAYLIST, true); // let the player know this is a new playlist
+                mMediaBrowserHelper.subscribeToNewSong(mediaItem.getDescription().getMediaId(), mediaItem.getDescription().getMediaId());
+                mMediaBrowserHelper.getTransportControls().playFromMediaId(mediaItem.getDescription().getMediaId(), bundle);
+            }
+
+            mOnAppOpen = true;
+        }
+        else{
+            Toast.makeText(this, "select something to play", Toast.LENGTH_SHORT).show();
+        }
     }
 
     @Override
     public MyPreferenceManager getMyPreferenceManager() {
+        return mMyPrefManager;
+    }
+
+    // 브로드캐스팅 UI 연동====
+    private class UpdateUIBroadcastReceiver extends BroadcastReceiver {
+
+        @Override
+        public void onReceive(Context context, Intent intent) {
+            String newMediaId = intent.getStringExtra(getString(R.string.broadcast_new_media_id));
+            Log.d(TAG, "onReceive: CALLED: " + newMediaId);
+            if (getLibraryFragment() != null) {
+                Log.d(TAG, "onReceive: " + mMyApplication.getMediaItem(newMediaId).getDescription().getMediaId());
+                getLibraryFragment().updateUI(mMyApplication.getMediaItem(newMediaId));
+            }
+        }
+    }
+
+    private LibraryFragment getLibraryFragment(){
+        LibraryFragment libraryFragment = (LibraryFragment)getSupportFragmentManager()
+                .findFragmentByTag(getString(R.string.fragment_library));
+        if(libraryFragment != null){
+            return libraryFragment;
+        }
         return null;
     }
+
+    private void initUpdateUIBroadcastReceiver(){
+        IntentFilter intentFilter = new IntentFilter();
+        intentFilter.addAction(getString(R.string.broadcast_update_ui));
+        mUpdateUIBroadcastReceiver = new UpdateUIBroadcastReceiver();
+        registerReceiver(mUpdateUIBroadcastReceiver, intentFilter);
+    }
+
+    // 마지막에 튼 노래 연동
+    private void prepareLastPlayedMedia() {
+//        showProgressBar();
+
+        FirebaseDatabase database = FirebaseDatabase.getInstance();
+
+        DatabaseReference databaseReference = database.getReference("Library");
+
+        final List<MediaMetadataCompat> mediaItems = new ArrayList<>();
+        databaseReference.addListenerForSingleValueEvent(new ValueEventListener() {
+
+            @Override
+            public void onDataChange(@NonNull DataSnapshot dataSnapshot) {
+                Log.d(TAG, "onDataChange: 데이터 받아옴");
+                Log.d(TAG, "onDataChange: 클리어 완료");
+                // 반복문으로 데이터 list 추출함
+                for (DataSnapshot snapshot : dataSnapshot.getChildren()) {
+
+                    Media song = snapshot.getValue(Media.class);
+                    MediaMetadataCompat mediaItem = addToMediaList(song);
+
+                    mediaItems.add(mediaItem);
+                    if (mediaItem.getDescription().getMediaId().equals(getMyPreferenceManager().getLastPlayedMedia())) {
+                        getMediaControllerFragment().setMediaInfo(mediaItem);
+                    }
+                }
+
+            }
+            @Override
+            public void onCancelled(@NonNull DatabaseError e) {
+                Log.e(TAG, "onCancelled: ", e.toException());
+            }
+        });
+        onFinishedGettingPreviousSessionData(mediaItems);
+    }
+
+    private void onFinishedGettingPreviousSessionData(List<MediaMetadataCompat> mediaItems){
+        mMyApplication.setMediaItems(mediaItems);
+        mMediaBrowserHelper.onStart(mWasConfigurationChange);
+//        hideProgressBar();
+    }
+    // 마지막에 튼 노래 연동 로직 끝
+
+    private MediaMetadataCompat addToMediaList(Media mediaData){
+
+        MediaMetadataCompat media = new MediaMetadataCompat.Builder()
+
+                .putString(MediaMetadataCompat.METADATA_KEY_MEDIA_ID, mediaData.getMediaId())
+                .putString(MediaMetadataCompat.METADATA_KEY_ARTIST, mediaData.getArtistName())
+                .putString(MediaMetadataCompat.METADATA_KEY_TITLE, mediaData.getSongTitle())
+                .putString(MediaMetadataCompat.METADATA_KEY_MEDIA_URI, mediaData.getSongUrl())
+                .putString(MediaMetadataCompat.METADATA_KEY_DISPLAY_TITLE, mediaData.getSongTitle())
+                .putString(MediaMetadataCompat.METADATA_KEY_ALBUM_ART_URI, mediaData.getAlbumImg())
+                .putString(MediaMetadataCompat.METADATA_KEY_DISPLAY_SUBTITLE, mediaData.getArtistName())
+                .putString(MediaMetadataCompat.METADATA_KEY_DISPLAY_ICON_URI, getMyPreferenceManager().getLastPlayedArtistImage())
+                .build();
+
+        return media;
+    }
+    // seekBar 브로드캐스트 리시버 시작
+    private class SeekBarBroadcastReceiver extends BroadcastReceiver {
+
+        @Override
+        public void onReceive(Context context, Intent intent) {
+            long seekProgress = intent.getLongExtra(SEEK_BAR_PROGRESS, 0);
+            long seekMax = intent.getLongExtra(SEEK_BAR_MAX, 0);
+            if(!getMediaControllerFragment().getMediaSeekBar().isTracking()){
+                getMediaControllerFragment().getMediaSeekBar().setProgress((int)seekProgress);
+                getMediaControllerFragment().getMediaSeekBar().setMax((int)seekMax);
+            }
+        }
+    }
+
+    private void initSeekBarBroadcastReceiver(){
+        IntentFilter intentFilter = new IntentFilter();
+        intentFilter.addAction(getString(R.string.broadcast_seekbar_update));
+        mSeekbarBroadcastReceiver = new SeekBarBroadcastReceiver();
+        registerReceiver(mSeekbarBroadcastReceiver, intentFilter);
+    }
+    // seekBar 브로드캐스트 리시버 끝
+
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/com/clone_spotify/view/fragments/HomeFragment.java b/app/src/main/java/com/com/clone_spotify/view/fragments/HomeFragment.java
index aded662..fa9bcfe 100644
--- a/app/src/main/java/com/com/clone_spotify/view/fragments/HomeFragment.java
+++ b/app/src/main/java/com/com/clone_spotify/view/fragments/HomeFragment.java
@@ -50,16 +50,12 @@ public void onCreateOptionsMenu(@NonNull @NotNull Menu menu, @NonNull @NotNull M
         inflater.inflate(R.menu.toolbar_main, menu);
     }
 
-    public HomeFragment(MainActivity mContext){
-        this.mContext = mContext;
-    }
-
     public HomeFragment() {
         // Required empty public constructor
     }
 
     public static HomeFragment newInstance() {
-        return null;
+        return new HomeFragment();
     }
 
     @Override
diff --git a/app/src/main/java/com/com/clone_spotify/view/fragments/LibraryFragment.java b/app/src/main/java/com/com/clone_spotify/view/fragments/LibraryFragment.java
index 80b8492..eca517c 100644
--- a/app/src/main/java/com/com/clone_spotify/view/fragments/LibraryFragment.java
+++ b/app/src/main/java/com/com/clone_spotify/view/fragments/LibraryFragment.java
@@ -1,5 +1,6 @@
 package com.com.clone_spotify.view.fragments;
 
+import android.content.Context;
 import android.os.Bundle;
 
 import androidx.annotation.NonNull;
@@ -10,6 +11,7 @@
 import androidx.recyclerview.widget.LinearLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;
 
+import android.support.v4.media.MediaMetadataCompat;
 import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.View;
@@ -18,6 +20,7 @@
 import com.com.clone_spotify.R;
 import com.com.clone_spotify.adapters.LibraryAdapter;
 import com.com.clone_spotify.model.Library;
+import com.com.clone_spotify.view.InitMainActivity;
 import com.com.clone_spotify.view.MainActivity;
 import com.google.firebase.database.DataSnapshot;
 import com.google.firebase.database.DatabaseError;
@@ -25,28 +28,25 @@
 import com.google.firebase.database.FirebaseDatabase;
 import com.google.firebase.database.ValueEventListener;
 
+import org.jetbrains.annotations.NotNull;
+
 import java.util.ArrayList;
 
 
-public class LibraryFragment extends Fragment {
+public class LibraryFragment extends Fragment implements LibraryAdapter.IMediaSelector{
     
     private static final String TAG = "LibraryFragment";
 
+    private InitMainActivity mIMainActivity;
     private RecyclerView reLibrary;
-    private RecyclerView.Adapter adapter;
+    private LibraryAdapter adapter;
     private RecyclerView.LayoutManager layoutManager;
-    private ArrayList<Library> arrayList;
-    private FirebaseDatabase database;
-    private DatabaseReference databaseReference;
-
-    private MainActivity mContext;
+    private ArrayList<MediaMetadataCompat> mMediaList = new ArrayList<>();
+    private MediaMetadataCompat mSelectedMedia;
 
 
-//    private LibraryFragment mContext = LibraryFragment.this;
-
-    // 오류 안나게 할려고 임시로 만듬
-    public static Fragment newInstance() {
-        return null;
+    public static LibraryFragment newInstance(){
+        return new LibraryFragment();
     }
 
     @Override
@@ -58,43 +58,60 @@ public void onCreate(Bundle savedInstanceState) {
         ActionBar ab = ((MainActivity)getActivity()).getSupportActionBar();
         ab.setTitle("내 라이브러리");
         ab.setDisplayHomeAsUpEnabled(true);
+        setRetainInstance(true);
 
     }
 
-    public LibraryFragment(){/*빈 생성자*/}
-    public LibraryFragment(MainActivity mContext) {
-        this.mContext = mContext;
-    }
+
 
     @Nullable
     @Override
     public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
         ViewGroup rootView = (ViewGroup) inflater.inflate(R.layout.fragment_library,container,false);
         Log.d(TAG, "onCreateView: 온크레이트 뷰");
-        reLibrary = rootView.findViewById(R.id.reLibrary); // 라이브러리 아이디 연결
+        return rootView;
+    }
+
+    @Override
+    public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceState) {
+        Log.d(TAG, "onViewCreated: 온뷰 크레이트");
+        //appbar setting
+
+        reLibrary = view.findViewById(R.id.reLibrary); // 라이브러리 아이디 연결
         reLibrary.setHasFixedSize(true); //
-        layoutManager = new LinearLayoutManager(getContext(),LinearLayoutManager.VERTICAL, false);
+        layoutManager = new LinearLayoutManager(getActivity());
         reLibrary.setLayoutManager(layoutManager);
-        arrayList = new ArrayList<>(); // 라이브러리 객체를 담은 어레이 리스트 (어댑터 쪽으로)
+        adapter = new LibraryAdapter(getActivity(), mMediaList, this);
+        reLibrary.setAdapter(adapter);
+        if(mMediaList.size() == 0){
+            retrieveMedia();
+        }
+
+        if(savedInstanceState != null){
+            adapter.setSelectedIndex(savedInstanceState.getInt("selected_index"));
+        }
 
-        database = FirebaseDatabase.getInstance(); // 파이어베이스 데이터베이스 연동
+    }
 
-        databaseReference = database.getReference("Library"); // DB 테이블 연결
+    private void retrieveMedia(){
+        FirebaseDatabase database = FirebaseDatabase.getInstance(); // 파이어베이스 데이터베이스 연동
+        DatabaseReference databaseReference = database.getReference("Library");
+        // DB 테이블 연결
         databaseReference.addListenerForSingleValueEvent(new ValueEventListener() {
             @Override
             public void onDataChange(@NonNull DataSnapshot dataSnapshot) {
                 Log.d(TAG, "onDataChange: 데이터 받아옴");
                 // 파이어베이스 데이터베이스의 데이터를 받아 오는 곳
-                arrayList.clear(); // 기존 배열 초기화 해주고
+                mMediaList.clear(); // 기존 배열 초기화 해주고
                 // 반복문으로 데이터 list 추출함
+                Log.d(TAG, "onDataChange: 클리어 완료");
                 for (DataSnapshot snapshot : dataSnapshot.getChildren()){
                     // 만들어 졌던 Library 모델에 데이터를 담음
                     Library library = snapshot.getValue(Library.class);
                     // 담은 데이터들을 배열리스에 넣고 리사이클러뷰에 보낼 준비 함.
-                    arrayList.add(library);
+                    addToMediaList(library);
                 }
-                // 리스트 저장 및 새로 고침
-                adapter.notifyDataSetChanged();
+                updateDataSet();
             }
 
             @Override
@@ -103,17 +120,56 @@ public void onCancelled(@NonNull DatabaseError error) {
                 Log.e(TAG, "onCancelled: ", error.toException());
             }
         });
+    }
 
-        adapter = new LibraryAdapter(arrayList, getContext());
-        // 리사이클러뷰에 어댑터 연결
-        reLibrary.setAdapter(adapter);
+    private void addToMediaList(Library library) {
+        MediaMetadataCompat media = new MediaMetadataCompat.Builder()
+                .putString(MediaMetadataCompat.METADATA_KEY_MEDIA_ID, library.getMediaId())
+                .putString(MediaMetadataCompat.METADATA_KEY_ARTIST, library.getArtistName())
+                .putString(MediaMetadataCompat.METADATA_KEY_TITLE, library.getSongTitle())
+                .putString(MediaMetadataCompat.METADATA_KEY_MEDIA_URI, library.getSongUrl())
+                .putString(MediaMetadataCompat.METADATA_KEY_DISPLAY_TITLE, library.getSongTitle())
+                .putString(MediaMetadataCompat.METADATA_KEY_ALBUM_ART_URI, library.getAlbumImg())
+                .putString(MediaMetadataCompat.METADATA_KEY_DISPLAY_SUBTITLE, library.getArtistName())
+                .putString(MediaMetadataCompat.METADATA_KEY_DISPLAY_ICON_URI, library.getAlbumImg())
+                .build();
+
+        mMediaList.add(media);
+    }
 
-        return rootView;
+    private void updateDataSet(){
+        Log.d(TAG, "updateDataSet: 업데이트 실행");
+        adapter.notifyDataSetChanged();
+//        getSelectedMediaItem(mIMainActivity.getMyPreferenceManager().getLastPlayedMedia());
     }
 
     @Override
-    public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceState) {
-        super.onViewCreated(view,savedInstanceState);
+    public void onMediaSelected(int position) {
+        mIMainActivity.getMyApplicationInstance().setMediaItems(mMediaList);
+        mSelectedMedia = mMediaList.get(position);
+        adapter.setSelectedIndex(position);
+        mIMainActivity.onMediaSelected(
+                mMediaList.get(position),
+                position);
+//        saveLastPlayedSongProperties();
+    }
+
+    @Override
+    public void onAttach(@NotNull Context context) {
+        super.onAttach(context);
+        mIMainActivity = (InitMainActivity) getActivity();
+    }
+
+    public void updateUI(MediaMetadataCompat mediaItem){
+        adapter.setSelectedIndex(adapter.getIndexOfItem(mediaItem));
+        mSelectedMedia = mediaItem;
+//        saveLastPlayedSongProperties();
+    }
+
+    @Override
+    public void onSaveInstanceState(@NonNull @NotNull Bundle outState) {
+        super.onSaveInstanceState(outState);
+        outState.putInt("selected_index", adapter.getSelectedIndex());
     }
 
 
diff --git a/app/src/main/java/com/com/clone_spotify/view/viewmodel/SearchViewModel.java b/app/src/main/java/com/com/clone_spotify/view/viewmodel/SearchViewModel.java
index 8a3a887..c755667 100644
--- a/app/src/main/java/com/com/clone_spotify/view/viewmodel/SearchViewModel.java
+++ b/app/src/main/java/com/com/clone_spotify/view/viewmodel/SearchViewModel.java
@@ -7,29 +7,28 @@
 import androidx.lifecycle.ViewModel;
 
 import com.com.clone_spotify.model.Song;
-import com.com.clone_spotify.repository.SongRepository;
 
 import java.util.List;
 
 public class SearchViewModel extends ViewModel {
     //repository 를 observe 하고있슴 => 구독이라고 말해봐
 
-    private static final String TAG = "SearchViewModel";
-    private SongRepository songRepository = new SongRepository();
-    private LiveData<List<Song>> allSongs;
-
-
-    public SearchViewModel(SongRepository songRepository) {
-        this.songRepository = songRepository;
-    }
-
-    public LiveData<List<Song>> observe(){ //구독하기
-        return allSongs;
-    }
-
-    public void renewal(){ //데이터 갱신하기
-        allSongs = songRepository.findAllSongs();
-    }
+//    private static final String TAG = "SearchViewModel";
+//    private SongRepository songRepository = new SongRepository();
+//    private LiveData<List<Song>> allSongs;
+//
+//
+//    public SearchViewModel(SongRepository songRepository) {
+//        this.songRepository = songRepository;
+//    }
+//
+//    public LiveData<List<Song>> observe(){ //구독하기
+//        return allSongs;
+//    }
+//
+//    public void renewal(){ //데이터 갱신하기
+//        allSongs = songRepository.findAllSongs();
+//    }