mirror of
https://github.com/GitJournal/GitJournal.git
synced 2025-06-29 02:07:39 +08:00
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
This commit is contained in:
@ -32,3 +32,7 @@ editors:
|
|||||||
editFileName: Edit File Name
|
editFileName: Edit File Name
|
||||||
tags: Edit Tags
|
tags: Edit Tags
|
||||||
pro: Pro
|
pro: Pro
|
||||||
|
actions:
|
||||||
|
newNote: New Note
|
||||||
|
newJournal: New Journal Entry
|
||||||
|
newChecklist: New Checklist
|
||||||
|
75
lib/app.dart
75
lib/app.dart
@ -5,8 +5,10 @@ import 'package:firebase_analytics/observer.dart';
|
|||||||
import 'package:flutter/material.dart';
|
import 'package:flutter/material.dart';
|
||||||
import 'package:gitjournal/analytics.dart';
|
import 'package:gitjournal/analytics.dart';
|
||||||
import 'package:gitjournal/screens/folder_listing.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_screen.dart';
|
||||||
import 'package:gitjournal/screens/purchase_thankyou_screen.dart';
|
import 'package:gitjournal/screens/purchase_thankyou_screen.dart';
|
||||||
|
import 'package:gitjournal/utils.dart';
|
||||||
import 'package:gitjournal/utils/logger.dart';
|
import 'package:gitjournal/utils/logger.dart';
|
||||||
import 'package:provider/provider.dart';
|
import 'package:provider/provider.dart';
|
||||||
import 'package:path/path.dart' as p;
|
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:easy_localization_loader/easy_localization_loader.dart';
|
||||||
|
|
||||||
import 'package:git_bindings/git_bindings.dart';
|
import 'package:git_bindings/git_bindings.dart';
|
||||||
|
import 'package:quick_actions/quick_actions.dart';
|
||||||
|
|
||||||
import 'package:gitjournal/apis/git.dart';
|
import 'package:gitjournal/apis/git.dart';
|
||||||
import 'package:gitjournal/settings.dart';
|
import 'package:gitjournal/settings.dart';
|
||||||
@ -31,7 +34,9 @@ import 'screens/onboarding_screens.dart';
|
|||||||
import 'screens/settings_screen.dart';
|
import 'screens/settings_screen.dart';
|
||||||
import 'setup/screens.dart';
|
import 'setup/screens.dart';
|
||||||
|
|
||||||
class JournalApp extends StatelessWidget {
|
class JournalApp extends StatefulWidget {
|
||||||
|
final AppState appState;
|
||||||
|
|
||||||
static Future main(SharedPreferences pref) async {
|
static Future main(SharedPreferences pref) async {
|
||||||
await Log.init();
|
await Log.init();
|
||||||
|
|
||||||
@ -68,7 +73,7 @@ class JournalApp extends StatelessWidget {
|
|||||||
return StateContainer(appState);
|
return StateContainer(appState);
|
||||||
},
|
},
|
||||||
child: ChangeNotifierProvider(
|
child: ChangeNotifierProvider(
|
||||||
child: JournalApp(),
|
child: JournalApp(appState),
|
||||||
create: (_) {
|
create: (_) {
|
||||||
assert(appState.notesFolder != null);
|
assert(appState.notesFolder != null);
|
||||||
return appState.notesFolder;
|
return appState.notesFolder;
|
||||||
@ -127,6 +132,60 @@ class JournalApp extends StatelessWidget {
|
|||||||
|
|
||||||
static bool isInDebugMode = false;
|
static bool isInDebugMode = false;
|
||||||
|
|
||||||
|
JournalApp(this.appState);
|
||||||
|
|
||||||
|
@override
|
||||||
|
_JournalAppState createState() => _JournalAppState();
|
||||||
|
}
|
||||||
|
|
||||||
|
class _JournalAppState extends State<JournalApp> {
|
||||||
|
final _navigatorKey = GlobalKey<NavigatorState>();
|
||||||
|
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>[
|
||||||
|
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
|
@override
|
||||||
Widget build(BuildContext context) {
|
Widget build(BuildContext context) {
|
||||||
return DynamicTheme(
|
return DynamicTheme(
|
||||||
@ -149,6 +208,7 @@ class JournalApp extends StatelessWidget {
|
|||||||
|
|
||||||
return MaterialApp(
|
return MaterialApp(
|
||||||
key: const ValueKey("App"),
|
key: const ValueKey("App"),
|
||||||
|
navigatorKey: _navigatorKey,
|
||||||
title: 'GitJournal',
|
title: 'GitJournal',
|
||||||
|
|
||||||
localizationsDelegates: EasyLocalization.of(context).delegates,
|
localizationsDelegates: EasyLocalization.of(context).delegates,
|
||||||
@ -201,6 +261,17 @@ class JournalApp extends StatelessWidget {
|
|||||||
return PurchaseThankYouScreen();
|
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");
|
assert(false, "Not found named route in _screenForRoute");
|
||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
|
@ -658,6 +658,13 @@ packages:
|
|||||||
url: "https://pub.dartlang.org"
|
url: "https://pub.dartlang.org"
|
||||||
source: hosted
|
source: hosted
|
||||||
version: "1.1.0"
|
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:
|
quiver:
|
||||||
dependency: transitive
|
dependency: transitive
|
||||||
description:
|
description:
|
||||||
|
@ -55,6 +55,7 @@ dependencies:
|
|||||||
image_picker: ^0.6.6+1
|
image_picker: ^0.6.6+1
|
||||||
easy_localization: ^2.2.1
|
easy_localization: ^2.2.1
|
||||||
easy_localization_loader: ^0.0.2
|
easy_localization_loader: ^0.0.2
|
||||||
|
quick_actions: ^0.4.0+5
|
||||||
|
|
||||||
dev_dependencies:
|
dev_dependencies:
|
||||||
flutter_launcher_icons: "^0.7.2"
|
flutter_launcher_icons: "^0.7.2"
|
||||||
|
Reference in New Issue
Block a user