Fix oom

app/src/main/java/xyz/quaver/pupil/Pupil.kt

@@ -217,6 +217,7 @@ class Pupil : Application(), ImageLoaderFactory {
                 .Builder()
                 .sslSocketFactory(SSLSettings.sslContext!!.socketFactory, SSLSettings.trustManager!!)
                 .build()
-        }.build()
+        }.memoryCache(null)
+        .build()
 
 }

app/src/main/java/xyz/quaver/pupil/ui/composable/Gallery.kt

@@ -248,9 +248,12 @@ fun TagGroup(tags: List<GalleryTag>) {
 
 @Composable
 fun DetailedGalleryInfoHeader(galleryInfo: GalleryInfo, thumbnailUrl: String?) {
-    val thumbnailFile = galleryInfo.files.firstOrNull()
+    val thumbnailFile = galleryInfo.files.first()
-    if (thumbnailFile?.let { it.width > it.height } == true) {
+    val aspectRatio = thumbnailFile.let { it.width / it.height.toFloat() }
+
+    if (thumbnailFile.let { it.width > it.height }) {
         Column {
+            if (thumbnailUrl != null) {
                 SubcomposeAsyncImage(
                     model = ImageRequest.Builder(LocalContext.current)
                         .data(thumbnailUrl)
@@ -258,12 +261,22 @@ fun DetailedGalleryInfoHeader(galleryInfo: GalleryInfo, thumbnailUrl: String?) {
                         .build(),
                     modifier = Modifier
                         .fillMaxWidth()
-                    .aspectRatio(thumbnailFile.let { it.width / it.height.toFloat() })
+                        .aspectRatio(aspectRatio)
                         .clip(RoundedCornerShape(8.dp)),
-                loading = { CircularProgressIndicator() },
+                    loading = { CircularProgressIndicator(Modifier.size(32.dp)) },
-                error = { Image(painter= painterResource(R.drawable.thumbnail), contentDescription = null) },
+                    error = {
+                        Image(
+                            painter = painterResource(R.drawable.thumbnail),
+                            contentDescription = null
+                        )
+                    },
                     contentDescription = "Thumbnail"
                 )
+            } else {
+                Box(Modifier.fillMaxWidth().aspectRatio(aspectRatio)) {
+                    CircularProgressIndicator(Modifier.size(32.dp))
+                }
+            }
             Text(galleryInfo.title, style = MaterialTheme.typography.headlineSmall)
             val artistsAndGroups = buildString {
                 if (!galleryInfo.artists.isNullOrEmpty())
@@ -307,6 +320,7 @@ fun DetailedGalleryInfoHeader(galleryInfo: GalleryInfo, thumbnailUrl: String?) {
             horizontalArrangement = Arrangement.spacedBy(4.dp),
             verticalAlignment = Alignment.CenterVertically
         ) {
+            if (thumbnailUrl != null) {
                 SubcomposeAsyncImage(
                     model = ImageRequest.Builder(LocalContext.current)
                         .data(thumbnailUrl)
@@ -314,11 +328,22 @@ fun DetailedGalleryInfoHeader(galleryInfo: GalleryInfo, thumbnailUrl: String?) {
                         .build(),
                     modifier = Modifier
                         .height(200.dp)
+                        .aspectRatio(aspectRatio)
                         .clip(RoundedCornerShape(8.dp)),
-                loading = { CircularProgressIndicator() },
+                    loading = { CircularProgressIndicator(Modifier.size(32.dp)) },
-                error = { Image(painter= painterResource(R.drawable.thumbnail), contentDescription = null) },
+                    error = {
+                        Image(
+                            painter = painterResource(R.drawable.thumbnail),
+                            contentDescription = null
+                        )
+                    },
                     contentDescription = "Thumbnail"
                 )
+            } else {
+                Box(Modifier.height(200.dp).aspectRatio(aspectRatio)) {
+                    CircularProgressIndicator(Modifier.size(32.dp))
+                }
+            }
             Column(Modifier.heightIn(min = 200.dp)) {
                 Text(galleryInfo.title, style = MaterialTheme.typography.headlineSmall)
                 val artistsAndGroups = buildString {

app/src/main/java/xyz/quaver/pupil/ui/composable/MainScreen.kt

@@ -443,7 +443,7 @@ fun MainScreen(
         loadSearchResult(pageToRange(page))
     }}
 
-    LaunchedEffect(Unit) { loadSearchResult(pageToRange(0)) }
+    LaunchedEffect(uiState.query, uiState.currentDestination) { loadSearchResult(pageToRange(0)) }
 
     if (contentType == ContentType.DUAL_PANE) {
         TwoPane(