mirror of
https://github.com/nextcloud/android.git
synced 2024-11-22 13:15:35 +03:00
switch to Nunito
Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
This commit is contained in:
parent
27ea5731bb
commit
aa96a1ded7
6 changed files with 31 additions and 7 deletions
22
src/main/res/font/nunito.xml
Normal file
22
src/main/res/font/nunito.xml
Normal file
|
@ -0,0 +1,22 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<font-family xmlns:app="http://schemas.android.com/apk/res-auto">
|
||||
<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
Normal file
BIN
src/main/res/font/nunito_bold.ttf
Normal file
Binary file not shown.
BIN
src/main/res/font/nunito_bold_italic.ttf
Normal file
BIN
src/main/res/font/nunito_bold_italic.ttf
Normal file
Binary file not shown.
BIN
src/main/res/font/nunito_italic.ttf
Normal file
BIN
src/main/res/font/nunito_italic.ttf
Normal file
Binary file not shown.
BIN
src/main/res/font/nunito_regular.ttf
Normal file
BIN
src/main/res/font/nunito_regular.ttf
Normal file
Binary file not shown.
|
@ -31,6 +31,7 @@
|
|||
<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.AppCompat.Light.DarkActionBar">
|
||||
|
@ -121,6 +122,7 @@
|
|||
<style name="Button.Primary" parent="Button">
|
||||
<item name="colorButtonNormal">@color/primary_button_background_color</item>
|
||||
<item name="android:textColor">@color/primary_button_text_color</item>
|
||||
<item name="fontFamily">@font/nunito_bold</item>
|
||||
</style>
|
||||
|
||||
<style name="Button.Login" parent="Button">
|
||||
|
@ -175,9 +177,9 @@
|
|||
<item name="android:windowFullscreen">true</item>
|
||||
<item name="colorAccent">@color/color_accent</item>
|
||||
</style>
|
||||
|
||||
|
||||
<style name="Theme.ownCloud.Widget.ActionBar"
|
||||
|
||||
|
||||
<style name="Theme.ownCloud.Widget.ActionBar"
|
||||
parent="@style/Widget.AppCompat.Light.ActionBar.Solid.Inverse">
|
||||
<item name="android:background">@color/primary</item>
|
||||
<item name="background">@color/primary</item>
|
||||
|
@ -232,8 +234,8 @@
|
|||
<!-- setting a fixed width as follows results in narrow buttons with line breaks, but of course this is not a solution -->
|
||||
<!-- <item name="android:width">100dp</item> -->
|
||||
</style>
|
||||
|
||||
<style name="PassCodeStyle">
|
||||
|
||||
<style name="PassCodeStyle">
|
||||
<item name="android:layout_width">50dp</item>
|
||||
<item name="android:layout_height">50dp</item>
|
||||
<item name="android:gravity">center</item>
|
||||
|
@ -244,9 +246,9 @@
|
|||
<item name="android:maxLength">1</item>
|
||||
<item name="android:password">true</item>
|
||||
<item name="android:maxLines">1</item>
|
||||
|
||||
|
||||
</style>
|
||||
|
||||
|
||||
<style name="Theme.ownCloud.NoActionBar">
|
||||
<item name="windowActionBar">false</item>
|
||||
<item name="windowNoTitle">true</item>
|
||||
|
|
Loading…
Reference in a new issue