New UI for Android version

Author: SpiralArm Consulting Ltd

Diff for: README.md

@@ -1,5 +1,15 @@
 # watchtips
 
+## Update Version 2.2
+The Watch tips prject has been updated again, the interface has been tidied up and a seperate value for the *tip* cost has been added and displayed.
+I have also added a custom 'keypad' rather than using the standard one available for the platform, hopefully the app now looks a bit better than it did, UX/UI design is not my strong point. 
+
+But the biggest update is that there is now also an Android version (without Watch support). Doing this has helped a lot as I can use the Flutter Android app for development purposes so that I now have Hot Relad back , developmernt is **good** again ....
+
+I still need to run/build (and fail) with the Flutter tools for iOS and finish with XCode, but general dev is know easier.
+
+
+
 This is an experiment to see if  can use Flutter to build an iOS app with an accompanying watchOS app. My first attempts using the beta product were not successful so the idea was parked.
 Having now re-visited this I can now get a compiled blank watch app up and running with a Flutter app, so I will, in stages, try and re-create the WatchTips app using Flutter.
 
@@ -28,7 +38,7 @@ My plan is to:
 ## Flutter Package Project
 From the results of this test project, I have started developing a Flutter Package to allow communication between a Flutter iOS app and a watch app. This should allow easier integration with some standard functionality, though it is still a pain ATM as after you add a Watch Kit target to the iOS project as Flutter run/build no longer works. This means all package testing and development then needs to be done via XCode. 
 
-I have got message working from an iOS app to the watch via the plugin, this can be seen working in a[video here](https://butterfly-mobile.uk/flutter-and-apple-watch).
+I have got messaging working from an iOS app to the watch via the plugin, this can be seen working in a[video here](https://butterfly-mobile.uk/flutter-and-apple-watch).
 
 
 

Diff for: android/.project

@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>android</name>
+	<comment>Project android created by Buildship.</comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.buildship.core.gradleprojectbuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.buildship.core.gradleprojectnature</nature>
+	</natures>
+</projectDescription>

Diff for: android/.settings/org.eclipse.buildship.core.prefs

@@ -0,0 +1,2 @@
+connection.project.dir=
+eclipse.preferences.version=1

Diff for: android/app/.classpath

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8/"/>
+	<classpathentry kind="con" path="org.eclipse.buildship.core.gradleclasspathcontainer"/>
+	<classpathentry kind="output" path="bin/default"/>
+</classpath>

Diff for: android/app/.project

@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>app</name>
+	<comment>Project app created by Buildship.</comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.buildship.core.gradleprojectbuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+		<nature>org.eclipse.buildship.core.gradleprojectnature</nature>
+	</natures>
+</projectDescription>

Diff for: android/app/.settings/org.eclipse.buildship.core.prefs

@@ -0,0 +1,2 @@
+connection.project.dir=..
+eclipse.preferences.version=1

Diff for: android/app/build.gradle

@@ -24,6 +24,12 @@ if (flutterVersionName == null) {
 apply plugin: 'com.android.application'
 apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle"
 
+def keystoreProperties = new Properties()
+def keystorePropertiesFile = rootProject.file('key.properties')
+if (keystorePropertiesFile.exists()) {
+    keystoreProperties.load(new FileInputStream(keystorePropertiesFile))
+}
+
 android {
     compileSdkVersion 27
 
@@ -33,19 +39,25 @@ android {
 
     defaultConfig {
         // TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html).
-        applicationId "com.example.watchtips"
+        applicationId "uk.spiralarm.tipcalculator"
         minSdkVersion 16
         targetSdkVersion 27
         versionCode flutterVersionCode.toInteger()
         versionName flutterVersionName
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
     }
 
+    signingConfigs {
+        release {
+            keyAlias keystoreProperties['keyAlias']
+            keyPassword keystoreProperties['keyPassword']
+            storeFile file(keystoreProperties['storeFile'])
+            storePassword keystoreProperties['storePassword']
+        }
+    }
     buildTypes {
         release {
-            // TODO: Add your own signing config for the release build.
-            // Signing with the debug keys for now, so `flutter run --release` works.
-            signingConfig signingConfigs.debug
+            signingConfig signingConfigs.release
         }
     }
 }

Diff for: android/app/src/main/AndroidManifest.xml

@@ -4,8 +4,9 @@
     <!-- The INTERNET permission is required for development. Specifically,
          flutter needs it to communicate with the running application
          to allow setting breakpoints, to provide hot reload, etc.
-    -->
+    
     <uses-permission android:name="android.permission.INTERNET"/>
+    -->
 
     <!-- io.flutter.app.FlutterApplication is an android.app.Application that
          calls FlutterMain.startInitialization(this); in its onCreate method.
@@ -14,7 +15,7 @@
          FlutterApplication and put your custom class here. -->
     <application
         android:name="io.flutter.app.FlutterApplication"
-        android:label="watchtips"
+        android:label="Watch Tips"
         android:icon="@mipmap/ic_launcher">
         <activity
             android:name=".MainActivity"

Diff for: android/app/src/main/java/com/example/watchtips/MainActivity.java

@@ -3,11 +3,40 @@
 import android.os.Bundle;
 import io.flutter.app.FlutterActivity;
 import io.flutter.plugins.GeneratedPluginRegistrant;
+import io.flutter.plugin.common.MethodCall;
+import io.flutter.plugin.common.MethodChannel;
+import io.flutter.plugin.common.MethodChannel.MethodCallHandler;
+import io.flutter.plugin.common.MethodChannel.Result;
+import android.content.res.Resources;
+import android.os.LocaleList;
+import 	java.util.*;
+
 
 public class MainActivity extends FlutterActivity {
   @Override
   protected void onCreate(Bundle savedInstanceState) {
     super.onCreate(savedInstanceState);
     GeneratedPluginRegistrant.registerWith(this);
+    new MethodChannel(getFlutterView(), "uk.spiralarm.watchtips/tipinfo").setMethodCallHandler(
+      new MethodCallHandler() {
+        @Override
+        public void onMethodCall(MethodCall call, Result result) {
+          if (call.method.equals("preferredLanguages")) {
+            result.success(getPreferredLanguages());
+          } else {
+            result.notImplemented();
+          }
+       }
+    });
+  }
+
+  private List<String> getPreferredLanguages() {
+    LocaleList list = Resources.getSystem().getConfiguration().getLocales().getAdjustedDefault();
+    List<String> result = new ArrayList<String>();
+    for(int i=0; i<list.size(); i++){
+      result.add(list.get(i).toString());
+    }
+    return result;
   }
+  
 }

Diff for: android/app/src/main/res/drawable/launch_background.xml

@@ -4,9 +4,9 @@
     <item android:drawable="@android:color/white" />
 
     <!-- You can insert your own image assets here -->
-    <!-- <item>
+    <item>
         <bitmap
             android:gravity="center"
             android:src="@mipmap/launch_image" />
-    </item> -->
+    </item>
 </layer-list>

Diff for: android/app/src/main/res/mipmap-hdpi/ic_launcher.png

@@ -1,7 +1,10 @@
 import 'package:flutter/material.dart';
 
 /// This defines the colours used in the app
-const appPrimaryColor = Color(0xFFE6E6E6); //Color(0xFF000000);
-const appScaffoldColor = Color(0xFFE6E6E6); //Color(0xFF000000);
-const appPrimaryTextColor = Color(0xFF0D5FFF);
-const appTextColor = Color(0xFF333333); //Color(0xFFFECC66);
+const appPrimaryColor =  Color(0xFF000000);//Color(0xFFE6E6E6);
+const appScaffoldColor =  Color(0xFF000000);//Color(0xFFE6E6E6);
+const accentTextColor = Color(0xFFFC6666);
+const appPrimaryTextColor = Color(0xFFFFFFFF);
+const appTextColor = Colors.grey;//Color(0xFF333333); //Color(0xFFFECC66);
+const appButtonColor = Color(0xFF7F7F7F);
+const appPrimaryButtonColor = Colors.orange;