SQUASHED IT ALL

to remove careem email ;)

Author: efemoney

app/src/dev/efemoney/lexiko/app/internal/module.kt

@@ -1,7 +1,9 @@
 package dev.efemoney.lexiko.app.internal
 
 import android.content.Context
-import coil.ImageLoader
+import coil3.ImageLoader
+import coil3.network.okhttp.OkHttpNetworkFetcherFactory
+import coil3.serviceLoaderEnabled
 import dagger.Binds
 import dagger.Module
 import dagger.Provides
@@ -13,7 +15,19 @@ import dev.efemoney.lexiko.navigation.Navigator
 import okhttp3.OkHttpClient
 
 @Module
-internal interface SingletonModule
+internal interface SingletonModule {
+  companion object {
+
+    @Provides
+    @Reusable
+    fun imageLoader(context: Context, okHttp: dagger.Lazy<OkHttpClient>) =
+      ImageLoader.Builder(context)
+        // Add okhttp fetching manually so we can specify a custom OkHttpClient instance.
+        .components { add(OkHttpNetworkFetcherFactory(okHttp::get)) }
+        .serviceLoaderEnabled(false)
+        .build()
+  }
+}
 
 @Module
 internal interface ForegroundModule {
@@ -26,15 +40,4 @@ internal interface ForegroundModule {
 
   @Binds
   fun RealForegroundScope.asForegroundScope(): ForegroundScope
-
-  companion object {
-
-    @Provides
-    @Reusable
-    fun imageLoader(context: Context, okHttp: dagger.Lazy<OkHttpClient>) =
-      ImageLoader.Builder(context)
-        .callFactory { okHttp.get() }
-        .components {}
-        .build()
-  }
 }

app/src/dev/efemoney/lexiko/app/lobby/lobby.kt

@@ -1,13 +1,30 @@
 package dev.efemoney.lexiko.app.lobby
 
-import androidx.compose.foundation.Image
 import androidx.compose.foundation.border
-import androidx.compose.foundation.layout.*
+import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.Spacer
+import androidx.compose.foundation.layout.fillMaxSize
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.height
+import androidx.compose.foundation.layout.heightIn
+import androidx.compose.foundation.layout.offset
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.size
+import androidx.compose.foundation.layout.width
+import androidx.compose.foundation.layout.wrapContentWidth
 import androidx.compose.foundation.lazy.LazyColumn
 import androidx.compose.foundation.lazy.items
 import androidx.compose.foundation.shape.CircleShape
 import androidx.compose.foundation.shape.RoundedCornerShape
-import androidx.compose.material.*
+import androidx.compose.material.ContentAlpha
+import androidx.compose.material.Icon
+import androidx.compose.material.IconButton
+import androidx.compose.material.LocalContentAlpha
+import androidx.compose.material.MaterialTheme
+import androidx.compose.material.Scaffold
+import androidx.compose.material.Surface
+import androidx.compose.material.Text
+import androidx.compose.material.TopAppBar
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.filled.AccountCircle
 import androidx.compose.material.icons.filled.Visibility
@@ -18,11 +35,12 @@ import androidx.compose.runtime.getValue
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.draw.clip
+import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.tooling.preview.PreviewParameter
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
-import coil.compose.rememberImagePainter
+import coil.compose.AsyncImage
 import dev.efemoney.lexiko.app.R
 import dev.efemoney.lexiko.app.internal.component
 import dev.efemoney.lexiko.app.ui.LexikoTheme
@@ -160,10 +178,9 @@ private fun SpectatorCount(spectatorCount: Int) {
 
 @Composable
 private fun PlayerAvatar(avatar: Avatar, modifier: Modifier = Modifier) {
-  Image(
-    painter = rememberImagePainter(avatar) {
-      placeholder(R.drawable.avatar_placeholder)
-    },
+  AsyncImage(
+    model = avatar,
+    placeholder = painterResource(R.drawable.avatar_placeholder),
     contentDescription = null,
     modifier = modifier
       .border(2.dp, color = MaterialTheme.colors.surface, CircleShape)

app/src/dev/efemoney/lexiko/app/navigation/navigation.kt

@@ -1,17 +1,17 @@
 package dev.efemoney.lexiko.app.navigation
 
+import androidx.navigation.NavDirections
 import dev.efemoney.lexiko.app.internal.Retained
-import dev.efemoney.lexiko.navigation.Direction
 import dev.efemoney.lexiko.navigation.Navigator
 import kotlinx.coroutines.channels.Channel
 import javax.inject.Inject
 
 @Retained
 internal class RealNavigator @Inject constructor() : Navigator {
 
-  val directions = Channel<Direction>()
+  val directions = Channel<NavDirections>()
 
-  override fun navigate(direction: Direction) {
+  override fun navigate(direction: NavDirections) {
     directions.trySend(direction)
   }
 }