Merge pull request #28 from aeri/wip

preparing version 1.6.0

Author: NAVAL

android/app/build.gradle

@@ -31,7 +31,7 @@ if (keystorePropertiesFile.exists()) {
 android {
 
 
-    compileSdkVersion 28
+    compileSdkVersion 29
 
     lintOptions {
         disable 'InvalidPackage'
@@ -40,7 +40,7 @@ android {
     defaultConfig {
         applicationId "com.LAPARCELA.nihonoari"
         minSdkVersion 16
-        targetSdkVersion 28
+        targetSdkVersion 29
         versionCode flutterVersionCode.toInteger()
         versionName flutterVersionName
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"

android/app/src/main/AndroidManifest.xml

@@ -5,9 +5,10 @@
          flutter 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.INTERNET"/>
 
     -->
+
   <!-- io.flutter.app.FlutterApplication is an android.app.Application that
        calls FlutterMain.startInitialization(this); in its onCreate method.
        In most cases you can leave this as-is, but you if you want to provide
@@ -18,7 +19,7 @@
         android:label="@string/app_name"
         android:icon="@mipmap/ic_launcher">
         <activity
-            android:name=".MainActivity"
+            android:name="io.flutter.embedding.android.FlutterActivity"
             android:launchMode="singleTop"
             android:theme="@style/LaunchTheme"
             android:configChanges="orientation|keyboardHidden|keyboard|screenSize|locale|layoutDirection|fontScale|screenLayout|density"
@@ -29,13 +30,15 @@
                  until Flutter renders its first frame. It can be removed if
                  there is no splash screen (such as the default splash screen
                  defined in @style/LaunchTheme). -->
-            <meta-data
-                android:name="io.flutter.app.android.SplashScreenUntilFirstFrame"
-                android:value="true" />
+
+
             <intent-filter>
                 <action android:name="android.intent.action.MAIN"/>
                 <category android:name="android.intent.category.LAUNCHER"/>
             </intent-filter>
         </activity>
+        <meta-data
+            android:name="flutterEmbedding"
+            android:value="2" />
     </application>
 </manifest>

android/app/src/main/java/co/appbrewery/quizzler/MainActivity.java

@@ -1,25 +1,18 @@
 package io.flutter.plugins;
 
-import io.flutter.plugin.common.PluginRegistry;
-import io.flutter.plugins.sharedpreferences.SharedPreferencesPlugin;
+import androidx.annotation.Keep;
+import androidx.annotation.NonNull;
+
+import io.flutter.embedding.engine.FlutterEngine;
 
 /**
  * Generated file. Do not edit.
+ * This file is generated by the Flutter tool based on the
+ * plugins that support the Android platform.
  */
+@Keep
 public final class GeneratedPluginRegistrant {
-  public static void registerWith(PluginRegistry registry) {
-    if (alreadyRegisteredWith(registry)) {
-      return;
-    }
-    SharedPreferencesPlugin.registerWith(registry.registrarFor("io.flutter.plugins.sharedpreferences.SharedPreferencesPlugin"));
-  }
-
-  private static boolean alreadyRegisteredWith(PluginRegistry registry) {
-    final String key = GeneratedPluginRegistrant.class.getCanonicalName();
-    if (registry.hasPlugin(key)) {
-      return true;
-    }
-    registry.registrarFor(key);
-    return false;
+  public static void registerWith(@NonNull FlutterEngine flutterEngine) {
+    flutterEngine.getPlugins().add(new io.flutter.plugins.sharedpreferences.SharedPreferencesPlugin());
   }
 }

android/app/src/main/java/io/flutter/plugins/GeneratedPluginRegistrant.java

@@ -0,0 +1,3 @@
+* Дададзена функцыя зваротнага тэставання (Rōmaji -> Kana)
+* Выпраўленая віктарына пасля вяртання ў меню
+* Нязначныя змены ў карыстальніцкім інтэрфейсе

assets/MPLUS1p-Black.ttf

@@ -0,0 +1,3 @@
+* Added reverse function (Rōmaji to Kana)
+* Fixed quiz after back to main menu
+* Minor UI changes

assets/MPLUS1p-Bold.ttf

@@ -0,0 +1,3 @@
+* Añadida la función de test inverso (Rōmaji a Kana)
+* Arreglado el cuestionario tras volver al menú principal
+* Cambios menores en la interfaz de usuario

assets/MPLUS1p-ExtraBold.ttf

@@ -0,0 +1,3 @@
+* Ajout de la fonction de test inversé (Rōmaji -> Kana)
+* Amélioration du questionnaire après le passage au menu
+* Changements mineurs dans l'interface utilisateur

assets/MPLUS1p-Light.ttf

@@ -0,0 +1,3 @@
+* Добавлена функция обратного теста (Rōmaji -> Kana)
+* Исправлена викторина после возврата в меню
+* Незначительные изменения пользовательского интерфейса

assets/MPLUS1p-Medium.ttf

@@ -0,0 +1,3 @@
+* Додана функція зворотного тестування (Rōmaji -> Kana)
+* Виправлена ​​вікторина після повернення до меню
+* Незначні зміни в інтерфейсі користувача

assets/MPLUS1p-Regular.ttf

@@ -14,5 +14,9 @@
   "quiz_enter": "Увядзіце рамаджы",
   "quiz_correct": "Правільны адказ",
   "quiz_stoptit" : "Спыніць тэст",
-  "quiz_stopmes" : "Вярнуцца ў галоўнае меню?"
-}
+  "quiz_stopmes" : "Вярнуцца ў галоўнае меню?",
+  "main_rset" : "Reverse",
+  "main_reverse" : "Паказаць rōmaji/Enter Kana",
+  "quiz_enter_hira" : "Увядзіце Хіраганы",
+  "quiz_enter_kata" : "Увядзіце Катаканы"
+}

assets/MPLUS1p-Thin.ttf

@@ -14,5 +14,9 @@
   "quiz_enter": "Input rōmaji",
   "quiz_correct": "Correct answer",
   "quiz_stoptit" : "Stop quiz",
-  "quiz_stopmes" : "Return to the main menu?"
+  "quiz_stopmes" : "Return to the main menu?",
+  "main_rset" : "Reverse",
+  "main_reverse" : "Show rōmaji/Enter Kana",
+  "quiz_enter_hira" : "Input hiragana",
+  "quiz_enter_kata" : "Input katakana"
 }

assets/apple-tp_bold.ttf

@@ -14,5 +14,9 @@
   "quiz_enter": "Escribe rōmaji",
   "quiz_correct": "Respuesta correcta",
   "quiz_stoptit" : "Detener prueba",
-  "quiz_stopmes" : "¿Volver al menú principal?"
+  "quiz_stopmes" : "¿Volver al menú principal?",
+  "main_rset" : "Inversa",
+  "main_reverse" : "Muestra rōmaji/Introduce Kana",
+  "quiz_enter_hira" : "Escribe hiragana",
+  "quiz_enter_kata" : "Escribe katakana"
 }

assets/apple-tp_extrathin.ttf

@@ -14,5 +14,9 @@
   "quiz_enter": "Écris rōmaji",
   "quiz_correct": "Réponse correcte",
   "quiz_stoptit" : "Arrêter le test",
-  "quiz_stopmes" : "Retour au menu principal?"
+  "quiz_stopmes" : "Retour au menu principal?",
+  "main_rset" : "Investi",
+  "main_reverse" : "Montrer rōmaji/Écris Kana",
+  "quiz_enter_hira" : "Écris hiragana",
+  "quiz_enter_kata" : "Écris katakana"
 }

assets/apple-tp_medium.ttf

@@ -14,5 +14,9 @@
   "quiz_enter": "Введите ромадзи",
   "quiz_correct": "Верный ответ",
   "quiz_stoptit" : "Остановить тест",
-  "quiz_stopmes" : "Вернуться в главное меню?"
+  "quiz_stopmes" : "Вернуться в главное меню?",
+  "main_rset" : "Задний ход",
+  "main_reverse" : "Покажи ромаджи/Введите Кана",
+  "quiz_enter_hira" : "Введите Хираганы",
+  "quiz_enter_kata" : "Введите Катаканы"
 }

assets/apple-tp_semibold.ttf

@@ -14,5 +14,10 @@
   "quiz_enter": "Введіть ромадзі",
   "quiz_correct": "Правильна відповідь",
   "quiz_stoptit" : "Зупинити тест",
-  "quiz_stopmes" : "Повернутися в головне меню?"
+  "quiz_stopmes" : "Повернутися в головне меню?",
+  "main_reverse" : "Reverse",
+  "main_rset" : "Reverse",
+  "main_reverse" : "Покажи ромадзі/Введіть Кана",
+  "quiz_enter_hira" : "Введіть Хіраґани",
+  "quiz_enter_kata" : "Введіть Катакани"
 }

assets/apple-tp_text.ttf

@@ -21,9 +21,12 @@ class Question{
 
   String question;
   String answer;
+  String type;
 
-  Question(String q, String a) {
+
+  Question(String q, String a, String t) {
     question = q;
     answer = a;
+    type = t;
   }
 }

assets/apple-tp_thin.ttf

@@ -0,0 +1,35 @@
+import 'package:flutter/cupertino.dart';
+import 'package:flutter/material.dart';
+
+class IconCreator extends StatelessWidget {
+
+  IconCreator(this.icon);
+
+  final String icon;
+
+  @override
+  Widget build(BuildContext context) {
+    return new Container(
+      decoration: new BoxDecoration(
+        color: Colors.white,
+        borderRadius: new BorderRadius.circular(4.0),
+      ),
+      padding: EdgeInsets.symmetric(vertical: 1, horizontal: 1),
+      //padding: new EdgeInsets.all(4.0),
+      height: 25.0,
+      width: 25.0,
+      child: Align(
+        alignment: Alignment.center,
+        child: new Text(
+          icon,
+          style: new TextStyle(
+            fontSize: 16.0,
+            fontFamily: "MP1P_BOLD",
+            fontStyle: FontStyle.normal,
+            color: Colors.black,
+          ),
+        ),
+      ),
+    );
+  }
+}