Skip to content

Commit fd0ce0d

Browse files
author
Wannes Ghielens
committed
Updated for v1.8.36
1 parent fd66736 commit fd0ce0d

File tree

18 files changed

+821
-60
lines changed

18 files changed

+821
-60
lines changed

.idea/gradle.xml

Lines changed: 8 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/misc.xml

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

README.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,9 @@ A library containing over 1500 material vector icons that can be easily used as
1010

1111
- MinSdk 4
1212
- LIVE previews and code completion in the Android Studio Designer (Does NOT work out of the box, see step 0 below!)
13-
- Currently contains 1712 icons, you can look at them here: https://materialdesignicons.com
13+
- Currently contains 1836 icons, you can look at them here: https://materialdesignicons.com
1414
- Configured in less than a minute
15-
- Adds about 200kb to your apk (so a wopping average of __120 bytes per icon__)
15+
- Adds about 200kb to your apk (so a wopping average of __112 bytes per icon__)
1616
- Includes a custom Drawable, IconView and a MenuInflater for all different icon use cases
1717

1818
# Usage
@@ -33,7 +33,7 @@ Previews work inside layout files, menu resource files sadly do not support prev
3333

3434
```groovy
3535
dependencies {
36-
compile 'net.steamcrafted:materialiconlib:1.1.1'
36+
compile 'net.steamcrafted:materialiconlib:1.1.2'
3737
}
3838
```
3939

app/app.iml

Lines changed: 20 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,7 @@
1212
<option name="SELECTED_TEST_ARTIFACT" value="_android_test_" />
1313
<option name="ASSEMBLE_TASK_NAME" value="assembleDebug" />
1414
<option name="COMPILE_JAVA_TASK_NAME" value="compileDebugSources" />
15-
<option name="ASSEMBLE_TEST_TASK_NAME" value="assembleDebugAndroidTest" />
16-
<option name="COMPILE_JAVA_TEST_TASK_NAME" value="compileDebugAndroidTestSources" />
1715
<afterSyncTasks>
18-
<task>generateDebugAndroidTestSources</task>
1916
<task>generateDebugSources</task>
2017
</afterSyncTasks>
2118
<option name="ALLOW_USER_CONFIGURATION" value="false" />
@@ -28,7 +25,7 @@
2825
</component>
2926
<component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_7" inherit-compiler-output="false">
3027
<output url="file://$MODULE_DIR$/build/intermediates/classes/debug" />
31-
<output-test url="file://$MODULE_DIR$/build/intermediates/classes/androidTest/debug" />
28+
<output-test url="file://$MODULE_DIR$/build/intermediates/classes/test/debug" />
3229
<exclude-output />
3330
<content url="file://$MODULE_DIR$">
3431
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/r/debug" isTestSource="false" generated="true" />
@@ -50,13 +47,27 @@
5047
<sourceFolder url="file://$MODULE_DIR$/src/debug/java" isTestSource="false" />
5148
<sourceFolder url="file://$MODULE_DIR$/src/debug/jni" isTestSource="false" />
5249
<sourceFolder url="file://$MODULE_DIR$/src/debug/rs" isTestSource="false" />
50+
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/res" type="java-test-resource" />
51+
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/resources" type="java-test-resource" />
52+
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/assets" type="java-test-resource" />
53+
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/aidl" isTestSource="true" />
54+
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/java" isTestSource="true" />
55+
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/jni" isTestSource="true" />
56+
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/rs" isTestSource="true" />
5357
<sourceFolder url="file://$MODULE_DIR$/src/main/res" type="java-resource" />
5458
<sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
5559
<sourceFolder url="file://$MODULE_DIR$/src/main/assets" type="java-resource" />
5660
<sourceFolder url="file://$MODULE_DIR$/src/main/aidl" isTestSource="false" />
5761
<sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
5862
<sourceFolder url="file://$MODULE_DIR$/src/main/jni" isTestSource="false" />
5963
<sourceFolder url="file://$MODULE_DIR$/src/main/rs" isTestSource="false" />
64+
<sourceFolder url="file://$MODULE_DIR$/src/test/res" type="java-test-resource" />
65+
<sourceFolder url="file://$MODULE_DIR$/src/test/resources" type="java-test-resource" />
66+
<sourceFolder url="file://$MODULE_DIR$/src/test/assets" type="java-test-resource" />
67+
<sourceFolder url="file://$MODULE_DIR$/src/test/aidl" isTestSource="true" />
68+
<sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
69+
<sourceFolder url="file://$MODULE_DIR$/src/test/jni" isTestSource="true" />
70+
<sourceFolder url="file://$MODULE_DIR$/src/test/rs" isTestSource="true" />
6071
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/res" type="java-test-resource" />
6172
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/resources" type="java-test-resource" />
6273
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/assets" type="java-test-resource" />
@@ -71,11 +82,11 @@
7182
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/dex" />
7283
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/appcompat-v7/23.1.1/jars" />
7384
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/support-v4/23.1.1/jars" />
74-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/de.hdodenhof/circleimageview/2.0.0/jars" />
85+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/net.steamcrafted/materialiconlib/1.1.2/jars" />
7586
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental" />
7687
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/lint" />
7788
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/manifests" />
78-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/mockable-android-23.jar" />
89+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/mockable-android-25.jar" />
7990
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/pre-dexed" />
8091
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/release" />
8192
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/res" />
@@ -87,12 +98,11 @@
8798
<excludeFolder url="file://$MODULE_DIR$/build/test-results" />
8899
<excludeFolder url="file://$MODULE_DIR$/build/tmp" />
89100
</content>
90-
<orderEntry type="jdk" jdkName="Android API 23 Platform" jdkType="Android SDK" />
101+
<orderEntry type="jdk" jdkName="Android API 25 Platform" jdkType="Android SDK" />
91102
<orderEntry type="sourceFolder" forTests="false" />
92-
<orderEntry type="library" exported="" name="support-annotations-23.1.1" level="project" />
93103
<orderEntry type="library" exported="" name="support-v4-23.1.1" level="project" />
104+
<orderEntry type="library" exported="" name="materialiconlib-1.1.2" level="project" />
105+
<orderEntry type="library" exported="" name="support-annotations-23.1.1" level="project" />
94106
<orderEntry type="library" exported="" name="appcompat-v7-23.1.1" level="project" />
95-
<orderEntry type="library" exported="" name="circleimageview-2.0.0" level="project" />
96-
<orderEntry type="module" module-name="materialiconlib" exported="" />
97107
</component>
98108
</module>

app/build.gradle

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,13 @@ apply plugin: 'com.android.application'
33
repositories { maven { url "http://dl.bintray.com/codecrafted/maven" } }
44

55
android {
6-
compileSdkVersion 23
6+
compileSdkVersion 25
77
buildToolsVersion "22.0.1"
88

99
defaultConfig {
1010
applicationId "net.steamcrafted.materialiconview"
1111
minSdkVersion 8
12-
targetSdkVersion 23
12+
targetSdkVersion 25
1313
versionCode 1
1414
versionName "1.0"
1515
}
@@ -30,7 +30,6 @@ android {
3030
dependencies {
3131
compile fileTree(dir: 'libs', include: ['*.jar'])
3232
compile 'com.android.support:appcompat-v7:23.1.1'
33-
compile 'de.hdodenhof:circleimageview:2.0.0'
34-
/*compile project(':materialiconlib')*/
33+
//compile 'net.steamcrafted:materialiconlib:1.1.2'
3534
compile project(":materialiconlib")
3635
}

app/src/main/assets/enumjava.java

Lines changed: 1 addition & 1 deletion
Large diffs are not rendered by default.

app/src/main/assets/enumjavaenum.java

Lines changed: 1 addition & 1 deletion
Large diffs are not rendered by default.

0 commit comments

Comments
 (0)