Dark partner logo support

paug · Apr 5, 2024 · 5b45deb · 5b45deb
1 parent 18a1780
commit 5b45deb
Show file tree

Hide file tree

Showing 9 changed files with 27 additions and 42 deletions.
diff --git a/androidApp/src/main/java/fr/paug/androidmakers/util/CustomTabUtil.kt b/androidApp/src/main/java/fr/paug/androidmakers/util/CustomTabUtil.kt
diff --git a/shared/data/src/commonMain/graphql/operations.graphql b/shared/data/src/commonMain/graphql/operations.graphql
@@ -68,7 +68,8 @@ query GetPartnerGroups {
         title
         partners {
             name
-            logoUrl
+            logoUrlLight: logoUrl(dark: false)
+            logoUrlDark: logoUrl(dark: true)
             url
         }
     }

diff --git a/shared/data/src/commonMain/graphql/schema.graphqls b/shared/data/src/commonMain/graphql/schema.graphqls
@@ -77,7 +77,7 @@ type PageInfo {
 }
 
 type Partner {
-  logoUrl: String!
+  logoUrl(dark: Boolean): String!
 
   name: String!
 

diff --git a/...ed/data/src/commonMain/kotlin/fr/androidmakers/store/graphql/PartnersGraphQLRepository.kt b/...ed/data/src/commonMain/kotlin/fr/androidmakers/store/graphql/PartnersGraphQLRepository.kt
@@ -22,9 +22,10 @@ class PartnersGraphQLRepository(private val apolloClient: ApolloClient): Partner
                 title = partnerGroup.title,
                 partners = partnerGroup.partners.map { partner ->
                   Partner(
-                      logoUrl = partner.logoUrl,
+                      logoUrl = partner.logoUrlLight,
                       name = partner.name,
-                      url = partner.url
+                      url = partner.url,
+                      logoUrlDark = partner.logoUrlDark
                   )
                 }
             )

diff --git a/shared/domain/src/commonMain/kotlin/fr/androidmakers/domain/model/Logo.kt b/shared/domain/src/commonMain/kotlin/fr/androidmakers/domain/model/Logo.kt
@@ -2,6 +2,7 @@ package fr.androidmakers.domain.model
 
 data class Partner(
     val logoUrl: String = "",
+    val logoUrlDark: String = "",
     val name: String = "",
     val url: String = ""
 )
diff --git a/shared/ui/src/commonMain/kotlin/com/androidmakers/di/ViewModelModule.kt b/shared/ui/src/commonMain/kotlin/com/androidmakers/di/ViewModelModule.kt
@@ -12,7 +12,7 @@ import org.koin.dsl.module
 
 val viewModelModule = module {
   factory { SpeakerListViewModel(get()) }
-  factory { SponsorsViewModel(get()) }
+  factory { SponsorsViewModel(get(), get()) }
   factory { VenueViewModel(get(), get(), get()) }
   factory { (speakerId: String) -> SpeakerDetailsViewModel(speakerId, get(), get()) }
   factory { AgendaLayoutViewModel(get()) }

diff --git a/shared/ui/src/commonMain/kotlin/com/androidmakers/ui/common/navigation/AVALayout.kt b/shared/ui/src/commonMain/kotlin/com/androidmakers/ui/common/navigation/AVALayout.kt
@@ -1,6 +1,5 @@
 package com.androidmakers.ui.common.navigation
 
-import androidx.compose.animation.ExitTransition
 import androidx.compose.animation.fadeIn
 import androidx.compose.animation.fadeOut
 import androidx.compose.foundation.Image
@@ -54,7 +53,6 @@ import fr.androidmakers.domain.model.User
 import fr.paug.androidmakers.ui.MR
 import kotlinx.coroutines.launch
 import moe.tlaster.precompose.koin.koinViewModel
-import moe.tlaster.precompose.navigation.BackStackEntry
 import moe.tlaster.precompose.navigation.NavHost
 import moe.tlaster.precompose.navigation.NavOptions
 import moe.tlaster.precompose.navigation.Navigator
@@ -282,9 +280,7 @@ private fun AVANavHost(
       route = AVANavigationRoute.SPONSORS.name,
       navTransition = defaultNavTransition
     ) {
-      SponsorsScreen(
-          onSponsorClick = {}
-      )
+      SponsorsScreen()
     }
   }
 }

diff --git a/shared/ui/src/commonMain/kotlin/com/androidmakers/ui/sponsors/SponsorScreen.kt b/shared/ui/src/commonMain/kotlin/com/androidmakers/ui/sponsors/SponsorScreen.kt
@@ -2,6 +2,7 @@ package com.androidmakers.ui.sponsors
 
 import androidx.compose.foundation.Image
 import androidx.compose.foundation.clickable
+import androidx.compose.foundation.isSystemInDarkTheme
 import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.PaddingValues
 import androidx.compose.foundation.layout.fillMaxWidth
@@ -18,26 +19,22 @@ import androidx.compose.runtime.collectAsState
 import androidx.compose.runtime.getValue
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
-import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.text.style.TextAlign
 import androidx.compose.ui.unit.dp
-import androidx.compose.ui.unit.sp
 import com.androidmakers.ui.model.Lce
 import com.seiko.imageloader.rememberImagePainter
 import fr.androidmakers.domain.model.Partner
 import fr.androidmakers.domain.model.PartnerGroup
 import moe.tlaster.precompose.koin.koinViewModel
 
 @Composable
-fun SponsorsScreen(
-    onSponsorClick: (partner: Partner) -> Unit
-) {
+fun SponsorsScreen() {
   val viewModel = koinViewModel(SponsorsViewModel::class)
   val sponsors by viewModel.values.collectAsState()
 
   SponsorsView(
       partnerList = sponsors,
-      onSponsorClick = onSponsorClick
+      onSponsorClick = { viewModel.openPartnerLink(it) }
   )
 }
 
@@ -73,30 +70,33 @@ fun SponsorsView(
           }) {
             Text(
                 modifier = Modifier
-                    .padding(top = 32.dp, bottom = 8.dp)
+                    .padding(top = 48.dp, bottom = 8.dp)
                     .fillMaxWidth(),
                 textAlign = TextAlign.Start,
                 text = partnerGroup.title.replaceFirstChar { if (it.isLowerCase()) it.titlecase() else it.toString() },
-                style = MaterialTheme.typography.titleMedium.copy(
-                    color = MaterialTheme.colorScheme.primary,
-                    fontWeight = FontWeight.Bold,
-                    fontSize = 18.sp
-                )
+                color = MaterialTheme.colorScheme.primary,
+                style = MaterialTheme.typography.titleMedium
             )
           }
 
           // Sponsor logo
           for (partner in partnerGroup.partners) {
             item {
-              val painter = rememberImagePainter(partner.logoUrl)
+              val logoUrl = if (isSystemInDarkTheme()) {
+                partner.logoUrlDark
+              } else {
+                partner.logoUrl
+            }
+
               Image(
                   modifier = Modifier
                       .fillMaxWidth()
                       .height(80.dp)
                       .clickable {
                         onSponsorClick(partner)
-                      },
-                  painter = painter,
+                      }
+                    .padding(12.dp),
+                  painter = rememberImagePainter(logoUrl),
                   contentDescription = partner.name
               )
             }

diff --git a/shared/ui/src/commonMain/kotlin/com/androidmakers/ui/sponsors/SponsorsViewModel.kt b/shared/ui/src/commonMain/kotlin/com/androidmakers/ui/sponsors/SponsorsViewModel.kt
@@ -2,11 +2,13 @@ package com.androidmakers.ui.sponsors
 
 import com.androidmakers.ui.common.LceViewModel
 import fr.androidmakers.domain.interactor.GetPartnersUseCase
+import fr.androidmakers.domain.interactor.OpenPartnerLinkUseCase
 import fr.androidmakers.domain.model.PartnerGroup
 import kotlinx.coroutines.flow.Flow
 
 class SponsorsViewModel(
-    private val getPartnersUseCase: GetPartnersUseCase
+    private val getPartnersUseCase: GetPartnersUseCase,
+    val openPartnerLink: OpenPartnerLinkUseCase,
 ) : LceViewModel<List<PartnerGroup>>() {
   override fun produce(): Flow<Result<List<PartnerGroup>>> {
     return getPartnersUseCase()
-Original file line number
+Diff line change
@@ Expand Up / @@ -68,7 +68,8 @@ query GetPartnerGroups { @@
             title
             partners {
                 name
-                logoUrl
+                logoUrlLight: logoUrl(dark: false)
+                logoUrlDark: logoUrl(dark: true)
                 url
             }
         }
@@ Expand Down @@