diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml
index 30aa626..34dc27c 100644
--- a/.idea/codeStyles/Project.xml
+++ b/.idea/codeStyles/Project.xml
@@ -1,5 +1,8 @@
 <component name="ProjectCodeStyleConfiguration">
   <code_scheme name="Project" version="173">
+    <JetCodeStyleSettings>
+      <option name="CODE_STYLE_DEFAULTS" value="KOTLIN_OFFICIAL" />
+    </JetCodeStyleSettings>
     <Objective-C-extensions>
       <file>
         <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Import" />
@@ -25,5 +28,8 @@
         <pair source="c" header="h" fileNamingConvention="NONE" />
       </extensions>
     </Objective-C-extensions>
+    <codeStyleSettings language="kotlin">
+      <option name="CODE_STYLE_DEFAULTS" value="KOTLIN_OFFICIAL" />
+    </codeStyleSettings>
   </code_scheme>
 </component>
\ No newline at end of file
diff --git a/.idea/codeStyles/codeStyleConfig.xml b/.idea/codeStyles/codeStyleConfig.xml
new file mode 100644
index 0000000..6e6eec1
--- /dev/null
+++ b/.idea/codeStyles/codeStyleConfig.xml
@@ -0,0 +1,6 @@
+<component name="ProjectCodeStyleConfiguration">
+  <state>
+    <option name="USE_PER_PROJECT_SETTINGS" value="true" />
+    <option name="PREFERRED_PROJECT_CODE_STYLE" value="Default" />
+  </state>
+</component>
\ No newline at end of file
diff --git a/app/build.gradle b/app/build.gradle
index 5b740c2..3c641ca 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -46,6 +46,9 @@ dependencies {
     // 카카오 로그인 sdk를 사용하기 위해 필요.
     implementation group: 'com.kakao.sdk', name: 'usermgmt', version: '1.17.0'
 
+    //애니메이션
+    implementation 'com.airbnb.android:lottie:2.6.0-beta19'
+
     // Glide is adapted
     implementation 'com.github.bumptech.glide:glide:4.9.0'
     implementation 'com.squareup.picasso:picasso:2.5.2'
@@ -56,4 +59,7 @@ dependencies {
     implementation 'com.fasterxml.jackson.core:jackson-annotations:2.9.0'
 
     implementation 'com.fasterxml.jackson.core:jackson-databind:2.9.7'
+
+    implementation 'com.airbnb.android:lottie:2.0.0-beta4'
+
 }
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index f77110a..bfb25b1 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -10,6 +10,7 @@
     <uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
 
     <application
+
         android:name=".Util.Audio.AudioApplication"
         android:allowBackup="true"
         android:icon="@drawable/android_app_icon"
@@ -18,44 +19,50 @@
         android:supportsRtl="true"
         android:theme="@style/Theme.AppCompat.NoActionBar"
         android:usesCleartextTraffic="true">
+
         <activity android:name=".ArtistSongListActivity"></activity>
-        <activity android:name=".StartActivity"></activity> <!-- 로그인 -->
+        <activity android:name=".StartActivity"></activity>
+
+        <!-- 로그인 -->
         <activity android:name=".UI.Login.LoginActivity2" />
         <activity android:name=".Util.Kakao.service.ScoringPlayerActivity" />
-        <activity android:name=".UI.Main.MyPage.UpLoadFileActivity" />
 
         <meta-data
             android:name="com.kakao.sdk.AppKey"
             android:value="@string/kakao_app_key" />
 
-        <!-- 메인 -->
-
+        <!-- 회원가입 -->
         <activity android:name=".UI.Signup.SignupFirstActivity"></activity>
         <activity android:name=".UI.Signup.SignupMoodActivity" />
+
+        <!--로그인-->
+        <activity android:name=".UI.Login.LoginActivity"
+                  android:windowSoftInputMode="adjustResize"></activity>
+
         <!-- 메인 -->
-        <activity
-            android:name=".SplashActivity">
+        <activity android:name=".UI.Main.MainActivity">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
 
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity>
-        <activity android:name=".UI.Main.MainActivity"
-            android:theme="@style/SplashTheme" />
-        <activity android:name=".UI.Main2Activity" />
-        <activity android:name=".UI.Artist.ArtistActivity" />
-        <activity android:name=".UI.Artist.ArtistLibraryActivity" /> <!-- 음악플레이어 -->
-        <activity android:name=".UI.MainPlayer.MainPlayerActivity" />
-
-        <service android:name=".Util.Player.Service.MusicService" />
 
-        <!-- 음악업로드 -->
+        <activity android:name=".UI.NetworkServiceTest.NetworkTestActivity"></activity>
         <activity android:name=".UI.Main.MyPage.MyPageProfileSettingActivity"></activity>
-        <activity android:name=".UI.Main.MyPage.SetStartPointActivity" />
-        <activity android:name=".UI.Main.MyPage.UploadSongInfoActivity"></activity>
 
-        <service android:name=".Util.Player.Service.MusicService" />
+        <activity android:name=".UI.Main2Activity"/>
+        <activity android:name=".UI.Artist.ArtistActivity"/>
+        <activity android:name=".UI.Artist.ArtistLibraryActivity"/>
+
+        <!-- 음악업로드 -->
+        <activity android:name=".UI.Main.MyPage.UpLoadFileActivity"></activity>
+        <activity android:name=".UI.Main.MyPage.SetStartPointActivity"/>
+        <activity android:name=".UI.Main.MyPage.UploadSongInfoActivity"/>
+        <activity android:name=".UI.Main.MyPage.UpLoadSongCoverActivity"></activity>
+        <activity android:name=".UI.Main.MyPage.UpLoadMoodActivity"/>
+        <activity android:name=".UI.Main.MyPage.UpLoadGenreActivity"/>
+        <service android:name=".Util.Player.Service.MusicService"/>
         <service
             android:name=".Util.Audio.AudioService"
             android:enabled="true"
@@ -66,22 +73,16 @@
                 <action android:name="FORWARD" />
                 <action android:name="CLOSE" />
             </intent-filter>
-        </service>
-
-        <!-- Declare foreground service -->
-
+        </service> <!-- Declare foreground service -->
         <service
             android:name=".Util.Player.Service.MyForeGroundService"
             android:enabled="true"
             android:exported="true" />
 
-        <activity android:name=".UI.MusicTestActivity" />
+        <activity android:name=".UI.MainPlayer.MainPlayerActivity" />
         <activity android:name=".Util.Audio.PlayerActivity" />
         <activity android:name=".UI.Signup.SignupSelectArtistActivity" />
         <activity android:name=".UI.Signup.SignupGenreActivity" />
-        <activity android:name=".UI.Main.MyPage.UpLoadSongCoverActivity"></activity>
-        <activity android:name=".UI.Login.LoginActivity"
-            android:windowSoftInputMode="adjustResize"></activity>
     </application>
 
 </manifest>
\ No newline at end of file
diff --git a/app/src/main/java/com/song2/wave/Data/model/SearchArtistData.kt b/app/src/main/java/com/song2/wave/Data/model/SearchArtistData.kt
new file mode 100644
index 0000000..ff84a6a
--- /dev/null
+++ b/app/src/main/java/com/song2/wave/Data/model/SearchArtistData.kt
@@ -0,0 +1,5 @@
+package com.song2.wave.Data.model
+
+data class SearchArtistData(var image : String, var title : String ) {
+
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/song2/wave/LikeAnimationActivity.kt b/app/src/main/java/com/song2/wave/LikeAnimationActivity.kt
new file mode 100644
index 0000000..8c4ac20
--- /dev/null
+++ b/app/src/main/java/com/song2/wave/LikeAnimationActivity.kt
@@ -0,0 +1,53 @@
+package com.song2.wave
+
+import android.animation.Animator
+import android.net.Uri
+import android.support.v7.app.AppCompatActivity
+import android.os.Bundle
+import android.util.Log
+import android.widget.VideoView
+import com.airbnb.lottie.LottieAnimationView
+import kotlinx.android.synthetic.main.activity_like_animation.*
+
+class LikeAnimationActivity : AppCompatActivity() {
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        setContentView(R.layout.activity_like_animation)
+
+        //--------------------------------------애니메이션---------
+        // val video : VideoView = findViewById(R.id.video)
+        //com.airbnb.lottie.LottieAnimationView 아이디
+        val love : LottieAnimationView = findViewById(R.id.lottie_main_act_like)
+        val videoView = findViewById<VideoView>(R.id.video)
+        val path = "android.resource://" + packageName + "/" + R.raw.try_11
+        videoView?.setVideoURI(Uri.parse(path))
+        //val button = findViewById<Button>(R.id.button)
+
+        lottie_main_act_like.setOnClickListener {
+            love.playAnimation()
+            val isPlaying = videoView.isPlaying
+            if (isPlaying) {
+                //videoView.pause()
+            } else {
+                videoView.start()
+            }
+        }
+        love.addAnimatorListener(object : Animator. AnimatorListener{
+            override fun onAnimationRepeat(animation: Animator?) {
+                Log.e("Animation:","repeat")
+            }
+            override fun onAnimationEnd(animation: Animator?) {
+                //Toast.makeText( application , "끝~",Toast. LENGTH_SHORT ).show()
+            }
+            override fun onAnimationCancel(animation: Animator?) {
+                Log.e("Animation:","cancel")  //취소
+            }
+            override fun onAnimationStart(animation: Animator?) {
+                Log.e("Animation ","star") //시작
+            }
+        })
+        //------------------------------------------------애니메이션
+
+    }
+}
diff --git a/app/src/main/java/com/song2/wave/UI/Main/Home/HomeOnFragment.kt b/app/src/main/java/com/song2/wave/UI/Main/Home/HomeOnFragment.kt
index dd8dc81..eb8ab3e 100644
--- a/app/src/main/java/com/song2/wave/UI/Main/Home/HomeOnFragment.kt
+++ b/app/src/main/java/com/song2/wave/UI/Main/Home/HomeOnFragment.kt
@@ -1,5 +1,6 @@
 package com.song2.wave.UI.Main.Home
 
+import android.app.Activity
 import android.content.Intent
 import android.database.Cursor
 import android.os.Bundle
@@ -33,11 +34,14 @@ import com.song2.wave.Data.model.Top10CategoryData
 import com.song2.wave.R
 import com.song2.wave.UI.Main.Home.Adapter.*
 import com.song2.wave.UI.Main.Home.Top10.Top10Fragment
+import com.song2.wave.UI.Main.MyPage.PointHistoryFragment
+import com.song2.wave.UI.Main.MyPage.UpLoadFileActivity
 import com.song2.wave.UI.Signup.SignupFirstActivity
 import com.song2.wave.Util.Network.ApiClient
 import com.song2.wave.Util.Network.NetworkService
 import kotlinx.android.synthetic.main.fragment_home_on.*
 import kotlinx.android.synthetic.main.fragment_home_on.view.*
+import org.jetbrains.anko.support.v4.startActivity
 import retrofit2.Call
 import retrofit2.Response
 
@@ -84,8 +88,11 @@ class HomeOnFragment : Fragment() {
 
     override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
         var v : View = inflater.inflate(R.layout.fragment_home_on, container, false)
+        var pref = context!!.getSharedPreferences("auto", Activity.MODE_PRIVATE)
 
-        authorization_info = "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ1c2VySWR4IjoxMDUsImlhdCI6MTU2MjcyMjQ5MCwiZXhwIjoxNTY1MzE0NDkwfQ.CdVtW28EY4XOWV_xlt2dlYFMdEdFcIRN6lmsmJ8_jKQ"
+        //authorization_info = pref.getString("token","")
+        authorization_info = "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ1c2VySWR4IjoxNiwiaWF0IjoxNTYyOTY3NzY2LCJleHAiOjE1NjU1NTk3NjZ9.PmlhTASv3yT75I_RG9T6YRL-BdCAGZaE7fpB4r_G3BM"
+9
 
         //통신
         getHomeInfoResponse()
@@ -96,28 +103,31 @@ class HomeOnFragment : Fragment() {
         getUploadResponse()
         getHitsResponse()
 
+
+
         v.iv_home_frag_wavelogo.setOnClickListener {
             var intent = Intent(context, PlayerActivity::class.java)
             startActivity(intent)
         }
 
         v.tv_home_frag_ment.setOnClickListener {
-            var intent = Intent(context, SignupFirstActivity::class.java)
-            startActivity(intent)
+            startActivity<UpLoadFileActivity>()
+
+/*            var intent = Intent(context, SignupFirstActivity::class.java)
+            startActivity(intent)*/
         }
 
         v.iv_home_frag_top10_genre_more_btn.setOnClickListener {
-
-
             HomeFragment.homeFragment.replaceFragment(top10fragment)
         }
 
         v.iv_home_frag_top10_mood_more_btn.setOnClickListener {
-
-
-            HomeFragment.homeFragment.replaceFragment(Top10Fragment())
+            HomeFragment.homeFragment.replaceFragment(top10fragment)
         }
 
+        v.ll_point_container.setOnClickListener {
+            HomeFragment.homeFragment.replaceFragment(PointHistoryFragment())
+        }
         return v
     }
 
@@ -188,19 +198,28 @@ class HomeOnFragment : Fragment() {
             override fun onResponse(call: Call<GetPlaylistResponse>, response: Response<GetPlaylistResponse>) {
                 if (response.isSuccessful) {
                     val playlistDataList: PlayListData = response.body()!!.data
+
+                    Log.e("playlistDataList.songList", playlistDataList.songList.size.toString())
+                    if( playlistDataList.songList.size == 0){
+                        tv_home_frag_waiting_scoring_mine.visibility = View.GONE
+                        rv_home_frag_scoring_waiting_mine.visibility = View.GONE
+
+                    }else
+                    {
+
+                        tv_home_frag_waiting_scoring_mine.visibility = View.VISIBLE
+                        rv_home_frag_scoring_waiting_mine.visibility = View.VISIBLE
+                    }
+
                     for(i in playlistDataList.songList.indices) {
                         myWaitingSongDataList.add(MyWaitingSongData(playlistDataList.songList[i]._id, playlistDataList.songList[i].songUrl, playlistDataList.songList[i].deleteTime.substring(8,10), playlistDataList.songList[i].artwork, playlistDataList.songList[i].originTitle, playlistDataList.songList[i].originArtistName, playlistDataList.songList[i].coverArtistName))
                     }
                     myWaitingSongHomeAdapter = MyWaitingSongHomeAdapter(context!!, myWaitingSongDataList, requestManager)
                     rv_home_frag_scoring_waiting_mine.adapter = myWaitingSongHomeAdapter
                     rv_home_frag_scoring_waiting_mine.layoutManager = LinearLayoutManager(context,LinearLayoutManager.HORIZONTAL, false)
-
                 }
-
             }
-
         })
-
     }
 
     //rateReady
@@ -388,6 +407,10 @@ class HomeOnFragment : Fragment() {
         tv_home_frag_perfect_cnt.setText(temp.hitSongCount.toString())
         tv_home_frag_total_point.setText(temp.totalPoint.toString() + "P")
 
+        tv_home_frag_waiting_scoring_mine.setText(temp.nickname + "님이 평가를 기다리고 있는 곡")
+        tv_home_frag_waiting_scoring.setText(temp.nickname + "님의 평가를 기다리고 있는 곡")
+        tv_home_frag_recommend_song.setText(temp.nickname + "을 위한 추천 곡")
+
         //visible
         rl_home_frag_goto_login.visibility = View.GONE
         ll_home_frag_point_layout.visibility = View.VISIBLE
diff --git a/app/src/main/java/com/song2/wave/UI/Main/Home/Top10/Adapter/FragmentViewPagerAdapter.kt b/app/src/main/java/com/song2/wave/UI/Main/Home/Top10/Adapter/FragmentViewPagerAdapter.kt
index 3721f7a..a05f470 100644
--- a/app/src/main/java/com/song2/wave/UI/Main/Home/Top10/Adapter/FragmentViewPagerAdapter.kt
+++ b/app/src/main/java/com/song2/wave/UI/Main/Home/Top10/Adapter/FragmentViewPagerAdapter.kt
@@ -9,13 +9,13 @@ class FragmentViewPagerAdapter(fm: FragmentManager, private val num_fragment: In
     override fun getItem(p0: Int): Fragment? {
         return when(p0){
             0 -> Idx0Fragment()
-            1 -> Idx0Fragment()
-            2 -> Idx0Fragment()
-            3 -> Idx0Fragment()
-            4 -> Idx0Fragment()
-            5 -> Idx0Fragment()
-            6 -> Idx0Fragment()
-            7 -> Idx0Fragment()
+            1 -> Idx1Fragment()
+            2 -> Idx2Fragment()
+            3 -> Idx3Fragment()
+            4 -> Idx4Fragment()
+            5 -> Idx5Fragment()
+            6 -> Idx6Fragment()
+            7 -> Idx7Fragment()
             else -> null
         }
     }
diff --git a/app/src/main/java/com/song2/wave/UI/Main/Library/LibraryLikeFragment.kt b/app/src/main/java/com/song2/wave/UI/Main/Library/LibraryLikeFragment.kt
index 7b951ca..ee1c49f 100644
--- a/app/src/main/java/com/song2/wave/UI/Main/Library/LibraryLikeFragment.kt
+++ b/app/src/main/java/com/song2/wave/UI/Main/Library/LibraryLikeFragment.kt
@@ -76,8 +76,16 @@ class LibraryLikeFragment : Fragment() {
                 if (response.isSuccessful) {
                     val playlistDataList: PlayListData = response.body()!!.data
 
-                    if(playlistDataList == null)
+                    if(playlistDataList == null){
+                        recycler_library_like_frag_list.visibility = View.GONE
+                        iv_library_like_list.visibility = View.VISIBLE
                         return
+                    }
+                    recycler_library_like_frag_list.visibility = View.VISIBLE
+                    iv_library_like_list.visibility = View.GONE
+
+
+
 
                     for(i in playlistDataList.songList.indices)
                         songDataArr.add(SongData(playlistDataList.songList[i]._id, playlistDataList.songList[i].songUrl, playlistDataList.songList[i].artwork, playlistDataList.songList[i].originTitle,playlistDataList.songList[i].originArtistName, playlistDataList.songList[i].coverArtistName,playlistDataList.songList[i].genre))
diff --git a/app/src/main/java/com/song2/wave/UI/Main/MainActivity.kt b/app/src/main/java/com/song2/wave/UI/Main/MainActivity.kt
index 9d0d1ac..db4abd4 100644
--- a/app/src/main/java/com/song2/wave/UI/Main/MainActivity.kt
+++ b/app/src/main/java/com/song2/wave/UI/Main/MainActivity.kt
@@ -188,7 +188,7 @@ class MainActivity : AppCompatActivity() {
                 nowFrag = LibraryFragment()
             }
             "myPage" ->{
-                nowFrag = PointHistoryFragment()
+                nowFrag = MyPageFragment()
             }
         }
 
@@ -281,4 +281,20 @@ class MainActivity : AppCompatActivity() {
             }
         })
     }
+
+    fun addFragment(fragment : android.support.v4.app.Fragment){
+        val fm = supportFragmentManager
+        val transaction = fm.beginTransaction()
+        transaction.add(R.id.ll_home_frag_layout, fragment)
+        transaction.commit()
+    }
+
+    fun replaceFragment(fragment: android.support.v4.app.Fragment)
+    {
+        val fm = supportFragmentManager
+        val transaction = fm.beginTransaction()
+        transaction.replace(R.id.ll_home_frag_layout, fragment)
+        transaction.addToBackStack(null)
+        transaction.commit()
+    }
 }
diff --git a/app/src/main/java/com/song2/wave/UI/Main/MyPage/Adapter/MyPageHitSuccessAdapter.kt b/app/src/main/java/com/song2/wave/UI/Main/MyPage/Adapter/MyPageHitSuccessAdapter.kt
index 0222ce0..bba90e4 100644
--- a/app/src/main/java/com/song2/wave/UI/Main/MyPage/Adapter/MyPageHitSuccessAdapter.kt
+++ b/app/src/main/java/com/song2/wave/UI/Main/MyPage/Adapter/MyPageHitSuccessAdapter.kt
@@ -44,8 +44,8 @@ class MyPageHitSuccessAdapter(val ctx: Context, val datalist: ArrayList<HitSucce
     }
 
     inner class Holder(ItemView : View): RecyclerView.ViewHolder(ItemView){
-        var failFilter : RelativeLayout = itemView!!.findViewById(R.id.rl_hit_success_pass)
-        var passFilter : RelativeLayout = itemView!!.findViewById(R.id.rl_hit_success_fail)
+        var failFilter : RelativeLayout = itemView!!.findViewById(R.id.rl_hit_success_fail)
+        var passFilter : RelativeLayout = itemView!!.findViewById(R.id.rl_hit_success_pass)
 
         var songCoverImg = itemView.findViewById(R.id.img_hit_success) as ImageView
         var songName = itemView.findViewById(R.id.tv_hit_success_song_item_song_name) as TextView
diff --git a/app/src/main/java/com/song2/wave/UI/Main/MyPage/MyPageFragment.kt b/app/src/main/java/com/song2/wave/UI/Main/MyPage/MyPageFragment.kt
index e2717d6..2de5590 100644
--- a/app/src/main/java/com/song2/wave/UI/Main/MyPage/MyPageFragment.kt
+++ b/app/src/main/java/com/song2/wave/UI/Main/MyPage/MyPageFragment.kt
@@ -1,5 +1,6 @@
 package com.song2.wave.UI.Main.MyPage
 
+import android.app.Activity
 import android.os.Bundle
 import android.support.v4.app.Fragment
 import android.support.v7.widget.LinearLayoutManager
@@ -16,16 +17,17 @@ import com.song2.wave.Data.model.Mypage.ScoreHitResultData
 import com.song2.wave.Data.model.PlayListData
 import com.song2.wave.Data.model.UserInfoData
 import com.song2.wave.R
+import com.song2.wave.UI.Main.MainActivity
 import com.song2.wave.UI.Main.MyPage.Adapter.FragmentMypageScoringResultPagerAdapter
 import com.song2.wave.UI.Main.MyPage.Adapter.HitScoreResultAdapter
 import com.song2.wave.Util.Network.ApiClient
-import com.song2.wave.Util.Network.ApplicationController
 import com.song2.wave.Util.Network.NetworkService
 import kotlinx.android.synthetic.main.fragment_my_page.*
-import kotlinx.android.synthetic.main.fragment_my_page.view.*
+import org.jetbrains.anko.support.v4.startActivity
 import retrofit2.Call
 import retrofit2.Response
 
+
 class MyPageFragment : Fragment() {
 
     val networkService: NetworkService by lazy { ApiClient.getRetrofit().create(NetworkService::class.java)
@@ -44,7 +46,18 @@ class MyPageFragment : Fragment() {
         super.onActivityCreated(savedInstanceState)
         configureTopNavigation()
 
-        authorization_info = "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ1c2VySWR4IjoxMDUsImlhdCI6MTU2MjcyMjQ5MCwiZXhwIjoxNTY1MzE0NDkwfQ.CdVtW28EY4XOWV_xlt2dlYFMdEdFcIRN6lmsmJ8_jKQ"
+        var pref = context!!.getSharedPreferences("auto", Activity.MODE_PRIVATE)
+
+        //authorization_info = pref.getString("token","")
+        authorization_info = "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ1c2VySWR4IjoxNiwiaWF0IjoxNTYyOTY3NzY2LCJleHAiOjE1NjU1NTk3NjZ9.PmlhTASv3yT75I_RG9T6YRL-BdCAGZaE7fpB4r_G3BM"
+
+        iv_mypage_song_upload.setOnClickListener {
+            startActivity<UpLoadFileActivity>()
+        }
+
+        rl_mypage_frag_goto_score_result.setOnClickListener {
+            MainActivity.mainActivity.replaceFragment(MyPageFragment())
+        }
 
         //통신
         getHitsResponse()
@@ -99,6 +112,9 @@ class MyPageFragment : Fragment() {
             override fun onResponse(call: Call<GetUserInfoResponse>, response: Response<GetUserInfoResponse>) {
                 val userInfoData : UserInfoData = response.body()!!.data
 
+                Log.e("MyPageFrag","userInfoData")
+
+
                 showUserInfo(userInfoData)
 
             }
diff --git a/app/src/main/java/com/song2/wave/UI/Main/MyPage/MypageScoringFailFragment.kt b/app/src/main/java/com/song2/wave/UI/Main/MyPage/MypageScoringFailFragment.kt
index af2bfcd..f0e9f7d 100644
--- a/app/src/main/java/com/song2/wave/UI/Main/MyPage/MypageScoringFailFragment.kt
+++ b/app/src/main/java/com/song2/wave/UI/Main/MyPage/MypageScoringFailFragment.kt
@@ -38,7 +38,7 @@ MypageScoringFailFragment : Fragment(){
     override fun onActivityCreated(savedInstanceState: Bundle?) {
         super.onActivityCreated(savedInstanceState)
 
-        authorization_info = "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ1c2VySWR4IjoxMDUsImlhdCI6MTU2MjcyMjQ5MCwiZXhwIjoxNTY1MzE0NDkwfQ.CdVtW28EY4XOWV_xlt2dlYFMdEdFcIRN6lmsmJ8_jKQ"
+        authorization_info = "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ1c2VySWR4IjoxNiwiaWF0IjoxNTYyOTY3NzY2LCJleHAiOjE1NjU1NTk3NjZ9.PmlhTASv3yT75I_RG9T6YRL-BdCAGZaE7fpB4r_G3BM"
         getUploadResponse()
         attachRecyclerView()
     }
diff --git a/app/src/main/java/com/song2/wave/UI/Main/MyPage/MypageScoringPassedFragment.kt b/app/src/main/java/com/song2/wave/UI/Main/MyPage/MypageScoringPassedFragment.kt
index da0f6d8..97de049 100644
--- a/app/src/main/java/com/song2/wave/UI/Main/MyPage/MypageScoringPassedFragment.kt
+++ b/app/src/main/java/com/song2/wave/UI/Main/MyPage/MypageScoringPassedFragment.kt
@@ -40,7 +40,7 @@ class MypageScoringPassedFragment : Fragment(){
     override fun onActivityCreated(savedInstanceState: Bundle?) {
         super.onActivityCreated(savedInstanceState)
 
-        authorization_info = "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ1c2VySWR4IjoxMDUsImlhdCI6MTU2MjcyMjQ5MCwiZXhwIjoxNTY1MzE0NDkwfQ.CdVtW28EY4XOWV_xlt2dlYFMdEdFcIRN6lmsmJ8_jKQ"
+        authorization_info = "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ1c2VySWR4IjoxNiwiaWF0IjoxNTYyOTY3NzY2LCJleHAiOjE1NjU1NTk3NjZ9.PmlhTASv3yT75I_RG9T6YRL-BdCAGZaE7fpB4r_G3BM"
 
         attachRecyclerView()
         getUploadResponse()
diff --git a/app/src/main/java/com/song2/wave/UI/Main/MyPage/MypageScoringWaitingFragment.kt b/app/src/main/java/com/song2/wave/UI/Main/MyPage/MypageScoringWaitingFragment.kt
index 5452eee..c3c6046 100644
--- a/app/src/main/java/com/song2/wave/UI/Main/MyPage/MypageScoringWaitingFragment.kt
+++ b/app/src/main/java/com/song2/wave/UI/Main/MyPage/MypageScoringWaitingFragment.kt
@@ -39,7 +39,7 @@ class MypageScoringWaitingFragment : Fragment(){
     override fun onActivityCreated(savedInstanceState: Bundle?) {
         super.onActivityCreated(savedInstanceState)
 
-        authorization_info = "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ1c2VySWR4IjoxMDUsImlhdCI6MTU2MjcyMjQ5MCwiZXhwIjoxNTY1MzE0NDkwfQ.CdVtW28EY4XOWV_xlt2dlYFMdEdFcIRN6lmsmJ8_jKQ"
+        authorization_info = "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ1c2VySWR4IjoxNiwiaWF0IjoxNTYyOTY3NzY2LCJleHAiOjE1NjU1NTk3NjZ9.PmlhTASv3yT75I_RG9T6YRL-BdCAGZaE7fpB4r_G3BM"
 
         attachRecyclerView()
         getUploadResponse()
diff --git a/app/src/main/java/com/song2/wave/UI/Main/MyPage/SetStartPointActivity.kt b/app/src/main/java/com/song2/wave/UI/Main/MyPage/SetStartPointActivity.kt
index b6c7f72..31ba5fc 100644
--- a/app/src/main/java/com/song2/wave/UI/Main/MyPage/SetStartPointActivity.kt
+++ b/app/src/main/java/com/song2/wave/UI/Main/MyPage/SetStartPointActivity.kt
@@ -50,6 +50,7 @@ class SetStartPointActivity : AppCompatActivity() {
         iv_set_start_act_upload_btn.setOnClickListener {
             try {
                 startActivity<UpLoadSongCoverActivity>("StartPoint" to currentPosition.toString(), "songURI" to upload_song_uri)
+                mediaPlayer.stop()
                 finish()
                 //killMediaPlayer()
                 Log.e("startPoint", currentPosition.toString())
diff --git a/app/src/main/java/com/song2/wave/UI/Main/MyPage/UpLoadFileActivity.kt b/app/src/main/java/com/song2/wave/UI/Main/MyPage/UpLoadFileActivity.kt
index 42728de..e467e3c 100644
--- a/app/src/main/java/com/song2/wave/UI/Main/MyPage/UpLoadFileActivity.kt
+++ b/app/src/main/java/com/song2/wave/UI/Main/MyPage/UpLoadFileActivity.kt
@@ -62,8 +62,6 @@ class UpLoadFileActivity : AppCompatActivity() {
             if (resultCode == Activity.RESULT_OK) {
                 data?.let {
                     selectedAudioUri = it.data
-                    var mediaPlayer = MediaPlayer()
-
                     //Log.e("error selectedAudioUri", selectedAudioUri.toString())
                     //Log.v("UploadActivity", "음악 실제 경로 = " + getRealPathFromURI(applicationContext, it.data))
 
diff --git a/app/src/main/java/com/song2/wave/UI/Main/MyPage/UpLoadGenreActivity.kt b/app/src/main/java/com/song2/wave/UI/Main/MyPage/UpLoadGenreActivity.kt
new file mode 100644
index 0000000..1d6eb0b
--- /dev/null
+++ b/app/src/main/java/com/song2/wave/UI/Main/MyPage/UpLoadGenreActivity.kt
@@ -0,0 +1,69 @@
+package com.song2.wave.UI.Main.MyPage
+
+import android.net.Uri
+import android.support.v7.app.AppCompatActivity
+import android.os.Bundle
+import android.os.Parcelable
+import android.util.Log
+import android.view.View
+import android.widget.ImageView
+import android.widget.Toast
+import com.song2.wave.R
+import kotlinx.android.synthetic.main.activity_signup_genre.*
+import kotlinx.android.synthetic.main.activity_upload_genre.*
+import org.jetbrains.anko.startActivity
+
+class UpLoadGenreActivity : AppCompatActivity(), View.OnClickListener {
+
+
+    lateinit var receivedImgUri : Uri
+    lateinit var genreArr : Array<ImageView>
+    var selectedGenreArr = ArrayList<String>()
+    lateinit var selectedArtistArr : ArrayList<String>
+
+    override fun onClick(v: View?) {
+        for(i in 0..7){
+            if (v!!.id == genreArr[i].getId()) {
+                selectedGenreArr.add("g" + ((i+1).toString()))
+                Toast.makeText(applicationContext, "장르 " +"g" + (i+1).toString() + "번 버튼 선택", Toast.LENGTH_LONG).show()
+            }
+        }
+        for(i in 0..selectedGenreArr.size-1)
+            Log.v("act", "장르 배열 값 = " + selectedGenreArr[i])
+
+    }
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        setContentView(R.layout.activity_upload_genre)
+
+        var popImg : ImageView = findViewById(R.id.img_upload_genre_act_pop)
+        var balladImg : ImageView = findViewById(R.id.img_upload_genre_act_ballad)
+        var danceImg : ImageView = findViewById(R.id.img_upload_genre_act_dance)
+        var aqusticImg : ImageView = findViewById(R.id.img_upload_genre_act_aqustic)
+        var rockImg : ImageView = findViewById(R.id.img_upload_genre_act_rock)
+        var soulImg : ImageView = findViewById(R.id.img_upload_genre_act_soul)
+        var hiphopImg : ImageView = findViewById(R.id.img_upload_genre_act_hiphop)
+        var eletronicImg : ImageView = findViewById(R.id.img_upload_genre_act_eletronic)
+
+
+        genreArr = arrayOf<ImageView>(balladImg, popImg, aqusticImg, danceImg, hiphopImg, soulImg, rockImg, eletronicImg)
+        for(i in 0..7){
+            genreArr[i].setOnClickListener(this)
+        }
+
+        btn_upload_genre_nex.setOnClickListener {
+            Log.e("next btn_song",intent.getStringExtra("songURI").toString())
+            Log.e("next btn_pic",intent.getStringExtra("picURI").toString())
+            startActivity<UpLoadMoodActivity>(
+                "Title" to intent.getStringExtra("StartPoint").toString(),
+                "Artist" to intent.getStringExtra("Artist").toString(),
+                "Comment" to intent.getStringExtra("Comment").toString(),
+                "StartPoint" to intent.getStringExtra("StartPoint").toString(),
+                "songURI" to intent.getStringExtra("songURI").toString(),
+                "picURI" to intent.getStringExtra("picURI").toString(),
+                "genre" to selectedGenreArr
+            )
+        }
+    }
+}
diff --git a/app/src/main/java/com/song2/wave/UI/Main/MyPage/UpLoadMoodActivity.kt b/app/src/main/java/com/song2/wave/UI/Main/MyPage/UpLoadMoodActivity.kt
new file mode 100644
index 0000000..af3fb1c
--- /dev/null
+++ b/app/src/main/java/com/song2/wave/UI/Main/MyPage/UpLoadMoodActivity.kt
@@ -0,0 +1,197 @@
+package com.song2.wave.UI.Main.MyPage
+
+import android.app.Activity
+import android.content.Context
+import android.database.Cursor
+import android.graphics.Bitmap
+import android.graphics.BitmapFactory
+import android.net.Uri
+import android.support.v7.app.AppCompatActivity
+import android.os.Bundle
+import android.provider.MediaStore
+import android.util.Log
+import android.view.View
+import android.widget.ImageView
+import android.widget.Toast
+import com.song2.wave.R
+import com.song2.wave.UI.Main.MainActivity
+import com.song2.wave.Util.Network.ApiClientSec
+import com.song2.wave.Util.Network.NetworkService
+import com.song2.wave.Util.Network.POST.PostResponse
+import kotlinx.android.synthetic.main.activity_upload_mood.*
+import okhttp3.MediaType
+import okhttp3.MultipartBody
+import okhttp3.RequestBody
+import org.jetbrains.anko.startActivity
+import retrofit2.Call
+import retrofit2.Callback
+import retrofit2.Response
+import java.io.*
+
+class UpLoadMoodActivity : AppCompatActivity(), View.OnClickListener {
+
+    lateinit var authorization_info: String
+    val networkService: NetworkService by lazy {
+        ApiClientSec.getRetrofit().create(NetworkService::class.java)
+    }
+
+
+    lateinit var data: Uri
+
+    lateinit var selectedArtistArr: ArrayList<String>
+
+    var genre = ArrayList<RequestBody?>()
+    var mood = ArrayList<RequestBody?>()
+    var originArtist = ArrayList<RequestBody?>()
+    private var coverImg: MultipartBody.Part? = null
+    private var audioFile: MultipartBody.Part? = null
+
+    lateinit var receivedImgUri: Uri
+    lateinit var receivedAudioUri: Uri
+
+    lateinit var selectedMoodArr: ArrayList<String>
+    lateinit var selectedGenreArr: ArrayList<String>
+
+    lateinit var moodArr: Array<ImageView>
+
+    override fun onClick(v: View?) {
+        for (i in 0..7) {
+            if (v!!.id == moodArr[i].getId()) {
+                if (moodArr[i].isSelected) {
+                    selectedMoodArr.remove(("m" + (i + 1)))
+                } else {
+                    selectedMoodArr.add(("m" + (i + 1)))
+                }
+            }
+        }
+    }
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        setContentView(R.layout.activity_upload_mood)
+
+
+        var pref = this!!.getSharedPreferences("auto", Activity.MODE_PRIVATE)
+        //authorization_info = pref.getString("token", "")
+        authorization_info = "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ1c2VySWR4IjoxNiwiaWF0IjoxNTYyOTY3NzY2LCJleHAiOjE1NjU1NTk3NjZ9.PmlhTASv3yT75I_RG9T6YRL-BdCAGZaE7fpB4r_G3BM"
+
+        selectedMoodArr = ArrayList<String>()
+        selectedGenreArr = ArrayList<String>()
+        selectedArtistArr = ArrayList<String>()
+
+        var funnyImg: ImageView = findViewById(R.id.img_upload_mood_act_funny)
+        var fluttetImg: ImageView = findViewById(R.id.img_upload_mood_act_flutter)
+        var hipImg: ImageView = findViewById(R.id.img_upload_mood_act_hip)
+        var sadImg: ImageView = findViewById(R.id.img_upload_mood_act_sad)
+        var windliessImg: ImageView = findViewById(R.id.img_upload_mood_act_windless)
+        var dreamyImg: ImageView = findViewById(R.id.img_upload_mood_act_dreamy)
+        var groovyImg: ImageView = findViewById(R.id.img_upload_mood_act_windless)
+        var honeyImg: ImageView = findViewById(R.id.img_upload_mood_act_honey)
+
+
+        moodArr = arrayOf<ImageView>(funnyImg, honeyImg, fluttetImg, sadImg, hipImg, windliessImg, groovyImg, dreamyImg)
+
+        for (i in 0..7) {
+            moodArr[i].setOnClickListener(this)
+        }
+
+        btn_upload_mood_next.setOnClickListener {
+            postSongUploadResponse()
+        }
+    }
+
+    // 이미지 파일을 확장자까지 표시해주는 메소드
+    fun getRealPathFromURI(context: Context, contentUri: Uri): String {
+        var cursor: Cursor? = null
+        try {
+            val proj = arrayOf(MediaStore.Images.Media.DATA)
+            cursor = context.contentResolver.query(contentUri, proj, null, null, null)
+            val column_index = cursor!!.getColumnIndexOrThrow(MediaStore.Images.Media.DATA)
+            cursor.moveToFirst()
+            return cursor.getString(column_index)
+        } finally {
+            cursor?.close()
+        }
+    }
+
+    fun postSongUploadResponse() {
+
+        var originTitleValue: String = intent.getStringExtra("Title")
+        var originArtistNameValue: String = intent.getStringExtra("Artist")
+        var songCommentValue: String = intent.getStringExtra("Comment")
+        var highlightTimeValue: String = intent.getStringExtra("StartPoint")
+
+        var genreValue: ArrayList<String> = intent.getStringArrayListExtra("genre")
+
+        Log.v("UploadActivity", "originTitle = " + originTitleValue)
+        Log.v("UploadActivity", "originArtistName = " + originArtistNameValue)
+        Log.v("UploadActivity", "songComment " + songCommentValue)
+        Log.v("UploadActivity", "songHigilight " + highlightTimeValue)
+
+        for (i in genreValue.indices) {
+            genre.add(RequestBody.create(MediaType.parse("text.plain"), genreValue[i]))
+        }
+
+        for (i in selectedMoodArr.indices) {
+            mood.add(RequestBody.create(MediaType.parse("text.plain"), selectedMoodArr[i]))
+        }
+
+        val title = RequestBody.create(MediaType.parse("text.plain"), originTitleValue)
+        val originArtistName = RequestBody.create(MediaType.parse("text.plain"), originArtistNameValue)
+        val songComment = RequestBody.create(MediaType.parse("text.plain"), songCommentValue)
+        val highlightTime = RequestBody.create(MediaType.parse("text.plain"), highlightTimeValue)
+
+
+        /// 이미지 파일변환
+        receivedImgUri = Uri.parse(intent.getStringExtra("picURI"))
+        val options = BitmapFactory.Options()
+        var input: InputStream? = null // here, you need to get your context.
+        try {
+            input = contentResolver.openInputStream(receivedImgUri)
+        } catch (e: FileNotFoundException) {
+            e.printStackTrace()
+        }
+        val bitmap = BitmapFactory.decodeStream(input, null, options) // InputStream 으로부터 Bitmap 을 만들어 준다.
+        val baos = ByteArrayOutputStream()
+        bitmap.compress(Bitmap.CompressFormat.JPEG, 20, baos)
+        val photoBody = RequestBody.create(MediaType.parse("image/jpg"), baos.toByteArray())
+        val img = File(getRealPathFromURI(applicationContext, receivedImgUri).toString()) // 가져온 파일의 이름을 알아내려고 사용합니다
+        coverImg = MultipartBody.Part.createFormData("artwork", img.name, photoBody)
+
+        /// mp3 파일변환
+        val audio = File(getRealPathFromURI(applicationContext, receivedImgUri)) // 가져온 파일의 이름을 알아내려고 사용합니다
+        val audioBody = RequestBody.create(MediaType.parse("audio/*"), audio)
+
+
+        audioFile = MultipartBody.Part.createFormData("songUrl", audio.name, audioBody)
+
+        val postSongUploadResponse = networkService.postSongUploadResponse(
+            authorization_info,
+            title, coverImg, originArtistName, audioFile,
+            genre, mood, songComment, highlightTime
+        )
+
+        postSongUploadResponse.enqueue(object : retrofit2.Callback<PostResponse> {
+            override fun onResponse(call: Call<PostResponse>, response: Response<PostResponse>) {
+                if (response.isSuccessful) {
+                    if (response.body()!!.success == true) {
+                        Toast.makeText(applicationContext, "곡업로드 완료", Toast.LENGTH_SHORT).show()
+                        Log.e("UploadMoodActivity", "곡업로드 성공")
+                        startActivity<MainActivity>()
+                    } else {
+                        Log.e("UploadMoodActivity", "실패message : " + response.body()!!.message)
+                    }
+                } else {
+                    Log.e("response", response.body().toString())
+                }
+            }
+
+            override fun onFailure(call: Call<PostResponse>, t: Throwable) {
+                Log.e("UploadMoodActivity", "곡업로드 실패" + t.toString())
+
+            }
+
+        })
+
+    }
+}
diff --git a/app/src/main/java/com/song2/wave/UI/Main/MyPage/UpLoadSongCoverActivity.kt b/app/src/main/java/com/song2/wave/UI/Main/MyPage/UpLoadSongCoverActivity.kt
index 13751ff..bf19013 100644
--- a/app/src/main/java/com/song2/wave/UI/Main/MyPage/UpLoadSongCoverActivity.kt
+++ b/app/src/main/java/com/song2/wave/UI/Main/MyPage/UpLoadSongCoverActivity.kt
@@ -57,7 +57,7 @@ class UpLoadSongCoverActivity : AppCompatActivity() {
 
         iv_up_load_cover_act_confirm_btn.setOnClickListener {
             Log.e("er","StartPoint: " + start_point.toString() +"/songURI: " + upload_song_uri +"/picURI: " + selectedPicUri.toString())
-            startActivity<UploadSongInfoActivity>("StartPoint" to start_point.toString(), "songURI" to upload_song_uri , "picURI" to selectedPicUri)
+            startActivity<UploadSongInfoActivity>("StartPoint" to start_point.toString(), "songURI" to upload_song_uri , "picURI" to selectedPicUri.toString())
         }
 
     }
diff --git a/app/src/main/java/com/song2/wave/UI/Main/MyPage/UploadSongInfoActivity.kt b/app/src/main/java/com/song2/wave/UI/Main/MyPage/UploadSongInfoActivity.kt
index 19dee4c..464216e 100644
--- a/app/src/main/java/com/song2/wave/UI/Main/MyPage/UploadSongInfoActivity.kt
+++ b/app/src/main/java/com/song2/wave/UI/Main/MyPage/UploadSongInfoActivity.kt
@@ -1,6 +1,5 @@
 package com.song2.wave.UI.Main.MyPage
 
-import android.net.Uri
 import android.support.v7.app.AppCompatActivity
 import android.os.Bundle
 import android.view.View
@@ -17,15 +16,7 @@ class UploadSongInfoActivity : AppCompatActivity() {
 
         var start_point = intent.getStringExtra("StartPoint")
         var upload_song_uri =  intent.getStringExtra("songURI")
-        var selectedPicUri =  intent.getStringExtra("picURI")
-
-        et_upload_song_info_origin_title.onFocusChangeListener = object : View.OnFocusChangeListener {
-            override fun onFocusChange(p0: View?, p1: Boolean) {
-                if (!p1){
-                    //iv_upload_song_info_act_confirm_btn.visibility = View.INVISIBLE
-                }
-            }
-        }
+        var upload_pic_uri =  intent.getStringExtra("picURI")
 
         tv_title_confirm.setOnClickListener {
             rl_upload_song_info_origin_singer_edt.visibility = View.VISIBLE
@@ -39,7 +30,7 @@ class UploadSongInfoActivity : AppCompatActivity() {
         tv_singer_confirm.setOnClickListener{
             rl_upload_song_info_origin_comment_edt.visibility = View.VISIBLE
 
-            //가수
+            //코멘트
             rl_upload_song_info_origin_title.visibility = View.GONE
             rl_upload_song_info_origin_artist.visibility = View.GONE
             rl_upload_song_info_comment.visibility = View.VISIBLE
@@ -47,11 +38,14 @@ class UploadSongInfoActivity : AppCompatActivity() {
 
 
         iv_upload_song_info_act_confirm_btn.setOnClickListener {
-            startActivity<SignupGenreActivity>(
-                "Confirm" to "upload",
-                "Title" to et_upload_song_info_origin_title.text.toString(), "Artist" to et_upload_song_info_origin_singer.text.toString(), "Comment" to et_upload_song_info_comment.text.toString()
-                ,"StartPoint" to start_point.toString(), "songURI" to upload_song_uri, "picURI" to selectedPicUri)
+            startActivity<UpLoadGenreActivity>(
+                "Title" to et_upload_song_info_origin_title.text.toString(),
+                "Artist" to et_upload_song_info_origin_singer.text.toString(),
+                "Comment" to et_upload_song_info_comment.text.toString(),
+                "StartPoint" to start_point.toString(),
+                "songURI" to upload_song_uri,
+                "picURI" to upload_pic_uri
+            )
         }
-
     }
-}
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/song2/wave/UI/Main/Scoring/ScoringCompletedFragment.kt b/app/src/main/java/com/song2/wave/UI/Main/Scoring/ScoringCompletedFragment.kt
index efc3563..4a748d8 100644
--- a/app/src/main/java/com/song2/wave/UI/Main/Scoring/ScoringCompletedFragment.kt
+++ b/app/src/main/java/com/song2/wave/UI/Main/Scoring/ScoringCompletedFragment.kt
@@ -1,5 +1,6 @@
 package com.song2.wave.UI.Main.Scoring
 
+import android.app.Activity
 import android.os.Bundle
 import android.support.v4.app.Fragment
 import android.support.v7.widget.LinearLayoutManager
@@ -46,7 +47,10 @@ class ScoringCompletedFragment : Fragment(){
     override fun onActivityCreated(savedInstanceState: Bundle?) {
         super.onActivityCreated(savedInstanceState)
 
-        authorization_info = "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ1c2VySWR4IjoxMDUsImlhdCI6MTU2MjcyMjQ5MCwiZXhwIjoxNTY1MzE0NDkwfQ.CdVtW28EY4XOWV_xlt2dlYFMdEdFcIRN6lmsmJ8_jKQ"
+        var pref = context!!.getSharedPreferences("auto", Activity.MODE_PRIVATE)
+
+        //authorization_info = pref.getString("token","")
+        authorization_info = "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ1c2VySWR4IjoxNiwiaWF0IjoxNTYyOTY3NzY2LCJleHAiOjE1NjU1NTk3NjZ9.PmlhTASv3yT75I_RG9T6YRL-BdCAGZaE7fpB4r_G3BM"
 
         getRatedResponse()
     }
diff --git a/app/src/main/java/com/song2/wave/UI/Main/Scoring/ScoringWaitingFragment.kt b/app/src/main/java/com/song2/wave/UI/Main/Scoring/ScoringWaitingFragment.kt
index 12f2705..d9172d5 100644
--- a/app/src/main/java/com/song2/wave/UI/Main/Scoring/ScoringWaitingFragment.kt
+++ b/app/src/main/java/com/song2/wave/UI/Main/Scoring/ScoringWaitingFragment.kt
@@ -1,6 +1,7 @@
 package com.song2.wave.UI.Main.Scoring
 
 
+import android.app.Activity
 import android.os.Bundle
 import android.support.v4.app.Fragment
 import android.support.v7.widget.LinearLayoutManager
@@ -34,7 +35,11 @@ class ScoringWaitingFragment : Fragment() {
     override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
         var v: View = inflater.inflate(com.song2.wave.R.layout.fragment_scoring_wait, container, false)
 
-        authorization_info = "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ1c2VySWR4IjoxMDUsImlhdCI6MTU2MjcyMjQ5MCwiZXhwIjoxNTY1MzE0NDkwfQ.CdVtW28EY4XOWV_xlt2dlYFMdEdFcIRN6lmsmJ8_jKQ"
+        var pref = context!!.getSharedPreferences("auto", Activity.MODE_PRIVATE)
+
+        //authorization_info = pref.getString("token","")
+
+        authorization_info = "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ1c2VySWR4IjoxNiwiaWF0IjoxNTYyOTY3NzY2LCJleHAiOjE1NjU1NTk3NjZ9.PmlhTASv3yT75I_RG9T6YRL-BdCAGZaE7fpB4r_G3BM"
 
         songDataArr = ArrayList<SongData>()
         requestManager = Glide.with(this)
diff --git a/app/src/main/java/com/song2/wave/UI/Main/Search/Adapter/SearchArtistViewAdapter.kt b/app/src/main/java/com/song2/wave/UI/Main/Search/Adapter/SearchArtistViewAdapter.kt
new file mode 100644
index 0000000..4b8ca8b
--- /dev/null
+++ b/app/src/main/java/com/song2/wave/UI/Main/Search/Adapter/SearchArtistViewAdapter.kt
@@ -0,0 +1,40 @@
+package com.song2.wave.UI.Main.Search.Adapter
+
+import android.content.Context
+import android.support.v7.widget.RecyclerView
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import android.widget.ImageView
+import android.widget.RelativeLayout
+import android.widget.TextView
+import com.bumptech.glide.Glide
+import com.song2.wave.Data.model.SearchArtistData
+import com.song2.wave.R
+
+
+//Adapter를 통해 view와 data를 연결시킨다.
+class SearchArtistViewAdapter(val ctx : Context, val dataList : ArrayList<SearchArtistData>) : RecyclerView.Adapter<SearchArtistViewAdapter.Holder>() {
+    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): Holder{
+        //뷰 인플레이트
+        var view : View = LayoutInflater.from(ctx).inflate(R.layout.item_search_origin_artist, parent, false)
+        return Holder(view)
+    }
+    override fun getItemCount() : Int = dataList.size
+
+    override fun onBindViewHolder(holder: Holder, position: Int) {
+        Glide.with(ctx).load(dataList[position].image).into(holder.image)
+        holder.title.text = dataList[position].title
+
+        holder.item_btn.setOnClickListener {
+
+        }
+    }
+
+    inner class Holder(itemView : View) : RecyclerView.ViewHolder(itemView){
+        val image : ImageView = itemView.findViewById(R.id.iv_search_origin_artist_item_image) as ImageView
+        val title : TextView = itemView.findViewById(R.id.tv_search_origin_artist_item_title) as TextView
+
+        val item_btn : RelativeLayout = itemView.findViewById(R.id.bt_rv_item_search_origin_artist) as RelativeLayout
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/song2/wave/UI/Main/Search/Adapter/SongSearchAdapter.kt b/app/src/main/java/com/song2/wave/UI/Main/Search/Adapter/SongSearchAdapter.kt
index a8afa34..55f20d4 100644
--- a/app/src/main/java/com/song2/wave/UI/Main/Search/Adapter/SongSearchAdapter.kt
+++ b/app/src/main/java/com/song2/wave/UI/Main/Search/Adapter/SongSearchAdapter.kt
@@ -16,6 +16,7 @@ class SongSearchAdapter (private var songData : ArrayList<SongData>, var request
         val mainView : View = LayoutInflater.from(parent.context)
                 .inflate(R.layout.item_song_view, parent, false)
         return SongSearchViewHolder(mainView)
+
     }
 
     override fun getItemCount(): Int = songData.size
diff --git a/app/src/main/java/com/song2/wave/UI/Main/Search/SearchCoverArtistFragment.kt b/app/src/main/java/com/song2/wave/UI/Main/Search/SearchCoverArtistFragment.kt
new file mode 100644
index 0000000..6c24598
--- /dev/null
+++ b/app/src/main/java/com/song2/wave/UI/Main/Search/SearchCoverArtistFragment.kt
@@ -0,0 +1,40 @@
+package com.song2.wave.UI.Main.Search
+
+import android.os.Bundle
+import android.support.v4.app.Fragment
+import android.support.v7.widget.LinearLayoutManager
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import com.song2.wave.R
+import com.song2.wave.UI.Main.Search.Adapter.SearchArtistViewAdapter
+
+class SearchCoverArtistFragment : Fragment() {
+    lateinit var searchCoverArtistViewAdapter: SearchArtistViewAdapter
+    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
+        return inflater.inflate(R.layout.fragment_search_origin_artist, container, false)
+    }
+    override fun onActivityCreated(savedInstanceState: Bundle?) {
+        super.onActivityCreated(savedInstanceState)
+
+        setRecyclerView()
+    }
+    private fun setRecyclerView() {
+        //임시 데이터
+       /* var dataList: ArrayList<SearchArtistData> = ArrayList()
+        dataList.add(SearchArtistData("https://images.otwojob.com/product/P/o/M/PoM0Lnkz9z54kZS.png/o2j/resize/900%3E", "개미는"))
+        dataList.add(SearchArtistData("https://images.otwojob.com/product/P/o/M/PoM0Lnkz9z54kZS.png/o2j/resize/900%3E", "뚠뚠"))
+        dataList.add(SearchArtistData("https://images.otwojob.com/product/P/o/M/PoM0Lnkz9z54kZS.png/o2j/resize/900%3E", "오늘도"))
+        dataList.add(SearchArtistData("https://images.otwojob.com/product/P/o/M/PoM0Lnkz9z54kZS.png/o2j/resize/900%3E", "뚠뚠"))
+        dataList.add(SearchArtistData("https://images.otwojob.com/product/P/o/M/PoM0Lnkz9z54kZS.png/o2j/resize/900%3E", "열심히"))
+        dataList.add(SearchArtistData("https://images.otwojob.com/product/P/o/M/PoM0Lnkz9z54kZS.png/o2j/resize/900%3E", "개미는"))
+        dataList.add(SearchArtistData("https://images.otwojob.com/product/P/o/M/PoM0Lnkz9z54kZS.png/o2j/resize/900%3E", "언제나"))
+        dataList.add(SearchArtistData("https://images.otwojob.com/product/P/o/M/PoM0Lnkz9z54kZS.png/o2j/resize/900%3E", "열심히"))
+        dataList.add(SearchArtistData("https://images.otwojob.com/product/P/o/M/PoM0Lnkz9z54kZS.png/o2j/resize/900%3E", "일을 하네"))
+        dataList.add(SearchArtistData("https://images.otwojob.com/product/P/o/M/PoM0Lnkz9z54kZS.png/o2j/resize/900%3E", "개미는 아무말도"))
+
+        searchCoverArtistViewAdapter = SearchArtistViewAdapter(activity!!, dataList)
+        rv_fragment_search_cover_artist_list.adapter =  searchCoverArtistViewAdapter
+        rv_fragment_search_cover_artist_list.layoutManager = LinearLayoutManager(activity)*/
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/song2/wave/UI/Main/Search/SearchHomeFragment.kt b/app/src/main/java/com/song2/wave/UI/Main/Search/SearchHomeFragment.kt
index 4c03ece..e263498 100644
--- a/app/src/main/java/com/song2/wave/UI/Main/Search/SearchHomeFragment.kt
+++ b/app/src/main/java/com/song2/wave/UI/Main/Search/SearchHomeFragment.kt
@@ -5,6 +5,7 @@ import android.os.Bundle
 import android.support.v4.app.Fragment
 import android.support.v7.widget.LinearLayoutManager
 import android.util.Log
+import android.view.KeyEvent
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
@@ -13,7 +14,6 @@ import com.bumptech.glide.RequestManager
 import com.song2.wave.Data.GET.GetSearchResponse
 import com.song2.wave.Data.model.*
 import com.song2.wave.Data.model.SignUp.OriginArtistData
-import com.song2.wave.R
 import com.song2.wave.UI.Main.MainActivity
 import com.song2.wave.UI.Main.Search.Adapter.CoverArtistSearchAdapter
 import com.song2.wave.UI.Main.Search.Adapter.OriginArtistSearchAdapter
@@ -27,6 +27,15 @@ import kotlinx.android.synthetic.main.fragment_search_home.view.*
 import org.jetbrains.anko.support.v4.toast
 import retrofit2.Call
 import retrofit2.Response
+import android.view.inputmethod.EditorInfo
+import android.widget.TextView
+import android.text.InputType
+
+
+
+
+
+
 
 class SearchHomeFragment : Fragment(), OnBackPressedListener {
 
@@ -60,25 +69,31 @@ class SearchHomeFragment : Fragment(), OnBackPressedListener {
     var searchBackFlag: Int = 0 // editText 비활성화 : 0
 
     override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
-        var v: View = inflater.inflate(R.layout.fragment_search_home, container, false)
+        var v: View = inflater.inflate(com.song2.wave.R.layout.fragment_search_home, container, false)
 
         originDataArr = ArrayList<OriginArtistData>()
 /*        if(getArguments() != null){
             getSearchResponse(getArguments()!!.getString("searchData"))
         }*/
 
+
+
+
         v.btn_search_home_frag_searchbar.setOnClickListener {
             getSearchResponse(edit_search_home_frag_searchbar.text.toString())
 
+
+
             ll_search_home_frag_focus_off.visibility = View.VISIBLE
             ll_search_home_frag_focus_on.visibility = View.GONE
+            rv_search_background.visibility = View.GONE
+
             edit_search_home_frag_searchbar.clearFocus()
             searchBackFlag = 0
 
         }
 
 
-
         v.ll_search_home_frag_focus_on.visibility = View.GONE
         songDataArr = ArrayList<SongData>()
         coverArtistDataArr = ArrayList<CoverArtistData>()
@@ -87,15 +102,18 @@ class SearchHomeFragment : Fragment(), OnBackPressedListener {
         // Edittext focus off
         v.ll_search_home_frag_focus.setOnClickListener {
             searchEditTextFocusOff()
+            //rv_search_background.visibility = View.VISIBLE
+
         }
 
         insertExampleData()
 
 
-        insertSearchHistoryData(v)
+       insertSearchHistoryData(v)
 
         // Edittext focus ON
         v.edit_search_home_frag_searchbar.setOnFocusChangeListener { view, hasFocus ->
+            rv_search_background.visibility = View.GONE
             if (hasFocus) {
                 searchEditTextFocusOn()
             }
@@ -104,12 +122,13 @@ class SearchHomeFragment : Fragment(), OnBackPressedListener {
 
 
         // "all delte" button is clicked
-        v.tv_search_home_frag_all_delete.setOnClickListener {
+       v.tv_search_home_frag_all_delete.setOnClickListener {
             searchData.clear()
             searchDataHistoryAdapter = SearchDataHistoryAdapter(searchData)
             v.recycler_search_home_frag_search_home_hisory.adapter = searchDataHistoryAdapter
             v.recycler_search_home_frag_search_home_hisory.layoutManager = LinearLayoutManager(context)
             v.recycler_search_home_frag_search_home_hisory.isNestedScrollingEnabled = false
+            v.rv_search_background.visibility = View.VISIBLE
         }
 
         // artist is clicked
diff --git a/app/src/main/java/com/song2/wave/UI/Main/Search/SearchOriginArtistFragment.kt b/app/src/main/java/com/song2/wave/UI/Main/Search/SearchOriginArtistFragment.kt
new file mode 100644
index 0000000..fedfa79
--- /dev/null
+++ b/app/src/main/java/com/song2/wave/UI/Main/Search/SearchOriginArtistFragment.kt
@@ -0,0 +1,71 @@
+package com.song2.wave.UI.Main.Search
+
+import android.os.Bundle
+import android.support.v4.app.Fragment
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import com.song2.wave.R
+import com.song2.wave.UI.Main.Search.Adapter.SearchArtistViewAdapter
+
+class SearchOriginArtistFragment : Fragment() {
+    lateinit var searchOriginArtistViewAdapter: SearchArtistViewAdapter
+    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
+        return inflater.inflate(R.layout.fragment_search_origin_artist, container, false)
+    }
+    override fun onActivityCreated(savedInstanceState: Bundle?) {
+        super.onActivityCreated(savedInstanceState)
+
+            // setRecyclerView()
+    }
+    /*private fun setRecyclerView() {
+        //임시 데이터
+        var dataList: ArrayList<SearchArtistData> = ArrayList()
+        dataList.add(
+            SearchArtistData(
+                "https://images.otwojob.com/product/P/o/M/PoM0Lnkz9z54kZS.png/o2j/resize/900%3E",
+                "이것은"
+            )
+        )
+        dataList.add(
+            SearchArtistData(
+                "https://images.otwojob.com/product/P/o/M/PoM0Lnkz9z54kZS.png/o2j/resize/900%3E",
+                "Origin"
+            )
+        )
+        dataList.add(
+            SearchArtistData(
+                "https://images.otwojob.com/product/P/o/M/PoM0Lnkz9z54kZS.png/o2j/resize/900%3E",
+                "입니다"
+            )
+        )
+        dataList.add(
+            SearchArtistData(
+                "https://images.otwojob.com/product/P/o/M/PoM0Lnkz9z54kZS.png/o2j/resize/900%3E",
+                "Artist"
+            )
+        )
+        dataList.add(
+            SearchArtistData(
+                "https://images.otwojob.com/product/P/o/M/PoM0Lnkz9z54kZS.png/o2j/resize/900%3E",
+                "이선이"
+            )
+        )
+        dataList.add(
+            SearchArtistData(
+                "https://images.otwojob.com/product/P/o/M/PoM0Lnkz9z54kZS.png/o2j/resize/900%3E",
+                "부릅니다"
+            )
+        )
+        dataList.add(
+            SearchArtistData(
+                "https://images.otwojob.com/product/P/o/M/PoM0Lnkz9z54kZS.png/o2j/resize/900%3E",
+                "소주 한잔"
+            )
+        )
+
+        searchOriginArtistViewAdapter = SearchArtistViewAdapter(activity!!, dataList)
+        rv_fragment_search_origin_artist_list.adapter = searchOriginArtistViewAdapter
+        rv_fragment_search_origin_artist_list.layoutManager = LinearLayoutManager(activity)
+    }*/
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/song2/wave/UI/MainPlayer/MainPlayerActivity.kt b/app/src/main/java/com/song2/wave/UI/MainPlayer/MainPlayerActivity.kt
index c82562a..a58fe37 100644
--- a/app/src/main/java/com/song2/wave/UI/MainPlayer/MainPlayerActivity.kt
+++ b/app/src/main/java/com/song2/wave/UI/MainPlayer/MainPlayerActivity.kt
@@ -1,5 +1,6 @@
 package com.song2.wave.UI.MainPlayer
 
+import android.animation.Animator
 import android.app.Activity
 import android.content.*
 import android.net.Uri
@@ -12,6 +13,8 @@ import android.view.View
 import android.widget.SeekBar
 import android.widget.TextView
 import android.widget.Toast
+import android.widget.VideoView
+import com.airbnb.lottie.LottieAnimationView
 import com.bumptech.glide.Glide
 import com.google.gson.JsonObject
 import com.google.gson.JsonParser
@@ -41,7 +44,51 @@ import org.jetbrains.anko.toast
 import org.json.JSONObject
 
 
-class MainPlayerActivity : AppCompatActivity(), View.OnClickListener {
+class
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+MainPlayerActivity : AppCompatActivity(), View.OnClickListener {
 
     lateinit var playTime: String
     var playbackPosition : Int = 0
@@ -77,7 +124,6 @@ class MainPlayerActivity : AppCompatActivity(), View.OnClickListener {
     val networkService: NetworkService by lazy { ApiClient.getRetrofit().create(NetworkService::class.java)
     }
 
-
     override fun onClick(v: View) {
         when (v.id) {
             R.id.lin_miniplayer -> {
@@ -229,6 +275,40 @@ class MainPlayerActivity : AppCompatActivity(), View.OnClickListener {
         durationTimeTv = findViewById(R.id.tv_main_player_duration_time)
         lengthTimeTv = findViewById(R.id.tv_main_player_length_of_song)
 
+        //--------------------------------------애니메이션---------
+        // val video : VideoView = findViewById(R.id.video)
+        //com.airbnb.lottie.LottieAnimationView 아이디
+        val love : LottieAnimationView = findViewById(R.id.lottie_main_act_like)
+        val videoView = findViewById<VideoView>(R.id.video)
+        val path = "android.resource://" + packageName + "/" + R.raw.try_11
+        videoView?.setVideoURI(Uri.parse(path))
+        //val button = findViewById<Button>(R.id.button)
+
+        lottie_main_act_like.setOnClickListener {
+            love.playAnimation()
+            val isPlaying = videoView.isPlaying
+            if (isPlaying) {
+                //videoView.pause()
+            } else {
+                videoView.start()
+            }
+        }
+        love.addAnimatorListener(object : Animator. AnimatorListener{
+            override fun onAnimationRepeat(animation: Animator?) {
+                Log.e("Animation:","repeat")
+            }
+            override fun onAnimationEnd(animation: Animator?) {
+                //Toast.makeText( application , "끝~",Toast. LENGTH_SHORT ).show()
+            }
+            override fun onAnimationCancel(animation: Animator?) {
+                Log.e("Animation:","cancel")  //취소
+            }
+            override fun onAnimationStart(animation: Animator?) {
+                Log.e("Animation ","star") //시작
+            }
+        })
+
+        //------------------------------------------------애니메이션
         iv_main_player_act_stop_btn.setOnClickListener(this)
         mPosition = intent.getIntExtra("mPosition", 0)
 
@@ -310,7 +390,11 @@ class MainPlayerActivity : AppCompatActivity(), View.OnClickListener {
 
         playerBtn()
         registerBroadcast();
-        updateUI();
+        updateUI()
+
+        iv_maim_player_close.setOnClickListener {
+            finish()
+        }
 
     }
 
@@ -331,6 +415,7 @@ class MainPlayerActivity : AppCompatActivity(), View.OnClickListener {
                 }
             }
             override fun onFailure(call: Call<PostResponse>, t: Throwable?) {
+
             }
         })
     }
diff --git a/app/src/main/java/com/song2/wave/UI/Signup/SignupGenreActivity.kt b/app/src/main/java/com/song2/wave/UI/Signup/SignupGenreActivity.kt
index 135b7cf..c5fa66f 100644
--- a/app/src/main/java/com/song2/wave/UI/Signup/SignupGenreActivity.kt
+++ b/app/src/main/java/com/song2/wave/UI/Signup/SignupGenreActivity.kt
@@ -11,8 +11,6 @@ import android.widget.ImageView
 import android.widget.Toast
 import com.song2.wave.R
 import kotlinx.android.synthetic.main.activity_signup_genre.*
-import okhttp3.MediaType
-import okhttp3.RequestBody
 
 class SignupGenreActivity : AppCompatActivity(), View.OnClickListener {
 
diff --git a/app/src/main/java/com/song2/wave/Util/Network/NetworkService.kt b/app/src/main/java/com/song2/wave/Util/Network/NetworkService.kt
index 57e52c0..eac6a0c 100644
--- a/app/src/main/java/com/song2/wave/Util/Network/NetworkService.kt
+++ b/app/src/main/java/com/song2/wave/Util/Network/NetworkService.kt
@@ -165,6 +165,7 @@ interface NetworkService {
     @Multipart
     @POST("/songs")
     fun postSongUploadResponse(
+        @Header("Authorization") authorization: String,
         @Part("originTitle") originTitle : RequestBody,
         @Part artwork : MultipartBody.Part?,
         @Part("originArtistName") originArtistName : RequestBody,
diff --git a/app/src/main/res/drawable-hdpi/btn_mypage_upload_song.png b/app/src/main/res/drawable-hdpi/btn_mypage_upload_song.png
new file mode 100644
index 0000000..60df3a3
Binary files /dev/null and b/app/src/main/res/drawable-hdpi/btn_mypage_upload_song.png differ
diff --git a/app/src/main/res/drawable-hdpi/img_home_weeklychalenge.png b/app/src/main/res/drawable-hdpi/img_home_weeklychalenge.png
new file mode 100644
index 0000000..1143dad
Binary files /dev/null and b/app/src/main/res/drawable-hdpi/img_home_weeklychalenge.png differ
diff --git a/app/src/main/res/drawable-hdpi/img_library_nosongs_def.png b/app/src/main/res/drawable-hdpi/img_library_nosongs_def.png
new file mode 100644
index 0000000..1158e19
Binary files /dev/null and b/app/src/main/res/drawable-hdpi/img_library_nosongs_def.png differ
diff --git a/app/src/main/res/drawable-hdpi/img_search_noresult_def.png b/app/src/main/res/drawable-hdpi/img_search_noresult_def.png
new file mode 100644
index 0000000..e5a2aad
Binary files /dev/null and b/app/src/main/res/drawable-hdpi/img_search_noresult_def.png differ
diff --git a/app/src/main/res/drawable-mdpi/btn_mypage_upload_song.png b/app/src/main/res/drawable-mdpi/btn_mypage_upload_song.png
new file mode 100644
index 0000000..2bbfef0
Binary files /dev/null and b/app/src/main/res/drawable-mdpi/btn_mypage_upload_song.png differ
diff --git a/app/src/main/res/drawable-mdpi/img_home_weeklychalenge.png b/app/src/main/res/drawable-mdpi/img_home_weeklychalenge.png
new file mode 100644
index 0000000..0264302
Binary files /dev/null and b/app/src/main/res/drawable-mdpi/img_home_weeklychalenge.png differ
diff --git a/app/src/main/res/drawable-mdpi/img_library_nosongs_def.png b/app/src/main/res/drawable-mdpi/img_library_nosongs_def.png
new file mode 100644
index 0000000..1492811
Binary files /dev/null and b/app/src/main/res/drawable-mdpi/img_library_nosongs_def.png differ
diff --git a/app/src/main/res/drawable-mdpi/img_search_noresult_def.png b/app/src/main/res/drawable-mdpi/img_search_noresult_def.png
new file mode 100644
index 0000000..a675946
Binary files /dev/null and b/app/src/main/res/drawable-mdpi/img_search_noresult_def.png differ
diff --git a/app/src/main/res/drawable-v24/artist_menu.png b/app/src/main/res/drawable-v24/artist_menu.png
new file mode 100644
index 0000000..3d98c6b
Binary files /dev/null and b/app/src/main/res/drawable-v24/artist_menu.png differ
diff --git a/app/src/main/res/drawable-v24/bt_close.png b/app/src/main/res/drawable-v24/bt_close.png
new file mode 100644
index 0000000..e32e258
Binary files /dev/null and b/app/src/main/res/drawable-v24/bt_close.png differ
diff --git a/app/src/main/res/drawable-v24/btn_mypage.png b/app/src/main/res/drawable-v24/btn_mypage.png
new file mode 100644
index 0000000..99e7aa8
Binary files /dev/null and b/app/src/main/res/drawable-v24/btn_mypage.png differ
diff --git a/app/src/main/res/drawable-v24/btn_plus.png b/app/src/main/res/drawable-v24/btn_plus.png
new file mode 100644
index 0000000..fe2bb93
Binary files /dev/null and b/app/src/main/res/drawable-v24/btn_plus.png differ
diff --git a/app/src/main/res/drawable-v24/btn_threedot_like.png b/app/src/main/res/drawable-v24/btn_threedot_like.png
new file mode 100644
index 0000000..d222029
Binary files /dev/null and b/app/src/main/res/drawable-v24/btn_threedot_like.png differ
diff --git a/app/src/main/res/drawable-v24/btn_threedot_share.png b/app/src/main/res/drawable-v24/btn_threedot_share.png
new file mode 100644
index 0000000..2869a54
Binary files /dev/null and b/app/src/main/res/drawable-v24/btn_threedot_share.png differ
diff --git a/app/src/main/res/drawable-v24/library_artist.png b/app/src/main/res/drawable-v24/library_artist.png
new file mode 100644
index 0000000..b7f5173
Binary files /dev/null and b/app/src/main/res/drawable-v24/library_artist.png differ
diff --git a/app/src/main/res/drawable-v24/playlist_atrist.png b/app/src/main/res/drawable-v24/playlist_atrist.png
new file mode 100644
index 0000000..c020e37
Binary files /dev/null and b/app/src/main/res/drawable-v24/playlist_atrist.png differ
diff --git a/app/src/main/res/drawable-xhdpi/btn_mypage_upload_song.png b/app/src/main/res/drawable-xhdpi/btn_mypage_upload_song.png
new file mode 100644
index 0000000..9204cfd
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/btn_mypage_upload_song.png differ
diff --git a/app/src/main/res/drawable-xhdpi/img_home_weeklychalenge.png b/app/src/main/res/drawable-xhdpi/img_home_weeklychalenge.png
new file mode 100644
index 0000000..8d3c429
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/img_home_weeklychalenge.png differ
diff --git a/app/src/main/res/drawable-xhdpi/img_library_nosongs_def.png b/app/src/main/res/drawable-xhdpi/img_library_nosongs_def.png
new file mode 100644
index 0000000..b0c8c4e
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/img_library_nosongs_def.png differ
diff --git a/app/src/main/res/drawable-xhdpi/img_search_noresult_def.png b/app/src/main/res/drawable-xhdpi/img_search_noresult_def.png
new file mode 100644
index 0000000..48d2ad0
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/img_search_noresult_def.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/btn_mypage_upload_song.png b/app/src/main/res/drawable-xxhdpi/btn_mypage_upload_song.png
new file mode 100644
index 0000000..a1a78df
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/btn_mypage_upload_song.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/img_home_weeklychalenge.png b/app/src/main/res/drawable-xxhdpi/img_home_weeklychalenge.png
new file mode 100644
index 0000000..f23765e
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/img_home_weeklychalenge.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/img_library_nosongs_def.png b/app/src/main/res/drawable-xxhdpi/img_library_nosongs_def.png
new file mode 100644
index 0000000..af7811b
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/img_library_nosongs_def.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/img_search_noresult_def.png b/app/src/main/res/drawable-xxhdpi/img_search_noresult_def.png
new file mode 100644
index 0000000..008c904
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/img_search_noresult_def.png differ
diff --git a/app/src/main/res/drawable-xxxhdpi/btn_mypage_upload_song.png b/app/src/main/res/drawable-xxxhdpi/btn_mypage_upload_song.png
new file mode 100644
index 0000000..2ab115c
Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/btn_mypage_upload_song.png differ
diff --git a/app/src/main/res/drawable-xxxhdpi/img_home_weeklychalenge.png b/app/src/main/res/drawable-xxxhdpi/img_home_weeklychalenge.png
new file mode 100644
index 0000000..ab4f628
Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/img_home_weeklychalenge.png differ
diff --git a/app/src/main/res/drawable-xxxhdpi/img_library_nosongs_def.png b/app/src/main/res/drawable-xxxhdpi/img_library_nosongs_def.png
new file mode 100644
index 0000000..90840ed
Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/img_library_nosongs_def.png differ
diff --git a/app/src/main/res/drawable-xxxhdpi/img_search_noresult_def.png b/app/src/main/res/drawable-xxxhdpi/img_search_noresult_def.png
new file mode 100644
index 0000000..744b021
Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/img_search_noresult_def.png differ
diff --git a/app/src/main/res/drawable/btn_report.png b/app/src/main/res/drawable/btn_report.png
new file mode 100644
index 0000000..c10a93f
Binary files /dev/null and b/app/src/main/res/drawable/btn_report.png differ
diff --git a/app/src/main/res/drawable/img_border_more_info.xml b/app/src/main/res/drawable/img_border_more_info.xml
new file mode 100644
index 0000000..99e8db7
--- /dev/null
+++ b/app/src/main/res/drawable/img_border_more_info.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape
+        xmlns:android="http://schemas.android.com/apk/res/android">
+    <solid android:color="#FFFFFF"/>
+
+    <padding android:left="1dp"
+             android:right="1dp"
+             android:top="1dp"
+             android:bottom="1dp"/>
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/progress_effect.xml b/app/src/main/res/drawable/progress_effect.xml
index d91e097..a366381 100644
--- a/app/src/main/res/drawable/progress_effect.xml
+++ b/app/src/main/res/drawable/progress_effect.xml
@@ -7,4 +7,4 @@
             android:endColor="#007f9b"
             android:angle="0"/>
 
-</shape>
\ No newline at end of file
+</shape>
diff --git a/app/src/main/res/layout/activity_chart_more.xml b/app/src/main/res/layout/activity_chart_more.xml
new file mode 100644
index 0000000..54f8cd7
--- /dev/null
+++ b/app/src/main/res/layout/activity_chart_more.xml
@@ -0,0 +1,157 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout
+        xmlns:android="http://schemas.android.com/apk/res/android"
+        xmlns:tools="http://schemas.android.com/tools"
+        xmlns:app="http://schemas.android.com/apk/res-auto"
+        android:orientation="vertical"
+        android:layout_width="match_parent"
+        android:background="#cc000000"
+        android:layout_height="698dp">
+    <View
+            android:layout_marginTop="340dp"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:background="#cc000000"/>
+    <LinearLayout
+            android:layout_marginTop="340dp"
+            android:layout_width="match_parent"
+            android:gravity="center_horizontal"
+            android:layout_height="142dp"
+            android:background="#000000"
+            android:orientation="vertical" >
+        <TextView
+                android:id="@+id/tv_chart_more_act_title"
+                android:layout_marginTop="36dp"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:lineSpacingExtra="8sp"
+                tools:text="Song Name - Original Artist"
+                android:textColor="#FFFFFF"
+                android:gravity="center_horizontal"
+                android:textSize="16sp"/>
+        <TextView
+                android:id="@+id/tv_chart_more_act_artist"
+                android:layout_marginTop="4dp"
+                android:layout_marginBottom="18dp"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:textSize="14sp"
+                android:textColor="#616161"
+                android:lineSpacingExtra="6sp"
+                tools:text="Cover Artist"/>
+        <LinearLayout
+                android:layout_width="wrap_content"
+                android:layout_height="24dp"
+                android:layout_gravity="right">
+            <ImageView
+                    android:id="@+id/iv_chart_more_act_like"
+                    android:layout_height="24dp"
+                    android:layout_width="24dp"
+                    android:layout_marginBottom="16dp"
+                    android:src="@drawable/btn_threedot_like"
+                    android:layout_marginRight="25dp"/>
+            <ImageView
+                    android:id="@+id/iv_chart_more_act_share"
+                    android:layout_height="24dp"
+                    android:layout_width="24dp"
+                    android:layout_marginBottom="16dp"
+                    android:src="@drawable/btn_threedot_share"
+                    android:layout_marginRight="20dp"/>
+        </LinearLayout>
+    </LinearLayout>
+    <ImageView
+            android:id="@+id/iv_chart_more_act_image"
+            android:background="@drawable/img_border_more_info"
+            android:src="@drawable/artist_menu"
+            android:layout_centerHorizontal="true"
+            android:layout_width="82dp"
+            android:layout_height="82dp"
+            android:layout_marginTop="281dp"/>
+    <LinearLayout
+            android:layout_marginTop="482dp"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:theme="@style/ThemeOverlay.AppCompat.Dark"
+            android:background="#000000"
+            android:orientation="vertical">
+        <view
+                android:layout_width="match_parent"
+                android:layout_height="1dp"
+                android:layout_marginHorizontal="16dp"/>
+        <LinearLayout
+                android:id="@+id/ll_chart_more_act_play_list"
+                android:layout_width="match_parent"
+                android:layout_height="53dp"
+                android:orientation="horizontal">
+            <ImageView
+                    android:src="@drawable/btn_plus"
+                    android:layout_height="24dp"
+                    android:layout_width="24dp"
+                    android:layout_marginLeft="20dp"
+                    android:layout_gravity="center_vertical"
+                    android:textColor="#FFFFFF"/>
+            <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:textColor="#ffffff"
+                    android:textSize="16sp"
+                    android:layout_gravity="center_vertical"
+                    android:layout_marginLeft="20dp"
+                    android:text="플레이리스트에 추가"/>
+        </LinearLayout>
+        <LinearLayout
+                android:id="@+id/ll_chart_more_act_artist_profile"
+                android:layout_width="match_parent"
+                android:layout_height="53dp"
+                android:orientation="horizontal">
+            <ImageView
+                    android:src="@drawable/btn_mypage"
+                    android:layout_height="24dp"
+                    android:layout_width="24dp"
+                    android:layout_marginLeft="20dp"
+                    android:layout_gravity="center_vertical"
+                    android:textColor="#FFFFFF"/>
+            <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:textColor="#ffffff"
+                    android:textSize="16sp"
+                    android:layout_gravity="center_vertical"
+                    android:layout_marginLeft="20dp"
+                    android:text="아티스트 프로필 추가"/>
+        </LinearLayout>
+        <LinearLayout
+                android:id="@+id/ll_chart_mor_act_notify"
+                android:layout_width="match_parent"
+                android:layout_height="53dp"
+                android:orientation="horizontal">
+            <ImageView
+                    android:layout_height="24dp"
+                    android:layout_width="24dp"
+                    android:layout_marginLeft="20dp"
+                    android:src="@drawable/btn_report"
+                    android:layout_gravity="center"
+                    android:textColor="#FFFFFF"/>
+            <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:textColor="#ffffff"
+                    android:textSize="16sp"
+                    android:layout_gravity="center_vertical"
+                    android:layout_marginLeft="20dp"
+                    android:text="신고"/>
+        </LinearLayout>
+        <view
+                android:layout_width="match_parent"
+                android:layout_height="1dp"
+                android:layout_marginHorizontal="16dp"/>
+        <Button
+                android:id="@+id/bt_chart_more_act_cancel"
+                android:layout_height="wrap_content"
+                android:layout_width="match_parent"
+                android:textSize="14sp"
+                android:textColor="#FFFFFF"
+                android:background="#000000"
+                android:text="취소"/>
+    </LinearLayout>
+</RelativeLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_library_more.xml b/app/src/main/res/layout/activity_library_more.xml
new file mode 100644
index 0000000..fde9c3c
--- /dev/null
+++ b/app/src/main/res/layout/activity_library_more.xml
@@ -0,0 +1,178 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout
+        xmlns:android="http://schemas.android.com/apk/res/android"
+        xmlns:tools="http://schemas.android.com/tools"
+        xmlns:app="http://schemas.android.com/apk/res-auto"
+        android:orientation="vertical"
+        android:layout_width="match_parent"
+        android:background="#cc000000"
+        android:layout_height="698dp">
+    <View
+            android:layout_marginTop="340dp"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:background="#cc000000"/>
+    <LinearLayout
+            android:layout_marginTop="293dp"
+            android:layout_width="match_parent"
+            android:gravity="center_horizontal"
+            android:layout_height="142dp"
+            android:background="#000000"
+            android:orientation="vertical">
+        <TextView
+                android:id="@+id/tv_library_more_act_title"
+                android:layout_marginTop="36dp"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:lineSpacingExtra="8sp"
+                tools:text="WARNING! - Day6(데이식스)"
+                android:textColor="#FFFFFF"
+                android:gravity="center_horizontal"
+                android:textSize="16sp"/>
+        <TextView
+                android:id="@+id/tv_library_more_act_artist"
+                android:layout_marginTop="4dp"
+                android:layout_marginBottom="18dp"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:textSize="14sp"
+                android:textColor="#616161"
+                android:lineSpacingExtra="6sp"
+                tools:text="blotto_archyan"/>
+        <LinearLayout
+                android:layout_width="wrap_content"
+                android:layout_height="24dp"
+                android:layout_gravity="right">
+            <ImageView
+                    android:id="@+id/iv_library_more_act_like"
+                    android:layout_height="24dp"
+                    android:layout_width="24dp"
+                    android:layout_marginBottom="16dp"
+                    android:src="@drawable/btn_threedot_like"
+                    android:layout_marginRight="25dp"/>
+            <ImageView
+                    android:id="@+id/iv_library_more_act_share"
+                    android:layout_height="24dp"
+                    android:layout_width="24dp"
+                    android:layout_marginBottom="16dp"
+                    android:src="@drawable/btn_threedot_share"
+                    android:layout_marginRight="20dp"/>
+        </LinearLayout>
+    </LinearLayout>
+    <ImageView
+            android:id="@+id/iv_library_more_act_image"
+            android:src="@drawable/library_artist"
+            android:layout_centerHorizontal="true"
+            android:background="@drawable/img_border_more_info"
+            android:layout_width="82dp"
+            android:layout_height="82dp"
+            android:layout_marginTop="234dp"/>
+    <LinearLayout
+            android:layout_marginTop="435dp"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:theme="@style/ThemeOverlay.AppCompat.Dark"
+            android:background="#000000"
+            android:orientation="vertical">
+        <view
+                android:layout_width="match_parent"
+                android:layout_height="1dp"
+                android:layout_marginHorizontal="16dp"/>
+        <LinearLayout
+                android:id="@+id/ll_library_more_act_play_list"
+                android:layout_width="match_parent"
+                android:layout_height="53dp"
+                android:orientation="horizontal">
+            <ImageView
+                    android:layout_height="24dp"
+                    android:layout_width="24dp"
+                    android:layout_marginLeft="20dp"
+                    android:src="@drawable/btn_plus"
+                    android:layout_gravity="center_vertical"
+                    android:textColor="#FFFFFF"/>
+            <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:textColor="#ffffff"
+                    android:textSize="16sp"
+                    android:layout_gravity="center_vertical"
+                    android:layout_marginLeft="20dp"
+                    android:text="플레이리스트에 추가"/>
+        </LinearLayout>
+        <LinearLayout
+                android:id="@+id/ll_library_more_act_artist_profile"
+                android:layout_width="match_parent"
+                android:layout_height="53dp"
+                android:orientation="horizontal">
+            <ImageView
+                    android:layout_height="24dp"
+                    android:layout_width="24dp"
+                    android:layout_marginLeft="20dp"
+                    android:src="@drawable/btn_mypage"
+                    android:layout_gravity="center_vertical"
+                    android:textColor="#FFFFFF"/>
+            <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:textColor="#ffffff"
+                    android:textSize="16sp"
+                    android:layout_gravity="center_vertical"
+                    android:layout_marginLeft="20dp"
+                    android:text="아티스트 프로필 추가"/>
+        </LinearLayout>
+        <LinearLayout
+                android:id="@+id/ll_library_more_act_delete"
+                android:layout_width="match_parent"
+                android:layout_height="53dp"
+                android:orientation="horizontal">
+            <ImageView
+                    android:layout_height="24dp"
+                    android:layout_width="24dp"
+                    android:layout_marginLeft="20dp"
+                    android:src="@drawable/bt_close"
+                    android:layout_gravity="center_vertical"
+                    android:textColor="#FFFFFF"/>
+            <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:textColor="#ffffff"
+                    android:textSize="16sp"
+                    android:layout_gravity="center_vertical"
+                    android:layout_marginLeft="20dp"
+                    android:text="삭제"/>
+        </LinearLayout>
+        <LinearLayout
+                android:id="@+id/ll_library_more_act_notify"
+                android:layout_width="match_parent"
+                android:layout_height="53dp"
+                android:orientation="horizontal">
+            <ImageView
+                    android:layout_height="24dp"
+                    android:layout_width="24dp"
+                    android:layout_marginLeft="20dp"
+                    android:src="@drawable/btn_report"
+                    android:layout_gravity="center_vertical"
+                    android:textColor="#FFFFFF"/>
+            <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:textColor="#ffffff"
+                    android:textSize="16sp"
+                    android:layout_gravity="center_vertical"
+                    android:layout_marginLeft="20dp"
+                    android:text="신고"/>
+        </LinearLayout>
+        <view
+                android:layout_width="match_parent"
+                android:layout_height="1dp"
+                android:layout_marginHorizontal="16dp"/>
+        <Button
+                android:id="@+id/bt_library_more_act_cancel"
+                android:layout_height="wrap_content"
+                android:layout_width="match_parent"
+                android:textSize="14sp"
+                android:textColor="#FFFFFF"
+                android:background="#000000"
+                android:text="취소"/>
+    </LinearLayout>
+</RelativeLayout>
diff --git a/app/src/main/res/layout/activity_like_animation.xml b/app/src/main/res/layout/activity_like_animation.xml
new file mode 100644
index 0000000..eea76cf
--- /dev/null
+++ b/app/src/main/res/layout/activity_like_animation.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout
+        xmlns:android="http://schemas.android.com/apk/res/android"
+        xmlns:tools="http://schemas.android.com/tools"
+        xmlns:app="http://schemas.android.com/apk/res-auto"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:background="#000000"
+        tools:context=".LikeAnimationActivity">
+    <VideoView
+            android:id="@+id/video"
+            android:layout_centerInParent="true"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"/>
+
+    <com.airbnb.lottie.LottieAnimationView
+            android:layout_alignParentBottom="true"
+            android:layout_alignParentRight="true"
+            android:layout_margin="100dp"
+            android:id="@+id/lottie_main_act_like"
+            android:layout_width="100dp"
+            android:layout_height="100dp"
+            app:lottie_rawRes="@raw/wave_heart_animation"
+            app:lottie_loop="false"
+            app:lottie_autoPlay="false"/>
+</RelativeLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index 9bb7f11..e512419 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -174,6 +174,7 @@
 
     </LinearLayout>
     <LinearLayout
+            android:paddingHorizontal="20dp"
         android:id="@+id/ll_main_act_bottom_main_player"
         android:layout_width="match_parent"
         android:layout_height="64dp"
@@ -186,16 +187,17 @@
             android:id="@+id/iv_main_act_bottom_play"
             android:layout_width="36dp"
             android:layout_height="36dp"
-            android:layout_marginLeft="16dp"
+            android:layout_marginLeft="30dp"
             android:layout_gravity="center_vertical"
             android:scaleType="fitXY"
             android:src="@drawable/btn_play_sm"/>
 
         <LinearLayout
+                android:layout_gravity="center_horizontal"
             android:layout_width="186dp"
             android:layout_height="wrap_content"
             android:orientation="vertical"
-            android:layout_marginLeft="35.5dp"
+            android:layout_marginLeft="40dp"
             android:gravity="center_horizontal"
             >
             <TextView
@@ -227,7 +229,7 @@
             android:layout_height="36dp"
             android:background="@drawable/btn_playlist_sm"
             android:layout_gravity="center_vertical"
-            android:layout_marginLeft="34.5dp"
+            android:layout_marginLeft="54.5dp"
             />
 
     </LinearLayout>
diff --git a/app/src/main/res/layout/activity_main_player.xml b/app/src/main/res/layout/activity_main_player.xml
index 140482a..a224c63 100644
--- a/app/src/main/res/layout/activity_main_player.xml
+++ b/app/src/main/res/layout/activity_main_player.xml
@@ -1,10 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
 <RelativeLayout
-    android:id="@+id/rl_main_player_act_all"
+        android:id="@+id/rl_main_player_act_all"
         xmlns:android="http://schemas.android.com/apk/res/android"
         android:background="#000000"
         android:layout_width="match_parent"
-        android:layout_height="match_parent">
+        android:layout_height="match_parent" xmlns:app="http://schemas.android.com/apk/res-auto">
+    <VideoView
+            android:id="@+id/video"
+            android:layout_centerInParent="true"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"/>
+
     <RelativeLayout
             android:id="@+id/rl_main_player_act_main_toolbar"
             android:layout_width="match_parent" android:layout_height="56dp">
@@ -19,11 +25,13 @@
                 android:layout_height="27dp"/>
 
         <ImageView
+                android:id="@+id/iv_maim_player_close"
                 android:layout_marginRight="20dp"
                 android:layout_alignParentRight="true"
                 android:layout_centerVertical="true"
                 android:src="@drawable/btn_down"
-                android:layout_width="24dp" android:layout_height="24dp"/>
+                android:paddingHorizontal="6dp"
+                android:layout_width="36dp" android:layout_height="36dp"/>
     </RelativeLayout>
 
     <TextView
@@ -38,6 +46,8 @@
             android:fontFamily="@font/noto_sans_kr_bold_hestia"
             android:layout_marginLeft="16dp"
             android:textColor="#e5e5e5"
+            android:maxLines="1"
+            android:ellipsize="end"
             android:textSize="22sp"
             android:includeFontPadding="false"/>
 
@@ -53,6 +63,8 @@
             android:lineSpacingExtra="8sp"
             android:gravity="center_horizontal"
             android:text="Covered by Blotto"
+        android:maxLines="1"
+        android:ellipsize="end"
     />
     <ImageView
         android:id="@+id/img_main_player_act_cover_img"
@@ -226,7 +238,9 @@
                 android:textColor="#ffffff"
                 android:lineSpacingExtra="6sp"
                 android:gravity="center_horizontal"
-                android:text="록  메탈  POP"/>
+                android:text="록  메탈  POP"
+                android:maxLines="1"
+                android:ellipsize="end"/>
 
         <ImageView
                 android:layout_gravity="right"
@@ -291,4 +305,17 @@
                 android:layout_centerVertical="true"
                 android:layout_width="32dp" android:layout_height="32dp"/>
     </RelativeLayout>
+    <RelativeLayout android:layout_width="match_parent" android:layout_height="match_parent">
+        <com.airbnb.lottie.LottieAnimationView
+                android:layout_marginRight="88.5dp"
+                android:layout_alignParentRight="true"
+                android:layout_alignParentBottom="true"
+                android:id="@+id/lottie_main_act_like"
+                android:layout_width="73dp"
+                android:layout_height="73dp"
+                app:lottie_rawRes="@raw/wave_heart_animation"
+                android:layout_marginBottom="12dp"
+                app:lottie_loop="false"
+                app:lottie_autoPlay="false"/>
+    </RelativeLayout>
 </RelativeLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_playlist_more.xml b/app/src/main/res/layout/activity_playlist_more.xml
new file mode 100644
index 0000000..9e3cb01
--- /dev/null
+++ b/app/src/main/res/layout/activity_playlist_more.xml
@@ -0,0 +1,108 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout
+        xmlns:android="http://schemas.android.com/apk/res/android"
+        xmlns:tools="http://schemas.android.com/tools"
+        xmlns:app="http://schemas.android.com/apk/res-auto"
+        android:orientation="vertical"
+        android:layout_width="match_parent"
+        android:background="#cc000000"
+        android:layout_height="698dp">
+    <View
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:background="#cc000000"
+            android:visibility="gone" />
+    <LinearLayout
+            android:layout_marginTop="430.9dp"
+            android:layout_width="match_parent"
+            android:gravity="center_horizontal"
+            android:layout_height="142dp"
+            android:background="#000000"
+            android:orientation="vertical" >
+        <TextView
+                android:id="@+id/tv_playlist_more_act_title"
+                android:layout_marginTop="36dp"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:lineSpacingExtra="8sp"
+                android:text="Play List Name"
+                android:textColor="#FFFFFF"
+                android:gravity="center_horizontal"
+                android:textSize="16sp"/>
+        <TextView
+                android:id="@+id/tv_playlist_more_act_artist"
+                android:layout_marginTop="4dp"
+                android:layout_marginBottom="18dp"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:textSize="14sp"
+                android:textColor="#616161"
+                android:lineSpacingExtra="6sp"
+                tools:text="한 줄 설명이 들어가는 텍스트필드입니다."/>
+        <LinearLayout
+                android:layout_width="wrap_content"
+                android:layout_height="24dp"
+                android:layout_gravity="right">
+            <ImageView
+                    android:id="@+id/iv_playlist_more_act_share"
+                    android:layout_height="24dp"
+                    android:layout_width="24dp"
+                    android:layout_marginBottom="16dp"
+                    android:src="@drawable/btn_threedot_share"
+                    android:layout_marginRight="20dp"/>
+        </LinearLayout>
+    </LinearLayout>
+    <ImageView
+            android:layout_centerHorizontal="true"
+            android:layout_width="82dp"
+            android:layout_height="82dp"
+            android:background="@drawable/img_border_more_info"
+            android:src="@drawable/playlist_atrist"
+            android:id="@+id/iv_artist_act_nav"
+            android:layout_marginTop="372dp"/>
+    <LinearLayout
+            android:layout_marginTop="573dp"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:theme="@style/ThemeOverlay.AppCompat.Dark"
+            android:background="#000000"
+            android:orientation="vertical">
+        <view
+                android:layout_width="match_parent"
+                android:layout_height="1dp"
+                android:layout_marginHorizontal="16dp"/>
+        <LinearLayout
+                android:id="@+id/ll_playlist_more_act_delete"
+                android:layout_width="match_parent"
+                android:layout_height="68dp"
+                android:orientation="horizontal">
+            <ImageView
+                    android:layout_height="24dp"
+                    android:layout_width="24dp"
+                    android:layout_marginLeft="20dp"
+                    android:src="@drawable/bt_close"
+                    android:layout_gravity="center_vertical"
+                    android:textColor="#FFFFFF"/>
+            <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:textColor="#ffffff"
+                    android:textSize="16sp"
+                    android:layout_gravity="center_vertical"
+                    android:layout_marginLeft="20dp"
+                    android:text="삭제"/>
+        </LinearLayout>
+        <view
+                android:layout_width="match_parent"
+                android:layout_height="1dp"
+                android:layout_marginHorizontal="16dp"/>
+        <Button
+                android:id="@+id/bt_playlist_more_act_cancel"
+                android:layout_height="wrap_content"
+                android:layout_width="match_parent"
+                android:textSize="14sp"
+                android:textColor="#FFFFFF"
+                android:background="#000000"
+                android:text="취소"/>
+    </LinearLayout>
+</RelativeLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_set_start_point.xml b/app/src/main/res/layout/activity_set_start_point.xml
index c2081e5..bd08c87 100644
--- a/app/src/main/res/layout/activity_set_start_point.xml
+++ b/app/src/main/res/layout/activity_set_start_point.xml
@@ -20,7 +20,7 @@
                 android:includeFontPadding="false"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:textSize="18sp"
+                android:textSize="18dp"
                 android:textColor="#fafafa"
                 android:lineSpacingExtra="9sp"
                 android:layout_marginStart="20dp"
@@ -35,7 +35,7 @@
                 android:includeFontPadding="false"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:textSize="18sp"
+                android:textSize="18dp"
                 android:textColor="#fafafa"
                 android:lineSpacingExtra="9sp"
                 android:layout_marginStart="20dp"
@@ -52,7 +52,7 @@
                 android:layout_marginStart="20dp"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:textSize="12sp"
+                android:textSize="12dp"
                 android:textColor="#9e9e9e"
                 android:lineSpacingExtra="6sp"
                 android:text="지정한 부분부터 평가곡이 재생됩니다."
diff --git a/app/src/main/res/layout/activity_upload_file.xml b/app/src/main/res/layout/activity_upload_file.xml
index 9649056..1e618b0 100644
--- a/app/src/main/res/layout/activity_upload_file.xml
+++ b/app/src/main/res/layout/activity_upload_file.xml
@@ -15,7 +15,7 @@
                 android:fontFamily="@font/noto_sans_kr_bold_hestia"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:textSize="18sp"
+                android:textSize="18dp"
                 android:textColor="#fafafa"
                 android:lineSpacingExtra="9sp"
                 android:text="음원을 등록해주세요"
diff --git a/app/src/main/res/layout/activity_upload_genre.xml b/app/src/main/res/layout/activity_upload_genre.xml
new file mode 100644
index 0000000..b154032
--- /dev/null
+++ b/app/src/main/res/layout/activity_upload_genre.xml
@@ -0,0 +1,314 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout 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"
+    android:orientation="vertical"
+    android:background="#000000"
+>
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:orientation="vertical"
+        >
+        <RelativeLayout
+            android:layout_width="match_parent"
+            android:layout_height="16dp"
+            android:layout_marginTop="20dp"
+            >
+            <ImageView
+                android:layout_width="16dp"
+                android:layout_height="16dp"
+                android:src="@drawable/btn_login_beforenav"
+                android:layout_marginLeft="16dp"
+                android:scaleType="fitXY"
+                />
+            <ImageView
+                android:layout_width="16dp"
+                android:layout_height="16dp"
+                android:src="@drawable/btn_login_nextnav"
+                android:layout_marginRight="16dp"
+                android:layout_alignParentRight="true"
+                android:scaleType="fitXY"
+                />
+
+        </RelativeLayout>
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="어떤 장르를 좋아하는지 말해주세요"
+            android:layout_gravity="center"
+            android:layout_marginTop="14dp"
+            android:fontFamily="@font/noto_sans_kr_bold_hestia"
+            android:textColor="#ffffff"
+            android:includeFontPadding="false"
+            />5
+        <View
+            android:layout_width="33dp"
+            android:layout_height="3dp"
+            android:background="#00b6de"
+            android:layout_marginLeft="115dp"
+            />
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="선택을 바탕으로 곡들을 추천해드릴게요"
+            android:layout_gravity="center"
+            android:textSize="14sp"
+            android:gravity="center"
+            android:fontFamily="@font/noto_sans_kr_regular_hestia"
+            android:textColor="#ffffff"
+            android:includeFontPadding="false"
+            />
+
+
+    </LinearLayout>
+    <RelativeLayout
+        android:id="@+id/rl_upload_genre_act_pop"
+        android:layout_width="80dp"
+        android:layout_height="80dp"
+        android:layout_marginLeft="31dp"
+        android:layout_marginTop="213dp"
+        >
+        <de.hdodenhof.circleimageview.CircleImageView
+            android:id="@+id/img_upload_genre_act_pop"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:src="#00b6de"
+            />
+        <TextView
+            android:id="@+id/tv_upload_genre_act_pop"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="POP"
+            android:textSize="16sp"
+            android:textColor="#ffffff"
+            android:layout_centerInParent="true"
+            android:fontFamily="@font/noto_sans_kr_bold_hestia"
+            android:includeFontPadding="true"
+            />
+    </RelativeLayout>
+    <RelativeLayout
+        android:id="@+id/rl_upload_genre_act_soul"
+        android:layout_width="80dp"
+        android:layout_height="80dp"
+        android:layout_marginLeft="31dp"
+        android:layout_marginTop="161dp"
+        android:layout_alignParentRight="true"
+        android:layout_marginRight="48dp"
+        >
+        <de.hdodenhof.circleimageview.CircleImageView
+            android:id="@+id/img_upload_genre_act_soul"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:src="#00b6de"
+            />
+        <TextView
+            android:id="@+id/tv_upload_genre_act_soul"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="RB
+SOUL"
+            android:textSize="16sp"
+            android:textColor="#ffffff"
+            android:layout_centerInParent="true"
+            android:fontFamily="@font/noto_sans_kr_bold_hestia"
+            android:includeFontPadding="true"
+            />
+    </RelativeLayout>
+
+    <RelativeLayout
+        android:id="@+id/rl_upload_genre_act_ballad"
+        android:layout_width="80dp"
+        android:layout_height="80dp"
+        android:layout_marginLeft="146dp"
+        android:layout_marginTop="256dp"
+        >
+        <de.hdodenhof.circleimageview.CircleImageView
+            android:id="@+id/img_upload_genre_act_ballad"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:src="#00b6de"
+            />
+        <TextView
+            android:id="@+id/tv_upload_genre_act_ballad"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="발라드"
+            android:textSize="16sp"
+            android:textColor="#ffffff"
+            android:layout_centerInParent="true"
+            android:fontFamily="@font/noto_sans_kr_bold_hestia"
+            android:includeFontPadding="true"
+            />
+    </RelativeLayout>
+    <RelativeLayout
+        android:id="@+id/rl_upload_genre_act_hiphop"
+        android:layout_width="80dp"
+        android:layout_height="80dp"
+        android:layout_alignParentRight="true"
+        android:layout_marginRight="31dp"
+        android:layout_marginTop="296dp"
+        >
+        <de.hdodenhof.circleimageview.CircleImageView
+            android:id="@+id/img_upload_genre_act_hiphop"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:src="#00b6de"
+            />
+        <TextView
+            android:id="@+id/tv_upload_genre_act_hiphop"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="힙합"
+            android:textSize="16sp"
+            android:textColor="#ffffff"
+            android:layout_centerInParent="true"
+            android:fontFamily="@font/noto_sans_kr_bold_hestia"
+            android:includeFontPadding="true"
+            />
+    </RelativeLayout>
+    <RelativeLayout
+        android:id="@+id/rl_upload_genre_act_dance"
+        android:layout_width="80dp"
+        android:layout_height="80dp"
+        android:layout_marginLeft="44dp"
+        android:layout_marginTop="323dp"
+        >
+        <de.hdodenhof.circleimageview.CircleImageView
+            android:id="@+id/img_upload_genre_act_dance"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:src="#00b6de"
+            />
+        <TextView
+            android:id="@+id/tv_upload_genre_act_dance"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="댄스"
+            android:textSize="16sp"
+            android:textColor="#ffffff"
+            android:layout_centerInParent="true"
+            android:fontFamily="@font/noto_sans_kr_bold_hestia"
+            android:includeFontPadding="true"
+            />
+    </RelativeLayout>
+    <RelativeLayout
+        android:id="@+id/rl_upload_genre_act_aqustic"
+        android:layout_width="80dp"
+        android:layout_height="80dp"
+        android:layout_marginLeft="124dp"
+        android:layout_marginTop="404dp"
+        >
+        <de.hdodenhof.circleimageview.CircleImageView
+            android:id="@+id/img_upload_genre_act_aqustic"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:src="#00b6de"
+            />
+        <TextView
+            android:id="@+id/tv_upload_genre_act_aqustic"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="어쿠스틱"
+            android:textSize="16sp"
+            android:textColor="#ffffff"
+            android:layout_centerInParent="true"
+            android:fontFamily="@font/noto_sans_kr_bold_hestia"
+            android:includeFontPadding="true"
+            />
+    </RelativeLayout>
+    <RelativeLayout
+        android:id="@+id/rl_upload_genre_act_eletronic"
+        android:layout_width="80dp"
+        android:layout_height="80dp"
+        android:layout_marginLeft="231dp"
+        android:layout_marginTop="444dp"
+        >
+        <de.hdodenhof.circleimageview.CircleImageView
+            android:id="@+id/img_upload_genre_act_eletronic"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:src="#00b6de"
+            />
+        <TextView
+            android:id="@+id/tv_upload_genre_act_eletronic"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="일레트로닉"
+            android:textSize="16sp"
+            android:textColor="#ffffff"
+            android:layout_centerInParent="true"
+            android:fontFamily="@font/noto_sans_kr_bold_hestia"
+            android:includeFontPadding="true"
+            />
+    </RelativeLayout>
+    <RelativeLayout
+        android:id="@+id/rl_upload_genre_act_rock"
+        android:layout_width="80dp"
+        android:layout_height="80dp"
+        android:layout_marginLeft="84dp"
+        android:layout_marginTop="525dp"
+        >
+        <de.hdodenhof.circleimageview.CircleImageView
+            android:id="@+id/img_upload_genre_act_rock"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:src="#00b6de"
+            />
+        <TextView
+            android:id="@+id/tv_upload_genre_act_rock"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="락"
+            android:textSize="16sp"
+            android:textColor="#ffffff"
+            android:layout_centerInParent="true"
+            android:fontFamily="@font/noto_sans_kr_bold_hestia"
+            android:includeFontPadding="true"
+            />
+    </RelativeLayout>
+
+    <RelativeLayout
+        android:layout_width="match_parent"
+        android:layout_height="44dp"
+        android:layout_marginTop="51dp"
+        android:layout_alignParentBottom="true"
+        android:layout_marginBottom="38dp"
+        >
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:textColor="#00b6de"
+            android:text="리셋"
+            android:textSize="14sp"
+            android:fontFamily="@font/noto_sans_kr_bold_hestia"
+            android:includeFontPadding="false"
+            android:layout_centerVertical="true"
+            android:layout_marginLeft="44dp"
+            />
+        <Button
+            android:id="@+id/btn_upload_genre_nex"
+            android:layout_width="160dp"
+            android:layout_height="44dp"
+            android:background="@drawable/btn_login_next_lg"
+            android:layout_centerInParent="true"
+            />
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:textColor="#00b6de"
+            android:text="2/3"
+            android:textSize="14sp"
+            android:fontFamily="@font/noto_sans_kr_bold_hestia"
+            android:includeFontPadding="false"
+            android:layout_centerVertical="true"
+            android:layout_marginRight="44dp"
+            android:layout_alignParentRight="true"
+            />
+    </RelativeLayout>
+
+</RelativeLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_upload_mood.xml b/app/src/main/res/layout/activity_upload_mood.xml
new file mode 100644
index 0000000..be6c731
--- /dev/null
+++ b/app/src/main/res/layout/activity_upload_mood.xml
@@ -0,0 +1,315 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout 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"
+    android:orientation="vertical"
+    android:background="#000000">
+
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:orientation="vertical"
+        >
+        <RelativeLayout
+            android:layout_width="match_parent"
+            android:layout_height="16dp"
+            android:layout_marginTop="20dp"
+            >
+            <ImageView
+                android:layout_width="16dp"
+                android:layout_height="16dp"
+                android:src="@drawable/btn_login_beforenav"
+                android:layout_marginLeft="16dp"
+                android:scaleType="fitXY"
+                />
+            <ImageView
+                android:layout_width="16dp"
+                android:layout_height="16dp"
+                android:src="@drawable/btn_login_nextnav"
+                android:layout_marginRight="16dp"
+                android:layout_alignParentRight="true"
+                android:scaleType="fitXY"
+                />
+
+        </RelativeLayout>
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="어떤 장르를 좋아하는지 말해주세요"
+            android:layout_gravity="center"
+            android:layout_marginTop="14dp"
+            android:fontFamily="@font/noto_sans_kr_bold_hestia"
+            android:textColor="#ffffff"
+            android:includeFontPadding="false"
+            />5
+        <View
+            android:layout_width="33dp"
+            android:layout_height="3dp"
+            android:background="#00b6de"
+            android:layout_marginLeft="115dp"
+            />
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="선택을 바탕으로 곡들을 추천해드릴게요"
+            android:layout_gravity="center"
+            android:textSize="14sp"
+            android:gravity="center"
+            android:fontFamily="@font/noto_sans_kr_regular_hestia"
+            android:textColor="#ffffff"
+            android:includeFontPadding="false"
+            />
+
+
+    </LinearLayout>
+    <RelativeLayout
+        android:id="@+id/rl_upload_mood_act_funny"
+        android:layout_width="80dp"
+        android:layout_height="80dp"
+        android:layout_marginLeft="31dp"
+        android:layout_marginTop="213dp"
+        >
+
+        <de.hdodenhof.circleimageview.CircleImageView
+            android:id="@+id/img_upload_mood_act_funny"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:layout_alignParentStart="true"
+            android:layout_alignParentTop="true"
+            android:src="#00b6de" />
+        <TextView
+            android:id="@+id/tv_upload_mood_act_funny"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="신나는"
+            android:textSize="16sp"
+            android:textColor="#ffffff"
+            android:layout_centerInParent="true"
+            android:fontFamily="@font/noto_sans_kr_bold_hestia"
+            android:includeFontPadding="true"
+            />
+    </RelativeLayout>
+    <RelativeLayout
+        android:id="@+id/rl_upload_mood_act_flutter"
+        android:layout_width="80dp"
+        android:layout_height="80dp"
+        android:layout_marginLeft="31dp"
+        android:layout_marginTop="161dp"
+        android:layout_alignParentRight="true"
+        android:layout_marginRight="48dp"
+        >
+        <de.hdodenhof.circleimageview.CircleImageView
+            android:id="@+id/img_upload_mood_act_flutter"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:src="#00b6de"
+            />
+        <TextView
+            android:id="@+id/tv_upload_mood_act_flutter"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="설레는"
+            android:textSize="16sp"
+            android:textColor="#ffffff"
+            android:layout_centerInParent="true"
+            android:fontFamily="@font/noto_sans_kr_bold_hestia"
+            android:includeFontPadding="true"
+            />
+    </RelativeLayout>
+    <RelativeLayout
+        android:id="@+id/rl_upload_mood_act_hip"
+        android:layout_width="80dp"
+        android:layout_height="80dp"
+        android:layout_marginLeft="146dp"
+        android:layout_marginTop="256dp"
+        >
+        <de.hdodenhof.circleimageview.CircleImageView
+            android:id="@+id/img_upload_mood_act_hip"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:src="#00b6de"
+            />
+        <TextView
+            android:id="@+id/tv_upload_mood_act_hip"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="힙한"
+            android:textSize="16sp"
+            android:textColor="#ffffff"
+            android:layout_centerInParent="true"
+            android:fontFamily="@font/noto_sans_kr_bold_hestia"
+            android:includeFontPadding="true"
+            />
+    </RelativeLayout>
+
+    <RelativeLayout
+        android:id="@+id/rl_upload_mood_act_sad"
+        android:layout_width="80dp"
+        android:layout_height="80dp"
+        android:layout_marginTop="296dp"
+        android:layout_marginRight="31dp"
+        android:layout_alignParentRight="true"
+        >
+        <de.hdodenhof.circleimageview.CircleImageView
+            android:id="@+id/img_upload_mood_act_sad"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:src="#00b6de"
+            />
+        <TextView
+            android:id="@+id/tv_upload_mood_act_sad"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="슬픈"
+            android:textSize="16sp"
+            android:textColor="#ffffff"
+            android:layout_centerInParent="true"
+            android:fontFamily="@font/noto_sans_kr_bold_hestia"
+            android:includeFontPadding="true"
+            />
+    </RelativeLayout>
+    <RelativeLayout
+        android:id="@+id/rl_upload_mood_act_windless"
+        android:layout_width="80dp"
+        android:layout_height="80dp"
+        android:layout_marginLeft="44dp"
+        android:layout_marginTop="323dp"
+        >
+        <de.hdodenhof.circleimageview.CircleImageView
+            android:id="@+id/img_upload_mood_act_windless"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:src="#00b6de"
+            />
+        <TextView
+            android:id="@+id/tv_upload_mood_act_windless"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="잔잔한"
+            android:textSize="16sp"
+            android:textColor="#ffffff"
+            android:layout_centerInParent="true"
+            android:fontFamily="@font/noto_sans_kr_bold_hestia"
+            android:includeFontPadding="true"
+            />
+    </RelativeLayout>
+    <RelativeLayout
+        android:id="@+id/rl_upload_mood_act_dreamy"
+        android:layout_width="80dp"
+        android:layout_height="80dp"
+        android:layout_marginLeft="124dp"
+        android:layout_marginTop="404dp"
+        >
+        <de.hdodenhof.circleimageview.CircleImageView
+            android:id="@+id/img_upload_mood_act_dreamy"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:src="#00b6de"
+            />
+        <TextView
+            android:id="@+id/tv_upload_mood_act_dreamy"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="몽환적인"
+            android:textSize="16sp"
+            android:textColor="#ffffff"
+            android:layout_centerInParent="true"
+            android:fontFamily="@font/noto_sans_kr_bold_hestia"
+            android:includeFontPadding="true"
+            />
+    </RelativeLayout>
+    <RelativeLayout
+        android:id="@+id/rl_upload_mood_act_groove"
+        android:layout_width="80dp"
+        android:layout_height="80dp"
+        android:layout_marginLeft="231dp"
+        android:layout_marginTop="444dp"
+        >
+        <de.hdodenhof.circleimageview.CircleImageView
+            android:id="@+id/img_upload_mood_act_groove"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:src="#00b6de"
+            />
+        <TextView
+            android:id="@+id/tv_upload_mood_act_groove"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="그루브한"
+            android:textSize="16sp"
+            android:textColor="#ffffff"
+            android:layout_centerInParent="true"
+            android:fontFamily="@font/noto_sans_kr_bold_hestia"
+            android:includeFontPadding="true"
+            />
+    </RelativeLayout>
+    <RelativeLayout
+        android:id="@+id/rl_upload_mood_act_honey"
+        android:layout_width="80dp"
+        android:layout_height="80dp"
+        android:layout_marginLeft="84dp"
+        android:layout_marginTop="525dp"
+        >
+        <de.hdodenhof.circleimageview.CircleImageView
+            android:id="@+id/img_upload_mood_act_honey"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:src="#00b6de"
+            />
+        <TextView
+            android:id="@+id/tv_upload_mood_act_honey"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="감미로운"
+            android:textSize="16sp"
+            android:textColor="#ffffff"
+            android:layout_centerInParent="true"
+            android:fontFamily="@font/noto_sans_kr_bold_hestia"
+            android:includeFontPadding="true"
+            />
+    </RelativeLayout>
+
+    <RelativeLayout
+        android:layout_width="match_parent"
+        android:layout_height="44dp"
+        android:layout_marginTop="51dp"
+        android:layout_alignParentBottom="true"
+        android:layout_marginBottom="38dp"
+        >
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:textColor="#00b6de"
+            android:text="리셋"
+            android:textSize="14sp"
+            android:fontFamily="@font/noto_sans_kr_bold_hestia"
+            android:includeFontPadding="false"
+            android:layout_centerVertical="true"
+            android:layout_marginLeft="44dp"
+            />
+        <Button
+            android:id="@+id/btn_upload_mood_next"
+            android:layout_width="160dp"
+            android:layout_height="44dp"
+            android:background="@drawable/btn_login_next_lg"
+            android:layout_centerInParent="true"
+            />
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:textColor="#00b6de"
+            android:text="3/3"
+            android:textSize="14sp"
+            android:fontFamily="@font/noto_sans_kr_bold_hestia"
+            android:includeFontPadding="false"
+            android:layout_centerVertical="true"
+            android:layout_marginRight="44dp"
+            android:layout_alignParentRight="true"
+            />
+    </RelativeLayout>
+
+</RelativeLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_upload_song_info.xml b/app/src/main/res/layout/activity_upload_song_info.xml
index 8f049d0..81632b1 100644
--- a/app/src/main/res/layout/activity_upload_song_info.xml
+++ b/app/src/main/res/layout/activity_upload_song_info.xml
@@ -106,6 +106,7 @@
                     android:textSize="16sp"
                     android:textColor="#ffffff"
                     android:lineSpacingExtra="8sp"
+                    android:padding="6dp"
                     android:text="확인"
                     android:layout_alignEnd="@+id/view_comment"
                     android:layout_centerVertical="true"
@@ -143,6 +144,7 @@
                     android:textSize="16sp"
                     android:textColor="#ffffff"
                     android:lineSpacingExtra="8sp"
+                    android:padding="6dp"
                     android:text="확인"
                     android:layout_alignEnd="@+id/view_singer"
                     android:layout_centerVertical="true"
@@ -172,6 +174,7 @@
                       android:background="@null"/>
             <TextView
                     android:id="@+id/tv_title_confirm"
+                    android:padding="6dp"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:textSize="16sp"
diff --git a/app/src/main/res/layout/bottom_play_list.xml b/app/src/main/res/layout/bottom_play_list.xml
index 7c4ea94..0e25e61 100644
--- a/app/src/main/res/layout/bottom_play_list.xml
+++ b/app/src/main/res/layout/bottom_play_list.xml
@@ -11,7 +11,7 @@
         android:layout_height="36dp"
         android:background="@drawable/btn_play_sm"
         android:layout_marginTop="14dp"
-        android:layout_marginLeft="16dp"
+        android:layout_marginLeft="25dp"
         />
     <LinearLayout
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/fragment_home_on.xml b/app/src/main/res/layout/fragment_home_on.xml
index 4f4f14d..26277c5 100644
--- a/app/src/main/res/layout/fragment_home_on.xml
+++ b/app/src/main/res/layout/fragment_home_on.xml
@@ -4,8 +4,8 @@
         android:background="#000000"
         android:layout_width="match_parent"
         android:layout_height="match_parent">
-    <ScrollView android:id="@+id/home_on_scroll" android:layout_width="match_parent" android:layout_height="match_parent">
-        android:layout_height="match_parent"
+    <ScrollView android:id="@+id/home_on_scroll" android:layout_width="match_parent" android:layout_height="match_parent">>
+
         <LinearLayout
                 android:orientation="vertical"
                 android:layout_width="match_parent" android:layout_height="match_parent">
@@ -30,7 +30,7 @@
                                 android:layout_marginStart="22dp"
                                 android:orientation="vertical"
                                 android:layout_marginTop="174dp"
-                                android:layout_width="match_parent" android:layout_height="match_parent">
+                                android:layout_width="match_parent" android:layout_height="397dp">
                             <TextView
                                     android:id="@+id/tv_home_frag_ment"
                                     android:includeFontPadding="false"
@@ -96,23 +96,31 @@
                                         android:src="@drawable/btn_scroll"
                                         android:layout_width="52dp" android:layout_height="52dp"/>
 
-                                <TextView
-                                        android:id="@+id/tv_home_frag_total_point"
-                                        android:layout_toLeftOf="@+id/iv_home_frag_more_info"
-                                        android:includeFontPadding="false"
-                                        android:fontFamily="@font/noto_sans_kr_bold_hestia"
+                                <LinearLayout
+                                        android:id="@+id/ll_point_container"
                                         android:layout_width="wrap_content"
-                                        android:layout_height="wrap_content"
-                                        android:textSize="22sp"
-                                        android:textColor="#ffffff"
-                                        android:lineSpacingExtra="9sp"
-                                        android:text="2,000P"/>
-                                <ImageView
-                                        android:layout_marginStart="1dp"
-                                        android:id="@+id/iv_home_frag_more_info"
-                                        android:src="@drawable/btn_more"
-                                        android:layout_width="24dp" android:layout_height="24dp"
-                                        android:layout_centerVertical="true" android:layout_alignParentEnd="true"/>
+                                              android:layout_height="match_parent"
+                                              android:layout_alignParentEnd="true">
+                                    <TextView
+                                            android:id="@+id/tv_home_frag_total_point"
+                                            android:layout_toLeftOf="@+id/iv_home_frag_more_info"
+                                            android:includeFontPadding="false"
+                                            android:fontFamily="@font/noto_sans_kr_bold_hestia"
+                                            android:layout_width="wrap_content"
+                                            android:layout_height="wrap_content"
+                                            android:textSize="22sp"
+                                            android:textColor="#ffffff"
+                                            android:lineSpacingExtra="9sp"
+                                            android:text="2,000P"/>
+                                    <ImageView
+                                            android:layout_marginStart="1dp"
+                                            android:id="@+id/iv_home_frag_more_info"
+                                            android:src="@drawable/btn_more"
+                                            android:layout_width="24dp" android:layout_height="24dp"
+                                            android:layout_gravity="center_vertical" />
+
+
+                                </LinearLayout>
                             </RelativeLayout>
 
                             <RelativeLayout
@@ -135,7 +143,7 @@
                                         android:layout_centerHorizontal="true"
                                         android:src="@drawable/btn_more"
                                         android:layout_width="24dp" android:layout_height="24dp"
-                                        android:layout_centerVertical="true" />
+                                        android:layout_centerVertical="true"/>
                             </RelativeLayout>
 
                             <ImageView
@@ -153,7 +161,6 @@
 
                 <!--평가대기중인 내 곡-->
                 <TextView
-
                         android:id="@+id/tv_home_frag_waiting_scoring_mine"
                         android:includeFontPadding="false"
                         android:layout_marginTop="30dp"
@@ -263,12 +270,12 @@
 
                 <ImageView
                         android:layout_marginHorizontal="13dp"
-                        android:background="@color/colorPrimary"
                         android:layout_marginTop="16dp"
+                        android:scaleType="centerCrop"
                         android:id="@+id/iv_home_frag_challenge_img"
                         android:layout_below="@+id/tv_home_frag_challenge"
                         android:layout_width="match_parent" android:layout_height="134dp"
-                        android:src="@drawable/img_artwork_1"
+                        android:src="@drawable/img_home_weeklychalenge"
                         android:layout_alignParentStart="true"/>
 
                 <!--TOP10 : 장르-->
@@ -333,7 +340,7 @@
                         android:layout_below="@+id/rv_home_frag_top10_mood"
                         android:layout_marginHorizontal="4dp"
                         android:layout_marginTop="16dp"
-                        android:layout_width="match_parent" android:layout_height="132dp">
+                        android:layout_width="match_parent" android:layout_height="140dp">
 
                 </android.support.v7.widget.RecyclerView>
             </RelativeLayout>
diff --git a/app/src/main/res/layout/fragment_library_like.xml b/app/src/main/res/layout/fragment_library_like.xml
index 6ec2a59..14181a6 100644
--- a/app/src/main/res/layout/fragment_library_like.xml
+++ b/app/src/main/res/layout/fragment_library_like.xml
@@ -8,6 +8,7 @@
     >
     <android.support.v7.widget.RecyclerView
         android:id="@+id/recycler_library_like_frag_list"
+        android:visibility="visible"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginTop="30dp"
@@ -15,4 +16,10 @@
 
     </android.support.v7.widget.RecyclerView>
 
+    <ImageView
+            android:id="@+id/iv_library_like_list"
+            android:visibility="gone"
+            android:layout_width="match_parent"
+               android:layout_height="wrap_content"/>
+
 </LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_my_page.xml b/app/src/main/res/layout/fragment_my_page.xml
index ed27012..a61bc68 100644
--- a/app/src/main/res/layout/fragment_my_page.xml
+++ b/app/src/main/res/layout/fragment_my_page.xml
@@ -51,7 +51,7 @@
                     android:fontFamily="@font/noto_sans_kr_bold_hestia"
                     android:layout_width="280dp"
                     android:layout_height="wrap_content"
-                    android:textSize="24sp"
+                    android:textSize="24dp"
                     android:textColor="#ffffff"
                     android:lineSpacingExtra="12sp"
                     android:text="혹시 슬픈일이 있었나요? \n웨이브가 항상 응원할게요!"
@@ -72,7 +72,7 @@
                         android:id="@+id/tv_mypage_frag_scoring"
                         android:layout_centerVertical="true"
                         android:includeFontPadding="false"
-                        android:textSize="12sp"
+                        android:textSize="12dp"
                         android:fontFamily="@font/noto_sans_kr_regular_hestia"
                         android:layout_width="wrap_content" android:layout_height="18dp"
                         android:text="평가수"/>
@@ -85,7 +85,7 @@
                         android:fontFamily="@font/noto_sans_kr_bold_hestia"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:textSize="20sp"
+                        android:textSize="20dp"
                         android:textColor="#ffffff"
                         android:lineSpacingExtra="11sp"
                         android:text="676"/>
@@ -95,7 +95,7 @@
                         android:layout_marginStart="96dp"
                         android:layout_centerVertical="true"
                         android:includeFontPadding="false"
-                        android:textSize="12sp"
+                        android:textSize="12dp"
                         android:fontFamily="@font/noto_sans_kr_regular_hestia"
                         android:layout_width="wrap_content" android:layout_height="18dp"
                         android:text="적중수" android:layout_marginTop="0dp"/>
@@ -108,7 +108,7 @@
                         android:fontFamily="@font/noto_sans_kr_bold_hestia"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:textSize="20sp"
+                        android:textSize="20dp"
                         android:textColor="#ffffff"
                         android:lineSpacingExtra="11sp"
                         android:text="22"/>
@@ -139,7 +139,7 @@
                             android:fontFamily="@font/noto_sans_kr_bold_hestia"
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
-                            android:textSize="20sp"
+                            android:textSize="20dp"
                             android:textColor="#ffffff"
                             android:lineSpacingExtra="4sp"
                             android:gravity="center_horizontal"
@@ -152,7 +152,7 @@
                             android:fontFamily="@font/noto_sans_kr_thin_hestia"
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
-                            android:textSize="10sp"
+                            android:textSize="10dp"
                             android:textColor="#9e9e9e"
                             android:lineSpacingExtra="65sp"
                             android:text="Artist"
@@ -166,7 +166,7 @@
                             android:includeFontPadding="false"
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
-                            android:textSize="14sp"
+                            android:textSize="14dp"
                             android:textColor="#9e9e9e"
                             android:lineSpacingExtra="61sp"
                             android:layout_centerVertical="true"
@@ -197,9 +197,10 @@
                             android:layout_alignEnd="@+id/tv_mypage_frag_my_point"/>
 
                     <ImageView
+                            android:id="@+id/iv_mypage_song_upload"
                             android:layout_alignParentBottom="true"
                             android:layout_width="139dp" android:layout_height="32dp"
-                            android:src="@drawable/btn_mypage_upload"/>
+                            android:src="@drawable/btn_mypage_upload_song"/>
                 </RelativeLayout>
             </RelativeLayout>
         </RelativeLayout>
@@ -245,6 +246,7 @@
                     android:layout_height="460dp"/>
 
             <RelativeLayout
+                    android:id="@+id/rl_mypage_frag_goto_score_result"
                     android:layout_marginTop="63dp"
                     android:layout_width="match_parent" android:layout_height="56dp">
                 <TextView
diff --git a/app/src/main/res/layout/fragment_search_cover_artist.xml b/app/src/main/res/layout/fragment_search_cover_artist.xml
new file mode 100644
index 0000000..6281263
--- /dev/null
+++ b/app/src/main/res/layout/fragment_search_cover_artist.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout
+        xmlns:android="http://schemas.android.com/apk/res/android"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:orientation="vertical">
+    <android.support.v7.widget.RecyclerView
+            android:id="@+id/rv_fragment_search_cover_artist_list"
+            android:layout_marginTop="16dp"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent">
+    </android.support.v7.widget.RecyclerView>
+</RelativeLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_search_home.xml b/app/src/main/res/layout/fragment_search_home.xml
index 14c821a..9f96d27 100644
--- a/app/src/main/res/layout/fragment_search_home.xml
+++ b/app/src/main/res/layout/fragment_search_home.xml
@@ -23,29 +23,40 @@
             android:id="@+id/btn_search_home_frag_searchbar"
             android:layout_width="24dp"
             android:layout_height="24dp"
-            android:background="@drawable/ic_search"
+            android:background="@drawable/tab_btn_search_active"
             android:layout_centerVertical="true"
-            android:layout_marginLeft="8dp"
+            android:layout_marginLeft="30dp"
+            android:layout_toRightOf="@id/edit_search_home_frag_searchbar"
             />
 
         <EditText
-            android:id="@+id/edit_search_home_frag_searchbar"
-            android:layout_width="300dp"
-            android:layout_height="match_parent"
-            android:layout_marginLeft="8dp"
-            android:hint="검색어를 입력해주세요"
-            android:includeFontPadding="false"
-            android:fontFamily="@font/noto_sans_kr_regular_hestia"
-            android:textSize="14sp"
-            android:textColor="#979797"
-            android:textColorHint="#979797"
-            android:layout_centerVertical="true"
-            android:background="@color/transparent"
-            android:layout_toRightOf="@id/btn_search_home_frag_searchbar"
-            />
+                android:id="@+id/edit_search_home_frag_searchbar"
+                android:layout_width="290dp"
+                android:layout_height="match_parent"
+                android:layout_marginLeft="12dp"
+                android:hint="검색어를 입력해주세요"
+                android:includeFontPadding="false"
+                android:fontFamily="@font/noto_sans_kr_regular_hestia"
+                android:textSize="14sp"
+                android:textColor="#979797"
+                android:textColorHint="#979797"
+                android:layout_centerVertical="true"
+                android:imeOptions="actionSearch"
+                android:inputType="text"
+                android:background="@color/transparent"
+
+        />
 
     </RelativeLayout>
+    <RelativeLayout
+            android:id="@+id/rv_search_background"
+            android:layout_centerInParent="true"
+            android:layout_width="360dp"
+            android:layout_height="346dp"
+            android:layout_marginTop="192dp"
+            android:background="@drawable/img_search_before_def">
 
+    </RelativeLayout>
     <LinearLayout
         android:id="@+id/ll_search_home_frag_focus_on"
         android:layout_width="match_parent"
@@ -66,6 +77,7 @@
                 android:layout_height="wrap_content">
 
                 <TextView
+                        android:visibility="gone"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:text="최근 검색어"
@@ -77,6 +89,7 @@
                         android:layout_marginBottom="25dp"/>
 
                 <TextView
+                        android:visibility="gone"
                     android:id="@+id/tv_search_home_frag_all_delete"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
@@ -93,6 +106,7 @@
 
         </LinearLayout>
         <android.support.v7.widget.RecyclerView
+                android:visibility="gone"
             android:id="@+id/recycler_search_home_frag_search_home_hisory"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
@@ -100,24 +114,25 @@
             >
 
         </android.support.v7.widget.RecyclerView>
-        <LinearLayout
-            android:id="@+id/ll_search_home_frag_focus"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:orientation="vertical"
-            >
 
+        <LinearLayout
+                android:id="@+id/ll_search_home_frag_focus"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:orientation="vertical"
+        >
         </LinearLayout>
     </LinearLayout>
     <ScrollView
+            android:visibility="gone"
         android:id="@+id/ll_search_home_frag_focus_off"
-        android:visibility="gone"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginTop="24dp"
         android:layout_below="@+id/rl_search_home_frag_searchbar"
         >
         <LinearLayout
+
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:orientation="vertical"
@@ -143,14 +158,14 @@
 
             <RelativeLayout
                 android:id="@+id/rel_search_home_frag_artist"
-                android:layout_width="82dp"
-                android:layout_height="110dp"
+                android:layout_width="100dp"
+                android:layout_height="86dp"
                 android:layout_marginLeft="16dp"
                 >
                 <android.support.v7.widget.RecyclerView
                     android:id="@+id/recycler_search_home_frag_origin_artist"
-                    android:layout_width="82dp"
-                    android:layout_height="110dp"
+                    android:layout_width="86dp"
+                    android:layout_height="86dp"
                     android:background="@drawable/img_artistprofile"
                     />
 
diff --git a/app/src/main/res/layout/fragment_search_origin_artist.xml b/app/src/main/res/layout/fragment_search_origin_artist.xml
new file mode 100644
index 0000000..9e11173
--- /dev/null
+++ b/app/src/main/res/layout/fragment_search_origin_artist.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout
+        xmlns:android="http://schemas.android.com/apk/res/android"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent">
+    <android.support.v7.widget.RecyclerView
+            android:id="@+id/rv_fragment_search_origin_artist_list"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent">
+    </android.support.v7.widget.RecyclerView>
+</RelativeLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/item_cover_artist_view.xml b/app/src/main/res/layout/item_cover_artist_view.xml
index 5807439..f948c18 100644
--- a/app/src/main/res/layout/item_cover_artist_view.xml
+++ b/app/src/main/res/layout/item_cover_artist_view.xml
@@ -21,6 +21,8 @@
         android:text="Post Ma…"
         android:textSize="16sp"
         android:textColor="#ffffff"
+        android:maxLines="1"
+        android:ellipsize="end"
         android:fontFamily="@font/noto_sans_kr_bold_hestia"
         android:includeFontPadding="false"
         android:layout_gravity="center"
diff --git a/app/src/main/res/layout/item_home_song.xml b/app/src/main/res/layout/item_home_song.xml
index 64218ef..85ec501 100644
--- a/app/src/main/res/layout/item_home_song.xml
+++ b/app/src/main/res/layout/item_home_song.xml
@@ -25,6 +25,8 @@
             android:textColor="#ffffff"
             android:lineSpacingExtra="9sp"
             android:text="Song name is..."
+            android:maxLines="1"
+            android:ellipsize="end"
     />
     <TextView
             android:id="@+id/tv_item_home_song_artist"
@@ -38,6 +40,8 @@
             android:lineSpacingExtra="6sp"
             android:gravity="center_horizontal"
             android:text="John Doe"
+            android:maxLines="1"
+            android:ellipsize="end"
     />
 
 </RelativeLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/item_my_waiting_song.xml b/app/src/main/res/layout/item_my_waiting_song.xml
index eca8a71..3a3274c 100644
--- a/app/src/main/res/layout/item_my_waiting_song.xml
+++ b/app/src/main/res/layout/item_my_waiting_song.xml
@@ -44,6 +44,8 @@
             android:lineSpacingExtra="6sp"
             android:gravity="center_horizontal"
             android:text="Song name - alice"
+            android:maxLines="1"
+             android:ellipsize="end"
             android:fontFamily="@font/noto_sans_kr_regular_hestia"
     />
 
diff --git a/app/src/main/res/layout/item_search_origin_artist.xml b/app/src/main/res/layout/item_search_origin_artist.xml
new file mode 100644
index 0000000..68b5276
--- /dev/null
+++ b/app/src/main/res/layout/item_search_origin_artist.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout
+        android:id="@+id/bt_rv_item_search_origin_artist"
+        xmlns:android="http://schemas.android.com/apk/res/android"
+        android:layout_width="match_parent"
+        android:layout_height="82dp"
+        android:layout_marginVertical="6dp"
+        android:background="#000000">
+    <ImageView
+            android:id="@+id/iv_search_origin_artist_item_image"
+            android:src="@drawable/img_dart"
+            android:layout_width="82dp"
+            android:layout_height="82dp"
+            android:layout_centerVertical="true"
+            android:layout_marginLeft="16dp"/>
+    <RelativeLayout
+            android:layout_toRightOf="@+id/iv_search_origin_artist_item_image"
+            android:layout_marginRight="24dp"
+            android:layout_marginLeft="10dp"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_centerVertical="true">
+        <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="24dp"
+                android:orientation="horizontal">
+            <TextView
+                    android:id="@+id/tv_search_origin_artist_item_title"
+                    android:textColor="#ffffff"
+                    android:textSize="16sp"
+                    android:text="Day6(데이식스)"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"/>
+        </LinearLayout>
+    </RelativeLayout>
+</RelativeLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/item_song_failed.xml b/app/src/main/res/layout/item_song_failed.xml
index 4ac39e8..3398bfd 100644
--- a/app/src/main/res/layout/item_song_failed.xml
+++ b/app/src/main/res/layout/item_song_failed.xml
@@ -28,6 +28,8 @@
             android:textColor="#ffffff"
             android:lineSpacingExtra="6sp"
             android:gravity="center_horizontal"
+            android:maxLines="1"
+            android:ellipsize="end"
             android:text="Song2-name"/>
     <TextView
             android:includeFontPadding="false"
@@ -41,5 +43,7 @@
             android:lineSpacingExtra="5sp"
             android:gravity="center_horizontal"
             android:text="Cover Artist"
+            android:maxLines="1"
+            android:ellipsize="end"
             android:layout_centerHorizontal="true"/>
 </RelativeLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/item_song_passed.xml b/app/src/main/res/layout/item_song_passed.xml
index 77132b4..8900a74 100644
--- a/app/src/main/res/layout/item_song_passed.xml
+++ b/app/src/main/res/layout/item_song_passed.xml
@@ -22,6 +22,8 @@
             android:lineSpacingExtra="9sp"
             android:gravity="center_horizontal"
             android:text="Song name is.."
+            android:maxLines="1"
+            android:ellipsize="end"
             android:fontFamily="@font/noto_sans_kr_bold_hestia"
             android:layout_marginTop="8dp"
 
@@ -36,6 +38,8 @@
             android:lineSpacingExtra="6sp"
             android:gravity="center_horizontal"
             android:text="Cover Artist"
+            android:maxLines="1"
+            android:ellipsize="end"
             android:fontFamily="@font/noto_sans_kr_bold_hestia"
             android:layout_marginTop="2dp"
     />
diff --git a/app/src/main/res/layout/item_song_passing.xml b/app/src/main/res/layout/item_song_passing.xml
index 65e8ebd..33582a4 100644
--- a/app/src/main/res/layout/item_song_passing.xml
+++ b/app/src/main/res/layout/item_song_passing.xml
@@ -28,6 +28,8 @@
             android:layout_height="wrap_content"
             android:textSize="13sp"
             android:includeFontPadding="false"
+            android:maxLines="1"
+            android:ellipsize="end"
             android:textColor="#ffffff"
             android:lineSpacingExtra="6sp"
             android:gravity="center_horizontal"
@@ -45,6 +47,8 @@
             android:lineSpacingExtra="5sp"
             android:gravity="center_horizontal"
             android:text="Cover Artist"
+            android:maxLines="1"
+            android:ellipsize="end"
             android:layout_centerHorizontal="true"/>
 
 
diff --git a/app/src/main/res/layout/item_waiting_song.xml b/app/src/main/res/layout/item_waiting_song.xml
index df77e67..356603f 100644
--- a/app/src/main/res/layout/item_waiting_song.xml
+++ b/app/src/main/res/layout/item_waiting_song.xml
@@ -28,6 +28,8 @@
             android:includeFontPadding="false"
             android:textColor="#ffffff"
             android:lineSpacingExtra="6sp"
+            android:maxLines="1"
+            android:ellipsize="end"
             android:gravity="center_horizontal"
             android:text="Song2-name"/>
 
@@ -43,6 +45,9 @@
             android:lineSpacingExtra="5sp"
             android:gravity="center_horizontal"
             android:text="Song 2 name"
+            android:maxLines="1"
+            android:ellipsize="end"
+
             android:layout_centerHorizontal="true"/>
 
 
diff --git a/app/src/main/res/raw/try_11.mp4 b/app/src/main/res/raw/try_11.mp4
new file mode 100644
index 0000000..f768252
Binary files /dev/null and b/app/src/main/res/raw/try_11.mp4 differ
diff --git a/app/src/main/res/raw/wave_heart_animation.json b/app/src/main/res/raw/wave_heart_animation.json
new file mode 100644
index 0000000..5535985
--- /dev/null
+++ b/app/src/main/res/raw/wave_heart_animation.json
@@ -0,0 +1 @@
+{"v":"4.6.9","fr":30,"ip":0,"op":38,"w":100,"h":100,"nm":"heart","ddd":0,"assets":[],"layers":[{"ddd":0,"ind":1,"ty":4,"nm":"飛沫_08","ks":{"o":{"a":1,"k":[{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"n":["0p833_0p833_0p167_0p167"],"t":14,"s":[0],"e":[100]},{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"n":["0p833_0p833_0p167_0p167"],"t":18,"s":[100],"e":[0]},{"t":32}]},"r":{"a":0,"k":0},"p":{"a":1,"k":[{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"n":"0p833_0p833_0p167_0p167","t":14,"s":[50,50,0],"e":[87,28.25,0],"to":[6.16666650772095,-3.625,0],"ti":[-4.75,2.75000834465027,0]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"n":"0p833_0p833_0p167_0p167","t":18,"s":[87,28.25,0],"e":[78.5,33.5,0],"to":[4.75,-2.75000834465027,0],"ti":[1.41666662693024,-0.87499165534973,0]},{"t":32}]},"a":{"a":0,"k":[0,0,0]},"s":{"a":1,"k":[{"i":{"x":[0.833,0.833,0.833],"y":[0.833,0.833,0.833]},"o":{"x":[0.167,0.167,0.167],"y":[0.167,0.167,0.167]},"n":["0p833_0p833_0p167_0p167","0p833_0p833_0p167_0p167","0p833_0p833_0p167_0p167"],"t":14,"s":[100,100,100],"e":[250,250,100]},{"i":{"x":[0.833,0.833,0.833],"y":[0.833,0.833,0.833]},"o":{"x":[0.167,0.167,0.167],"y":[0.167,0.167,0.167]},"n":["0p833_0p833_0p167_0p167","0p833_0p833_0p167_0p167","0p833_0p833_0p167_0p167"],"t":18,"s":[250,250,100],"e":[50,50,100]},{"t":32}]}},"ao":0,"shapes":[{"ty":"gr","it":[{"d":1,"ty":"el","s":{"a":0,"k":[3,3]},"p":{"a":0,"k":[0,0]},"nm":"楕円形パス 1","mn":"ADBE Vector Shape - Ellipse"},{"ty":"st","c":{"a":0,"k":[1,1,1,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":0},"lc":1,"lj":1,"ml":4,"nm":"線 1","mn":"ADBE Vector Graphic - Stroke"},{"ty":"fl","c":{"a":0,"k":[0,0.714,0.871,1]},"o":{"a":0,"k":100},"r":1,"nm":"塗り 1","mn":"ADBE Vector Graphic - Fill"},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"トランスフォーム"}],"nm":"楕円形 1","np":3,"cix":2,"ix":1,"mn":"ADBE Vector Group"}],"ip":0,"op":150,"st":0,"bm":0,"sr":1},{"ddd":0,"ind":2,"ty":4,"nm":"飛沫_07","ks":{"o":{"a":1,"k":[{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"n":["0p833_0p833_0p167_0p167"],"t":18,"s":[0],"e":[100]},{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"n":["0p833_0p833_0p167_0p167"],"t":22,"s":[100],"e":[0]},{"t":32}]},"r":{"a":0,"k":0},"p":{"a":1,"k":[{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"n":"0p833_0p833_0p167_0p167","t":18,"s":[50,50,0],"e":[13.5,28.75,0],"to":[-6.08333349227905,-3.54166674613953,0],"ti":[5.22916650772095,2.765625,0]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"n":"0p833_0p833_0p167_0p167","t":22,"s":[13.5,28.75,0],"e":[18.625,33.406,0],"to":[-5.22916650772095,-2.765625,0],"ti":[-0.85416668653488,-0.77604168653488,0]},{"t":32}]},"a":{"a":0,"k":[0,0,0]},"s":{"a":1,"k":[{"i":{"x":[0.833,0.833,0.833],"y":[0.833,0.833,0.833]},"o":{"x":[0.167,0.167,0.167],"y":[0.167,0.167,0.167]},"n":["0p833_0p833_0p167_0p167","0p833_0p833_0p167_0p167","0p833_0p833_0p167_0p167"],"t":18,"s":[100,100,100],"e":[250,250,100]},{"i":{"x":[0.833,0.833,0.833],"y":[0.833,0.833,0.833]},"o":{"x":[0.167,0.167,0.167],"y":[0.167,0.167,0.167]},"n":["0p833_0p833_0p167_0p167","0p833_0p833_0p167_0p167","0p833_0p833_0p167_0p167"],"t":22,"s":[250,250,100],"e":[50,50,100]},{"t":32}]}},"ao":0,"shapes":[{"ty":"gr","it":[{"d":1,"ty":"el","s":{"a":0,"k":[3,3]},"p":{"a":0,"k":[0,0]},"nm":"楕円形パス 1","mn":"ADBE Vector Shape - Ellipse"},{"ty":"st","c":{"a":0,"k":[1,1,1,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":0},"lc":1,"lj":1,"ml":4,"nm":"線 1","mn":"ADBE Vector Graphic - Stroke"},{"ty":"fl","c":{"a":0,"k":[0,0.714,0.871,1]},"o":{"a":0,"k":100},"r":1,"nm":"塗り 1","mn":"ADBE Vector Graphic - Fill"},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"トランスフォーム"}],"nm":"楕円形 1","np":3,"cix":2,"ix":1,"mn":"ADBE Vector Group"}],"ip":0,"op":150,"st":0,"bm":0,"sr":1},{"ddd":0,"ind":3,"ty":4,"nm":"飛沫_06","ks":{"o":{"a":1,"k":[{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"n":["0p833_0p833_0p167_0p167"],"t":14,"s":[0],"e":[100]},{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"n":["0p833_0p833_0p167_0p167"],"t":18,"s":[100],"e":[0]},{"t":32}]},"r":{"a":0,"k":0},"p":{"a":1,"k":[{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"n":"0p833_0p833_0p167_0p167","t":14,"s":[50,50,0],"e":[14,70.5,0],"to":[-6,3.41666674613953,0],"ti":[5.16666650772095,-2.64583325386047,0]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"n":"0p833_0p833_0p167_0p167","t":18,"s":[14,70.5,0],"e":[19,65.875,0],"to":[-5.16666650772095,2.64583325386047,0],"ti":[-0.83333331346512,0.77083331346512,0]},{"t":32}]},"a":{"a":0,"k":[0,0,0]},"s":{"a":1,"k":[{"i":{"x":[0.833,0.833,0.833],"y":[0.833,0.833,0.833]},"o":{"x":[0.167,0.167,0.167],"y":[0.167,0.167,0.167]},"n":["0p833_0p833_0p167_0p167","0p833_0p833_0p167_0p167","0p833_0p833_0p167_0p167"],"t":14,"s":[100,100,100],"e":[250,250,100]},{"i":{"x":[0.833,0.833,0.833],"y":[0.833,0.833,0.833]},"o":{"x":[0.167,0.167,0.167],"y":[0.167,0.167,0.167]},"n":["0p833_0p833_0p167_0p167","0p833_0p833_0p167_0p167","0p833_0p833_0p167_0p167"],"t":18,"s":[250,250,100],"e":[50,50,100]},{"t":32}]}},"ao":0,"shapes":[{"ty":"gr","it":[{"d":1,"ty":"el","s":{"a":0,"k":[3,3]},"p":{"a":0,"k":[0,0]},"nm":"楕円形パス 1","mn":"ADBE Vector Shape - Ellipse"},{"ty":"st","c":{"a":0,"k":[1,1,1,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":0},"lc":1,"lj":1,"ml":4,"nm":"線 1","mn":"ADBE Vector Graphic - Stroke"},{"ty":"fl","c":{"a":0,"k":[0,0.714,0.871,1]},"o":{"a":0,"k":100},"r":1,"nm":"塗り 1","mn":"ADBE Vector Graphic - Fill"},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"トランスフォーム"}],"nm":"楕円形 1","np":3,"cix":2,"ix":1,"mn":"ADBE Vector Group"}],"ip":0,"op":150,"st":0,"bm":0,"sr":1},{"ddd":0,"ind":4,"ty":4,"nm":"飛沫_05","ks":{"o":{"a":1,"k":[{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"n":["0p833_0p833_0p167_0p167"],"t":18,"s":[0],"e":[100]},{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"n":["0p833_0p833_0p167_0p167"],"t":22,"s":[100],"e":[0]},{"t":32}]},"r":{"a":0,"k":0},"p":{"a":1,"k":[{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"n":"0p833_0p833_0p167_0p167","t":18,"s":[50,50,0],"e":[85.5,70.5,0],"to":[5.91666650772095,3.41666674613953,0],"ti":[-5.04166650772095,-2.64583325386047,0]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"n":"0p833_0p833_0p167_0p167","t":22,"s":[85.5,70.5,0],"e":[80.25,65.875,0],"to":[5.04166650772095,2.64583325386047,0],"ti":[0.875,0.77083331346512,0]},{"t":32}]},"a":{"a":0,"k":[0,0,0]},"s":{"a":1,"k":[{"i":{"x":[0.833,0.833,0.833],"y":[0.833,0.833,0.833]},"o":{"x":[0.167,0.167,0.167],"y":[0.167,0.167,0.167]},"n":["0p833_0p833_0p167_0p167","0p833_0p833_0p167_0p167","0p833_0p833_0p167_0p167"],"t":18,"s":[100,100,100],"e":[250,250,100]},{"i":{"x":[0.833,0.833,0.833],"y":[0.833,0.833,0.833]},"o":{"x":[0.167,0.167,0.167],"y":[0.167,0.167,0.167]},"n":["0p833_0p833_0p167_0p167","0p833_0p833_0p167_0p167","0p833_0p833_0p167_0p167"],"t":22,"s":[250,250,100],"e":[50,50,100]},{"t":32}]}},"ao":0,"shapes":[{"ty":"gr","it":[{"d":1,"ty":"el","s":{"a":0,"k":[3,3]},"p":{"a":0,"k":[0,0]},"nm":"楕円形パス 1","mn":"ADBE Vector Shape - Ellipse"},{"ty":"st","c":{"a":0,"k":[1,1,1,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":0},"lc":1,"lj":1,"ml":4,"nm":"線 1","mn":"ADBE Vector Graphic - Stroke"},{"ty":"fl","c":{"a":0,"k":[0,0.714,0.871,1]},"o":{"a":0,"k":100},"r":1,"nm":"塗り 1","mn":"ADBE Vector Graphic - Fill"},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"トランスフォーム"}],"nm":"楕円形 1","np":3,"cix":2,"ix":1,"mn":"ADBE Vector Group"}],"ip":0,"op":150,"st":0,"bm":0,"sr":1},{"ddd":0,"ind":5,"ty":4,"nm":"飛沫_02","ks":{"o":{"a":1,"k":[{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"n":["0p833_0p833_0p167_0p167"],"t":10,"s":[0],"e":[100]},{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"n":["0p833_0p833_0p167_0p167"],"t":14,"s":[100],"e":[0]},{"t":32}]},"r":{"a":0,"k":0},"p":{"a":1,"k":[{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"n":"0p833_0p833_0p167_0p167","t":10,"s":[50,50,0],"e":[50,92,0],"to":[0,7,0],"ti":[0,-5.33333349227905,0]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"n":"0p833_0p833_0p167_0p167","t":14,"s":[50,92,0],"e":[50,82,0],"to":[0,5.33333349227905,0],"ti":[0,1.66666662693024,0]},{"t":32}]},"a":{"a":0,"k":[0,0,0]},"s":{"a":1,"k":[{"i":{"x":[0.833,0.833,0.833],"y":[0.833,0.833,0.833]},"o":{"x":[0.167,0.167,0.167],"y":[0.167,0.167,0.167]},"n":["0p833_0p833_0p167_0p167","0p833_0p833_0p167_0p167","0p833_0p833_0p167_0p167"],"t":10,"s":[100,100,100],"e":[180,180,100]},{"i":{"x":[0.833,0.833,0.833],"y":[0.833,0.833,0.833]},"o":{"x":[0.167,0.167,0.167],"y":[0.167,0.167,0.167]},"n":["0p833_0p833_0p167_0p167","0p833_0p833_0p167_0p167","0p833_0p833_0p167_0p167"],"t":14,"s":[180,180,100],"e":[50,50,100]},{"t":32}]}},"ao":0,"shapes":[{"ty":"gr","it":[{"d":1,"ty":"el","s":{"a":0,"k":[3,3]},"p":{"a":0,"k":[0,0]},"nm":"楕円形パス 1","mn":"ADBE Vector Shape - Ellipse"},{"ty":"st","c":{"a":0,"k":[1,1,1,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":0},"lc":1,"lj":1,"ml":4,"nm":"線 1","mn":"ADBE Vector Graphic - Stroke"},{"ty":"fl","c":{"a":0,"k":[0,0.714,0.871,1]},"o":{"a":0,"k":100},"r":1,"nm":"塗り 1","mn":"ADBE Vector Graphic - Fill"},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"トランスフォーム"}],"nm":"楕円形 1","np":3,"cix":2,"ix":1,"mn":"ADBE Vector Group"}],"ip":0,"op":150,"st":0,"bm":0,"sr":1},{"ddd":0,"ind":6,"ty":4,"nm":"飛沫_01","ks":{"o":{"a":1,"k":[{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"n":["0p833_0p833_0p167_0p167"],"t":10,"s":[0],"e":[100]},{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"n":["0p833_0p833_0p167_0p167"],"t":14,"s":[100],"e":[0]},{"t":32}]},"r":{"a":0,"k":0},"p":{"a":1,"k":[{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"n":"0p833_0p833_0p167_0p167","t":10,"s":[50,50,0],"e":[50,8,0],"to":[0,-7,0],"ti":[0,5.33333349227905,0]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"n":"0p833_0p833_0p167_0p167","t":14,"s":[50,8,0],"e":[50,18,0],"to":[0,-5.33333349227905,0],"ti":[0,-1.66666662693024,0]},{"t":32}]},"a":{"a":0,"k":[0,0,0]},"s":{"a":1,"k":[{"i":{"x":[0.833,0.833,0.833],"y":[0.833,0.833,0.833]},"o":{"x":[0.167,0.167,0.167],"y":[0.167,0.167,0.167]},"n":["0p833_0p833_0p167_0p167","0p833_0p833_0p167_0p167","0p833_0p833_0p167_0p167"],"t":10,"s":[100,100,100],"e":[180,180,100]},{"i":{"x":[0.833,0.833,0.833],"y":[0.833,0.833,0.833]},"o":{"x":[0.167,0.167,0.167],"y":[0.167,0.167,0.167]},"n":["0p833_0p833_0p167_0p167","0p833_0p833_0p167_0p167","0p833_0p833_0p167_0p167"],"t":14,"s":[180,180,100],"e":[50,50,100]},{"t":32}]}},"ao":0,"shapes":[{"ty":"gr","it":[{"d":1,"ty":"el","s":{"a":0,"k":[3,3]},"p":{"a":0,"k":[0,0]},"nm":"楕円形パス 1","mn":"ADBE Vector Shape - Ellipse"},{"ty":"st","c":{"a":0,"k":[1,1,1,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":0},"lc":1,"lj":1,"ml":4,"nm":"線 1","mn":"ADBE Vector Graphic - Stroke"},{"ty":"fl","c":{"a":0,"k":[0,0.714,0.871,1]},"o":{"a":0,"k":100},"r":1,"nm":"塗り 1","mn":"ADBE Vector Graphic - Fill"},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"トランスフォーム"}],"nm":"楕円形 1","np":3,"cix":2,"ix":1,"mn":"ADBE Vector Group"}],"ip":0,"op":150,"st":0,"bm":0,"sr":1},{"ddd":0,"ind":7,"ty":4,"nm":"heart_03","ks":{"o":{"a":0,"k":100},"r":{"a":0,"k":0},"p":{"a":0,"k":[50,50,0]},"a":{"a":0,"k":[0,0,0]},"s":{"a":1,"k":[{"i":{"x":[0.589,0.589,0.685],"y":[1,1,0.685]},"o":{"x":[0.183,0.183,0.173],"y":[0.041,0.041,0.173]},"n":["0p589_1_0p183_0p041","0p589_1_0p183_0p041","0p685_0p685_0p173_0p173"],"t":11,"s":[0,0,100],"e":[300,300,100]},{"i":{"x":[0.418,0.418,0.833],"y":[1.005,1.005,0.833]},"o":{"x":[0.483,0.483,0.333],"y":[0,0,0.333]},"n":["0p418_1p005_0p483_0","0p418_1p005_0p483_0","0p833_0p833_0p333_0p333"],"t":16,"s":[300,300,100],"e":[200,200,100]},{"i":{"x":[0.639,0.639,0.778],"y":[1,1,0.778]},"o":{"x":[0.412,0.412,0.157],"y":[0,0,0.157]},"n":["0p639_1_0p412_0","0p639_1_0p412_0","0p778_0p778_0p157_0p157"],"t":21,"s":[200,200,100],"e":[240,240,100]},{"i":{"x":[0.625,0.625,0.833],"y":[1,1,0.833]},"o":{"x":[0.359,0.359,0.167],"y":[0,0,0.167]},"n":["0p625_1_0p359_0","0p625_1_0p359_0","0p833_0p833_0p167_0p167"],"t":25,"s":[240,240,100],"e":[200,200,100]},{"i":{"x":[0.593,0.593,0.833],"y":[1,1,0.833]},"o":{"x":[0.395,0.395,0.167],"y":[0,0,0.167]},"n":["0p593_1_0p395_0","0p593_1_0p395_0","0p833_0p833_0p167_0p167"],"t":29,"s":[200,200,100],"e":[215,215,100]},{"i":{"x":[0.533,0.533,0.833],"y":[1,1,0.833]},"o":{"x":[0.579,0.579,0.167],"y":[0,0,0.167]},"n":["0p533_1_0p579_0","0p533_1_0p579_0","0p833_0p833_0p167_0p167"],"t":32,"s":[215,215,100],"e":[200,200,100]},{"t":35}]}},"ao":0,"ef":[{"ty":5,"nm":"グラデーション","mn":"ADBE Ramp","ix":1,"en":1,"ef":[{"ty":3,"nm":"グラデーションの開始","mn":"ADBE Ramp-0001","ix":1,"v":{"a":0,"k":[30.5,67.25]}},{"ty":2,"nm":"開始色","mn":"ADBE Ramp-0002","ix":2,"v":{"a":0,"k":[0.9764706,0.2588235,0.2431373,1]}},{"ty":3,"nm":"グラデーションの終了","mn":"ADBE Ramp-0003","ix":3,"v":{"a":0,"k":[70,33]}},{"ty":2,"nm":"終了色","mn":"ADBE Ramp-0004","ix":4,"v":{"a":0,"k":[0.9803922,0.2666667,0.5294118,1]}},{"ty":7,"nm":"グラデーションのシェイプ","mn":"ADBE Ramp-0005","ix":5,"v":{"a":0,"k":1}},{"ty":0,"nm":"グラデーションの拡散","mn":"ADBE Ramp-0006","ix":6,"v":{"a":0,"k":0}},{"ty":0,"nm":"元の画像とブレンド","mn":"ADBE Ramp-0007","ix":7,"v":{"a":0,"k":0}},{"ty":6,"nm":"","mn":"ADBE Ramp-0008","ix":8,"v":0}]}],"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[1.339,1.458],[1.963,-0.285],[0.72,-0.686],[1.543,0.226],[1.224,-1.331],[-0.71,-2.118],[-1.501,-0.867],[-0.207,-0.025],[-0.082,0.05],[-1.083,3.23]],"o":[[-1.226,-1.329],[-1.544,0.226],[-0.72,-0.686],[-1.958,-0.285],[-1.338,1.457],[1.085,3.233],[0.072,0.046],[0.248,0],[1.509,-0.873],[0.712,-2.117]],"v":[[8.503,-6.715],[3.569,-8.338],[0,-6.268],[-3.57,-8.338],[-8.504,-6.715],[-9.523,-0.92],[-0.521,8.451],[-0.009,8.623],[0.519,8.451],[9.521,-0.92]],"c":true}},"nm":"パス 1","mn":"ADBE Vector Shape - Group"},{"ty":"st","c":{"a":0,"k":[1,1,1,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":0},"lc":1,"lj":1,"ml":4,"nm":"線 1","mn":"ADBE Vector Graphic - Stroke"},{"ty":"fl","c":{"a":0,"k":[0,0.714,0.871,1]},"o":{"a":0,"k":100},"r":1,"nm":"塗り 1","mn":"ADBE Vector Graphic - Fill"},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"トランスフォーム"}],"nm":"シェイプ 1","np":3,"cix":2,"ix":1,"mn":"ADBE Vector Group"}],"ip":0,"op":150,"st":0,"bm":0,"sr":1},{"ddd":0,"ind":8,"ty":4,"nm":"heart_02","ks":{"o":{"a":0,"k":100},"r":{"a":0,"k":0},"p":{"a":0,"k":[50,50,0]},"a":{"a":0,"k":[0,0,0]},"s":{"a":0,"k":[100,100,100]}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[1.339,1.458],[1.963,-0.285],[0.72,-0.686],[1.543,0.226],[1.224,-1.331],[-0.71,-2.118],[-1.501,-0.867],[-0.207,-0.025],[-0.082,0.05],[-1.083,3.23]],"o":[[-1.226,-1.329],[-1.544,0.226],[-0.72,-0.686],[-1.958,-0.285],[-1.338,1.457],[1.085,3.233],[0.072,0.046],[0.248,0],[1.509,-0.873],[0.712,-2.117]],"v":[[8.503,-6.715],[3.569,-8.338],[0,-6.268],[-3.57,-8.338],[-8.504,-6.715],[-9.523,-0.92],[-0.521,8.451],[-0.009,8.623],[0.519,8.451],[9.521,-0.92]],"c":true}},"nm":"パス 1","mn":"ADBE Vector Shape - Group"},{"ty":"st","c":{"a":0,"k":[1,1,1,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":0},"lc":1,"lj":1,"ml":4,"nm":"線 1","mn":"ADBE Vector Graphic - Stroke"},{"ty":"fl","c":{"a":0,"k":[1,1,1,1]},"o":{"a":0,"k":100},"r":1,"nm":"塗り 1","mn":"ADBE Vector Graphic - Fill"},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":1,"k":[{"i":{"x":[0.833,0.833],"y":[0.833,0.833]},"o":{"x":[0.167,0.167],"y":[0.167,0.167]},"n":["0p833_0p833_0p167_0p167","0p833_0p833_0p167_0p167"],"t":4,"s":[0,0],"e":[300,300]},{"t":15}],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":1,"k":[{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"n":["0p833_0p833_0p167_0p167"],"t":4,"s":[100],"e":[70]},{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"n":["0p833_0p833_0p167_0p167"],"t":10,"s":[70],"e":[0]},{"t":15}],"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"トランスフォーム"}],"nm":"シェイプ 1","np":3,"cix":2,"ix":1,"mn":"ADBE Vector Group"}],"ip":0,"op":150,"st":0,"bm":0,"sr":1},{"ddd":0,"ind":9,"ty":4,"nm":"heart_01","ks":{"o":{"a":0,"k":100},"r":{"a":0,"k":0},"p":{"a":0,"k":[50,49.893,0]},"a":{"a":0,"k":[0,0,0]},"s":{"a":1,"k":[{"i":{"x":[0.833,0.833,0.833],"y":[0.833,0.833,0.833]},"o":{"x":[0.167,0.167,0.167],"y":[0.167,0.167,0.167]},"n":["0p833_0p833_0p167_0p167","0p833_0p833_0p167_0p167","0p833_0p833_0p167_0p167"],"t":0,"s":[0,0,100],"e":[300,300,100]},{"t":13}]}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[1.339,1.458],[1.963,-0.285],[0.72,-0.686],[1.543,0.226],[1.224,-1.331],[-0.71,-2.118],[-1.501,-0.867],[-0.207,-0.025],[-0.082,0.05],[-1.083,3.23]],"o":[[-1.226,-1.329],[-1.544,0.226],[-0.72,-0.686],[-1.958,-0.285],[-1.338,1.457],[1.085,3.233],[0.072,0.046],[0.248,0],[1.509,-0.873],[0.712,-2.117]],"v":[[8.503,-6.715],[3.569,-8.338],[0,-6.268],[-3.57,-8.338],[-8.504,-6.715],[-9.523,-0.92],[-0.521,8.451],[-0.009,8.623],[0.519,8.451],[9.521,-0.92]],"c":true}},"nm":"パス 1","mn":"ADBE Vector Shape - Group"},{"ty":"st","c":{"a":0,"k":[1,1,1,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":0},"lc":1,"lj":1,"ml":4,"nm":"線 1","mn":"ADBE Vector Graphic - Stroke"},{"ty":"fl","c":{"a":1,"k":[{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"n":["0p833_0p833_0p167_0p167"],"t":0,"s":[0.8784314,0.5882353,0.8509804,1],"e":[0.9568627,0.9058824,0.5372549,1]},{"t":17}]},"o":{"a":1,"k":[{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"n":["0p833_0p833_0p167_0p167"],"t":0,"s":[100],"e":[0]},{"t":17}]},"r":1,"nm":"塗り 1","mn":"ADBE Vector Graphic - Fill"},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"トランスフォーム"}],"nm":"シェイプ 1","np":3,"cix":2,"ix":1,"mn":"ADBE Vector Group"}],"ip":0,"op":150,"st":0,"bm":0,"sr":1}]}
\ No newline at end of file