Moved to androidx and added gesture for left and right swipe

Author: kgoel

.gitignore

@@ -7,3 +7,4 @@
 /build
 /captures
 .externalNativeBuild
+/.idea/*

.idea/caches/build_file_checksums.ser

@@ -5,12 +5,21 @@ apply plugin: 'kotlin-android-extensions'
 
 android {
     compileSdkVersion 29
+
+    kotlinOptions {
+        jvmTarget = '1.8'
+    }
+
     defaultConfig {
         applicationId "com.shrikanthravi.collapsiblecalendarview"
         minSdkVersion 21
         targetSdkVersion 29
         versionCode 1
         versionName "1.0"
+        compileOptions {
+            sourceCompatibility JavaVersion.VERSION_1_8
+            targetCompatibility JavaVersion.VERSION_1_8
+        }
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
     dexOptions {

app/build.gradle

@@ -7,7 +7,9 @@ group = 'com.github.shrikanth7698'
 android {
     compileSdkVersion 29
 
-
+    kotlinOptions {
+        jvmTarget = '1.8'
+    }
 
     defaultConfig {
         minSdkVersion 21
@@ -16,6 +18,10 @@ android {
         versionName "1.0"
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
+        compileOptions {
+            sourceCompatibility JavaVersion.VERSION_1_8
+            targetCompatibility JavaVersion.VERSION_1_8
+        }
 
     }
     dexOptions {

collapsiblecalendarview2/build.gradle

@@ -12,18 +12,26 @@ import android.widget.ScrollView
 
 class LockScrollView : ScrollView {
     constructor(context: Context) : super(context) {}
-
     constructor(context: Context, attrs: AttributeSet) : super(context, attrs) {}
-
     constructor(context: Context, attrs: AttributeSet, defStyleAttr: Int) : super(context, attrs, defStyleAttr) {}
+    var swipeTouchListener: OnSwipeTouchListener? = null
+    fun setParams(swipeTouchListener: OnSwipeTouchListener){
+        this.swipeTouchListener = swipeTouchListener
+    }
 
     override fun onInterceptTouchEvent(ev: MotionEvent): Boolean {
-        return true
+        swipeTouchListener?.onTouch(this, ev).let {
+            if(it==null){
+                return false;
+            }
+            else {
+                return it
+            }
+        }
     }
 
-    @SuppressLint("ClickableViewAccessibility")
     override fun onTouchEvent(ev: MotionEvent): Boolean {
         super.onTouchEvent(ev)
         return true
     }
-}
+}

collapsiblecalendarview2/src/main/java/com/shrikanthravi/collapsiblecalendarview/view/LockScrollView.kt

@@ -24,7 +24,7 @@ abstract class OnSwipeTouchListener(ctx: Context) : OnTouchListener {
     private inner class GestureListener : SimpleOnGestureListener() {
 
         override fun onDown(e: MotionEvent): Boolean {
-            return true
+            return false
         }
 
         override fun onFling(e1: MotionEvent, e2: MotionEvent, velocityX: Float, velocityY: Float): Boolean {

collapsiblecalendarview2/src/main/java/com/shrikanthravi/collapsiblecalendarview/view/SwipeTouchListener.kt

@@ -110,7 +110,7 @@ abstract class UICalendar constructor(context: Context, attrs: AttributeSet? = n
     /**
      * This can be used to defined the left icon drawable other than predefined icon
      */
-    var buttonLeftDrawable = resources.getDrawable(R.drawable.left_icon)
+    var buttonLeftDrawable = resources.getDrawable(com.shrikanthravi.collapsiblecalendarview.R.drawable.left_icon)
         set(buttonLeftDrawable) {
             field = buttonLeftDrawable
             mBtnPrevMonth.setImageDrawable(buttonLeftDrawable)
@@ -120,7 +120,7 @@ abstract class UICalendar constructor(context: Context, attrs: AttributeSet? = n
     /**
      *  This can be used to set the drawable for the right icon, other than predefined icon
      */
-    var buttonRightDrawable = resources.getDrawable(R.drawable.right_icon)
+    var buttonRightDrawable = resources.getDrawable(com.shrikanthravi.collapsiblecalendarview.R.drawable.right_icon)
         set(buttonRightDrawable) {
             field = buttonRightDrawable
             mBtnNextMonth.setImageDrawable(buttonRightDrawable)
@@ -139,7 +139,34 @@ abstract class UICalendar constructor(context: Context, attrs: AttributeSet? = n
             redraw()
 
         }
+    private fun getSwipe(context:Context): OnSwipeTouchListener {
+        return object: OnSwipeTouchListener(context){
+            override fun onSwipeTop() {
+                expandIconView.performClick()
 
+            }
+
+            override fun onSwipeLeft() {
+                if (state == STATE_COLLAPSED) {
+                    mBtnNextWeek.performClick()
+                } else if (state == STATE_EXPANDED) {
+                    mBtnNextMonth.performClick()
+                }
+            }
+
+            override fun onSwipeRight() {
+                if (state == STATE_COLLAPSED) {
+                    mBtnPrevWeek.performClick()
+                } else if (state == STATE_EXPANDED) {
+                    mBtnPrevMonth.performClick()
+                }
+            }
+
+            override fun onSwipeBottom() {
+                expandIconView.performClick()
+            }
+        }
+    }
     init {
         mInflater = LayoutInflater.from(context)
 
@@ -161,23 +188,9 @@ abstract class UICalendar constructor(context: Context, attrs: AttributeSet? = n
         mScrollViewBody = rootView.findViewById(R.id.scroll_view_body)
         expandIconView = rootView.findViewById(R.id.expandIcon)
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
-            mScrollViewBody.setOnTouchListener(object: OnSwipeTouchListener(context){
-                override fun onSwipeRight() {
-                    mBtnNextMonth.performClick()
-                }
-
-                override fun onSwipeLeft() {
-                    mBtnPrevMonth.performClick()
-                }
-
-                override fun onSwipeTop() {
-                    expandIconView.performClick()
-                }
-
-                override fun onSwipeBottom() {
-                    expandIconView.performClick()
-                }
-            })
+            mLayoutRoot.setOnTouchListener(getSwipe(context));
+            mScrollViewBody.setOnTouchListener(getSwipe(context))
+            mScrollViewBody.setParams(getSwipe(context))
         }
         val attributes = context.theme.obtainStyledAttributes(
                 attrs, R.styleable.UICalendar, defStyleAttr, 0)