ソースを参照

Merge pull request #3446 from nextcloud/revertFont

Use default/device font
Tobias Kaminsky 6 年 前
コミット
b50079d3d7

+ 0 - 24
src/main/res/font/nunito.xml

@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<font-family xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
-    tools:ignore="UnusedResources">
-    <font
-        app:font="@font/nunito_regular"
-        app:fontStyle="normal"
-        app:fontWeight="400"/>
-
-    <font
-        app:font="@font/nunito_italic"
-        app:fontStyle="italic"
-        app:fontWeight="400"/>
-
-    <font
-        app:font="@font/nunito_bold"
-        app:fontStyle="normal"
-        app:fontWeight="700"/>
-
-    <font
-        app:font="@font/nunito_bold_italic"
-        app:fontStyle="italic"
-        app:fontWeight="700"/>
-</font-family>

BIN
src/main/res/font/nunito_bold.ttf


BIN
src/main/res/font/nunito_bold_italic.ttf


BIN
src/main/res/font/nunito_italic.ttf


BIN
src/main/res/font/nunito_regular.ttf


+ 0 - 13
src/main/res/values/styles.xml

@@ -31,7 +31,6 @@
 		<item name="alertDialogTheme">@style/ownCloud.AlertDialog</item>
 		<item name="android:windowBackground">@color/background_color</item>
 		<item name="searchViewStyle">@style/ownCloud.SearchView</item>
-        <item name="fontFamily">@font/nunito_regular</item>
 	</style>
 
 	<style name="FallbackThemingTheme" parent="Theme.MaterialComponents.Light.DarkActionBar.Bridge">
@@ -89,20 +88,14 @@
 		<item name="android:textColorPrimary">@color/primary</item>
 		<item name="searchViewStyle">@style/ownCloud.SearchView</item>
         <item name="android:textAllCaps">false</item>
-        <item name="android:buttonStyle">@style/nextcloudButtonStyle</item>
 	</style>
 
 	<style name="ownCloud.Dialog" parent="Theme.MaterialComponents.Light.Dialog">
 		<item name="colorAccent">@color/color_accent</item>
 		<item name="searchViewStyle">@style/ownCloud.SearchView</item>
         <item name="android:textAllCaps">false</item>
-        <item name="android:buttonStyle">@style/nextcloudButtonStyle</item>
 	</style>
 
-    <style name="nextcloudButtonStyle" parent="Widget.MaterialComponents.Button">
-        <item name="fontFamily">@font/nunito_bold</item>
-    </style>
-
 	<style name="ProgressDialogTheme" parent="ownCloud.Dialog">
 		<item name="colorAccent">@color/color_accent</item>
 		<item name="android:textColorPrimary">@color/primary</item>
@@ -124,21 +117,18 @@
 		<item name="colorButtonNormal">@color/secondary_button_background_color</item>
 		<item name="android:textColor">@color/secondary_button_text_color</item>
         <item name="android:textAllCaps">false</item>
-        <item name="fontFamily">@font/nunito_bold</item>
 	</style>
 
     <style name="OutlinedButton" parent="Widget.MaterialComponents.Button.OutlinedButton">
         <item name="colorAccent">@color/transparent</item>
         <item name="android:textColor">@color/primary_dark</item>
         <item name="android:textAllCaps">false</item>
-        <item name="fontFamily">@font/nunito_bold</item>
     </style>
 
     <style name="OutlineLogindButton" parent="Widget.MaterialComponents.Button.OutlinedButton">
         <item name="colorAccent">@color/transparent</item>
         <item name="android:textColor">@color/white</item>
         <item name="android:textAllCaps">false</item>
-        <item name="fontFamily">@font/nunito_bold</item>
         <item name="strokeColor">@color/white</item>
     </style>
 
@@ -155,18 +145,15 @@
 
 	<style name="Button.Borderless" parent="Widget.MaterialComponents.Button.TextButton">
 		<item name="android:textColor">@drawable/borderless_btn</item>
-        <item name="fontFamily">@font/nunito_bold</item>
         <item name="android:textAllCaps">false</item>
 	</style>
 
 	<style name="Button.Borderless.Destructive" parent="Widget.MaterialComponents.Button.TextButton">
-        <item name="fontFamily">@font/nunito_bold</item>
 		<item name="android:textColor">@color/highlight_textColor_Warning</item>
         <item name="android:textAllCaps">false</item>
 	</style>
 
 	<style name="Button.Borderless.Login" parent="Widget.MaterialComponents.Button.TextButton">
-        <item name="fontFamily">@font/nunito_bold</item>
 		<item name="android:textColor">@color/white</item>
         <item name="android:textAllCaps">false</item>
 	</style>