From 69f76be119638643ad9f0b9f9d0b84b9e762b554 Mon Sep 17 00:00:00 2001
From: kostas214pro <kdoukas2006@gmail.com>
Date: Fri, 31 Mar 2023 22:16:16 +0300
Subject: [PATCH] Changes and improvements-mMove inialization stuff to a
 coroutine to speed up app load times, added material 3 dynamic colors, and
 changed the color shceme for the base app

---
 .idea/deploymentTargetDropDown.xml            | 17 -------------
 app/src/main/AndroidManifest.xml              |  3 ++-
 .../example/spotifydownloader/Application.kt  | 13 ++++++++++
 .../example/spotifydownloader/MainActivity.kt | 25 ++++++++++++-------
 app/src/main/res/values-night/themes.xml      |  2 +-
 app/src/main/res/values/colors.xml            |  3 ++-
 app/src/main/res/values/themes.xml            |  6 ++---
 7 files changed, 37 insertions(+), 32 deletions(-)
 delete mode 100644 .idea/deploymentTargetDropDown.xml
 create mode 100644 app/src/main/java/com/example/spotifydownloader/Application.kt

diff --git a/.idea/deploymentTargetDropDown.xml b/.idea/deploymentTargetDropDown.xml
deleted file mode 100644
index 5275e60..0000000
--- a/.idea/deploymentTargetDropDown.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="deploymentTargetDropDown">
-    <targetSelectedWithDropDown>
-      <Target>
-        <type value="QUICK_BOOT_TARGET" />
-        <deviceKey>
-          <Key>
-            <type value="VIRTUAL_DEVICE_PATH" />
-            <value value="$USER_HOME$/.android/avd/Pixel_6_Pro_API_33.avd" />
-          </Key>
-        </deviceKey>
-      </Target>
-    </targetSelectedWithDropDown>
-    <timeTargetWasSelectedWithDropDown value="2023-03-31T13:57:27.845895Z" />
-  </component>
-</project>
\ No newline at end of file
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index d811f8b..c62d250 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -18,7 +18,8 @@
         android:supportsRtl="true"
         android:theme="@style/Theme.SpotifyDownloader"
         android:extractNativeLibs="true"
-        tools:targetApi="33">
+        tools:targetApi="33"
+        android:name=".SpotifyDownloaderApplication">
         <activity
             android:name=".MainActivity"
             android:exported="true">
diff --git a/app/src/main/java/com/example/spotifydownloader/Application.kt b/app/src/main/java/com/example/spotifydownloader/Application.kt
new file mode 100644
index 0000000..63e0cbe
--- /dev/null
+++ b/app/src/main/java/com/example/spotifydownloader/Application.kt
@@ -0,0 +1,13 @@
+package com.example.spotifydownloader
+
+import android.app.Application
+import com.google.android.material.color.DynamicColors
+
+class SpotifyDownloaderApplication : Application(){
+
+    override fun onCreate() {
+        super.onCreate()
+        DynamicColors.applyToActivitiesIfAvailable(this)
+    }
+
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/example/spotifydownloader/MainActivity.kt b/app/src/main/java/com/example/spotifydownloader/MainActivity.kt
index c7ecbd9..4842569 100644
--- a/app/src/main/java/com/example/spotifydownloader/MainActivity.kt
+++ b/app/src/main/java/com/example/spotifydownloader/MainActivity.kt
@@ -1,17 +1,20 @@
 package com.example.spotifydownloader
 
+import android.app.Activity
 import android.os.Bundle
 import android.util.Log
 import android.view.MenuItem
 import androidx.appcompat.app.ActionBarDrawerToggle
 import androidx.appcompat.app.AppCompatActivity
 import androidx.core.view.GravityCompat
+import androidx.lifecycle.lifecycleScope
 import com.chaquo.python.Python
 import com.chaquo.python.android.AndroidPlatform
 import com.example.spotifydownloader.databinding.ActivityMainBinding
 import com.yausername.ffmpeg.FFmpeg
 import com.yausername.youtubedl_android.YoutubeDL
 import com.yausername.youtubedl_android.YoutubeDLException
+import kotlinx.coroutines.launch
 
 class MainActivity : AppCompatActivity() {
 
@@ -36,6 +39,7 @@ class MainActivity : AppCompatActivity() {
         )
         binding.drawerLayout.addDrawerListener(toggle)
         toggle.syncState()
+
         supportActionBar?.setDisplayHomeAsUpEnabled(true)
 
 
@@ -113,18 +117,21 @@ class MainActivity : AppCompatActivity() {
 
 
         //Init youtubedl-android
+        lifecycleScope.launch{
+            try {
+                YoutubeDL.getInstance().init(applicationContext )
+                FFmpeg.getInstance().init(applicationContext)
+            } catch (e: YoutubeDLException) {
+                Log.e("error", "failed to initialize youtubedl-android", e)
 
-        try {
-            YoutubeDL.getInstance().init(this)
-            FFmpeg.getInstance().init(this)
-        } catch (e: YoutubeDLException) {
-            Log.e("error", "failed to initialize youtubedl-android", e)
+
+            }
+            //Init chaquopy
+            if (!Python.isStarted()) {
+                Python.start(AndroidPlatform(applicationContext))
+            }
 
 
-        }
-        //Init chaquopy
-        if (!Python.isStarted()) {
-            Python.start(AndroidPlatform(this))
         }
 
 
diff --git a/app/src/main/res/values-night/themes.xml b/app/src/main/res/values-night/themes.xml
index 6cbe25d..b74985e 100644
--- a/app/src/main/res/values-night/themes.xml
+++ b/app/src/main/res/values-night/themes.xml
@@ -10,7 +10,7 @@
         <item name="colorSecondaryVariant">@color/teal_200</item>
         <item name="colorOnSecondary">@color/black</item>
         <!-- Status bar color. -->
-        <item name="android:statusBarColor">?attr/colorPrimaryVariant</item>
+        <item name="android:statusBarColor">@color/teal_700</item>
         <!-- Customize your theme here. -->
     </style>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index f8c6127..6a1f442 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -3,8 +3,9 @@
     <color name="purple_200">#FFBB86FC</color>
     <color name="purple_500">#FF6200EE</color>
     <color name="purple_700">#FF3700B3</color>
-    <color name="teal_200">#FF03DAC5</color>
+    <color name="teal_200">#00838F</color>
     <color name="teal_700">#FF018786</color>
     <color name="black">#FF000000</color>
     <color name="white">#FFFFFFFF</color>
+
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml
index 83fded6..4509aee 100644
--- a/app/src/main/res/values/themes.xml
+++ b/app/src/main/res/values/themes.xml
@@ -2,15 +2,15 @@
     <!-- Base application theme. -->
     <style name="Theme.SpotifyDownloader" parent="Theme.Material3.Light">
         <!-- Primary brand color. -->
-        <item name="colorPrimary">@color/purple_500</item>
-        <item name="colorPrimaryVariant">@color/purple_700</item>
+        <item name="colorPrimary">@color/teal_200</item>
+        <item name="colorPrimaryVariant">@color/teal_200</item>
         <item name="colorOnPrimary">@color/white</item>
         <!-- Secondary brand color. -->
         <item name="colorSecondary">@color/teal_200</item>
         <item name="colorSecondaryVariant">@color/teal_700</item>
         <item name="colorOnSecondary">@color/black</item>
         <!-- Status bar color. -->
-        <item name="android:statusBarColor">?attr/colorPrimaryVariant</item>
+        <item name="android:statusBarColor">@color/teal_700</item>
         <!-- Customize your theme here. -->
 
     </style>