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

[mob][photos] Fix safeArea issues on file viewer

Browse Source
This commit is contained in:
ashilkn
2024-08-26 14:47:23 +05:30
parent 999de31233
commit 661f93a1bc
2 changed files with 42 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -74,7 +74,7 @@ class FileBottomBarState extends State<FileBottomBar> {
}
}
return SafeArea(child: _getBottomBar());
return _getBottomBar();
}
void safeRefresh() {
@@ -204,42 +204,46 @@ class FileBottomBarState extends State<FileBottomBar> {
stops: const [0, 0.8, 1],
),
),
child: Column(
mainAxisSize: MainAxisSize.min,
children: [
widget.file.caption?.isNotEmpty ?? false
? Padding(
padding: const EdgeInsets.fromLTRB(
16,
12,
16,
0,
),
child: GestureDetector(
onTap: () async {
await _displayDetails(widget.file);
await Future.delayed(
const Duration(milliseconds: 500),
); //Waiting for some time till the caption gets updated in db if the user closes the bottom sheet without pressing 'done'
safeRefresh();
},
child: Text(
widget.file.caption!,
overflow: TextOverflow.ellipsis,
maxLines: 1,
style: getEnteTextTheme(context)
.mini
.copyWith(color: textBaseDark),
textAlign: TextAlign.center,
child: SafeArea(
left: false,
right: false,
child: Column(
mainAxisSize: MainAxisSize.min,
children: [
widget.file.caption?.isNotEmpty ?? false
? Padding(
padding: const EdgeInsets.fromLTRB(
16,
12,
16,
0,
),
),
)
: const SizedBox.shrink(),
Row(
mainAxisAlignment: MainAxisAlignment.spaceAround,
children: children,
),
],
child: GestureDetector(
onTap: () async {
await _displayDetails(widget.file);
await Future.delayed(
const Duration(milliseconds: 500),
); //Waiting for some time till the caption gets updated in db if the user closes the bottom sheet without pressing 'done'
safeRefresh();
},
child: Text(
widget.file.caption!,
overflow: TextOverflow.ellipsis,
maxLines: 1,
style: getEnteTextTheme(context)
.mini
.copyWith(color: textBaseDark),
textAlign: TextAlign.center,
),
),
)
: const SizedBox.shrink(),
Row(
mainAxisAlignment: MainAxisAlignment.spaceAround,
children: children,
),
],
),
),
),
),

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

@@ -233,6 +233,8 @@ class _VideoWidgetNativeState extends State<VideoWidgetNative>
right: 0,
left: 0,
child: SafeArea(
left: false,
right: false,
child: Padding(
padding: EdgeInsets.only(
bottom: widget.isFromMemories ? 32 : 0,