TerribleDev/ente
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat: upgrade deps (incomplete)

Browse Source
This commit is contained in:
Prateek Sunal
2025-06-16 12:58:13 +05:30
parent cb84164466
commit 2f4c3c7777
72 changed files with 262 additions and 233 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
mobile/lib/core/error-reporting/super_logging.dart
View File

@@ -1,5 +1,3 @@
library super_logging;
import 'dart:async';
import 'dart:collection';
import 'dart:core';

22
mobile/lib/ente_theme_data.dart
View File

@@ -206,7 +206,7 @@ TextTheme _buildTextTheme(Color textColor) {
fontWeight: FontWeight.w500,
),
bodySmall: TextStyle(
color: textColor.withOpacity(0.6),
color: textColor.withValues(alpha: 0.6),
fontSize: 14,
fontWeight: FontWeight.w500,
),
@@ -278,7 +278,7 @@ extension CustomColorScheme on ColorScheme {
: const Color.fromRGBO(48, 48, 48, 0.5);
Color get iconColor => brightness == Brightness.light
? const Color.fromRGBO(0, 0, 0, 1).withOpacity(0.75)
? const Color.fromRGBO(0, 0, 0, 1).withValues(alpha: 0.75)
: const Color.fromRGBO(255, 255, 255, 1);
Color get bgColorForQuestions => brightness == Brightness.light
@@ -289,7 +289,7 @@ extension CustomColorScheme on ColorScheme {
Color get cupertinoPickerTopColor => brightness == Brightness.light
? const Color.fromARGB(255, 238, 238, 238)
: const Color.fromRGBO(255, 255, 255, 1).withOpacity(0.1);
: const Color.fromRGBO(255, 255, 255, 1).withValues(alpha: 0.1);
Color get stepProgressUnselectedColor => brightness == Brightness.light
? const Color.fromRGBO(196, 196, 196, 0.6)
@@ -300,20 +300,20 @@ extension CustomColorScheme on ColorScheme {
: const Color.fromRGBO(20, 20, 20, 1);
Color get galleryThumbDrawColor => brightness == Brightness.light
? const Color.fromRGBO(0, 0, 0, 1).withOpacity(0.8)
: const Color.fromRGBO(255, 255, 255, 1).withOpacity(0.5);
? const Color.fromRGBO(0, 0, 0, 1).withValues(alpha: 0.8)
: const Color.fromRGBO(255, 255, 255, 1).withValues(alpha: 0.5);
Color get backupEnabledBgColor => brightness == Brightness.light
? const Color.fromRGBO(230, 230, 230, 0.95)
: const Color.fromRGBO(10, 40, 40, 0.3);
Color get dotsIndicatorActiveColor => brightness == Brightness.light
? const Color.fromRGBO(0, 0, 0, 1).withOpacity(0.5)
: const Color.fromRGBO(255, 255, 255, 1).withOpacity(0.5);
? const Color.fromRGBO(0, 0, 0, 1).withValues(alpha: 0.5)
: const Color.fromRGBO(255, 255, 255, 1).withValues(alpha: 0.5);
Color get dotsIndicatorInactiveColor => brightness == Brightness.light
? const Color.fromRGBO(0, 0, 0, 1).withOpacity(0.12)
: const Color.fromRGBO(255, 255, 255, 1).withOpacity(0.12);
? const Color.fromRGBO(0, 0, 0, 1).withValues(alpha: 0.12)
: const Color.fromRGBO(255, 255, 255, 1).withValues(alpha: 0.12);
Color get toastTextColor => brightness == Brightness.light
? const Color.fromRGBO(255, 255, 255, 1)
@@ -336,8 +336,8 @@ extension CustomColorScheme on ColorScheme {
: const Color.fromRGBO(150, 150, 150, 1);
Color get searchResultsBackgroundColor => brightness == Brightness.light
? Colors.black.withOpacity(0.32)
: Colors.black.withOpacity(0.64);
? Colors.black.withValues(alpha: 0.32)
: Colors.black.withValues(alpha: 0.64);
EnteTheme get enteTheme =>
brightness == Brightness.light ? lightTheme : darkTheme;

2
mobile/lib/module/download/manager.dart
View File

@@ -168,7 +168,7 @@ class DownloadManager {
final existingSize = await baseFile.length();
if (existingSize == task.totalBytes) {
_logger.info(
'Download already exists for ${task.filename} (${existingSize}/${task.totalBytes} bytes)',
'Download already exists for ${task.filename} ($existingSize/${task.totalBytes} bytes)',
);
task = task.copyWith(
status: DownloadStatus.completed,

2
mobile/lib/services/machine_learning/face_ml/feedback/cluster_feedback.dart
View File

@@ -57,7 +57,7 @@ class ClusterFeedbackService<T> {
/// 1. clusterID: the ID of the cluster
/// 2. distance: the distance between the person's cluster and the suggestion
/// 3. bool: whether the suggestion was found using the mean (true) or the median (false)
/// 4. List<EnteFile>: the files in the cluster
/// 4. `List<EnteFile>`: the files in the cluster
Future<List<ClusterSuggestion>> getSuggestionForPerson(
PersonEntity person, {
bool extremeFilesFirst = true,

6
mobile/lib/ui/account/recovery_key_page.dart
View File

@@ -249,7 +249,11 @@ class _RecoveryKeyPageState extends State<RecoveryKeyPage> {
}
_recoveryKeyFile.writeAsStringSync(recoveryKey);
await Share.shareXFiles([XFile(_recoveryKeyFile.path)]);
await SharePlus.instance.share(
ShareParams(
files: [XFile(_recoveryKeyFile.path)],
),
);
Future.delayed(const Duration(milliseconds: 500), () {
if (mounted) {
setState(() {

4
mobile/lib/ui/account/sessions_page.dart
View File

@@ -83,7 +83,7 @@ class _SessionsPageState extends State<SessionsPage> {
color: Theme.of(context)
.colorScheme
.onSurface
.withOpacity(0.8),
.withValues(alpha: 0.8),
fontSize: 14,
),
),
@@ -96,7 +96,7 @@ class _SessionsPageState extends State<SessionsPage> {
color: Theme.of(context)
.colorScheme
.onSurface
.withOpacity(0.8),
.withValues(alpha: 0.8),
fontSize: 12,
),
),

5
mobile/lib/ui/account/two_factor_recovery_page.dart
View File

@@ -101,8 +101,9 @@ class _TwoFactorRecoveryPageState extends State<TwoFactorRecoveryPage> {
style: TextStyle(
decoration: TextDecoration.underline,
fontSize: 12,
color:
getEnteColorScheme(context).textBase.withOpacity(0.9),
color: getEnteColorScheme(context)
.textBase
.withValues(alpha: 0.9),
),
),
),

6
mobile/lib/ui/account/two_factor_setup_page.dart
View File

@@ -160,14 +160,14 @@ class _TwoFactorSetupPageState extends State<TwoFactorSetupPage>
padding: const EdgeInsets.only(left: 10, right: 10),
child: Container(
padding: const EdgeInsets.all(16),
color: textColor.withOpacity(0.1),
color: textColor.withValues(alpha: 0.1),
child: Center(
child: Text(
widget.secretCode,
style: TextStyle(
fontSize: 15,
fontFeatures: const [FontFeature.tabularFigures()],
color: textColor.withOpacity(0.7),
color: textColor.withValues(alpha: 0.7),
),
),
),
@@ -176,7 +176,7 @@ class _TwoFactorSetupPageState extends State<TwoFactorSetupPage>
const Padding(padding: EdgeInsets.all(6)),
Text(
S.of(context).tapToCopy,
style: TextStyle(color: textColor.withOpacity(0.5)),
style: TextStyle(color: textColor.withValues(alpha: 0.5)),
),
],
),

4
mobile/lib/ui/collections/album/row_item.dart
View File

@@ -97,8 +97,8 @@ class AlbumRowItemWidget extends StatelessWidget {
child: isSelected
? ColorFiltered(
colorFilter: ColorFilter.mode(
Colors.black.withOpacity(
0.4,
Colors.black.withValues(
alpha: 0.4,
),
BlendMode.darken,
),

2
mobile/lib/ui/collections/button/archived_button.dart
View File

@@ -28,7 +28,7 @@ class ArchivedCollectionsButton extends StatelessWidget {
padding: const EdgeInsets.all(0),
side: BorderSide(
width: 0.5,
color: Theme.of(context).iconTheme.color!.withOpacity(0.24),
color: Theme.of(context).iconTheme.color!.withValues(alpha: 0.24),
),
),
child: SizedBox(

2
mobile/lib/ui/collections/button/hidden_button.dart
View File

@@ -23,7 +23,7 @@ class HiddenCollectionsButtonWidget extends StatelessWidget {
padding: const EdgeInsets.all(0),
side: BorderSide(
width: 0.5,
color: Theme.of(context).iconTheme.color!.withOpacity(0.24),
color: Theme.of(context).iconTheme.color!.withValues(alpha: 0.24),
),
),
child: SizedBox(

2
mobile/lib/ui/collections/button/trash_button.dart
View File

@@ -52,7 +52,7 @@ class _TrashSectionButtonState extends State<TrashSectionButton> {
padding: const EdgeInsets.all(0),
side: BorderSide(
width: 0.5,
color: Theme.of(context).iconTheme.color!.withOpacity(0.24),
color: Theme.of(context).iconTheme.color!.withValues(alpha: 0.24),
),
),
child: SizedBox(

2
mobile/lib/ui/collections/button/uncategorized_button.dart
View File

@@ -33,7 +33,7 @@ class UnCategorizedCollections extends StatelessWidget {
padding: const EdgeInsets.all(0),
side: BorderSide(
width: 0.5,
color: Theme.of(context).iconTheme.color!.withOpacity(0.24),
color: Theme.of(context).iconTheme.color!.withValues(alpha: 0.24),
),
),
child: SizedBox(

2
mobile/lib/ui/components/notification_widget.dart
View File

@@ -60,7 +60,7 @@ class NotificationWidget extends StatelessWidget {
subTextStyle = textTheme.miniMuted;
strokeColorScheme = colorScheme;
boxShadow = [
BoxShadow(color: Colors.black.withOpacity(0.25), blurRadius: 1),
BoxShadow(color: Colors.black.withValues(alpha: 0.25), blurRadius: 1),
];
break;
case NotificationType.goldenBanner:

2
mobile/lib/ui/home/grant_permissions_widget.dart
View File

@@ -44,7 +44,7 @@ class _GrantPermissionsWidgetState extends State<GrantPermissionsWidget> {
isLightMode
? Image.asset(
'assets/loading_photos_background.png',
color: Colors.white.withOpacity(0.4),
color: Colors.white.withValues(alpha: 0.4),
colorBlendMode: BlendMode.modulate,
)
: Image.asset(

5
mobile/lib/ui/home/landing_page_widget.dart
View File

@@ -350,7 +350,10 @@ class FeatureItemWidget extends StatelessWidget {
subText,
textAlign: TextAlign.center,
style: TextStyle(
color: Theme.of(context).colorScheme.onSurface.withOpacity(0.5),
color: Theme.of(context)
.colorScheme
.onSurface
.withValues(alpha: 0.5),
fontSize: 16,
),
),

4
mobile/lib/ui/home/loading_photos_widget.dart
View File

@@ -124,12 +124,12 @@ class _LoadingPhotosWidgetState extends State<LoadingPhotosWidget> {
isLightMode
? Image.asset(
'assets/loading_photos_background.png',
color: Colors.white.withOpacity(0.5),
color: Colors.white.withValues(alpha: 0.5),
colorBlendMode: BlendMode.modulate,
)
: Image.asset(
'assets/loading_photos_background_dark.png',
color: Colors.white.withOpacity(0.25),
color: Colors.white.withValues(alpha: 0.25),
colorBlendMode: BlendMode.modulate,
),
Column(

8
mobile/lib/ui/home/memories/full_screen_memory.dart
View File

@@ -185,7 +185,7 @@ class _FullScreenMemoryState extends State<FullScreenMemory> {
currentStep: value + 1,
size: 2,
selectedColor: Colors.white, //same for both themes
unselectedColor: Colors.white.withOpacity(0.4),
unselectedColor: Colors.white.withValues(alpha: 0.4),
)
: const SizedBox.shrink(),
const SizedBox(
@@ -217,8 +217,8 @@ class _FullScreenMemoryState extends State<FullScreenMemory> {
begin: Alignment.topCenter,
end: Alignment.bottomCenter,
colors: [
Colors.black.withOpacity(0.6),
Colors.black.withOpacity(0.5),
Colors.black.withValues(alpha: 0.6),
Colors.black.withValues(alpha: 0.5),
Colors.transparent,
],
stops: const [0, 0.6, 1],
@@ -440,7 +440,7 @@ class BottomGradient extends StatelessWidget {
begin: Alignment.bottomCenter,
end: Alignment.topCenter,
colors: [
Colors.black.withOpacity(0.5), //same for both themes
Colors.black.withValues(alpha: 0.5), //same for both themes
Colors.transparent,
],
stops: const [0, 0.8],

4
mobile/lib/ui/home/memories/memory_cover_widget.dart
View File

@@ -112,7 +112,7 @@ class _MemoryCoverWidgetState extends State<MemoryCoverWidget> {
decoration: BoxDecoration(
gradient: LinearGradient(
colors: [
Colors.black.withOpacity(0.5),
Colors.black.withValues(alpha: 0.5),
Colors.transparent,
],
stops: const [0, 1],
@@ -163,7 +163,7 @@ class _MemoryCoverWidgetState extends State<MemoryCoverWidget> {
decoration: BoxDecoration(
gradient: LinearGradient(
colors: [
Colors.black.withOpacity(0.5),
Colors.black.withValues(alpha: 0.5),
Colors.transparent,
],
stops: const [0, 1],

2
mobile/lib/ui/map/map_view.dart
View File

@@ -96,7 +96,7 @@ class _MapViewState extends State<MapView> {
),
),
onPositionChanged: (position, hasGesture) {
if (position.bounds != null) {
if (position.pixelBounds != null) {
onChange(position.bounds!);
}
},

3
mobile/lib/ui/payment/payment_web_page.dart
View File

@@ -1,6 +1,5 @@
import 'dart:io';
import 'package:collection/collection.dart' show IterableNullableExtension;
import 'package:flutter/foundation.dart';
import 'package:flutter/material.dart';
import 'package:flutter_inappwebview/flutter_inappwebview.dart';
@@ -110,7 +109,7 @@ class _PaymentWebPageState extends State<PaymentWebPage> {
},
),
),
].whereNotNull().toList(),
].nonNulls.toList(),
),
),
);

2
mobile/lib/ui/payment/subscription_plan_widget.dart
View File

@@ -60,7 +60,7 @@ class _SubscriptionPlanWidgetState extends State<SubscriptionPlanWidget> {
: null,
boxShadow: [
BoxShadow(
color: Colors.black.withOpacity(0.08),
color: Colors.black.withValues(alpha: 0.08),
offset: const Offset(0, 4),
blurRadius: 4,
),

2
mobile/lib/ui/settings/about_section_widget.dart
View File

@@ -77,7 +77,7 @@ class AboutSectionWidget extends StatelessWidget {
updateService.getLatestVersionInfo(),
);
},
barrierColor: Colors.black.withOpacity(0.85),
barrierColor: Colors.black.withValues(alpha: 0.85),
);
} else {
showShortToast(

2
mobile/lib/ui/settings/account_section_widget.dart
View File

@@ -71,7 +71,7 @@ class AccountSectionWidget extends StatelessWidget {
builder: (BuildContext context) {
return const ChangeEmailDialog();
},
barrierColor: Colors.black.withOpacity(0.85),
barrierColor: Colors.black.withValues(alpha: 0.85),
barrierDismissible: false,
);
}

9
mobile/lib/ui/settings/backup/backup_folder_selection_page.dart
View File

@@ -271,8 +271,11 @@ class _BackupFolderSelectionPageState extends State<BackupFolderSelectionPage> {
final t = dragAnimation.value;
final elevation = lerpDouble(0, 8, t)!;
final themeColor = Theme.of(context).colorScheme.onSurface;
final color =
Color.lerp(themeColor, themeColor.withOpacity(0.8), t);
final color = Color.lerp(
themeColor,
themeColor.withValues(alpha: 0.8),
t,
);
return SizeFadeTransition(
sizeFraction: 0.7,
curve: Curves.easeInOut,
@@ -359,7 +362,7 @@ class _BackupFolderSelectionPageState extends State<BackupFolderSelectionPage> {
: Theme.of(context)
.colorScheme
.onSurface
.withOpacity(0.7),
.withValues(alpha: 0.7),
),
overflow: TextOverflow.ellipsis,
maxLines: 2,

2
mobile/lib/ui/settings/backup/backup_item_card.dart
View File

@@ -77,7 +77,7 @@ class _BackupItemCardState extends State<BackupItemCard> {
decoration: BoxDecoration(
borderRadius: BorderRadius.circular(4),
border: Border.all(
color: colorScheme.fillFaint.withOpacity(0.08),
color: colorScheme.fillFaint.withValues(alpha: 0.08),
width: 1,
),
),

4
mobile/lib/ui/settings/backup/backup_status_screen.dart
View File

@@ -138,8 +138,8 @@ class _BackupStatusScreenState extends State<BackupStatusScreen> {
fontSize: 16,
height: 20 / 16,
color: Theme.of(context).brightness == Brightness.light
? const Color(0xFF000000).withOpacity(0.7)
: const Color(0xFFFFFFFF).withOpacity(0.7),
? const Color(0xFF000000).withValues(alpha: 0.7)
: const Color(0xFFFFFFFF).withValues(alpha: 0.7),
),
),
const SizedBox(height: 48),

8
mobile/lib/ui/settings/lock_screen/lock_screen_confirm_password.dart
View File

@@ -117,10 +117,10 @@ class _LockScreenConfirmPasswordState extends State<LockScreenConfirmPassword> {
shape: BoxShape.circle,
gradient: LinearGradient(
colors: [
Colors.grey.shade500.withOpacity(0.2),
Colors.grey.shade50.withOpacity(0.1),
Colors.grey.shade400.withOpacity(0.2),
Colors.grey.shade300.withOpacity(0.4),
Colors.grey.shade500.withValues(alpha: 0.2),
Colors.grey.shade50.withValues(alpha: 0.1),
Colors.grey.shade400.withValues(alpha: 0.2),
Colors.grey.shade300.withValues(alpha: 0.4),
],
begin: Alignment.topCenter,
end: Alignment.bottomCenter,

8
mobile/lib/ui/settings/lock_screen/lock_screen_confirm_pin.dart
View File

@@ -101,10 +101,10 @@ class _LockScreenConfirmPinState extends State<LockScreenConfirmPin> {
shape: BoxShape.circle,
gradient: LinearGradient(
colors: [
Colors.grey.shade500.withOpacity(0.2),
Colors.grey.shade50.withOpacity(0.1),
Colors.grey.shade400.withOpacity(0.2),
Colors.grey.shade300.withOpacity(0.4),
Colors.grey.shade500.withValues(alpha: 0.2),
Colors.grey.shade50.withValues(alpha: 0.1),
Colors.grey.shade400.withValues(alpha: 0.2),
Colors.grey.shade300.withValues(alpha: 0.4),
],
begin: Alignment.topCenter,
end: Alignment.bottomCenter,

8
mobile/lib/ui/settings/lock_screen/lock_screen_password.dart
View File

@@ -127,10 +127,10 @@ class _LockScreenPasswordState extends State<LockScreenPassword> {
shape: BoxShape.circle,
gradient: LinearGradient(
colors: [
Colors.grey.shade500.withOpacity(0.2),
Colors.grey.shade50.withOpacity(0.1),
Colors.grey.shade400.withOpacity(0.2),
Colors.grey.shade300.withOpacity(0.4),
Colors.grey.shade500.withValues(alpha: 0.2),
Colors.grey.shade50.withValues(alpha: 0.1),
Colors.grey.shade400.withValues(alpha: 0.2),
Colors.grey.shade300.withValues(alpha: 0.4),
],
begin: Alignment.topCenter,
end: Alignment.bottomCenter,

8
mobile/lib/ui/settings/lock_screen/lock_screen_pin.dart
View File

@@ -178,10 +178,10 @@ class _LockScreenPinState extends State<LockScreenPin> {
shape: BoxShape.circle,
gradient: LinearGradient(
colors: [
Colors.grey.shade500.withOpacity(0.2),
Colors.grey.shade50.withOpacity(0.1),
Colors.grey.shade400.withOpacity(0.2),
Colors.grey.shade300.withOpacity(0.4),
Colors.grey.shade500.withValues(alpha: 0.2),
Colors.grey.shade50.withValues(alpha: 0.1),
Colors.grey.shade400.withValues(alpha: 0.2),
Colors.grey.shade300.withValues(alpha: 0.4),
],
begin: Alignment.topCenter,
end: Alignment.bottomCenter,

15
mobile/lib/ui/settings/widget_settings_screen.dart
View File

@@ -87,7 +87,10 @@ class WidgetSettingsScreen extends StatelessWidget {
),
leadingIconWidget: SvgPicture.asset(
"assets/icons/people-widget-icon.svg",
color: colorScheme.textBase,
colorFilter: ColorFilter.mode(
colorScheme.textBase,
BlendMode.srcIn,
),
),
menuItemColor: colorScheme.fillFaint,
singleBorderRadius: 8,
@@ -101,7 +104,10 @@ class WidgetSettingsScreen extends StatelessWidget {
),
leadingIconWidget: SvgPicture.asset(
"assets/icons/albums-widget-icon.svg",
color: colorScheme.textBase,
colorFilter: ColorFilter.mode(
colorScheme.textBase,
BlendMode.srcIn,
),
),
menuItemColor: colorScheme.fillFaint,
singleBorderRadius: 8,
@@ -115,7 +121,10 @@ class WidgetSettingsScreen extends StatelessWidget {
),
leadingIconWidget: SvgPicture.asset(
"assets/icons/memories-widget-icon.svg",
color: colorScheme.textBase,
colorFilter: ColorFilter.mode(
colorScheme.textBase,
BlendMode.srcIn,
),
),
menuItemColor: colorScheme.fillFaint,
singleBorderRadius: 8,

15
mobile/lib/ui/settings/widgets/memories_widget_settings.dart
View File

@@ -151,7 +151,10 @@ class _MemoriesWidgetSettingsState extends State<MemoriesWidgetSettings> {
),
leadingIconWidget: SvgPicture.asset(
"assets/icons/past-year-memory-icon.svg",
color: colorScheme.textBase,
colorFilter: ColorFilter.mode(
colorScheme.textBase,
BlendMode.srcIn,
),
),
menuItemColor: colorScheme.fillFaint,
trailingWidget: ToggleSwitchWidget(
@@ -174,7 +177,10 @@ class _MemoriesWidgetSettingsState extends State<MemoriesWidgetSettings> {
),
leadingIconWidget: SvgPicture.asset(
"assets/icons/memories-widget-icon.svg",
color: colorScheme.textBase,
colorFilter: ColorFilter.mode(
colorScheme.textBase,
BlendMode.srcIn,
),
),
menuItemColor: colorScheme.fillFaint,
trailingWidget: ToggleSwitchWidget(
@@ -198,7 +204,10 @@ class _MemoriesWidgetSettingsState extends State<MemoriesWidgetSettings> {
),
leadingIconWidget: SvgPicture.asset(
"assets/icons/smart-memory-icon.svg",
color: colorScheme.textBase,
colorFilter: ColorFilter.mode(
colorScheme.textBase,
BlendMode.srcIn,
),
),
menuItemColor: colorScheme.fillFaint,
trailingWidget: ToggleSwitchWidget(

2
mobile/lib/ui/tabs/home_widget.dart
View File

@@ -231,7 +231,7 @@ class _HomeWidgetState extends State<HomeWidget> {
updateService.getLatestVersionInfo(),
);
},
barrierColor: Colors.black.withOpacity(0.85),
barrierColor: Colors.black.withValues(alpha: 0.85),
);
updateService.resetUpdateAvailableShownTime();
}

4
mobile/lib/ui/tabs/nav_bar.dart
View File

@@ -1,5 +1,3 @@
library google_nav_bar;
import 'package:flutter/material.dart';
import 'package:flutter/services.dart';
import "package:photos/theme/effects.dart";
@@ -340,7 +338,7 @@ class _ButtonState extends State<Button> with TickerProviderStateMixin {
: widget.border,
gradient: widget.gradient,
color: _expanded!
? widget.color!.withOpacity(0)
? widget.color!.withValues(alpha: 0)
: widget.debug!
? Colors.red
: widget.gradient != null

2
mobile/lib/ui/tabs/user_collections_tab.dart
View File

@@ -124,7 +124,7 @@ class _UserCollectionsTabState extends State<UserCollectionsTab>
.textTheme
.titleMedium!
.color!
.withOpacity(0.5),
.withValues(alpha: 0.5),
);
return Stack(

4
mobile/lib/ui/tools/deduplicate_page.dart
View File

@@ -204,7 +204,7 @@ class _DeduplicatePageState extends State<DeduplicatePage> {
text,
style: Theme.of(context).textTheme.titleMedium!.copyWith(
fontSize: 14,
color: Theme.of(context).iconTheme.color!.withOpacity(0.7),
color: Theme.of(context).iconTheme.color!.withValues(alpha: 0.7),
),
);
}
@@ -303,7 +303,7 @@ class _DeduplicatePageState extends State<DeduplicatePage> {
color: Theme.of(context)
.colorScheme
.inverseTextColor
.withOpacity(0.7),
.withValues(alpha: 0.7),
fontSize: 12,
),
),

4
mobile/lib/ui/tools/editor/export_video_result.dart
View File

@@ -168,7 +168,7 @@ class FileDescription extends StatelessWidget {
child: Container(
width: MediaQuery.of(context).size.width - 60,
padding: const EdgeInsets.all(10),
color: Colors.black.withOpacity(0.5),
color: Colors.black.withValues(alpha: 0.5),
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: description.entries
@@ -184,7 +184,7 @@ class FileDescription extends StatelessWidget {
text: entry.value,
style: TextStyle(
fontSize: 10,
color: Colors.white.withOpacity(0.8),
color: Colors.white.withValues(alpha: 0.8),
),
),
],

21
mobile/lib/ui/tools/editor/image_editor_page.dart
View File

@@ -179,7 +179,8 @@ class _ImageEditorPageState extends State<ImageEditorPage> {
padding: const EdgeInsets.only(bottom: 2),
child: Icon(
Icons.flip,
color: Theme.of(context).iconTheme.color!.withOpacity(0.8),
color:
Theme.of(context).iconTheme.color!.withValues(alpha: 0.8),
size: 20,
),
),
@@ -187,7 +188,7 @@ class _ImageEditorPageState extends State<ImageEditorPage> {
Text(
S.of(context).flip,
style: subtitle2.copyWith(
color: subtitle2.color!.withOpacity(0.8),
color: subtitle2.color!.withValues(alpha: 0.8),
),
textAlign: TextAlign.center,
),
@@ -211,13 +212,13 @@ class _ImageEditorPageState extends State<ImageEditorPage> {
children: [
Icon(
Icons.rotate_left,
color: Theme.of(context).iconTheme.color!.withOpacity(0.8),
color: Theme.of(context).iconTheme.color!.withValues(alpha: 0.8),
),
const Padding(padding: EdgeInsets.all(2)),
Text(
S.of(context).rotateLeft,
style: subtitle2.copyWith(
color: subtitle2.color!.withOpacity(0.8),
color: subtitle2.color!.withValues(alpha: 0.8),
),
textAlign: TextAlign.center,
),
@@ -241,13 +242,13 @@ class _ImageEditorPageState extends State<ImageEditorPage> {
children: [
Icon(
Icons.rotate_right,
color: Theme.of(context).iconTheme.color!.withOpacity(0.8),
color: Theme.of(context).iconTheme.color!.withValues(alpha: 0.8),
),
const Padding(padding: EdgeInsets.all(2)),
Text(
S.of(context).rotateRight,
style: subtitle2.copyWith(
color: subtitle2.color!.withOpacity(0.8),
color: subtitle2.color!.withValues(alpha: 0.8),
),
textAlign: TextAlign.center,
),
@@ -271,13 +272,13 @@ class _ImageEditorPageState extends State<ImageEditorPage> {
children: [
Icon(
Icons.save_alt_outlined,
color: Theme.of(context).iconTheme.color!.withOpacity(0.8),
color: Theme.of(context).iconTheme.color!.withValues(alpha: 0.8),
),
const Padding(padding: EdgeInsets.all(2)),
Text(
S.of(context).saveCopy,
style: subtitle2.copyWith(
color: subtitle2.color!.withOpacity(0.8),
color: subtitle2.color!.withValues(alpha: 0.8),
),
textAlign: TextAlign.center,
),
@@ -436,7 +437,7 @@ class _ImageEditorPageState extends State<ImageEditorPage> {
child: Text(
S.of(context).color,
style: subtitle2.copyWith(
color: subtitle2.color!.withOpacity(0.8),
color: subtitle2.color!.withValues(alpha: 0.8),
),
),
),
@@ -486,7 +487,7 @@ class _ImageEditorPageState extends State<ImageEditorPage> {
child: Text(
S.of(context).light,
style: subtitle2.copyWith(
color: subtitle2.color!.withOpacity(0.8),
color: subtitle2.color!.withValues(alpha: 0.8),
),
),
),

2
mobile/lib/ui/tools/editor/video_editor_page.dart
View File

@@ -80,7 +80,7 @@ class _VideoEditorPageState extends State<VideoEditorPage> {
lineColor: Theme.of(context)
.colorScheme
.videoPlayerBorderColor
.withOpacity(0.6),
.withValues(alpha: 0.6),
),
);

6
mobile/lib/ui/tools/free_space_page.dart
View File

@@ -56,7 +56,7 @@ class _FreeSpacePageState extends State<FreeSpacePage> {
final informationTextStyle = TextStyle(
fontSize: 14,
height: 1.3,
color: Theme.of(context).colorScheme.onSurface.withOpacity(0.8),
color: Theme.of(context).colorScheme.onSurface.withValues(alpha: 0.8),
fontWeight: FontWeight.w500,
);
final isLightMode = Theme.of(context).brightness == Brightness.light;
@@ -71,12 +71,12 @@ class _FreeSpacePageState extends State<FreeSpacePage> {
isLightMode
? Image.asset(
'assets/loading_photos_background.png',
color: Colors.white.withOpacity(0.4),
color: Colors.white.withValues(alpha: 0.4),
colorBlendMode: BlendMode.modulate,
)
: Image.asset(
'assets/loading_photos_background_dark.png',
color: Colors.white.withOpacity(0.25),
color: Colors.white.withValues(alpha: 0.25),
),
Padding(
padding: const EdgeInsets.only(top: 16),

8
mobile/lib/ui/tools/lock_screen.dart
View File

@@ -103,10 +103,10 @@ class _LockScreenState extends State<LockScreen>
shape: BoxShape.circle,
gradient: LinearGradient(
colors: [
Colors.grey.shade500.withOpacity(0.2),
Colors.grey.shade50.withOpacity(0.1),
Colors.grey.shade400.withOpacity(0.2),
Colors.grey.shade300.withOpacity(0.4),
Colors.grey.shade500.withValues(alpha: 0.2),
Colors.grey.shade50.withValues(alpha: 0.1),
Colors.grey.shade400.withValues(alpha: 0.2),
Colors.grey.shade300.withValues(alpha: 0.4),
],
begin: Alignment.topCenter,
end: Alignment.bottomCenter,

2
mobile/lib/ui/viewer/actions/album_selection_overlay_bar.dart
View File

@@ -142,7 +142,7 @@ class _SelectAllAlbumsButtonState extends State<SelectAllAlbumsButton> {
borderRadius: BorderRadius.circular(16),
boxShadow: [
BoxShadow(
color: Colors.black.withOpacity(0.1),
color: Colors.black.withValues(alpha: 0.1),
blurRadius: 4,
offset: const Offset(0, -1),
),

1
mobile/lib/ui/viewer/actions/file_selection_actions_widget.dart
View File

@@ -1,7 +1,6 @@
import "dart:async";
import 'package:fast_base58/fast_base58.dart';
import "package:flutter/cupertino.dart";
import 'package:flutter/material.dart';
import 'package:flutter/services.dart';
import "package:local_auth/local_auth.dart";

2
mobile/lib/ui/viewer/actions/file_selection_overlay_bar.dart
View File

@@ -253,7 +253,7 @@ class _SelectAllButtonState extends State<SelectAllButton> {
borderRadius: BorderRadius.circular(16),
boxShadow: [
BoxShadow(
color: Colors.black.withOpacity(0.1),
color: Colors.black.withValues(alpha: 0.1),
blurRadius: 4,
offset: const Offset(0, -1),
),

5
mobile/lib/ui/viewer/file/exif_info_dialog.dart
View File

@@ -1,4 +1,3 @@
import 'package:flutter/material.dart';
import "package:photos/generated/l10n.dart";
import 'package:photos/models/file/file.dart';
@@ -61,7 +60,7 @@ class ExifInfoDialog extends StatelessWidget {
}
return Container(
padding: const EdgeInsets.all(2),
color: Colors.white.withOpacity(0.05),
color: Colors.white.withValues(alpha: 0.05),
child: Center(
child: Padding(
padding: const EdgeInsets.all(4),
@@ -76,7 +75,7 @@ class ExifInfoDialog extends StatelessWidget {
color: Theme.of(context)
.colorScheme
.onSurface
.withOpacity(0.7),
.withValues(alpha: 0.7),
),
),
),

4
mobile/lib/ui/viewer/file/file_app_bar.dart
View File

@@ -115,8 +115,8 @@ class FileAppBarState extends State<FileAppBar> {
begin: Alignment.topCenter,
end: Alignment.bottomCenter,
colors: [
Colors.black.withOpacity(0.72),
Colors.black.withOpacity(0.6),
Colors.black.withValues(alpha: 0.72),
Colors.black.withValues(alpha: 0.6),
Colors.transparent,
],
stops: const [0, 0.2, 1],

4
mobile/lib/ui/viewer/file/file_bottom_bar.dart
View File

@@ -192,8 +192,8 @@ class FileBottomBarState extends State<FileBottomBar> {
end: Alignment.bottomCenter,
colors: [
Colors.transparent,
Colors.black.withOpacity(0.6),
Colors.black.withOpacity(0.72),
Colors.black.withValues(alpha: 0.6),
Colors.black.withValues(alpha: 0.72),
],
stops: const [0, 0.8, 1],
),

4
mobile/lib/ui/viewer/file/file_icons_widget.dart
View File

@@ -173,7 +173,7 @@ class VideoOverlayDuration extends StatelessWidget {
padding: EdgeInsets.only(bottom: inset, right: inset),
child: Container(
decoration: BoxDecoration(
color: Colors.black.withOpacity(0.3),
color: Colors.black.withValues(alpha: 0.3),
borderRadius: iconFallback ? null : BorderRadius.circular(8.0),
shape: iconFallback ? BoxShape.circle : BoxShape.rectangle,
),
@@ -256,7 +256,7 @@ class FileOverlayText extends StatelessWidget {
gradient: LinearGradient(
begin: Alignment.bottomCenter,
end: Alignment.topCenter,
colors: [Colors.black.withOpacity(0.33), Colors.transparent],
colors: [Colors.black.withValues(alpha: 0.33), Colors.transparent],
),
),
alignment: Alignment.bottomCenter,

2
mobile/lib/ui/viewer/file/native_video_player_controls/play_pause_button.dart
View File

@@ -53,7 +53,7 @@ class _PlayPauseButtonState extends State<PlayPauseButton> {
width: 54,
height: 54,
decoration: BoxDecoration(
color: Colors.black.withOpacity(0.3),
color: Colors.black.withValues(alpha: 0.3),
shape: BoxShape.circle,
border: Border.all(
color: strokeFaintDark,

2
mobile/lib/ui/viewer/file/video_widget.dart
View File

@@ -125,7 +125,7 @@ class _VideoWidgetState extends State<VideoWidget> {
padding: const EdgeInsets.all(8),
decoration: BoxDecoration(
borderRadius: BorderRadius.circular(24),
color: Colors.black.withOpacity(0.3),
color: Colors.black.withValues(alpha: 0.3),
border: Border.all(
color: strokeFaintDark,
width: 1,

4
mobile/lib/ui/viewer/file/video_widget_media_kit_common.dart
View File

@@ -217,7 +217,7 @@ class _PlayPauseButtonState extends State<PlayPauseButtonMediaKit> {
width: 54,
height: 54,
decoration: BoxDecoration(
color: Colors.black.withOpacity(0.3),
color: Colors.black.withValues(alpha: 0.3),
shape: BoxShape.circle,
border: Border.all(
color: strokeFaintDark,
@@ -276,7 +276,7 @@ class SeekBarAndDuration extends StatelessWidget {
4,
),
decoration: BoxDecoration(
color: Colors.black.withOpacity(0.3),
color: Colors.black.withValues(alpha: 0.3),
borderRadius: const BorderRadius.all(
Radius.circular(8),
),

8
mobile/lib/ui/viewer/file/video_widget_native.dart
View File

@@ -608,7 +608,7 @@ class _VideoWidgetNativeState extends State<VideoWidgetNative>
padding: const EdgeInsets.all(8),
decoration: BoxDecoration(
borderRadius: BorderRadius.circular(24),
color: Colors.black.withOpacity(0.3),
color: Colors.black.withValues(alpha: 0.3),
border: Border.all(
color: strokeFaintDark,
width: 1,
@@ -764,7 +764,7 @@ class _SeekBarAndDuration extends StatelessWidget {
4,
),
decoration: BoxDecoration(
color: Colors.black.withOpacity(0.3),
color: Colors.black.withValues(alpha: 0.3),
borderRadius: const BorderRadius.all(
Radius.circular(8),
),
@@ -918,12 +918,12 @@ class _VideoDescriptionAndSwitchToMediaKitButton extends StatelessWidget {
Icon(
Icons.play_arrow_outlined,
size: 24,
color: Colors.white.withOpacity(0.2),
color: Colors.white.withValues(alpha: 0.2),
),
Icon(
Icons.question_mark_rounded,
size: 10,
color: Colors.white.withOpacity(0.2),
color: Colors.white.withValues(alpha: 0.2),
),
],
),

2
mobile/lib/ui/viewer/file/zoomable_image.dart
View File

@@ -213,7 +213,7 @@ class _ZoomableImageState extends State<ZoomableImage> {
showDetailsSheet(context, widget.photo);
},
child: Container(
color: Colors.black.withOpacity(0.1),
color: Colors.black.withValues(alpha: 0.1),
width: double.infinity,
child: Row(
mainAxisAlignment: MainAxisAlignment.center,

2
mobile/lib/ui/viewer/file_details/location_tags_widget.dart
View File

@@ -287,7 +287,7 @@ class _InfoMapState extends State<InfoMap> {
child: Container(
color: getEnteColorScheme(context)
.backgroundElevated
.withOpacity(0.5),
.withValues(alpha: 0.5),
),
),
Container(

10
mobile/lib/ui/viewer/gallery/collect_photos_card_widget.dart
View File

@@ -30,8 +30,8 @@ class _CollectPhotosCardWidgetState extends State<CollectPhotosCardWidget> {
decoration: ShapeDecoration(
gradient: LinearGradient(
colors: [
colorTheme.primary700.withOpacity(0.9),
colorTheme.backdropBase.withOpacity(0.6),
colorTheme.primary700.withValues(alpha: 0.9),
colorTheme.backdropBase.withValues(alpha: 0.6),
colorTheme.backdropBase,
],
begin: Alignment.bottomLeft,
@@ -55,7 +55,7 @@ class _CollectPhotosCardWidgetState extends State<CollectPhotosCardWidget> {
color: colorTheme.backgroundElevated,
shadows: [
BoxShadow(
color: colorTheme.textBase.withOpacity(0.1),
color: colorTheme.textBase.withValues(alpha: 0.1),
blurRadius: 4.0,
offset: const Offset(0, 1),
),
@@ -118,8 +118,8 @@ class _CollectPhotosCardWidgetState extends State<CollectPhotosCardWidget> {
const BorderRadius.only(bottomLeft: Radius.circular(10)),
gradient: LinearGradient(
colors: [
colorTheme.primary700.withOpacity(0.4),
colorTheme.backgroundElevated.withOpacity(0.6),
colorTheme.primary700.withValues(alpha: 0.4),
colorTheme.backgroundElevated.withValues(alpha: 0.6),
colorTheme.backgroundElevated,
],
begin: Alignment.bottomLeft,

4
mobile/lib/ui/viewer/gallery/component/gallery_file_widget.dart
View File

@@ -87,8 +87,8 @@ class GalleryFileWidget extends StatelessWidget {
child: isFileSelected
? ColorFiltered(
colorFilter: ColorFilter.mode(
Colors.black.withOpacity(
0.4,
Colors.black.withValues(
alpha: 0.4,
),
BlendMode.darken,
),

2
mobile/lib/ui/viewer/gallery/empty_state.dart
View File

@@ -19,7 +19,7 @@ class EmptyState extends StatelessWidget {
color: Theme.of(context)
.colorScheme
.defaultTextColor
.withOpacity(0.35),
.withValues(alpha: 0.35),
),
),
),

2
mobile/lib/ui/viewer/gallery/gallery_app_bar_widget.dart
View File

@@ -177,7 +177,7 @@ class _GalleryAppBarWidgetState extends State<GalleryAppBarWidget> {
bottom: child as PreferredSizeWidget,
surfaceTintColor: Colors.transparent,
scrolledUnderElevation: 4,
shadowColor: Colors.black.withOpacity(0.15),
shadowColor: Colors.black.withValues(alpha: 0.15),
);
},
)

2
mobile/lib/ui/viewer/hierarchicial_search/applied_filters_for_appbar.dart
View File

@@ -111,7 +111,7 @@ class _AppliedFiltersForAppbarState extends State<AppliedFiltersForAppbar> {
gradient: LinearGradient(
colors: [
getEnteColorScheme(context).backdropBase,
getEnteColorScheme(context).backdropBase.withOpacity(0),
getEnteColorScheme(context).backdropBase.withValues(alpha: 0),
],
begin: Alignment.centerLeft,
end: Alignment.centerRight,

4
mobile/lib/ui/viewer/location/update_location_data_widget.dart
View File

@@ -76,11 +76,9 @@ class _UpdateLocationDataWidgetState extends State<UpdateLocationDataWidget> {
}
},
),
nonRotatedChildren: const [
OSMFranceTileAttributes(),
],
children: const [
OSMFranceTileLayer(),
OSMFranceTileAttributes(),
],
),
Positioned(

2
mobile/lib/ui/viewer/people/cluster_app_bar.dart
View File

@@ -98,7 +98,7 @@ class _AppBarWidgetState extends State<ClusterAppBar> {
),
actions: _getDefaultActions(context),
scrolledUnderElevation: 4,
shadowColor: Colors.black.withOpacity(0.15),
shadowColor: Colors.black.withValues(alpha: 0.15),
surfaceTintColor: Colors.transparent,
);
}

2
mobile/lib/ui/viewer/people/people_app_bar.dart
View File

@@ -170,7 +170,7 @@ class _AppBarWidgetState extends State<PeopleAppBar> {
actions: isSearching ? null : _getDefaultActions(context),
surfaceTintColor: Colors.transparent,
scrolledUnderElevation: 4,
shadowColor: Colors.black.withOpacity(0.15),
shadowColor: Colors.black.withValues(alpha: 0.15),
);
},
)

2
mobile/lib/ui/viewer/people/person_cluster_suggestion.dart
View File

@@ -424,7 +424,7 @@ class _PersonClustersState extends State<PersonReviewClusterSuggestion> {
),
child: Container(
decoration: BoxDecoration(
color: Colors.black.withOpacity(0.7),
color: Colors.black.withValues(alpha: 0.7),
),
child: Center(
child: Text(

11
mobile/lib/ui/viewer/search_tab/locations_section.dart
View File

@@ -185,7 +185,7 @@ class LocationRecommendation extends StatelessWidget {
cornerSmoothing: cornerSmoothing,
),
child: Container(
color: Colors.white.withOpacity(0.1),
color: Colors.white.withValues(alpha: 0.1),
width: width + outerStrokeWidth * 2,
height: height + outerStrokeWidth * 2,
),
@@ -233,7 +233,7 @@ class LocationRecommendation extends StatelessWidget {
: const NoThumbnailWidget(),
),
Container(
color: Colors.black.withOpacity(0.2),
color: Colors.black.withValues(alpha: 0.2),
),
],
),
@@ -257,7 +257,8 @@ class LocationRecommendation extends StatelessWidget {
cornerSmoothing: cornerSmoothing,
),
child: Container(
color: Colors.black.withOpacity(0.1),
color:
Colors.black.withValues(alpha: 0.1),
width: sideOfThumbnail +
thumbnailBorderWidth * 2,
height: sideOfThumbnail +
@@ -400,7 +401,7 @@ class GoToMapWithBG extends StatelessWidget {
cornerSmoothing: LocationRecommendation.cornerSmoothing,
),
child: Container(
color: Colors.white.withOpacity(0.1),
color: Colors.white.withValues(alpha: 0.1),
width: LocationRecommendation.width +
LocationRecommendation.outerStrokeWidth * 2,
height: LocationRecommendation.height +
@@ -510,7 +511,7 @@ class LocationCTA extends StatelessWidget {
cornerSmoothing: LocationRecommendation.cornerSmoothing,
),
child: Container(
color: Colors.white.withOpacity(0.1),
color: Colors.white.withValues(alpha: 0.1),
width: LocationRecommendation.width +
LocationRecommendation.outerStrokeWidth * 2,
height: LocationRecommendation.height +

8
mobile/lib/ui/viewer/search_tab/magic_section.dart
View File

@@ -172,7 +172,7 @@ class MagicRecommendation extends StatelessWidget {
decoration: BoxDecoration(
boxShadow: [
BoxShadow(
color: Colors.black.withOpacity(0.1),
color: Colors.black.withValues(alpha: 0.1),
blurRadius: 6.25,
offset: const Offset(-1.25, 2.5),
),
@@ -209,9 +209,9 @@ class MagicRecommendation extends StatelessWidget {
begin: Alignment.topCenter,
end: Alignment.bottomCenter,
colors: [
Colors.black.withOpacity(0),
Colors.black.withOpacity(0),
Colors.black.withOpacity(0.5),
Colors.black.withValues(alpha: 0),
Colors.black.withValues(alpha: 0),
Colors.black.withValues(alpha: 0.5),
],
stops: const [
0,

10
mobile/lib/ui/viewer/search_tab/moments_section.dart
View File

@@ -170,7 +170,7 @@ class MomentRecommendation extends StatelessWidget {
cornerSmoothing: _cornerSmoothing,
),
child: Container(
color: Colors.white.withOpacity(0.16),
color: Colors.white.withValues(alpha: 0.16),
width: _width + _borderWidth * 2,
height: _height + _borderWidth * 2,
),
@@ -179,7 +179,7 @@ class MomentRecommendation extends StatelessWidget {
decoration: BoxDecoration(
boxShadow: [
BoxShadow(
color: Colors.black.withOpacity(0.1),
color: Colors.black.withValues(alpha: 0.1),
blurRadius: 6.25,
offset: const Offset(-1.25, 2.5),
),
@@ -216,9 +216,9 @@ class MomentRecommendation extends StatelessWidget {
begin: Alignment.topCenter,
end: Alignment.bottomCenter,
colors: [
Colors.black.withOpacity(0),
Colors.black.withOpacity(0),
Colors.black.withOpacity(0.5),
Colors.black.withValues(alpha: 0),
Colors.black.withValues(alpha: 0),
Colors.black.withValues(alpha: 0.5),
],
stops: const [
0,

4
mobile/lib/ui/viewer/search_tab/people_section.dart
View File

@@ -285,8 +285,8 @@ class PersonSearchExample extends StatelessWidget {
),
child: ColorFiltered(
colorFilter: ColorFilter.mode(
Colors.black.withOpacity(
isSelected ? 0.4 : 0,
Colors.black.withValues(
alpha: isSelected ? 0.4 : 0,
),
BlendMode.darken,
),

2
mobile/lib/utils/delete_file_util.dart
View File

@@ -590,7 +590,7 @@ Future<List<String>> deleteLocalFilesInBatches(
builder: (context) {
return dialog;
},
barrierColor: Colors.black.withOpacity(0.85),
barrierColor: Colors.black.withValues(alpha: 0.85),
);
final batchSize = min(
max(minimumBatchSize, (localIDs.length / minimumParts).round()),

8
mobile/lib/utils/email_util.dart
View File

@@ -217,9 +217,11 @@ Future<void> exportLogs(BuildContext context, String zipFilePath) async {
ext: 'zip',
);
} else {
await Share.shareXFiles(
[XFile(zipFilePath, mimeType: 'application/zip')],
sharePositionOrigin: Rect.fromLTWH(0, 0, size.width, size.height / 2),
await SharePlus.instance.share(
ShareParams(
files: [XFile(zipFilePath, mimeType: 'application/zip')],
sharePositionOrigin: Rect.fromLTWH(0, 0, size.width, size.height / 2),
),
);
}
}

39
mobile/lib/utils/share_util.dart
View File

@@ -56,10 +56,11 @@ Future<void> share(
if (path == null) continue;
xFiles.add(XFile(path));
}
await Share.shareXFiles(
xFiles,
// required for ipad https://github.com/flutter/flutter/issues/47220#issuecomment-608453383
sharePositionOrigin: shareButtonRect(context, shareButtonKey),
await SharePlus.instance.share(
ShareParams(
files: xFiles,
sharePositionOrigin: shareButtonRect(context, shareButtonKey),
),
);
} catch (e, s) {
_logger.severe(
@@ -101,9 +102,11 @@ Future<ShareResult> shareText(
}) async {
try {
final sharePosOrigin = _sharePosOrigin(context, key);
return Share.share(
text,
sharePositionOrigin: sharePosOrigin,
return SharePlus.instance.share(
ShareParams(
text: text,
sharePositionOrigin: sharePosOrigin,
),
);
} catch (e, s) {
_logger.severe("failed to share text", e, s);
@@ -234,16 +237,18 @@ Future<void> shareImageAndUrl(
GlobalKey? key,
}) async {
final sharePosOrigin = _sharePosOrigin(context, key);
await Share.shareXFiles(
[
XFile.fromData(
imageBytes,
name: 'placeholder_image.png',
mimeType: 'image/png',
),
],
text: url,
sharePositionOrigin: sharePosOrigin,
await SharePlus.instance.share(
ShareParams(
files: [
XFile.fromData(
imageBytes,
name: 'placeholder_image.png',
mimeType: 'image/png',
),
],
text: url,
sharePositionOrigin: sharePosOrigin,
),
);
}

114
mobile/pubspec.lock
View File

@@ -5,10 +5,10 @@ packages:
dependency: transitive
description:
name: _fe_analyzer_shared
sha256: f256b0c0ba6c7577c15e2e4e114755640a875e885099367bf6e012b19314c834
sha256: "16e298750b6d0af7ce8a3ba7c18c69c3785d11b15ec83f6dcd0ad2a0009b3cab"
url: "https://pub.dev"
source: hosted
version: "72.0.0"
version: "76.0.0"
_flutterfire_internals:
dependency: transitive
description:
@@ -21,7 +21,7 @@ packages:
dependency: transitive
description: dart
source: sdk
version: "0.3.2"
version: "0.3.3"
adaptive_theme:
dependency: "direct main"
description:
@@ -34,10 +34,10 @@ packages:
dependency: transitive
description:
name: analyzer
sha256: b652861553cd3990d8ed361f7979dc6d7053a9ac8843fa73820ab68ce5410139
sha256: "1f14db053a8c23e260789e9b0980fa27f2680dd640932cae5e1137cce0e46e1e"
url: "https://pub.dev"
source: hosted
version: "6.7.0"
version: "6.11.0"
android_intent_plus:
dependency: "direct main"
description:
@@ -130,10 +130,10 @@ packages:
dependency: transitive
description:
name: async
sha256: "947bfcf187f74dbc5e146c9eb9c0f10c9f8b30743e341481c1e2ed3ecc18c20c"
sha256: d2872f9c19731c2e5f10444b14686eb7cc85c76274bd6c16e1816bff9a3bab63
url: "https://pub.dev"
source: hosted
version: "2.11.0"
version: "2.12.0"
background_fetch:
dependency: "direct main"
description:
@@ -163,10 +163,10 @@ packages:
dependency: transitive
description:
name: boolean_selector
sha256: "6cfb5af12253eaf2b368f07bacc5a80d1301a071c73360d746b7f2e32d762c66"
sha256: "8aab1771e1243a5063b8b0ff68042d67334e3feab9e95b9490f9a6ebf73b42ea"
url: "https://pub.dev"
source: hosted
version: "2.1.1"
version: "2.1.2"
brotli:
dependency: transitive
description:
@@ -276,10 +276,10 @@ packages:
dependency: transitive
description:
name: characters
sha256: "04a925763edad70e8443c99234dc3328f442e811f1d8fd1a72f1c8ad0f69a605"
sha256: f71061c654a3380576a52b451dd5532377954cf9dbd272a78fc8479606670803
url: "https://pub.dev"
source: hosted
version: "1.3.0"
version: "1.4.0"
checked_yaml:
dependency: transitive
description:
@@ -317,10 +317,10 @@ packages:
dependency: transitive
description:
name: clock
sha256: cb6d7f03e1de671e34607e909a7213e31d7752be4fb66a86d29fe1eb14bfb5cf
sha256: fddb70d9b5277016c77a80201021d40a2247104d9f4aa7bab7157b7e3f05b84b
url: "https://pub.dev"
source: hosted
version: "1.1.1"
version: "1.1.2"
code_builder:
dependency: transitive
description:
@@ -333,10 +333,10 @@ packages:
dependency: "direct main"
description:
name: collection
sha256: ee67cb0715911d28db6bf4af1026078bd6f0128b07a5f66fb2ed94ec6783c09a
sha256: "2f5709ae4d3d59dd8f7cd309b4e023046b57d8a6c82130785d2b0e5868084e76"
url: "https://pub.dev"
source: hosted
version: "1.18.0"
version: "1.19.1"
computer:
dependency: "direct main"
description:
@@ -643,10 +643,10 @@ packages:
dependency: transitive
description:
name: fake_async
sha256: "511392330127add0b769b75a987850d136345d9227c6b94c96a04cf4a391bf78"
sha256: "6a95e56b2449df2273fd8c45a662d6947ce1ebb7aafe80e550a3f68297f3cacc"
url: "https://pub.dev"
source: hosted
version: "1.3.1"
version: "1.3.2"
fast_base58:
dependency: "direct main"
description:
@@ -692,10 +692,10 @@ packages:
dependency: transitive
description:
name: file
sha256: "5fc22d7c25582e38ad9a8515372cd9a93834027aacf1801cf01164dac0ffa08c"
sha256: a3b4f84adafef897088c160faf7dfffb7696046cb13ae90b508c2cbc95d3b8d4
url: "https://pub.dev"
source: hosted
version: "7.0.0"
version: "7.0.1"
file_saver:
dependency: "direct main"
description:
@@ -1440,18 +1440,18 @@ packages:
dependency: transitive
description:
name: leak_tracker
sha256: "3f87a60e8c63aecc975dda1ceedbc8f24de75f09e4856ea27daf8958f2f0ce05"
sha256: c35baad643ba394b40aac41080300150a4f08fd0fd6a10378f8f7c6bc161acec
url: "https://pub.dev"
source: hosted
version: "10.0.5"
version: "10.0.8"
leak_tracker_flutter_testing:
dependency: transitive
description:
name: leak_tracker_flutter_testing
sha256: "932549fb305594d82d7183ecd9fa93463e9914e1b67cacc34bc40906594a1806"
sha256: f8b613e7e6a13ec79cfdc0e97638fddb3ab848452eff057653abd3edba760573
url: "https://pub.dev"
source: hosted
version: "3.0.5"
version: "3.0.9"
leak_tracker_testing:
dependency: transitive
description:
@@ -1560,10 +1560,10 @@ packages:
dependency: transitive
description:
name: macros
sha256: "0acaed5d6b7eab89f63350bccd82119e6c602df0f391260d0e32b5e23db79536"
sha256: "1d9e801cd66f7ea3663c45fc708450db1fa57f988142c64289142c9b7ee80656"
url: "https://pub.dev"
source: hosted
version: "0.1.2-main.4"
version: "0.1.3-main.0"
maps_launcher:
dependency: "direct main"
description:
@@ -1576,10 +1576,10 @@ packages:
dependency: transitive
description:
name: matcher
sha256: d2323aa2060500f906aa31a895b4030b6da3ebdcc5619d14ce1aada65cd161cb
sha256: dc58c723c3c24bf8d3e2d3ad3f2f9d7bd9cf43ec6feaa64181775e60190153f2
url: "https://pub.dev"
source: hosted
version: "0.12.16+1"
version: "0.12.17"
material_color_utilities:
dependency: transitive
description:
@@ -1669,10 +1669,10 @@ packages:
dependency: transitive
description:
name: meta
sha256: bdb68674043280c3428e9ec998512fb681678676b3c54e773629ffe74419f8c7
sha256: e3641ec5d63ebf0d9b41bd43201a66e3fc79a65db5f61fc181f04cd27aab950c
url: "https://pub.dev"
source: hosted
version: "1.15.0"
version: "1.16.0"
mgrs_dart:
dependency: transitive
description:
@@ -1891,10 +1891,10 @@ packages:
dependency: "direct main"
description:
name: path
sha256: "087ce49c3f0dc39180befefc60fdb4acd8f8620e5682fe2476afd0b3688bb4af"
sha256: "75cca69d1490965be98c73ceaea117e8a04dd21217b37b292c9ddbec0d955bc5"
url: "https://pub.dev"
source: hosted
version: "1.9.0"
version: "1.9.1"
path_drawing:
dependency: transitive
description:
@@ -2051,10 +2051,10 @@ packages:
dependency: transitive
description:
name: platform
sha256: "9b71283fc13df574056616011fb138fd3b793ea47cc509c189a6c3fa5f8a1a65"
sha256: "5d6b1b0036a5f331ebc77c850ebc8506cbc1e9416c27e59b439f917a902a4984"
url: "https://pub.dev"
source: hosted
version: "3.1.5"
version: "3.1.6"
plugin_platform_interface:
dependency: transitive
description:
@@ -2108,10 +2108,10 @@ packages:
dependency: transitive
description:
name: process
sha256: "21e54fd2faf1b5bdd5102afd25012184a6793927648ea81eea80552ac9405b32"
sha256: "107d8be718f120bbba9dcd1e95e3bd325b1b4a4f07db64154635ba03f2567a0d"
url: "https://pub.dev"
source: hosted
version: "5.0.2"
version: "5.0.3"
proj4dart:
dependency: transitive
description:
@@ -2349,7 +2349,7 @@ packages:
dependency: transitive
description: flutter
source: sdk
version: "0.0.99"
version: "0.0.0"
source_gen:
dependency: transitive
description:
@@ -2386,10 +2386,10 @@ packages:
dependency: transitive
description:
name: source_span
sha256: "53e943d4206a5e30df338fd4c6e7a077e02254531b138a15aec3bd143c1a8b3c"
sha256: "254ee5351d6cb365c859e20ee823c3bb479bf4a293c22d17a9f1bf144ce86f7c"
url: "https://pub.dev"
source: hosted
version: "1.10.0"
version: "1.10.1"
sprintf:
dependency: transitive
description:
@@ -2482,10 +2482,10 @@ packages:
dependency: transitive
description:
name: stack_trace
sha256: "73713990125a6d93122541237550ee3352a2d84baad52d375a4cad2eb9b7ce0b"
sha256: "8b27215b45d22309b5cddda1aa2b19bdfec9df0e765f2de506401c071d38d1b1"
url: "https://pub.dev"
source: hosted
version: "1.11.1"
version: "1.12.1"
step_progress_indicator:
dependency: "direct main"
description:
@@ -2498,10 +2498,10 @@ packages:
dependency: transitive
description:
name: stream_channel
sha256: ba2aa5d8cc609d96bbb2899c28934f9e1af5cddbd60a827822ea467161eb54e7
sha256: "969e04c80b8bcdf826f8f16579c7b14d780458bd97f56d107d3950fdbeef059d"
url: "https://pub.dev"
source: hosted
version: "2.1.2"
version: "2.1.4"
stream_transform:
dependency: transitive
description:
@@ -2514,10 +2514,10 @@ packages:
dependency: transitive
description:
name: string_scanner
sha256: "556692adab6cfa87322a115640c11f13cb77b3f076ddcc5d6ae3c20242bedcde"
sha256: "921cd31725b72fe181906c6a94d987c78e3b98c2e205b397ea399d4054872b43"
url: "https://pub.dev"
source: hosted
version: "1.2.0"
version: "1.4.1"
styled_text:
dependency: "direct main"
description:
@@ -2570,34 +2570,34 @@ packages:
dependency: transitive
description:
name: term_glyph
sha256: a29248a84fbb7c79282b40b8c72a1209db169a2e0542bce341da992fe1bc7e84
sha256: "7f554798625ea768a7518313e58f83891c7f5024f88e46e7182a4558850a4b8e"
url: "https://pub.dev"
source: hosted
version: "1.2.1"
version: "1.2.2"
test:
dependency: "direct dev"
description:
name: test
sha256: "7ee44229615f8f642b68120165ae4c2a75fe77ae2065b1e55ae4711f6cf0899e"
sha256: "301b213cd241ca982e9ba50266bd3f5bd1ea33f1455554c5abb85d1be0e2d87e"
url: "https://pub.dev"
source: hosted
version: "1.25.7"
version: "1.25.15"
test_api:
dependency: transitive
description:
name: test_api
sha256: "5b8a98dafc4d5c4c9c72d8b31ab2b23fc13422348d2997120294d3bac86b4ddb"
sha256: fb31f383e2ee25fbbfe06b40fe21e1e458d14080e3c67e7ba0acfde4df4e0bbd
url: "https://pub.dev"
source: hosted
version: "0.7.2"
version: "0.7.4"
test_core:
dependency: transitive
description:
name: test_core
sha256: "55ea5a652e38a1dfb32943a7973f3681a60f872f8c3a05a14664ad54ef9c6696"
sha256: "84d17c3486c8dfdbe5e12a50c8ae176d15e2a771b96909a9442b40173649ccaa"
url: "https://pub.dev"
source: hosted
version: "0.6.4"
version: "0.6.8"
thermal:
dependency: "direct main"
description:
@@ -2861,10 +2861,10 @@ packages:
dependency: transitive
description:
name: vm_service
sha256: "5c5f338a667b4c644744b661f309fb8080bb94b18a7e91ef1dbd343bed00ed6d"
sha256: "0968250880a6c5fe7edc067ed0a13d4bae1577fe2771dcf3010d52c4a9d3ca14"
url: "https://pub.dev"
source: hosted
version: "14.2.5"
version: "14.3.1"
volume_controller:
dependency: transitive
description:
@@ -2925,10 +2925,10 @@ packages:
dependency: transitive
description:
name: webdriver
sha256: "003d7da9519e1e5f329422b36c4dcdf18d7d2978d1ba099ea4e45ba490ed845e"
sha256: "3d773670966f02a646319410766d3b5e1037efb7f07cc68f844d5e06cd4d61c8"
url: "https://pub.dev"
source: hosted
version: "3.0.3"
version: "3.0.4"
webkit_inspection_protocol:
dependency: transitive
description:
@@ -3018,5 +3018,5 @@ packages:
source: hosted
version: "3.1.3"
sdks:
dart: ">=3.6.0 <4.0.0"
dart: ">=3.7.0-0 <4.0.0"
flutter: ">=3.27.0"