Merge branch 'release-0.15.1'

theblackwidower · Mar 7, 2024 · 7806b12 · 7806b12
2 parents 1645b44 + c7ab92e
commit 7806b12
Show file tree

Hide file tree

Showing 19 changed files with 137 additions and 98 deletions.
diff --git a/.idea/gradle.xml b/.idea/gradle.xml
diff --git a/.idea/migrations.xml b/.idea/migrations.xml
diff --git a/.idea/misc.xml b/.idea/misc.xml
diff --git a/README.md b/README.md
@@ -30,6 +30,8 @@ This application is in a state of constant development. Any additional feature r
 
   * Supports Hiragana and Katakana character sets
   * Ten different character groupings for each set, allowing a gradual progression through the characters
+  * Complete control of which characters the user is quizzed on (either groups of questions or individual questions can be enabled and disabled)
+  * Support for kun'yomi and on'yomi-based kanji questions
   * Can answer questions by entering them using the on-screen keyboard, or as multiple choice questions
   * Built-in kana reference sheet
   * Supports both digraphs (ひゃ, みゅ, リュ) and diacritics (が, ぴ)
@@ -50,14 +52,12 @@ _NB: The following features have no planned release date, or guarantee of releas
 
   * Multiple fonts
   * Obsolete kana option
-  * Finer question selection feature
   * User-made question lists
   * Furigana option
   * Export logs and preferences
   * Pronunciation Guide
   * Number questions
   * Reverse questions mode (questions in English, answers in Japanese)
-  * Support for kun'yomi and on'yomi-based kanji questions
   * Limitation alerts, either by time, or number of questions
 
 ## Code Analysis, Continuous Integration and Test Coverage
@@ -78,7 +78,7 @@ If you are multi-lingual, and wish to assist this project by volunteering transl
 
 If you wish to submit a translation as a pull request, please use Android Studio's built-in Translations Editor. 
 
-If you don't wish to go through the hassle of installing Android Studio, you can use [this strings.xml file](https://gist.github.com/theblackwidower/206876858d2bc5a81f9014267750d8fd) as a template, and place it in a new directory called `/app/src/main/res/values-[language code]/` with the [ISO 639-1 language code](https://en.wikipedia.org/wiki/List_of_ISO_639-1_codes). The various string tags contain elements that need to be translated. Be sure to place the name of the language you're translating as well as your own name, in the field marked `translator_credit`. You can also place the URL to your GitHub, Twitter, or other social media profile or personal/professional website in the field marked `translator_credit_url`.
+If you don't wish to go through the hassle of installing Android Studio, you can use [this strings.xml file](https://gist.github.com/theblackwidower/206876858d2bc5a81f9014267750d8fd) as a template, and place it in a new directory called `/app/src/main/res/values-[language code]/` with the [ISO 639-1 language code](https://en.wikipedia.org/wiki/List_of_ISO_639-1_codes). The various string tags contain elements that need to be translated. Be sure to place the name of the language you're translating as well as your own name, in the field marked `translator_credit`. You can also place the URL to your GitHub, Twitter/X, Mastodon, Bluesky or other social media profile or personal/professional website in the field marked `translator_credit_url`.
 
 If you don't wish to bother with pull requests, using the template listed above you can also submit your translation through email to [[email protected]](mailto:[email protected]?subject=KanaQuiz%20Translation), with the subject "KanaQuiz Translation".
 

diff --git a/app/build.gradle b/app/build.gradle
@@ -6,17 +6,17 @@ if (getGradle().getStartParameter().getTaskNames().toString().toLowerCase().cont
 }
 
 android {
-    compileSdkVersion 33
-    buildToolsVersion '33.0.0'
+    compileSdk 34
+    buildToolsVersion = '34.0.0'
     defaultConfig {
         applicationId 'com.noprestige.kanaquiz'
         minSdkVersion 22
-        targetSdkVersion 33
-        versionCode 19
-        versionName '0.15'
+        targetSdkVersion 34
+        versionCode 20
+        versionName '0.15.1'
         testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner'
         //ref: https://stackoverflow.com/a/47525966/3582371
-        resConfigs 'en-rCA', 'es-rES', 'ca-rES', 'de-rDE'
+        resourceConfigurations += ['en-rCA', 'es-rES', 'ca-rES', 'de-rDE']
         javaCompileOptions {
             annotationProcessorOptions {
                 arguments = ['room.schemaLocation':
@@ -60,6 +60,9 @@ android {
     lint {
         disable 'MissingTranslation'
     }
+    buildFeatures {
+        buildConfig true
+    }
 }
 
 dependencies {
@@ -68,17 +71,17 @@ dependencies {
     androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.1'
     implementation 'androidx.appcompat:appcompat:1.6.1'
     testImplementation 'junit:junit:4.13.2'
-    implementation 'com.google.android.material:material:1.9.0'
+    implementation 'com.google.android.material:material:1.11.0'
 
-    implementation 'androidx.room:room-runtime:2.5.2'
-    annotationProcessor 'androidx.room:room-compiler:2.5.2'
+    implementation 'androidx.room:room-runtime:2.6.1'
+    annotationProcessor 'androidx.room:room-compiler:2.6.1'
 
-    androidTestImplementation 'androidx.room:room-testing:2.5.2'
+    androidTestImplementation 'androidx.room:room-testing:2.6.1'
 
     releaseImplementation 'com.google.firebase:firebase-core:21.1.1'
-    releaseImplementation 'com.google.firebase:firebase-perf:20.3.3'
-    releaseImplementation 'com.google.firebase:firebase-crashlytics:18.3.7'
-    releaseImplementation 'com.google.firebase:firebase-analytics:21.3.0'
+    releaseImplementation 'com.google.firebase:firebase-perf:20.5.2'
+    releaseImplementation 'com.google.firebase:firebase-crashlytics:18.6.2'
+    releaseImplementation 'com.google.firebase:firebase-analytics:21.5.1'
 
     implementation 'org.apmem.tools:layouts:1.10@aar'
 
@@ -92,20 +95,20 @@ dependencies {
 
     implementation 'com.github.PhilJay:MPAndroidChart:3.1.0'
 
-    implementation 'androidx.preference:preference:1.2.0'
+    implementation 'androidx.preference:preference:1.2.1'
 
     implementation 'moe.shizuku.fontprovider:api:10'
 
-    coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:2.0.3'
+    coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:2.0.4'
 }
 
-coveralls {
-    sourceDirs += "${rootDir}/app/src/main/java/"
-    //Unit tests
-    jacocoReportPath "${buildDir}/reports/jacoco/debug/jacoco.xml"
-    //Instrument tests
-    //jacocoReportPath "${buildDir}/reports/coverage/debug/report.xml"
-}
+//coveralls {
+//    sourceDirs += "${rootDir}/app/src/main/java/"
+//    //Unit tests
+//    jacocoReportPath "${buildDir}/reports/jacoco/debug/jacoco.xml"
+//    //Instrument tests
+//    //jacocoReportPath "${buildDir}/reports/coverage/debug/report.xml"
+//}
 
 //ref: https://stackoverflow.com/a/49739351/3582371
 if (getGradle().getStartParameter().getTaskNames().toString().toLowerCase().contains('release')) {

diff --git a/app/src/main/java/com/noprestige/kanaquiz/AboutScreen.java b/app/src/main/java/com/noprestige/kanaquiz/AboutScreen.java
@@ -1,5 +1,5 @@
 /*
- *    Copyright 2018 T Duke Perry
+ *    Copyright 2024 T Duke Perry
  *
  *    Licensed under the Apache License, Version 2.0 (the "License");
  *    you may not use this file except in compliance with the License.
@@ -93,9 +93,9 @@ public void toAppGithub(View view)
         toGithub("theblackwidower/KanaQuiz");
     }
 
-    public void toTwitter(View view)
+    public void toMastodon(View view)
     {
-        toSite("https://twitter.com/theblackwidower/");
+        toSite("https://fandom.ink/@scarletduke");
     }
 
     public void toAssetStudioGithub(View view)

diff --git a/app/src/main/res/drawable/ic_twitter_logo.xml b/app/src/main/res/drawable/ic_twitter_logo.xml
diff --git a/app/src/main/res/drawable/mastodon_logo.xml b/app/src/main/res/drawable/mastodon_logo.xml
@@ -0,0 +1,35 @@
+<!--
+  ~    Copyright 2024 T Duke Perry
+  ~
+  ~    Licensed under the Apache License, Version 2.0 (the "License");
+  ~    you may not use this file except in compliance with the License.
+  ~    You may obtain a copy of the License at
+  ~
+  ~        http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~    Unless required by applicable law or agreed to in writing, software
+  ~    distributed under the License is distributed on an "AS IS" BASIS,
+  ~    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~    See the License for the specific language governing permissions and
+  ~    limitations under the License.
+  -->
+
+<vector xmlns:android="http://schemas.android.com/apk/res/android" xmlns:aapt="http://schemas.android.com/aapt"
+    android:width="314dp" android:height="80dp" android:viewportWidth="314" android:viewportHeight="80">
+  <path
+      android:pathData="M73.45,17.7C72.32,9.2 65,2.49 56.35,1.2C54.88,0.98 49.35,0.18 36.52,0.18H36.42C23.59,0.18 20.84,0.98 19.37,1.2C10.94,2.46 3.26,8.48 1.38,17.09C0.5,21.32 0.4,26.02 0.57,30.33C0.81,36.52 0.86,42.68 1.41,48.84C1.79,52.93 2.45,56.99 3.4,60.98C5.18,68.36 12.36,74.5 19.4,76.99C26.93,79.6 35.03,80.04 42.79,78.25C43.64,78.04 44.48,77.81 45.32,77.54C47.21,76.93 49.42,76.25 51.05,75.06C51.07,75.04 51.09,75.02 51.1,74.99C51.11,74.97 51.12,74.95 51.12,74.91V68.94C51.12,68.94 51.12,68.89 51.1,68.87C51.1,68.85 51.07,68.82 51.05,68.81C51.03,68.8 51,68.79 50.98,68.77C50.95,68.77 50.93,68.77 50.91,68.77C45.93,69.98 40.83,70.59 35.73,70.57C26.93,70.57 24.56,66.34 23.89,64.58C23.35,63.06 23,61.47 22.86,59.86C22.86,59.84 22.86,59.81 22.87,59.79C22.87,59.76 22.89,59.74 22.92,59.73C22.94,59.71 22.96,59.7 22.99,59.69H23.07C27.96,60.88 32.98,61.49 38.01,61.49C39.22,61.49 40.42,61.49 41.64,61.46C46.69,61.31 52.02,61.05 57.01,60.07C57.13,60.04 57.26,60.02 57.37,59.99C65.22,58.46 72.69,53.66 73.45,41.51C73.47,41.04 73.54,36.5 73.54,36.01C73.54,34.32 74.08,24.04 73.46,17.72L73.45,17.7Z">
+    <aapt:attr name="android:fillColor">
+      <gradient android:startX="37.12" android:startY="0.18" android:endX="37.12" android:endY="79.32"
+          android:type="linear">
+        <item android:offset="0" android:color="#FF6364FF" />
+        <item android:offset="1" android:color="#FF563ACC" />
+      </gradient>
+    </aapt:attr>
+  </path>
+  <path
+      android:pathData="M15.31,22.45C15.31,19.96 17.27,17.96 19.7,17.96C22.12,17.96 24.08,19.97 24.08,22.45C24.08,24.92 22.12,26.93 19.7,26.93C17.27,26.93 15.31,24.92 15.31,22.45Z"
+      android:fillColor="#ffffff" />
+  <path
+      android:pathData="M80.52,26.3V46.91H72.53V26.91C72.53,22.7 70.8,20.57 67.33,20.57C63.5,20.57 61.57,23.11 61.57,28.12V39.06H53.64V28.12C53.64,23.09 51.74,20.57 47.88,20.57C44.42,20.57 42.68,22.7 42.68,26.91V46.89H34.71V26.3C34.71,22.1 35.75,18.76 37.85,16.27C40.03,13.79 42.87,12.53 46.39,12.53C50.47,12.53 53.57,14.14 55.61,17.36L57.61,20.76L59.6,17.36C61.64,14.15 64.73,12.53 68.82,12.53C72.34,12.53 75.19,13.8 77.36,16.27C79.46,18.76 80.51,22.08 80.51,26.3H80.52ZM107.99,36.54C109.65,34.75 110.43,32.54 110.43,29.84C110.43,27.13 109.64,24.89 107.99,23.19C106.41,21.4 104.39,20.55 101.95,20.55C99.52,20.55 97.51,21.4 95.91,23.19C94.33,24.89 93.54,27.13 93.54,29.84C93.54,32.54 94.33,34.78 95.91,36.54C97.5,38.25 99.52,39.11 101.95,39.11C104.39,39.11 106.4,38.26 107.99,36.54ZM110.43,13.36H118.3V46.31H110.43V42.43C108.05,45.65 104.76,47.25 100.49,47.25C96.21,47.25 92.92,45.6 90.01,42.24C87.14,38.88 85.68,34.73 85.68,29.86C85.68,24.99 87.15,20.9 90.01,17.54C92.94,14.18 96.42,12.47 100.49,12.47C104.56,12.47 108.05,14.06 110.43,17.27V13.39V13.36ZM144.76,29.21C147.08,31 148.23,33.5 148.17,36.65C148.17,40.01 147.02,42.66 144.64,44.48C142.26,46.27 139.39,47.19 135.91,47.19C129.63,47.19 125.37,44.54 123.11,39.36L129.93,35.21C130.84,38.03 132.85,39.49 135.91,39.49C138.72,39.49 140.12,38.58 140.12,36.67C140.12,35.28 138.29,34.02 134.57,33.05C133.16,32.66 132,32.26 131.1,31.93C129.81,31.41 128.72,30.81 127.81,30.08C125.55,28.29 124.4,25.93 124.4,22.9C124.4,19.67 125.49,17.1 127.69,15.25C129.95,13.34 132.69,12.42 135.98,12.42C141.23,12.42 145.06,14.73 147.57,19.4L140.87,23.35C139.9,21.11 138.24,19.99 135.98,19.99C133.61,19.99 132.45,20.9 132.45,22.69C132.45,24.08 134.28,25.33 138,26.3C140.87,26.96 143.13,27.95 144.76,29.21H144.77H144.76ZM169.76,21.52H162.87V35.23C162.87,36.87 163.48,37.87 164.65,38.32C165.5,38.65 167.21,38.71 169.78,38.59V46.3C164.48,46.95 160.64,46.42 158.38,44.65C156.12,42.95 155.03,39.77 155.03,35.24V21.52H149.73V13.35H155.03V6.7L162.89,4.13V13.36H169.79V21.53H169.78L169.76,21.52ZM194.84,36.35C196.42,34.65 197.21,32.47 197.21,29.82C197.21,27.18 196.42,25.03 194.84,23.3C193.24,21.59 191.29,20.73 188.92,20.73C186.54,20.73 184.59,21.58 183,23.3C181.47,25.09 180.68,27.24 180.68,29.82C180.68,32.4 181.47,34.56 183,36.35C184.58,38.05 186.54,38.92 188.92,38.92C191.29,38.92 193.24,38.07 194.84,36.35ZM177.46,42.21C174.35,38.85 172.83,34.77 172.83,29.82C172.83,24.88 174.35,20.86 177.46,17.5C180.57,14.14 184.41,12.44 188.92,12.44C193.42,12.44 197.27,14.14 200.37,17.5C203.47,20.86 205.07,25.01 205.07,29.82C205.07,34.63 203.47,38.85 200.37,42.21C197.26,45.57 193.48,47.21 188.92,47.21C184.35,47.21 180.56,45.57 177.46,42.21ZM231.36,36.53C232.95,34.74 233.74,32.53 233.74,29.82C233.74,27.12 232.95,24.88 231.36,23.18C229.78,21.39 227.76,20.53 225.32,20.53C222.89,20.53 220.87,21.39 219.23,23.18C217.64,24.88 216.85,27.12 216.85,29.82C216.85,32.53 217.64,34.77 219.23,36.53C220.88,38.24 222.95,39.1 225.32,39.1C227.7,39.1 229.77,38.25 231.36,36.53ZM233.74,0.16H241.61V46.3H233.74V42.41C231.43,45.64 228.13,47.23 223.86,47.23C219.59,47.23 216.25,45.59 213.3,42.23C210.43,38.87 208.98,34.72 208.98,29.85C208.98,24.98 210.45,20.89 213.3,17.53C216.22,14.17 219.76,12.46 223.86,12.46C227.96,12.46 231.43,14.04 233.74,17.26V0.18V0.16ZM269.24,36.31C270.82,34.61 271.62,32.43 271.62,29.79C271.62,27.14 270.82,24.99 269.24,23.26C267.65,21.56 265.71,20.69 263.32,20.69C260.93,20.69 259,21.54 257.4,23.26C255.87,25.05 255.08,27.21 255.08,29.79C255.08,32.37 255.87,34.52 257.4,36.31C258.98,38.02 260.94,38.88 263.32,38.88C265.7,38.88 267.64,38.03 269.24,36.31ZM251.86,42.17C248.76,38.81 247.23,34.73 247.23,29.79C247.23,24.84 248.75,20.83 251.86,17.47C254.97,14.1 258.82,12.4 263.32,12.4C267.82,12.4 271.68,14.1 274.77,17.47C277.88,20.83 279.47,24.98 279.47,29.79C279.47,34.6 277.88,38.81 274.77,42.17C271.66,45.53 267.88,47.17 263.32,47.17C258.76,47.17 254.96,45.53 251.86,42.17ZM313.5,26.02V46.26H305.64V27.08C305.64,24.9 305.09,23.26 303.98,22.02C302.95,20.9 301.48,20.31 299.59,20.31C295.15,20.31 292.89,23.02 292.89,28.48V46.27H285.03V13.35H292.89V17.05C294.78,13.96 297.78,12.44 301.97,12.44C305.32,12.44 308.07,13.62 310.21,16.05C312.41,18.49 313.5,21.79 313.5,26.06"
+      android:fillColor="#000000" />
+</vector>