From 6857047f36ac8d52fc785b97a982c06384db4d19 Mon Sep 17 00:00:00 2001 From: Vishesh Handa Date: Wed, 13 May 2020 16:49:32 +0200 Subject: [PATCH] Add App Shorcuts I've added 3 app shortcuts - * New Note * New Checklist * New Journal Entry The icons for these shortcuts are horrible, and I cannot seem to make it prettier, so this will have to do for now. It's also a bit slow as first the home screen in built and then a NoteEditor is shown. Fixes #134 --- assets/langs/en.yaml | 4 +++ lib/app.dart | 75 ++++++++++++++++++++++++++++++++++++++++++-- pubspec.lock | 7 +++++ pubspec.yaml | 1 + 4 files changed, 85 insertions(+), 2 deletions(-) diff --git a/assets/langs/en.yaml b/assets/langs/en.yaml index 6a4cbbd0..300cc694 100644 --- a/assets/langs/en.yaml +++ b/assets/langs/en.yaml @@ -32,3 +32,7 @@ editors: editFileName: Edit File Name tags: Edit Tags pro: Pro +actions: + newNote: New Note + newJournal: New Journal Entry + newChecklist: New Checklist diff --git a/lib/app.dart b/lib/app.dart index ade24eee..699b6a0c 100644 --- a/lib/app.dart +++ b/lib/app.dart @@ -5,8 +5,10 @@ import 'package:firebase_analytics/observer.dart'; import 'package:flutter/material.dart'; import 'package:gitjournal/analytics.dart'; import 'package:gitjournal/screens/folder_listing.dart'; +import 'package:gitjournal/screens/note_editor.dart'; import 'package:gitjournal/screens/purchase_screen.dart'; import 'package:gitjournal/screens/purchase_thankyou_screen.dart'; +import 'package:gitjournal/utils.dart'; import 'package:gitjournal/utils/logger.dart'; import 'package:provider/provider.dart'; import 'package:path/path.dart' as p; @@ -16,6 +18,7 @@ import 'package:easy_localization/easy_localization.dart'; import 'package:easy_localization_loader/easy_localization_loader.dart'; import 'package:git_bindings/git_bindings.dart'; +import 'package:quick_actions/quick_actions.dart'; import 'package:gitjournal/apis/git.dart'; import 'package:gitjournal/settings.dart'; @@ -31,7 +34,9 @@ import 'screens/onboarding_screens.dart'; import 'screens/settings_screen.dart'; import 'setup/screens.dart'; -class JournalApp extends StatelessWidget { +class JournalApp extends StatefulWidget { + final AppState appState; + static Future main(SharedPreferences pref) async { await Log.init(); @@ -68,7 +73,7 @@ class JournalApp extends StatelessWidget { return StateContainer(appState); }, child: ChangeNotifierProvider( - child: JournalApp(), + child: JournalApp(appState), create: (_) { assert(appState.notesFolder != null); return appState.notesFolder; @@ -127,6 +132,60 @@ class JournalApp extends StatelessWidget { static bool isInDebugMode = false; + JournalApp(this.appState); + + @override + _JournalAppState createState() => _JournalAppState(); +} + +class _JournalAppState extends State { + final _navigatorKey = GlobalKey(); + String _pendingShortcut; + + @override + void initState() { + super.initState(); + final QuickActions quickActions = QuickActions(); + quickActions.initialize((String shortcutType) { + Log.i("Quick Action Open: $shortcutType"); + if (_navigatorKey.currentState == null) { + Log.i("Quick Action delegating for after build"); + WidgetsBinding.instance + .addPostFrameCallback((_) => _afterBuild(context)); + setState(() { + _pendingShortcut = shortcutType; + }); + return; + } + _navigatorKey.currentState.pushNamed("/newNote/$shortcutType"); + }); + + quickActions.setShortcutItems([ + ShortcutItem( + type: 'Markdown', + localizedTitle: tr('actions.newNote'), + ), + ShortcutItem( + type: 'Checklist', + localizedTitle: tr('actions.newChecklist'), + ), + ShortcutItem( + type: 'Journal', + localizedTitle: tr('actions.newJournal'), + ), + ]); + + print("Nav key $_navigatorKey"); + } + + void _afterBuild(BuildContext context) { + print("_afterBuild $_pendingShortcut"); + if (_pendingShortcut != null) { + _navigatorKey.currentState.pushNamed("/newNote/$_pendingShortcut"); + _pendingShortcut = null; + } + } + @override Widget build(BuildContext context) { return DynamicTheme( @@ -149,6 +208,7 @@ class JournalApp extends StatelessWidget { return MaterialApp( key: const ValueKey("App"), + navigatorKey: _navigatorKey, title: 'GitJournal', localizationsDelegates: EasyLocalization.of(context).delegates, @@ -201,6 +261,17 @@ class JournalApp extends StatelessWidget { return PurchaseThankYouScreen(); } + if (route.startsWith('/newNote/')) { + var type = route.substring('/newNote/'.length); + var et = SettingsEditorType.fromInternalString(type).toEditorType(); + + Log.i("New Note - $route"); + Log.i("EditorType: $et"); + + var rootFolder = widget.appState.notesFolder; + return NoteEditor.newNote(getFolderForEditor(rootFolder, et), et); + } + assert(false, "Not found named route in _screenForRoute"); return null; } diff --git a/pubspec.lock b/pubspec.lock index 4cfe43b8..f93d03db 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -658,6 +658,13 @@ packages: url: "https://pub.dartlang.org" source: hosted version: "1.1.0" + quick_actions: + dependency: "direct main" + description: + name: quick_actions + url: "https://pub.dartlang.org" + source: hosted + version: "0.4.0+5" quiver: dependency: transitive description: diff --git a/pubspec.yaml b/pubspec.yaml index 5f6d78da..912c9d90 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -55,6 +55,7 @@ dependencies: image_picker: ^0.6.6+1 easy_localization: ^2.2.1 easy_localization_loader: ^0.0.2 + quick_actions: ^0.4.0+5 dev_dependencies: flutter_launcher_icons: "^0.7.2"