aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--lib/main.dart9
-rw-r--r--lib/views/info_view.dart14
-rw-r--r--lib/views/main_view.dart3
-rw-r--r--lib/views/recipe_view.dart25
-rw-r--r--lib/views/week_view.dart17
5 files changed, 17 insertions, 51 deletions
diff --git a/lib/main.dart b/lib/main.dart
index 9bbfe49..f7b3aca 100644
--- a/lib/main.dart
+++ b/lib/main.dart
@@ -15,9 +15,12 @@ import 'package:flutter_gen/gen_l10n/app_localizations.dart';
void main() async {
WidgetsFlutterBinding.ensureInitialized();
- const AndroidInitializationSettings initializationSettingsAndroid = AndroidInitializationSettings("@mipmap/notification_icon");
- final InitializationSettings initializationSettings = InitializationSettings(android: initializationSettingsAndroid);
- await Notifications.flutterLocalNotificationsPlugin.initialize(initializationSettings, onSelectNotification: Notifications.selectNotification);
+ const AndroidInitializationSettings initializationSettingsAndroid =
+ AndroidInitializationSettings("@mipmap/notification_icon");
+ final InitializationSettings initializationSettings =
+ InitializationSettings(android: initializationSettingsAndroid);
+ await Notifications.flutterLocalNotificationsPlugin
+ .initialize(initializationSettings);
await RecipeData.load();
await SettingsData.load();
diff --git a/lib/views/info_view.dart b/lib/views/info_view.dart
index 04c3887..bda2d14 100644
--- a/lib/views/info_view.dart
+++ b/lib/views/info_view.dart
@@ -14,8 +14,9 @@ class InfoView extends StatefulWidget {
}
class _InfoViewState extends State<InfoView> {
+ String name = "David Penkowoj";
String websiteURL = "https://davidpenkowoj.de";
- String sourceCodeURL = "http://git.davidpenkowoj.de/kulinar_app.git";
+ String sourceCodeURL = "https://git.davidpenkowoj.de/kulinar_app.git";
String privacyNoticeURL = "https://davidpenkowoj.de/static/files/privacy-notice.html";
@override
@@ -35,7 +36,7 @@ class _InfoViewState extends State<InfoView> {
),
ListTile(
title: Text(AppLocalizations.of(context)!.info2, style: cDefaultTextStyle),
- subtitle: Text("David Penkowoj", style: cDetailsTextStyle),
+ subtitle: Text(name, style: cDetailsTextStyle),
),
ListTile(
title: Text(AppLocalizations.of(context)!.info3, style: cDefaultTextStyle),
@@ -76,15 +77,6 @@ class _InfoViewState extends State<InfoView> {
},
),
),
-/* ListTile(
- title: Text(AppLocalizations.of(context)!.info7, style: cDefaultTextStyle),
- trailing: IconButton(
- icon: Icon(Icons.launch_rounded),
- onPressed: () {
- Navigator.push(context, SlideFromRightRoute(child: ChangelogView()));
- },
- ),
- ), */
],
),
);
diff --git a/lib/views/main_view.dart b/lib/views/main_view.dart
index 97ad04e..759e423 100644
--- a/lib/views/main_view.dart
+++ b/lib/views/main_view.dart
@@ -33,7 +33,8 @@ class _MainViewState extends State<MainView> with SingleTickerProviderStateMixin
super.initState();
getOpenFileUrl();
WidgetsBinding.instance.addObserver(this);
- _tabController = TabController(length: 2, vsync: this);
+ _tabController = TabController(length: 2, vsync: this, initialIndex: 1);
+ // TODO: Make initialIndex a setting and maybe remember during app use
}
@override
diff --git a/lib/views/recipe_view.dart b/lib/views/recipe_view.dart
index 92a50b7..f512770 100644
--- a/lib/views/recipe_view.dart
+++ b/lib/views/recipe_view.dart
@@ -16,7 +16,6 @@ import 'package:flutter_markdown/flutter_markdown.dart';
import 'package:path_provider/path_provider.dart';
import 'package:image_picker/image_picker.dart';
import 'package:share_plus/share_plus.dart';
-import 'package:http/http.dart';
import 'package:flutter_gen/gen_l10n/app_localizations.dart';
@@ -131,7 +130,7 @@ class _RecipeViewState extends State<RecipeView> {
setState(() {});
}
- // TODO: FIXME: This might introduce bugs later (sanetize); maybe use FileHandler?
+ // TODO: FIXME: This might introduce bugs later (sanitize); maybe use FileHandler?
void downloadRecipe(BuildContext context, Recipe recipe) async {
RecipeData.recipeList.add(recipe);
ToastBar.showToastBar(context, AppLocalizations.of(context)!.downloadSuccess);
@@ -292,7 +291,7 @@ class _RecipeViewState extends State<RecipeView> {
if (_ingredients.isEmpty) {
// TODO: translation
- widget.showToastCallback!("No ingredients found", "");
+ widget.showToastCallback!("No ingredients found", "", () {});
return;
}
@@ -308,30 +307,12 @@ class _RecipeViewState extends State<RecipeView> {
if (widget.showToastCallback != null) {
// TODO: translation
- widget.showToastCallback!("Added to Shoplist", "");
+ widget.showToastCallback!("Added to Shoplist", "", () {});
}
}
void _uploadRecipe(BuildContext context) async {
return;
-
- Map<String, String> _headers = {"Content-Type": "application/json; charset=UTF-8"};
- String _body = _unsavedRecipe.toJsonString();
- Response? res;
-
- try {
- res = await post(Uri.https(SettingsData.settings["serverURL"]!, "/"), headers: _headers, body: _body);
- } catch (e) {
- print(e);
- } finally {
- if (res != null && res.statusCode == 200) {
- ToastBar.showToastBar(context, AppLocalizations.of(context)!.uploadSuccess);
- } else {
- ToastBar.showToastBar(context, AppLocalizations.of(context)!.uploadError);
- }
-
- setState(() {});
- }
}
List<Widget> _buildAppBarActions(BuildContext context, Recipe recipe) {
diff --git a/lib/views/week_view.dart b/lib/views/week_view.dart
index 8ea43a4..23d71b8 100644
--- a/lib/views/week_view.dart
+++ b/lib/views/week_view.dart
@@ -36,7 +36,9 @@ class _WeekViewState extends State<WeekView> {
setState(() {});
},
child: ListView(
- children: _buildRecipeCardsFromString(snapshot.data.body),
+ children: [
+ Text("Not implemented"), // TODO: Not implemented
+ ],
),
);
},
@@ -58,19 +60,6 @@ class _WeekViewState extends State<WeekView> {
}
}
- List<Widget> _buildRecipeCardsFromString(String string) {
- List<Widget> _list = [];
- RecipeData.remoteRecipeList.clear();
-
- for (dynamic _entry in jsonDecode(string)) {
- Recipe _recipe = Recipe.fromJson(jsonEncode(_entry));
- RecipeData.remoteRecipeList.add(_recipe);
- _list.add(RecipeCard(remote: true, recipe: _recipe));
- }
-
- return _list;
- }
-
Future<Null> _retry() async {
await Future.delayed(Duration(milliseconds: 300));
generated by cgit v1.2.3 (git 2.39.1) at 2024-09-20 05:33:39 +0000