Skip to content

Commit f93fbe6

Browse files
mikepenzmikepenz
authored
Merge pull request #624 from mikepenz/develop
dev -> main
2 parents ff43dbd + 52bf999 commit f93fbe6

File tree

17 files changed

+2530
-43
lines changed

17 files changed

+2530
-43
lines changed

‎Gemfile.lock

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ GEM
3737
multipart-post (>= 1.2, < 3)
3838
faraday-http-cache (2.2.0)
3939
faraday (>= 0.8)
40-
git (1.7.0)
40+
git (1.11.0)
4141
rchardet (~> 1.8)
4242
kramdown (2.3.1)
4343
rexml

‎README.md

Lines changed: 29 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -46,14 +46,15 @@
4646
- [Material Design DX](https://jossef.github.io/material-design-icons-iconfont/)
4747
- [Pixeden 7 Stroke](https://themes-pixeden.com/font-demos/7-stroke/)
4848
- [Phosphor](https://phosphoricons.com/)
49+
- [Simple Icons](https://simpleicons.org/)
4950
- Or create your own font with any icon needed.
5051

5152
# Setup
5253

5354
## Latest releases 🛠
5455

55-
- Kotlin Next Gen | [v5.3.3](https://github.com/mikepenz/Android-Iconics/tree/v5.3.3)
56-
- Kotlin | [v4.0.2](https://github.com/mikepenz/Android-Iconics/tree/v4.0.2)
56+
- Kotlin Next Gen | [v5.3.4](https://github.com/mikepenz/Android-Iconics/tree/v5.3.4)
57+
- Kotlin | [v4.0.2](https://github.com/mikepenz/Android-Iconics/tree/v4.0.2)
5758
- Java AndroidX | [v3.2.5](https://github.com/mikepenz/Android-Iconics/tree/v3.2.5)
5859
- Java Appcompat | [v3.0.4](https://github.com/mikepenz/Android-Iconics/tree/v3.0.4)
5960

@@ -94,11 +95,13 @@ implementation 'com.mikepenz:ionicons-typeface:2.0.1.7-kotlin@aar'
9495
implementation 'com.mikepenz:pixeden-7-stroke-typeface:1.2.0.5-kotlin@aar'
9596
implementation 'com.mikepenz:material-design-icons-dx-typeface:5.0.1.2-kotlin@aar'
9697
implementation 'com.mikepenz:phosphor-typeface:1.0.0.0-kotlin@aar'
98+
implementation 'com.mikepenz:simple-icons-typeface:17.0.0.2@aar'
9799
```
98100

99101
## Note
100102

101-
⚠️ The fonts use the `jetpack startup` library to automatically register themself. If `jetpack startup` is disabled, it is required to manually register the fonts. Please find additional details in the [Register fonts](#register-fonts).
103+
⚠️ The fonts use the `jetpack startup` library to automatically register themselves. If `jetpack startup` is disabled,
104+
it is required to manually register the fonts. Please find additional details in the [Register fonts](#register-fonts).
102105

103106
# Usage
104107
## Use as drawable
@@ -202,25 +205,29 @@ Image(
202205
![Image](https://raw.githubusercontent.com/mikepenz/Android-Iconics/develop/DEV/github/screenshots1.jpg)
203206

204207
# Available fonts
205-
|Link|Prefix|Dependency|
206-
|---|---|---|
207-
|[Google Material Design Icons](https://github.com/google/material-design-icons) **ORIGINAL by Google**|gmd,gmo,gmr,gms|implementation 'com.mikepenz:google-material-typeface{-outlined,rounded,sharp}:+@aar'|
208-
|[Material Design Iconic Font](http://zavoloklom.github.io/material-design-iconic-font) **Google Material Iconic**|gmi|implementation 'com.mikepenz:material-design-iconic-typeface:+@aar'|
209-
|[Fontawesome](https://fontawesome.com/)|faw|implementation 'com.mikepenz:fontawesome-typeface:+@aar'|
210-
|[FontawesomeBrand](https://fontawesome.com/)|fab|implementation 'com.mikepenz:fontawesome-typeface:+@aar'|
211-
|[FontawesomeRegular](https://fontawesome.com/)|far|implementation 'com.mikepenz:fontawesome-typeface:+@aar'|
212-
|[Meteocons](http://www.alessioatzeni.com/meteocons/)|met|implementation 'com.mikepenz:meteocons-typeface:+@aar'|
213-
|[Octicons](https://github.com/github/octicons)|oct|implementation 'com.mikepenz:octicons-typeface:+@aar'|
214-
|[Community Material](http://materialdesignicons.com/)|cmd|implementation 'com.mikepenz:community-material-typeface:+@aar'|
215-
|[Weather Icons](https://erikflowers.github.io/weather-icons/)|wic|implementation 'com.mikepenz:weather-icons-typeface:+@aar'|
216-
|[Typeicons](http://typicons.com/)|typ|implementation 'com.mikepenz:typeicons-typeface:+@aar'|
217-
|[Entypo](http://www.entypo.com/)|ent|implementation 'com.mikepenz:entypo-typeface:+@aar'|
218-
|[Devicon](http://devicon.fr/)|dev|implementation 'com.mikepenz:devicon-typeface:+@aar'|
219-
|[Foundation Icons](https://github.com/zurb/foundation-icon-fonts)|fou|implementation 'com.mikepenz:foundation-icons-typeface:+@aar'|
220-
|[Ionicons](http://ionicons.com/)|ion|implementation 'com.mikepenz:ionicons-typeface:+@aar'|
221-
|[Pixden7Stroke](http://themes-pixeden.com/font-demos/7-stroke/)|pe7|implementation 'com.mikepenz:pixeden-7-stroke-typeface:+@aar'|
222-
|[Material Design DX](https://jossef.github.io/material-design-icons-iconfont/)|cmf|implementation 'com.mikepenz:material-design-icons-dx-typeface:+@aar'|
223-
|[Phosphor Icons](https://phosphoricons.com/)|pho|implementation 'com.mikepenz:phosphor-typeface:+@aar'|
208+
209+
| Link | Prefix | Dependency |
210+
|-------------------------------------------------------------------------------------------------------------------|-----------------|---------------------------------------------------------------------------------------|
211+
| [Google Material Design Icons](https://github.com/google/material-design-icons) **ORIGINAL by
212+
Google** | gmd,gmo,gmr,gms | implementation 'com.mikepenz:google-material-typeface{-outlined,rounded,sharp}:+@aar' |
213+
| [Material Design Iconic Font](http://zavoloklom.github.io/material-design-iconic-font) **Google Material
214+
Iconic** | gmi | implementation 'com.mikepenz:material-design-iconic-typeface:+@aar' |
215+
| [Fontawesome](https://fontawesome.com/) | faw | implementation 'com.mikepenz:fontawesome-typeface:+@aar' |
216+
| [FontawesomeBrand](https://fontawesome.com/) | fab | implementation 'com.mikepenz:fontawesome-typeface:+@aar' |
217+
| [FontawesomeRegular](https://fontawesome.com/) | far | implementation 'com.mikepenz:fontawesome-typeface:+@aar' |
218+
| [Meteocons](http://www.alessioatzeni.com/meteocons/) | met | implementation 'com.mikepenz:meteocons-typeface:+@aar' |
219+
| [Octicons](https://github.com/github/octicons) | oct | implementation 'com.mikepenz:octicons-typeface:+@aar' |
220+
| [Community Material](http://materialdesignicons.com/) | cmd | implementation 'com.mikepenz:community-material-typeface:+@aar' |
221+
| [Weather Icons](https://erikflowers.github.io/weather-icons/) | wic | implementation 'com.mikepenz:weather-icons-typeface:+@aar' |
222+
| [Typeicons](http://typicons.com/) | typ | implementation 'com.mikepenz:typeicons-typeface:+@aar' |
223+
| [Entypo](http://www.entypo.com/) | ent | implementation 'com.mikepenz:entypo-typeface:+@aar' |
224+
| [Devicon](http://devicon.fr/) | dev | implementation 'com.mikepenz:devicon-typeface:+@aar' |
225+
| [Foundation Icons](https://github.com/zurb/foundation-icon-fonts) | fou | implementation 'com.mikepenz:foundation-icons-typeface:+@aar' |
226+
| [Ionicons](http://ionicons.com/) | ion | implementation 'com.mikepenz:ionicons-typeface:+@aar' |
227+
| [Pixden7Stroke](http://themes-pixeden.com/font-demos/7-stroke/) | pe7 | implementation 'com.mikepenz:pixeden-7-stroke-typeface:+@aar' |
228+
| [Material Design DX](https://jossef.github.io/material-design-icons-iconfont/) | cmf | implementation 'com.mikepenz:material-design-icons-dx-typeface:+@aar' |
229+
| [Phosphor Icons](https://phosphoricons.com/) | pho | implementation 'com.mikepenz:phosphor-typeface:+@aar' |
230+
| [Simple Icons](https://simpleicons.org/) | sim | implementation 'com.mikepenz:simple-icons-typeface:+@aar' |
224231

225232
Licenses for all included fonts are linked inside the class or can be found on the coresponding repositories.
226233

‎app/build.gradle

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -134,6 +134,7 @@ dependencies {
134134
implementation project(':octicons-typeface-library')
135135
implementation project(':phosphor-typeface-library')
136136
implementation project(':pixeden-7-stroke-typeface-library')
137+
implementation project(':simple-icons-typeface-library')
137138
implementation project(':typeicons-typeface-library')
138139
implementation project(':weather-icons-typeface-library')
139140

‎build.gradle

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -18,37 +18,37 @@ buildscript {
1818

1919
ext {
2020
release = [
21-
versionName: "5.3.3",
22-
versionCode: 50303
21+
versionName: "5.3.4",
22+
versionCode: 50304
2323
]
2424

2525
setup = [
2626
compileSdk : 31,
27-
buildTools : "31.0.0",
27+
buildTools : "33.0.0",
2828
minSdk : 16,
2929
composeMinSdk: 21,
3030
targetSdk : 30
3131
]
3232

3333
versions = [
34-
kotlin : '1.5.31',
34+
kotlin : '1.6.10',
3535
androidX : '1.0.0',
3636
recyclerView : '1.2.1',
37-
material : '1.5.0-beta01',
38-
appcompat : '1.3.1',
37+
material : '1.6.1',
38+
appcompat : '1.4.2',
3939
drawerlayout : '1.1.0',
4040
constraintLayout: '2.0.4',
4141
cardview : '1.0.0',
4242
ktx : [
43-
core: '1.7.0'
43+
core: '1.8.0'
4444
],
4545
startup : '1.1.0',
4646
detekt : '1.18.1',
47-
aboutLibraries : '10.0.0-a04',
48-
materialDrawer : '9.0.0-a02',
49-
fastAdapter : '5.5.1',
47+
aboutLibraries : '10.3.1',
48+
materialDrawer : '9.0.0',
49+
fastAdapter : '5.6.0',
5050
// compose
51-
compose : '1.0.5'
51+
compose : '1.1.1'
5252
]
5353
}
5454

@@ -61,7 +61,7 @@ buildscript {
6161
}
6262

6363
dependencies {
64-
classpath 'com.android.tools.build:gradle:7.2.0-alpha04'
64+
classpath 'com.android.tools.build:gradle:7.2.1'
6565
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:${versions.kotlin}"
6666
classpath "io.gitlab.arturbosch.detekt:detekt-gradle-plugin:${versions.detekt}"
6767
classpath "com.mikepenz.aboutlibraries.plugin:aboutlibraries-plugin:${versions.aboutLibraries}"

‎gradle/wrapper/gradle-wrapper.jar

285 Bytes
Binary file not shown.

‎gradle/wrapper/gradle-wrapper.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-7.3-all.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-7.4.2-all.zip
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists

‎gradlew

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#!/bin/sh
22

33
#
4-
# Copyright ? 2015-2021 the original authors.
4+
# Copyright © 2015-2021 the original authors.
55
#
66
# Licensed under the Apache License, Version 2.0 (the "License");
77
# you may not use this file except in compliance with the License.
@@ -32,10 +32,10 @@
3232
# Busybox and similar reduced shells will NOT work, because this script
3333
# requires all of these POSIX shell features:
3434
# * functions;
35-
# * expansions ?$var?, ?${var}?, ?${var:-default}?, ?${var+SET}?,
36-
# ?${var#prefix}?, ?${var%suffix}?, and ?$( cmd )?;
37-
# * compound commands having a testable exit status, especially ?case?;
38-
# * various built-in commands including ?command?, ?set?, and ?ulimit?.
35+
# * expansions «$var», «${var}», «${var:-default}», «${var+SET}»,
36+
# «${var#prefix}», «${var%suffix}», and «$( cmd )»;
37+
# * compound commands having a testable exit status, especially «case»;
38+
# * various built-in commands including «command», «set», and «ulimit».
3939
#
4040
# Important for patching:
4141
#

‎iconics-compose/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,4 +69,4 @@ dependencies {
6969

7070
implementation "androidx.compose.ui:ui:${versions.compose}"
7171
implementation "androidx.compose.foundation:foundation:${versions.compose}"
72-
}
72+
}

‎settings.gradle

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,4 +44,5 @@ include ':octicons-typeface-library'
4444
include ':phosphor-typeface-library'
4545
include ':pixeden-7-stroke-typeface-library'
4646
include ':typeicons-typeface-library'
47-
include ':weather-icons-typeface-library'
47+
include ':weather-icons-typeface-library'
48+
include ':simple-icons-typeface-library'

‎simple-icons-typeface-library/build.gradle

Lines changed: 48 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,48 @@
1+
/*
2+
* Copyright 2019 Mike Penz
3+
*
4+
* Licensed under the Apache License, Version 2.0 (the "License");
5+
* you may not use this file except in compliance with the License.
6+
* You may obtain a copy of the License at
7+
*
8+
* http://www.apache.org/licenses/LICENSE-2.0
9+
*
10+
* Unless required by applicable law or agreed to in writing, software
11+
* distributed under the License is distributed on an "AS IS" BASIS,
12+
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13+
* See the License for the specific language governing permissions and
14+
* limitations under the License.
15+
*/
16+
17+
apply plugin: 'com.android.library'
18+
19+
apply plugin: 'kotlin-android'
20+
21+
android {
22+
compileSdkVersion setup.compileSdk
23+
buildToolsVersion setup.buildTools
24+
25+
defaultConfig {
26+
minSdkVersion setup.minSdk
27+
targetSdkVersion setup.targetSdk
28+
consumerProguardFiles 'consumer-proguard-rules.pro'
29+
versionCode 170002
30+
versionName "17.0.0.2"
31+
32+
resValue "string", "Simple_Icons_version", "${versionName}"
33+
}
34+
buildTypes {
35+
release {
36+
minifyEnabled false
37+
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
38+
}
39+
}
40+
}
41+
if (project.hasProperty('pushall') || project.hasProperty('simpleicons')) {
42+
apply from: '../gradle-release.gradle'
43+
}
44+
45+
dependencies {
46+
implementation project(':iconics-typeface-api')
47+
}
48+

0 commit comments

Comments
 (0)