Skip to content

Commit

Permalink
Version 1.3.1
Browse files Browse the repository at this point in the history
Ready for version 1.3.1 of Auxio.
  • Loading branch information
OxygenCobalt committed Feb 21, 2021
1 parent 044f74b commit 5de45ee
Show file tree
Hide file tree
Showing 10 changed files with 23 additions and 22 deletions.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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">
Expand Down
4 changes: 2 additions & 2 deletions app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 2 additions & 4 deletions app/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand All @@ -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" />
Expand Down
1 change: 1 addition & 0 deletions app/src/main/java/org/oxycblt/auxio/MainActivity.kt
Original file line number Diff line number Diff line change
Expand Up @@ -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)
}

Expand Down
2 changes: 0 additions & 2 deletions app/src/main/java/org/oxycblt/auxio/MainFragment.kt
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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)
)
}

Expand Down
15 changes: 8 additions & 7 deletions app/src/main/res/layout/fragment_loading.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
xmlns:tools="http://schemas.android.com/tools">

<data>

<variable
name="loadingModel"
type="org.oxycblt.auxio.loading.LoadingViewModel" />
Expand All @@ -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"
Expand All @@ -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
Expand All @@ -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>
Expand Down
3 changes: 1 addition & 2 deletions app/src/main/res/values-de/strings.xml
Original file line number Diff line number Diff line change
@@ -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>

Expand Down Expand Up @@ -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 -->
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/res/values/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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 -->
Expand Down
6 changes: 6 additions & 0 deletions fastlane/metadata/android/en-US/changelogs/3.txt
Original file line number Diff line number Diff line change
@@ -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

0 comments on commit 5de45ee

Please sign in to comment.