From 5f75aa09526930eb47b83eb73fbde7cd8a244837 Mon Sep 17 00:00:00 2001
From: VankaGam <122173219+VankaGam@users.noreply.github.com>
Date: Mon, 6 Oct 2025 21:59:31 +0300
Subject: [PATCH 1/3] creat vetka

---
 .idea/deploymentTargetSelector.xml                |  4 ++--
 .idea/misc.xml                                    |  2 ++
 .idea/vcs.xml                                     |  1 -
 app/build.gradle.kts                              | 15 +++++++++++++++
 .../playlistmaker/settingsjc/ui/SettingsScreen.kt |  2 ++
 .../com/example/playlistmaker/ui/theme/Theme.kt   |  3 +++
 6 files changed, 24 insertions(+), 3 deletions(-)
 create mode 100644 app/src/main/java/com/example/playlistmaker/settingsjc/ui/SettingsScreen.kt
 create mode 100644 app/src/main/java/com/example/playlistmaker/ui/theme/Theme.kt

diff --git a/.idea/deploymentTargetSelector.xml b/.idea/deploymentTargetSelector.xml
index 066b899..e72705f 100644
--- a/.idea/deploymentTargetSelector.xml
+++ b/.idea/deploymentTargetSelector.xml
@@ -15,10 +15,10 @@
       </SelectionState>
       <SelectionState runConfigName="app">
         <option name="selectionMode" value="DROPDOWN" />
-        <DropdownSelection timestamp="2025-09-19T21:19:06.188866800Z">
+        <DropdownSelection timestamp="2025-09-19T21:30:56.193466300Z">
           <Target type="DEFAULT_BOOT">
             <handle>
-              <DeviceId pluginId="LocalEmulator" identifier="path=C:\Users\DNS\.android\avd\Pixel_9_API_35.avd" />
+              <DeviceId pluginId="PhysicalDevice" identifier="serial=ZY22JZ2NR3" />
             </handle>
           </Target>
         </DropdownSelection>
diff --git a/.idea/misc.xml b/.idea/misc.xml
index c9b1536..02a7102 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -1,4 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
+  <component name="ExternalStorageConfigurationManager" enabled="true" />
   <component name="ProjectRootManager" version="2" languageLevel="JDK_21" default="true" project-jdk-name="jbr-21" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/build/classes" />
   </component>
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
index 4e98c8e..94a25f7 100644
--- a/.idea/vcs.xml
+++ b/.idea/vcs.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="VcsDirectoryMappings">
-    <mapping directory="$PROJECT_DIR$/../../Proecti/PlayList" vcs="Git" />
     <mapping directory="$PROJECT_DIR$" vcs="Git" />
   </component>
 </project>
\ No newline at end of file
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index 284c15a..11f6702 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -47,6 +47,10 @@ android {
         checkReleaseBuilds = false
         abortOnError = false
     }
+    buildFeatures { compose = true }
+    composeOptions {
+        kotlinCompilerExtensionVersion = "1.5.10"
+    }
 }
 
 dependencies {
@@ -77,4 +81,15 @@ dependencies {
     implementation("androidx.room:room-runtime:2.6.1")
     kapt("androidx.room:room-compiler:2.6.1")
     implementation("androidx.room:room-ktx:2.6.1")
+    val composeBom = platform("androidx.compose:compose-bom:2024.06.00")
+    implementation(composeBom)
+    androidTestImplementation(composeBom)
+    implementation("androidx.activity:activity-compose:1.8.0")
+    implementation("androidx.compose.ui:ui")
+    implementation("androidx.compose.material3:material3")
+    implementation("androidx.compose.ui:ui-tooling-preview")
+    debugImplementation("androidx.compose.ui:ui-tooling")
+    implementation("androidx.compose.runtime:runtime-livedata")
+    implementation("androidx.lifecycle:lifecycle-runtime-compose:2.8.0")
+    implementation("io.coil-kt:coil-compose:2.7.0")
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/example/playlistmaker/settingsjc/ui/SettingsScreen.kt b/app/src/main/java/com/example/playlistmaker/settingsjc/ui/SettingsScreen.kt
new file mode 100644
index 0000000..258f717
--- /dev/null
+++ b/app/src/main/java/com/example/playlistmaker/settingsjc/ui/SettingsScreen.kt
@@ -0,0 +1,2 @@
+package com.example.playlistmaker.settingsjc.ui
+
diff --git a/app/src/main/java/com/example/playlistmaker/ui/theme/Theme.kt b/app/src/main/java/com/example/playlistmaker/ui/theme/Theme.kt
new file mode 100644
index 0000000..6743f81
--- /dev/null
+++ b/app/src/main/java/com/example/playlistmaker/ui/theme/Theme.kt
@@ -0,0 +1,3 @@
+package com.example.playlistmaker.ui.theme
+
+class Theme
\ No newline at end of file

From 09fc2cc5f90ed23fe270fb24ff9f7f15db82df5e Mon Sep 17 00:00:00 2001
From: VankaGam <122173219+VankaGam@users.noreply.github.com>
Date: Sun, 12 Oct 2025 18:24:24 +0300
Subject: [PATCH 2/3] Level 1

---
 .idea/AndroidProjectSystem.xml                |   6 +
 .idea/deploymentTargetSelector.xml            |   2 +-
 .idea/deviceManager.xml                       |  13 +
 app/build.gradle.kts                          |   4 +-
 .../java/com/example/playlistmaker/App.kt     |   4 +-
 .../playlistmaker/di/ViewModelModule.kt       |  24 +-
 .../di/mediaLibraryComposeModule.kt           |  38 ++
 .../media/ui/Fragment/FavoritesFragment.kt    |  78 ---
 .../media/ui/Fragment/PlaylistsFragment.kt    |  81 ---
 .../media/ui/MediaLibraryFragment.kt          |  86 ++-
 .../media/ui/MediaLibraryScreen.kt            | 373 ++++++++++++
 .../media/ui/MediaLibraryState.kt             |  16 +
 .../media/ui/MediaLibraryViewModel.kt         |  37 ++
 .../ui/adapter/MediaLibraryPagerAdapter.kt    |  23 -
 .../playlistmaker/search/ui/SearchFragment.kt | 252 +++-----
 .../playlistmaker/search/ui/SearchScreen.kt   | 547 ++++++++++++++++++
 .../settings/ui/viewmodel/SettingsFragment.kt | 100 ++--
 .../settingsjc/ui/SettingsScreen.kt           | 182 ++++++
 .../example/playlistmaker/ui/theme/Theme.kt   |  19 +-
 .../main/res/layout/fragment_favorites.xml    |  49 --
 .../res/layout/fragment_media_library.xml     |  49 --
 app/src/main/res/layout/fragment_search.xml   | 173 ------
 app/src/main/res/layout/fragment_settings.xml |  98 ----
 app/src/main/res/values/strings.xml           |   8 +
 gradle/libs.versions.toml                     |   2 +-
 25 files changed, 1435 insertions(+), 829 deletions(-)
 create mode 100644 .idea/AndroidProjectSystem.xml
 create mode 100644 .idea/deviceManager.xml
 create mode 100644 app/src/main/java/com/example/playlistmaker/di/mediaLibraryComposeModule.kt
 delete mode 100644 app/src/main/java/com/example/playlistmaker/media/ui/Fragment/FavoritesFragment.kt
 delete mode 100644 app/src/main/java/com/example/playlistmaker/media/ui/Fragment/PlaylistsFragment.kt
 create mode 100644 app/src/main/java/com/example/playlistmaker/media/ui/MediaLibraryScreen.kt
 create mode 100644 app/src/main/java/com/example/playlistmaker/media/ui/MediaLibraryState.kt
 create mode 100644 app/src/main/java/com/example/playlistmaker/media/ui/MediaLibraryViewModel.kt
 delete mode 100644 app/src/main/java/com/example/playlistmaker/media/ui/adapter/MediaLibraryPagerAdapter.kt
 create mode 100644 app/src/main/java/com/example/playlistmaker/search/ui/SearchScreen.kt
 delete mode 100644 app/src/main/res/layout/fragment_favorites.xml
 delete mode 100644 app/src/main/res/layout/fragment_media_library.xml
 delete mode 100644 app/src/main/res/layout/fragment_search.xml
 delete mode 100644 app/src/main/res/layout/fragment_settings.xml

diff --git a/.idea/AndroidProjectSystem.xml b/.idea/AndroidProjectSystem.xml
new file mode 100644
index 0000000..4a53bee
--- /dev/null
+++ b/.idea/AndroidProjectSystem.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="AndroidProjectSystem">
+    <option name="providerId" value="com.android.tools.idea.GradleProjectSystem" />
+  </component>
+</project>
\ No newline at end of file
diff --git a/.idea/deploymentTargetSelector.xml b/.idea/deploymentTargetSelector.xml
index e72705f..8ac2031 100644
--- a/.idea/deploymentTargetSelector.xml
+++ b/.idea/deploymentTargetSelector.xml
@@ -15,7 +15,7 @@
       </SelectionState>
       <SelectionState runConfigName="app">
         <option name="selectionMode" value="DROPDOWN" />
-        <DropdownSelection timestamp="2025-09-19T21:30:56.193466300Z">
+        <DropdownSelection timestamp="2025-10-12T15:16:52.973284300Z">
           <Target type="DEFAULT_BOOT">
             <handle>
               <DeviceId pluginId="PhysicalDevice" identifier="serial=ZY22JZ2NR3" />
diff --git a/.idea/deviceManager.xml b/.idea/deviceManager.xml
new file mode 100644
index 0000000..91f9558
--- /dev/null
+++ b/.idea/deviceManager.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="DeviceTable">
+    <option name="columnSorters">
+      <list>
+        <ColumnSorterState>
+          <option name="column" value="Name" />
+          <option name="order" value="ASCENDING" />
+        </ColumnSorterState>
+      </list>
+    </option>
+  </component>
+</project>
\ No newline at end of file
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index 11f6702..1d55704 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -9,7 +9,7 @@ plugins {
 
 android {
     namespace = "com.example.playlistmaker"
-    compileSdk = 34
+    compileSdk = 35
     
     defaultConfig {
         applicationId = "com.example.playlistmaker"
@@ -92,4 +92,6 @@ dependencies {
     implementation("androidx.compose.runtime:runtime-livedata")
     implementation("androidx.lifecycle:lifecycle-runtime-compose:2.8.0")
     implementation("io.coil-kt:coil-compose:2.7.0")
+    implementation("androidx.compose.material:material")
+    implementation("androidx.compose.material:material-icons-extended")
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/example/playlistmaker/App.kt b/app/src/main/java/com/example/playlistmaker/App.kt
index 1ec4a87..3a4c47c 100644
--- a/app/src/main/java/com/example/playlistmaker/App.kt
+++ b/app/src/main/java/com/example/playlistmaker/App.kt
@@ -6,6 +6,7 @@ import com.example.playlistmaker.di.DomainModule
 import com.example.playlistmaker.di.dataModule
 import com.example.playlistmaker.di.repositoryModule
 import com.example.playlistmaker.di.interactorModule
+import com.example.playlistmaker.di.mediaLibraryComposeModule
 import com.example.playlistmaker.di.mediaModule
 import com.example.playlistmaker.di.viewModelModule
 import com.example.playlistmaker.di.navigationModule
@@ -29,7 +30,8 @@ class App : Application() {
                 mediaModule,
                 navigationModule,
                 DomainModule,
-                playlistWorkModule
+                playlistWorkModule,
+                mediaLibraryComposeModule
             )
         }
 
diff --git a/app/src/main/java/com/example/playlistmaker/di/ViewModelModule.kt b/app/src/main/java/com/example/playlistmaker/di/ViewModelModule.kt
index a7541f7..caf8157 100644
--- a/app/src/main/java/com/example/playlistmaker/di/ViewModelModule.kt
+++ b/app/src/main/java/com/example/playlistmaker/di/ViewModelModule.kt
@@ -1,14 +1,20 @@
 package com.example.playlistmaker.di
 
+import com.example.playlistmaker.media.domain.interactor.PlaylistInteractor
+import com.example.playlistmaker.media.ui.MediaLibraryViewModel
+import com.example.playlistmaker.media.ui.PlaylistUi
 import com.example.playlistmaker.media.ui.viewmodel.CreatePlaylistViewModel
 import com.example.playlistmaker.media.ui.viewmodel.FavoritesViewModel
 import com.example.playlistmaker.media.ui.viewmodel.PlaylistViewModel
 import com.example.playlistmaker.media.ui.viewmodel.PlaylistsViewModel
-import com.example.playlistmaker.search.ui.viewmodel.SearchViewModel
+import com.example.playlistmaker.player.domain.interactor.FavoritesInteractor
 import com.example.playlistmaker.player.ui.viewmodel.PlayerViewModel
 import com.example.playlistmaker.search.domain.model.Track
+import com.example.playlistmaker.search.ui.viewmodel.SearchViewModel
 import com.example.playlistmaker.settings.ui.viewmodel.SettingsViewModel
+import kotlinx.coroutines.flow.first
 import org.koin.androidx.viewmodel.dsl.viewModel
+import org.koin.core.qualifier.named
 import org.koin.dsl.module
 
 val viewModelModule = module {
@@ -21,7 +27,6 @@ val viewModelModule = module {
         )
     }
 
-
     viewModel {
         SettingsViewModel(
             getTheme = get(),
@@ -40,17 +45,8 @@ val viewModelModule = module {
         )
     }
 
-    viewModel {
-        FavoritesViewModel(
-            favoritesInteractor = get()
-        )
-    }
+    viewModel { FavoritesViewModel(favoritesInteractor = get()) }
+    viewModel { CreatePlaylistViewModel(get()) }
+    viewModel { PlaylistsViewModel(get()) }
 
-    viewModel {
-        CreatePlaylistViewModel(get())
-    }
-
-    viewModel {
-        PlaylistsViewModel(get())
-    }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/example/playlistmaker/di/mediaLibraryComposeModule.kt b/app/src/main/java/com/example/playlistmaker/di/mediaLibraryComposeModule.kt
new file mode 100644
index 0000000..751ab86
--- /dev/null
+++ b/app/src/main/java/com/example/playlistmaker/di/mediaLibraryComposeModule.kt
@@ -0,0 +1,38 @@
+package com.example.playlistmaker.di
+
+import com.example.playlistmaker.media.domain.interactor.PlaylistInteractor
+import com.example.playlistmaker.media.ui.MediaLibraryViewModel
+import com.example.playlistmaker.media.ui.PlaylistUi
+import com.example.playlistmaker.player.domain.interactor.FavoritesInteractor
+import com.example.playlistmaker.search.domain.model.Track
+import kotlinx.coroutines.flow.first
+import org.koin.androidx.viewmodel.dsl.viewModel
+import org.koin.core.qualifier.named
+import org.koin.dsl.module
+
+val mediaLibraryComposeModule = module {
+
+    single<suspend () -> List<Track>>(named("getFavoritesOnce")) {
+        suspend { get<FavoritesInteractor>().observeFavorites().first() }
+    }
+
+    single<suspend () -> List<PlaylistUi>>(named("getPlaylistsOnce")) {
+        suspend {
+            get<PlaylistInteractor>().observeAll().first().map { p ->
+                PlaylistUi(
+                    id = p.id,
+                    title = p.name,
+                    trackCount = p.trackCount,
+                    coverUrl = p.coverPath
+                )
+            }
+        }
+    }
+
+    viewModel {
+        MediaLibraryViewModel(
+            getFavoritesOnce = get(named("getFavoritesOnce")),
+            getPlaylistsOnce = get(named("getPlaylistsOnce")),
+        )
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/example/playlistmaker/media/ui/Fragment/FavoritesFragment.kt b/app/src/main/java/com/example/playlistmaker/media/ui/Fragment/FavoritesFragment.kt
deleted file mode 100644
index d4c08f3..0000000
--- a/app/src/main/java/com/example/playlistmaker/media/ui/Fragment/FavoritesFragment.kt
+++ /dev/null
@@ -1,78 +0,0 @@
-package com.example.playlistmaker.media.ui.Fragment
-
-import android.os.Bundle
-import android.view.LayoutInflater
-import android.view.View
-import android.view.ViewGroup
-import androidx.core.os.bundleOf
-import androidx.fragment.app.Fragment
-import androidx.navigation.findNavController
-import androidx.recyclerview.widget.LinearLayoutManager
-import com.example.playlistmaker.R
-import org.koin.androidx.viewmodel.ext.android.viewModel
-import com.example.playlistmaker.databinding.FragmentFavoritesBinding
-import com.example.playlistmaker.media.ui.viewmodel.FavoritesViewModel
-import com.example.playlistmaker.player.ui.PlayerFragment
-import com.example.playlistmaker.search.ui.TrackAdapter
-
-class FavoritesFragment : Fragment() {
-
-    private val favoritesViewModel: FavoritesViewModel by viewModel()
-
-    private var _binding: FragmentFavoritesBinding? = null
-    private val binding get() = _binding!!
-
-    companion object {
-        fun newInstance(): FavoritesFragment {
-            return FavoritesFragment()
-        }
-    }
-
-
-    override fun onCreateView(
-        inflater: LayoutInflater,
-        container: ViewGroup?,
-        savedInstanceState: Bundle?
-    ): View {
-        _binding = FragmentFavoritesBinding.inflate(inflater, container, false)
-        return binding.root
-    }
-
-    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
-        super.onViewCreated(view, savedInstanceState)
-
-        val trackAdapter = TrackAdapter(
-            tracks = emptyList(),
-            onItemClick = { track ->
-                val args = bundleOf("track" to track)
-                requireActivity()
-                    .findNavController(R.id.nav_host_fragment)
-                    .navigate(R.id.playerFragment, args)
-            },
-            onFavoriteClick = { track ->
-                favoritesViewModel.onFavoriteClicked(track)
-            }
-        )
-
-        binding.recyclerFavorites.layoutManager = LinearLayoutManager(requireContext())
-        binding.recyclerFavorites.adapter = trackAdapter
-
-        favoritesViewModel.favorites.observe(viewLifecycleOwner) { list ->
-            if (list.isEmpty()) {
-                binding.recyclerFavorites.visibility = View.GONE
-                binding.imagePlaceholderFavorites.visibility = View.VISIBLE
-                binding.textPlaceholderFavorites.visibility = View.VISIBLE
-            } else {
-                binding.imagePlaceholderFavorites.visibility = View.GONE
-                binding.textPlaceholderFavorites.visibility = View.GONE
-                binding.recyclerFavorites.visibility = View.VISIBLE
-                trackAdapter.updateTracks(list)
-            }
-        }
-    }
-
-    override fun onDestroyView() {
-        super.onDestroyView()
-        _binding = null
-    }
-}
\ No newline at end of file
diff --git a/app/src/main/java/com/example/playlistmaker/media/ui/Fragment/PlaylistsFragment.kt b/app/src/main/java/com/example/playlistmaker/media/ui/Fragment/PlaylistsFragment.kt
deleted file mode 100644
index 6dc8606..0000000
--- a/app/src/main/java/com/example/playlistmaker/media/ui/Fragment/PlaylistsFragment.kt
+++ /dev/null
@@ -1,81 +0,0 @@
-package com.example.playlistmaker.media.ui.Fragment
-
-import android.os.Bundle
-import android.view.LayoutInflater
-import android.view.View
-import android.view.ViewGroup
-import androidx.fragment.app.Fragment
-import androidx.lifecycle.Lifecycle
-import androidx.lifecycle.lifecycleScope
-import androidx.lifecycle.repeatOnLifecycle
-import androidx.navigation.fragment.findNavController
-import androidx.recyclerview.widget.GridLayoutManager
-import com.example.playlistmaker.R
-import org.koin.androidx.viewmodel.ext.android.viewModel
-import com.example.playlistmaker.databinding.FragmentPlaylistsBinding
-import com.example.playlistmaker.media.ui.adapter.PlaylistsAdapter
-import com.example.playlistmaker.media.ui.viewmodel.PlaylistViewModel
-import com.example.playlistmaker.media.ui.viewmodel.PlaylistsViewModel
-import kotlinx.coroutines.launch
-
-class PlaylistsFragment : Fragment() {
-
-    private var _binding: FragmentPlaylistsBinding? = null
-    private val binding get() = _binding!!
-
-    private lateinit var adapter: PlaylistsAdapter
-    private val viewModel: PlaylistsViewModel by viewModel()
-
-    companion object {
-        fun newInstance(): PlaylistsFragment = PlaylistsFragment()
-    }
-
-    override fun onCreateView(
-        inflater: LayoutInflater,
-        container: ViewGroup?,
-        savedInstanceState: Bundle?
-    ): View {
-        _binding = FragmentPlaylistsBinding.inflate(inflater, container, false)
-        return binding.root
-    }
-
-    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
-        super.onViewCreated(view, savedInstanceState)
-
-        binding.recyclerPlaylists.visibility = View.GONE
-        binding.imagePlaceholderPlaylists.visibility = View.VISIBLE
-        binding.textPlaceholderPlaylists.visibility = View.VISIBLE
-        binding.refreshButton.setOnClickListener {
-            findNavController().navigate(R.id.action_mediaLibrary_to_createPlaylist)
-        }
-
-        adapter = PlaylistsAdapter { playlist ->
-            val bundle = Bundle().apply { putLong("playlistId", playlist.id) }
-            findNavController().navigate(R.id.action_mediaLibrary_to_playlistWork, bundle)
-        }
-        binding.recyclerPlaylists.adapter = adapter
-        binding.recyclerPlaylists.layoutManager = GridLayoutManager(requireContext(), 2)
-
-        viewLifecycleOwner.lifecycleScope.launch {
-            viewLifecycleOwner.repeatOnLifecycle(Lifecycle.State.STARTED) {
-                viewModel.playlists.collect { list ->
-                    if (list.isEmpty()) {
-                        binding.recyclerPlaylists.visibility = View.GONE
-                        binding.imagePlaceholderPlaylists.visibility = View.VISIBLE
-                        binding.textPlaceholderPlaylists.visibility = View.VISIBLE
-                    } else {
-                        binding.recyclerPlaylists.visibility = View.VISIBLE
-                        binding.imagePlaceholderPlaylists.visibility = View.GONE
-                        binding.textPlaceholderPlaylists.visibility = View.GONE
-                        adapter.submitList(list)
-                    }
-                }
-            }
-        }
-    }
-
-    override fun onDestroyView() {
-        super.onDestroyView()
-        _binding = null
-    }
-}
\ No newline at end of file
diff --git a/app/src/main/java/com/example/playlistmaker/media/ui/MediaLibraryFragment.kt b/app/src/main/java/com/example/playlistmaker/media/ui/MediaLibraryFragment.kt
index 43316fa..081b5d6 100644
--- a/app/src/main/java/com/example/playlistmaker/media/ui/MediaLibraryFragment.kt
+++ b/app/src/main/java/com/example/playlistmaker/media/ui/MediaLibraryFragment.kt
@@ -5,62 +5,60 @@ import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
-import android.widget.TextView
+import androidx.compose.runtime.getValue
+import androidx.compose.ui.platform.ComposeView
+import androidx.compose.ui.platform.ViewCompositionStrategy
+import androidx.core.os.bundleOf
 import androidx.fragment.app.Fragment
+import androidx.lifecycle.compose.collectAsStateWithLifecycle
 import androidx.navigation.fragment.findNavController
 import com.example.playlistmaker.R
-import com.example.playlistmaker.databinding.FragmentMediaLibraryBinding
-import com.example.playlistmaker.media.ui.adapter.MediaLibraryPagerAdapter
-import com.google.android.material.tabs.TabLayoutMediator
+import com.example.playlistmaker.search.domain.model.Track
+import com.example.playlistmaker.ui.theme.AppTheme
+import org.koin.androidx.viewmodel.ext.android.viewModel
 
 class MediaLibraryFragment : Fragment() {
 
-    companion object {
-        fun newInstance(): MediaLibraryFragment = MediaLibraryFragment()
-    }
-
-    private var _binding: FragmentMediaLibraryBinding? = null
-    private val binding get() = _binding!!
-
-    private val STATE_KEY_SELECTED_TAB = "STATE_SELECTED_TAB"
+    private val vm: MediaLibraryViewModel by viewModel()
 
     override fun onCreateView(
-        inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?
+        inflater: LayoutInflater,
+        container: ViewGroup?,
+        savedInstanceState: Bundle?
     ): View {
-        _binding = FragmentMediaLibraryBinding.inflate(inflater, container, false)
-        return binding.root
-    }
-
-    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
-        super.onViewCreated(view, savedInstanceState)
-
-        binding.viewPager.adapter = MediaLibraryPagerAdapter(
-            fragmentManager = childFragmentManager,
-            lifecycle = viewLifecycleOwner.lifecycle
-        )
+        return ComposeView(requireContext()).apply {
+            setViewCompositionStrategy(ViewCompositionStrategy.DisposeOnViewTreeLifecycleDestroyed)
+            setContent {
+                val state by vm.state.collectAsStateWithLifecycle()
 
-        TabLayoutMediator(binding.tabLayout, binding.viewPager) { tab, position ->
-            tab.text = when (position) {
-                0 -> getString(R.string.tab_favorites)
-                else -> getString(R.string.tab_playlists)
+                AppTheme {
+                    MediaLibraryScreen(
+                        state = state,
+                        onTabSelect = vm::onTabSelected,
+                        onTrackClick = { track: Track ->
+                            findNavController().navigate(
+                                R.id.playerFragment,
+                                Bundle().apply { putSerializable("track", track) }
+                            )
+                        },
+                        onPlaylistClick = { playlistUi ->
+                            findNavController().navigate(
+                                R.id.action_mediaLibrary_to_playlistWork,
+                                bundleOf("playlistId" to playlistUi.id)
+                            )
+                        },
+                        onCreatePlaylistClick = {
+                            findNavController().navigate(R.id.action_mediaLibrary_to_createPlaylist)
+                        },
+                        emptyFavoritesImage = R.drawable.error_search,
+                        emptyPlaylistsImage = R.drawable.error_search
+                    )
+                }
             }
-        }.attach()
-
-        if (savedInstanceState != null) {
-            val savedTab = savedInstanceState.getInt(STATE_KEY_SELECTED_TAB, 0)
-            binding.viewPager.currentItem = savedTab
         }
     }
-
-    override fun onSaveInstanceState(outState: Bundle) {
-        super.onSaveInstanceState(outState)
-        _binding?.viewPager?.let { vp ->
-            outState.putInt(STATE_KEY_SELECTED_TAB, vp.currentItem)
-        }
-    }
-
-    override fun onDestroyView() {
-        super.onDestroyView()
-        _binding = null
+    override fun onResume() {
+        super.onResume()
+        vm.reload()
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/example/playlistmaker/media/ui/MediaLibraryScreen.kt b/app/src/main/java/com/example/playlistmaker/media/ui/MediaLibraryScreen.kt
new file mode 100644
index 0000000..806b7b3
--- /dev/null
+++ b/app/src/main/java/com/example/playlistmaker/media/ui/MediaLibraryScreen.kt
@@ -0,0 +1,373 @@
+package com.example.playlistmaker.media.ui
+
+import androidx.annotation.DrawableRes
+import androidx.compose.foundation.Image
+import androidx.compose.foundation.background
+import androidx.compose.foundation.layout.*
+import androidx.compose.foundation.lazy.LazyColumn
+import androidx.compose.foundation.lazy.items
+import androidx.compose.foundation.lazy.grid.GridCells
+import androidx.compose.foundation.lazy.grid.LazyVerticalGrid
+import androidx.compose.foundation.lazy.grid.items
+import androidx.compose.material.icons.Icons
+import androidx.compose.material3.*
+import androidx.compose.material3.TabRowDefaults.tabIndicatorOffset
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.draw.clip
+import androidx.compose.ui.layout.ContentScale
+import androidx.compose.ui.res.painterResource
+import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.text.style.TextAlign
+import androidx.compose.ui.unit.dp
+import coil.compose.AsyncImage
+import com.example.playlistmaker.R
+import com.example.playlistmaker.search.domain.model.Track
+import androidx.compose.foundation.clickable
+import androidx.compose.foundation.shape.RoundedCornerShape
+import androidx.compose.material.icons.filled.ChevronRight
+import androidx.compose.ui.res.colorResource
+import androidx.compose.ui.text.font.FontWeight
+import androidx.compose.ui.unit.sp
+import com.example.playlistmaker.search.ui.YSDisplay
+
+@Composable
+fun MediaLibraryScreen(
+    state: MediaLibraryState,
+    onTabSelect: (Int) -> Unit,
+    onTrackClick: (Track) -> Unit,
+    onPlaylistClick: (PlaylistUi) -> Unit,
+    onCreatePlaylistClick: () -> Unit,
+    @DrawableRes emptyFavoritesImage: Int,
+    @DrawableRes emptyPlaylistsImage: Int,
+) {
+    Column(
+        Modifier
+            .fillMaxSize()
+            .background(colorResource(R.color.color_background))
+            .padding(bottom = 0.dp)
+    ) {
+        Text(
+            text = stringResource(id = R.string.media_library_title),
+            modifier = Modifier.padding(start = 16.dp, end = 16.dp, top = 16.dp, bottom = 8.dp),
+            style = LocalTextStyle.current.copy(
+                fontFamily = YSDisplay,
+                fontWeight = FontWeight.Medium,
+                fontSize = 22.sp,
+                lineHeight = 22.sp,
+                letterSpacing = 0.sp,
+                color = colorResource(R.color.color_special_black)
+            )
+        )
+
+        TabRow(
+            selectedTabIndex = state.selectedTab,
+            containerColor = colorResource(R.color.color_background),
+            contentColor = colorResource(R.color.color_special_black),
+            indicator = { positions ->
+                TabRowDefaults.Indicator(
+                    modifier = Modifier.tabIndicatorOffset(positions[state.selectedTab]),
+                    height = 2.dp,
+                    color = colorResource(R.color.color_special_black)
+                )
+            },
+            divider = {}
+        ) {
+            Tab(
+                selected = state.selectedTab == 0,
+                onClick = { onTabSelect(0) },
+                text = {
+                    Text(
+                        text = stringResource(id = R.string.tab_favorites),
+                        style = LocalTextStyle.current.copy(
+                            fontFamily = YSDisplay,
+                            fontWeight = FontWeight.Medium,
+                            fontSize = 14.sp,
+                            lineHeight = 14.sp,
+                            color = colorResource(R.color.color_special_black)
+                        )
+                    )
+                }
+            )
+            Tab(
+                selected = state.selectedTab == 1,
+                onClick = { onTabSelect(1) },
+                text = {
+                    Text(
+                        text = stringResource(id = R.string.tab_playlists),
+                        style = LocalTextStyle.current.copy(
+                            fontFamily = YSDisplay,
+                            fontWeight = FontWeight.Medium,
+                            fontSize = 14.sp,
+                            lineHeight = 14.sp,
+                            color = colorResource(R.color.color_special_black)
+                        )
+                    )
+                }
+            )
+        }
+
+        when (state.selectedTab) {
+            0 -> FavoritesTab(
+                items = state.favorites,
+                onItemClick = onTrackClick,
+                emptyImage = emptyFavoritesImage,
+                emptyText = stringResource(R.string.media_empty_library)
+            )
+            else -> PlaylistsTab(
+                items = state.playlists,
+                onItemClick = onPlaylistClick,
+                onCreatePlaylistClick = onCreatePlaylistClick,
+                emptyImage = emptyPlaylistsImage,
+                emptyText = stringResource(R.string.media_empty_playlists)
+            )
+        }
+    }
+}
+
+@Composable
+private fun FavoritesTab(
+    items: List<Track>,
+    onItemClick: (Track) -> Unit,
+    @DrawableRes emptyImage: Int,
+    emptyText: String
+) {
+    if (items.isEmpty()) {
+        EmptyState(image = emptyImage, message = emptyText)
+    } else {
+        LazyColumn(
+            modifier = Modifier.fillMaxSize(),
+            contentPadding = PaddingValues(top = 24.dp, bottom = 4.dp),
+            verticalArrangement = Arrangement.spacedBy(4.dp)
+        ) {
+            items(items, key = { it.trackId }) { t ->
+                TrackRowLibrary(t, onItemClick)
+            }
+        }
+    }
+}
+
+@Composable
+private fun TrackRowLibrary(track: Track, onClick: (Track) -> Unit) {
+    val primary = colorResource(R.color.color_special_black)
+    val secondary = colorResource(R.color.color_gray)
+
+    Row(
+        modifier = Modifier
+            .fillMaxWidth()
+            .clickable { onClick(track) }
+            .padding(horizontal = 16.dp, vertical = 6.dp),
+        verticalAlignment = Alignment.CenterVertically
+    ) {
+        AsyncImage(
+            model = track.artworkUrl100,
+            contentDescription = null,
+            contentScale = ContentScale.Crop,
+            modifier = Modifier
+                .size(56.dp)
+                .clip(RoundedCornerShape(6.dp))
+        )
+        Spacer(Modifier.width(12.dp))
+
+        Column(Modifier.weight(1f)) {
+            Text(
+                text = track.trackName,
+                maxLines = 1,
+                style = LocalTextStyle.current.copy(
+                    fontFamily = YSDisplay,
+                    fontWeight = FontWeight.Medium,
+                    fontSize = 16.sp,
+                    lineHeight = 16.sp,
+                    color = primary
+                )
+            )
+            Spacer(Modifier.height(3.dp))
+            Row(verticalAlignment = Alignment.CenterVertically) {
+                Text(
+                    text = track.artistName,
+                    maxLines = 1,
+                    style = LocalTextStyle.current.copy(
+                        fontFamily = YSDisplay,
+                        fontWeight = FontWeight.Normal,
+                        fontSize = 14.sp,
+                        lineHeight = 14.sp,
+                        color = secondary
+                    )
+                )
+                Box(
+                    modifier = Modifier
+                        .padding(horizontal = 6.dp)
+                        .size(3.dp)
+                        .clip(RoundedCornerShape(percent = 50))
+                        .background(secondary)
+                )
+                Text(
+                    text = track.getFormattedTrackTime(),
+                    maxLines = 1,
+                    style = LocalTextStyle.current.copy(
+                        fontFamily = YSDisplay,
+                        fontWeight = FontWeight.Normal,
+                        fontSize = 14.sp,
+                        lineHeight = 14.sp,
+                        color = secondary
+                    )
+                )
+            }
+        }
+
+        Icon(
+            imageVector = Icons.Filled.ChevronRight,
+            contentDescription = null,
+            tint = secondary,
+            modifier = Modifier.size(20.dp)
+        )
+    }
+}
+
+@Composable
+private fun PlaylistsTab(
+    items: List<PlaylistUi>,
+    onItemClick: (PlaylistUi) -> Unit,
+    onCreatePlaylistClick: () -> Unit,
+    @DrawableRes emptyImage: Int,
+    emptyText: String
+) {
+
+    Column(
+        modifier = Modifier
+            .fillMaxSize(),
+        horizontalAlignment = Alignment.CenterHorizontally
+    ) {
+        Spacer(Modifier.height(24.dp))
+        Button(
+            onClick = onCreatePlaylistClick,
+            modifier = Modifier
+                .height(36.dp)
+                .defaultMinSize(minWidth = 0.dp)
+                .wrapContentWidth(),
+            shape = RoundedCornerShape(24.dp),
+            colors = ButtonDefaults.buttonColors(
+                containerColor = colorResource(R.color.color_black),
+                contentColor = colorResource(R.color.white)
+            ),
+            contentPadding = PaddingValues(
+                horizontal = 16.dp, vertical = 8.dp)
+        ) {
+            Text(
+                text = stringResource(R.string.create_playlist),
+                style = LocalTextStyle.current.copy(
+                    fontFamily = YSDisplay,
+                    fontWeight = FontWeight.Medium,
+                    fontSize = 14.sp,
+                    lineHeight = 14.sp
+                )
+            )
+        }
+
+        if (items.isEmpty()) {
+            Spacer(Modifier.height(24.dp))
+            EmptyState(image = emptyImage, message = emptyText)
+        } else {
+            // сетка 2 колонки, отступы Start/End 8dp, Top 16dp
+            LazyVerticalGrid(
+                columns = GridCells.Fixed(2),
+                modifier = Modifier
+                    .fillMaxSize(),
+                contentPadding = PaddingValues(
+                    start = 16.dp,
+                    end = 16.dp,
+                    top = 16.dp,
+                    bottom = 8.dp
+                ),
+                horizontalArrangement = Arrangement.spacedBy(12.dp),
+                verticalArrangement = Arrangement.spacedBy(16.dp)
+            ) {
+                items(items, key = { it.id }) { p ->
+                    PlaylistCard(item = p, onClick = { onItemClick(p) })
+                }
+            }
+        }
+    }
+}
+
+@Composable
+private fun PlaylistCard(item: PlaylistUi, onClick: () -> Unit) {
+    val context = androidx.compose.ui.platform.LocalContext.current
+    val data: Any? = item.coverUrl?.let { path ->
+        when {
+            path.isBlank() -> null
+            path.startsWith("http", true) -> path
+            path.startsWith("content://", true) -> android.net.Uri.parse(path)
+            else -> java.io.File(path)
+        }
+    }
+
+    Column(
+        modifier = Modifier
+            .fillMaxWidth()
+            .clickable(onClick = onClick)
+    ) {
+        AsyncImage(
+            model = coil.request.ImageRequest.Builder(context)
+                .data(data)
+                .crossfade(true)
+                .build(),
+            contentDescription = null,
+            placeholder = painterResource(R.drawable.zaglyshka),
+            error = painterResource(R.drawable.zaglyshka),
+            fallback = painterResource(R.drawable.zaglyshka),
+            contentScale = ContentScale.Crop,
+            modifier = Modifier
+                .aspectRatio(1f)
+                .clip(RoundedCornerShape(10.dp))
+        )
+
+        Spacer(Modifier.height(6.dp))
+        Text(
+            text = item.title,
+            maxLines = 1,
+            style = LocalTextStyle.current.copy(
+                fontFamily = YSDisplay,
+                fontWeight = FontWeight.Normal,
+                fontSize = 14.sp,
+                lineHeight = 14.sp,
+                color = colorResource(R.color.black)
+            )
+        )
+        Text(
+            text = stringResource(R.string.playlist_tracks_count, item.trackCount),
+            style = LocalTextStyle.current.copy(
+                fontFamily = YSDisplay,
+                fontWeight = FontWeight.Normal,
+                fontSize = 12.sp,
+                lineHeight = 12.sp,
+                color = colorResource(R.color.black)
+            )
+        )
+    }
+}
+
+@Composable
+private fun EmptyState(@DrawableRes image: Int, message: String) {
+    Column(
+        modifier = Modifier
+            .fillMaxWidth()
+            .padding(horizontal = 24.dp),
+        horizontalAlignment = Alignment.CenterHorizontally
+    ) {
+        Image(painter = painterResource(id = image), contentDescription = null, modifier = Modifier.size(120.dp))
+        Spacer(Modifier.height(16.dp))
+        Text(
+            text = message,
+            textAlign = TextAlign.Center,
+            style = LocalTextStyle.current.copy(
+                fontFamily = YSDisplay,
+                fontWeight = FontWeight.Medium,
+                fontSize = 19.sp,
+                lineHeight = 19.sp,
+                color = colorResource(R.color.black)
+            )
+        )
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/example/playlistmaker/media/ui/MediaLibraryState.kt b/app/src/main/java/com/example/playlistmaker/media/ui/MediaLibraryState.kt
new file mode 100644
index 0000000..0ee7c10
--- /dev/null
+++ b/app/src/main/java/com/example/playlistmaker/media/ui/MediaLibraryState.kt
@@ -0,0 +1,16 @@
+package com.example.playlistmaker.media.ui
+
+import com.example.playlistmaker.search.domain.model.Track
+
+data class MediaLibraryState(
+    val selectedTab: Int = 0,
+    val favorites: List<Track> = emptyList(),
+    val playlists: List<PlaylistUi> = emptyList(),
+)
+
+data class PlaylistUi(
+    val id: Long,
+    val title: String,
+    val trackCount: Int,
+    val coverUrl: String? = null
+)
\ No newline at end of file
diff --git a/app/src/main/java/com/example/playlistmaker/media/ui/MediaLibraryViewModel.kt b/app/src/main/java/com/example/playlistmaker/media/ui/MediaLibraryViewModel.kt
new file mode 100644
index 0000000..ddd674c
--- /dev/null
+++ b/app/src/main/java/com/example/playlistmaker/media/ui/MediaLibraryViewModel.kt
@@ -0,0 +1,37 @@
+package com.example.playlistmaker.media.ui
+
+import androidx.lifecycle.ViewModel
+import androidx.lifecycle.viewModelScope
+import com.example.playlistmaker.search.domain.model.Track
+import kotlinx.coroutines.async
+import kotlinx.coroutines.flow.MutableStateFlow
+import kotlinx.coroutines.flow.StateFlow
+import kotlinx.coroutines.flow.asStateFlow
+import kotlinx.coroutines.flow.update
+import kotlinx.coroutines.launch
+
+class MediaLibraryViewModel(
+    private val getFavoritesOnce: suspend () -> List<Track>,
+    private val getPlaylistsOnce: suspend () -> List<PlaylistUi>,
+) : ViewModel() {
+
+    private val _state = MutableStateFlow(MediaLibraryState())
+    val state: StateFlow<MediaLibraryState> = _state.asStateFlow()
+
+    fun onTabSelected(index: Int) {
+        _state.update { it.copy(selectedTab = index) }
+    }
+
+    fun reload() {
+        viewModelScope.launch {
+            val favDef = async { runCatching { getFavoritesOnce() }.getOrElse { emptyList() } }
+            val plsDef = async { runCatching { getPlaylistsOnce() }.getOrElse { emptyList() } }
+            _state.update {
+                it.copy(
+                    favorites = favDef.await(),
+                    playlists  = plsDef.await()
+                )
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/example/playlistmaker/media/ui/adapter/MediaLibraryPagerAdapter.kt b/app/src/main/java/com/example/playlistmaker/media/ui/adapter/MediaLibraryPagerAdapter.kt
deleted file mode 100644
index ad07a26..0000000
--- a/app/src/main/java/com/example/playlistmaker/media/ui/adapter/MediaLibraryPagerAdapter.kt
+++ /dev/null
@@ -1,23 +0,0 @@
-package com.example.playlistmaker.media.ui.adapter
-
-import androidx.fragment.app.Fragment
-import androidx.fragment.app.FragmentManager
-import androidx.lifecycle.Lifecycle
-import androidx.viewpager2.adapter.FragmentStateAdapter
-import com.example.playlistmaker.media.ui.Fragment.FavoritesFragment
-import com.example.playlistmaker.media.ui.Fragment.PlaylistsFragment
-
-class MediaLibraryPagerAdapter(
-    fragmentManager: FragmentManager,
-    lifecycle: Lifecycle
-) : FragmentStateAdapter(fragmentManager, lifecycle) {
-
-    override fun getItemCount(): Int = 2
-
-    override fun createFragment(position: Int): Fragment {
-        return when (position) {
-            0 -> FavoritesFragment.newInstance()
-            else -> PlaylistsFragment.newInstance()
-        }
-    }
-}
\ No newline at end of file
diff --git a/app/src/main/java/com/example/playlistmaker/search/ui/SearchFragment.kt b/app/src/main/java/com/example/playlistmaker/search/ui/SearchFragment.kt
index 90b2716..7cfd6c3 100644
--- a/app/src/main/java/com/example/playlistmaker/search/ui/SearchFragment.kt
+++ b/app/src/main/java/com/example/playlistmaker/search/ui/SearchFragment.kt
@@ -4,188 +4,116 @@ import android.content.Context
 import android.net.ConnectivityManager
 import android.net.NetworkCapabilities
 import android.os.Bundle
-import android.text.Editable
-import android.text.TextWatcher
-import android.view.LayoutInflater
-import android.view.View
-import android.view.ViewGroup
+import android.view.*
+import androidx.compose.ui.platform.ComposeView
 import androidx.fragment.app.Fragment
+import androidx.lifecycle.compose.collectAsStateWithLifecycle
 import androidx.lifecycle.lifecycleScope
 import androidx.navigation.fragment.findNavController
-import androidx.recyclerview.widget.LinearLayoutManager
-import com.example.playlistmaker.R
-import com.example.playlistmaker.databinding.FragmentSearchBinding
+import org.koin.androidx.viewmodel.ext.android.viewModel
 import com.example.playlistmaker.search.ui.viewmodel.SearchViewModel
-import kotlinx.coroutines.Job
+import androidx.compose.runtime.getValue
+import androidx.lifecycle.compose.LifecycleStartEffect
+import androidx.compose.runtime.LaunchedEffect
+import androidx.compose.runtime.CompositionLocalProvider
+import androidx.compose.runtime.remember
+import androidx.lifecycle.LiveData
+import androidx.compose.runtime.livedata.observeAsState
+import androidx.compose.runtime.mutableStateOf
+import com.example.playlistmaker.search.ui.viewmodel.SearchState
 import kotlinx.coroutines.delay
 import kotlinx.coroutines.launch
-import org.koin.androidx.viewmodel.ext.android.viewModel
+import androidx.compose.runtime.setValue
+import com.example.playlistmaker.R
 
 class SearchFragment : Fragment() {
 
-    private var _binding: FragmentSearchBinding? = null
-    private val binding get() = _binding!!
-
     private val viewModel: SearchViewModel by viewModel()
 
-    private lateinit var adapter: TrackAdapter
-    private lateinit var historyAdapter: TrackAdapter
-
-    private var searchJob: Job? = null
-    private var clickJob: Job? = null
-    private var textWatcher: TextWatcher? = null
-
-    override fun onCreateView(
-        inflater: LayoutInflater, container: ViewGroup?,
-        savedInstanceState: Bundle?
-    ): View {
-        _binding = FragmentSearchBinding.inflate(inflater, container, false)
-        return binding.root
-    }
-
-    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
-        super.onViewCreated(view, savedInstanceState)
-
-        adapter = TrackAdapter(
-            tracks = emptyList(),
-            onItemClick = { track ->
-            clickJob?.cancel()
-            clickJob = lifecycleScope.launch {
-                delay(300)
-                viewModel.saveTrack(track)
-                findNavController()
-                    .navigate(R.id.action_search_to_player, Bundle().apply {
-                        putSerializable("track", track)
-                    })
-            }
-        }
-        )
-        binding.recyclerView.apply {
-            layoutManager = LinearLayoutManager(requireContext())
-            adapter = this@SearchFragment.adapter
-        }
-
-        historyAdapter = TrackAdapter(
-            tracks = emptyList(),
-            onItemClick = { track ->
-            clickJob?.cancel()
-            clickJob = lifecycleScope.launch {
-                delay(300)
-                viewModel.saveTrack(track)
-                findNavController()
-                    .navigate(R.id.action_search_to_player, Bundle().apply {
-                        putSerializable("track", track)
-                    })
-            }
-        }
-        )
-        binding.historyRecyclerView.apply {
-            layoutManager = LinearLayoutManager(requireContext())
-            adapter = historyAdapter
-        }
-
-        textWatcher = object : TextWatcher {
-            override fun beforeTextChanged(s: CharSequence?, start: Int, count: Int, after: Int) { }
-            override fun onTextChanged(s: CharSequence?, start: Int, before: Int, count: Int) { }
-            override fun afterTextChanged(s: Editable?) {
-                val query = s?.toString() ?: ""
-                binding.clearButton.visibility =
-                    if (query.isNotEmpty()) View.VISIBLE else View.GONE
-
-                binding.progressBar.visibility = View.GONE
-                binding.emptyPlaceholder.visibility = View.GONE
-                binding.errorPlaceholder.visibility = View.GONE
+    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?) =
+        ComposeView(requireContext()).apply {
+            setContent {
+                val state by viewModel.state.observeAsState(SearchState())
+                var forceEmptyResults by remember { mutableStateOf(false) }
+                var localNoNetworkError by remember { mutableStateOf(false) }
+
+                SearchScreen(
+                    state = state,
+                    localNoNetworkError = localNoNetworkError,
+                    forceEmptyResults = forceEmptyResults,
+
+                    onTextChangedSideEffects = {
+                        localNoNetworkError = false
+                        forceEmptyResults = false
+                    },
+
+                    onDebouncedQuery = { q ->
+                        if (q.isEmpty()) {
+                            viewModel.loadHistory()
+                        } else {
+                            if (!isNetworkAvailable(requireContext())) {
+                                localNoNetworkError = true
+                            } else {
+                                viewModel.search(q)
+                            }
+                        }
+                    },
 
-                searchJob?.cancel()
-                searchJob = lifecycleScope.launch {
-                    if (query.isEmpty()) {
+                    onClearButton = {
+                        localNoNetworkError = false
+                        forceEmptyResults = true
                         viewModel.loadHistory()
-                    } else {
-                        delay(2000)
-                        if (!isNetworkAvailable()) {
-                            binding.historyContainer.visibility  = View.GONE
-                            binding.recyclerView.visibility = View.GONE
-                            binding.errorPlaceholder.visibility  = View.VISIBLE
+                    },
+
+                    onRefresh = { currentText ->
+                        if (currentText.isEmpty()) {
+                            forceEmptyResults = true
+                            localNoNetworkError = false
+                            viewModel.loadHistory()
+                        } else if (!isNetworkAvailable(requireContext())) {
+                            localNoNetworkError = true
                         } else {
-                            viewModel.search(query)
+                            localNoNetworkError = false
+                            viewModel.search(currentText)
                         }
-                    }
-                }
-            }
-        }
-        binding.searchEditText.addTextChangedListener(textWatcher)
-
-        binding.clearButton.setOnClickListener {
-            binding.searchEditText.text?.clear()
-            binding.errorPlaceholder.visibility = View.GONE
-            viewModel.loadHistory()
-        }
-
-        binding.clearHistoryButton.setOnClickListener {
-            viewModel.clearHistory()
-        }
-
-        binding.refreshButton.setOnClickListener {
-            val q = binding.searchEditText.text.toString()
-            if (q.isEmpty()) viewModel.loadHistory() else viewModel.search(q)
-        }
-
-        restoreSearchState()
-
-        viewModel.state.observe(viewLifecycleOwner) { state ->
-            binding.progressBar.visibility = if (state.isLoading) View.VISIBLE else View.GONE
-            binding.errorPlaceholder.visibility = if (state.isError) View.VISIBLE else View.GONE
-
-            val hasQuery  = state.query.isNotEmpty()
-            val noResults = state.tracks.isEmpty()
-
-            binding.emptyPlaceholder.visibility =
-                if (hasQuery && noResults && !state.isLoading && !state.isError)
-                    View.VISIBLE else View.GONE
+                    },
+
+                    onClearHistory = {
+                        forceEmptyResults = true
+                        localNoNetworkError = false
+                        viewModel.clearHistory()
+                    },
+
+                    onTrackClick = { track ->
+                        lifecycleScope.launch {
+                            delay(300)
+                            viewModel.saveTrack(track)
+                            findNavController().navigate(
+                                R.id.action_search_to_player,
+                                Bundle().apply { putSerializable("track", track) }
+                            )
+                        }
+                    },
 
-            if (state.query.isEmpty()) {
-                binding.recyclerView.visibility = View.GONE
-                if (state.showHistory && state.history.isNotEmpty()) {
-                    binding.historyContainer.visibility = View.VISIBLE
-                    historyAdapter.updateTracks(state.history)
-                } else {
-                    binding.historyContainer.visibility = View.GONE
-                }
-            } else {
-                binding.historyContainer.visibility = View.GONE
-                if (noResults) {
-                    binding.recyclerView.visibility = View.GONE
-                } else {
-                    adapter.updateTracks(state.tracks)
-                    binding.recyclerView.visibility = View.VISIBLE
-                }
+                    onRestore = {
+                        val last = viewModel.state.value
+                        if (last == null || last.query.isEmpty()) {
+                            forceEmptyResults = false
+                            viewModel.loadHistory()
+                        } else {
+                            forceEmptyResults = false
+                            viewModel.search(last.query)
+                        }
+                    }
+                )
             }
-
-            binding.clearHistoryButton.visibility =
-                if (state.showHistory) View.VISIBLE else View.GONE
         }
-    }
-
-    private fun restoreSearchState() {
-        val last = viewModel.state.value ?: return
-        binding.searchEditText.setText(last.query)
-        if (last.query.isEmpty()) viewModel.loadHistory()
-        else viewModel.search(last.query)
-    }
-
-    override fun onDestroyView() {
-        super.onDestroyView()
-        textWatcher?.let { binding.searchEditText.removeTextChangedListener(it) }
-        searchJob?.cancel()
-        clickJob?.cancel()
-        _binding = null
-    }
 
-    private fun isNetworkAvailable(): Boolean {
-        val cm = requireContext()
-            .getSystemService(Context.CONNECTIVITY_SERVICE) as ConnectivityManager
+    private fun isNetworkAvailable(context: Context): Boolean {
+        val cm = context.getSystemService(Context.CONNECTIVITY_SERVICE) as ConnectivityManager
         val net = cm.activeNetwork ?: return false
         val caps = cm.getNetworkCapabilities(net) ?: return false
-        return caps.hasCapability(NetworkCapabilities.NET_CAPABILITY_INTERNET) && caps.hasCapability(NetworkCapabilities.NET_CAPABILITY_VALIDATED)
+        return caps.hasCapability(NetworkCapabilities.NET_CAPABILITY_INTERNET) &&
+                caps.hasCapability(NetworkCapabilities.NET_CAPABILITY_VALIDATED)
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/example/playlistmaker/search/ui/SearchScreen.kt b/app/src/main/java/com/example/playlistmaker/search/ui/SearchScreen.kt
new file mode 100644
index 0000000..18f6b96
--- /dev/null
+++ b/app/src/main/java/com/example/playlistmaker/search/ui/SearchScreen.kt
@@ -0,0 +1,547 @@
+package com.example.playlistmaker.search.ui
+
+import androidx.annotation.DrawableRes
+import androidx.annotation.StringRes
+import androidx.compose.foundation.Image
+import androidx.compose.foundation.background
+import androidx.compose.foundation.clickable
+import androidx.compose.foundation.layout.*
+import androidx.compose.foundation.lazy.LazyColumn
+import androidx.compose.foundation.lazy.items
+import androidx.compose.foundation.lazy.rememberLazyListState
+import androidx.compose.foundation.rememberScrollState
+import androidx.compose.foundation.shape.RoundedCornerShape
+import androidx.compose.foundation.text.BasicTextField
+import androidx.compose.foundation.text.KeyboardActions
+import androidx.compose.foundation.text.KeyboardOptions
+import androidx.compose.foundation.verticalScroll
+import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.outlined.Clear
+import androidx.compose.material.icons.outlined.Search
+import androidx.compose.material3.*
+import androidx.compose.runtime.*
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.draw.clip
+import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.graphics.SolidColor
+import androidx.compose.ui.layout.ContentScale
+import androidx.compose.ui.res.colorResource
+import androidx.compose.ui.res.painterResource
+import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.text.font.Font
+import androidx.compose.ui.text.font.FontFamily
+import androidx.compose.ui.text.font.FontWeight
+import androidx.compose.ui.text.input.ImeAction
+import androidx.compose.ui.text.input.KeyboardType
+import androidx.compose.ui.text.style.TextAlign
+import androidx.compose.ui.unit.dp
+import androidx.compose.ui.unit.sp
+import coil.compose.AsyncImage
+import com.example.playlistmaker.R
+import com.example.playlistmaker.search.domain.model.Track
+import com.example.playlistmaker.search.ui.viewmodel.SearchState
+import kotlinx.coroutines.delay
+import androidx.compose.ui.text.TextStyle
+import androidx.compose.material.icons.filled.ChevronRight
+
+val YSDisplay = FontFamily(
+    Font(R.font.ys_display_regular, FontWeight.Normal), // 400
+    Font(R.font.ys_display_medium,  FontWeight.Medium)
+)
+
+@OptIn(ExperimentalMaterial3Api::class)
+@Composable
+fun SearchScreen(
+    state: SearchState,
+    localNoNetworkError: Boolean,
+    forceEmptyResults: Boolean,
+    onTextChangedSideEffects: () -> Unit,
+    onDebouncedQuery: (String) -> Unit,
+    onClearButton: () -> Unit,
+    onRefresh: (String) -> Unit,
+    onClearHistory: () -> Unit,
+    onTrackClick: (Track) -> Unit,
+    onRestore: () -> Unit
+) {
+    var text by remember { mutableStateOf(state.query) }
+    var isTypingDebounce by remember { mutableStateOf(false) }
+
+    LaunchedEffect(state.query) {
+        if (state.query != text) text = state.query
+    }
+    LaunchedEffect(Unit) { onRestore() }
+    LaunchedEffect(text) {
+        onTextChangedSideEffects()
+        isTypingDebounce = true
+        if (text.isEmpty()) {
+            onDebouncedQuery("")
+            isTypingDebounce = false
+        } else {
+            delay(2000)
+            onDebouncedQuery(text)
+            isTypingDebounce = false
+        }
+    }
+
+    Scaffold(
+        topBar = {
+            TopAppBar(
+                title = {
+                    Text(
+                        text = stringResource(R.string.search),
+                        style = LocalTextStyle.current.copy(
+                            fontFamily = YSDisplay,
+                            fontWeight = FontWeight.Medium,
+                            fontSize = 22.sp,
+                            lineHeight = 22.sp,
+                            letterSpacing = 0.sp
+                        )
+                    )
+                },
+                colors = TopAppBarDefaults.topAppBarColors(
+                    containerColor = colorResource(R.color.color_background),
+                    scrolledContainerColor = colorResource(R.color.color_background),
+                    titleContentColor = colorResource(R.color.color_special_black),
+                    navigationIconContentColor = colorResource(R.color.color_special_black),
+                    actionIconContentColor = colorResource(R.color.color_special_black)
+                )
+            )
+        }
+    ) { padding ->
+        Column(
+            Modifier
+                .fillMaxSize()
+                .padding(padding)
+                .background(colorResource(R.color.color_background))
+        ) {
+            SearchRowXmlLike(
+                value = text,
+                onValueChange = { new -> text = new },
+                onClear = {
+                    text = ""
+                    onClearButton()
+                },
+                onDone = { onDebouncedQuery(text) },
+                modifier = Modifier
+                    .padding(horizontal = 16.dp, vertical = 12.dp)
+            )
+
+            val hasQuery = text.isNotEmpty()
+            val noResults = state.tracks.isEmpty()
+
+            when {
+                isTypingDebounce && hasQuery -> Unit
+                forceEmptyResults -> Unit
+                !hasQuery && state.showHistory && state.history.isNotEmpty() -> {
+                    HistoryBlock(
+                        items = state.history,
+                        onClear = onClearHistory,
+                        onItemClick = onTrackClick
+                    )
+                }
+
+                state.isLoading -> {
+                    Box(Modifier.fillMaxSize(), contentAlignment = Alignment.Center) {
+                        CircularProgressIndicator()
+                    }
+                }
+
+                localNoNetworkError && hasQuery -> {
+                    ErrorPlaceholder(onRefresh = { onRefresh(text) })
+                }
+
+                hasQuery && !state.isLoading && !localNoNetworkError && noResults -> {
+                    EmptyPlaceholder()
+                }
+
+                state.tracks.isNotEmpty() -> {
+                    LazyColumn(
+                        modifier = Modifier.fillMaxWidth(),
+                        contentPadding = PaddingValues(vertical = 4.dp),
+                        verticalArrangement = Arrangement.spacedBy(4.dp)
+                    ) {
+                        items(state.tracks, key = { it.trackId }) { t ->
+                            TrackRowXmlLike(t, onTrackClick)
+                        }
+                    }
+                }
+
+                else -> Unit
+            }
+        }
+    }
+}
+
+@Composable
+private fun HistoryBlock(
+    items: List<Track>,
+    onClear: () -> Unit,
+    onItemClick: (Track) -> Unit,
+    modifier: Modifier = Modifier
+) {
+    val listState = rememberLazyListState()
+    val isLongList by remember {
+        derivedStateOf { listState.canScrollForward || listState.firstVisibleItemIndex > 0 }
+    }
+
+    Box(
+        modifier = modifier
+            .fillMaxSize()
+            .padding(top = 24.dp, start = 13.dp, end = 12.dp)
+    ) {
+        Column(Modifier.fillMaxSize()) {
+            Text(
+                text = stringResource(R.string.were_looking),
+                modifier = Modifier
+                    .fillMaxWidth()
+                    .padding(bottom = 8.dp),
+                textAlign = TextAlign.Center,
+                style = TextStyle(
+                    fontFamily = YSDisplay,
+                    fontWeight = FontWeight.Medium,
+                    fontSize = 19.sp,
+                    lineHeight = 19.sp,
+                    color = colorResource(R.color.color_special_black)
+                )
+            )
+
+            if (isLongList) {
+                LazyColumn(
+                    state = listState,
+                    modifier = Modifier
+                        .fillMaxSize()
+                        .padding(bottom = 56.dp), // запас под кнопку
+                    contentPadding = PaddingValues(vertical = 4.dp),
+                    verticalArrangement = Arrangement.spacedBy(4.dp)
+                ) {
+                    items(items, key = { it.trackId }) { t ->
+                        TrackRowXmlLike(t, onItemClick)
+                    }
+                }
+            } else {
+                LazyColumn(
+                    state = listState,
+                    modifier = Modifier.wrapContentHeight(),
+                    contentPadding = PaddingValues(vertical = 4.dp),
+                    verticalArrangement = Arrangement.spacedBy(4.dp)
+                ) {
+                    items(items, key = { it.trackId }) { t ->
+                        TrackRowXmlLike(t, onItemClick)
+                    }
+                }
+
+                Spacer(Modifier.height(16.dp))
+
+                ClearHistoryButton(
+                    onClick = onClear,
+                    modifier = Modifier
+                        .align(Alignment.CenterHorizontally)
+                )
+            }
+        }
+
+        if (isLongList) {
+            ClearHistoryButton(
+                onClick = onClear,
+                modifier = Modifier
+                    .align(Alignment.BottomCenter)
+                    .navigationBarsPadding()
+                    .padding(bottom = 8.dp)
+            )
+        }
+    }
+}
+
+@Composable
+private fun ClearHistoryButton(
+    onClick: () -> Unit,
+    modifier: Modifier = Modifier
+) {
+    Button(
+        onClick = onClick,
+        modifier = modifier
+            .height(36.dp)
+            .defaultMinSize(minWidth = 0.dp)
+            .wrapContentWidth(),
+        shape = RoundedCornerShape(24.dp),
+        colors = ButtonDefaults.buttonColors(
+            containerColor = colorResource(R.color.color_black),
+            contentColor = colorResource(R.color.white)
+        )
+    ) {
+        Text(
+            text = stringResource(R.string.clear_history),
+            style = TextStyle(
+                fontFamily = YSDisplay,
+                fontWeight = FontWeight.Medium,
+                fontSize = 14.sp,
+                lineHeight = 14.sp
+            )
+        )
+    }
+}
+
+@Composable
+private fun SearchRowXmlLike(
+    value: String,
+    onValueChange: (String) -> Unit,
+    onClear: () -> Unit,
+    onDone: () -> Unit,
+    modifier: Modifier = Modifier
+) {
+    val ysTextStyle = TextStyle(
+        fontFamily = YSDisplay,
+        fontWeight = FontWeight.Normal,
+        fontSize = 16.sp,
+        lineHeight = 16.sp,
+        letterSpacing = 0.sp
+    )
+
+    Row(
+        modifier
+            .fillMaxWidth()
+            .height(48.dp)
+            .clip(RoundedCornerShape(16.dp))
+            .background(colorResource(R.color.white_navigator)),
+        verticalAlignment = Alignment.CenterVertically
+    ) {
+        Icon(
+            imageVector = Icons.Outlined.Search,
+            contentDescription = null,
+            tint = colorResource(R.color.iconSearch),
+            modifier = Modifier
+                .padding(start = 12.dp)
+                .size(18.dp)
+        )
+
+        Spacer(Modifier.width(8.dp))
+        Box(
+            modifier = Modifier
+                .weight(1f)
+                .fillMaxHeight(),
+            contentAlignment = Alignment.CenterStart
+        ) {
+            if (value.isEmpty()) {
+                Text(
+                    text = stringResource(R.string.search),
+                    style = ysTextStyle,
+                    color = colorResource(R.color.search_hint_color)
+                )
+            }
+
+            BasicTextField(
+                value = value,
+                onValueChange = onValueChange,
+                singleLine = true,
+                textStyle = ysTextStyle.copy(color = colorResource(R.color.black_text_search)),
+                keyboardOptions = KeyboardOptions(
+                    imeAction = ImeAction.Done,
+                    keyboardType = KeyboardType.Text
+                ),
+                keyboardActions = KeyboardActions(onDone = { onDone() }),
+                cursorBrush = SolidColor(colorResource(R.color.black_text_search)),
+                modifier = Modifier.fillMaxWidth()
+            )
+        }
+
+        if (value.isNotEmpty()) {
+            IconButton(
+                onClick = onClear,
+                modifier = Modifier
+                    .padding(start = 6.dp, end = 12.dp)
+                    .size(24.dp)
+            ) {
+                Icon(
+                    imageVector = Icons.Outlined.Clear,
+                    contentDescription = null,
+                    tint = colorResource(R.color.iconSearch),
+                    modifier = Modifier.size(16.dp)
+                )
+            }
+        } else {
+            Spacer(Modifier.width(24.dp))
+        }
+    }
+}
+
+@Composable
+fun ErrorPlaceholder(onRefresh: () -> Unit) {
+    val scroll = rememberScrollState()
+    Column(
+        modifier = Modifier
+            .fillMaxSize()
+            .verticalScroll(scroll)
+            .padding(horizontal = 24.dp),
+        horizontalAlignment = Alignment.CenterHorizontally
+    ) {
+        Spacer(Modifier.height(24.dp))
+        Image(
+            painter = painterResource(R.drawable.error_internet),
+            contentDescription = null,
+            modifier = Modifier.size(120.dp)
+        )
+
+        Spacer(Modifier.height(16.dp))
+        Text(
+            text = stringResource(R.string.error_internet_text),
+            textAlign = TextAlign.Center,
+            style = TextStyle(
+                fontFamily = YSDisplay,
+                fontWeight = FontWeight.Medium,
+                fontSize = 19.sp,
+                lineHeight = 19.sp,
+                letterSpacing = 0.sp,
+                color = colorResource(R.color.color_special_black)
+            )
+        )
+
+        Spacer(Modifier.height(24.dp))
+        Button(
+            onClick = onRefresh,
+            modifier = Modifier
+                .height(36.dp)
+                .defaultMinSize(minWidth = 0.dp)
+                .wrapContentWidth(),
+            shape = RoundedCornerShape(24.dp),
+            colors = ButtonDefaults.buttonColors(
+                containerColor = colorResource(R.color.color_black),
+                contentColor = colorResource(R.color.white)
+            )
+        ) {
+            Text(
+                text = stringResource(R.string.refresh_button_text),
+                style = TextStyle(
+                    fontFamily = YSDisplay,
+                    fontWeight = FontWeight.Medium,
+                    fontSize = 14.sp,
+                    lineHeight = 14.sp,
+                    letterSpacing = 0.sp
+                )
+            )
+        }
+
+        Spacer(Modifier.height(24.dp))
+    }
+}
+
+@Composable
+fun EmptyPlaceholder() {
+    val scroll = rememberScrollState()
+    Column(
+        modifier = Modifier
+            .fillMaxSize()
+            .verticalScroll(scroll)
+            .padding(horizontal = 24.dp),
+        horizontalAlignment = Alignment.CenterHorizontally
+    ) {
+        Spacer(Modifier.height(24.dp))
+        Image(
+            painter = painterResource(R.drawable.error_search),
+            contentDescription = null,
+            modifier = Modifier.size(120.dp)
+        )
+
+        Spacer(Modifier.height(16.dp))
+        Text(
+            text = stringResource(R.string.error_search_text),
+            textAlign = TextAlign.Center,
+            style = TextStyle(
+                fontFamily = YSDisplay,
+                fontWeight = FontWeight.Medium,
+                fontSize = 19.sp,
+                lineHeight = 19.sp,
+                letterSpacing = 0.sp,
+                color = colorResource(R.color.color_special_black)
+            )
+        )
+
+        Spacer(Modifier.height(24.dp))
+    }
+}
+
+@Composable
+private fun TrackRowXmlLike(
+    track: Track,
+    onClick: (Track) -> Unit
+) {
+    val SecondaryGrey = colorResource(R.color.color_gray)
+    Row(
+        modifier = Modifier
+            .fillMaxWidth()
+            .clickable(onClick = { onClick(track) })
+            .padding(horizontal = 13.dp, vertical = 4.dp),
+        verticalAlignment = Alignment.CenterVertically
+    ) {
+        AsyncImage(
+            model = track.artworkUrl100,
+            contentDescription = null,
+            contentScale = ContentScale.Crop,
+            modifier = Modifier
+                .size(45.dp)
+                .clip(RoundedCornerShape(3.dp))
+        )
+
+        Spacer(Modifier.width(12.dp))
+
+        Column(
+            modifier = Modifier.weight(1f),
+        ) {
+            Text(
+                text = track.trackName,
+                maxLines = 1,
+                style = TextStyle(
+                    fontFamily = YSDisplay,
+                    fontWeight = FontWeight.Medium,
+                    fontSize = 16.sp,
+                    lineHeight = 16.sp,
+                    letterSpacing = 0.sp,
+                    color = colorResource(R.color.color_special_black)
+                )
+            )
+
+            Spacer(Modifier.height(3.dp))
+
+            Row(verticalAlignment = Alignment.CenterVertically) {
+                Text(
+                    text = track.artistName,
+                    maxLines = 1,
+                    style = TextStyle(
+                        fontFamily = YSDisplay,
+                        fontWeight = FontWeight.Normal,
+                        fontSize = 14.sp,
+                        lineHeight = 14.sp,
+                        letterSpacing = 0.sp,
+                        color = SecondaryGrey
+                    )
+                )
+                Box(
+                    modifier = Modifier
+                        .padding(horizontal = 6.dp)
+                        .size(3.dp)
+                        .clip(RoundedCornerShape(percent = 50))
+                        .background(SecondaryGrey)
+                )
+                Text(
+                    text = track.getFormattedTrackTime(),
+                    maxLines = 1,
+                    style = TextStyle(
+                        fontFamily = YSDisplay,
+                        fontWeight = FontWeight.Normal,
+                        fontSize = 14.sp,
+                        lineHeight = 14.sp,
+                        letterSpacing = 0.sp,
+                        color = SecondaryGrey
+                    )
+                )
+            }
+        }
+
+        Icon(
+            imageVector = Icons.Filled.ChevronRight,
+            contentDescription = null,
+            tint = colorResource(R.color.color_gray),
+            modifier = Modifier.size(20.dp)
+        )
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/example/playlistmaker/settings/ui/viewmodel/SettingsFragment.kt b/app/src/main/java/com/example/playlistmaker/settings/ui/viewmodel/SettingsFragment.kt
index a5da79e..0c65c1f 100644
--- a/app/src/main/java/com/example/playlistmaker/settings/ui/viewmodel/SettingsFragment.kt
+++ b/app/src/main/java/com/example/playlistmaker/settings/ui/viewmodel/SettingsFragment.kt
@@ -7,11 +7,15 @@ import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import androidx.appcompat.app.AppCompatDelegate
+import androidx.compose.ui.platform.ComposeView
+import androidx.compose.ui.platform.ViewCompositionStrategy
 import androidx.fragment.app.Fragment
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.livedata.observeAsState
 import com.example.playlistmaker.R
-import com.example.playlistmaker.databinding.FragmentSettingsBinding
 import com.example.playlistmaker.settings.ui.viewmodel.SettingsViewModel
-import com.google.android.material.switchmaterial.SwitchMaterial
+import com.example.playlistmaker.settingsjc.ui.SettingsScreen
+import com.example.playlistmaker.ui.theme.AppTheme
 import org.koin.androidx.viewmodel.ext.android.viewModel
 
 class SettingsFragment : Fragment() {
@@ -20,9 +24,6 @@ class SettingsFragment : Fragment() {
         fun newInstance(): SettingsFragment = SettingsFragment()
     }
 
-    private var _binding: FragmentSettingsBinding? = null
-    private val binding get() = _binding!!
-
     private val viewModel: SettingsViewModel by viewModel()
 
     override fun onCreateView(
@@ -30,56 +31,49 @@ class SettingsFragment : Fragment() {
         container: ViewGroup?,
         savedInstanceState: Bundle?
     ): View {
-        _binding = FragmentSettingsBinding.inflate(inflater, container, false)
-        return binding.root
-    }
-
-    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
-        super.onViewCreated(view, savedInstanceState)
-
-        val themeSwitcher: SwitchMaterial = binding.controlp
-        val shareButton = binding.share
-        val supportButton = binding.support
-        val termsButton = binding.agreement
-
-        viewModel.isDarkMode.observe(viewLifecycleOwner) { enabled ->
-            themeSwitcher.isChecked =
-                AppCompatDelegate.getDefaultNightMode() == AppCompatDelegate.MODE_NIGHT_YES
-
-            themeSwitcher.setOnCheckedChangeListener { _, isChecked ->
-                viewModel.switchTheme(isChecked)
-                requireActivity().recreate()
-            }
-
-            shareButton.setOnClickListener {
-                val intent = Intent(Intent.ACTION_SEND).apply {
-                    type = "text/plain"
-                    putExtra(Intent.EXTRA_TEXT, getString(R.string.android_development_course))
-                }
-                startActivity(Intent.createChooser(intent, getString(R.string.share_via)))
-            }
-
-            supportButton.setOnClickListener {
-                val uri = Uri.parse("mailto:${getString(R.string.email)}")
-                val emailIntent = Intent(Intent.ACTION_SENDTO, uri).apply {
-                    putExtra(Intent.EXTRA_SUBJECT, getString(R.string.subject))
-                    putExtra(Intent.EXTRA_TEXT, getString(R.string.body))
-                }
-                startActivity(emailIntent)
-            }
-
-            termsButton.setOnClickListener {
-                val intent = Intent(
-                    Intent.ACTION_VIEW,
-                    Uri.parse(getString(R.string.android_ofter_url))
+        return ComposeView(requireContext()).apply {
+            setViewCompositionStrategy(
+                ViewCompositionStrategy.DisposeOnViewTreeLifecycleDestroyed
+            )
+            setContent {
+                val dark by viewModel.isDarkMode.observeAsState(
+                    initial = AppCompatDelegate.getDefaultNightMode() == AppCompatDelegate.MODE_NIGHT_YES
                 )
-                startActivity(intent)
+                AppTheme(darkTheme = dark == true) {
+                    SettingsScreen(
+                        darkThemeEnabled = dark == true,
+                        onToggleDarkTheme = { enabled ->
+                            viewModel.switchTheme(enabled)
+                            requireActivity().recreate()
+                        },
+                        onShareClick = {
+                            val intent = Intent(Intent.ACTION_SEND).apply {
+                                type = "text/plain"
+                                putExtra(
+                                    Intent.EXTRA_TEXT,
+                                    getString(R.string.android_development_course)
+                                )
+                            }
+                            startActivity(Intent.createChooser(intent, getString(R.string.share_via)))
+                        },
+                        onSupportClick = {
+                            val uri = Uri.parse("mailto:${getString(R.string.email)}")
+                            val email = Intent(Intent.ACTION_SENDTO, uri).apply {
+                                putExtra(Intent.EXTRA_SUBJECT, getString(R.string.subject))
+                                putExtra(Intent.EXTRA_TEXT, getString(R.string.body))
+                            }
+                            startActivity(email)
+                        },
+                        onAgreementClick = {
+                            val intent = Intent(
+                                Intent.ACTION_VIEW,
+                                Uri.parse(getString(R.string.android_ofter_url))
+                            )
+                            startActivity(intent)
+                        }
+                    )
+                }
             }
         }
     }
-
-    override fun onDestroyView() {
-        super.onDestroyView()
-        _binding = null
-    }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/example/playlistmaker/settingsjc/ui/SettingsScreen.kt b/app/src/main/java/com/example/playlistmaker/settingsjc/ui/SettingsScreen.kt
index 258f717..54cb3e7 100644
--- a/app/src/main/java/com/example/playlistmaker/settingsjc/ui/SettingsScreen.kt
+++ b/app/src/main/java/com/example/playlistmaker/settingsjc/ui/SettingsScreen.kt
@@ -1,2 +1,184 @@
 package com.example.playlistmaker.settingsjc.ui
 
+import androidx.compose.foundation.background
+import androidx.compose.foundation.clickable
+import androidx.compose.foundation.layout.*
+import androidx.compose.material3.*
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.res.colorResource
+import androidx.compose.ui.res.dimensionResource
+import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.text.TextStyle
+import androidx.compose.ui.text.font.Font
+import androidx.compose.ui.text.font.FontFamily
+import androidx.compose.ui.text.font.FontWeight
+import androidx.compose.ui.unit.dp
+import androidx.compose.ui.unit.sp
+import com.example.playlistmaker.R
+import androidx.compose.material.Switch as SwitchM2
+import androidx.compose.material.SwitchDefaults as SwitchDefaultsM2
+import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.outlined.ChevronRight
+import androidx.compose.material.icons.outlined.HeadsetMic
+import androidx.compose.material.icons.outlined.Share
+import androidx.compose.material3.Icon as IconM3
+
+private val YSDisplay = FontFamily(
+    Font(R.font.ys_display_regular, FontWeight.Normal),
+    Font(R.font.ys_display_medium,  FontWeight.Medium)
+)
+
+@Composable
+fun SettingsScreen(
+    darkThemeEnabled: Boolean,
+    onToggleDarkTheme: (Boolean) -> Unit,
+    onShareClick: () -> Unit,
+    onSupportClick: () -> Unit,
+    onAgreementClick: () -> Unit,
+) {
+    val bg = colorResource(R.color.color_background)
+    val textPrimary = colorResource(R.color.black_setting)
+    val rowStart = dimensionResource(R.dimen.margin_start)
+    val rowV = dimensionResource(R.dimen.layout_margin_setting)
+    val iconSize = dimensionResource(R.dimen.margin_bottom_setting)
+    val rowEnd = dimensionResource(R.dimen.margin_setting_end)
+    val headerBottom = dimensionResource(R.dimen.margin_bottom_setting)
+    val blue = colorResource(R.color.blue)
+    val gray = colorResource(R.color.color_gray)
+    val white = colorResource(R.color.white)
+    val iconTint = if (darkThemeEnabled)
+        colorResource(R.color.black_setting)
+    else
+        colorResource(R.color.color_gray)
+
+    Column(
+        modifier = Modifier
+            .fillMaxSize()
+            .background(bg)
+            .navigationBarsPadding()
+    ) {
+        Text(
+            text = stringResource(R.string.settings),
+            style = TextStyle(
+                fontFamily = YSDisplay,
+                fontWeight = FontWeight.Medium,
+                fontSize = 22.sp,
+                lineHeight = 22.sp,
+                color = textPrimary
+            ),
+            modifier = Modifier
+                .fillMaxWidth()
+                .padding(start = rowStart, top = 16.dp, bottom = 61.dp)
+        )
+
+        Row(
+            modifier = Modifier
+                .fillMaxWidth()
+                .clickable { onToggleDarkTheme(!darkThemeEnabled) }
+                .padding(start = rowStart, end = rowEnd, bottom = 42.dp),
+            verticalAlignment = Alignment.CenterVertically
+        ) {
+            Text(
+                text = stringResource(R.string.black_theme),
+                style = TextStyle(
+                    fontFamily = YSDisplay,
+                    fontWeight = FontWeight.Normal,
+                    fontSize = 16.sp,          // TextStyle_menu
+                    lineHeight = 16.sp,
+                    color = textPrimary
+                ),
+                modifier = Modifier.weight(1f)
+            )
+            SwitchM2(
+                checked = darkThemeEnabled,
+                onCheckedChange = onToggleDarkTheme,
+                colors = SwitchDefaultsM2.colors(
+                    checkedThumbColor = colorResource(R.color.blue),
+                    checkedTrackColor = gray.copy(alpha = 1f),
+                    uncheckedThumbColor = colorResource(R.color.color_gray),
+                    uncheckedTrackColor = gray.copy(alpha = 1f),
+                )
+            )
+        }
+
+        Row(
+            modifier = Modifier
+                .fillMaxWidth()
+                .clickable(onClick = onShareClick)
+                .padding(start = rowStart, end = rowEnd, bottom = 42.dp),
+            verticalAlignment = Alignment.CenterVertically
+        ) {
+            Text(
+                text = stringResource(R.string.to_share),
+                style = TextStyle(
+                    fontFamily = YSDisplay,
+                    fontWeight = FontWeight.Normal,
+                    fontSize = 16.sp,
+                    lineHeight = 16.sp,
+                    color = textPrimary
+                ),
+                modifier = Modifier.weight(1f)
+            )
+            IconM3(
+                imageVector = Icons.Outlined.Share,
+                contentDescription = null,
+                tint = iconTint,
+                modifier = Modifier.size(iconSize)
+            )
+        }
+
+        Row(
+            modifier = Modifier
+                .fillMaxWidth()
+                .clickable(onClick = onSupportClick)
+                .padding(start = rowStart, end = rowEnd, bottom = 42.dp),
+            verticalAlignment = Alignment.CenterVertically
+        ) {
+            Text(
+                text = stringResource(R.string.to_write),
+                style = TextStyle(
+                    fontFamily = YSDisplay,
+                    fontWeight = FontWeight.Normal,
+                    fontSize = 16.sp,
+                    lineHeight = 16.sp,
+                    color = textPrimary
+                ),
+                modifier = Modifier.weight(1f)
+            )
+            IconM3(
+                imageVector = Icons.Outlined.HeadsetMic,
+                contentDescription = null,
+                tint = iconTint,
+                modifier = Modifier.size(iconSize)
+            )
+        }
+
+        Row(
+            modifier = Modifier
+                .fillMaxWidth()
+                .clickable(onClick = onAgreementClick)
+                .padding(start = rowStart, end = rowEnd),
+            verticalAlignment = Alignment.CenterVertically
+        ) {
+            Text(
+                text = stringResource(R.string.agrement),
+                style = TextStyle(
+                    fontFamily = YSDisplay,
+                    fontWeight = FontWeight.Normal,
+                    fontSize = 16.sp,
+                    lineHeight = 16.sp,
+                    color = textPrimary
+                ),
+                modifier = Modifier.weight(1f)
+            )
+            IconM3(
+                imageVector = Icons.Outlined.ChevronRight,
+                contentDescription = null,
+                tint = iconTint,
+                modifier = Modifier.size(iconSize)
+            )
+        }
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/example/playlistmaker/ui/theme/Theme.kt b/app/src/main/java/com/example/playlistmaker/ui/theme/Theme.kt
index 6743f81..d244a96 100644
--- a/app/src/main/java/com/example/playlistmaker/ui/theme/Theme.kt
+++ b/app/src/main/java/com/example/playlistmaker/ui/theme/Theme.kt
@@ -1,3 +1,20 @@
 package com.example.playlistmaker.ui.theme
 
-class Theme
\ No newline at end of file
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.darkColorScheme
+import androidx.compose.material3.lightColorScheme
+import androidx.compose.runtime.Composable
+
+private val LightColors = lightColorScheme()
+private val DarkColors = darkColorScheme()
+
+@Composable
+fun AppTheme(
+    darkTheme: Boolean = false,
+    content: @Composable () -> Unit
+) {
+    MaterialTheme(
+        colorScheme = if (darkTheme) DarkColors else LightColors,
+        content = content
+    )
+}
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_favorites.xml b/app/src/main/res/layout/fragment_favorites.xml
deleted file mode 100644
index 8b021a1..0000000
--- a/app/src/main/res/layout/fragment_favorites.xml
+++ /dev/null
@@ -1,49 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:id="@+id/favorites_fragment_root"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:background="@color/color_background">
-
-    <androidx.recyclerview.widget.RecyclerView
-        android:id="@+id/recycler_favorites"
-        android:layout_width="0dp"
-        android:layout_height="0dp"
-        android:visibility="gone"
-        app:layout_constraintTop_toTopOf="parent"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintEnd_toEndOf="parent" />
-
-    <ImageView
-        android:id="@+id/image_placeholder_favorites"
-        android:layout_width="120dp"
-        android:layout_height="120dp"
-        android:src="@drawable/error_search"
-        android:layout_marginTop="106dp"
-        android:visibility="visible"
-        app:layout_constraintTop_toTopOf="parent"
-        app:layout_constraintBottom_toTopOf="@+id/text_placeholder_favorites"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        android:layout_marginBottom="16dp" />
-
-    <TextView
-        android:id="@+id/text_placeholder_favorites"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:text="Ваша медиатека пуста"
-        style="@style/error_fragment_text_style"
-        android:visibility="visible"
-        app:layout_constraintTop_toBottomOf="@id/image_placeholder_favorites"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintEnd_toEndOf="parent" />
-
-    <androidx.recyclerview.widget.RecyclerView
-        android:id="@+id/recyclerFavorites"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"/>
-
-</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_media_library.xml b/app/src/main/res/layout/fragment_media_library.xml
deleted file mode 100644
index 91fe715..0000000
--- a/app/src/main/res/layout/fragment_media_library.xml
+++ /dev/null
@@ -1,49 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:id="@+id/media_library_root"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:background="@color/color_background">
-
-    <TextView
-        android:id="@+id/text_title"
-        style="@style/TextStyleSetting"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="14dp"
-        android:layout_marginStart="16dp"
-        android:text="Медиатека"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent" />
-
-    <com.google.android.material.tabs.TabLayout
-        android:id="@+id/tab_layout"
-        android:background="@color/color_background"
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="16dp"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@id/text_title"
-        app:tabIndicatorColor="@color/black"
-        app:tabIndicatorFullWidth="false"
-        app:tabMode="fixed"
-        app:tabTextColor="@color/black"
-        app:tabSelectedTextColor="@color/black"
-        app:tabTextAppearance="@style/style_tab_fragment"/>
-
-    <androidx.viewpager2.widget.ViewPager2
-        android:background="@color/color_background"
-        android:id="@+id/view_pager"
-        android:layout_width="0dp"
-        android:layout_height="0dp"
-        android:layout_marginTop="8dp"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@id/tab_layout" />
-
-</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_search.xml b/app/src/main/res/layout/fragment_search.xml
deleted file mode 100644
index 316c9e5..0000000
--- a/app/src/main/res/layout/fragment_search.xml
+++ /dev/null
@@ -1,173 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:id="@+id/main"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:background="@color/color_background"
-    android:orientation="vertical"
-    android:fitsSystemWindows="true"
-    tools:context=".SearchActivity">
-
-    <FrameLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content">
-
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:gravity="center_vertical"
-            android:orientation="horizontal"
-            tools:ignore="UselessParent">
-
-            <TextView
-                style="@style/TextStyleSetting"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginStart="@dimen/margin_start"
-                android:layout_marginTop="@dimen/margin_top"
-                android:layout_marginBottom="@dimen/margin_bottom"
-                android:text="@string/search" />
-        </LinearLayout>
-    </FrameLayout>
-
-    <FrameLayout
-        android:id="@+id/search_menu"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_gravity="center">
-
-        <ImageView
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="@dimen/margin_start"
-            android:layout_marginTop="8dp"
-            android:layout_marginEnd="@dimen/margin_end"
-            android:layout_marginBottom="8dp"
-            android:background="@drawable/edittext_background"
-            android:paddingVertical="24dp" />
-
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:gravity="center_vertical"
-            android:orientation="horizontal">
-
-            <ImageView
-                style="@style/IconSearch"
-                android:src="@drawable/search_vector" />
-
-            <EditText
-                android:id="@+id/searchEditText"
-                style="@style/TextStyleSearch"
-                android:layout_width="0dp"
-                android:layout_height="match_parent"
-                android:layout_weight="1"
-                android:background="@android:color/transparent"
-                android:hint="@string/search"
-                android:textCursorDrawable="@drawable/text_cursor"
-                android:inputType="text"
-                android:imeOptions="actionDone"
-                android:singleLine="true"/>
-
-            <ImageView
-                android:id="@+id/clearButton"
-                android:layout_width="16dp"
-                android:layout_height="16dp"
-                android:layout_gravity="center_vertical"
-                android:layout_marginStart="6dp"
-                android:layout_marginEnd="24dp"
-                android:src="@drawable/close_text"
-                android:visibility="gone" />
-        </LinearLayout>
-    </FrameLayout>
-
-    <LinearLayout
-        android:id="@+id/historyContainer"
-        style="@style/historyContainer"
-        android:visibility="gone">
-
-        <TextView
-            style="@style/historyTitle"
-            android:id="@+id/historyTitle"
-            android:text="@string/were_looking"/>
-
-        <androidx.recyclerview.widget.RecyclerView
-            android:id="@+id/historyRecyclerView"
-            style="@style/historyRecyclerView" />
-
-        <TextView
-            android:id="@+id/clearHistoryButton"
-            style="@style/clearHistoryButton"
-            android:text="@string/clear_history"
-            android:visibility="visible"/>
-
-    </LinearLayout>
-
-    <ScrollView
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content">
-
-    <LinearLayout
-        android:id="@+id/errorPlaceholder"
-        style="@style/error_placholder_style"
-        android:visibility="gone">
-
-        <ImageView
-            style="@style/error_internet_image_style"
-            android:src="@drawable/error_internet" />
-
-        <TextView
-            style="@style/error_internet_text_style"
-            android:text="@string/error_internet_text" />
-
-        <TextView
-            android:id="@+id/refreshButton"
-            style="@style/refresh_button_style"
-            android:text="@string/refresh_button_text"/>
-
-    </LinearLayout>
-    </ScrollView>
-
-    <ScrollView
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content">
-    <LinearLayout
-        android:id="@+id/emptyPlaceholder"
-        style="@style/error_placholder_style"
-        android:visibility="gone">
-        <ImageView
-            style="@style/error_search_image_style"
-            android:src="@drawable/error_search"/>
-        <TextView
-            style="@style/error_search_text_style"
-            android:text="@string/error_search_text" />
-
-    </LinearLayout>
-    </ScrollView>
-
-    <androidx.recyclerview.widget.RecyclerView
-        android:id="@+id/recyclerView"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_weight="1"
-        android:visibility="gone"
-        tools:listitem="@layout/item_track" />
-
-    <FrameLayout
-        android:layout_width="match_parent"
-        android:layout_height="0dp"
-        android:layout_weight="1">
-
-        <ProgressBar
-            android:id="@+id/progressBar"
-            android:layout_width="44dp"
-            android:layout_height="44dp"
-            android:layout_gravity="center_horizontal"
-            android:layout_marginTop="140dp"
-            android:visibility="gone"
-            android:indeterminateTint="@color/blue" />
-    </FrameLayout>
-
-</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_settings.xml b/app/src/main/res/layout/fragment_settings.xml
deleted file mode 100644
index 598be62..0000000
--- a/app/src/main/res/layout/fragment_settings.xml
+++ /dev/null
@@ -1,98 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:id="@+id/main"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:orientation="vertical"
-    android:background="@color/color_background"
-    tools:context=".SettingActivity">
-
-    <FrameLayout
-        style="@style/FrameStyle"
-        android:layout_marginBottom="@dimen/margin_bottom_setting">
-
-        <LinearLayout
-            style="@style/LinerStyle">
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="@string/settings"
-                style="@style/TextStyleSetting"
-                android:layout_marginStart="@dimen/margin_start"
-                android:layout_marginTop="@dimen/margin_top"
-                android:layout_marginBottom="@dimen/margin_bottom" />
-        </LinearLayout>
-    </FrameLayout>
-
-        <LinearLayout
-            style="@style/LinerStyle">
-
-            <TextView
-                style="@style/TextStyle_menu"
-                android:layout_weight="1"
-                android:text="@string/black_theme"/>
-
-            <com.google.android.material.switchmaterial.SwitchMaterial
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:id="@+id/controlp"
-                android:layout_marginEnd="@dimen/margin_setting_end"
-                android:backgroundTint="@color/white"
-                app:useMaterialThemeColors="false"
-                app:thumbTint="@color/switch_thumb_color"
-                app:trackTint="@color/switch_track_color"
-                tools:ignore="UseSwitchCompatOrMaterialXml" />
-        </LinearLayout>
-
-        <LinearLayout
-            android:id="@+id/share"
-            style="@style/LinerStyle">
-
-            <TextView
-                style="@style/TextStyle_menu"
-                android:layout_weight="1"
-                android:text="@string/to_share" />
-
-            <ImageButton
-                android:id="@+id/vectorShare"
-                style="@style/IconStyleButton"
-                android:src="@drawable/vectorshare" />
-
-        </LinearLayout>
-
-        <LinearLayout
-            android:id="@+id/support"
-            style="@style/LinerStyle">
-
-            <TextView
-                android:layout_weight="1"
-                android:text="@string/to_write"
-                style="@style/TextStyle_menu" />
-
-            <ImageButton
-                android:id="@+id/supportVector"
-                style="@style/IconStyleButton"
-                android:src="@drawable/group" />
-
-        </LinearLayout>
-
-        <LinearLayout
-            android:id="@+id/agreement"
-            style="@style/LinerStyle">
-
-            <TextView
-                android:layout_weight="1"
-                android:text="@string/agrement"
-                style="@style/TextStyle_menu" />
-
-            <ImageButton
-                android:id="@+id/agreementVector"
-                style="@style/IconStyleButton"
-                android:src="@drawable/back" />
-
-        </LinearLayout>
-
-</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 27547c1..a333cc7 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -32,4 +32,12 @@ https://practicum.yandex.ru/profile/android-developer-plus/</string>
     <string name="share">Поделиться</string>
     <string name="more">Меню</string>
     <string name="empty_tracks">В этом плейлисте нет треков</string>
+    <string name="media_library_title">Медиатека</string>
+    <string name="create_playlist">Новый плейлист</string>
+    <string name="media_empty_library">Ваша медиатека пуста</string>
+    <string name="media_empty_playlists">Вы не создали ни одного плейлиста</string>
+    <string name="playlist_tracks_count">%1$d треков</string>
+    <string name="no_internet_message">Нет подключения к интернету</string>
+    <string name="search_hint">подсказка</string>
+    search_hint
 </resources>
\ No newline at end of file
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index fb7aeba..ab6dbfd 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -1,6 +1,6 @@
 [versions]
 agp = "8.7.1"
-kotlin = "1.9.21"
+kotlin = "1.9.22"
 coreKtx = "1.13.1"
 junit = "4.13.2"
 junitVersion = "1.2.1"

From 68da9e383ca75b713e99742bbd031d9b3b714969 Mon Sep 17 00:00:00 2001
From: VankaGam <122173219+VankaGam@users.noreply.github.com>
Date: Sun, 12 Oct 2025 19:14:51 +0300
Subject: [PATCH 3/3] Level 1 verstka ispravlena

---
 .../media/ui/MediaLibraryScreen.kt            | 43 ++++++++++++++++---
 1 file changed, 38 insertions(+), 5 deletions(-)

diff --git a/app/src/main/java/com/example/playlistmaker/media/ui/MediaLibraryScreen.kt b/app/src/main/java/com/example/playlistmaker/media/ui/MediaLibraryScreen.kt
index 806b7b3..a226bc9 100644
--- a/app/src/main/java/com/example/playlistmaker/media/ui/MediaLibraryScreen.kt
+++ b/app/src/main/java/com/example/playlistmaker/media/ui/MediaLibraryScreen.kt
@@ -134,7 +134,7 @@ private fun FavoritesTab(
     emptyText: String
 ) {
     if (items.isEmpty()) {
-        EmptyState(image = emptyImage, message = emptyText)
+        FavoritesEmptyState(image = emptyImage, message = emptyText)
     } else {
         LazyColumn(
             modifier = Modifier.fillMaxSize(),
@@ -165,8 +165,8 @@ private fun TrackRowLibrary(track: Track, onClick: (Track) -> Unit) {
             contentDescription = null,
             contentScale = ContentScale.Crop,
             modifier = Modifier
-                .size(56.dp)
-                .clip(RoundedCornerShape(6.dp))
+                .size(45.dp)
+                .clip(RoundedCornerShape(3.dp))
         )
         Spacer(Modifier.width(12.dp))
 
@@ -352,8 +352,9 @@ private fun PlaylistCard(item: PlaylistUi, onClick: () -> Unit) {
 private fun EmptyState(@DrawableRes image: Int, message: String) {
     Column(
         modifier = Modifier
-            .fillMaxWidth()
-            .padding(horizontal = 24.dp),
+            .fillMaxSize()
+            .padding(horizontal = 24.dp)
+            .padding(top = 40.dp),
         horizontalAlignment = Alignment.CenterHorizontally
     ) {
         Image(painter = painterResource(id = image), contentDescription = null, modifier = Modifier.size(120.dp))
@@ -370,4 +371,36 @@ private fun EmptyState(@DrawableRes image: Int, message: String) {
             )
         )
     }
+}
+
+@Composable
+private fun FavoritesEmptyState(
+    @DrawableRes image: Int,
+    message: String
+) {
+    Column(
+        modifier = Modifier
+            .fillMaxSize()
+            .padding(horizontal = 24.dp)
+            .padding(top = 106.dp),
+        horizontalAlignment = Alignment.CenterHorizontally
+    ) {
+        Image(
+            painter = painterResource(id = image),
+            contentDescription = null,
+            modifier = Modifier.size(120.dp)
+        )
+        Spacer(Modifier.height(16.dp))
+        Text(
+            text = message,
+            textAlign = TextAlign.Center,
+            style = LocalTextStyle.current.copy(
+                fontFamily = YSDisplay,
+                fontWeight = FontWeight.Medium,
+                fontSize = 19.sp,
+                lineHeight = 19.sp,
+                color = colorResource(R.color.black)
+            )
+        )
+    }
 }
\ No newline at end of file