[mob] Move resumable upload setting

mobile/lib/generated/intl/messages_de.dart

@@ -683,8 +683,6 @@ class MessageLookup extends MessageLookupByLibrary {
         "enableMaps": MessageLookupByLibrary.simpleMessage("Karten aktivieren"),
         "enableMapsDesc": MessageLookupByLibrary.simpleMessage(
             "Dies zeigt Ihre Fotos auf einer Weltkarte.\n\nDiese Karte wird von OpenStreetMap gehostet und die genauen Standorte Ihrer Fotos werden niemals geteilt.\n\nSie können diese Funktion jederzeit in den Einstellungen deaktivieren."),
-        "enableMultiPartUpload": MessageLookupByLibrary.simpleMessage(
-            "Mehrteiliges Hochladen aktivieren"),
         "encryptingBackup":
             MessageLookupByLibrary.simpleMessage("Verschlüssele Sicherung …"),
         "encryption": MessageLookupByLibrary.simpleMessage("Verschlüsselung"),

mobile/lib/generated/intl/messages_en.dart

@@ -661,8 +661,6 @@ class MessageLookup extends MessageLookupByLibrary {
         "enableMaps": MessageLookupByLibrary.simpleMessage("Enable Maps"),
         "enableMapsDesc": MessageLookupByLibrary.simpleMessage(
             "This will show your photos on a world map.\n\nThis map is hosted by Open Street Map, and the exact locations of your photos are never shared.\n\nYou can disable this feature anytime from Settings."),
-        "enableMultiPartUpload":
-            MessageLookupByLibrary.simpleMessage("Enable multi-part upload"),
         "encryptingBackup":
             MessageLookupByLibrary.simpleMessage("Encrypting backup..."),
         "encryption": MessageLookupByLibrary.simpleMessage("Encryption"),
@@ -1259,6 +1257,8 @@ class MessageLookup extends MessageLookupByLibrary {
             MessageLookupByLibrary.simpleMessage("Restore to album"),
         "restoringFiles":
             MessageLookupByLibrary.simpleMessage("Restoring files..."),
+        "resumableUploads":
+            MessageLookupByLibrary.simpleMessage("Resumable uploads"),
         "retry": MessageLookupByLibrary.simpleMessage("Retry"),
         "reviewDeduplicateItems": MessageLookupByLibrary.simpleMessage(
             "Please review and delete the items you believe are duplicates."),

mobile/lib/generated/intl/messages_pl.dart

@@ -675,8 +675,6 @@ class MessageLookup extends MessageLookupByLibrary {
         "enableMaps": MessageLookupByLibrary.simpleMessage("Włącz mapy"),
         "enableMapsDesc": MessageLookupByLibrary.simpleMessage(
             "To pokaże Twoje zdjęcia na mapie świata.\n\nTa mapa jest hostowana przez Open Street Map, a dokładne lokalizacje Twoich zdjęć nigdy nie są udostępniane.\n\nMożesz wyłączyć tę funkcję w każdej chwili w ustawieniach."),
-        "enableMultiPartUpload": MessageLookupByLibrary.simpleMessage(
-            "Włącz przesyłanie wieloczęściowe"),
         "encryptingBackup": MessageLookupByLibrary.simpleMessage(
             "Szyfrowanie kopii zapasowej..."),
         "encryption": MessageLookupByLibrary.simpleMessage("Szyfrowanie"),

mobile/lib/generated/intl/messages_pt.dart

@@ -676,8 +676,6 @@ class MessageLookup extends MessageLookupByLibrary {
         "enableMaps": MessageLookupByLibrary.simpleMessage("Habilitar Mapa"),
         "enableMapsDesc": MessageLookupByLibrary.simpleMessage(
             "Isto mostrará suas fotos em um mapa do mundo.\n\nEste mapa é hospedado pelo OpenStreetMap, e os exatos locais de suas fotos nunca são compartilhados.\n\nVocê pode desativar esse recurso a qualquer momento nas Configurações."),
-        "enableMultiPartUpload": MessageLookupByLibrary.simpleMessage(
-            "Ativar envio de várias partes"),
         "encryptingBackup":
             MessageLookupByLibrary.simpleMessage("Criptografando backup..."),
         "encryption": MessageLookupByLibrary.simpleMessage("Criptografia"),

mobile/lib/generated/intl/messages_zh.dart

@@ -562,7 +562,6 @@ class MessageLookup extends MessageLookupByLibrary {
         "enableMaps": MessageLookupByLibrary.simpleMessage("启用地图"),
         "enableMapsDesc": MessageLookupByLibrary.simpleMessage(
             "这将在世界地图上显示您的照片。\n\n该地图由 Open Street Map 托管，并且您的照片的确切位置永远不会共享。\n\n您可以随时从“设置”中禁用此功能。"),
-        "enableMultiPartUpload": MessageLookupByLibrary.simpleMessage("启用分片上传"),
         "encryptingBackup": MessageLookupByLibrary.simpleMessage("正在加密备份..."),
         "encryption": MessageLookupByLibrary.simpleMessage("加密"),
         "encryptionKeys": MessageLookupByLibrary.simpleMessage("加密密钥"),

mobile/lib/generated/l10n.dart

@@ -8015,11 +8015,11 @@ class S {
     );
   }
 
-  /// `Enable multi-part upload`
+  /// `Resumable uploads`
-  String get enableMultiPartUpload {
+  String get resumableUploads {
     return Intl.message(
-      'Enable multi-part upload',
+      'Resumable uploads',
-      name: 'enableMultiPartUpload',
+      name: 'resumableUploads',
       desc: '',
       args: [],
     );

mobile/lib/l10n/intl_en.arb

@@ -1148,7 +1148,7 @@
   "successfullyHid": "Successfully hid",
   "successfullyUnhid": "Successfully unhid",
   "crashReporting": "Crash reporting",
-  "enableMultiPartUpload": "Enable multi-part upload",
+  "resumableUploads": "Resumable uploads",
   "addToHiddenAlbum": "Add to hidden album",
   "moveToHiddenAlbum": "Move to hidden album",
   "fileTypes": "File types",

mobile/lib/ui/settings/advanced_settings_screen.dart

@@ -192,29 +192,6 @@ class _AdvancedSettingsScreenState extends State<AdvancedSettingsScreen> {
                                 },
                               ),
                             ),
-                            if (flagService.enableMobMultiPart)
-                              const SizedBox(
-                                height: 24,
-                              ),
-                            if (flagService.enableMobMultiPart)
-                              MenuItemWidget(
-                                captionedTextWidget: CaptionedTextWidget(
-                                  title: S.of(context).enableMultiPartUpload,
-                                ),
-                                menuItemColor: colorScheme.fillFaint,
-                                singleBorderRadius: 8,
-                                alignCaptionedTextToLeft: true,
-                                trailingWidget: ToggleSwitchWidget(
-                                  value: () =>
-                                      localSettings.userEnabledMultiplePart,
-                                  onChanged: () async {
-                                    await localSettings
-                                        .setUserEnabledMultiplePart(
-                                      !localSettings.userEnabledMultiplePart,
-                                    );
-                                  },
-                                ),
-                              ),
                             const SizedBox(
                               height: 24,
                             ),

mobile/lib/ui/settings/backup/backup_settings_screen.dart

@@ -3,6 +3,7 @@ import 'dart:io';
 import 'package:flutter/material.dart';
 import 'package:photos/core/configuration.dart';
 import "package:photos/generated/l10n.dart";
+import "package:photos/service_locator.dart";
 import 'package:photos/theme/ente_theme.dart';
 import 'package:photos/ui/components/buttons/icon_button_widget.dart';
 import 'package:photos/ui/components/captioned_text_widget.dart';
@@ -92,6 +93,29 @@ class BackupSettingsScreen extends StatelessWidget {
                               alignCaptionedTextToLeft: true,
                               isTopBorderRadiusRemoved: true,
                               isGestureDetectorDisabled: true,
+                              isBottomBorderRadiusRemoved:
+                                  flagService.enableMobMultiPart,
+                            ),
+                            if (flagService.enableMobMultiPart)
+                              MenuItemWidget(
+                                captionedTextWidget: CaptionedTextWidget(
+                                  title: S.of(context).resumableUploads,
+                                ),
+                                menuItemColor: colorScheme.fillFaint,
+                                singleBorderRadius: 8,
+                                trailingWidget: ToggleSwitchWidget(
+                                  value: () =>
+                                      localSettings.userEnabledMultiplePart,
+                                  onChanged: () async {
+                                    await localSettings
+                                        .setUserEnabledMultiplePart(
+                                      !localSettings.userEnabledMultiplePart,
+                                    );
+                                  },
+                                ),
+                                alignCaptionedTextToLeft: true,
+                                isTopBorderRadiusRemoved: true,
+                                isGestureDetectorDisabled: true,
                               ),
                           ],
                         ),