WIP

.circleci/config.yml

@@ -1,88 +0,0 @@
-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

.envrc

@@ -0,0 +1 @@
+use flake

.gitignore

@@ -1,25 +1,3 @@
-# Miscellaneous
-*.class
-*.log
-*.pyc
-*.swp
-.DS_Store
-.atom/
-.buildlog/
-.history
-.svn/
-
-# IntelliJ related
-*.iml
-*.ipr
-*.iws
-.idea/
-
-# The .vscode folder contains launch configuration and tasks you configure in
-# VS Code which you may wish to be included in version control, so this line
-# is commented out by default.
-#.vscode/
-
 # Flutter/Dart/Pub related
 **/doc/api/
 **/ios/Flutter/.last_build_id
@@ -31,15 +9,6 @@
 .pub/
 /build/
 
-# Web related
-lib/generated_plugin_registrant.dart
-
-# Symbolication related
-app.*.symbols
-
-# Obfuscation related
-app.*.map.json
-
 # Android Studio will place build artifacts here
 /android/app/debug
 /android/app/profile
@@ -47,9 +16,9 @@ app.*.map.json
 
 # -----------------------------
 
-# Nix build result
+# Nix build results
 result
+result-*
 
-# The dev directory I'm using when moving files via adb
-android-data
-
+# Database files
+*.sqlite

.metadata

@@ -1,10 +0,0 @@
-# This file tracks properties of this Flutter project.
-# Used by Flutter tool to assess capabilities and perform upgrades etc.
-#
-# This file should be version controlled and should not be manually edited.
-
-version:
-  revision: 7e9793dee1b85a243edd0e06cb1658e98b077561
-  channel: stable
-
-project_type: app

README.md

@@ -1,77 +1,25 @@
-[![CircleCI Status][circleci-badge]][circleci]
+<h1>
+  <ruby>
+    麦
+    <rp>（</rp><rt>むぎ</rt><rp>）</rp>
+    典
+    <rp>（</rp><rt>てん</rt><rp>）</rp>
+  </ruby>
+  / Mugiten
+</h1>
 
-<p align="center">
-  <img src="assets/images/logo/logo_icon_transparent_green.png" width=100/>
-
-</p>
-
-# Jisho Study tool
-A japanese dictionary with features for making studying the language easier. For the time being, it's mostly a frontend for [Jisho.org][jisho]. It is still in beta, and will stay in beta for some time. Its main data source is the [unofficial_jisho_api][unofficial_jisho_api].
+A japanese dictionary as a study tool.
 
 ## Screenshots
 
 <p align="center">
-  <img src=".github/screenshots/search.png" width="250"/>
-  <img src=".github/screenshots/kanji_search.png" width="250"/> 
-  <img src=".github/screenshots/radical_search.png" width="250"/>
+  <img src="docs/images/search.png" width="250"/>
+  <img src="docs/images/kanji_search.png" width="250"/>
+  <img src="docs/images/radical_search.png" width="250"/>
 </p>
 
 <p align="center">
-  <img src=".github/screenshots/search_result.png" width="250"/>
-  <img src=".github/screenshots/kanji_result.png" width="250"/> 
-  <img src=".github/screenshots/draw_search.png" width="250"/>
+  <img src="docs/images/search_result.png" width="250"/>
+  <img src="docs/images/kanji_result.png" width="250"/>
+  <img src="docs/images/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

@@ -1,167 +1,28 @@
-analyzer:
-  exclude:
+# This file configures the analyzer, which statically analyzes Dart code to
+# check for errors, warnings, and lints.
+#
+# The issues identified by the analyzer are surfaced in the UI of Dart-enabled
+# IDEs (https://dart.dev/tools#ides-and-editors). The analyzer can also be
+# invoked from the command line by running `flutter analyze`.
+
+# 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
 
 linter:
+  # The lint rules applied to this project can be customized in the
+  # section below to disable rules from the `package:flutter_lints/flutter.yaml`
+  # included above or to enable additional rules. A list of all available lints
+  # and their documentation is published at https://dart.dev/lints.
+  #
+  # Instead of disabling a lint rule for the entire project in the
+  # section below, it can also be suppressed for a single line of code
+  # or a specific dart file by using the `// ignore: name_of_lint` and
+  # `// ignore_for_file: name_of_lint` syntax on the line or in the file
+  # producing the lint.
   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
-    
+    # avoid_print: false  # Uncomment to disable the `avoid_print` rule
+    # prefer_single_quotes: true  # Uncomment to enable the `prefer_single_quotes` rule
+
+# Additional information about this file can be found at
+# https://dart.dev/guides/language/analysis-options

android/.gitignore

@@ -7,7 +7,7 @@ gradle-wrapper.jar
 GeneratedPluginRegistrant.java
 
 # Remember to never publicly share your keystore.
-# See https://flutter.dev/docs/deployment/android#reference-the-keystore-from-the-app
+# See https://flutter.dev/to/reference-keystore
 key.properties
 **/*.keystore
 **/*.jks

android/app/build.gradle

@@ -1,69 +1,52 @@
-def localProperties = new Properties()
-def localPropertiesFile = rootProject.file('local.properties')
-if (localPropertiesFile.exists()) {
-    localPropertiesFile.withReader('UTF-8') { reader ->
-        localProperties.load(reader)
-    }
+plugins {
+    id "com.android.application"
+    id "kotlin-android"
+    // The Flutter Gradle Plugin must be applied after the Android and Kotlin Gradle plugins.
+    id "dev.flutter.flutter-gradle-plugin"
 }
 
-def flutterRoot = localProperties.getProperty('flutter.sdk')
-if (flutterRoot == null) {
-    throw new GradleException("Flutter SDK not found. Define location with flutter.sdk in the local.properties file.")
-}
-
-def flutterVersionCode = localProperties.getProperty('flutter.versionCode')
-if (flutterVersionCode == null) {
-    flutterVersionCode = '1'
-}
-
-def flutterVersionName = localProperties.getProperty('flutter.versionName')
-if (flutterVersionName == null) {
-    flutterVersionName = '1.0'
-}
-
-apply plugin: 'com.android.application'
-apply plugin: 'kotlin-android'
-apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle"
-
 android {
-    compileSdkVersion flutter.compileSdkVersion
+    namespace = "wtf.nani.mugiten"
+    compileSdk = flutter.compileSdkVersion
+    ndkVersion = flutter.ndkVersion
 
     compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_8
-        targetCompatibility JavaVersion.VERSION_1_8
+        sourceCompatibility = JavaVersion.VERSION_1_8
+        targetCompatibility = JavaVersion.VERSION_1_8
     }
 
     kotlinOptions {
-        jvmTarget = '1.8'
-    }
-
-    sourceSets {
-        main.java.srcDirs += 'src/main/kotlin'
+        jvmTarget = JavaVersion.VERSION_1_8
     }
 
     defaultConfig {
         // TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html).
-        applicationId "app.jishostudytool.jisho_study_tool"
-        // minSdkVersion flutter.minSdkVersion
-        minSdkVersion 19
-        targetSdkVersion flutter.targetSdkVersion
-        versionCode flutterVersionCode.toInteger()
-        versionName flutterVersionName
+        applicationId = "wtf.nani.mugiten"
+        // You can update the following values to match your application needs.
+        // For more information, see: https://flutter.dev/to/review-gradle-config.
+        minSdk = flutter.minSdkVersion
+        targetSdk = flutter.targetSdkVersion
+        versionCode = flutter.versionCode
+        versionName = flutter.versionName
+
+        resValue "string", "app_name", "Mugiten"
     }
 
     buildTypes {
         release {
             // TODO: Add your own signing config for the release build.
             // Signing with the debug keys for now, so `flutter run --release` works.
-            signingConfig signingConfigs.debug
+            signingConfig = signingConfigs.debug
+        }
+
+        debug {
+            applicationIdSuffix ".debug"
+            versionNameSuffix "-debug"
+            resValue "string", "app_name", "Mugiten Debug"
         }
     }
 }
 
 flutter {
-    source '../..'
-}
-
-dependencies {
-    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
+    source = "../.."
 }

android/app/src/debug/AndroidManifest.xml

@@ -1,10 +1,17 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="app.jishostudytool.jisho_study_tool">
-    <!-- Flutter needs it to communicate with the running application
+<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.WRITE_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,13 +1,13 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="app.jishostudytool.jisho_study_tool">
-   <application
-        android:label="Jisho Study Tool"
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
+    <application
+        android:label="@string/app_name"
         android:name="${applicationName}"
-        android:icon="@mipmap/launcher_icon">
+        android:icon="@mipmap/ic_launcher">
         <activity
             android:name=".MainActivity"
             android:exported="true"
             android:launchMode="singleTop"
+            android:taskAffinity=""
             android:theme="@style/LaunchTheme"
             android:configChanges="orientation|keyboardHidden|keyboard|screenSize|smallestScreenSize|locale|layoutDirection|fontScale|screenLayout|density|uiMode"
             android:hardwareAccelerated="true"
@@ -31,8 +31,23 @@
             android:name="flutterEmbedding"
             android:value="2" />
     </application>
+    <!-- Required to query activities that can process text, see:
+         https://developer.android.com/training/package-visibility and
+         https://developer.android.com/reference/android/content/Intent#ACTION_PROCESS_TEXT.
+
+         In particular, this is used by the Flutter engine in io.flutter.plugin.text.ProcessTextPlugin. -->
+    <queries>
+        <intent>
+            <action android:name="android.intent.action.PROCESS_TEXT"/>
+            <data android:mimeType="text/plain"/>
+        </intent>
+    </queries>
+
     <uses-permission android:name="android.permission.INTERNET"/>
-    <uses-permission android:name="android.permission.WRITE_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/java/io/flutter/app/FlutterMultiDexApplication.java

@@ -1,20 +0,0 @@
-// Generated file.
-// If you wish to remove Flutter's multidex support, delete this entire file.
-
-package io.flutter.app;
-
-import android.content.Context;
-import androidx.annotation.CallSuper;
-import androidx.multidex.MultiDex;
-
-/**
- * Extension of {@link io.flutter.app.FlutterApplication}, adding multidex support.
- */
-public class FlutterMultiDexApplication extends FlutterApplication {
-  @Override
-  @CallSuper
-  protected void attachBaseContext(Context base) {
-    super.attachBaseContext(base);
-    MultiDex.install(this);
-  }
-}

android/app/src/main/kotlin/app/jishostudytool/jisho_study_tool/MainActivity.kt

@@ -1,6 +0,0 @@
-package app.jishostudytool.jisho_study_tool
-
-import io.flutter.embedding.android.FlutterActivity
-
-class MainActivity: FlutterActivity() {
-}

android/app/src/main/kotlin/wtf/nani/mugiten/MainActivity.kt

@@ -0,0 +1,5 @@
+package wtf.nani.mugiten
+
+import io.flutter.embedding.android.FlutterActivity
+
+class MainActivity: FlutterActivity()

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

@@ -1,9 +0,0 @@
-<?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

@@ -1,9 +0,0 @@
-<?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,9 +1,12 @@
 <?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>
-        <bitmap android:gravity="fill" android:src="@drawable/background"/>
-    </item>
-    <item>
-        <bitmap android:gravity="center" android:src="@drawable/splash"/>
-    </item>
-</layer-list>
+    <item android:drawable="?android:colorBackground" />
+
+    <!-- You can insert your own image assets here -->
+    <!-- <item>
+        <bitmap
+            android:gravity="center"
+            android:src="@mipmap/launch_image" />
+    </item> -->
+</layer-list>

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

@@ -1,9 +1,12 @@
 <?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>
-        <bitmap android:gravity="fill" android:src="@drawable/background"/>
-    </item>
-    <item>
-        <bitmap android:gravity="center" android:src="@drawable/splash"/>
-    </item>
-</layer-list>
+    <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>

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

@@ -1,18 +0,0 @@
-<?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.Black.NoTitleBar">
-        <item name="android:forceDarkAllowed">false</item>
-        <item name="android:windowFullscreen">false</item>
-        <item name="android:windowSplashScreenBackground">#202020</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

@@ -3,10 +3,8 @@
     <!-- 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 -->
+             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>
     </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
@@ -17,4 +15,4 @@
     <style name="NormalTheme" parent="@android:style/Theme.Black.NoTitleBar">
         <item name="android:windowBackground">?android:colorBackground</item>
     </style>
-</resources>
+</resources>

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

@@ -1,18 +0,0 @@
-<?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:windowSplashScreenBackground">#3edd00</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/styles.xml

@@ -3,10 +3,8 @@
     <!-- 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">
         <!-- Show a splash screen on the activity. Automatically removed when
-             Flutter draws its first frame -->
+             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>
     </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
@@ -17,4 +15,4 @@
     <style name="NormalTheme" parent="@android:style/Theme.Light.NoTitleBar">
         <item name="android:windowBackground">?android:colorBackground</item>
     </style>
-</resources>
+</resources>

android/app/src/profile/AndroidManifest.xml

@@ -1,10 +1,7 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="app.jishostudytool.jisho_study_tool">
-    <!-- Flutter needs it to communicate with the running application
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
+    <!-- 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.WRITE_EXTERNAL_STORAGE" />
-    <uses-permission android:name="android.permission.READ_INTERNAL_STORAGE" />
-    <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE"/>
 </manifest>

android/build.gradle

@@ -1,16 +1,3 @@
-buildscript {
-    ext.kotlin_version = '1.6.10'
-    repositories {
-        google()
-        mavenCentral()
-    }
-
-    dependencies {
-        classpath 'com.android.tools.build:gradle:4.1.0'
-        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
-    }
-}
-
 allprojects {
     repositories {
         google()
@@ -18,14 +5,14 @@ allprojects {
     }
 }
 
-rootProject.buildDir = '../build'
+rootProject.buildDir = "../build"
 subprojects {
     project.buildDir = "${rootProject.buildDir}/${project.name}"
 }
 subprojects {
-    project.evaluationDependsOn(':app')
+    project.evaluationDependsOn(":app")
 }
 
-task clean(type: Delete) {
+tasks.register("clean", Delete) {
     delete rootProject.buildDir
 }

android/gradle.properties

@@ -1,3 +1,3 @@
-org.gradle.jvmargs=-Xmx1536M
+org.gradle.jvmargs=-Xmx4G -XX:MaxMetaspaceSize=2G -XX:+HeapDumpOnOutOfMemoryError
 android.useAndroidX=true
 android.enableJetifier=true

android/gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,5 @@
-#Fri Jun 23 08:50:38 CEST 2017
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.7-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.3-all.zip

android/settings.gradle

@@ -1,11 +1,25 @@
-include ':app'
+pluginManagement {
+    def flutterSdkPath = {
+        def properties = new Properties()
+        file("local.properties").withInputStream { properties.load(it) }
+        def flutterSdkPath = properties.getProperty("flutter.sdk")
+        assert flutterSdkPath != null, "flutter.sdk not set in local.properties"
+        return flutterSdkPath
+    }()
 
-def localPropertiesFile = new File(rootProject.projectDir, "local.properties")
-def properties = new Properties()
+    includeBuild("$flutterSdkPath/packages/flutter_tools/gradle")
 
-assert localPropertiesFile.exists()
-localPropertiesFile.withReader("UTF-8") { reader -> properties.load(reader) }
+    repositories {
+        google()
+        mavenCentral()
+        gradlePluginPortal()
+    }
+}
 
-def flutterSdkPath = properties.getProperty("flutter.sdk")
-assert flutterSdkPath != null, "flutter.sdk not set in local.properties"
-apply from: "$flutterSdkPath/packages/flutter_tools/gradle/app_plugin_loader.gradle"
+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
+}
+
+include ":app"

assets/images/logo/mugi.svg

@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   width="83.959915mm"
+   height="86.423279mm"
+   viewBox="0 0 83.959915 86.423279"
+   version="1.1"
+   id="svg1"
+   xml:space="preserve"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"><defs
+     id="defs1"><filter
+       style="color-interpolation-filters:sRGB"
+       id="filter29"
+       x="-0.030891813"
+       y="-0.026372997"
+       width="1.0806977"
+       height="1.0800704"><feFlood
+         result="flood"
+         in="SourceGraphic"
+         flood-opacity="0.635294"
+         flood-color="rgb(0,0,0)"
+         id="feFlood28" /><feGaussianBlur
+         result="blur"
+         in="SourceGraphic"
+         stdDeviation="1.000000"
+         id="feGaussianBlur28" /><feOffset
+         result="offset"
+         in="blur"
+         dx="1.469442"
+         dy="2.486583"
+         id="feOffset28" /><feComposite
+         result="comp1"
+         operator="in"
+         in="flood"
+         in2="offset"
+         id="feComposite28" /><feComposite
+         result="comp2"
+         operator="over"
+         in="SourceGraphic"
+         in2="comp1"
+         id="feComposite29" /></filter></defs><g
+     id="layer1"
+     transform="translate(-71.699268,-4.8907089)"><path
+       style="display:inline;fill:#ffe680;fill-opacity:1;filter:url(#filter29)"
+       d="m 80.301184,97.702012 c -1.457273,-1.69689 -1.470163,-4.799934 -0.0613,-14.750524 2.0346,-14.36976 5.18519,-16.68294 23.493586,-17.24914 l 5.25734,-0.16258 -0.19015,-3.72956 c -0.10459,-2.051256 -0.21993,-3.761127 -0.25631,-3.799714 -0.0364,-0.03859 -2.91194,0.105653 -6.39011,0.320533 -20.741826,1.281422 -22.842716,1.230936 -23.292149,-0.559727 -0.62337,-2.483711 1.412843,-2.848206 21.982719,-3.935052 4.21319,-0.222611 7.67734,-0.430251 7.69813,-0.461422 0.0208,-0.03117 0.17532,-1.059928 0.34343,-2.286127 0.68266,-4.979403 4.27414,-4.306652 4.27414,0.800627 0,1.509867 0.0985,1.561057 3.00487,1.561843 3.53017,9.54e-4 12.71449,0.43988 19.45876,0.929948 2.9689,0.215734 5.79663,0.392243 6.28385,0.392243 h 0.88586 l 4.1e-4,-1.124479 c 0.002,-5.978047 3.73823,-3.517883 3.92216,2.582715 0.40785,13.528362 -2.72438,15.371842 -23.61434,13.898282 -4.20928,-0.29692 -8.12641,-0.53985 -8.70473,-0.53985 h -1.05149 l 0.16538,2.3151 c 0.79769,11.16612 10.39165,17.81656 30.07636,20.84861 6.81496,1.04972 8.54881,1.87478 7.72756,3.677224 -1.18331,2.59708 -18.91832,-0.551852 -28.24427,-5.014904 -9.0616,-4.33655 -13.85887,-11.03693 -13.87453,-19.37863 l -0.005,-2.4474 h -3.66574 c -18.236756,0 -20.562146,2.21241 -21.972106,20.90462 -0.48968,6.491834 -1.65321,9.069924 -3.25277,7.207364 z M 138.9884,65.779458 c 2.32051,-1.08049 4.99323,-6.500502 3.21018,-6.50993 -0.1819,-9.62e-4 -2.53339,-0.171799 -5.22552,-0.379639 -4.81465,-0.371702 -13.93777,-0.83476 -20.30678,-1.030702 l -3.24114,-0.09971 v 3.888641 3.88864 l 7.34219,0.20052 c 4.0382,0.11029 8.29468,0.28993 9.45885,0.39921 4.63418,0.43499 7.294,0.32661 8.76222,-0.35703 z M 75.380944,46.556657 c -1.93629,-0.601761 -1.63421,-2.185774 0.605647,-3.175849 2.18913,-0.967649 12.772843,-1.813816 28.045839,-2.242263 3.05594,-0.08573 5.82414,-0.210389 6.15156,-0.277026 l 0.59531,-0.121158 v -3.169959 -3.169959 l -3.24114,4.44e-4 c -1.78263,2.44e-4 -6.43426,0.182727 -10.336936,0.405517 -14.97356,0.854784 -18.436503,0.65495 -18.436503,-1.063907 0,-2.432958 5.024433,-3.246868 23.698869,-3.838992 4.35536,-0.138098 8.00814,-0.254345 8.11728,-0.258325 0.10914,-0.004 0.19843,-1.614581 0.19843,-3.579112 v -3.571875 l -0.85989,8.84e-4 c -0.47294,4.87e-4 -3.5388,0.180758 -6.81302,0.400604 -23.780816,1.59675 -27.548879,0.21034 -26.586179,-9.782034 0.57959,-6.0157858 3.264683,-6.0233028 4.126933,-0.01155 1.00363,6.997427 1.18108,7.030798 27.949346,5.25599 l 2.18281,-0.144727 v -3.270517 c 0,-9.6315092 3.9781,-10.4501792 4.1883,-0.861928 l 0.0911,4.154428 1.10146,0.131831 c 1.79603,0.214961 16.38858,0.693602 20.68063,0.678332 6.63735,-0.02361 7.53448,-0.681412 8.06683,-5.914803 0.6592,-6.4805388 3.77768,-6.5060208 4.1638,-0.03402 0.60286,10.104706 -1.72403,10.832533 -30.55302,9.556679 l -3.50573,-0.15515 v 3.569869 c 0,1.963428 0.0893,3.571681 0.19844,3.573895 23.61498,0.479191 31.81614,1.538388 31.81614,4.10912 0,1.709173 -3.4866,1.908749 -18.4365,1.055315 -3.90268,-0.22279 -8.55431,-0.405273 -10.33694,-0.405517 l -3.24114,-4.44e-4 v 3.169959 3.169959 l 0.59531,0.121252 c 0.32742,0.06669 2.61938,0.191877 5.09323,0.278196 5.74154,0.200336 23.05139,1.135917 25.13542,1.358545 3.63489,0.388301 5.95312,1.41232 5.95312,2.629631 0,1.670016 -2.03662,1.918068 -10.9802,1.33734 -18.72887,-1.21611 -36.40928,-1.265022 -53.313546,-0.14749 -6.68717,0.442086 -11.176253,0.530578 -12.11503,0.238822 z"
+       id="path2"
+       transform="matrix(1,0,0,0.87927938,0,0.59040935)" /></g></svg>

assets/images/logo/src/logo_full.svg

@@ -1,88 +0,0 @@
-<?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

@@ -1,105 +0,0 @@
-<?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

@@ -1,101 +0,0 @@
-<?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

@@ -1,101 +0,0 @@
-<?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>

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.md

@@ -0,0 +1,17 @@
+# v0.1.0
+
+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.md

@@ -0,0 +1,13 @@
+# v0.2.0
+
+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.md

@@ -0,0 +1,34 @@
+# v0.3.0
+
+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.md

@@ -0,0 +1,10 @@
+# v0.3.1
+
+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.md

@@ -0,0 +1,22 @@
+# v0.4.0
+
+(TODO: add description)
+
+## New features ✨
+
+- Added infinite scroll for word search results.
+- Added infinite scroll for history view.
+- Added a bubble in the top bar of word search results to indicate how many times it has been searched before.
+
+## 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.
+
+## 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.

flake.lock

@@ -1,181 +1,23 @@
 {
   "nodes": {
-    "android-nixpkgs": {
-      "inputs": {
-        "devshell": "devshell",
-        "flake-utils": "flake-utils_2",
-        "nixpkgs": [
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1651782096,
-        "narHash": "sha256-rrj0HPwmDf6Q14sljnVf2hkMvc97rndgi4PJkFtpFPk=",
-        "owner": "tadfisher",
-        "repo": "android-nixpkgs",
-        "rev": "ccd2a8f58709ea3413fcb72769b2f62a98332215",
-        "type": "github"
-      },
-      "original": {
-        "owner": "tadfisher",
-        "repo": "android-nixpkgs",
-        "type": "github"
-      }
-    },
-    "devshell": {
-      "inputs": {
-        "flake-utils": "flake-utils",
-        "nixpkgs": "nixpkgs"
-      },
-      "locked": {
-        "lastModified": 1650900878,
-        "narHash": "sha256-qhNncMBSa9STnhiLfELEQpYC1L4GrYHNIzyCZ/pilsI=",
-        "owner": "numtide",
-        "repo": "devshell",
-        "rev": "d97df53b5ddaa1cfbea7cddbd207eb2634304733",
-        "type": "github"
-      },
-      "original": {
-        "owner": "numtide",
-        "repo": "devshell",
-        "type": "github"
-      }
-    },
-    "flake-utils": {
-      "locked": {
-        "lastModified": 1642700792,
-        "narHash": "sha256-XqHrk7hFb+zBvRg6Ghl+AZDq03ov6OshJLiSWOoX5es=",
-        "owner": "numtide",
-        "repo": "flake-utils",
-        "rev": "846b2ae0fc4cc943637d3d1def4454213e203cba",
-        "type": "github"
-      },
-      "original": {
-        "owner": "numtide",
-        "repo": "flake-utils",
-        "type": "github"
-      }
-    },
-    "flake-utils_2": {
-      "locked": {
-        "lastModified": 1649676176,
-        "narHash": "sha256-OWKJratjt2RW151VUlJPRALb7OU2S5s+f0vLj4o1bHM=",
-        "owner": "numtide",
-        "repo": "flake-utils",
-        "rev": "a4b154ebbdc88c8498a5c7b01589addc9e9cb678",
-        "type": "github"
-      },
-      "original": {
-        "owner": "numtide",
-        "repo": "flake-utils",
-        "type": "github"
-      }
-    },
-    "flake-utils_3": {
-      "locked": {
-        "lastModified": 1649676176,
-        "narHash": "sha256-OWKJratjt2RW151VUlJPRALb7OU2S5s+f0vLj4o1bHM=",
-        "owner": "numtide",
-        "repo": "flake-utils",
-        "rev": "a4b154ebbdc88c8498a5c7b01589addc9e9cb678",
-        "type": "github"
-      },
-      "original": {
-        "owner": "numtide",
-        "repo": "flake-utils",
-        "type": "github"
-      }
-    },
-    "flake-utils_4": {
-      "locked": {
-        "lastModified": 1649676176,
-        "narHash": "sha256-OWKJratjt2RW151VUlJPRALb7OU2S5s+f0vLj4o1bHM=",
-        "owner": "numtide",
-        "repo": "flake-utils",
-        "rev": "a4b154ebbdc88c8498a5c7b01589addc9e9cb678",
-        "type": "github"
-      },
-      "original": {
-        "owner": "numtide",
-        "repo": "flake-utils",
-        "type": "github"
-      }
-    },
-    "nix-dart": {
-      "inputs": {
-        "flake-utils": "flake-utils_4",
-        "nixpkgs": [
-          "nixpkgs"
-        ],
-        "pub2nix": "pub2nix"
-      },
-      "locked": {
-        "lastModified": 1651781526,
-        "narHash": "sha256-q01e+S69g4UDrMcEitaQOccr2aHeiJ+VEmPS94h/7WY=",
-        "owner": "tadfisher",
-        "repo": "nix-dart",
-        "rev": "71d2fda0f9590d5de917fb736dee312d9fef7e27",
-        "type": "github"
-      },
-      "original": {
-        "owner": "tadfisher",
-        "repo": "nix-dart",
-        "type": "github"
-      }
-    },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1643381941,
-        "narHash": "sha256-pHTwvnN4tTsEKkWlXQ8JMY423epos8wUOhthpwJjtpc=",
+        "lastModified": 1751792365,
+        "narHash": "sha256-J1kI6oAj25IG4EdVlg2hQz8NZTBNYvIS0l4wpr9KcUo=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "5efc8ca954272c4376ac929f4c5ffefcc20551d5",
-        "type": "github"
-      },
-      "original": {
-        "owner": "NixOS",
-        "ref": "nixpkgs-unstable",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
-    "nixpkgs_2": {
-      "locked": {
-        "lastModified": 1651743098,
-        "narHash": "sha256-NuQNu6yHh54li0kZffM59FRC5bWCJusygL4Cy+3O0fY=",
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "rev": "d4191fe35cbe52f755ef73009d4d37b9e002efa2",
+        "rev": "1fd8bada0b6117e6c7eb54aad5813023eed37ccb",
         "type": "github"
       },
       "original": {
         "id": "nixpkgs",
-        "ref": "nixos-21.11",
+        "ref": "nixos-unstable",
         "type": "indirect"
       }
     },
-    "pub2nix": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1594192744,
-        "narHash": "sha256-pDvcXSG1Mh2BpwkqAcNDJzcupV3pIAAtZJLfkiHMAz4=",
-        "owner": "paulyoung",
-        "repo": "pub2nix",
-        "rev": "0c7ecca590fcd1616db8c6468f799ffef36c85e9",
-        "type": "github"
-      },
-      "original": {
-        "owner": "paulyoung",
-        "repo": "pub2nix",
-        "type": "github"
-      }
-    },
     "root": {
       "inputs": {
-        "android-nixpkgs": "android-nixpkgs",
-        "flake-utils": "flake-utils_3",
-        "nix-dart": "nix-dart",
-        "nixpkgs": "nixpkgs_2"
+        "nixpkgs": "nixpkgs"
       }
     }
   },

flake.nix

@@ -1,116 +1,49 @@
 {
-  description = "A dictionary app for studying japanese";
+  inputs.nixpkgs.url = "nixpkgs/nixos-unstable";
+  outputs = { self, nixpkgs }: let
+    inherit (nixpkgs) lib;
+    systems = [
+      "x86_64-linux"
+      "aarch64-linux"
+      "x86_64-darwin"
+      "aarch64-darwin"
+    ];
 
-  inputs = {
-    nixpkgs.url = "nixpkgs/nixos-21.11";
-
-    flake-utils = {
-      url = "github:numtide/flake-utils";
-      inputs.nixpkgs.follows = "nixpkgs";
-    };
-
-    android-nixpkgs = {
-      url = "github:tadfisher/android-nixpkgs";
-      inputs.nixpkgs.follows = "nixpkgs";
-    };
-
-    nix-dart = {
-      url = "github:tadfisher/nix-dart";
-      inputs.nixpkgs.follows = "nixpkgs";
-    };
-
-    # nix-flutter = {
-    #   url = "path:/home/h7x4/git/flutter_linux_2.5.1-stable/flutter";
-    #   inputs.nixpkgs.follows = "nixpkgs";
-    # };
-  };
-
-  outputs = { self, nixpkgs, flake-utils, android-nixpkgs, nix-dart }:
-  let
-    system = "x86_64-linux";
-    pkgs = import nixpkgs {
-      inherit system;
-      config = {
-        android_sdk.accept_license = true;
-        allowUnfree = true;
+    forAllSystems = f: lib.genAttrs systems (system: let
+      pkgs = import nixpkgs {
+        inherit system;
+        config = {
+          android_sdk.accept_license = true;
+          allowUnfree = true;
+        };
       };
-    };
-
-    dartVersion = "2.14.2";
-    dartChannel = "stable";
-
-    flutterVersion = "2.5.1";
-    flutterChannel = "stable";
+      androidSdk = (pkgs.androidenv.composeAndroidPackages {
+        buildToolsVersions = [ "33.0.1" "34.0.0" ];
+        platformVersions = [ "35" "34" ];
+        abiVersions = [ "armeabi-v7a" "arm64-v8a" ];
+      }).androidsdk;
+    in f system pkgs androidSdk);
   in {
-
-    packages.${system} = {
-      android-sdk = android-nixpkgs.sdk.${system} (sdkPkgs: with sdkPkgs; [
-        cmdline-tools-latest
-        build-tools-32-0-0
-        build-tools-31-0-0
-        build-tools-30-0-2
-        build-tools-29-0-2
-        platform-tools
-        platforms-android-32
-        platforms-android-31
-        platforms-android-30
-        platforms-android-29
-        emulator
-      ]);
-
-      # dart = nix-dart.packages.${system}.dart;
-      dart = (pkgs.callPackage ./nix/dart.nix {});
-
-      inherit (pkgs.callPackage ./nix/flutter.nix { inherit (self.packages.${system}) dart; }) flutter;
-
-      # pub2nix-lock = nix-dart.packages.${system}.pub2nix-lock;
-    };
-
-    # apps.${system} = {
-    #   web-debug = {
-    #     type = "app";
-    #     program = "";
-    #   };
-    #   web-release = {
-    #     type = "app";
-    #     program = "";
-    #   };
-    #   apk-debug = {
-    #     type = "app";
-    #     program = "";
-    #   };
-    #   apk-release = {
-    #     type = "app";
-    #     program = "${self.packages.${system}.flutter}/bin/flutter run --release";
-    #   };
-    #   default = self.apps.${system}.apk-debug;
-    # };
-
-    devShell.${system} = let
-      inherit (pkgs) lcov google-chrome sqlite sqlite-web;
-      inherit (self.packages.${system}) android-sdk flutter dart;
-      inherit (nix-dart.packages.${system}) pub2nix-lock;
-      java = pkgs.jdk8;
-    in pkgs.mkShell rec {
-      ANDROID_JAVA_HOME="${java.home}";
-      ANDROID_SDK_ROOT = "${android-sdk}/share/android-sdk";
-      CHROME_EXECUTABLE = "${google-chrome}/bin/google-chrome-stable";
-      FLUTTER_SDK="${flutter}";
-      GRADLE_OPTS = "-Dorg.gradle.project.android.aapt2FromMavenOverride=${ANDROID_SDK_ROOT}/build-tools/32.0.0/aapt2";
-      JAVA_HOME="${ANDROID_JAVA_HOME}";
-      USE_CCACHE=0;
-
-      buildInputs = [
-        android-sdk
-        dart
-        flutter
-        google-chrome
-        java
-        lcov
-        pub2nix-lock
-        sqlite
-        sqlite-web
-      ];
-    };
+    devShells = forAllSystems (_: pkgs: androidSdk: {
+      default = let
+        flutter' = pkgs.flutter327;
+        jdk' = pkgs.jdk17;
+      in pkgs.mkShell {
+        packages = [
+          flutter'
+          pkgs.sqlite-interactive
+          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";
+          FLUTTER_SDK = "${flutter'}";
+          JAVA_HOME = "${jdk'}/lib/openjdk";
+          LIBSQLITE_PATH = "${pkgs.sqlite.out}/lib/libsqlite3.so";
+          JADB_PATH = "./assets/jadb.sqlite";
+        };
+      };
+    });
   };
 }

flutter_native_splash.yaml

@@ -1,76 +0,0 @@
-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/.gitignore

@@ -1,34 +0,0 @@
-**/dgph
-*.mode1v3
-*.mode2v3
-*.moved-aside
-*.pbxuser
-*.perspectivev3
-**/*sync/
-.sconsign.dblite
-.tags*
-**/.vagrant/
-**/DerivedData/
-Icon?
-**/Pods/
-**/.symlinks/
-profile
-xcuserdata
-**/.generated/
-Flutter/App.framework
-Flutter/Flutter.framework
-Flutter/Flutter.podspec
-Flutter/Generated.xcconfig
-Flutter/ephemeral/
-Flutter/app.flx
-Flutter/app.zip
-Flutter/flutter_assets/
-Flutter/flutter_export_environment.sh
-ServiceDefinitions.json
-Runner/GeneratedPluginRegistrant.*
-
-# Exceptions to above rules.
-!default.mode1v3
-!default.mode2v3
-!default.pbxuser
-!default.perspectivev3

ios/Flutter/AppFrameworkInfo.plist

@@ -1,26 +0,0 @@
-<?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>en</string>
-  <key>CFBundleExecutable</key>
-  <string>App</string>
-  <key>CFBundleIdentifier</key>
-  <string>io.flutter.flutter.app</string>
-  <key>CFBundleInfoDictionaryVersion</key>
-  <string>6.0</string>
-  <key>CFBundleName</key>
-  <string>App</string>
-  <key>CFBundlePackageType</key>
-  <string>FMWK</string>
-  <key>CFBundleShortVersionString</key>
-  <string>1.0</string>
-  <key>CFBundleSignature</key>
-  <string>????</string>
-  <key>CFBundleVersion</key>
-  <string>1.0</string>
-  <key>MinimumOSVersion</key>
-  <string>9.0</string>
-</dict>
-</plist>

ios/Flutter/Debug.xcconfig

@@ -1 +0,0 @@
-#include "Generated.xcconfig"

ios/Flutter/Release.xcconfig

@@ -1 +0,0 @@
-#include "Generated.xcconfig"

ios/Runner.xcodeproj/project.pbxproj

@@ -1,481 +0,0 @@
-// !$*UTF8*$!
-{
-	archiveVersion = 1;
-	classes = {
-	};
-	objectVersion = 50;
-	objects = {
-
-/* Begin PBXBuildFile section */
-		1498D2341E8E89220040F4C2 /* GeneratedPluginRegistrant.m in Sources */ = {isa = PBXBuildFile; fileRef = 1498D2331E8E89220040F4C2 /* GeneratedPluginRegistrant.m */; };
-		3B3967161E833CAA004F5970 /* AppFrameworkInfo.plist in Resources */ = {isa = PBXBuildFile; fileRef = 3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */; };
-		74858FAF1ED2DC5600515810 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 74858FAE1ED2DC5600515810 /* AppDelegate.swift */; };
-		97C146FC1CF9000F007C117D /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FA1CF9000F007C117D /* Main.storyboard */; };
-		97C146FE1CF9000F007C117D /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FD1CF9000F007C117D /* Assets.xcassets */; };
-		97C147011CF9000F007C117D /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FF1CF9000F007C117D /* LaunchScreen.storyboard */; };
-/* End PBXBuildFile section */
-
-/* Begin PBXCopyFilesBuildPhase section */
-		9705A1C41CF9048500538489 /* Embed Frameworks */ = {
-			isa = PBXCopyFilesBuildPhase;
-			buildActionMask = 2147483647;
-			dstPath = "";
-			dstSubfolderSpec = 10;
-			files = (
-			);
-			name = "Embed Frameworks";
-			runOnlyForDeploymentPostprocessing = 0;
-		};
-/* End PBXCopyFilesBuildPhase section */
-
-/* Begin PBXFileReference section */
-		1498D2321E8E86230040F4C2 /* GeneratedPluginRegistrant.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = GeneratedPluginRegistrant.h; sourceTree = "<group>"; };
-		1498D2331E8E89220040F4C2 /* GeneratedPluginRegistrant.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GeneratedPluginRegistrant.m; sourceTree = "<group>"; };
-		3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = AppFrameworkInfo.plist; path = Flutter/AppFrameworkInfo.plist; sourceTree = "<group>"; };
-		74858FAD1ED2DC5600515810 /* Runner-Bridging-Header.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "Runner-Bridging-Header.h"; sourceTree = "<group>"; };
-		74858FAE1ED2DC5600515810 /* AppDelegate.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = "<group>"; };
-		7AFA3C8E1D35360C0083082E /* Release.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; name = Release.xcconfig; path = Flutter/Release.xcconfig; sourceTree = "<group>"; };
-		9740EEB21CF90195004384FC /* Debug.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; name = Debug.xcconfig; path = Flutter/Debug.xcconfig; sourceTree = "<group>"; };
-		9740EEB31CF90195004384FC /* Generated.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; name = Generated.xcconfig; path = Flutter/Generated.xcconfig; sourceTree = "<group>"; };
-		97C146EE1CF9000F007C117D /* Runner.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = Runner.app; sourceTree = BUILT_PRODUCTS_DIR; };
-		97C146FB1CF9000F007C117D /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/Main.storyboard; sourceTree = "<group>"; };
-		97C146FD1CF9000F007C117D /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = "<group>"; };
-		97C147001CF9000F007C117D /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/LaunchScreen.storyboard; sourceTree = "<group>"; };
-		97C147021CF9000F007C117D /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
-/* End PBXFileReference section */
-
-/* Begin PBXFrameworksBuildPhase section */
-		97C146EB1CF9000F007C117D /* Frameworks */ = {
-			isa = PBXFrameworksBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
-/* End PBXFrameworksBuildPhase section */
-
-/* Begin PBXGroup section */
-		9740EEB11CF90186004384FC /* Flutter */ = {
-			isa = PBXGroup;
-			children = (
-				3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */,
-				9740EEB21CF90195004384FC /* Debug.xcconfig */,
-				7AFA3C8E1D35360C0083082E /* Release.xcconfig */,
-				9740EEB31CF90195004384FC /* Generated.xcconfig */,
-			);
-			name = Flutter;
-			sourceTree = "<group>";
-		};
-		97C146E51CF9000F007C117D = {
-			isa = PBXGroup;
-			children = (
-				9740EEB11CF90186004384FC /* Flutter */,
-				97C146F01CF9000F007C117D /* Runner */,
-				97C146EF1CF9000F007C117D /* Products */,
-			);
-			sourceTree = "<group>";
-		};
-		97C146EF1CF9000F007C117D /* Products */ = {
-			isa = PBXGroup;
-			children = (
-				97C146EE1CF9000F007C117D /* Runner.app */,
-			);
-			name = Products;
-			sourceTree = "<group>";
-		};
-		97C146F01CF9000F007C117D /* Runner */ = {
-			isa = PBXGroup;
-			children = (
-				97C146FA1CF9000F007C117D /* Main.storyboard */,
-				97C146FD1CF9000F007C117D /* Assets.xcassets */,
-				97C146FF1CF9000F007C117D /* LaunchScreen.storyboard */,
-				97C147021CF9000F007C117D /* Info.plist */,
-				1498D2321E8E86230040F4C2 /* GeneratedPluginRegistrant.h */,
-				1498D2331E8E89220040F4C2 /* GeneratedPluginRegistrant.m */,
-				74858FAE1ED2DC5600515810 /* AppDelegate.swift */,
-				74858FAD1ED2DC5600515810 /* Runner-Bridging-Header.h */,
-			);
-			path = Runner;
-			sourceTree = "<group>";
-		};
-/* End PBXGroup section */
-
-/* Begin PBXNativeTarget section */
-		97C146ED1CF9000F007C117D /* Runner */ = {
-			isa = PBXNativeTarget;
-			buildConfigurationList = 97C147051CF9000F007C117D /* Build configuration list for PBXNativeTarget "Runner" */;
-			buildPhases = (
-				9740EEB61CF901F6004384FC /* Run Script */,
-				97C146EA1CF9000F007C117D /* Sources */,
-				97C146EB1CF9000F007C117D /* Frameworks */,
-				97C146EC1CF9000F007C117D /* Resources */,
-				9705A1C41CF9048500538489 /* Embed Frameworks */,
-				3B06AD1E1E4923F5004D2608 /* Thin Binary */,
-			);
-			buildRules = (
-			);
-			dependencies = (
-			);
-			name = Runner;
-			productName = Runner;
-			productReference = 97C146EE1CF9000F007C117D /* Runner.app */;
-			productType = "com.apple.product-type.application";
-		};
-/* End PBXNativeTarget section */
-
-/* Begin PBXProject section */
-		97C146E61CF9000F007C117D /* Project object */ = {
-			isa = PBXProject;
-			attributes = {
-				LastUpgradeCheck = 1300;
-				ORGANIZATIONNAME = "";
-				TargetAttributes = {
-					97C146ED1CF9000F007C117D = {
-						CreatedOnToolsVersion = 7.3.1;
-						LastSwiftMigration = 1100;
-					};
-				};
-			};
-			buildConfigurationList = 97C146E91CF9000F007C117D /* Build configuration list for PBXProject "Runner" */;
-			compatibilityVersion = "Xcode 9.3";
-			developmentRegion = en;
-			hasScannedForEncodings = 0;
-			knownRegions = (
-				en,
-				Base,
-			);
-			mainGroup = 97C146E51CF9000F007C117D;
-			productRefGroup = 97C146EF1CF9000F007C117D /* Products */;
-			projectDirPath = "";
-			projectRoot = "";
-			targets = (
-				97C146ED1CF9000F007C117D /* Runner */,
-			);
-		};
-/* End PBXProject section */
-
-/* Begin PBXResourcesBuildPhase section */
-		97C146EC1CF9000F007C117D /* Resources */ = {
-			isa = PBXResourcesBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-				97C147011CF9000F007C117D /* LaunchScreen.storyboard in Resources */,
-				3B3967161E833CAA004F5970 /* AppFrameworkInfo.plist in Resources */,
-				97C146FE1CF9000F007C117D /* Assets.xcassets in Resources */,
-				97C146FC1CF9000F007C117D /* Main.storyboard in Resources */,
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
-/* End PBXResourcesBuildPhase section */
-
-/* Begin PBXShellScriptBuildPhase section */
-		3B06AD1E1E4923F5004D2608 /* Thin Binary */ = {
-			isa = PBXShellScriptBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-			);
-			inputPaths = (
-			);
-			name = "Thin Binary";
-			outputPaths = (
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-			shellPath = /bin/sh;
-			shellScript = "/bin/sh \"$FLUTTER_ROOT/packages/flutter_tools/bin/xcode_backend.sh\" embed_and_thin";
-		};
-		9740EEB61CF901F6004384FC /* Run Script */ = {
-			isa = PBXShellScriptBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-			);
-			inputPaths = (
-			);
-			name = "Run Script";
-			outputPaths = (
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-			shellPath = /bin/sh;
-			shellScript = "/bin/sh \"$FLUTTER_ROOT/packages/flutter_tools/bin/xcode_backend.sh\" build";
-		};
-/* End PBXShellScriptBuildPhase section */
-
-/* Begin PBXSourcesBuildPhase section */
-		97C146EA1CF9000F007C117D /* Sources */ = {
-			isa = PBXSourcesBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-				74858FAF1ED2DC5600515810 /* AppDelegate.swift in Sources */,
-				1498D2341E8E89220040F4C2 /* GeneratedPluginRegistrant.m in Sources */,
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
-/* End PBXSourcesBuildPhase section */
-
-/* Begin PBXVariantGroup section */
-		97C146FA1CF9000F007C117D /* Main.storyboard */ = {
-			isa = PBXVariantGroup;
-			children = (
-				97C146FB1CF9000F007C117D /* Base */,
-			);
-			name = Main.storyboard;
-			sourceTree = "<group>";
-		};
-		97C146FF1CF9000F007C117D /* LaunchScreen.storyboard */ = {
-			isa = PBXVariantGroup;
-			children = (
-				97C147001CF9000F007C117D /* Base */,
-			);
-			name = LaunchScreen.storyboard;
-			sourceTree = "<group>";
-		};
-/* End PBXVariantGroup section */
-
-/* Begin XCBuildConfiguration section */
-		249021D3217E4FDB00AE95B9 /* Profile */ = {
-			isa = XCBuildConfiguration;
-			buildSettings = {
-				ALWAYS_SEARCH_USER_PATHS = NO;
-				CLANG_ANALYZER_NONNULL = YES;
-				CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
-				CLANG_CXX_LIBRARY = "libc++";
-				CLANG_ENABLE_MODULES = YES;
-				CLANG_ENABLE_OBJC_ARC = YES;
-				CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
-				CLANG_WARN_BOOL_CONVERSION = YES;
-				CLANG_WARN_COMMA = YES;
-				CLANG_WARN_CONSTANT_CONVERSION = YES;
-				CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
-				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
-				CLANG_WARN_EMPTY_BODY = YES;
-				CLANG_WARN_ENUM_CONVERSION = YES;
-				CLANG_WARN_INFINITE_RECURSION = YES;
-				CLANG_WARN_INT_CONVERSION = YES;
-				CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
-				CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
-				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
-				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
-				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
-				CLANG_WARN_STRICT_PROTOTYPES = YES;
-				CLANG_WARN_SUSPICIOUS_MOVE = YES;
-				CLANG_WARN_UNREACHABLE_CODE = YES;
-				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
-				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
-				COPY_PHASE_STRIP = NO;
-				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
-				ENABLE_NS_ASSERTIONS = NO;
-				ENABLE_STRICT_OBJC_MSGSEND = YES;
-				GCC_C_LANGUAGE_STANDARD = gnu99;
-				GCC_NO_COMMON_BLOCKS = YES;
-				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
-				GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
-				GCC_WARN_UNDECLARED_SELECTOR = YES;
-				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
-				GCC_WARN_UNUSED_FUNCTION = YES;
-				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 9.0;
-				MTL_ENABLE_DEBUG_INFO = NO;
-				SDKROOT = iphoneos;
-				SUPPORTED_PLATFORMS = iphoneos;
-				TARGETED_DEVICE_FAMILY = "1,2";
-				VALIDATE_PRODUCT = YES;
-			};
-			name = Profile;
-		};
-		249021D4217E4FDB00AE95B9 /* Profile */ = {
-			isa = XCBuildConfiguration;
-			baseConfigurationReference = 7AFA3C8E1D35360C0083082E /* Release.xcconfig */;
-			buildSettings = {
-				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
-				CLANG_ENABLE_MODULES = YES;
-				CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)";
-				ENABLE_BITCODE = NO;
-				INFOPLIST_FILE = Runner/Info.plist;
-				LD_RUNPATH_SEARCH_PATHS = (
-					"$(inherited)",
-					"@executable_path/Frameworks",
-				);
-				PRODUCT_BUNDLE_IDENTIFIER = app.jishostudytool.jishoStudyTool;
-				PRODUCT_NAME = "$(TARGET_NAME)";
-				SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
-				SWIFT_VERSION = 5.0;
-				VERSIONING_SYSTEM = "apple-generic";
-			};
-			name = Profile;
-		};
-		97C147031CF9000F007C117D /* Debug */ = {
-			isa = XCBuildConfiguration;
-			buildSettings = {
-				ALWAYS_SEARCH_USER_PATHS = NO;
-				CLANG_ANALYZER_NONNULL = YES;
-				CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
-				CLANG_CXX_LIBRARY = "libc++";
-				CLANG_ENABLE_MODULES = YES;
-				CLANG_ENABLE_OBJC_ARC = YES;
-				CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
-				CLANG_WARN_BOOL_CONVERSION = YES;
-				CLANG_WARN_COMMA = YES;
-				CLANG_WARN_CONSTANT_CONVERSION = YES;
-				CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
-				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
-				CLANG_WARN_EMPTY_BODY = YES;
-				CLANG_WARN_ENUM_CONVERSION = YES;
-				CLANG_WARN_INFINITE_RECURSION = YES;
-				CLANG_WARN_INT_CONVERSION = YES;
-				CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
-				CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
-				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
-				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
-				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
-				CLANG_WARN_STRICT_PROTOTYPES = YES;
-				CLANG_WARN_SUSPICIOUS_MOVE = YES;
-				CLANG_WARN_UNREACHABLE_CODE = YES;
-				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
-				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
-				COPY_PHASE_STRIP = NO;
-				DEBUG_INFORMATION_FORMAT = dwarf;
-				ENABLE_STRICT_OBJC_MSGSEND = YES;
-				ENABLE_TESTABILITY = YES;
-				GCC_C_LANGUAGE_STANDARD = gnu99;
-				GCC_DYNAMIC_NO_PIC = NO;
-				GCC_NO_COMMON_BLOCKS = YES;
-				GCC_OPTIMIZATION_LEVEL = 0;
-				GCC_PREPROCESSOR_DEFINITIONS = (
-					"DEBUG=1",
-					"$(inherited)",
-				);
-				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
-				GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
-				GCC_WARN_UNDECLARED_SELECTOR = YES;
-				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
-				GCC_WARN_UNUSED_FUNCTION = YES;
-				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 9.0;
-				MTL_ENABLE_DEBUG_INFO = YES;
-				ONLY_ACTIVE_ARCH = YES;
-				SDKROOT = iphoneos;
-				TARGETED_DEVICE_FAMILY = "1,2";
-			};
-			name = Debug;
-		};
-		97C147041CF9000F007C117D /* Release */ = {
-			isa = XCBuildConfiguration;
-			buildSettings = {
-				ALWAYS_SEARCH_USER_PATHS = NO;
-				CLANG_ANALYZER_NONNULL = YES;
-				CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
-				CLANG_CXX_LIBRARY = "libc++";
-				CLANG_ENABLE_MODULES = YES;
-				CLANG_ENABLE_OBJC_ARC = YES;
-				CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
-				CLANG_WARN_BOOL_CONVERSION = YES;
-				CLANG_WARN_COMMA = YES;
-				CLANG_WARN_CONSTANT_CONVERSION = YES;
-				CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
-				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
-				CLANG_WARN_EMPTY_BODY = YES;
-				CLANG_WARN_ENUM_CONVERSION = YES;
-				CLANG_WARN_INFINITE_RECURSION = YES;
-				CLANG_WARN_INT_CONVERSION = YES;
-				CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
-				CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
-				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
-				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
-				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
-				CLANG_WARN_STRICT_PROTOTYPES = YES;
-				CLANG_WARN_SUSPICIOUS_MOVE = YES;
-				CLANG_WARN_UNREACHABLE_CODE = YES;
-				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
-				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
-				COPY_PHASE_STRIP = NO;
-				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
-				ENABLE_NS_ASSERTIONS = NO;
-				ENABLE_STRICT_OBJC_MSGSEND = YES;
-				GCC_C_LANGUAGE_STANDARD = gnu99;
-				GCC_NO_COMMON_BLOCKS = YES;
-				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
-				GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
-				GCC_WARN_UNDECLARED_SELECTOR = YES;
-				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
-				GCC_WARN_UNUSED_FUNCTION = YES;
-				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 9.0;
-				MTL_ENABLE_DEBUG_INFO = NO;
-				SDKROOT = iphoneos;
-				SUPPORTED_PLATFORMS = iphoneos;
-				SWIFT_COMPILATION_MODE = wholemodule;
-				SWIFT_OPTIMIZATION_LEVEL = "-O";
-				TARGETED_DEVICE_FAMILY = "1,2";
-				VALIDATE_PRODUCT = YES;
-			};
-			name = Release;
-		};
-		97C147061CF9000F007C117D /* Debug */ = {
-			isa = XCBuildConfiguration;
-			baseConfigurationReference = 9740EEB21CF90195004384FC /* Debug.xcconfig */;
-			buildSettings = {
-				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
-				CLANG_ENABLE_MODULES = YES;
-				CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)";
-				ENABLE_BITCODE = NO;
-				INFOPLIST_FILE = Runner/Info.plist;
-				LD_RUNPATH_SEARCH_PATHS = (
-					"$(inherited)",
-					"@executable_path/Frameworks",
-				);
-				PRODUCT_BUNDLE_IDENTIFIER = app.jishostudytool.jishoStudyTool;
-				PRODUCT_NAME = "$(TARGET_NAME)";
-				SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
-				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
-				SWIFT_VERSION = 5.0;
-				VERSIONING_SYSTEM = "apple-generic";
-			};
-			name = Debug;
-		};
-		97C147071CF9000F007C117D /* Release */ = {
-			isa = XCBuildConfiguration;
-			baseConfigurationReference = 7AFA3C8E1D35360C0083082E /* Release.xcconfig */;
-			buildSettings = {
-				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
-				CLANG_ENABLE_MODULES = YES;
-				CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)";
-				ENABLE_BITCODE = NO;
-				INFOPLIST_FILE = Runner/Info.plist;
-				LD_RUNPATH_SEARCH_PATHS = (
-					"$(inherited)",
-					"@executable_path/Frameworks",
-				);
-				PRODUCT_BUNDLE_IDENTIFIER = app.jishostudytool.jishoStudyTool;
-				PRODUCT_NAME = "$(TARGET_NAME)";
-				SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
-				SWIFT_VERSION = 5.0;
-				VERSIONING_SYSTEM = "apple-generic";
-			};
-			name = Release;
-		};
-/* End XCBuildConfiguration section */
-
-/* Begin XCConfigurationList section */
-		97C146E91CF9000F007C117D /* Build configuration list for PBXProject "Runner" */ = {
-			isa = XCConfigurationList;
-			buildConfigurations = (
-				97C147031CF9000F007C117D /* Debug */,
-				97C147041CF9000F007C117D /* Release */,
-				249021D3217E4FDB00AE95B9 /* Profile */,
-			);
-			defaultConfigurationIsVisible = 0;
-			defaultConfigurationName = Release;
-		};
-		97C147051CF9000F007C117D /* Build configuration list for PBXNativeTarget "Runner" */ = {
-			isa = XCConfigurationList;
-			buildConfigurations = (
-				97C147061CF9000F007C117D /* Debug */,
-				97C147071CF9000F007C117D /* Release */,
-				249021D4217E4FDB00AE95B9 /* Profile */,
-			);
-			defaultConfigurationIsVisible = 0;
-			defaultConfigurationName = Release;
-		};
-/* End XCConfigurationList section */
-	};
-	rootObject = 97C146E61CF9000F007C117D /* Project object */;
-}

ios/Runner.xcodeproj/project.xcworkspace/contents.xcworkspacedata

@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Workspace
-   version = "1.0">
-   <FileRef
-      location = "self:">
-   </FileRef>
-</Workspace>

ios/Runner.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist

@@ -1,8 +0,0 @@
-<?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>IDEDidComputeMac32BitWarning</key>
-	<true/>
-</dict>
-</plist>

ios/Runner.xcodeproj/project.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings

@@ -1,8 +0,0 @@
-<?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>PreviewsEnabled</key>
-	<false/>
-</dict>
-</plist>

ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme

@@ -1,87 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Scheme
-   LastUpgradeVersion = "1300"
-   version = "1.3">
-   <BuildAction
-      parallelizeBuildables = "YES"
-      buildImplicitDependencies = "YES">
-      <BuildActionEntries>
-         <BuildActionEntry
-            buildForTesting = "YES"
-            buildForRunning = "YES"
-            buildForProfiling = "YES"
-            buildForArchiving = "YES"
-            buildForAnalyzing = "YES">
-            <BuildableReference
-               BuildableIdentifier = "primary"
-               BlueprintIdentifier = "97C146ED1CF9000F007C117D"
-               BuildableName = "Runner.app"
-               BlueprintName = "Runner"
-               ReferencedContainer = "container:Runner.xcodeproj">
-            </BuildableReference>
-         </BuildActionEntry>
-      </BuildActionEntries>
-   </BuildAction>
-   <TestAction
-      buildConfiguration = "Debug"
-      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
-      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      shouldUseLaunchSchemeArgsEnv = "YES">
-      <MacroExpansion>
-         <BuildableReference
-            BuildableIdentifier = "primary"
-            BlueprintIdentifier = "97C146ED1CF9000F007C117D"
-            BuildableName = "Runner.app"
-            BlueprintName = "Runner"
-            ReferencedContainer = "container:Runner.xcodeproj">
-         </BuildableReference>
-      </MacroExpansion>
-      <Testables>
-      </Testables>
-   </TestAction>
-   <LaunchAction
-      buildConfiguration = "Debug"
-      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
-      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      launchStyle = "0"
-      useCustomWorkingDirectory = "NO"
-      ignoresPersistentStateOnLaunch = "NO"
-      debugDocumentVersioning = "YES"
-      debugServiceExtension = "internal"
-      allowLocationSimulation = "YES">
-      <BuildableProductRunnable
-         runnableDebuggingMode = "0">
-         <BuildableReference
-            BuildableIdentifier = "primary"
-            BlueprintIdentifier = "97C146ED1CF9000F007C117D"
-            BuildableName = "Runner.app"
-            BlueprintName = "Runner"
-            ReferencedContainer = "container:Runner.xcodeproj">
-         </BuildableReference>
-      </BuildableProductRunnable>
-   </LaunchAction>
-   <ProfileAction
-      buildConfiguration = "Profile"
-      shouldUseLaunchSchemeArgsEnv = "YES"
-      savedToolIdentifier = ""
-      useCustomWorkingDirectory = "NO"
-      debugDocumentVersioning = "YES">
-      <BuildableProductRunnable
-         runnableDebuggingMode = "0">
-         <BuildableReference
-            BuildableIdentifier = "primary"
-            BlueprintIdentifier = "97C146ED1CF9000F007C117D"
-            BuildableName = "Runner.app"
-            BlueprintName = "Runner"
-            ReferencedContainer = "container:Runner.xcodeproj">
-         </BuildableReference>
-      </BuildableProductRunnable>
-   </ProfileAction>
-   <AnalyzeAction
-      buildConfiguration = "Debug">
-   </AnalyzeAction>
-   <ArchiveAction
-      buildConfiguration = "Release"
-      revealArchiveInOrganizer = "YES">
-   </ArchiveAction>
-</Scheme>

ios/Runner.xcworkspace/contents.xcworkspacedata

@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Workspace
-   version = "1.0">
-   <FileRef
-      location = "group:Runner.xcodeproj">
-   </FileRef>
-</Workspace>

ios/Runner.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist

@@ -1,8 +0,0 @@
-<?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>IDEDidComputeMac32BitWarning</key>
-	<true/>
-</dict>
-</plist>

ios/Runner.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings

@@ -1,8 +0,0 @@
-<?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>PreviewsEnabled</key>
-	<false/>
-</dict>
-</plist>

ios/Runner/AppDelegate.swift

@@ -1,13 +0,0 @@
-import UIKit
-import Flutter
-
-@UIApplicationMain
-@objc class AppDelegate: FlutterAppDelegate {
-  override func application(
-    _ application: UIApplication,
-    didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey: Any]?
-  ) -> Bool {
-    GeneratedPluginRegistrant.register(with: self)
-    return super.application(application, didFinishLaunchingWithOptions: launchOptions)
-  }
-}

ios/Runner/Assets.xcassets/AppIcon.appiconset/Contents.json

@@ -1,122 +0,0 @@
-{
-  "images" : [
-    {
-      "size" : "20x20",
-      "idiom" : "iphone",
-      "filename" : "Icon-App-20x20@2x.png",
-      "scale" : "2x"
-    },
-    {
-      "size" : "20x20",
-      "idiom" : "iphone",
-      "filename" : "Icon-App-20x20@3x.png",
-      "scale" : "3x"
-    },
-    {
-      "size" : "29x29",
-      "idiom" : "iphone",
-      "filename" : "Icon-App-29x29@1x.png",
-      "scale" : "1x"
-    },
-    {
-      "size" : "29x29",
-      "idiom" : "iphone",
-      "filename" : "Icon-App-29x29@2x.png",
-      "scale" : "2x"
-    },
-    {
-      "size" : "29x29",
-      "idiom" : "iphone",
-      "filename" : "Icon-App-29x29@3x.png",
-      "scale" : "3x"
-    },
-    {
-      "size" : "40x40",
-      "idiom" : "iphone",
-      "filename" : "Icon-App-40x40@2x.png",
-      "scale" : "2x"
-    },
-    {
-      "size" : "40x40",
-      "idiom" : "iphone",
-      "filename" : "Icon-App-40x40@3x.png",
-      "scale" : "3x"
-    },
-    {
-      "size" : "60x60",
-      "idiom" : "iphone",
-      "filename" : "Icon-App-60x60@2x.png",
-      "scale" : "2x"
-    },
-    {
-      "size" : "60x60",
-      "idiom" : "iphone",
-      "filename" : "Icon-App-60x60@3x.png",
-      "scale" : "3x"
-    },
-    {
-      "size" : "20x20",
-      "idiom" : "ipad",
-      "filename" : "Icon-App-20x20@1x.png",
-      "scale" : "1x"
-    },
-    {
-      "size" : "20x20",
-      "idiom" : "ipad",
-      "filename" : "Icon-App-20x20@2x.png",
-      "scale" : "2x"
-    },
-    {
-      "size" : "29x29",
-      "idiom" : "ipad",
-      "filename" : "Icon-App-29x29@1x.png",
-      "scale" : "1x"
-    },
-    {
-      "size" : "29x29",
-      "idiom" : "ipad",
-      "filename" : "Icon-App-29x29@2x.png",
-      "scale" : "2x"
-    },
-    {
-      "size" : "40x40",
-      "idiom" : "ipad",
-      "filename" : "Icon-App-40x40@1x.png",
-      "scale" : "1x"
-    },
-    {
-      "size" : "40x40",
-      "idiom" : "ipad",
-      "filename" : "Icon-App-40x40@2x.png",
-      "scale" : "2x"
-    },
-    {
-      "size" : "76x76",
-      "idiom" : "ipad",
-      "filename" : "Icon-App-76x76@1x.png",
-      "scale" : "1x"
-    },
-    {
-      "size" : "76x76",
-      "idiom" : "ipad",
-      "filename" : "Icon-App-76x76@2x.png",
-      "scale" : "2x"
-    },
-    {
-      "size" : "83.5x83.5",
-      "idiom" : "ipad",
-      "filename" : "Icon-App-83.5x83.5@2x.png",
-      "scale" : "2x"
-    },
-    {
-      "size" : "1024x1024",
-      "idiom" : "ios-marketing",
-      "filename" : "Icon-App-1024x1024@1x.png",
-      "scale" : "1x"
-    }
-  ],
-  "info" : {
-    "version" : 1,
-    "author" : "xcode"
-  }
-}