new release

This commit is contained in:
Page Asgardius 2023-05-05 17:47:10 -07:00
parent ebd7a94930
commit 1258781d01
11 changed files with 24 additions and 13 deletions

View file

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<project version="4"> <project version="4">
<component name="CompilerConfiguration"> <component name="CompilerConfiguration">
<bytecodeTargetLevel target="11" /> <bytecodeTargetLevel target="17" />
</component> </component>
</project> </project>

View file

@ -7,7 +7,7 @@
<option name="testRunner" value="GRADLE" /> <option name="testRunner" value="GRADLE" />
<option name="distributionType" value="DEFAULT_WRAPPED" /> <option name="distributionType" value="DEFAULT_WRAPPED" />
<option name="externalProjectPath" value="$PROJECT_DIR$" /> <option name="externalProjectPath" value="$PROJECT_DIR$" />
<option name="gradleJvm" value="Embedded JDK" /> <option name="gradleJvm" value="JDK" />
<option name="modules"> <option name="modules">
<set> <set>
<option value="$PROJECT_DIR$" /> <option value="$PROJECT_DIR$" />

View file

@ -1,4 +1,3 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4"> <project version="4">
<component name="DesignSurface"> <component name="DesignSurface">
<option name="filePathToZoomLevelMap"> <option name="filePathToZoomLevelMap">
@ -28,7 +27,7 @@
</map> </map>
</option> </option>
</component> </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" /> <output url="file://$PROJECT_DIR$/build/classes" />
</component> </component>
<component name="ProjectType"> <component name="ProjectType">

6
.idea/vcs.xml Normal file
View file

@ -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>

View file

@ -9,8 +9,8 @@ android {
applicationId "asgardius.page.s3music" applicationId "asgardius.page.s3music"
minSdk 21 minSdk 21
targetSdk 33 targetSdk 33
versionCode 6 versionCode 7
versionName "0.0.3" versionName "0.1.0"
setProperty("archivesBaseName", "s3-music-$versionName") setProperty("archivesBaseName", "s3-music-$versionName")
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
@ -29,6 +29,7 @@ android {
buildFeatures { buildFeatures {
viewBinding true viewBinding true
} }
namespace 'asgardius.page.s3music'
} }
dependencies { dependencies {

View file

@ -1,7 +1,6 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android" <manifest xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools" xmlns:tools="http://schemas.android.com/tools">
package="asgardius.page.s3music" >
<uses-permission android:name="android.permission.INTERNET" /> <uses-permission android:name="android.permission.INTERNET" />
<uses-permission <uses-permission
@ -55,6 +54,7 @@
android:configChanges="orientation|keyboardHidden|screenSize|smallestScreenSize|screenLayout|uiMode|keyboardHidden" android:configChanges="orientation|keyboardHidden|screenSize|smallestScreenSize|screenLayout|uiMode|keyboardHidden"
android:exported="false" android:exported="false"
android:launchMode="singleTask" android:launchMode="singleTask"
android:documentLaunchMode="always"
android:resizeableActivity="true" /> android:resizeableActivity="true" />
<activity <activity
android:name=".MainActivity" android:name=".MainActivity"

View file

@ -183,7 +183,7 @@ public class VideoPlayer extends AppCompatActivity {
player = new ExoPlayer.Builder(this).setLoadControl(loadControl).build(); player = new ExoPlayer.Builder(this).setLoadControl(loadControl).build();
player.setAudioAttributes(audioAttributes, true); player.setAudioAttributes(audioAttributes, true);
mediaSessionConnector.setPlayer(player); mediaSessionConnector.setPlayer(player);
mediaSession.setActive(true); //mediaSession.setActive(true);
evictor = new LeastRecentlyUsedCacheEvictor(maxCacheSize); evictor = new LeastRecentlyUsedCacheEvictor(maxCacheSize);
simpleCache = new SimpleCache( simpleCache = new SimpleCache(
new File(this.getFilesDir(), "media"), new File(this.getFilesDir(), "media"),
@ -296,6 +296,7 @@ public class VideoPlayer extends AppCompatActivity {
public void onPlaybackStateChanged(@Player.State int state) { public void onPlaybackStateChanged(@Player.State int state) {
if (state == 3) { if (state == 3) {
// Active playback. // Active playback.
mediaSession.setActive(true);
success = true; success = true;
//Acquiring WakeLock and WifiLock if not held //Acquiring WakeLock and WifiLock if not held
if (!mWifiLock.isHeld()) { if (!mWifiLock.isHeld()) {
@ -319,6 +320,7 @@ public class VideoPlayer extends AppCompatActivity {
} }
} else { } else {
//Player inactive //Player inactive
mediaSession.setActive(false);
//Releasing WifiLock and WakeLock if held //Releasing WifiLock and WakeLock if held
if (mWifiLock.isHeld()) { if (mWifiLock.isHeld()) {
mWifiLock.release(); mWifiLock.release();

View file

@ -1,7 +1,7 @@
// Top-level build file where you can add configuration options common to all sub-projects/modules. // Top-level build file where you can add configuration options common to all sub-projects/modules.
plugins { plugins {
id 'com.android.application' version '7.4.2' apply false id 'com.android.application' version '8.0.0' apply false
id 'com.android.library' version '7.4.2' apply false id 'com.android.library' version '8.0.0' apply false
} }
task clean(type: Delete) { task clean(type: Delete) {

View file

@ -0,0 +1 @@
* Music player as separate task

View file

@ -18,4 +18,6 @@ android.useAndroidX=true
# Enables namespacing of each library's R class so that its R class includes only the # 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, # resources declared in the library itself and none from the library's dependencies,
# thereby reducing the size of the R class for that library # thereby reducing the size of the R class for that library
android.nonTransitiveRClass=true android.nonTransitiveRClass=true
android.defaults.buildfeatures.buildconfig=true
android.nonFinalResIds=false

View file

@ -1,6 +1,6 @@
#Sat Aug 27 12:12:23 MST 2022 #Sat Aug 27 12:12:23 MST 2022
distributionBase=GRADLE_USER_HOME 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 distributionPath=wrapper/dists
zipStorePath=wrapper/dists zipStorePath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME zipStoreBase=GRADLE_USER_HOME