Merge pull request #168 from Infomaniak/clean-code

refactor: Clean code
Infomaniak · Nov 13, 2024 · e07b900 · e07b900
2 parents 531b2aa + c13c3df
commit e07b900
Show file tree

Hide file tree

Showing 10 changed files with 3 additions and 67 deletions.
diff --git a/Core2/src/main/res/values-fr/strings.xml b/Core2/src/main/res/values-fr/strings.xml
@@ -15,7 +15,7 @@
   ~ You should have received a copy of the GNU General Public License
   ~ along with this program.  If not, see <http://www.gnu.org/licenses/>.
   -->
-<resources xmlns:tools="http://schemas.android.com/tools">
+<resources>
     <string name="buttonCancel">Annuler</string>
     <string name="buttonRetry">Réessayer</string>
 </resources>
diff --git a/app/src/main/java/com/infomaniak/swisstransfer/ui/components/Buttons.kt b/app/src/main/java/com/infomaniak/swisstransfer/ui/components/Buttons.kt
@@ -42,7 +42,6 @@ import com.infomaniak.swisstransfer.ui.theme.Dimens
 import com.infomaniak.swisstransfer.ui.theme.Margin
 import com.infomaniak.swisstransfer.ui.theme.SwissTransferTheme
 
-
 /**
  * Specifying a progress has the priority over specifying showIndeterminateProgress
  */
@@ -70,7 +69,6 @@ fun LargeButton(
     )
 }
 
-
 /**
  * Specifying a progress has the priority over specifying showIndeterminateProgress
  */

diff --git a/app/src/main/java/com/infomaniak/swisstransfer/ui/components/CrossCircleButton.kt b/app/src/main/java/com/infomaniak/swisstransfer/ui/components/CrossCircleButton.kt
@@ -62,7 +62,6 @@ fun BoxScope.CrossCircleButton(onClick: (() -> Unit)?, size: Dp = 48.dp) {
     }
 }
 
-
 @PreviewLightAndDark
 @Composable
 private fun CrossCircleButtonPreview() {

diff --git a/.../infomaniak/swisstransfer/ui/images/illus/uploadError/GhostMagnifyingGlassQuestionMark.kt b/.../infomaniak/swisstransfer/ui/images/illus/uploadError/GhostMagnifyingGlassQuestionMark.kt
@@ -17,7 +17,6 @@
  */
 package com.infomaniak.swisstransfer.ui.images.illus.uploadError
 
-
 import android.content.res.Configuration
 import androidx.compose.foundation.Image
 import androidx.compose.foundation.layout.Box

diff --git a/...c/main/java/com/infomaniak/swisstransfer/ui/screen/main/received/ReceivedScreenWrapper.kt b/...c/main/java/com/infomaniak/swisstransfer/ui/screen/main/received/ReceivedScreenWrapper.kt
@@ -69,7 +69,6 @@ private fun DetailPane(navigator: ThreePaneScaffoldNavigator<String>) {
     }
 }
 
-// Show the detail pane content if selected item is available
 @Composable
 private fun NoSelectionEmptyState() {
     Box(modifier = Modifier.fillMaxSize(), contentAlignment = Alignment.Center) {

diff --git a/app/src/main/java/com/infomaniak/swisstransfer/ui/screen/main/sent/SentListScreen.kt b/app/src/main/java/com/infomaniak/swisstransfer/ui/screen/main/sent/SentListScreen.kt
diff --git a/app/src/main/java/com/infomaniak/swisstransfer/ui/screen/main/sent/SentScreen.kt b/app/src/main/java/com/infomaniak/swisstransfer/ui/screen/main/sent/SentScreen.kt
@@ -52,11 +52,7 @@ private fun SentScreen(transfers: List<Any>?) {
             }
         },
     ) {
-        if (transfers.isEmpty()) {
-            SentEmptyScreen()
-        } else {
-            SentListScreen(transfers)
-        }
+        if (transfers.isEmpty()) SentEmptyScreen()
     }
 }
 

diff --git a/...c/main/java/com/infomaniak/swisstransfer/ui/screen/main/settings/SettingsScreenWrapper.kt b/...c/main/java/com/infomaniak/swisstransfer/ui/screen/main/settings/SettingsScreenWrapper.kt
@@ -162,7 +162,6 @@ private fun DetailPane(
     }
 }
 
-// Show the detail pane content if selected item is available
 @Composable
 private fun NoSelectionEmptyState() {
     Box(modifier = Modifier.fillMaxSize(), contentAlignment = Alignment.Center) {

diff --git a/...nfomaniak/swisstransfer/ui/screen/newtransfer/importfiles/components/ImportedFilesCard.kt b/...nfomaniak/swisstransfer/ui/screen/newtransfer/importfiles/components/ImportedFilesCard.kt
@@ -123,7 +123,6 @@ private data class TransferLazyRowKey(
     }
 }
 
-
 @PreviewLightAndDark
 @Composable
 private fun ImportedFilesCardPreview(@PreviewParameter(FileUiListPreviewParameter::class) files: List<FileUi>) {

diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
@@ -15,7 +15,7 @@
   ~ You should have received a copy of the GNU General Public License
   ~ along with this program.  If not, see <http://www.gnu.org/licenses/>.
   -->
-<resources xmlns:tools="http://schemas.android.com/tools">
+<resources>
     <string name="advancedSettingsTitle">Paramètres avancés</string>
     <string name="buttonAddFiles">Ajouter des fichiers</string>
     <string name="buttonCancel">Annuler</string>
-Original file line number
+Diff line change
@@ Expand Up / @@ -42,7 +42,6 @@ import com.infomaniak.swisstransfer.ui.theme.Dimens @@
     import com.infomaniak.swisstransfer.ui.theme.Margin
     import com.infomaniak.swisstransfer.ui.theme.SwissTransferTheme
     /**
      * Specifying a progress has the priority over specifying showIndeterminateProgress
      */
@@ Expand Down Expand Up / @@ -70,7 +69,6 @@ fun LargeButton( @@
         )
     }
     /**
      * Specifying a progress has the priority over specifying showIndeterminateProgress
      */
@@ Expand Down @@