diff --git a/app/build.gradle b/app/build.gradle index e203f7ea1..242402243 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -14,7 +14,7 @@ android { vectorDrawables.useSupportLibrary = true applicationId "code.name.monkey.retromusic" - versionCode 10590 + versionCode 10591 versionName '6.0.0-beta' buildConfigField("String", "GOOGLE_PLAY_LICENSING_KEY", "\"${getProperty(getProperties('../public.properties'), 'GOOGLE_PLAY_LICENSE_KEY')}\"") @@ -125,7 +125,7 @@ dependencies { def retrofit_version = '2.9.0' implementation "com.squareup.retrofit2:retrofit:$retrofit_version" implementation "com.squareup.retrofit2:converter-gson:$retrofit_version" - implementation 'com.squareup.okhttp3:logging-interceptor:5.0.0-alpha.7' + implementation 'com.squareup.okhttp3:logging-interceptor:5.0.0-alpha.8' def material_dialog_version = "3.3.0" implementation "com.afollestad.material-dialogs:core:$material_dialog_version" @@ -167,5 +167,4 @@ dependencies { implementation 'me.zhanghai.android.fastscroll:library:1.1.8' implementation 'cat.ereza:customactivityoncrash:2.4.0' implementation 'me.tankery.lib:circularSeekBar:1.4.0' - debugImplementation 'com.squareup.leakcanary:leakcanary-android:2.9.1' } \ No newline at end of file diff --git a/app/src/main/res/layout-land/fragment_adaptive_player.xml b/app/src/main/res/layout-land/fragment_adaptive_player.xml new file mode 100644 index 000000000..6a193abcb --- /dev/null +++ b/app/src/main/res/layout-land/fragment_adaptive_player.xml @@ -0,0 +1,72 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout-land/fragment_circle_player.xml b/app/src/main/res/layout-land/fragment_circle_player.xml index 71f388878..d1e87ac7f 100644 --- a/app/src/main/res/layout-land/fragment_circle_player.xml +++ b/app/src/main/res/layout-land/fragment_circle_player.xml @@ -112,7 +112,9 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginStart="8dp" + android:background="?attr/roundSelector" android:padding="16dp" + android:scaleType="fitCenter" app:layout_constraintBottom_toBottomOf="@+id/playPauseButton" app:layout_constraintStart_toEndOf="@+id/playPauseButton" app:layout_constraintTop_toTopOf="@+id/playPauseButton" @@ -124,7 +126,9 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginEnd="8dp" + android:background="?attr/roundSelector" android:padding="16dp" + android:scaleType="fitCenter" app:layout_constraintBottom_toBottomOf="@+id/playPauseButton" app:layout_constraintEnd_toStartOf="@+id/playPauseButton" app:layout_constraintTop_toTopOf="@+id/playPauseButton" @@ -195,7 +199,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginEnd="16dp" - android:gravity="center_vertical|right|end" + android:gravity="center_vertical|end" android:singleLine="true" android:textColor="?android:attr/textColorSecondary" android:textSize="12sp" @@ -209,9 +213,11 @@ android:id="@+id/songCurrentProgress" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_alignParentLeft="true" - android:gravity="center_vertical|left|end" - android:paddingLeft="8dp" + android:layout_alignParentStart="true" + android:layout_marginStart="16dp" + android:gravity="center_vertical|start" + android:paddingStart="8dp" + android:paddingEnd="0dp" android:singleLine="true" android:textColor="?android:attr/textColorSecondary" android:textSize="12sp" diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 6308cc5cc..20c531b95 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-bin.zip