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

Fix artist cover background purple color in color theme

Browse source
This commit is contained in:
h4h13 2019-04-05 11:22:42 +05:30
parent fce012aaf3
commit f7628aa831
4 changed files with 11 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
app/src/main/java/code/name/monkey/retromusic/ui/activities/ArtistDetailActivity.kt
View file

@ -73,8 +73,7 @@ class ArtistDetailActivity : AbsSlidingMusicPanelActivity(), ArtistDetailContrac
setDrawUnderStatusBar() setDrawUnderStatusBar()
setupWindowTransitions() setupWindowTransitions()
super.onCreate(savedInstanceState) super.onCreate(savedInstanceState)
collapsingToolbarLayout?.setBackgroundColor(ThemeStore.primaryColor(this))
toggleBottomNavigationView(true) toggleBottomNavigationView(true)
setNavigationbarColorAuto() setNavigationbarColorAuto()
setLightNavigationBar(true) setLightNavigationBar(true)
@ -126,9 +125,9 @@ class ArtistDetailActivity : AbsSlidingMusicPanelActivity(), ArtistDetailContrac
private fun setupToolbarMarginHeight() { private fun setupToolbarMarginHeight() {
val primaryColor = ThemeStore.primaryColor(this) val primaryColor = ThemeStore.primaryColor(this)
TintHelper.setTintAuto(contentContainer!!, primaryColor, true) TintHelper.setTintAuto(contentContainer!!, primaryColor, true)
if (collapsingToolbar != null) { if (collapsingToolbarLayout != null) {
collapsingToolbar!!.setContentScrimColor(primaryColor) collapsingToolbarLayout!!.setContentScrimColor(primaryColor)
collapsingToolbar!!.setStatusBarScrimColor(ColorUtil.darkenColor(primaryColor)) collapsingToolbarLayout!!.setStatusBarScrimColor(ColorUtil.darkenColor(primaryColor))
} }
toolbar!!.setNavigationIcon(R.drawable.ic_keyboard_backspace_black_24dp) toolbar!!.setNavigationIcon(R.drawable.ic_keyboard_backspace_black_24dp)

9
app/src/main/res/layout-land/activity_artist_details.xml
View file

@ -42,10 +42,6 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:orientation="vertical"> android:orientation="vertical">
<View
android:layout_width="match_parent"
android:layout_height="@dimen/status_bar_padding" />
<LinearLayout <LinearLayout
android:id="@+id/background" android:id="@+id/background"
android:layout_width="match_parent" android:layout_width="match_parent"
@ -88,6 +84,10 @@
<include layout="@layout/activity_artist_content" /> <include layout="@layout/activity_artist_content" />
</LinearLayout> </LinearLayout>
<View
android:layout_width="match_parent"
android:layout_height="@dimen/status_bar_padding" />
</LinearLayout> </LinearLayout>
</androidx.core.widget.NestedScrollView> </androidx.core.widget.NestedScrollView>
</LinearLayout> </LinearLayout>
@ -96,6 +96,7 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="72dp" android:layout_height="72dp"
android:background="@drawable/shadow_down_strong" /> android:background="@drawable/shadow_down_strong" />
<com.google.android.material.floatingactionbutton.ExtendedFloatingActionButton <com.google.android.material.floatingactionbutton.ExtendedFloatingActionButton
android:id="@+id/actionShuffleAll" android:id="@+id/actionShuffleAll"
android:layout_width="wrap_content" android:layout_width="wrap_content"

1
app/src/main/res/layout-xlarge/activity_artist_details.xml
View file

@ -20,6 +20,7 @@
<com.google.android.material.appbar.CollapsingToolbarLayout <com.google.android.material.appbar.CollapsingToolbarLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:id="@+id/collapsingToolbarLayout"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:background="@android:color/transparent" android:background="@android:color/transparent"
app:layout_scrollFlags="scroll|exitUntilCollapsed" app:layout_scrollFlags="scroll|exitUntilCollapsed"

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

@ -12,7 +12,7 @@
android:layout_height="wrap_content"> android:layout_height="wrap_content">
<com.google.android.material.appbar.CollapsingToolbarLayout <com.google.android.material.appbar.CollapsingToolbarLayout
android:id="@+id/collapsingToolbar" android:id="@+id/collapsingToolbarLayout"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
app:contentScrim="@android:color/transparent" app:contentScrim="@android:color/transparent"