Retrieve fonts through google fonts package, add more fonts

bug introduced in 4a7b28ad68

.gitignore

@@ -14,6 +14,8 @@
 /android/app/profile
 /android/app/release
 
+/android/build/reports
+
 # -----------------------------
 
 # Nix build results

LICENSE

@@ -0,0 +1,674 @@
+                    GNU GENERAL PUBLIC LICENSE
+                       Version 3, 29 June 2007
+
+ Copyright (C) 2007 Free Software Foundation, Inc. <https://fsf.org/>
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+                            Preamble
+
+  The GNU General Public License is a free, copyleft license for
+software and other kinds of works.
+
+  The licenses for most software and other practical works are designed
+to take away your freedom to share and change the works.  By contrast,
+the GNU General Public License is intended to guarantee your freedom to
+share and change all versions of a program--to make sure it remains free
+software for all its users.  We, the Free Software Foundation, use the
+GNU General Public License for most of our software; it applies also to
+any other work released this way by its authors.  You can apply it to
+your programs, too.
+
+  When we speak of free software, we are referring to freedom, not
+price.  Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+them if you wish), that you receive source code or can get it if you
+want it, that you can change the software or use pieces of it in new
+free programs, and that you know you can do these things.
+
+  To protect your rights, we need to prevent others from denying you
+these rights or asking you to surrender the rights.  Therefore, you have
+certain responsibilities if you distribute copies of the software, or if
+you modify it: responsibilities to respect the freedom of others.
+
+  For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must pass on to the recipients the same
+freedoms that you received.  You must make sure that they, too, receive
+or can get the source code.  And you must show them these terms so they
+know their rights.
+
+  Developers that use the GNU GPL protect your rights with two steps:
+(1) assert copyright on the software, and (2) offer you this License
+giving you legal permission to copy, distribute and/or modify it.
+
+  For the developers' and authors' protection, the GPL clearly explains
+that there is no warranty for this free software.  For both users' and
+authors' sake, the GPL requires that modified versions be marked as
+changed, so that their problems will not be attributed erroneously to
+authors of previous versions.
+
+  Some devices are designed to deny users access to install or run
+modified versions of the software inside them, although the manufacturer
+can do so.  This is fundamentally incompatible with the aim of
+protecting users' freedom to change the software.  The systematic
+pattern of such abuse occurs in the area of products for individuals to
+use, which is precisely where it is most unacceptable.  Therefore, we
+have designed this version of the GPL to prohibit the practice for those
+products.  If such problems arise substantially in other domains, we
+stand ready to extend this provision to those domains in future versions
+of the GPL, as needed to protect the freedom of users.
+
+  Finally, every program is threatened constantly by software patents.
+States should not allow patents to restrict development and use of
+software on general-purpose computers, but in those that do, we wish to
+avoid the special danger that patents applied to a free program could
+make it effectively proprietary.  To prevent this, the GPL assures that
+patents cannot be used to render the program non-free.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.
+
+                       TERMS AND CONDITIONS
+
+  0. Definitions.
+
+  "This License" refers to version 3 of the GNU General Public License.
+
+  "Copyright" also means copyright-like laws that apply to other kinds of
+works, such as semiconductor masks.
+
+  "The Program" refers to any copyrightable work licensed under this
+License.  Each licensee is addressed as "you".  "Licensees" and
+"recipients" may be individuals or organizations.
+
+  To "modify" a work means to copy from or adapt all or part of the work
+in a fashion requiring copyright permission, other than the making of an
+exact copy.  The resulting work is called a "modified version" of the
+earlier work or a work "based on" the earlier work.
+
+  A "covered work" means either the unmodified Program or a work based
+on the Program.
+
+  To "propagate" a work means to do anything with it that, without
+permission, would make you directly or secondarily liable for
+infringement under applicable copyright law, except executing it on a
+computer or modifying a private copy.  Propagation includes copying,
+distribution (with or without modification), making available to the
+public, and in some countries other activities as well.
+
+  To "convey" a work means any kind of propagation that enables other
+parties to make or receive copies.  Mere interaction with a user through
+a computer network, with no transfer of a copy, is not conveying.
+
+  An interactive user interface displays "Appropriate Legal Notices"
+to the extent that it includes a convenient and prominently visible
+feature that (1) displays an appropriate copyright notice, and (2)
+tells the user that there is no warranty for the work (except to the
+extent that warranties are provided), that licensees may convey the
+work under this License, and how to view a copy of this License.  If
+the interface presents a list of user commands or options, such as a
+menu, a prominent item in the list meets this criterion.
+
+  1. Source Code.
+
+  The "source code" for a work means the preferred form of the work
+for making modifications to it.  "Object code" means any non-source
+form of a work.
+
+  A "Standard Interface" means an interface that either is an official
+standard defined by a recognized standards body, or, in the case of
+interfaces specified for a particular programming language, one that
+is widely used among developers working in that language.
+
+  The "System Libraries" of an executable work include anything, other
+than the work as a whole, that (a) is included in the normal form of
+packaging a Major Component, but which is not part of that Major
+Component, and (b) serves only to enable use of the work with that
+Major Component, or to implement a Standard Interface for which an
+implementation is available to the public in source code form.  A
+"Major Component", in this context, means a major essential component
+(kernel, window system, and so on) of the specific operating system
+(if any) on which the executable work runs, or a compiler used to
+produce the work, or an object code interpreter used to run it.
+
+  The "Corresponding Source" for a work in object code form means all
+the source code needed to generate, install, and (for an executable
+work) run the object code and to modify the work, including scripts to
+control those activities.  However, it does not include the work's
+System Libraries, or general-purpose tools or generally available free
+programs which are used unmodified in performing those activities but
+which are not part of the work.  For example, Corresponding Source
+includes interface definition files associated with source files for
+the work, and the source code for shared libraries and dynamically
+linked subprograms that the work is specifically designed to require,
+such as by intimate data communication or control flow between those
+subprograms and other parts of the work.
+
+  The Corresponding Source need not include anything that users
+can regenerate automatically from other parts of the Corresponding
+Source.
+
+  The Corresponding Source for a work in source code form is that
+same work.
+
+  2. Basic Permissions.
+
+  All rights granted under this License are granted for the term of
+copyright on the Program, and are irrevocable provided the stated
+conditions are met.  This License explicitly affirms your unlimited
+permission to run the unmodified Program.  The output from running a
+covered work is covered by this License only if the output, given its
+content, constitutes a covered work.  This License acknowledges your
+rights of fair use or other equivalent, as provided by copyright law.
+
+  You may make, run and propagate covered works that you do not
+convey, without conditions so long as your license otherwise remains
+in force.  You may convey covered works to others for the sole purpose
+of having them make modifications exclusively for you, or provide you
+with facilities for running those works, provided that you comply with
+the terms of this License in conveying all material for which you do
+not control copyright.  Those thus making or running the covered works
+for you must do so exclusively on your behalf, under your direction
+and control, on terms that prohibit them from making any copies of
+your copyrighted material outside their relationship with you.
+
+  Conveying under any other circumstances is permitted solely under
+the conditions stated below.  Sublicensing is not allowed; section 10
+makes it unnecessary.
+
+  3. Protecting Users' Legal Rights From Anti-Circumvention Law.
+
+  No covered work shall be deemed part of an effective technological
+measure under any applicable law fulfilling obligations under article
+11 of the WIPO copyright treaty adopted on 20 December 1996, or
+similar laws prohibiting or restricting circumvention of such
+measures.
+
+  When you convey a covered work, you waive any legal power to forbid
+circumvention of technological measures to the extent such circumvention
+is effected by exercising rights under this License with respect to
+the covered work, and you disclaim any intention to limit operation or
+modification of the work as a means of enforcing, against the work's
+users, your or third parties' legal rights to forbid circumvention of
+technological measures.
+
+  4. Conveying Verbatim Copies.
+
+  You may convey verbatim copies of the Program's source code as you
+receive it, in any medium, provided that you conspicuously and
+appropriately publish on each copy an appropriate copyright notice;
+keep intact all notices stating that this License and any
+non-permissive terms added in accord with section 7 apply to the code;
+keep intact all notices of the absence of any warranty; and give all
+recipients a copy of this License along with the Program.
+
+  You may charge any price or no price for each copy that you convey,
+and you may offer support or warranty protection for a fee.
+
+  5. Conveying Modified Source Versions.
+
+  You may convey a work based on the Program, or the modifications to
+produce it from the Program, in the form of source code under the
+terms of section 4, provided that you also meet all of these conditions:
+
+    a) The work must carry prominent notices stating that you modified
+    it, and giving a relevant date.
+
+    b) The work must carry prominent notices stating that it is
+    released under this License and any conditions added under section
+    7.  This requirement modifies the requirement in section 4 to
+    "keep intact all notices".
+
+    c) You must license the entire work, as a whole, under this
+    License to anyone who comes into possession of a copy.  This
+    License will therefore apply, along with any applicable section 7
+    additional terms, to the whole of the work, and all its parts,
+    regardless of how they are packaged.  This License gives no
+    permission to license the work in any other way, but it does not
+    invalidate such permission if you have separately received it.
+
+    d) If the work has interactive user interfaces, each must display
+    Appropriate Legal Notices; however, if the Program has interactive
+    interfaces that do not display Appropriate Legal Notices, your
+    work need not make them do so.
+
+  A compilation of a covered work with other separate and independent
+works, which are not by their nature extensions of the covered work,
+and which are not combined with it such as to form a larger program,
+in or on a volume of a storage or distribution medium, is called an
+"aggregate" if the compilation and its resulting copyright are not
+used to limit the access or legal rights of the compilation's users
+beyond what the individual works permit.  Inclusion of a covered work
+in an aggregate does not cause this License to apply to the other
+parts of the aggregate.
+
+  6. Conveying Non-Source Forms.
+
+  You may convey a covered work in object code form under the terms
+of sections 4 and 5, provided that you also convey the
+machine-readable Corresponding Source under the terms of this License,
+in one of these ways:
+
+    a) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by the
+    Corresponding Source fixed on a durable physical medium
+    customarily used for software interchange.
+
+    b) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by a
+    written offer, valid for at least three years and valid for as
+    long as you offer spare parts or customer support for that product
+    model, to give anyone who possesses the object code either (1) a
+    copy of the Corresponding Source for all the software in the
+    product that is covered by this License, on a durable physical
+    medium customarily used for software interchange, for a price no
+    more than your reasonable cost of physically performing this
+    conveying of source, or (2) access to copy the
+    Corresponding Source from a network server at no charge.
+
+    c) Convey individual copies of the object code with a copy of the
+    written offer to provide the Corresponding Source.  This
+    alternative is allowed only occasionally and noncommercially, and
+    only if you received the object code with such an offer, in accord
+    with subsection 6b.
+
+    d) Convey the object code by offering access from a designated
+    place (gratis or for a charge), and offer equivalent access to the
+    Corresponding Source in the same way through the same place at no
+    further charge.  You need not require recipients to copy the
+    Corresponding Source along with the object code.  If the place to
+    copy the object code is a network server, the Corresponding Source
+    may be on a different server (operated by you or a third party)
+    that supports equivalent copying facilities, provided you maintain
+    clear directions next to the object code saying where to find the
+    Corresponding Source.  Regardless of what server hosts the
+    Corresponding Source, you remain obligated to ensure that it is
+    available for as long as needed to satisfy these requirements.
+
+    e) Convey the object code using peer-to-peer transmission, provided
+    you inform other peers where the object code and Corresponding
+    Source of the work are being offered to the general public at no
+    charge under subsection 6d.
+
+  A separable portion of the object code, whose source code is excluded
+from the Corresponding Source as a System Library, need not be
+included in conveying the object code work.
+
+  A "User Product" is either (1) a "consumer product", which means any
+tangible personal property which is normally used for personal, family,
+or household purposes, or (2) anything designed or sold for incorporation
+into a dwelling.  In determining whether a product is a consumer product,
+doubtful cases shall be resolved in favor of coverage.  For a particular
+product received by a particular user, "normally used" refers to a
+typical or common use of that class of product, regardless of the status
+of the particular user or of the way in which the particular user
+actually uses, or expects or is expected to use, the product.  A product
+is a consumer product regardless of whether the product has substantial
+commercial, industrial or non-consumer uses, unless such uses represent
+the only significant mode of use of the product.
+
+  "Installation Information" for a User Product means any methods,
+procedures, authorization keys, or other information required to install
+and execute modified versions of a covered work in that User Product from
+a modified version of its Corresponding Source.  The information must
+suffice to ensure that the continued functioning of the modified object
+code is in no case prevented or interfered with solely because
+modification has been made.
+
+  If you convey an object code work under this section in, or with, or
+specifically for use in, a User Product, and the conveying occurs as
+part of a transaction in which the right of possession and use of the
+User Product is transferred to the recipient in perpetuity or for a
+fixed term (regardless of how the transaction is characterized), the
+Corresponding Source conveyed under this section must be accompanied
+by the Installation Information.  But this requirement does not apply
+if neither you nor any third party retains the ability to install
+modified object code on the User Product (for example, the work has
+been installed in ROM).
+
+  The requirement to provide Installation Information does not include a
+requirement to continue to provide support service, warranty, or updates
+for a work that has been modified or installed by the recipient, or for
+the User Product in which it has been modified or installed.  Access to a
+network may be denied when the modification itself materially and
+adversely affects the operation of the network or violates the rules and
+protocols for communication across the network.
+
+  Corresponding Source conveyed, and Installation Information provided,
+in accord with this section must be in a format that is publicly
+documented (and with an implementation available to the public in
+source code form), and must require no special password or key for
+unpacking, reading or copying.
+
+  7. Additional Terms.
+
+  "Additional permissions" are terms that supplement the terms of this
+License by making exceptions from one or more of its conditions.
+Additional permissions that are applicable to the entire Program shall
+be treated as though they were included in this License, to the extent
+that they are valid under applicable law.  If additional permissions
+apply only to part of the Program, that part may be used separately
+under those permissions, but the entire Program remains governed by
+this License without regard to the additional permissions.
+
+  When you convey a copy of a covered work, you may at your option
+remove any additional permissions from that copy, or from any part of
+it.  (Additional permissions may be written to require their own
+removal in certain cases when you modify the work.)  You may place
+additional permissions on material, added by you to a covered work,
+for which you have or can give appropriate copyright permission.
+
+  Notwithstanding any other provision of this License, for material you
+add to a covered work, you may (if authorized by the copyright holders of
+that material) supplement the terms of this License with terms:
+
+    a) Disclaiming warranty or limiting liability differently from the
+    terms of sections 15 and 16 of this License; or
+
+    b) Requiring preservation of specified reasonable legal notices or
+    author attributions in that material or in the Appropriate Legal
+    Notices displayed by works containing it; or
+
+    c) Prohibiting misrepresentation of the origin of that material, or
+    requiring that modified versions of such material be marked in
+    reasonable ways as different from the original version; or
+
+    d) Limiting the use for publicity purposes of names of licensors or
+    authors of the material; or
+
+    e) Declining to grant rights under trademark law for use of some
+    trade names, trademarks, or service marks; or
+
+    f) Requiring indemnification of licensors and authors of that
+    material by anyone who conveys the material (or modified versions of
+    it) with contractual assumptions of liability to the recipient, for
+    any liability that these contractual assumptions directly impose on
+    those licensors and authors.
+
+  All other non-permissive additional terms are considered "further
+restrictions" within the meaning of section 10.  If the Program as you
+received it, or any part of it, contains a notice stating that it is
+governed by this License along with a term that is a further
+restriction, you may remove that term.  If a license document contains
+a further restriction but permits relicensing or conveying under this
+License, you may add to a covered work material governed by the terms
+of that license document, provided that the further restriction does
+not survive such relicensing or conveying.
+
+  If you add terms to a covered work in accord with this section, you
+must place, in the relevant source files, a statement of the
+additional terms that apply to those files, or a notice indicating
+where to find the applicable terms.
+
+  Additional terms, permissive or non-permissive, may be stated in the
+form of a separately written license, or stated as exceptions;
+the above requirements apply either way.
+
+  8. Termination.
+
+  You may not propagate or modify a covered work except as expressly
+provided under this License.  Any attempt otherwise to propagate or
+modify it is void, and will automatically terminate your rights under
+this License (including any patent licenses granted under the third
+paragraph of section 11).
+
+  However, if you cease all violation of this License, then your
+license from a particular copyright holder is reinstated (a)
+provisionally, unless and until the copyright holder explicitly and
+finally terminates your license, and (b) permanently, if the copyright
+holder fails to notify you of the violation by some reasonable means
+prior to 60 days after the cessation.
+
+  Moreover, your license from a particular copyright holder is
+reinstated permanently if the copyright holder notifies you of the
+violation by some reasonable means, this is the first time you have
+received notice of violation of this License (for any work) from that
+copyright holder, and you cure the violation prior to 30 days after
+your receipt of the notice.
+
+  Termination of your rights under this section does not terminate the
+licenses of parties who have received copies or rights from you under
+this License.  If your rights have been terminated and not permanently
+reinstated, you do not qualify to receive new licenses for the same
+material under section 10.
+
+  9. Acceptance Not Required for Having Copies.
+
+  You are not required to accept this License in order to receive or
+run a copy of the Program.  Ancillary propagation of a covered work
+occurring solely as a consequence of using peer-to-peer transmission
+to receive a copy likewise does not require acceptance.  However,
+nothing other than this License grants you permission to propagate or
+modify any covered work.  These actions infringe copyright if you do
+not accept this License.  Therefore, by modifying or propagating a
+covered work, you indicate your acceptance of this License to do so.
+
+  10. Automatic Licensing of Downstream Recipients.
+
+  Each time you convey a covered work, the recipient automatically
+receives a license from the original licensors, to run, modify and
+propagate that work, subject to this License.  You are not responsible
+for enforcing compliance by third parties with this License.
+
+  An "entity transaction" is a transaction transferring control of an
+organization, or substantially all assets of one, or subdividing an
+organization, or merging organizations.  If propagation of a covered
+work results from an entity transaction, each party to that
+transaction who receives a copy of the work also receives whatever
+licenses to the work the party's predecessor in interest had or could
+give under the previous paragraph, plus a right to possession of the
+Corresponding Source of the work from the predecessor in interest, if
+the predecessor has it or can get it with reasonable efforts.
+
+  You may not impose any further restrictions on the exercise of the
+rights granted or affirmed under this License.  For example, you may
+not impose a license fee, royalty, or other charge for exercise of
+rights granted under this License, and you may not initiate litigation
+(including a cross-claim or counterclaim in a lawsuit) alleging that
+any patent claim is infringed by making, using, selling, offering for
+sale, or importing the Program or any portion of it.
+
+  11. Patents.
+
+  A "contributor" is a copyright holder who authorizes use under this
+License of the Program or a work on which the Program is based.  The
+work thus licensed is called the contributor's "contributor version".
+
+  A contributor's "essential patent claims" are all patent claims
+owned or controlled by the contributor, whether already acquired or
+hereafter acquired, that would be infringed by some manner, permitted
+by this License, of making, using, or selling its contributor version,
+but do not include claims that would be infringed only as a
+consequence of further modification of the contributor version.  For
+purposes of this definition, "control" includes the right to grant
+patent sublicenses in a manner consistent with the requirements of
+this License.
+
+  Each contributor grants you a non-exclusive, worldwide, royalty-free
+patent license under the contributor's essential patent claims, to
+make, use, sell, offer for sale, import and otherwise run, modify and
+propagate the contents of its contributor version.
+
+  In the following three paragraphs, a "patent license" is any express
+agreement or commitment, however denominated, not to enforce a patent
+(such as an express permission to practice a patent or covenant not to
+sue for patent infringement).  To "grant" such a patent license to a
+party means to make such an agreement or commitment not to enforce a
+patent against the party.
+
+  If you convey a covered work, knowingly relying on a patent license,
+and the Corresponding Source of the work is not available for anyone
+to copy, free of charge and under the terms of this License, through a
+publicly available network server or other readily accessible means,
+then you must either (1) cause the Corresponding Source to be so
+available, or (2) arrange to deprive yourself of the benefit of the
+patent license for this particular work, or (3) arrange, in a manner
+consistent with the requirements of this License, to extend the patent
+license to downstream recipients.  "Knowingly relying" means you have
+actual knowledge that, but for the patent license, your conveying the
+covered work in a country, or your recipient's use of the covered work
+in a country, would infringe one or more identifiable patents in that
+country that you have reason to believe are valid.
+
+  If, pursuant to or in connection with a single transaction or
+arrangement, you convey, or propagate by procuring conveyance of, a
+covered work, and grant a patent license to some of the parties
+receiving the covered work authorizing them to use, propagate, modify
+or convey a specific copy of the covered work, then the patent license
+you grant is automatically extended to all recipients of the covered
+work and works based on it.
+
+  A patent license is "discriminatory" if it does not include within
+the scope of its coverage, prohibits the exercise of, or is
+conditioned on the non-exercise of one or more of the rights that are
+specifically granted under this License.  You may not convey a covered
+work if you are a party to an arrangement with a third party that is
+in the business of distributing software, under which you make payment
+to the third party based on the extent of your activity of conveying
+the work, and under which the third party grants, to any of the
+parties who would receive the covered work from you, a discriminatory
+patent license (a) in connection with copies of the covered work
+conveyed by you (or copies made from those copies), or (b) primarily
+for and in connection with specific products or compilations that
+contain the covered work, unless you entered into that arrangement,
+or that patent license was granted, prior to 28 March 2007.
+
+  Nothing in this License shall be construed as excluding or limiting
+any implied license or other defenses to infringement that may
+otherwise be available to you under applicable patent law.
+
+  12. No Surrender of Others' Freedom.
+
+  If conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot convey a
+covered work so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you may
+not convey it at all.  For example, if you agree to terms that obligate you
+to collect a royalty for further conveying from those to whom you convey
+the Program, the only way you could satisfy both those terms and this
+License would be to refrain entirely from conveying the Program.
+
+  13. Use with the GNU Affero General Public License.
+
+  Notwithstanding any other provision of this License, you have
+permission to link or combine any covered work with a work licensed
+under version 3 of the GNU Affero General Public License into a single
+combined work, and to convey the resulting work.  The terms of this
+License will continue to apply to the part which is the covered work,
+but the special requirements of the GNU Affero General Public License,
+section 13, concerning interaction through a network will apply to the
+combination as such.
+
+  14. Revised Versions of this License.
+
+  The Free Software Foundation may publish revised and/or new versions of
+the GNU General Public License from time to time.  Such new versions will
+be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+  Each version is given a distinguishing version number.  If the
+Program specifies that a certain numbered version of the GNU General
+Public License "or any later version" applies to it, you have the
+option of following the terms and conditions either of that numbered
+version or of any later version published by the Free Software
+Foundation.  If the Program does not specify a version number of the
+GNU General Public License, you may choose any version ever published
+by the Free Software Foundation.
+
+  If the Program specifies that a proxy can decide which future
+versions of the GNU General Public License can be used, that proxy's
+public statement of acceptance of a version permanently authorizes you
+to choose that version for the Program.
+
+  Later license versions may give you additional or different
+permissions.  However, no additional obligations are imposed on any
+author or copyright holder as a result of your choosing to follow a
+later version.
+
+  15. Disclaimer of Warranty.
+
+  THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
+APPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
+HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
+OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
+THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
+IS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
+ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+  16. Limitation of Liability.
+
+  IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
+THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
+GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
+USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
+DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
+PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
+EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
+SUCH DAMAGES.
+
+  17. Interpretation of Sections 15 and 16.
+
+  If the disclaimer of warranty and limitation of liability provided
+above cannot be given local legal effect according to their terms,
+reviewing courts shall apply local law that most closely approximates
+an absolute waiver of all civil liability in connection with the
+Program, unless a warranty or assumption of liability accompanies a
+copy of the Program in return for a fee.
+
+                     END OF TERMS AND CONDITIONS
+
+            How to Apply These Terms to Your New Programs
+
+  If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+  To do so, attach the following notices to the program.  It is safest
+to attach them to the start of each source file to most effectively
+state the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+    <one line to give the program's name and a brief idea of what it does.>
+    Copyright (C) <year>  <name of author>
+
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program.  If not, see <https://www.gnu.org/licenses/>.
+
+Also add information on how to contact you by electronic and paper mail.
+
+  If the program does terminal interaction, make it output a short
+notice like this when it starts in an interactive mode:
+
+    <program>  Copyright (C) <year>  <name of author>
+    This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+    This is free software, and you are welcome to redistribute it
+    under certain conditions; type `show c' for details.
+
+The hypothetical commands `show w' and `show c' should show the appropriate
+parts of the General Public License.  Of course, your program's commands
+might be different; for a GUI interface, you would use an "about box".
+
+  You should also get your employer (if you work as a programmer) or school,
+if any, to sign a "copyright disclaimer" for the program, if necessary.
+For more information on this, and how to apply and follow the GNU GPL, see
+<https://www.gnu.org/licenses/>.
+
+  The GNU General Public License does not permit incorporating your program
+into proprietary programs.  If your program is a subroutine library, you
+may consider it more useful to permit linking proprietary applications with
+the library.  If this is what you want to do, use the GNU Lesser General
+Public License instead of this License.  But first, please read
+<https://www.gnu.org/licenses/why-not-lgpl.html>.

analysis_options.yaml

@@ -7,7 +7,8 @@
 
 # The following line activates a set of recommended lints for Flutter apps,
 # packages, and plugins designed to encourage good coding practices.
-include: package:flutter_lints/flutter.yaml
+include:
+  - package:flutter_lints/flutter.yaml
 
 linter:
   # The lint rules applied to this project can be customized in the
@@ -21,8 +22,20 @@ linter:
   # `// ignore_for_file: name_of_lint` syntax on the line or in the file
   # producing the lint.
   rules:
-    # avoid_print: false  # Uncomment to disable the `avoid_print` rule
-    # prefer_single_quotes: true  # Uncomment to enable the `prefer_single_quotes` rule
+    always_declare_return_types: true
+    annotate_redeclares: true
+    avoid_print: false
+    avoid_setters_without_getters: true
+    avoid_slow_async_io: true
+    directives_ordering: true
+    eol_at_end_of_file: true
+    prefer_const_declarations: true
+    prefer_contains: true
+    prefer_final_fields: true
+    prefer_final_locals: true
+    prefer_single_quotes: true
+    use_key_in_widget_constructors: true
+    use_null_aware_elements: true
 
 # Additional information about this file can be found at
 # https://dart.dev/guides/language/analysis-options

android/app/build.gradle

@@ -11,12 +11,12 @@ android {
     ndkVersion = flutter.ndkVersion
 
     compileOptions {
-        sourceCompatibility = JavaVersion.VERSION_1_8
-        targetCompatibility = JavaVersion.VERSION_1_8
+        sourceCompatibility = JavaVersion.VERSION_17
+        targetCompatibility = JavaVersion.VERSION_17
     }
 
     kotlinOptions {
-        jvmTarget = JavaVersion.VERSION_1_8
+        jvmTarget = JavaVersion.VERSION_17
     }
 
     defaultConfig {
@@ -28,6 +28,8 @@ android {
         targetSdk = flutter.targetSdkVersion
         versionCode = flutter.versionCode
         versionName = flutter.versionName
+
+        resValue "string", "app_name", "Mugiten"
     }
 
     buildTypes {
@@ -36,6 +38,12 @@ android {
             // Signing with the debug keys for now, so `flutter run --release` works.
             signingConfig = signingConfigs.debug
         }
+
+        debug {
+            applicationIdSuffix ".debug"
+            versionNameSuffix "-debug"
+            resValue "string", "app_name", "Mugiten Debug"
+        }
     }
 }
 

android/app/src/debug/AndroidManifest.xml

@@ -1,10 +1,17 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android">
+    <application
+        android:label="@string/app_name"
+    />
+
     <!-- The INTERNET permission is required for development. Specifically,
          the Flutter tool needs it to communicate with the running application
          to allow setting breakpoints, to provide hot reload, etc.
     -->
     <uses-permission android:name="android.permission.INTERNET"/>
-    <uses-permission android:name="android.permission.MANAGE_EXTERNAL_STORAGE" />
+
     <uses-permission android:name="android.permission.READ_INTERNAL_STORAGE" />
+
+    <uses-permission android:name="android.permission.MANAGE_EXTERNAL_STORAGE" />
     <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE"/>
+    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
 </manifest>

android/app/src/main/AndroidManifest.xml

@@ -1,8 +1,8 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android">
     <application
-        android:label="mugiten"
+        android:label="@string/app_name"
         android:name="${applicationName}"
-        android:icon="@mipmap/ic_launcher">
+        android:icon="@mipmap/launcher_icon">
         <activity
             android:name=".MainActivity"
             android:exported="true"
@@ -44,7 +44,10 @@
     </queries>
 
     <uses-permission android:name="android.permission.INTERNET"/>
-    <uses-permission android:name="android.permission.MANAGE_EXTERNAL_STORAGE" />
+
     <uses-permission android:name="android.permission.READ_INTERNAL_STORAGE" />
+
+    <uses-permission android:name="android.permission.MANAGE_EXTERNAL_STORAGE" />
     <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE"/>
+    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
 </manifest>

android/app/src/main/res/drawable-night-v21/launch_background.xml

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+    <item>
+        <bitmap android:gravity="fill" android:src="@drawable/background"/>
+    </item>
+    <item>
+        <bitmap android:gravity="center" android:src="@drawable/splash"/>
+    </item>
+</layer-list>

android/app/src/main/res/drawable-night/launch_background.xml

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+    <item>
+        <bitmap android:gravity="fill" android:src="@drawable/background"/>
+    </item>
+    <item>
+        <bitmap android:gravity="center" android:src="@drawable/splash"/>
+    </item>
+</layer-list>

android/app/src/main/res/drawable-v21/launch_background.xml

@@ -1,12 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- Modify this file to customize your launch splash screen -->
 <layer-list xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:drawable="?android:colorBackground" />
-
-    <!-- You can insert your own image assets here -->
-    <!-- <item>
-        <bitmap
-            android:gravity="center"
-            android:src="@mipmap/launch_image" />
-    </item> -->
+    <item>
+        <bitmap android:gravity="fill" android:src="@drawable/background"/>
+    </item>
+    <item>
+        <bitmap android:gravity="center" android:src="@drawable/splash"/>
+    </item>
 </layer-list>

android/app/src/main/res/drawable/launch_background.xml

@@ -1,12 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- Modify this file to customize your launch splash screen -->
 <layer-list xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:drawable="@android:color/white" />
-
-    <!-- You can insert your own image assets here -->
-    <!-- <item>
-        <bitmap
-            android:gravity="center"
-            android:src="@mipmap/launch_image" />
-    </item> -->
+    <item>
+        <bitmap android:gravity="fill" android:src="@drawable/background"/>
+    </item>
+    <item>
+        <bitmap android:gravity="center" android:src="@drawable/splash"/>
+    </item>
 </layer-list>

android/app/src/main/res/mipmap-anydpi-v26/launcher_icon.xml

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
+  <background android:drawable="@color/ic_launcher_background"/>
+  <foreground>
+      <inset
+          android:drawable="@drawable/ic_launcher_foreground"
+          android:inset="25%" />
+  </foreground>
+</adaptive-icon>

android/app/src/main/res/values-night-v31/styles.xml

@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <!-- Theme applied to the Android Window while the process is starting when the OS's Dark Mode setting is on -->
+    <style name="LaunchTheme" parent="@android:style/Theme.Black.NoTitleBar">
+        <item name="android:forceDarkAllowed">false</item>
+        <item name="android:windowFullscreen">false</item>
+        <item name="android:windowDrawsSystemBarBackgrounds">false</item>
+        <item name="android:windowLayoutInDisplayCutoutMode">shortEdges</item>
+        <item name="android:windowSplashScreenBackground">#202020</item>
+        <item name="android:windowSplashScreenAnimatedIcon">@drawable/android12splash</item>
+    </style>
+    <!-- Theme applied to the Android Window as soon as the process has started.
+         This theme determines the color of the Android Window while your
+         Flutter UI initializes, as well as behind your Flutter UI while its
+         running.
+         
+         This Theme is only used starting with V2 of Flutter's Android embedding. -->
+    <style name="NormalTheme" parent="@android:style/Theme.Black.NoTitleBar">
+        <item name="android:windowBackground">?android:colorBackground</item>
+    </style>
+</resources>

android/app/src/main/res/values-night/styles.xml

@@ -5,6 +5,10 @@
         <!-- Show a splash screen on the activity. Automatically removed when
              the Flutter engine draws its first frame -->
         <item name="android:windowBackground">@drawable/launch_background</item>
+        <item name="android:forceDarkAllowed">false</item>
+        <item name="android:windowFullscreen">false</item>
+        <item name="android:windowDrawsSystemBarBackgrounds">false</item>
+        <item name="android:windowLayoutInDisplayCutoutMode">shortEdges</item>
     </style>
     <!-- Theme applied to the Android Window as soon as the process has started.
          This theme determines the color of the Android Window while your

android/app/src/main/res/values-v31/styles.xml

@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <!-- Theme applied to the Android Window while the process is starting when the OS's Dark Mode setting is off -->
+    <style name="LaunchTheme" parent="@android:style/Theme.Light.NoTitleBar">
+        <item name="android:forceDarkAllowed">false</item>
+        <item name="android:windowFullscreen">false</item>
+        <item name="android:windowDrawsSystemBarBackgrounds">false</item>
+        <item name="android:windowLayoutInDisplayCutoutMode">shortEdges</item>
+        <item name="android:windowSplashScreenBackground">#ffffff</item>
+        <item name="android:windowSplashScreenAnimatedIcon">@drawable/android12splash</item>
+    </style>
+    <!-- Theme applied to the Android Window as soon as the process has started.
+         This theme determines the color of the Android Window while your
+         Flutter UI initializes, as well as behind your Flutter UI while its
+         running.
+         
+         This Theme is only used starting with V2 of Flutter's Android embedding. -->
+    <style name="NormalTheme" parent="@android:style/Theme.Light.NoTitleBar">
+        <item name="android:windowBackground">?android:colorBackground</item>
+    </style>
+</resources>

android/app/src/main/res/values/colors.xml

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <color name="ic_launcher_background">#be9a5c</color>
+</resources>

android/app/src/main/res/values/styles.xml

@@ -5,6 +5,10 @@
         <!-- Show a splash screen on the activity. Automatically removed when
              the Flutter engine draws its first frame -->
         <item name="android:windowBackground">@drawable/launch_background</item>
+        <item name="android:forceDarkAllowed">false</item>
+        <item name="android:windowFullscreen">false</item>
+        <item name="android:windowDrawsSystemBarBackgrounds">false</item>
+        <item name="android:windowLayoutInDisplayCutoutMode">shortEdges</item>
     </style>
     <!-- Theme applied to the Android Window as soon as the process has started.
          This theme determines the color of the Android Window while your

android/gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,7 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.3-bin.zip
+networkTimeout=10000
+validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.3-all.zip

android/settings.gradle

@@ -18,8 +18,8 @@ pluginManagement {
 
 plugins {
     id "dev.flutter.flutter-plugin-loader" version "1.0.0"
-    id "com.android.application" version "8.1.0" apply false
-    id "org.jetbrains.kotlin.android" version "1.8.22" apply false
+    id "com.android.application" version "8.13.2" apply false
+    id "org.jetbrains.kotlin.android" version "2.3.0" apply false
 }
 
 include ":app"

assets/licenses.json

@@ -1,4 +1,12 @@
 {
-    "droid-fonts": "assets/licenses/droid-fonts.txt",
-    "noto-fonts": "assets/licenses/noto-fonts.txt"
-}
+  "droid-sans-japanese": "assets/licenses/apache-2.0.txt",
+  "hina-mincho": "assets/licenses/ofl-1.1.txt",
+  "ibm-plex-sans-japanese": "assets/licenses/ofl-1.1.txt",
+  "klee-one": "assets/licenses/ofl-1.1.txt",
+  "kosugi": "assets/licenses/apache-2.0.txt",
+  "m-plus-2": "assets/licenses/ofl-1.1.txt",
+  "m-plus-rounded-1c": "assets/licenses/ofl-1.1.txt",
+  "noto-sans-japanese": "assets/licenses/ofl-1.1.txt",
+  "noto-serif-japanese": "assets/licenses/ofl-1.1.txt",
+  "zen-kurenaido": "assets/licenses/ofl-1.1.txt"
+}

assets/licenses/ofl-1.1.txt

@@ -1,8 +1,6 @@
-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.
+Copyright (c) [year] [fullname] ([email])
 
+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
 
@@ -12,10 +10,10 @@ 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.
+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
@@ -23,8 +21,8 @@ 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.
+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
@@ -34,25 +32,25 @@ 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).
+"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.
+"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 AND 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:
+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.
+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
@@ -62,9 +60,9 @@ 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.
+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
@@ -75,8 +73,8 @@ 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.
+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
@@ -91,4 +89,4 @@ 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.
+OTHER DEALINGS IN THE FONT SOFTWARE.

devtools_options.yaml

@@ -0,0 +1,3 @@
+description: This file stores settings for Dart & Flutter DevTools.
+documentation: https://docs.flutter.dev/tools/devtools/extensions#configure-extension-enablement-states
+extensions:

docs/changelog/v0.1.0 - 2025-05-20.md

@@ -0,0 +1,17 @@
+# v0.1.0 - 2025-05-20
+
+Initial beta version of the project.
+
+This version denotes the first version after the complete rewrite from JST.
+In this version, we are no longer depending on jisho.org for any data - everything
+is managed with sqlite through `jadb`. This comes at a cost of bigger size, less accurate
+search, temporarily disabling existing features such as library lists and history tracking,
+and several missing pieces of data. But it is a step towards more control, and offline performant
+search.
+
+## Current features ✨
+
+- Word search by input
+- Kanji search, including search by radical, drawing, grade and input
+- Font selection
+- Romaji mode

docs/changelog/v0.2.0 - 2025-06-24.md

@@ -0,0 +1,13 @@
+# v0.2.0 - 2025-06-24
+
+Major update readding some big features from JST, plus some more
+
+## New features ✨
+
+- Readd history tracking
+- Readd library lists
+- Add kanji drawing input for word search
+
+## Bugfixes 🐞
+
+- Fix kanji filtering sometimes suggesting invalid kanji.

docs/changelog/v0.3.0 - 2025-07-08.md

@@ -0,0 +1,34 @@
+# v0.3.0 - 2025-07-08
+
+A large update with some significant additions and fixes.
+
+## New features ✨
+
+- Added offline kanji drawing search via Google ML Kit 🔥
+- Allow users to import and export their data
+- Added a toggle in settings for enabling/disabling history tracking
+- Display the number of history searches on the history page
+- Embed the changelog in the app
+- Added search count bubbles to the history entries
+- Added a toggle in settings to shrink the kanji drawing board
+- Added an initialization view to perform updates and large downloads on launch
+
+## Changes 🔧
+
+- Removed the "Clear Favourites" button from settings in favour of using the delete button on the favourites page.
+- Removed the "Reset database" button from settings in favour of "Clear History" and deleting individual library lists.
+
+## Bugfixes 🐞
+
+- Always show exact matches first in the word search results.
+- Respect the cursor position when inserting a kanji into the search bar from the kanji drawing page.
+- Remove word search duplicates
+- Fix version number in the info page.
+- Fix a broken query for adding items to library lists.
+- Ensure that the kanji drawing search is located above navigation buttons
+- Capitalize app name
+
+## Other 📝
+
+- Significant performance improvements for word search.
+- A small size reduction of the database.

docs/changelog/v0.3.1 - 2025-07-09.md

@@ -0,0 +1,10 @@
+# v0.3.1 - 2025-07-09
+
+Bugfixes and bugfixes and maybe some more bugs.
+
+## Bugfixes 🐞
+
+- Fix a bug where deleting a library list would remove more than one list.
+- Fix filename encoding in user data exports.
+- Don't throw errors on empty search results.
+- Fix reinitialization button, so it migrates the database from the bottom up.

docs/changelog/v0.4.0 - 2025-07-17.md

@@ -0,0 +1,38 @@
+# v0.4.0 - 2025-07-17
+
+The scrolling update, brings infinite scroll to importants parts of the app in addition to other things and bobs.
+
+## New features ✨
+
+- Added infinite scroll for word search results.
+- Added infinite scroll for history view.
+- Added infinite scroll for library lists.
+- Added a bubble in the top bar of word search results to indicate how many times it has been searched before.
+- Added basic support for Android's [Predictive Back](https://developer.android.com/design/ui/mobile/guides/patterns/predictive-back) feature.
+- Allow inline expansion of antonyms "See also" references in the word search results.
+- Added a button to clear the content of the search bar in the word query view.
+
+## Changes 🔧
+
+- Display proper language names for "From language" references.
+- Lock rotation to portrait mode for the entire application.
+- Don't allow users to search for whitespace only queries.
+- The dictionary data is now queried in batch from the database, leading to a significant performance improvement.
+- (Re)added a custom splash screen for nicer looking app startup.
+- (Re)added a custom launcher icon for the app.
+- Don't collapse meaning/yomi lists in kanji search results despite the list being long.
+- Mark ambiguous antonyms and "See also" references with a question mark icon.
+
+## Bugfixes 🐞
+
+- Fix a bug where some "From language" references would display 'null' as the phrase.
+- Remove duplicate date separators in the history page.
+- Don't allow users to search for the `On:` and `Kun:` labels on the kanji result page.
+- Strip leading and trailing whitespace from search queries.
+- Fix a bug where cancelling an export would print a misleading status message.
+
+## Other 📝
+
+- Updated flutter: `3.27` -> `3.32`
+- Updated dictionary data
+- Added dates to the changelog entries.

docs/changelog/v0.5.0 - 2025-12-19.md

@@ -0,0 +1,20 @@
+# v0.5.0 - 2025-12-19
+
+A relatively small update, pushing out some features that have been laying ready on the main branch for a while.
+
+## New features ✨
+
+- Added search count bubbles to the history entries.
+- Added the search term to the appbar when viewing search results.
+
+## Changes 🔧
+
+- Enable automatic theme by default, following system settings.
+- Use hiragana for both kunyomi and onyomi in kanji search results.
+- Provide the existing content from the searchbar as context to the kanji drawing recognition model, likely improving suggestions.
+- Removed [Predictive Back](https://developer.android.com/design/ui/mobile/guides/patterns/predictive-back) support, due to weird "go to the previous page" behaviour on some devices.
+
+## Other 📝
+
+- Updated flutter: `3.32` -> `3.35`
+- Updated dictionary data

flake.lock

@@ -2,11 +2,11 @@
   "nodes": {
     "nixpkgs": {
       "locked": {
-        "lastModified": 1744463964,
-        "narHash": "sha256-LWqduOgLHCFxiTNYi3Uj5Lgz0SR+Xhw3kr/3Xd0GPTM=",
+        "lastModified": 1771369470,
+        "narHash": "sha256-0NBlEBKkN3lufyvFegY4TYv5mCNHbi5OmBDrzihbBMQ=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "2631b0b7abcea6e640ce31cd78ea58910d31e650",
+        "rev": "0182a361324364ae3f436a63005877674cf45efb",
         "type": "github"
       },
       "original": {

flake.nix

@@ -17,29 +17,39 @@
           allowUnfree = true;
         };
       };
-      androidSdk = (pkgs.androidenv.composeAndroidPackages {
-        buildToolsVersions = [ "33.0.1" "34.0.0" ];
-        platformVersions = [ "35" "34" ];
+      androidPkgs = (pkgs.androidenv.composeAndroidPackages {
+        buildToolsVersions = [ "35.0.0" "36.1.0" ];
+        platformVersions = [ "35" "36" ];
         abiVersions = [ "armeabi-v7a" "arm64-v8a" ];
-      }).androidsdk;
-    in f system pkgs androidSdk);
+        cmakeVersions = [ "3.22.1" ];
+        includeNDK = true;
+        ndkVersions = [ "28.2.13676358" ];
+      });
+    in f system pkgs androidPkgs);
   in {
-    devShells = forAllSystems (_: pkgs: androidSdk: {
+    devShells = forAllSystems (_: pkgs: androidPkgs: {
       default = let
-        flutter' = pkgs.flutter327;
-        jdk' = pkgs.jdk17;
+        flutter' = pkgs.flutter341;
+        jdk' = pkgs.jdk21;
       in pkgs.mkShell {
         packages = [
           flutter'
           pkgs.sqlite-interactive
-          androidSdk
+          androidPkgs.androidsdk
           jdk'
         ];
         env = {
-          ANDROID_SDK_ROOT = "${androidSdk}/libexec/android-sdk";
-          GRADLE_OPTS = "-Dorg.gradle.project.android.aapt2FromMavenOverride=${androidSdk}/libexec/android-sdk/build-tools/34.0.0/aapt2";
+          ANDROID_SDK_ROOT = "${androidPkgs.androidsdk}/libexec/android-sdk";
+          GRADLE_OPTS = let
+            buildToolsVersion = (lib.head androidPkgs.build-tools).version;
+            buildToolsDir = "${androidPkgs.androidsdk}/libexec/android-sdk/build-tools/${buildToolsVersion}";
+          in lib.concatStringsSep " " [
+            "-Dorg.gradle.project.android.aapt2FromMavenOverride=${buildToolsDir}/aapt2"
+          ];
           FLUTTER_SDK = "${flutter'}";
           JAVA_HOME = "${jdk'}/lib/openjdk";
+          LIBSQLITE_PATH = "${pkgs.sqlite.out}/lib/libsqlite3.so";
+          JADB_PATH = "./assets/jadb.sqlite";
         };
       };
     });

flutter_launcher_icons.yaml

@@ -0,0 +1,33 @@
+# flutter pub run flutter_launcher_icons
+flutter_launcher_icons:
+  image_path: "assets/images/logo/mugi_app_icon.png"
+
+  android: "launcher_icon"
+  min_sdk_android: 21 # android min sdk min:16, default 21
+  adaptive_icon_foreground: "assets/images/logo/mugi.png"
+  adaptive_icon_background: "#be9a5c"
+  adaptive_icon_foreground_inset: 25
+  # adaptive_icon_monochrome: "assets/icon/monochrome.png"
+
+  ios: false
+  # image_path_ios: "assets/icon/icon.png"
+  # remove_alpha_ios: true
+  # image_path_ios_dark_transparent: "assets/icon/icon_dark.png"
+  # image_path_ios_tinted_grayscale: "assets/icon/icon_tinted.png"
+  # desaturate_tinted_to_grayscale_ios: true
+  # background_color_ios: "#ffffff"
+
+  # web:
+  #   generate: true
+  #   image_path: "path/to/image.png"
+  #   background_color: "#hexcode"
+  #   theme_color: "#hexcode"
+
+  # windows:
+  #   generate: true
+  #   image_path: "path/to/image.png"
+  #   icon_size: 48 # min:48, max:256, default: 48
+
+  # macos:
+  #   generate: true
+  #   image_path: "path/to/image.png"

flutter_native_splash.yaml

@@ -0,0 +1,162 @@
+flutter_native_splash:
+  # This package generates native code to customize Flutter's default white native splash screen
+  # with background color and splash image.
+  # Customize the parameters below, and run the following command in the terminal:
+  # dart run flutter_native_splash:create
+  # To restore Flutter's default white splash screen, run the following command in the terminal:
+  # dart run flutter_native_splash:remove
+
+  # IMPORTANT NOTE: These parameter do not affect the configuration of Android 12 and later, which
+  # handle splash screens differently that prior versions of Android.  Android 12 and later must be
+  # configured specifically in the android_12 section below.
+
+  # color or background_image is the only required parameter.  Use color to set the background
+  # of your splash screen to a solid color.  Use background_image to set the background of your
+  # splash screen to a png image.  This is useful for gradients. The image will be stretch to the
+  # size of the app. Only one parameter can be used, color and background_image cannot both be set.
+  color: "#3edd00"
+  color_dark: "#202020"
+  #background_image: "assets/background.png"
+
+  # Optional parameters are listed below.  To enable a parameter, uncomment the line by removing
+  # the leading # character.
+
+  # The image parameter allows you to specify an image used in the splash screen.  It must be a
+  # png file and should be sized for 4x pixel density.
+  #image: assets/splash.png
+  image: "assets/images/logo/mugi.png"
+  image_dark: "assets/images/logo/mugi.png"
+
+  # The branding property allows you to specify an image used as branding in the splash screen.
+  # It must be a png file. It is supported for Android, iOS and the Web.  For Android 12,
+  # see the Android 12 section below.
+  #branding: assets/dart.png
+
+  # To position the branding image at the bottom of the screen you can use bottom, bottomRight,
+  # and bottomLeft. The default values is bottom if not specified or specified something else.
+  #branding_mode: bottom
+
+  # Set the branding padding from the bottom of the screen.  The default value is 0
+  # (Not supported on web yet)
+  # branding_bottom_padding: 24
+
+  # The color_dark, background_image_dark, image_dark, branding_dark are parameters that set the background
+  # and image when the device is in dark mode. If they are not specified, the app will use the
+  # parameters from above.  If there is no parameter above, the app will use the light mode values.
+  # If the image_dark parameter is specified, color_dark or background_image_dark must be specified.
+  # color_dark and background_image_dark cannot both be set.
+  #color_dark: "#042a49"
+  #background_image_dark: "assets/dark-background.png"
+  #image_dark: assets/splash-invert.png
+  #branding_dark: assets/dart_dark.png
+
+  # From Android 12 onwards, the splash screen is handled differently than in previous versions.
+  # Please visit https://developer.android.com/guide/topics/ui/splash-screen
+  # Following are specific parameters for Android 12+.
+  android_12:
+    # The image parameter sets the splash screen icon image.  If this parameter is not specified,
+    # the app's launcher icon will be used instead.
+    # Please note that the splash screen will be clipped to a circle on the center of the screen.
+    # App icon with an icon background: This should be 960×960 pixels, and fit within a circle
+    # 640 pixels in diameter.
+    # App icon without an icon background: This should be 1152×1152 pixels, and fit within a circle
+    # 768 pixels in diameter.  To fit a 1152x1152 image within a circle with a 768 diameter, simply
+    # ensure that the most important design elements of your image are placed within a circular area
+    # with a 768 diameter at the center of the 1152x1152 canvas.
+    #image: assets/android12splash.png
+
+    image: "assets/images/logo/mugi_splash.png"
+    image_dark: "assets/images/logo/mugi_splash.png"
+
+    # Splash screen background color.
+    #color: "#42a5f5"
+    color: "#ffffff"
+    color_dark: "#202020"
+
+    # App icon background color.
+    #icon_background_color: "#111111"
+
+    # The branding property allows you to specify an image used as branding in the splash screen.
+    #branding: assets/dart.png
+
+    # The image_dark, color_dark, icon_background_color_dark, and branding_dark set values that
+    # apply when the device is in dark mode. If they are not specified, the app will use the
+    # parameters from above.  If there is no parameter above, the app will use the light mode values.
+    #image_dark: assets/android12splash-invert.png
+    #color_dark: "#042a49"
+    #icon_background_color_dark: "#eeeeee"
+
+  # The android, ios and web parameters can be used to disable generating a splash screen on a given
+  # platform.
+  #android: false
+  #ios: false
+  #web: false
+
+  # Platform specific images can be specified with the following parameters, which will override
+  # the respective parameter.  You may specify all, selected, or none of these parameters:
+  #color_android: "#42a5f5"
+  #color_dark_android: "#042a49"
+  #color_ios: "#42a5f5"
+  #color_dark_ios: "#042a49"
+  #color_web: "#42a5f5"
+  #color_dark_web: "#042a49"
+  #image_android: assets/splash-android.png
+  #image_dark_android: assets/splash-invert-android.png
+  #image_ios: assets/splash-ios.png
+  #image_dark_ios: assets/splash-invert-ios.png
+  #image_web: assets/splash-web.gif
+  #image_dark_web: assets/splash-invert-web.gif
+  #background_image_android: "assets/background-android.png"
+  #background_image_dark_android: "assets/dark-background-android.png"
+  #background_image_ios: "assets/background-ios.png"
+  #background_image_dark_ios: "assets/dark-background-ios.png"
+  #background_image_web: "assets/background-web.png"
+  #background_image_dark_web: "assets/dark-background-web.png"
+  #branding_android: assets/brand-android.png
+  #branding_bottom_padding_android: 24
+  #branding_dark_android: assets/dart_dark-android.png
+  #branding_ios: assets/brand-ios.png
+  #branding_bottom_padding_ios: 24
+  #branding_dark_ios: assets/dart_dark-ios.png
+  #branding_web: assets/brand-web.gif
+  #branding_dark_web: assets/dart_dark-web.gif
+
+  # The position of the splash image can be set with android_gravity, ios_content_mode, and
+  # web_image_mode parameters.  All default to center.
+  #
+  # android_gravity can be one of the following Android Gravity (see
+  # https://developer.android.com/reference/android/view/Gravity): bottom, center,
+  # center_horizontal, center_vertical, clip_horizontal, clip_vertical, end, fill, fill_horizontal,
+  # fill_vertical, left, right, start, or top. android_gravity can be combined using the | operator to achieve multiple effects.
+  # For example:
+  # `android_gravity: fill|clip_vertical` - This will fill the width while maintaining the image's vertical aspect ratio
+  #android_gravity: center
+  #
+  # ios_content_mode can be one of the following iOS UIView.ContentMode (see
+  # https://developer.apple.com/documentation/uikit/uiview/contentmode): scaleToFill,
+  # scaleAspectFit, scaleAspectFill, center, top, bottom, left, right, topLeft, topRight,
+  # bottomLeft, or bottomRight.
+  #ios_content_mode: center
+  #
+  # web_image_mode can be one of the following modes: center, contain, stretch, and cover.
+  #web_image_mode: center
+
+  # The screen orientation can be set in Android with the android_screen_orientation parameter.
+  # Valid parameters can be found here:
+  # https://developer.android.com/guide/topics/manifest/activity-element#screen
+  #android_screen_orientation: sensorLandscape
+
+  # To hide the notification bar, use the fullscreen parameter.  Has no effect in web since web
+  # has no notification bar.  Defaults to false.
+  # NOTE: Unlike Android, iOS will not automatically show the notification bar when the app loads.
+  #       To show the notification bar, add the following code to your Flutter app:
+  #       WidgetsFlutterBinding.ensureInitialized();
+  #       SystemChrome.setEnabledSystemUIMode(SystemUiMode.manual, overlays: [SystemUiOverlay.bottom, SystemUiOverlay.top], );
+  #fullscreen: true
+
+  # If you have changed the name(s) of your info.plist file(s), you can specify the filename(s)
+  # with the info_plist_files parameter.  Remove only the # characters in the three lines below,
+  # do not remove any spaces:
+  #info_plist_files:
+  #  - 'ios/Runner/Info-Debug.plist'
+  #  - 'ios/Runner/Info-Release.plist'

lib/bloc/theme/theme_bloc.dart

@@ -5,9 +5,6 @@ import 'package:flutter_bloc/flutter_bloc.dart';
 import '../../models/themes/theme.dart';
 import '../../settings.dart';
 
-export 'package:flutter_bloc/flutter_bloc.dart';
-export 'package:mugiten/models/themes/theme.dart';
-
 part 'theme_event.dart';
 part 'theme_state.dart';
 

lib/components/common/denshi_jisho_background.dart

@@ -3,10 +3,7 @@ import 'package:flutter/material.dart';
 class DenshiJishoBackground extends StatelessWidget {
   final Widget child;
 
-  const DenshiJishoBackground({
-    super.key,
-    required this.child,
-  });
+  const DenshiJishoBackground({super.key, required this.child});
 
   @override
   Widget build(BuildContext context) {

lib/components/common/kanji_box.dart

@@ -0,0 +1,179 @@
+import 'dart:math';
+
+import 'package:flutter/material.dart';
+import 'package:flutter_bloc/flutter_bloc.dart';
+
+import '../../bloc/theme/theme_bloc.dart';
+import '../../settings.dart';
+
+/// The ratio is defined as 'the amount of space the text should take'
+/// divided by 'the amount of space the padding should take'.
+///
+/// So if the KanjiBox should span 50 pixels, and you wanted 10 of those pixels
+/// to be used for padding (5 on each side), and 40 to be used for the text,
+/// you could write:
+///
+/// ```dart
+/// KanjiBox.withRatioAndFontSize({
+///   kanji: '例',
+///   ratio: 4 / 1,
+///   fontSize: 40,
+/// })
+/// ```
+///
+class KanjiBox extends StatelessWidget {
+  final String kanji;
+  final double? fontSize;
+  final double? padding;
+  final Color? foreground;
+  final Color? background;
+  final double? contentPaddingRatio;
+  final double borderRadius;
+
+  static const double defaultRatio = 3 / 1;
+  static const double defaultBorderRadius = 10;
+
+  double get ratio => contentPaddingRatio ?? fontSize! / padding!;
+  double get fontSizeFactor => ratio / (ratio + 1);
+  double get paddingSizeFactor => 1 / (ratio + 1);
+
+  bool get isExpanded => contentPaddingRatio != null;
+  double? get size => isExpanded ? null : fontSize! + (2 * padding!);
+  double? get oneSidePadding => padding != null ? padding! / 2 : null;
+
+  const KanjiBox._({
+    super.key,
+    required this.kanji,
+    this.fontSize,
+    this.padding,
+    this.contentPaddingRatio,
+    this.foreground,
+    this.background,
+    this.borderRadius = defaultBorderRadius,
+  }) : assert(
+         kanji.length == 1,
+         'KanjiBox can not show more than one character at a time',
+       ),
+       assert(
+         contentPaddingRatio != null || (fontSize != null && padding != null),
+         'Either contentPaddingRatio or both the fontSize and padding need to be '
+         'explicitly defined in order for the box to be able to render correctly',
+       );
+
+  const factory KanjiBox.withFontSizeAndPadding({
+    required String kanji,
+    required double fontSize,
+    required double padding,
+    Color? foreground,
+    Color? background,
+    double borderRadius,
+  }) = KanjiBox._;
+
+  factory KanjiBox.withFontSize({
+    required String kanji,
+    required double fontSize,
+    double ratio = defaultRatio,
+    Color? foreground,
+    Color? background,
+    double borderRadius = defaultBorderRadius,
+  }) => KanjiBox._(
+    kanji: kanji,
+    fontSize: fontSize,
+    padding: pow(ratio * (1 / fontSize), -1).toDouble(),
+    foreground: foreground,
+    background: background,
+    borderRadius: borderRadius,
+  );
+
+  factory KanjiBox.withPadding({
+    required String kanji,
+    double ratio = defaultRatio,
+    required double padding,
+    Color? foreground,
+    Color? background,
+    double borderRadius = defaultBorderRadius,
+  }) => KanjiBox._(
+    kanji: kanji,
+    fontSize: ratio * padding,
+    padding: padding,
+    foreground: foreground,
+    background: background,
+    borderRadius: borderRadius,
+  );
+
+  factory KanjiBox.expanded({
+    required String kanji,
+    double ratio = defaultRatio,
+    Color? foreground,
+    Color? background,
+    double borderRadius = defaultBorderRadius,
+  }) => KanjiBox._(
+    kanji: kanji,
+    contentPaddingRatio: ratio,
+    foreground: foreground,
+    background: background,
+    borderRadius: borderRadius,
+  );
+
+  /// A shortcut
+  factory KanjiBox.headline4({
+    required BuildContext context,
+    required String kanji,
+    double ratio = defaultRatio,
+    Color? foreground,
+    Color? background,
+    double borderRadius = defaultBorderRadius,
+  }) => KanjiBox.withFontSize(
+    kanji: kanji,
+    fontSize: Theme.of(context).textTheme.displaySmall!.fontSize!,
+    ratio: ratio,
+    foreground: foreground,
+    background: background,
+    borderRadius: borderRadius,
+  );
+
+  @override
+  Widget build(BuildContext context) {
+    return BlocBuilder<ThemeBloc, ThemeState>(
+      builder: (context, state) {
+        final calculatedForeground =
+            foreground ?? state.theme.menuGreyLight.foreground;
+        final calculatedBackground =
+            background ?? state.theme.menuGreyLight.background;
+        return LayoutBuilder(
+          builder: (context, constraints) {
+            final sizeConstraint = min(
+              constraints.maxHeight,
+              constraints.maxWidth,
+            );
+            final calculatedFontSize =
+                fontSize ?? sizeConstraint * fontSizeFactor;
+            final calculatedPadding =
+                oneSidePadding ?? (sizeConstraint * paddingSizeFactor) / 2;
+
+            return Container(
+              padding: EdgeInsets.all(calculatedPadding),
+              alignment: Alignment.center,
+              width: size,
+              height: size,
+              decoration: BoxDecoration(
+                color: calculatedBackground,
+                borderRadius: BorderRadius.circular(borderRadius),
+              ),
+              child: FittedBox(
+                child: Text(
+                  kanji,
+                  textScaler: TextScaler.linear(1),
+                  style: TextStyle(
+                    color: calculatedForeground,
+                    fontSize: calculatedFontSize,
+                  ).merge(japaneseFont.textStyle),
+                ),
+              ),
+            );
+          },
+        );
+      },
+    );
+  }
+}

lib/components/common/loading.dart

@@ -5,8 +5,6 @@ class LoadingScreen extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
-    return const Center(
-      child: CircularProgressIndicator(),
-    );
+    return const Center(child: CircularProgressIndicator());
   }
 }

lib/components/common/opaque_box.dart

@@ -3,12 +3,14 @@ import 'package:flutter/material.dart';
 class OpaqueBox extends StatelessWidget {
   final Widget child;
 
-  const OpaqueBox({required this.child, super.key,});
+  const OpaqueBox({required this.child, super.key});
 
   @override
   Widget build(BuildContext context) {
     return Container(
-      decoration: BoxDecoration(color: Theme.of(context).scaffoldBackgroundColor),
+      decoration: BoxDecoration(
+        color: Theme.of(context).scaffoldBackgroundColor,
+      ),
       child: child,
     );
   }

lib/components/common/splash.dart

@@ -8,11 +8,9 @@ class SplashScreen extends StatelessWidget {
   @override
   Widget build(BuildContext context) {
     return Container(
-      decoration: BoxDecoration(color: AppTheme.jishoGreen.background),
+      decoration: BoxDecoration(color: AppTheme.mugitenWheat.background),
       child: const Center(
-        child: Image(
-          image: AssetImage('assets/images/logo/mugi.png'),
-        ),
+        child: Image(image: AssetImage('assets/images/logo/mugi.png')),
       ),
     );
   }

lib/components/drawing_board/drawing_board.dart

@@ -1,12 +1,18 @@
-import 'package:flutter/material.dart';
+import 'package:flutter/material.dart' hide Ink;
+import 'package:flutter_bloc/flutter_bloc.dart';
+import 'package:get_it/get_it.dart';
+import 'package:google_mlkit_digital_ink_recognition/google_mlkit_digital_ink_recognition.dart';
+import 'package:jadb/search.dart';
+import 'package:mugiten/models/themes/theme.dart';
 import 'package:signature/signature.dart';
+import 'package:sqflite/sqflite.dart';
 
 import '../../bloc/theme/theme_bloc.dart';
-import '../../services/handwriting.dart';
 import '../../settings.dart';
 
 class DrawingBoard extends StatefulWidget {
   final Function(String)? onSuggestionChosen;
+  final String? precedingText;
   final bool onlyOneCharacterSuggestions;
   final bool allowKanji;
   final bool allowHiragana;
@@ -15,6 +21,7 @@ class DrawingBoard extends StatefulWidget {
 
   const DrawingBoard({
     this.onSuggestionChosen,
+    this.precedingText,
     this.onlyOneCharacterSuggestions = false,
     this.allowKanji = true,
     this.allowHiragana = false,
@@ -30,8 +37,8 @@ class DrawingBoard extends StatefulWidget {
 class _DrawingBoardState extends State<DrawingBoard> {
   List<String> suggestions = [];
 
-  final List<List<TimedPoint>> strokes = [];
-  final List<List<TimedPoint>> undoQueue = [];
+  final List<List<StrokePoint>> strokes = [];
+  final List<List<StrokePoint>> undoQueue = [];
 
   GlobalKey signatureW = GlobalKey();
   GlobalKey suggestionBarW = GlobalKey();
@@ -39,10 +46,12 @@ class _DrawingBoardState extends State<DrawingBoard> {
   static const double fontSize = 30;
   static const double suggestionCirclePadding = 13;
 
-  late ColorSet panelColor =
-      BlocProvider.of<ThemeBloc>(context).state.theme.menuGreyLight;
-  late ColorSet barColor =
-      BlocProvider.of<ThemeBloc>(context).state.theme.menuGreyNormal;
+  late ColorSet panelColor = BlocProvider.of<ThemeBloc>(
+    context,
+  ).state.theme.menuGreyLight;
+  late ColorSet barColor = BlocProvider.of<ThemeBloc>(
+    context,
+  ).state.theme.menuGreyNormal;
 
   late final SignatureController controller = SignatureController(
     penColor: panelColor.foreground,
@@ -50,165 +59,220 @@ class _DrawingBoardState extends State<DrawingBoard> {
       strokes.add([]);
       undoQueue.clear();
     },
-    onDrawMove: () => strokes.last
-        .add(TimedPoint(time: DateTime.now(), point: controller.points.last)),
+    onDrawMove: () => strokes.last.add(
+      StrokePoint(
+        t: DateTime.now().millisecondsSinceEpoch,
+        x: controller.points.last.offset.dx,
+        y: controller.points.last.offset.dy,
+      ),
+    ),
     onDrawEnd: () => updateSuggestions(),
   );
 
   Future<void> updateSuggestions() async {
     if (strokes.isEmpty) return setState(() => suggestions.clear());
 
-    final newSuggestions = await HandwritingRequest(
-      writingAreaHeight: signatureW.currentContext!.size!.width.toInt(),
-      writingAreaWidth: signatureW.currentContext!.size!.width.toInt(),
-      ink: strokes,
-    ).fetch();
+    final digitalInkRecognizer = DigitalInkRecognizer(languageCode: 'ja');
+    final context = DigitalInkRecognitionContext(
+      preContext: widget.precedingText,
+      writingArea: WritingArea(
+        height: signatureW.currentContext!.size!.height,
+        width: signatureW.currentContext!.size!.width,
+      ),
+    );
+
+    final ink = Ink()
+      ..strokes = strokes.map((s) => Stroke()..points = s).toList();
+
+    final newSuggestions = await digitalInkRecognizer.recognize(
+      ink,
+      context: context,
+    );
+
     setState(() {
-      suggestions = newSuggestions;
+      suggestions = newSuggestions.map((rc) => rc.text).toList();
     });
   }
 
-  List<String> get filteredSuggestions {
-    const kanjiR = r'\p{Script=Hani}';
+  Future<List<String>> filterSuggestions() async {
     const hiraganaR = r'\p{Script=Hiragana}';
     const katakanaR = r'\p{Script=Katakana}';
-    const otherR = '[^$kanjiR$hiraganaR$katakanaR]';
 
-    final x = widget.allowKanji ? kanjiR : '';
-    final y = widget.allowHiragana ? hiraganaR : '';
-    final z = widget.allowKatakana ? katakanaR : '';
+    final kanjiSuggestions = await GetIt.instance.get<Database>().filterKanji(
+      suggestions,
+      deduplicate: true,
+    );
+    final hiraganaSuggestions = suggestions
+        .where((s) => RegExp(hiraganaR).hasMatch(s))
+        .toSet()
+        .toList();
+    final katakanaSuggestions = suggestions
+        .where((s) => RegExp(katakanaR).hasMatch(s))
+        .toSet()
+        .toList();
 
-    late final RegExp combinedRegex;
-    if ((widget.allowKanji || widget.allowHiragana || widget.allowKatakana) &&
-        widget.allowOther) {
-      combinedRegex = RegExp('^(?:[$x$y$z]|$otherR)+\$', unicode: true);
-    } else if (widget.allowOther) {
-      combinedRegex = RegExp('^$otherR+\$', unicode: true);
-    } else {
-      combinedRegex = RegExp('^[$x$y$z]+\$', unicode: true);
-    }
-
-    return suggestions
-        .where((s) => combinedRegex.hasMatch(s))
+    return {
+          if (widget.allowKanji) ...kanjiSuggestions,
+          if (widget.allowHiragana) ...hiraganaSuggestions,
+          if (widget.allowKatakana) ...katakanaSuggestions,
+        }
         .where((s) => !widget.onlyOneCharacterSuggestions || s.length == 1)
         .toList();
   }
 
   Widget kanjiChip(String kanji) => InkWell(
-        onTap: () => widget.onSuggestionChosen?.call(kanji),
-        child: BlocBuilder<ThemeBloc, ThemeState>(
-          builder: (context, state) {
-            final colors = state.theme.menuGreyLight;
+    onTap: () => widget.onSuggestionChosen?.call(kanji),
+    child: BlocBuilder<ThemeBloc, ThemeState>(
+      builder: (context, state) {
+        final colors = state.theme.menuGreyLight;
 
-            return Container(
-              height: fontSize + 2 * suggestionCirclePadding,
-              width: fontSize + 2 * suggestionCirclePadding,
-              decoration: BoxDecoration(
-                shape: BoxShape.circle,
-                color: colors.background,
-              ),
-              child: Center(
-                child: Text(
-                  kanji,
-                  style: TextStyle(
-                    fontSize: fontSize,
-                    color: colors.foreground,
-                  ).merge(japaneseFont.textStyle),
-                ),
-              ),
-            );
-          },
-        ),
-      );
+        return Container(
+          height: fontSize + 2 * suggestionCirclePadding,
+          width: fontSize + 2 * suggestionCirclePadding,
+          decoration: BoxDecoration(
+            shape: BoxShape.circle,
+            color: colors.background,
+          ),
+          child: Center(
+            child: Text(
+              kanji,
+              style: TextStyle(
+                fontSize: fontSize,
+                color: colors.foreground,
+              ).merge(japaneseFont.textStyle),
+            ),
+          ),
+        );
+      },
+    ),
+  );
 
   Widget suggestionBar() {
     const padding = EdgeInsets.symmetric(horizontal: 10, vertical: 5);
 
-    return Container(
-      key: suggestionBarW,
-      color: barColor.background,
-      alignment: Alignment.center,
-      padding: padding,
+    return FutureBuilder<List<String>>(
+      future: filterSuggestions(),
+      builder: (context, snapshot) {
+        if (snapshot.connectionState == ConnectionState.waiting ||
+            (!snapshot.hasError && (snapshot.data?.isEmpty ?? false))) {
+          return Container(
+            key: suggestionBarW,
+            color: barColor.background,
+            alignment: Alignment.center,
+            padding: padding,
+            child: const Text('No suggestions'),
+          );
+        }
 
-      // TODO: calculate dynamically
-      constraints: BoxConstraints(
-        minHeight: 8 +
-            suggestionCirclePadding * 2 +
-            fontSize +
-            (2 * 4) +
-            padding.vertical,
-      ),
+        if (snapshot.hasError) {
+          return Center(
+            child: Text(
+              'Error: ${snapshot.error}',
+              style: const TextStyle(color: Colors.red),
+            ),
+          );
+        }
 
-      child: Wrap(
-        spacing: 20,
-        runSpacing: 5,
-        children: filteredSuggestions.map((s) => kanjiChip(s)).toList(),
-      ),
+        final filteredSuggestions = snapshot.data!;
+
+        return Container(
+          key: suggestionBarW,
+          color: barColor.background,
+          alignment: Alignment.center,
+          padding: padding,
+
+          // TODO: calculate dynamically
+          constraints: BoxConstraints(
+            minHeight:
+                8 +
+                suggestionCirclePadding * 2 +
+                fontSize +
+                (2 * 4) +
+                padding.vertical,
+          ),
+
+          child: Wrap(
+            spacing: 20,
+            runSpacing: 5,
+            children: filteredSuggestions.map((s) => kanjiChip(s)).toList(),
+          ),
+        );
+      },
     );
   }
 
   Widget buttonRow() => Container(
-        color: panelColor.background,
-        child: Row(
-          mainAxisSize: MainAxisSize.min,
-          children: [
-            IconButton(
-              onPressed: () => setState(() {
-                controller.clear();
-                strokes.clear();
-                suggestions.clear();
-              }),
-              icon: const Icon(Icons.delete),
-            ),
-            IconButton(
-              onPressed: () {
-                if (strokes.isNotEmpty) {
-                  undoQueue.add(strokes.removeLast());
-                  controller.undo();
-                  updateSuggestions();
-                }
-              },
-              icon: const Icon(Icons.undo),
-            ),
-            IconButton(
-              onPressed: () {
-                if (undoQueue.isNotEmpty) {
-                  strokes.add(undoQueue.removeLast());
-                  controller.redo();
-                  updateSuggestions();
-                }
-              },
-              icon: const Icon(Icons.redo),
-            ),
-            if (!widget.onlyOneCharacterSuggestions)
-              IconButton(
-                onPressed: () => ScaffoldMessenger.of(context).showSnackBar(
-                  const SnackBar(
-                    content: Text('TODO: implement scrolling page feature!'),
-                  ),
-                ),
-                icon: const Icon(Icons.arrow_forward),
-              ),
-          ],
+    color: panelColor.background,
+    child: Row(
+      mainAxisSize: MainAxisSize.min,
+      children: [
+        IconButton(
+          onPressed: () => setState(() {
+            controller.clear();
+            strokes.clear();
+            suggestions.clear();
+          }),
+          icon: const Icon(Icons.delete),
         ),
-      );
+        IconButton(
+          onPressed: () {
+            if (strokes.isNotEmpty) {
+              undoQueue.add(strokes.removeLast());
+              controller.undo();
+              updateSuggestions();
+            }
+          },
+          icon: const Icon(Icons.undo),
+        ),
+        IconButton(
+          onPressed: () {
+            if (undoQueue.isNotEmpty) {
+              strokes.add(undoQueue.removeLast());
+              controller.redo();
+              updateSuggestions();
+            }
+          },
+          icon: const Icon(Icons.redo),
+        ),
+        if (!widget.onlyOneCharacterSuggestions)
+          IconButton(
+            onPressed: () => ScaffoldMessenger.of(context).showSnackBar(
+              const SnackBar(
+                content: Text('TODO: implement scrolling page feature!'),
+              ),
+            ),
+            icon: const Icon(Icons.arrow_forward),
+          ),
+      ],
+    ),
+  );
 
-  Widget drawingPanel() => AspectRatio(
-        aspectRatio: 1.2,
-        child: Stack(
-          alignment: Alignment.bottomRight,
-          children: [
-            ClipRect(
-              child: Signature(
-                key: signatureW,
-                controller: controller,
-                backgroundColor: panelColor.background,
-              ),
+  Widget drawingPanel() {
+    final board = AspectRatio(
+      aspectRatio: 1.0,
+      child: Stack(
+        alignment: Alignment.bottomRight,
+        children: [
+          ClipRect(
+            child: Signature(
+              key: signatureW,
+              controller: controller,
+              backgroundColor: panelColor.background,
             ),
-            buttonRow(),
-          ],
-        ),
+          ),
+          buttonRow(),
+        ],
+      ),
+    );
+
+    if (reduceKanjiDrawingBoardSize) {
+      return Padding(
+        padding: const EdgeInsets.fromLTRB(50, 0, 50, 30),
+        child: board,
       );
+    }
+    return board;
+  }
 
   @override
   Widget build(BuildContext context) {
@@ -217,12 +281,7 @@ class _DrawingBoardState extends State<DrawingBoard> {
         panelColor = state.theme.menuGreyLight;
         barColor = state.theme.menuGreyDark;
       }),
-      child: Column(
-        children: [
-          suggestionBar(),
-          drawingPanel(),
-        ],
-      ),
+      child: Column(children: [suggestionBar(), drawingPanel()]),
     );
   }
 }

lib/components/history/date_divider.dart

@@ -1,31 +1,26 @@
 import 'package:flutter/material.dart';
+import 'package:flutter_bloc/flutter_bloc.dart';
 
 import '../../bloc/theme/theme_bloc.dart';
 
 class TextDivider extends StatelessWidget {
   final String text;
 
-  const TextDivider({
-    super.key,
-    required this.text,
-  });
+  const TextDivider({super.key, required this.text});
 
   @override
   Widget build(BuildContext context) => BlocBuilder<ThemeBloc, ThemeState>(
-        builder: (context, state) {
-          final colors = state.theme.menuGreyNormal;
+    builder: (context, state) {
+      final colors = state.theme.menuGreyNormal;
 
-          return Container(
-            decoration: BoxDecoration(color: colors.background),
-            padding: const EdgeInsets.symmetric(
-              vertical: 5,
-              horizontal: 10,
-            ),
-            child: DefaultTextStyle.merge(
-              child: Text(text),
-              style: TextStyle(color: colors.foreground),
-            ),
-          );
-        },
+      return Container(
+        decoration: BoxDecoration(color: colors.background),
+        padding: const EdgeInsets.symmetric(vertical: 5, horizontal: 10),
+        child: DefaultTextStyle.merge(
+          child: Text(text),
+          style: TextStyle(color: colors.foreground),
+        ),
       );
+    },
+  );
 }

lib/components/history/history_entry_tile.dart

@@ -0,0 +1,110 @@
+import 'package:flutter/material.dart';
+import 'package:flutter_bloc/flutter_bloc.dart';
+import 'package:flutter_slidable/flutter_slidable.dart';
+import 'package:get_it/get_it.dart';
+import 'package:mugiten/bloc/theme/theme_bloc.dart';
+import 'package:mugiten/components/search/search_results_body/parts/circle_badge.dart';
+import 'package:mugiten/models/history_entry.dart';
+import 'package:sqflite/sqlite_api.dart';
+
+import '../../routing/routes.dart';
+import '../../services/datetime.dart';
+import '../../settings.dart';
+import '../common/kanji_box.dart';
+
+class HistoryEntryTile extends StatelessWidget {
+  final HistoryEntry entry;
+  final int objectKey;
+  final void Function()? onDelete;
+  final void Function()? onFavourite;
+
+  const HistoryEntryTile({
+    required this.entry,
+    required this.objectKey,
+    this.onDelete,
+    this.onFavourite,
+    super.key,
+  });
+
+  void Function() _onTap(BuildContext context) => entry.isKanji
+      ? () => Navigator.pushNamed(
+          context,
+          Routes.kanjiSearch,
+          arguments: entry.kanji,
+        )
+      : () =>
+            Navigator.pushNamed(context, Routes.search, arguments: entry.word);
+
+  MaterialPageRoute get timestamps => MaterialPageRoute(
+    builder: (context) => Scaffold(
+      appBar: AppBar(title: const Text('Last searched')),
+      body: ListView(
+        children: entry.timestamps
+            .map(
+              (ts) => ListTile(
+                title: Text('${formatDate(ts)}    ${formatTime(ts)}'),
+              ),
+            )
+            .toList(),
+      ),
+    ),
+  );
+
+  List<SlidableAction> _actions(BuildContext context) => [
+    SlidableAction(
+      backgroundColor: Colors.blue,
+      icon: Icons.access_time,
+      onPressed: (_) => Navigator.push(context, timestamps),
+    ),
+    SlidableAction(
+      backgroundColor: Colors.red,
+      icon: Icons.delete,
+      onPressed: (_) async {
+        await GetIt.instance.get<Database>().historyEntryDelete(entry.id);
+        onDelete?.call();
+      },
+    ),
+  ];
+
+  @override
+  Widget build(BuildContext context) {
+    return Slidable(
+      endActionPane: ActionPane(
+        motion: const ScrollMotion(),
+        children: _actions(context),
+      ),
+      child: Container(
+        padding: const EdgeInsets.symmetric(vertical: 10),
+        child: ListTile(
+          onTap: _onTap(context),
+          contentPadding: EdgeInsets.zero,
+          title: Row(
+            children: [
+              Padding(
+                padding: const EdgeInsets.symmetric(horizontal: 20),
+                child: Text(formatTime(entry.lastTimestamp)),
+              ),
+              DefaultTextStyle.merge(
+                style: japaneseFont.textStyle,
+                child: entry.isKanji
+                    ? KanjiBox.headline4(context: context, kanji: entry.kanji!)
+                    : Expanded(child: Text(entry.word!)),
+              ),
+              if (entry.isKanji) Expanded(child: SizedBox.shrink()),
+              if (entry.timestampCount > 1)
+                Padding(
+                  padding: const EdgeInsets.symmetric(horizontal: 20),
+                  child: BlocBuilder<ThemeBloc, ThemeState>(
+                    builder: (context, themeState) => CircleBadge(
+                      color: themeState.theme.menuGreyNormal.background,
+                      child: Text('${entry.timestampCount}'),
+                    ),
+                  ),
+                ),
+            ],
+          ),
+        ),
+      ),
+    );
+  }
+}

lib/components/history/kanji_box.dart

@@ -1,41 +0,0 @@
-import 'package:flutter/material.dart';
-
-import '../../bloc/theme/theme_bloc.dart';
-
-class KanjiBox extends StatelessWidget {
-  final String kanji;
-
-  const KanjiBox({
-    super.key,
-    required this.kanji,
-  });
-
-  @override
-  Widget build(BuildContext context) => IntrinsicHeight(
-        child: AspectRatio(
-          aspectRatio: 1,
-          child: BlocBuilder<ThemeBloc, ThemeState>(
-            builder: (context, state) {
-              final colors = state.theme.menuGreyLight;
-              return Container(
-                padding: const EdgeInsets.all(5),
-                alignment: Alignment.center,
-                decoration: BoxDecoration(
-                  color: colors.background,
-                  borderRadius: BorderRadius.circular(10.0),
-                ),
-                child: FittedBox(
-                  child: Text(
-                    kanji,
-                    style: TextStyle(
-                      color: colors.foreground,
-                      fontSize: 25,
-                    ),
-                  ),
-                ),
-              );
-            },
-          ),
-        ),
-      );
-}

lib/components/history/search_item.dart

@@ -1,109 +0,0 @@
-import 'package:flutter/material.dart';
-import 'package:flutter_slidable/flutter_slidable.dart';
-import 'package:get_it/get_it.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 Search search;
-  // final Widget search;
-  final int objectKey;
-  final void Function()? onDelete;
-  final void Function()? onFavourite;
-
-  const SearchItem({
-    required this.search,
-    required this.objectKey,
-    this.onDelete,
-    this.onFavourite,
-    super.key,
-  });
-
-  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: _actions(context),
-      ),
-      child: Container(
-        padding: const EdgeInsets.symmetric(vertical: 10),
-        child: ListTile(
-          onTap: _onTap(context),
-          contentPadding: EdgeInsets.zero,
-          title: Row(
-            children: [
-              Padding(
-                padding: const EdgeInsets.symmetric(horizontal: 20),
-                child: Text(formatTime(search.timestamp)),
-              ),
-              DefaultTextStyle.merge(
-                style: japaneseFont.textStyle,
-                child: _child,
-              ),
-            ],
-          ),
-        ),
-      ),
-    );
-  }
-}

lib/components/kanji/kanji_result_body/examples.dart

@@ -1,6 +1,7 @@
 import 'package:flutter/material.dart';
+import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:jadb/util/romaji_transliteration.dart';
-// import 'package:unofficial_jisho_api/api.dart';
+import 'package:mugiten/models/themes/theme.dart';
 
 import '../../../bloc/theme/theme_bloc.dart';
 import '../../../routing/routes.dart';
@@ -26,21 +27,17 @@ class YomiExample {
 
   // ignore: public_member_api_docs
   Map<String, String> toJson() => {
-        'example': example,
-        'reading': reading,
-        'meaning': meaning,
-      };
+    'example': example,
+    'reading': reading,
+    'meaning': meaning,
+  };
 }
 
 class Examples extends StatelessWidget {
   final List<YomiExample> onyomi;
   final List<YomiExample> kunyomi;
 
-  const Examples({
-    super.key,
-    required this.onyomi,
-    required this.kunyomi,
-  });
+  const Examples({super.key, required this.onyomi, required this.kunyomi});
 
   @override
   Widget build(BuildContext context) {
@@ -48,7 +45,7 @@ class Examples extends StatelessWidget {
 
     final yomiWidgets =
         onyomi.map((onEx) => _Example(onEx, _KanaType.onyomi)).toList() +
-            kunyomi.map((kunEx) => _Example(kunEx, _KanaType.kunyomi)).toList();
+        kunyomi.map((kunEx) => _Example(kunEx, _KanaType.kunyomi)).toList();
 
     const noExamplesWidget = Padding(
       padding: EdgeInsets.symmetric(vertical: 10),
@@ -65,7 +62,7 @@ class Examples extends StatelessWidget {
         if (onyomi.isEmpty && kunyomi.isEmpty)
           noExamplesWidget
         else
-          ...yomiWidgets
+          ...yomiWidgets,
       ],
     );
   }
@@ -81,50 +78,44 @@ class _Example extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) => BlocBuilder<ThemeBloc, ThemeState>(
-        builder: (context, state) {
-          final theme = state.theme;
-          final menuColors = theme.menuGreyNormal;
-          final kanaColors = kanaType == _KanaType.kunyomi
-              ? theme.kunyomiColor
-              : theme.onyomiColor;
+    builder: (context, state) {
+      final theme = state.theme;
+      final menuColors = theme.menuGreyNormal;
+      final kanaColors = kanaType == _KanaType.kunyomi
+          ? theme.kunyomiColor
+          : theme.onyomiColor;
 
-          return Container(
-            margin: const EdgeInsets.symmetric(
-              vertical: 5.0,
-              horizontal: 10.0,
-            ),
-            decoration: BoxDecoration(
-              color: menuColors.background,
-              borderRadius: BorderRadius.circular(10.0),
-            ),
-            child: IntrinsicHeight(
-              child: Row(
-                children: [
-                  InkWell(
-                    onTap: () => Navigator.pushNamed(
-                      context,
-                      Routes.search,
-                      arguments: yomiExample.example,
-                    ),
-                    child: _Kana(colors: kanaColors, example: yomiExample),
-                  ),
-                  _ExampleText(colors: menuColors, example: yomiExample)
-                ],
+      return Container(
+        margin: const EdgeInsets.symmetric(vertical: 5.0, horizontal: 10.0),
+        decoration: BoxDecoration(
+          color: menuColors.background,
+          borderRadius: BorderRadius.circular(10.0),
+        ),
+        child: IntrinsicHeight(
+          child: Row(
+            children: [
+              InkWell(
+                onTap: () => Navigator.pushNamed(
+                  context,
+                  Routes.search,
+                  arguments: yomiExample.example,
+                ),
+                child: _Kana(colors: kanaColors, example: yomiExample),
               ),
-            ),
-          );
-        },
+              _ExampleText(colors: menuColors, example: yomiExample),
+            ],
+          ),
+        ),
       );
+    },
+  );
 }
 
 class _Kana extends StatelessWidget {
   final ColorSet colors;
   final YomiExample example;
 
-  const _Kana({
-    required this.colors,
-    required this.example,
-  });
+  const _Kana({required this.colors, required this.example});
 
   @override
   Widget build(BuildContext context) {
@@ -167,10 +158,7 @@ class _ExampleText extends StatelessWidget {
   final ColorSet colors;
   final YomiExample example;
 
-  const _ExampleText({
-    required this.colors,
-    required this.example,
-  });
+  const _ExampleText({required this.colors, required this.example});
 
   @override
   Widget build(BuildContext context) {
@@ -179,12 +167,7 @@ class _ExampleText extends StatelessWidget {
         padding: const EdgeInsets.all(10),
         child: Wrap(
           children: [
-            Text(
-              example.meaning,
-              style: TextStyle(
-                color: colors.foreground,
-              ),
-            )
+            Text(example.meaning, style: TextStyle(color: colors.foreground)),
           ],
         ),
       ),

lib/components/kanji/kanji_result_body/grade.dart

@@ -1,4 +1,5 @@
 import 'package:flutter/material.dart';
+import 'package:flutter_bloc/flutter_bloc.dart';
 
 import '../../../bloc/theme/theme_bloc.dart';
 import '../../../settings.dart';
@@ -7,31 +8,27 @@ class Grade extends StatelessWidget {
   final String? grade;
   final String ifNullChar;
 
-  const Grade({
-    required this.grade,
-    this.ifNullChar = '⨉',
-    super.key,
-  });
+  const Grade({required this.grade, this.ifNullChar = '⨉', super.key});
 
   @override
   Widget build(BuildContext context) => BlocBuilder<ThemeBloc, ThemeState>(
-        builder: (context, state) {
-          final colors = state.theme.kanjiResultColor;
+    builder: (context, state) {
+      final colors = state.theme.kanjiResultColor;
 
-          return Container(
-            padding: const EdgeInsets.all(10.0),
-            decoration: BoxDecoration(
-              color: colors.background,
-              shape: BoxShape.circle,
-            ),
-            child: Text(
-              grade ?? ifNullChar,
-              style: TextStyle(
-                color: colors.foreground,
-                fontSize: 20.0,
-              ).merge(japaneseFont.textStyle),
-            ),
-          );
-        },
+      return Container(
+        padding: const EdgeInsets.all(10.0),
+        decoration: BoxDecoration(
+          color: colors.background,
+          shape: BoxShape.circle,
+        ),
+        child: Text(
+          grade ?? ifNullChar,
+          style: TextStyle(
+            color: colors.foreground,
+            fontSize: 20.0,
+          ).merge(japaneseFont.textStyle),
+        ),
       );
+    },
+  );
 }

lib/components/kanji/kanji_result_body/header.dart

@@ -1,4 +1,5 @@
 import 'package:flutter/material.dart';
+import 'package:flutter_bloc/flutter_bloc.dart';
 
 import '../../../bloc/theme/theme_bloc.dart';
 import '../../../settings.dart';
@@ -6,31 +7,30 @@ import '../../../settings.dart';
 class Header extends StatelessWidget {
   final String kanji;
 
-  const Header({
-    required this.kanji,
-    super.key,
-  });
+  const Header({required this.kanji, super.key});
 
   @override
   Widget build(BuildContext context) => AspectRatio(
-        aspectRatio: 1,
-        child: BlocBuilder<ThemeBloc, ThemeState>(
-          builder: (context, state) {
-            final colors = state.theme.kanjiResultColor;
+    aspectRatio: 1,
+    child: BlocBuilder<ThemeBloc, ThemeState>(
+      builder: (context, state) {
+        final colors = state.theme.kanjiResultColor;
 
-            return Container(
-              alignment: Alignment.center,
-              decoration: BoxDecoration(
-                borderRadius: BorderRadius.circular(10.0),
-                color: colors.background,
-              ),
-              child: Text(
-                kanji,
-                style: TextStyle(fontSize: 70.0, color: colors.foreground)
-                    .merge(japaneseFont.textStyle),
-              ),
-            );
-          },
-        ),
-      );
+        return Container(
+          alignment: Alignment.center,
+          decoration: BoxDecoration(
+            borderRadius: BorderRadius.circular(10.0),
+            color: colors.background,
+          ),
+          child: Text(
+            kanji,
+            style: TextStyle(
+              fontSize: 70.0,
+              color: colors.foreground,
+            ).merge(japaneseFont.textStyle),
+          ),
+        );
+      },
+    ),
+  );
 }

lib/components/kanji/kanji_result_body/jlpt_level.dart

@@ -1,4 +1,5 @@
 import 'package:flutter/material.dart';
+import 'package:flutter_bloc/flutter_bloc.dart';
 
 import '../../../bloc/theme/theme_bloc.dart';
 
@@ -6,30 +7,23 @@ class JlptLevel extends StatelessWidget {
   final String? jlptLevel;
   final String ifNullChar;
 
-  const JlptLevel({
-    required this.jlptLevel,
-    this.ifNullChar = '⨉',
-    super.key,
-  });
+  const JlptLevel({required this.jlptLevel, this.ifNullChar = '⨉', super.key});
 
   @override
   Widget build(BuildContext context) => BlocBuilder<ThemeBloc, ThemeState>(
-        builder: (context, state) {
-          final colors = state.theme.kanjiResultColor;
-          return Container(
-            padding: const EdgeInsets.all(10.0),
-            decoration: BoxDecoration(
-              shape: BoxShape.circle,
-              color: colors.background,
-            ),
-            child: Text(
-              jlptLevel ?? ifNullChar,
-              style: TextStyle(
-                color: colors.foreground,
-                fontSize: 20.0,
-              ),
-            ),
-          );
-        },
+    builder: (context, state) {
+      final colors = state.theme.kanjiResultColor;
+      return Container(
+        padding: const EdgeInsets.all(10.0),
+        decoration: BoxDecoration(
+          shape: BoxShape.circle,
+          color: colors.background,
+        ),
+        child: Text(
+          jlptLevel ?? ifNullChar,
+          style: TextStyle(color: colors.foreground, fontSize: 20.0),
+        ),
       );
+    },
+  );
 }

lib/components/kanji/kanji_result_body/radical.dart

@@ -1,5 +1,5 @@
 import 'package:flutter/material.dart';
-// import 'package:unofficial_jisho_api/api.dart' as jisho;
+import 'package:flutter_bloc/flutter_bloc.dart';
 
 import '../../../bloc/theme/theme_bloc.dart';
 import '../../../routing/routes.dart';
@@ -8,37 +8,34 @@ import '../../../settings.dart';
 class Radical extends StatelessWidget {
   final String radical;
 
-  const Radical({
-    required this.radical,
-    super.key,
-  });
+  const Radical({required this.radical, super.key});
 
   @override
   Widget build(BuildContext context) => BlocBuilder<ThemeBloc, ThemeState>(
-        builder: (context, state) {
-          final colors = state.theme.kanjiResultColor;
+    builder: (context, state) {
+      final colors = state.theme.kanjiResultColor;
 
-          return InkWell(
-            onTap: () => Navigator.pushNamed(
-              context,
-              Routes.kanjiSearchRadicals,
-              arguments: radical,
-            ),
-            child: Container(
-              padding: const EdgeInsets.all(15.0),
-              decoration: BoxDecoration(
-                shape: BoxShape.circle,
-                color: colors.background,
-              ),
-              child: Text(
-                radical,
-                style: TextStyle(
-                  color: colors.foreground,
-                  fontSize: 40.0,
-                ).merge(japaneseFont.textStyle),
-              ),
-            ),
-          );
-        },
+      return InkWell(
+        onTap: () => Navigator.pushNamed(
+          context,
+          Routes.kanjiSearchRadicals,
+          arguments: radical,
+        ),
+        child: Container(
+          padding: const EdgeInsets.all(15.0),
+          decoration: BoxDecoration(
+            shape: BoxShape.circle,
+            color: colors.background,
+          ),
+          child: Text(
+            radical,
+            style: TextStyle(
+              color: colors.foreground,
+              fontSize: 40.0,
+            ).merge(japaneseFont.textStyle),
+          ),
+        ),
       );
+    },
+  );
 }

lib/components/kanji/kanji_result_body/rank.dart

@@ -1,4 +1,5 @@
 import 'package:flutter/material.dart';
+import 'package:flutter_bloc/flutter_bloc.dart';
 
 import '../../../bloc/theme/theme_bloc.dart';
 
@@ -6,32 +7,25 @@ class Rank extends StatelessWidget {
   final int? rank;
   final String ifNullChar;
 
-  const Rank({
-    required this.rank,
-    this.ifNullChar = '⨉',
-    super.key,
-  });
+  const Rank({required this.rank, this.ifNullChar = '⨉', super.key});
 
   @override
   Widget build(BuildContext context) => BlocBuilder<ThemeBloc, ThemeState>(
-        builder: (context, state) {
-          final colors = state.theme.kanjiResultColor;
+    builder: (context, state) {
+      final colors = state.theme.kanjiResultColor;
 
-          return Container(
-            padding: const EdgeInsets.all(10.0),
-            decoration: BoxDecoration(
-              shape: (rank == null) ? BoxShape.circle : BoxShape.rectangle,
-              borderRadius: (rank == null) ? null : BorderRadius.circular(10.0),
-              color: colors.background,
-            ),
-            child: Text(
-              rank != null ? '${rank.toString()} / 2500' : ifNullChar,
-              style: TextStyle(
-                color: colors.foreground,
-                fontSize: 20.0,
-              ),
-            ),
-          );
-        },
+      return Container(
+        padding: const EdgeInsets.all(10.0),
+        decoration: BoxDecoration(
+          shape: (rank == null) ? BoxShape.circle : BoxShape.rectangle,
+          borderRadius: (rank == null) ? null : BorderRadius.circular(10.0),
+          color: colors.background,
+        ),
+        child: Text(
+          rank != null ? '${rank.toString()} / 2500' : ifNullChar,
+          style: TextStyle(color: colors.foreground, fontSize: 20.0),
+        ),
       );
+    },
+  );
 }

lib/components/kanji/kanji_result_body/stroke_order_gif.dart

@@ -1,30 +1,28 @@
 import 'package:flutter/material.dart';
+import 'package:flutter_bloc/flutter_bloc.dart';
 
 import '../../../bloc/theme/theme_bloc.dart';
 
 class StrokeOrderGif extends StatelessWidget {
   final String uri;
 
-  const StrokeOrderGif({
-    required this.uri,
-    super.key,
-  });
+  const StrokeOrderGif({required this.uri, super.key});
 
   @override
   Widget build(BuildContext context) => BlocBuilder<ThemeBloc, ThemeState>(
-        builder: (context, state) {
-          return Container(
-            margin: const EdgeInsets.symmetric(vertical: 20.0),
-            padding: const EdgeInsets.all(5.0),
-            decoration: BoxDecoration(
-              color: state.theme.kanjiResultColor.background,
-              borderRadius: BorderRadius.circular(15.0),
-            ),
-            child: ClipRRect(
-              borderRadius: BorderRadius.circular(10.0),
-              child: Image.network(uri),
-            ),
-          );
-        },
+    builder: (context, state) {
+      return Container(
+        margin: const EdgeInsets.symmetric(vertical: 20.0),
+        padding: const EdgeInsets.all(5.0),
+        decoration: BoxDecoration(
+          color: state.theme.kanjiResultColor.background,
+          borderRadius: BorderRadius.circular(15.0),
+        ),
+        child: ClipRRect(
+          borderRadius: BorderRadius.circular(10.0),
+          child: Image.network(uri),
+        ),
       );
+    },
+  );
 }

lib/components/kanji/kanji_result_body/yomi_chips.dart

@@ -1,15 +1,13 @@
 import 'package:flutter/material.dart';
+import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:jadb/util/romaji_transliteration.dart';
+import 'package:mugiten/models/themes/theme.dart';
 
 import '../../../bloc/theme/theme_bloc.dart';
 import '../../../routing/routes.dart';
 import '../../../settings.dart';
 
-enum YomiType {
-  onyomi,
-  kunyomi,
-  meaning,
-}
+enum YomiType { onyomi, kunyomi, meaning }
 
 extension on YomiType {
   String get title {
@@ -42,42 +40,34 @@ class YomiChips extends StatelessWidget {
   final List<String> yomi;
   final YomiType type;
 
-  const YomiChips({
-    required this.yomi,
-    required this.type,
-    super.key,
-  });
-
-  bool get isExpandable => yomi.length > 6;
+  const YomiChips({required this.yomi, required this.type, super.key});
 
   Widget yomiCard({
     required BuildContext context,
     required String yomi,
     required ColorSet colors,
+    bool searchable = true,
     TextStyle? extraTextStyle,
-  }) =>
-      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),
-          ),
-        ),
-      );
+  }) => InkWell(
+    onTap: searchable
+        ? () => Navigator.pushNamed(context, Routes.search, arguments: yomi)
+        : null,
+    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),
+      ),
+    ),
+  );
 
   Widget yomiWrapper(BuildContext context) {
     final yomiCards = yomi
@@ -94,52 +84,29 @@ class YomiChips extends StatelessWidget {
         )
         .toList();
 
-    final yomiCardsWithTitle = <Widget>[
-      if (type != YomiType.meaning)
-        yomiCard(
-          context: context,
-          yomi: type == YomiType.kunyomi ? 'Kun:' : 'On:',
-          colors: ColorSet(
-            foreground: type.getColors(context).background,
-            background: Colors.transparent,
-          ),
-        ),
-      ...yomiCards
-    ];
-
-    final wrap = Wrap(
+    return Wrap(
       runSpacing: 10.0,
       crossAxisAlignment: WrapCrossAlignment.center,
-      children: yomiCardsWithTitle,
-    );
-
-    if (!isExpandable) {
-      return wrap;
-    } else {
-      return ExpansionTile(
-        title: Center(
-          child: yomiCard(
+      children: [
+        if (type != YomiType.meaning)
+          yomiCard(
             context: context,
-            yomi: type.title,
-            colors: type.getColors(context),
+            yomi: type == YomiType.kunyomi ? 'Kun:' : 'On:',
+            searchable: false,
+            colors: ColorSet(
+              foreground: type.getColors(context).background,
+              background: Colors.transparent,
+            ),
           ),
-        ),
-        children: [
-          const SizedBox(height: 20.0),
-          wrap,
-          const SizedBox(height: 25.0),
-        ],
-      );
-    }
+        ...yomiCards,
+      ],
+    );
   }
 
   @override
   Widget build(BuildContext context) {
     return Container(
-      margin: const EdgeInsets.symmetric(
-        horizontal: 10.0,
-        vertical: 5.0,
-      ),
+      margin: const EdgeInsets.symmetric(horizontal: 10.0, vertical: 5.0),
       alignment: Alignment.centerLeft,
       child: yomiWrapper(context),
     );

lib/components/kanji/kanji_search_body.dart

@@ -1,7 +1,9 @@
 import 'package:animated_size_and_fade/animated_size_and_fade.dart';
 import 'package:flutter/material.dart';
+import 'package:get_it/get_it.dart';
+import 'package:jadb/search.dart';
+import 'package:sqflite/sqflite.dart';
 
-import '../../services/kanji_suggestions.dart';
 import 'kanji_search_body/kanji_grid.dart';
 import 'kanji_search_body/kanji_search_bar.dart';
 import 'kanji_search_body/kanji_search_options_bar.dart';
@@ -17,6 +19,7 @@ class _KanjiSearchBodyState extends State<KanjiSearchBody>
     with SingleTickerProviderStateMixin {
   late final AnimationController _controller;
   late final Animation _searchbarMovementAnimation;
+  bool _isFocused = false;
   final FocusNode focus = FocusNode();
   final GlobalKey<KanjiSearchBarState> _kanjiSearchBarState =
       GlobalKey<KanjiSearchBarState>();
@@ -34,12 +37,7 @@ class _KanjiSearchBodyState extends State<KanjiSearchBody>
     _searchbarMovementAnimation = AlignmentTween(
       begin: Alignment.center,
       end: Alignment.topCenter,
-    ).animate(
-      CurvedAnimation(
-        parent: _controller,
-        curve: Curves.easeInOut,
-      ),
-    );
+    ).animate(CurvedAnimation(parent: _controller, curve: Curves.easeInOut));
   }
 
   @override
@@ -50,14 +48,13 @@ class _KanjiSearchBodyState extends State<KanjiSearchBody>
 
   @override
   Widget build(BuildContext context) {
-    return WillPopScope(
-      onWillPop: () async {
-        if (_controller.value == 1) {
+    return PopScope(
+      canPop: !_isFocused,
+      onPopInvokedWithResult: (didPop, result) {
+        if (!didPop) {
           focus.unfocus();
           _kanjiSearchBarState.currentState!.clearText();
-          return false;
         }
-        return true;
       },
       child: InkWell(
         onTap: () => FocusScope.of(context).unfocus(),
@@ -79,14 +76,18 @@ class _KanjiSearchBodyState extends State<KanjiSearchBody>
                       onFocusChange: (hasFocus) {
                         if (hasFocus) {
                           _controller.forward();
+                          setState(() => _isFocused = true);
                         } else {
                           _controller.reverse();
+                          setState(() => _isFocused = false);
                         }
                       },
                       child: KanjiSearchBar(
                         key: _kanjiSearchBarState,
-                        onChanged: (text) => setState(() {
-                          suggestions = kanjiSuggestions(text);
+                        onChanged: (text) => setState(() async {
+                          suggestions = await GetIt.instance
+                              .get<Database>()
+                              .filterKanji(text.characters.toList());
                         }),
                       ),
                     ),
@@ -97,14 +98,14 @@ class _KanjiSearchBodyState extends State<KanjiSearchBody>
                       child: (_controller.value == 1 && suggestions.isNotEmpty)
                           ? KanjiGrid(suggestions: suggestions)
                           : (_controller.value == 1)
-                              ? const Text(
-                                  'Type a kanji to start searching',
-                                  style: TextStyle(
-                                    fontSize: 16,
-                                    color: Colors.grey,
-                                  ),
-                                )
-                              : const KanjiSearchOptionsBar(),
+                          ? 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

@@ -1,4 +1,5 @@
 import 'package:flutter/material.dart';
+import 'package:flutter_bloc/flutter_bloc.dart';
 
 import '../../../bloc/theme/theme_bloc.dart';
 import '../../../routing/routes.dart';
@@ -12,10 +13,7 @@ class KanjiGrid extends StatelessWidget {
   @override
   Widget build(BuildContext context) {
     return Container(
-      padding: const EdgeInsets.symmetric(
-        vertical: 20.0,
-        horizontal: 40.0,
-      ),
+      padding: const EdgeInsets.symmetric(vertical: 20.0, horizontal: 40.0),
       child: GridView.count(
         shrinkWrap: true,
         crossAxisCount: 3,

lib/components/kanji/kanji_search_body/kanji_search_bar.dart

@@ -57,12 +57,11 @@ class KanjiSearchBarState extends State<KanjiSearchBar> {
       style: japaneseFont.textStyle,
       decoration: InputDecoration(
         hintText: 'Search',
-        border: OutlineInputBorder(
-          borderRadius: BorderRadius.circular(10.0),
-        ),
+        border: OutlineInputBorder(borderRadius: BorderRadius.circular(10.0)),
         isDense: false,
-        suffixIcon:
-            (button == TextFieldButton.clear) ? clearButton : pasteButton,
+        suffixIcon: (button == TextFieldButton.clear)
+            ? clearButton
+            : pasteButton,
       ),
     );
   }

lib/components/kanji/kanji_search_body/kanji_search_options_bar.dart

@@ -1,4 +1,5 @@
 import 'package:flutter/material.dart';
+import 'package:flutter_bloc/flutter_bloc.dart';
 
 import '../../../bloc/theme/theme_bloc.dart';
 import '../../../routing/routes.dart';
@@ -39,18 +40,15 @@ class _IconButton extends StatelessWidget {
   final Widget icon;
   final void Function()? onPressed;
 
-  const _IconButton({
-    required this.icon,
-    required this.onPressed,
-  });
+  const _IconButton({required this.icon, required this.onPressed});
 
   @override
   Widget build(BuildContext context) => BlocBuilder<ThemeBloc, ThemeState>(
-        builder: (context, state) => IconButton(
-          onPressed: onPressed,
-          icon: icon,
-          iconSize: 30,
-          color: state.theme.menuGreyDark.background,
-        ),
-      );
+    builder: (context, state) => IconButton(
+      onPressed: onPressed,
+      icon: icon,
+      iconSize: 30,
+      color: state.theme.menuGreyDark.background,
+    ),
+  );
 }

lib/components/library/add_to_library_dialog.dart

@@ -0,0 +1,166 @@
+import 'package:flutter/material.dart';
+import 'package:get_it/get_it.dart';
+import 'package:jadb/search.dart';
+import 'package:mugiten/models/library_list.dart';
+import 'package:ruby_text/ruby_text.dart';
+import 'package:sqflite/sqflite.dart';
+
+import '../common/loading.dart';
+
+Future<void> showAddToLibraryDialog({
+  required BuildContext context,
+  required int? jmdictEntryId,
+  required String? kanji,
+}) => showDialog(
+  context: context,
+  barrierDismissible: true,
+  builder: (_) =>
+      AddToLibraryDialog(jmdictEntryId: jmdictEntryId, kanji: kanji),
+);
+
+class AddToLibraryDialog extends StatefulWidget {
+  final int? jmdictEntryId;
+  final String? kanji;
+
+  const AddToLibraryDialog({
+    super.key,
+    required this.jmdictEntryId,
+    required this.kanji,
+  });
+
+  @override
+  State<AddToLibraryDialog> createState() => _AddToLibraryDialogState();
+}
+
+class _AddToLibraryDialogState extends State<AddToLibraryDialog> {
+  Map<String, bool>? librariesContainEntry;
+
+  /// A lock to make sure that the local data and the database doesn't
+  /// get out of sync.
+  bool toggleLock = false;
+
+  @override
+  void initState() {
+    super.initState();
+
+    GetIt.instance
+        .get<Database>()
+        .libraryListAllListsContain(
+          jmdictEntryId: widget.jmdictEntryId,
+          kanji: widget.kanji,
+        )
+        .then((data) => setState(() => librariesContainEntry = data));
+  }
+
+  Future<void> toggleEntry(String libraryName) async {
+    if (toggleLock) return;
+
+    setState(() => toggleLock = true);
+
+    await GetIt.instance.get<Database>().libraryListToggleEntry(
+      libraryName,
+      jmdictEntryId: widget.jmdictEntryId,
+      kanji: widget.kanji,
+    );
+
+    setState(() {
+      toggleLock = false;
+      librariesContainEntry![libraryName] =
+          !librariesContainEntry![libraryName]!;
+    });
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    return AlertDialog(
+      title: const Text('Add to library'),
+      contentPadding: const EdgeInsets.symmetric(vertical: 24, horizontal: 12),
+      content: Column(
+        children: [
+          ListTile(
+            title: Center(
+              child: widget.kanji != null
+                  // TODO: fix
+                  // ? KanjiBox.headline4(
+                  //     context: context,
+                  //     kanji: widget.kanji!,
+                  //   )
+                  ? Text(
+                      widget.kanji!,
+                      style: Theme.of(context).textTheme.displayMedium,
+                    )
+                  : FutureBuilder(
+                      future: GetIt.instance.get<Database>().jadbGetWordById(
+                        widget.jmdictEntryId!,
+                      ),
+                      builder: (context, snapshot) {
+                        if (snapshot.hasError) {
+                          return ErrorWidget(snapshot.error!);
+                        }
+
+                        if (!snapshot.hasData) {
+                          return const LoadingScreen();
+                        }
+
+                        final entry = snapshot.data!;
+                        final japaneseWord = entry.japanese.firstOrNull;
+
+                        assert(
+                          japaneseWord != null,
+                          'Japanese word should not be null',
+                        );
+
+                        if (japaneseWord == null) {
+                          return const Text('???');
+                        }
+
+                        return RubySpanWidget(
+                          RubyTextData(
+                            japaneseWord.base,
+                            ruby: japaneseWord.furigana,
+                          ),
+                        );
+                      },
+                    ),
+            ),
+          ),
+          const Divider(thickness: 3),
+          Expanded(
+            child: SizedBox(
+              width: double.maxFinite,
+              child: librariesContainEntry == null
+                  ? const LoadingScreen()
+                  : ListView(
+                      children: librariesContainEntry!.entries.map((e) {
+                        final libraryName = e.key;
+                        final checked = e.value;
+                        return ListTile(
+                          onTap: () => toggleEntry(libraryName),
+                          contentPadding: const EdgeInsets.symmetric(
+                            vertical: 5,
+                          ),
+                          title: Row(
+                            children: [
+                              Checkbox(
+                                value: checked,
+                                onChanged: (_) => toggleEntry(libraryName),
+                              ),
+                              Text(libraryName),
+                            ],
+                          ),
+                        );
+                      }).toList(),
+                    ),
+            ),
+          ),
+        ],
+      ),
+      actions: [
+        ElevatedButton(
+          onPressed: () => Navigator.pop(context),
+          child: const Text('OK'),
+        ),
+      ],
+    );
+  }
+}

lib/components/library/library_list_entry_tile.dart

@@ -0,0 +1,99 @@
+import 'package:flutter/material.dart';
+import 'package:flutter_slidable/flutter_slidable.dart';
+import 'package:get_it/get_it.dart';
+import 'package:mugiten/components/search/search_results_body/search_card.dart';
+import 'package:mugiten/models/library_list.dart';
+import 'package:sqflite/sqlite_api.dart';
+
+import '../../routing/routes.dart';
+import '../../settings.dart';
+import '../common/kanji_box.dart';
+
+class LibraryListEntryTile extends StatelessWidget {
+  final int? index;
+  final LibraryList library;
+  final LibraryListEntry entry;
+  final void Function()? onDelete;
+  final void Function()? onUpdate;
+
+  const LibraryListEntryTile({
+    super.key,
+    required this.entry,
+    required this.library,
+    this.index,
+    this.onDelete,
+    this.onUpdate,
+  });
+
+  @override
+  Widget build(BuildContext context) {
+    return entry.kanji != null
+        ? _kanjiTile(context, index, entry.kanji!)
+        : _jmdictEntryTile(context, index, entry);
+  }
+
+  Widget _index(BuildContext context, int index) {
+    return Padding(
+      padding: const EdgeInsets.symmetric(horizontal: 10),
+      child: Text(
+        (index + 1).toString(),
+        style: Theme.of(
+          context,
+        ).textTheme.titleMedium!.merge(japaneseFont.textStyle),
+      ),
+    );
+  }
+
+  SlidableAction _deleteAction() {
+    return SlidableAction(
+      backgroundColor: Colors.red,
+      icon: Icons.delete,
+      onPressed: (_) async {
+        await GetIt.instance.get<Database>().libraryListDeleteEntry(
+          library.name,
+          jmdictEntryId: entry.jmdictEntryId,
+          kanji: entry.kanji,
+        );
+        onDelete?.call();
+      },
+    );
+  }
+
+  Widget _kanjiTile(BuildContext context, int? index, String kanji) {
+    return Slidable(
+      endActionPane: ActionPane(
+        motion: const ScrollMotion(),
+        children: [_deleteAction()],
+      ),
+      child: ListTile(
+        leading: (index != null) ? _index(context, index) : null,
+        onTap: () async {
+          await Navigator.pushNamed(
+            context,
+            Routes.kanjiSearch,
+            arguments: kanji,
+          );
+          onUpdate?.call();
+        },
+        title: Row(
+          children: [
+            SizedBox(width: 15),
+            KanjiBox.headline4(context: context, kanji: kanji),
+          ],
+        ),
+      ),
+    );
+  }
+
+  Widget _jmdictEntryTile(
+    BuildContext context,
+    int? index,
+    LibraryListEntry entry,
+  ) {
+    return SearchResultCard(
+      result: entry.wordSearchResult!,
+      leading: index != null ? _index(context, index) : null,
+      slidableActions: [_deleteAction()],
+    );
+  }
+}

lib/components/library/library_list_tile.dart

@@ -0,0 +1,67 @@
+import 'package:flutter/material.dart';
+import 'package:flutter_slidable/flutter_slidable.dart';
+import 'package:get_it/get_it.dart';
+import 'package:mugiten/models/library_list.dart';
+import 'package:sqflite/sqlite_api.dart';
+
+import '../../routing/routes.dart';
+
+class LibraryListTile extends StatelessWidget {
+  final Widget? leading;
+  final LibraryList library;
+  final void Function()? onDelete;
+  final void Function()? onUpdate;
+  final bool isEditable;
+
+  const LibraryListTile({
+    super.key,
+    required this.library,
+    this.leading,
+    this.onDelete,
+    this.onUpdate,
+    this.isEditable = true,
+  });
+
+  @override
+  Widget build(BuildContext context) {
+    return Slidable(
+      endActionPane: ActionPane(
+        motion: const ScrollMotion(),
+        children: !isEditable
+            ? []
+            : [
+                SlidableAction(
+                  backgroundColor: Colors.blue,
+                  icon: Icons.edit,
+                  onPressed: (_) async {
+                    // TODO: update name
+                    onUpdate?.call();
+                  },
+                ),
+                // TODO: ask for confirmation before deleting
+                SlidableAction(
+                  backgroundColor: Colors.red,
+                  icon: Icons.delete,
+                  onPressed: (_) async {
+                    await GetIt.instance.get<Database>().libraryListDeleteList(
+                      library.name,
+                    );
+                    onDelete?.call();
+                  },
+                ),
+              ],
+      ),
+      child: ListTile(
+        leading: leading,
+        onTap: () =>
+            Navigator.pushNamed(context, Routes.library, arguments: library),
+        title: Row(
+          children: [
+            Expanded(child: Text(library.name)),
+            Text('${library.totalCount} items'),
+          ],
+        ),
+      ),
+    );
+  }
+}

lib/components/library/new_library_dialog.dart

@@ -0,0 +1,85 @@
+import 'package:flutter/material.dart';
+import 'package:get_it/get_it.dart';
+import 'package:mugiten/models/library_list.dart';
+import 'package:sqflite/sqlite_api.dart';
+
+void Function() showNewLibraryDialog(BuildContext context) => () async {
+  final String? listName = await showDialog<String>(
+    context: context,
+    barrierDismissible: true,
+    builder: (_) => const NewLibraryDialog(),
+  );
+
+  if (listName == null) return;
+
+  await GetIt.instance.get<Database>().libraryListInsertList(listName);
+};
+
+class NewLibraryDialog extends StatefulWidget {
+  const NewLibraryDialog({super.key});
+
+  @override
+  State<NewLibraryDialog> createState() => _NewLibraryDialogState();
+}
+
+enum _NameState { initial, currentlyChecking, invalid, alreadyExists, valid }
+
+class _NewLibraryDialogState extends State<NewLibraryDialog> {
+  final controller = TextEditingController();
+  _NameState nameState = _NameState.initial;
+
+  Future<void> onNameUpdate(String proposedListName) async {
+    setState(() => nameState = _NameState.currentlyChecking);
+    if (proposedListName == '') {
+      setState(() => nameState = _NameState.invalid);
+      return;
+    }
+
+    final nameAlreadyExists = await GetIt.instance
+        .get<Database>()
+        .libraryListExists(proposedListName);
+    if (nameAlreadyExists) {
+      setState(() => nameState = _NameState.alreadyExists);
+    } else {
+      setState(() => nameState = _NameState.valid);
+    }
+  }
+
+  bool get errorStatus =>
+      nameState == _NameState.invalid || nameState == _NameState.alreadyExists;
+  String? get statusLabel => {
+    _NameState.invalid: 'Invalid Name',
+    _NameState.alreadyExists: 'Already Exists',
+  }[nameState];
+  bool get confirmButtonActive => nameState == _NameState.valid;
+
+  @override
+  Widget build(BuildContext context) {
+    return AlertDialog(
+      title: const Text('Add new library'),
+      content: TextField(
+        decoration: InputDecoration(
+          hintText: 'Library name',
+          errorText: statusLabel,
+        ),
+        controller: controller,
+        onChanged: onNameUpdate,
+      ),
+      actions: [
+        ElevatedButton(
+          onPressed: () => Navigator.pop(context),
+          child: const Text('Cancel'),
+        ),
+        ElevatedButton(
+          style: confirmButtonActive
+              ? null
+              : ElevatedButton.styleFrom(foregroundColor: Colors.grey),
+          onPressed: confirmButtonActive
+              ? () => Navigator.pop(context, controller.text)
+              : () {},
+          child: const Text('Add'),
+        ),
+      ],
+    );
+  }
+}

lib/components/search/global_search_bar.dart

@@ -1,4 +1,5 @@
 import 'package:flutter/material.dart';
+import 'package:mugiten/components/drawing_board/drawing_board.dart';
 
 import '../../models/themes/theme.dart';
 import '../../routing/routes.dart';
@@ -6,15 +7,13 @@ import '../../settings.dart';
 import 'language_selector.dart';
 
 class GlobalSearchBar extends StatelessWidget {
-  final TextEditingController controller = TextEditingController();
+  final TextEditingController textController = TextEditingController();
+  final FocusNode textFocus = FocusNode();
 
   GlobalSearchBar({super.key});
 
-  void _search(BuildContext context, String text) => Navigator.pushNamed(
-        context,
-        Routes.search,
-        arguments: text,
-      );
+  void _search(BuildContext context, String text) =>
+      Navigator.pushNamed(context, Routes.search, arguments: text);
 
   @override
   Widget build(BuildContext context) {
@@ -24,7 +23,8 @@ class GlobalSearchBar extends StatelessWidget {
         children: [
           TextField(
             onSubmitted: (text) => _search(context, text),
-            controller: controller,
+            controller: textController,
+            focusNode: textFocus,
             style: japaneseFont.textStyle,
             decoration: InputDecoration(
               labelText: 'Search',
@@ -37,25 +37,89 @@ class GlobalSearchBar extends StatelessWidget {
                   topRight: Radius.circular(10.0),
                   bottomRight: Radius.circular(10.0),
                 ),
-                color: AppTheme.jishoGreen.background,
+                color: AppTheme.mugitenWheat.background,
                 child: IconButton(
                   onPressed: () {
-                    if (controller.text.isNotEmpty) {
-                      _search(context, controller.text);
+                    final text = textController.text.trim();
+                    if (text.isNotEmpty) {
+                      _search(context, text);
                     }
                   },
-                  icon: const Icon(
-                    Icons.search,
-                    color: Colors.white,
-                  ),
+                  icon: const Icon(Icons.search, color: Colors.white),
                 ),
               ),
             ),
           ),
           const SizedBox(height: 20),
-          const LanguageSelector()
+          Row(
+            mainAxisAlignment: MainAxisAlignment.spaceBetween,
+            children: [
+              IconButton(
+                icon: const Icon(Icons.close),
+                color: Colors.red,
+                onPressed: () {
+                  textController.clear();
+                },
+              ),
+              const LanguageSelector(),
+              IconButton(
+                icon: const Icon(Icons.mode),
+                onPressed: () async {
+                  final precedingText = textController.selection.isValid
+                      ? textController.text.substring(
+                          textController.selection.baseOffset,
+                        )
+                      : null;
+
+                  final result = await _drawKanji(precedingText)(context);
+
+                  if (result != null && result.isNotEmpty) {
+                    if (textController.selection.isValid) {
+                      final pos = textController.selection.baseOffset;
+                      textController.text =
+                          textController.text.substring(0, pos) +
+                          result +
+                          textController.text.substring(pos);
+                      textController.selection = TextSelection.fromPosition(
+                        TextPosition(offset: pos + result.length),
+                      );
+                    } else {
+                      textController.text += result;
+                      textController.selection = TextSelection.fromPosition(
+                        TextPosition(offset: textController.text.length),
+                      );
+                      textFocus.requestFocus();
+                    }
+                  }
+                },
+              ),
+            ],
+          ),
         ],
       ),
     );
   }
+
+  Future<String?> Function(BuildContext) _drawKanji(String? precedingText) {
+    final MaterialPageRoute<String> route = MaterialPageRoute(
+      builder: (context) => Scaffold(
+        appBar: AppBar(title: const Text('Draw a kanji')),
+        body: SafeArea(
+          child: Column(
+            children: [
+              const Expanded(child: Column()),
+              DrawingBoard(
+                precedingText: precedingText,
+                onlyOneCharacterSuggestions: true,
+                onSuggestionChosen: (suggestion) =>
+                    Navigator.pop(context, suggestion),
+              ),
+            ],
+          ),
+        ),
+      ),
+    );
+
+    return (context) => Navigator.push<String>(context, route);
+  }
 }

lib/components/search/language_selector.dart

@@ -23,31 +23,30 @@ class _LanguageSelectorState extends State<LanguageSelector> {
   }
 
   Future<void> _updateSelectedStatus() async => prefs.setStringList(
-        'languageSelectorStatus',
-        isSelected.map((b) => b ? '1' : '0').toList(),
-      );
+    'languageSelectorStatus',
+    isSelected.map((b) => b ? '1' : '0').toList(),
+  );
 
   List<bool>? _getSelectedStatus() => prefs
       .getStringList('languageSelectorStatus')
       ?.map((s) => s == '1')
       .toList();
 
-  Widget _languageOption(String language, {TextStyle? style}) =>
-    Container(
-      alignment: Alignment.center,
-      padding: const EdgeInsets.symmetric(vertical: 10.0, horizontal: 20.0),
-      child: Text(language, style: style,),
-    );
+  Widget _languageOption(String language, {TextStyle? style}) => Container(
+    alignment: Alignment.center,
+    padding: const EdgeInsets.symmetric(vertical: 10.0, horizontal: 20.0),
+    child: Text(language, style: style),
+  );
 
   @override
   Widget build(BuildContext context) {
     return ToggleButtons(
-      selectedColor: AppTheme.jishoGreen.background,
+      selectedColor: AppTheme.mugitenWheat.background,
       isSelected: isSelected,
       children: [
         _languageOption('Auto'),
         _languageOption('日本語', style: japaneseFont.textStyle),
-        _languageOption('English')
+        _languageOption('English'),
       ],
       onPressed: (buttonIndex) {
         setState(() {

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

@@ -4,11 +4,7 @@ class CircleBadge extends StatelessWidget {
   final Widget? child;
   final Color color;
 
-  const CircleBadge({
-    super.key,
-    this.child,
-    required this.color,
-  });
+  const CircleBadge({super.key, this.child, required this.color});
 
   @override
   Widget build(BuildContext context) {
@@ -17,10 +13,7 @@ class CircleBadge extends StatelessWidget {
       width: 30,
       height: 30,
       margin: const EdgeInsets.symmetric(horizontal: 2),
-      decoration: BoxDecoration(
-        shape: BoxShape.circle,
-        color: color,
-      ),
+      decoration: BoxDecoration(shape: BoxShape.circle, color: color),
       child: FittedBox(child: child),
     );
   }

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

@@ -4,10 +4,7 @@ import 'circle_badge.dart';
 class CommonBadge extends StatelessWidget {
   final bool isCommon;
 
-  const CommonBadge({
-    required this.isCommon,
-    super.key,
-  });
+  const CommonBadge({required this.isCommon, super.key});
 
   @override
   Widget build(BuildContext context) {
@@ -15,9 +12,7 @@ class CommonBadge extends StatelessWidget {
       color: isCommon ? Colors.green : Colors.transparent,
       child: Text(
         'C',
-        style: TextStyle(
-          color: isCommon ? Colors.white : Colors.transparent,
-        ),
+        style: TextStyle(color: isCommon ? Colors.white : Colors.transparent),
       ),
     );
   }