UNOV/tablet-app
1
0
Fork 0
mirror of https://bitbucket.org/FransoletThomas/tablet-app.git synced 2025-12-06 08:31:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

Slider support all format + update to adapt (webview youtube memory issue) + hour and date main view

Browse Source
This commit is contained in:
Thomas Fransolet 2023-12-29 22:47:56 +01:00
parent 7afe94b564
commit 4e6c281b84
7 changed files with 227 additions and 168 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
lib/Components/audio_player.dart
View File

@ -30,6 +30,7 @@ class _AudioPlayerFloatingContainerState extends State<AudioPlayerFloatingContai
@override
void initState() {
print("IN INITSTATE AUDDDIOOOO");
Future.delayed(Duration.zero, () async {
if(widget.audioBytes != null) {
audiobytes = widget.audioBytes!;
@ -99,10 +100,10 @@ class _AudioPlayerFloatingContainerState extends State<AudioPlayerFloatingContai
});
});*/
await player.setUrl(widget.resourceURl);
if(widget.isAuto) {
//player.play(BytesSource(audiobytes));
//await player.setAudioSource(LoadedSource(audiobytes));
await player.setUrl(widget.resourceURl);
player.play();
setState(() {
isplaying = true;
@ -130,7 +131,7 @@ class _AudioPlayerFloatingContainerState extends State<AudioPlayerFloatingContai
onPressed: () async {
if(!isplaying && !audioplayed){
//player.play(BytesSource(audiobytes));
await player.setAudioSource(LoadedSource(audiobytes));
//await player.setUrl(widget.resourceURl);
player.play();
setState(() {
isplaying = true;

6
lib/Components/show_element_for_resource.dart
View File

@ -10,7 +10,7 @@ import 'package:tablet_app/Components/video_viewer_youtube.dart';
import 'package:tablet_app/Models/tabletContext.dart';
import 'package:tablet_app/app_context.dart';
showElementForResource(ResourceDTO resourceDTO, AppContext appContext) {
showElementForResource(ResourceDTO resourceDTO, AppContext appContext, bool isAuto, bool webView) {
TabletAppContext tabletAppContext = appContext.getContext();
Color primaryColor = new Color(int.parse(tabletAppContext.configuration!.primaryColor!.split('(0x')[1].split(')')[0], radix: 16));
@ -57,7 +57,7 @@ showElementForResource(ResourceDTO resourceDTO, AppContext appContext) {
},
);
case ResourceType.Audio:
return AudioPlayerFloatingContainer(audioBytes: null, resourceURl: resourceDTO.url!, isAuto: true);
return AudioPlayerFloatingContainer(audioBytes: null, resourceURl: resourceDTO.url!, isAuto: isAuto);
/*return FutureBuilder(
future: getAudio(resourceDTO.url, appContext),
builder: (context, AsyncSnapshot<dynamic> snapshot) {
@ -94,7 +94,7 @@ showElementForResource(ResourceDTO resourceDTO, AppContext appContext) {
if(resourceDTO.url == null) {
return Center(child: Text("Error loading video"));
} else {
return VideoViewerYoutube(videoUrl: resourceDTO.url!);
return VideoViewerYoutube(videoUrl: resourceDTO.url!, isAuto: isAuto, webView: webView);
}
}
}

13
lib/Components/video_viewer_youtube.dart
View File

@ -9,7 +9,9 @@ import 'package:youtube_player_flutter/youtube_player_flutter.dart';
class VideoViewerYoutube extends StatefulWidget {
final String videoUrl;
VideoViewerYoutube({required this.videoUrl});
final bool isAuto;
final bool webView;
VideoViewerYoutube({required this.videoUrl, required this.isAuto, this.webView = false});
@override
_VideoViewerYoutube createState() => _VideoViewerYoutube();
@ -25,7 +27,7 @@ class _VideoViewerYoutube extends State<VideoViewerYoutube> {
if (widget.videoUrl.length > 0 ) {
videoId = YoutubePlayer.convertUrlToId(widget.videoUrl);
if (kIsWeb) {
if (widget.webView) {
final _controllerWeb = iframe.YoutubePlayerController(
params: iframe.YoutubePlayerParams(
mute: false,
@ -52,11 +54,12 @@ class _VideoViewerYoutube extends State<VideoViewerYoutube> {
),*/
);
} else {
// Cause memory issue on tablet
videoId = YoutubePlayer.convertUrlToId(widget.videoUrl);
YoutubePlayerController _controller = YoutubePlayerController(
initialVideoId: videoId!,
flags: YoutubePlayerFlags(
autoPlay: true,
autoPlay: widget.isAuto,
controlsVisibleAtStart: false,
loop: true,
hideControls: false,
@ -81,13 +84,13 @@ class _VideoViewerYoutube extends State<VideoViewerYoutube> {
@override
void dispose() {
_videoView = null;
//_videoView = null;
_videoViewWeb = null;
super.dispose();
}
@override
Widget build(BuildContext context) => widget.videoUrl.length > 0 ?
(kIsWeb ? _videoViewWeb! : _videoView!):
(widget.webView ? _videoViewWeb! : _videoView!):
Center(child: Text("La vidéo ne peut pas être affichée, l'url est incorrecte", style: new TextStyle(fontSize: kNoneInfoOrIncorrect)));
}

97
lib/Screens/MainView/main_view.dart
View File

@ -1,3 +1,4 @@
import 'dart:async';
import 'dart:math';
import 'package:flutter/foundation.dart';
@ -26,6 +27,7 @@ import 'package:tablet_app/Screens/Video/video_view.dart';
import 'package:tablet_app/Screens/Web/web_view.dart';
import 'package:tablet_app/app_context.dart';
import 'package:tablet_app/constants.dart';
import 'package:intl/intl.dart';
import '../Quizz/quizz_view.dart';
import 'language_selection.dart';
@ -41,15 +43,38 @@ class _MainViewWidget extends State<MainViewWidget> {
Size sizeScreen = new Size(1080.0, 1920.0); // Tablet resolution
SectionDTO? sectionSelected;
late ConfigurationDTO configurationDTO;
ValueNotifier<DateTime?> currentHourDate = ValueNotifier<DateTime?>(DateTime.now());
late Color backgroundColor;
int rowCount = 4;
@override
void initState() {
final appContext = Provider.of<AppContext>(context, listen: false);
configurationDTO = appContext.getContext().configuration;
if(configurationDTO.isHour != null && configurationDTO.isHour!) {
Timer.periodic(Duration(seconds: 1), (Timer t) => _getTime(currentHourDate));
}
super.initState();
}
void _getTime(ValueNotifier<DateTime?> valueNotifier) {
//final DateTime now = DateTime.now();
//final String formattedDateTime = _formatDateTime(now);
//setState(() {
//_timeString = formattedDateTime;
valueNotifier.value = DateTime.now();
//});
}
@override
Widget build(BuildContext context) {
final appContext = Provider.of<AppContext>(context);
SystemChrome.setEnabledSystemUIMode(SystemUiMode.manual, overlays: []);
Size size = MediaQuery.of(context).size;
configurationDTO = appContext.getContext().configuration;
backgroundColor = appContext.getContext().configuration != null ? new Color(int.parse(appContext.getContext().configuration.secondaryColor.split('(0x')[1].split(')')[0], radix: 16)) : Colors.white;
Color textColor = backgroundColor.computeLuminance() > 0.5 ? Colors.black : Colors.white;
// TODO REMOVE
/*if (!MQTTHelper.instance.isInstantiated)
@ -151,7 +176,7 @@ class _MainViewWidget extends State<MainViewWidget> {
alignment: Alignment.centerLeft,
child: HtmlWidget(
sectionSelected!.title!.firstWhere((translation) => translation.language == appContext.getContext().language).value!,
textStyle: new TextStyle(fontSize: kIsWeb ? kWebSectionTitleDetailSize : kSectionTitleDetailSize, color: Colors.white),
textStyle: new TextStyle(fontSize: kIsWeb ? kWebSectionTitleDetailSize : kSectionTitleDetailSize, color: textColor),
)
)
),
@ -161,7 +186,7 @@ class _MainViewWidget extends State<MainViewWidget> {
alignment: Alignment.centerLeft,
child: HtmlWidget(
sectionSelected!.description!.firstWhere((translation) => translation.language == appContext.getContext().language).value!,
textStyle: new TextStyle(fontSize: kIsWeb? kWebSectionDescriptionDetailSize : kSectionDescriptionDetailSize),
textStyle: new TextStyle(fontSize: kIsWeb? kWebSectionDescriptionDetailSize : kSectionDescriptionDetailSize, color: textColor),
)
)
)
@ -226,7 +251,7 @@ class _MainViewWidget extends State<MainViewWidget> {
body: Container(
height: size.height,
width: size.width,
color: configurationDTO.imageId == null ? configurationDTO.secondaryColor != null ? new Color(int.parse(appContext.getContext().configuration.secondaryColor.split('(0x')[1].split(')')[0], radix: 16)): kBackgroundGrey : null,
color: configurationDTO.imageId == null ? configurationDTO.secondaryColor != null ? backgroundColor : kBackgroundGrey : null,
decoration: configurationDTO.imageId != null ? BoxDecoration(
image: new DecorationImage(
fit: BoxFit.cover,
@ -238,6 +263,35 @@ class _MainViewWidget extends State<MainViewWidget> {
) : null,
child: Stack(
children: [
if(currentHourDate.value != null)
ValueListenableBuilder<DateTime?>(
valueListenable: currentHourDate,
builder: (context, value, _) {
return Positioned(
top: 0,
left: 0,
child: Padding(
padding: const EdgeInsets.all(8.0),
child: Column(
mainAxisAlignment: MainAxisAlignment.spaceEvenly,
crossAxisAlignment: CrossAxisAlignment.start,
children: [
if(value != null && configurationDTO.isHour!)
Text(DateFormat('HH:mm').format(value), style: TextStyle(fontSize: 20, color: textColor)),
if(value != null && configurationDTO.isDate!)
if(appContext.getContext().language.toString().toUpperCase() == "EN")
Text(DateFormat('MM/dd/yy').format(value), style: TextStyle(fontSize: 15, color: textColor)),
if(value != null && configurationDTO.isDate!)
if(appContext.getContext().language.toString().toUpperCase() != "EN")
Text(DateFormat('dd/MM/yy').format(value), style: TextStyle(fontSize: 15, color: textColor)),
if(configurationDTO.weatherCity != null) // TODO Weather
Text('TODO - ' + configurationDTO.weatherCity!, style: TextStyle(fontSize: 15, color: textColor))
],
),
)
);
},
),
LanguageSelection(size: size),
Center(
child: Container(
@ -271,19 +325,15 @@ class _MainViewWidget extends State<MainViewWidget> {
child: Align(
alignment: Alignment.bottomRight,
child: FractionallySizedBox(
heightFactor: 0.35,
heightFactor: 0.4,
child: Container(
color: Colors.green,
//color: Colors.green,
child: Column(
children: [
Container(
color: Colors.blue,
child: LayoutBuilder(
builder: (BuildContext context, BoxConstraints constraints) {
return SizedBox(
//color: Colors.orange,
child: SizedBox(
width: double.infinity,
child: FittedBox(
fit: BoxFit.fitWidth,
child: Align(
alignment: Alignment.centerRight,
child: HtmlWidget(
@ -291,15 +341,27 @@ class _MainViewWidget extends State<MainViewWidget> {
customStylesBuilder: (element) {
return {'text-align': 'right'};
},
textStyle: TextStyle(fontSize: calculateFontSize(constraints.maxWidth, constraints.maxHeight, kIsWeb ? kWebMenuTitleDetailSize : kMenuTitleDetailSize)),
textStyle: TextStyle(fontSize: 25),//calculateFontSize(constraints.maxWidth, constraints.maxHeight, kIsWeb ? kWebMenuTitleDetailSize : kMenuTitleDetailSize)),
),
),
),
);
),
Container(
//color: Colors.red,
child: SizedBox(
width: double.infinity,
child: Align(
alignment: Alignment.centerRight,
child: HtmlWidget(
snapshot.data[index].description.firstWhere((translation) => translation.language == appContext.getContext().language).value,
customStylesBuilder: (element) {
return {'text-align': 'right'};
},
textStyle: TextStyle(fontSize: 20),//calculateFontSize(constraints.maxWidth, constraints.maxHeight, kIsWeb ? kWebMenuTitleDetailSize : kMenuTitleDetailSize)),
),
),
),
),
Container(color: Colors.orange, child: Text("ds")),
/*Container(
color: Colors.orange,
@ -366,6 +428,7 @@ class _MainViewWidget extends State<MainViewWidget> {
ConfigurationDTO? configurationDTO = await tabletAppContext.clientAPI!.configurationApi!.configurationGetDetail(tabletAppContext.configuration!.id!);
tabletAppContext.configuration = configurationDTO;
backgroundColor = tabletAppContext.configuration != null ? new Color(int.parse(appContext.getContext().configuration.secondaryColor.split('(0x')[1].split(')')[0], radix: 16)) : Colors.white;
TabletAppContext? localContext = await DatabaseHelper.instance.getData();
if (localContext != null) { // Check if sql DB exist
@ -441,7 +504,7 @@ boxDecoration(SectionDTO section, bool isSelected) {
borderRadius: BorderRadius.circular(30.0),
image: section.imageSource != null ? new DecorationImage(
fit: !isSelected || kIsWeb ? BoxFit.cover : BoxFit.contain,
colorFilter: !isSelected? new ColorFilter.mode(Colors.black.withOpacity(kIsWeb ? 0.3 : 0.5), BlendMode.dstATop) : null,
colorFilter: !isSelected? new ColorFilter.mode(Colors.black.withOpacity(kIsWeb ? 0.3 : 0.3), BlendMode.dstATop) : null,
image: new NetworkImage(
section.imageSource!,
),

2
lib/Screens/Puzzle/message_dialog.dart
View File

@ -29,7 +29,7 @@ void showMessage(TranslationAndResourceDTO translationAndResourceDTO, AppContext
borderRadius: BorderRadius.circular(30),
//border: Border.all(width: 3, color: Colors.black)
),
child: showElementForResource(ResourceDTO(id: translationAndResourceDTO.resourceId, type: translationAndResourceDTO.resourceType, url: translationAndResourceDTO.resourceUrl), appContext),
child: showElementForResource(ResourceDTO(id: translationAndResourceDTO.resourceId, type: translationAndResourceDTO.resourceType, url: translationAndResourceDTO.resourceUrl), appContext, true, false),
),
),
),

9
lib/Screens/Puzzle/puzzle_view.dart
View File

@ -27,17 +27,12 @@ class _PuzzleView extends State<PuzzleView> {
int allInPlaceCount = 0;
bool isFinished = false;
GlobalKey _widgetKey = GlobalKey();
Size? realWidgetSize;
//File? _image;
String? _imagePath;
List<Widget> pieces = [];
bool isSplittingImage = true;
@override
void initState() {
puzzleDTO = PuzzleDTO.fromJson(jsonDecode(widget.section!.data!))!;
@ -77,7 +72,7 @@ class _PuzzleView extends State<PuzzleView> {
// we need to find out the image size, to be used in the PuzzlePiece widget
Future<Size> getImageSize(Image image) async {
final Completer<Size> completer = Completer<Size>();
Completer<Size> completer = Completer<Size>();
image.image
.resolve(const ImageConfiguration())
@ -86,7 +81,7 @@ class _PuzzleView extends State<PuzzleView> {
Size(info.image.width.toDouble(), info.image.height.toDouble()));
}));
final Size imageSize = await completer.future;
Size imageSize = await completer.future;
return imageSize;
}

37
lib/Screens/Slider/slider_view.dart
View File

@ -23,7 +23,7 @@ class SliderView extends StatefulWidget {
class _SliderView extends State<SliderView> {
SliderDTO sliderDTO = SliderDTO();
CarouselController? sliderController;
int currentIndex = 1;
ValueNotifier<int> currentIndex = ValueNotifier<int>(1);
late ConfigurationDTO configurationDTO;
@ -51,19 +51,13 @@ class _SliderView extends State<SliderView> {
configurationDTO = appContext.getContext().configuration;
return Stack(
children: [
Column(
crossAxisAlignment: CrossAxisAlignment.center,
mainAxisAlignment: MainAxisAlignment.spaceEvenly,
children: [
if(sliderDTO.contents != null && sliderDTO.contents!.length > 0)
CarouselSlider(
carouselController: sliderController,
options: CarouselOptions(
onPageChanged: (int index, CarouselPageChangedReason reason) {
setState(() {
currentIndex = index + 1;
});
currentIndex.value = index + 1;
},
height: MediaQuery.of(context).size.height * 0.8,
enlargeCenterPage: true,
@ -168,8 +162,6 @@ class _SliderView extends State<SliderView> {
);
}).toList(),
),
],
),
if(sliderDTO.contents != null && sliderDTO.contents!.length > 1)
Positioned(
top: MediaQuery.of(context).size.height * 0.35,
@ -211,9 +203,14 @@ class _SliderView extends State<SliderView> {
onTap: () {
sliderController!.previousPage(duration: new Duration(milliseconds: 500), curve: Curves.fastOutSlowIn);
},
child: Text(
currentIndex.toString()+'/'+sliderDTO.contents!.length.toString(),
child: ValueListenableBuilder<int>(
valueListenable: currentIndex,
builder: (context, value, _) {
return Text(
value.toString()+'/'+sliderDTO.contents!.length.toString(),
style: TextStyle(fontSize: 25, fontWeight: FontWeight.w500),
);
}
),
)
),
@ -250,10 +247,6 @@ class _SliderView extends State<SliderView> {
getElementForResource(AppContext appContext, ContentDTO i) {
var widgetToInclude;
print("TTTTTTTTTTTTTTESSSSSSSSSSSt CONTENTR");
print(i);
print(i.resourceUrl);
print(i.resourceType);
switch(i.resourceType) {
case ResourceType.Image:
@ -274,13 +267,17 @@ class _SliderView extends State<SliderView> {
case ResourceType.Video:
case ResourceType.VideoUrl:
case ResourceType.Audio:
widgetToInclude = showElementForResource(ResourceDTO(id: i.resourceId, url: i.resourceUrl, type: i.resourceType), appContext);
widgetToInclude = Container(
decoration: BoxDecoration(
color: kBackgroundSecondGrey,
shape: BoxShape.rectangle,
borderRadius: BorderRadius.circular(15.0),
),
child: showElementForResource(ResourceDTO(id: i.resourceId, url: i.resourceUrl, type: i.resourceType), appContext, false, true),
);
break;
}
print("TTTTTTTTTTTTTTESSSSSSSSSSSt");
print(widgetToInclude);
return Center(
child: Container(
height: MediaQuery.of(context).size.height * 0.6,