π End-to-end encrypted cloud for everything.
Dart 2faandroidauthye2eeencryptionend-to-end-encryptionfluttergolanggoogle-photosgoogle-photos-alternativeiosopensourcephotosprivacyprivacy-toolstypescriptzero-knowledge
refactor: convert stateful widgets to stateless for EXIF item display
AmanRajSinghMourya81a4b46fd801
diff --git a/mobile/apps/photos/lib/ui/components/info_item_widget.dart b/mobile/apps/photos/lib/ui/components/info_item_widget.dartindex b41ac3da43..158e639357 100644--- a/mobile/apps/photos/lib/ui/components/info_item_widget.dart+++ b/mobile/apps/photos/lib/ui/components/info_item_widget.dart@@ -1,3 +1,5 @@+import "dart:async";+import "package:ente_components/ente_components.dart";import "package:flutter/material.dart";import "package:hugeicons/hugeicons.dart";@@ -12,7 +14,7 @@ class InfoItemWidget extends StatelessWidget {final VoidCallback? editOnTap;final String? title;final Widget? endSection;- final Future<List<Widget>> subtitleSection;+ final FutureOr<List<Widget>> subtitleSection;final bool hasChipButtons;final bool biggerSpinner;final VoidCallback? onTap;@@ -52,34 +54,31 @@ class InfoItemWidget extends StatelessWidget {children.addAll([Flexible(- child: FutureBuilder(- future: subtitleSection,- builder: (context, snapshot) {- Widget child;- if (snapshot.hasData) {- final subtitle = snapshot.data as List<Widget>;- if (subtitle.isNotEmpty) {- child = Wrap(runSpacing: 8, spacing: 8, children: subtitle);- } else {- child = const SizedBox.shrink();- }+ child: _buildSubtitleSection(context, (context, snapshot) {+ Widget child;+ if (snapshot.hasData) {+ final subtitle = snapshot.data as List<Widget>;+ if (subtitle.isNotEmpty) {+ child = Wrap(runSpacing: 8, spacing: 8, children: subtitle);} else {- child = EnteLoadingWidget(- padding: biggerSpinner ? 6 : 3,- size: biggerSpinner ? 20 : 11,- color: getEnteColorScheme(context).strokeMuted,- alignment: biggerSpinner- ? Alignment.center- : Alignment.centerLeft,- );+ child = const SizedBox.shrink();}- return AnimatedSwitcher(- duration: const Duration(milliseconds: 200),- switchInCurve: Curves.easeInOutExpo,- child: child,+ } else {+ child = EnteLoadingWidget(+ padding: biggerSpinner ? 6 : 3,+ size: biggerSpinner ? 20 : 11,+ color: getEnteColorScheme(context).strokeMuted,+ alignment: biggerSpinner+ ? Alignment.center+ : Alignment.centerLeft,);- },- ),+ }+ return AnimatedSwitcher(+ duration: const Duration(milliseconds: 200),+ switchInCurve: Curves.easeInOutExpo,+ child: child,+ );+ }),),]);@@ -183,38 +182,35 @@ class InfoItemWidget extends StatelessWidget {),const SizedBox(height: Spacing.xs),],- FutureBuilder<List<Widget>>(- future: subtitleSection,- builder: (context, snapshot) {- final Widget child;- if (snapshot.hasData) {- final subtitle = snapshot.data!;- child = subtitle.isEmpty- ? const SizedBox.shrink()- : Wrap(- runSpacing: Spacing.sm,- spacing: hasChipButtons- ? Spacing.sm- : Spacing.md,- children: subtitle,- );- } else {- child = EnteLoadingWidget(- padding: biggerSpinner ? 6 : 3,- size: biggerSpinner ? 20 : 11,- color: colors.strokeFaint,- alignment: biggerSpinner- ? Alignment.center- : Alignment.centerLeft,- );- }- return AnimatedSwitcher(- duration: const Duration(milliseconds: 200),- switchInCurve: Curves.easeInOutExpo,- child: child,+ _buildSubtitleSection(context, (context, snapshot) {+ final Widget child;+ if (snapshot.hasData) {+ final subtitle = snapshot.data!;+ child = subtitle.isEmpty+ ? const SizedBox.shrink()+ : Wrap(+ runSpacing: Spacing.sm,+ spacing: hasChipButtons+ ? Spacing.sm+ : Spacing.md,+ children: subtitle,+ );+ } else {+ child = EnteLoadingWidget(+ padding: biggerSpinner ? 6 : 3,+ size: biggerSpinner ? 20 : 11,+ color: colors.strokeFaint,+ alignment: biggerSpinner+ ? Alignment.center+ : Alignment.centerLeft,);- },- ),+ }+ return AnimatedSwitcher(+ duration: const Duration(milliseconds: 200),+ switchInCurve: Curves.easeInOutExpo,+ child: child,+ );+ }),],),),@@ -250,4 +246,19 @@ class InfoItemWidget extends StatelessWidget {),);}++ Widget _buildSubtitleSection(+ BuildContext context,+ AsyncWidgetBuilder<List<Widget>> builder,+ ) {+ final section = subtitleSection;+ if (section is List<Widget>) {+ return builder(+ context,+ AsyncSnapshot.withData(ConnectionState.done, section),+ );+ }++ return FutureBuilder<List<Widget>>(future: section, builder: builder);+ }}diff --git a/mobile/apps/photos/lib/ui/viewer/file_details/exif_item_widgets.dart b/mobile/apps/photos/lib/ui/viewer/file_details/exif_item_widgets.dartindex 03cb2877a2..07b3e106f4 100644--- a/mobile/apps/photos/lib/ui/viewer/file_details/exif_item_widgets.dart+++ b/mobile/apps/photos/lib/ui/viewer/file_details/exif_item_widgets.dart@@ -41,46 +41,22 @@ class BasicExifItemWidget extends StatelessWidget {}}-class AllExifItemWidget extends StatefulWidget {+class AllExifItemWidget extends StatelessWidget {final EnteFile file;final Map<String, IfdTag>? exif;const AllExifItemWidget(this.file, this.exif, {super.key});- @override- State<AllExifItemWidget> createState() => _AllExifItemWidgetState();-}--class _AllExifItemWidgetState extends State<AllExifItemWidget> {- VoidCallback? _onTap;-- @override- void initState() {- super.initState();- }-@overrideWidget build(BuildContext context) {- return InfoItemWidget(- leadingIconWidget: const HugeIcon(icon: HugeIcons.strokeRoundedLicense),- title: AppLocalizations.of(context).exif,- subtitleSection: _exifButton(context, widget.file, widget.exif),- onTap: _onTap,- useMenuStyle: true,- );- }-- Future<List<Widget>> _exifButton(- BuildContext context,- EnteFile file,- Map<String, IfdTag>? exif,- ) async {+ final l10n = AppLocalizations.of(context);+ final currentExif = exif;late final String label;late final VoidCallback? onTap;- if (exif == null) {- label = AppLocalizations.of(context).loadingExifData;+ if (currentExif == null) {+ label = l10n.loadingExifData;onTap = null;- } else if (exif.isNotEmpty) {- label = AppLocalizations.of(context).viewAllExifData;+ } else if (currentExif.isNotEmpty) {+ label = l10n.viewAllExifData;onTap = () => showDialog(useRootNavigator: false,context: context,@@ -90,17 +66,18 @@ class _AllExifItemWidgetState extends State<AllExifItemWidget> {barrierColor: backdropFaintDark,);} else {- label = AppLocalizations.of(context).noExifData;- onTap = () => showShortToast(- context,- AppLocalizations.of(context).thisImageHasNoExifData,- );+ label = l10n.noExifData;+ onTap = () => showShortToast(context, l10n.thisImageHasNoExifData);}- setState(() {- _onTap = onTap;- });- return Future.value([- Text(label, style: getEnteTextTheme(context).miniBoldMuted),- ]);++ return InfoItemWidget(+ leadingIconWidget: const HugeIcon(icon: HugeIcons.strokeRoundedLicense),+ title: l10n.exif,+ subtitleSection: [+ Text(label, style: getEnteTextTheme(context).miniBoldMuted),+ ],+ onTap: onTap,+ useMenuStyle: true,+ );}}diff --git a/mobile/apps/photos/lib/ui/viewer/file_details/video_exif_item.dart b/mobile/apps/photos/lib/ui/viewer/file_details/video_exif_item.dartindex e4aaf83f8c..a3087212bc 100644--- a/mobile/apps/photos/lib/ui/viewer/file_details/video_exif_item.dart+++ b/mobile/apps/photos/lib/ui/viewer/file_details/video_exif_item.dart@@ -10,50 +10,26 @@ import "package:photos/ui/components/info_item_widget.dart";import "package:photos/ui/notification/toast.dart";import "package:photos/ui/viewer/file/video_exif_dialog.dart";-class VideoExifRowItem extends StatefulWidget {+class VideoExifRowItem extends StatelessWidget {final EnteFile file;final FFProbeProps? props;const VideoExifRowItem(this.file, this.props, {super.key});- @override- State<VideoExifRowItem> createState() => _VideoProbeInfoState();-}--class _VideoProbeInfoState extends State<VideoExifRowItem> {- VoidCallback? _onTap;-- @override- void initState() {- super.initState();- }-@overrideWidget build(BuildContext context) {- return InfoItemWidget(- leadingIconWidget: const HugeIcon(icon: HugeIcons.strokeRoundedLicense),- title: AppLocalizations.of(context).videoInfo,- subtitleSection: _exifButton(context, widget.file, widget.props),- onTap: _onTap,- useMenuStyle: true,- );- }-- Future<List<Widget>> _exifButton(- BuildContext context,- EnteFile file,- FFProbeProps? props,- ) async {+ final l10n = AppLocalizations.of(context);+ final currentProps = props;late final String label;late final VoidCallback? onTap;- if (props?.propData == null) {- label = AppLocalizations.of(context).loadingExifData;+ if (currentProps?.propData == null) {+ label = l10n.loadingExifData;onTap = null;- } else if (props!.propData!.isNotEmpty) {- label = "${widget.props?.videoInfo ?? ''} ..";+ } else if (currentProps!.propData!.isNotEmpty) {+ label = "${currentProps.videoInfo} ..";onTap = () => showBarModalBottomSheet(context: context,builder: (BuildContext context) {- return VideoExifDialog(props: props);+ return VideoExifDialog(props: currentProps);},shape: const RoundedRectangleBorder(side: BorderSide(width: 0),@@ -65,17 +41,18 @@ class _VideoProbeInfoState extends State<VideoExifRowItem> {enableDrag: true,);} else {- label = AppLocalizations.of(context).noExifData;- onTap = () => showShortToast(- context,- AppLocalizations.of(context).thisImageHasNoExifData,- );+ label = l10n.noExifData;+ onTap = () => showShortToast(context, l10n.thisImageHasNoExifData);}- setState(() {- _onTap = onTap;- });- return Future.value([- Text(label, style: getEnteTextTheme(context).miniBoldMuted),- ]);++ return InfoItemWidget(+ leadingIconWidget: const HugeIcon(icon: HugeIcons.strokeRoundedLicense),+ title: l10n.videoInfo,+ subtitleSection: [+ Text(label, style: getEnteTextTheme(context).miniBoldMuted),+ ],+ onTap: onTap,+ useMenuStyle: true,+ );}}