Fabio/Auxio
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

chore: upgrade deps

Browse source 
Update dependencies again:

activity -> 1.3.1
constraintlayout -> 2.1.0
media -> 1.4.1
This commit is contained in:
OxygenCobalt 2021-08-06 09:41:31 -06:00
parent 828ab3ccee
commit 1b5822eae0
No known key found for this signature in database
GPG key ID: 37DBE3621FE9AD47
28 changed files with 72 additions and 75 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
app/build.gradle
View file

@ -62,12 +62,12 @@ dependencies {
// General
implementation "androidx.core:core-ktx:1.6.0"
implementation "androidx.activity:activity-ktx:1.3.0"
implementation "androidx.activity:activity-ktx:1.3.1"
implementation 'androidx.fragment:fragment-ktx:1.3.6'
// UI
implementation "androidx.recyclerview:recyclerview:1.2.1"
implementation "androidx.constraintlayout:constraintlayout:2.0.4"
implementation "androidx.constraintlayout:constraintlayout:2.1.0"
implementation "androidx.dynamicanimation:dynamicanimation:1.0.0"
// Lifecycle
@ -83,7 +83,7 @@ dependencies {
// Media
// TODO: Migrate to media2 when I can figure out how to use it
implementation "androidx.media:media:1.4.0"
implementation "androidx.media:media:1.4.1"
// Preferences
implementation "androidx.preference:preference-ktx:1.1.1"

4
app/src/main/AndroidManifest.xml
View file

@ -57,9 +57,9 @@
android:roundIcon="@mipmap/ic_launcher_round" />
<receiver
android:label="@string/info_widget_name"
android:name=".widgets.WidgetProvider"
android:exported="false">
android:exported="false"
android:label="@string/info_widget_name">
<intent-filter>
<action android:name="android.appwidget.action.APPWIDGET_UPDATE" />

4
app/src/main/res/drawable/ic_artist.xml
View file

@ -2,9 +2,9 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:tint="?attr/colorPrimary"
android:viewportWidth="24"
android:viewportHeight="24"
android:tint="?attr/colorPrimary">
android:viewportHeight="24">
<path
android:fillColor="@android:color/white"
android:pathData="M12,12c2.21,0 4,-1.79 4,-4s-1.79,-4 -4,-4 -4,1.79 -4,4 1.79,4 4,4zM12,14c-2.67,0 -8,1.34 -8,4v2h16v-2c0,-2.66 -5.33,-4 -8,-4z" />

2
app/src/main/res/layout-land/fragment_playback.xml
View file

@ -102,9 +102,9 @@
<SeekBar
android:id="@+id/playback_seek_bar"
style="@style/Widget.SeekBar.Full"
android:layout_width="0dp"
android:layout_height="wrap_content"
style="@style/Widget.SeekBar.Full"
android:layout_marginTop="@dimen/spacing_medium"
app:layout_constraintBottom_toTopOf="@+id/playback_duration_current"
app:layout_constraintEnd_toEndOf="parent"

14
app/src/main/res/layout-land/item_album_header.xml
View file

@ -25,12 +25,12 @@
<ImageView
android:id="@+id/album_cover"
style="@style/Widget.ImageView.Full"
android:layout_width="@dimen/size_cover_detail_land"
android:layout_height="@dimen/size_cover_detail_land"
android:layout_marginStart="@dimen/spacing_medium"
android:layout_marginTop="@dimen/spacing_medium"
android:contentDescription="@{@string/desc_album_cover(album.name)}"
style="@style/Widget.ImageView.Full"
app:albumArt="@{album}"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
@ -84,11 +84,11 @@
<com.google.android.material.button.MaterialButton
android:id="@+id/album_play_button"
style="@style/Widget.Button.Vibrant.Secondary"
android:onClick="@{() -> playbackModel.playAlbum(album, false)}"
android:text="@string/lbl_play"
android:layout_marginStart="@dimen/spacing_medium"
android:layout_marginTop="@dimen/spacing_small"
android:layout_marginEnd="@dimen/spacing_small"
android:layout_marginStart="@dimen/spacing_medium"
android:onClick="@{() -> playbackModel.playAlbum(album, false)}"
android:text="@string/lbl_play"
app:layout_constraintEnd_toStartOf="@+id/album_shuffle_button"
app:layout_constraintHorizontal_bias="0.5"
app:layout_constraintStart_toStartOf="parent"
@ -97,11 +97,11 @@
<com.google.android.material.button.MaterialButton
android:id="@+id/album_shuffle_button"
style="@style/Widget.Button.Vibrant.Primary"
android:layout_marginStart="@dimen/spacing_small"
android:layout_marginEnd="@dimen/spacing_medium"
android:backgroundTint="?attr/colorPrimary"
android:onClick="@{() -> playbackModel.playAlbum(album, true)}"
android:text="@string/lbl_shuffle"
android:layout_marginStart="@dimen/spacing_small"
android:layout_marginEnd="@dimen/spacing_medium"
app:layout_constraintBottom_toBottomOf="@+id/album_play_button"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toEndOf="@+id/album_play_button"
@ -121,9 +121,9 @@
<ImageButton
android:id="@+id/album_sort_button"
style="@style/Widget.Button.Unbounded.Small"
android:layout_width="0dp"
android:layout_height="wrap_content"
style="@style/Widget.Button.Unbounded.Small"
android:contentDescription="@string/desc_sort_button"
android:onClick="@{() -> detailModel.incrementAlbumSortMode()}"
app:layout_constraintBottom_toBottomOf="@+id/album_song_header"

4
app/src/main/res/layout/fragment_compact_playback.xml
View file

@ -46,9 +46,9 @@
<TextView
android:id="@+id/playback_song"
style="@style/Widget.TextView.Compact.Primary"
android:text="@{song.name}"
android:layout_marginStart="@dimen/spacing_small"
android:layout_marginEnd="@dimen/spacing_small"
android:text="@{song.name}"
app:layout_constraintBottom_toTopOf="@+id/playback_info"
app:layout_constraintEnd_toStartOf="@+id/playback_play_pause"
app:layout_constraintStart_toEndOf="@+id/playback_cover"
@ -71,10 +71,10 @@
<org.oxycblt.auxio.playback.PlayPauseButton
android:id="@+id/playback_play_pause"
style="@style/Widget.Button.Unbounded"
android:padding="0dp"
android:layout_margin="@dimen/spacing_small"
android:contentDescription="@string/desc_play_pause"
android:onClick="@{() -> playbackModel.invertPlayingStatus()}"
android:padding="0dp"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent"

2
app/src/main/res/layout/fragment_detail.xml
View file

@ -25,8 +25,8 @@
android:id="@+id/detail_recycler"
android:layout_width="match_parent"
android:layout_height="match_parent"
app:layout_behavior="com.google.android.material.appbar.AppBarLayout$ScrollingViewBehavior"
app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
app:layout_behavior="com.google.android.material.appbar.AppBarLayout$ScrollingViewBehavior"
tools:listitem="@layout/item_artist_header" />
</androidx.coordinatorlayout.widget.CoordinatorLayout>

4
app/src/main/res/layout/fragment_loading.xml
View file

@ -46,9 +46,9 @@
<Button
android:id="@+id/loading_retry_button"
style="@style/Widget.Button.Unbounded.Text"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
style="@style/Widget.Button.Unbounded.Text"
android:onClick="@{() -> loadingModel.load(context)}"
android:text="@string/lbl_retry"
android:visibility="gone"
@ -56,9 +56,9 @@
<Button
android:id="@+id/loading_grant_button"
style="@style/Widget.Button.Unbounded.Text"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
style="@style/Widget.Button.Unbounded.Text"
android:onClick="@{() -> loadingModel.grant()}"
android:text="@string/lbl_grant"
android:visibility="gone"

6
app/src/main/res/layout/fragment_playback.xml
View file

@ -79,8 +79,8 @@
android:layout_marginStart="@dimen/spacing_mid_large"
android:layout_marginEnd="@dimen/spacing_mid_large"
android:layout_marginBottom="@dimen/spacing_medium"
android:text="@{song.album.name}"
android:onClick="@{() -> detailModel.navToItem(playbackModel.song.album)}"
android:text="@{song.album.name}"
app:layout_constraintBottom_toTopOf="@+id/playback_seek_bar"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
@ -88,9 +88,9 @@
<SeekBar
android:id="@+id/playback_seek_bar"
android:layout_height="wrap_content"
android:layout_width="match_parent"
style="@style/Widget.SeekBar.Full"
android:layout_width="match_parent"
android:layout_height="wrap_content"
app:layout_constraintBottom_toTopOf="@+id/playback_duration_current"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"

2
app/src/main/res/layout/fragment_search.xml
View file

@ -32,8 +32,8 @@
app:boxStrokeWidthFocused="2dp"
app:endIconContentDescription="@string/desc_clear_search"
app:endIconDrawable="@drawable/ic_close"
app:endIconTint="?attr/colorControlNormal"
app:endIconMode="clear_text"
app:endIconTint="?attr/colorControlNormal"
app:errorEnabled="false">
<com.google.android.material.textfield.TextInputEditText

4
app/src/main/res/layout/item_action_header.xml
View file

@ -18,9 +18,9 @@
<TextView
android:id="@+id/header_title"
style="@style/Widget.TextView.Header"
android:layout_width="match_parent"
android:layout_height="wrap_content"
style="@style/Widget.TextView.Header"
android:text="@{header.name}"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
@ -28,9 +28,9 @@
<ImageButton
android:id="@+id/header_button"
style="@style/Widget.Button.Unbounded.Small"
android:layout_width="0dp"
android:layout_height="wrap_content"
style="@style/Widget.Button.Unbounded.Small"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="@+id/header_title"

16
app/src/main/res/layout/item_album_header.xml
View file

@ -79,11 +79,11 @@
<com.google.android.material.button.MaterialButton
android:id="@+id/album_play_button"
style="@style/Widget.Button.Vibrant.Secondary"
android:onClick="@{() -> playbackModel.playAlbum(album, false)}"
android:text="@string/lbl_play"
android:layout_marginStart="@dimen/spacing_medium"
android:layout_marginTop="@dimen/spacing_small"
android:layout_marginEnd="@dimen/spacing_small"
android:layout_marginStart="@dimen/spacing_medium"
android:onClick="@{() -> playbackModel.playAlbum(album, false)}"
android:text="@string/lbl_play"
app:layout_constraintEnd_toStartOf="@+id/album_shuffle_button"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/album_details" />
@ -91,11 +91,11 @@
<com.google.android.material.button.MaterialButton
android:id="@+id/album_shuffle_button"
style="@style/Widget.Button.Vibrant.Primary"
android:layout_marginStart="@dimen/spacing_small"
android:layout_marginEnd="@dimen/spacing_medium"
android:backgroundTint="?attr/colorPrimary"
android:onClick="@{() -> playbackModel.playAlbum(album, true)}"
android:text="@string/lbl_shuffle"
android:layout_marginStart="@dimen/spacing_small"
android:layout_marginEnd="@dimen/spacing_medium"
app:layout_constraintBottom_toBottomOf="@+id/album_play_button"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toEndOf="@+id/album_play_button"
@ -103,9 +103,9 @@
<TextView
android:id="@+id/album_song_header"
style="@style/Widget.TextView.Header"
android:layout_width="match_parent"
android:layout_height="wrap_content"
style="@style/Widget.TextView.Header"
android:layout_marginTop="@dimen/spacing_small"
android:background="@drawable/ui_header_dividers"
android:text="@string/lbl_songs"
@ -114,9 +114,9 @@
<ImageButton
android:id="@+id/album_sort_button"
android:layout_height="wrap_content"
android:layout_width="0dp"
style="@style/Widget.Button.Unbounded.Small"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:contentDescription="@string/desc_sort_button"
android:onClick="@{() -> detailModel.incrementAlbumSortMode()}"
app:layout_constraintBottom_toBottomOf="@+id/album_song_header"

12
app/src/main/res/layout/item_artist_header.xml
View file

@ -21,11 +21,11 @@
<ImageView
android:id="@+id/artist_image"
style="@style/Widget.ImageView.Full"
android:layout_width="@dimen/size_cover_detail"
android:layout_height="@dimen/size_cover_detail"
android:layout_marginTop="@dimen/spacing_medium"
android:contentDescription="@{@string/desc_artist_image(artist.name)}"
style="@style/Widget.ImageView.Full"
app:artistImage="@{artist}"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
@ -74,11 +74,11 @@
<com.google.android.material.button.MaterialButton
android:id="@+id/artist_play_button"
style="@style/Widget.Button.Vibrant.Secondary"
android:onClick="@{() -> playbackModel.playArtist(artist, false)}"
android:text="@string/lbl_play"
android:layout_marginStart="@dimen/spacing_medium"
android:layout_marginTop="@dimen/spacing_small"
android:layout_marginEnd="@dimen/spacing_small"
android:layout_marginStart="@dimen/spacing_medium"
android:onClick="@{() -> playbackModel.playArtist(artist, false)}"
android:text="@string/lbl_play"
app:layout_constraintEnd_toStartOf="@+id/artist_shuffle_button"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/artist_counts" />
@ -86,11 +86,11 @@
<com.google.android.material.button.MaterialButton
android:id="@+id/artist_shuffle_button"
style="@style/Widget.Button.Vibrant.Primary"
android:layout_marginStart="@dimen/spacing_small"
android:layout_marginEnd="@dimen/spacing_medium"
android:backgroundTint="?attr/colorPrimary"
android:onClick="@{() -> playbackModel.playArtist(artist, true)}"
android:text="@string/lbl_shuffle"
android:layout_marginStart="@dimen/spacing_small"
android:layout_marginEnd="@dimen/spacing_medium"
app:layout_constraintBottom_toBottomOf="@+id/artist_play_button"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toEndOf="@+id/artist_play_button"

2
app/src/main/res/layout/item_blacklist_entry.xml
View file

@ -23,11 +23,11 @@
<ImageButton
android:id="@+id/blacklist_clear"
style="@style/Widget.Button.Unbounded"
android:tint="?attr/colorControlNormal"
android:layout_width="@dimen/size_clear"
android:layout_height="@dimen/size_clear"
android:contentDescription="@string/desc_blacklist_delete"
android:src="@drawable/ic_clear"
android:tint="?attr/colorControlNormal"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent" />

12
app/src/main/res/layout/item_genre_header.xml
View file

@ -26,11 +26,11 @@
<ImageView
android:id="@+id/genre_image"
style="@style/Widget.ImageView.Full"
android:layout_width="@dimen/size_cover_detail"
android:layout_height="@dimen/size_cover_detail"
android:layout_marginTop="@dimen/spacing_medium"
android:contentDescription="@{@string/desc_genre_image(genre.name)}"
style="@style/Widget.ImageView.Full"
app:genreImage="@{genre}"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
@ -79,11 +79,11 @@
<com.google.android.material.button.MaterialButton
android:id="@+id/genre_play_button"
style="@style/Widget.Button.Vibrant.Secondary"
android:onClick="@{() -> playbackModel.playGenre(genre, false)}"
android:text="@string/lbl_play"
android:layout_marginStart="@dimen/spacing_medium"
android:layout_marginTop="@dimen/spacing_small"
android:layout_marginEnd="@dimen/spacing_small"
android:layout_marginStart="@dimen/spacing_medium"
android:onClick="@{() -> playbackModel.playGenre(genre, false)}"
android:text="@string/lbl_play"
app:layout_constraintEnd_toStartOf="@+id/genre_shuffle_button"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/genre_duration" />
@ -101,9 +101,9 @@
<TextView
android:id="@+id/genre_song_header"
style="@style/Widget.TextView.Header"
android:layout_width="match_parent"
android:layout_height="wrap_content"
style="@style/Widget.TextView.Header"
android:layout_marginTop="@dimen/spacing_small"
android:text="@string/lbl_songs"
app:layout_constraintStart_toStartOf="parent"
@ -111,9 +111,9 @@
<ImageButton
android:id="@+id/genre_sort_button"
style="@style/Widget.Button.Unbounded.Small"
android:layout_width="0dp"
android:layout_height="wrap_content"
style="@style/Widget.Button.Unbounded.Small"
android:contentDescription="@string/desc_sort_button"
android:onClick="@{() -> detailModel.incrementGenreSortMode()}"
app:layout_constraintBottom_toBottomOf="@+id/genre_song_header"

2
app/src/main/res/layout/item_header.xml
View file

@ -12,9 +12,9 @@
<TextView
android:id="@android:id/title"
style="@style/Widget.TextView.Header"
android:layout_width="match_parent"
android:layout_height="wrap_content"
style="@style/Widget.TextView.Header"
android:text="@{header.name}"
tools:text="Songs" />
</layout>

4
app/src/main/res/layout/widget_full.xml
View file

@ -1,6 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:id="@android:id/background"
android:layout_width="match_parent"
android:layout_height="match_parent"
@ -13,8 +12,7 @@
android:contentDescription="@string/desc_no_cover"
android:src="@drawable/ic_song" />
<LinearLayout
style="@style/Widget.Component.AppWidget.Panel.Base">
<LinearLayout style="@style/Widget.Component.AppWidget.Panel.Base">
<TextView
android:id="@+id/widget_song"

4
app/src/main/res/layout/widget_small.xml
View file

@ -1,6 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:id="@android:id/background"
android:layout_width="match_parent"
android:layout_height="match_parent"
@ -13,8 +12,7 @@
android:contentDescription="@string/desc_no_cover"
android:src="@drawable/ic_song" />
<LinearLayout
style="@style/Widget.Component.AppWidget.Panel.Base">
<LinearLayout style="@style/Widget.Component.AppWidget.Panel.Base">
<TextView
android:id="@+id/widget_song"

1
app/src/main/res/values-v31/styles_component.xml
View file

@ -1,5 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<style name="Widget.Component.AppWidget.Button" parent="Widget.Component.AppWidget.Button.Base">
<item name="android:background">@drawable/ui_unbounded_ripple</item>
</style>

1
app/src/main/res/values-v31/styles_core.xml
View file

@ -1,5 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<style name="Theme.Widget" parent="@android:style/Theme.DeviceDefault.DayNight">
<item name="colorPrimary">?android:attr/colorAccent</item>
<item name="colorSecondary">?android:attr/colorAccent</item>

3
app/src/main/res/values/strings.xml
View file

@ -1,6 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<resources xmlns:tools="http://schemas.android.com/tools"
tools:ignore="MissingTranslation">
<resources xmlns:tools="http://schemas.android.com/tools" tools:ignore="MissingTranslation">
<!-- Info namespace | App labels -->
<string name="info_app_desc">A simple, rational music player for android.</string>

6
app/src/main/res/xml-v31/widget_minimal.xml
View file

@ -1,12 +1,12 @@
<?xml version="1.0" encoding="utf-8"?>
<appwidget-provider xmlns:android="http://schemas.android.com/apk/res/android"
android:description="@string/info_widget_desc"
android:initialLayout="@layout/widget_small"
android:targetCellWidth="2"
android:targetCellHeight="2"
android:minResizeWidth="110dp"
android:minResizeHeight="110dp"
android:previewLayout="@layout/widget_small"
android:description="@string/info_widget_desc"
android:resizeMode="horizontal|vertical"
android:targetCellWidth="2"
android:targetCellHeight="2"
android:updatePeriodMillis="0"
android:widgetCategory="home_screen" />

4
app/src/main/res/xml/prefs_main.xml
View file

@ -21,12 +21,12 @@
app:title="@string/set_accent" />
<SwitchPreferenceCompat
app:allowDividerBelow="false"
app:defaultValue="false"
app:iconSpaceReserved="false"
app:key="KEY_BLACK_THEME"
app:title="@string/set_black_mode"
app:summary="@string/setting_black_mode_desc"
app:allowDividerBelow="false" />
app:title="@string/set_black_mode" />
</PreferenceCategory>

2
app/src/main/res/xml/widget_minimal.xml
View file

@ -3,7 +3,7 @@
android:initialLayout="@layout/widget_small"
android:minWidth="110dp"
android:minHeight="110dp"
android:previewImage="@drawable/ui_widget_preview"
android:resizeMode="horizontal|vertical"
android:updatePeriodMillis="0"
android:previewImage="@drawable/ui_widget_preview"
android:widgetCategory="home_screen" />