From 5de45eea0eae59e5f1ea0c3db3319d98a25c03b6 Mon Sep 17 00:00:00 2001
From: OxygenCobalt <oxycblt@abstractr.net>
Date: Sun, 21 Feb 2021 08:19:05 -0700
Subject: [PATCH] Version 1.3.1

Ready for version 1.3.1 of Auxio.
---
 README.md                                         |  2 +-
 app/build.gradle                                  |  4 ++--
 app/src/main/AndroidManifest.xml                  |  6 ++----
 .../main/java/org/oxycblt/auxio/MainActivity.kt   |  1 +
 .../main/java/org/oxycblt/auxio/MainFragment.kt   |  2 --
 .../auxio/playback/system/PlaybackService.kt      |  4 +---
 app/src/main/res/layout/fragment_loading.xml      | 15 ++++++++-------
 app/src/main/res/values-de/strings.xml            |  3 +--
 app/src/main/res/values/strings.xml               |  2 +-
 fastlane/metadata/android/en-US/changelogs/3.txt  |  6 ++++++
 10 files changed, 23 insertions(+), 22 deletions(-)
 create mode 100644 fastlane/metadata/android/en-US/changelogs/3.txt

diff --git a/README.md b/README.md
index c4ace68b22..8c22133965 100644
--- a/README.md
+++ b/README.md
@@ -3,7 +3,7 @@
 <h4 align="center">A simple, rational music player for android.</h4>
 <p align="center">
     <a href="https://github.com/oxygencobalt/Auxio/releases/">
-        <img alt="GitHub release" src="https://img.shields.io/static/v1?label=Tag&message=v1.3.0&color=0D5AF5">
+        <img alt="GitHub release" src="https://img.shields.io/static/v1?label=Tag&message=v1.3.1&color=0D5AF5">
     </a>
     <a href="https://www.gnu.org/licenses/gpl-3.0"> 
         <img src="https://img.shields.io/badge/License-GPL%20v3-blue.svg">
diff --git a/app/build.gradle b/app/build.gradle
index fde47b762e..2b5bb7b733 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -11,8 +11,8 @@ android {
         applicationId "org.oxycblt.auxio"
         minSdkVersion 21
         targetSdkVersion 30
-        versionCode 2 // Code 1 officially responds to 1.2, anything higher is 1.3 onwards
-        versionName "1.3.0"
+        versionCode 3
+        versionName "1.3.1"
 
         buildFeatures {
             dataBinding true
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index f86d3b8ce7..16cef2ec89 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -26,11 +26,11 @@
 
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
+                <action android:name="android.intent.action.MUSIC_PLAYER" />
+
                 <category android:name="android.intent.category.DEFAULT" />
                 <category android:name="android.intent.category.LAUNCHER" />
-
                 <category android:name="android.intent.category.APP_MUSIC" />
-                <action android:name="android.intent.action.MUSIC_PLAYER" />
             </intent-filter>
 
             <intent-filter>
@@ -44,8 +44,6 @@
         <service
             android:name=".playback.system.PlaybackService"
             android:description="@string/info_service_desc"
-            android:enabled="true"
-            android:exported="false"
             android:foregroundServiceType="mediaPlayback"
             android:icon="@mipmap/ic_launcher"
             android:roundIcon="@mipmap/ic_launcher_round" />
diff --git a/app/src/main/java/org/oxycblt/auxio/MainActivity.kt b/app/src/main/java/org/oxycblt/auxio/MainActivity.kt
index 360a7d7338..385e6b566f 100644
--- a/app/src/main/java/org/oxycblt/auxio/MainActivity.kt
+++ b/app/src/main/java/org/oxycblt/auxio/MainActivity.kt
@@ -52,6 +52,7 @@ class MainActivity : AppCompatActivity() {
         // Since the activity is set to singleInstance [Given that there's only MainActivity]
         // We have to manually push the intent whenever we get one so that the fragments
         // can catch any file intents
+        // TODO: Improve this dumb chain system in one way or another
         setIntent(intent)
     }
 
diff --git a/app/src/main/java/org/oxycblt/auxio/MainFragment.kt b/app/src/main/java/org/oxycblt/auxio/MainFragment.kt
index 8f9e00191f..04a08d5add 100644
--- a/app/src/main/java/org/oxycblt/auxio/MainFragment.kt
+++ b/app/src/main/java/org/oxycblt/auxio/MainFragment.kt
@@ -120,8 +120,6 @@ class MainFragment : Fragment() {
     override fun onResume() {
         super.onResume()
 
-        // File intents chain-navigate towards PlaybackFragment
-        // Not for any express purpose, I just prefer it this way.
         if (shouldHandleFileIntent()) {
             handleFileIntent(playbackModel)
         } else {
diff --git a/app/src/main/java/org/oxycblt/auxio/playback/system/PlaybackService.kt b/app/src/main/java/org/oxycblt/auxio/playback/system/PlaybackService.kt
index 360ec463b2..be4da8fea0 100644
--- a/app/src/main/java/org/oxycblt/auxio/playback/system/PlaybackService.kt
+++ b/app/src/main/java/org/oxycblt/auxio/playback/system/PlaybackService.kt
@@ -311,9 +311,7 @@ class PlaybackService : Service(), Player.EventListener, PlaybackStateManager.Ca
         // battery/apk size/cache size
         val audioRenderer = RenderersFactory { handler, _, audioListener, _, _ ->
             arrayOf(
-                MediaCodecAudioRenderer(
-                    this, MediaCodecSelector.DEFAULT, handler, audioListener
-                )
+                MediaCodecAudioRenderer(this, MediaCodecSelector.DEFAULT, handler, audioListener)
             )
         }
 
diff --git a/app/src/main/res/layout/fragment_loading.xml b/app/src/main/res/layout/fragment_loading.xml
index 72c12b307f..ed179fe53e 100644
--- a/app/src/main/res/layout/fragment_loading.xml
+++ b/app/src/main/res/layout/fragment_loading.xml
@@ -3,6 +3,7 @@
     xmlns:tools="http://schemas.android.com/tools">
 
     <data>
+
         <variable
             name="loadingModel"
             type="org.oxycblt.auxio.loading.LoadingViewModel" />
@@ -11,30 +12,30 @@
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:orientation="vertical"
         android:animateLayoutChanges="true"
-        android:gravity="center">
+        android:gravity="center"
+        android:orientation="vertical">
 
         <ProgressBar
             android:id="@+id/loading_circle"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
+            android:layout_margin="@dimen/margin_small"
             android:indeterminateTint="?attr/colorPrimary"
             android:indeterminateTintMode="src_in"
-            android:layout_margin="@dimen/margin_small"
             android:paddingBottom="@dimen/padding_tiny" />
 
         <ImageView
             android:id="@+id/loading_error_icon"
             android:layout_width="@dimen/size_error_icon"
             android:layout_height="@dimen/size_error_icon"
+            android:layout_margin="@dimen/margin_small"
             android:contentDescription="@string/description_error"
             android:indeterminateTint="?attr/colorPrimary"
             android:indeterminateTintMode="src_in"
             android:src="@drawable/ic_error"
-            android:layout_margin="@dimen/margin_small"
             android:visibility="gone"
-            tools:visibility="visible"/>
+            tools:visibility="visible" />
 
         <TextView
             android:id="@+id/loading_error_text"
@@ -52,10 +53,10 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:fontFamily="@font/inter_semibold"
+            android:onClick="@{() -> loadingModel.load()}"
             android:text="@string/label_retry"
             android:textColor="?attr/colorPrimary"
             android:visibility="gone"
-            android:onClick="@{() -> loadingModel.load()}"
             tools:visibility="visible" />
 
         <Button
@@ -64,10 +65,10 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:fontFamily="@font/inter_semibold"
+            android:onClick="@{() -> loadingModel.grant()}"
             android:text="@string/label_grant"
             android:textColor="?attr/colorPrimary"
             android:visibility="gone"
-            android:onClick="@{() -> loadingModel.grant()}"
             tools:visibility="visible" />
 
     </LinearLayout>
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index c44c23d0e5..f93ec577dc 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <!-- Info namespace | App labels -->
-    <string name="info_app_desc">Ein einfacher, sinnvoller Musikplayer für android.</string>
     <string name="info_channel_name">Musikwiedergabe</string>
     <string name="info_service_desc">der Musikwiedergabedienst von Auxio.</string>
 
@@ -87,7 +86,7 @@
     <string name="setting_behavior_keep_shuffle_desc">Lassen zufällig an, wenn ein neues Lied anspielen</string>
     <string name="setting_behavior_rewind_prev">Zurückspulen, bevor zurück springen</string>
     <string name="setting_behavior_rewind_prev_desc">Zurückspulen, bevor zum vorheriger Lied springen</string>
-    <string name="setting_behavior_save" >Wiedergabezustand abspeichern</string>
+    <string name="setting_behavior_save">Wiedergabezustand abspeichern</string>
     <string name="setting_behavior_save_desc">Der aktuell Wiedergabezustand jetzt abspeichern</string>
 
     <!-- Error Namespace | Error Labels -->
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 8d172c42b8..eb7aae8dda 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -89,7 +89,7 @@
     <string name="setting_behavior_keep_shuffle_desc">Keep shuffle on when playing a new song</string>
     <string name="setting_behavior_rewind_prev">Rewind before skipping back</string>
     <string name="setting_behavior_rewind_prev_desc">Rewind before skipping to the previous song</string>
-    <string name="setting_behavior_save" >Save playback state</string>
+    <string name="setting_behavior_save">Save playback state</string>
     <string name="setting_behavior_save_desc">Save the current playback state now</string>
 
     <!-- Error Namespace | Error Labels -->
diff --git a/fastlane/metadata/android/en-US/changelogs/3.txt b/fastlane/metadata/android/en-US/changelogs/3.txt
new file mode 100644
index 0000000000..8b8996d5a8
--- /dev/null
+++ b/fastlane/metadata/android/en-US/changelogs/3.txt
@@ -0,0 +1,6 @@
+- Added the ability to play a song from a file
+- Fixed issue where music loading would fail
+- Fixed crash on the songs UI due to bad music loading
+- Added ability to manually save the playback state
+- Updated the animation of the compact controls to be faster
+- Optimized icons
\ No newline at end of file