Merge remote-tracking branch 'origin/master'

# Conflicts:
#	lib/src/main/java/com/faskn/lib/ClickablePieChart.kt

Author: Furkan

README.md

@@ -18,7 +18,7 @@ allprojects {
 Step 2. Add the dependency
 ```gradle
 dependencies {
-	implementation 'com.github.furkanaskin:ClickablePieChart:1.0.7'
+	implementation 'com.github.furkanaskin:ClickablePieChart:1.0.8'
 }
 ```
 
@@ -47,6 +47,12 @@ To setup with legend you need an root layout for legend.
 ```kotlin
 chart.showLegend(legendLayout)
 ```
+Or use with custom legend adapter by inheriting from [LegendAdapter](https://github.com/furkanaskin/ClickablePieChart/blob/master/lib/src/main/java/com/faskn/lib/legend/LegendAdapter.kt)
+```kotlin
+chart.showLegend(legendLayout, CustomLegendAdapter())
+```
+Sample Custom Adapter can be found [here](https://github.com/furkanaskin/ClickablePieChart/blob/master/app/src/main/java/com/faskn/clickablepiechart/CustomLegendAdapter.kt)
+
 ## XML Attributes
 <table>
 <thead>

app/build.gradle

@@ -35,6 +35,7 @@ dependencies {
     implementation 'androidx.core:core-ktx:1.3.1'
     implementation 'androidx.appcompat:appcompat:1.2.0'
     implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
+    implementation "androidx.recyclerview:recyclerview:1.1.0"
     testImplementation 'junit:junit:4.12'
     androidTestImplementation 'androidx.test.ext:junit:1.1.1'
     androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0'

app/src/main/java/com/faskn/clickablepiechart/CustomLegendAdapter.kt

@@ -0,0 +1,31 @@
+package com.faskn.clickablepiechart
+
+import android.content.res.ColorStateList
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import androidx.core.content.ContextCompat
+import com.faskn.lib.Slice
+import com.faskn.lib.legend.LegendAdapter
+import com.faskn.lib.legend.LegendItemViewHolder
+import kotlinx.android.synthetic.main.custom_item_legend.view.*
+
+
+class CustomLegendAdapter: LegendAdapter() {
+
+    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): CustomLegendItemViewHolder {
+        return CustomLegendItemViewHolder(
+            LayoutInflater.from(parent.context).inflate(R.layout.custom_item_legend, parent, false)
+        )
+    }
+
+    // CREATE YOUR OWN ITEM VIEW HOLDER
+    class CustomLegendItemViewHolder(view: View) : LegendItemViewHolder(view) {
+       override fun bind(slice: Slice) {
+           this.boundItem = slice
+           itemView.imageViewCircleIndicator.imageTintList =
+               ColorStateList.valueOf(ContextCompat.getColor(itemView.context, slice.color))
+           itemView.textViewSliceTitle.text = slice.name
+       }
+   }
+}

app/src/main/java/com/faskn/clickablepiechart/MainActivity.kt

@@ -32,6 +32,10 @@ class MainActivity : AppCompatActivity() {
 
         chart.setPieChart(pieChart)
         chart.showLegend(legendLayout)
+
+        //OR SET WITH CUSTOMER LEGEND ADAPTER
+        chart2.setPieChart(pieChart)
+        chart2.showLegend(legendLayout2,CustomLegendAdapter())
     }
 
     private fun provideSlices(): ArrayList<Slice> {

app/src/main/res/drawable/ic_star.xml

@@ -0,0 +1,5 @@
+<vector android:height="48dp" android:viewportHeight="1280"
+    android:viewportWidth="1280" android:width="48dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="#000000"
+        android:pathData="M628,197.7c-7.9,24.7 -33.4,103.7 -56.6,175.8l-42.2,131 -7.3,0.1c-4.1,0.1 -65.4,0.7 -136.4,1.4 -71,0.6 -129.6,1.3 -130.3,1.6 -0.7,0.2 -20.5,0.4 -44,0.4 -23.5,-0 -50.2,0.3 -59.3,0.7l-16.7,0.6 126.2,93.9c69.3,51.6 140.6,104.6 158.3,117.8l32.2,23.9 -1.9,5.8c-6.2,18.5 -104.9,325.7 -104.7,325.9 0.1,0.1 13.3,-9 29.2,-20.1 16,-11.1 83.8,-58.2 150.7,-104.7l121.7,-84.6 43.3,30.7c23.8,16.9 92.1,65.3 151.8,107.5 59.7,42.3 109.2,77.5 110.1,78.2 0.8,0.8 1.8,1.4 2.1,1.4 0.2,-0 -9.1,-27.8 -20.8,-61.8 -11.8,-33.9 -23.2,-66.9 -25.3,-73.2 -63.6,-184.2 -78.1,-226.6 -77.8,-227.3 0.2,-0.8 29,-20.4 214.9,-146.4 51,-34.5 92.7,-63.2 92.8,-63.7 0,-0.5 -8.2,-0.6 -18.7,-0.2 -10.4,0.3 -91.9,0.9 -181.3,1.2l-162.5,0.6 -17.7,-48.3c-9.7,-26.6 -35.9,-98.4 -58.3,-159.4 -22.4,-61.1 -44.1,-120.6 -48.3,-132.2 -4.2,-11.7 -7.9,-21.3 -8.2,-21.3 -0.3,-0 -7.1,20.1 -15,44.7z" android:strokeColor="#00000000"/>
+</vector>

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

@@ -1,27 +1,29 @@
 <?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
+    android:orientation="vertical"
+    android:weightSum="2"
     tools:context=".MainActivity">
 
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_centerInParent="true"
         android:layout_margin="24dp"
+        android:layout_weight="1"
         android:orientation="horizontal">
 
         <com.faskn.lib.ClickablePieChart
             android:id="@+id/chart"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
             android:layout_weight="1"
+            app:animationDuration="2000"
             app:centerColor="@color/white"
             app:popupText="Ziyaret"
             app:showPercentage="true"
-            app:animationDuration="2000"
             app:showPopup="true" />
 
         <FrameLayout
@@ -30,4 +32,32 @@
             android:layout_height="wrap_content"
             android:layout_weight="1.5" />
     </LinearLayout>
-</RelativeLayout>
+
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_margin="24dp"
+
+        android:layout_weight="1"
+        android:orientation="horizontal">
+
+        <com.faskn.lib.ClickablePieChart
+            android:id="@+id/chart2"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:layout_weight="1"
+            app:animationDuration="2000"
+            app:centerColor="@color/white"
+            app:popupText="Ziyaret"
+            app:showPercentage="true"
+            app:showPopup="true" />
+
+        <FrameLayout
+            android:id="@+id/legendLayout2"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_weight="1.5" />
+    </LinearLayout>
+
+</LinearLayout>

app/src/main/res/layout/custom_item_legend.xml

@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content">
+
+    <ImageView
+        android:id="@+id/imageViewCircleIndicator"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_centerVertical="true"
+        android:layout_marginStart="11dp"
+        android:src="@drawable/ic_star" />
+
+    <TextView
+        android:id="@+id/textViewSliceTitle"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_centerVertical="true"
+        android:layout_marginStart="4dp"
+        android:layout_marginEnd="11dp"
+        android:layout_toEndOf="@+id/imageViewCircleIndicator"
+        android:ellipsize="end"
+        android:maxLines="1"
+        android:textColor="@android:color/black"
+        android:textSize="20sp"
+        tools:text="1648 ziyaret" />
+</RelativeLayout>

lib/src/main/java/com/faskn/lib/ClickablePieChart.kt

@@ -297,13 +297,13 @@ class ClickablePieChart @JvmOverloads constructor(
         popupWindow?.dismiss()
     }
 
-    fun showLegend(rootLayout: ViewGroup) {
+    fun showLegend(rootLayout: ViewGroup, adapter: LegendAdapter = LegendAdapter()) {
         val recyclerView = RecyclerView(context)
-        val linearLayoutManager = LinearLayoutManager(context, LinearLayoutManager.VERTICAL, false)
+        val linearLayoutManager =
+            LinearLayoutManager(context, LinearLayoutManager.VERTICAL, false)
         recyclerView.layoutManager = linearLayoutManager
-        val adapter = LegendAdapter()
-        slices?.toMutableList()?.let { adapter.setup(it) }
         recyclerView.adapter = adapter
+        slices?.toMutableList()?.let { adapter.setup(it) }
         recyclerView.overScrollMode = OVER_SCROLL_NEVER
         rootLayout.addView(recyclerView)
         invalidateAndRequestLayout()

lib/src/main/java/com/faskn/lib/legend/LegendAdapter.kt

@@ -10,52 +10,40 @@ import com.faskn.lib.R
 import com.faskn.lib.Slice
 import kotlinx.android.synthetic.main.item_legend.view.*
 
-class LegendAdapter : RecyclerView.Adapter<LegendAdapter.ItemViewHolder>() {
-
-    private val items = mutableListOf<Slice>()
+open class LegendAdapter : RecyclerView.Adapter<LegendItemViewHolder>() {
 
+    protected val items = mutableListOf<Slice>()
     var onItemClickListener: ((Slice?) -> Unit)? = null
 
-    override fun onCreateViewHolder(
-        parent: ViewGroup,
-        viewType: Int
-    ): LegendAdapter.ItemViewHolder {
-        return ItemViewHolder(
-            LayoutInflater.from(parent.context).inflate(
-                R.layout.item_legend,
-                parent,
-                false
-            )
-        )
-    }
-
-    override fun onBindViewHolder(holder: LegendAdapter.ItemViewHolder, position: Int) {
-        holder.bind(items[position])
-    }
-
-    override fun getItemCount(): Int = items.size
-
     fun setup(items: List<Slice>) {
         this.items.clear()
         this.items.addAll(items)
         notifyDataSetChanged()
     }
 
-    inner class ItemViewHolder(view: View) : RecyclerView.ViewHolder(view) {
+    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): LegendItemViewHolder {
+        return LegendItemViewHolder(
+            LayoutInflater.from(parent.context).inflate(R.layout.item_legend, parent, false)
+        )
+    }
 
-        private var boundItem: Slice? = null
+    override fun getItemCount(): Int = items.size
 
-        init {
-            itemView.setOnClickListener {
-                onItemClickListener?.invoke(boundItem)
-            }
-        }
+    override fun onBindViewHolder(holder: LegendItemViewHolder, position: Int) {
+        holder.bind(items[position])
 
-        fun bind(slice: Slice) {
-            this.boundItem = slice
-            itemView.imageViewCircleIndicator.imageTintList =
-                ColorStateList.valueOf(ContextCompat.getColor(itemView.context, slice.color))
-            itemView.textViewSliceTitle.text = slice.name
+        holder.itemView.setOnClickListener {
+            onItemClickListener?.invoke(items[position])
         }
     }
+}
+
+open class LegendItemViewHolder(view: View) : RecyclerView.ViewHolder(view) {
+    var boundItem: Slice? = null
+    open fun bind(slice: Slice) {
+        boundItem = slice
+        itemView.imageViewCircleIndicator.imageTintList =
+            ColorStateList.valueOf(ContextCompat.getColor(itemView.context, slice.color))
+        itemView.textViewSliceTitle.text = slice.name
+    }
 }