Add vocabulary quizz

app/src/main/java/com/xwilarg/yousei/HiraganaLearning.kt

@@ -4,9 +4,9 @@ import com.google.gson.Gson
 import kotlin.random.Random
 import com.google.gson.reflect.TypeToken
 
-class HiraganaLearning() : ILearning {
+class HiraganaLearning : ILearning {
 
-    constructor(content: String) : this() {
+    constructor(content: String) {
         hiraganas = Gson().fromJson(content, object : TypeToken<Map<String, String>>() {}.type)
     }
 

app/src/main/java/com/xwilarg/yousei/KanjiLearning.kt

@@ -3,9 +3,9 @@ package com.xwilarg.yousei
 import com.google.gson.Gson
 import kotlin.random.Random
 
-class KanjiLearning() : ILearning {
+class KanjiLearning : ILearning {
 
-    constructor(content: String) : this() {
+    constructor(content: String) {
         kanjis = Gson().fromJson(content, Array<KanjiInfo>::class.java)
     }
 

app/src/main/java/com/xwilarg/yousei/LearningType.kt

@@ -2,5 +2,6 @@ package com.xwilarg.yousei
 
 enum class LearningType {
     HIRAGANA,
-    KANJI
+    KANJI,
+    VOCABULARY
 }

app/src/main/java/com/xwilarg/yousei/MainActivity.kt

@@ -34,4 +34,16 @@ class MainActivity : AppCompatActivity() {
         intent.putExtra("LEARNING_TYPE", LearningType.KANJI)
         startActivity(intent)
     }
+
+    fun startGameFreeVocabulary(view: View) {
+        var intent = Intent(this, QuizzNormalActivity::class.java)
+        intent.putExtra("LEARNING_TYPE", LearningType.VOCABULARY)
+        startActivity(intent)
+    }
+
+    fun startGameChoicesVocabulary(view: View) {
+        var intent = Intent(this, QuizzChoicesActivity::class.java)
+        intent.putExtra("LEARNING_TYPE", LearningType.VOCABULARY)
+        startActivity(intent)
+    }
 }

app/src/main/java/com/xwilarg/yousei/QuizzCommon.kt

@@ -15,7 +15,9 @@ open class QuizzCommon : AppCompatActivity() {
 
     fun preload() {
         learning = if (intent.getSerializableExtra("LEARNING_TYPE") == LearningType.KANJI) {
-            KanjiLearning(this.resources.openRawResource(R.raw.jlpt5).bufferedReader().use { it.readText() })
+            KanjiLearning(this.resources.openRawResource(R.raw.kanji_jlpt5).bufferedReader().use { it.readText() })
+        } else if (intent.getSerializableExtra("LEARNING_TYPE") == LearningType.VOCABULARY) {
+            VocabularyLearning(this.resources.openRawResource(R.raw.vocabulary_jlpt5).bufferedReader().use { it.readText() })
         } else {
             HiraganaLearning(this.resources.openRawResource(R.raw.hiragana).bufferedReader().use { it.readText() })
         }

app/src/main/java/com/xwilarg/yousei/VocabularyInfo.kt

@@ -0,0 +1,7 @@
+package com.xwilarg.yousei
+
+data class VocabularyInfo (
+    val word: String,
+    val meaning: Array<String>,
+    val reading: String
+)

app/src/main/java/com/xwilarg/yousei/VocabularyLearning.kt

@@ -0,0 +1,55 @@
+package com.xwilarg.yousei;
+
+import com.google.gson.Gson
+import kotlin.random.Random
+
+class VocabularyLearning : ILearning {
+
+    constructor(content: String) {
+        words = Gson().fromJson(content, Array<VocabularyInfo>::class.java)
+    }
+
+    override fun getQuestion() : Pair<String, String> {
+        currentWord = words[Random.nextInt(0, words.size)]
+        return Pair(currentWord.word, currentWord.reading)
+    }
+
+    override fun checkAnswer(myAnswer: String) : Pair<IsCorrect, String> {
+        var isCorrect = false
+        var closestAnswer : String? = null
+        if (!myAnswer.isNullOrBlank()) {
+            for (m in currentWord   .meaning) {
+                if (myAnswer == m) {
+                    return Pair(IsCorrect.YES, m)
+                }
+                if (closestAnswer == null && (myAnswer.contains(m) || m.contains(myAnswer))) {
+                    closestAnswer = m
+                }
+            }
+        }
+        if (closestAnswer != null) {
+            return Pair(IsCorrect.PARTIAL, closestAnswer)
+        }
+        return Pair(IsCorrect.NO, currentWord.meaning[0])
+    }
+
+    override fun getCurrent(): String {
+        return currentWord.word
+    }
+
+    override fun getRandomChoices(): ArrayList<String> {
+        var choices = arrayListOf<String>()
+        choices.add(currentWord.meaning[0])
+        while (choices.size < 4) {
+            var randomChoice = words[Random.nextInt(0, words.size)].meaning[0]
+            if (!choices.contains(randomChoice)) {
+                choices.add(randomChoice)
+            }
+        }
+        choices.shuffle()
+        return choices
+    }
+
+    lateinit var words: Array<VocabularyInfo>
+    lateinit var currentWord: VocabularyInfo
+}

app/src/main/res/layout/activity_main.xml

@@ -11,7 +11,7 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:text="Hiragana Learning"
-        android:textSize="30sp"
+        android:textSize="25sp"
         app:layout_constraintBottom_toTopOf="@+id/guidelineTitle1"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
@@ -21,8 +21,19 @@
         android:id="@+id/textTitleKanji"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:text="Kanji Learning"
-        android:textSize="30sp"
+        android:text="Kanji Learning (JLPT 5)"
+        android:textSize="25sp"
+        app:layout_constraintBottom_toTopOf="@+id/guidelineHorizontal"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="@+id/guidelineTitle1" />
+
+    <TextView
+        android:id="@+id/textTitleVocabulary"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="Vocabulary Learning (JLPT 5)"
+        android:textSize="25sp"
         app:layout_constraintBottom_toTopOf="@+id/guidelineTitle2"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
@@ -84,17 +95,39 @@
         android:layout_height="wrap_content"
         android:onClick="startGameFreeKanji"
         android:text="Free Text"
-        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintBottom_toTopOf="@+id/guidelineTitle2"
         app:layout_constraintEnd_toStartOf="@+id/guidelineVertical"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="@+id/guidelineHorizontal" />
+        app:layout_constraintTop_toTopOf="@+id/guidelineTitle1" />
 
     <Button
         android:id="@+id/launchButtonChoicesHiragana2"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:onClick="startGameChoicesKanji"
         android:text="Choices"
+        app:layout_constraintBottom_toTopOf="@+id/guidelineTitle2"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="@+id/guidelineVertical"
+        app:layout_constraintTop_toTopOf="@+id/guidelineTitle1" />
+
+    <Button
+        android:id="@+id/launchButtonFreeVocabulary"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:onClick="startGameFreeVocabulary"
+        android:text="Free Text"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toStartOf="@+id/guidelineVertical"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="@+id/guidelineHorizontal" />
+
+    <Button
+        android:id="@+id/launchButtonChoicesVocabulary"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:onClick="startGameChoicesVocabulary"
+        android:text="Choices"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="@+id/guidelineVertical"