nyancrimew
/
PlayerAndroid
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix peak theme expand color

main
h4h13 2019-10-30 20:35:19 +05:30
parent a4c3e46e85
commit 11e988fa80
6 changed files with 152 additions and 131 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/src/main/java/code/name/monkey/retromusic/activities/base/AbsSlidingMusicPanelActivity.kt
View File

@ -2,6 +2,7 @@ package code.name.monkey.retromusic.activities.base
import android.animation.ValueAnimator import android.animation.ValueAnimator
import android.annotation.SuppressLint import android.annotation.SuppressLint
import android.graphics.Color
import android.graphics.Rect import android.graphics.Rect
import android.os.Bundle import android.os.Bundle
import android.view.MotionEvent import android.view.MotionEvent
@ -95,6 +96,9 @@ abstract class AbsSlidingMusicPanelActivity : AbsMusicServiceActivity(), AbsPlay
updateTabs() updateTabs()
bottomSheetBehavior = BottomSheetBehavior.from(slidingPanel) bottomSheetBehavior = BottomSheetBehavior.from(slidingPanel)
val themeColor = ATHUtil.resolveColor(this, R.attr.colorPrimary, Color.GRAY)
dimBackground.setBackgroundColor(ColorUtil.withAlpha(themeColor, 0.5f))
} }
override fun onResume() { override fun onResume() {

2
app/src/main/java/code/name/monkey/retromusic/fragments/settings/MainSettingsFragment.kt
View File

@ -63,7 +63,7 @@ class MainSettingsFragment : Fragment(), View.OnClickListener {
aboutSettings.setOnClickListener(this) aboutSettings.setOnClickListener(this)
buyProContainer.apply { buyProContainer.apply {
if (App.isProVersion()) show() else hide() if (!App.isProVersion()) show() else hide()
setOnClickListener { setOnClickListener {
NavigationUtil.goToProVersion(requireContext()) NavigationUtil.goToProVersion(requireContext())
} }

240
app/src/main/res/layout-v24/layout_notification_expanded.xml
View File

@ -5,131 +5,139 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content"> android:layout_height="wrap_content">
<RelativeLayout <RelativeLayout
android:id="@+id/image" android:id="@+id/image"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_alignBottom="@+id/content" android:layout_alignBottom="@+id/content"
android:layout_alignParentEnd="true"> android:layout_alignParentEnd="true">
<ImageView <ImageView
android:id="@+id/largeIcon" android:id="@+id/largeIcon"
android:layout_width="@dimen/notification_big_image_size" android:layout_width="@dimen/notification_big_image_size"
android:layout_height="@dimen/notification_big_image_size" android:layout_height="@dimen/notification_big_image_size"
android:layout_alignParentEnd="true" android:layout_alignParentEnd="true"
android:scaleType="centerCrop" android:scaleType="centerCrop"
tools:src="@tools:sample/avatars" /> tools:src="@tools:sample/avatars" />
<ImageView <ImageView
android:id="@+id/foregroundImage" android:id="@+id/foregroundImage"
android:layout_width="96dp" android:layout_width="96dp"
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_alignStart="@id/largeIcon" android:layout_alignStart="@id/largeIcon"
android:src="@drawable/background_image" /> android:src="@drawable/background_image" />
</RelativeLayout> </RelativeLayout>
<LinearLayout
android:id="@+id/content"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_alignParentStart="true"
android:orientation="vertical"
android:paddingStart="0dp"
android:paddingTop="8dp"
android:paddingEnd="144dp">
<LinearLayout <LinearLayout
android:layout_width="wrap_content" android:id="@+id/content"
android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginBottom="4dp" android:layout_alignParentStart="true"
android:gravity="center_vertical" android:orientation="vertical"
android:orientation="horizontal"> android:paddingStart="0dp"
android:paddingTop="8dp"
android:paddingEnd="144dp">
<ImageView <LinearLayout
android:id="@+id/smallIcon" android:layout_width="wrap_content"
android:layout_width="16dp" android:layout_height="wrap_content"
android:layout_height="16dp" android:layout_marginBottom="4dp"
android:layout_marginStart="8dp" android:gravity="center_vertical"
tools:src="@drawable/ic_audiotrack_black_24dp" android:orientation="horizontal">
tools:tint="@color/md_black_1000" />
<TextView <ImageView
android:id="@+id/appName" android:id="@+id/smallIcon"
android:layout_width="wrap_content" android:layout_width="12dp"
android:layout_height="wrap_content" android:layout_height="12dp"
android:layout_marginStart="4dp" android:layout_marginStart="16dp"
android:ellipsize="end" tools:src="@drawable/ic_audiotrack_black_24dp"
android:lines="1" tools:tint="@color/md_black_1000" />
android:singleLine="true"
android:textSize="13sp"
tools:text="@string/app_name" />
<ImageView <TextView
android:id="@+id/arrow" android:id="@+id/appName"
android:layout_width="16dp" android:layout_width="wrap_content"
android:layout_height="16dp" android:layout_height="wrap_content"
android:layout_marginStart="2dp" android:layout_marginStart="4dp"
android:scaleType="centerInside" android:ellipsize="end"
android:src="@drawable/ic_keyboard_arrow_up_24dp" android:lines="1"
android:tint="@color/dark_grey" android:singleLine="true"
tools:ignore="VectorDrawableCompat" /> android:textSize="13sp"
tools:text="@tools:sample/lorem/random" />
<ImageView
android:id="@+id/arrow"
android:layout_width="12dp"
android:layout_height="12dp"
android:layout_marginStart="2dp"
android:scaleType="centerInside"
android:src="@drawable/ic_keyboard_arrow_up_24dp"
android:tint="@color/dark_grey"
tools:ignore="VectorDrawableCompat" />
</LinearLayout>
<TextView
android:id="@+id/title"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:ellipsize="end"
android:lines="1"
android:paddingStart="16dp"
android:paddingEnd="0dp"
android:singleLine="true"
android:textStyle="bold"
tools:text="@tools:sample/lorem/random" />
<TextView
android:id="@+id/subtitle"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:ellipsize="end"
android:lines="1"
android:paddingStart="16dp"
android:paddingEnd="0dp"
android:singleLine="true"
tools:text="@tools:sample/lorem/random" />
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:orientation="horizontal"
android:paddingStart="8dp"
android:paddingEnd="0dp">
<ImageView
android:id="@+id/action_prev"
android:layout_width="42dp"
android:layout_height="42dp"
android:scaleType="centerInside"
tools:src="@drawable/ic_skip_previous_round_white_32dp"
tools:tint="?colorOnPrimary" />
<ImageView
android:id="@+id/action_play_pause"
android:layout_width="42dp"
android:layout_height="42dp"
android:scaleType="centerInside"
tools:src="@drawable/ic_pause_white_48dp"
tools:tint="?colorOnPrimary" />
<ImageView
android:id="@+id/action_next"
android:layout_width="42dp"
android:layout_height="42dp"
android:scaleType="centerInside"
tools:src="@drawable/ic_skip_next_round_white_32dp"
tools:tint="?colorOnPrimary" />
<ImageView
android:id="@+id/action_quit"
android:layout_width="42dp"
android:layout_height="42dp"
android:scaleType="centerInside"
tools:src="@drawable/ic_close_white_24dp"
tools:tint="?colorOnPrimary" />
</LinearLayout>
</LinearLayout> </LinearLayout>
<TextView
android:id="@+id/title"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:ellipsize="end"
android:lines="1"
android:paddingStart="16dp"
android:paddingEnd="0dp"
android:singleLine="true"
android:textStyle="bold"
tools:text="@tools:sample/lorem/random" />
<TextView
android:id="@+id/subtitle"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:ellipsize="end"
android:lines="1"
android:paddingStart="16dp"
android:paddingEnd="0dp"
android:singleLine="true"
tools:text="@tools:sample/lorem/random" />
<LinearLayout
android:paddingEnd="0dp"
android:paddingStart="12dp"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:orientation="horizontal">
<ImageView
android:id="@+id/action_prev"
android:layout_width="42dp"
android:layout_height="42dp"
android:scaleType="centerInside" />
<ImageView
android:id="@+id/action_play_pause"
android:layout_width="42dp"
android:layout_height="42dp"
android:scaleType="centerInside" />
<ImageView
android:id="@+id/action_next"
android:layout_width="42dp"
android:layout_height="42dp"
android:scaleType="centerInside" />
<ImageView
android:id="@+id/action_quit"
android:layout_width="42dp"
android:layout_height="42dp"
android:scaleType="centerInside" />
</LinearLayout>
</LinearLayout>
</RelativeLayout> </RelativeLayout>

6
app/src/main/res/layout/layout_notification_collapsed.xml
View File

@ -123,7 +123,7 @@
android:layout_height="38dp" android:layout_height="38dp"
android:scaleType="centerInside" android:scaleType="centerInside"
android:src="@drawable/ic_skip_previous_round_white_32dp" android:src="@drawable/ic_skip_previous_round_white_32dp"
android:tint="?colorOnPrimary" /> tools:tint="?colorOnPrimary" />
<ImageView <ImageView
android:id="@+id/action_play_pause" android:id="@+id/action_play_pause"
@ -131,7 +131,7 @@
android:layout_height="38dp" android:layout_height="38dp"
android:scaleType="centerInside" android:scaleType="centerInside"
android:src="@drawable/ic_pause_white_24dp" android:src="@drawable/ic_pause_white_24dp"
android:tint="?colorOnPrimary" /> tools:tint="?colorOnPrimary" />
<ImageView <ImageView
android:id="@+id/action_next" android:id="@+id/action_next"
@ -139,7 +139,7 @@
android:layout_height="38dp" android:layout_height="38dp"
android:scaleType="centerInside" android:scaleType="centerInside"
android:src="@drawable/ic_skip_next_round_white_32dp" android:src="@drawable/ic_skip_next_round_white_32dp"
android:tint="?colorOnPrimary" /> tools:tint="?colorOnPrimary" />
<ImageView <ImageView
android:id="@+id/action_quit" android:id="@+id/action_quit"

30
app/src/main/res/layout/layout_notification_expanded.xml
View File

@ -48,9 +48,9 @@
<ImageView <ImageView
android:id="@+id/smallIcon" android:id="@+id/smallIcon"
android:layout_width="16dp" android:layout_width="12dp"
android:layout_height="16dp" android:layout_height="12dp"
android:layout_marginStart="8dp" android:layout_marginStart="16dp"
tools:src="@drawable/ic_audiotrack_black_24dp" tools:src="@drawable/ic_audiotrack_black_24dp"
tools:tint="@color/md_black_1000" /> tools:tint="@color/md_black_1000" />
@ -67,8 +67,8 @@
<ImageView <ImageView
android:id="@+id/arrow" android:id="@+id/arrow"
android:layout_width="16dp" android:layout_width="12dp"
android:layout_height="16dp" android:layout_height="12dp"
android:layout_marginStart="2dp" android:layout_marginStart="2dp"
android:scaleType="centerInside" android:scaleType="centerInside"
android:src="@drawable/ic_keyboard_arrow_up_24dp" android:src="@drawable/ic_keyboard_arrow_up_24dp"
@ -103,31 +103,41 @@
<LinearLayout <LinearLayout
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="match_parent" android:layout_height="match_parent"
android:orientation="horizontal"> android:orientation="horizontal"
android:paddingStart="8dp"
android:paddingEnd="0dp">
<ImageView <ImageView
android:id="@+id/action_prev" android:id="@+id/action_prev"
android:layout_width="42dp" android:layout_width="42dp"
android:layout_height="42dp" android:layout_height="42dp"
android:scaleType="centerInside" /> android:scaleType="centerInside"
tools:src="@drawable/ic_skip_previous_round_white_32dp"
tools:tint="?colorOnPrimary" />
<ImageView <ImageView
android:id="@+id/action_play_pause" android:id="@+id/action_play_pause"
android:layout_width="42dp" android:layout_width="42dp"
android:layout_height="42dp" android:layout_height="42dp"
android:scaleType="centerInside" /> android:scaleType="centerInside"
tools:src="@drawable/ic_pause_white_48dp"
tools:tint="?colorOnPrimary" />
<ImageView <ImageView
android:id="@+id/action_next" android:id="@+id/action_next"
android:layout_width="42dp" android:layout_width="42dp"
android:layout_height="42dp" android:layout_height="42dp"
android:scaleType="centerInside" /> android:scaleType="centerInside"
tools:src="@drawable/ic_skip_next_round_white_32dp"
tools:tint="?colorOnPrimary" />
<ImageView <ImageView
android:id="@+id/action_quit" android:id="@+id/action_quit"
android:layout_width="42dp" android:layout_width="42dp"
android:layout_height="42dp" android:layout_height="42dp"
android:scaleType="centerInside" /> android:scaleType="centerInside"
tools:src="@drawable/ic_close_white_24dp"
tools:tint="?colorOnPrimary" />
</LinearLayout> </LinearLayout>
</LinearLayout> </LinearLayout>
</RelativeLayout> </RelativeLayout>

1
app/src/main/res/layout/sliding_music_panel_layout.xml
View File

@ -15,7 +15,6 @@
android:id="@+id/dimBackground" android:id="@+id/dimBackground"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:background="?colorOnSecondary"
android:clickable="true" android:clickable="true"
android:focusable="true" android:focusable="true"
android:visibility="gone" /> android:visibility="gone" />