Compare commits

...

2 Commits

2 changed files with 35 additions and 27 deletions

View File

@@ -48,7 +48,9 @@ class _HomePageState extends State<HomePage> with RouteAware {
super.initState(); super.initState();
// Exit fullscreen when entering home page // Exit fullscreen when entering home page
if (FullScreen.isFullScreen) {
FullScreen.setFullScreen(false); FullScreen.setFullScreen(false);
}
// Subscribe to route changes // Subscribe to route changes
WidgetsBinding.instance.addPostFrameCallback((_) { WidgetsBinding.instance.addPostFrameCallback((_) {
@@ -71,14 +73,19 @@ class _HomePageState extends State<HomePage> with RouteAware {
@override @override
void didPush() { void didPush() {
// Exit fullscreen when entering home page
if (FullScreen.isFullScreen) {
FullScreen.setFullScreen(false); FullScreen.setFullScreen(false);
}
super.didPush(); super.didPush();
} }
@override @override
void didPopNext() { void didPopNext() {
// Exit fullscreen when returning to home page // Exit fullscreen when returning to home page
if (FullScreen.isFullScreen) {
FullScreen.setFullScreen(false); FullScreen.setFullScreen(false);
}
super.didPopNext(); super.didPopNext();
} }

View File

@@ -65,7 +65,9 @@ class _SheetViewerPageState extends State<SheetViewerPage>
_rightDrawingController = DrawingController(maxHistorySteps: 50); _rightDrawingController = DrawingController(maxHistorySteps: 50);
FullScreen.addListener(this); FullScreen.addListener(this);
if (FullScreen.isFullScreen != widget.config.fullscreen) {
FullScreen.setFullScreen(widget.config.fullscreen); FullScreen.setFullScreen(widget.config.fullscreen);
}
_documentLoaded = _loadPdf(); _documentLoaded = _loadPdf();
} }
@@ -161,14 +163,12 @@ class _SheetViewerPageState extends State<SheetViewerPage>
); );
// Upload left page to server // Upload left page to server
if (leftHasContent) {
_syncService.uploadAnnotation( _syncService.uploadAnnotation(
sheetUuid: widget.sheet.uuid, sheetUuid: widget.sheet.uuid,
page: _currentPage, page: _currentPage,
annotationsJson: leftJson, annotationsJson: leftJson,
lastModified: now, lastModified: now,
); );
}
_leftDrawingController.markSaved(); _leftDrawingController.markSaved();
} }
@@ -188,14 +188,12 @@ class _SheetViewerPageState extends State<SheetViewerPage>
); );
// Upload right page to server // Upload right page to server
if (rightHasContent) {
_syncService.uploadAnnotation( _syncService.uploadAnnotation(
sheetUuid: widget.sheet.uuid, sheetUuid: widget.sheet.uuid,
page: _currentPage + 1, page: _currentPage + 1,
annotationsJson: rightJson, annotationsJson: rightJson,
lastModified: now, lastModified: now,
); );
}
_rightDrawingController.markSaved(); _rightDrawingController.markSaved();
} }
@@ -214,7 +212,7 @@ class _SheetViewerPageState extends State<SheetViewerPage>
} }
void _toggleFullscreen() { void _toggleFullscreen() {
FullScreen.setFullScreen(!widget.config.fullscreen); FullScreen.setFullScreen(!FullScreen.isFullScreen);
} }
// --------------------------------------------------------------------------- // ---------------------------------------------------------------------------
@@ -300,8 +298,9 @@ class _SheetViewerPageState extends State<SheetViewerPage>
icon: Icon( icon: Icon(
widget.config.fullscreen ? Icons.fullscreen_exit : Icons.fullscreen, widget.config.fullscreen ? Icons.fullscreen_exit : Icons.fullscreen,
), ),
tooltip: tooltip: widget.config.fullscreen
widget.config.fullscreen ? 'Exit Fullscreen' : 'Enter Fullscreen', ? 'Exit Fullscreen'
: 'Enter Fullscreen',
onPressed: _toggleFullscreen, onPressed: _toggleFullscreen,
), ),
IconButton( IconButton(
@@ -313,8 +312,9 @@ class _SheetViewerPageState extends State<SheetViewerPage>
icon: Icon( icon: Icon(
widget.config.twoPageMode ? Icons.filter_1 : Icons.filter_2, widget.config.twoPageMode ? Icons.filter_1 : Icons.filter_2,
), ),
tooltip: tooltip: widget.config.twoPageMode
widget.config.twoPageMode ? 'Single Page Mode' : 'Two Page Mode', ? 'Single Page Mode'
: 'Two Page Mode',
onPressed: _toggleTwoPageMode, onPressed: _toggleTwoPageMode,
), ),
], ],
@@ -346,8 +346,9 @@ class _SheetViewerPageState extends State<SheetViewerPage>
currentPageNumber: _currentPage, currentPageNumber: _currentPage,
config: widget.config, config: widget.config,
leftDrawingController: _leftDrawingController, leftDrawingController: _leftDrawingController,
rightDrawingController: rightDrawingController: widget.config.twoPageMode
widget.config.twoPageMode ? _rightDrawingController : null, ? _rightDrawingController
: null,
drawingEnabled: _isPaintMode, drawingEnabled: _isPaintMode,
); );