Add padding for links in About dialog

android/app/src/main/AndroidManifest.xml

@@ -36,4 +36,4 @@
             </intent-filter>
         </activity>
     </application>
-</manifest>
+</manifest>

lib/entity_class/timer_entity.dart

@@ -9,22 +9,31 @@ class TimerEntity extends Entity {
   void update(Map rawData) {
     super.update(rawData);
     String durationSource = "${attributes["duration"]}";
-    List<String> durationList = durationSource.split(":");
-    if (durationList.length == 1) {
-      duration = Duration(seconds: int.tryParse(durationList[0] ?? 0));
-    } else if (durationList.length == 2) {
-      duration = Duration(
-          hours: int.tryParse(durationList[0]) ?? 0,
-          minutes: int.tryParse(durationList[1]) ?? 0
-      );
-    } else if (durationList.length == 3) {
-      duration = Duration(
-          hours: int.tryParse(durationList[0]) ?? 0,
-          minutes: int.tryParse(durationList[1]) ?? 0,
-        seconds: int.tryParse(durationList[2]) ?? 0
-      );
+    if (durationSource != null && durationSource.isNotEmpty) {
+      try {
+        List<String> durationList = durationSource.split(":");
+        if (durationList.length == 1) {
+          duration = Duration(seconds: int.tryParse(durationList[0] ?? 0));
+        } else if (durationList.length == 2) {
+          duration = Duration(
+              hours: int.tryParse(durationList[0]) ?? 0,
+              minutes: int.tryParse(durationList[1]) ?? 0
+          );
+        } else if (durationList.length == 3) {
+          duration = Duration(
+              hours: int.tryParse(durationList[0]) ?? 0,
+              minutes: int.tryParse(durationList[1]) ?? 0,
+              seconds: int.tryParse(durationList[2]) ?? 0
+          );
+        } else {
+          Logger.e("Strange $entityId duration format: $durationSource");
+          duration = Duration(seconds: 0);
+        }
+      } catch (e) {
+        Logger.e("Error parsing duration for $entityId: ${e.toString()}");
+        duration = Duration(seconds: 0);
+      }
     } else {
-      Logger.e("Cann't parse $entityId duration: $durationSource");
       duration = Duration(seconds: 0);
     }
   }

lib/main.dart

@@ -100,7 +100,7 @@ part 'ui_widgets/config_panel_widget.dart';
 
 EventBus eventBus = new EventBus();
 const String appName = "HA Client";
-const appVersion = "0.5.0";
+const appVersion = "0.5.3";
 
 String homeAssistantWebHost;
 
@@ -392,6 +392,14 @@ class _MainPageState extends State<MainPage> with WidgetsBindingObserver, Ticker
           },
         ),
         Divider(),
+        new ListTile(
+          leading: Icon(MaterialDesignIcons.getIconDataFromIconName("mdi:discord")),
+          title: Text("Join Discord server"),
+          onTap: () {
+            Navigator.of(context).pop();
+            HAUtils.launchURL("https://discord.gg/AUzEvwn");
+          },
+        ),
         new AboutListTile(
           aboutBoxChildren: <Widget>[
             GestureDetector(
@@ -406,6 +414,38 @@ class _MainPageState extends State<MainPage> with WidgetsBindingObserver, Ticker
                   decoration: TextDecoration.underline
                 ),
               ),
+            ),
+            Container(
+              height: 10.0,
+            ),
+            GestureDetector(
+              onTap: () {
+                Navigator.of(context).pop();
+                HAUtils.launchURLInCustomTab(context, "http://ha-client.homemade.systems/terms_and_conditions");
+              },
+              child: Text(
+                "Terms and Conditions",
+                style: TextStyle(
+                    color: Colors.blue,
+                    decoration: TextDecoration.underline
+                ),
+              ),
+            ),
+            Container(
+              height: 10.0,
+            ),
+            GestureDetector(
+              onTap: () {
+                Navigator.of(context).pop();
+                HAUtils.launchURLInCustomTab(context, "http://ha-client.homemade.systems/privacy_policy");
+              },
+              child: Text(
+                "Privacy Policy",
+                style: TextStyle(
+                    color: Colors.blue,
+                    decoration: TextDecoration.underline
+                ),
+              ),
             )
           ],
           applicationName: appName,

pubspec.yaml

@@ -1,7 +1,7 @@
 name: hass_client
 description: Home Assistant Android Client
 
-version: 0.5.0+97
+version: 0.5.3+530
 
 environment:
   sdk: ">=2.0.0-dev.68.0 <3.0.0"