dict selection, enter buttons, minor fixes

definition: added enter button
match: added enter button and pushed selection from list into strat on tap
settings: added dictionary selection

.gitignore

@@ -84,6 +84,7 @@ app.*.map.json
 # other stuff
 deploy.sh
 deploy_release.sh
+/ci/
 
 # Exceptions to above rules.
 !**/ios/**/default.mode1v3

README.md

@@ -1,4 +1,5 @@
 # dict2229
+[![Actions Status: CI\_test](https://github.com/gryffyn/dict2229/workflows/CI_test/badge.svg)](https://github.com/gryffyn/dict2229/actions?query=workflow%3A"CI_test")
 
 a client for the RFC 2229 DICT protocol.
 

android/.gitignore

@@ -9,3 +9,4 @@ GeneratedPluginRegistrant.java
 # Remember to never publicly share your keystore.
 # See https://flutter.dev/docs/deployment/android#reference-the-keystore-from-the-app
 key.properties
+default_keyring.jks

android/app/build.gradle

@@ -38,7 +38,6 @@ android {
     }
 
     defaultConfig {
-        // TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html).
         applicationId "io.gryffyn.dict2229"
         minSdkVersion 16
         targetSdkVersion 30

lib/dialogs/listDialog.dart

@@ -26,9 +26,14 @@ class ListDialog extends StatelessWidget {
           },
           itemBuilder: (BuildContext context, int index) {
             String key = text.keys.elementAt(index);
-            return ListTile(
-              title: Text(key),
-              subtitle: Text(stripParen(text[key])),
+            return InkWell(
+              onTap: () {
+                Navigator.pop(context, key);
+              },
+              child: ListTile(
+                title: Text(key),
+                subtitle: Text(stripParen(text[key])),
+              )
             );
           },
         ),

lib/dict.dart

@@ -66,7 +66,12 @@ class Dict {
       ];
       dicts[parts[0]] = parts[1];
     }
-    return dicts;
+    Map<dynamic,dynamic> allDicts = {
+      "*": "\"all dictionaries\"",
+      "!": "\"first match from all dicts\"",
+    };
+    allDicts.addAll(dicts);
+    return allDicts;
   }
 
   Future<List<Definition>> define(String word, [String database = '*']) async {

lib/main.dart

@@ -134,7 +134,7 @@ class _NavigationState extends State<Navigation> {
 
 setDefault(Box box) {
   if (!box.containsKey('addr')) {
-    box.put('addr', 'port.neveris.one');
+    box.put('addr', 'dict.neveris.one');
   }
   if (!box.containsKey('port')) {
     box.put('port', '2628');

lib/pages/definition.dart

@@ -9,8 +9,7 @@ import 'package:dict2229/utils.dart';
 import 'package:hive/hive.dart';
 
 class PageDefinition extends StatefulWidget {
-  PageDefinition({Key? key, this.word = ""}) : super(key: key);
-  String word;
+  PageDefinition({Key? key}) : super(key: key);
 
   @override
   _PageDefinition createState() => _PageDefinition();
@@ -34,21 +33,33 @@ class _PageDefinition extends State<PageDefinition> {
   @override
   void initState() {
     super.initState();
-    WidgetsBinding.instance!.addPostFrameCallback((_) =>
-        FocusScope.of(context).requestFocus(_focusNode));
+    WidgetsBinding.instance!.addPostFrameCallback(
+        (_) => FocusScope.of(context).requestFocus(_focusNode));
   }
 
   List<TextSpan> buildText(Definition key) {
     if (key.sourceName == "") {
       return <TextSpan>[
-        TextSpan(text: key.title, style: TextStyle(fontWeight: FontWeight.bold)),
+        TextSpan(
+            text: key.title, style: TextStyle(fontWeight: FontWeight.bold)),
       ];
     }
-   return <TextSpan>[
-      TextSpan(text: key.title + "\n", style: TextStyle(fontWeight: FontWeight.bold)),
+    return <TextSpan>[
+      TextSpan(
+          text: key.title + "\n",
+          style: TextStyle(fontWeight: FontWeight.bold)),
       TextSpan(text: key.body + "\n\n"),
-      TextSpan(text: key.sourceName + "\n", style: TextStyle(fontStyle: FontStyle.italic, fontWeight: FontWeight.bold, fontSize: DefaultTextStyle.of(context).style.fontSize!*0.7)),
-      TextSpan(text: key.sourceDesc + "\n", style: TextStyle(fontStyle: FontStyle.italic, fontSize: DefaultTextStyle.of(context).style.fontSize!*0.7)),
+      TextSpan(
+          text: key.sourceName + "\n",
+          style: TextStyle(
+              fontStyle: FontStyle.italic,
+              fontWeight: FontWeight.bold,
+              fontSize: DefaultTextStyle.of(context).style.fontSize! * 0.7)),
+      TextSpan(
+          text: key.sourceDesc + "\n",
+          style: TextStyle(
+              fontStyle: FontStyle.italic,
+              fontSize: DefaultTextStyle.of(context).style.fontSize! * 0.7)),
     ];
   }
 
@@ -58,32 +69,45 @@ class _PageDefinition extends State<PageDefinition> {
       body: Column(
         children: [
           Padding(
-            padding: EdgeInsets.only(left: 12, top: 16, right: 12),
-            child: TextField(
-              autofocus: true,
-              focusNode: _focusNode,
-              decoration: InputDecoration(
-                isDense: true,
-                hintText: 'word to define',
-                border: OutlineInputBorder(
-                  borderRadius: BorderRadius.circular(12),
-                ),
-              ),
-              onSubmitted: (text) {
-                if (this.widget.word != "") {
-                  getDef(this.widget.word);
-                } else {
-                  getDef(text);
-                }
-              },
-            ),
-          ),
+              padding: EdgeInsets.only(left: 12, top: 16, right: 12),
+              child: Row(
+                children: [
+                  Expanded(
+                    child: TextField(
+                      autofocus: true,
+                      focusNode: _focusNode,
+                      decoration: InputDecoration(
+                        isDense: true,
+                        hintText: 'word to define',
+                        border: OutlineInputBorder(
+                          borderRadius: BorderRadius.circular(12),
+                        ),
+                      ),
+                      onChanged: (text) {
+                        setState(() {
+                          input = text;
+                        });
+                      },
+                      onSubmitted: (text) {
+                        getDef(text);
+                      },
+                    ),
+                  ),
+                  IconButton(
+                    onPressed: () {
+                      getDef(input);
+                    },
+                    icon: Icon(Icons.send_rounded, color: Colors.pink,),
+                  ),
+                ],
+              )),
           // TODO List dictionaries and allow choice
           Expanded(
             child: Padding(
               padding: EdgeInsets.all(12),
               child: ListView.separated(
-                keyboardDismissBehavior: ScrollViewKeyboardDismissBehavior.onDrag,
+                keyboardDismissBehavior:
+                    ScrollViewKeyboardDismissBehavior.onDrag,
                 scrollDirection: Axis.vertical,
                 shrinkWrap: true,
                 itemCount: out.length,
@@ -106,4 +130,4 @@ class _PageDefinition extends State<PageDefinition> {
       ),
     );
   }
-}
+}

lib/pages/match.dart

@@ -6,8 +6,6 @@
 import 'package:dict2229/dialogs/listDialog.dart';
 import 'package:dict2229/dialogs/matchDialog.dart';
 import 'package:dict2229/dict.dart';
-import 'package:dict2229/pages/definition.dart';
-import 'package:flutter/gestures.dart';
 import 'package:flutter/material.dart';
 import 'package:dict2229/utils.dart';
 import 'package:hive/hive.dart';
@@ -27,10 +25,6 @@ class _PageMatch extends State<PageMatch> {
 
   void getDef(String text) async {
     var box = Hive.box('prefs');
-    // TODO shared prefs
-    // final prefs = await SharedPreferences.getInstance();
-    // final address = prefs.getString('io.gryffyn.dict2229.server_url') ?? "";
-    // final port = prefs.getInt('io.gryffyn.dict2229.port') ?? 0;
     var dict = Dict.newDict(box.get('addr'), int.tryParse(box.get('port'))!);
     var definition = await dict.match(parenthesize(text), box.get('strat'), box.get('dict'));
     setState(() {
@@ -67,11 +61,12 @@ class _PageMatch extends State<PageMatch> {
     var dict = Dict.newDict(box.get('addr'), int.tryParse(box.get('port'))!);
     var strats = await dict.getStrategies();
     showDialog(
-        context: context,
-        builder: (BuildContext context) => ListDialog(
-              title: "Strategies",
-              text: strats,
-            ));
+      context: context,
+      builder: (BuildContext context) => ListDialog(
+            title: "Strategies",
+            text: strats,
+      )).then((value) => setStrat(value));
+    _focusNode.requestFocus();
   }
 
   defineMatch(String match, String dict) {
@@ -107,23 +102,37 @@ class _PageMatch extends State<PageMatch> {
         children: [
           Padding(
             padding: EdgeInsets.only(left: 12, top: 16, right: 12),
-            child: TextField(
-              autofocus: true,
-              focusNode: _focusNode,
-              decoration: InputDecoration(
-                isDense: true,
-                hintText: 'string to match',
-                border: OutlineInputBorder(
-                  borderRadius: BorderRadius.circular(12),
+            child: Row(
+              children: [
+                Expanded(
+                  child: TextField(
+                    autofocus: true,
+                    focusNode: _focusNode,
+                    decoration: InputDecoration(
+                      isDense: true,
+                      hintText: 'string to match',
+                      border: OutlineInputBorder(
+                        borderRadius: BorderRadius.circular(12),
+                      ),
+                    ),
+                    onChanged: (text) {
+                      setSearch(text);
+                    },
+                    onSubmitted: (text) {
+                      getDef(text);
+                    },
+                  ),
                 ),
-              ),
-              onChanged: (text) {
-                setSearch(text);
-              },
-              onSubmitted: (text) {
-                getDef(text);
-              },
-            ),
+                IconButton(
+                  onPressed: () {
+                    if (search != "") {
+                      getDef(search);
+                    }
+                  },
+                  icon: Icon(Icons.send_rounded, color: Colors.pink),
+                ),
+              ],
+            )
           ),
           Padding(
               padding: EdgeInsets.only(left: 12, top: 8, right: 12),