8 Commits

Author SHA1 Message Date
442403b5b9 DO save empty todo 2025-04-21 23:38:06 +02:00
ad767ac33a Fix backspace delete 2025-04-21 23:33:15 +02:00
1051805463 Fix the double escape bug 2025-04-21 23:04:40 +02:00
173c4fbee2 Auto focus new entry 2025-04-21 22:36:54 +02:00
d06a8d6698 Implement commit sudoku button 2025-04-21 22:35:53 +02:00
d788c110a7 TODO 2025-04-21 22:33:02 +02:00
41e2922bfb Make 20 minutes instead of 60 2025-04-21 22:28:25 +02:00
a07ba1109c Make release script 2025-04-21 22:28:10 +02:00
3 changed files with 100 additions and 13 deletions

View File

@@ -7,7 +7,12 @@ import 'package:system_tray/system_tray.dart';
import 'package:window_manager/window_manager.dart';
import 'package:audioplayers/audioplayers.dart';
const Duration popupInterval = Duration(hours: 1);
// TODO: Add an icon to the executable, simply use the existing tray icon
// TODO: Add an entry field for the duration ie. the interval of apperance
// TODO: Also the sound file, if possible...
// TODO: Cram the above into the database
const Duration popupInterval = Duration(minutes: 20);
const String notificationSound = 'MeetTheSniper.mp3';
void main() async {
@@ -116,16 +121,18 @@ class MainPage extends StatefulWidget {
const MainPage({super.key});
@override
State<MainPage> createState() => _MainPageState();
State<MainPage> createState() => MainPageState();
}
class _MainPageState extends State<MainPage> with WindowListener {
class MainPageState extends State<MainPage> with WindowListener {
final SystemTray _systemTray = SystemTray();
final Menu _menu = Menu();
final AudioPlayer _audioPlayer = AudioPlayer();
final TextEditingController _previousEntryController =
TextEditingController();
final TextEditingController _currentEntryController = TextEditingController();
final FocusNode _currentEntryFocusNode = FocusNode();
final TextEditingController _todoController = TextEditingController();
Note? previousNote;
@@ -151,6 +158,7 @@ class _MainPageState extends State<MainPage> with WindowListener {
_debounceTimer?.cancel();
_previousEntryController.dispose();
_currentEntryController.dispose();
_currentEntryFocusNode.dispose();
_todoController.dispose();
_audioPlayer.dispose();
super.dispose();
@@ -172,9 +180,22 @@ class _MainPageState extends State<MainPage> with WindowListener {
await _systemTray.initSystemTray(iconPath: iconPath, toolTip: "Journaler");
await _menu.buildFrom([
MenuItemLabel(
label: 'Commit Sudoku',
onClicked: (menuItem) => windowManager.destroy(),
),
]);
await _systemTray.setContextMenu(_menu);
_systemTray.registerSystemTrayEventHandler((eventName) {
debugPrint("System Tray Event: $eventName");
if (eventName == kSystemTrayEventClick) {
_showWindow();
} else if (eventName == kSystemTrayEventRightClick) {
_systemTray.popUpContextMenu();
}
});
}
@@ -192,9 +213,11 @@ class _MainPageState extends State<MainPage> with WindowListener {
await windowManager.center();
await windowManager.show();
await windowManager.focus();
_currentEntryFocusNode.requestFocus();
await _playSound();
} else {
await windowManager.focus();
_currentEntryFocusNode.requestFocus();
}
}
@@ -237,13 +260,17 @@ class _MainPageState extends State<MainPage> with WindowListener {
@override
Widget build(BuildContext context) {
return KeyboardListener(
focusNode: FocusNode(),
autofocus: true,
onKeyEvent: (event) {
if (event is KeyDownEvent &&
// Wrap Scaffold with RawKeyboardListener as workaround for Escape key
return RawKeyboardListener(
focusNode: FocusNode(), // Needs its own node
onKey: (RawKeyEvent event) {
if (event is RawKeyDownEvent &&
event.logicalKey == LogicalKeyboardKey.escape) {
debugPrint("Escape key pressed - hiding window.");
debugPrint(
"Escape pressed inside MainPage (RawKeyboardListener - Workaround)",
);
// Call method directly since we are in the state
FocusManager.instance.primaryFocus?.unfocus(); // Keep unfocus attempt
onWindowClose();
}
},
@@ -274,6 +301,7 @@ class _MainPageState extends State<MainPage> with WindowListener {
Expanded(
child: TextField(
controller: _currentEntryController,
focusNode: _currentEntryFocusNode,
maxLines: null,
expands: true,
autofocus: true,
@@ -312,3 +340,5 @@ class _MainPageState extends State<MainPage> with WindowListener {
);
}
}
// --- End Actions and Shortcuts ---

View File

@@ -57,8 +57,5 @@ Future<Todo?> getLatestTodo() async {
}
Future<void> createTodo(String content) async {
if (content.isEmpty) {
return;
}
await DB.db.insert('todos', {'content': content});
}

60
release.sh Normal file
View File

@@ -0,0 +1,60 @@
#!/bin/bash
echo "Figuring out the tag..."
TAG=$(git describe --tags --exact-match 2>/dev/null || echo "")
if [ -z "$TAG" ]; then
# Get the latest tag
LATEST_TAG=$(git describe --tags $(git rev-list --tags --max-count=1))
# Increment the patch version
IFS='.' read -r -a VERSION_PARTS <<< "$LATEST_TAG"
VERSION_PARTS[2]=$((VERSION_PARTS[2]+1))
TAG="${VERSION_PARTS[0]}.${VERSION_PARTS[1]}.${VERSION_PARTS[2]}"
# Create a new tag
git tag $TAG
git push origin $TAG
fi
echo "Tag: $TAG"
echo "Building the thing..."
flutter build windows --release
flutter build apk --release
echo "Creating a release..."
TOKEN="$GITEA_API_KEY"
GITEA="https://git.site.quack-lab.dev"
REPO="dave/journaler"
ZIP="journaler-${TAG}.zip"
APK="journaler-${TAG}.apk"
# Create a release
RELEASE_RESPONSE=$(curl -s -X POST \
-H "Authorization: token $TOKEN" \
-H "Accept: application/json" \
-H "Content-Type: application/json" \
-d '{
"tag_name": "'"$TAG"'",
"name": "'"$TAG"'",
"draft": false,
"prerelease": false
}' \
$GITEA/api/v1/repos/$REPO/releases)
# Extract the release ID
echo $RELEASE_RESPONSE
RELEASE_ID=$(echo $RELEASE_RESPONSE | awk -F'"id":' '{print $2+0; exit}')
echo "Release ID: $RELEASE_ID"
echo "Uploading the things..."
WINRELEASE="./build/windows/x64/runner/Release/"
7z a $WINRELEASE/$ZIP $WINRELEASE/*
curl -X POST \
-H "Authorization: token $TOKEN" \
-F "attachment=@$WINRELEASE/$ZIP" \
"$GITEA/api/v1/repos/$REPO/releases/${RELEASE_ID}/assets?name=$ZIP"
rm $WINRELEASE/$ZIP
ANDROIDRELEASE="./build/app/outputs/flutter-apk/"
mv $ANDROIDRELEASE/app-release.apk $ANDROIDRELEASE/$APK
curl -X POST \
-H "Authorization: token $TOKEN" \
-F "attachment=@$ANDROIDRELEASE/$APK" \
"$GITEA/api/v1/repos/$REPO/releases/${RELEASE_ID}/assets?name=$APK"