Fix peak theme expand color
This commit is contained in:
parent
a4c3e46e85
commit
11e988fa80
6 changed files with 152 additions and 131 deletions
|
@ -2,6 +2,7 @@ package code.name.monkey.retromusic.activities.base
|
|||
|
||||
import android.animation.ValueAnimator
|
||||
import android.annotation.SuppressLint
|
||||
import android.graphics.Color
|
||||
import android.graphics.Rect
|
||||
import android.os.Bundle
|
||||
import android.view.MotionEvent
|
||||
|
@ -95,6 +96,9 @@ abstract class AbsSlidingMusicPanelActivity : AbsMusicServiceActivity(), AbsPlay
|
|||
updateTabs()
|
||||
|
||||
bottomSheetBehavior = BottomSheetBehavior.from(slidingPanel)
|
||||
|
||||
val themeColor = ATHUtil.resolveColor(this, R.attr.colorPrimary, Color.GRAY)
|
||||
dimBackground.setBackgroundColor(ColorUtil.withAlpha(themeColor, 0.5f))
|
||||
}
|
||||
|
||||
override fun onResume() {
|
||||
|
|
|
@ -63,7 +63,7 @@ class MainSettingsFragment : Fragment(), View.OnClickListener {
|
|||
aboutSettings.setOnClickListener(this)
|
||||
|
||||
buyProContainer.apply {
|
||||
if (App.isProVersion()) show() else hide()
|
||||
if (!App.isProVersion()) show() else hide()
|
||||
setOnClickListener {
|
||||
NavigationUtil.goToProVersion(requireContext())
|
||||
}
|
||||
|
|
|
@ -48,9 +48,9 @@
|
|||
|
||||
<ImageView
|
||||
android:id="@+id/smallIcon"
|
||||
android:layout_width="16dp"
|
||||
android:layout_height="16dp"
|
||||
android:layout_marginStart="8dp"
|
||||
android:layout_width="12dp"
|
||||
android:layout_height="12dp"
|
||||
android:layout_marginStart="16dp"
|
||||
tools:src="@drawable/ic_audiotrack_black_24dp"
|
||||
tools:tint="@color/md_black_1000" />
|
||||
|
||||
|
@ -63,12 +63,12 @@
|
|||
android:lines="1"
|
||||
android:singleLine="true"
|
||||
android:textSize="13sp"
|
||||
tools:text="@string/app_name" />
|
||||
tools:text="@tools:sample/lorem/random" />
|
||||
|
||||
<ImageView
|
||||
android:id="@+id/arrow"
|
||||
android:layout_width="16dp"
|
||||
android:layout_height="16dp"
|
||||
android:layout_width="12dp"
|
||||
android:layout_height="12dp"
|
||||
android:layout_marginStart="2dp"
|
||||
android:scaleType="centerInside"
|
||||
android:src="@drawable/ic_keyboard_arrow_up_24dp"
|
||||
|
@ -101,35 +101,43 @@
|
|||
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">
|
||||
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" />
|
||||
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" />
|
||||
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" />
|
||||
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" />
|
||||
android:scaleType="centerInside"
|
||||
tools:src="@drawable/ic_close_white_24dp"
|
||||
tools:tint="?colorOnPrimary" />
|
||||
</LinearLayout>
|
||||
</LinearLayout>
|
||||
</RelativeLayout>
|
|
@ -123,7 +123,7 @@
|
|||
android:layout_height="38dp"
|
||||
android:scaleType="centerInside"
|
||||
android:src="@drawable/ic_skip_previous_round_white_32dp"
|
||||
android:tint="?colorOnPrimary" />
|
||||
tools:tint="?colorOnPrimary" />
|
||||
|
||||
<ImageView
|
||||
android:id="@+id/action_play_pause"
|
||||
|
@ -131,7 +131,7 @@
|
|||
android:layout_height="38dp"
|
||||
android:scaleType="centerInside"
|
||||
android:src="@drawable/ic_pause_white_24dp"
|
||||
android:tint="?colorOnPrimary" />
|
||||
tools:tint="?colorOnPrimary" />
|
||||
|
||||
<ImageView
|
||||
android:id="@+id/action_next"
|
||||
|
@ -139,7 +139,7 @@
|
|||
android:layout_height="38dp"
|
||||
android:scaleType="centerInside"
|
||||
android:src="@drawable/ic_skip_next_round_white_32dp"
|
||||
android:tint="?colorOnPrimary" />
|
||||
tools:tint="?colorOnPrimary" />
|
||||
|
||||
<ImageView
|
||||
android:id="@+id/action_quit"
|
||||
|
|
|
@ -48,9 +48,9 @@
|
|||
|
||||
<ImageView
|
||||
android:id="@+id/smallIcon"
|
||||
android:layout_width="16dp"
|
||||
android:layout_height="16dp"
|
||||
android:layout_marginStart="8dp"
|
||||
android:layout_width="12dp"
|
||||
android:layout_height="12dp"
|
||||
android:layout_marginStart="16dp"
|
||||
tools:src="@drawable/ic_audiotrack_black_24dp"
|
||||
tools:tint="@color/md_black_1000" />
|
||||
|
||||
|
@ -67,8 +67,8 @@
|
|||
|
||||
<ImageView
|
||||
android:id="@+id/arrow"
|
||||
android:layout_width="16dp"
|
||||
android:layout_height="16dp"
|
||||
android:layout_width="12dp"
|
||||
android:layout_height="12dp"
|
||||
android:layout_marginStart="2dp"
|
||||
android:scaleType="centerInside"
|
||||
android:src="@drawable/ic_keyboard_arrow_up_24dp"
|
||||
|
@ -103,31 +103,41 @@
|
|||
<LinearLayout
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="match_parent"
|
||||
android:orientation="horizontal">
|
||||
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" />
|
||||
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" />
|
||||
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" />
|
||||
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" />
|
||||
android:scaleType="centerInside"
|
||||
tools:src="@drawable/ic_close_white_24dp"
|
||||
tools:tint="?colorOnPrimary" />
|
||||
</LinearLayout>
|
||||
</LinearLayout>
|
||||
</RelativeLayout>
|
|
@ -15,7 +15,6 @@
|
|||
android:id="@+id/dimBackground"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="match_parent"
|
||||
android:background="?colorOnSecondary"
|
||||
android:clickable="true"
|
||||
android:focusable="true"
|
||||
android:visibility="gone" />
|
||||
|
|
Loading…
Reference in a new issue