Removed unused fonts, fixed weights order.

0x414c · Aug 4, 2016 · 015e22e · 015e22e
1 parent 376cf4a
commit 015e22e
Show file tree

Hide file tree

Showing 11 changed files with 23 additions and 16 deletions.
diff --git a/build.gradle b/build.gradle
@@ -5,7 +5,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:1.5.0'
+        classpath 'com.android.tools.build:gradle:2.1.2'
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files

diff --git a/store_icon.png b/store_icon.png
diff --git a/theme/build.gradle b/theme/build.gradle
@@ -2,14 +2,14 @@ apply plugin: 'com.android.application'
 
 android {
     compileSdkVersion 21
-    buildToolsVersion "23.0.2"
+    buildToolsVersion "23.0.3"
 
     defaultConfig {
         applicationId "com.mozilla.font.firasans"
         minSdkVersion 21
         targetSdkVersion 21
         maxSdkVersion 23
-        versionCode 4
+        versionCode 5
         versionName "4.106.1"
     }
 

diff --git a/theme/src/main/assets/fonts/FiraMono-Medium.ttf b/theme/src/main/assets/fonts/FiraMono-Medium.ttf
diff --git a/theme/src/main/assets/fonts/FiraSans-ExtraBold.ttf b/theme/src/main/assets/fonts/FiraSans-ExtraBold.ttf
diff --git a/theme/src/main/assets/fonts/FiraSans-ExtraBoldItalic.ttf b/theme/src/main/assets/fonts/FiraSans-ExtraBoldItalic.ttf
diff --git a/theme/src/main/assets/fonts/FiraSans-ExtraLight.ttf b/theme/src/main/assets/fonts/FiraSans-ExtraLight.ttf
diff --git a/theme/src/main/assets/fonts/FiraSans-ExtraLightItalic.ttf b/theme/src/main/assets/fonts/FiraSans-ExtraLightItalic.ttf
diff --git a/theme/src/main/assets/fonts/FiraSans-SemiBold.ttf b/theme/src/main/assets/fonts/FiraSans-SemiBold.ttf
diff --git a/theme/src/main/assets/fonts/FiraSans-SemiBoldItalic.ttf b/theme/src/main/assets/fonts/FiraSans-SemiBoldItalic.ttf
diff --git a/theme/src/main/assets/fonts/fonts.xml b/theme/src/main/assets/fonts/fonts.xml
@@ -20,33 +20,38 @@ paired with the 500 weight, ensuring adequate contrast.
 <familyset version="22">
 
     <!--
-    Common weight name mapping
+    NOTE: Common weight name mapping:
     The 100 to 900 values roughly correspond to the following common weight names:
-    100 - Thin (Hairline); 200 - Extra Light (Ultra Light); 300 - Light;
-    400 - Normal; 500 - Medium; 600 - Semi Bold (Demi Bold); 700 - Bold;
-    800 - Extra Bold (Ultra Bold); 900 - Black (Heavy).
+    100 - Thin (Hairline);
+    200 - Extra Light (Ultra Light);
+    300 - Light;
+    400 - Normal; ***
+    500 - Medium;
+    600 - Semi Bold (Demi Bold);
+    700 - Bold; ***
+    800 - Extra Bold (Ultra Bold);
+    900 - Black (Heavy).
     -->
 
     <!-- first font is default -->
     <family name="sans-serif">
         <font weight="100" style="normal">FiraSans-Thin.ttf</font>
         <font weight="100" style="italic">FiraSans-ThinItalic.ttf</font>
-        <font weight="200" style="normal">FiraSans-ExtraLight.ttf</font>
-        <font weight="200" style="italic">FiraSans-ExtraLightItalic.ttf</font>
+
         <font weight="300" style="normal">FiraSans-Light.ttf</font>
         <font weight="300" style="italic">FiraSans-LightItalic.ttf</font>
+
         <font weight="400" style="normal">FiraSans-Regular.ttf</font>
         <font weight="400" style="italic">FiraSans-Italic.ttf</font>
+
         <font weight="500" style="normal">FiraSans-Medium.ttf</font>
         <font weight="500" style="italic">FiraSans-MediumItalic.ttf</font>
-        <font weight="600" style="normal">FiraSans-SemiBold.ttf</font>
-        <font weight="600" style="italic">FiraSans-SemiBoldItalic.ttf</font>
-        <font weight="700" style="normal">FiraSans-Bold.ttf</font>
-        <font weight="700" style="italic">FiraSans-BoldItalic.ttf</font>
-        <font weight="800" style="normal">FiraSans-ExtraBold.ttf</font>
-        <font weight="800" style="italic">FiraSans-ExtraBoldItalic.ttf</font>
+
         <font weight="900" style="normal">FiraSans-Heavy.ttf</font>
         <font weight="900" style="italic">FiraSans-HeavyItalic.ttf</font>
+
+        <font weight="700" style="normal">FiraSans-Bold.ttf</font>
+        <font weight="700" style="italic">FiraSans-BoldItalic.ttf</font>
     </family>
 
     <!-- Note that aliases must come after the fonts they reference. -->
@@ -62,8 +67,10 @@ paired with the 500 weight, ensuring adequate contrast.
     <family name="sans-serif-condensed">
         <font weight="300" style="normal">FiraSansCondensed-Light.ttf</font>
         <font weight="300" style="italic">FiraSansCondensed-LightItalic.ttf</font>
+
         <font weight="400" style="normal">FiraSansCondensed-Regular.ttf</font>
         <font weight="400" style="italic">FiraSansCondensed-Italic.ttf</font>
+
         <font weight="700" style="normal">FiraSansCondensed-Bold.ttf</font>
         <font weight="700" style="italic">FiraSansCondensed-BoldItalic.ttf</font>
     </family>
@@ -72,7 +79,7 @@ paired with the 500 weight, ensuring adequate contrast.
 
     <family name="monospace">
         <font weight="400" style="normal">FiraMono-Regular.ttf</font>
-        <font weight="500" style="normal">FiraMono-Medium.ttf</font>
+
         <font weight="700" style="normal">FiraMono-Bold.ttf</font>
     </family>