From 1258781d010080cf62fd5bccdfd2e4e86ce55495 Mon Sep 17 00:00:00 2001
From: Page Asgardius <asgardius@asgardius.company>
Date: Fri, 5 May 2023 17:47:10 -0700
Subject: [PATCH] new release

---
 .idea/compiler.xml                                        | 2 +-
 .idea/gradle.xml                                          | 2 +-
 .idea/misc.xml                                            | 3 +--
 .idea/vcs.xml                                             | 6 ++++++
 app/build.gradle                                          | 5 +++--
 app/src/main/AndroidManifest.xml                          | 4 ++--
 app/src/main/java/asgardius/page/s3music/VideoPlayer.java | 4 +++-
 build.gradle                                              | 4 ++--
 fastlane/metadata/android/en-US/changelogs/7.txt          | 1 +
 gradle.properties                                         | 4 +++-
 gradle/wrapper/gradle-wrapper.properties                  | 2 +-
 11 files changed, 24 insertions(+), 13 deletions(-)
 create mode 100644 .idea/vcs.xml
 create mode 100644 fastlane/metadata/android/en-US/changelogs/7.txt

diff --git a/.idea/compiler.xml b/.idea/compiler.xml
index fb7f4a8..b589d56 100644
--- a/.idea/compiler.xml
+++ b/.idea/compiler.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="CompilerConfiguration">
-    <bytecodeTargetLevel target="11" />
+    <bytecodeTargetLevel target="17" />
   </component>
 </project>
\ No newline at end of file
diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index a0de2a1..56d6814 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -7,7 +7,7 @@
         <option name="testRunner" value="GRADLE" />
         <option name="distributionType" value="DEFAULT_WRAPPED" />
         <option name="externalProjectPath" value="$PROJECT_DIR$" />
-        <option name="gradleJvm" value="Embedded JDK" />
+        <option name="gradleJvm" value="JDK" />
         <option name="modules">
           <set>
             <option value="$PROJECT_DIR$" />
diff --git a/.idea/misc.xml b/.idea/misc.xml
index 8cf3a0e..5a8182e 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -1,4 +1,3 @@
-<?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="DesignSurface">
     <option name="filePathToZoomLevelMap">
@@ -28,7 +27,7 @@
       </map>
     </option>
   </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_11" default="true" project-jdk-name="11" project-jdk-type="JavaSDK">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_17" project-jdk-name="jbr-17" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/build/classes" />
   </component>
   <component name="ProjectType">
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
new file mode 100644
index 0000000..94a25f7
--- /dev/null
+++ b/.idea/vcs.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="VcsDirectoryMappings">
+    <mapping directory="$PROJECT_DIR$" vcs="Git" />
+  </component>
+</project>
\ No newline at end of file
diff --git a/app/build.gradle b/app/build.gradle
index e1fc697..688b90e 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -9,8 +9,8 @@ android {
         applicationId "asgardius.page.s3music"
         minSdk 21
         targetSdk 33
-        versionCode 6
-        versionName "0.0.3"
+        versionCode 7
+        versionName "0.1.0"
         setProperty("archivesBaseName", "s3-music-$versionName")
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
@@ -29,6 +29,7 @@ android {
     buildFeatures {
         viewBinding true
     }
+    namespace 'asgardius.page.s3music'
 }
 
 dependencies {
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 10a7c06..47c95a3 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    package="asgardius.page.s3music" >
+    xmlns:tools="http://schemas.android.com/tools">
 
     <uses-permission android:name="android.permission.INTERNET" />
     <uses-permission
@@ -55,6 +54,7 @@
             android:configChanges="orientation|keyboardHidden|screenSize|smallestScreenSize|screenLayout|uiMode|keyboardHidden"
             android:exported="false"
             android:launchMode="singleTask"
+            android:documentLaunchMode="always"
             android:resizeableActivity="true" />
         <activity
             android:name=".MainActivity"
diff --git a/app/src/main/java/asgardius/page/s3music/VideoPlayer.java b/app/src/main/java/asgardius/page/s3music/VideoPlayer.java
index e8919b8..dc14b7d 100644
--- a/app/src/main/java/asgardius/page/s3music/VideoPlayer.java
+++ b/app/src/main/java/asgardius/page/s3music/VideoPlayer.java
@@ -183,7 +183,7 @@ public class VideoPlayer extends AppCompatActivity {
         player = new ExoPlayer.Builder(this).setLoadControl(loadControl).build();
         player.setAudioAttributes(audioAttributes, true);
         mediaSessionConnector.setPlayer(player);
-        mediaSession.setActive(true);
+        //mediaSession.setActive(true);
         evictor = new LeastRecentlyUsedCacheEvictor(maxCacheSize);
         simpleCache = new SimpleCache(
                 new File(this.getFilesDir(), "media"),
@@ -296,6 +296,7 @@ public class VideoPlayer extends AppCompatActivity {
             public void onPlaybackStateChanged(@Player.State int state) {
                 if (state == 3) {
                     // Active playback.
+                    mediaSession.setActive(true);
                     success = true;
                     //Acquiring WakeLock and WifiLock if not held
                     if (!mWifiLock.isHeld()) {
@@ -319,6 +320,7 @@ public class VideoPlayer extends AppCompatActivity {
                     }
                 } else {
                     //Player inactive
+                    mediaSession.setActive(false);
                     //Releasing WifiLock and WakeLock if held
                     if (mWifiLock.isHeld()) {
                         mWifiLock.release();
diff --git a/build.gradle b/build.gradle
index 4a0042b..1f7d8ec 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,7 +1,7 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 plugins {
-    id 'com.android.application' version '7.4.2' apply false
-    id 'com.android.library' version '7.4.2' apply false
+    id 'com.android.application' version '8.0.0' apply false
+    id 'com.android.library' version '8.0.0' apply false
 }
 
 task clean(type: Delete) {
diff --git a/fastlane/metadata/android/en-US/changelogs/7.txt b/fastlane/metadata/android/en-US/changelogs/7.txt
new file mode 100644
index 0000000..ae1c34d
--- /dev/null
+++ b/fastlane/metadata/android/en-US/changelogs/7.txt
@@ -0,0 +1 @@
+* Music player as separate task
diff --git a/gradle.properties b/gradle.properties
index dab7c28..ec63151 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -18,4 +18,6 @@ android.useAndroidX=true
 # Enables namespacing of each library's R class so that its R class includes only the
 # resources declared in the library itself and none from the library's dependencies,
 # thereby reducing the size of the R class for that library
-android.nonTransitiveRClass=true
\ No newline at end of file
+android.nonTransitiveRClass=true
+android.defaults.buildfeatures.buildconfig=true
+android.nonFinalResIds=false
\ No newline at end of file
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 1cfb2ab..a78c6f8 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 #Sat Aug 27 12:12:23 MST 2022
 distributionBase=GRADLE_USER_HOME
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.0-bin.zip
 distributionPath=wrapper/dists
 zipStorePath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME