Merge pull request #5 from sephiroth74/hotfix/onTextChanged

sephiroth74 · web-flow · commit 85f4848f4aa5 · 2019-03-07T15:23:37.000+01:00
don't dispatch user text while typing, updated kotlin version, update…
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -1,19 +1,23 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-          package="it.sephiroth.android.numberpicker.demo">
+<manifest
+    package="it.sephiroth.android.numberpicker.demo"
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools">
 
     <application
-            android:allowBackup="true"
-            android:icon="@mipmap/ic_launcher"
-            android:label="@string/app_name"
-            android:roundIcon="@mipmap/ic_launcher_round"
-            android:supportsRtl="true"
-            android:theme="@style/AppTheme">
+        android:name=".MainApplication"
+        android:allowBackup="false"
+        android:icon="@mipmap/ic_launcher"
+        android:label="@string/app_name"
+        android:roundIcon="@mipmap/ic_launcher_round"
+        android:supportsRtl="true"
+        android:theme="@style/AppTheme"
+        tools:ignore="GoogleAppIndexingWarning">
         <activity android:name=".MainActivity">
             <intent-filter>
-                <action android:name="android.intent.action.MAIN"/>
+                <action android:name="android.intent.action.MAIN" />
 
-                <category android:name="android.intent.category.LAUNCHER"/>
+                <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity>
     </application>
diff --git a/app/src/main/java/it/sephiroth/android/numberpicker/demo/MainActivity.kt b/app/src/main/java/it/sephiroth/android/numberpicker/demo/MainActivity.kt
@@ -2,9 +2,7 @@ package it.sephiroth.android.numberpicker.demo
 
 import android.os.Bundle
 import androidx.appcompat.app.AppCompatActivity
-import it.sephiroth.android.library.numberpicker.doOnProgressChanged
-import it.sephiroth.android.library.numberpicker.doOnStartTrackingTouch
-import it.sephiroth.android.library.numberpicker.doOnStopTrackingTouch
+import it.sephiroth.android.library.numberpicker.setListener
 import kotlinx.android.synthetic.main.activity_main.*
 import timber.log.Timber
 
@@ -14,16 +12,18 @@ class MainActivity : AppCompatActivity() {
         super.onCreate(savedInstanceState)
         setContentView(R.layout.activity_main)
 
-        numberPicker.doOnProgressChanged { numberPicker, progress, formUser ->
-            // progress changed
-        }
+        numberPicker.setListener {
+            onProgressChanged { numberPicker, progress, fromUser ->
+                Timber.v("doOnProgressChanged($progress, $fromUser)")
+            }
 
-        numberPicker.doOnStartTrackingTouch { numberPicker ->
-            // tracking started
-        }
+            onStartTrackingTouch {
+                Timber.v("onStartTrackingTouch")
+            }
 
-        numberPicker.doOnStopTrackingTouch { numberPicker ->
-            // tracking ended
+            onStopTrackingTouch {
+                Timber.v("onStopTrackingTouch")
+            }
         }
     }
 }
diff --git a/app/src/main/java/it/sephiroth/android/numberpicker/demo/MainApplication.kt b/app/src/main/java/it/sephiroth/android/numberpicker/demo/MainApplication.kt
@@ -0,0 +1,12 @@
+package it.sephiroth.android.numberpicker.demo
+
+import android.app.Application
+import timber.log.Timber
+
+class MainApplication : Application() {
+
+    override fun onCreate() {
+        Timber.plant(Timber.DebugTree())
+        super.onCreate()
+    }
+}
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
@@ -34,6 +34,7 @@
         style="@style/NumberPicker.Outlined"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
+        app:picker_editTextStyle="@style/NumberPicker.EditTextStyle.Disabled"
         android:layout_marginTop="8dp"
         android:progress="50"
         app:layout_constraintEnd_toEndOf="@+id/numberPicker"
@@ -45,7 +46,7 @@
         android:layout_height="wrap_content"
         android:layout_marginEnd="16dp"
         android:gravity="right"
-        android:text="Outlined Vertical Picker"
+        android:text="Outlined Picker (input disabled)"
         app:layout_constraintBottom_toBottomOf="@+id/numberPicker2"
         app:layout_constraintEnd_toStartOf="@+id/numberPicker2"
         app:layout_constraintTop_toTopOf="@+id/numberPicker2" />
diff --git a/build.gradle b/build.gradle
@@ -1,14 +1,14 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 
 buildscript {
-    ext.kotlin_version = '1.3.20'
+    ext.kotlin_version = '1.3.21'
     repositories {
         google()
         jcenter()
         
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.4.0-beta03'
+        classpath 'com.android.tools.build:gradle:3.4.0-beta05'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
diff --git a/gradle.properties b/gradle.properties
@@ -23,8 +23,8 @@ kotlin.code.style=official
 ANDROID_BUILD_SDK_VERSION=28
 ANDROID_BUILD_TARGET_SDK_VERSION=28
 
-VERSION_NAME=1.0.1
-VERSION_CODE=2
+VERSION_NAME=1.0.2
+VERSION_CODE=3
 GROUP=it.sephiroth.android.library
 
 POM_DESCRIPTION=Sliding Number Picker for Android
diff --git a/numberpicker/src/main/java/it/sephiroth/android/library/numberpicker/NumberPicker.kt b/numberpicker/src/main/java/it/sephiroth/android/library/numberpicker/NumberPicker.kt
@@ -16,7 +16,6 @@ import android.widget.LinearLayout
 import android.widget.TextView
 import androidx.appcompat.view.ContextThemeWrapper
 import androidx.appcompat.widget.AppCompatImageButton
-import androidx.core.widget.doOnTextChanged
 import io.reactivex.Observable
 import io.reactivex.android.schedulers.AndroidSchedulers
 import io.reactivex.disposables.Disposable
@@ -71,6 +70,7 @@ class NumberPicker @JvmOverloads constructor(
     private var buttonInterval: Disposable? = null
 
     private val longGestureListener = { it: UIGestureRecognizer ->
+        Timber.i("longGestureListener = ${it.state}")
         when {
             it.state == UIGestureRecognizer.State.Began -> {
                 requestFocus()
@@ -87,7 +87,8 @@ class NumberPicker @JvmOverloads constructor(
             }
 
             it.state == UIGestureRecognizer.State.Changed -> {
-                var diff = if (data.orientation == VERTICAL) it.currentLocationY - it.downLocationY else it.currentLocationX - it.downLocationX
+                var diff =
+                        if (data.orientation == VERTICAL) it.currentLocationY - it.downLocationY else it.currentLocationX - it.downLocationX
                 if (diff > tracker.minDistance) {
                     diff = tracker.minDistance
                 } else if (diff < -tracker.minDistance) {
@@ -115,6 +116,7 @@ class NumberPicker @JvmOverloads constructor(
 
     @Suppress("MemberVisibilityCanBePrivate")
     fun setProgress(value: Int, fromUser: Boolean = true) {
+        Timber.i("setProgress($value, $fromUser)")
         if (value != data.value) {
             data.value = value
             tooltip?.update(data.value.toString())
@@ -148,6 +150,8 @@ class NumberPicker @JvmOverloads constructor(
             data.stepSize = value
         }
 
+    private var initialized = false
+
     init {
         setWillNotDraw(false)
         isFocusable = true
@@ -241,7 +245,6 @@ class NumberPicker @JvmOverloads constructor(
 
     @SuppressLint("ClickableViewAccessibility")
     private fun initializeButtonActions() {
-
         upButton.setOnTouchListener { _, event ->
             if (!isEnabled) {
                 false
@@ -263,10 +266,10 @@ class NumberPicker @JvmOverloads constructor(
                                 ARROW_BUTTON_FRAME_DELAY,
                                 TimeUnit.MILLISECONDS,
                                 Schedulers.io())
-                                .observeOn(AndroidSchedulers.mainThread())
-                                .subscribe {
-                                    setProgress(progress + stepSize)
-                                }
+                            .observeOn(AndroidSchedulers.mainThread())
+                            .subscribe {
+                                setProgress(progress + stepSize)
+                            }
                     }
 
                     MotionEvent.ACTION_UP -> {
@@ -301,10 +304,10 @@ class NumberPicker @JvmOverloads constructor(
                                 ARROW_BUTTON_FRAME_DELAY,
                                 TimeUnit.MILLISECONDS,
                                 Schedulers.io())
-                                .observeOn(AndroidSchedulers.mainThread())
-                                .subscribe {
-                                    setProgress(progress - stepSize)
-                                }
+                            .observeOn(AndroidSchedulers.mainThread())
+                            .subscribe {
+                                setProgress(progress - stepSize)
+                            }
                     }
 
                     MotionEvent.ACTION_UP -> {
@@ -321,21 +324,23 @@ class NumberPicker @JvmOverloads constructor(
             }
         }
 
-        editText.doOnTextChanged { text, _, _, _ ->
-            if (!text.isNullOrEmpty()) {
-                try {
-                    this.setProgress(Integer.valueOf(text.toString()))
-                } catch (e: NumberFormatException) {
-                    Timber.e(e)
-                }
-            }
-        }
+//        editText.doOnTextChanged { text, _, _, _ ->
+//            if (!text.isNullOrEmpty()) {
+//                try {
+//                    this.setProgress(Integer.valueOf(text.toString()))
+//                } catch (e: NumberFormatException) {
+//                    Timber.e(e)
+//                }
+//            }
+//        }
 
         editText.setOnFocusChangeListener { _, hasFocus ->
             setBackgroundFocused(hasFocus)
 
             if (!hasFocus) {
-                if (editText.text.isNullOrEmpty()) {
+                if (!editText.text.isNullOrEmpty()) {
+                    setProgress(Integer.valueOf(editText.text.toString()), true)
+                } else {
                     editText.setText(data.value.toString())
                 }
             }
@@ -383,15 +388,15 @@ class NumberPicker @JvmOverloads constructor(
         animate().alpha(0.5f).start()
 
         tooltip = Tooltip.Builder(context)
-                .anchor(editText, 0, 0, false)
-                .styleId(tooltipStyleId)
-                .arrow(true)
-                .closePolicy(ClosePolicy.TOUCH_NONE)
-                .overlay(false)
-                .showDuration(0)
-                .text(if (minValue.toString().length > maxValue.toString().length) minValue.toString() else maxValue.toString())
-                .animationStyle(if (orientation == VERTICAL) R.style.NumberPicker_AnimationVertical else R.style.NumberPicker_AnimationHorizontal)
-                .create()
+            .anchor(editText, 0, 0, false)
+            .styleId(tooltipStyleId)
+            .arrow(true)
+            .closePolicy(ClosePolicy.TOUCH_NONE)
+            .overlay(false)
+            .showDuration(0)
+            .text(if (minValue.toString().length > maxValue.toString().length) minValue.toString() else maxValue.toString())
+            .animationStyle(if (orientation == VERTICAL) R.style.NumberPicker_AnimationVertical else R.style.NumberPicker_AnimationHorizontal)
+            .create()
 
         tooltip?.doOnPrepare { tooltip ->
             tooltip.contentView?.let { contentView ->
@@ -430,12 +435,6 @@ class NumberPicker @JvmOverloads constructor(
 
         val FOCUSED_STATE_ARRAY = intArrayOf(android.R.attr.state_focused)
         val UNFOCUSED_STATE_ARRAY = intArrayOf(0, -android.R.attr.state_focused)
-
-        init {
-            if (BuildConfig.DEBUG) {
-                Timber.plant(Timber.DebugTree())
-            }
-        }
     }
 }
 
diff --git a/numberpicker/src/main/java/it/sephiroth/android/library/numberpicker/NumberPickerExt.kt b/numberpicker/src/main/java/it/sephiroth/android/library/numberpicker/NumberPickerExt.kt
@@ -20,13 +20,13 @@ inline fun NumberPicker.addProgressChangedListener(
                 numberPicker: NumberPicker,
                 progress: Int,
                 formUser: Boolean
-        ) -> Unit = { _, _, _ -> },
+                                     ) -> Unit = { _, _, _ -> },
 
         crossinline startTrackingTouch: (numberPicker: NumberPicker) -> Unit = { _ -> },
 
         crossinline stopTrackingTouch: (numberPicker: NumberPicker) -> Unit = { _ -> }
 
-): NumberPicker.OnNumberPickerChangeListener {
+                                                  ): NumberPicker.OnNumberPickerChangeListener {
     val listener = object : NumberPicker.OnNumberPickerChangeListener {
 
         override fun onProgressChanged(numberPicker: NumberPicker, progress: Int, fromUser: Boolean) {
@@ -44,4 +44,41 @@ inline fun NumberPicker.addProgressChangedListener(
     }
     numberPickerChangeListener = listener
     return listener
-}
+}
+
+class _OnNumberPickerChangeListener : NumberPicker.OnNumberPickerChangeListener {
+
+    override fun onProgressChanged(numberPicker: NumberPicker, progress: Int, fromUser: Boolean) {
+        _onProgressChanged?.invoke(numberPicker, progress, fromUser)
+    }
+
+    override fun onStartTrackingTouch(numberPicker: NumberPicker) {
+        _onStartTrackingTouch?.invoke(numberPicker)
+    }
+
+    override fun onStopTrackingTouch(numberPicker: NumberPicker) {
+        _onStopTrackingTouch?.invoke(numberPicker)
+    }
+
+    fun onProgressChanged(func: (NumberPicker, Int, Boolean) -> Unit) {
+        _onProgressChanged = func
+    }
+
+    fun onStartTrackingTouch(func: (NumberPicker) -> Unit) {
+        _onStartTrackingTouch = func
+    }
+
+    fun onStopTrackingTouch(func: (NumberPicker) -> Unit) {
+        _onStopTrackingTouch = func
+    }
+
+    private var _onProgressChanged: ((NumberPicker, Int, Boolean) -> Unit)? = null
+    private var _onStartTrackingTouch: ((NumberPicker) -> Unit)? = null
+    private var _onStopTrackingTouch: ((NumberPicker) -> Unit)? = null
+}
+
+inline fun NumberPicker.setListener(func: _OnNumberPickerChangeListener.() -> Unit) {
+    val listener = _OnNumberPickerChangeListener()
+    listener.func()
+    numberPickerChangeListener = listener
+}
diff --git a/numberpicker/src/main/res/values/styles.xml b/numberpicker/src/main/res/values/styles.xml
@@ -75,7 +75,7 @@
 
     <style name="NumberPicker.EditTextStyle" parent="Widget.AppCompat.EditText">
         <item name="android:textAppearance">?android:attr/textAppearanceSmall</item>
-        <item name="android:selectAllOnFocus">false</item>
+        <item name="android:selectAllOnFocus">true</item>
         <item name="android:textIsSelectable">false</item>
         <item name="android:inputType">numberSigned</item>
         <item name="android:gravity">center</item>
@@ -84,4 +84,15 @@
         <item name="android:imeOptions">actionDone</item>
     </style>
 
+    <style name="NumberPicker.EditTextStyle.Disabled">
+        <item name="android:selectAllOnFocus">false</item>
+        <item name="android:textIsSelectable">false</item>
+        <item name="android:selectable">false</item>
+        <item name="android:focusable">false</item>
+        <item name="android:focusableInTouchMode">false</item>
+        <item name="android:inputType">none</item>
+        <item name="android:editable">false</item>
+        <item name="android:clickable">false</item>
+    </style>
+
 </resources>
