Text Box Enahancements (#44)

* Text Box Enahancements * Apply suggestions from code review fixed spelling error * fix error when pressing clear button * fixed rendering error * get rid of setState Co-authored-by: Gogs <gogs@fake.local> Co-authored-by: David <davidmccoy@mailfence.com>
david-shortman · Apr 17, 2020 · 8995961 · 8995961
1 parent 1f61b98
commit 8995961
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 16 deletions.
diff --git a/flutter_app/lib/main.dart b/flutter_app/lib/main.dart
@@ -76,8 +76,7 @@ class _MyHomePageState extends State<MyHomePage> {
   bool isAttemptingToJoinSessionFromText = false;
   bool isAttemptingToJoinSessionFromQR = false;
   SidMessage sidMessage;
-  TextEditingController _controller = TextEditingController();
-  TextEditingController _messageController = TextEditingController();
+  TextEditingController _urlTextController = TextEditingController();
   Timer serverTimeTimer;
   Timer pingTimer;
   String _username;
@@ -200,6 +199,10 @@ class _MyHomePageState extends State<MyHomePage> {
     sendMessage(new BufferingMessage(bufferingContent));
   }
 
+  void _onSubmitPressedInUrlField(String s) {
+    _onConnectPressed();
+  }
+
   void _onConnectPressed() {
     setState(() {
       isAttemptingToJoinSessionFromText = true;
@@ -211,31 +214,31 @@ class _MyHomePageState extends State<MyHomePage> {
       sessionJoined = false;
       sessionId = "";
       String serverId = "";
-      int varStart = _controller.text.toString().indexOf('?');
+      int varStart = _urlTextController.text.toString().indexOf('?');
       if (varStart >= 0) {
-        int sessionIdStart = _controller.text.toString().indexOf(
+        int sessionIdStart = _urlTextController.text.toString().indexOf(
             'npSessionId=');
         if (sessionIdStart >= 0) {
-          int sessionIdEnd = _controller.text.toString().indexOf(
+          int sessionIdEnd = _urlTextController.text.toString().indexOf(
               '&', sessionIdStart);
           if (sessionIdEnd > sessionIdStart) {
-            sessionId = _controller.text.toString().substring(
+            sessionId = _urlTextController.text.toString().substring(
                 sessionIdStart + 12, sessionIdEnd);
           } else {
             sessionId =
-                _controller.text.toString().substring(sessionIdStart + 12);
+                _urlTextController.text.toString().substring(sessionIdStart + 12);
           }
         }
-        int serverIdStart = _controller.text.toString().indexOf('npServerId=');
+        int serverIdStart = _urlTextController.text.toString().indexOf('npServerId=');
         if (serverIdStart >= 0) {
-          int serverIdEnd = _controller.text.toString().indexOf(
+          int serverIdEnd = _urlTextController.text.toString().indexOf(
               '&', serverIdStart);
           if (serverIdEnd > serverIdStart) {
-            serverId = _controller.text.toString().substring(
+            serverId = _urlTextController.text.toString().substring(
                 serverIdStart + 11, serverIdEnd);
           } else {
             serverId =
-                _controller.text.toString().substring(serverIdStart + 11);
+                _urlTextController.text.toString().substring(serverIdStart + 11);
           }
         }
       }
@@ -412,8 +415,12 @@ class _MyHomePageState extends State<MyHomePage> {
   List<Widget> getNotConnectedWidgets() {
     List<Widget> widgets = new List<Widget>();
     widgets.add(TextFormField(
-      controller: _controller,
-      decoration: InputDecoration(labelText: 'Enter URL'),
+      textInputAction: TextInputAction.go,
+      onFieldSubmitted: _onSubmitPressedInUrlField,
+      controller: _urlTextController,
+      decoration: InputDecoration(labelText: 'Enter URL', suffixIcon: IconButton(icon: Icon(Icons.cancel), onPressed: () {
+        WidgetsBinding.instance.addPostFrameCallback( (_) => _urlTextController.clear());
+      },)),
     ));
     widgets.add(Padding(
       padding: new EdgeInsets.fromLTRB(50, 10, 50, 10),
@@ -445,7 +452,7 @@ class _MyHomePageState extends State<MyHomePage> {
   void _onScanQRPressed() async {
     debugPrint('qr pressed');
     var result = await BarcodeScanner.scan();
-    _controller.text = result;
+    _urlTextController.text = result;
     _connectToServer();
     setState(() {
       isAttemptingToJoinSessionFromQR = true;
@@ -507,4 +514,3 @@ class _MyHomePageState extends State<MyHomePage> {
   }
 }
 
-
diff --git a/flutter_app/lib/pages/UserSettingsScreen.dart b/flutter_app/lib/pages/UserSettingsScreen.dart
@@ -103,7 +103,9 @@ class _UserSettingsScreenState extends State<UserSettingsScreen> {
         padding: const EdgeInsets.all(20.0),
         child: Column( children: [new TextFormField(
           controller: _usernameController,
-          decoration: InputDecoration(labelText: 'Enter Username'),
+          decoration: InputDecoration(labelText: 'Enter Username', suffixIcon: IconButton(icon: Icon(Icons.cancel), onPressed: () {
+              WidgetsBinding.instance.addPostFrameCallback( (_) => _usernameController.clear());
+          },)),
         ), Expanded( child: GridView.count(crossAxisCount: 4,
             crossAxisSpacing: 4.0,
             mainAxisSpacing: 8.0,