Update incognito indicator and PreviewFragment

app/src/main/kotlin/org/koitharu/kotatsu/core/AppModule.kt

@@ -40,7 +40,6 @@ import org.koitharu.kotatsu.core.parser.favicon.FaviconFetcher
 import org.koitharu.kotatsu.core.ui.image.CoilImageGetter
 import org.koitharu.kotatsu.core.ui.util.ActivityRecreationHandle
 import org.koitharu.kotatsu.core.util.AcraScreenLogger
-import org.koitharu.kotatsu.core.util.IncognitoModeIndicator
 import org.koitharu.kotatsu.core.util.ext.connectivityManager
 import org.koitharu.kotatsu.core.util.ext.isLowRamDevice
 import org.koitharu.kotatsu.details.ui.pager.pages.MangaPageFetcher
@@ -147,12 +146,10 @@ interface AppModule {
 		fun provideActivityLifecycleCallbacks(
 			appProtectHelper: AppProtectHelper,
 			activityRecreationHandle: ActivityRecreationHandle,
-			incognitoModeIndicator: IncognitoModeIndicator,
 			acraScreenLogger: AcraScreenLogger,
 		): Set<@JvmSuppressWildcards Application.ActivityLifecycleCallbacks> = arraySetOf(
 			appProtectHelper,
 			activityRecreationHandle,
-			incognitoModeIndicator,
 			acraScreenLogger,
 		)
 

app/src/main/kotlin/org/koitharu/kotatsu/core/ui/widgets/TipView.kt

@@ -12,6 +12,7 @@ import androidx.annotation.DrawableRes
 import androidx.annotation.StringRes
 import androidx.core.content.ContextCompat
 import androidx.core.content.withStyledAttributes
+import androidx.core.view.isVisible
 import androidx.core.view.setPadding
 import com.google.android.material.shape.MaterialShapeDrawable
 import com.google.android.material.shape.ShapeAppearanceModel
@@ -103,16 +104,22 @@ class TipView @JvmOverloads constructor(
 
 	fun setPrimaryButtonText(@StringRes resId: Int) {
 		binding.buttonPrimary.setTextAndVisible(resId)
+		updateButtonsLayout()
 	}
 
 	fun setSecondaryButtonText(@StringRes resId: Int) {
 		binding.buttonSecondary.setTextAndVisible(resId)
+		updateButtonsLayout()
 	}
 
 	fun setIcon(@DrawableRes resId: Int) {
 		icon = ContextCompat.getDrawable(context, resId)
 	}
 
+	private fun updateButtonsLayout() {
+		binding.layoutButtons.isVisible = binding.buttonPrimary.isVisible || binding.buttonSecondary.isVisible
+	}
+
 	interface OnButtonClickListener {
 
 		fun onPrimaryButtonClick(tipView: TipView)

app/src/main/kotlin/org/koitharu/kotatsu/core/util/IncognitoModeIndicator.kt

@@ -1,46 +0,0 @@
-package org.koitharu.kotatsu.core.util
-
-import android.app.Activity
-import android.os.Bundle
-import androidx.appcompat.app.AppCompatActivity
-import androidx.core.content.ContextCompat
-import androidx.lifecycle.flowWithLifecycle
-import androidx.lifecycle.lifecycleScope
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.flow.flowOn
-import kotlinx.coroutines.flow.launchIn
-import kotlinx.coroutines.flow.onEach
-import org.koitharu.kotatsu.R
-import org.koitharu.kotatsu.core.prefs.AppSettings
-import org.koitharu.kotatsu.core.prefs.observeAsFlow
-import org.koitharu.kotatsu.core.ui.DefaultActivityLifecycleCallbacks
-import org.koitharu.kotatsu.core.util.ext.getThemeColor
-import javax.inject.Inject
-import javax.inject.Singleton
-
-@Singleton
-class IncognitoModeIndicator @Inject constructor(
-	private val settings: AppSettings,
-) : DefaultActivityLifecycleCallbacks {
-
-	override fun onActivityCreated(activity: Activity, savedInstanceState: Bundle?) {
-		if (activity !is AppCompatActivity) {
-			return
-		}
-		settings.observeAsFlow(
-			key = AppSettings.KEY_INCOGNITO_MODE,
-			valueProducer = { isIncognitoModeEnabled },
-		).flowOn(Dispatchers.IO)
-			.flowWithLifecycle(activity.lifecycle)
-			.onEach { updateStatusBar(activity, it) }
-			.launchIn(activity.lifecycleScope)
-	}
-
-	private fun updateStatusBar(activity: AppCompatActivity, isIncognitoModeEnabled: Boolean) {
-		activity.window.statusBarColor = if (isIncognitoModeEnabled) {
-			ContextCompat.getColor(activity, R.color.status_bar_incognito)
-		} else {
-			activity.getThemeColor(android.R.attr.statusBarColor)
-		}
-	}
-}

app/src/main/kotlin/org/koitharu/kotatsu/details/ui/DetailsActivity.kt

@@ -35,6 +35,7 @@ import com.google.android.material.chip.Chip
 import com.google.android.material.snackbar.Snackbar
 import dagger.hilt.android.AndroidEntryPoint
 import kotlinx.coroutines.flow.FlowCollector
+import kotlinx.coroutines.flow.combine
 import kotlinx.coroutines.flow.filterNotNull
 import org.koitharu.kotatsu.R
 import org.koitharu.kotatsu.bookmarks.domain.Bookmark
@@ -160,12 +161,13 @@ class DetailsActivity :
 		viewModel.newChaptersCount.observe(this, ::onNewChaptersChanged)
 		viewModel.onError.observeEvent(this, DetailsErrorObserver(this, viewModel, exceptionResolver))
 		viewModel.onActionDone.observeEvent(this, ReversibleActionObserver(viewBinding.scrollView, null))
-		viewModel.historyInfo.observe(this, ::onHistoryChanged)
+		combine(viewModel.historyInfo, viewModel.isLoading, ::Pair).observe(this) {
+			onHistoryChanged(it.first, it.second)
+		}
 		viewModel.isLoading.observe(this, ::onLoadingStateChanged)
 		viewModel.scrobblingInfo.observe(this, ::onScrobblingInfoChanged)
 		viewModel.localSize.observe(this, ::onLocalSizeChanged)
 		viewModel.relatedManga.observe(this, ::onRelatedMangaChanged)
-		// viewModel.chapters.observe(this, ::onChaptersChanged)
 		viewModel.readingTime.observe(this, ::onReadingTimeChanged)
 		viewModel.selectedBranch.observe(this) {
 			viewBinding.infoLayout.chipBranch.text = it.ifNullOrEmpty { getString(R.string.system_default) }
@@ -197,9 +199,7 @@ class DetailsActivity :
 		when (v.id) {
 			R.id.button_read -> openReader(isIncognitoMode = false)
 			R.id.chip_branch -> showBranchPopupMenu(v)
-			R.id.button_chapters -> {
-				ChaptersPagesSheet.show(supportFragmentManager)
-			}
+			R.id.button_chapters -> ChaptersPagesSheet.show(supportFragmentManager)
 
 			R.id.chip_author -> {
 				val manga = viewModel.manga.value ?: return
@@ -342,10 +342,6 @@ class DetailsActivity :
 		}
 	}
 
-	private fun onChaptersChanged(chapters: List<ChapterListItem>?) {
-		// TODO
-	}
-
 	private fun onFavoritesChanged(categories: Set<FavouriteCategory>) {
 		val chip = viewBinding.infoLayout.chipFavorite
 		chip.setChipIconResource(if (categories.isEmpty()) R.drawable.ic_heart_outline else R.drawable.ic_heart)
@@ -449,7 +445,6 @@ class DetailsActivity :
 	private fun onMangaUpdated(details: MangaDetails) {
 		with(viewBinding) {
 			val manga = details.toManga()
-			val hasChapters = !manga.chapters.isNullOrEmpty()
 			// Main
 			loadCover(manga)
 			textViewTitle.text = manga.title
@@ -500,9 +495,7 @@ class DetailsActivity :
 					.enqueueWith(coil)
 			}
 
-			buttonChapters?.isEnabled = hasChapters
 			title = manga.title
-			buttonRead.isEnabled = hasChapters
 			invalidateOptionsMenu()
 		}
 	}
@@ -531,30 +524,18 @@ class DetailsActivity :
 		)
 	}
 
-	private fun onHistoryChanged(info: HistoryInfo) {
-		with(viewBinding.buttonRead) {
-			if (info.history != null) {
-				setTitle(R.string._continue)
-			} else {
-				setTitle(R.string.read)
-			}
-		}
-		viewBinding.buttonRead.subtitle = when {
-			!info.isValid -> getString(R.string.loading_)
-			info.currentChapter >= 0 -> getString(
-				R.string.chapter_d_of_d,
-				info.currentChapter + 1,
-				info.totalChapters,
-			)
-
+	private fun onHistoryChanged(info: HistoryInfo, isLoading: Boolean) = with(viewBinding) {
+		buttonRead.setTitle(if (info.history != null) R.string._continue else R.string.read)
+		buttonRead.subtitle = when {
+			isLoading -> getString(R.string.loading_)
+			info.isIncognitoMode -> getString(R.string.incognito_mode)
+			info.currentChapter >= 0 -> getString(R.string.chapter_d_of_d, info.currentChapter + 1, info.totalChapters)
 			info.totalChapters == 0 -> getString(R.string.no_chapters)
-			else -> resources.getQuantityString(
-				R.plurals.chapters,
-				info.totalChapters,
-				info.totalChapters,
-			)
+			else -> resources.getQuantityString(R.plurals.chapters, info.totalChapters, info.totalChapters)
 		}
-		viewBinding.buttonRead.setProgress(info.history?.percent?.coerceIn(0f, 1f) ?: 0f, true)
+		buttonRead.setProgress(info.history?.percent?.coerceIn(0f, 1f) ?: 0f, true)
+		buttonChapters?.isEnabled = info.isValid
+		buttonRead.isEnabled = info.isValid
 	}
 
 	private fun onNewChaptersChanged(count: Int) {

app/src/main/kotlin/org/koitharu/kotatsu/history/ui/HistoryListViewModel.kt

@@ -35,6 +35,7 @@ import org.koitharu.kotatsu.list.ui.model.EmptyState
 import org.koitharu.kotatsu.list.ui.model.ListHeader
 import org.koitharu.kotatsu.list.ui.model.ListModel
 import org.koitharu.kotatsu.list.ui.model.LoadingState
+import org.koitharu.kotatsu.list.ui.model.TipModel
 import org.koitharu.kotatsu.list.ui.model.toErrorState
 import org.koitharu.kotatsu.list.ui.model.toGridModel
 import org.koitharu.kotatsu.list.ui.model.toListDetailedModel
@@ -82,7 +83,8 @@ class HistoryListViewModel @Inject constructor(
 		isGroupingEnabled,
 		listMode,
 		networkState,
-	) { list, grouped, mode, online ->
+		settings.observeAsFlow(AppSettings.KEY_INCOGNITO_MODE) { isIncognitoModeEnabled },
+	) { list, grouped, mode, online, incognito ->
 		when {
 			list.isEmpty() -> listOf(
 				EmptyState(
@@ -93,7 +95,7 @@ class HistoryListViewModel @Inject constructor(
 				),
 			)
 
-			else -> mapList(list, grouped, mode, online)
+			else -> mapList(list, grouped, mode, online, incognito)
 		}
 	}.onStart {
 		loadingCounter.increment()
@@ -141,8 +143,19 @@ class HistoryListViewModel @Inject constructor(
 		grouped: Boolean,
 		mode: ListMode,
 		isOnline: Boolean,
+		isIncognito: Boolean,
 	): List<ListModel> {
-		val result = ArrayList<ListModel>(if (grouped) (list.size * 1.4).toInt() else list.size + 1)
+		val result = ArrayList<ListModel>(if (grouped) (list.size * 1.4).toInt() else list.size + 2)
+		if (isIncognito) {
+			result += TipModel(
+				key = AppSettings.KEY_INCOGNITO_MODE,
+				title = R.string.incognito_mode,
+				text = R.string.incognito_mode_hint,
+				icon = R.drawable.ic_incognito,
+				primaryButtonText = 0,
+				secondaryButtonText = 0,
+			)
+		}
 		val order = sortOrder.value
 		var prevHeader: ListHeader? = null
 		if (!isOnline) {

app/src/main/kotlin/org/koitharu/kotatsu/list/ui/preview/PreviewFragment.kt

@@ -131,38 +131,21 @@ class PreviewFragment : BaseFragment<FragmentPreviewBinding>(), View.OnClickList
 
 	private fun onFooterUpdated(footer: PreviewViewModel.FooterInfo?) {
 		with(requireViewBinding()) {
-			toolbarBottom.isVisible = footer != null
-			if (footer == null) {
-				return
-			}
-			toolbarBottom.title = when {
-				footer.isInProgress() -> {
-					getString(R.string.chapter_d_of_d, footer.currentChapter, footer.totalChapters)
-				}
+			buttonRead.isEnabled = footer != null
+			buttonRead.setTitle(if (footer?.isInProgress() == true) R.string._continue else R.string.read)
+			buttonRead.subtitle = when {
+				footer == null -> getString(R.string.loading_)
+				footer.isIncognito -> getString(R.string.incognito_mode)
+				footer.currentChapter >= 0 -> getString(
+					R.string.chapter_d_of_d,
+					footer.currentChapter + 1,
+					footer.totalChapters,
+				)
 
-				footer.totalChapters > 0 -> {
-					resources.getQuantityString(R.plurals.chapters, footer.totalChapters, footer.totalChapters)
-				}
-
-				else -> {
-					getString(R.string.no_chapters)
-				}
+				footer.totalChapters == 0 -> getString(R.string.no_chapters)
+				else -> resources.getQuantityString(R.plurals.chapters, footer.totalChapters, footer.totalChapters)
 			}
-			buttonRead.isEnabled = footer.totalChapters > 0
-			buttonRead.setIconResource(
-				when {
-					footer.isIncognito -> R.drawable.ic_incognito
-					footer.isInProgress() -> R.drawable.ic_play
-					else -> R.drawable.ic_read
-				},
-			)
-			buttonRead.setText(
-				if (footer.isInProgress()) {
-					R.string._continue
-				} else {
-					R.string.read
-				},
-			)
+			buttonRead.setProgress(footer?.percent?.coerceIn(0f, 1f) ?: 0f, true)
 		}
 	}
 

app/src/main/kotlin/org/koitharu/kotatsu/list/ui/preview/PreviewViewModel.kt

@@ -29,6 +29,7 @@ import org.koitharu.kotatsu.core.ui.widgets.ChipsView
 import org.koitharu.kotatsu.core.util.ext.require
 import org.koitharu.kotatsu.core.util.ext.sanitize
 import org.koitharu.kotatsu.history.data.HistoryRepository
+import org.koitharu.kotatsu.history.data.PROGRESS_NONE
 import org.koitharu.kotatsu.list.domain.ListExtraProvider
 import javax.inject.Inject
 
@@ -56,7 +57,7 @@ class PreviewViewModel @Inject constructor(
 		val b = m.getPreferredBranch(history)
 		val chapters = m.getChapters(b).orEmpty()
 		FooterInfo(
-			branch = b,
+			percent = history?.percent ?: PROGRESS_NONE,
 			currentChapter = history?.chapterId?.let {
 				chapters.indexOfFirst { x -> x.id == it }
 			} ?: -1,
@@ -109,10 +110,10 @@ class PreviewViewModel @Inject constructor(
 	}
 
 	data class FooterInfo(
-		val branch: String?,
 		val currentChapter: Int,
 		val totalChapters: Int,
 		val isIncognito: Boolean,
+		val percent: Float,
 	) {
 
 		fun isInProgress() = currentChapter >= 0

app/src/main/kotlin/org/koitharu/kotatsu/main/ui/MainActivity.kt

@@ -130,9 +130,6 @@ class MainActivity : BaseActivity<ActivityMainBinding>(), AppBarOwner, BottomNav
 		viewModel.onFirstStart.observeEvent(this) {
 			WelcomeSheet.show(supportFragmentManager)
 		}
-		viewModel.isIncognitoMode.observe(this) {
-			adjustSearchUI(isSearchOpened(), false)
-		}
 		searchSuggestionViewModel.isIncognitoModeEnabled.observe(this, this::onIncognitoModeChanged)
 	}
 
@@ -368,10 +365,10 @@ class MainActivity : BaseActivity<ActivityMainBinding>(), AppBarOwner, BottomNav
 		adjustFabVisibility(isSearchOpened = isOpened)
 		supportActionBar?.apply {
 			setHomeAsUpIndicator(
-				when {
-					isOpened -> materialR.drawable.abc_ic_ab_back_material
-					viewModel.isIncognitoMode.value -> R.drawable.ic_incognito
-					else -> materialR.drawable.abc_ic_search_api_material
+				if (isOpened) {
+					materialR.drawable.abc_ic_ab_back_material
+				} else {
+					materialR.drawable.abc_ic_search_api_material
 				},
 			)
 			setHomeActionContentDescription(

app/src/main/kotlin/org/koitharu/kotatsu/main/ui/MainViewModel.kt

@@ -9,7 +9,6 @@ import kotlinx.coroutines.plus
 import org.koitharu.kotatsu.core.exceptions.EmptyHistoryException
 import org.koitharu.kotatsu.core.github.AppUpdateRepository
 import org.koitharu.kotatsu.core.prefs.AppSettings
-import org.koitharu.kotatsu.core.prefs.observeAsStateFlow
 import org.koitharu.kotatsu.core.ui.BaseViewModel
 import org.koitharu.kotatsu.core.util.ext.MutableEventFlow
 import org.koitharu.kotatsu.core.util.ext.call
@@ -39,12 +38,6 @@ class MainViewModel @Inject constructor(
 		initialValue = false,
 	)
 
-	val isIncognitoMode = settings.observeAsStateFlow(
-		scope = viewModelScope + Dispatchers.Default,
-		key = AppSettings.KEY_INCOGNITO_MODE,
-		valueProducer = { isIncognitoModeEnabled },
-	)
-
 	val appUpdate = appUpdateRepository.observeAvailableUpdate()
 
 	val feedCounter = trackingRepository.observeUpdatedMangaCount()

app/src/main/res/layout/activity_details.xml

@@ -182,7 +182,6 @@
 				android:gravity="center"
 				android:paddingHorizontal="6dp"
 				android:paddingVertical="8dp"
-				android:textColor="?colorOnPrimaryContainer"
 				app:baseColor="?colorSecondaryContainer"
 				app:layout_constraintEnd_toStartOf="@id/button_chapters"
 				app:layout_constraintStart_toStartOf="parent"

app/src/main/res/layout/activity_image.xml

@@ -22,7 +22,7 @@
 		android:contentDescription="@string/back"
 		android:elevation="@dimen/m3_sys_elevation_level1"
 		android:scaleType="center"
-		android:src="?homeAsUpIndicator" />
+		app:srcCompat="?homeAsUpIndicator" />
 
 	<com.google.android.material.progressindicator.CircularProgressIndicator
 		android:id="@+id/progressBar"

app/src/main/res/layout/fragment_preview.xml

@@ -1,197 +1,194 @@
 <?xml version="1.0" encoding="utf-8"?>
-<FrameLayout
+<ScrollView
 	xmlns:android="http://schemas.android.com/apk/res/android"
 	xmlns:app="http://schemas.android.com/apk/res-auto"
 	xmlns:tools="http://schemas.android.com/tools"
+	android:id="@+id/scrollView"
 	android:layout_width="match_parent"
-	android:layout_height="match_parent">
+	android:layout_height="match_parent"
+	tools:background="@macro/m3_comp_filled_card_container_color">
 
-	<ScrollView
-		android:id="@+id/scrollView"
+	<androidx.constraintlayout.widget.ConstraintLayout
 		android:layout_width="match_parent"
 		android:layout_height="wrap_content"
-		android:scrollIndicators="bottom">
+		android:paddingBottom="?actionBarSize">
 
-		<androidx.constraintlayout.widget.ConstraintLayout
-			android:layout_width="match_parent"
+		<com.google.android.material.imageview.ShapeableImageView
+			android:id="@+id/imageView_cover"
+			android:layout_width="0dp"
+			android:layout_height="0dp"
+			android:layout_marginStart="16dp"
+			android:layout_marginTop="16dp"
+			android:background="?colorSecondaryContainer"
+			android:foreground="?selectableItemBackground"
+			android:scaleType="centerCrop"
+			app:layout_constraintDimensionRatio="H,13:18"
+			app:layout_constraintEnd_toEndOf="parent"
+			app:layout_constraintHorizontal_bias="0"
+			app:layout_constraintStart_toStartOf="parent"
+			app:layout_constraintTop_toTopOf="parent"
+			app:layout_constraintWidth_percent="0.3"
+			app:shapeAppearanceOverlay="@style/ShapeAppearanceOverlay.Kotatsu.Cover"
+			tools:background="@tools:sample/backgrounds/scenic[5]"
+			tools:ignore="ContentDescription,UnusedAttribute" />
+
+		<TextView
+			android:id="@+id/textView_title"
+			android:layout_width="0dp"
 			android:layout_height="wrap_content"
-			android:paddingBottom="?actionBarSize">
+			android:layout_marginStart="16dp"
+			android:layout_marginTop="16dp"
+			android:ellipsize="end"
+			android:maxLines="5"
+			android:textAppearance="?attr/textAppearanceHeadlineSmall"
+			app:layout_constraintEnd_toStartOf="@id/button_open"
+			app:layout_constraintStart_toEndOf="@id/imageView_cover"
+			app:layout_constraintTop_toTopOf="parent"
+			app:layout_goneMarginEnd="16dp"
+			tools:text="@tools:sample/lorem" />
 
-			<com.google.android.material.imageview.ShapeableImageView
-				android:id="@+id/imageView_cover"
-				android:layout_width="0dp"
-				android:layout_height="0dp"
-				android:layout_marginStart="16dp"
-				android:layout_marginTop="16dp"
-				android:background="?colorSecondaryContainer"
-				android:foreground="?selectableItemBackground"
-				android:scaleType="centerCrop"
-				app:layout_constraintDimensionRatio="H,13:18"
-				app:layout_constraintEnd_toEndOf="parent"
-				app:layout_constraintHorizontal_bias="0"
-				app:layout_constraintStart_toStartOf="parent"
-				app:layout_constraintTop_toTopOf="parent"
-				app:layout_constraintWidth_percent="0.3"
-				app:shapeAppearanceOverlay="@style/ShapeAppearanceOverlay.Kotatsu.Cover"
-				tools:background="@tools:sample/backgrounds/scenic[5]"
-				tools:ignore="ContentDescription,UnusedAttribute" />
-
-			<TextView
-				android:id="@+id/textView_title"
-				android:layout_width="0dp"
-				android:layout_height="wrap_content"
-				android:layout_marginStart="16dp"
-				android:layout_marginTop="16dp"
-				android:ellipsize="end"
-				android:maxLines="5"
-				android:textAppearance="?attr/textAppearanceHeadlineSmall"
-				app:layout_constraintEnd_toStartOf="@id/button_open"
-				app:layout_constraintStart_toEndOf="@id/imageView_cover"
-				app:layout_constraintTop_toTopOf="parent"
-				app:layout_goneMarginEnd="16dp"
-				tools:text="@tools:sample/lorem" />
-
-			<ImageButton
-				android:id="@+id/button_open"
-				android:layout_width="wrap_content"
-				android:layout_height="wrap_content"
-				android:layout_marginTop="4dp"
-				android:background="?selectableItemBackgroundBorderless"
-				android:contentDescription="@string/details"
-				android:padding="12dp"
-				app:layout_constraintEnd_toStartOf="@id/button_close"
-				app:layout_constraintTop_toTopOf="parent"
-				app:srcCompat="@drawable/ic_expand" />
-
-			<ImageButton
-				android:id="@+id/button_close"
-				android:layout_width="wrap_content"
-				android:layout_height="wrap_content"
-				android:layout_marginTop="4dp"
-				android:layout_marginEnd="4dp"
-				android:background="?selectableItemBackgroundBorderless"
-				android:contentDescription="@string/close"
-				android:padding="12dp"
-				app:layout_constraintEnd_toEndOf="parent"
-				app:layout_constraintTop_toTopOf="parent"
-				app:srcCompat="?actionModeCloseDrawable"
-				app:tint="?colorControlNormal" />
-
-			<TextView
-				android:id="@+id/textView_subtitle"
-				android:layout_width="0dp"
-				android:layout_height="wrap_content"
-				android:layout_marginStart="16dp"
-				android:layout_marginTop="4dp"
-				android:layout_marginEnd="16dp"
-				android:ellipsize="end"
-				android:maxLines="3"
-				android:textAppearance="?attr/textAppearanceBodyMedium"
-				app:layout_constraintEnd_toEndOf="parent"
-				app:layout_constraintStart_toEndOf="@id/imageView_cover"
-				app:layout_constraintTop_toBottomOf="@id/textView_title"
-				tools:text="@tools:sample/lorem[12]" />
-
-			<TextView
-				android:id="@+id/textView_author"
-				android:layout_width="wrap_content"
-				android:layout_height="wrap_content"
-				android:layout_marginStart="16dp"
-				android:layout_marginTop="4dp"
-				android:layout_marginEnd="16dp"
-				android:background="@drawable/list_selector"
-				android:padding="2dp"
-				android:singleLine="true"
-				android:textColor="?attr/colorTertiary"
-				android:textStyle="bold"
-				app:layout_constrainedWidth="true"
-				app:layout_constraintEnd_toEndOf="parent"
-				app:layout_constraintHorizontal_bias="0"
-				app:layout_constraintStart_toEndOf="@id/imageView_cover"
-				app:layout_constraintTop_toBottomOf="@id/textView_subtitle"
-				tools:text="@tools:sample/full_names" />
-
-			<RatingBar
-				android:id="@+id/rating_bar"
-				style="?ratingBarStyleSmall"
-				android:layout_width="wrap_content"
-				android:layout_height="wrap_content"
-				android:layout_marginStart="16dp"
-				android:layout_marginTop="4dp"
-				android:layout_marginEnd="16dp"
-				android:isIndicator="true"
-				android:max="1"
-				android:numStars="5"
-				android:stepSize="0.5"
-				app:layout_constraintEnd_toEndOf="parent"
-				app:layout_constraintHorizontal_bias="0.0"
-				app:layout_constraintStart_toEndOf="@id/imageView_cover"
-				app:layout_constraintTop_toBottomOf="@id/textView_author"
-				tools:rating="4" />
-
-			<androidx.constraintlayout.widget.Barrier
-				android:id="@+id/barrier_header"
-				android:layout_width="0dp"
-				android:layout_height="wrap_content"
-				app:barrierDirection="bottom"
-				app:barrierMargin="8dp"
-				app:constraint_referenced_ids="imageView_cover,rating_bar" />
-
-			<org.koitharu.kotatsu.core.ui.widgets.ChipsView
-				android:id="@+id/chips_tags"
-				android:layout_width="0dp"
-				android:layout_height="wrap_content"
-				android:layout_marginTop="8dp"
-				android:paddingStart="16dp"
-				android:paddingEnd="16dp"
-				app:chipSpacingHorizontal="6dp"
-				app:chipSpacingVertical="6dp"
-				app:layout_constraintEnd_toEndOf="parent"
-				app:layout_constraintStart_toStartOf="parent"
-				app:layout_constraintTop_toBottomOf="@+id/barrier_header" />
-
-			<org.koitharu.kotatsu.core.ui.widgets.SelectableTextView
-				android:id="@+id/textView_description"
-				android:layout_width="0dp"
-				android:layout_height="wrap_content"
-				android:layout_marginStart="@dimen/margin_normal"
-				android:layout_marginTop="@dimen/margin_small"
-				android:layout_marginEnd="@dimen/margin_normal"
-				android:lineSpacingMultiplier="1.2"
-				android:paddingBottom="@dimen/margin_normal"
-				android:textAppearance="?attr/textAppearanceBodyMedium"
-				android:textIsSelectable="true"
-				app:layout_constraintEnd_toEndOf="parent"
-				app:layout_constraintStart_toStartOf="parent"
-				app:layout_constraintTop_toBottomOf="@id/chips_tags"
-				tools:ignore="UnusedAttribute"
-				tools:text="@tools:sample/lorem/random" />
-
-		</androidx.constraintlayout.widget.ConstraintLayout>
-
-	</ScrollView>
-
-	<com.google.android.material.appbar.MaterialToolbar
-		android:id="@+id/toolbar_bottom"
-		android:layout_width="match_parent"
-		android:layout_height="wrap_content"
-		android:layout_gravity="bottom"
-		android:background="?colorBackgroundFloating">
-
-		<com.google.android.material.button.MaterialButton
-			android:id="@+id/button_read"
+		<ImageButton
+			android:id="@+id/button_close"
 			android:layout_width="wrap_content"
 			android:layout_height="wrap_content"
-			android:layout_gravity="end|center_vertical"
-			android:layout_marginHorizontal="@dimen/toolbar_button_margin"
-			android:enabled="false"
-			android:text="@string/read"
-			android:textAllCaps="false"
-			app:iconGravity="textStart"
-			app:iconPadding="8dp"
-			tools:enabled="true"
-			tools:icon="@drawable/ic_read" />
+			android:layout_marginTop="4dp"
+			android:layout_marginEnd="4dp"
+			android:background="?selectableItemBackgroundBorderless"
+			android:contentDescription="@string/close"
+			android:padding="12dp"
+			app:layout_constraintEnd_toEndOf="parent"
+			app:layout_constraintTop_toTopOf="parent"
+			app:srcCompat="?actionModeCloseDrawable"
+			app:tint="?colorControlNormal" />
 
-	</com.google.android.material.appbar.MaterialToolbar>
+		<TextView
+			android:id="@+id/textView_subtitle"
+			android:layout_width="0dp"
+			android:layout_height="wrap_content"
+			android:layout_marginStart="16dp"
+			android:layout_marginTop="4dp"
+			android:layout_marginEnd="16dp"
+			android:ellipsize="end"
+			android:maxLines="3"
+			android:textAppearance="?attr/textAppearanceBodyMedium"
+			app:layout_constraintEnd_toEndOf="parent"
+			app:layout_constraintStart_toEndOf="@id/imageView_cover"
+			app:layout_constraintTop_toBottomOf="@id/textView_title"
+			tools:text="@tools:sample/lorem[12]" />
 
-</FrameLayout>
+		<TextView
+			android:id="@+id/textView_author"
+			android:layout_width="wrap_content"
+			android:layout_height="wrap_content"
+			android:layout_marginStart="16dp"
+			android:layout_marginTop="4dp"
+			android:layout_marginEnd="16dp"
+			android:background="@drawable/custom_selectable_item_background"
+			android:padding="2dp"
+			android:singleLine="true"
+			android:textColor="?attr/colorTertiary"
+			android:textStyle="bold"
+			app:layout_constrainedWidth="true"
+			app:layout_constraintEnd_toEndOf="parent"
+			app:layout_constraintHorizontal_bias="0"
+			app:layout_constraintStart_toEndOf="@id/imageView_cover"
+			app:layout_constraintTop_toBottomOf="@id/textView_subtitle"
+			tools:text="@tools:sample/full_names" />
+
+		<RatingBar
+			android:id="@+id/rating_bar"
+			style="?ratingBarStyleSmall"
+			android:layout_width="wrap_content"
+			android:layout_height="wrap_content"
+			android:layout_marginStart="16dp"
+			android:layout_marginTop="4dp"
+			android:layout_marginEnd="16dp"
+			android:isIndicator="true"
+			android:max="1"
+			android:numStars="5"
+			android:stepSize="0.5"
+			app:layout_constraintEnd_toEndOf="parent"
+			app:layout_constraintHorizontal_bias="0.0"
+			app:layout_constraintStart_toEndOf="@id/imageView_cover"
+			app:layout_constraintTop_toBottomOf="@id/textView_author"
+			tools:rating="4" />
+
+		<androidx.constraintlayout.widget.Barrier
+			android:id="@+id/barrier_header"
+			android:layout_width="0dp"
+			android:layout_height="wrap_content"
+			app:barrierDirection="bottom"
+			app:barrierMargin="8dp"
+			app:constraint_referenced_ids="imageView_cover,rating_bar" />
+
+		<org.koitharu.kotatsu.core.ui.widgets.ProgressButton
+			android:id="@+id/button_read"
+			android:layout_width="0dp"
+			android:layout_height="wrap_content"
+			android:layout_marginStart="16dp"
+			android:layout_marginTop="@dimen/margin_normal"
+			android:layout_marginEnd="12dp"
+			android:foreground="?selectableItemBackground"
+			android:gravity="center"
+			android:paddingHorizontal="6dp"
+			android:paddingVertical="8dp"
+			app:baseColor="@color/m3_chip_background_color"
+			app:layout_constraintEnd_toStartOf="@id/button_open"
+			app:layout_constraintStart_toStartOf="parent"
+			app:layout_constraintTop_toBottomOf="@id/barrier_header"
+			app:progressColor="?colorControlNormal"
+			app:subtitleTextAppearance="?textAppearanceBodySmall"
+			app:titleTextAppearance="?textAppearanceButton"
+			tools:max="100"
+			tools:progress="40"
+			tools:subtitle="12 chapters"
+			tools:title="@string/read" />
+
+		<ImageView
+			android:id="@+id/button_open"
+			android:layout_width="0dp"
+			android:layout_height="0dp"
+			android:layout_marginEnd="16dp"
+			android:background="@drawable/bg_circle_button"
+			android:backgroundTint="@color/m3_chip_background_color"
+			android:contentDescription="@string/details"
+			android:scaleType="centerInside"
+			app:layout_constraintBottom_toBottomOf="@id/button_read"
+			app:layout_constraintDimensionRatio="1"
+			app:layout_constraintEnd_toEndOf="parent"
+			app:layout_constraintTop_toTopOf="@id/button_read"
+			app:srcCompat="@drawable/ic_expand" />
+
+		<org.koitharu.kotatsu.core.ui.widgets.ChipsView
+			android:id="@+id/chips_tags"
+			android:layout_width="0dp"
+			android:layout_height="wrap_content"
+			android:layout_marginTop="@dimen/margin_normal"
+			android:paddingStart="@dimen/screen_padding"
+			android:paddingEnd="@dimen/screen_padding"
+			app:chipSpacingHorizontal="6dp"
+			app:chipSpacingVertical="6dp"
+			app:layout_constraintEnd_toEndOf="parent"
+			app:layout_constraintStart_toStartOf="parent"
+			app:layout_constraintTop_toBottomOf="@+id/button_read" />
+
+		<org.koitharu.kotatsu.core.ui.widgets.SelectableTextView
+			android:id="@+id/textView_description"
+			android:layout_width="0dp"
+			android:layout_height="wrap_content"
+			android:layout_marginStart="@dimen/margin_normal"
+			android:layout_marginTop="@dimen/margin_small"
+			android:layout_marginEnd="@dimen/margin_normal"
+			android:lineSpacingMultiplier="1.2"
+			android:paddingBottom="@dimen/margin_normal"
+			android:textAppearance="?attr/textAppearanceBodyMedium"
+			android:textIsSelectable="true"
+			app:layout_constraintEnd_toEndOf="parent"
+			app:layout_constraintStart_toStartOf="parent"
+			app:layout_constraintTop_toBottomOf="@id/chips_tags"
+			tools:ignore="UnusedAttribute"
+			tools:text="@tools:sample/lorem/random" />
+
+	</androidx.constraintlayout.widget.ConstraintLayout>
+
+</ScrollView>

app/src/main/res/layout/view_tip.xml

@@ -30,6 +30,7 @@
 		tools:text="Включите их, чтобы ничего не пропускать. Откройте настройки системы и разрешите их отправку." />
 
 	<LinearLayout
+		android:id="@+id/layout_buttons"
 		android:layout_width="match_parent"
 		android:layout_height="wrap_content"
 		android:layout_marginTop="8dp"