add custom position programatically + saveState

abd3lraouf · Jan 31, 2020 · 49a7a76 · 49a7a76
1 parent 6ba84b5
commit 49a7a76
Show file tree

Hide file tree

Showing 60 changed files with 34 additions and 6 deletions.
diff --git a/.gitignore b/.gitignore
diff --git a/.idea/.name b/.idea/.name
diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml
diff --git a/.idea/codeStyles/codeStyleConfig.xml b/.idea/codeStyles/codeStyleConfig.xml
diff --git a/.idea/gradle.xml b/.idea/gradle.xml
diff --git a/.idea/misc.xml b/.idea/misc.xml
diff --git a/.idea/runConfigurations.xml b/.idea/runConfigurations.xml
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
diff --git a/README.md b/README.md
diff --git a/app/.gitignore b/app/.gitignore
diff --git a/app/build.gradle b/app/build.gradle
diff --git a/app/proguard-rules.pro b/app/proguard-rules.pro
diff --git a/app/src/androidTest/java/io/abdelraoufsabri/learn/androidruler/ExampleInstrumentedTest.kt b/app/src/androidTest/java/io/abdelraoufsabri/learn/androidruler/ExampleInstrumentedTest.kt
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
diff --git a/app/src/main/java/io/abdelraoufsabri/learn/androidruler/MainActivity.kt b/app/src/main/java/io/abdelraoufsabri/learn/androidruler/MainActivity.kt
@@ -16,8 +16,13 @@ class MainActivity : AppCompatActivity() {
             value_text.text = myScrollingValuePicker.getReading(it).toString()
         }, 250)
 
+
+
+
         myScrollingValuePicker2.setOnScrollChangedListener({
             value_text2.text = myScrollingValuePicker2.getReading(it).toString()
         }, 250)
+
+        myScrollingValuePicker2.moveTo(150F)
     }
 }
diff --git a/app/src/main/res/drawable-v24/ic_launcher_foreground.xml b/app/src/main/res/drawable-v24/ic_launcher_foreground.xml
diff --git a/app/src/main/res/drawable/ic_launcher_background.xml b/app/src/main/res/drawable/ic_launcher_background.xml
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
@@ -22,8 +22,8 @@
         android:layout_height="wrap_content"
         app:rulerMinValue="15"
         app:rulerMaxValue="108"
-        app:rulerSystem="imperial"
         app:rulerDefaultPosition="107.75"
+        app:rulerSystem="imperial"
         app:rulerPointerColor="#FF0000FF"
         app:rulerNormalUnitBarColor="#FF0000FF"
         app:rulerMiddleUnitBarColor="#00BCD4"
@@ -51,8 +51,8 @@
         android:layout_height="wrap_content"
         app:rulerMinValue="30"
         app:rulerMaxValue="280"
-        app:rulerSystem="metric"
         app:rulerDefaultPosition="279"
+        app:rulerSystem="metric"
         app:rulerPointerColor="#FF0000FF"
         app:rulerNormalUnitBarColor="#FF0000FF"
         app:rulerMiddleUnitBarColor="#00BCD4"

diff --git a/app/src/main/res/layout/content_main.xml b/app/src/main/res/layout/content_main.xml
diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher.png b/app/src/main/res/mipmap-hdpi/ic_launcher.png
diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_round.png b/app/src/main/res/mipmap-hdpi/ic_launcher_round.png
diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher.png b/app/src/main/res/mipmap-mdpi/ic_launcher.png
diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher_round.png b/app/src/main/res/mipmap-mdpi/ic_launcher_round.png
diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher.png b/app/src/main/res/mipmap-xhdpi/ic_launcher.png
diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png b/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png
diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher.png b/app/src/main/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png b/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png
diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
diff --git a/app/src/test/java/io/abdelraoufsabri/learn/androidruler/ExampleUnitTest.kt b/app/src/test/java/io/abdelraoufsabri/learn/androidruler/ExampleUnitTest.kt
diff --git a/build.gradle b/build.gradle
diff --git a/gradle.properties b/gradle.properties
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
diff --git a/gradlew.bat b/gradlew.bat
diff --git a/ruler/.gitignore b/ruler/.gitignore
diff --git a/ruler/build.gradle b/ruler/build.gradle
@@ -13,8 +13,8 @@ android {
     defaultConfig {
         minSdkVersion 16
         targetSdkVersion 29
-        versionCode 7
-        versionName "1.3.0"
+        versionCode 8
+        versionName "1.3.1"
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         consumerProguardFiles 'consumer-rules.pro'
@@ -38,5 +38,4 @@ dependencies {
     implementation 'io.reactivex.rxjava2:rxandroid:2.1.1'
     implementation 'io.reactivex.rxjava2:rxjava:2.2.16'
     implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
-
 }
diff --git a/ruler/consumer-rules.pro b/ruler/consumer-rules.pro
diff --git a/ruler/proguard-rules.pro b/ruler/proguard-rules.pro
diff --git a/ruler/src/main/AndroidManifest.xml b/ruler/src/main/AndroidManifest.xml
diff --git a/ruler/src/main/java/io/abdelraoufsabri/learn/ruler/ObservableHorizontalScrollView.kt b/ruler/src/main/java/io/abdelraoufsabri/learn/ruler/ObservableHorizontalScrollView.kt
diff --git a/ruler/src/main/java/io/abdelraoufsabri/learn/ruler/widget/FancyRuler.kt b/ruler/src/main/java/io/abdelraoufsabri/learn/ruler/widget/FancyRuler.kt
@@ -4,6 +4,8 @@ import android.animation.ObjectAnimator
 import android.content.Context
 import android.content.res.TypedArray
 import android.graphics.drawable.GradientDrawable
+import android.os.Bundle
+import android.os.Parcelable
 import android.util.AttributeSet
 import android.util.Log
 import android.view.Gravity
@@ -24,6 +26,7 @@ import kotlin.math.roundToInt
 
 
 class FancyRuler : LinearLayout {
+    var value: Float = 0F
 
     private var multiplier = 0
 
@@ -238,7 +241,7 @@ class FancyRuler : LinearLayout {
         item.background = gradientDrawable
     }
 
-    private fun customPosition() = ((defaultPosition - rulerMinValue) * step * multiplier) + step
+    private fun customPosition(newPosition: Float = defaultPosition) = ((newPosition - rulerMinValue) * step * multiplier) + step
 
     private fun startPosition() = step.toFloat()
 
@@ -338,13 +341,34 @@ class FancyRuler : LinearLayout {
             overScrolled(value) -> scrollTo(endPosition())
             else -> scrollTo(correctedMark.toFloat())
         }
+        this.value = value
         return value
     }
 
+    override fun onSaveInstanceState(): Parcelable? {
+        val bundle = Bundle()
+        bundle.putParcelable("SUPER_STATE", super.onSaveInstanceState())
+        bundle.putFloat("value", value)
+        return bundle
+    }
+
+    override fun onRestoreInstanceState(state: Parcelable?) {
+        if (state is Bundle) {
+            value = state.getFloat("value")
+            moveTo(value)
+            return super.onRestoreInstanceState(state.getParcelable<Parcelable>("SUPER_STATE"))
+        }
+        return super.onRestoreInstanceState(state)
+    }
+
     private fun approachesNextStep(xValue: Int) = xValue % step > (step * .5)
 
     private fun Float.dpAsPixels(): Int {
         val scale = context.resources.displayMetrics.density
         return (this * scale).toInt()
     }
+
+    fun moveTo(newPosition: Float) {
+        scrollTo(customPosition(newPosition))
+    }
 }
diff --git a/ruler/src/main/res/drawable/main_unit_bar.xml b/ruler/src/main/res/drawable/main_unit_bar.xml
diff --git a/ruler/src/main/res/drawable/middle_unit_bar.xml b/ruler/src/main/res/drawable/middle_unit_bar.xml
diff --git a/ruler/src/main/res/drawable/normal_unit_bar.xml b/ruler/src/main/res/drawable/normal_unit_bar.xml
diff --git a/ruler/src/main/res/drawable/pointer_line.xml b/ruler/src/main/res/drawable/pointer_line.xml
diff --git a/ruler/src/main/res/drawable/quarter_unit_bar.xml b/ruler/src/main/res/drawable/quarter_unit_bar.xml
diff --git a/ruler/src/main/res/drawable/three_quarters_unit_bar.xml b/ruler/src/main/res/drawable/three_quarters_unit_bar.xml
diff --git a/ruler/src/main/res/layout/units.xml b/ruler/src/main/res/layout/units.xml
diff --git a/ruler/src/main/res/values/attrs.xml b/ruler/src/main/res/values/attrs.xml
diff --git a/ruler/src/main/res/values/colors.xml b/ruler/src/main/res/values/colors.xml
diff --git a/ruler/src/main/res/values/dimens.xml b/ruler/src/main/res/values/dimens.xml
diff --git a/ruler/src/main/res/values/strings.xml b/ruler/src/main/res/values/strings.xml
diff --git a/settings.gradle b/settings.gradle