Clean-up code.

StephaneBg · Aug 29, 2017 · b6cf512 · b6cf512
1 parent 642c4b6
commit b6cf512
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 6 deletions.
diff --git a/dependencies.gradle b/dependencies.gradle
@@ -22,6 +22,7 @@ ext {
     // Packages
     supportPackage = 'com.android.support'
     rangeViewPackage = 'me.bendik.simplerangeview'
+    kotlinPackage = 'org.jetbrains.kotlin'
 
     supportDependencies = [
             appCompat        : buildDependency(supportPackage, 'appcompat-v7', supportVersion),
@@ -34,6 +35,8 @@ ext {
             percent          : buildDependency(supportPackage, 'percent', supportVersion)
     ]
 
+    kotlinDependency = buildDependency(kotlinPackage, 'kotlin-stdlib-jre8', kotlin_version)
+
     rangeView = buildDependency(rangeViewPackage, 'simplerangeview', rangeViewVersion)
 }
 

diff --git a/library/build.gradle b/library/build.gradle
@@ -36,5 +36,5 @@ dependencies {
     implementation supportDependencies.appCompat
     implementation supportDependencies.percent
     implementation supportDependencies.grid
-    implementation "org.jetbrains.kotlin:kotlin-stdlib-jre8:$kotlin_version"
+    implementation kotlinDependency
 }
diff --git a/library/src/main/java/com/sbgapps/simplenumberpicker/decimal/DecimalPickerDialog.kt b/library/src/main/java/com/sbgapps/simplenumberpicker/decimal/DecimalPickerDialog.kt
@@ -96,8 +96,7 @@ class DecimalPickerDialog : DialogFragment() {
                     if (result.isEmpty()) result = "0"
                     result = result.replace(',', '.')
                     if (result == ".") result = "0"
-
-                    val number = java.lang.Float.parseFloat(result)
+                    val number = result.toFloat()
 
                     val activity = activity
                     val fragment = parentFragment
@@ -193,7 +192,10 @@ class DecimalPickerDialog : DialogFragment() {
         backspaceButton.isEnabled = 0 != numberTextView.length()
         if (numberTextView.text.isEmpty()) {
             dialog.getButton(DialogInterface.BUTTON_POSITIVE).isEnabled = false
-        } else dialog.getButton(DialogInterface.BUTTON_POSITIVE).isEnabled = !(1 == numberTextView.text.length && '-' == numberTextView.text[0])
+        } else {
+            dialog.getButton(DialogInterface.BUTTON_POSITIVE).isEnabled =
+                    !(1 == numberTextView.text.length && '-' == numberTextView.text[0])
+        }
     }
 
     private fun initDecimalSeparator() {

diff --git a/library/src/main/java/com/sbgapps/simplenumberpicker/hex/HexaPickerDialog.kt b/library/src/main/java/com/sbgapps/simplenumberpicker/hex/HexaPickerDialog.kt
@@ -90,6 +90,7 @@ class HexaPickerDialog : DialogFragment() {
                 .setPositiveButton(android.R.string.ok) { _, _ ->
                     if (numberTextView.text.isEmpty()) numberTextView.text = "0"
                     val number = numberTextView.text.toString()
+
                     val activity = activity
                     val fragment = parentFragment
                     if (activity is HexaPickerHandler) {

diff --git a/sample/build.gradle b/sample/build.gradle
@@ -50,5 +50,5 @@ dependencies {
     implementation supportDependencies.appCompat
     implementation supportDependencies.design
     implementation rangeView
-    implementation "org.jetbrains.kotlin:kotlin-stdlib-jre8:$kotlin_version"
+    implementation kotlinDependency
 }
diff --git a/sample/src/main/java/com/sbgapps/simplenumberpicker/sample/MainActivity.kt b/sample/src/main/java/com/sbgapps/simplenumberpicker/sample/MainActivity.kt
@@ -39,7 +39,7 @@ class MainActivity : AppCompatActivity(), HexaPickerHandler, DecimalPickerHandle
 
     @SuppressLint("SetTextI18n")
     override fun onDecimalNumberPicked(reference: Int, number: Float) {
-        decimalTextView.text = java.lang.Float.toString(number)
+        decimalTextView.text = "$number"
     }
 
     fun showDecimalPicker() {