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

[mob][photos] Fix UI for native video player on memories

Browse Source
This commit is contained in:
ashilkn
2024-08-10 17:58:01 +05:30
parent de1f287c1c
commit cbdf6ea0e3
4 changed files with 104 additions and 88 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -268,6 +268,7 @@ class _FullScreenMemoryState extends State<FullScreenMemory> {
backgroundDecoration: const BoxDecoration(
color: Colors.transparent,
),
isFromMemories: true,
),
);
},

1
mobile/lib/ui/viewer/file/detail_page.dart
View File

@@ -215,6 +215,7 @@ class _DetailPageState extends State<DetailPage> {
});
},
backgroundDecoration: const BoxDecoration(color: Colors.black),
isFromMemories: false,
);
return GestureDetector(
onTap: () {

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

@@ -13,6 +13,7 @@ class FileWidget extends StatelessWidget {
final Function(bool)? playbackCallback;
final BoxDecoration? backgroundDecoration;
final bool? autoPlay;
final bool isFromMemories;
const FileWidget(
this.file, {
@@ -21,6 +22,7 @@ class FileWidget extends StatelessWidget {
this.playbackCallback,
this.tagPrefix,
this.backgroundDecoration,
required this.isFromMemories,
Key? key,
}) : super(key: key);

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

@@ -32,10 +32,12 @@ class VideoWidgetNative extends StatefulWidget {
final EnteFile file;
final String? tagPrefix;
final Function(bool)? playbackCallback;
final bool isFromMemories;
const VideoWidgetNative(
this.file, {
this.tagPrefix,
this.playbackCallback,
this.isFromMemories = false,
super.key,
});
@@ -239,104 +241,114 @@ class _VideoWidgetNativeState extends State<VideoWidgetNative>
bottom: verticalMargin,
right: 0,
left: 0,
child: ValueListenableBuilder(
builder: (BuildContext context, bool value, _) {
return value
? ValueListenableBuilder(
valueListenable: _showControls,
builder:
(BuildContext context, bool value, _) {
return AnimatedOpacity(
duration: const Duration(
milliseconds: 200,
),
curve: Curves.easeInQuad,
opacity: value ? 1 : 0,
child: IgnorePointer(
ignoring: !value,
child: Padding(
padding: const EdgeInsets.symmetric(
horizontal: 8,
),
child: Container(
child: Padding(
padding: EdgeInsets.only(
bottom: widget.isFromMemories ? 0 : 32,
),
child: ValueListenableBuilder(
builder: (BuildContext context, bool value, _) {
return value
? ValueListenableBuilder(
valueListenable: _showControls,
builder: (
BuildContext context,
bool value,
_,
) {
return AnimatedOpacity(
duration: const Duration(
milliseconds: 200,
),
curve: Curves.easeInQuad,
opacity: value ? 1 : 0,
child: IgnorePointer(
ignoring: !value,
child: Padding(
padding:
const EdgeInsets.fromLTRB(
16,
4,
16,
4,
const EdgeInsets.symmetric(
horizontal: 8,
),
decoration: BoxDecoration(
color: Colors.black
.withOpacity(0.3),
borderRadius:
const BorderRadius.all(
Radius.circular(8),
child: Container(
padding:
const EdgeInsets.fromLTRB(
16,
4,
16,
4,
),
border: Border.all(
color: strokeFaintDark,
width: 1,
),
),
child: Row(
children: [
AnimatedSize(
duration: const Duration(
seconds: 5,
),
curve: Curves.easeInOut,
child:
ValueListenableBuilder(
valueListenable: _controller!
.onPlaybackPositionChanged,
builder: (
BuildContext context,
int value,
_,
) {
return Text(
secondsToDuration(
value,
),
style:
getEnteTextTheme(
context,
).mini.copyWith(
color:
textBaseDark,
),
);
},
),
decoration: BoxDecoration(
color: Colors.black
.withOpacity(0.3),
borderRadius:
const BorderRadius.all(
Radius.circular(8),
),
Expanded(
child: SeekBar(
_controller!,
_durationToSeconds(
duration,
border: Border.all(
color: strokeFaintDark,
width: 1,
),
),
child: Row(
children: [
AnimatedSize(
duration: const Duration(
seconds: 5,
),
curve: Curves.easeInOut,
child:
ValueListenableBuilder(
valueListenable:
_controller!
.onPlaybackPositionChanged,
builder: (
BuildContext context,
int value,
_,
) {
return Text(
secondsToDuration(
value,
),
style:
getEnteTextTheme(
context,
).mini.copyWith(
color:
textBaseDark,
),
);
},
),
_isSeeking,
),
),
Text(
duration ?? "0:00",
style: getEnteTextTheme(
context,
).mini.copyWith(
color: textBaseDark,
Expanded(
child: SeekBar(
_controller!,
_durationToSeconds(
duration,
),
),
],
_isSeeking,
),
),
Text(
duration ?? "0:00",
style: getEnteTextTheme(
context,
).mini.copyWith(
color: textBaseDark,
),
),
],
),
),
),
),
),
);
},
)
: const SizedBox();
},
valueListenable: _isPlaybackReady,
);
},
)
: const SizedBox();
},
valueListenable: _isPlaybackReady,
),
),
),
],