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

Merge branch 'Version-2.0.6' into Version-2.0.7

Browse Source 
# Conflicts:
#	pubspec.yaml
This commit is contained in:
Thomas Fransolet 2024-04-24 17:30:01 +02:00
commit fea8e11236
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
RELEASE/app-release_version_2_0_6.aab Normal file
View File

Binary file not shown.

BIN
RELEASE/app-release_version_2_0_6_14.aab Normal file
View File

Binary file not shown.

8
lib/Screens/Menu/menu_view.dart
View File

@ -66,7 +66,7 @@ class _MenuView extends State<MenuView> {
return Center( return Center(
child: GridView.builder( child: GridView.builder(
shrinkWrap: true, shrinkWrap: true,
gridDelegate: new SliverGridDelegateWithFixedCrossAxisCount(crossAxisCount: 3, childAspectRatio: kIsWeb ? 1.7 : 1.2), gridDelegate: new SliverGridDelegateWithFixedCrossAxisCount(crossAxisCount: 3, childAspectRatio: kIsWeb ? 1.7 : 1.3),
itemCount: menuDTO.sections!.length, itemCount: menuDTO.sections!.length,
itemBuilder: (BuildContext context, int index) { itemBuilder: (BuildContext context, int index) {
return InkWell( return InkWell(
@ -87,8 +87,8 @@ class _MenuView extends State<MenuView> {
}, },
child: Container( child: Container(
decoration: isImageBackground ? boxDecoration(appContext, menuDTO.sections![index], false) : null, decoration: isImageBackground ? boxDecoration(appContext, menuDTO.sections![index], false) : null,
padding: const EdgeInsets.all(12), padding: const EdgeInsets.all(20),
margin: EdgeInsets.symmetric(vertical: 8, horizontal: 8), margin: EdgeInsets.symmetric(vertical: 15, horizontal: 15),
child: isImageBackground ? Align( child: isImageBackground ? Align(
alignment: Alignment.bottomRight, alignment: Alignment.bottomRight,
child: FractionallySizedBox( child: FractionallySizedBox(
@ -124,7 +124,7 @@ class _MenuView extends State<MenuView> {
flex: 7, flex: 7,
child: Container( child: Container(
decoration: BoxDecoration( decoration: BoxDecoration(
color: menuDTO.sections![index].imageSource == null ? kBackgroundColor : null, // default color if no image color: menuDTO.sections![index].imageSource == null && menuDTO.sections![index].type != SectionType.Video ? kBackgroundColor : null, // default color if no image
shape: BoxShape.rectangle, shape: BoxShape.rectangle,
image: menuDTO.sections![index].imageSource != null || menuDTO.sections![index].type == SectionType.Video ? new DecorationImage( image: menuDTO.sections![index].imageSource != null || menuDTO.sections![index].type == SectionType.Video ? new DecorationImage(
fit: BoxFit.contain, // contain or cover ? fit: BoxFit.contain, // contain or cover ?