Merge pull request #8 from RiccardoMoro/hotfix-1.2.2

Removed logs
RiccardoMoro · Dec 21, 2016 · 8ae7c18 · 8ae7c18
2 parents c63bb7b + 2fe9e2e
commit 8ae7c18
Show file tree

Hide file tree

Showing 6 changed files with 16 additions and 11 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -39,4 +39,9 @@ Changelog
 #### New from v1.2.1: <br />
 (21/11/2016) <br />
 -Fix a crash due to too much data inside save state parcel <br />
--Fix first time not rendering padding inside toggle image correctly
+-Fix first time not rendering padding inside toggle image correctly <br />
+
+#### New from v1.2.2 <br />
+(20/12/2016) <br />
+-Removed log for margin and padding measurement <br />
+-Updated gradle compiler and SDK tools version
diff --git a/README.md b/README.md
@@ -23,7 +23,7 @@ Download
 ------
 ####Gradle:
 ```groovy
-compile 'com.rm:rmswitch:1.2.1'
+compile 'com.rm:rmswitch:1.2.2'
 ```
 
 ## Usage

diff --git a/app/build.gradle b/app/build.gradle
@@ -2,21 +2,23 @@ apply plugin: 'com.android.application'
 
 android {
     compileSdkVersion 25
-    buildToolsVersion "25.0.0"
+    buildToolsVersion "25.0.2"
 
     defaultConfig {
         applicationId "com.rm.switchsample"
         minSdkVersion 16
         targetSdkVersion 25
         versionCode 1
-        versionName "1.0"
+        versionName "1.0.0"
     }
     buildTypes {
         release {
             minifyEnabled false
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
         }
     }
+
+    return void;
 }
 
 dependencies {

diff --git a/build.gradle b/build.gradle
@@ -5,7 +5,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:2.2.2'
+        classpath 'com.android.tools.build:gradle:2.2.3'
         classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.7'
 
         // NOTE: Do not place your application dependencies here; they belong

diff --git a/rmswitch/build.gradle b/rmswitch/build.gradle
@@ -13,7 +13,7 @@ ext {
     siteUrl = 'https://github.com/RiccardoMoro/RMSwitch'
     gitUrl = 'https://github.com/RiccardoMoro/RMSwitch.git'
 
-    libraryVersion = '1.2.1'
+    libraryVersion = '1.2.2'
 
     developerId = 'RiccardoMoro'
     developerName = 'Riccardo Moro'
@@ -26,13 +26,13 @@ ext {
 
 android {
     compileSdkVersion 25
-    buildToolsVersion "25.0.0"
+    buildToolsVersion "25.0.2"
 
     defaultConfig {
         minSdkVersion 16
         targetSdkVersion 25
         versionCode 2
-        versionName "1.2.1"
+        versionName "1.2.2"
     }
     buildTypes {
         release {
@@ -45,7 +45,7 @@ android {
 dependencies {
     compile fileTree(dir: 'libs', include: ['*.jar'])
     testCompile 'junit:junit:4.12'
-    compile 'com.android.support:appcompat-v7:25.0.1'
+    compile 'com.android.support:appcompat-v7:25.1.0'
 }
 
 apply from: 'https://raw.githubusercontent.com/nuuneoi/JCenter/master/bintrayv1.gradle'
diff --git a/rmswitch/src/main/java/com/rm/rmswitch/RMAbstractSwitch.java b/rmswitch/src/main/java/com/rm/rmswitch/RMAbstractSwitch.java
@@ -303,7 +303,6 @@ private void setBkgMargins(int heightMeasureSpec, int widthMeasureSpec) {
     }
 
     private void setToggleMargins(int heightMeasureSpec) {
-        Log.e(TAG, "Margins");
         // Set the margin after all measures have been done
         int calculatedToggleMargin;
         if (mSwitchDesign == DESIGN_LARGE) {
@@ -320,7 +319,6 @@ private void setToggleMargins(int heightMeasureSpec) {
     }
 
     private void setToggleImagePadding() {
-        Log.e(TAG, "Paddings");
         // Set the padding of the image
         int padding;
         if (mSwitchDesign == DESIGN_LARGE) {