Use androidmakers.fr API

paug · Apr 8, 2024 · ce8ed51 · ce8ed51
1 parent 0783fc4
commit ce8ed51
Show file tree

Hide file tree

Showing 7 changed files with 24 additions and 7 deletions.
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -7,4 +7,18 @@ a bug upstream.
 
 Developing is done using Android Studio.   
 
-Issues and pull requests are very welcome. For any substantial work, it's best to create an issue first and assign it to yourself to avoid duplicating work.  
+Issues and pull requests are very welcome. For any substantial work, it's best to create an issue first and assign it to yourself to avoid duplicating work.
+
+The keystore sha1 if needed:
+
+### Debug
+```
+SHA1: FF:35:7F:34:7E:10:7C:05:2E:57:09:50:34:00:0D:9A:31:22:75:A5
+SHA256: 2D:B8:6C:E5:6C:D1:58:26:99:A3:CE:A5:D1:BF:9D:DF:B1:33:30:D7:E2:9B:9B:74:AD:79:8B:17:10:F2:AE:7B
+```
+
+### Release
+```
+SHA1: A1:EB:32:3C:4B:06:A5:69:E8:DB:48:7B:B0:3A:65:D2:EA:64:9F:48
+SHA256: 27:77:B6:49:B2:69:17:1C:C8:62:6D:1D:98:7F:8F:67:45:66:9C:F3:8B:20:88:67:65:43:9C:4F:1D:F8:8F:C9
+```
diff --git a/shared/data/build.gradle.kts b/shared/data/build.gradle.kts
@@ -51,7 +51,7 @@ apollo {
 
     introspection {
       schemaFile.set(file("src/commonMain/graphql/schema.graphqls"))
-      endpointUrl.set("https://confetti-app.dev/graphql")
+      endpointUrl.set("https://androidmakers.fr/graphql")
 
       // This header is not needed to fetch the schema but it's read by the Apollo IDE plugin which will inject it when executing queries
       headers.set(mapOf("conference" to "androidmakers2024"))

diff --git a/shared/data/src/commonMain/kotlin/fr/androidmakers/store/graphql/mappers.kt b/shared/data/src/commonMain/kotlin/fr/androidmakers/store/graphql/mappers.kt
@@ -67,7 +67,7 @@ fun GetVenueQuery.Venue.toVenue(): Venue {
       coordinates = coordinates ?: "",
       descriptionFr = descriptionFr,
       description = description,
-      floorPlanUrl = floorPlanUrl!!,
+      floorPlanUrl = floorPlanUrl,
       imageUrl = imageUrl ?: ""
   )
 }
diff --git a/shared/di/src/androidMain/kotlin/fr/androidmakers/di/DataModule.android.kt b/shared/di/src/androidMain/kotlin/fr/androidmakers/di/DataModule.android.kt
@@ -10,7 +10,7 @@ import org.koin.dsl.module
 actual val dataPlatformModule = module {
   single { ApolloClientBuilder(
       androidContext(),
-    "https://confetti-app.dev/graphql",
+    "https://androidmakers.fr/graphql",
       "androidmakers2024")
   }
 

diff --git a/shared/di/src/iosMain/kotlin/fr/androidmakers/di/DataModule.ios.kt b/shared/di/src/iosMain/kotlin/fr/androidmakers/di/DataModule.ios.kt
@@ -13,7 +13,7 @@ import platform.Foundation.NSUserDomainMask
 
 @OptIn(ExperimentalForeignApi::class)
 actual val dataPlatformModule = module {
-  single { ApolloClientBuilder("https://confetti-app.dev/graphql", "androidmakers2024", "") }
+  single { ApolloClientBuilder("https://androidmakers.fr/graphql", "androidmakers2024", "") }
 
   single<DataStore<Preferences>> {
     createDataStore {

diff --git a/shared/domain/src/commonMain/kotlin/fr/androidmakers/domain/model/Venue.kt b/shared/domain/src/commonMain/kotlin/fr/androidmakers/domain/model/Venue.kt
@@ -6,6 +6,6 @@ data class Venue(
     var description: String = "",
     var descriptionFr: String = "",
     var imageUrl: String = "",
-    val floorPlanUrl: String = "",
+    val floorPlanUrl: String?,
     var name: String = "No Venue"
 )
diff --git a/shared/ui/src/commonMain/kotlin/com/androidmakers/ui/venue/VenuePager.kt b/shared/ui/src/commonMain/kotlin/com/androidmakers/ui/venue/VenuePager.kt
@@ -14,6 +14,7 @@ import androidx.compose.runtime.collectAsState
 import androidx.compose.runtime.remember
 import androidx.compose.runtime.rememberCoroutineScope
 import androidx.compose.ui.Modifier
+import androidx.compose.ui.text.style.TextOverflow
 import androidx.compose.ui.unit.sp
 import com.androidmakers.ui.common.LceLayout
 import com.androidmakers.ui.model.Lce
@@ -53,6 +54,8 @@ fun VenuePager() {
           text = {
             Text(
               text = stringResource(titles[it]),
+              overflow = TextOverflow.Ellipsis,
+              maxLines = 1
             )
           },
           selected = pagerState.currentPage == it,
@@ -108,7 +111,7 @@ fun VenuePager() {
           }
           val venueState = flow.collectAsState(initial = Lce.Loading)
           LceLayout(lce = venueState.value) { venue ->
-            FloorPlan(venue.floorPlanUrl)
+            FloorPlan(venue.floorPlanUrl ?: "")
           }
         }
       }