mirror of
https://github.com/tachiyomiorg/tachiyomi.git
synced 2024-11-20 05:49:16 +01:00
Fix background color of browse/recents' bottom sheet
This commit is contained in:
parent
5725fb1c58
commit
c49584d003
@ -2,6 +2,7 @@ package eu.kanade.tachiyomi.ui.recents
|
|||||||
|
|
||||||
import android.Manifest.permission.WRITE_EXTERNAL_STORAGE
|
import android.Manifest.permission.WRITE_EXTERNAL_STORAGE
|
||||||
import android.app.Activity
|
import android.app.Activity
|
||||||
|
import android.content.res.ColorStateList
|
||||||
import android.os.Bundle
|
import android.os.Bundle
|
||||||
import android.view.LayoutInflater
|
import android.view.LayoutInflater
|
||||||
import android.view.Menu
|
import android.view.Menu
|
||||||
@ -10,6 +11,7 @@ import android.view.MenuItem
|
|||||||
import android.view.View
|
import android.view.View
|
||||||
import android.view.ViewGroup
|
import android.view.ViewGroup
|
||||||
import androidx.appcompat.widget.SearchView
|
import androidx.appcompat.widget.SearchView
|
||||||
|
import androidx.core.graphics.ColorUtils
|
||||||
import androidx.core.view.isVisible
|
import androidx.core.view.isVisible
|
||||||
import androidx.recyclerview.widget.ItemTouchHelper
|
import androidx.recyclerview.widget.ItemTouchHelper
|
||||||
import androidx.recyclerview.widget.LinearLayoutManager
|
import androidx.recyclerview.widget.LinearLayoutManager
|
||||||
@ -40,7 +42,9 @@ import eu.kanade.tachiyomi.ui.reader.ReaderActivity
|
|||||||
import eu.kanade.tachiyomi.ui.recents.options.TabbedRecentsOptionsSheet
|
import eu.kanade.tachiyomi.ui.recents.options.TabbedRecentsOptionsSheet
|
||||||
import eu.kanade.tachiyomi.ui.source.browse.ProgressItem
|
import eu.kanade.tachiyomi.ui.source.browse.ProgressItem
|
||||||
import eu.kanade.tachiyomi.util.system.dpToPx
|
import eu.kanade.tachiyomi.util.system.dpToPx
|
||||||
|
import eu.kanade.tachiyomi.util.system.getResourceColor
|
||||||
import eu.kanade.tachiyomi.util.system.spToPx
|
import eu.kanade.tachiyomi.util.system.spToPx
|
||||||
|
import eu.kanade.tachiyomi.util.system.toInt
|
||||||
import eu.kanade.tachiyomi.util.view.activityBinding
|
import eu.kanade.tachiyomi.util.view.activityBinding
|
||||||
import eu.kanade.tachiyomi.util.view.expand
|
import eu.kanade.tachiyomi.util.view.expand
|
||||||
import eu.kanade.tachiyomi.util.view.isCollapsed
|
import eu.kanade.tachiyomi.util.view.isCollapsed
|
||||||
@ -191,6 +195,15 @@ class RecentsController(bundle: Bundle? = null) :
|
|||||||
binding.shadow2.alpha = if (isCollapsed) 0.25f else 0f
|
binding.shadow2.alpha = if (isCollapsed) 0.25f else 0f
|
||||||
binding.shadow.alpha = if (isCollapsed) 0.5f else 0f
|
binding.shadow.alpha = if (isCollapsed) 0.5f else 0f
|
||||||
binding.fakeAppBar.alpha = if (isExpanded) 1f else 0f
|
binding.fakeAppBar.alpha = if (isExpanded) 1f else 0f
|
||||||
|
binding.downloadBottomSheet.dlRecycler.alpha = isExpanded.toInt().toFloat()
|
||||||
|
binding.downloadBottomSheet.sheetLayout.backgroundTintList = ColorStateList.valueOf(
|
||||||
|
ColorUtils.blendARGB(
|
||||||
|
view.context.getResourceColor(R.attr.colorPrimaryVariant),
|
||||||
|
view.context.getResourceColor(android.R.attr.colorBackground),
|
||||||
|
isExpanded.toInt().toFloat()
|
||||||
|
)
|
||||||
|
)
|
||||||
|
binding.downloadBottomSheet.root.backgroundTintList = binding.downloadBottomSheet.sheetLayout.backgroundTintList
|
||||||
updateTitleAndMenu()
|
updateTitleAndMenu()
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -224,6 +237,15 @@ class RecentsController(bundle: Bundle? = null) :
|
|||||||
).coerceIn(0f, 15f)
|
).coerceIn(0f, 15f)
|
||||||
binding.fakeAppBar.alpha = max(0f, (progress - cap) / (1f - cap))
|
binding.fakeAppBar.alpha = max(0f, (progress - cap) / (1f - cap))
|
||||||
binding.downloadBottomSheet.sheetLayout.alpha = 1 - max(0f, progress / cap)
|
binding.downloadBottomSheet.sheetLayout.alpha = 1 - max(0f, progress / cap)
|
||||||
|
binding.downloadBottomSheet.dlRecycler.alpha = progress * 10
|
||||||
|
binding.downloadBottomSheet.sheetLayout.backgroundTintList = ColorStateList.valueOf(
|
||||||
|
ColorUtils.blendARGB(
|
||||||
|
view.context.getResourceColor(R.attr.colorPrimaryVariant),
|
||||||
|
view.context.getResourceColor(android.R.attr.colorBackground),
|
||||||
|
(progress * 2f).coerceIn(0f, 1f)
|
||||||
|
)
|
||||||
|
)
|
||||||
|
binding.downloadBottomSheet.root.backgroundTintList = binding.downloadBottomSheet.sheetLayout.backgroundTintList
|
||||||
activityBinding?.appBar?.y = max(
|
activityBinding?.appBar?.y = max(
|
||||||
activityBinding!!.appBar.y,
|
activityBinding!!.appBar.y,
|
||||||
-headerHeight * (1 - progress)
|
-headerHeight * (1 - progress)
|
||||||
|
@ -7,7 +7,7 @@
|
|||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="match_parent"
|
android:layout_height="match_parent"
|
||||||
android:background="@drawable/bottom_sheet_rounded_background"
|
android:background="@drawable/bottom_sheet_rounded_background"
|
||||||
android:backgroundTint="?android:attr/colorBackground"
|
android:backgroundTint="?colorPrimaryVariant"
|
||||||
android:orientation="vertical"
|
android:orientation="vertical"
|
||||||
app:behavior_peekHeight="48sp"
|
app:behavior_peekHeight="48sp"
|
||||||
app:layout_behavior="com.google.android.material.bottomsheet.BottomSheetBehavior">
|
app:layout_behavior="com.google.android.material.bottomsheet.BottomSheetBehavior">
|
||||||
|
@ -7,7 +7,7 @@
|
|||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="match_parent"
|
android:layout_height="match_parent"
|
||||||
android:background="@drawable/bottom_sheet_rounded_background"
|
android:background="@drawable/bottom_sheet_rounded_background"
|
||||||
android:backgroundTint="?android:attr/colorBackground"
|
android:backgroundTint="?attr/colorPrimaryVariant"
|
||||||
android:orientation="vertical"
|
android:orientation="vertical"
|
||||||
app:behavior_peekHeight="60sp"
|
app:behavior_peekHeight="60sp"
|
||||||
app:layout_behavior="com.google.android.material.bottomsheet.BottomSheetBehavior">
|
app:layout_behavior="com.google.android.material.bottomsheet.BottomSheetBehavior">
|
||||||
|
Loading…
Reference in New Issue
Block a user