Several changes

* Add info sections to application

* Update README

* Make screenshots bigger

* A little less big

* Fix heading sizes

README.md

@@ -1,22 +1,77 @@
-[![CircleCI Status](https://circleci.com/gh/h7x4ABk3g/Jisho-Study-Tool.svg?style=shield)]()
+[![CircleCI Status][circleci-badge]][circleci]
+
+<p align="center">
+  <img src="assets/images/logo/logo_icon_transparent_green.png" width=100/>
+
+</p>
 
 # Jisho Study tool
+A japanese dictionary with features for making studying the language easier. For the time being, it's mostly a frontend for [Jisho.org][jisho]. It is still in beta, and will stay in beta for some time. Its main data source is the [unofficial_jisho_api][unofficial_jisho_api].
 
-A japanese dictionary with features for making studying the language easier.
+## Screenshots
+
+<p align="center">
+  <img src=".github/screenshots/search.png" width="250"/>
+  <img src=".github/screenshots/kanji_search.png" width="250"/> 
+  <img src=".github/screenshots/radical_search.png" width="250"/>
+</p>
+
+<p align="center">
+  <img src=".github/screenshots/search_result.png" width="250"/>
+  <img src=".github/screenshots/kanji_result.png" width="250"/> 
+  <img src=".github/screenshots/draw_search.png" width="250"/>
+</p>
+
+[See all screenshots][screenshots]
 
 ## Search
 
-Standard search using Jishos API. This returns standard Jisho search results, including what you'd find if you searched through the search bar without any modifiers
+Search using the Jisho API.
+This returns the same Jisho search results you would find by default search without any modifiers (like `#kanji` or `#adverbs`).
+There is also an `Extensive search` mode which does another request to fetch detailed information, at the expense of keeping the user waiting.
+This detailed information might include example sentences, audio, and other supplementary information.
 
 ## Kanji Search
 
-Jisho kanji search just like using the #kanji modifier in the jisho search bar. This will give you detailed information about things like drawing order, radicals, different kinds of ranks and statistics and some onyomi and kunyomi example words.
+There's several ways to search for kanji.
+You can search for kanji manually, by typing it in (or by choosing from a large copy-pasted message).
+You can also search for kanji by trying to draw it.
+There's also grade based search, and radical based search.
+The data returned usually includes the kanjis radical, meanings, pronounciations, stroke order, some statistics and example usage.
 
-## Upcoming Features
+## Development environment
 
- - [ ] Different kinds of kanji input like radicals and grade based lists
- - [ ] Favorites, history and custom lists
- - [ ] Anki export
- - [ ] Memo cards
- - [ ] Cloud sync
- - [ ] Dark theme
+To set up a development environment, I would suggest heading over to [flutter.dev][flutter-get-started] and following the installation instructions.
+
+Apart from that, there is no other tools being used at the current time.
+
+## Aim
+
+Why am I making this application, when there's thousands of japanese dictionary apps out there?
+
+I've spent quite a lot of time studying this language.
+During study sessions, most of my time would go towards looking for information.
+I would often come across new kanji for which I don't know the stroke order, so I ended up fighting with the handwriting recognizers.
+Sometimes, I was looking at a word where I had some translations for the word, but no idea how to actually use it.
+Finding words that were worthwile to learn could also be hard, and I've probably memorized a bunch of uncommon words that people don't really use.
+I also frequently went to places without access to the internet.
+
+To resolve these problems, I've tried several study aiding apps.
+Most were good in some ways, but there wasn't really any app that filled all my requirements.
+Jisho.org however, provides most of my needs.
+There was a lot of Jisho.org apps, but most were missing a lot of the features that were critical to me.
+That is the main problem this app is trying to solve.
+I'm aiming to make the app I wished I had while studying.
+
+## Thanks to
+
+- Kim, Miwa and Andrew, who did the absolutely incredible work of making Jisho.org
+- Mistvall, who created the original API library [unofficial-jisho-api][unofficial-jisho-api].
+
+[circleci-badge]: https://circleci.com/gh/h7x4ABk3g/Jisho-Study-Tool.svg?style=shield
+[circleci]: https://app.circleci.com/pipelines/github/h7x4ABk3g/Jisho-Study-Tool
+[flutter-get-started]: https://docs.flutter.dev/get-started/install
+[jisho]: https://jisho.org
+[screenshots]: .github/screenshots/
+[unofficial-jisho-api]: https://www.npmjs.com/package/unofficial-jisho-api
+[unofficial_jisho_api]: https://pub.dev/packages/unofficial_jisho_api

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()

assets/licenses.json

@@ -0,0 +1,4 @@
+{
+    "droid-fonts": "assets/licenses/droid-fonts.txt",
+    "noto-fonts": "assets/licenses/noto-fonts.txt"
+}

assets/licenses/droid-fonts.txt

@@ -0,0 +1,202 @@
+
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.

assets/licenses/noto-fonts.txt

@@ -0,0 +1,94 @@
+Copyright 2018 The Noto Project Authors (github.com/googlei18n/noto-fonts)
+
+This Font Software is licensed under the SIL Open Font License,
+Version 1.1.
+
+This license is copied below, and is also available with a FAQ at:
+http://scripts.sil.org/OFL
+
+-----------------------------------------------------------
+SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007
+-----------------------------------------------------------
+
+PREAMBLE
+The goals of the Open Font License (OFL) are to stimulate worldwide
+development of collaborative font projects, to support the font
+creation efforts of academic and linguistic communities, and to
+provide a free and open framework in which fonts may be shared and
+improved in partnership with others.
+
+The OFL allows the licensed fonts to be used, studied, modified and
+redistributed freely as long as they are not sold by themselves. The
+fonts, including any derivative works, can be bundled, embedded,
+redistributed and/or sold with any software provided that any reserved
+names are not used by derivative works. The fonts and derivatives,
+however, cannot be released under any other type of license. The
+requirement for fonts to remain under this license does not apply to
+any document created using the fonts or their derivatives.
+
+DEFINITIONS
+"Font Software" refers to the set of files released by the Copyright
+Holder(s) under this license and clearly marked as such. This may
+include source files, build scripts and documentation.
+
+"Reserved Font Name" refers to any names specified as such after the
+copyright statement(s).
+
+"Original Version" refers to the collection of Font Software
+components as distributed by the Copyright Holder(s).
+
+"Modified Version" refers to any derivative made by adding to,
+deleting, or substituting -- in part or in whole -- any of the
+components of the Original Version, by changing formats or by porting
+the Font Software to a new environment.
+
+"Author" refers to any designer, engineer, programmer, technical
+writer or other person who contributed to the Font Software.
+
+PERMISSION & CONDITIONS
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Font Software, to use, study, copy, merge, embed,
+modify, redistribute, and sell modified and unmodified copies of the
+Font Software, subject to the following conditions:
+
+1) Neither the Font Software nor any of its individual components, in
+Original or Modified Versions, may be sold by itself.
+
+2) Original or Modified Versions of the Font Software may be bundled,
+redistributed and/or sold with any software, provided that each copy
+contains the above copyright notice and this license. These can be
+included either as stand-alone text files, human-readable headers or
+in the appropriate machine-readable metadata fields within text or
+binary files as long as those fields can be easily viewed by the user.
+
+3) No Modified Version of the Font Software may use the Reserved Font
+Name(s) unless explicit written permission is granted by the
+corresponding Copyright Holder. This restriction only applies to the
+primary font name as presented to the users.
+
+4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font
+Software shall not be used to promote, endorse or advertise any
+Modified Version, except to acknowledge the contribution(s) of the
+Copyright Holder(s) and the Author(s) or with their explicit written
+permission.
+
+5) The Font Software, modified or unmodified, in part or in whole,
+must be distributed entirely under this license, and must not be
+distributed under any other license. The requirement for fonts to
+remain under this license does not apply to any document created using
+the Font Software.
+
+TERMINATION
+This license becomes null and void if any of the above conditions are
+not met.
+
+DISCLAIMER
+THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
+OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE
+COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL
+DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM
+OTHER DEALINGS IN THE FONT SOFTWARE.

lib/components/common/denshi_jisho_background.dart

@@ -0,0 +1,27 @@
+import 'package:flutter/material.dart';
+
+class DenshiJishoBackground extends StatelessWidget {
+  final Widget child;
+
+  const DenshiJishoBackground({
+    Key? key,
+    required this.child,
+  }) : super(key: key);
+
+  @override
+  Widget build(BuildContext context) {
+    return Stack(
+      children: [
+        Positioned(
+          right: 30,
+          left: 100,
+          bottom: 30,
+          child: Image.asset(
+            'assets/images/denshi_jisho_background_overlay.png',
+          ),
+        ),
+        child,
+      ],
+    );
+  }
+}

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/drawing_board/drawing_board.dart

@@ -3,6 +3,7 @@ import 'package:signature/signature.dart';
 
 import '../../bloc/theme/theme_bloc.dart';
 import '../../services/handwriting.dart';
+import '../../settings.dart';
 
 class DrawingBoard extends StatefulWidget {
   final Function(String)? onSuggestionChosen;
@@ -112,7 +113,7 @@ class _DrawingBoardState extends State<DrawingBoard> {
                   style: TextStyle(
                     fontSize: fontSize,
                     color: colors.foreground,
-                  ),
+                  ).merge(japaneseFont.textStyle),
                 ),
               ),
             );

lib/components/history/date_divider.dart

@@ -2,38 +2,13 @@ import 'package:flutter/material.dart';
 
 import '../../bloc/theme/theme_bloc.dart';
 
-class DateDivider extends StatelessWidget {
-  final String? text;
-  final DateTime? date;
+class TextDivider extends StatelessWidget {
+  final String text;
 
-  const DateDivider({
-    this.text,
-    this.date,
+  const TextDivider({
     Key? key,
-  })  : assert((text == null) ^ (date == null)),
-        super(key: key);
-
-  String getHumanReadableDate(DateTime date) {
-    const List<String> monthTable = [
-      'Jan',
-      'Feb',
-      'Mar',
-      'Apr',
-      'May',
-      'Jun',
-      'Jul',
-      'Aug',
-      'Sep',
-      'Oct',
-      'Nov',
-      'Dec',
-    ];
-
-    final int day = date.day;
-    final String month = monthTable[date.month - 1];
-    final int year = date.year;
-    return '$day. $month $year';
-  }
+    required this.text,
+  }) : super(key: key);
 
   @override
   Widget build(BuildContext context) => BlocBuilder<ThemeBloc, ThemeState>(
@@ -47,9 +22,7 @@ class DateDivider extends StatelessWidget {
               horizontal: 10,
             ),
             child: DefaultTextStyle.merge(
-              child: (text != null)
-                  ? Text(text!)
-                  : Text(getHumanReadableDate(date!)),
+              child: Text(text),
               style: TextStyle(color: colors.foreground),
             ),
           );

lib/components/history/search_item.dart

@@ -2,72 +2,103 @@ import 'package:flutter/material.dart';
 import 'package:flutter_slidable/flutter_slidable.dart';
 
 import '../../models/history/search.dart';
+import '../../routing/routes.dart';
+import '../../services/datetime.dart';
+import '../../settings.dart';
+import 'kanji_box.dart';
 
 class SearchItem extends StatelessWidget {
-  final DateTime time;
-  final Widget search;
+  final Search search;
+  // final Widget search;
   final int objectKey;
   final void Function()? onDelete;
   final void Function()? onFavourite;
-  final void Function()? onTap;
 
   const SearchItem({
-    required this.time,
     required this.search,
     required this.objectKey,
     this.onDelete,
     this.onFavourite,
-    this.onTap,
     Key? key,
   }) : super(key: key);
 
-  String getTime() {
-    final hours = time.hour.toString().padLeft(2, '0');
-    final mins = time.minute.toString().padLeft(2, '0');
-    return '$hours:$mins';
-  }
+  Widget get _child => (search.isKanji)
+      ? KanjiBox(kanji: search.kanjiQuery!.kanji)
+      : Text(search.wordQuery!.query);
+
+  void Function() _onTap(context) => search.isKanji
+      ? () => Navigator.pushNamed(
+            context,
+            Routes.kanjiSearch,
+            arguments: search.kanjiQuery!.kanji,
+          )
+      : () => Navigator.pushNamed(
+            context,
+            Routes.search,
+            arguments: search.wordQuery!.query,
+          );
+
+  MaterialPageRoute get timestamps => MaterialPageRoute(
+        builder: (context) => Scaffold(
+          appBar: AppBar(title: const Text('Last searched')),
+          body: ListView(
+            children: [
+              for (final ts in search.timestamps.reversed)
+                ListTile(title: Text('${formatDate(ts)}    ${formatTime(ts)}'))
+            ],
+          ),
+        ),
+      );
+
+  List<SlidableAction> _actions(context) => [
+        SlidableAction(
+          backgroundColor: Colors.blue,
+          icon: Icons.access_time,
+          onPressed: (_) => Navigator.push(context, timestamps),
+        ),
+        SlidableAction(
+          backgroundColor: Colors.yellow,
+          icon: Icons.star,
+          onPressed: (_) {
+            ScaffoldMessenger.of(context).showSnackBar(
+              const SnackBar(content: Text('TODO: implement favourites')),
+            );
+            onFavourite?.call();
+          },
+        ),
+        SlidableAction(
+          backgroundColor: Colors.red,
+          icon: Icons.delete,
+          onPressed: (_) {
+            final Database db = GetIt.instance.get<Database>();
+            Search.store.record(objectKey).delete(db);
+            onDelete?.call();
+          },
+        ),
+      ];
 
   @override
   Widget build(BuildContext context) {
     return Slidable(
       endActionPane: ActionPane(
         motion: const ScrollMotion(),
-        children: [
-          SlidableAction(
-            label: 'Favourite',
-            backgroundColor: Colors.yellow,
-            icon: Icons.star,
-            onPressed: (_) {
-              ScaffoldMessenger.of(context).showSnackBar(
-                const SnackBar(content: Text('TODO: implement favourites')),
-              );
-              onFavourite?.call();
-            },
-          ),
-          SlidableAction(
-            label: 'Delete',
-            backgroundColor: Colors.red,
-            icon: Icons.delete,
-            onPressed: (_) {
-              final Database db = GetIt.instance.get<Database>();
-              Search.store.record(objectKey).delete(db);
-              onDelete?.call();
-            },
-          ),
-        ],
+        children: _actions(context),
       ),
       child: Container(
         padding: const EdgeInsets.symmetric(vertical: 10),
         child: ListTile(
-          onTap: onTap,
+          onTap: _onTap(context),
           contentPadding: EdgeInsets.zero,
           title: Row(
             children: [
               Padding(
                 padding: const EdgeInsets.symmetric(horizontal: 20),
-                child: Text(getTime()),
+                child: Text(formatTime(search.timestamp)),
+              ),
+              DefaultTextStyle.merge(
+                style: japaneseFont.textStyle,
+                child: _child,
               ),
-              search,
             ],
           ),
         ),

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

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)
                 ],
               ),
@@ -114,7 +122,7 @@ class _Kana extends StatelessWidget {
             style: TextStyle(
               color: colors.foreground,
               fontSize: 15.0,
-            ),
+            ).merge(!romajiEnabled ? japaneseFont.textStyle : null),
           ),
           const SizedBox(height: 5.0),
           Text(
@@ -122,7 +130,7 @@ class _Kana extends StatelessWidget {
             style: TextStyle(
               color: colors.foreground,
               fontSize: 20.0,
-            ),
+            ).merge(japaneseFont.textStyle),
           ),
         ],
       ),

lib/components/kanji/kanji_result_body/grade.dart

@@ -1,6 +1,7 @@
 import 'package:flutter/material.dart';
 
 import '../../../bloc/theme/theme_bloc.dart';
+import '../../../settings.dart';
 
 class Grade extends StatelessWidget {
   final String? grade;
@@ -28,7 +29,7 @@ class Grade extends StatelessWidget {
               style: TextStyle(
                 color: colors.foreground,
                 fontSize: 20.0,
-              ),
+              ).merge(japaneseFont.textStyle),
             ),
           );
         },

lib/components/kanji/kanji_result_body/header.dart

@@ -1,6 +1,7 @@
 import 'package:flutter/material.dart';
 
 import '../../../bloc/theme/theme_bloc.dart';
+import '../../../settings.dart';
 
 class Header extends StatelessWidget {
   final String kanji;
@@ -22,10 +23,11 @@ class Header extends StatelessWidget {
                 borderRadius: BorderRadius.circular(10.0),
                 color: colors.background,
               ),
-              child: Center(
+              child: FittedBox(
                 child: Text(
                   kanji,
-                  style: TextStyle(fontSize: 70.0, color: colors.foreground),
+                  style: TextStyle(color: colors.foreground)
+                      .merge(japaneseFont.textStyle),
                 ),
               ),
             );

lib/components/kanji/kanji_result_body/radical.dart

@@ -2,6 +2,8 @@ import 'package:flutter/material.dart';
 import 'package:unofficial_jisho_api/api.dart' as jisho;
 
 import '../../../bloc/theme/theme_bloc.dart';
+import '../../../routing/routes.dart';
+import '../../../settings.dart';
 
 class Radical extends StatelessWidget {
   final jisho.Radical radical;
@@ -16,19 +18,38 @@ class Radical extends StatelessWidget {
         builder: (context, state) {
           final colors = state.theme.kanjiResultColor;
 
-          return Container(
-            padding: const EdgeInsets.all(15.0),
-            decoration: BoxDecoration(
-              shape: BoxShape.circle,
-              color: colors.background,
+          return InkWell(
+            onTap: () => Navigator.pushNamed(
+              context,
+              Routes.kanjiSearchRadicals,
+              arguments: radical.symbol,
             ),
-            child: Text(
-              radical.symbol,
-              style: TextStyle(
-                color: colors.foreground,
-                fontSize: 40.0,
+            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/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,30 @@ class YomiChips extends StatelessWidget {
   bool get isExpandable => yomi.length > 6;
 
   Widget yomiCard({
+    required BuildContext context,
     required String yomi,
     required ColorSet colors,
+    TextStyle? extraTextStyle,
   }) =>
-      Container(
-        margin: const EdgeInsets.symmetric(horizontal: 5),
-        padding: const EdgeInsets.symmetric(
-          vertical: 10.0,
-          horizontal: 10.0,
-        ),
-        decoration: BoxDecoration(
-          color: colors.background,
-          borderRadius: BorderRadius.circular(10.0),
-        ),
-        child: Text(
-          yomi,
-          style: TextStyle(
-            fontSize: 20.0,
-            color: colors.foreground,
+      InkWell(
+        onTap: () =>
+            Navigator.pushNamed(context, Routes.search, arguments: yomi),
+        child: Container(
+          margin: const EdgeInsets.symmetric(horizontal: 5),
+          padding: const EdgeInsets.symmetric(
+            vertical: 10.0,
+            horizontal: 10.0,
+          ),
+          decoration: BoxDecoration(
+            color: colors.background,
+            borderRadius: BorderRadius.circular(10.0),
+          ),
+          child: Text(
+            yomi,
+            style: TextStyle(
+              fontSize: 20.0,
+              color: colors.foreground,
+            ).merge(extraTextStyle),
           ),
         ),
       );
@@ -75,12 +82,22 @@ 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),
+            extraTextStyle: type != YomiType.meaning && !romajiEnabled
+                ? japaneseFont.textStyle
+                : null,
+          ),
+        )
         .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 +118,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/components/kanji/kanji_search_body.dart

@@ -93,9 +93,17 @@ class _KanjiSearchBodyState extends State<KanjiSearchBody>
                     AnimatedSizeAndFade(
                       fadeDuration: const Duration(milliseconds: 200),
                       sizeDuration: const Duration(milliseconds: 300),
-                      child: _controller.value == 1
+                      child: (_controller.value == 1 && suggestions.isNotEmpty)
                           ? KanjiGrid(suggestions: suggestions)
-                          : const KanjiSearchOptionsBar(),
+                          : (_controller.value == 1)
+                              ? const Text(
+                                  'Type a kanji to start searching',
+                                  style: TextStyle(
+                                    fontSize: 16,
+                                    color: Colors.grey,
+                                  ),
+                                )
+                              : const KanjiSearchOptionsBar(),
                     ),
                   ],
                 ),

lib/components/kanji/kanji_search_body/kanji_grid.dart

@@ -2,6 +2,7 @@ import 'package:flutter/material.dart';
 
 import '../../../bloc/theme/theme_bloc.dart';
 import '../../../routing/routes.dart';
+import '../../../settings.dart';
 
 class KanjiGrid extends StatelessWidget {
   final List<String> suggestions;
@@ -49,7 +50,9 @@ class _GridItem extends StatelessWidget {
               child: FittedBox(
                 child: Text(
                   kanji,
-                  style: TextStyle(color: _menuColors.foreground),
+                  style: japaneseFont.textStyle.merge(
+                    TextStyle(color: _menuColors.foreground),
+                  ),
                 ),
               ),
             ),

lib/components/kanji/kanji_search_body/kanji_search_bar.dart

@@ -1,6 +1,8 @@
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
 
+import '../../../settings.dart';
+
 class KanjiSearchBar extends StatefulWidget {
   final Function(String)? onChanged;
 
@@ -52,8 +54,8 @@ class KanjiSearchBarState extends State<KanjiSearchBar> {
       controller: textController,
       onChanged: (text) => onChanged(),
       onSubmitted: (_) => {},
+      style: japaneseFont.textStyle,
       decoration: InputDecoration(
-        prefixIcon: const Icon(Icons.search),
         hintText: 'Search',
         border: OutlineInputBorder(
           borderRadius: BorderRadius.circular(10.0),

lib/components/search/language_selector.dart

@@ -3,6 +3,7 @@ import 'package:get_it/get_it.dart';
 import 'package:shared_preferences/shared_preferences.dart';
 
 import '../../models/themes/theme.dart';
+import '../../settings.dart';
 
 class LanguageSelector extends StatefulWidget {
   const LanguageSelector({Key? key}) : super(key: key);
@@ -31,11 +32,11 @@ class _LanguageSelectorState extends State<LanguageSelector> {
       ?.map((s) => s == '1')
       .toList();
 
-  Widget _languageOption(String language) => 
+  Widget _languageOption(String language, {TextStyle? style}) => 
     Container(
       alignment: Alignment.center,
       padding: const EdgeInsets.symmetric(vertical: 10.0, horizontal: 20.0),
-      child: Text(language),
+      child: Text(language, style: style,),
     );
 
   @override
@@ -43,9 +44,9 @@ class _LanguageSelectorState extends State<LanguageSelector> {
     return ToggleButtons(
       selectedColor: AppTheme.jishoGreen.background,
       isSelected: isSelected,
-      children: <Widget>[
+      children: [
         _languageOption('Auto'),
-        _languageOption('日本語'),
+        _languageOption('日本語', style: japaneseFont.textStyle),
         _languageOption('English')
       ],
       onPressed: (buttonIndex) {

lib/components/search/search_bar.dart

@@ -1,10 +1,20 @@
 import 'package:flutter/material.dart';
 
+import '../../models/themes/theme.dart';
 import '../../routing/routes.dart';
+import '../../settings.dart';
 import 'language_selector.dart';
 
 class SearchBar extends StatelessWidget {
-  const SearchBar({Key? key}) : super(key: key);
+  final TextEditingController controller = TextEditingController();
+
+  SearchBar({Key? key}) : super(key: key);
+
+  void _search(BuildContext context, String text) => Navigator.pushNamed(
+        context,
+        Routes.search,
+        arguments: text,
+      );
 
   @override
   Widget build(BuildContext context) {
@@ -13,17 +23,35 @@ class SearchBar extends StatelessWidget {
       child: Column(
         children: [
           TextField(
-            onSubmitted: (text) =>
-                Navigator.pushNamed(context, Routes.search, arguments: text),
-            controller: TextEditingController(),
+            onSubmitted: (text) => _search(context, text),
+            controller: controller,
+            style: japaneseFont.textStyle,
             decoration: InputDecoration(
               labelText: 'Search',
               border: OutlineInputBorder(
                 borderRadius: BorderRadius.circular(10.0),
               ),
+              suffixIconConstraints: const BoxConstraints.tightFor(height: 60),
+              suffixIcon: Material(
+                borderRadius: const BorderRadius.only(
+                  topRight: Radius.circular(10.0),
+                  bottomRight: Radius.circular(10.0),
+                ),
+                color: AppTheme.jishoGreen.background,
+                child: IconButton(
+                  onPressed: () {
+                    if (controller.text.isNotEmpty)
+                      _search(context, controller.text);
+                  },
+                  icon: const Icon(
+                    Icons.search,
+                    color: Colors.white,
+                  ),
+                ),
+              ),
             ),
           ),
-          const SizedBox(height: 10.0),
+          const SizedBox(height: 20),
           const LanguageSelector()
         ],
       ),

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

@@ -31,8 +31,23 @@ class JapaneseHeader extends StatelessWidget {
           // If that's not the case, then the word is usually present in wordReading.
           // However, there are some exceptions where the reading is placed in word.
           // I have no clue why this might be the case.
-          hasFurigana ? Text(wordReading!) : const Text(''),
-          hasFurigana ? Text(word.word!) : Text(wordReading ?? word.word!),
+          hasFurigana
+              ? Text(
+                  wordReading!,
+                  style: romajiEnabled ? null : japaneseFont.textStyle,
+                )
+              : const Text(''),
+          hasFurigana
+              ? Text(
+                  word.word!,
+                  style: japaneseFont.textStyle,
+                )
+              : Text(
+                  wordReading ?? word.word!,
+                  style: wordReading != null && romajiEnabled
+                      ? null
+                      : japaneseFont.textStyle,
+                ),
         ],
       ),
     );

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

@@ -2,6 +2,8 @@ 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;
@@ -12,33 +14,33 @@ class KanjiRow extends StatelessWidget {
     this.fontSize = 20,
   }) : super(key: key);
 
-  Widget _kanjiBox(String kanji) => UnconstrainedBox(
-        child: IntrinsicHeight(
-          child: AspectRatio(
-            aspectRatio: 1,
-            child: BlocBuilder<ThemeBloc, ThemeState>(
-              builder: (context, state) {
-                final colors = state.theme.menuGreyLight;
-                return Container(
-                  padding: const EdgeInsets.all(10),
-                  alignment: Alignment.center,
-                  decoration: BoxDecoration(
-                    color: colors.background,
-                    borderRadius: BorderRadius.circular(10),
-                  ),
-                  child: FittedBox(
-                    child: Text(
-                      kanji,
-                      style: TextStyle(
-                        color: colors.foreground,
-                        fontSize: fontSize,
-                      ),
-                    ),
-                  ),
-                );
-              },
-            ),
-          ),
+  Widget _kanjiBox(BuildContext context, String kanji) => Square(
+        onTap: () => Navigator.pushNamed(
+          context,
+          Routes.kanjiSearch,
+          arguments: kanji,
+        ),
+        child: BlocBuilder<ThemeBloc, ThemeState>(
+          builder: (context, state) {
+            final colors = state.theme.menuGreyLight;
+            return Container(
+              padding: const EdgeInsets.all(10),
+              alignment: Alignment.center,
+              decoration: BoxDecoration(
+                color: colors.background,
+                borderRadius: BorderRadius.circular(10),
+              ),
+              child: FittedBox(
+                child: Text(
+                  kanji,
+                  style: TextStyle(
+                    color: colors.foreground,
+                    fontSize: fontSize,
+                  ).merge(japaneseFont.textStyle),
+                ),
+              ),
+            );
+          },
         ),
       );
 
@@ -56,15 +58,7 @@ class KanjiRow extends StatelessWidget {
           spacing: 10,
           runSpacing: 10,
           children: [
-            for (final k in kanji)
-              InkWell(
-                onTap: () => Navigator.pushNamed(
-                  context,
-                  Routes.kanjiSearch,
-                  arguments: k,
-                ),
-                child: _kanjiBox(k),
-              )
+            for (final k in kanji) _kanjiBox(context, k),
           ],
         ),
       ],

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

@@ -65,6 +65,10 @@ class KanjiKanaBox extends StatelessWidget {
                     style: TextStyle(
                       fontSize: fFontsize,
                       color: colors.foreground,
+                    ).merge(
+                      romajiEnabled && autoTransliterateRomaji
+                          ? null
+                          : japaneseFont.textStyle,
                     ),
                   )
                 : Text(
@@ -72,14 +76,19 @@ class KanjiKanaBox extends StatelessWidget {
                     style: TextStyle(
                       color: Colors.transparent,
                       fontSize: fFontsize,
+                    ).merge(
+                      romajiEnabled && autoTransliterateRomaji
+                          ? null
+                          : japaneseFont.textStyle,
                     ),
                   ),
 
             DefaultTextStyle.merge(
               child: hasFurigana
-                  ? Text(word.word!)
+                  ? Text(word.word ?? word.reading!)
                   : Text(wordReading ?? word.word!),
-              style: TextStyle(fontSize: kanjiFontsize),
+              style: TextStyle(fontSize: kanjiFontsize)
+                  .merge(japaneseFont.textStyle),
             ),
             if (romajiEnabled && showRomajiBelow)
               Text(

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

@@ -1,15 +1,8 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_svg/flutter_svg.dart';
 import 'package:unofficial_jisho_api/api.dart';
-import 'package:url_launcher/url_launcher.dart';
 
-Future<void> _launch(String url) async {
-  if (await canLaunch(url)) {
-    launch(url);
-  } else {
-    debugPrint('Could not open url: $url');
-  }
-}
+import '../../../../services/open_webpage.dart';
 
 final BoxDecoration _iconStyle = BoxDecoration(
   color: Colors.white,
@@ -30,7 +23,7 @@ Widget _wiki({
             decoration: _iconStyle,
             margin: EdgeInsets.fromLTRB(0, 0, 10, isJapanese ? 12 : 10),
             child: IconButton(
-              onPressed: () => _launch(link),
+              onPressed: () => open_webpage(link),
               icon: SvgPicture.asset('assets/images/wikipedia.svg'),
             ),
           ),
@@ -56,7 +49,7 @@ Widget _wiki({
 Widget _dbpedia(String link) => Container(
       decoration: _iconStyle,
       child: IconButton(
-        onPressed: () => _launch(link),
+        onPressed: () => open_webpage(link),
         icon: Image.asset(
           'assets/images/dbpedia.png',
         ),
@@ -107,7 +100,7 @@ class Links extends StatelessWidget {
     final List<Widget> otherLinks = [
       for (final link in newLinks) ...[
         InkWell(
-          onTap: () => _launch(link.url),
+          onTap: () => open_webpage(link.url),
           child: Text(
             link.text,
             style: const TextStyle(color: Colors.blue),

lib/components/search/search_results_body/parts/sense/antonyms.dart

@@ -2,6 +2,7 @@ import 'package:flutter/material.dart';
 
 import '../../../../../models/themes/theme.dart';
 import '../../../../../routing/routes.dart';
+import '../../../../../settings.dart';
 import 'search_chip.dart';
 
 class Antonyms extends StatelessWidget {
@@ -41,6 +42,7 @@ class Antonyms extends StatelessWidget {
                 child: SearchChip(
                   text: antonym,
                   colors: colors,
+                  extraTextStyle: japaneseFont.textStyle,
                 ),
               ),
           ],

lib/components/search/search_results_body/parts/sense/search_chip.dart

@@ -5,11 +5,13 @@ import '../../../../../models/themes/theme.dart';
 class SearchChip extends StatelessWidget {
   final String text;
   final ColorSet colors;
+  final TextStyle? extraTextStyle;
 
   const SearchChip({
     Key? key,
     required this.text,
     this.colors = LightTheme.defaultMenuGreyNormal,
+    this.extraTextStyle,
   }) : super(key: key);
 
   @override
@@ -21,7 +23,7 @@ class SearchChip extends StatelessWidget {
         ),
         child: Text(
           text,
-          style: TextStyle(color: colors.foreground),
+          style: TextStyle(color: colors.foreground).merge(extraTextStyle),
         ),
       );
 }

lib/components/search/search_results_body/parts/sense/supplemental_info.dart

@@ -1,6 +1,8 @@
 import 'package:flutter/material.dart';
 import 'package:unofficial_jisho_api/api.dart';
 
+import '../../../../../settings.dart';
+
 class SupplementalInfo extends StatelessWidget {
   final JishoWordSense sense;
   final List<String>? supplementalInfo;
@@ -42,6 +44,6 @@ class SupplementalInfo extends StatelessWidget {
   @override
   Widget build(BuildContext context) => DefaultTextStyle.merge(
         child: Column(children: _body),
-        style: TextStyle(color: color),
+        style: TextStyle(color: color).merge(japaneseFont.textStyle),
       );
 }

lib/data/grades.dart

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

lib/main.dart

@@ -1,30 +1,13 @@
-import 'dart:io';
 
 import 'package:flutter/material.dart';
-import 'package:get_it/get_it.dart';
-import 'package:path/path.dart';
-import 'package:path_provider/path_provider.dart';
-import 'package:sembast/sembast.dart';
-import 'package:sembast/sembast_io.dart';
-import 'package:shared_preferences/shared_preferences.dart';
 
 import 'bloc/theme/theme_bloc.dart';
 import 'routing/router.dart';
+import 'services/database.dart';
+import 'services/licenses.dart';
+import 'services/preferences.dart';
 import 'settings.dart';
 
-Future<void> setupDatabase() async {
-  final Directory appDocDir = await getApplicationDocumentsDirectory();
-  if (!appDocDir.existsSync()) appDocDir.createSync(recursive: true);
-  final Database database =
-      await databaseFactoryIo.openDatabase(join(appDocDir.path, 'sembast.db'));
-  GetIt.instance.registerSingleton<Database>(database);
-}
-
-Future<void> setupSharedPreferences() async {
-  final SharedPreferences prefs = await SharedPreferences.getInstance();
-  GetIt.instance.registerSingleton<SharedPreferences>(prefs);
-}
-
 Future<void> main() async {
   WidgetsFlutterBinding.ensureInitialized();
 
@@ -33,6 +16,8 @@ Future<void> main() async {
     setupSharedPreferences(),
   ]);
 
+  registerExtraLicenses();
+
   runApp(const MyApp());
 }
 

lib/models/history/search.dart

@@ -1,3 +1,4 @@
+import 'package:get_it/get_it.dart';
 import 'package:sembast/sembast.dart';
 
 import './kanji_query.dart';
@@ -7,39 +8,81 @@ export 'package:get_it/get_it.dart';
 export 'package:sembast/sembast.dart';
 
 class Search {
-  final DateTime timestamp;
   final WordQuery? wordQuery;
   final KanjiQuery? kanjiQuery;
+  final List<DateTime> timestamps;
 
   Search.fromKanjiQuery({
-    required this.timestamp,
     required KanjiQuery this.kanjiQuery,
-  }) : wordQuery = null;
+    List<DateTime>? timestamps,
+  })  : wordQuery = null,
+        timestamps = timestamps ?? [DateTime.now()];
 
   Search.fromWordQuery({
-    required this.timestamp,
     required WordQuery this.wordQuery,
-  }) : kanjiQuery = null;
+    List<DateTime>? timestamps,
+  })  : kanjiQuery = null,
+        timestamps = timestamps ?? [DateTime.now()];
 
   bool get isKanji => wordQuery == null;
 
+  DateTime get timestamp => timestamps.last;
+
   Map<String, Object?> toJson() => {
-        'timestamp': timestamp.millisecondsSinceEpoch,
+        'timestamps': [for (final ts in timestamps) ts.millisecondsSinceEpoch],
+        'lastTimestamp': timestamps.last.millisecondsSinceEpoch,
         'wordQuery': wordQuery?.toJson(),
         'kanjiQuery': kanjiQuery?.toJson(),
       };
 
-  factory Search.fromJson(Map<String, dynamic> json) =>
-      json['wordQuery'] != null
-          ? Search.fromWordQuery(
-              timestamp:
-                  DateTime.fromMillisecondsSinceEpoch(json['timestamp'] as int),
-              wordQuery: WordQuery.fromJson(json['wordQuery']),
-            )
-          : Search.fromKanjiQuery(
-              timestamp: DateTime.fromMillisecondsSinceEpoch(json['timestamp'] as int),
-              kanjiQuery: KanjiQuery.fromJson(json['kanjiQuery']),
-            );
+  factory Search.fromJson(Map<String, dynamic> json) {
+    final List<DateTime> timestamps = [
+      for (final ts in json['timestamps'] as List<dynamic>)
+        DateTime.fromMillisecondsSinceEpoch(ts as int)
+    ];
+
+    return json['wordQuery'] != null
+        ? Search.fromWordQuery(
+            wordQuery: WordQuery.fromJson(json['wordQuery']),
+            timestamps: timestamps,
+          )
+        : Search.fromKanjiQuery(
+            kanjiQuery: KanjiQuery.fromJson(json['kanjiQuery']),
+            timestamps: timestamps,
+          );
+  }
 
   static StoreRef<int, Object?> get store => intMapStoreFactory.store('search');
 }
+
+Future<void> addSearchToDatabase({
+  required String searchTerm,
+  required bool isKanji,
+}) async {
+  final DateTime now = DateTime.now();
+  final db = GetIt.instance.get<Database>();
+  final Filter filter = Filter.equals(
+    isKanji ? 'kanjiQuery.kanji' : 'wordQuery.query',
+    searchTerm,
+  );
+
+  final RecordSnapshot<int, Object?>? previousSearch =
+      await Search.store.findFirst(db, finder: Finder(filter: filter));
+
+  if (previousSearch != null) {
+    final search =
+        Search.fromJson(previousSearch.value! as Map<String, Object?>);
+    search.timestamps.add(now);
+    Search.store.record(previousSearch.key).put(db, search.toJson());
+    return;
+  }
+
+  Search.store.add(
+    db,
+    isKanji
+        ? Search.fromKanjiQuery(kanjiQuery: KanjiQuery(kanji: searchTerm))
+            .toJson()
+        : Search.fromWordQuery(wordQuery: WordQuery(query: searchTerm))
+            .toJson(),
+  );
+}

lib/routing/router.dart

@@ -1,11 +1,12 @@
 import 'package:flutter/material.dart';
 
 import '../screens/home.dart';
-import '../screens/search/kanji_result_page.dart';
+import '../screens/info/about.dart';
+import '../screens/info/licenses.dart';
+import '../screens/search/result_page.dart';
 import '../screens/search/search_mechanisms/drawing.dart';
 import '../screens/search/search_mechanisms/grade_list.dart';
 import '../screens/search/search_mechanisms/radical_list.dart';
-import '../screens/search/search_results_page.dart';
 import 'routes.dart';
 
 Route<Widget> generateRoute(RouteSettings settings) {
@@ -18,13 +19,13 @@ Route<Widget> generateRoute(RouteSettings settings) {
     case Routes.search:
       final searchTerm = args! as String;
       return MaterialPageRoute(
-        builder: (_) => SearchResultsPage(searchTerm: searchTerm),
+        builder: (_) => ResultPage(searchTerm: searchTerm, isKanji: false),
       );
 
     case Routes.kanjiSearch:
       final searchTerm = args! as String;
       return MaterialPageRoute(
-        builder: (_) => KanjiResultPage(kanjiSearchTerm: searchTerm),
+        builder: (_) => ResultPage(searchTerm: searchTerm, isKanji: true),
       );
 
     case Routes.kanjiSearchDraw:
@@ -34,7 +35,15 @@ 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),
+      );
+
+    case Routes.about:
+      return MaterialPageRoute(builder: (_) => const AboutView());
+    case Routes.aboutLicenses:
+      return MaterialPageRoute(builder: (_) => const LicensesView());
 
     // TODO: Add more specific error screens.
     case Routes.errorNotFound:

lib/routing/routes.dart

@@ -5,6 +5,8 @@ class Routes {
   static const String kanjiSearchDraw = '/kanjiSearch/draw';
   static const String kanjiSearchGrade = '/kanjiSearch/grade';
   static const String kanjiSearchRadicals = '/kanjiSearch/radicals';
+  static const String about = '/info/about';
+  static const String aboutLicenses = '/info/licenses';
   static const String errorNotFound = '/error/404';
   static const String errorNetwork = '/error/network';
   static const String errorOther = '/error/other';

lib/screens/history.dart

@@ -3,18 +3,15 @@ import 'package:flutter/material.dart';
 import '../components/common/loading.dart';
 import '../components/common/opaque_box.dart';
 import '../components/history/date_divider.dart';
-import '../components/history/kanji_box.dart';
 import '../components/history/search_item.dart';
 import '../models/history/search.dart';
-import '../routing/routes.dart';
+import '../services/datetime.dart';
 
 class HistoryView extends StatelessWidget {
   const HistoryView({Key? key}) : super(key: key);
 
-  Database get _db => GetIt.instance.get<Database>();
-
   Stream<Map<int, Search>> get searchStream => Search.store
-      .query(finder: Finder(sortOrders: [SortOrder('timestamp', false)]))
+      .query(finder: Finder(sortOrders: [SortOrder('lastTimestamp', false)]))
       .onSnapshots(_db)
       .map(
         (snapshot) => Map.fromEntries(
@@ -27,6 +24,8 @@ class HistoryView extends StatelessWidget {
         ),
       );
 
+  Database get _db => GetIt.instance.get<Database>();
+
   @override
   Widget build(BuildContext context) {
     return StreamBuilder<Map<int, Search>>(
@@ -52,72 +51,27 @@ class HistoryView extends StatelessWidget {
     );
   }
 
-  Widget Function(BuildContext, int) historyEntryWithData(
-    Map<int, Search> data,
-  ) =>
-      (context, index) {
-        if (index == 0) return const SizedBox.shrink();
-
-        final Search search = data.values.toList()[index - 1];
-        final int objectKey = data.keys.toList()[index - 1];
-
-        late final Widget child;
-        late final void Function() onTap;
-
-        if (search.isKanji) {
-          child = KanjiBox(kanji: search.kanjiQuery!.kanji);
-          onTap = () => Navigator.pushNamed(
-                context,
-                Routes.kanjiSearch,
-                arguments: search.kanjiQuery!.kanji,
-              );
-        } else {
-          child = Text(search.wordQuery!.query);
-          onTap = () => Navigator.pushNamed(
-                context,
-                Routes.search,
-                arguments: search.wordQuery!.query,
-              );
-        }
-
-        return SearchItem(
-          time: search.timestamp,
-          search: child,
-          objectKey: objectKey,
-          onTap: onTap,
-          onDelete: () => build(context),
-        );
-      };
-
-  DateTime roundToDay(DateTime date) =>
-      DateTime(date.year, date.month, date.day);
-
-  bool dateChangedFromLastSearch(Search prevSearch, DateTime searchDate) {
-    final DateTime prevSearchDate = roundToDay(prevSearch.timestamp);
-    return prevSearchDate != searchDate;
-  }
-
-  DateTime get today => roundToDay(DateTime.now());
-  DateTime get yesterday =>
-      roundToDay(DateTime.now().subtract(const Duration(days: 1)));
-
   Widget Function(BuildContext, int) historyEntrySeparatorWithData(
     List<Search> data,
   ) =>
       (context, index) {
         final Search search = data[index];
-        final DateTime searchDate = roundToDay(search.timestamp);
+        final DateTime searchDate = search.timestamp;
 
-        if (index == 0 ||
-            dateChangedFromLastSearch(data[index - 1], searchDate)) {
-          if (searchDate == today)
-            return const DateDivider(text: 'Today');
-          else if (searchDate == yesterday)
-            return const DateDivider(text: 'Yesterday');
-          else
-            return DateDivider(date: searchDate);
-        }
+        if (index == 0 || !dateIsEqual(data[index - 1].timestamp, searchDate))
+          return TextDivider(text: formatDate(roundToDay(searchDate)));
 
         return const Divider(height: 0);
       };
+
+  Widget Function(BuildContext, int) historyEntryWithData(
+    Map<int, Search> data,
+  ) =>
+      (context, index) => (index == 0)
+          ? const SizedBox.shrink()
+          : SearchItem(
+              search: data.values.toList()[index - 1],
+              objectKey: data.keys.toList()[index - 1],
+              onDelete: () => build(context),
+            );
 }

lib/screens/home.dart

@@ -3,6 +3,7 @@ import 'package:flutter/material.dart';
 import 'package:mdi/mdi.dart';
 
 import '../bloc/theme/theme_bloc.dart';
+import '../components/common/denshi_jisho_background.dart';
 import 'debug.dart';
 import 'history.dart';
 import 'search/kanji_view.dart';
@@ -30,19 +31,7 @@ class _HomeState extends State<Home> {
             backgroundColor: AppTheme.jishoGreen.background,
             foregroundColor: AppTheme.jishoGreen.foreground,
           ),
-          body: Stack(
-            children: [
-              Positioned(
-                right: 30,
-                left: 100,
-                bottom: 30,
-                child: Image.asset(
-                  'assets/images/denshi_jisho_background_overlay.png',
-                ),
-              ),
-              pages[pageNum].content,
-            ],
-          ),
+          body: DenshiJishoBackground(child: pages[pageNum].content),
           bottomNavigationBar: BottomNavigationBar(
             fixedColor: AppTheme.jishoGreen.background,
             currentIndex: pageNum,
@@ -103,8 +92,8 @@ class _HomeState extends State<Home> {
         if (kDebugMode) ...[
           const _Page(
             content: DebugView(),
-            titleBar:  Text('Debug Page'),
-            item:  BottomNavigationBarItem(
+            titleBar: Text('Debug Page'),
+            item: BottomNavigationBarItem(
               label: 'Debug',
               icon: Icon(Icons.biotech),
             ),

lib/screens/info/about.dart

@@ -0,0 +1,149 @@
+import 'package:flutter/material.dart';
+import 'package:mdi/mdi.dart';
+
+import '../../components/common/denshi_jisho_background.dart';
+import '../../services/open_webpage.dart';
+import '../../settings.dart';
+
+class AboutView extends StatelessWidget {
+  const AboutView({Key? key}) : super(key: key);
+
+  static const double _verticalSeparation = 18.0;
+
+  Widget _header(context) => Column(
+        children: [
+          const SizedBox(height: _verticalSeparation),
+          Text(
+            'Jisho Study Tool',
+            style: Theme.of(context).textTheme.headline5,
+          ),
+          const SizedBox(height: _verticalSeparation),
+          Row(
+            children: [
+              const Expanded(child: SizedBox()),
+              Expanded(
+                child: Image.asset(
+                  'assets/images/logo/logo_icon_transparent_green.png',
+                ),
+              ),
+              const Expanded(child: SizedBox()),
+            ],
+          ),
+          const SizedBox(height: _verticalSeparation),
+          Text(
+            'Version: $appVersion',
+            style: Theme.of(context).textTheme.bodyText2,
+          ),
+          const SizedBox(height: _verticalSeparation),
+        ],
+      );
+
+  @override
+  Widget build(BuildContext context) {
+    return Scaffold(
+      appBar: AppBar(title: const Text('About')),
+      body: DenshiJishoBackground(
+        child: Padding(
+          padding: const EdgeInsets.symmetric(horizontal: 10),
+          child: Column(
+            crossAxisAlignment: CrossAxisAlignment.start,
+            // crossAxisAlignment: CrossAxisAlignment.center,
+            children: [
+              _header(context),
+              Padding(
+                padding: const EdgeInsets.symmetric(horizontal: 30),
+                child: Text(
+                  'Jisho Study Tool is a frontend for Jisho.org, a a powerful Japanese-English dictionary. '
+                  "It's made to aid you in your journey towards Japanese proficiency. "
+                  'More features to come!',
+                  style: Theme.of(context).textTheme.bodyText2,
+                ),
+              ),
+
+              const SizedBox(height: 2 * _verticalSeparation),
+
+              Text('Contact:', style: Theme.of(context).textTheme.headline6),
+              const SizedBox(height: _verticalSeparation),
+              IntrinsicHeight(
+                child: Row(
+                  children: [
+                    Container(
+                      decoration: BoxDecoration(
+                        color: Colors.black,
+                        borderRadius: BorderRadius.circular(15),
+                      ),
+                      child: IconButton(
+                        color: Colors.white,
+                        iconSize: 50,
+                        onPressed: () => open_webpage(
+                          'https://github.com/h7x4ABk3g/Jisho-Study-Tool',
+                        ),
+                        icon: const Icon(Mdi.github),
+                      ),
+                    ),
+                    const SizedBox(width: 20),
+                    Expanded(
+                      child: InkWell(
+                        onTap: () => open_webpage(
+                          'mailto:developer@jishostudytool.app',
+                        ),
+                        child: Column(
+                          mainAxisAlignment: MainAxisAlignment.center,
+                          crossAxisAlignment: CrossAxisAlignment.start,
+                          children: const [
+                            Text('You can reach me at:'),
+                            Text(
+                              'developer@jishostudytool.app',
+                              style: TextStyle(color: Colors.blue),
+                            ),
+                          ],
+                        ),
+                      ),
+                    ),
+                  ],
+                ),
+              ),
+              const SizedBox(height: _verticalSeparation),
+              Text(
+                'File a bug report:',
+                style: Theme.of(context).textTheme.headline6,
+              ),
+              InkWell(
+                onTap: () => open_webpage(
+                  'mailto:bugs@jishostudytool.app',
+                ),
+                child: Container(
+                  alignment: Alignment.center,
+                  padding: const EdgeInsets.symmetric(
+                    vertical: _verticalSeparation,
+                  ),
+                  child: const Text(
+                    'bugs@jishostudytool.app',
+                    style: TextStyle(color: Colors.blue),
+                  ),
+                ),
+              ),
+              Text(
+                'I would really appreciate it if you send in some bug reports! '
+                'If you find something weird, '
+                'please send me a mail, or open an issue on GitHub.',
+                style: Theme.of(context).textTheme.bodyText2,
+              ),
+              const SizedBox(height: _verticalSeparation),
+              Center(
+                child: Text(
+                  '頑張れ！',
+                  style: Theme.of(context)
+                      .textTheme
+                      .headline5
+                      ?.merge(japaneseFont.textStyle),
+                ),
+              ),
+              // const SizedBox(height: 6 * _verticalSeparation),
+            ],
+          ),
+        ),
+      ),
+    );
+  }
+}

lib/screens/info/licenses.dart

@@ -0,0 +1,27 @@
+import 'package:flutter/material.dart';
+
+import '../../settings.dart';
+
+class LicensesView extends StatelessWidget {
+  const LicensesView({Key? key}) : super(key: key);
+
+  @override
+  Widget build(BuildContext context) => LicensePage(
+        applicationName: 'Jisho Study Tool',
+        applicationVersion: 'Version: $appVersion',
+        applicationIcon: Padding(
+          padding: const EdgeInsets.symmetric(vertical: 30),
+          child: Row(
+            children: [
+              const Expanded(child: SizedBox()),
+              Expanded(
+                child: Image.asset(
+                  'assets/images/logo/logo_icon_transparent_green.png',
+                ),
+              ),
+              const Expanded(child: SizedBox()),
+            ],
+          ),
+        ),
+      );
+}

lib/screens/search/kanji_result_page.dart

@@ -1,50 +0,0 @@
-import 'package:flutter/material.dart';
-
-import '../../components/common/loading.dart';
-import '../../components/kanji/kanji_result_body.dart';
-import '../../models/history/kanji_query.dart';
-import '../../models/history/search.dart';
-import '../../services/jisho_api/kanji_search.dart';
-
-class KanjiResultPage extends StatefulWidget {
-  final String kanjiSearchTerm;
-
-  const KanjiResultPage({
-    Key? key,
-    required this.kanjiSearchTerm,
-  }) : super(key: key);
-
-  @override
-  _KanjiResultPageState createState() => _KanjiResultPageState();
-}
-
-class _KanjiResultPageState extends State<KanjiResultPage> {
-  bool addedToDatabase = false;
-
-  @override
-  Widget build(BuildContext context) {
-    return Scaffold(
-      appBar: AppBar(),
-      body: FutureBuilder<KanjiResult>(
-        future: fetchKanji(widget.kanjiSearchTerm),
-        builder: (context, snapshot) {
-          if (!snapshot.hasData) return const LoadingScreen();
-          if (snapshot.hasError) return ErrorWidget(snapshot.error!);
-
-          if (!addedToDatabase) {
-            Search.store.add(
-              GetIt.instance.get<Database>(),
-              Search.fromKanjiQuery(
-                timestamp: DateTime.now(),
-                kanjiQuery: KanjiQuery(kanji: widget.kanjiSearchTerm),
-              ).toJson(),
-            );
-            addedToDatabase = true;
-          }
-
-          return KanjiResultBody(result: snapshot.data!);
-        },
-      ),
-    );
-  }
-}

lib/screens/search/result_page.dart

@@ -0,0 +1,67 @@
+import 'package:flutter/material.dart';
+
+import '../../components/common/loading.dart';
+import '../../components/kanji/kanji_result_body.dart';
+import '../../components/search/search_result_body.dart';
+import '../../models/history/search.dart';
+import '../../services/jisho_api/jisho_search.dart';
+import '../../services/jisho_api/kanji_search.dart';
+
+class ResultPage extends StatefulWidget {
+  final String searchTerm;
+  final bool isKanji;
+
+  const ResultPage({
+    Key? key,
+    required this.searchTerm,
+    required this.isKanji,
+  }) : super(key: key);
+
+  @override
+  _ResultPageState createState() => _ResultPageState();
+}
+
+class _ResultPageState extends State<ResultPage> {
+  bool addedToDatabase = false;
+
+  @override
+  Widget build(BuildContext context) {
+    return Scaffold(
+      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)
+            : fetchJishoResults(widget.searchTerm),
+        builder: (context, snapshot) {
+          if (!snapshot.hasData) return const LoadingScreen();
+          if (snapshot.hasError) return ErrorWidget(snapshot.error!);
+
+          if (!addedToDatabase) {
+            addSearchToDatabase(
+              searchTerm: widget.searchTerm,
+              isKanji: widget.isKanji,
+            );
+            addedToDatabase = true;
+          }
+
+          return widget.isKanji
+              ? KanjiResultBody(result: snapshot.data! as KanjiResult)
+              : SearchResultsBody(
+                  results: (snapshot.data! as JishoAPIResult).data!,
+                );
+        },
+      ),
+    );
+  }
+}

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,8 @@ 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 {
   const KanjiGradeSearch({Key? key}) : super(key: key);
@@ -29,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(
-            color: color.foreground,
-            fontSize: 25,
-          ),
+          style: Theme.of(context)
+              .textTheme
+              .headline5
+              ?.merge(TextStyle(color: color.foreground))
+              .merge(japaneseFont.textStyle),
         ),
       ),
     );
@@ -77,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(
-                    crossAxisCount: 6,
-                    physics: const NeverScrollableScrollPhysics(),
-                    shrinkWrap: true,
-                    mainAxisSpacing: 10,
-                    crossAxisSpacing: 10,
+                  Padding(
                     padding: const EdgeInsets.all(10),
-                    children: (await gradeWidgets)[grade]!
-                        .values
-                        .expand((l) => l)
-                        .toList(),
-                  )
+                    child: Wrap(
+                      runSpacing: 10,
+                      spacing: 10,
+                      children: (await gradeWidgets)[grade]!
+                          .values
+                          .expand((l) => l)
+                          .toList(),
+                    ),
+                  ),
                 ],
               ),
             ),
-          ))
-              .toList(),
+          ),
         ),
       );
 

lib/screens/search/search_mechanisms/radical_list.dart

@@ -4,9 +4,12 @@ import '../../../../bloc/theme/theme_bloc.dart';
 import '../../../../data/radicals.dart';
 import '../../../../routing/routes.dart';
 import '../../../../services/jisho_api/radicals_search.dart';
+import '../../../settings.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 +28,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;
       });
@@ -151,47 +163,50 @@ class _KanjiRadicalSearchState extends State<KanjiRadicalSearch> {
   Widget build(BuildContext context) {
     return Scaffold(
       appBar: AppBar(title: const Text('Choose by radicals')),
-      body: Column(
-        children: [
-          Expanded(
-            child: (suggestions.isEmpty)
-                ? Center(
-                    child: BlocBuilder<ThemeBloc, ThemeState>(
-                      builder: (context, state) => Text(
-                        'Toggle a radical to start',
-                        style: TextStyle(
-                          fontSize: fontSize * 0.8,
-                          color: state.theme.menuGreyNormal.background,
+      body: DefaultTextStyle.merge(
+        style: japaneseFont.textStyle,
+        child: Column(
+          children: [
+            Expanded(
+              child: (suggestions.isEmpty)
+                  ? Center(
+                      child: BlocBuilder<ThemeBloc, ThemeState>(
+                        builder: (context, state) => Text(
+                          'Toggle a radical to start',
+                          style: TextStyle(
+                            fontSize: fontSize * 0.8,
+                            color: state.theme.menuGreyNormal.background,
+                          ),
                         ),
                       ),
+                    )
+                  : GridView.count(
+                      crossAxisCount: 6,
+                      mainAxisSpacing: 10,
+                      crossAxisSpacing: 10,
+                      padding: const EdgeInsets.all(10),
+                      children:
+                          suggestions.map((s) => kanjiGridElement(s)).toList(),
                     ),
-                  )
-                : GridView.count(
-                    crossAxisCount: 6,
-                    mainAxisSpacing: 10,
-                    crossAxisSpacing: 10,
-                    padding: const EdgeInsets.all(10),
-                    children:
-                        suggestions.map((s) => kanjiGridElement(s)).toList(),
-                  ),
-          ),
-          Divider(
-            color: AppTheme.jishoGreen.background,
-            thickness: 3,
-            height: 30,
-            indent: 5,
-            endIndent: 5,
-          ),
-          Expanded(
-            child: GridView.count(
-              crossAxisCount: 6,
-              mainAxisSpacing: 10,
-              crossAxisSpacing: 10,
-              padding: const EdgeInsets.all(10),
-              children: radicalGridElements,
             ),
-          ),
-        ],
+            Divider(
+              color: AppTheme.jishoGreen.background,
+              thickness: 3,
+              height: 30,
+              indent: 5,
+              endIndent: 5,
+            ),
+            Expanded(
+              child: GridView.count(
+                crossAxisCount: 6,
+                mainAxisSpacing: 10,
+                crossAxisSpacing: 10,
+                padding: const EdgeInsets.all(10),
+                children: radicalGridElements,
+              ),
+            ),
+          ],
+        ),
       ),
     );
   }

lib/screens/search/search_results_page.dart

@@ -1,54 +0,0 @@
-import 'package:flutter/material.dart';
-
-import '../../components/common/loading.dart';
-import '../../components/search/search_result_body.dart';
-import '../../models/history/search.dart';
-import '../../models/history/word_query.dart';
-import '../../services/jisho_api/jisho_search.dart';
-
-// TODO: merge with KanjiResultPage
-class SearchResultsPage extends StatefulWidget {
-  final String searchTerm;
-
-  const SearchResultsPage({
-    Key? key,
-    required this.searchTerm,
-  }) : super(key: key);
-
-  @override
-  _SearchResultsPageState createState() => _SearchResultsPageState();
-}
-
-class _SearchResultsPageState extends State<SearchResultsPage> {
-  bool addedToDatabase = false;
-
-  @override
-  Widget build(BuildContext context) {
-    return Scaffold(
-      appBar: AppBar(),
-      body: FutureBuilder<JishoAPIResult>(
-        future: fetchJishoResults(widget.searchTerm),
-        builder: (context, snapshot) {
-          if (!snapshot.hasData) return const LoadingScreen();
-          if (snapshot.hasError || snapshot.data!.data == null)
-            return ErrorWidget(snapshot.error!);
-
-          if (!addedToDatabase) {
-            Search.store.add(
-              GetIt.instance.get<Database>(),
-              Search.fromWordQuery(
-                timestamp: DateTime.now(),
-                wordQuery: WordQuery(query: widget.searchTerm),
-              ).toJson(),
-            );
-            addedToDatabase = true;
-          }
-
-          return SearchResultsBody(
-            results: snapshot.data!.data!,
-          );
-        },
-      ),
-    );
-  }
-}

lib/screens/search/search_view.dart

@@ -8,9 +8,7 @@ class SearchView extends StatelessWidget {
   Widget build(BuildContext context) {
     return Column(
       mainAxisAlignment: MainAxisAlignment.center,
-      children: const <Widget>[
-        SearchBar(),
-      ],
+      children: <Widget>[SearchBar()],
     );
   }
 }

lib/screens/settings.dart

@@ -1,9 +1,13 @@
 import 'package:confirm_dialog/confirm_dialog.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_settings_ui/flutter_settings_ui.dart';
+import 'package:mdi/mdi.dart';
 
 import '../bloc/theme/theme_bloc.dart';
+import '../components/common/denshi_jisho_background.dart';
 import '../models/history/search.dart';
+import '../routing/routes.dart';
+import '../services/open_webpage.dart';
 import '../settings.dart';
 
 class SettingsView extends StatefulWidget {
@@ -36,6 +40,32 @@ class _SettingsViewState extends State<SettingsView> {
     setState(() => autoThemeEnabled = b);
   }
 
+  Future<int?> Function(BuildContext) _chooseFromList({
+    required List<String> list,
+    int? chosen,
+    String? title,
+  }) =>
+      (context) => Navigator.push<int>(
+            context,
+            MaterialPageRoute(
+              builder: (context) => Scaffold(
+                appBar: AppBar(title: title == null ? null : Text(title)),
+                body: DenshiJishoBackground(
+                  child: ListView.builder(
+                    itemBuilder: (context, i) => ListTile(
+                      title: Text(list[i]),
+                      trailing: (chosen != null && chosen == i)
+                          ? const Icon(Icons.check)
+                          : null,
+                      onTap: () => Navigator.pop(context, i),
+                    ),
+                    itemCount: list.length,
+                  ),
+                ),
+              ),
+            ),
+          );
+
   @override
   Widget build(BuildContext context) => BlocBuilder<ThemeBloc, ThemeState>(
         builder: (context, state) {
@@ -44,6 +74,10 @@ class _SettingsViewState extends State<SettingsView> {
                 state is DarkThemeState ? AppTheme.jishoGreen.background : null,
           );
 
+          const SettingsTileTheme theme = SettingsTileTheme(
+            horizontalTitleGap: 0,
+          );
+
           return SettingsList(
             backgroundColor: Colors.transparent,
             contentPadding: const EdgeInsets.symmetric(vertical: 10),
@@ -54,21 +88,48 @@ class _SettingsViewState extends State<SettingsView> {
                 tiles: <SettingsTile>[
                   SettingsTile.switchTile(
                     title: 'Use romaji',
+                    leading: const Icon(Mdi.alphabetical),
                     onToggle: (b) {
                       setState(() => romajiEnabled = b);
                     },
                     switchValue: romajiEnabled,
+                    theme: theme,
                     switchActiveColor: AppTheme.jishoGreen.background,
                   ),
                   SettingsTile.switchTile(
                     title: 'Extensive search',
+                    leading: const Icon(Icons.downloading),
                     onToggle: (b) {
                       setState(() => extensiveSearchEnabled = b);
                     },
                     switchValue: extensiveSearchEnabled,
+                    theme: theme,
                     switchActiveColor: AppTheme.jishoGreen.background,
-                    subtitle:
-                        'Gathers extra data when searching for words, at the expense of having to wait for extra word details',
+                    // subtitle:
+                    //     'Gathers extra data when searching for words, at the expense of having to wait for extra word details.',
+                    // subtitleWidget:
+                    trailing: const Icon(Icons.info),
+                    subtitleMaxLines: 3,
+                  ),
+                  SettingsTile(
+                    title: 'Japanese font',
+                    leading: const Icon(Icons.format_size),
+                    onPressed: (context) async {
+                      final int? i = await _chooseFromList(
+                        list: [
+                          for (final font in JapaneseFont.values) font.name
+                        ],
+                        chosen: japaneseFont.index,
+                      )(context);
+                      if (i != null)
+                        setState(() {
+                          japaneseFont = JapaneseFont.values[i];
+                        });
+                    },
+                    theme: theme,
+                    trailing: Text(japaneseFont.name),
+                    // subtitle:
+                    //     'Which font to use for japanese text. This might be useful if your phone shows kanji with a Chinese font.',
                     subtitleMaxLines: 3,
                   ),
                 ],
@@ -78,13 +139,16 @@ class _SettingsViewState extends State<SettingsView> {
                 titleTextStyle: _titleTextStyle,
                 tiles: <SettingsTile>[
                   SettingsTile.switchTile(
-                    title: 'Automatically determine theme',
+                    title: 'Automatic theme',
+                    leading: const Icon(Icons.brightness_auto),
                     onToggle: toggleAutoTheme,
                     switchValue: autoThemeEnabled,
+                    theme: theme,
                     switchActiveColor: AppTheme.jishoGreen.background,
                   ),
                   SettingsTile.switchTile(
                     title: 'Dark Theme',
+                    leading: const Icon(Icons.dark_mode),
                     onToggle: (b) {
                       BlocProvider.of<ThemeBloc>(context)
                           .add(SetTheme(themeIsDark: b));
@@ -92,44 +156,46 @@ class _SettingsViewState extends State<SettingsView> {
                     },
                     switchValue: darkThemeEnabled,
                     enabled: !autoThemeEnabled,
+                    theme: theme,
                     switchActiveColor: AppTheme.jishoGreen.background,
                   ),
                 ],
               ),
-              SettingsSection(
-                title: 'Cache',
-                titleTextStyle: _titleTextStyle,
-                tiles: <SettingsTile>[
-                  SettingsTile.switchTile(
-                    title: 'Cache grade 1-7 kanji',
-                    switchValue: false,
-                    onToggle: (v) {},
-                    enabled: false,
-                    switchActiveColor: AppTheme.jishoGreen.background,
-                  ),
-                  SettingsTile.switchTile(
-                    title: 'Cache grade standard kanji',
-                    switchValue: false,
-                    onToggle: (v) {},
-                    enabled: false,
-                    switchActiveColor: AppTheme.jishoGreen.background,
-                  ),
-                  SettingsTile.switchTile(
-                    title: 'Cache all favourites',
-                    switchValue: false,
-                    onToggle: (v) {},
-                    enabled: false,
-                    switchActiveColor: AppTheme.jishoGreen.background,
-                  ),
-                  SettingsTile.switchTile(
-                    title: 'Cache all searches',
-                    switchValue: false,
-                    onToggle: (v) {},
-                    enabled: false,
-                    switchActiveColor: AppTheme.jishoGreen.background,
-                  ),
-                ],
-              ),
+              // TODO: This will be left commented until caching is implemented
+              // SettingsSection(
+              //   title: 'Cache',
+              //   titleTextStyle: _titleTextStyle,
+              //   tiles: <SettingsTile>[
+              //     SettingsTile.switchTile(
+              //       title: 'Cache grade 1-7 kanji',
+              //       switchValue: false,
+              //       onToggle: (v) {},
+              //       enabled: false,
+              //       switchActiveColor: AppTheme.jishoGreen.background,
+              //     ),
+              //     SettingsTile.switchTile(
+              //       title: 'Cache grade standard kanji',
+              //       switchValue: false,
+              //       onToggle: (v) {},
+              //       enabled: false,
+              //       switchActiveColor: AppTheme.jishoGreen.background,
+              //     ),
+              //     SettingsTile.switchTile(
+              //       title: 'Cache all favourites',
+              //       switchValue: false,
+              //       onToggle: (v) {},
+              //       enabled: false,
+              //       switchActiveColor: AppTheme.jishoGreen.background,
+              //     ),
+              //     SettingsTile.switchTile(
+              //       title: 'Cache all searches',
+              //       switchValue: false,
+              //       onToggle: (v) {},
+              //       enabled: false,
+              //       switchActiveColor: AppTheme.jishoGreen.background,
+              //     ),
+              //   ],
+              // ),
               SettingsSection(
                 title: 'Data',
                 titleTextStyle: _titleTextStyle,
@@ -154,6 +220,32 @@ class _SettingsViewState extends State<SettingsView> {
                   )
                 ],
               ),
+              SettingsSection(
+                title: 'Info',
+                titleTextStyle: _titleTextStyle,
+                tiles: <SettingsTile>[
+                  SettingsTile(
+                    leading: const Icon(Icons.info),
+                    title: 'About',
+                    onPressed: (c) =>
+                        Navigator.pushNamed(context, Routes.about),
+                  ),
+                  SettingsTile(
+                    leading: Image.asset(
+                      'assets/images/logo/logo_icon_transparent_green.png',
+                      width: 30,
+                    ),
+                    title: 'Jisho',
+                    onPressed: (c) => open_webpage('https://jisho.org/about'),
+                  ),
+                  SettingsTile(
+                    leading: const Icon(Icons.copyright),
+                    title: 'Licenses',
+                    onPressed: (c) =>
+                        Navigator.pushNamed(context, Routes.aboutLicenses),
+                  ),
+                ],
+              )
             ],
           );
         },

lib/services/database.dart

@@ -0,0 +1,15 @@
+import 'dart:io';
+
+import 'package:get_it/get_it.dart';
+import 'package:path/path.dart';
+import 'package:path_provider/path_provider.dart';
+import 'package:sembast/sembast.dart';
+import 'package:sembast/sembast_io.dart';
+
+Future<void> setupDatabase() async {
+  final Directory appDocDir = await getApplicationDocumentsDirectory();
+  if (!appDocDir.existsSync()) appDocDir.createSync(recursive: true);
+  final Database database =
+      await databaseFactoryIo.openDatabase(join(appDocDir.path, 'sembast.db'));
+  GetIt.instance.registerSingleton<Database>(database);
+}

lib/services/datetime.dart

@@ -0,0 +1,39 @@
+DateTime roundToDay(DateTime date) => DateTime(date.year, date.month, date.day);
+
+bool dateIsEqual(DateTime date1, DateTime date2) =>
+    roundToDay(date1) == roundToDay(date2);
+
+DateTime get today => roundToDay(DateTime.now());
+DateTime get yesterday =>
+    roundToDay(DateTime.now().subtract(const Duration(days: 1)));
+
+String formatTime(DateTime timestamp) {
+  final hours = timestamp.hour.toString().padLeft(2, '0');
+  final mins = timestamp.minute.toString().padLeft(2, '0');
+  return '$hours:$mins';
+}
+
+String formatDate(DateTime date) {
+  if (date == today) return 'Today';
+  if (date == yesterday) return 'Yesterday';
+
+  const List<String> monthTable = [
+    'Jan',
+    'Feb',
+    'Mar',
+    'Apr',
+    'May',
+    'Jun',
+    'Jul',
+    'Aug',
+    'Sep',
+    'Oct',
+    'Nov',
+    'Dec',
+  ];
+
+  final int day = date.day;
+  final String month = monthTable[date.month - 1];
+  final int year = date.year;
+  return '$day. $month $year';
+}

lib/services/licenses.dart

@@ -0,0 +1,14 @@
+import 'dart:convert';
+
+import 'package:flutter/foundation.dart';
+import 'package:flutter/services.dart' show rootBundle;
+
+void registerExtraLicenses() => LicenseRegistry.addLicense(() async* {
+      final jsonString = await rootBundle.loadString('assets/licenses.json');
+      final Map<String, dynamic> jsonData = jsonDecode(jsonString);
+      for (final license in jsonData.entries)
+        yield LicenseEntryWithLineBreaks(
+          [license.key],
+          await rootBundle.loadString(license.value as String),
+        );
+    });

lib/services/open_webpage.dart

@@ -0,0 +1,10 @@
+import 'package:flutter/material.dart';
+import 'package:url_launcher/url_launcher.dart';
+
+Future<void> open_webpage(String url) async {
+  if (await canLaunch(url)) {
+    launch(url);
+  } else {
+    debugPrint('Could not open url: $url');
+  }
+}

lib/services/preferences.dart

@@ -0,0 +1,7 @@
+import 'package:get_it/get_it.dart';
+import 'package:shared_preferences/shared_preferences.dart';
+
+Future<void> setupSharedPreferences() async {
+  final SharedPreferences prefs = await SharedPreferences.getInstance();
+  GetIt.instance.registerSingleton<SharedPreferences>(prefs);
+}

lib/settings.dart

@@ -1,13 +1,52 @@
+import 'package:flutter/material.dart';
 import 'package:get_it/get_it.dart';
 import 'package:shared_preferences/shared_preferences.dart';
 
 final SharedPreferences _prefs = GetIt.instance.get<SharedPreferences>();
 
+enum JapaneseFont {
+  none,
+  droidSansJapanese,
+  notoSansCJK,
+  notoSerifCJK,
+}
+
+extension Methods on JapaneseFont {
+  TextStyle get textStyle {
+    String? fontFamily;
+    switch (this) {
+      case JapaneseFont.droidSansJapanese:
+        fontFamily = 'Droid Sans Japanese';
+        break;
+      case JapaneseFont.notoSansCJK:
+        fontFamily = 'Noto Sans CJK';
+        break;
+      case JapaneseFont.notoSerifCJK:
+        fontFamily = 'Noto Serif CJK';
+        break;
+      case JapaneseFont.none:
+    }
+    return TextStyle(fontFamily: fontFamily);
+  }
+
+  String get name =>
+      {
+        JapaneseFont.none: 'Default',
+        JapaneseFont.droidSansJapanese: 'Droid Sans Japanese',
+        JapaneseFont.notoSansCJK: 'Noto Sans CJK',
+        JapaneseFont.notoSerifCJK: 'Noto Serif CJK',
+      }[this] ??
+      '';
+}
+
+const String appVersion = '0.1 Beta';
+
 const Map<String, dynamic> _defaults = {
   'romajiEnabled': false,
   'extensiveSearch': true,
   'darkThemeEnabled': false,
   'autoThemeEnabled': false,
+  'japaneseFont': JapaneseFont.droidSansJapanese,
 };
 
 bool _getSettingOrDefault(String settingName) =>
@@ -17,8 +56,13 @@ bool get romajiEnabled => _getSettingOrDefault('romajiEnabled');
 bool get extensiveSearchEnabled => _getSettingOrDefault('extensiveSearch');
 bool get darkThemeEnabled => _getSettingOrDefault('darkThemeEnabled');
 bool get autoThemeEnabled => _getSettingOrDefault('autoThemeEnabled');
+JapaneseFont get japaneseFont {
+  final int? i = _prefs.getInt('japaneseFont');
+  return (i != null) ? JapaneseFont.values[i] : _defaults['japaneseFont'];
+}
 
 set romajiEnabled(b) => _prefs.setBool('romajiEnabled', b);
 set extensiveSearchEnabled(b) => _prefs.setBool('extensiveSearch', b);
 set darkThemeEnabled(b) => _prefs.setBool('darkThemeEnabled', b);
 set autoThemeEnabled(b) => _prefs.setBool('autoThemeEnabled', b);
+set japaneseFont(JapaneseFont jf) => _prefs.setInt('japaneseFont', jf.index);

pubspec.lock

@@ -285,7 +285,7 @@ packages:
       name: flutter_svg
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.0.2"
+    version: "1.0.3"
   flutter_test:
     dependency: "direct dev"
     description: flutter
@@ -407,7 +407,7 @@ packages:
       name: just_audio_web
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.4.2"
+    version: "0.4.3"
   logging:
     dependency: transitive
     description:

pubspec.yaml

@@ -44,18 +44,27 @@ flutter:
   uses-material-design: true
   
   assets:
+    - assets/
+    - assets/fonts/
     - assets/images/
     - assets/images/logo/
-  #  - images/a_dot_burr.jpeg
-  #  - images/a_dot_ham.jpeg
+    - assets/licenses/
 
 
-  # fonts:
-  #   - family: Schyler
-  #     fonts:
-  #       - asset: fonts/Schyler-Regular.ttf
-  #       - asset: fonts/Schyler-Italic.ttf
-  #         style: italic
+  fonts:
+    - family: Droid Sans Japanese
+      fonts:
+        - asset: assets/fonts/DroidSansJapanese.ttf
+
+    - family: Noto Sans CJK
+      fonts:
+        - asset: assets/fonts/NotoSansCJK-Regular.ttc 
+
+    - family: Noto Serif CJK
+      fonts:
+        - asset: assets/fonts/NotoSerifCJK-Regular.ttc
+        # - asset: fonts/Schyler-Italic.ttf
+          # style: italic
   #   - family: Trajan Pro
   #     fonts:
   #       - asset: fonts/TrajanPro.ttf