fead: add label title and pie chart

SeptiawanAjiP · Sep 8, 2023 · cd2cfb5 · cd2cfb5
1 parent c8b32a3
commit cd2cfb5
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 11 deletions.
diff --git a/app/src/main/java/com/dewakoding/androidchartjsapp/MainActivity.kt b/app/src/main/java/com/dewakoding/androidchartjsapp/MainActivity.kt
@@ -2,7 +2,7 @@ package com.dewakoding.androidchartjsapp
 
 import android.os.Bundle
 import androidx.appcompat.app.AppCompatActivity
-import com.dewakoding.androidchartjs.util.CommonConst
+import com.dewakoding.androidchartjs.util.ChartType
 import com.dewakoding.androidchartjsapp.databinding.ActivityMainBinding
 
 class MainActivity : AppCompatActivity() {
@@ -12,7 +12,7 @@ class MainActivity : AppCompatActivity() {
         super.onCreate(savedInstanceState)
         setContentView(binding.root)
 
-        binding.androidChart.setChart(CommonConst.CHART_JS_BAR, arrayOf("Sunday", "Monday", "Tuesday", "Wednesday", "Thursday"), arrayOf(10, 3, 5, 8, 9))
+        binding.androidChart.setChart(ChartType.PIE, arrayOf("Sunday", "Monday", "Tuesday", "Wednesday", "Thursday"), arrayOf(10, 3, 5, 8, 9), "of Orders")
     }
 
 }
diff --git a/chartjs/src/main/assets/index.html b/chartjs/src/main/assets/index.html
@@ -21,7 +21,7 @@
           labels: JSON.parse(Android.getLabel()),
           datasets: [
             {
-              label: "# of Votes",
+              label: Android.getLabelTitle(),
               data: JSON.parse(Android.getData()),
               borderWidth: 1,
             },

diff --git a/chartjs/src/main/java/com/dewakoding/androidchartjs/AndroidChartJSView.kt b/chartjs/src/main/java/com/dewakoding/androidchartjs/AndroidChartJSView.kt
@@ -30,9 +30,8 @@ class AndroidChartJSView  @JvmOverloads constructor(
         webView = WebView(context)
     }
 
-    fun setChart(type: String,label: Array<String>, data: Array<Int>) {
-
-        jsi = JavascriptInterface(getContext(), type, Gson().toJson(label) , Gson().toJson(data))
+    fun setChart(type: String,label: Array<String>, data: Array<Int>, labelTitle: String) {
+        jsi = JavascriptInterface(getContext(), type, Gson().toJson(label) , Gson().toJson(data), labelTitle)
         val webSettings: WebSettings = webView.getSettings()
         webSettings.javaScriptEnabled = true
         webView.addJavascriptInterface(jsi!!, JavascriptInterface.TAG_HANDLER)

diff --git a/chartjs/src/main/java/com/dewakoding/androidchartjs/JavascriptInterface.kt b/chartjs/src/main/java/com/dewakoding/androidchartjs/JavascriptInterface.kt
@@ -16,15 +16,16 @@ class JavascriptInterface(
     context: Context,
     type: String,
     label: String,
-    data: String
-
+    data: String,
+    labelTitle: String
 ) {
     companion object {
         const val TAG_HANDLER = "Android"
     }
     private val mType = type
     private val mLabel = label
     private val mData = data
+    private val mLabelTitle = labelTitle
 
 
     @JavascriptInterface
@@ -42,5 +43,10 @@ class JavascriptInterface(
         return mData.toString()
     }
 
+    @JavascriptInterface
+    fun getLabelTitle(): String {
+        return mLabelTitle
+    }
+
 
 }
diff --git a/...koding/androidchartjs/util/CommonConst.kt → ...wakoding/androidchartjs/util/ChartType.kt b/...koding/androidchartjs/util/CommonConst.kt → ...wakoding/androidchartjs/util/ChartType.kt
@@ -9,9 +9,10 @@ email : [email protected]
 website : dewakoding.com
 
  **/
-class CommonConst {
+class ChartType {
     companion object {
-        val CHART_JS_BAR = "bar"
-        val CHART_JS_LINE = "line"
+        val BAR = "bar"
+        val LINE = "line"
+        val PIE = "pie"
     }
 }