Merge pull request #37 from mancj/2.2.6/feature/refactoring_compat

2.2.6/feature/refactoring compat
mancj · Jul 13, 2017 · 0df1f33 · 0df1f33
2 parents e587e39 + 51ab8ce
commit 0df1f33
Show file tree

Hide file tree

Showing 5 changed files with 41 additions and 5 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -6,7 +6,7 @@ android {
     defaultConfig {
         applicationId "com.example.slideup"
         minSdkVersion 14
-        targetSdkVersion 26
+        targetSdkVersion 25
         versionCode 1
         versionName "1.0"
 

diff --git a/app/src/main/java/com/example/slideup/SlideDownViewActivity.java b/app/src/main/java/com/example/slideup/SlideDownViewActivity.java
@@ -9,6 +9,7 @@
 import android.view.Menu;
 import android.view.MenuItem;
 import android.view.View;
+import android.widget.Toast;
 
 import com.mancj.slideup.SlideUp;
 import com.mancj.slideup.SlideUpBuilder;
@@ -18,6 +19,7 @@ public class SlideDownViewActivity extends AppCompatActivity {
     private View dim;
     private View sliderView;
     private FloatingActionButton fab;
+    Toast toast;
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
@@ -27,6 +29,16 @@ protected void onCreate(Bundle savedInstanceState) {
         setSupportActionBar(toolbar);
 
         sliderView = findViewById(R.id.slideView);
+        sliderView.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                if (toast != null){
+                    toast.cancel();
+                }
+                toast = Toast.makeText(SlideDownViewActivity.this, "click", Toast.LENGTH_SHORT);
+                toast.show();
+            }
+        });
         dim = findViewById(R.id.dim);
         fab = (FloatingActionButton) findViewById(R.id.fab);
 

diff --git a/app/src/main/java/com/example/slideup/SlideEndViewActivity.java b/app/src/main/java/com/example/slideup/SlideEndViewActivity.java
@@ -9,6 +9,7 @@
 import android.view.Menu;
 import android.view.MenuItem;
 import android.view.View;
+import android.widget.Toast;
 
 import com.mancj.slideup.SlideUp;
 import com.mancj.slideup.SlideUpBuilder;
@@ -18,6 +19,7 @@ public class SlideEndViewActivity extends AppCompatActivity {
     private View dim;
     private View sliderView;
     private FloatingActionButton fab;
+    Toast toast;
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
@@ -27,6 +29,16 @@ protected void onCreate(Bundle savedInstanceState) {
         setSupportActionBar(toolbar);
 
         sliderView = findViewById(R.id.slideView);
+        sliderView.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                if (toast != null){
+                    toast.cancel();
+                }
+                toast = Toast.makeText(SlideEndViewActivity.this, "click", Toast.LENGTH_SHORT);
+                toast.show();
+            }
+        });
         dim = findViewById(R.id.dim);
         fab = (FloatingActionButton) findViewById(R.id.fab);
 

diff --git a/app/src/main/java/com/example/slideup/SlideStartViewActivity.java b/app/src/main/java/com/example/slideup/SlideStartViewActivity.java
@@ -9,6 +9,7 @@
 import android.view.Menu;
 import android.view.MenuItem;
 import android.view.View;
+import android.widget.Toast;
 
 import com.mancj.slideup.SlideUp;
 import com.mancj.slideup.SlideUpBuilder;
@@ -18,6 +19,7 @@ public class SlideStartViewActivity extends AppCompatActivity {
     private View dim;
     private View sliderView;
     private FloatingActionButton fab;
+    Toast toast;
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
@@ -27,6 +29,16 @@ protected void onCreate(Bundle savedInstanceState) {
         setSupportActionBar(toolbar);
 
         sliderView = findViewById(R.id.slideView);
+        sliderView.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                if (toast != null){
+                    toast.cancel();
+                }
+                toast = Toast.makeText(SlideStartViewActivity.this, "click", Toast.LENGTH_SHORT);
+                toast.show();
+            }
+        });
         dim = findViewById(R.id.dim);
         fab = (FloatingActionButton) findViewById(R.id.fab);
 

diff --git a/build.gradle b/build.gradle
@@ -1,7 +1,7 @@
 buildscript {
     ext {
         versions = [
-                support        : '26.0.0-beta2',
+                support        : '25.4.0',
                 SlideUp        : '2.2.1',
                 Rx             : [
                         Java     : '1.3.0'
@@ -10,17 +10,17 @@ buildscript {
     }
     repositories {
         jcenter()
-        google()
+        maven { url 'https://maven.google.com' }
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.0.0-alpha6'
+        classpath 'com.android.tools.build:gradle:2.3.3'
     }
 }
 
 allprojects {
     repositories {
         jcenter()
-        google()
+        maven { url 'https://maven.google.com' }
     }
 }