Siklos/Metro
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge remote-tracking branch 'retro/dev' into dev

Browse source 
# Conflicts:
#	.github/ISSUE_TEMPLATE/bug_report.md
#	README.md
#	app/build.gradle
#	app/src/main/AndroidManifest.xml
#	app/src/main/java/code/name/monkey/retromusic/App.kt
#	app/src/main/java/code/name/monkey/retromusic/Constants.kt
#	app/src/main/java/code/name/monkey/retromusic/activities/LyricsActivity.kt
#	app/src/main/java/code/name/monkey/retromusic/activities/PermissionActivity.kt
#	app/src/main/java/code/name/monkey/retromusic/activities/PlayingQueueActivity.kt
#	app/src/main/java/code/name/monkey/retromusic/activities/PurchaseActivity.kt
#	app/src/main/java/code/name/monkey/retromusic/activities/SettingsActivity.kt
#	app/src/main/java/code/name/monkey/retromusic/activities/SupportDevelopmentActivity.kt
#	app/src/main/java/code/name/monkey/retromusic/activities/base/AbsBaseActivity.kt
#	app/src/main/java/code/name/monkey/retromusic/activities/bugreport/model/DeviceInfo.java
#	app/src/main/java/code/name/monkey/retromusic/dialogs/CreatePlaylistDialog.kt
#	app/src/main/java/code/name/monkey/retromusic/extensions/ColorExtensions.kt
#	app/src/main/java/code/name/monkey/retromusic/extensions/DrawableExtensions.kt
#	app/src/main/java/code/name/monkey/retromusic/fragments/DetailListFragment.kt
#	app/src/main/java/code/name/monkey/retromusic/fragments/artists/ArtistDetailsFragment.kt
#	app/src/main/java/code/name/monkey/retromusic/fragments/base/AbsRecyclerViewFragment.kt
#	app/src/main/java/code/name/monkey/retromusic/fragments/folder/FoldersFragment.java
#	app/src/main/java/code/name/monkey/retromusic/fragments/home/HomeFragment.kt
#	app/src/main/java/code/name/monkey/retromusic/fragments/library/LibraryFragment.kt
#	app/src/main/java/code/name/monkey/retromusic/fragments/player/full/FullPlaybackControlsFragment.kt
#	app/src/main/java/code/name/monkey/retromusic/fragments/settings/AbsSettingsFragment.kt
#	app/src/main/java/code/name/monkey/retromusic/fragments/settings/MainSettingsFragment.kt
#	app/src/main/java/code/name/monkey/retromusic/model/Artist.kt
#	app/src/main/java/code/name/monkey/retromusic/model/Song.kt
#	app/src/main/java/code/name/monkey/retromusic/preferences/AlbumCoverStylePreferenceDialog.kt
#	app/src/main/java/code/name/monkey/retromusic/preferences/BlacklistPreferenceDialog.kt
#	app/src/main/java/code/name/monkey/retromusic/preferences/NowPlayingScreenPreferenceDialog.kt
#	app/src/main/java/code/name/monkey/retromusic/repository/AlbumRepository.kt
#	app/src/main/java/code/name/monkey/retromusic/service/MusicService.java
#	app/src/main/java/code/name/monkey/retromusic/util/AppRater.kt
#	app/src/main/java/code/name/monkey/retromusic/util/NavigationUtil.java
#	app/src/main/java/code/name/monkey/retromusic/util/PremiumShow.kt
#	app/src/main/java/code/name/monkey/retromusic/util/RingtoneManager.kt
#	app/src/main/java/code/name/monkey/retromusic/util/SAFUtil.java
#	app/src/main/res/layout-sw600dp/item_list_no_image.xml
#	app/src/main/res/layout/activity_donation.xml
#	app/src/main/res/layout/activity_pro_version.xml
#	app/src/main/res/layout/fragment_blur.xml
#	app/src/main/res/layout/fragment_classic_player.xml
#	app/src/main/res/layout/fragment_color_player.xml
#	app/src/main/res/layout/fragment_fit.xml
#	app/src/main/res/layout/fragment_flat_player.xml
#	app/src/main/res/layout/fragment_full.xml
#	app/src/main/res/layout/fragment_gradient_player.xml
#	app/src/main/res/layout/fragment_home_player.xml
#	app/src/main/res/layout/fragment_peak_player.xml
#	app/src/main/res/layout/fragment_plain_player.xml
#	app/src/main/res/layout/fragment_simple_player.xml
#	app/src/main/res/layout/fragment_tiny_player.xml
#	app/src/main/res/layout/item_storage.xml
#	app/src/main/res/layout/sliding_music_panel_layout.xml
#	app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
#	app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
#	app/src/main/res/values-fa-rIR/strings.xml
This commit is contained in:
JFronny 2022-05-14 14:28:31 +02:00
commit 4df292bddf
No known key found for this signature in database
GPG key ID: E76429612C2929F4
925 changed files with 37703 additions and 63683 deletions
Download patch file Download diff file Expand all files Collapse all files

18
app/src/main/res/layout/item_queue.xml
View file

@ -4,22 +4,20 @@
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="?rectSelector"
android:clickable="true"
android:focusable="true">
android:focusable="true"
android:background="?rectSelector"
android:transitionGroup="true">
<FrameLayout
android:id="@+id/dummy_view"
android:layout_width="match_parent"
android:layout_height="match_parent">
<androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginStart="1dp"
android:layout_marginEnd="1dp"
android:layout_marginBottom="1dp"
android:background="?rectSelector"
android:minHeight="?attr/listPreferredItemHeight"
android:orientation="horizontal"
tools:ignore="MissingPrefix">
@ -27,24 +25,24 @@
<androidx.appcompat.widget.AppCompatImageView
android:id="@+id/drag_view"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:layout_height="0dp"
android:layout_gravity="center_vertical|start"
android:visibility="gone"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:srcCompat="@drawable/ic_drag_vertical"
app:srcCompat="@drawable/ic_drag_handle"
app:tint="?attr/colorControlNormal"
tools:ignore="ContentDescription"
android:paddingHorizontal="8dp"
tools:visibility="visible" />
<FrameLayout
<com.google.android.material.card.MaterialCardView
android:id="@+id/imageContainer"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:layout_marginStart="16dp"
app:cardCornerRadius="6dp"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toEndOf="@id/drag_view"
@ -72,7 +70,7 @@
android:visibility="gone"
tools:text="100"
tools:visibility="visible" />
</FrameLayout>
</com.google.android.material.card.MaterialCardView>
<com.google.android.material.textview.MaterialTextView