RomanNum3ral
/
ollama-app
mirror of https://github.com/JHubi1/ollama-app.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Added warning before new chat

This commit is contained in:
JHubi1 2024-05-29 12:42:44 +02:00
parent a1a59f225f
commit 1bbc0e2a8a
No known key found for this signature in database
GPG Key ID: 7BF82570CBBBD050
6 changed files with 177 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
README.md
View File

@ -36,7 +36,7 @@ That's it, you can now just chat. Enter a message into the box at the bottom and
## Side Menu
The button on the top left opens the menu. In it, you have two options for now: `New Chat` and `Settings`. The first option clears the chat (-> creates a new one), and the second one reopens the host dialog from the initial start of the app to adapt to changing hosts.
The button on the top left opens the menu. In it, you have three options: `New Chat`, `Ask before Deletion` and `Set Host`. The first option clears the chat (-> creates a new one), the second one opens a new dialog that has a toggle you can toggle if you don't want to be asked or want to be asked again before deleting a chat, and the third option reopens the host dialog from the initial start of the app to adapt to changing hosts.
![side menu](assets/screenshots/other/s02.png)

BIN
assets/screenshots/other/s02.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 12 KiB

After

Width:  |  Height:  |  Size: 14 KiB

47
lib/l10n/app_de.arb
View File

@ -5,16 +5,21 @@
"description": "Title of the application",
"context": "Visible in the side bar"
},
"optionSettings": "Einstellungen",
"@optionSettings": {
"description": "Text displayed for settings option",
"context": "Visible in the side bar"
},
"optionNewChat": "Neuer Chat",
"@optionNewChat": {
"description": "Text displayed for new chat option",
"context": "Visible in the side bar"
},
"optionSetHost": "Host Setzen",
"@optionSetHost": {
"description": "Text displayed for set host option",
"context": "Visible in the side bar"
},
"optionSetAskDeletion": "Vor dem Löschen fragen",
"@optionSetAskDeletion": {
"description": "Text displayed for ask before deletion option",
"context": "Visible in the side bar"
},
"takeImage": "Bild Aufnehmen",
"@takeImage": {
"description": "Text displayed for take image button",
@ -35,7 +40,7 @@
"description": "Text displayed when no model is selected",
"context": "Visible in the chat view"
},
"hostDialogTitle": "Host Festlegen",
"hostDialogTitle": "Host Setzen",
"@hostDialogTitle": {
"description": "Title of the host dialog",
"context": "Visible in the host dialog"
@ -60,6 +65,11 @@
"description": "Text displayed for save host button, should be capitalized",
"context": "Visible in the host dialog"
},
"hostDialogCancel": "Abbrechen",
"@hostDialogCancel": {
"description": "Text displayed for cancel button, should be capitalized",
"context": "Visible in the host dialog"
},
"noSelectedModel": "<selektor>",
"@noSelectedModel": {
"description": "Text displayed when no model is selected",
@ -74,5 +84,30 @@
"@modelDialogAddSteps": {
"description": "Steps to add a new model",
"context": "Visible in the model dialog"
},
"deleteDialogTitle": "Löschen Bestätigen",
"@deleteDialogTitle": {
"description": "Title of the delete dialog",
"context": "Visible in the delete dialog"
},
"deleteDialogDescription": "Bist du sicher, dass du fortfahren möchtest? Dies wird alle Erinnerungen dieses Chats löschen und kann nicht rückgängig gemacht werden.",
"@deleteDialogDescription": {
"description": "Description of the delete dialog",
"context": "Visible in the delete dialog"
},
"deleteDialogDelete": "Löschen",
"@deleteDialogDelete": {
"description": "Text displayed for delete button, should be capitalized",
"context": "Visible in the delete dialog"
},
"deleteDialogCancel": "Abbrechen",
"@deleteDialogCancel": {
"description": "Text displayed for cancel button, should be capitalized",
"context": "Visible in the delete dialog"
},
"deleteDialogAskAlways": "Jedesmal nachfragen",
"@deleteDialogAskAlways": {
"description": "Text displayed for ask me always again checkbox",
"context": "Visible in the delete dialog"
}
}

40
lib/l10n/app_en.arb
View File

@ -5,16 +5,21 @@
"description": "Title of the application",
"context": "Visible in the side bar"
},
"optionSettings": "Settings",
"@optionSettings": {
"description": "Text displayed for settings option",
"context": "Visible in the side bar"
},
"optionNewChat": "New Chat",
"@optionNewChat": {
"description": "Text displayed for new chat option",
"context": "Visible in the side bar"
},
"optionSetHost": "Set Host",
"@optionSetHost": {
"description": "Text displayed for set host option",
"context": "Visible in the side bar"
},
"optionSetAskDeletion": "Ask before Deletion",
"@optionSetAskDeletion": {
"description": "Text displayed for ask before deletion option",
"context": "Visible in the side bar"
},
"takeImage": "Take Image",
"@takeImage": {
"description": "Text displayed for take image button",
@ -79,5 +84,30 @@
"@modelDialogAddSteps": {
"description": "Steps to add a new model",
"context": "Visible in the model dialog"
},
"deleteDialogTitle": "Confirm Deletion",
"@deleteDialogTitle": {
"description": "Title of the delete dialog",
"context": "Visible in the delete dialog"
},
"deleteDialogDescription": "Are you sure you want to continue? This will wipe all memory of this chat and cannot be undone.",
"@deleteDialogDescription": {
"description": "Description of the delete dialog",
"context": "Visible in the delete dialog"
},
"deleteDialogDelete": "Delete",
"@deleteDialogDelete": {
"description": "Text displayed for delete button, should be capitalized",
"context": "Visible in the delete dialog"
},
"deleteDialogCancel": "Cancel",
"@deleteDialogCancel": {
"description": "Text displayed for cancel button, should be capitalized",
"context": "Visible in the delete dialog"
},
"deleteDialogAskAlways": "Ask me every time",
"@deleteDialogAskAlways": {
"description": "Text displayed for ask me always again checkbox",
"context": "Visible in the delete dialog"
}
}

17
lib/main.dart
View File

@ -209,7 +209,7 @@ class _MainAppState extends State<MainApp> {
onPressed: () {
HapticFeedback.selectionClick();
if (!chatAllowed) return;
messages = [];
deleteChat(context, setState);
setState(() {});
},
icon: const Icon(Icons.restart_alt_rounded))
@ -497,9 +497,12 @@ class _MainAppState extends State<MainApp> {
HapticFeedback.selectionClick();
Navigator.of(context).pop();
if (!chatAllowed) return;
messages = [];
setState(() {});
deleteChat(context, setState);
} else if (value == 2) {
HapticFeedback.selectionClick();
Navigator.of(context).pop();
setAskBeforeDeletion(context, setState);
} else if (value == 3) {
HapticFeedback.selectionClick();
Navigator.of(context).pop();
if (!chatAllowed) return;
@ -517,11 +520,15 @@ class _MainAppState extends State<MainApp> {
NavigationDrawerDestination(
icon: const Icon(Icons.add_rounded),
label: Text(AppLocalizations.of(context)!.optionNewChat)),
NavigationDrawerDestination(
icon: const Icon(Icons.live_help_rounded),
label:
Text(AppLocalizations.of(context)!.optionSetAskDeletion)),
(useHost)
? const SizedBox.shrink()
: NavigationDrawerDestination(
icon: const Icon(Icons.settings_rounded),
label: Text(AppLocalizations.of(context)!.optionSettings))
icon: const Icon(Icons.dns_rounded),
label: Text(AppLocalizations.of(context)!.optionSetHost)),
]));
}
}

97
lib/worker_setter.dart
View File

@ -52,6 +52,14 @@ void setHost(BuildContext context, [bool force = true]) {
hintText: "http://example.com:8080"))
]),
actions: [
!force
? TextButton(
onPressed: () {
Navigator.of(context).pop();
},
child: Text(
AppLocalizations.of(context)!.hostDialogCancel))
: const SizedBox.shrink(),
TextButton(
onPressed: () async {
setState(() {
@ -108,15 +116,7 @@ void setHost(BuildContext context, [bool force = true]) {
}
},
child:
Text(AppLocalizations.of(context)!.hostDialogSave)),
!force
? TextButton(
onPressed: () {
Navigator.of(context).pop();
},
child: Text(
AppLocalizations.of(context)!.hostDialogCancel))
: const SizedBox.shrink()
Text(AppLocalizations.of(context)!.hostDialogSave))
]))));
}
@ -269,3 +269,82 @@ void setModel(BuildContext context, Function setState) {
});
});
}
void deleteChat(BuildContext context, Function setState) {
if (prefs!.getBool("askBeforeDeletion") ?? true && messages.isNotEmpty) {
showDialog(
context: context,
builder: (context) {
return StatefulBuilder(builder: (context, setLocalState) {
return AlertDialog(
title: Text(AppLocalizations.of(context)!.deleteDialogTitle),
content: Column(mainAxisSize: MainAxisSize.min, children: [
Text(AppLocalizations.of(context)!.deleteDialogDescription),
Row(
crossAxisAlignment: CrossAxisAlignment.center,
mainAxisAlignment: MainAxisAlignment.end,
children: [
Text(AppLocalizations.of(context)!
.deleteDialogAskAlways),
const Expanded(child: SizedBox()),
Switch(
value: prefs!.getBool("askBeforeDeletion") ?? true,
onChanged: (value) {
prefs!.setBool("askBeforeDeletion", value);
setLocalState(() {});
},
)
])
]),
actions: [
TextButton(
onPressed: () {
HapticFeedback.selectionClick();
Navigator.of(context).pop();
},
child: Text(
AppLocalizations.of(context)!.deleteDialogCancel)),
TextButton(
onPressed: () {
HapticFeedback.selectionClick();
Navigator.of(context).pop();
messages = [];
setState(() {});
},
child: Text(
AppLocalizations.of(context)!.deleteDialogDelete))
]);
});
});
} else {
messages = [];
setState(() {});
}
}
void setAskBeforeDeletion(BuildContext context, Function setState) {
showDialog(
context: context,
builder: (context) {
return StatefulBuilder(builder: (context, setLocalState) {
return Dialog(
child: Padding(
padding: const EdgeInsets.all(16),
child: Row(
crossAxisAlignment: CrossAxisAlignment.center,
mainAxisAlignment: MainAxisAlignment.end,
children: [
Text(AppLocalizations.of(context)!
.deleteDialogAskAlways),
const Expanded(child: SizedBox()),
Switch(
value: prefs!.getBool("askBeforeDeletion") ?? true,
onChanged: (value) {
prefs!.setBool("askBeforeDeletion", value);
setLocalState(() {});
},
)
])));
});
});
}