Merge pull request #38 from Pfuster12/feat@touch-overlay-display

feat(overlay): add always display flag to touch overlay

Author: Pfuster12

README.md

@@ -288,6 +288,17 @@ livechart.setDataset(dataset)
 
 This allows us to show the current point the user is dragging along.
 
+Since v1.3.5, the touch overlay can be displayed at all times by applying the `drawTouchOverlayAlways()` flag.
+
+```kotlin
+val textView = findViewById(R.id.text_view)
+
+livechart.setDataset(dataset)
+        .drawTouchOverlayAlways()
+        .drawDataset()
+```
+
+
 ### Disabling the touch overlay
 
 If you don't want the touch overlay it can be disabled easily:

app/src/main/java/com/yabu/livechartdemoapp/MainActivity.kt

@@ -40,6 +40,7 @@ class MainActivity : AppCompatActivity() {
 
         livechartSimple.setDataset(dataset)
             .setLiveChartStyle(chartStyle)
+            .drawTouchOverlayAlways()
             .drawSmoothPath()
             .setOnTouchCallbackListener(object : LiveChart.OnTouchCallback {
                 @SuppressLint("SetTextI18n")

app/src/main/java/com/yabu/livechartdemoapp/SampleData.kt

@@ -235,7 +235,7 @@ object SampleData {
 
         val data = Gson().fromJson(json, TestDataResponse::class.java)
         return Dataset(data.mapIndexed { index, it ->
-            DataPoint(index.toFloat() + 16, it.close.toFloat())
+            DataPoint(index.toFloat(), it.close.toFloat())
         }.toMutableList())
     }
 

livechart/build.gradle

@@ -13,8 +13,8 @@ android {
     defaultConfig {
         minSdkVersion 21
         targetSdkVersion 29
-        versionCode 2
-        versionName "1.3.4"
+        versionCode 3
+        versionName "1.3.5"
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         consumerProguardFiles "consumer-rules.pro"

livechart/src/main/java/com/yabu/livechart/view/LiveChart.kt

@@ -238,6 +238,17 @@ class LiveChart(context: Context, attrs: AttributeSet? = null) : FrameLayout(con
         return this
     }
 
+    /**
+     * Show Overlay by default, not just on touch.
+     */
+    @PublicApi
+    fun drawTouchOverlayAlways(): LiveChart {
+        disableTouchOverlay = false
+        overlay.alwaysDisplay()
+
+        return this
+    }
+
     /**
      * Draw on chart and bind overlay to dataset.
      */

livechart/src/main/java/com/yabu/livechart/view/LiveChartTouchOverlay.kt

@@ -7,6 +7,7 @@ import android.graphics.Path
 import android.graphics.PathMeasure
 import android.util.AttributeSet
 import android.util.DisplayMetrics
+import android.util.Log
 import android.view.LayoutInflater
 import android.view.MotionEvent
 import android.view.View
@@ -20,8 +21,10 @@ import com.yabu.livechart.utils.EPointF
 import com.yabu.livechart.utils.PolyBezierPathUtil
 import com.yabu.livechart.utils.PublicApi
 import com.yabu.livechart.view.LiveChart.OnTouchCallback
+import java.lang.Exception
 import kotlin.math.max
 import kotlin.math.min
+import kotlin.math.round
 import kotlin.math.roundToInt
 
 /**
@@ -86,6 +89,11 @@ class LiveChartTouchOverlay(context: Context, attrs: AttributeSet?)
      */
     private var oldRoundedPos = 0
 
+    /**
+     * Always display flag.
+     */
+    private var alwaysDisplay = false
+
     /**
      * Y Bounds display flag.
      */
@@ -146,6 +154,12 @@ class LiveChartTouchOverlay(context: Context, attrs: AttributeSet?)
         return this
     }
 
+    @PublicApi
+    fun alwaysDisplay() {
+        overlay.alpha = 1f
+        alwaysDisplay = true
+    }
+
     /**
      * Draw straight path flag.
      */
@@ -234,6 +248,15 @@ class LiveChartTouchOverlay(context: Context, attrs: AttributeSet?)
 
             extractCoordinatesFromPath()
 
+            try {
+                // Set to default in the middle of the path
+                val coordinates = pathCoordinates[round(pathCoordinates.size.div(2).toFloat()).toInt()]
+                overlay.x = coordinates[0] - (chartStyle.overlayCircleDiameter/2)
+                overlayPoint.y = coordinates[1] - (chartStyle.overlayCircleDiameter/2)
+            } catch (e: Exception) {
+                Log.e("Overlay", e.message.toString())
+            }
+
             invalidate()
         }
     }
@@ -391,7 +414,9 @@ class LiveChartTouchOverlay(context: Context, attrs: AttributeSet?)
             MotionEvent.ACTION_OUTSIDE -> {
                 touchListener?.onTouchFinished()
 
-                overlay.alpha = 0f
+                if (!alwaysDisplay) {
+                    overlay.alpha = 0f
+                }
                 true
             }