Skip to content
This repository was archived by the owner on Sep 14, 2024. It is now read-only.
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified android/app/src/main/res/drawable-hdpi/ic_launcher_foreground.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified android/app/src/main/res/drawable-mdpi/ic_launcher_foreground.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
<item>
<bitmap android:gravity="fill" android:src="@drawable/background"/>
</item>
</layer-list>
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
6 changes: 6 additions & 0 deletions android/app/src/main/res/drawable-night/launch_background.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
<item>
<bitmap android:gravity="fill" android:src="@drawable/background"/>
</item>
</layer-list>
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
6 changes: 6 additions & 0 deletions android/app/src/main/res/drawable-v21/launch_background.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
<item>
<bitmap android:gravity="fill" android:src="@drawable/background"/>
</item>
</layer-list>
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added android/app/src/main/res/drawable/background.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
12 changes: 3 additions & 9 deletions android/app/src/main/res/drawable/launch_background.xml
Original file line number Diff line number Diff line change
@@ -1,12 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- Modify this file to customize your launch splash screen -->
<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
<item android:drawable="@android:color/white" />

<!-- You can insert your own image assets here -->
<!-- <item>
<bitmap
android:gravity="center"
android:src="@mipmap/launch_image" />
</item> -->
<item>
<bitmap android:gravity="fill" android:src="@drawable/background"/>
</item>
</layer-list>
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
<background android:drawable="@color/ic_launcher_background"/>
<background android:drawable="@drawable/ic_launcher_background"/>
<foreground android:drawable="@drawable/ic_launcher_foreground"/>
</adaptive-icon>
Binary file modified android/app/src/main/res/mipmap-hdpi/launcher_icon.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified android/app/src/main/res/mipmap-mdpi/launcher_icon.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified android/app/src/main/res/mipmap-xhdpi/launcher_icon.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified android/app/src/main/res/mipmap-xxhdpi/launcher_icon.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified android/app/src/main/res/mipmap-xxxhdpi/launcher_icon.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
21 changes: 21 additions & 0 deletions android/app/src/main/res/values-night-v31/styles.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<!-- Theme applied to the Android Window while the process is starting when the OS's Dark Mode setting is off -->
<style name="LaunchTheme" parent="@android:style/Theme.Black.NoTitleBar">
<item name="android:forceDarkAllowed">false</item>
<item name="android:windowFullscreen">false</item>
<item name="android:windowDrawsSystemBarBackgrounds">false</item>
<item name="android:windowLayoutInDisplayCutoutMode">shortEdges</item>
<item name="android:windowSplashScreenBackground">#1a1c1e</item>
<item name="android:windowSplashScreenIconBackgroundColor">#1a1c1e</item>
</style>
<!-- Theme applied to the Android Window as soon as the process has started.
This theme determines the color of the Android Window while your
Flutter UI initializes, as well as behind your Flutter UI while its
running.

This Theme is only used starting with V2 of Flutter's Android embedding. -->
<style name="NormalTheme" parent="@android:style/Theme.Black.NoTitleBar">
<item name="android:windowBackground">?android:colorBackground</item>
</style>
</resources>
22 changes: 22 additions & 0 deletions android/app/src/main/res/values-night/styles.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<!-- Theme applied to the Android Window while the process is starting when the OS's Dark Mode setting is on -->
<style name="LaunchTheme" parent="@android:style/Theme.Black.NoTitleBar">
<!-- Show a splash screen on the activity. Automatically removed when
the Flutter engine draws its first frame -->
<item name="android:windowBackground">@drawable/launch_background</item>
<item name="android:forceDarkAllowed">false</item>
<item name="android:windowFullscreen">false</item>
<item name="android:windowDrawsSystemBarBackgrounds">false</item>
<item name="android:windowLayoutInDisplayCutoutMode">shortEdges</item>
</style>
<!-- Theme applied to the Android Window as soon as the process has started.
This theme determines the color of the Android Window while your
Flutter UI initializes, as well as behind your Flutter UI while its
running.
This Theme is only used starting with V2 of Flutter's Android embedding. -->
<style name="NormalTheme" parent="@android:style/Theme.Black.NoTitleBar">
<item name="android:windowBackground">?android:colorBackground</item>
</style>
</resources>
21 changes: 21 additions & 0 deletions android/app/src/main/res/values-v31/styles.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<!-- Theme applied to the Android Window while the process is starting when the OS's Dark Mode setting is off -->
<style name="LaunchTheme" parent="@android:style/Theme.Light.NoTitleBar">
<item name="android:forceDarkAllowed">false</item>
<item name="android:windowFullscreen">false</item>
<item name="android:windowDrawsSystemBarBackgrounds">false</item>
<item name="android:windowLayoutInDisplayCutoutMode">shortEdges</item>
<item name="android:windowSplashScreenBackground">#fcfcff</item>
<item name="android:windowSplashScreenIconBackgroundColor">#fcfcff</item>
</style>
<!-- Theme applied to the Android Window as soon as the process has started.
This theme determines the color of the Android Window while your
Flutter UI initializes, as well as behind your Flutter UI while its
running.

This Theme is only used starting with V2 of Flutter's Android embedding. -->
<style name="NormalTheme" parent="@android:style/Theme.Light.NoTitleBar">
<item name="android:windowBackground">?android:colorBackground</item>
</style>
</resources>
Binary file removed assets/adaptive_foreground.png
Binary file not shown.
76 changes: 58 additions & 18 deletions assets/i18n/en.json
Original file line number Diff line number Diff line change
@@ -1,10 +1,18 @@
{
"app_bar": {
"search": "Search",
"refresh": "Refresh",
"logout": "Logout",
"clear_all": "Clear all"
},
"alert": {
"discard": "Discard",
"clear": "Clear"
},
"form": {
"validators": {
"invalid_number": "not a valid number",
"required": "required"
}
},
"login": {
"title": "Login",
"server_url": {
Expand Down Expand Up @@ -46,6 +54,12 @@
"categories": {
"title": "Cookbook",
"all_categories": "All",
"uncategorized": "Uncategorized",
"items": {
"0": "no items",
"1": "1 item",
"else": "{{value}} items"
},
"drawer": {
"import": "Import Recipe",
"settings": "Settings"
Expand All @@ -71,18 +85,21 @@
"cook": "Cooking time",
"total": "Total time",
"fields": {
"name": "Recipe Name:",
"description": "Recipe Description:",
"keywords": "Keywords:",
"category": "Category:",
"servings": "Servings:",
"source": "Source:",
"name": "Recipe Name",
"description": "Recipe Description",
"keywords": "Keywords",
"category": "Category",
"servings": {
"1": "Serving",
"else": "Servings"
},
"source": "Source",
"source_button": "Source",
"image": "Image:",
"image": "Image",
"time": {
"prep": "Preparation time:",
"cook": "Cooking time:",
"total": "Total time:",
"prep": "Preparation time",
"cook": "Cooking time",
"total": "Total time",
"hours": "Hours",
"minutes": "Minutes"
},
Expand All @@ -103,9 +120,11 @@
"unsaturatedFatContent": "Unsaturated-fat content"
}
},
"tools": "Tools:",
"ingredients": "Ingredients:",
"instructions": "Instructions:"
"general": "General",
"times": "Times",
"tools": "Tools",
"ingredients": "Ingredients",
"instructions": "Instructions"
},
"errors": {
"load_failed": "Failed to load Recipe!"
Expand All @@ -116,26 +135,42 @@
"button": "Save",
"errors": {
"update_failed": "Update Failed {error_msg}"
},
"delete": {
"title": "Delete Recipe",
"dialog": "Are you sure you want to permanently delete {recipe}?"
}
},
"recipe_create": {
"title": "Create Recipe",
"button": "Create",
"add_field": "add",
"remove_field": "remove",
"errors": {
"update_failed": "Create Failed {error_msg}"
}
},
"recipe_form": {
"dismiss_edit": {
"title": "Cancel edit",
"dialog": "Are you sure you want to discard your changes to {recipe}?"
},
"dismiss_create": {
"title": "Cancel create",
"dialog": "Are you sure you want to discard the creation?"
}
},
"recipe_import": {
"title": "Import Recipe",
"button": "Import",
"field": "URL to Recipe",
"clipboard": "Paste Clipboard",
"errors": {
"import_failed": "Import Failed {error_msg}"
}
},
"search": {
"title": "Search Recipe",
"description": "Search for recipes by name or keyword",
"nothing_found": "No recipe found!",
"errors": {
"search_failed": "Unable to load all Recipes!\n{error_msg}"
Expand All @@ -145,8 +180,13 @@
"title": "Your timers",
"started": "Timer started.",
"finished": "is finished.",
"button": {
"start": "start timer",
"cancel": "cancel timer"
},
"done": "Timer is done.",
"missing": "You need to set the cooking time to use a timer."
"missing": "You need to set the cooking time to use a timer.",
"empty_list": "Your running timers will be shown here."
},
"settings": {
"title": "App Settings",
Expand All @@ -172,4 +212,4 @@
"subtitle": "Changes the font size of category title. This can be useful if you have long category names."
}
}
}
}
Binary file removed assets/icon.png
Binary file not shown.
Binary file added assets/launcher/adaptive_background.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/launcher/adaptive_foreground.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/launcher/icon.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
7 changes: 4 additions & 3 deletions docker-compose.yaml
Original file line number Diff line number Diff line change
@@ -1,18 +1,19 @@
version: '3.8'
services:
nextcloud:
image: lscr.io/linuxserver/nextcloud:22.2.3
image: lscr.io/linuxserver/nextcloud:latest
container_name: plugin_development
environment:
- PUID=1000
- PGID=1000
- TZ=Europe/London
- COOKBOOK=0.9.8
- COOKBOOK=0.10.2
volumes:
- /config
- /data
- ./docker/data:/config/www/nextcloud/data/preset
- ./docker/80-setup:/etc/cont-init.d/80-setup
- ./docker/80-setup:/custom-cont-init.d/80-setup:ro
- ./docker/setup_library:/etc/setup_library:ro
ports:
- 443:443
- 80:80
6 changes: 1 addition & 5 deletions docker/80-setup
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,4 @@ tar -zxf /config/www/nextcloud/apps/Cookbook-"${COOKBOOK}".tar.gz -C /config/www
rm /config/www/nextcloud/apps/Cookbook-"${COOKBOOK}".tar.gz
occ app:enable cookbook

# Setup Cookbook Library
rm -R /config/www/nextcloud/data/admin/files
cp -R /config/www/nextcloud/data/preset /config/www/nextcloud/data/admin/files
chown abc:users -R /config/www/nextcloud/data/admin/files/
occ files:scan admin
bash /etc/setup_library
7 changes: 7 additions & 0 deletions docker/setup_library
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
#!/usr/bin/with-contenv bash

# Setup Cookbook Library
rm -R /config/www/nextcloud/data/admin/files
cp -R /config/www/nextcloud/data/preset /config/www/nextcloud/data/admin/files
chown abc:users -R /config/www/nextcloud/data/admin/files/
occ files:scan admin
7 changes: 7 additions & 0 deletions flutter_launcher_icons.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
flutter_icons:
android: "launcher_icon"
ios: true
remove_alpha_ios: true
image_path: "assets/launcher/icon.png"
adaptive_icon_background: "assets/launcher/adaptive_background.png"
adaptive_icon_foreground: "assets/launcher/adaptive_foreground.png"
10 changes: 10 additions & 0 deletions flutter_native_splash.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
flutter_native_splash:
color: "#fcfcff"
color_dark: "#1a1c1e"
#image: assets/splash_icon.png
android_12:
#image: assets/splash_icon_android_12.png
icon_background_color: "#fcfcff"
icon_background_color_dark: "#1a1c1e"
ios: false
web: false
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@1x.png
Binary file modified ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@2x.png
Binary file modified ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@3x.png
Binary file modified ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@1x.png
Binary file modified ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@2x.png
Binary file modified ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@3x.png
Binary file modified ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@1x.png
Binary file modified ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@2x.png
Binary file modified ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@1x.png
Loading