From 2b8fb24a79193b3039c1520f7d05c5814618169b Mon Sep 17 00:00:00 2001
From: Peter Osterlund <peterosterlund2@gmail.com>
Date: Sun, 20 Dec 2015 16:03:24 +0100
Subject: [PATCH] DroidFish: Made monospace font work on HTC M9. This required
 changing the minimum API level to 16 (4.1).

---
 DroidFish/AndroidManifest.xml      | 4 ++--
 DroidFish/project.properties       | 2 +-
 DroidFish/res/layout-land/main.xml | 9 ++++++---
 DroidFish/res/layout/main.xml      | 9 ++++++---
 DroidFish/res/layout/title.xml     | 6 ++++++
 5 files changed, 21 insertions(+), 9 deletions(-)

diff --git a/DroidFish/AndroidManifest.xml b/DroidFish/AndroidManifest.xml
index 6b87051..e67bcec 100644
--- a/DroidFish/AndroidManifest.xml
+++ b/DroidFish/AndroidManifest.xml
@@ -9,8 +9,8 @@
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
     <uses-permission android:name="android.permission.INTERNET" />
     <uses-permission android:name="android.permission.VIBRATE" />
-    <uses-sdk android:minSdkVersion="15"
-              android:targetSdkVersion="15"/>
+    <uses-sdk android:minSdkVersion="16"
+              android:targetSdkVersion="16"/>
     <application android:icon="@drawable/icon"
                  android:label="@string/app_name"
                  android:allowBackup="true">
diff --git a/DroidFish/project.properties b/DroidFish/project.properties
index cd9c350..8f81673 100644
--- a/DroidFish/project.properties
+++ b/DroidFish/project.properties
@@ -10,4 +10,4 @@
 # Indicates whether an apk should be generated for each density.
 split.density=false
 # Project target.
-target=android-15
+target=android-16
diff --git a/DroidFish/res/layout-land/main.xml b/DroidFish/res/layout-land/main.xml
index a51fbcc..11aba45 100644
--- a/DroidFish/res/layout-land/main.xml
+++ b/DroidFish/res/layout-land/main.xml
@@ -67,8 +67,9 @@
             android:layout_width="fill_parent" 
             android:layout_height="wrap_content" 
             android:includeFontPadding="true"
+            android:fontFamily="monospace"
             android:typeface="monospace"
-            android:textSize="10dip"/>
+            android:textSize="12sp"/>
         <RelativeLayout
             android:orientation="vertical"
             android:layout_width="fill_parent"
@@ -84,8 +85,9 @@
                     android:layout_width="fill_parent" 
                     android:layout_height="wrap_content" 
                     android:includeFontPadding="true"
+                    android:fontFamily="monospace"
                     android:typeface="monospace"
-                    android:textSize="10dip"/>
+                    android:textSize="12sp"/>
             </view>
             <ScrollView
                 android:id="@+id/scrollView"
@@ -97,8 +99,9 @@
                     android:layout_width="fill_parent" 
                     android:layout_height="wrap_content" 
                     android:includeFontPadding="true"
+                    android:fontFamily="monospace"
                     android:typeface="monospace"
-                    android:textSize="10dip"/>
+                    android:textSize="12sp"/>
             </ScrollView>
         </RelativeLayout>
     </LinearLayout>
diff --git a/DroidFish/res/layout/main.xml b/DroidFish/res/layout/main.xml
index 996c4bd..b53dbb3 100644
--- a/DroidFish/res/layout/main.xml
+++ b/DroidFish/res/layout/main.xml
@@ -24,8 +24,9 @@
             android:layout_height="wrap_content" 
             android:layout_weight="1"
             android:includeFontPadding="true"
+            android:fontFamily="monospace"
             android:typeface="monospace"
-            android:textSize="10dip"/>
+            android:textSize="12sp"/>
         <ImageButton
             android:id="@+id/custom3Button"
             android:contentDescription="@string/buttonDesc_custom3"
@@ -78,8 +79,9 @@
                 android:layout_width="fill_parent" 
                 android:layout_height="wrap_content" 
                 android:includeFontPadding="true"
+                android:fontFamily="monospace"
                 android:typeface="monospace"
-                android:textSize="10dip"/>
+                android:textSize="12sp"/>
         </view>
         <ScrollView
             android:id="@+id/scrollView"
@@ -91,8 +93,9 @@
                 android:layout_width="fill_parent" 
                 android:layout_height="wrap_content" 
                 android:includeFontPadding="true"
+                android:fontFamily="monospace"
                 android:typeface="monospace"
-                android:textSize="10dip"/>
+                android:textSize="12sp"/>
         </ScrollView>
     </RelativeLayout>
 </LinearLayout>
diff --git a/DroidFish/res/layout/title.xml b/DroidFish/res/layout/title.xml
index b0dcb7e..9aa6d86 100644
--- a/DroidFish/res/layout/title.xml
+++ b/DroidFish/res/layout/title.xml
@@ -28,6 +28,7 @@
             android:marqueeRepeatLimit="marquee_forever"
             android:scrollHorizontally="false"
             android:singleLine="true"
+            android:textSize="14sp"
             android:tag="title" >
         </TextView>
         <TextView
@@ -37,6 +38,7 @@
             android:layout_height="wrap_content"
             android:layout_weight="1"
             android:gravity="center"
+            android:textSize="14sp"
             android:tag="title"
             android:text="@string/app_name">
         </TextView>
@@ -53,6 +55,7 @@
             android:marqueeRepeatLimit="marquee_forever"
             android:scrollHorizontally="true"
             android:singleLine="true"
+            android:textSize="14sp"
             android:tag="title" >
         </TextView>
     </LinearLayout>
@@ -76,6 +79,7 @@
             android:marqueeRepeatLimit="marquee_forever"
             android:singleLine="true"
             android:tag="title"
+            android:textSize="14sp"
             android:textAppearance="?android:attr/textAppearanceMedium"
             android:textStyle="bold">
         </TextView>
@@ -87,6 +91,7 @@
             android:layout_weight="1"
             android:gravity="center|center_vertical"
             android:tag="title"
+            android:textSize="14sp"
             android:text="">
         </TextView>
         <TextView
@@ -103,6 +108,7 @@
             android:scrollHorizontally="true"
             android:singleLine="true"
             android:tag="title"
+            android:textSize="14sp"
             android:textAppearance="?android:attr/textAppearanceMedium"
             android:textStyle="bold">
         </TextView>