Lower min sdk to 10

rubengees · Sep 18, 2015 · e7cf0c5 · e7cf0c5
1 parent b047bc8
commit e7cf0c5
Show file tree

Hide file tree

Showing 10 changed files with 26 additions and 22 deletions.
diff --git a/README.md b/README.md
@@ -13,7 +13,7 @@ Add this to your build.gradle:
 
 ```groovy
 dependencies {
-    compile ('com.rubengees:introduction:1.0.4@aar'){
+    compile ('com.rubengees:introduction:1.0.5@aar'){
         transitive = true;
     }
 }

diff --git a/library/build.gradle b/library/build.gradle
@@ -3,18 +3,18 @@ apply plugin: 'com.android.library'
 ext {
     PUBLISH_GROUP_ID = 'com.rubengees'
     PUBLISH_ARTIFACT_ID = 'introduction'
-    PUBLISH_VERSION = '1.0.4'
+    PUBLISH_VERSION = '1.0.5'
 }
 
 android {
     compileSdkVersion 23
     buildToolsVersion "23.0.1"
 
     defaultConfig {
-        minSdkVersion 11
+        minSdkVersion 10
         targetSdkVersion 23
-        versionCode 1
-        versionName "1.0.4"
+        versionCode 5
+        versionName "1.0.5"
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
     }
     buildTypes {

diff --git a/library/src/main/java/com/rubengees/introduction/IntroductionActivity.java b/library/src/main/java/com/rubengees/introduction/IntroductionActivity.java
@@ -30,6 +30,7 @@
 import android.view.WindowManager;
 import android.widget.FrameLayout;
 import android.widget.ImageButton;
+import android.widget.RelativeLayout;
 
 import com.readystatesoftware.systembartint.SystemBarTintManager;
 import com.rubengees.introduction.adapter.PagerAdapter;
@@ -165,9 +166,11 @@ private void findViews() {
     private void handleTranslucency() {
         SystemBarTintManager tintManager = new SystemBarTintManager(this);
         config = tintManager.getConfig();
+        RelativeLayout.LayoutParams params = (RelativeLayout.LayoutParams) bottomBar.getLayoutParams();
+        params.height = params.height + config.getPixelInsetBottom();
+        bottomBar.setLayoutParams(params);
 
-        bottomBar.setY(bottomBar.getY() - config.getPixelInsetBottom());
-        bottomBar.setPadding(0, 0, config.getPixelInsetRight(), 0);
+        bottomBar.setPadding(0, -config.getPixelInsetBottom(), config.getPixelInsetRight(), 0);
     }
 
     private void initSlides() {

diff --git a/library/src/main/java/com/rubengees/introduction/entity/Option.java b/library/src/main/java/com/rubengees/introduction/entity/Option.java
@@ -121,6 +121,7 @@ public boolean equals(Object o) {
 
         if (isActivated != option.isActivated) return false;
         if (position != option.position) return false;
+        //noinspection SimplifiableIfStatement
         if (title != null ? !title.equals(option.title) : option.title != null) return false;
         return !(titleResource != null ? !titleResource.equals(option.titleResource) : option.titleResource != null);
 

diff --git a/library/src/main/java/com/rubengees/introduction/entity/Slide.java b/library/src/main/java/com/rubengees/introduction/entity/Slide.java
@@ -299,6 +299,7 @@ public boolean equals(Object o) {
         if (imageResource != null ? !imageResource.equals(slide.imageResource) : slide.imageResource != null)
             return false;
         if (color != null ? !color.equals(slide.color) : slide.color != null) return false;
+        //noinspection SimplifiableIfStatement
         if (colorResource != null ? !colorResource.equals(slide.colorResource) : slide.colorResource != null)
             return false;
         return !(option != null ? !option.equals(slide.option) : slide.option != null);

diff --git a/library/src/main/res/values/library_introduction_strings.xml b/library/src/main/res/values/library_introduction_strings.xml
@@ -1,18 +1,18 @@
 <?xml version="1.0" encoding="utf-8"?><!-- Support for AboutLibraries by Mike Penz (https://github.com/mikepenz/AboutLibraries) -->
-<resources>
-	<string name="define_introduction" />
+<resources xmlns:tools="http://schemas.android.com/tools">
+	<string name="define_introduction" tools:ignore="UnusedResources" />
 	<!-- Author section -->
 	<string name="library_introduction_author">Ruben Gees</string>
-	<string name="library_introduction_authorWebsite">https://github.com/RubenGees</string>
+	<string name="library_introduction_authorWebsite" tools:ignore="UnusedResources">https://github.com/RubenGees</string>
 	<!-- Library section -->
-	<string name="library_introduction_libraryName">Introduction</string>
-	<string name="library_introduction_libraryDescription">Show a beautiful Intro to your users with ease.</string>
-	<string name="library_introduction_libraryWebsite">https://github.com/RubenGees/Introduction</string>
-	<string name="library_introduction_libraryVersion">1.0.4</string>
+	<string name="library_introduction_libraryName" tools:ignore="UnusedResources">Introduction</string>
+	<string name="library_introduction_libraryDescription" tools:ignore="UnusedResources">Show a beautiful Intro to your users with ease.</string>
+	<string name="library_introduction_libraryWebsite" tools:ignore="UnusedResources">https://github.com/RubenGees/Introduction</string>
+	<string name="library_introduction_libraryVersion" tools:ignore="UnusedResources">1.0.4</string>
 	<!-- OpenSource section -->
-	<string name="library_introduction_isOpenSource">true</string>
-	<string name="library_introduction_repositoryLink">https://github.com/RubenGees/Introduction</string>
+	<string name="library_introduction_isOpenSource" tools:ignore="UnusedResources">true</string>
+	<string name="library_introduction_repositoryLink" tools:ignore="UnusedResources">https://github.com/RubenGees/Introduction</string>
 	<!-- License section -->
-	<string name="library_introduction_licenseId">apache_2_0</string>
+	<string name="library_introduction_licenseId" tools:ignore="UnusedResources">apache_2_0</string>
 	<!-- Custom variables section -->
 </resources>
diff --git a/sample/build.gradle b/sample/build.gradle
@@ -8,8 +8,8 @@ android {
         applicationId "com.rubengees.introductionsample"
         minSdkVersion 11
         targetSdkVersion 23
-        versionCode 2
-        versionName "1.0.1"
+        versionCode 5
+        versionName "1.0.5"
     }
     buildTypes {
         release {

diff --git a/...oduction/common/DepthPageTransformer.java → ...roductionsample/DepthPageTransformer.java b/...oduction/common/DepthPageTransformer.java → ...roductionsample/DepthPageTransformer.java
@@ -16,7 +16,7 @@
  *   Taken from: <a href="http://developer.android.com/training/animation/screen-slide.html">Android Developers</a>
  */
 
-package com.rubengees.introduction.common;
+package com.rubengees.introductionsample;
 
 import android.support.v4.view.ViewPager;
 import android.view.View;

diff --git a/sample/src/main/java/com/rubengees/introductionsample/MainActivity.java b/sample/src/main/java/com/rubengees/introductionsample/MainActivity.java
@@ -30,7 +30,6 @@
 import com.rubengees.introduction.IntroductionBuilder;
 import com.rubengees.introduction.IntroductionConfiguration;
 import com.rubengees.introduction.common.NumberIndicatorManager;
-import com.rubengees.introduction.common.ZoomOutPageTransformer;
 import com.rubengees.introduction.entity.Option;
 import com.rubengees.introduction.entity.Slide;
 

diff --git a/...uction/common/ZoomOutPageTransformer.java → ...ductionsample/ZoomOutPageTransformer.java b/...uction/common/ZoomOutPageTransformer.java → ...ductionsample/ZoomOutPageTransformer.java
@@ -16,7 +16,7 @@
  *   Taken from: <a href="http://developer.android.com/training/animation/screen-slide.html">Android Developers</a>
  */
 
-package com.rubengees.introduction.common;
+package com.rubengees.introductionsample;
 
 import android.support.v4.view.ViewPager;
 import android.view.View;