From 6c89207eff94c90a2ac20a82a7eeac1a12c6210d Mon Sep 17 00:00:00 2001
From: Max Lv <max.c.lv@gmail.com>
Date: Fri, 22 Dec 2017 00:29:31 -0800
Subject: [PATCH] Donwload fonts through support library. #1515

---
 mobile/src/main/AndroidManifest.xml              |  3 ---
 .../java/com/github/shadowsocks/MainActivity.kt  |  9 +++++++++
 mobile/src/main/res/font/iceland.xml             | 16 ++++++++++------
 mobile/src/main/res/layout/layout_header.xml     |  1 -
 mobile/src/main/res/values/preloaded_fonts.xml   |  6 ------
 5 files changed, 19 insertions(+), 16 deletions(-)
 delete mode 100644 mobile/src/main/res/values/preloaded_fonts.xml

diff --git a/mobile/src/main/AndroidManifest.xml b/mobile/src/main/AndroidManifest.xml
index fdced725..2ac65b5a 100644
--- a/mobile/src/main/AndroidManifest.xml
+++ b/mobile/src/main/AndroidManifest.xml
@@ -34,9 +34,6 @@
                    android:value="@integer/google_play_services_version"/>
         <meta-data android:name="com.google.android.backup.api_key"
                    android:value="AEdPqrEAAAAI_zVxZthz2HDuz9toTvkYvL0L5GA-OjeUIfBeXg"/>
-        <meta-data
-            android:name="preloaded_fonts"
-            android:resource="@array/preloaded_fonts"/>
 
         <activity
             android:name=".MainActivity"
diff --git a/mobile/src/main/java/com/github/shadowsocks/MainActivity.kt b/mobile/src/main/java/com/github/shadowsocks/MainActivity.kt
index d64123b4..1677581d 100644
--- a/mobile/src/main/java/com/github/shadowsocks/MainActivity.kt
+++ b/mobile/src/main/java/com/github/shadowsocks/MainActivity.kt
@@ -24,6 +24,7 @@ import android.app.Activity
 import android.app.backup.BackupManager
 import android.content.ActivityNotFoundException
 import android.content.Intent
+import android.graphics.Typeface
 import android.net.Uri
 import android.net.VpnService
 import android.nfc.NdefMessage
@@ -33,6 +34,7 @@ import android.os.SystemClock
 import android.support.customtabs.CustomTabsIntent
 import android.support.design.widget.Snackbar
 import android.support.v4.content.ContextCompat
+import android.support.v4.content.res.ResourcesCompat
 import android.support.v7.app.AlertDialog
 import android.support.v7.app.AppCompatActivity
 import android.support.v7.content.res.AppCompatResources
@@ -213,6 +215,7 @@ class MainActivity : AppCompatActivity(), ShadowsocksConnection.Interface, Drawe
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         setContentView(R.layout.layout_main)
+
         val drawerBuilder = DrawerBuilder()
                 .withActivity(this)
                 .withTranslucentStatusBar(true)
@@ -273,6 +276,12 @@ class MainActivity : AppCompatActivity(), ShadowsocksConnection.Interface, Drawe
             })
         } else drawer = drawerBuilder.build()
 
+        val drawerTitle = drawer.getHeader().findViewById<TextView>(R.id.drawer_title)
+        ResourcesCompat.getFont(this, R.font.iceland, object : ResourcesCompat.FontCallback() {
+            override fun onFontRetrievalFailed(reason: Int) {} // Do nothing
+            override fun onFontRetrieved(typeface: Typeface) { drawerTitle.setTypeface(typeface) }
+        }, null)
+
         if (savedInstanceState == null) displayFragment(ProfilesFragment())
         previousSelectedDrawer = drawer.currentSelection
         statusText = findViewById(R.id.status)
diff --git a/mobile/src/main/res/font/iceland.xml b/mobile/src/main/res/font/iceland.xml
index b887eb61..d1c452e1 100644
--- a/mobile/src/main/res/font/iceland.xml
+++ b/mobile/src/main/res/font/iceland.xml
@@ -1,7 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
-<font-family xmlns:app="http://schemas.android.com/apk/res-auto"
-        app:fontProviderAuthority="com.google.android.gms.fonts"
-        app:fontProviderPackage="com.google.android.gms"
-        app:fontProviderQuery="Iceland"
-        app:fontProviderCerts="@array/com_google_android_gms_fonts_certs">
-</font-family>
+<font-family xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    app:fontProviderAuthority="com.google.android.gms.fonts"
+    app:fontProviderPackage="com.google.android.gms"
+    app:fontProviderQuery="Iceland"
+    app:fontProviderCerts="@array/com_google_android_gms_fonts_certs"
+    android:fontProviderAuthority="com.google.android.gms.fonts"
+    android:fontProviderPackage="com.google.android.gms"
+    android:fontProviderQuery="Iceland"
+    android:fontProviderCerts="@array/com_google_android_gms_fonts_certs" />
diff --git a/mobile/src/main/res/layout/layout_header.xml b/mobile/src/main/res/layout/layout_header.xml
index 17db2b80..77d4b4c9 100644
--- a/mobile/src/main/res/layout/layout_header.xml
+++ b/mobile/src/main/res/layout/layout_header.xml
@@ -14,7 +14,6 @@
               android:layout_width="match_parent"
               android:layout_height="wrap_content"
               android:layout_centerVertical="true"
-              android:fontFamily="@font/iceland"
               android:gravity="center"
               android:text="shadowsocks"
               android:textColor="@android:color/white"
diff --git a/mobile/src/main/res/values/preloaded_fonts.xml b/mobile/src/main/res/values/preloaded_fonts.xml
deleted file mode 100644
index d421ea09..00000000
--- a/mobile/src/main/res/values/preloaded_fonts.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <array name="preloaded_fonts" translatable="false">
-        <item>@font/iceland</item>
-    </array>
-</resources>