Merge pull request #108 from dlyongemallo/master

Add {qolqoS} as a Klingon font option.

Author: De7vID

app/src/main/assets/fonts/qolqoS-pIqaD.ttf

@@ -55,6 +55,7 @@ public class KlingonAssistant extends BaseActivity {
   // These holds the {pIqaD} typefaces.
   private static Typeface mTNGKlingonFontTypeface = null;
   private static Typeface mDSCKlingonFontTypeface = null;
+  private static Typeface mCoreKlingonFontTypeface = null;
 
   // The two main views in app's main screen.
   private TextView mTextView;
@@ -147,13 +148,22 @@ private void handleIntent(Intent intent) {
   }
 
   public static Typeface getKlingonFontTypeface(Context context) {
-    if (Preferences.useDSCKlingonFont(context)) {
+    String klingonFontCode = Preferences.getKlingonFontCode(context);
+    if (klingonFontCode.equals("CORE")) {
+      if (mCoreKlingonFontTypeface == null) {
+        mCoreKlingonFontTypeface =
+            Typeface.createFromAsset(context.getAssets(), "fonts/qolqoS-pIqaD.ttf");
+      }
+      return mCoreKlingonFontTypeface;
+    } else if (klingonFontCode.equals("DSC")) {
       if (mDSCKlingonFontTypeface == null) {
         mDSCKlingonFontTypeface =
             Typeface.createFromAsset(context.getAssets(), "fonts/DSC-pIqaD.ttf");
       }
       return mDSCKlingonFontTypeface;
     } else {
+      // Return TNG-style as the default as that's how we want to display the app name
+      // when Latin is chosen.
       if (mTNGKlingonFontTypeface == null) {
         mTNGKlingonFontTypeface =
             Typeface.createFromAsset(context.getAssets(), "fonts/TNG-pIqaD.ttf");

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

@@ -128,14 +128,13 @@ public static boolean useKlingonUI(Context context) {
   public static boolean useKlingonFont(Context context) {
     SharedPreferences sharedPrefs = PreferenceManager.getDefaultSharedPreferences(context);
     String value = sharedPrefs.getString(KEY_KLINGON_FONT_LIST_PREFERENCE, /* default */ "LATIN");
-    return value.equals("TNG") || value.equals("DSC");
+    return value.equals("TNG") || value.equals("DSC") || value.equals("CORE");
   }
 
-  // Whether the DSC font should be used instead of the TNG one.
-  public static boolean useDSCKlingonFont(Context context) {
+  // Returns which font should be used for Klingon: returns one of "LATIN", "TNG", "DSC", or "CORE".
+  public static String getKlingonFontCode(Context context) {
     SharedPreferences sharedPrefs = PreferenceManager.getDefaultSharedPreferences(context);
-    String value = sharedPrefs.getString(KEY_KLINGON_FONT_LIST_PREFERENCE, /* default */ "LATIN");
-    return value.equals("DSC");
+    return sharedPrefs.getString(KEY_KLINGON_FONT_LIST_PREFERENCE, /* default */ "LATIN");
   }
 
   @Override

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

@@ -24,12 +24,14 @@
     <item>@string/font_latin</item>
     <item>@string/font_tng</item>
     <item>@string/font_dsc</item>
+    <item>@string/font_core</item>
   </string-array>
 
   <string-array name="klingonFontChoicesValues">
     <item>LATIN</item>
     <item>TNG</item>
     <item>DSC</item>
+    <item>CORE</item>
   </string-array>
 
   <!-- Note: These are sorted by completeness (languages in beta come after completed ones). -->

app/src/main/res/values/arrays.xml

@@ -182,8 +182,9 @@
 
     <!-- Choices for showing Klingon text using {pIqaD}. -->
     <string name="font_latin">Off</string>
-    <string name="font_tng">TNG {pIqaD}</string>
-    <string name="font_dsc">DSC {pIqaD}</string>
+    <string name="font_tng">TNG-style</string>
+    <string name="font_dsc">DSC-style</string>
+    <string name="font_core">{qolqoS}</string>
 
     <!-- Choices for secondary languages. -->
     <string name="secondary_language_none">None</string>