fix for
- bump deps versions
- change gradle version for AS 3.3
MODIFY
app/build.gradle
app/build.gradle
@@ -52,46 +52,44 @@ android {
}
dependencies {
- implementation 'com.android.support:multidex:1.0.3'
+ implementation 'androidx.multidex:multidex:2.0.1'
- implementation "androidx.appcompat:appcompat:${versions.androidXVersion}"
- implementation "com.google.android.material:material:${versions.androidXVersion}"
- implementation "androidx.recyclerview:recyclerview:${versions.androidXVersion}"
- implementation "androidx.cardview:cardview:${versions.androidXVersion}"
+ implementation "androidx.appcompat:appcompat:${versions.appCompat}"
+ implementation "com.google.android.material:material:${versions.androidX}"
+ implementation "androidx.recyclerview:recyclerview:${versions.androidX}"
+ implementation "androidx.cardview:cardview:${versions.androidX}"
// used to base on some backwards compatible themes
// contains util classes to support various android versions, and clean up code
// comes with the awesome "Holder"-Pattern
// https://github.com/mikepenz/Materialize
- implementation 'com.mikepenz:materialize:1.2.0'
+ implementation 'com.mikepenz:materialize:1.2.1'
// used to fill the RecyclerView with the DrawerItems
// and provides single and multi selection, expandable items
// https://github.com/mikepenz/FastAdapter
- implementation 'com.mikepenz:fastadapter:3.3.0'
- implementation 'com.mikepenz:fastadapter-commons:3.3.0'
- implementation 'com.mikepenz:fastadapter-extensions-expandable:3.3.0'
+ implementation 'com.mikepenz:fastadapter:3.3.1'
+ implementation 'com.mikepenz:fastadapter-commons:3.3.1'
+ implementation 'com.mikepenz:fastadapter-extensions-expandable:3.3.1'
// used to generating string fields for icons (sample - test/java/StringFieldGenerator.java)
testImplementation 'ru.ztrap.iconics:string-generator:1.0.2'
//used to generate the drawer on the left
//https://github.com/mikepenz/MaterialDrawer
- implementation('com.mikepenz:materialdrawer:6.1.0') {
+ implementation('com.mikepenz:materialdrawer:6.1.2') {
transitive = true
exclude module: "fastadapter"
exclude module: "fastadapter-extensions-expandable"
exclude module: "iconics-core"
- exclude group: "com.android.support"
}
// used to generate the Open Source section
// https://github.com/mikepenz/AboutLibraries
- implementation('com.mikepenz:aboutlibraries:6.2.0') {
+ implementation('com.mikepenz:aboutlibraries:6.2.1') {
transitive = true
exclude module: "fastadapter"
exclude module: "iconics-core"
- exclude group: "com.android.support"
}
implementation project(':library-core')

MODIFY
app/src/main/res/layout/activity_playground.xml
app/src/main/res/layout/activity_playground.xml
~ See the License for the specific language governing permissions and
~ limitations under the License.
-->
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<LinearLayout
+ xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar" />
<ScrollView
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
android:paddingBottom="@dimen/activity_vertical_margin"
android:paddingTop="@dimen/activity_vertical_margin"
android:paddingLeft="@dimen/activity_horizontal_margin"
android:paddingRight="@dimen/activity_horizontal_margin"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
android:clipToPadding="false">
<LinearLayout
app:iiv_all_icon="gmd_account_circle"
app:iiv_all_size="24dp" />
- <com.mikepenz.iconics.view.IconicsTextView
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:text="IconicsTextView with side-drawables"
- android:textColor="@android:color/black"
-
- app:iiv_all_color="@color/md_amber_300"
- app:iiv_all_icon="gmd_account_circle"
- app:iiv_all_size="24dp"/>
-
<com.mikepenz.iconics.view.IconicsTextView
android:layout_width="wrap_content"
android:layout_height="56dp"
android:layout_weight="1" />
<com.mikepenz.iconics.view.IconicsImageButton
- android:focusable="true"
- android:clickable="true"
android:layout_width="0dp"
android:layout_height="60dp"
android:layout_weight="1"
+ android:focusable="true"
+ android:clickable="true"
app:iiv_icon="gmd_replay_10"
app:iiv_color="@color/color_states_icon"
app:iiv_background_contour_color="@color/color_states_bg_contour"
app:iiv_contour_color="@color/color_states_contour"
app:iiv_background_contour_width="2dp"
- app:iiv_contour_width="2dp"
- app:iiv_shadow_color="@color/md_green_A400"
- app:iiv_shadow_dx="4dp"
- app:iiv_shadow_dy="4dp"
- app:iiv_shadow_radius="4dp"/>
+ app:iiv_contour_width="2dp" />
<com.mikepenz.iconics.view.IconicsImageButton
android:id="@+id/test7"
- android:focusable="true"
- android:clickable="true"
android:layout_width="0dp"
android:layout_height="60dp"
android:layout_weight="1"
+ android:focusable="true"
+ android:clickable="true"
app:iiv_size="60dp"
app:iiv_corner_radius="60dp"
android:background="#000" />
<LinearLayout
- android:orientation="vertical"
android:layout_width="match_parent"
- android:layout_height="wrap_content">
+ android:layout_height="wrap_content"
+ android:orientation="vertical">
<com.mikepenz.iconics.view.IconicsCheckBox
android:layout_width="wrap_content"
android:background="#000" />
<LinearLayout
- android:orientation="vertical"
android:layout_width="match_parent"
- android:layout_height="wrap_content">
+ android:layout_height="wrap_content"
+ android:orientation="vertical">
<com.mikepenz.iconics.view.IconicsCheckableTextView
android:layout_width="wrap_content"

MODIFY
build.gradle
build.gradle
@@ -2,18 +2,19 @@ buildscript {
ext {
release = [
versionName: "3.2.0-rc1",
- versionCode: 3200
+ versionCode: 32000
]
setup = [
compileSdk: 28,
- buildTools: "28.0.2",
+ buildTools: "28.0.3",
minSdk : 14,
targetSdk : 28
]
versions = [
- androidXVersion: '1.0.0'
+ androidX : '1.0.0',
+ appCompat: '1.0.2'
]
}
@@ -23,7 +24,7 @@ buildscript {
}
dependencies {
- classpath 'com.android.tools.build:gradle:3.4.0-alpha08'
+ classpath 'com.android.tools.build:gradle:3.3.0'
classpath 'com.github.dcendents:android-maven-gradle-plugin:2.1'
classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.8.4'
}

MODIFY
gradle.properties
gradle.properties
@@ -33,5 +33,3 @@ POM_LICENCE_DIST=repo
POM_DEVELOPER_ID=mikepenz
POM_DEVELOPER_NAME=Mike Penz
\ No newline at end of file
-android.useAndroidX=true
-android.enableJetifier=true
\ No newline at end of file

MODIFY
gradle/wrapper/gradle-wrapper.properties
gradle/wrapper/gradle-wrapper.properties
-#Sat Dec 15 16:16:47 CET 2018
+#Sat Feb 02 13:34:48 MSK 2019
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-5.1-milestone-1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.1-all.zip

MODIFY
iconics-view-library/build.gradle
iconics-view-library/build.gradle
@@ -27,5 +27,5 @@ if (project.hasProperty('pushall') || project.hasProperty('libraryviewsonly')) {
dependencies {
implementation project(':library-core')
- implementation "androidx.appcompat:appcompat:${versions.androidXVersion}"
+ implementation "androidx.appcompat:appcompat:${versions.appCompat}"
}

MODIFY
library-core/build.gradle
library-core/build.gradle
@@ -33,5 +33,5 @@ if (project.hasProperty('pushall') || project.hasProperty('librarycoreonly')) {
}
dependencies {
- implementation "androidx.appcompat:appcompat:${versions.androidXVersion}"
+ implementation "androidx.appcompat:appcompat:${versions.appCompat}"
}

MODIFY
library-core/src/main/java/com/mikepenz/iconics/IconicsDrawable.java
library-core/src/main/java/com/mikepenz/iconics/IconicsDrawable.java
@@ -159,6 +159,14 @@ public class IconicsDrawable extends Drawable {
public IconicsDrawable(@NonNull Context context) {
mContext = context.getApplicationContext();
+ mIconBrush.getPaint().setStyle(Paint.Style.FILL);
+ mIconBrush.getPaint().setTextAlign(Paint.Align.CENTER);
+ mIconBrush.getPaint().setUnderlineText(false);
+
+ mContourBrush.getPaint().setStyle(Paint.Style.STROKE);
+
+ mBackgroundContourBrush.getPaint().setStyle(Paint.Style.STROKE);
+
icon(' ');
}
@@ -186,14 +194,6 @@ public class IconicsDrawable extends Drawable {
this(context);
icon(typeface, icon);
-
- mIconBrush.getPaint().setStyle(Paint.Style.FILL);
- mIconBrush.getPaint().setTextAlign(Paint.Align.CENTER);
- mIconBrush.getPaint().setUnderlineText(false);
-
- mContourBrush.getPaint().setStyle(Paint.Style.STROKE);
-
- mBackgroundContourBrush.getPaint().setStyle(Paint.Style.STROKE);
}
//region getters

- fix for #426
 - bump deps versions
 - change gradle version for AS 3.3