Skip to content

Commit

Permalink
update deps
Browse files Browse the repository at this point in the history
  • Loading branch information
hatch01 committed Dec 14, 2023
1 parent 352f084 commit 004d68c
Show file tree
Hide file tree
Showing 6 changed files with 189 additions and 185 deletions.
65 changes: 37 additions & 28 deletions apps/onyx/lib/screens/mails/pages/email_send_page.dart
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import 'dart:io';

import 'package:flutter/material.dart';
import 'package:flutter_bloc/flutter_bloc.dart';
import 'package:flutter_quill/flutter_quill.dart' hide Text;
import 'package:flutter_quill/flutter_quill.dart';
import 'package:lyon1mailclient/lyon1mailclient.dart';
import 'package:onyx/screens/mails/mails_export.dart';
import 'package:responsive_sizer/responsive_sizer.dart';
Expand Down Expand Up @@ -202,35 +202,44 @@ class MailSendPage extends StatelessWidget {
height: (originalMessage == null) ? 62.5.h : 75.h,
width: 100.w,
child: SingleChildScrollView(
child: Column(
children: [
QuillToolbar.basic(
controller: controller, multiRowsDisplay: false),
Container(
height: (originalMessage != null) ? 40.h : 52.h,
width: 100.w,
padding: const EdgeInsets.all(10),
child: QuillEditor.basic(
controller: controller,
readOnly: false, // true for view only mode
child: QuillProvider(
configurations: QuillConfigurations(
controller: controller,
sharedConfigurations: const QuillSharedConfigurations(),
),
child: Column(
children: [
const QuillToolbar(
configurations: QuillToolbarConfigurations(
multiRowsDisplay: false),
),
),
(originalMessage != null)
? Container(
width: 100.w,
height: 75.h,
padding: EdgeInsets.all(1.h),
child: MailContentWidget(
mail: context
.read<EmailCubit>()
.state
.currentMailBox!
.emails
.firstWhere((element) =>
element.id == originalMessage)),
Container(
height: (originalMessage != null) ? 40.h : 52.h,
width: 100.w,
padding: const EdgeInsets.all(10),
child: QuillEditor.basic(
configurations: const QuillEditorConfigurations(
readOnly: false, // true for view only mode
)
: Container(),
],
),
),
(originalMessage != null)
? Container(
width: 100.w,
height: 75.h,
padding: EdgeInsets.all(1.h),
child: MailContentWidget(
mail: context
.read<EmailCubit>()
.state
.currentMailBox!
.emails
.firstWhere((element) =>
element.id == originalMessage)),
)
: Container(),
],
),
),
),
),
Expand Down
20 changes: 9 additions & 11 deletions apps/onyx/lib/screens/map/widgets/map_widget.dart
Original file line number Diff line number Diff line change
Expand Up @@ -54,9 +54,9 @@ class _MapWidgetState extends State<MapWidget> with TickerProviderStateMixin {
List<Marker> markers = [
for (var element in widget.batiments)
Marker(
anchorPos: AnchorPos.align(AnchorAlign.center),
alignment: Alignment.center,
point: element.position,
builder: (context) => Icon(
child: Icon(
Icons.location_on_rounded,
size: 20.sp,
color: Colors.red,
Expand All @@ -65,9 +65,9 @@ class _MapWidgetState extends State<MapWidget> with TickerProviderStateMixin {
),
for (var element in widget.restaurant)
Marker(
anchorPos: AnchorPos.align(AnchorAlign.center),
alignment: Alignment.center,
point: LatLng(element.lat, element.lon),
builder: (context) => Icon(
child: Icon(
Icons.restaurant_rounded,
size: 20.sp,
color: Colors.green,
Expand All @@ -91,8 +91,8 @@ class _MapWidgetState extends State<MapWidget> with TickerProviderStateMixin {
popupController: popupLayerController,
child: FlutterMap(
options: MapOptions(
center: widget.center ?? MapRes.center,
zoom: 16.5,
initialCenter: widget.center ?? MapRes.center,
initialZoom: 16.5,
maxZoom: MapRes.maxZoom,
minZoom: 0,
onTap: (_, __) => popupLayerController.hideAllPopups(),
Expand Down Expand Up @@ -127,11 +127,9 @@ class _MapWidgetState extends State<MapWidget> with TickerProviderStateMixin {
spiderfyCluster: false,
disableClusteringAtZoom: 15,
zoomToBoundsOnClick: false,
anchorPos: AnchorPos.align(AnchorAlign.center),
fitBoundsOptions: const FitBoundsOptions(
padding: EdgeInsets.all(50),
maxZoom: 15,
),
alignment: Alignment.center,
maxZoom: 15,
padding: const EdgeInsets.all(50),
markers: markers,
popupOptions: PopupOptions(
popupSnap: PopupSnap.markerTop,
Expand Down
Loading

0 comments on commit 004d68c

Please sign in to comment.