From 0473759240f35790fdc77aa9889cae41d3503d58 Mon Sep 17 00:00:00 2001
From: fish-dd <pusedzhuse228@gmail.com>
Date: Sat, 14 Dec 2024 22:16:04 +0300
Subject: [PATCH 1/2] =?UTF-8?q?=D0=B4=D0=BE=D0=B1=D0=B0=D0=B2=D0=B8=D0=BB?=
 =?UTF-8?q?=20edge-to-edge=20=D0=B4=D0=BB=D1=8F=20=D0=BC=D0=BE=D0=B4=D0=BD?=
 =?UTF-8?q?=D0=B5=D0=BD=D1=8C=D0=BA=D0=B8=D1=85=20=D1=82=D0=B5=D0=BB=D0=B5?=
 =?UTF-8?q?=D1=84=D0=BE=D0=BD=D1=87=D0=B8=D0=BA=D0=BE=D0=B2=20=D1=81=20?=
 =?UTF-8?q?=D0=B0=D0=BD=D0=B4=D1=80=D0=BE=D0=B8=D0=B4=20=D0=BD=D0=BE=D0=B2?=
 =?UTF-8?q?=D0=B5=D0=B5=204.4=20(=D1=81=D0=BA=D0=BE=D1=80=D0=B5=D0=B5=20?=
 =?UTF-8?q?=D0=B2=D1=81=D0=B5=D0=B3=D0=BE=20=D0=BE=D0=BD=D0=BE=20=D0=B7?=
 =?UTF-8?q?=D0=B0=D0=BF=D1=83=D1=81=D1=82=D0=B8=D1=82=D1=81=D1=8F=20=D0=BC?=
 =?UTF-8?q?=D0=B8=D0=BD=D0=B8=D0=BC=D1=83=D0=BC=20=D0=BD=D0=B0=20=D0=B0?=
 =?UTF-8?q?=D0=BD=D0=B4=D1=80=D0=BE=D0=B8=D0=B4=2016=20=D0=BD=D0=BE=20?=
 =?UTF-8?q?=D0=BD=D0=B0=D1=81=D1=80=D0=B0=D1=82=D1=8C)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .idea/compiler.xml                            |  2 +-
 .idea/deploymentTargetSelector.xml            | 10 ----------
 .idea/gradle.xml                              |  2 +-
 .idea/misc.xml                                |  2 +-
 app/build.gradle.kts                          |  1 +
 .../platon/easymusicandroid/MainActivity.kt   | 19 ++++++++++++++-----
 gradle/libs.versions.toml                     |  2 +-
 gradle/wrapper/gradle-wrapper.properties      |  2 +-
 8 files changed, 20 insertions(+), 20 deletions(-)
 delete mode 100644 .idea/deploymentTargetSelector.xml

diff --git a/.idea/compiler.xml b/.idea/compiler.xml
index b589d56..b86273d 100644
--- a/.idea/compiler.xml
+++ b/.idea/compiler.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="CompilerConfiguration">
-    <bytecodeTargetLevel target="17" />
+    <bytecodeTargetLevel target="21" />
   </component>
 </project>
\ No newline at end of file
diff --git a/.idea/deploymentTargetSelector.xml b/.idea/deploymentTargetSelector.xml
deleted file mode 100644
index 5e2bddb..0000000
--- a/.idea/deploymentTargetSelector.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="deploymentTargetSelector">
-    <selectionStates>
-      <SelectionState runConfigName="release">
-        <option name="selectionMode" value="DROPDOWN" />
-      </SelectionState>
-    </selectionStates>
-  </component>
-</project>
\ No newline at end of file
diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index 0897082..ae733f1 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
-  <component name="GradleMigrationSettings" migrationVersion="1" />
   <component name="GradleSettings">
     <option name="linkedExternalProjectsSettings">
       <GradleProjectSettings>
+        <option name="testRunner" value="CHOOSE_PER_TEST" />
         <option name="externalProjectPath" value="$PROJECT_DIR$" />
         <option name="gradleJvm" value="#GRADLE_LOCAL_JAVA_HOME" />
         <option name="modules">
diff --git a/.idea/misc.xml b/.idea/misc.xml
index 8978d23..b2c751a 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -1,6 +1,6 @@
 <project version="4">
   <component name="ExternalStorageConfigurationManager" enabled="true" />
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_17" default="true" project-jdk-name="jbr-17" project-jdk-type="JavaSDK">
+  <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>
   <component name="ProjectType">
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index 9e38885..ecc5a36 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -52,6 +52,7 @@ android {
 
 dependencies {
     implementation("androidx.activity:activity-compose:1.7.0")
+    implementation("androidx.activity:activity:1.9.3")
     implementation("androidx.compose.material3:material3:1.0.1")
     implementation("androidx.lifecycle:lifecycle-runtime-ktx:2.6.0")
     implementation("com.google.android.exoplayer:exoplayer:2.19.1")
diff --git a/app/src/main/java/com/platon/easymusicandroid/MainActivity.kt b/app/src/main/java/com/platon/easymusicandroid/MainActivity.kt
index e4b51af..f16a4f3 100644
--- a/app/src/main/java/com/platon/easymusicandroid/MainActivity.kt
+++ b/app/src/main/java/com/platon/easymusicandroid/MainActivity.kt
@@ -1,7 +1,9 @@
 package com.platon.easymusicandroid
 
+import android.annotation.SuppressLint
 import android.content.Intent
 import android.os.Bundle
+import android.view.View
 import androidx.activity.ComponentActivity
 import androidx.activity.compose.setContent
 import androidx.compose.foundation.background
@@ -26,6 +28,7 @@ import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
 import com.google.android.exoplayer2.ExoPlayer
 import com.google.android.exoplayer2.MediaItem
+import androidx.activity.enableEdgeToEdge
 
 data class Station(
     val name: String,
@@ -74,7 +77,9 @@ class MainActivity : ComponentActivity() {
     private var currentStationIndex = mutableStateOf(0)
 
     override fun onCreate(savedInstanceState: Bundle?) {
+        enableEdgeToEdge()
         super.onCreate(savedInstanceState)
+        window.isNavigationBarContrastEnforced = false
 
         // Initialize ExoPlayer
         player = ExoPlayer.Builder(this).build()
@@ -119,6 +124,8 @@ class MainActivity : ComponentActivity() {
     }
 }
 
+@SuppressLint("UnusedMaterial3ScaffoldPaddingParameter")
+@OptIn(ExperimentalMaterial3Api::class)
 @Composable
 fun EasyMusicApp(
     stations: List<Station>,
@@ -129,15 +136,15 @@ fun EasyMusicApp(
 ) {
     val station = stations[currentStationIndex]
 
-    Box(
+    Scaffold(
         modifier = Modifier
-            .fillMaxSize()
             .background(
                 brush = Brush.verticalGradient(
                     colors = station.gradientColors
                 )
-            ),
-        contentAlignment = Alignment.Center
+            )
+            .safeContentPadding(),
+        containerColor = Color.Transparent
     ) {
         Column(
             modifier = Modifier
@@ -206,7 +213,9 @@ fun EasyMusicApp(
                 }
 
                 IconButton(onClick = {
-                    if (currentStationIndex < stations.size - 1) onStationChange(currentStationIndex + 1)
+                    if (currentStationIndex < stations.size - 1) onStationChange(
+                        currentStationIndex + 1
+                    )
                 }) {
                     Icon(
                         imageVector = Icons.Filled.ArrowForward,
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index e07f2ea..3b7c687 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -1,5 +1,5 @@
 [versions]
-agp = "8.6.1"
+agp = "8.7.2"
 kotlin = "1.9.0"
 coreKtx = "1.15.0"
 junit = "4.13.2"
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 4bac153..d9e33c6 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 #Sun Dec 08 18:38:14 MSK 2024
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

From 144febdd796fd019a0e3ca401fb9ec8cdb4fa18f Mon Sep 17 00:00:00 2001
From: fish-dd <pusedzhuse228@gmail.com>
Date: Sat, 14 Dec 2024 23:15:19 +0300
Subject: [PATCH 2/2] =?UTF-8?q?=D0=B4=D0=BE=D0=B1=D0=B0=D0=B2=D0=B8=D0=BB?=
 =?UTF-8?q?=20edge-to-edge=20=D0=B4=D0=BB=D1=8F=20=D0=BC=D0=BE=D0=B4=D0=BD?=
 =?UTF-8?q?=D0=B5=D0=BD=D1=8C=D0=BA=D0=B8=D1=85=20=D1=82=D0=B5=D0=BB=D0=B5?=
 =?UTF-8?q?=D1=84=D0=BE=D0=BD=D1=87=D0=B8=D0=BA=D0=BE=D0=B2=20=D1=81=20?=
 =?UTF-8?q?=D0=B0=D0=BD=D0=B4=D1=80=D0=BE=D0=B8=D0=B4=20=D0=BD=D0=BE=D0=B2?=
 =?UTF-8?q?=D0=B5=D0=B5=204.4=20(=D1=81=D0=BA=D0=BE=D1=80=D0=B5=D0=B5=20?=
 =?UTF-8?q?=D0=B2=D1=81=D0=B5=D0=B3=D0=BE=20=D0=BE=D0=BD=D0=BE=20=D0=B7?=
 =?UTF-8?q?=D0=B0=D0=BF=D1=83=D1=81=D1=82=D0=B8=D1=82=D1=81=D1=8F=20=D0=BC?=
 =?UTF-8?q?=D0=B8=D0=BD=D0=B8=D0=BC=D1=83=D0=BC=20=D0=BD=D0=B0=20=D0=B0?=
 =?UTF-8?q?=D0=BD=D0=B4=D1=80=D0=BE=D0=B8=D0=B4=2016=20=D0=BD=D0=BE=20?=
 =?UTF-8?q?=D0=BD=D0=B0=D1=81=D1=80=D0=B0=D1=82=D1=8C)=20"=D0=BC=D1=8B=20?=
 =?UTF-8?q?=D0=B4=D1=80=D0=BE=D0=BF=D0=BD=D1=83=D0=BB=D0=B8=20=D0=BF=D0=BE?=
 =?UTF-8?q?=D0=B4=D0=B4=D0=B5=D1=80=D0=B6=D0=BA=D1=83=20=D0=BF=D0=BE=20?=
 =?UTF-8?q?=D0=B0=D0=BD=D0=B4=D1=80=D0=BE=D0=B8=D0=B4=209=20=D0=B2=D0=BA?=
 =?UTF-8?q?=D0=BB=D1=8E=D1=87=D0=B8=D1=82=D0=B5=D0=BB=D1=8C=D0=BD=D0=BE=20?=
 =?UTF-8?q?=D1=87=D1=82=D0=BE=D0=B1=D1=8B=20=D0=B4=D0=BE=D0=B1=D0=B0=D0=B2?=
 =?UTF-8?q?=D0=B8=D1=82=D1=8C=20=D0=BD=D0=BE=D0=B2=D1=83=D1=8E=20=D0=BA?=
 =?UTF-8?q?=D1=80=D0=B0=D1=81=D0=B8=D0=B2=D1=83=D1=8E=20=D0=BA=D0=BD=D0=BE?=
 =?UTF-8?q?=D0=BF=D0=BE=D1=87=D0=BA=D1=83=20=D0=B2=20=D1=83=D0=B3=D0=BB?=
 =?UTF-8?q?=D1=83"=20-=20=D0=BF=D0=B8=D1=82=D0=BE=D0=BD=D0=B8=D1=81=D1=82?=
 =?UTF-8?q?=D1=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../platon/easymusicandroid/MainActivity.kt   | 163 ++++++++++--------
 1 file changed, 94 insertions(+), 69 deletions(-)

diff --git a/app/src/main/java/com/platon/easymusicandroid/MainActivity.kt b/app/src/main/java/com/platon/easymusicandroid/MainActivity.kt
index f16a4f3..eff9a79 100644
--- a/app/src/main/java/com/platon/easymusicandroid/MainActivity.kt
+++ b/app/src/main/java/com/platon/easymusicandroid/MainActivity.kt
@@ -2,8 +2,10 @@ package com.platon.easymusicandroid
 
 import android.annotation.SuppressLint
 import android.content.Intent
+import android.net.Uri
 import android.os.Bundle
 import android.view.View
+import android.widget.Toast
 import androidx.activity.ComponentActivity
 import androidx.activity.compose.setContent
 import androidx.compose.foundation.background
@@ -29,6 +31,7 @@ import androidx.compose.ui.unit.sp
 import com.google.android.exoplayer2.ExoPlayer
 import com.google.android.exoplayer2.MediaItem
 import androidx.activity.enableEdgeToEdge
+import androidx.compose.ui.platform.LocalContext
 
 data class Station(
     val name: String,
@@ -135,6 +138,8 @@ fun EasyMusicApp(
     onStationChange: (Int) -> Unit
 ) {
     val station = stations[currentStationIndex]
+    val context = LocalContext.current
+    val intent = remember { Intent(Intent.ACTION_VIEW, Uri.parse("https://t.me/easymusicplatonoferon/")) }
 
     Scaffold(
         modifier = Modifier
@@ -143,85 +148,105 @@ fun EasyMusicApp(
                     colors = station.gradientColors
                 )
             )
-            .safeContentPadding(),
+            .safeDrawingPadding(),
         containerColor = Color.Transparent
     ) {
-        Column(
-            modifier = Modifier
-                .fillMaxSize()
-                .padding(16.dp),
-            horizontalAlignment = Alignment.CenterHorizontally
-        ) {
-            Spacer(modifier = Modifier.height(16.dp))
-
-            Text(
-                text = station.name,
-                style = MaterialTheme.typography.titleLarge.copy(
-                    fontSize = 28.sp,
-                    fontWeight = FontWeight.Bold,
-                    fontFamily = FontFamily.SansSerif
+        Box {
+            TextButton(
+                onClick = {
+                    try {
+                        context.startActivity(intent)
+                    }
+                    catch (e: Exception) {
+                        Toast.makeText(context, "Ошибка. Ищи вручную:\n@easymusicplatonoferon", Toast.LENGTH_LONG).show()
+                    }
+                },
+                colors = ButtonDefaults.buttonColors(
+                    containerColor = Color.Transparent,
+                    contentColor = Color(0xA0FFFFFF)
                 ),
-                color = Color.White,
-                modifier = Modifier.padding(bottom = 8.dp)
-            )
+                modifier = Modifier.padding(horizontal = 20.dp)
+            ) {
+                Text(text = "тг чат")
+            }
 
-            Text(
-                text = station.description,
-                style = MaterialTheme.typography.bodyMedium.copy(
-                    fontFamily = FontFamily.SansSerif
-                ),
-                color = Color.White,
-                textAlign = TextAlign.Center,
-                modifier = Modifier.padding(horizontal = 16.dp)
-            )
+            Column(
+                modifier = Modifier
+                    .fillMaxSize()
+                    .padding(16.dp),
+                horizontalAlignment = Alignment.CenterHorizontally
+            ) {
+                Spacer(modifier = Modifier.height(16.dp))
+
+                Text(
+                    text = station.name,
+                    style = MaterialTheme.typography.titleLarge.copy(
+                        fontSize = 28.sp,
+                        fontWeight = FontWeight.Bold,
+                        fontFamily = FontFamily.SansSerif
+                    ),
+                    color = Color.White,
+                    modifier = Modifier.padding(bottom = 8.dp)
+                )
 
-            Spacer(modifier = Modifier.weight(1f))
+                Text(
+                    text = station.description,
+                    style = MaterialTheme.typography.bodyMedium.copy(
+                        fontFamily = FontFamily.SansSerif
+                    ),
+                    color = Color.White,
+                    textAlign = TextAlign.Center,
+                    modifier = Modifier.padding(horizontal = 16.dp)
+                )
 
-            Text(
-                text = if (isPlaying) "Now Playing: Streaming" else "Now Playing: Paused",
-                color = Color.White,
-                modifier = Modifier.padding(bottom = 32.dp)
-            )
+                Spacer(modifier = Modifier.weight(1f))
 
-            Row(
-                modifier = Modifier.fillMaxWidth(),
-                horizontalArrangement = Arrangement.SpaceBetween,
-                verticalAlignment = Alignment.CenterVertically
-            ) {
-                IconButton(onClick = {
-                    if (currentStationIndex > 0) onStationChange(currentStationIndex - 1)
-                }) {
-                    Icon(
-                        imageVector = Icons.Filled.ArrowBack,
-                        contentDescription = "Previous",
-                        tint = Color.White
-                    )
-                }
+                Text(
+                    text = if (isPlaying) "Now Playing: Streaming" else "Now Playing: Paused",
+                    color = Color.White,
+                    modifier = Modifier.padding(bottom = 32.dp)
+                )
 
-                Box(
-                    modifier = Modifier
-                        .size(80.dp)
-                        .background(Color.White, CircleShape)
-                        .clickable { onPlayPauseToggle() },
-                    contentAlignment = Alignment.Center
+                Row(
+                    modifier = Modifier.fillMaxWidth(),
+                    horizontalArrangement = Arrangement.SpaceBetween,
+                    verticalAlignment = Alignment.CenterVertically
                 ) {
-                    Icon(
-                        imageVector = if (isPlaying) Icons.Filled.Close else Icons.Filled.PlayArrow,
-                        contentDescription = if (isPlaying) "Pause" else "Play",
-                        tint = Color.Red
-                    )
-                }
+                    IconButton(onClick = {
+                        if (currentStationIndex > 0) onStationChange(currentStationIndex - 1)
+                    }) {
+                        Icon(
+                            imageVector = Icons.Filled.ArrowBack,
+                            contentDescription = "Previous",
+                            tint = Color.White
+                        )
+                    }
 
-                IconButton(onClick = {
-                    if (currentStationIndex < stations.size - 1) onStationChange(
-                        currentStationIndex + 1
-                    )
-                }) {
-                    Icon(
-                        imageVector = Icons.Filled.ArrowForward,
-                        contentDescription = "Next",
-                        tint = Color.White
-                    )
+                    Box(
+                        modifier = Modifier
+                            .size(80.dp)
+                            .background(Color.White, CircleShape)
+                            .clickable { onPlayPauseToggle() },
+                        contentAlignment = Alignment.Center
+                    ) {
+                        Icon(
+                            imageVector = if (isPlaying) Icons.Filled.Close else Icons.Filled.PlayArrow,
+                            contentDescription = if (isPlaying) "Pause" else "Play",
+                            tint = Color.Red
+                        )
+                    }
+
+                    IconButton(onClick = {
+                        if (currentStationIndex < stations.size - 1) onStationChange(
+                            currentStationIndex + 1
+                        )
+                    }) {
+                        Icon(
+                            imageVector = Icons.Filled.ArrowForward,
+                            contentDescription = "Next",
+                            tint = Color.White
+                        )
+                    }
                 }
             }
         }