Fix heading sizes

* Add search button

* Add search tip to kanji search

.circleci/config.yml

@@ -0,0 +1,88 @@
+version: 2.1
+
+jobs:
+  build:
+    description: "Build the application into an Android APK executable"
+    docker:
+      - image: cirrusci/flutter:stable
+    working_directory: ~/project
+    steps:
+      - checkout
+      - run:
+          name: Print 
+          command: flutter doctor
+        
+      - run:
+          name: Install Dependencies
+          command: flutter pub get
+        
+      - run:
+          name: Build
+          command: flutter -v build apk
+        
+      - save_cache:
+          paths:
+            - .dart_tool
+          key: dart-dependencies-{{ checksum "pubspec.lock" }}
+
+  lint:
+    description: "Run static analysis for the code"
+    docker:
+      - image: cirrusci/flutter:stable
+    working_directory: ~/project
+    steps:
+      - checkout
+
+      - restore_cache:
+          keys:
+            - dart-dependencies-{{ checksum "pubspec.lock" }}
+            - dart-dependencies-
+
+      - run:
+          name: Make folder for analysis results
+          command: mkdir lint_analysis_data
+
+      - run:
+          name: Analyze code
+          command: flutter analyze --no-fatal-infos > lint_analysis_data/results.txt
+
+      - store_artifacts:
+          path: ~/project/lint_analysis_data
+
+  test:
+    description: "Run all unittests"
+    docker:
+      - image: cirrusci/flutter:stable
+    working_directory: ~/project
+    steps:
+      - checkout
+      - restore_cache:
+          keys:
+            - dart-dependencies-{{ checksum "pubspec.lock" }}
+            - dart-dependencies-
+
+      - run:
+          name: Install test report converter tool
+          command: pub global activate junitreport
+
+      - run:
+          name: Make folder for test results
+          command: mkdir -p test_results/flutter
+
+      - run:
+          name: Run tests
+          command: flutter test --machine | ~/.pub-cache/bin/tojunit --output test_results/flutter/results.xml || true 
+
+      - store_test_results:
+          path: test_results
+
+workflows:
+  build_and_test:
+    jobs:
+      - build
+      - lint:
+          requires:
+            - build
+      - test:
+          requires:
+            - build

.gitignore

@@ -34,4 +34,4 @@
 lib/generated_plugin_registrant.dart
 
 # Exceptions to above rules.
-!/packages/flutter_tools/test/data/dart_dependencies_test/**/.packages
+!/packages/flutter_tools/test/data/dart_dependencies_test/**/.packages

README.md

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

analysis_options.yaml

@@ -0,0 +1,167 @@
+analyzer:
+  exclude:
+
+linter:
+  rules:
+    # these rules are documented on and in the same order as
+    # the Dart Lint rules page to make maintenance easier
+    # https://github.com/dart-lang/linter/blob/master/example/all.yaml
+    - always_declare_return_types
+    # - always_put_control_body_on_new_line # Allow return statements on same line as ifs
+    # - always_put_required_named_parameters_first # we prefer having parameters in the same order as fields https://github.com/flutter/flutter/issues/10219
+    - always_require_non_null_named_parameters
+    # - always_specify_types
+    # - always_use_package_imports # we do this commonly
+    - annotate_overrides
+    - avoid_bool_literals_in_conditional_expressions
+    - avoid_classes_with_only_static_members
+    - avoid_double_and_int_checks
+    - avoid_dynamic_calls
+    - avoid_empty_else
+    - avoid_equals_and_hash_code_on_mutable_classes
+    - avoid_escaping_inner_quotes
+    - avoid_field_initializers_in_const_classes
+    - avoid_function_literals_in_foreach_calls
+    - avoid_implementing_value_types
+    - avoid_init_to_null
+    - avoid_js_rounded_ints
+    - avoid_multiple_declarations_per_line
+    - avoid_null_checks_in_equality_operators
+    - avoid_positional_boolean_parameters
+    - avoid_print
+    # - avoid_private_typedef_functions # we prefer having typedef (discussion in https://github.com/flutter/flutter/pull/16356)
+    - avoid_redundant_argument_values
+    - avoid_relative_lib_imports
+    - avoid_renaming_method_parameters
+    - avoid_return_types_on_setters
+    - avoid_returning_null
+    - avoid_returning_null_for_future
+    - avoid_returning_null_for_void
+    - avoid_setters_without_getters
+    - avoid_shadowing_type_parameters
+    - avoid_single_cascade_in_expression_statements
+    - avoid_slow_async_io
+    - avoid_type_to_string
+    - avoid_types_as_parameter_names
+    - avoid_types_on_closure_parameters
+    - avoid_unnecessary_containers
+    - avoid_unused_constructor_parameters
+    - avoid_void_async
+    - await_only_futures
+    - camel_case_extensions
+    - camel_case_types
+    - cancel_subscriptions
+    - cast_nullable_to_non_nullable
+    - control_flow_in_finally
+    # - curly_braces_in_flow_control_structures
+    - depend_on_referenced_packages
+    - deprecated_consistency
+    - directives_ordering
+    - do_not_use_environment
+    - empty_catches
+    - empty_constructor_bodies
+    - empty_statements
+    - eol_at_end_of_file
+    - exhaustive_cases
+    - file_names
+    # - flutter_style_todos # This is mostly a single person project for the time being
+    - hash_and_equals
+    - implementation_imports
+    - iterable_contains_unrelated_type
+    - join_return_with_assignment
+    - leading_newlines_in_multiline_strings
+    - library_names
+    - library_prefixes
+    - library_private_types_in_public_api
+    # - lines_longer_than_80_chars
+    - list_remove_unrelated_type
+    - missing_whitespace_between_adjacent_strings
+    - no_adjacent_strings_in_list
+    - no_default_cases
+    - no_duplicate_case_values
+    - no_logic_in_create_state
+    # - non_constant_identifier_names # use API names for several variables
+    - noop_primitive_operations
+    - null_check_on_nullable_type_parameter
+    - null_closures
+    - only_throw_errors
+    - overridden_fields
+    - package_api_docs
+    - package_names
+    - package_prefixed_library_names
+    - prefer_adjacent_string_concatenation
+    - prefer_asserts_in_initializer_lists
+    - prefer_collection_literals
+    - prefer_conditional_assignment
+    - prefer_const_constructors
+    - prefer_const_constructors_in_immutables
+    - prefer_const_declarations
+    - prefer_const_literals_to_create_immutables
+    - prefer_contains
+    - prefer_equal_for_default_values
+    - prefer_final_fields
+    - prefer_final_in_for_each
+    - prefer_final_locals
+    # - prefer_final_parameters
+    - prefer_for_elements_to_map_fromIterable
+    - prefer_foreach
+    - prefer_function_declarations_over_variables
+    - prefer_generic_function_type_aliases
+    # - prefer_if_elements_to_conditional_expressions
+    - prefer_if_null_operators
+    - prefer_initializing_formals
+    - prefer_inlined_adds
+    - prefer_interpolation_to_compose_strings
+    - prefer_is_empty
+    - prefer_is_not_empty
+    - prefer_is_not_operator
+    - prefer_iterable_whereType
+    - prefer_null_aware_operators
+    - prefer_relative_imports
+    - prefer_single_quotes
+    - prefer_spread_collections
+    - prefer_typing_uninitialized_variables
+    - prefer_void_to_null
+    - provide_deprecation_message
+    - recursive_getters
+    - require_trailing_commas
+    - sized_box_for_whitespace
+    - slash_for_doc_comments
+    - sort_child_properties_last
+    # - sort_constructors_first
+    - sort_unnamed_constructors_first
+    - test_types_in_equals
+    - throw_in_finally
+    - tighten_type_of_initializing_formals
+    - type_init_formals
+    - unnecessary_await_in_return
+    - unnecessary_brace_in_string_interps
+    - unnecessary_const
+    - unnecessary_getters_setters
+    - unnecessary_new
+    - unnecessary_null_aware_assignments
+    - unnecessary_null_checks
+    - unnecessary_null_in_if_null_operators
+    - unnecessary_nullable_for_final_variable_declarations
+    - unnecessary_overrides
+    - unnecessary_parenthesis
+    - unnecessary_statements
+    - unnecessary_string_escapes
+    - unnecessary_string_interpolations
+    - unnecessary_this
+    - unrelated_type_equality_checks
+    - unsafe_html
+    - use_build_context_synchronously
+    - use_full_hex_values_for_flutter_colors
+    - use_function_type_syntax_for_parameters
+    - use_is_even_rather_than_modulo
+    - use_key_in_widget_constructors
+    - use_late_for_private_fields_and_variables
+    - use_named_constants
+    - use_raw_strings
+    - use_rethrow_when_possible
+    - use_setters_to_change_properties
+    - use_test_throws_matchers
+    - valid_regexps
+    - void_checks
+    

android/app/src/main/AndroidManifest.xml

@@ -8,7 +8,7 @@
     <application
         android:name="io.flutter.app.FlutterApplication"
         android:label="jisho_study_tool"
-        android:icon="@mipmap/ic_launcher">
+        android:icon="@mipmap/launcher_icon">
         <activity
             android:name=".MainActivity"
             android:launchMode="singleTop"
@@ -27,4 +27,5 @@
             android:name="flutterEmbedding"
             android:value="2" />
     </application>
+    <uses-permission android:name="android.permission.INTERNET"/>
 </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

@@ -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/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> -->
-</layer-list>
+    <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/values-night/styles.xml

@@ -0,0 +1,19 @@
+<?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">
+        <!-- Show a splash screen on the activity. Automatically removed when
+             Flutter draws its first frame -->
+        <item name="android:windowBackground">@drawable/launch_background</item>
+        <item name="android:windowFullscreen">false</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/build.gradle

@@ -1,12 +1,12 @@
 buildscript {
-    ext.kotlin_version = '1.3.50'
+    ext.kotlin_version = '1.5.0'
     repositories {
         google()
         jcenter()
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.5.0'
+        classpath 'com.android.tools.build:gradle:7.0.3'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
     }
 }

android/gradle/wrapper/gradle-wrapper.properties

@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.2-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-all.zip

assets/images/logo/src/logo_full.svg

@@ -0,0 +1,88 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   width="116.21878mm"
+   height="168.41707mm"
+   viewBox="0 0 116.21878 168.41707"
+   version="1.1"
+   id="svg5"
+   inkscape:version="1.1 (c4e8f9ed74, 2021-05-24)"
+   sodipodi:docname="logo.svg"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg">
+  <sodipodi:namedview
+     id="namedview7"
+     pagecolor="#505050"
+     bordercolor="#ffffff"
+     borderopacity="1"
+     inkscape:pageshadow="0"
+     inkscape:pageopacity="0"
+     inkscape:pagecheckerboard="1"
+     inkscape:document-units="mm"
+     showgrid="false"
+     inkscape:snap-bbox="true"
+     inkscape:snap-bbox-edge-midpoints="true"
+     inkscape:snap-bbox-midpoints="true"
+     inkscape:bbox-nodes="true"
+     inkscape:bbox-paths="true"
+     inkscape:zoom="0.53199738"
+     inkscape:cx="313.91132"
+     inkscape:cy="373.12214"
+     inkscape:window-width="1920"
+     inkscape:window-height="1040"
+     inkscape:window-x="0"
+     inkscape:window-y="40"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="layer1" />
+  <defs
+     id="defs2">
+    <rect
+       x="200.13075"
+       y="623.04645"
+       width="473.25778"
+       height="261.66223"
+       id="rect9216" />
+  </defs>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(-42.105021,-80.321739)">
+    <g
+       id="g38459"
+       transform="translate(-1.981914)">
+      <path
+         style="fill:#3edd00;fill-opacity:1;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         d="m 54.857656,80.331202 c 0,0 37.29506,0.0327 41.175585,-0.009 3.88052,-0.0417 8.759679,2.73803 8.746059,6.91875 -0.0136,4.18072 0.0381,59.881448 0.0381,59.881448 0,0 -1.15495,-6.96923 -10.211389,-6.96837 -9.056438,8.7e-4 -40.947893,0.0796 -40.947893,0.0796 z"
+         id="path1313"
+         sodipodi:nodetypes="czzczcc" />
+      <path
+         style="fill:#3edd00;fill-opacity:1;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         d="m 159.10617,80.331202 c 0,0 -37.29506,0.0327 -41.17558,-0.009 -3.88052,-0.0417 -8.75968,2.73803 -8.74606,6.91875 0.0136,4.18072 -0.0381,59.881448 -0.0381,59.881448 0,0 1.15495,-6.96923 10.21139,-6.96837 9.05643,8.7e-4 40.94789,0.0796 40.94789,0.0796 z"
+         id="path1313-5"
+         sodipodi:nodetypes="czzczcc" />
+    </g>
+    <g
+       id="g58222"
+       transform="matrix(1.0472356,0,0,1.0472356,-7.4785709,-12.201969)">
+      <path
+         style="fill:#5a5a5b;fill-opacity:1;stroke:none;stroke-width:0.782822px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         d="m 56.34787,234.5408 c -0.05858,3.83453 -6.693584,3.22552 -9.000748,2.54845 v 11.77361 c 0,0 6.050037,0.64772 8.989416,0.0651 3.850244,-0.76299 8.07,-1.80117 10.852598,-4.5695 1.825991,-1.81662 3.031513,-4.50415 3.035152,-7.10609 l 0.07989,-56.99147 c 0,-2.4019 -1.130194,-3.39771 -2.941302,-3.39771 -1.811109,0 -10.82162,-0.0237 -10.82162,-0.0237 0,0 -0.134621,53.86566 -0.193204,57.7002 z"
+         id="path38758"
+         sodipodi:nodetypes="zccaaszzczz" />
+      <path
+         style="fill:#5a5a5b;fill-opacity:1;stroke:none;stroke-width:0.782822px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         d="m 108.11434,192.24548 13.19136,-0.18107 c 0,0 -1.05395,-16.82423 -22.4507,-16.82423 -21.396781,0 -24.108399,9.77625 -24.108399,17.47804 0.03373,16.90655 34.137529,12.03505 33.890919,22.73722 -0.16184,4.64513 -3.25226,6.88638 -10.625601,6.94079 -10.148162,0 -11.076749,-8.66 -11.076749,-8.66 l -13.254529,-0.0737 c 0,0 1.140963,18.00336 24.160501,17.82398 23.019568,-0.1793 25.236938,-11.80584 25.141638,-18.91852 -0.26776,-20.41059 -32.692002,-8.85701 -34.030014,-22.69393 0.228411,-3.86856 2.091741,-5.44138 8.873879,-5.59706 10.718565,-0.27783 10.287695,7.96851 10.287695,7.96851 z"
+         id="path43833"
+         sodipodi:nodetypes="cczccccczccccc" />
+      <path
+         style="fill:#5a5a5b;fill-opacity:1;stroke:none;stroke-width:0.782822px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         d="m 125.51569,229.9507 v -53.79983 c -0.0852,-3.94995 -1.20339,-4.71895 -5.39279,-4.71895 H 56.595158 l -0.107401,-13.68673 101.836093,-0.3728 -0.16007,13.82911 -14.46247,0.17841 c -3.6821,0 -4.23233,1.6087 -4.23233,4.89922 v 53.5845 z"
+         id="path50119"
+         sodipodi:nodetypes="ccccccccccc" />
+    </g>
+  </g>
+</svg>

assets/images/logo/src/logo_icon.svg

@@ -0,0 +1,105 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   width="130.63339mm"
+   height="130.63339mm"
+   viewBox="0 0 130.63339 130.63339"
+   version="1.1"
+   id="svg5"
+   inkscape:version="1.1 (c4e8f9ed74, 2021-05-24)"
+   sodipodi:docname="logo_icon.svg"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg">
+  <sodipodi:namedview
+     id="namedview7"
+     pagecolor="#505050"
+     bordercolor="#ffffff"
+     borderopacity="1"
+     inkscape:pageshadow="0"
+     inkscape:pageopacity="0"
+     inkscape:pagecheckerboard="1"
+     inkscape:document-units="mm"
+     showgrid="false"
+     inkscape:snap-bbox="true"
+     inkscape:snap-bbox-edge-midpoints="true"
+     inkscape:snap-bbox-midpoints="true"
+     inkscape:bbox-nodes="true"
+     inkscape:bbox-paths="true"
+     inkscape:zoom="1.1848606"
+     inkscape:cx="138.8349"
+     inkscape:cy="252.77235"
+     inkscape:window-width="1920"
+     inkscape:window-height="1040"
+     inkscape:window-x="0"
+     inkscape:window-y="40"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="layer1" />
+  <defs
+     id="defs2">
+    <rect
+       x="200.13075"
+       y="623.04645"
+       width="473.25778"
+       height="261.66223"
+       id="rect9216" />
+    <filter
+       inkscape:collect="always"
+       style="color-interpolation-filters:sRGB"
+       id="filter4453"
+       x="-0.034027219"
+       y="-0.054324626"
+       width="1.0680544"
+       height="1.1086493">
+      <feGaussianBlur
+         inkscape:collect="always"
+         stdDeviation="1.5120504"
+         id="feGaussianBlur4455" />
+    </filter>
+  </defs>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(-34.897717,-99.213577)">
+    <rect
+       style="fill:#3edd00;fill-rule:evenodd;stroke:none;stroke-width:0.264583;-inkscape-stroke:none;stop-color:#000000;fill-opacity:1"
+       id="rect406"
+       width="130.63339"
+       height="130.63339"
+       x="34.897717"
+       y="99.213577" />
+    <g
+       id="g38459-5"
+       transform="translate(-7.0289917,58.213397)"
+       style="fill:#000000;fill-opacity:0.26982671;filter:url(#filter4453)">
+      <path
+         style="fill:#000000;fill-opacity:0.26982671;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         d="m 54.857656,80.331202 c 0,0 37.29506,0.0327 41.175585,-0.009 3.88052,-0.0417 8.759679,2.73803 8.746059,6.91875 -0.0136,4.18072 0.0381,59.881448 0.0381,59.881448 0,0 -1.15495,-6.96923 -10.211389,-6.96837 -9.056438,8.7e-4 -40.947893,0.0796 -40.947893,0.0796 z"
+         id="path1313-3"
+         sodipodi:nodetypes="czzczcc" />
+      <path
+         style="fill:#000000;fill-opacity:0.26982671;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         d="m 159.10617,80.331202 c 0,0 -37.29506,0.0327 -41.17558,-0.009 -3.88052,-0.0417 -8.75968,2.73803 -8.74606,6.91875 0.0136,4.18072 -0.0381,59.881448 -0.0381,59.881448 0,0 1.15495,-6.96923 10.21139,-6.96837 9.05643,8.7e-4 40.94789,0.0796 40.94789,0.0796 z"
+         id="path1313-5-5"
+         sodipodi:nodetypes="czzczcc" />
+    </g>
+    <g
+       id="g38459"
+       transform="translate(-6.7675027,50.808204)"
+       style="fill:#ffffff">
+      <path
+         style="fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         d="m 54.857656,80.331202 c 0,0 37.29506,0.0327 41.175585,-0.009 3.88052,-0.0417 8.759679,2.73803 8.746059,6.91875 -0.0136,4.18072 0.0381,59.881448 0.0381,59.881448 0,0 -1.15495,-6.96923 -10.211389,-6.96837 -9.056438,8.7e-4 -40.947893,0.0796 -40.947893,0.0796 z"
+         id="path1313"
+         sodipodi:nodetypes="czzczcc" />
+      <path
+         style="fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         d="m 159.10617,80.331202 c 0,0 -37.29506,0.0327 -41.17558,-0.009 -3.88052,-0.0417 -8.75968,2.73803 -8.74606,6.91875 0.0136,4.18072 -0.0381,59.881448 -0.0381,59.881448 0,0 1.15495,-6.96923 10.21139,-6.96837 9.05643,8.7e-4 40.94789,0.0796 40.94789,0.0796 z"
+         id="path1313-5"
+         sodipodi:nodetypes="czzczcc" />
+    </g>
+  </g>
+</svg>

assets/images/logo/src/logo_icon_transparent.svg

@@ -0,0 +1,101 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   width="131.84314mm"
+   height="90.09211mm"
+   viewBox="0 0 131.84314 90.092108"
+   version="1.1"
+   id="svg5"
+   inkscape:version="1.1 (c4e8f9ed74, 2021-05-24)"
+   sodipodi:docname="logo_icon_transparent.svg"
+   inkscape:export-filename="/home/h7x4/git/jishoStudyTool/assets/images/logo_icon_transparent.png"
+   inkscape:export-xdpi="96"
+   inkscape:export-ydpi="96"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg">
+  <sodipodi:namedview
+     id="namedview7"
+     pagecolor="#505050"
+     bordercolor="#ffffff"
+     borderopacity="1"
+     inkscape:pageshadow="0"
+     inkscape:pageopacity="0"
+     inkscape:pagecheckerboard="1"
+     inkscape:document-units="mm"
+     showgrid="false"
+     inkscape:snap-bbox="true"
+     inkscape:snap-bbox-edge-midpoints="true"
+     inkscape:snap-bbox-midpoints="true"
+     inkscape:bbox-nodes="true"
+     inkscape:bbox-paths="true"
+     inkscape:zoom="1.1848606"
+     inkscape:cx="142.21082"
+     inkscape:cy="155.71452"
+     inkscape:window-width="1920"
+     inkscape:window-height="1040"
+     inkscape:window-x="0"
+     inkscape:window-y="40"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="layer1" />
+  <defs
+     id="defs2">
+    <rect
+       x="200.13075"
+       y="623.04645"
+       width="473.25778"
+       height="261.66223"
+       id="rect9216" />
+    <filter
+       inkscape:collect="always"
+       style="color-interpolation-filters:sRGB"
+       id="filter4453"
+       x="-0.034027219"
+       y="-0.054324626"
+       width="1.0680544"
+       height="1.1086493">
+      <feGaussianBlur
+         inkscape:collect="always"
+         stdDeviation="1.5120504"
+         id="feGaussianBlur4455" />
+    </filter>
+  </defs>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(-34.031354,-125.00128)">
+    <g
+       id="g38459-5"
+       transform="matrix(1.1574789,0,0,1.1574789,-23.876386,40.601912)"
+       style="fill:#000000;fill-opacity:0.269827;filter:url(#filter4453)">
+      <path
+         style="fill:#000000;fill-opacity:0.269827;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         d="m 54.857656,80.331202 c 0,0 37.29506,0.0327 41.175585,-0.009 3.88052,-0.0417 8.759679,2.73803 8.746059,6.91875 -0.0136,4.18072 0.0381,59.881448 0.0381,59.881448 0,0 -1.15495,-6.96923 -10.211389,-6.96837 -9.056438,8.7e-4 -40.947893,0.0796 -40.947893,0.0796 z"
+         id="path1313-3"
+         sodipodi:nodetypes="czzczcc" />
+      <path
+         style="fill:#000000;fill-opacity:0.269827;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         d="m 159.10617,80.331202 c 0,0 -37.29506,0.0327 -41.17558,-0.009 -3.88052,-0.0417 -8.75968,2.73803 -8.74606,6.91875 0.0136,4.18072 -0.0381,59.881448 -0.0381,59.881448 0,0 1.15495,-6.96923 10.21139,-6.96837 9.05643,8.7e-4 40.94789,0.0796 40.94789,0.0796 z"
+         id="path1313-5-5"
+         sodipodi:nodetypes="czzczcc" />
+    </g>
+    <g
+       id="g38459"
+       transform="matrix(1.1574789,0,0,1.1574789,-23.573718,32.030558)"
+       style="fill:#ffffff">
+      <path
+         style="fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         d="m 54.857656,80.331202 c 0,0 37.29506,0.0327 41.175585,-0.009 3.88052,-0.0417 8.759679,2.73803 8.746059,6.91875 -0.0136,4.18072 0.0381,59.881448 0.0381,59.881448 0,0 -1.15495,-6.96923 -10.211389,-6.96837 -9.056438,8.7e-4 -40.947893,0.0796 -40.947893,0.0796 z"
+         id="path1313"
+         sodipodi:nodetypes="czzczcc" />
+      <path
+         style="fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         d="m 159.10617,80.331202 c 0,0 -37.29506,0.0327 -41.17558,-0.009 -3.88052,-0.0417 -8.75968,2.73803 -8.74606,6.91875 0.0136,4.18072 -0.0381,59.881448 -0.0381,59.881448 0,0 1.15495,-6.96923 10.21139,-6.96837 9.05643,8.7e-4 40.94789,0.0796 40.94789,0.0796 z"
+         id="path1313-5"
+         sodipodi:nodetypes="czzczcc" />
+    </g>
+  </g>
+</svg>

assets/images/logo/src/logo_icon_transparent_green.svg

@@ -0,0 +1,101 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   width="131.84314mm"
+   height="90.09211mm"
+   viewBox="0 0 131.84314 90.092108"
+   version="1.1"
+   id="svg5"
+   inkscape:version="1.1 (c4e8f9ed74, 2021-05-24)"
+   sodipodi:docname="green.svg"
+   inkscape:export-filename="/home/h7x4/git/jishoStudyTool/assets/images/logo_icon_transparent.png"
+   inkscape:export-xdpi="96"
+   inkscape:export-ydpi="96"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg">
+  <sodipodi:namedview
+     id="namedview7"
+     pagecolor="#505050"
+     bordercolor="#ffffff"
+     borderopacity="1"
+     inkscape:pageshadow="0"
+     inkscape:pageopacity="0"
+     inkscape:pagecheckerboard="1"
+     inkscape:document-units="mm"
+     showgrid="false"
+     inkscape:snap-bbox="true"
+     inkscape:snap-bbox-edge-midpoints="true"
+     inkscape:snap-bbox-midpoints="true"
+     inkscape:bbox-nodes="true"
+     inkscape:bbox-paths="true"
+     inkscape:zoom="1.1848606"
+     inkscape:cx="142.21082"
+     inkscape:cy="155.71452"
+     inkscape:window-width="1920"
+     inkscape:window-height="1040"
+     inkscape:window-x="0"
+     inkscape:window-y="40"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="layer1" />
+  <defs
+     id="defs2">
+    <rect
+       x="200.13075"
+       y="623.04645"
+       width="473.25778"
+       height="261.66223"
+       id="rect9216" />
+    <filter
+       inkscape:collect="always"
+       style="color-interpolation-filters:sRGB"
+       id="filter4453"
+       x="-0.034027219"
+       y="-0.054324626"
+       width="1.0680544"
+       height="1.1086493">
+      <feGaussianBlur
+         inkscape:collect="always"
+         stdDeviation="1.5120504"
+         id="feGaussianBlur4455" />
+    </filter>
+  </defs>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(-34.031354,-125.00128)">
+    <g
+       id="g38459-5"
+       transform="matrix(1.1574789,0,0,1.1574789,-23.876386,40.601912)"
+       style="fill:#000000;fill-opacity:0.269827;filter:url(#filter4453)">
+      <path
+         style="fill:#000000;fill-opacity:0.269827;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         d="m 54.857656,80.331202 c 0,0 37.29506,0.0327 41.175585,-0.009 3.88052,-0.0417 8.759679,2.73803 8.746059,6.91875 -0.0136,4.18072 0.0381,59.881448 0.0381,59.881448 0,0 -1.15495,-6.96923 -10.211389,-6.96837 -9.056438,8.7e-4 -40.947893,0.0796 -40.947893,0.0796 z"
+         id="path1313-3"
+         sodipodi:nodetypes="czzczcc" />
+      <path
+         style="fill:#000000;fill-opacity:0.269827;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         d="m 159.10617,80.331202 c 0,0 -37.29506,0.0327 -41.17558,-0.009 -3.88052,-0.0417 -8.75968,2.73803 -8.74606,6.91875 0.0136,4.18072 -0.0381,59.881448 -0.0381,59.881448 0,0 1.15495,-6.96923 10.21139,-6.96837 9.05643,8.7e-4 40.94789,0.0796 40.94789,0.0796 z"
+         id="path1313-5-5"
+         sodipodi:nodetypes="czzczcc" />
+    </g>
+    <g
+       id="g38459"
+       transform="matrix(1.1574789,0,0,1.1574789,-23.573718,32.030558)"
+       style="fill:#3edd00;fill-opacity:1">
+      <path
+         style="fill:#3edd00;fill-opacity:1;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         d="m 54.857656,80.331202 c 0,0 37.29506,0.0327 41.175585,-0.009 3.88052,-0.0417 8.759679,2.73803 8.746059,6.91875 -0.0136,4.18072 0.0381,59.881448 0.0381,59.881448 0,0 -1.15495,-6.96923 -10.211389,-6.96837 -9.056438,8.7e-4 -40.947893,0.0796 -40.947893,0.0796 z"
+         id="path1313"
+         sodipodi:nodetypes="czzczcc" />
+      <path
+         style="fill:#3edd00;fill-opacity:1;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         d="m 159.10617,80.331202 c 0,0 -37.29506,0.0327 -41.17558,-0.009 -3.88052,-0.0417 -8.75968,2.73803 -8.74606,6.91875 0.0136,4.18072 -0.0381,59.881448 -0.0381,59.881448 0,0 1.15495,-6.96923 10.21139,-6.96837 9.05643,8.7e-4 40.94789,0.0796 40.94789,0.0796 z"
+         id="path1313-5"
+         sodipodi:nodetypes="czzczcc" />
+    </g>
+  </g>
+</svg>

assets/licenses.json

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

assets/licenses/droid-fonts.txt

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

assets/licenses/noto-fonts.txt

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

flutter_native_splash.yaml

@@ -0,0 +1,76 @@
+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:
+  # flutter pub run flutter_native_splash:create
+  # To restore Flutter's default white splash screen, run the following command in the terminal:
+  # flutter pub run flutter_native_splash:remove
+
+  # 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: ""
+  
+  # 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.  
+  #image: assets/splash.png
+  image: "assets/images/logo/logo_icon_transparent.png"
+  image_dark: "assets/images/logo/logo_icon_transparent_green.png"
+
+  # The color_dark, background_image_dark, and image_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 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
+
+  # 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
+
+  # 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: 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
+
+  # To hide the notification bar, use the fullscreen parameter.  Has no affect 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.setEnabledSystemUIOverlays([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'
+
+  # To enable support for Android 12, set the following parameter to true.  Defaults to false.
+  #android12: true

ios/Runner.xcodeproj/project.pbxproj

@@ -515,4 +515,4 @@
 /* End XCConfigurationList section */
 	};
 	rootObject = 97C146E61CF9000F007C117D /* Project object */;
-}
+}

ios/Runner/Assets.xcassets/LaunchBackground.imageset/Contents.json

@@ -0,0 +1,52 @@
+{
+  "images" : [
+    {
+      "filename" : "background.png",
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "dark"
+        }
+      ],
+      "filename" : "darkbackground.png",
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "dark"
+        }
+      ],
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
+    },
+    {
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "dark"
+        }
+      ],
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

ios/Runner/Assets.xcassets/LaunchImage.imageset/Contents.json

@@ -1,23 +1,56 @@
 {
   "images" : [
     {
-      "idiom" : "universal",
       "filename" : "LaunchImage.png",
+      "idiom" : "universal",
       "scale" : "1x"
     },
     {
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "dark"
+        }
+      ],
+      "filename" : "LaunchImageDark.png",
       "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
       "filename" : "LaunchImage@2x.png",
+      "idiom" : "universal",
       "scale" : "2x"
     },
     {
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "dark"
+        }
+      ],
+      "filename" : "LaunchImageDark@2x.png",
       "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
       "filename" : "LaunchImage@3x.png",
+      "idiom" : "universal",
+      "scale" : "3x"
+    },
+    {
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "dark"
+        }
+      ],
+      "filename" : "LaunchImageDark@3x.png",
+      "idiom" : "universal",
       "scale" : "3x"
     }
   ],
   "info" : {
-    "version" : 1,
-    "author" : "xcode"
+    "author" : "xcode",
+    "version" : 1
   }
 }

ios/Runner/Base.lproj/LaunchScreen.storyboard

@@ -16,13 +16,19 @@
                     <view key="view" contentMode="scaleToFill" id="Ze5-6b-2t3">
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <subviews>
-                            <imageView opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" image="LaunchImage" translatesAutoresizingMaskIntoConstraints="NO" id="YRO-k0-Ey4">
-                            </imageView>
+                            <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleToFill" image="LaunchBackground" translatesAutoresizingMaskIntoConstraints="NO" id="tWc-Dq-wcI"/>
+                            <imageView opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" image="LaunchImage" translatesAutoresizingMaskIntoConstraints="NO" id="YRO-k0-Ey4"></imageView>
                         </subviews>
                         <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                         <constraints>
-                            <constraint firstItem="YRO-k0-Ey4" firstAttribute="centerX" secondItem="Ze5-6b-2t3" secondAttribute="centerX" id="1a2-6s-vTC"/>
-                            <constraint firstItem="YRO-k0-Ey4" firstAttribute="centerY" secondItem="Ze5-6b-2t3" secondAttribute="centerY" id="4X2-HB-R7a"/>
+                            <constraint firstItem="YRO-k0-Ey4" firstAttribute="leading" secondItem="Ze5-6b-2t3" secondAttribute="leading" id="3T2-ad-Qdv"/>
+                            <constraint firstItem="tWc-Dq-wcI" firstAttribute="bottom" secondItem="Ze5-6b-2t3" secondAttribute="bottom" id="RPx-PI-7Xg"/>
+                            <constraint firstItem="tWc-Dq-wcI" firstAttribute="top" secondItem="Ze5-6b-2t3" secondAttribute="top" id="SdS-ul-q2q"/>
+                            <constraint firstAttribute="trailing" secondItem="tWc-Dq-wcI" secondAttribute="trailing" id="Swv-Gf-Rwn"/>
+                            <constraint firstAttribute="trailing" secondItem="YRO-k0-Ey4" secondAttribute="trailing" id="TQA-XW-tRk"/>
+                            <constraint firstItem="YRO-k0-Ey4" firstAttribute="bottom" secondItem="Ze5-6b-2t3" secondAttribute="bottom" id="duK-uY-Gun"/>
+                            <constraint firstItem="tWc-Dq-wcI" firstAttribute="leading" secondItem="Ze5-6b-2t3" secondAttribute="leading" id="kV7-tw-vXt"/>
+                            <constraint firstItem="YRO-k0-Ey4" firstAttribute="top" secondItem="Ze5-6b-2t3" secondAttribute="top" id="xPn-NY-SIU"/>
                         </constraints>
                     </view>
                 </viewController>
@@ -32,6 +38,7 @@
         </scene>
     </scenes>
     <resources>
-        <image name="LaunchImage" width="168" height="185"/>
+        <image name="LaunchImage" width="498" height="341"/>
+        <image name="LaunchBackground" width="1" height="1"/>
     </resources>
-</document>
+</document>

ios/Runner/Info.plist

@@ -1,45 +1,47 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
-<dict>
-	<key>CFBundleDevelopmentRegion</key>
-	<string>$(DEVELOPMENT_LANGUAGE)</string>
-	<key>CFBundleExecutable</key>
-	<string>$(EXECUTABLE_NAME)</string>
-	<key>CFBundleIdentifier</key>
-	<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
-	<key>CFBundleInfoDictionaryVersion</key>
-	<string>6.0</string>
-	<key>CFBundleName</key>
-	<string>jisho_study_tool</string>
-	<key>CFBundlePackageType</key>
-	<string>APPL</string>
-	<key>CFBundleShortVersionString</key>
-	<string>$(FLUTTER_BUILD_NAME)</string>
-	<key>CFBundleSignature</key>
-	<string>????</string>
-	<key>CFBundleVersion</key>
-	<string>$(FLUTTER_BUILD_NUMBER)</string>
-	<key>LSRequiresIPhoneOS</key>
-	<true/>
-	<key>UILaunchStoryboardName</key>
-	<string>LaunchScreen</string>
-	<key>UIMainStoryboardFile</key>
-	<string>Main</string>
-	<key>UISupportedInterfaceOrientations</key>
-	<array>
-		<string>UIInterfaceOrientationPortrait</string>
-		<string>UIInterfaceOrientationLandscapeLeft</string>
-		<string>UIInterfaceOrientationLandscapeRight</string>
-	</array>
-	<key>UISupportedInterfaceOrientations~ipad</key>
-	<array>
-		<string>UIInterfaceOrientationPortrait</string>
-		<string>UIInterfaceOrientationPortraitUpsideDown</string>
-		<string>UIInterfaceOrientationLandscapeLeft</string>
-		<string>UIInterfaceOrientationLandscapeRight</string>
-	</array>
-	<key>UIViewControllerBasedStatusBarAppearance</key>
-	<false/>
-</dict>
-</plist>
+	<dict>
+		<key>CFBundleDevelopmentRegion</key>
+		<string>$(DEVELOPMENT_LANGUAGE)</string>
+		<key>CFBundleExecutable</key>
+		<string>$(EXECUTABLE_NAME)</string>
+		<key>CFBundleIdentifier</key>
+		<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
+		<key>CFBundleInfoDictionaryVersion</key>
+		<string>6.0</string>
+		<key>CFBundleName</key>
+		<string>jisho_study_tool</string>
+		<key>CFBundlePackageType</key>
+		<string>APPL</string>
+		<key>CFBundleShortVersionString</key>
+		<string>$(FLUTTER_BUILD_NAME)</string>
+		<key>CFBundleSignature</key>
+		<string>????</string>
+		<key>CFBundleVersion</key>
+		<string>$(FLUTTER_BUILD_NUMBER)</string>
+		<key>LSRequiresIPhoneOS</key>
+		<true/>
+		<key>UILaunchStoryboardName</key>
+		<string>LaunchScreen</string>
+		<key>UIMainStoryboardFile</key>
+		<string>Main</string>
+		<key>UISupportedInterfaceOrientations</key>
+		<array>
+			<string>UIInterfaceOrientationPortrait</string>
+			<string>UIInterfaceOrientationLandscapeLeft</string>
+			<string>UIInterfaceOrientationLandscapeRight</string>
+		</array>
+		<key>UISupportedInterfaceOrientations~ipad</key>
+		<array>
+			<string>UIInterfaceOrientationPortrait</string>
+			<string>UIInterfaceOrientationPortraitUpsideDown</string>
+			<string>UIInterfaceOrientationLandscapeLeft</string>
+			<string>UIInterfaceOrientationLandscapeRight</string>
+		</array>
+		<key>UIViewControllerBasedStatusBarAppearance</key>
+		<false/>
+		<key>UIStatusBarHidden</key>
+		<false/>
+	</dict>
+</plist>

lib/bloc/history/bloc/history_bloc.dart

@@ -1,18 +0,0 @@
-import 'dart:async';
-
-import 'package:bloc/bloc.dart';
-import 'package:meta/meta.dart';
-
-part 'history_event.dart';
-part 'history_state.dart';
-
-class HistoryBloc extends Bloc<HistoryEvent, HistoryState> {
-  HistoryBloc() : super(HistoryInitial());
-
-  @override
-  Stream<HistoryState> mapEventToState(
-    HistoryEvent event,
-  ) async* {
-    // TODO: implement mapEventToState
-  }
-}

lib/bloc/history/bloc/history_event.dart

@@ -1,4 +0,0 @@
-part of 'history_bloc.dart';
-
-@immutable
-abstract class HistoryEvent {}

lib/bloc/history/bloc/history_state.dart

@@ -1,6 +0,0 @@
-part of 'history_bloc.dart';
-
-@immutable
-abstract class HistoryState {}
-
-class HistoryInitial extends HistoryState {}

lib/bloc/kanji/kanji_bloc.dart

@@ -1,41 +0,0 @@
-import 'dart:async';
-
-import './kanji_event.dart';
-import './kanji_state.dart';
-
-import 'package:bloc/bloc.dart';
-import 'package:jisho_study_tool/services/kanji_search.dart';
-import 'package:jisho_study_tool/services/kanji_suggestions.dart';
-
-export './kanji_event.dart';
-export './kanji_state.dart';
-
-class KanjiBloc extends Bloc<KanjiEvent, KanjiState> {
-
-  KanjiBloc() : super(KanjiSearchInitial());
-
-  @override
-  Stream<KanjiState> mapEventToState(
-    KanjiEvent event,
-  ) async* {
-    if (event is GetKanji) {
-      
-      yield KanjiSearchLoading();
-
-      try {
-        final _kanji = await fetchKanji(event.kanjiSearchString);
-        if (_kanji.found) yield KanjiSearchFinished(kanji: _kanji);
-        else yield KanjiSearchError('Something went wrong');
-      } on Exception {
-        yield KanjiSearchError('Something went wrong');
-      }
-    } else if (event is GetKanjiSuggestions) {
-      
-      final suggestions = kanjiSuggestions(event.searchString);
-      yield KanjiSearchInput(suggestions);
-
-    } else if (event is ReturnToInitialState) {
-      yield KanjiSearchInitial();
-    }
-  }
-}

lib/bloc/kanji/kanji_event.dart

@@ -1,17 +0,0 @@
-abstract class KanjiEvent {
-  const KanjiEvent();
-}
-
-class GetKanjiSuggestions extends KanjiEvent {
-  final String searchString;
-  const GetKanjiSuggestions(this.searchString);
-}
-
-class GetKanji extends KanjiEvent {
-  final String kanjiSearchString;
-  const GetKanji(this.kanjiSearchString);
-}
-
-class ReturnToInitialState extends KanjiEvent {
-  const ReturnToInitialState();
-}

lib/bloc/kanji/kanji_state.dart

@@ -1,34 +0,0 @@
-import 'package:unofficial_jisho_api/api.dart';
-
-abstract class KanjiState {
-  const KanjiState();
-}
-
-class KanjiSearchInitial extends KanjiState {
-  const KanjiSearchInitial();
-}
-
-class KanjiSearchInput extends KanjiState {
-  final List<String> kanjiSuggestions;
-  const KanjiSearchInput(this.kanjiSuggestions);
-}
-
-class KanjiSearchLoading extends KanjiState {
-  const KanjiSearchLoading();
-}
-
-class KanjiSearchFinished extends KanjiState {
-  final KanjiResult kanji;
-  final bool starred;
-
-  const KanjiSearchFinished({
-    this.kanji, 
-    this.starred = false,
-  });
-}
-
-class KanjiSearchError extends KanjiState {
-  final String message;
-
-  const KanjiSearchError(this.message);
-}

lib/bloc/search/search_bloc.dart

@@ -1,18 +0,0 @@
-import 'dart:async';
-
-import 'package:bloc/bloc.dart';
-import 'package:meta/meta.dart';
-
-part 'search_event.dart';
-part 'search_state.dart';
-
-class SearchBloc extends Bloc<SearchEvent, SearchState> {
-  SearchBloc() : super(SearchInitial());
-
-  @override
-  Stream<SearchState> mapEventToState(
-    SearchEvent event,
-  ) async* {
-    // TODO: implement mapEventToState
-  }
-}

lib/bloc/search/search_event.dart

@@ -1,4 +0,0 @@
-part of 'search_bloc.dart';
-
-@immutable
-abstract class SearchEvent {}

lib/bloc/search/search_state.dart

@@ -1,14 +0,0 @@
-part of 'search_bloc.dart';
-
-@immutable
-abstract class SearchState {}
-
-class SearchInitial extends SearchState {}
-
-class SearchLoading extends SearchState {}
-
-class SearchFinished extends SearchState {}
-
-class SearchError extends SearchState {}
-
-class ReSearch extends SearchState {}

lib/bloc/theme/theme_bloc.dart

@@ -0,0 +1,31 @@
+import 'package:flutter/material.dart';
+import 'package:flutter/scheduler.dart';
+import 'package:flutter_bloc/flutter_bloc.dart';
+
+import '../../models/themes/theme.dart';
+import '../../settings.dart';
+
+export 'package:flutter_bloc/flutter_bloc.dart';
+export 'package:jisho_study_tool/models/themes/theme.dart';
+
+part 'theme_event.dart';
+part 'theme_state.dart';
+
+class ThemeBloc extends Bloc<ThemeEvent, ThemeState> {
+  ThemeBloc() : super(const LightThemeState()) {
+    on<SetTheme>(
+      (event, emit) => emit(
+        event.themeIsDark ? const DarkThemeState() : const LightThemeState(),
+      ),
+    );
+
+    final bool autoThemeIsDark =
+        SchedulerBinding.instance!.window.platformBrightness == Brightness.dark;
+
+    add(
+      SetTheme(
+        themeIsDark: autoThemeEnabled ? autoThemeIsDark : darkThemeEnabled,
+      ),
+    );
+  }
+}

lib/bloc/theme/theme_event.dart

@@ -0,0 +1,12 @@
+part of 'theme_bloc.dart';
+
+@immutable
+abstract class ThemeEvent {
+  const ThemeEvent();
+}
+
+class SetTheme extends ThemeEvent {
+  final bool themeIsDark;
+
+  const SetTheme({required this.themeIsDark});
+}

lib/bloc/theme/theme_state.dart

@@ -0,0 +1,22 @@
+part of 'theme_bloc.dart';
+
+@immutable
+abstract class ThemeState {
+  const ThemeState();
+
+  AppTheme get theme;
+}
+
+class LightThemeState extends ThemeState {
+  const LightThemeState();
+
+  @override
+  AppTheme get theme => const LightTheme();
+}
+
+class DarkThemeState extends ThemeState {
+  const DarkThemeState();
+
+  @override
+  AppTheme get theme => const DarkTheme();
+}

lib/components/common/denshi_jisho_background.dart

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

lib/components/common/loading.dart

@@ -1,12 +1,12 @@
 import 'package:flutter/material.dart';
 
 class LoadingScreen extends StatelessWidget {
+  const LoadingScreen({Key? key}) : super(key: key);
+
   @override
   Widget build(BuildContext context) {
-    return Container(
-      child: Center(
-        child: CircularProgressIndicator(),
-      ),
+    return const Center(
+      child: CircularProgressIndicator(),
     );
   }
 }

lib/components/common/opaque_box.dart

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

lib/components/common/splash.dart

@@ -0,0 +1,19 @@
+import 'package:flutter/material.dart';
+
+import '../../models/themes/theme.dart';
+
+class SplashScreen extends StatelessWidget {
+  const SplashScreen({Key? key}) : super(key: key);
+
+  @override
+  Widget build(BuildContext context) {
+    return Container(
+      decoration: BoxDecoration(color: AppTheme.jishoGreen.background),
+      child: const Center(
+        child: Image(
+          image: AssetImage('assets/images/logo/logo_icon_transparent.png'),
+        ),
+      ),
+    );
+  }
+}