Skip to content

Add GitHub link to About page #374

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

Merged
martinbonnin merged 1 commit into from
Apr 9, 2025
Merged

Add GitHub link to About page #374

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: 2 additions & 0 deletions shared/di/src/commonMain/kotlin/fr/androidmakers/di/DomainModule.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ import fr.androidmakers.domain.interactor.MergeBookmarksUseCase
import fr.androidmakers.domain.interactor.OpenBlueskyAccountUseCase
import fr.androidmakers.domain.interactor.OpenCocUseCase
import fr.androidmakers.domain.interactor.OpenFaqUseCase
import fr.androidmakers.domain.interactor.OpenGithubRepoUseCase
import fr.androidmakers.domain.interactor.OpenPartnerLinkUseCase
import fr.androidmakers.domain.interactor.OpenXAccountUseCase
import fr.androidmakers.domain.interactor.OpenXHashtagUseCase
Expand All @@ -32,6 +33,7 @@ val domainModule = module {
factoryOf(::OpenXHashtagUseCase)
factoryOf(::OpenBlueskyAccountUseCase)
factoryOf(::OpenXAccountUseCase)
factoryOf(::OpenGithubRepoUseCase)
factoryOf(::SetSessionBookmarkUseCase)
factoryOf(::GetPartnersUseCase)
factoryOf(::GetFavoriteSessionsUseCase)
Expand Down
11 changes: 11 additions & 0 deletions .../domain/src/commonMain/kotlin/fr/androidmakers/domain/interactor/OpenGithubRepoUseCase.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@

package fr.androidmakers.domain.interactor

import fr.androidmakers.domain.utils.Constants
import fr.androidmakers.domain.utils.UrlOpener

class OpenGithubRepoUseCase() {
operator fun invoke(urlOpener: UrlOpener) {
urlOpener.openUrl(Constants.Urls.githubRepo)
}
}
1 change: 1 addition & 0 deletions 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 @@ -10,5 +10,6 @@ object Constants {
const val xHashtagApp = "twitter://search?query=AMxDC25"
const val xAccountWeb = "https://x.com/AndroidMakersFR"
const val xAccountApp = "twitter://user?screen_name=AndroidMakersFR"
const val githubRepo = "https://github.com/paug/AndroidMakersApp"
}
}
1 change: 1 addition & 0 deletions shared/ui/src/commonMain/composeResources/values-fr/strings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@

<string name="faq">FAQ</string>
<string name="code_of_conduct">Code de conduite</string>
<string name="github_repo">Dépôt GitHub</string>
Copy link
Contributor

@martinbonnin martinbonnin Apr 9, 2025

Choose a reason for hiding this comment

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

This feels super weird. I would probably say "GitHub repository" in French too but for the sake of defending the French language, I'm in on "Dépôt GitHub" 🙌

<string name="social">Social</string>

<string name="beginner">Débutant</string>
Expand Down
1 change: 1 addition & 0 deletions shared/ui/src/commonMain/composeResources/values/strings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@

<string name="faq">FAQ</string>
<string name="code_of_conduct">Code of conduct</string>
<string name="github_repo">GitHub repository</string>
<string name="social">Social</string>

<string name="beginner">Beginner</string>
Expand Down
11 changes: 9 additions & 2 deletions shared/ui/src/commonMain/kotlin/com/androidmakers/ui/about/AboutScreen.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@ import fr.paug.androidmakers.ui.Res
import fr.paug.androidmakers.ui.about_android_makers
import fr.paug.androidmakers.ui.code_of_conduct
import fr.paug.androidmakers.ui.faq
import fr.paug.androidmakers.ui.github_repo
import fr.paug.androidmakers.ui.ic_network_bluesky
import fr.paug.androidmakers.ui.ic_network_x
import fr.paug.androidmakers.ui.ic_network_youtube
Expand Down Expand Up @@ -60,7 +61,8 @@ fun AboutScreen(

IntroCard(
onFaqClick = { viewModel.openFaq(urlOpener) },
onCocClick = { viewModel.openCoc(urlOpener) }
onCocClick = { viewModel.openCoc(urlOpener) },
onGithubRepoClick = { viewModel.openGithubRepo(urlOpener) }
)

SocialCard(
Expand All @@ -85,7 +87,8 @@ fun AboutScreen(
@Composable
private fun IntroCard(
onFaqClick: () -> Unit,
onCocClick: () -> Unit
onCocClick: () -> Unit,
onGithubRepoClick: () -> Unit
) {
Column(Modifier.padding(vertical = 8.dp)) {
Image(
Expand All @@ -112,6 +115,10 @@ private fun IntroCard(
text = stringResource(Res.string.code_of_conduct),
onClick = onCocClick
)
ClickableText(
text = stringResource(Res.string.github_repo),
onClick = onGithubRepoClick
)
}
}
}
Expand Down
4 changes: 3 additions & 1 deletion shared/ui/src/commonMain/kotlin/com/androidmakers/ui/about/AboutViewModel.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ import androidx.lifecycle.ViewModel
import fr.androidmakers.domain.interactor.OpenBlueskyAccountUseCase
import fr.androidmakers.domain.interactor.OpenCocUseCase
import fr.androidmakers.domain.interactor.OpenFaqUseCase
import fr.androidmakers.domain.interactor.OpenGithubRepoUseCase
import fr.androidmakers.domain.interactor.OpenXAccountUseCase
import fr.androidmakers.domain.interactor.OpenXHashtagUseCase
import fr.androidmakers.domain.interactor.OpenYoutubeUseCase
Expand All @@ -14,5 +15,6 @@ class AboutViewModel(
val openBlueSkyAccount: OpenBlueskyAccountUseCase,
val openYoutube: OpenYoutubeUseCase,
val openCoc: OpenCocUseCase,
val openFaq: OpenFaqUseCase
val openFaq: OpenFaqUseCase,
val openGithubRepo: OpenGithubRepoUseCase
): ViewModel()