Merge branch 'release/v2.4.1'

.gitignore

@@ -1,29 +1,54 @@
-# Built application files
-*.apk
-*.ap_
-
-# Files for the Dalvik VM
-*.dex
-
-# Java class files
-*.class
-
-# Generated files
-bin/
-gen/
+#Android generated
+bin
+gen
+lint.xml
+lint
+
+#Eclipse
+.project
+.classpath
+.settings
+.checkstyle
+
+#IntelliJ IDEA
+.idea
+*.iml
+*.ipr
+*.iws
+classes
+gen-external-apklibs
 
-# Gradle files
-.gradle/
+#gradle
+.gradle
+local.properties
+gradlew
+gradlew.bat
+gradle/
 build/
 
-# Local configuration file (sdk path, etc)
-local.properties
+#vi
+*.swp
 
-# Proguard folder generated by Eclipse
-proguard/
+#other editors
+*.bak
 
-# Log Files
-*.log
+#Maven
+target
+release.properties
+pom.xml.*
 
-*.idea
-*.iml
+#Ant
+build.xml
+ant.properties
+local.properties
+proguard.cfg
+proguard-project.txt
+
+#Other
+.DS_Store
+Thumbs.db
+tmp
+*.tgz
+*.lock
+*.lck
+com_crashlytics_export_strings.xml

app/build.gradle

@@ -7,13 +7,13 @@ try {
 
 android {
     compileSdkVersion 23
-    buildToolsVersion "23.0.1"
+    buildToolsVersion "23.0.2"
     defaultConfig {
         applicationId 'com.mikepenz.lollipopshowcase.sample'
         minSdkVersion 16
         targetSdkVersion 23
-        versionCode 240
-        versionName "2.4.0"
+        versionCode 241
+        versionName "2.4.1"
     }
 
     buildTypes {
@@ -54,21 +54,20 @@ android {
 }
 
 dependencies {
-    compile "com.android.support:appcompat-v7:23.1.0"
-    compile 'com.android.support:recyclerview-v7:23.1.0'
-    compile 'com.android.support:cardview-v7:23.1.0'
-    compile 'com.android.support:design:23.1.0'
+    compile "com.android.support:appcompat-v7:23.1.1"
+    compile 'com.android.support:recyclerview-v7:23.1.1'
+    compile 'com.android.support:cardview-v7:23.1.1'
+    compile 'com.android.support:design:23.1.1'
 
-    compile('com.mikepenz:aboutlibraries:5.2.5@aar') {
+    compile('com.mikepenz:aboutlibraries:5.3.4@aar') {
         transitive = true
     }
-    compile('com.mikepenz:materialdrawer:4.3.7@aar') {
+    compile('com.mikepenz:materialdrawer:4.5.9@aar') {
         transitive = true
     }
-    compile 'com.mikepenz:iconics-core:1.7.8@aar'
-    compile 'com.mikepenz:google-material-typeface:1.2.0.1@aar'
-    compile 'com.mikepenz:fontawesome-typeface:4.4.0.1@aar'
+    compile 'com.mikepenz:iconics-core:2.5.1@aar'
+    compile 'com.mikepenz:google-material-typeface:2.1.0.1.original@aar'
+    compile 'com.mikepenz:fontawesome-typeface:4.5.0.1@aar'
 
-
-    compile 'com.facebook.rebound:rebound:0.3.6'
+    compile 'com.facebook.rebound:rebound:0.3.8'
 }

app/src/main/java/com/mikepenz/lollipopshowcase/util/UploadHelper.java

@@ -76,7 +76,7 @@ public void showProgress(Activity act) {
         protected void onPreExecute() {
             if (!Network.isAvailiable(act)) {
                 this.cancel(true);
-                Snackbar.make(act.findViewById(R.id.container), act.getString(R.string.dialog_nointernet), Snackbar.LENGTH_SHORT).show();
+                Snackbar.make(act.findViewById(android.R.id.content), act.getString(R.string.dialog_nointernet), Snackbar.LENGTH_SHORT).show();
             } else {
                 showProgress(act);
             }