Skip to content

Commit 93ec0db

Browse files
committed
* split up google material icons and material design iconics
* the material design iconics are now MaterialDesignIconic with prefix "gmi" * the google material icons are back to GoogleMaterial with prefix "gmd"
1 parent acc37b6 commit 93ec0db

File tree

15 files changed

+1061
-1059
lines changed

15 files changed

+1061
-1059
lines changed

README.md

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ Use the icons in the variation you need them.
2323

2424
**Already available fonts**
2525
- [Google Material Design Icons](https://github.com/google/material-design-icons)
26-
- [Google Material Design Iconic Font](http://zavoloklom.github.io/material-design-iconic-font)
26+
- [Material Design Iconic Font](http://zavoloklom.github.io/material-design-iconic-font)
2727
- [Fontawesome](http://fontawesome.io)
2828
- [Meteocons](http://www.alessioatzeni.com/meteocons/)
2929
- [Octicons](https://github.com/github/octicons)
@@ -52,9 +52,8 @@ dependencies {
5252

5353
##2. Choose your desired fonts
5454
```gradle
55-
compile 'com.mikepenz:google-material-typeface:2.2.0.1@aar'
56-
//this one is the original set by google different baseline may (really really rare) mapping issues on single custom roms
5755
compile 'com.mikepenz:google-material-typeface:2.1.0.1.original@aar'
56+
compile 'com.mikepenz:material-design-iconic-typeface:2.2.0.1@aar'
5857
compile 'com.mikepenz:fontawesome-typeface:4.5.0.1@aar'
5958
compile 'com.mikepenz:octicons-typeface:3.2.0.1@aar'
6059
compile 'com.mikepenz:meteocons-typeface:1.1.0.1@aar'
@@ -179,10 +178,12 @@ Some great text with a {faw-android} font awesome icon and {met-wind} meteocons
179178

180179

181180
#Available fonts
182-
* [Google Material Design Iconic Font](http://zavoloklom.github.io/material-design-iconic-font) - [Google Material Design Icons](https://github.com/google/material-design-icons)
181+
* [Google Material Design Icons](https://github.com/google/material-design-icons)
183182
* "gmd"
184-
* **Google Material Iconic** compile 'com.mikepenz:google-material-typeface:+@aar'
185183
* **ORIGINAL by Google** compile 'com.mikepenz:google-material-typeface:+.original@aar'
184+
* [Material Design Iconic Font](http://zavoloklom.github.io/material-design-iconic-font)
185+
* "gmi"
186+
* **Google Material Iconic** compile 'com.mikepenz:material-design-iconic-typeface:+@aar'
186187
* [Fontawesome](http://fontawesome.io)
187188
* "faw"
188189
* compile 'com.mikepenz:fontawesome-typeface:+@aar'

app/build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -65,8 +65,8 @@ dependencies {
6565
}
6666

6767
compile project(':fontawesome-typeface-library')
68-
compile project(':google-material-typeface-library')
69-
//compile project(':original-google-material-typeface-library')
68+
compile project(':material-design-iconic-typeface-library')
69+
compile project(':original-google-material-typeface-library')
7070
compile project(':meteocons-typeface-library')
7171
compile project(':weather-icons-typeface-library')
7272
compile project(':octicons-typeface-library')

google-material-typeface-library/consumer-proguard-rules.pro

Lines changed: 0 additions & 1 deletion
This file was deleted.

0 commit comments

Comments
 (0)