From 5e68fe4fe92dfe281662fce84195288c743f5cb7 Mon Sep 17 00:00:00 2001 From: arkon Date: Fri, 5 Aug 2022 22:33:52 -0400 Subject: [PATCH] Make screen loading indicators more consistent --- .../presentation/components/LoadingScreen.kt | 4 +--- .../track/myanimelist/MyAnimeListInterceptor.kt | 1 - .../tachiyomi/ui/manga/MangaController.kt | 10 ++-------- .../ui/manga/info/MangaFullCoverDialog.kt | 17 ++--------------- 4 files changed, 5 insertions(+), 27 deletions(-) diff --git a/app/src/main/java/eu/kanade/presentation/components/LoadingScreen.kt b/app/src/main/java/eu/kanade/presentation/components/LoadingScreen.kt index 6c461c04e7..0afb5cfa80 100644 --- a/app/src/main/java/eu/kanade/presentation/components/LoadingScreen.kt +++ b/app/src/main/java/eu/kanade/presentation/components/LoadingScreen.kt @@ -2,12 +2,10 @@ package eu.kanade.presentation.components import androidx.compose.foundation.layout.Box import androidx.compose.foundation.layout.fillMaxSize -import androidx.compose.foundation.layout.size import androidx.compose.material3.CircularProgressIndicator import androidx.compose.runtime.Composable import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier -import androidx.compose.ui.unit.dp @Composable fun LoadingScreen() { @@ -15,6 +13,6 @@ fun LoadingScreen() { modifier = Modifier.fillMaxSize(), contentAlignment = Alignment.Center, ) { - CircularProgressIndicator(modifier = Modifier.size(64.dp)) + CircularProgressIndicator() } } diff --git a/app/src/main/java/eu/kanade/tachiyomi/data/track/myanimelist/MyAnimeListInterceptor.kt b/app/src/main/java/eu/kanade/tachiyomi/data/track/myanimelist/MyAnimeListInterceptor.kt index 22da4c1212..cf26d57e8e 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/data/track/myanimelist/MyAnimeListInterceptor.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/data/track/myanimelist/MyAnimeListInterceptor.kt @@ -1,7 +1,6 @@ package eu.kanade.tachiyomi.data.track.myanimelist import eu.kanade.tachiyomi.network.parseAs -import kotlinx.serialization.decodeFromString import kotlinx.serialization.json.Json import okhttp3.Interceptor import okhttp3.Response diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/manga/MangaController.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/manga/MangaController.kt index 580ad04bb8..9c840824df 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/manga/MangaController.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/manga/MangaController.kt @@ -8,17 +8,12 @@ import android.view.ViewGroup import androidx.activity.OnBackPressedDispatcherOwner import androidx.appcompat.app.AlertDialog import androidx.appcompat.app.AppCompatActivity -import androidx.compose.foundation.layout.Box -import androidx.compose.foundation.layout.fillMaxSize -import androidx.compose.material3.CircularProgressIndicator import androidx.compose.material3.SnackbarHostState import androidx.compose.material3.SnackbarResult import androidx.compose.runtime.Composable import androidx.compose.runtime.collectAsState import androidx.compose.runtime.getValue import androidx.compose.runtime.remember -import androidx.compose.ui.Alignment -import androidx.compose.ui.Modifier import androidx.core.os.bundleOf import com.bluelinelabs.conductor.ControllerChangeHandler import com.bluelinelabs.conductor.ControllerChangeType @@ -28,6 +23,7 @@ import eu.kanade.domain.category.model.Category import eu.kanade.domain.manga.model.Manga import eu.kanade.domain.manga.model.toDbManga import eu.kanade.presentation.components.ChapterDownloadAction +import eu.kanade.presentation.components.LoadingScreen import eu.kanade.presentation.manga.DownloadAction import eu.kanade.presentation.manga.MangaScreen import eu.kanade.presentation.util.calculateWindowWidthSizeClass @@ -147,9 +143,7 @@ class MangaController : onInvertSelection = presenter::invertSelection, ) } else { - Box(modifier = Modifier.fillMaxSize(), contentAlignment = Alignment.Center) { - CircularProgressIndicator() - } + LoadingScreen() } } diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/manga/info/MangaFullCoverDialog.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/manga/info/MangaFullCoverDialog.kt index f3eb130679..c8bf71f1e0 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/manga/info/MangaFullCoverDialog.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/manga/info/MangaFullCoverDialog.kt @@ -6,16 +6,9 @@ import android.content.Intent import android.graphics.drawable.BitmapDrawable import android.net.Uri import android.os.Bundle -import androidx.compose.foundation.background -import androidx.compose.foundation.layout.Box -import androidx.compose.foundation.layout.fillMaxSize -import androidx.compose.material3.CircularProgressIndicator -import androidx.compose.material3.MaterialTheme import androidx.compose.runtime.Composable import androidx.compose.runtime.collectAsState import androidx.compose.runtime.remember -import androidx.compose.ui.Alignment -import androidx.compose.ui.Modifier import androidx.core.os.bundleOf import coil.imageLoader import coil.request.ImageRequest @@ -24,6 +17,7 @@ import eu.kanade.domain.manga.interactor.GetManga import eu.kanade.domain.manga.interactor.UpdateManga import eu.kanade.domain.manga.model.Manga import eu.kanade.domain.manga.model.hasCustomCover +import eu.kanade.presentation.components.LoadingScreen import eu.kanade.presentation.manga.EditCoverAction import eu.kanade.presentation.manga.components.MangaCoverDialog import eu.kanade.tachiyomi.R @@ -78,14 +72,7 @@ class MangaFullCoverDialog : FullComposeController