Better coding style

2 files changed, 57 insertions, 62 deletions

diff --git a/lib/chat.dart b/lib/chat.dart
index d20cde4..e75188c 100644
--- a/lib/chat.dart
+++ b/lib/chat.dart
@@ -6,13 +6,13 @@ void main() {
   runApp(new MessengerApp());
 }
 
-final ThemeData kIOSTheme = new ThemeData(
+final ThemeData iosTheme = new ThemeData(
   primarySwatch: Colors.orange,
   primaryColor: Colors.grey[100],
   primaryColorBrightness: Brightness.light,
 );
 
-final ThemeData kDefaultTheme = new ThemeData(
+final ThemeData defaultTheme = new ThemeData(
   primarySwatch: Colors.blue,
   accentColor: Colors.orangeAccent[400],
 );
@@ -20,13 +20,12 @@ final ThemeData kDefaultTheme = new ThemeData(
 const String _name = "Marvin Borner";
 
 class MessengerApp extends StatelessWidget {
- @override
- Widget build(BuildContext context) {
+  @override
+  Widget build(BuildContext context) {
     return new MaterialApp(
       title: "BEAM-Messenger",
-      theme: defaultTargetPlatform == TargetPlatform.iOS
-        ? kIOSTheme
-        : kDefaultTheme,
+      theme:
+          defaultTargetPlatform == TargetPlatform.iOS ? iosTheme : defaultTheme,
       home: new ChatScreen(),
     );
   }
@@ -39,36 +38,33 @@ class ChatMessage extends StatelessWidget {
   @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),
-                  ),
-                ],
+        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),
+                    ),
+                  ],
+                ),
+              ),
+            ],
+          ),
+        ));
   }
 }
 
@@ -106,7 +102,7 @@ class ChatScreenState extends State<ChatScreen> with TickerProviderStateMixin {
     super.dispose();
   }
 
-   Widget _buildTextComposer() {
+  Widget _buildTextComposer() {
     return new IconTheme(
       data: new IconThemeData(color: Theme.of(context).accentColor),
       child: new Container(
@@ -121,8 +117,8 @@ class ChatScreenState extends State<ChatScreen> with TickerProviderStateMixin {
                   });
                 },
                 onSubmitted: _handleSubmitted,
-                decoration:
-                    new InputDecoration.collapsed(hintText: "Send a message..."),
+                decoration: new InputDecoration.collapsed(
+                    hintText: "Send a message..."),
               ),
             ),
             new Container(
@@ -152,30 +148,29 @@ class ChatScreenState extends State<ChatScreen> with TickerProviderStateMixin {
   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
-      ),
+          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(
+          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),
-   );
+            )),
+            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/data/rest_ds.dart b/lib/data/rest_ds.dart
index 7d66d4a..36a82c7 100644
--- a/lib/data/rest_ds.dart
+++ b/lib/data/rest_ds.dart
@@ -6,11 +6,11 @@ import 'package:beam_messenger/models/user.dart';
 
 class RestDatasource {
   NetworkUtil _netUtil = new NetworkUtil();
-  static final BASE_URL = "http://192.168.0.74:8000";
-  static final LOGIN_URL = BASE_URL + "/login";
+  static final baseUrl = "http://192.168.0.74:8000";
+  static final loginUrl = baseUrl + "/login";
 
   Future<User> login(String email, String password) {
-    return _netUtil.post(LOGIN_URL,
+    return _netUtil.post(loginUrl,
         body: {"email": email, "password": password}).then((dynamic res) {
       print(res.toString());
       if (res["status"]) throw new Exception(res["message"]);