Using kotlin now

7 files changed, 0 insertions, 1395 deletions

diff --git a/lib/chat.dart b/lib/chat.dart
deleted file mode 100644
index e75188c..0000000
--- a/lib/chat.dart
+++ /dev/null
@@ -1,176 +0,0 @@
-import 'package:flutter/cupertino.dart';
-import 'package:flutter/foundation.dart';
-import 'package:flutter/material.dart';
-
-void main() {
-  runApp(new MessengerApp());
-}
-
-final ThemeData iosTheme = new ThemeData(
-  primarySwatch: Colors.orange,
-  primaryColor: Colors.grey[100],
-  primaryColorBrightness: Brightness.light,
-);
-
-final ThemeData defaultTheme = new ThemeData(
-  primarySwatch: Colors.blue,
-  accentColor: Colors.orangeAccent[400],
-);
-
-const String _name = "Marvin Borner";
-
-class MessengerApp extends StatelessWidget {
-  @override
-  Widget build(BuildContext context) {
-    return new MaterialApp(
-      title: "BEAM-Messenger",
-      theme:
-          defaultTargetPlatform == TargetPlatform.iOS ? iosTheme : defaultTheme,
-      home: new ChatScreen(),
-    );
-  }
-}
-
-class ChatMessage extends StatelessWidget {
-  ChatMessage({this.text, this.animationController});
-  final String text;
-  final AnimationController animationController;
-  @override
-  Widget build(BuildContext context) {
-    return new SizeTransition(
-        sizeFactor: new CurvedAnimation(
-            parent: animationController, curve: Curves.easeOut),
-        axisAlignment: 0.0,
-        child: new Container(
-          margin: const EdgeInsets.symmetric(vertical: 10.0),
-          child: new Row(
-            crossAxisAlignment: CrossAxisAlignment.start,
-            children: <Widget>[
-              new Container(
-                margin: const EdgeInsets.only(right: 16.0),
-                child: new CircleAvatar(child: new Text(_name[0])),
-              ),
-              new Expanded(
-                child: new Column(
-                  crossAxisAlignment: CrossAxisAlignment.start,
-                  children: <Widget>[
-                    new Text(_name, style: Theme.of(context).textTheme.subhead),
-                    new Container(
-                      margin: const EdgeInsets.only(top: 5.0),
-                      child: new Text(text),
-                    ),
-                  ],
-                ),
-              ),
-            ],
-          ),
-        ));
-  }
-}
-
-class ChatScreen extends StatefulWidget {
-  @override
-  State createState() => new ChatScreenState();
-}
-
-class ChatScreenState extends State<ChatScreen> with TickerProviderStateMixin {
-  final List<ChatMessage> _messages = <ChatMessage>[];
-  final TextEditingController _textController = new TextEditingController();
-  bool _isComposing = false;
-
-  void _handleSubmitted(String text) {
-    _textController.clear();
-    setState(() {
-      _isComposing = false;
-    });
-    ChatMessage message = new ChatMessage(
-      text: text,
-      animationController: new AnimationController(
-        duration: new Duration(milliseconds: 700),
-        vsync: this,
-      ),
-    );
-    setState(() {
-      _messages.insert(0, message);
-    });
-    message.animationController.forward();
-  }
-
-  void dispose() {
-    for (ChatMessage message in _messages)
-      message.animationController.dispose();
-    super.dispose();
-  }
-
-  Widget _buildTextComposer() {
-    return new IconTheme(
-      data: new IconThemeData(color: Theme.of(context).accentColor),
-      child: new Container(
-          margin: const EdgeInsets.symmetric(horizontal: 8.0),
-          child: new Row(children: <Widget>[
-            new Flexible(
-              child: new TextField(
-                controller: _textController,
-                onChanged: (String text) {
-                  setState(() {
-                    _isComposing = text.length > 0;
-                  });
-                },
-                onSubmitted: _handleSubmitted,
-                decoration: new InputDecoration.collapsed(
-                    hintText: "Send a message..."),
-              ),
-            ),
-            new Container(
-                margin: new EdgeInsets.symmetric(horizontal: 4.0),
-                child: Theme.of(context).platform == TargetPlatform.iOS
-                    ? new CupertinoButton(
-                        child: new Text("Send"),
-                        onPressed: _isComposing
-                            ? () => _handleSubmitted(_textController.text)
-                            : null,
-                      )
-                    : new IconButton(
-                        icon: new Icon(Icons.send),
-                        onPressed: _isComposing
-                            ? () => _handleSubmitted(_textController.text)
-                            : null,
-                      )),
-          ]),
-          decoration: Theme.of(context).platform == TargetPlatform.iOS
-              ? new BoxDecoration(
-                  border:
-                      new Border(top: new BorderSide(color: Colors.grey[200])))
-              : null),
-    );
-  }
-
-  Widget build(BuildContext context) {
-    return new Scaffold(
-      appBar: new AppBar(
-          title: new Text("BEAM-Messenger"),
-          elevation:
-              Theme.of(context).platform == TargetPlatform.iOS ? 0.0 : 4.0),
-      body: new Container(
-          child: new Column(children: <Widget>[
-            new Flexible(
-                child: new ListView.builder(
-              padding: new EdgeInsets.all(8.0),
-              reverse: true,
-              itemBuilder: (_, int index) => _messages[index],
-              itemCount: _messages.length,
-            )),
-            new Divider(height: 1.0),
-            new Container(
-              decoration: new BoxDecoration(color: Theme.of(context).cardColor),
-              child: _buildTextComposer(),
-            ),
-          ]),
-          decoration: Theme.of(context).platform == TargetPlatform.iOS
-              ? new BoxDecoration(
-                  border:
-                      new Border(top: new BorderSide(color: Colors.grey[200])))
-              : null),
-    );
-  }
-}
diff --git a/lib/components.dart b/lib/components.dart
deleted file mode 100644
index 17e6767..0000000
--- a/lib/components.dart
+++ /dev/null
@@ -1,83 +0,0 @@
-import 'package:flutter/material.dart';
-
-class InputField extends StatelessWidget {
-  IconData icon;
-  String hintText;
-  TextInputType textInputType;
-  Color textFieldColor, iconColor;
-  bool obscureText;
-  var validateFunction;
-  var onSaved;
-
-  String onEmpty;
-  String name;
-
-  //passing props in the Constructor.
-  //Java like style
-  InputField({
-    this.name,
-    this.hintText,
-    this.onEmpty,
-    this.obscureText,
-    this.textInputType,
-    this.icon,
-    this.validateFunction,
-    this.onSaved,
-  });
-
-  @override
-  Widget build(BuildContext context) {
-    // TODO: implement build
-    return (new Container(
-      margin: new EdgeInsets.only(bottom: 10.0),
-      child: new DecoratedBox(
-        decoration: new BoxDecoration(
-            borderRadius: new BorderRadius.all(new Radius.circular(30.0)),
-            color: Colors.grey[50]),
-        child: new Padding(
-          padding: EdgeInsets.all(5.0),
-          child: new TextFormField(
-            decoration: new InputDecoration(
-              icon: new Icon(icon),
-              labelText: name,
-              border: InputBorder.none,
-              hintText: hintText,
-              hintStyle: const TextStyle(color: Colors.grey, fontSize: 15.0),
-            ),
-            validator: (val) => val.isEmpty ? onEmpty : null,
-            onSaved: (val) => onSaved = val,
-            obscureText: obscureText,
-            keyboardType: textInputType,
-          ),
-        ),
-      ),
-    ));
-  }
-}
-
-class TextButton extends StatelessWidget {
-  VoidCallback onPressed;
-  String name;
-
-  //passing props in the Constructor.
-  //Java like style
-  TextButton({
-    this.name,
-    this.onPressed,
-  });
-
-  @override
-  Widget build(BuildContext context) {
-    // TODO: implement build
-    return (new FlatButton(
-      child: new Text(name,
-          textAlign: TextAlign.center,
-          style: const TextStyle(
-              color: Colors.black,
-              fontSize: 14.0,
-              fontFamily: "Roboto",
-              fontWeight: FontWeight.bold)),
-      onPressed: onPressed,
-    ));
-  }
-}
diff --git a/lib/globals.dart b/lib/globals.dart
deleted file mode 100644
index 818183c..0000000
--- a/lib/globals.dart
+++ /dev/null
@@ -1,83 +0,0 @@
-library globals;
-
-import 'dart:async';
-import 'dart:convert';
-import 'dart:io';
-import 'package:flutter/material.dart';
-import 'package:http/http.dart' as http;
-
-//Variables
-bool isLoggedIn = false;
-String token = "";
-String domain = "";
-String apiURL = "http://192.168.0.74:8000/login";
-String error = "";
-
-String id = "0";
-String firstname = "";
-String email = "";
-String avatar = "https://api.adorable.io/avatars/128/BEAM-Messenger.png";
-
-class Utility {
-  static Future<Null> showAlertPopup(
-      BuildContext context, String title, String detail) async {
-    return showDialog<Null>(
-      context: context,
-      barrierDismissible: false, // user must tap button!
-      child: new AlertDialog(
-        title: new Text(title),
-        content: new SingleChildScrollView(
-          child: new ListBody(
-            children: <Widget>[
-              new Text(detail),
-            ],
-          ),
-        ),
-        actions: <Widget>[
-          new FlatButton(
-            child: new Text('Done'),
-            onPressed: () {
-              Navigator.of(context).pop();
-            },
-          ),
-        ],
-      ),
-    );
-  }
-
-  static Future<String> getData(Map params) async {
-    var requestURL = apiURL;
-    requestURL = requestURL;
-    print("Request URL: " + requestURL);
-
-    var url = requestURL;
-    String result;
-
-    try {
-      await http.post(url, body: {
-        "email": params["email"],
-        "password": params["password"]
-      }).then((response) {
-        result = response.body;
-        print('Answer: ' + result.toString());
-      });
-    } catch (exception) {
-      result = 'Failed logging in';
-    }
-
-    return result;
-  }
-
-  static Widget newTextButton(String title, VoidCallback onPressed) {
-    return new FlatButton(
-      child: new Text(title,
-          textAlign: TextAlign.center,
-          style: const TextStyle(
-              color: Colors.black,
-              fontSize: 14.0,
-              fontFamily: "Roboto",
-              fontWeight: FontWeight.bold)),
-      onPressed: onPressed,
-    );
-  }
-}
diff --git a/lib/lockedscreen/home.dart b/lib/lockedscreen/home.dart
deleted file mode 100644
index 2336bb6..0000000
--- a/lib/lockedscreen/home.dart
+++ /dev/null
@@ -1,49 +0,0 @@
-import 'package:flutter/material.dart';
-import 'package:flutter/rendering.dart';
-import 'package:beam_messenger/globals.dart' as globals;
-
-class Home extends StatelessWidget {
-  @override
-  Widget build(BuildContext context) {
-    return new Scaffold(
-      appBar: new AppBar(
-        title: new Text("Home"),
-      ),
-      body: new Center(
-          child: new Column(
-        children: <Widget>[
-          new Container(height: 20.0),
-          new CircleAvatar(
-            radius: 60.0,
-            backgroundImage: new NetworkImage(globals.avatar),
-          ),
-          new Container(height: 10.0),
-          new Text(
-            'ID: ' + globals.id,
-            style: new TextStyle(
-              color: Colors.black,
-              fontWeight: FontWeight.bold,
-              fontSize: 20.0,
-            ),
-          ),
-          new Container(height: 10.0),
-          new Text(
-            'First Name: ' + globals.firstname,
-            style: new TextStyle(
-              color: Colors.black,
-              fontSize: 20.0,
-            ),
-          ),
-          new Container(height: 10.0),
-          new Text(
-            'Email: ' + globals.email,
-            style: new TextStyle(
-              color: Colors.black,
-              fontSize: 20.0,
-            ),
-          ),
-        ],
-      )),
-    );
-  }
-}
diff --git a/lib/main.dart b/lib/main.dart
deleted file mode 100644
index e56c38d..0000000
--- a/lib/main.dart
+++ /dev/null
@@ -1,602 +0,0 @@
-import 'package:meta/meta.dart';
-import 'dart:async';
-import 'dart:convert';
-import 'package:flutter/material.dart';
-import 'package:flutter/rendering.dart';
-import 'package:beam_messenger/globals.dart' as globals;
-import 'lockedscreen/home.dart';
-import 'pincode/pincode_verify.dart';
-import 'pincode/pincode_create.dart';
-import 'package:local_auth/local_auth.dart';
-import 'package:shared_preferences/shared_preferences.dart';
-import 'components.dart';
-
-void main() {
-  runApp(new MaterialApp(home: new LoginPage()));
-}
-
-class LoginPage extends StatefulWidget {
-  LoginPageState createState() => new LoginPageState();
-}
-
-class LoginPageState extends State<LoginPage> {
-  final formKey = new GlobalKey<FormState>();
-  final _scaffoldKey = new GlobalKey<ScaffoldState>();
-
-  String _email;
-  String _password;
-  bool _usePinCode = false;
-
-  bool autovalidate = false;
-  void _handleSubmitted() {
-    final FormState form = formKey.currentState;
-    if (!form.validate()) {
-      autovalidate = true; // Start validating on every change.
-      showInSnackBar('Please fix the errors in red before submitting.');
-      setState(() {
-        globals.isLoggedIn = false;
-      });
-    } else {
-      form.save();
-      _performLogin();
-    }
-  }
-
-  void showInSnackBar(String value) {
-    _scaffoldKey.currentState
-        .showSnackBar(new SnackBar(content: new Text(value)));
-  }
-
-  void _performLogin() async {
-    // This is just a demo, so no actual login here.
-    final snackbar = new SnackBar(
-      duration: new Duration(seconds: 10),
-      content: new Row(
-        children: <Widget>[
-          new CircularProgressIndicator(),
-          new Text("  Signing-In...")
-        ],
-      ),
-    );
-    _scaffoldKey.currentState.showSnackBar(snackbar);
-    await tryLogin(_email, _password);
-    if (globals.isLoggedIn) {
-      // await showAlertPopup();
-      // await saveData(_usePinCode);
-      if (_usePinCode) {
-        navigateToScreen('Create Pin');
-      } else {
-        navigateToScreen('Home');
-      }
-    }
-    _scaffoldKey.currentState.hideCurrentSnackBar();
-  }
-
-  Future<bool> _loginRequest(String email, String password) async {
-    String result = "";
-    result = await globals.Utility.getData({'email': email, 'password': password});
-
-    //Decode Data
-    try {
-      Map decoded = JSON.decode(result);
-      globals.id = decoded["user_data"]['id'].toString();
-      globals.firstname = decoded["user_data"]['name'].toString();
-      globals.email = decoded["user_data"]['email'].toString();
-      globals.avatar = decoded["user_data"]['avatar'].toString();
-
-      print(globals.id);
-      print(globals.firstname);
-      print(globals.email);
-      print(globals.avatar);
-
-      globals.token = globals.id;
-    } catch (exception) {
-      print("Error Decoding Data");
-      return false;
-    }
-    return true;
-  }
-
-  tryLogin(String email, String password) async {
-    await _loginRequest(email, password);
-    print("Token: " + globals.token + " | Error: " + globals.error);
-
-    if (globals.token != 'null') {
-      print("Valid Token!");
-      setState(() {
-        globals.isLoggedIn = true;
-      });
-
-      //Save Email and Password to Shared Preferences
-      SharedPreferences prefs = await SharedPreferences.getInstance();
-      print('Email: $email Password $password.');
-      prefs.setString('userEmail', email);
-      prefs.setString('userPassword', password);
-      prefs.setString('userToken', globals.token);
-    } else {
-      print("Invalid Token!");
-      setState(() {
-        globals.isLoggedIn = false;
-      });
-      globals.error = "Check Email and Password!";
-      globals.Utility.showAlertPopup(
-          context, "Info", "Please Try Logging In Again! \n" + globals.error);
-    }
-  }
-
-  saveData(bool usePin) async {
-    SharedPreferences prefs = await SharedPreferences.getInstance();
-    if (usePin) {
-      prefs.setBool('usePinCode', true);
-    } else {
-      prefs.setBool('usePinCode', false);
-    }
-  }
-
-  Future<Null> navigateToScreen(String name) async {
-    if (name.contains('Home')) {
-      Navigator.push(
-        context,
-        new MaterialPageRoute(
-            builder: (context) =>
-                new Home()), //When Authorized Navigate to the next screen
-      );
-    } else if (name.contains('Create Pin')) {
-      Navigator.push(
-        context,
-        new MaterialPageRoute(
-            builder: (context) =>
-                new PinCodeCreate()), //When Authorized Navigate to the next screen
-      );
-    } else if (name.contains('Verify Pin')) {
-      Navigator.push(
-        context,
-        new MaterialPageRoute(
-            builder: (context) =>
-                new PinCodeVerify()), //When Authorized Navigate to the next screen
-      );
-    } else {
-      print('Error: $name');
-    }
-  }
-
-  Future<Null> showAlertPopup() async {
-    return showDialog<Null>(
-      context: context,
-      barrierDismissible: false, // user must tap button!
-      child: new AlertDialog(
-        title: new Text('Info'),
-        content: new SingleChildScrollView(
-          child: new ListBody(
-            children: <Widget>[
-              new Text('Would you like to set a Pin Code for a faster log in?'),
-              new Text('Once a Pin is set you can unlock with biometrics'),
-            ],
-          ),
-        ),
-        actions: <Widget>[
-          new FlatButton(
-            child: new Text('Yes'),
-            onPressed: () {
-              _usePinCode = true;
-              Navigator.of(context).pop();
-            },
-          ),
-          new FlatButton(
-            child: new Text('No'),
-            onPressed: () {
-              _usePinCode = false;
-              Navigator.of(context).pop();
-            },
-          ),
-        ],
-      ),
-    );
-  }
-
-  String _authorized = 'Not Authorized';
-  Future<Null> _goToBiometrics() async {
-    String email;
-    String password;
-    final LocalAuthentication auth = new LocalAuthentication();
-    bool authenticated = false;
-    try {
-      authenticated = await auth.authenticateWithBiometrics(
-          localizedReason: 'Scan your fingerprint to authenticate',
-          useErrorDialogs: true,
-          stickyAuth: false);
-    } catch (e) {
-      print(e);
-    }
-    if (!mounted) return;
-
-    setState(() {
-      _authorized = authenticated ? 'Authorized' : 'Not Authorized';
-      print(_authorized);
-
-      if (authenticated) {
-        //Todo: Get Saved Email and Password from Shared Preferences
-        //https://github.com/flutter/plugins/tree/master/packages/shared_preferences
-        String savedEmail = "Test";
-        String savedPassword = "Test";
-        //Todo: Get Email and Password from Shared Preferences
-        email = savedEmail;
-        password = savedPassword;
-      }
-    });
-    if (authenticated) {
-      await tryLogin(email, password);
-      if (globals.isLoggedIn) {
-        navigateToScreen('Home');
-      } else {
-        globals.Utility.showAlertPopup(
-            context, "Info", "Login Failed\nPlease Try Logging In Again");
-      }
-    } else {
-      globals.Utility.showAlertPopup(
-          context, "Info", "Login Failed\nPlease Try Biometrics Again");
-    }
-  }
-
-  void newAccount() {
-    Navigator.of(context).push(new MaterialPageRoute<Null>(
-        builder: (BuildContext context) {
-          return new NewAccountPage();
-        },
-        fullscreenDialog: true));
-  }
-
-  void needHelp() {
-    Navigator.of(context).push(new MaterialPageRoute<Null>(
-        builder: (BuildContext context) {
-          return new HelpPage();
-        },
-        fullscreenDialog: true));
-  }
-
-  @override
-  Widget build(BuildContext context) {
-    return new Scaffold(
-      key: _scaffoldKey,
-      appBar: new AppBar(
-        title: new Text('Login'),
-      ),
-      body: new Container(
-        color: Colors.grey[300],
-        child: new ListView(
-          physics: new AlwaysScrollableScrollPhysics(),
-          key: new PageStorageKey("Divider 1"),
-          children: <Widget>[
-            new Container(
-              height: 20.0,
-            ),
-            new Padding(
-              padding: EdgeInsets.all(20.0),
-              child: new Card(
-                child: new Column(
-                  children: <Widget>[
-                    new Container(height: 30.0),
-                    new Icon(
-                      globals.isLoggedIn ? Icons.lock_open : Icons.lock_outline,
-                      size: 120.0,
-                    ),
-                    new Padding(
-                      padding: const EdgeInsets.all(16.0),
-                      child: new Form(
-                        key: formKey,
-                        child: new Column(
-                          children: [
-                            new TextFormField(
-                              decoration:
-                                  new InputDecoration(labelText: 'Email'),
-                              validator: (val) =>
-                                  val.length < 1 ? 'Email Required' : null,
-                              onSaved: (val) => _email = val,
-                              obscureText: false,
-                              keyboardType: TextInputType.text,
-                              autocorrect: false,
-                            ),
-                            new Container(height: 10.0),
-                            new TextFormField(
-                              decoration:
-                                  new InputDecoration(labelText: 'Password'),
-                              validator: (val) =>
-                                  val.length < 1 ? 'Password Required' : null,
-                              onSaved: (val) => _password = val,
-                              obscureText: true,
-                              keyboardType: TextInputType.text,
-                              autocorrect: false,
-                            ),
-                            new Container(height: 5.0),
-                          ],
-                        ),
-                      ),
-                    ),
-                  ],
-                ),
-              ),
-            ),
-            new Padding(
-              padding: EdgeInsets.all(20.0),
-              child: new Row(
-                children: <Widget>[
-                  new Expanded(
-                    child: new Padding(
-                      padding: const EdgeInsets.all(5.0),
-                      child: new RaisedButton(
-                        color: Colors.blue,
-                        onPressed: _handleSubmitted,
-                        child: new Text(
-                          'Login',
-                          style: new TextStyle(color: Colors.white),
-                        ),
-                      ),
-                    ),
-                  ),
-                  new Padding(
-                    padding: const EdgeInsets.all(5.0),
-                    child: new RaisedButton(
-                      color: Colors.redAccent[400],
-                      onPressed: _goToBiometrics,
-                      child: new Icon(
-                        Icons.fingerprint,
-                        color: Colors.white,
-                      ),
-                    ),
-                  ),
-                ],
-              ),
-            ),
-            new Padding(
-              padding: EdgeInsets.all(20.0),
-              child: new Row(
-                mainAxisAlignment: MainAxisAlignment.spaceBetween,
-                children: <Widget>[
-                  new TextButton(name: "Create Account", onPressed: newAccount),
-                  new TextButton(name: "Need Help?", onPressed: needHelp),
-                ],
-              ),
-            )
-          ],
-        ),
-      ),
-    );
-  }
-}
-
-class NewAccountPage extends StatefulWidget {
-  @override
-  NewAccountPageState createState() => new NewAccountPageState();
-}
-
-class NewAccountPageState extends State<NewAccountPage> {
-  final formKey = new GlobalKey<FormState>();
-  final _scaffoldKey = new GlobalKey<ScaffoldState>();
-
-  String _email;
-  String _password;
-
-  void openTermsAndConditions() {
-    Navigator.of(context).push(new MaterialPageRoute<Null>(
-        builder: (BuildContext context) {
-          return new TermsConditionsPage();
-        },
-        fullscreenDialog: true));
-  }
-
-  bool isEmail(String email) {
-    String regex =
-        r'^(([^<>()[\]\\.,;:\s@\"]+(\.[^<>()[\]\\.,;:\s@\"]+)*)|(\".+\"))@((\[[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\])|(([a-zA-Z\-0-9]+\.)+[a-zA-Z]{2,}))$';
-    RegExp regExp = new RegExp(regex);
-    return regExp.hasMatch(email);
-  }
-
-  bool autovalidate = false;
-  void _handleSubmitted() {
-    final FormState form = formKey.currentState;
-    if (!form.validate()) {
-      autovalidate = true; // Start validating on every change.
-      showInSnackBar('Please fix the errors before submitting again.');
-    } else {
-      form.save();
-      Navigator.pop(context);
-    }
-  }
-
-  void showInSnackBar(String value) {
-    _scaffoldKey.currentState
-        .showSnackBar(new SnackBar(content: new Text(value)));
-  }
-
-  @override
-  Widget build(BuildContext context) {
-    return new Scaffold(
-      key: _scaffoldKey,
-      appBar: new AppBar(
-        title: const Text('Create New Account'),
-      ),
-      body: new Container(
-        color: Colors.grey[300],
-        child: new ListView(
-          physics: new AlwaysScrollableScrollPhysics(),
-          key: new PageStorageKey("Divider 1"),
-          children: <Widget>[
-            new Container(
-              height: 20.0,
-            ),
-            new Padding(
-              padding: EdgeInsets.all(20.0),
-              child: new Card(
-                child: new Column(
-                  children: <Widget>[
-                    new Padding(
-                      padding: const EdgeInsets.all(16.0),
-                      child: new Form(
-                        key: formKey,
-                        child: new Column(
-                          children: [
-                            new TextFormField(
-                              decoration:
-                                  new InputDecoration(labelText: 'Email'),
-                              validator: (val) => isEmail(val) && val.length < 1
-                                  ? 'Email Required'
-                                  : null,
-                              onSaved: (val) => _email = val,
-                              obscureText: false,
-                              keyboardType: TextInputType.emailAddress,
-                              autocorrect: false,
-                            ),
-                            new Container(
-                              height: 10.0,
-                            ),
-                            new TextFormField(
-                              decoration:
-                                  new InputDecoration(labelText: 'Email'),
-                              validator: (val) =>
-                                  isEmail(val) && val.length < 1 ? 'Email Required' : null,
-                              onSaved: (val) => _email = val,
-                              obscureText: true,
-                              keyboardType: TextInputType.emailAddress,
-                              autocorrect: false,
-                            ),
-                            new Container(height: 10.0),
-                            new TextFormField(
-                              decoration:
-                                  new InputDecoration(labelText: 'Password'),
-                              validator: (val) =>
-                                  val.length >= 8 && val.length >= 32 ? 'Password length must be between 8 and 32 characters.' : null,
-                              onSaved: (val) => _password = val,
-                              obscureText: true,
-                              keyboardType: TextInputType.text,
-                              autocorrect: false,
-                            ),
-                            new Container(
-                              height: 10.0,
-                            ),
-                            new TextFormField(
-                              decoration:
-                                  new InputDecoration(labelText: 'Password'),
-                              validator: (val) =>
-                                  val.length >= 8 && val.length >= 32 ? 'Password length must be between 8 and 32 characters.' : null,
-                              onSaved: (val) => _password = val,
-                              obscureText: true,
-                              keyboardType: TextInputType.text,
-                              autocorrect: false,
-                            ),
-                            new Container(height: 5.0),
-                          ],
-                        ),
-                      ),
-                    ),
-                    new TextButton(
-                        name: "Terms and Conditions",
-                        onPressed: openTermsAndConditions),
-                  ],
-                ),
-              ),
-            ),
-            new Padding(
-              padding: EdgeInsets.all(20.0),
-              child: new Row(
-                children: <Widget>[
-                  new Expanded(
-                    child: new Padding(
-                      padding: const EdgeInsets.all(5.0),
-                      child: new RaisedButton(
-                        color: Colors.blue,
-                        onPressed: _handleSubmitted,
-                        child: new Text(
-                          'Save',
-                          style: new TextStyle(color: Colors.white),
-                        ),
-                      ),
-                    ),
-                  ),
-                ],
-              ),
-            ),
-          ],
-        ),
-      ),
-    );
-  }
-}
-
-class HelpPage extends StatefulWidget {
-  @override
-  HelpPageState createState() => new HelpPageState();
-}
-
-class HelpPageState extends State<HelpPage> {
-  @override
-  Widget build(BuildContext context) {
-    return new Scaffold(
-      appBar: new AppBar(
-        title: const Text('Help'),
-      ),
-      body: new Center(
-        child: new Column(
-          children: <Widget>[
-            new Padding(
-              padding: new EdgeInsets.all(10.0),
-              child: new Text(
-                '24/7 Customer Support',
-                textAlign: TextAlign.center,
-                style: new TextStyle(
-                  color: Colors.black,
-                  fontWeight: FontWeight.bold,
-                  fontSize: 20.0,
-                ),
-              ),
-            ),
-            new Padding(
-              padding: new EdgeInsets.all(10.0),
-              child: new Text(
-                'Email: contact@beam-messenger.com',
-                textAlign: TextAlign.center,
-                style: new TextStyle(
-                  color: Colors.black,
-                  fontSize: 15.0,
-                ),
-              ),
-            ),
-          ],
-        ),
-      ),
-    );
-  }
-}
-
-class TermsConditionsPage extends StatefulWidget {
-  @override
-  TermsConditionsPageState createState() => new TermsConditionsPageState();
-}
-
-class TermsConditionsPageState extends State<TermsConditionsPage> {
-  String termsOfUse = "Your data is secure - don't worry :) (TODO: Write TOU)";
-  @override
-  Widget build(BuildContext context) {
-    return new Scaffold(
-      appBar: new AppBar(
-        title: const Text('Terms and Conditions'),
-      ),
-      body: new Center(
-        child: new Column(
-          children: <Widget>[
-            new Padding(
-              padding: new EdgeInsets.all(10.0),
-              child: new Text(
-                termsOfUse,
-                textAlign: TextAlign.center,
-                style: new TextStyle(
-                  color: Colors.black,
-                  fontSize: 15.0,
-                ),
-              ),
-            ),
-          ],
-        ),
-      ),
-    );
-  }
-}
diff --git a/lib/pincode/pincode_create.dart b/lib/pincode/pincode_create.dart
deleted file mode 100644
index 0798ff4..0000000
--- a/lib/pincode/pincode_create.dart
+++ /dev/null
@@ -1,239 +0,0 @@
-import 'package:flutter/material.dart';
-import 'package:flutter/rendering.dart';
-
-class PinCodeCreate extends StatelessWidget {
-  var pinCode = "";
-
-  @override
-  Widget build(BuildContext context) {
-    return new Scaffold(
-      appBar: new AppBar(
-        title: new Text("Create Pin"),
-      ),
-      body: new ListView(
-        children: <Widget>[
-          new Padding(
-            padding: new EdgeInsets.all(20.0),
-            child: new Text("Enter a New Pin",
-                textAlign: TextAlign.center,
-                style: new TextStyle(
-                  color: Colors.black.withOpacity(1.0),
-                  fontWeight: FontWeight.bold,
-                  fontSize: 20.0,
-                )),
-          ),
-          new Row(
-            children: <Widget>[
-              new Expanded(
-                child: new Text(''),
-              ),
-              new Expanded(
-                child: new Text(''),
-              ),
-              new Expanded(
-                child: new Icon(Icons.check_circle_outline),
-              ),
-              new Expanded(
-                child: new Icon(Icons.radio_button_unchecked),
-              ),
-              new Expanded(
-                child: new Icon(Icons.radio_button_unchecked),
-              ),
-              new Expanded(
-                child: new Icon(Icons.radio_button_unchecked),
-              ),
-              new Expanded(
-                child: new Text(''),
-              ),
-              new Expanded(
-                child: new Text(''),
-              ),
-            ],
-          ),
-          new Row(
-            children: <Widget>[
-              new Expanded(
-                child: new Padding(
-                  padding: new EdgeInsets.all(20.0),
-                  child: new FloatingActionButton(
-                      elevation: 0.0,
-                      heroTag: "7",
-                      child: new Text('7',
-                          style: new TextStyle(
-                            fontSize: 40.0,
-                            fontFamily: 'Roboto',
-                            color: Colors.white,
-                          )),
-                      backgroundColor: new Color(0xFFE57373),
-                      onPressed: () {}),
-                ),
-              ),
-              new Expanded(
-                child: new Padding(
-                  padding: new EdgeInsets.all(20.0),
-                  child: new FloatingActionButton(
-                      elevation: 0.0,
-                      heroTag: "8",
-                      child: new Text('8',
-                          style: new TextStyle(
-                            fontSize: 40.0,
-                            fontFamily: 'Roboto',
-                            color: Colors.white,
-                          )),
-                      backgroundColor: new Color(0xFFE57373),
-                      onPressed: () {}),
-                ),
-              ),
-              new Expanded(
-                child: new Padding(
-                  padding: new EdgeInsets.all(20.0),
-                  child: new FloatingActionButton(
-                      elevation: 0.0,
-                      heroTag: "9",
-                      child: new Text('9',
-                          style: new TextStyle(
-                            fontSize: 40.0,
-                            fontFamily: 'Roboto',
-                            color: Colors.white,
-                          )),
-                      backgroundColor: new Color(0xFFE57373),
-                      onPressed: () {}),
-                ),
-              ),
-            ],
-          ),
-          new Row(
-            children: <Widget>[
-              new Expanded(
-                child: new Padding(
-                  padding: new EdgeInsets.all(20.0),
-                  child: new FloatingActionButton(
-                      elevation: 0.0,
-                      heroTag: "4",
-                      child: new Text('4',
-                          style: new TextStyle(
-                            fontSize: 40.0,
-                            fontFamily: 'Roboto',
-                            color: Colors.white,
-                          )),
-                      backgroundColor: new Color(0xFFE57373),
-                      onPressed: () {}),
-                ),
-              ),
-              new Expanded(
-                child: new Padding(
-                  padding: new EdgeInsets.all(20.0),
-                  child: new FloatingActionButton(
-                      elevation: 0.0,
-                      heroTag: "5",
-                      child: new Text('5',
-                          style: new TextStyle(
-                            fontSize: 40.0,
-                            fontFamily: 'Roboto',
-                            color: Colors.white,
-                          )),
-                      backgroundColor: new Color(0xFFE57373),
-                      onPressed: () {}),
-                ),
-              ),
-              new Expanded(
-                child: new Padding(
-                  padding: new EdgeInsets.all(20.0),
-                  child: new FloatingActionButton(
-                      elevation: 0.0,
-                      heroTag: "6",
-                      child: new Text('6',
-                          style: new TextStyle(
-                            fontSize: 40.0,
-                            fontFamily: 'Roboto',
-                            color: Colors.white,
-                          )),
-                      backgroundColor: new Color(0xFFE57373),
-                      onPressed: () {}),
-                ),
-              ),
-            ],
-          ),
-          new Row(
-            children: <Widget>[
-              new Expanded(
-                child: new Padding(
-                  padding: new EdgeInsets.all(20.0),
-                  child: new FloatingActionButton(
-                      elevation: 0.0,
-                      heroTag: "1",
-                      child: new Text('1',
-                          style: new TextStyle(
-                            fontSize: 40.0,
-                            fontFamily: 'Roboto',
-                            color: Colors.white,
-                          )),
-                      backgroundColor: new Color(0xFFE57373),
-                      onPressed: () {}),
-                ),
-              ),
-              new Expanded(
-                child: new Padding(
-                  padding: new EdgeInsets.all(20.0),
-                  child: new FloatingActionButton(
-                      elevation: 0.0,
-                      heroTag: "2",
-                      child: new Text('2',
-                          style: new TextStyle(
-                            fontSize: 40.0,
-                            fontFamily: 'Roboto',
-                            color: Colors.white,
-                          )),
-                      backgroundColor: new Color(0xFFE57373),
-                      onPressed: () {}),
-                ),
-              ),
-              new Expanded(
-                child: new Padding(
-                  padding: new EdgeInsets.all(20.0),
-                  child: new FloatingActionButton(
-                      elevation: 0.0,
-                      heroTag: "3",
-                      child: new Text('3',
-                          style: new TextStyle(
-                            fontSize: 40.0,
-                            fontFamily: 'Roboto',
-                            color: Colors.white,
-                          )),
-                      backgroundColor: new Color(0xFFE57373),
-                      onPressed: () {}),
-                ),
-              ),
-            ],
-          ),
-          new Row(
-            children: <Widget>[
-              new Expanded(
-                child: new Text(''),
-              ),
-              new Expanded(
-                child: new Padding(
-                  padding: new EdgeInsets.all(20.0),
-                  child: new FloatingActionButton(
-                      elevation: 0.0,
-                      heroTag: "0",
-                      child: new Text('0',
-                          style: new TextStyle(
-                            fontSize: 40.0,
-                            fontFamily: 'Roboto',
-                            color: Colors.white,
-                          )),
-                      backgroundColor: new Color(0xFFE57373),
-                      onPressed: () {}),
-                ),
-              ),
-              new Expanded(
-                child: new Text(''),
-              ),
-            ],
-          ),
-        ],
-      ),
-    );
-  }
-}
diff --git a/lib/pincode/pincode_verify.dart b/lib/pincode/pincode_verify.dart
deleted file mode 100644
index 391e7d2..0000000
--- a/lib/pincode/pincode_verify.dart
+++ /dev/null
@@ -1,163 +0,0 @@
-import 'package:flutter/material.dart';
-import 'package:flutter/rendering.dart';
-
-class PinCodeVerify extends StatelessWidget {
-  @override
-  Widget build(BuildContext context) {
-    return new Scaffold(
-      appBar: new AppBar(
-        title: new Text("Verify Pin"),
-      ),
-      body: new GridView.count(
-        primary: false,
-        padding: const EdgeInsets.all(20.0),
-        crossAxisSpacing: 10.0,
-        crossAxisCount: 3,
-        children: <Widget>[
-          new Padding(
-            padding: new EdgeInsets.all(20.0),
-            child: new FloatingActionButton(
-                elevation: 0.0,
-                heroTag: "1",
-                child: new Text('1',
-                    style: new TextStyle(
-                      fontSize: 40.0,
-                      fontFamily: 'Roboto',
-                      color: Colors.white,
-                    )),
-                backgroundColor: new Color(0xFFE57373),
-                onPressed: () {}),
-          ),
-          new Padding(
-            padding: new EdgeInsets.all(20.0),
-            child: new FloatingActionButton(
-                elevation: 0.0,
-                heroTag: "2",
-                child: new Text('2',
-                    style: new TextStyle(
-                      fontSize: 40.0,
-                      fontFamily: 'Roboto',
-                      color: Colors.white,
-                    )),
-                backgroundColor: new Color(0xFFE57373),
-                onPressed: () {}),
-          ),
-          new Padding(
-            padding: new EdgeInsets.all(20.0),
-            child: new FloatingActionButton(
-                elevation: 0.0,
-                heroTag: "3",
-                child: new Text('3',
-                    style: new TextStyle(
-                      fontSize: 40.0,
-                      fontFamily: 'Roboto',
-                      color: Colors.white,
-                    )),
-                backgroundColor: new Color(0xFFE57373),
-                onPressed: () {}),
-          ),
-          new Padding(
-            padding: new EdgeInsets.all(20.0),
-            child: new FloatingActionButton(
-                elevation: 0.0,
-                heroTag: "4",
-                child: new Text('4',
-                    style: new TextStyle(
-                      fontSize: 40.0,
-                      fontFamily: 'Roboto',
-                      color: Colors.white,
-                    )),
-                backgroundColor: new Color(0xFFE57373),
-                onPressed: () {}),
-          ),
-          new Padding(
-            padding: new EdgeInsets.all(20.0),
-            child: new FloatingActionButton(
-                elevation: 0.0,
-                heroTag: "5",
-                child: new Text('5',
-                    style: new TextStyle(
-                      fontSize: 40.0,
-                      fontFamily: 'Roboto',
-                      color: Colors.white,
-                    )),
-                backgroundColor: new Color(0xFFE57373),
-                onPressed: () {}),
-          ),
-          new Padding(
-            padding: new EdgeInsets.all(20.0),
-            child: new FloatingActionButton(
-                elevation: 0.0,
-                heroTag: "6",
-                child: new Text('6',
-                    style: new TextStyle(
-                      fontSize: 40.0,
-                      fontFamily: 'Roboto',
-                      color: Colors.white,
-                    )),
-                backgroundColor: new Color(0xFFE57373),
-                onPressed: () {}),
-          ),
-          new Padding(
-            padding: new EdgeInsets.all(20.0),
-            child: new FloatingActionButton(
-                elevation: 0.0,
-                heroTag: "7",
-                child: new Text('7',
-                    style: new TextStyle(
-                      fontSize: 40.0,
-                      fontFamily: 'Roboto',
-                      color: Colors.white,
-                    )),
-                backgroundColor: new Color(0xFFE57373),
-                onPressed: () {}),
-          ),
-          new Padding(
-            padding: new EdgeInsets.all(20.0),
-            child: new FloatingActionButton(
-                elevation: 0.0,
-                heroTag: "8",
-                child: new Text('8',
-                    style: new TextStyle(
-                      fontSize: 40.0,
-                      fontFamily: 'Roboto',
-                      color: Colors.white,
-                    )),
-                backgroundColor: new Color(0xFFE57373),
-                onPressed: () {}),
-          ),
-          new Padding(
-            padding: new EdgeInsets.all(20.0),
-            child: new FloatingActionButton(
-                elevation: 0.0,
-                heroTag: "9",
-                child: new Text('9',
-                    style: new TextStyle(
-                      fontSize: 40.0,
-                      fontFamily: 'Roboto',
-                      color: Colors.white,
-                    )),
-                backgroundColor: new Color(0xFFE57373),
-                onPressed: () {}),
-          ),
-          new Text(''),
-          new Padding(
-            padding: new EdgeInsets.all(20.0),
-            child: new FloatingActionButton(
-                elevation: 0.0,
-                heroTag: "0",
-                child: new Text('0',
-                    style: new TextStyle(
-                      fontSize: 40.0,
-                      fontFamily: 'Roboto',
-                      color: Colors.white,
-                    )),
-                backgroundColor: new Color(0xFFE57373),
-                onPressed: () {}),
-          ),
-          new Text(''),
-        ],
-      ),
-    );
-  }
-}