beenull/ente
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Merge branch 'collaboration_view' into font_size_bug

Browse source
This commit is contained in:
ashilkn 2022-12-16 18:16:15 +05:30
parent e9e62e379c 858c390860
commit 714643c02a
3 changed files with 66 additions and 63 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
lib/ui/sharing/add_partipant_page.dart
View file

@ -132,7 +132,7 @@ class _AddParticipantPage extends State<AddParticipantPage> {
: DividerWidget(
dividerType: DividerType.menu,
bgColor: getEnteColorScheme(context)
.blurStrokeFaint,
.fillFaint,
),
],
);
@ -180,7 +180,7 @@ class _AddParticipantPage extends State<AddParticipantPage> {
),
DividerWidget(
dividerType: DividerType.menu,
bgColor: getEnteColorScheme(context).blurStrokeFaint,
bgColor: getEnteColorScheme(context).fillFaint,
),
MenuItemWidget(
captionedTextWidget: const CaptionedTextWidget(

2
lib/ui/sharing/manage_album_participant.dart
View file

@ -98,7 +98,7 @@ class _ManageIndividualParticipantState
),
DividerWidget(
dividerType: DividerType.menu,
bgColor: getEnteColorScheme(context).blurStrokeFaint,
bgColor: getEnteColorScheme(context).fillFaint,
),
MenuItemWidget(
captionedTextWidget: const CaptionedTextWidget(

123
lib/ui/viewer/gallery/empty_hidden_widget.dart
View file

@ -12,68 +12,71 @@ class EmptyHiddenWidget extends StatelessWidget {
final EnteColorScheme enteColorScheme = getEnteColorScheme(context);
return Padding(
padding: const EdgeInsets.all(8.0),
child: Column(
mainAxisAlignment: MainAxisAlignment.center,
children: [
Icon(
Icons.visibility_off,
color: enteColorScheme.strokeMuted,
size: 24,
),
const SizedBox(height: 10),
Text(
"No hidden photos or videos",
textAlign: TextAlign.center,
style: enteTextTheme.body.copyWith(
color: enteColorScheme.textMuted,
child: SizedBox(
width: double.infinity,
child: Column(
mainAxisAlignment: MainAxisAlignment.center,
children: [
Icon(
Icons.visibility_off,
color: enteColorScheme.strokeMuted,
size: 24,
),
),
const SizedBox(height: 36),
Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
const EmptyHiddenTextWidget("To hide a photo or video"),
const SizedBox(height: 4),
Padding(
padding: const EdgeInsets.only(left: 6),
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
const EmptyHiddenTextWidget("• Open the item"),
const SizedBox(height: 2),
const EmptyHiddenTextWidget(
"• Click on the overflow menu",
),
const SizedBox(height: 2),
SizedBox(
width: 120,
child: Row(
children: [
const EmptyHiddenTextWidget("• Click "),
const SizedBox(width: 4),
Icon(
Icons.visibility_off,
color: enteColorScheme.strokeBase,
size: 16,
),
const Padding(
padding: EdgeInsets.all(4),
),
Text(
"Hide",
style: TextStyle(
color: enteColorScheme.textBase,
),
),
],
),
),
],
),
const SizedBox(height: 10),
Text(
"No hidden photos or videos",
textAlign: TextAlign.center,
style: enteTextTheme.body.copyWith(
color: enteColorScheme.textMuted,
),
],
),
],
),
const SizedBox(height: 36),
Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
const EmptyHiddenTextWidget("To hide a photo or video"),
const SizedBox(height: 4),
Padding(
padding: const EdgeInsets.only(left: 6),
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
const EmptyHiddenTextWidget("• Open the item"),
const SizedBox(height: 2),
const EmptyHiddenTextWidget(
"• Click on the overflow menu",
),
const SizedBox(height: 2),
SizedBox(
width: 120,
child: Row(
children: [
const EmptyHiddenTextWidget("• Click "),
const SizedBox(width: 4),
Icon(
Icons.visibility_off,
color: enteColorScheme.strokeBase,
size: 16,
),
const Padding(
padding: EdgeInsets.all(4),
),
Text(
"Hide",
style: TextStyle(
color: enteColorScheme.textBase,
),
),
],
),
),
],
),
),
],
),
],
),
),
);
}