Merge branch 'release/v2.5.1'

Author: mikepenz

README.md

@@ -22,14 +22,18 @@ Use the icons in the variation you need them.
 - Save in APK size
 
 **Already available fonts**
-- FontAwesome
-- Material Design Icons
-- Meteocons
-- Octicons
-- Community Material Icons
-- Weather Icons
-- Typeicons
-- Entypo
+- [Google Material Design Icons](https://github.com/google/material-design-icons)
+- [Material Design Iconic Font](http://zavoloklom.github.io/material-design-iconic-font)
+- [Fontawesome](http://fontawesome.io)
+- [Meteocons](http://www.alessioatzeni.com/meteocons/)
+- [Octicons](https://github.com/github/octicons)
+- [Community Material](http://materialdesignicons.com/)
+- [Weather Icons](https://erikflowers.github.io/weather-icons/)
+- [Typeicons](http://typicons.com/)
+- [Entypo](http://www.entypo.com/)
+- [Devicon](http://devicon.fr/)
+- [Foundation Icons](http://zurb.com/playground/foundation-icon-fonts-3)
+- [Ionicons](http://ionicons.com/)
 
 **Need more?**
 Provide additional fonts for you project, or even create your custom font with just the icons you need.
@@ -42,22 +46,24 @@ Provide additional fonts for you project, or even create your custom font with j
 ##1. Provide the gradle dependency
 ```gradle
 dependencies {
-	compile 'com.mikepenz:iconics-core:2.5.0@aar'
+	compile 'com.mikepenz:iconics-core:2.5.1@aar'
 }
 ```
 
 ##2. Choose your desired fonts
 ```gradle
-compile 'com.mikepenz:google-material-typeface:2.2.0.1@aar'
-//this one is the original set by google different baseline may (really really rare) mapping issues on single custom roms 
 compile 'com.mikepenz:google-material-typeface:2.1.0.1.original@aar' 
-compile 'com.mikepenz:fontawesome-typeface:4.4.0.1@aar'
+compile 'com.mikepenz:material-design-iconic-typeface:2.2.0.1@aar'
+compile 'com.mikepenz:fontawesome-typeface:4.5.0.1@aar'
 compile 'com.mikepenz:octicons-typeface:3.2.0.1@aar'
 compile 'com.mikepenz:meteocons-typeface:1.1.0.1@aar'
 compile 'com.mikepenz:community-material-typeface:1.3.41.1@aar'
 compile 'com.mikepenz:weather-icons-typeface:2.0.10.1@aar'
 compile 'com.mikepenz:typeicons-typeface:2.0.7.1@aar'
-compile 'com.mikepenz:entypo:1.0.0.1@aar'
+compile 'com.mikepenz:entypo-typeface:1.0.0.1@aar'
+compile 'com.mikepenz:devicon-typeface:2.0.0.1@aar'
+compile 'com.mikepenz:foundation-icons-typeface-typeface:3.0.0.1@aar'
+compile 'com.mikepenz:ionicons-typeface:2.0.1.1@aar'
 ```
 
 ##3. Define IconicsLayoutInflater to enable automatic xml icons detection (optional)
@@ -172,10 +178,12 @@ Some great text with a {faw-android} font awesome icon and {met-wind} meteocons
 
 
 #Available fonts
-* [Google Material Design Iconic Font](http://zavoloklom.github.io/material-design-iconic-font) - [Google Material Design Icons](https://github.com/google/material-design-icons)
+* [Google Material Design Icons](https://github.com/google/material-design-icons)
   * "gmd"
-  * **Google Material Iconic** compile 'com.mikepenz:google-material-typeface:+@aar'
   * **ORIGINAL by Google** compile 'com.mikepenz:google-material-typeface:+.original@aar'
+* [Material Design Iconic Font](http://zavoloklom.github.io/material-design-iconic-font)
+  * "gmi"
+  * **Google Material Iconic** compile 'com.mikepenz:material-design-iconic-typeface:+@aar'
 * [Fontawesome](http://fontawesome.io)
   * "faw"
   * compile 'com.mikepenz:fontawesome-typeface:+@aar'
@@ -196,8 +204,18 @@ Some great text with a {faw-android} font awesome icon and {met-wind} meteocons
   * compile 'com.mikepenz:typeicons-typeface:+@aar'
 * [Entypo](http://www.entypo.com/)
   * "ent"
-  * compile 'com.mikepenz:entypo:+@aar'
-
+  * compile 'com.mikepenz:entypo-typeface:+@aar'
+* [Devicon](http://devicon.fr/)
+  * "dev"
+  * compile 'com.mikepenz:devicon-typeface:+@aar'
+* [Foundation Icons](http://zurb.com/playground/foundation-icon-fonts-3)
+  * "fou"
+  * compile 'com.mikepenz:foundation-icons-typeface:+@aar'
+* [Ionicons](http://ionicons.com/)
+  * "ion"
+  * compile 'com.mikepenz:ionicons-typeface:+@aar'
+
+Licenses for all included fonts are linked inside the class or can be found on the coresponding repoistories.
 
 #Advanced Usage
 

app/build.gradle

@@ -12,8 +12,8 @@ android {
     defaultConfig {
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
-        versionCode 250
-        versionName "2.5.0"
+        versionCode 251
+        versionName "2.5.1"
         enforceUniquePackageName false
     }
 
@@ -65,12 +65,15 @@ dependencies {
     }
 
     compile project(':fontawesome-typeface-library')
+    compile project(':material-design-iconic-typeface-library')
     compile project(':google-material-typeface-library')
-    //compile project(':original-google-material-typeface-library')
     compile project(':meteocons-typeface-library')
     compile project(':weather-icons-typeface-library')
     compile project(':octicons-typeface-library')
     compile project(':community-material-typeface-library')
     compile project(':entypo-typeface-library')
     compile project(':typeicons-typeface-library')
+    compile project(':devicon-typeface-library')
+    compile project(':foundation-icons-typeface-library')
+    compile project(':ionicons-typeface-library')
 }

app/src/main/java/com/mikepenz/iconics/sample/CustomApplication.java

@@ -17,7 +17,7 @@ public void onCreate() {
         Iconics.registerFont(new CustomFont());
 
         //Generic font creation process
-        GenericFont gf2 = new GenericFont("gmf", "fonts/materialdrawerfont.ttf");
+        GenericFont gf2 = new GenericFont("GenericFont", "SampleGenericFont", "gmf", "fonts/materialdrawerfont.ttf");
         gf2.registerIcon("person", '\ue800');
         gf2.registerIcon("up", '\ue801');
         gf2.registerIcon("down", '\ue802');

app/src/main/java/com/mikepenz/iconics/sample/MainActivity.java

@@ -44,15 +44,18 @@
 import com.mikepenz.materialdrawer.model.interfaces.IDrawerItem;
 
 import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Comparator;
 import java.util.Iterator;
+import java.util.List;
 import java.util.Random;
 
 
 public class MainActivity extends AppCompatActivity {
 
     private IconsFragment mIconsFragment;
     private boolean mRandomize;
-
+    private List<ITypeface> mFonts;
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
@@ -64,9 +67,18 @@ protected void onCreate(Bundle savedInstanceState) {
         setSupportActionBar(toolbar);
         getSupportActionBar().setDisplayHomeAsUpEnabled(false);
 
-        ArrayList<IDrawerItem> items = new ArrayList<>(Iconics.getRegisteredFonts(this).size());
+        //order fonts by their name
+        mFonts = new ArrayList<>(Iconics.getRegisteredFonts(this));
+        Collections.sort(mFonts, new Comparator<ITypeface>() {
+            @Override
+            public int compare(final ITypeface object1, final ITypeface object2) {
+                return object1.getFontName().compareTo(object2.getFontName());
+            }
+        });
+
         //add all icons of all registered Fonts to the list
-        for (ITypeface font : Iconics.getRegisteredFonts(this)) {
+        ArrayList<IDrawerItem> items = new ArrayList<>(Iconics.getRegisteredFonts(this).size());
+        for (ITypeface font : mFonts) {
             PrimaryDrawerItem pdi = new PrimaryDrawerItem()
                     .withName(font.getFontName())
                     .withBadge("" + font.getIcons().size())
@@ -89,10 +101,8 @@ protected void onCreate(Bundle savedInstanceState) {
                 .withOnDrawerItemClickListener(new Drawer.OnDrawerItemClickListener() {
                     @Override
                     public boolean onItemClick(View view, int i, IDrawerItem iDrawerItem) {
-                        ITypeface font = new ArrayList<>(Iconics.getRegisteredFonts(MainActivity.this)).get(i);
-                        loadIcons(font.getFontName());
-
-                        getSupportActionBar().setTitle(font.getFontName());
+                        loadIcons(mFonts.get(i).getFontName());
+                        getSupportActionBar().setTitle(mFonts.get(i).getFontName());
 
                         return false;
                     }

app/src/main/java/com/mikepenz/iconics/sample/typeface/CustomFont.java

@@ -50,7 +50,7 @@ public String getFontName() {
 
     @Override
     public String getVersion() {
-        return "";
+        return "1.0.0";
     }
 
     @Override
@@ -72,7 +72,7 @@ public Collection<String> getIcons() {
 
     @Override
     public String getAuthor() {
-        return "";
+        return "SampleCustomFont";
     }
 
     @Override

build.gradle

@@ -5,7 +5,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:2.0.0-alpha1'
+        classpath 'com.android.tools.build:gradle:2.0.0-alpha2'
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files

devicon-typeface-library/build.gradle

@@ -0,0 +1,43 @@
+/*
+ * Copyright 2014 Mike Penz
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+apply plugin: 'com.android.library'
+
+android {
+    compileSdkVersion rootProject.ext.compileSdkVersion
+    buildToolsVersion '23.0.2'
+
+    defaultConfig {
+        minSdkVersion rootProject.ext.minSdkVersion
+        targetSdkVersion rootProject.ext.targetSdkVersion
+        consumerProguardFiles 'consumer-proguard-rules.pro'
+        versionCode 20001
+        versionName "2.0.0.1"
+    }
+    buildTypes {
+        release {
+            minifyEnabled false
+            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
+        }
+    }
+}
+if (project.hasProperty('pushall') || project.hasProperty('DevIcononly')) {
+    apply from: '../gradle-mvn-push.gradle'
+}
+
+dependencies {
+    compile project(':library-core')
+}

devicon-typeface-library/consumer-proguard-rules.pro

@@ -0,0 +1 @@
+-keep class com.mikepenz.devicon_typeface_library.DevIcon { *; }

original-google-material-typeface-library/gradle.properties renamed to devicon-typeface-library/gradle.properties

@@ -32,9 +32,9 @@
 # This option should only be used with decoupled projects. More details, visit
 # http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
 # org.gradle.parallel=true
-VERSION_NAME=2.1.0.1.original
-VERSION_CODE=21001
+VERSION_NAME=2.0.0.1
+VERSION_CODE=20001
 
-POM_NAME=Android-Iconics Google Material Typeface Library
-POM_ARTIFACT_ID=google-material-typeface
+POM_NAME=Android-Iconics DevIcon Typeface Library
+POM_ARTIFACT_ID=devicon-typeface
 POM_PACKAGING=aar

original-google-material-typeface-library/src/main/AndroidManifest.xml renamed to devicon-typeface-library/src/main/AndroidManifest.xml

@@ -14,6 +14,6 @@
   ~ limitations under the License.
   -->
 
-<manifest package="com.mikepenz.google_material_typeface_library">
+<manifest package="com.mikepenz.devicon_typeface_library">
     <application/>
 </manifest>