Skip to content

Commit 36030d2

Browse files
Pfuster12Pfuster12
authored
Merge pull request #17 from Pfuster12/v1.2.1-release
V1.2.1 release
2 parents cf70bcf + f0c93b8 commit 36030d2

File tree

7 files changed

+114
-87
lines changed

7 files changed

+114
-87
lines changed

‎app/build.gradle‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ android {
1111
minSdkVersion 21
1212
targetSdkVersion 29
1313
versionCode 1
14-
versionName "1.0"
14+
versionName "1.1"
1515

1616
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
1717
}

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

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -52,8 +52,14 @@ class MainActivity : AppCompatActivity() {
5252
.setOnTouchCallbackListener(object : LiveChart.OnTouchCallback {
5353
@SuppressLint("SetTextI18n")
5454
override fun onTouchCallback(point: DataPoint) {
55+
livechartSimple.parent.requestDisallowInterceptTouchEvent(true)
5556
main_simple_data_point.text = "(${"%.2f".format(point.x)}, ${"%.2f".format(point.y)})"
5657
}
58+
59+
override fun onTouchFinished() {
60+
livechartSimple.parent.requestDisallowInterceptTouchEvent(false)
61+
main_simple_data_point.text = "Touch Finished"
62+
}
5763
})
5864
.drawDataset()
5965

‎app/src/main/res/layout/activity_main.xml‎

Lines changed: 101 additions & 85 deletions
Original file line numberDiff line numberDiff line change
@@ -1,98 +1,114 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
2+
<androidx.core.widget.NestedScrollView xmlns:android="http://schemas.android.com/apk/res/android"
33
xmlns:app="http://schemas.android.com/apk/res-auto"
44
xmlns:tools="http://schemas.android.com/tools"
55
android:layout_width="match_parent"
6-
android:layout_height="match_parent"
7-
android:clipChildren="false"
8-
tools:context=".MainActivity">
6+
android:layout_height="match_parent">
97

10-
<TextView
11-
android:id="@+id/main_title"
12-
android:layout_width="wrap_content"
13-
android:layout_height="wrap_content"
14-
android:text="@string/livechart_sample"
15-
app:layout_constraintStart_toStartOf="parent"
16-
app:layout_constraintTop_toTopOf="parent"
17-
style="@style/TextAppearance.AppCompat.Medium"
18-
android:textStyle="bold"
19-
android:padding="16dp"/>
8+
<androidx.constraintlayout.widget.ConstraintLayout
9+
android:layout_width="match_parent"
10+
android:layout_height="match_parent"
11+
android:clipChildren="false"
12+
tools:context=".MainActivity">
2013

21-
<TextView
22-
android:id="@+id/main_simple"
23-
android:layout_width="wrap_content"
24-
android:layout_height="wrap_content"
25-
android:text="@string/simple_livechart_sample"
26-
app:layout_constraintStart_toStartOf="parent"
27-
app:layout_constraintTop_toBottomOf="@id/main_title"
28-
style="@style/TextAppearance.AppCompat.Caption"
29-
android:textStyle="bold"
30-
android:padding="16dp"/>
14+
<TextView
15+
android:id="@+id/lorem"
16+
android:layout_width="wrap_content"
17+
android:layout_height="wrap_content"
18+
android:text="@string/lorem_ipsum"
19+
app:layout_constraintStart_toStartOf="parent"
20+
app:layout_constraintTop_toTopOf="parent"
21+
style="@style/TextAppearance.AppCompat.Medium"
22+
android:textStyle="bold"
23+
android:padding="16dp"/>
3124

32-
<com.yabu.livechart.view.LiveChart
33-
android:id="@+id/main_simple_live_chart"
34-
android:layout_width="match_parent"
35-
android:layout_height="0dp"
36-
app:layout_constraintTop_toBottomOf="@id/main_simple"
37-
app:layout_constraintBottom_toTopOf="@id/main_positive"
38-
android:layout_marginBottom="16dp"/>
25+
<TextView
26+
android:id="@+id/main_title"
27+
android:layout_width="wrap_content"
28+
android:layout_height="wrap_content"
29+
android:text="@string/livechart_sample"
30+
app:layout_constraintStart_toStartOf="parent"
31+
app:layout_constraintTop_toBottomOf="@id/lorem"
32+
style="@style/TextAppearance.AppCompat.Medium"
33+
android:textStyle="bold"
34+
android:padding="16dp"/>
3935

40-
<TextView
41-
android:id="@+id/main_simple_data_point"
42-
android:layout_width="wrap_content"
43-
android:layout_height="wrap_content"
44-
tools:text="40.0"
45-
app:layout_constraintEnd_toEndOf="parent"
46-
app:layout_constraintTop_toTopOf="@id/main_simple"/>
36+
<TextView
37+
android:id="@+id/main_simple"
38+
android:layout_width="wrap_content"
39+
android:layout_height="wrap_content"
40+
android:text="@string/simple_livechart_sample"
41+
app:layout_constraintStart_toStartOf="parent"
42+
app:layout_constraintTop_toBottomOf="@id/main_title"
43+
style="@style/TextAppearance.AppCompat.Caption"
44+
android:textStyle="bold"
45+
android:padding="16dp"/>
4746

48-
<TextView
49-
android:id="@+id/main_positive"
50-
android:layout_width="wrap_content"
51-
android:layout_height="wrap_content"
52-
android:text="@string/positive_livechart_sample"
53-
app:layout_constraintStart_toStartOf="parent"
54-
app:layout_constraintBottom_toTopOf="@id/main_live_chart"
55-
app:layout_constraintTop_toBottomOf="@id/main_simple_live_chart"
56-
style="@style/TextAppearance.AppCompat.Caption"
57-
android:textStyle="bold"
58-
android:padding="16dp"/>
47+
<com.yabu.livechart.view.LiveChart
48+
android:id="@+id/main_simple_live_chart"
49+
android:layout_width="match_parent"
50+
android:layout_height="300dp"
51+
app:layout_constraintTop_toBottomOf="@id/main_simple"
52+
app:layout_constraintBottom_toTopOf="@id/main_positive"
53+
android:layout_marginBottom="16dp"/>
5954

60-
<com.yabu.livechart.view.LiveChart
61-
android:id="@+id/main_live_chart"
62-
android:layout_width="match_parent"
63-
android:layout_height="0dp"
64-
app:layout_constraintTop_toBottomOf="@id/main_positive"
65-
app:layout_constraintBottom_toTopOf="@id/main_negative"
66-
android:layout_marginBottom="16dp"/>
55+
<TextView
56+
android:id="@+id/main_simple_data_point"
57+
android:layout_width="wrap_content"
58+
android:layout_height="wrap_content"
59+
tools:text="40.0"
60+
app:layout_constraintEnd_toEndOf="parent"
61+
app:layout_constraintTop_toTopOf="@id/main_simple"/>
6762

68-
<TextView
69-
android:id="@+id/main_negative"
70-
android:layout_width="wrap_content"
71-
android:layout_height="wrap_content"
72-
android:text="@string/negative_livechart_sample"
73-
app:layout_constraintStart_toStartOf="parent"
74-
app:layout_constraintBottom_toTopOf="@id/main_negative_live_chart"
75-
app:layout_constraintTop_toBottomOf="@id/main_live_chart"
76-
style="@style/TextAppearance.AppCompat.Caption"
77-
android:textStyle="bold"
78-
android:padding="16dp"/>
63+
<TextView
64+
android:id="@+id/main_positive"
65+
android:layout_width="wrap_content"
66+
android:layout_height="wrap_content"
67+
android:text="@string/positive_livechart_sample"
68+
app:layout_constraintStart_toStartOf="parent"
69+
app:layout_constraintBottom_toTopOf="@id/main_live_chart"
70+
app:layout_constraintTop_toBottomOf="@id/main_simple_live_chart"
71+
style="@style/TextAppearance.AppCompat.Caption"
72+
android:textStyle="bold"
73+
android:padding="16dp"/>
7974

80-
<com.yabu.livechart.view.LiveChart
81-
android:id="@+id/main_negative_live_chart"
82-
android:layout_width="match_parent"
83-
android:layout_height="0dp"
84-
app:layout_constraintBottom_toBottomOf="parent"
85-
app:layout_constraintTop_toBottomOf="@id/main_negative"
86-
android:layout_marginBottom="16dp"
87-
app:labelTextColor="@color/colorAccent"
88-
app:pathColor="@color/colorAccent"
89-
app:pathStrokeWidth="4dp"
90-
app:baselineStrokeWidth="4dp"
91-
app:baselineDashGap="8dp"
92-
app:labelTextHeight="20sp"
93-
app:overlayCircleColor="@color/colorPrimaryDark"
94-
app:overlayLineColor="@color/colorPrimary"
95-
app:overlayCircleDiameter="8dp"
96-
app:baselineColor="@color/colorPrimaryDark"/>
75+
<com.yabu.livechart.view.LiveChart
76+
android:id="@+id/main_live_chart"
77+
android:layout_width="match_parent"
78+
android:layout_height="300dp"
79+
app:layout_constraintTop_toBottomOf="@id/main_positive"
80+
app:layout_constraintBottom_toTopOf="@id/main_negative"
81+
android:layout_marginBottom="16dp"/>
82+
83+
<TextView
84+
android:id="@+id/main_negative"
85+
android:layout_width="wrap_content"
86+
android:layout_height="wrap_content"
87+
android:text="@string/negative_livechart_sample"
88+
app:layout_constraintStart_toStartOf="parent"
89+
app:layout_constraintBottom_toTopOf="@id/main_negative_live_chart"
90+
app:layout_constraintTop_toBottomOf="@id/main_live_chart"
91+
style="@style/TextAppearance.AppCompat.Caption"
92+
android:textStyle="bold"
93+
android:padding="16dp"/>
94+
95+
<com.yabu.livechart.view.LiveChart
96+
android:id="@+id/main_negative_live_chart"
97+
android:layout_width="match_parent"
98+
android:layout_height="300dp"
99+
app:layout_constraintBottom_toBottomOf="parent"
100+
app:layout_constraintTop_toBottomOf="@id/main_negative"
101+
android:layout_marginBottom="16dp"
102+
app:labelTextColor="@color/colorAccent"
103+
app:pathColor="@color/colorAccent"
104+
app:pathStrokeWidth="4dp"
105+
app:baselineStrokeWidth="4dp"
106+
app:baselineDashGap="8dp"
107+
app:labelTextHeight="20sp"
108+
app:overlayCircleColor="@color/colorPrimaryDark"
109+
app:overlayLineColor="@color/colorPrimary"
110+
app:overlayCircleDiameter="8dp"
111+
app:baselineColor="@color/colorPrimaryDark"/>
97112

98-
</androidx.constraintlayout.widget.ConstraintLayout>
113+
</androidx.constraintlayout.widget.ConstraintLayout>
114+
</androidx.core.widget.NestedScrollView>

‎app/src/main/res/values/strings.xml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,4 +4,5 @@
44
<string name="positive_livechart_sample">Positive Livechart Sample</string>
55
<string name="negative_livechart_sample">Negative Livechart Sample</string>
66
<string name="simple_livechart_sample">Simple Livechart Sample</string>
7+
<string name="lorem_ipsum">Sed ut perspiciatis unde omnis iste natus error sit voluptatem accusantium doloremque laudantium, totam rem aperiam, eaque ipsa quae ab illo inventore veritatis et quasi architecto beatae vitae dicta sunt explicabo. Nemo enim ipsam voluptatem quia voluptas sit aspernatur aut odit aut fugit, sed quia consequuntur magni dolores eos qui ratione voluptatem sequi nesciunt. Neque porro quisquam est, qui dolorem ipsum quia dolor sit amet, consectetur, adipisci velit, sed quia non numquam eius modi tempora incidunt ut labore et dolore magnam aliquam quaerat voluptatem. Ut enim ad minima veniam, quis nostrum exercitationem ullam corporis suscipit laboriosam, nisi ut aliquid ex ea commodi consequatur? Quis autem vel eum iure reprehenderit qui in ea voluptate velit esse quam nihil molestiae consequatur, vel illum qui dolorem eum fugiat quo voluptas nulla pariatur?</string>
78
</resources>

‎livechart/build.gradle‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ android {
1313
minSdkVersion 21
1414
targetSdkVersion 29
1515
versionCode 2
16-
versionName "1.1.0"
16+
versionName "1.2.1"
1717

1818
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
1919
consumerProguardFiles "consumer-rules.pro"

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,8 @@ class LiveChart(context: Context, attrs: AttributeSet?) : FrameLayout(context, a
2727

2828
interface OnTouchCallback {
2929
fun onTouchCallback(point: DataPoint)
30+
31+
fun onTouchFinished()
3032
}
3133

3234
/**

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -299,6 +299,8 @@ class LiveChartTouchOverlay(context: Context, attrs: AttributeSet?)
299299
MotionEvent.ACTION_UP,
300300
MotionEvent.ACTION_CANCEL,
301301
MotionEvent.ACTION_OUTSIDE -> {
302+
touchListener?.onTouchFinished()
303+
302304
overlay.alpha = 0f
303305
true
304306
}

0 commit comments

Comments
 (0)