Merge remote-tracking branch 'github/dev_alpha08' into dev_owl_naviga…

…tion_alpha07

Change-Id: I7f1eec345c23bd01fc3860ced23bf9f39f6e4713

Owl/app/build.gradle

@@ -93,12 +93,12 @@ dependencies {
     implementation Libs.AndroidX.Compose.tooling
 
     implementation Libs.Accompanist.coil
+    implementation Libs.Accompanist.insets
 
     androidTestImplementation Libs.junit
     androidTestImplementation Libs.AndroidX.Test.core
     androidTestImplementation Libs.AndroidX.Test.espressoCore
     androidTestImplementation Libs.AndroidX.Test.rules
     androidTestImplementation Libs.AndroidX.Test.Ext.junit
     androidTestImplementation Libs.AndroidX.Compose.uiTest
-
 }

Owl/app/src/main/java/com/example/owl/ui/OwlApp.kt

@@ -22,13 +22,12 @@ import androidx.compose.runtime.Providers
 import com.example.owl.ui.utils.AmbientBackDispatcher
 import com.example.owl.ui.utils.ProvideDisplayInsets
 import com.example.owl.ui.utils.ProvideImageLoader
-import dev.chrisbanes.accompanist.insets.ProvideWindowInsets
 
 @Composable
 fun OwlApp(backDispatcher: OnBackPressedDispatcher) {
 
     Providers(AmbientBackDispatcher provides backDispatcher) {
-        ProvideWindowInsets {
+        ProvideDisplayInsets {
             ProvideImageLoader {
                 NavGraph()
             }

Owl/app/src/main/java/com/example/owl/ui/courses/FeaturedCourses.kt

@@ -31,6 +31,7 @@ import androidx.compose.material.Text
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.rounded.OndemandVideo
 import androidx.compose.runtime.Composable
+import androidx.compose.ui.layout.Layout
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.semantics.accessibilityLabel

Owl/app/src/main/java/com/example/owl/ui/utils/NetworkImage.kt

@@ -63,10 +63,6 @@ fun NetworkImage(
     )
 }
 
-val AmbientImageLoader = staticAmbientOf<ImageLoader> {
-    error("No loader provided")
-}
-
 @Composable
 fun ProvideImageLoader(content: @Composable () -> Unit) {
     val context = ContextAmbient.current