From 67f26b10bb965cfa23cf857a7b91ba205355d6e4 Mon Sep 17 00:00:00 2001
From: Benjamin Gonin <benjamin@lalalab.com>
Date: Tue, 12 Mar 2024 17:53:52 +0100
Subject: [PATCH] Update Readme, update about tex, Fix faq link

---
 README.md                                                    | 2 +-
 .../fr/paug/androidmakers/ui/components/about/AboutLayout.kt | 5 -----
 .../kotlin/fr/androidmakers/domain/utils/Constants.kt        | 2 +-
 shared/ui/src/commonMain/moko-resources/base/strings.xml     | 4 ++--
 shared/ui/src/commonMain/moko-resources/fr/strings.xml       | 4 ++--
 5 files changed, 6 insertions(+), 11 deletions(-)

diff --git a/README.md b/README.md
index 60d12409..6492988a 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
 <h1>Android Makers conference app</h1>
 
-Android App for Android Makers Paris Conferences https://androidmakers.fr/
+Android App for Android Makers (by droidcon) Paris Conferences https://androidmakers.droidcon.com
 
 Play store link: https://play.google.com/store/apps/details?id=fr.paug.androidmakers
 
diff --git a/androidApp/src/main/java/fr/paug/androidmakers/ui/components/about/AboutLayout.kt b/androidApp/src/main/java/fr/paug/androidmakers/ui/components/about/AboutLayout.kt
index 41ef41c3..a02b5233 100644
--- a/androidApp/src/main/java/fr/paug/androidmakers/ui/components/about/AboutLayout.kt
+++ b/androidApp/src/main/java/fr/paug/androidmakers/ui/components/about/AboutLayout.kt
@@ -1,6 +1,5 @@
 package fr.paug.androidmakers.ui.components.about
 
-import androidx.annotation.StringRes
 import androidx.compose.foundation.Image
 import androidx.compose.foundation.clickable
 import androidx.compose.foundation.layout.Arrangement
@@ -31,7 +30,6 @@ import fr.paug.androidmakers.R
 import fr.paug.androidmakers.ui.MR
 import fr.paug.androidmakers.ui.util.stringResource
 
-
 class AboutActions(
     val onFaqClick: () -> Unit = {},
     val onCodeOfConductClick: () -> Unit = {},
@@ -45,7 +43,6 @@ class AboutActions(
 fun AboutLayout(
     aboutActions: AboutActions,
 ) {
-
   Column(
       modifier = Modifier
           .fillMaxSize()
@@ -53,7 +50,6 @@ fun AboutLayout(
           .padding(16.dp),
       verticalArrangement = Arrangement.spacedBy(16.dp, Alignment.CenterVertically)
   ) {
-
     IntroCard(
         onFaqClick = aboutActions.onFaqClick,
         onCocClick = aboutActions.onCodeOfConductClick
@@ -109,7 +105,6 @@ private fun IntroCard(
       )
     }
   }
-
 }
 
 @Composable
diff --git a/shared/domain/src/commonMain/kotlin/fr/androidmakers/domain/utils/Constants.kt b/shared/domain/src/commonMain/kotlin/fr/androidmakers/domain/utils/Constants.kt
index ba037435..715c4b42 100644
--- a/shared/domain/src/commonMain/kotlin/fr/androidmakers/domain/utils/Constants.kt
+++ b/shared/domain/src/commonMain/kotlin/fr/androidmakers/domain/utils/Constants.kt
@@ -2,7 +2,7 @@ package fr.androidmakers.domain.utils
 
 object Constants {
   object Urls {
-    const val faq = "https://www.youtube.com/channel/UCkatLlah5weIpN23LqMgdTg"
+    const val faq = "https://androidmakers.droidcon.com/faqs/"
     const val coc = "https://androidmakers.droidcon.com/code-of-conduct/"
     const val youtubeWeb = "https://www.youtube.com/channel/UCkatLlah5weIpN23LqMgdTg"
     const val youtubeApp = "youtube://www.youtube.com/channel/UCkatLlah5weIpN23LqMgdTg"
diff --git a/shared/ui/src/commonMain/moko-resources/base/strings.xml b/shared/ui/src/commonMain/moko-resources/base/strings.xml
index ef10e195..42ef918b 100644
--- a/shared/ui/src/commonMain/moko-resources/base/strings.xml
+++ b/shared/ui/src/commonMain/moko-resources/base/strings.xml
@@ -46,7 +46,7 @@
     <string name="expert">Expert</string>
 
     <!--About-->
-    <string name="about_android_makers">Android Makers by droidcon is a two days event held in Paris on April 27th and 28th.
+    <string name="about_android_makers">Android Makers by droidcon is a two days event held in Paris on April 25th and 26th 2024.
         \n\nJoin us in tackling the present and future of Android with the hottest experts of the domain.
         There\'ll be technical sessions, workshops and opportunities to meet your favorites speakers.
         \n\nAll the Talks will be recorded, and uploaded on the Youtube channel.</string>
@@ -54,7 +54,7 @@
     <string name="current_session">Current</string>
     <string name="upcoming_session">Upcoming</string>
 
-    <string name="about_am">About AM 23</string>
+    <string name="about_am">About AM 24</string>
     <string name="locations">Locations</string>
     <string name="directions">Directions</string>
 
diff --git a/shared/ui/src/commonMain/moko-resources/fr/strings.xml b/shared/ui/src/commonMain/moko-resources/fr/strings.xml
index 984f2d2f..ae81142a 100644
--- a/shared/ui/src/commonMain/moko-resources/fr/strings.xml
+++ b/shared/ui/src/commonMain/moko-resources/fr/strings.xml
@@ -43,7 +43,7 @@
     <string name="intermediate">Intermédiaire</string>
     <string name="expert">Expert</string>
 
-    <string name="about_android_makers">AndroidMakers by droidcon est un événement de deux jours qui se tiendra les 27 et 28 avril.
+    <string name="about_android_makers">AndroidMakers by droidcon est un événement de deux jours qui se tiendra les 25 et 26 Avril 2024.
         \n\nRejoignez-nous pour aborder le présent et futur d‘Android avec les meilleurs experts du domaine.
         Il y aura des sessions techniques, des ateliers et des rencontres avec vos speakers préférés.
         \n\nTous les talks seront enregistrées, et mis sur la chaîne YouTube.</string>
@@ -52,7 +52,7 @@
     <string name="upcoming_session">Bientôt</string>
 
     <!-- Specific iOS -->
-    <string name="about_am">À propos d\'AM 23</string>
+    <string name="about_am">À propos d\'AM 24</string>
     <string name="locations">Lieux</string>
     <string name="directions">Localiser</string>