Merge branch 'develop'

CHANGELOG

@@ -1,3 +1,8 @@
+## 1.0.8+8
+- Bugfix: Serialization issue when launched without existing user data
+- Add about popup
+- New logo: Many thanks to @7eter
+
 ## 1.0.7+7
 - Add option to import and export data.
 - Add default group for future group support feature.

android/app/src/main/res/drawable/ic_launcher_background.xml

@@ -4,10 +4,10 @@
     android:height="108dp"
     android:viewportWidth="108"
     android:viewportHeight="108">
-  <group android:scaleX="1.16"
-      android:scaleY="1.16"
-      android:translateX="-8.64"
-      android:translateY="-8.64">
+  <group android:scaleX="1.54"
+      android:scaleY="1.54"
+      android:translateX="-29.16"
+      android:translateY="-29.16">
       <path android:fillColor="#3DDC84"
             android:pathData="M0,0h108v108h-108z"/>
       <path android:fillColor="#00000000" android:pathData="M9,0L9,108"

android/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml

@@ -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"/>
-    <foreground android:drawable="@drawable/ic_launcher_foreground"/>
+    <foreground android:drawable="@mipmap/ic_launcher_foreground"/>
 </adaptive-icon>

android/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml

@@ -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"/>
-    <foreground android:drawable="@drawable/ic_launcher_foreground"/>
+    <foreground android:drawable="@mipmap/ic_launcher_foreground"/>
 </adaptive-icon>

android/app/src/main/res/values/ic_launcher_background.xml

@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <color name="ic_launcher_background">#31493C</color>
+    <color name="ic_launcher_background">#FFFFFF</color>
 </resources>

lib/models/app_model.dart

@@ -9,7 +9,9 @@ class AppModel extends ChangeNotifier {
 
   static emptyModel() {
     GroupModel group = GroupModel("My plants");
-    return group;
+    AppModel model = AppModel();
+    model._groups.add(group);
+    return model;
   }
 
   GroupModel get defaultGroup {

lib/screens/plant_list.dart

@@ -1,11 +1,15 @@
+import 'package:flutter/gestures.dart';
 import 'package:flutter/material.dart';
 import 'package:permission_handler/permission_handler.dart';
 import 'package:provider/provider.dart';
+import 'package:url_launcher/url_launcher_string.dart';
 import 'package:water_me/app_context.dart';
 import 'package:water_me/models/plant_model.dart';
 import 'package:water_me/screens/plant_edit.dart';
 import 'package:water_me/screens/plant_list_entry.dart';
 import 'package:water_me/theme.dart';
+import 'package:url_launcher/url_launcher.dart';
+import 'package:package_info_plus/package_info_plus.dart';
 
 import '../main.dart';
 import '../models/app_model.dart';
@@ -96,18 +100,51 @@ class MyPlants extends StatelessWidget {
               //   value: 2,
               //   child: Text("Notification Time"),
               // ),
-              // const PopupMenuItem<int>(
-              //   value: 3,
-              //   child: Text("About"),
-              // ),
+              const PopupMenuItem<int>(
+                value: 3,
+                child: Text("About"),
+              ),
             ];
-          }, onSelected: (value) {
+          }, onSelected: (value) async {
             if (value == 0) {
               onExportJson(context);
             } else if (value == 1) {
               onImportJson(context);
             } else if (value == 2) {
             } else if (value == 3) {
+              PackageInfo packageInfo = await PackageInfo.fromPlatform();
+              showDialog<String>(
+                  context: context,
+                  builder: (BuildContext context) => AlertDialog(
+                      title: const Text('About'),
+                      content: RichText(
+                          text: TextSpan(
+                        children: [
+                          const TextSpan(
+                            style: TextStyle(color: Colors.black),
+                            text: "Water-Me is built by abertschi.\n\n",
+                          ),
+                          TextSpan(
+                            style: const TextStyle(color: Colors.black,
+                                decoration: TextDecoration.underline),
+                            text: "https://abertschi.ch\n\n",
+                            recognizer: TapGestureRecognizer()
+                              ..onTap = () async {
+                                const url = 'https://abertschi.ch?rel=water-me';
+                                await launchUrlString(url);
+                              },
+                          ),
+                          TextSpan(
+                            style: const TextStyle(color: Colors.black),
+                            text: "version ${packageInfo.version}",
+                            recognizer: TapGestureRecognizer()
+                              ..onTap = () async {
+                                const url = 'https://github.com/abertschi/water-me/blob/master/CHANGELOG';
+                                await launchUrlString(url);
+                              },
+                          ),
+                        ],
+                      ))));
             } else {}
           }),
         ],

metadata/en-US/changelogs/8.txt

@@ -0,0 +1,34 @@
+## 1.0.8+8
+- Bugfix: Serialization issue when launched without existing user data
+- Add about popup
+- New logo: Many thanks to @7eter
+
+## 1.0.7+7
+- Add option to import and export data.
+- Add default group for future group support feature.
+- Camera no longer creates temporary files but stores plants to app directory.
+- Padding changes in plant details.
+- Drop support for landscape mode.
+- This version changes the model data. Add migration code to introduce a single group on import.
+
+## 1.0.6+6
+- Fix issue on Android 7 with crash due to notification misconfig
+
+## 1.0.5+5
+- Remove permissions from being auto merged into manifest: ACCESS_NETWORK_STATE, RECORD_AUDIO
+- input validation and eye candy
+
+## 1.0.4+4
+- Introduce fdroid release
+
+## 1.0.2+3
+- Count days always at midnight
+
+## 1.0.1+2
+- Fix bug to properly store model
+- UI sugar, input validation
+- Github runner to build APK
+
+## 1.0.0+1
+- Initial release, base functionality
+- Plant list, detail-, edit-, add- plant view

metadata/en-US/full_description.txt

@@ -3,6 +3,7 @@ Water me is a mobile application written in Flutter to remind you to water your
 Features and Components:
 - Add plants with watering frequency, name and picture
 - No remote entity, local-only application
+- Backup and Restore data
 - Flutter, currently support for Android
 - Camera access
 - Local Notifications

pubspec.lock

@@ -156,6 +156,20 @@ packages:
     description: flutter
     source: sdk
     version: "0.0.0"
+  http:
+    dependency: transitive
+    description:
+      name: http
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "0.13.5"
+  http_parser:
+    dependency: transitive
+    description:
+      name: http_parser
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "4.0.2"
   js:
     dependency: transitive
     description:
@@ -205,6 +219,20 @@ packages:
       url: "https://pub.dartlang.org"
     source: hosted
     version: "1.0.0"
+  package_info_plus:
+    dependency: "direct main"
+    description:
+      name: package_info_plus
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "3.0.3"
+  package_info_plus_platform_interface:
+    dependency: transitive
+    description:
+      name: package_info_plus_platform_interface
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "2.0.1"
   path:
     dependency: "direct main"
     description:
@@ -434,6 +462,69 @@ packages:
       url: "https://pub.dartlang.org"
     source: hosted
     version: "0.8.0"
+  typed_data:
+    dependency: transitive
+    description:
+      name: typed_data
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "1.3.1"
+  url_launcher:
+    dependency: "direct main"
+    description:
+      name: url_launcher
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "6.1.10"
+  url_launcher_android:
+    dependency: transitive
+    description:
+      name: url_launcher_android
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "6.0.26"
+  url_launcher_ios:
+    dependency: transitive
+    description:
+      name: url_launcher_ios
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "6.0.18"
+  url_launcher_linux:
+    dependency: transitive
+    description:
+      name: url_launcher_linux
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "3.0.4"
+  url_launcher_macos:
+    dependency: transitive
+    description:
+      name: url_launcher_macos
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "3.0.4"
+  url_launcher_platform_interface:
+    dependency: transitive
+    description:
+      name: url_launcher_platform_interface
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "2.1.2"
+  url_launcher_web:
+    dependency: transitive
+    description:
+      name: url_launcher_web
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "2.0.16"
+  url_launcher_windows:
+    dependency: transitive
+    description:
+      name: url_launcher_windows
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "3.0.5"
   vector_math:
     dependency: transitive
     description: