Skip to content

Commit

Permalink
Update font to 2.2.0
Browse files Browse the repository at this point in the history
  • Loading branch information
Malinskiy committed Jun 11, 2016
1 parent 469d548 commit 6545eab
Show file tree
Hide file tree
Showing 7 changed files with 51 additions and 128 deletions.
14 changes: 7 additions & 7 deletions android-material-icons-sample/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,13 @@ apply plugin: 'android-apt'
def AAVersion = '3.3.1'

android {
compileSdkVersion 22
buildToolsVersion "22.0.1"
compileSdkVersion 23
buildToolsVersion "23.0.3"

defaultConfig {
applicationId "com.malinskiy.materialicons.sample"
minSdkVersion 8
targetSdkVersion 22
targetSdkVersion 23
versionCode 1
versionName "1.0"
}
Expand All @@ -33,10 +33,10 @@ dependencies {
apt "org.androidannotations:androidannotations:$AAVersion"
compile "org.androidannotations:androidannotations-api:$AAVersion"

compile 'com.android.support:support-v4:22.2.0'
compile 'com.android.support:appcompat-v7:22.2.0'
compile 'com.android.support:cardview-v7:22.2.0'
compile 'com.android.support:recyclerview-v7:22.2.0'
compile 'com.android.support:support-v4:23.4.0'
compile 'com.android.support:appcompat-v7:23.4.0'
compile 'com.android.support:cardview-v7:23.4.0'
compile 'com.android.support:recyclerview-v7:23.4.0'

compile 'com.github.johnkil.android-robototextview:robototextview:2.2.0'
}
Expand Down
11 changes: 5 additions & 6 deletions android-material-icons/build.gradle
Original file line number Diff line number Diff line change
@@ -1,13 +1,12 @@
apply plugin: 'com.android.library'
apply plugin: 'org.robolectric'

android {
compileSdkVersion 22
buildToolsVersion "22.0.1"
compileSdkVersion 23
buildToolsVersion "23.0.3"

defaultConfig {
minSdkVersion 4
targetSdkVersion 22
targetSdkVersion 23
versionCode 1
versionName "1.0.0"
}
Expand All @@ -23,7 +22,7 @@ android {

dependencies {
testCompile 'junit:junit:4.12'
testCompile 'org.robolectric:robolectric:2.4'
testCompile 'org.robolectric:robolectric:3.0'
}

apply from: 'https://raw.github.com/chrisbanes/gradle-mvn-push/master/gradle-mvn-push.gradle'
//apply from: 'https://raw.github.com/chrisbanes/gradle-mvn-push/master/gradle-mvn-push.gradle'
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@

public final class Iconify {

private static final String TTF_FILE = "material-design-iconic-font-2.1.1.ttf";
private static final String TTF_FILE = "material-design-iconic-font-2.2.0.ttf";

public static final String TAG = Iconify.class.getSimpleName();

Expand Down Expand Up @@ -684,7 +684,7 @@ public static enum IconValue {
zmdi_pocket('\uf359'),
zmdi_polymer('\uf35a'),
zmdi_share('\uf35b'),
zmdi_stack_overflow('\uf35c'),
zmdi_stackoverflow('\uf35c'),
zmdi_steam_square('\uf35d'),
zmdi_steam('\uf35e'),
zmdi_twitter_box('\uf35f'),
Expand Down Expand Up @@ -825,114 +825,39 @@ public static enum IconValue {
zmdi_tap_and_play('\uf3e6'),
zmdi_vibration('\uf3e7'),
zmdi_voicemail('\uf3e8'),
zmdi_import_export('\uf30c'),
zmdi_swap_vertical_('\uf30c'),
zmdi_airplanemode_inactive('\uf102'),
zmdi_airplanemode_active('\uf103'),
zmdi_rate_review('\uf103'),
zmdi_comment_sign('\uf25a'),
zmdi_network_warning('\uf2ad'),
zmdi_shopping_cart_add('\uf1ca'),
zmdi_file_add('\uf221'),
zmdi_network_wifi_scan('\uf2e4'),
zmdi_collection_add('\uf14e'),
zmdi_format_playlist_add('\uf3ac'),
zmdi_format_queue_music('\uf3ab'),
zmdi_plus_box('\uf277'),
zmdi_tag_backspace('\uf1d9'),
zmdi_alarm_add('\uf32b'),
zmdi_battery_charging('\uf114'),
zmdi_daydream_setting('\uf217'),
zmdi_more_horiz('\uf19c'),
zmdi_book_photo('\uf11b'),
zmdi_incandescent('\uf189'),
zmdi_wb_iridescent('\uf38c'),
zmdi_calendar_remove('\uf330'),
zmdi_refresh_sync_disabled('\uf1b7'),
zmdi_refresh_sync_problem('\uf1b6'),
zmdi_crop_original('\uf17e'),
zmdi_power_off('\uf1af'),
zmdi_power_off_setting('\uf1ae'),
zmdi_leak_remove('\uf38d'),
zmdi_star_border('\uf27c'),
zmdi_brightness_low('\uf36d'),
zmdi_brightness_medium('\uf36e'),
zmdi_brightness_high('\uf36f'),
zmdi_smartphone_portrait('\uf2d4'),
zmdi_live_tv('\uf2d9'),
zmdi_format_textdirection_l_to_r('\uf249'),
zmdi_format_textdirection_r_to_l('\uf24a'),
zmdi_arrow_back('\uf2ea'),
zmdi_arrow_forward('\uf2ee'),
zmdi_arrow_in('\uf2e9'),
zmdi_arrow_out('\uf2ed'),
zmdi_rotate_90_degrees_ccw('\uf304'),
zmdi_adb('\uf33a'),
zmdi_network_wifi('\uf2e8'),
zmdi_network_wifi_alt('\uf2e3'),
zmdi_network_wifi_lock('\uf2e5'),
zmdi_network_wifi_off('\uf2e6'),
zmdi_network_wifi_outline('\uf2e7'),
zmdi_network_wifi_info('\uf2e4'),
zmdi_layers_clear('\uf18b'),
zmdi_colorize('\uf15d'),
zmdi_format_paint('\uf1ba'),
zmdi_format_quote('\uf1b2'),
zmdi_camera_monochrome_photos('\uf285'),
zmdi_sort_by_alpha('\uf1cf'),
zmdi_folder_shared('\uf225'),
zmdi_folder_special('\uf226'),
zmdi_comment_dots('\uf260'),
zmdi_reorder('\uf31e'),
zmdi_dehaze('\uf197'),
zmdi_sort('\uf1ce'),
zmdi_pages('\uf34a'),
zmdi_calendar_account('\uf204'),
zmdi_paste('\uf109'),
zmdi_cut('\uf1bc'),
zmdi_save('\uf297'),
zmdi_smartphone_code('\uf139'),
zmdi_directions_bike('\uf117'),
zmdi_directions_boat('\uf11a'),
zmdi_directions_bus('\uf121'),
zmdi_directions_car('\uf125'),
zmdi_directions_railway('\uf1b3'),
zmdi_directions_run('\uf215'),
zmdi_directions_subway('\uf1d5'),
zmdi_directions_walk('\uf216'),
zmdi_local_hotel('\uf178'),
zmdi_local_activity('\uf1df'),
zmdi_local_play('\uf1df'),
zmdi_local_airport('\uf103'),
zmdi_local_atm('\uf198'),
zmdi_local_bar('\uf137'),
zmdi_local_cafe('\uf13b'),
zmdi_local_car_wash('\uf124'),
zmdi_local_convenience_store('\uf1d3'),
zmdi_local_dining('\uf153'),
zmdi_local_drink('\uf157'),
zmdi_local_florist('\uf168'),
zmdi_local_gas_station('\uf16f'),
zmdi_local_grocery_store('\uf1cb'),
zmdi_local_hospital('\uf177'),
zmdi_local_laundry_service('\uf1e9'),
zmdi_local_library('\uf18d'),
zmdi_local_mall('\uf195'),
zmdi_local_movies('\uf19d'),
zmdi_local_offer('\uf187'),
zmdi_local_parking('\uf1a5'),
zmdi_local_pharmacy('\uf176'),
zmdi_local_phone('\uf2be'),
zmdi_local_pizza('\uf1ac'),
zmdi_local_post_office('\uf15a'),
zmdi_local_printshop('\uf1b0'),
zmdi_local_see('\uf28c'),
zmdi_local_shipping('\uf1e6'),
zmdi_local_store('\uf1d4'),
zmdi_local_taxi('\uf123'),
zmdi_local_wc('\uf211'),
zmdi_my_location('\uf299'),
zmdi_directions('\uf1e7');
zmdi_group('\uf3e9'),
zmdi_rss('\uf3ea'),
zmdi_shape('\uf3eb'),
zmdi_spinner('\uf3ec'),
zmdi_ungroup('\uf3ed'),
zmdi_500px('\uf3ee'),
zmdi_8tracks('\uf3ef'),
zmdi_amazon('\uf3f0'),
zmdi_blogger('\uf3f1'),
zmdi_delicious('\uf3f2'),
zmdi_disqus('\uf3f3'),
zmdi_flattr('\uf3f4'),
zmdi_flickr('\uf3f5'),
zmdi_github_alt('\uf3f6'),
zmdi_google_old('\uf3f7'),
zmdi_linkedin('\uf3f8'),
zmdi_odnoklassniki('\uf3f9'),
zmdi_outlook('\uf3fa'),
zmdi_paypal_alt('\uf3fb'),
zmdi_pinterest('\uf3fc'),
zmdi_playstation('\uf3fd'),
zmdi_reddit('\uf3fe'),
zmdi_skype('\uf3ff'),
zmdi_slideshare('\uf400'),
zmdi_soundcloud('\uf401'),
zmdi_tumblr('\uf402'),
zmdi_twitch('\uf403'),
zmdi_vimeo('\uf404'),
zmdi_whatsapp('\uf405'),
zmdi_xbox('\uf406'),
zmdi_yahoo('\uf407'),
zmdi_youtube_play('\uf408'),
zmdi_youtube('\uf409');

char character;

Expand Down
Binary file not shown.
Binary file not shown.
5 changes: 2 additions & 3 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,8 @@ buildscript {
}

dependencies {
classpath 'com.android.tools.build:gradle:1.2.3'
classpath 'com.neenbedankt.gradle.plugins:android-apt:1.4'
classpath 'org.robolectric:robolectric-gradle-plugin:1.1.0'
classpath 'com.android.tools.build:gradle:2.1.0'
classpath 'com.neenbedankt.gradle.plugins:android-apt:1.8'
}
}

Expand Down
4 changes: 2 additions & 2 deletions gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#Mon Jul 06 13:14:13 MSK 2015
#Sat Jun 11 09:46:28 ICT 2016
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-2.2.1-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-2.10-all.zip

0 comments on commit 6545eab

Please sign in to comment.