Communication: Profile picture dialog + usage in other places

app/src/main/java/de/tum/informatics/www1/artemis/native_app/android/ArtemisApplication.kt

@@ -5,10 +5,12 @@ import android.app.Application
 import android.app.NotificationChannel
 import android.os.Bundle
 import androidx.core.app.NotificationManagerCompat
-import coil.ImageLoader
-import coil.ImageLoaderFactory
-import coil.memory.MemoryCache
+import coil3.ImageLoader
+import coil3.PlatformContext
+import coil3.SingletonImageLoader
+import coil3.memory.MemoryCache
 import de.tum.informatics.www1.artemis.native_app.android.db.dbModule
+import de.tum.informatics.www1.artemis.native_app.core.common.ArtemisNotificationChannel
 import de.tum.informatics.www1.artemis.native_app.core.common.CurrentActivityListener
 import de.tum.informatics.www1.artemis.native_app.core.data.dataModule
 import de.tum.informatics.www1.artemis.native_app.core.datastore.datastoreModule
@@ -22,7 +24,6 @@ import de.tum.informatics.www1.artemis.native_app.feature.exerciseview.exerciseM
 import de.tum.informatics.www1.artemis.native_app.feature.lectureview.lectureModule
 import de.tum.informatics.www1.artemis.native_app.feature.login.loginModule
 import de.tum.informatics.www1.artemis.native_app.feature.metis.communicationModule
-import de.tum.informatics.www1.artemis.native_app.core.common.ArtemisNotificationChannel
 import de.tum.informatics.www1.artemis.native_app.feature.push.pushModule
 import de.tum.informatics.www1.artemis.native_app.feature.quiz.quizParticipationModule
 import de.tum.informatics.www1.artemis.native_app.feature.settings.settingsModule
@@ -32,7 +33,7 @@ import org.koin.android.ext.koin.androidContext
 import org.koin.androidx.workmanager.koin.workManagerFactory
 import org.koin.core.context.startKoin
 
-class ArtemisApplication : Application(), ImageLoaderFactory, CurrentActivityListener {
+class ArtemisApplication : Application(), SingletonImageLoader.Factory, CurrentActivityListener {
 
     override val currentActivity = MutableStateFlow<Activity?>(null)
 
@@ -84,11 +85,11 @@ class ArtemisApplication : Application(), ImageLoaderFactory, CurrentActivityLis
         registerActivityLifecycleCallbacks(this)
     }
 
-    override fun newImageLoader(): ImageLoader =
+    override fun newImageLoader(context: PlatformContext): ImageLoader =
         ImageLoader.Builder(this)
             .memoryCache {
-                MemoryCache.Builder(this)
-                    .maxSizePercent(0.25)
+                MemoryCache.Builder()
+                    .maxSizePercent(context, 0.25)
                     .build()
             }
             .build()

app/src/main/java/de/tum/informatics/www1/artemis/native_app/android/db/AppDatabase.kt

@@ -29,7 +29,7 @@ import de.tum.informatics.www1.artemis.native_app.feature.push.communication_not
         CommunicationMessageEntity::class
     ],
     exportSchema = true,
-    version = 11,
+    version = 12,
 )
 @TypeConverters(RoomTypeConverters::class)
 abstract class AppDatabase : RoomDatabase() {

app/src/main/java/de/tum/informatics/www1/artemis/native_app/android/ui/MainActivity.kt

@@ -36,6 +36,7 @@ import de.tum.informatics.www1.artemis.native_app.core.ui.LocalLinkOpener
 import de.tum.informatics.www1.artemis.native_app.core.ui.LocalWindowSizeClassProvider
 import de.tum.informatics.www1.artemis.native_app.core.ui.WindowSizeClassProvider
 import de.tum.informatics.www1.artemis.native_app.core.ui.alert.TextAlertDialog
+import de.tum.informatics.www1.artemis.native_app.core.ui.remote_images.LocalArtemisImageProvider
 import de.tum.informatics.www1.artemis.native_app.feature.courseregistration.courseRegistration
 import de.tum.informatics.www1.artemis.native_app.feature.courseregistration.navigateToCourseRegistration
 import de.tum.informatics.www1.artemis.native_app.feature.courseview.ui.course_overview.course
@@ -53,7 +54,7 @@ import de.tum.informatics.www1.artemis.native_app.feature.lectureview.navigateTo
 import de.tum.informatics.www1.artemis.native_app.feature.login.LoginScreen
 import de.tum.informatics.www1.artemis.native_app.feature.login.loginScreen
 import de.tum.informatics.www1.artemis.native_app.feature.login.navigateToLogin
-import de.tum.informatics.www1.artemis.native_app.feature.metis.shared.visiblemetiscontextreporter.ProvideLocalVisibleMetisContextManager
+import de.tum.informatics.www1.artemis.native_app.feature.metis.shared.visiblemetiscontextreporter.LocalVisibleMetisContextManager
 import de.tum.informatics.www1.artemis.native_app.feature.metis.shared.visiblemetiscontextreporter.VisibleMetisContext
 import de.tum.informatics.www1.artemis.native_app.feature.metis.shared.visiblemetiscontextreporter.VisibleMetisContextManager
 import de.tum.informatics.www1.artemis.native_app.feature.metis.shared.visiblemetiscontextreporter.VisibleMetisContextReporter
@@ -73,6 +74,7 @@ import kotlinx.coroutines.flow.map
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.runBlocking
 import org.koin.android.ext.android.get
+import org.koin.compose.koinInject
 
 /**
  * Main and only activity used in the android app.
@@ -134,8 +136,8 @@ class MainActivity : AppCompatActivity(),
 
         setContent {
             AppTheme {
-                ProvideLocalVisibleMetisContextManager(
-                    visibleMetisContextManager = visibleMetisContextManager
+                CompositionLocalProvider(
+                    LocalVisibleMetisContextManager provides visibleMetisContextManager,
                 ) {
                     val navController = rememberNavController()
 
@@ -251,7 +253,8 @@ class MainActivity : AppCompatActivity(),
 
         CompositionLocalProvider(
             LocalWindowSizeClassProvider provides windowSizeClassProvider,
-            LocalLinkOpener provides linkOpener
+            LocalLinkOpener provides linkOpener,
+            LocalArtemisImageProvider provides koinInject()
         ) {
             // Use jetpack compose navigation for the navigation logic.
             NavHost(navController = navController, startDestination = startDestination) {

core/core-test/build.gradle.kts

@@ -12,6 +12,7 @@ dependencies {
     implementation(project(":core:common"))
     api(project(":core:common-test"))
     implementation(project(":core:ui"))
+    api(project(":core:ui-test"))
     implementation(project(":core:datastore"))
     implementation(project(":core:device"))
     api(project(":core:device-test"))

core/core-test/src/main/kotlin/de/tum/informatics/www1/artemis/native_app/core/test/core_test_modules.kt

@@ -5,7 +5,7 @@ import de.tum.informatics.www1.artemis.native_app.core.data.test.testDataModule
 import de.tum.informatics.www1.artemis.native_app.core.datastore.ServerConfigurationService
 import de.tum.informatics.www1.artemis.native_app.core.datastore.datastoreModule
 import de.tum.informatics.www1.artemis.native_app.core.test.test_setup.TestServerConfigurationProvider
-import de.tum.informatics.www1.artemis.native_app.core.ui.uiModule
+import de.tum.informatics.www1.artemis.native_app.core.ui.test.uiTestModule
 import de.tum.informatics.www1.artemis.native_app.core.websocket.websocketModule
 import de.tum.informatics.www1.artemis.native_app.device.test.deviceTestModule
 import org.koin.dsl.module
@@ -15,7 +15,7 @@ val coreTestModules = listOf(
     testDataModule,
     datastoreModule,
     deviceTestModule,
-    uiModule,
+    uiTestModule,
     websocketModule,
     module {
         single<ServerConfigurationService> { TestServerConfigurationProvider() }

core/ui-test/build.gradle.kts

@@ -0,0 +1,18 @@
+plugins {
+    id("artemis.android.library")
+    id("artemis.android.library.compose")
+    id("artemis.android.flavor.library.instanceSelection")
+}
+
+android {
+    namespace = "de.tum.informatics.www1.artemis.native_app.core.ui.test"
+}
+
+dependencies {
+    implementation(project(":core:ui"))
+
+    implementation(libs.koin.core)
+    implementation(libs.kotlinx.coroutines.core)
+
+    implementation(libs.coil.test)
+}

core/ui-test/src/main/kotlin/de/tum/informatics/www1/artemis/native_app/core/ui/test/ArtemisImageProviderStub.kt

@@ -0,0 +1,42 @@
+package de.tum.informatics.www1.artemis.native_app.core.ui.test
+
+import android.content.Context
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.platform.LocalContext
+import coil3.ImageLoader
+import coil3.SingletonImageLoader
+import coil3.annotation.DelicateCoilApi
+import coil3.request.ImageRequest
+import coil3.test.FakeImage
+import coil3.test.FakeImageLoaderEngine
+import de.tum.informatics.www1.artemis.native_app.core.ui.remote_images.ArtemisImageProvider
+
+
+@OptIn(DelicateCoilApi::class)
+class ArtemisImageProviderStub : ArtemisImageProvider {
+
+    companion object {
+        fun setup(context: Context) {
+            // For more info on testing coil, see: https://coil-kt.github.io/coil/testing/
+            val engine = FakeImageLoaderEngine.Builder()
+                .default(FakeImage(color = 0x00F))
+                .build()
+            val imageLoader = ImageLoader.Builder(context)
+                .components { add(engine) }
+                .build()
+            SingletonImageLoader.setUnsafe(imageLoader)
+        }
+    }
+
+    @Composable
+    override fun rememberArtemisImageRequest(imagePath: String): ImageRequest {
+        return ImageRequest.Builder(LocalContext.current)
+            .data(imagePath)
+            .build()
+    }
+
+    @Composable
+    override fun rememberArtemisImageLoader(): coil.ImageLoader {
+        return coil.ImageLoader(LocalContext.current)
+    }
+}

core/ui-test/src/main/kotlin/de/tum/informatics/www1/artemis/native_app/core/ui/test/ui_test_module.kt

@@ -0,0 +1,8 @@
+package de.tum.informatics.www1.artemis.native_app.core.ui.test
+
+import de.tum.informatics.www1.artemis.native_app.core.ui.remote_images.ArtemisImageProvider
+import org.koin.dsl.module
+
+val uiTestModule = module {
+    single<ArtemisImageProvider> { ArtemisImageProviderStub() }
+}

core/ui/build.gradle.kts

@@ -26,7 +26,11 @@ dependencies {
     api(libs.androidx.compose.ui.util)
     api(libs.androidx.compose.runtime)
     api(libs.androidx.navigation.compose)
+    api(libs.coil2.base)
     api(libs.coil.compose)
+    api(libs.coil.network)
+    debugApi(libs.coil.compose.core)
+    debugApi(libs.coil.test)
     api(libs.accompanist.webview)
 
     implementation(libs.kotlinx.datetime)

core/ui/src/main/kotlin/de/tum/informatics/www1/artemis/native_app/core/ui/common/course/CourseListUi.kt

@@ -10,19 +10,12 @@ import androidx.compose.foundation.layout.ColumnScope
 import androidx.compose.foundation.layout.PaddingValues
 import androidx.compose.foundation.layout.Row
 import androidx.compose.foundation.layout.WindowInsets
-import androidx.compose.foundation.layout.WindowInsetsSides
 import androidx.compose.foundation.layout.asPaddingValues
 import androidx.compose.foundation.layout.aspectRatio
-import androidx.compose.foundation.layout.consumeWindowInsets
 import androidx.compose.foundation.layout.fillMaxHeight
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.height
-import androidx.compose.foundation.layout.ime
-import androidx.compose.foundation.layout.navigationBars
-import androidx.compose.foundation.layout.only
 import androidx.compose.foundation.layout.padding
-import androidx.compose.foundation.layout.safeContent
-import androidx.compose.foundation.layout.safeDrawing
 import androidx.compose.foundation.layout.size
 import androidx.compose.foundation.layout.systemBars
 import androidx.compose.foundation.lazy.grid.GridCells
@@ -56,11 +49,11 @@ import androidx.compose.ui.unit.sp
 import androidx.core.graphics.toColorInt
 import de.tum.informatics.www1.artemis.native_app.core.model.Course
 import de.tum.informatics.www1.artemis.native_app.core.model.CourseWithScore
-import de.tum.informatics.www1.artemis.native_app.core.ui.remote_images.LocalCourseImageProvider
 import de.tum.informatics.www1.artemis.native_app.core.ui.R
 import de.tum.informatics.www1.artemis.native_app.core.ui.common.AutoResizeText
 import de.tum.informatics.www1.artemis.native_app.core.ui.common.FontSizeRange
 import de.tum.informatics.www1.artemis.native_app.core.ui.getWindowSizeClass
+import de.tum.informatics.www1.artemis.native_app.core.ui.remote_images.LocalArtemisImageProvider
 
 private val headerHeight = 80.dp
 
@@ -107,13 +100,11 @@ fun Modifier.computeCourseItemModifier(isCompact: Boolean): Modifier {
 fun CompactCourseItemHeader(
     modifier: Modifier,
     course: Course,
-    serverUrl: String,
-    authorizationToken: String,
     compactCourseHeaderViewMode: CompactCourseHeaderViewMode,
     onClick: () -> Unit = {},
     content: @Composable ColumnScope.() -> Unit
 ) {
-    val painter = getCourseIconPainter(course, serverUrl, authorizationToken)
+    val painter = getCourseIconPainter(course)
 
     Card(modifier = modifier, onClick = onClick) {
         Column(
@@ -180,14 +171,10 @@ fun CompactCourseItemHeader(
 @Composable
 private fun getCourseIconPainter(
     course: Course,
-    serverUrl: String,
-    authorizationToken: String
 ): Painter {
     return if (course.courseIconPath != null) {
-        LocalCourseImageProvider.current.rememberCourseImagePainter(
-            courseIconPath = course.courseIconPath.orEmpty(),
-            serverUrl = serverUrl,
-            authorizationToken = authorizationToken
+        LocalArtemisImageProvider.current.rememberArtemisAsyncImagePainter(
+            imagePath = course.courseIconPath.orEmpty()
         )
     } else rememberVectorPainter(image = Icons.Default.QuestionMark)
 }
@@ -196,13 +183,11 @@ private fun getCourseIconPainter(
 fun ExpandedCourseItemHeader(
     modifier: Modifier,
     course: Course,
-    serverUrl: String,
-    authorizationToken: String,
     onClick: () -> Unit = {},
     content: @Composable ColumnScope.() -> Unit,
     rightHeaderContent: @Composable BoxScope.() -> Unit
 ) {
-    val courseIconPainter = getCourseIconPainter(course, serverUrl, authorizationToken)
+    val courseIconPainter = getCourseIconPainter(course)
 
     val courseColor: Color? = remember {
         try {

core/ui/src/main/kotlin/de/tum/informatics/www1/artemis/native_app/core/ui/common/image/RetryableAsyncImage.kt

@@ -1,6 +1,5 @@
 package de.tum.informatics.www1.artemis.native_app.core.ui.common.image
 
-import android.graphics.drawable.Drawable
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.runtime.derivedStateOf
@@ -9,16 +8,17 @@ import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
 import androidx.compose.runtime.setValue
 import androidx.compose.ui.platform.LocalContext
-import coil.imageLoader
-import coil.request.ErrorResult
-import coil.request.ImageRequest
-import coil.request.SuccessResult
+import coil3.Image
+import coil3.imageLoader
+import coil3.request.ErrorResult
+import coil3.request.ImageRequest
+import coil3.request.SuccessResult
 import de.tum.informatics.www1.artemis.native_app.core.data.DataState
 
 @Composable
 fun loadAsyncImageDrawable(request: ImageRequest): AsyncImageDrawableResult {
     val context = LocalContext.current
-    var dataState: DataState<Drawable> by remember(request) { mutableStateOf(DataState.Loading()) }
+    var dataState: DataState<Image> by remember(request) { mutableStateOf(DataState.Loading()) }
 
     // We simply increase this counter to trigger a reload
     var reloadCounter by remember(request) { mutableStateOf(0) }
@@ -31,7 +31,7 @@ fun loadAsyncImageDrawable(request: ImageRequest): AsyncImageDrawableResult {
             }
 
             is SuccessResult -> {
-                DataState.Success(result.drawable)
+                DataState.Success(result.image)
             }
         }
     }
@@ -48,6 +48,6 @@ fun loadAsyncImageDrawable(request: ImageRequest): AsyncImageDrawableResult {
 }
 
 data class AsyncImageDrawableResult(
-    val dataState: DataState<Drawable>,
+    val dataState: DataState<Image>,
     val requestRetry: () -> Unit
 )

core/ui/src/main/kotlin/de/tum/informatics/www1/artemis/native_app/core/ui/common/text_unit_util.kt

@@ -0,0 +1,10 @@
+package de.tum.informatics.www1.artemis.native_app.core.ui.common
+
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.platform.LocalDensity
+import androidx.compose.ui.unit.TextUnit
+import androidx.compose.ui.unit.sp
+
+val TextUnit.nonScaledSp
+    @Composable
+    get() = (this.value / LocalDensity.current.fontScale).sp

core/ui/src/main/kotlin/de/tum/informatics/www1/artemis/native_app/core/ui/markdown/LocalMarkwon.kt

@@ -6,14 +6,15 @@ import androidx.compose.runtime.ProvidableCompositionLocal
 import androidx.compose.runtime.compositionLocalOf
 import androidx.compose.runtime.remember
 import androidx.compose.ui.platform.LocalContext
-import coil.ImageLoader
+import de.tum.informatics.www1.artemis.native_app.core.ui.remote_images.LocalArtemisImageProvider
 import io.noties.markwon.Markwon
 
 val LocalMarkwon: ProvidableCompositionLocal<Markwon?> =
     compositionLocalOf { null }
 
 @Composable
-fun ProvideMarkwon(imageLoader: ImageLoader? = null, content: @Composable () -> Unit) {
+fun ProvideMarkwon(content: @Composable () -> Unit) {
+    val imageLoader = LocalArtemisImageProvider.current.rememberArtemisImageLoader()
     val context = LocalContext.current
 
     val imageWith = context.resources.displayMetrics.widthPixels