π End-to-end encrypted cloud for everything.
Dart 2faandroidauthye2eeencryptionend-to-end-encryptionfluttergolanggoogle-photosgoogle-photos-alternativeiosopensourcephotosprivacyprivacy-toolstypescriptzero-knowledge
Share divider widget
Neeraj Gupta2fd1be151e38
diff --git a/mobile/apps/auth/lib/ui/components/bottom_action_bar_widget.dart b/mobile/apps/auth/lib/ui/components/bottom_action_bar_widget.dartindex 540f14322f..3ad1a644c0 100644--- a/mobile/apps/auth/lib/ui/components/bottom_action_bar_widget.dart+++ b/mobile/apps/auth/lib/ui/components/bottom_action_bar_widget.dart@@ -5,7 +5,7 @@ import 'package:ente_auth/theme/ente_theme.dart';import 'package:ente_auth/ui/components/actions_bar_widget.dart';import 'package:ente_auth/ui/components/code_selection_actions_widget.dart';import 'package:ente_auth/ui/components/components_constants.dart';-import "package:ente_auth/ui/components/divider_widget.dart";+import "package:ente_ui/components/divider_widget.dart";import 'package:flutter/material.dart';class BottomActionBarWidget extends StatelessWidget {diff --git a/mobile/apps/auth/lib/ui/components/divider_widget.dart b/mobile/apps/auth/lib/ui/components/divider_widget.dartdeleted file mode 100644index a414a9cfd4..0000000000--- a/mobile/apps/auth/lib/ui/components/divider_widget.dart+++ /dev/null@@ -1,60 +0,0 @@-import 'package:ente_auth/theme/ente_theme.dart';-import 'package:flutter/material.dart';--enum DividerType { solid, menu, menuNoIcon, bottomBar }--class DividerWidget extends StatelessWidget {- final DividerType dividerType;- final Color bgColor;- final bool divColorHasBlur;- final EdgeInsets? padding;- const DividerWidget({- super.key,- required this.dividerType,- this.bgColor = Colors.transparent,- this.divColorHasBlur = true,- this.padding,- });-- @override- Widget build(BuildContext context) {- final dividerColor = divColorHasBlur- ? getEnteColorScheme(context).blurStrokeFaint- : getEnteColorScheme(context).strokeFaint;-- if (dividerType == DividerType.solid) {- return Container(- color: getEnteColorScheme(context).strokeFaint,- width: double.infinity,- height: 1,- );- }- if (dividerType == DividerType.bottomBar) {- return Container(color: dividerColor, width: double.infinity, height: 1);- }-- return Container(- color: bgColor,- padding: padding ?? EdgeInsets.zero,- child: Row(- children: [- SizedBox(- width: dividerType == DividerType.menu- ? 48- : dividerType == DividerType.menuNoIcon- ? 16- : 0,- height: 1,- ),- Expanded(- child: Container(- color: dividerColor,- height: 1,- width: double.infinity,- ),- ),- ],- ),- );- }-}diff --git a/mobile/apps/photos/lib/emergency/emergency_page.dart b/mobile/apps/photos/lib/emergency/emergency_page.dartindex e2435df349..09de7de4a4 100644--- a/mobile/apps/photos/lib/emergency/emergency_page.dart+++ b/mobile/apps/photos/lib/emergency/emergency_page.dart@@ -1,6 +1,7 @@import "dart:async";import "package:ente_strings/ente_strings.dart";+import "package:ente_ui/components/divider_widget.dart";import "package:ente_ui/components/loading_widget.dart";import "package:flutter/foundation.dart";import "package:flutter/material.dart";@@ -14,7 +15,6 @@ import "package:photos/services/contacts/contact_identity_resolver.dart";import "package:photos/theme/ente_theme.dart";import "package:photos/ui/components/alert_bottom_sheet.dart";import "package:photos/ui/components/buttons/button_widget_v2.dart";-import "package:photos/ui/components/divider_widget.dart";import "package:photos/ui/components/menu_item_widget/menu_item_widget_new.dart";import "package:photos/ui/components/menu_section_title.dart";import "package:photos/ui/components/title_bar_title_widget.dart";diff --git a/mobile/apps/photos/lib/emergency/select_contact_page.dart b/mobile/apps/photos/lib/emergency/select_contact_page.dartindex ae6dbf6d66..7152d6a580 100644--- a/mobile/apps/photos/lib/emergency/select_contact_page.dart+++ b/mobile/apps/photos/lib/emergency/select_contact_page.dart@@ -1,5 +1,6 @@import 'package:email_validator/email_validator.dart';import "package:ente_strings/ente_strings.dart";+import "package:ente_ui/components/divider_widget.dart";import 'package:flutter/material.dart';import "package:logging/logging.dart";import 'package:photos/core/configuration.dart';@@ -14,7 +15,6 @@ import 'package:photos/theme/ente_theme.dart';import "package:photos/ui/components/alert_bottom_sheet.dart";import "package:photos/ui/components/base_bottom_sheet.dart";import "package:photos/ui/components/buttons/button_widget_v2.dart";-import "package:photos/ui/components/divider_widget.dart";import "package:photos/ui/components/menu_item_widget/menu_item_widget_new.dart";import "package:photos/ui/components/text_input_widget_v2.dart";import 'package:photos/ui/sharing/user_avator_widget.dart';diff --git a/mobile/apps/photos/lib/ui/components/bottom_action_bar/album_bottom_action_bar_widget.dart b/mobile/apps/photos/lib/ui/components/bottom_action_bar/album_bottom_action_bar_widget.dartindex ddbe539ee0..c557fabf23 100644--- a/mobile/apps/photos/lib/ui/components/bottom_action_bar/album_bottom_action_bar_widget.dart+++ b/mobile/apps/photos/lib/ui/components/bottom_action_bar/album_bottom_action_bar_widget.dart@@ -1,10 +1,10 @@import "package:ente_components/ente_components.dart" as components;+import "package:ente_ui/components/divider_widget.dart";import "package:flutter/material.dart";import "package:photos/core/constants.dart";import "package:photos/models/selected_albums.dart";import "package:photos/ui/collections/collection_list_page.dart";import "package:photos/ui/components/bottom_action_bar/album_action_bar_widget.dart";-import "package:photos/ui/components/divider_widget.dart";import "package:photos/ui/viewer/actions/album_selection_action_widget.dart";class AlbumBottomActionBarWidget extends StatelessWidget {diff --git a/mobile/apps/photos/lib/ui/components/bottom_action_bar/bottom_action_bar_widget.dart b/mobile/apps/photos/lib/ui/components/bottom_action_bar/bottom_action_bar_widget.dartindex e986153e17..68ab11e6b1 100644--- a/mobile/apps/photos/lib/ui/components/bottom_action_bar/bottom_action_bar_widget.dart+++ b/mobile/apps/photos/lib/ui/components/bottom_action_bar/bottom_action_bar_widget.dart@@ -1,4 +1,5 @@import "package:ente_components/ente_components.dart" as components;+import "package:ente_ui/components/divider_widget.dart";import 'package:flutter/material.dart';import 'package:photos/core/constants.dart';import 'package:photos/models/collection/collection.dart';@@ -6,7 +7,6 @@ import "package:photos/models/gallery_type.dart";import "package:photos/models/ml/face/person.dart";import 'package:photos/models/selected_files.dart';import 'package:photos/ui/components/bottom_action_bar/action_bar_widget.dart';-import "package:photos/ui/components/divider_widget.dart";import "package:photos/ui/viewer/actions/file_selection_actions_widget.dart";class BottomActionBarWidget extends StatelessWidget {diff --git a/mobile/apps/photos/lib/ui/components/bottom_action_bar/expanded_menu_widget.dart b/mobile/apps/photos/lib/ui/components/bottom_action_bar/expanded_menu_widget.dartindex c3c7bb1b0e..b88ec12511 100644--- a/mobile/apps/photos/lib/ui/components/bottom_action_bar/expanded_menu_widget.dart+++ b/mobile/apps/photos/lib/ui/components/bottom_action_bar/expanded_menu_widget.dart@@ -1,6 +1,6 @@+import 'package:ente_ui/components/divider_widget.dart';import 'package:flutter/material.dart';import 'package:photos/ui/components/blur_menu_item_widget.dart';-import 'package:photos/ui/components/divider_widget.dart';class ExpandedMenuWidget extends StatelessWidget {final List<List<BlurMenuItemWidget>> items;diff --git a/mobile/apps/photos/lib/ui/components/bottom_action_bar/people_bottom_action_bar_widget.dart b/mobile/apps/photos/lib/ui/components/bottom_action_bar/people_bottom_action_bar_widget.dartindex d30bac3dd5..594aa15d34 100644--- a/mobile/apps/photos/lib/ui/components/bottom_action_bar/people_bottom_action_bar_widget.dart+++ b/mobile/apps/photos/lib/ui/components/bottom_action_bar/people_bottom_action_bar_widget.dart@@ -1,9 +1,9 @@import "package:ente_components/ente_components.dart" as components;+import "package:ente_ui/components/divider_widget.dart";import "package:flutter/material.dart";import "package:photos/core/constants.dart";import "package:photos/models/selected_people.dart";import "package:photos/ui/components/bottom_action_bar/people_action_bar_widget.dart";-import "package:photos/ui/components/divider_widget.dart";import "package:photos/ui/viewer/actions/people_selection_action_widget.dart";class PeopleBottomActionBarWidget extends StatelessWidget {diff --git a/mobile/apps/photos/lib/ui/components/divider_widget.dart b/mobile/apps/photos/lib/ui/components/divider_widget.dartdeleted file mode 100644index 78b9dc2773..0000000000--- a/mobile/apps/photos/lib/ui/components/divider_widget.dart+++ /dev/null@@ -1,70 +0,0 @@-import 'package:flutter/material.dart';-import 'package:photos/theme/ente_theme.dart';--enum DividerType { solid, menu, menuNoIcon, bottomBar }--class DividerWidget extends StatelessWidget {- final DividerType dividerType;- final Color bgColor;- final bool divColorHasBlur;- final EdgeInsets? padding;- const DividerWidget({- required this.dividerType,- this.bgColor = Colors.transparent,- this.divColorHasBlur = true,- this.padding,- super.key,- });-- @override- Widget build(BuildContext context) {- final dividerColor = divColorHasBlur- ? getEnteColorScheme(context).blurStrokeFaint- : getEnteColorScheme(context).strokeFaint;-- if (dividerType == DividerType.solid) {- return Padding(- padding: padding ?? EdgeInsets.zero,- child: Container(- color: getEnteColorScheme(context).strokeFaint,- width: double.infinity,- height: 1,- ),- );- }- if (dividerType == DividerType.bottomBar) {- return Padding(- padding: padding ?? EdgeInsets.zero,- child: Container(- color: dividerColor,- width: double.infinity,- height: 1,- ),- );- }-- return Container(- color: bgColor,- padding: padding ?? EdgeInsets.zero,- child: Row(- children: [- SizedBox(- width: dividerType == DividerType.menu- ? 48- : dividerType == DividerType.menuNoIcon- ? 16- : 0,- height: 1,- ),- Expanded(- child: Container(- color: dividerColor,- height: 1,- width: double.infinity,- ),- ),- ],- ),- );- }-}diff --git a/mobile/apps/photos/lib/ui/viewer/file/file_details_widget.dart b/mobile/apps/photos/lib/ui/viewer/file/file_details_widget.dartindex b5072840ed..fbcb2e3056 100644--- a/mobile/apps/photos/lib/ui/viewer/file/file_details_widget.dart+++ b/mobile/apps/photos/lib/ui/viewer/file/file_details_widget.dart@@ -4,6 +4,7 @@ import "dart:io";import "package:ente_components/ente_components.dart";import "package:ente_strings/ente_strings.dart";+import "package:ente_ui/components/divider_widget.dart";import "package:exif_reader/exif_reader.dart";import "package:flutter/foundation.dart";import "package:flutter/material.dart";@@ -24,7 +25,6 @@ import "package:photos/module/metadata/exif.dart";import "package:photos/module/metadata/video.dart";import "package:photos/service_locator.dart";import "package:photos/services/file_magic_service.dart";-import "package:photos/ui/components/divider_widget.dart";import 'package:photos/ui/viewer/file/file_caption_widget.dart';import "package:photos/ui/viewer/file_details/added_by_widget.dart";import "package:photos/ui/viewer/file_details/albums_item_widget.dart";diff --git a/mobile/apps/photos/lib/ui/viewer/location/add_location_sheet.dart b/mobile/apps/photos/lib/ui/viewer/location/add_location_sheet.dartindex 019eacb2b3..70f7514da1 100644--- a/mobile/apps/photos/lib/ui/viewer/location/add_location_sheet.dart+++ b/mobile/apps/photos/lib/ui/viewer/location/add_location_sheet.dart@@ -1,4 +1,5 @@import "package:ente_strings/ente_strings.dart";+import "package:ente_ui/components/divider_widget.dart";import "package:ente_ui/components/loading_widget.dart";import 'package:flutter/material.dart';import "package:intl/intl.dart";@@ -11,7 +12,6 @@ import "package:photos/theme/colors.dart";import "package:photos/theme/ente_theme.dart";import "package:photos/ui/components/bottom_of_title_bar_widget.dart";import "package:photos/ui/components/buttons/button_widget.dart";-import "package:photos/ui/components/divider_widget.dart";import 'package:photos/ui/components/keyboard/keyboard_oveylay.dart';import "package:photos/ui/components/keyboard/keyboard_top_button.dart";import "package:photos/ui/components/models/button_type.dart";diff --git a/mobile/apps/photos/lib/ui/viewer/location/edit_location_sheet.dart b/mobile/apps/photos/lib/ui/viewer/location/edit_location_sheet.dartindex 1c32f0e9f8..e9aad331e9 100644--- a/mobile/apps/photos/lib/ui/viewer/location/edit_location_sheet.dart+++ b/mobile/apps/photos/lib/ui/viewer/location/edit_location_sheet.dart@@ -1,4 +1,5 @@import "package:ente_strings/ente_strings.dart";+import "package:ente_ui/components/divider_widget.dart";import "package:ente_ui/components/loading_widget.dart";import 'package:flutter/material.dart';import "package:intl/intl.dart";@@ -12,7 +13,6 @@ import "package:photos/theme/colors.dart";import "package:photos/theme/ente_theme.dart";import "package:photos/ui/components/bottom_of_title_bar_widget.dart";import "package:photos/ui/components/buttons/button_widget.dart";-import "package:photos/ui/components/divider_widget.dart";import 'package:photos/ui/components/keyboard/keyboard_oveylay.dart';import "package:photos/ui/components/keyboard/keyboard_top_button.dart";import "package:photos/ui/components/models/button_type.dart";diff --git a/mobile/packages/ui/lib/components/divider_widget.dart b/mobile/packages/ui/lib/components/divider_widget.dartindex 0336b3c964..34e37739b3 100644--- a/mobile/packages/ui/lib/components/divider_widget.dart+++ b/mobile/packages/ui/lib/components/divider_widget.dart@@ -18,20 +18,22 @@ class DividerWidget extends StatelessWidget {@overrideWidget build(BuildContext context) {- final dividerColor = divColorHasBlur- ? getEnteColorScheme(context).blurStrokeFaint- : getEnteColorScheme(context).strokeFaint;+ final colorScheme = getEnteColorScheme(context);+ final dividerColor = dividerType == DividerType.solid || !divColorHasBlur+ ? colorScheme.fillMuted+ : colorScheme.blurStrokeFaint;- if (dividerType == DividerType.solid) {- return Container(- color: getEnteColorScheme(context).strokeFaint,- width: double.infinity,- height: 1,+ if (dividerType == DividerType.solid ||+ dividerType == DividerType.bottomBar) {+ return Padding(+ padding: padding ?? EdgeInsets.zero,+ child: Container(+ color: dividerColor,+ width: double.infinity,+ height: 1,+ ),);}- if (dividerType == DividerType.bottomBar) {- return Container(color: dividerColor, width: double.infinity, height: 1);- }return Container(color: bgColor,