Connect multiple kanji parts with search (#33)

lib/components/kanji/kanji_result_body.dart

@@ -31,7 +31,7 @@ class KanjiResultBody extends StatelessWidget {
           children: [
             const Flexible(
               fit: FlexFit.tight,
-              child: Center(child: SizedBox()),
+              child: SizedBox(),
             ),
             Flexible(
               fit: FlexFit.tight,

lib/components/kanji/kanji_result_body/examples.dart

@@ -2,6 +2,7 @@ import 'package:flutter/material.dart';
 import 'package:unofficial_jisho_api/api.dart';
 
 import '../../../bloc/theme/theme_bloc.dart';
+import '../../../routing/routes.dart';
 import '../../../services/romaji_transliteration.dart';
 import '../../../settings.dart';
 
@@ -73,7 +74,14 @@ class _Example extends StatelessWidget {
             child: IntrinsicHeight(
               child: Row(
                 children: [
-                  _Kana(colors: kanaColors, example: yomiExample),
+                  InkWell(
+                    onTap: () => Navigator.pushNamed(
+                      context,
+                      Routes.search,
+                      arguments: yomiExample.example,
+                    ),
+                    child: _Kana(colors: kanaColors, example: yomiExample),
+                  ),
                   _ExampleText(colors: menuColors, example: yomiExample)
                 ],
               ),

lib/components/kanji/kanji_result_body/header.dart

@@ -18,15 +18,14 @@ class Header extends StatelessWidget {
             final colors = state.theme.kanjiResultColor;
 
             return Container(
+              alignment: Alignment.center,
               decoration: BoxDecoration(
                 borderRadius: BorderRadius.circular(10.0),
                 color: colors.background,
               ),
-              child: Center(
+              child: Text(
-                child: Text(
+                kanji,
-                  kanji,
+                style: TextStyle(fontSize: 70.0, color: colors.foreground),
-                  style: TextStyle(fontSize: 70.0, color: colors.foreground),
-                ),
               ),
             );
           },

lib/components/kanji/kanji_result_body/radical.dart

@@ -2,6 +2,7 @@ import 'package:flutter/material.dart';
 import 'package:unofficial_jisho_api/api.dart' as jisho;
 
 import '../../../bloc/theme/theme_bloc.dart';
+import '../../../routing/routes.dart';
 
 class Radical extends StatelessWidget {
   final jisho.Radical radical;
@@ -16,17 +17,20 @@ class Radical extends StatelessWidget {
         builder: (context, state) {
           final colors = state.theme.kanjiResultColor;
 
-          return Container(
+          return InkWell(
-            padding: const EdgeInsets.all(15.0),
+            onTap: () => Navigator.pushNamed(context, Routes.kanjiSearchRadicals, arguments: radical.symbol),
-            decoration: BoxDecoration(
+            child: Container(
-              shape: BoxShape.circle,
+              padding: const EdgeInsets.all(15.0),
-              color: colors.background,
+              decoration: BoxDecoration(
-            ),
+                shape: BoxShape.circle,
-            child: Text(
+                color: colors.background,
-              radical.symbol,
+              ),
-              style: TextStyle(
+              child: Text(
-                color: colors.foreground,
+                radical.symbol,
-                fontSize: 40.0,
+                style: TextStyle(
+                  color: colors.foreground,
+                  fontSize: 40.0,
+                ),
               ),
             ),
           );

lib/components/kanji/kanji_result_body/yomi_chips.dart

@@ -1,6 +1,7 @@
 import 'package:flutter/material.dart';
 
 import '../../../bloc/theme/theme_bloc.dart';
+import '../../../routing/routes.dart';
 import '../../../services/romaji_transliteration.dart';
 import '../../../settings.dart';
 
@@ -50,24 +51,29 @@ class YomiChips extends StatelessWidget {
   bool get isExpandable => yomi.length > 6;
 
   Widget yomiCard({
+    required BuildContext context,
     required String yomi,
     required ColorSet colors,
   }) =>
-      Container(
+      InkWell(
-        margin: const EdgeInsets.symmetric(horizontal: 5),
+        onTap: () =>
-        padding: const EdgeInsets.symmetric(
+            Navigator.pushNamed(context, Routes.search, arguments: yomi),
-          vertical: 10.0,
+        child: Container(
-          horizontal: 10.0,
+          margin: const EdgeInsets.symmetric(horizontal: 5),
-        ),
+          padding: const EdgeInsets.symmetric(
-        decoration: BoxDecoration(
+            vertical: 10.0,
-          color: colors.background,
+            horizontal: 10.0,
-          borderRadius: BorderRadius.circular(10.0),
+          ),
-        ),
+          decoration: BoxDecoration(
-        child: Text(
+            color: colors.background,
-          yomi,
+            borderRadius: BorderRadius.circular(10.0),
-          style: TextStyle(
+          ),
-            fontSize: 20.0,
+          child: Text(
-            color: colors.foreground,
+            yomi,
+            style: TextStyle(
+              fontSize: 20.0,
+              color: colors.foreground,
+            ),
           ),
         ),
       );
@@ -75,12 +81,19 @@ class YomiChips extends StatelessWidget {
   Widget yomiWrapper(BuildContext context) {
     final yomiCards = yomi
         .map((y) => romajiEnabled ? transliterateKanaToLatin(y) : y)
-        .map((y) => yomiCard(yomi: y, colors: type.getColors(context)))
+        .map(
+          (y) => yomiCard(
+            context: context,
+            yomi: y,
+            colors: type.getColors(context),
+          ),
+        )
         .toList();
 
     final yomiCardsWithTitle = <Widget>[
       if (type != YomiType.meaning)
         yomiCard(
+          context: context,
           yomi: type == YomiType.kunyomi ? 'Kun:' : 'On:',
           colors: ColorSet(
             foreground: type.getColors(context).background,
@@ -101,7 +114,11 @@ class YomiChips extends StatelessWidget {
     else
       return ExpansionTile(
         title: Center(
-          child: yomiCard(yomi: type.title, colors: type.getColors(context)),
+          child: yomiCard(
+            context: context,
+            yomi: type.title,
+            colors: type.getColors(context),
+          ),
         ),
         children: [
           const SizedBox(height: 20.0),

lib/routing/router.dart

@@ -34,7 +34,8 @@ Route<Widget> generateRoute(RouteSettings settings) {
       return MaterialPageRoute(builder: (_) => const KanjiGradeSearch());
 
     case Routes.kanjiSearchRadicals:
-      return MaterialPageRoute(builder: (_) => const KanjiRadicalSearch());
+      final prechosenRadical = args as String?;
+      return MaterialPageRoute(builder: (_) => KanjiRadicalSearch(prechosenRadical: prechosenRadical));
 
     // TODO: Add more specific error screens.
     case Routes.errorNotFound:

lib/screens/search/search_mechanisms/radical_list.dart

@@ -6,7 +6,9 @@ import '../../../../routing/routes.dart';
 import '../../../../services/jisho_api/radicals_search.dart';
 
 class KanjiRadicalSearch extends StatefulWidget {
-  const KanjiRadicalSearch({Key? key}) : super(key: key);
+  final String? prechosenRadical;
+
+  const KanjiRadicalSearch({Key? key, this.prechosenRadical}) : super(key: key);
 
   @override
   _KanjiRadicalSearchState createState() => _KanjiRadicalSearchState();
@@ -25,6 +27,15 @@ class _KanjiRadicalSearchState extends State<KanjiRadicalSearch> {
     for (final String r in radicals.values.expand((l) => l)) r: true
   };
 
+  @override
+  void initState() {
+    if (widget.prechosenRadical != null &&
+        radicalToggles.containsKey(widget.prechosenRadical))
+      radicalToggles[widget.prechosenRadical!] = true;
+      updateSuggestions();
+    super.initState();
+  }
+
   void resetRadicalToggles() => radicalToggles.forEach((k, _) {
         radicalToggles[k] = false;
       });