Merge pull request #86 from dlyongemallo/master

version 2020.08.08b (531)

app/build.gradle

@@ -12,8 +12,8 @@ android {
         // We are targeting only Marshmallow and above.
         minSdkVersion 23
         targetSdkVersion 29
-        versionCode 529
-        versionName "2020.07.31a"
+        versionCode 531
+        versionName "2020.08.08a"
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
     }
     buildTypes {

app/src/main/java/org/tlhInganHol/android/klingonassistant/KlingonContentDatabase.java

@@ -181,7 +181,7 @@ public class KlingonContentDatabase {
 
   // This should be kept in sync with the version number in the database
   // entry {boQwI':n} of the database which is bundled into the app.
-  private static final int BUNDLED_DATABASE_VERSION = 202007310;
+  private static final int BUNDLED_DATABASE_VERSION = 202008081;
 
   // Metadata about the installed database, and the updated database, if any.
   public static final String KEY_INSTALLED_DATABASE_VERSION = "installed_database_version";
@@ -197,7 +197,7 @@ public class KlingonContentDatabase {
   // the IDs of the first entry and one past the ID of the last non-hypothetical,
   // non-extended-canon entry in the database, respectively.
   private static final int ID_OF_FIRST_ENTRY = 10000;
-  private static final int ID_OF_FIRST_EXTRA_ENTRY = 14959;
+  private static final int ID_OF_FIRST_EXTRA_ENTRY = 14910;
 
   private final KlingonDatabaseOpenHelper mDatabaseOpenHelper;
   private static final HashMap<String, String> mColumnMap = buildColumnMap();

app/src/main/java/org/tlhInganHol/android/klingonassistant/KlingonContentProvider.java

@@ -894,7 +894,19 @@ private String getSpecificPartOfSpeech() {
           pos =  mContext.getResources().getString(R.string.pos_name);
         } else if (mNounType == NounType.PRONOUN) {
           pos =  mContext.getResources().getString(R.string.pos_pronoun);
+        } else {
+          pos =  mContext.getResources().getString(R.string.pos_noun);
         }
+      } else if (mBasePartOfSpeech == BasePartOfSpeechEnum.VERB) {
+        pos =  mContext.getResources().getString(R.string.pos_verb);
+      } else if (mBasePartOfSpeech == BasePartOfSpeechEnum.ADVERBIAL) {
+        pos =  mContext.getResources().getString(R.string.pos_adv);
+      } else if (mBasePartOfSpeech == BasePartOfSpeechEnum.CONJUNCTION) {
+        pos =  mContext.getResources().getString(R.string.pos_conj);
+      } else if (mBasePartOfSpeech == BasePartOfSpeechEnum.QUESTION) {
+        pos =  mContext.getResources().getString(R.string.pos_ques);
+      } else if (mBasePartOfSpeech == BasePartOfSpeechEnum.EXCLAMATION) {
+        pos =  mContext.getResources().getString(R.string.pos_excl);
       }
       return pos;
     }

app/src/main/res/values-b+zh+HK/strings.xml

@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/*
+** Copyright (C) 2020 De'vID jonpIn (David Yonge-Mallo)
+**
+** 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.
+*/
+-->
+<resources>
+    <!-- Entry parts of speech and attributes. -->
+    <!-- Disabled for now as it looks strange when Chinese parts of speech are
+         embedded inside English notes.
+    <string name="pos_noun">名詞</string>
+    <string name="pos_number">數字</string>
+    <string name="pos_name">名稱</string>
+    <string name="pos_pronoun">代詞</string>
+    <string name="pos_verb">動詞</string>
+    <string name="pos_adv">狀語</string>
+    <string name="pos_conj">連詞</string>
+    <string name="pos_ques">問題</string>
+    <string name="pos_excl">嘆詞</string>
+    -->
+</resources>

write_db.sh

@@ -1,9 +1,7 @@
 #!/bin/bash
 
 cd data
-./renumber.py
 ./generate_db.sh --noninteractive
 cp qawHaq.db ../app/src/main/assets/
-./unnumber.sh
 ./stats.sh
 cd ..