Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update Readme, update about tex, Fix faq link #196

Merged
merged 1 commit into from
Mar 13, 2024
Merged

Update Readme, update about tex, Fix faq link #196

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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

Expand Down
5 changes: 0 additions & 5 deletions androidApp/src/main/java/fr/paug/androidmakers/ui/components/about/AboutLayout.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down Expand Up @@ -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 = {},
Expand All @@ -45,15 +43,13 @@ class AboutActions(
fun AboutLayout(
aboutActions: AboutActions,
) {

Column(
modifier = Modifier
.fillMaxSize()
.verticalScroll(state = rememberScrollState())
.padding(16.dp),
verticalArrangement = Arrangement.spacedBy(16.dp, Alignment.CenterVertically)
) {

IntroCard(
onFaqClick = aboutActions.onFaqClick,
onCocClick = aboutActions.onCodeOfConductClick
Expand Down Expand Up @@ -109,7 +105,6 @@ private fun IntroCard(
)
}
}

}

@Composable
Expand Down
2 changes: 1 addition & 1 deletion shared/domain/src/commonMain/kotlin/fr/androidmakers/domain/utils/Constants.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ package fr.androidmakers.domain.utils

object Constants {
object Urls {
const val faq = "https://www.youtube.com/channel/UCkatLlah5weIpN23LqMgdTg"
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Oups, my bad 😥

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

no problem 😄

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"
Expand Down
4 changes: 2 additions & 2 deletions shared/ui/src/commonMain/moko-resources/base/strings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,15 +46,15 @@
<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>

<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>

Expand Down
4 changes: 2 additions & 2 deletions shared/ui/src/commonMain/moko-resources/fr/strings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand All @@ -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>

Expand Down
Loading