EmptyScreen: Compose-ify and apply content padding (#8177)

* Apply content padding to empty screen

except the empty screens in browse

* compose-ify EmptyScreen

* center face when action show

* fix padding

* apply content padding to browse tabs

* fix duplicate bottom insets

app/src/main/java/eu/kanade/presentation/library/LibraryScreen.kt

@@ -1,17 +1,26 @@
 package eu.kanade.presentation.library
 
 import androidx.compose.animation.Crossfade
+import androidx.compose.foundation.layout.padding
+import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.filled.HelpOutline
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.getValue
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.platform.LocalUriHandler
 import eu.kanade.domain.category.model.Category
 import eu.kanade.domain.library.model.display
+import eu.kanade.presentation.components.EmptyScreen
+import eu.kanade.presentation.components.EmptyScreenAction
 import eu.kanade.presentation.components.LibraryBottomActionMenu
 import eu.kanade.presentation.components.LoadingScreen
 import eu.kanade.presentation.components.Scaffold
 import eu.kanade.presentation.library.components.LibraryContent
 import eu.kanade.presentation.library.components.LibraryToolbar
+import eu.kanade.tachiyomi.R
 import eu.kanade.tachiyomi.source.LocalSource
 import eu.kanade.tachiyomi.ui.library.LibraryPresenter
+import eu.kanade.tachiyomi.widget.TachiyomiBottomNavigationView
 
 @Composable
 fun LibraryScreen(
@@ -60,9 +69,26 @@ fun LibraryScreen(
                     )
                 },
             ) { paddingValues ->
+                val contentPadding = TachiyomiBottomNavigationView.withBottomNavPadding(paddingValues)
+                if (presenter.searchQuery.isNullOrEmpty() && presenter.isLibraryEmpty) {
+                    val handler = LocalUriHandler.current
+                    EmptyScreen(
+                        textResource = R.string.information_empty_library,
+                        modifier = Modifier.padding(contentPadding),
+                        actions = listOf(
+                            EmptyScreenAction(
+                                stringResId = R.string.getting_started_guide,
+                                icon = Icons.Default.HelpOutline,
+                                onClick = { handler.openUri("https://tachiyomi.org/help/guides/getting-started") },
+                            ),
+                        ),
+                    )
+                    return@Scaffold
+                }
+
                 LibraryContent(
                     state = presenter,
-                    contentPadding = paddingValues,
+                    contentPadding = contentPadding,
                     currentPage = { presenter.activeCategory },
                     isLibraryEmpty = presenter.isLibraryEmpty,
                     showPageTabs = presenter.tabVisibility,

app/src/main/java/eu/kanade/presentation/library/components/LazyLibraryGrid.kt

@@ -15,7 +15,6 @@ import androidx.compose.ui.zIndex
 import eu.kanade.presentation.components.FastScrollLazyVerticalGrid
 import eu.kanade.presentation.util.plus
 import eu.kanade.tachiyomi.R
-import eu.kanade.tachiyomi.widget.TachiyomiBottomNavigationView.Companion.bottomNavPadding
 
 @Composable
 fun LazyLibraryGrid(
@@ -27,7 +26,7 @@ fun LazyLibraryGrid(
     FastScrollLazyVerticalGrid(
         columns = if (columns == 0) GridCells.Adaptive(128.dp) else GridCells.Fixed(columns),
         modifier = modifier,
-        contentPadding = contentPadding + bottomNavPadding + PaddingValues(12.dp),
+        contentPadding = contentPadding + PaddingValues(12.dp),
         verticalArrangement = Arrangement.spacedBy(12.dp),
         horizontalArrangement = Arrangement.spacedBy(12.dp),
         content = content,

app/src/main/java/eu/kanade/presentation/library/components/LibraryContent.kt

@@ -15,18 +15,15 @@ import androidx.compose.runtime.rememberCoroutineScope
 import androidx.compose.runtime.setValue
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.platform.LocalLayoutDirection
-import androidx.compose.ui.platform.LocalUriHandler
 import com.google.accompanist.pager.rememberPagerState
 import eu.kanade.core.prefs.PreferenceMutableState
 import eu.kanade.domain.category.model.Category
 import eu.kanade.domain.library.model.LibraryDisplayMode
 import eu.kanade.domain.library.model.LibraryManga
-import eu.kanade.presentation.components.EmptyScreen
 import eu.kanade.presentation.components.SwipeRefresh
 import eu.kanade.presentation.library.LibraryState
-import eu.kanade.tachiyomi.R
+import eu.kanade.presentation.util.plus
 import eu.kanade.tachiyomi.ui.library.LibraryItem
-import eu.kanade.tachiyomi.widget.EmptyView
 import kotlinx.coroutines.delay
 import kotlinx.coroutines.launch
 
@@ -100,19 +97,6 @@ fun LibraryContent(
             },
             enabled = state.selectionMode.not(),
         ) {
-            if (state.searchQuery.isNullOrEmpty() && isLibraryEmpty) {
-                val handler = LocalUriHandler.current
-                EmptyScreen(
-                    R.string.information_empty_library,
-                    listOf(
-                        EmptyView.Action(R.string.getting_started_guide, R.drawable.ic_help_24dp) {
-                            handler.openUri("https://tachiyomi.org/help/guides/getting-started")
-                        },
-                    ),
-                )
-                return@SwipeRefresh
-            }
-
             LibraryPager(
                 state = pagerState,
                 contentPadding = PaddingValues(bottom = contentPadding.calculateBottomPadding()),

app/src/main/java/eu/kanade/presentation/library/components/LibraryList.kt

@@ -31,7 +31,6 @@ import eu.kanade.presentation.util.selectedBackground
 import eu.kanade.presentation.util.verticalPadding
 import eu.kanade.tachiyomi.R
 import eu.kanade.tachiyomi.ui.library.LibraryItem
-import eu.kanade.tachiyomi.widget.TachiyomiBottomNavigationView.Companion.bottomNavPadding
 
 @Composable
 fun LibraryList(
@@ -45,7 +44,7 @@ fun LibraryList(
 ) {
     FastScrollLazyColumn(
         modifier = Modifier.fillMaxSize(),
-        contentPadding = bottomNavPadding + contentPadding,
+        contentPadding = contentPadding,
     ) {
         item {
             if (searchQuery.isNullOrEmpty().not()) {