diff --git a/mobile/lib/generated/intl/messages_de.dart b/mobile/lib/generated/intl/messages_de.dart index 203738b726..d86cc2800f 100644 --- a/mobile/lib/generated/intl/messages_de.dart +++ b/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"), diff --git a/mobile/lib/generated/intl/messages_en.dart b/mobile/lib/generated/intl/messages_en.dart index b92a9f13e7..1424401fa4 100644 --- a/mobile/lib/generated/intl/messages_en.dart +++ b/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."), diff --git a/mobile/lib/generated/intl/messages_pl.dart b/mobile/lib/generated/intl/messages_pl.dart index abb44e9cca..9a3dec20ad 100644 --- a/mobile/lib/generated/intl/messages_pl.dart +++ b/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"), diff --git a/mobile/lib/generated/intl/messages_pt.dart b/mobile/lib/generated/intl/messages_pt.dart index e8c025de56..9c5b8d3f92 100644 --- a/mobile/lib/generated/intl/messages_pt.dart +++ b/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"), diff --git a/mobile/lib/generated/intl/messages_zh.dart b/mobile/lib/generated/intl/messages_zh.dart index 95b5fbabc6..49f04cd803 100644 --- a/mobile/lib/generated/intl/messages_zh.dart +++ b/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("加密密钥"), diff --git a/mobile/lib/generated/l10n.dart b/mobile/lib/generated/l10n.dart index 5f831a325e..b498ab84dd 100644 --- a/mobile/lib/generated/l10n.dart +++ b/mobile/lib/generated/l10n.dart @@ -8015,11 +8015,11 @@ class S { ); } - /// `Enable multi-part upload` - String get enableMultiPartUpload { + /// `Resumable uploads` + String get resumableUploads { return Intl.message( - 'Enable multi-part upload', - name: 'enableMultiPartUpload', + 'Resumable uploads', + name: 'resumableUploads', desc: '', args: [], ); diff --git a/mobile/lib/l10n/intl_en.arb b/mobile/lib/l10n/intl_en.arb index 92b58dcd7b..112b3c9e7d 100644 --- a/mobile/lib/l10n/intl_en.arb +++ b/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", diff --git a/mobile/lib/ui/settings/advanced_settings_screen.dart b/mobile/lib/ui/settings/advanced_settings_screen.dart index bdad641108..6792f254bd 100644 --- a/mobile/lib/ui/settings/advanced_settings_screen.dart +++ b/mobile/lib/ui/settings/advanced_settings_screen.dart @@ -192,29 +192,6 @@ class _AdvancedSettingsScreenState extends State { }, ), ), - 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, ), diff --git a/mobile/lib/ui/settings/backup/backup_settings_screen.dart b/mobile/lib/ui/settings/backup/backup_settings_screen.dart index 6d15793d7e..6fa4225f6d 100644 --- a/mobile/lib/ui/settings/backup/backup_settings_screen.dart +++ b/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,7 +93,30 @@ 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, + ), ], ), const SizedBox(height: 24),