Several changes

android/app/build.gradle

@@ -38,7 +38,7 @@ android {
 
     defaultConfig {
         // TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html).
-        applicationId "com.example.jisho_study_tool"
+        applicationId "app.jishostudytool.jisho_study_tool"
         minSdkVersion 16
         targetSdkVersion 28
         versionCode flutterVersionCode.toInteger()

lib/components/common/square.dart

@@ -0,0 +1,30 @@
+import 'package:flutter/material.dart';
+
+/// This is somewhat of a hack.
+/// Wrapping the AspectRatio inside an UnconstrainedBox and IntrinsicHeight will
+/// result in the AspectRatio having an unbounded width and intrinsic height.
+/// That makes the AspectRatio size the widget with respect to the height
+/// (essentially stretch the width out to match the height)
+class Square extends StatelessWidget {
+  final Widget child;
+  final void Function()? onTap;
+
+  const Square({
+    Key? key,
+    required this.child,
+    this.onTap,
+  }) : super(key: key);
+
+  @override
+  Widget build(BuildContext context) => InkWell(
+        onTap: onTap,
+        child: UnconstrainedBox(
+          child: IntrinsicHeight(
+            child: AspectRatio(
+              aspectRatio: 1,
+              child: child,
+            ),
+          ),
+        ),
+      );
+}

lib/components/kanji/kanji_result_body.dart

@@ -39,11 +39,9 @@ class KanjiResultBody extends StatelessWidget {
             ),
             Flexible(
               fit: FlexFit.tight,
-              child: Center(
+              child: (resultData.radical != null)
-                child: (resultData.radical != null)
+                  ? Center(child: Radical(radical: resultData.radical!))
-                    ? Radical(radical: resultData.radical!)
+                  : const SizedBox(),
-                    : const SizedBox(),
-              ),
             ),
           ],
         ),

lib/components/kanji/kanji_result_body/header.dart

@@ -19,15 +19,16 @@ 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: Text(
+              child: FittedBox(
-                kanji,
+                child: Text(
-                style: TextStyle(fontSize: 70.0, color: colors.foreground)
+                  kanji,
-                    .merge(japaneseFont.textStyle),
+                  style: TextStyle(color: colors.foreground)
+                      .merge(japaneseFont.textStyle),
+                ),
               ),
             );
           },

lib/components/kanji/kanji_result_body/radical.dart

@@ -19,21 +19,37 @@ class Radical extends StatelessWidget {
           final colors = state.theme.kanjiResultColor;
 
           return InkWell(
-            onTap: () => Navigator.pushNamed(context, Routes.kanjiSearchRadicals, arguments: radical.symbol),
+            onTap: () => Navigator.pushNamed(
-            child: Container(
+              context,
-              padding: const EdgeInsets.all(15.0),
+              Routes.kanjiSearchRadicals,
-              decoration: BoxDecoration(
+              arguments: radical.symbol,
-                shape: BoxShape.circle,
-                color: colors.background,
-              ),
-              child: Text(
-                radical.symbol,
-                style: TextStyle(
-                  color: colors.foreground,
-                  fontSize: 40.0,
-                ).merge(japaneseFont.textStyle),
-              ),
             ),
+            child: 
+              Expanded(
+                child: Row(
+                  children: [
+                    const Expanded(child: SizedBox()),
+                    Expanded(
+                      flex: 2,
+                      child: Container(
+                        padding: const EdgeInsets.all(20.0),
+                        decoration: BoxDecoration(
+                          shape: BoxShape.circle,
+                          color: colors.background,
+                        ),
+                        child: FittedBox(
+                          child: Text(
+                            radical.symbol,
+                            style: TextStyle(color: colors.foreground)
+                                .merge(japaneseFont.textStyle),
+                          ),
+                        ),
+                      ),
+                    ),
+                    const Expanded(child: SizedBox()),
+                  ],
+                ),
+              ),
           );
         },
       );

lib/components/search/search_results_body/parts/kanji.dart

@@ -3,6 +3,7 @@ import 'package:flutter/material.dart';
 import '../../../../bloc/theme/theme_bloc.dart';
 import '../../../../routing/routes.dart';
 import '../../../../settings.dart';
+import '../../../common/square.dart';
 
 class KanjiRow extends StatelessWidget {
   final List<String> kanji;
@@ -13,33 +14,33 @@ class KanjiRow extends StatelessWidget {
     this.fontSize = 20,
   }) : super(key: key);
 
-  Widget _kanjiBox(String kanji) => UnconstrainedBox(
+  Widget _kanjiBox(BuildContext context, String kanji) => Square(
-        child: IntrinsicHeight(
+        onTap: () => Navigator.pushNamed(
-          child: AspectRatio(
+          context,
-            aspectRatio: 1,
+          Routes.kanjiSearch,
-            child: BlocBuilder<ThemeBloc, ThemeState>(
+          arguments: kanji,
-              builder: (context, state) {
+        ),
-                final colors = state.theme.menuGreyLight;
+        child: BlocBuilder<ThemeBloc, ThemeState>(
-                return Container(
+          builder: (context, state) {
-                  padding: const EdgeInsets.all(10),
+            final colors = state.theme.menuGreyLight;
-                  alignment: Alignment.center,
+            return Container(
-                  decoration: BoxDecoration(
+              padding: const EdgeInsets.all(10),
-                    color: colors.background,
+              alignment: Alignment.center,
-                    borderRadius: BorderRadius.circular(10),
+              decoration: BoxDecoration(
-                  ),
+                color: colors.background,
-                  child: FittedBox(
+                borderRadius: BorderRadius.circular(10),
-                    child: Text(
+              ),
-                      kanji,
+              child: FittedBox(
-                      style: TextStyle(
+                child: Text(
-                        color: colors.foreground,
+                  kanji,
-                        fontSize: fontSize,
+                  style: TextStyle(
-                      ).merge(japaneseFont.textStyle),
+                    color: colors.foreground,
-                    ),
+                    fontSize: fontSize,
-                  ),
+                  ).merge(japaneseFont.textStyle),
-                );
+                ),
-              },
+              ),
-            ),
+            );
-          ),
+          },
         ),
       );
 
@@ -57,15 +58,7 @@ class KanjiRow extends StatelessWidget {
           spacing: 10,
           runSpacing: 10,
           children: [
-            for (final k in kanji)
+            for (final k in kanji) _kanjiBox(context, k),
-              InkWell(
-                onTap: () => Navigator.pushNamed(
-                  context,
-                  Routes.kanjiSearch,
-                  arguments: k,
-                ),
-                child: _kanjiBox(k),
-              )
           ],
         ),
       ],

lib/components/search/search_results_body/parts/kanji_kana_box.dart

@@ -76,6 +76,10 @@ class KanjiKanaBox extends StatelessWidget {
                     style: TextStyle(
                       color: Colors.transparent,
                       fontSize: fFontsize,
+                    ).merge(
+                      romajiEnabled && autoTransliterateRomaji
+                          ? null
+                          : japaneseFont.textStyle,
                     ),
                   ),
 

lib/data/grades.dart

@@ -456,7 +456,7 @@ const Map<int, Map<int, List<String>>> grades = {
       '矛', '丙', '払', '氾', '尼',
       '丼', '凸', '奴', '旦', '占',
       '仙', '斥', '尻', '召', '汁',
-      '囚', '𠮟', '込', '甲', '巧',
+      '囚', '叱', '込', '甲', '巧',
       '玄', '巨', '丘', '甘', '且',
       '瓦', '牙', '凹'
     ],

lib/screens/info/about.dart

@@ -73,6 +73,7 @@ class AboutView extends StatelessWidget {
                         borderRadius: BorderRadius.circular(15),
                       ),
                       child: IconButton(
+                        color: Colors.white,
                         iconSize: 50,
                         onPressed: () => open_webpage(
                           'https://github.com/h7x4ABk3g/Jisho-Study-Tool',

lib/screens/search/result_page.dart

@@ -27,7 +27,18 @@ class _ResultPageState extends State<ResultPage> {
   @override
   Widget build(BuildContext context) {
     return Scaffold(
-      appBar: AppBar(),
+      appBar: AppBar(
+        leadingWidth: 100,
+        leading: Row(
+          children: [
+            const BackButton(),
+            CloseButton(
+              onPressed: () =>
+                  Navigator.popUntil(context, (route) => route.isFirst),
+            ),
+          ],
+        ),
+      ),
       body: FutureBuilder(
         future: widget.isKanji
             ? fetchKanji(widget.searchTerm)

lib/screens/search/search_mechanisms/drawing.dart

@@ -15,7 +15,7 @@ class KanjiDrawingSearch extends StatelessWidget {
           Expanded(child: Column()),
           DrawingBoard(
             onlyOneCharacterSuggestions: true,
-            onSuggestionChosen: (suggestion) => Navigator.popAndPushNamed(
+            onSuggestionChosen: (suggestion) => Navigator.pushNamed(
               context,
               Routes.kanjiSearch,
               arguments: suggestion,

lib/screens/search/search_mechanisms/grade_list.dart

@@ -5,6 +5,7 @@ import '../../../../data/grades.dart';
 import '../../../../models/themes/theme.dart';
 import '../../../../routing/routes.dart';
 import '../../../components/common/loading.dart';
+import '../../../components/common/square.dart';
 import '../../../settings.dart';
 
 class KanjiGradeSearch extends StatefulWidget {
@@ -30,26 +31,28 @@ class _GridItem extends StatelessWidget {
         ? () => ScaffoldMessenger.of(context).showSnackBar(
               SnackBar(content: Text(text)),
             )
-        : () => Navigator.popAndPushNamed(
+        : () => Navigator.pushNamed(
               context,
               Routes.kanjiSearch,
               arguments: text,
             );
 
-    return InkWell(
+    return Square(
       onTap: onTap,
       child: Container(
+        padding: const EdgeInsets.all(10),
+        alignment: Alignment.center,
         decoration: BoxDecoration(
           borderRadius: const BorderRadius.all(Radius.circular(5)),
           color: color.background,
         ),
-        alignment: Alignment.center,
         child: Text(
           text,
-          style: TextStyle(
+          style: Theme.of(context)
-            color: color.foreground,
+              .textTheme
-            fontSize: 25,
+              .headline5
-          ).merge(japaneseFont.textStyle),
+              ?.merge(TextStyle(color: color.foreground))
+              .merge(japaneseFont.textStyle),
         ),
       ),
     );
@@ -78,29 +81,27 @@ class _KanjiGradeSearchState extends State<KanjiGradeSearch> {
 
   Future<Widget> get makeGrids async => SingleChildScrollView(
         child: Column(
-          children: (await Future.wait(
+          children: await Future.wait(
             grades.keys.map(
               (grade) async => ExpansionTile(
                 title: Text(grade == 7 ? 'Junior Highschool' : 'Grade $grade'),
                 maintainState: true,
                 children: [
-                  GridView.count(
+                  Padding(
-                    crossAxisCount: 6,
-                    physics: const NeverScrollableScrollPhysics(),
-                    shrinkWrap: true,
-                    mainAxisSpacing: 10,
-                    crossAxisSpacing: 10,
                     padding: const EdgeInsets.all(10),
-                    children: (await gradeWidgets)[grade]!
+                    child: Wrap(
-                        .values
+                      runSpacing: 10,
-                        .expand((l) => l)
+                      spacing: 10,
-                        .toList(),
+                      children: (await gradeWidgets)[grade]!
-                  )
+                          .values
+                          .expand((l) => l)
+                          .toList(),
+                    ),
+                  ),
                 ],
               ),
             ),
-          ))
+          ),
-              .toList(),
         ),
       );