From bea85cd78fa8a28080be4eb5b705a214276524a0 Mon Sep 17 00:00:00 2001
From: Syer10 <syer10@users.noreply.github.com>
Date: Mon, 10 May 2021 12:08:13 -0400
Subject: [PATCH] Cleanup

---
 src/main/kotlin/ca/gosyer/ui/base/components/KtorImage.kt | 3 +--
 src/main/kotlin/ca/gosyer/ui/base/theme/AppTheme.kt       | 3 +--
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/src/main/kotlin/ca/gosyer/ui/base/components/KtorImage.kt b/src/main/kotlin/ca/gosyer/ui/base/components/KtorImage.kt
index 17c97361..25331cd1 100644
--- a/src/main/kotlin/ca/gosyer/ui/base/components/KtorImage.kt
+++ b/src/main/kotlin/ca/gosyer/ui/base/components/KtorImage.kt
@@ -39,9 +39,8 @@ fun KtorImage(
     alpha: Float = DefaultAlpha,
     colorFilter: ColorFilter? = null,
     retries: Int = 3,
-    httpClient: Http? = null
+    client: Http = remember { AppScope.getInstance() }
 ) {
-    val client = remember { httpClient ?: AppScope.getInstance() }
     BoxWithConstraints {
         val drawable: MutableState<ImageBitmap?> = remember { mutableStateOf(null) }
         val loading: MutableState<Boolean> = remember { mutableStateOf(true) }
diff --git a/src/main/kotlin/ca/gosyer/ui/base/theme/AppTheme.kt b/src/main/kotlin/ca/gosyer/ui/base/theme/AppTheme.kt
index 69dbb7e4..bf09d7cf 100644
--- a/src/main/kotlin/ca/gosyer/ui/base/theme/AppTheme.kt
+++ b/src/main/kotlin/ca/gosyer/ui/base/theme/AppTheme.kt
@@ -68,8 +68,7 @@ private class AppThemeViewModel @Inject constructor(
         val primary by colors.primaryStateFlow.collectAsState()
         val secondary by colors.secondaryStateFlow.collectAsState()
 
-        val material = getMaterialColors(baseTheme.colors, primary, secondary)
-        return material
+        return getMaterialColors(baseTheme.colors, primary, secondary)
     }
 
     @Composable