Merge pull request #174 from Infomaniak/repo-url

feat: Use real data for repository URL in DataManagement screen
Infomaniak · Nov 13, 2024 · a407899 · a407899
2 parents 5ff9d78 + 016b51c
commit a407899
Show file tree

Hide file tree

Showing 7 changed files with 10 additions and 10 deletions.
diff --git 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/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/...java/com/infomaniak/swisstransfer/ui/screen/main/settings/SettingsDataManagementScreen.kt b/...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/.../java/com/infomaniak/swisstransfer/ui/screen/newtransfer/importfiles/ImportFilesScreen.kt b/.../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/...fomaniak/swisstransfer/ui/screen/newtransfer/importfiles/UploadSourceChoiceBottomSheet.kt b/...fomaniak/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/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
@@ -19,7 +19,6 @@
     <string name="appName" translatable="false">SwissTransfer</string>
     <string name="matomo" translatable="false">Matomo</string>
     <string name="sentry" translatable="false">Sentry</string>
-    <string name="urlSourceCode" translatable="false">https://chk.me/83azQOl</string>
 
     <string name="advancedSettingsTitle">Advanced settings</string>
     <string name="buttonAddFiles">Add files</string>

diff --git 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") }
     }