From 915daa22931dfd1d3827b414930547af03677b08 Mon Sep 17 00:00:00 2001 From: Kevin Boulongne Date: Tue, 12 Nov 2024 18:01:50 +0100 Subject: [PATCH 1/2] refactor: Clean some TODOs code --- .../com/infomaniak/swisstransfer/ui/MatomoSwissTransfer.kt | 4 ++-- .../ui/screen/newtransfer/importfiles/ImportFilesScreen.kt | 2 +- .../newtransfer/importfiles/UploadSourceChoiceBottomSheet.kt | 4 ++-- settings.gradle.kts | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/app/src/main/java/com/infomaniak/swisstransfer/ui/MatomoSwissTransfer.kt b/app/src/main/java/com/infomaniak/swisstransfer/ui/MatomoSwissTransfer.kt index 9106a9ed4..d21c8220c 100644 --- a/app/src/main/java/com/infomaniak/swisstransfer/ui/MatomoSwissTransfer.kt +++ b/app/src/main/java/com/infomaniak/swisstransfer/ui/MatomoSwissTransfer.kt @@ -23,6 +23,6 @@ import org.matomo.sdk.Tracker object MatomoSwissTransfer : Matomo { - override val Context.tracker: Tracker get() = buildTracker() //TODO fetch appSettings for opt out - override val siteId: Int = -1 //TODO replace with the right site ID when we have one + override val Context.tracker: Tracker get() = buildTracker() // TODO: Fetch appSettings for opt-out + override val siteId: Int = -1 // TODO: Replace with the right site ID when we have one } diff --git a/app/src/main/java/com/infomaniak/swisstransfer/ui/screen/newtransfer/importfiles/ImportFilesScreen.kt b/app/src/main/java/com/infomaniak/swisstransfer/ui/screen/newtransfer/importfiles/ImportFilesScreen.kt index 4611d9cb2..c8133bbc3 100644 --- a/app/src/main/java/com/infomaniak/swisstransfer/ui/screen/newtransfer/importfiles/ImportFilesScreen.kt +++ b/app/src/main/java/com/infomaniak/swisstransfer/ui/screen/newtransfer/importfiles/ImportFilesScreen.kt @@ -126,7 +126,7 @@ private fun HandleSendActionResult( LaunchedEffect(getSendActionResult()) { when (val actionResult = getSendActionResult()) { is SendActionResult.Success -> navigateToUploadProgress(transferType(), actionResult.totalSize) - is SendActionResult.Failure -> Unit //TODO: Show error + is SendActionResult.Failure -> Unit // TODO: Show error else -> Unit } } diff --git a/app/src/main/java/com/infomaniak/swisstransfer/ui/screen/newtransfer/importfiles/UploadSourceChoiceBottomSheet.kt b/app/src/main/java/com/infomaniak/swisstransfer/ui/screen/newtransfer/importfiles/UploadSourceChoiceBottomSheet.kt index 7e2a5f622..c7bd2689c 100644 --- a/app/src/main/java/com/infomaniak/swisstransfer/ui/screen/newtransfer/importfiles/UploadSourceChoiceBottomSheet.kt +++ b/app/src/main/java/com/infomaniak/swisstransfer/ui/screen/newtransfer/importfiles/UploadSourceChoiceBottomSheet.kt @@ -53,7 +53,7 @@ fun UploadSourceChoiceBottomSheet( titleRes = R.string.transferUploadSourceChoiceCamera, onClick = { closeBottomSheet() - /* TODO */ + // TODO: Handle this feature }, ) HorizontalDivider(Modifier.padding(horizontal = Margin.Medium)) @@ -62,7 +62,7 @@ fun UploadSourceChoiceBottomSheet( titleRes = R.string.transferUploadSourceChoiceGallery, onClick = { closeBottomSheet() - /* TODO */ + // TODO: Handle this feature }, ) HorizontalDivider(Modifier.padding(horizontal = Margin.Medium)) diff --git a/settings.gradle.kts b/settings.gradle.kts index 8c3abc6e3..57b8ebe0e 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -17,7 +17,7 @@ dependencyResolutionManagement { @Suppress("UnstableApiUsage") repositories { google() - // mavenLocal() // TODO Do not put this in production + // mavenLocal() // TODO: Do not put this in production mavenCentral() maven { url = uri("https://jitpack.io") } } From 016b51ce3a0f1beefa65a6dd1cce476b997d5e04 Mon Sep 17 00:00:00 2001 From: Kevin Boulongne Date: Tue, 12 Nov 2024 18:01:20 +0100 Subject: [PATCH 2/2] feat: Use real data for repository URL in DataManagement screen --- app/build.gradle.kts | 3 ++- .../ui/screen/main/settings/SettingsDataManagementScreen.kt | 4 ++-- app/src/main/res/values/strings.xml | 1 - 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/app/build.gradle.kts b/app/build.gradle.kts index b10844a1f..db5ac7c8e 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -30,6 +30,7 @@ android { } buildConfigField("String", "RECAPTCHA_API_SITE_KEY", "\"6LfaxOgpAAAAAI3Sj4rtB2oAFjkRJILiGEt-LUsc\"") + buildConfigField ("String", "GITHUB_REPO_URL", "\"https://github.com/Infomaniak/android-SwissTransfer\"") } buildTypes { @@ -92,7 +93,7 @@ dependencies { // Compose implementation(libs.androidx.activity.compose) implementation(platform(libs.compose.bom)) - implementation(libs.compose.foundation) //TODO: To be removed when compose 1.8.0 is stable + implementation(libs.compose.foundation) // TODO: To be removed when compose 1.8.0 is stable implementation(libs.compose.ui) implementation(libs.compose.ui.graphics) implementation(libs.compose.material3) diff --git a/app/src/main/java/com/infomaniak/swisstransfer/ui/screen/main/settings/SettingsDataManagementScreen.kt b/app/src/main/java/com/infomaniak/swisstransfer/ui/screen/main/settings/SettingsDataManagementScreen.kt index 204b810fd..714bae021 100644 --- a/app/src/main/java/com/infomaniak/swisstransfer/ui/screen/main/settings/SettingsDataManagementScreen.kt +++ b/app/src/main/java/com/infomaniak/swisstransfer/ui/screen/main/settings/SettingsDataManagementScreen.kt @@ -30,6 +30,7 @@ import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier import androidx.compose.ui.platform.LocalContext import androidx.compose.ui.res.stringResource +import com.infomaniak.swisstransfer.BuildConfig import com.infomaniak.swisstransfer.R import com.infomaniak.swisstransfer.ui.components.SharpRippleButton import com.infomaniak.swisstransfer.ui.components.SwissTransferTopAppBar @@ -57,7 +58,6 @@ fun SettingsDataManagementScreen( ) { val context = LocalContext.current - val sourceCodeURL = stringResource(R.string.urlSourceCode) // TODO: Update this URL when we know what we want SmallWindowTopAppBarScaffold( smallWindowTopAppBar = { @@ -84,7 +84,7 @@ fun SettingsDataManagementScreen( ) SharpRippleButton( modifier = Modifier.fillMaxWidth(), - onClick = { context.openUrl(sourceCodeURL) }, + onClick = { context.openUrl(BuildConfig.GITHUB_REPO_URL) }, ) { Text( text = stringResource(R.string.settingsDataManagementSourceCode), diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index aefc59e4d..2c3914467 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -19,7 +19,6 @@ SwissTransfer Matomo Sentry - https://chk.me/83azQOl Advanced settings Add files