High performance self-hosted photo and video management solution.
TypeScript backup-toolfluttergoogle-photosgoogle-photos-alternativejavascriptmobile-appnestjsnodejsphoto-galleryphotosphotos-managementself-hostedsveltesveltekittypescriptvideos
fix: backup indicator in beta app bar (#20354)
shenlong1e1c2ea627c5
diff --git a/mobile/lib/domain/models/setting.model.dart b/mobile/lib/domain/models/setting.model.dartindex 99246c31a1..150545eba9 100644--- a/mobile/lib/domain/models/setting.model.dart+++ b/mobile/lib/domain/models/setting.model.dart@@ -8,6 +8,7 @@ enum Setting<T> {loadOriginalVideo<bool>(StoreKey.loadOriginalVideo, false),preferRemoteImage<bool>(StoreKey.preferRemoteImage, false),advancedTroubleshooting<bool>(StoreKey.advancedTroubleshooting, false),+ enableBackup<bool>(StoreKey.enableBackup, false),;const Setting(this.storeKey, this.defaultValue);diff --git a/mobile/lib/widgets/common/immich_sliver_app_bar.dart b/mobile/lib/widgets/common/immich_sliver_app_bar.dartindex 9f84b7cd7f..18f29b9f9d 100644--- a/mobile/lib/widgets/common/immich_sliver_app_bar.dart+++ b/mobile/lib/widgets/common/immich_sliver_app_bar.dart@@ -4,11 +4,12 @@ import 'package:flutter/foundation.dart';import 'package:flutter/material.dart';import 'package:flutter_svg/svg.dart';import 'package:hooks_riverpod/hooks_riverpod.dart';+import 'package:immich_mobile/domain/models/setting.model.dart';import 'package:immich_mobile/extensions/build_context_extensions.dart';-import 'package:immich_mobile/models/backup/backup_state.model.dart';import 'package:immich_mobile/models/server_info/server_info.model.dart';-import 'package:immich_mobile/providers/backup/backup.provider.dart';+import 'package:immich_mobile/providers/backup/drift_backup.provider.dart';import 'package:immich_mobile/providers/cast.provider.dart';+import 'package:immich_mobile/providers/infrastructure/setting.provider.dart';import 'package:immich_mobile/providers/server_info.provider.dart';import 'package:immich_mobile/providers/sync_status.provider.dart';import 'package:immich_mobile/providers/timeline/multiselect.provider.dart';@@ -238,43 +239,50 @@ class _BackupIndicator extends ConsumerWidget {}Widget? _getBackupBadgeIcon(BuildContext context, WidgetRef ref) {- final BackUpState backupState = ref.watch(backupProvider);- final bool isEnableAutoBackup = backupState.backgroundBackup || backupState.autoBackup;+ final backupStateStream = ref.watch(settingsProvider).watch(Setting.enableBackup);final isDarkTheme = context.isDarkTheme;final iconColor = isDarkTheme ? Colors.white : Colors.black;+ final isUploading = ref.watch(driftBackupProvider.select((state) => state.uploadItems.isNotEmpty));++ return StreamBuilder(+ stream: backupStateStream,+ initialData: false,+ builder: (ctx, snapshot) {+ final backupEnabled = snapshot.data ?? false;++ if (!backupEnabled) {+ return Icon(+ Icons.cloud_off_rounded,+ size: 9,+ color: iconColor,+ semanticLabel: 'backup_controller_page_backup'.tr(),+ );+ }++ if (isUploading) {+ return Container(+ padding: const EdgeInsets.all(3.5),+ child: Theme(+ data: context.themeData+ .copyWith(progressIndicatorTheme: context.themeData.progressIndicatorTheme.copyWith(year2023: true)),+ child: CircularProgressIndicator(+ strokeWidth: 2,+ strokeCap: StrokeCap.round,+ valueColor: AlwaysStoppedAnimation<Color>(iconColor),+ semanticsLabel: 'backup_controller_page_backup'.tr(),+ ),+ ),+ );+ }- if (isEnableAutoBackup) {- if (backupState.backupProgress == BackUpProgressEnum.inProgress) {- return Container(- padding: const EdgeInsets.all(3.5),- child: CircularProgressIndicator(- strokeWidth: 2,- strokeCap: StrokeCap.round,- valueColor: AlwaysStoppedAnimation<Color>(iconColor),- semanticsLabel: 'backup_controller_page_backup'.tr(),- ),- );- } else if (backupState.backupProgress != BackUpProgressEnum.inBackground &&- backupState.backupProgress != BackUpProgressEnum.manualInProgress) {return Icon(Icons.check_outlined,size: 9,color: iconColor,semanticLabel: 'backup_controller_page_backup'.tr(),);- }- }-- if (!isEnableAutoBackup) {- return Icon(- Icons.cloud_off_rounded,- size: 9,- color: iconColor,- semanticLabel: 'backup_controller_page_backup'.tr(),- );- }-- return null;+ },+ );}}