mmk2410/cm-themechooser-font-fira
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge branch 'fira-sans-condensed' into 'master'

Browse source 
Fira sans condensed

I have added Fira Sans Condensed to the font theme.

Testing was successfull on my Motorola Razr HD with Cyanogenmod 12.1-20160515-Nightly-xt925.

* [Mozilla Fira GitHub repository](https://github.com/mozilla/Fira) as submodule to folder fira/, checkout at version/tag  4.202 [quatauta/cm-themechooser-font-fira@fd772795]
* OpenType fonts symlinks to submodule replace truetype fonts [quatauta/cm-themechooser-font-fira@163be1d9]
* Fira Sans Condensed added as family sans-serif-condensed [quatauta/cm-themechooser-font-fira@f045636c]

See merge request !1
This commit is contained in:
Marcel Kapfer 2016-07-17 15:26:07 +00:00
commit 7a12ef839c
66 changed files with 87 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
.gitmodules vendored Normal file
View file

@ -0,0 +1,3 @@
[submodule "fira"]
path = fira
url = https://github.com/mozilla/Fira

1
fira Submodule

@ -0,0 +1 @@
Subproject commit 48a8d0a0354e933c0d1cfcf9feb07ccb00eb6fa9

1
theme/src/main/AndroidManifest.xml
View file

@ -24,6 +24,7 @@
<meta-data android:name="org.cyanogenmod.theme.author" android:value="@string/theme_author" /> <meta-data android:name="org.cyanogenmod.theme.author" android:value="@string/theme_author" />
<application android:hasCode="false" <application android:hasCode="false"
android:allowBackup="true"
android:icon="@drawable/ic_launcher" android:icon="@drawable/ic_launcher"
android:label="@string/theme_name"/> android:label="@string/theme_name"/>

1
theme/src/main/assets/fonts/FiraMono-Bold.otf Symbolic link
View file

@ -0,0 +1 @@
../../../../../fira/otf/FiraMono-Bold.otf

BIN
theme/src/main/assets/fonts/FiraMono-Bold.ttf
View file

Binary file not shown.

1
theme/src/main/assets/fonts/FiraMono-Medium.otf Symbolic link
View file

@ -0,0 +1 @@
../../../../../fira/otf/FiraMono-Medium.otf

BIN
theme/src/main/assets/fonts/FiraMono-Medium.ttf
View file

Binary file not shown.

1
theme/src/main/assets/fonts/FiraMono-Regular.otf Symbolic link
View file

@ -0,0 +1 @@
../../../../../fira/otf/FiraMono-Regular.otf

BIN
theme/src/main/assets/fonts/FiraMono-Regular.ttf
View file

Binary file not shown.

1
theme/src/main/assets/fonts/FiraSans-Bold.otf Symbolic link
View file

@ -0,0 +1 @@
../../../../../fira/otf/FiraSans-Bold.otf

BIN
theme/src/main/assets/fonts/FiraSans-Bold.ttf
View file

Binary file not shown.

1
theme/src/main/assets/fonts/FiraSans-BoldItalic.otf Symbolic link
View file

@ -0,0 +1 @@
../../../../../fira/otf/FiraSans-BoldItalic.otf

BIN
theme/src/main/assets/fonts/FiraSans-BoldItalic.ttf
View file

Binary file not shown.

1
theme/src/main/assets/fonts/FiraSans-Heavy.otf Symbolic link
View file

@ -0,0 +1 @@
../../../../../fira/otf/FiraSans-Heavy.otf

BIN
theme/src/main/assets/fonts/FiraSans-Heavy.ttf
View file

Binary file not shown.

1
theme/src/main/assets/fonts/FiraSans-HeavyItalic.otf Symbolic link
View file

@ -0,0 +1 @@
../../../../../fira/otf/FiraSans-HeavyItalic.otf

BIN
theme/src/main/assets/fonts/FiraSans-HeavyItalic.ttf
View file

Binary file not shown.

1
theme/src/main/assets/fonts/FiraSans-Italic.otf Symbolic link
View file

@ -0,0 +1 @@
../../../../../fira/otf/FiraSans-Italic.otf

BIN
theme/src/main/assets/fonts/FiraSans-Italic.ttf
View file

Binary file not shown.

1
theme/src/main/assets/fonts/FiraSans-Light.otf Symbolic link
View file

@ -0,0 +1 @@
../../../../../fira/otf/FiraSans-Light.otf

BIN
theme/src/main/assets/fonts/FiraSans-Light.ttf
View file

Binary file not shown.

1
theme/src/main/assets/fonts/FiraSans-LightItalic.otf Symbolic link
View file

@ -0,0 +1 @@
../../../../../fira/otf/FiraSans-LightItalic.otf

BIN
theme/src/main/assets/fonts/FiraSans-LightItalic.ttf
View file

Binary file not shown.

1
theme/src/main/assets/fonts/FiraSans-Medium.otf Symbolic link
View file

@ -0,0 +1 @@
../../../../../fira/otf/FiraSans-Medium.otf

BIN
theme/src/main/assets/fonts/FiraSans-Medium.ttf
View file

Binary file not shown.

1
theme/src/main/assets/fonts/FiraSans-MediumItalic.otf Symbolic link
View file

@ -0,0 +1 @@
../../../../../fira/otf/FiraSans-MediumItalic.otf

BIN
theme/src/main/assets/fonts/FiraSans-MediumItalic.ttf
View file

Binary file not shown.

1
theme/src/main/assets/fonts/FiraSans-Regular.otf Symbolic link
View file

@ -0,0 +1 @@
../../../../../fira/otf/FiraSans-Regular.otf

BIN
theme/src/main/assets/fonts/FiraSans-Regular.ttf
View file

Binary file not shown.

1
theme/src/main/assets/fonts/FiraSans-SemiBold.otf Symbolic link
View file

@ -0,0 +1 @@
../../../../../fira/otf/FiraSans-SemiBold.otf

BIN
theme/src/main/assets/fonts/FiraSans-SemiBold.ttf
View file

Binary file not shown.

1
theme/src/main/assets/fonts/FiraSans-SemiBoldItalic.otf Symbolic link
View file

@ -0,0 +1 @@
../../../../../fira/otf/FiraSans-SemiBoldItalic.otf

BIN
theme/src/main/assets/fonts/FiraSans-SemiBoldItalic.ttf
View file

Binary file not shown.

1
theme/src/main/assets/fonts/FiraSans-Thin.otf Symbolic link
View file

@ -0,0 +1 @@
../../../../../fira/otf/FiraSans-Thin.otf

BIN
theme/src/main/assets/fonts/FiraSans-Thin.ttf
View file

Binary file not shown.

1
theme/src/main/assets/fonts/FiraSans-ThinItalic.otf Symbolic link
View file

@ -0,0 +1 @@
../../../../../fira/otf/FiraSans-ThinItalic.otf

BIN
theme/src/main/assets/fonts/FiraSans-ThinItalic.ttf
View file

Binary file not shown.

1
theme/src/main/assets/fonts/FiraSans-Ultra.otf Symbolic link
View file

@ -0,0 +1 @@
../../../../../fira/otf/FiraSans-Ultra.otf

BIN
theme/src/main/assets/fonts/FiraSans-Ultra.ttf
View file

Binary file not shown.

1
theme/src/main/assets/fonts/FiraSans-UltraItalic.otf Symbolic link
View file

@ -0,0 +1 @@
../../../../../fira/otf/FiraSans-UltraItalic.otf

BIN
theme/src/main/assets/fonts/FiraSans-UltraItalic.ttf
View file

Binary file not shown.

1
theme/src/main/assets/fonts/FiraSans-UltraLight.otf Symbolic link
View file

@ -0,0 +1 @@
../../../../../fira/otf/FiraSans-UltraLight.otf

BIN
theme/src/main/assets/fonts/FiraSans-UltraLight.ttf
View file

Binary file not shown.

1
theme/src/main/assets/fonts/FiraSans-UltraLightItalic.otf Symbolic link
View file

@ -0,0 +1 @@
../../../../../fira/otf/FiraSans-UltraLightItalic.otf

BIN
theme/src/main/assets/fonts/FiraSans-UltraLightItalic.ttf
View file

Binary file not shown.

1
theme/src/main/assets/fonts/FiraSansCondensed-Bold.otf Symbolic link
View file

@ -0,0 +1 @@
../../../../../fira/otf/FiraSansCondensed-Bold.otf

1
theme/src/main/assets/fonts/FiraSansCondensed-BoldItalic.otf Symbolic link
View file

@ -0,0 +1 @@
../../../../../fira/otf/FiraSansCondensed-BoldItalic.otf

1
theme/src/main/assets/fonts/FiraSansCondensed-Heavy.otf Symbolic link
View file

@ -0,0 +1 @@
../../../../../fira/otf/FiraSansCondensed-Heavy.otf

1
theme/src/main/assets/fonts/FiraSansCondensed-HeavyItalic.otf Symbolic link
View file

@ -0,0 +1 @@
../../../../../fira/otf/FiraSansCondensed-HeavyItalic.otf

1
theme/src/main/assets/fonts/FiraSansCondensed-Italic.otf Symbolic link
View file

@ -0,0 +1 @@
../../../../../fira/otf/FiraSansCondensed-Italic.otf

1
theme/src/main/assets/fonts/FiraSansCondensed-Light.otf Symbolic link
View file

@ -0,0 +1 @@
../../../../../fira/otf/FiraSansCondensed-Light.otf

1
theme/src/main/assets/fonts/FiraSansCondensed-LightItalic.otf Symbolic link
View file

@ -0,0 +1 @@
../../../../../fira/otf/FiraSansCondensed-LightItalic.otf

1
theme/src/main/assets/fonts/FiraSansCondensed-Medium.otf Symbolic link
View file

@ -0,0 +1 @@
../../../../../fira/otf/FiraSansCondensed-Medium.otf

1
theme/src/main/assets/fonts/FiraSansCondensed-MediumItalic.otf Symbolic link
View file

@ -0,0 +1 @@
../../../../../fira/otf/FiraSansCondensed-MediumItalic.otf

1
theme/src/main/assets/fonts/FiraSansCondensed-Regular.otf Symbolic link
View file

@ -0,0 +1 @@
../../../../../fira/otf/FiraSansCondensed-Regular.otf

1
theme/src/main/assets/fonts/FiraSansCondensed-SemiBold.otf Symbolic link
View file

@ -0,0 +1 @@
../../../../../fira/otf/FiraSansCondensed-SemiBold.otf

1
theme/src/main/assets/fonts/FiraSansCondensed-SemiboldItalic.otf Symbolic link
View file

@ -0,0 +1 @@
../../../../../fira/otf/FiraSansCondensed-SemiboldItalic.otf

1
theme/src/main/assets/fonts/FiraSansCondensed-Thin.otf Symbolic link
View file

@ -0,0 +1 @@
../../../../../fira/otf/FiraSansCondensed-Thin.otf

1
theme/src/main/assets/fonts/FiraSansCondensed-ThinItalic.otf Symbolic link
View file

@ -0,0 +1 @@
../../../../../fira/otf/FiraSansCondensed-ThinItalic.otf

1
theme/src/main/assets/fonts/FiraSansCondensed-Ultra.otf Symbolic link
View file

@ -0,0 +1 @@
../../../../../fira/otf/FiraSansCondensed-Ultra.otf

1
theme/src/main/assets/fonts/FiraSansCondensed-UltraItalic.otf Symbolic link
View file

@ -0,0 +1 @@
../../../../../fira/otf/FiraSansCondensed-UltraItalic.otf

1
theme/src/main/assets/fonts/FiraSansCondensed-UltraLight.otf Symbolic link
View file

@ -0,0 +1 @@
../../../../../fira/otf/FiraSansCondensed-UltraLight.otf

1
theme/src/main/assets/fonts/FiraSansCondensed-UltraLightItalic.otf Symbolic link
View file

@ -0,0 +1 @@
../../../../../fira/otf/FiraSansCondensed-UltraLightItalic.otf

63
theme/src/main/assets/fonts/fonts.xml
View file

@ -2,24 +2,24 @@
<familyset version="22"> <familyset version="22">
<!-- first font is default --> <!-- first font is default -->
<family name="sans-serif"> <family name="sans-serif">
<font weight="100" style="normal">FiraSans-Thin.ttf</font> <font weight="100" style="normal">FiraSans-Thin.otf</font>
<font weight="100" style="italic">FiraSans-ThinItalic.ttf</font> <font weight="100" style="italic">FiraSans-ThinItalic.otf</font>
<font weight="200" style="normal">FiraSans-UltraLight.ttf</font> <font weight="200" style="normal">FiraSans-UltraLight.otf</font>
<font weight="200" style="italic">FiraSans-UltraLightItalic.ttf</font> <font weight="200" style="italic">FiraSans-UltraLightItalic.otf</font>
<font weight="300" style="normal">FiraSans-Light.ttf</font> <font weight="300" style="normal">FiraSans-Light.otf</font>
<font weight="300" style="italic">FiraSans-LightItalic.ttf</font> <font weight="300" style="italic">FiraSans-LightItalic.otf</font>
<font weight="400" style="normal">FiraSans-Regular.ttf</font> <font weight="400" style="normal">FiraSans-Regular.otf</font>
<font weight="400" style="italic">FiraSans-Italic.ttf</font> <font weight="400" style="italic">FiraSans-Italic.otf</font>
<font weight="500" style="normal">FiraSans-Medium.ttf</font> <font weight="500" style="normal">FiraSans-Medium.otf</font>
<font weight="500" style="italic">FiraSans-MediumItalic.ttf</font> <font weight="500" style="italic">FiraSans-MediumItalic.otf</font>
<font weight="600" style="normal">FiraSans-SemiBold.ttf</font> <font weight="600" style="normal">FiraSans-SemiBold.otf</font>
<font weight="600" style="italic">FiraSans-SemiBoldItalic.ttf</font> <font weight="600" style="italic">FiraSans-SemiBoldItalic.otf</font>
<font weight="700" style="normal">FiraSans-Bold.ttf</font> <font weight="700" style="normal">FiraSans-Bold.otf</font>
<font weight="700" style="italic">FiraSans-BoldItalic.ttf</font> <font weight="700" style="italic">FiraSans-BoldItalic.otf</font>
<font weight="800" style="normal">FiraSans-Heavy.ttf</font> <font weight="800" style="normal">FiraSans-Heavy.otf</font>
<font weight="800" style="italic">FiraSans-HeavyItalic.ttf</font> <font weight="800" style="italic">FiraSans-HeavyItalic.otf</font>
<font weight="900" style="normal">FiraSans-Ultra.ttf</font> <font weight="900" style="normal">FiraSans-Ultra.otf</font>
<font weight="900" style="italic">FiraSans-UltraItalic.ttf</font> <font weight="900" style="italic">FiraSans-UltraItalic.otf</font>
</family> </family>
<!-- Note that aliases must come after the fonts they reference. --> <!-- Note that aliases must come after the fonts they reference. -->
@ -32,10 +32,31 @@
<alias name="tahoma" to="sans-serif" /> <alias name="tahoma" to="sans-serif" />
<alias name="verdana" to="sans-serif" /> <alias name="verdana" to="sans-serif" />
<family name="sans-serif-condensed">
<font weight="100" style="normal">FiraSansCondensed-Thin.otf</font>
<font weight="100" style="italic">FiraSansCondensed-ThinItalic.otf</font>
<font weight="200" style="normal">FiraSansCondensed-UltraLight.otf</font>
<font weight="200" style="italic">FiraSansCondensed-UltraLightItalic.otf</font>
<font weight="300" style="normal">FiraSansCondensed-Light.otf</font>
<font weight="300" style="italic">FiraSansCondensed-LightItalic.otf</font>
<font weight="400" style="normal">FiraSansCondensed-Regular.otf</font>
<font weight="400" style="italic">FiraSansCondensed-Italic.otf</font>
<font weight="500" style="normal">FiraSansCondensed-Medium.otf</font>
<font weight="500" style="italic">FiraSansCondensed-MediumItalic.otf</font>
<font weight="600" style="normal">FiraSansCondensed-SemiBold.otf</font>
<font weight="600" style="italic">FiraSansCondensed-SemiboldItalic.otf</font>
<font weight="700" style="normal">FiraSansCondensed-Bold.otf</font>
<font weight="700" style="italic">FiraSansCondensed-BoldItalic.otf</font>
<font weight="800" style="normal">FiraSansCondensed-Heavy.otf</font>
<font weight="800" style="italic">FiraSansCondensed-HeavyItalic.otf</font>
<font weight="900" style="normal">FiraSansCondensed-Ultra.otf</font>
<font weight="900" style="italic">FiraSansCondensed-UltraItalic.otf</font>
</family>
<family name="monospace"> <family name="monospace">
<font weight="400" style="normal">FiraMono-Regular.ttf</font> <font weight="400" style="normal">FiraMono-Regular.otf</font>
<font weight="500" style="normal">FiraMono-Medium.ttf</font> <font weight="500" style="normal">FiraMono-Medium.otf</font>
<font weight="700" style="normal">FiraMono-Bold.ttf</font> <font weight="700" style="normal">FiraMono-Bold.otf</font>
</family> </family>
<alias name="sans-serif-monospace" to="monospace" /> <alias name="sans-serif-monospace" to="monospace" />
<alias name="monaco" to="monospace" /> <alias name="monaco" to="monospace" />

BIN
theme/src/main/res/drawable-hdpi/ic_launcher.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 13 KiB

BIN
theme/src/main/res/drawable-mdpi/ic_launcher.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 11 KiB