Merge branch 'master' into 2.2.6/feature/refactoring_compat

mancj · Jul 13, 2017 · 51ab8ce · 51ab8ce
2 parents dbad811 + e587e39
commit 51ab8ce
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 5 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -0,0 +1,14 @@
+ # 2.2.6
+  - fixed problems with clicks onto `view` with `SlideUp`-effect
+  - `SlideUp.Builder` was moved into separated class and renamed to `SlideUpBuilder`
+  #### SlideUp
+  - method `setTouchebleArea(float touchableArea)` was split to two methods: 
+     - `setTouchebleAreaDp(float touchableArea)`
+     - `setTouchebleAreaPx(float touchableArea)`
+  - method `getTouchebleArea()` was split to two methods:
+     - `getTouchebleAreaDp()`
+     - `getTouchebleAreaPx()`
+  #### SlideUpBuilder
+  - method `withTouchebleArea(float touchableArea)` was split to two methods: 
+     - `withTouchebleAreaDp(float touchableArea)`
+     - `withTouchebleAreaPx(float touchableArea)`
diff --git a/app/build.gradle b/app/build.gradle
@@ -1,8 +1,8 @@
 apply plugin: 'com.android.application'
 
 android {
-    compileSdkVersion 25
-    buildToolsVersion '25.0.3'
+    compileSdkVersion 26
+    buildToolsVersion '26.0.0'
     defaultConfig {
         applicationId "com.example.slideup"
         minSdkVersion 14

diff --git a/app/src/main/java/com/example/slideup/SlideUpViewActivity.java b/app/src/main/java/com/example/slideup/SlideUpViewActivity.java
@@ -25,7 +25,7 @@ public class SlideUpViewActivity extends AppCompatActivity {
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_slide_up_view);
-        Toolbar toolbar = (Toolbar) findViewById(R.id.toolbar);
+        Toolbar toolbar = findViewById(R.id.toolbar);
         setSupportActionBar(toolbar);
 
         sliderView = findViewById(R.id.slideView);
@@ -40,7 +40,7 @@ public void onClick(View v) {
             }
         });
         dim = findViewById(R.id.dim);
-        fab = (FloatingActionButton) findViewById(R.id.fab);
+        fab = findViewById(R.id.fab);
 
         slideUp = new SlideUpBuilder(sliderView)
                 .withListeners(new SlideUp.Listener.Events() {

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-3.3-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.1-milestone-1-all.zip