From d796911d56711009b9d5b735971da518a3617c2d Mon Sep 17 00:00:00 2001
From: =?utf8?q?Reimar=20D=C3=B6ffinger?= <Reimar.Doeffinger@gmx.de>
Date: Sat, 29 Aug 2015 17:03:29 +0200
Subject: [PATCH] Allow choosing more system font variations.

---
 res/values-de/arrays.xml                                  | 8 +++++++-
 res/values-es/arrays.xml                                  | 6 ++++++
 res/values-fr/arrays.xml                                  | 8 +++++++-
 res/values-it/arrays.xml                                  | 6 ++++++
 res/values/arrays.xml                                     | 8 +++++++-
 src/com/hughes/android/dictionary/DictionaryActivity.java | 6 ++++++
 6 files changed, 39 insertions(+), 3 deletions(-)

diff --git a/res/values-de/arrays.xml b/res/values-de/arrays.xml
index 5eb30f3..ee16e07 100644
--- a/res/values-de/arrays.xml
+++ b/res/values-de/arrays.xml
@@ -4,11 +4,17 @@
   <string-array name="fontKeys">
     <item>FreeSerif.ttf.jpg</item>
     <item>SYSTEM</item>
+    <item>SERIF</item>
+    <item>SANS_SERIF</item>
+    <item>MONOSPACE</item>
   </string-array>
 
   <string-array name="fonts">
     <item>FreeSerif</item>
     <item>System default</item>
+    <item>System serif</item>
+    <item>System sans-serif</item>
+    <item>System monospace</item>
   </string-array>
     
   <string-array name="themeKeys">
@@ -21,4 +27,4 @@
     <item>Standard-Theme</item>
   </string-array>
   
-</resources>
\ No newline at end of file
+</resources>
diff --git a/res/values-es/arrays.xml b/res/values-es/arrays.xml
index d3ea168..e85359d 100644
--- a/res/values-es/arrays.xml
+++ b/res/values-es/arrays.xml
@@ -4,11 +4,17 @@
   <string-array name="fontKeys">
     <item>FreeSerif.ttf.jpg</item>
     <item>SYSTEM</item>
+    <item>SERIF</item>
+    <item>SANS_SERIF</item>
+    <item>MONOSPACE</item>
   </string-array>
 
   <string-array name="fonts">
     <item>FreeSerif</item>
     <item>Predeterminada del sistema</item>
+    <item>Serif del sistema</item>
+    <item>Sans-serif del sistema</item>
+    <item>Monospace del sistema</item>
   </string-array>
     
   <string-array name="themeKeys">
diff --git a/res/values-fr/arrays.xml b/res/values-fr/arrays.xml
index 9302922..56d836e 100644
--- a/res/values-fr/arrays.xml
+++ b/res/values-fr/arrays.xml
@@ -4,11 +4,17 @@
   <string-array name="fontKeys">
     <item>FreeSerif.ttf.jpg</item>
     <item>SYSTEM</item>
+    <item>SERIF</item>
+    <item>SANS_SERIF</item>
+    <item>MONOSPACE</item>
   </string-array>
 
   <string-array name="fonts">
     <item>FreeSerif</item>
     <item>System standard</item>
+    <item>System serif</item>
+    <item>System sans-serif</item>
+    <item>System monospace</item>
   </string-array>
     
   <string-array name="themeKeys">
@@ -21,4 +27,4 @@
     <item>theme standard</item>
   </string-array>
   
-</resources>
\ No newline at end of file
+</resources>
diff --git a/res/values-it/arrays.xml b/res/values-it/arrays.xml
index 7320c3d..ffd4abd 100644
--- a/res/values-it/arrays.xml
+++ b/res/values-it/arrays.xml
@@ -4,11 +4,17 @@
   <string-array name="fontKeys">
     <item>FreeSerif.ttf.jpg</item>
     <item>SYSTEM</item>
+    <item>SERIF</item>
+    <item>SANS_SERIF</item>
+    <item>MONOSPACE</item>
   </string-array>
 
   <string-array name="fonts">
     <item>FreeSerif</item>
     <item>Default di Sistema</item>
+    <item>Serif di Sistema</item>
+    <item>Sans-serif di Sistema</item>
+    <item>Monospace di Sistema</item>
   </string-array>
     
   <string-array name="themeKeys">
diff --git a/res/values/arrays.xml b/res/values/arrays.xml
index 8c194a3..d399751 100644
--- a/res/values/arrays.xml
+++ b/res/values/arrays.xml
@@ -4,11 +4,17 @@
   <string-array name="fontKeys">
     <item>FreeSerif.ttf.jpg</item>
     <item>SYSTEM</item>
+    <item>SERIF</item>
+    <item>SANS_SERIF</item>
+    <item>MONOSPACE</item>
   </string-array>
 
   <string-array name="fonts">
     <item>FreeSerif</item>
     <item>System default</item>
+    <item>System serif</item>
+    <item>System sans-serif</item>
+    <item>System monospace</item>
   </string-array>
     
   <string-array name="themeKeys">
@@ -21,4 +27,4 @@
     <item>Default theme</item>
   </string-array>
   
-</resources>
\ No newline at end of file
+</resources>
diff --git a/src/com/hughes/android/dictionary/DictionaryActivity.java b/src/com/hughes/android/dictionary/DictionaryActivity.java
index a37e3c4..2a37b6e 100644
--- a/src/com/hughes/android/dictionary/DictionaryActivity.java
+++ b/src/com/hughes/android/dictionary/DictionaryActivity.java
@@ -408,6 +408,12 @@ public class DictionaryActivity extends ActionBarActivity {
         String fontName = prefs.getString(getString(R.string.fontKey), "FreeSerif.ttf.jpg");
         if ("SYSTEM".equals(fontName)) {
             typeface = Typeface.DEFAULT;
+	} else if ("SERIF".equals(fontName)) {
+            typeface = Typeface.SERIF;
+	} else if ("SANS_SERIF".equals(fontName)) {
+            typeface = Typeface.SANS_SERIF;
+	} else if ("MONOSPACE".equals(fontName)) {
+            typeface = Typeface.MONOSPACE;
         } else {
             try {
                 typeface = Typeface.createFromAsset(getAssets(), fontName);
-- 
2.43.0