Merge pull request #51 from NUmeroAndDev/revert-49-change_font

Revert "ダウンロードフォントに変更"
NUmeroAndDev · Feb 23, 2018 · 80dbd42 · 80dbd42
2 parents 5ee2fbb + 4ca5ed0
commit 80dbd42
Show file tree

Hide file tree

Showing 7 changed files with 4 additions and 38 deletions.
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -42,10 +42,6 @@
 
         <service android:name=".service.UpdateBusDataService" />
 
-        <meta-data
-            android:name="preloaded_fonts"
-            android:resource="@array/preloaded_fonts" />
-
     </application>
 
 </manifest>
diff --git a/app/src/main/res/font/lato.ttf b/app/src/main/res/font/lato.ttf
diff --git a/app/src/main/res/font/lato_light.xml b/app/src/main/res/font/lato_light.xml
diff --git a/app/src/main/res/layout-land/bus_schedule_fragment.xml b/app/src/main/res/layout-land/bus_schedule_fragment.xml
@@ -64,10 +64,10 @@
                     android:layout_height="wrap_content"
                     android:layout_gravity="center|bottom"
                     android:layout_marginBottom="@dimen/card_count_time_text_margin"
+                    android:fontFamily="@font/lato"
                     android:textSize="@dimen/count_time_text"
                     app:attentionTextColor="@color/count_attention_text"
                     app:defaultTextColor="@color/count_default_text"
-                    app:fontFamily="@font/lato_light"
                     app:safeTextColor="@color/count_safe_text" />
 
                 <FrameLayout
@@ -165,10 +165,10 @@
                     android:layout_height="wrap_content"
                     android:layout_gravity="center|bottom"
                     android:layout_marginBottom="@dimen/card_count_time_text_margin"
+                    android:fontFamily="@font/lato"
                     android:textSize="@dimen/count_time_text"
                     app:attentionTextColor="@color/count_attention_text"
                     app:defaultTextColor="@color/count_default_text"
-                    app:fontFamily="@font/lato_light"
                     app:safeTextColor="@color/count_safe_text" />
 
                 <FrameLayout

diff --git a/app/src/main/res/layout/bus_schedule_fragment.xml b/app/src/main/res/layout/bus_schedule_fragment.xml
@@ -64,10 +64,10 @@
                     android:layout_height="wrap_content"
                     android:layout_gravity="center|bottom"
                     android:layout_marginBottom="@dimen/card_count_time_text_margin"
+                    android:fontFamily="@font/lato"
                     android:textSize="@dimen/count_time_text"
                     app:attentionTextColor="@color/count_attention_text"
                     app:defaultTextColor="@color/count_default_text"
-                    app:fontFamily="@font/lato_light"
                     app:safeTextColor="@color/count_safe_text" />
 
                 <FrameLayout
@@ -169,10 +169,10 @@
                     android:layout_height="wrap_content"
                     android:layout_gravity="center|bottom"
                     android:layout_marginBottom="@dimen/card_count_time_text_margin"
+                    android:fontFamily="@font/lato"
                     android:textSize="@dimen/count_time_text"
                     app:attentionTextColor="@color/count_attention_text"
                     app:defaultTextColor="@color/count_default_text"
-                    app:fontFamily="@font/lato_light"
                     app:safeTextColor="@color/count_safe_text" />
 
                 <FrameLayout

diff --git a/app/src/main/res/values/font_certs.xml b/app/src/main/res/values/font_certs.xml
diff --git a/app/src/main/res/values/preloaded_fonts.xml b/app/src/main/res/values/preloaded_fonts.xml