diff --git a/app/build.gradle b/app/build.gradle
index b4711913..938959fe 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -4,13 +4,13 @@ plugins {
 }
 
 android {
-    compileSdkVersion 30
-    buildToolsVersion "30.0.3"
+    compileSdkVersion 34
+    namespace = "otus.homework.customview"
 
     defaultConfig {
         applicationId "otus.homework.customview"
         minSdkVersion 23
-        targetSdkVersion 30
+        targetSdkVersion 34
         versionCode 1
         versionName "1.0"
 
@@ -24,11 +24,11 @@ android {
         }
     }
     compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_8
-        targetCompatibility JavaVersion.VERSION_1_8
+        sourceCompatibility JavaVersion.VERSION_17
+        targetCompatibility JavaVersion.VERSION_17
     }
     kotlinOptions {
-        jvmTarget = '1.8'
+        jvmTarget = '17'
     }
 }
 
@@ -40,6 +40,7 @@ dependencies {
     implementation 'com.google.android.material:material:1.3.0'
     implementation 'androidx.constraintlayout:constraintlayout:2.0.4'
     testImplementation 'junit:junit:4.+'
+    implementation 'com.google.code.gson:gson:2.10.1'
     androidTestImplementation 'androidx.test.ext:junit:1.1.2'
     androidTestImplementation 'androidx.test.espresso:espresso-core:3.3.0'
 }
\ No newline at end of file
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index efd1e519..0af130d3 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -10,7 +10,8 @@
         android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
         android:theme="@style/Theme.CustomView">
-        <activity android:name=".MainActivity">
+        <activity android:name=".MainActivity"
+            android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
 
diff --git a/app/src/main/java/otus/homework/customview/GraphBarView.kt b/app/src/main/java/otus/homework/customview/GraphBarView.kt
new file mode 100644
index 00000000..09675af7
--- /dev/null
+++ b/app/src/main/java/otus/homework/customview/GraphBarView.kt
@@ -0,0 +1,164 @@
+package otus.homework.customview
+
+import android.content.Context
+import android.graphics.Canvas
+import android.graphics.Color
+import android.graphics.Paint
+import android.graphics.Path
+import android.util.AttributeSet
+import android.view.View
+import otus.homework.customview.data.GraphBarModel
+
+class GraphBarView @JvmOverloads constructor(
+    context: Context,
+    attrs: AttributeSet? = null
+) : View(context, attrs) {
+
+    private var maxPrice: Int = 2000
+    private val stepsPrice: Int = 5
+    private val stepsDate: Int = 16
+    private val maxVerticalLine = 500f
+    private val paddingHorizontal = 50f
+    private var list: ArrayList<GraphBarModel> = arrayListOf()
+
+    private val paintText = Paint().apply {
+        color = Color.GRAY
+    }
+
+    private val paintGrid = Paint().apply {
+        color = Color.LTGRAY
+        strokeWidth = 2f
+        style = Paint.Style.STROKE
+    }
+
+    private val paintLine = Paint().apply {
+        strokeWidth = 8f
+        style = Paint.Style.STROKE
+        strokeCap = Paint.Cap.ROUND
+        strokeJoin = Paint.Join.ROUND
+    }
+
+    override fun onMeasure(widthMeasureSpec: Int, heightMeasureSpec: Int) {
+        val wMode = MeasureSpec.getMode(widthMeasureSpec)
+        val hMode = MeasureSpec.getMode(heightMeasureSpec)
+        val wSize = MeasureSpec.getSize(widthMeasureSpec)
+        val hSize = MeasureSpec.getSize(heightMeasureSpec)
+
+        when (wMode) {
+            MeasureSpec.EXACTLY -> {
+                setMeasuredDimension(wSize, hSize)
+            }
+
+            MeasureSpec.AT_MOST -> {
+                setMeasuredDimension(wSize, hSize)
+            }
+
+            MeasureSpec.UNSPECIFIED -> {
+                setMeasuredDimension(wSize, hSize)
+            }
+        }
+    }
+
+    override fun onDraw(canvas: Canvas) {
+        super.onDraw(canvas)
+
+        drawPrice(canvas)
+    }
+
+    fun setMaxPrice(newMaxPrice: Int) {
+        maxPrice = newMaxPrice
+    }
+
+    private fun drawPrice(canvas: Canvas) {
+        val stepPriceForGrid = maxPrice / stepsPrice.minus(1)
+        val stepDateForGrid = (measuredWidth - paddingHorizontal.times(2)) / stepsDate.minus(1)
+
+        repeat(stepsPrice) {
+            val sum = maxPrice - stepPriceForGrid.times(it)
+            canvas.drawLine(
+                0f + paddingHorizontal,
+                100f + it * 100f,
+                measuredWidth.toFloat() - paddingHorizontal,
+                100f + it * 100f,
+                paintGrid
+            )
+            canvas.drawText(
+                "$sum ₽",
+                measuredWidth - 100f,
+                50f + it * 100f + paddingHorizontal.div(2),
+                paintText.apply { textSize = 32f })
+        }
+
+        repeat(stepsDate) {
+            canvas.drawLine(
+                (it * stepDateForGrid) + paddingHorizontal,
+                0f + paddingHorizontal.times(2),
+                (it * stepDateForGrid) + paddingHorizontal,
+                maxVerticalLine,
+                paintGrid
+            )
+            canvas.drawText(
+                if (it == 0) "1" else "${((it + 1) * 2) - 1}",
+                (it * stepDateForGrid) + paddingHorizontal - paddingHorizontal.div(4),
+                maxVerticalLine.plus(100),
+                paintText.apply { textSize = 28f })
+        }
+
+        list.map { data ->
+            val listDays = data.listCategory.map { it.day }
+            paintLine.apply {
+                color = data.color
+            }
+
+            val path = Path()
+
+            if (data.listCategory.first().day == 1) {
+                val sumFirst = data.listCategory.first().sum
+                val percentFirst = sumFirst.toFloat().div(maxPrice.toFloat())
+                path.moveTo(
+                    0f + paddingHorizontal,
+                    (maxVerticalLine) - maxVerticalLine.minus(100f).times(percentFirst)
+                )
+
+            } else
+                path.moveTo(0f + paddingHorizontal, maxVerticalLine)
+
+            repeat(stepsDate.times(2).minus(1)) { repeatInt ->
+                if (listDays.contains(repeatInt.plus(1))) {
+                    val currSum = data.listCategory.find { it.day == repeatInt.plus(1) }?.sum
+                    val percent = currSum?.toFloat()?.div(maxPrice.toFloat()) ?: 0f
+                    path.quadTo(
+                        (repeatInt * (stepDateForGrid / 2)) + paddingHorizontal,
+                        (maxVerticalLine) - maxVerticalLine.minus(100f).times(percent),
+                        (repeatInt * (stepDateForGrid / 2)) + paddingHorizontal,
+                        (maxVerticalLine) - maxVerticalLine.minus(100f).times(percent)
+                    )
+                    path.moveTo(
+                        (repeatInt * (stepDateForGrid / 2)) + paddingHorizontal,
+                        (maxVerticalLine) - maxVerticalLine.minus(100f).times(percent)
+                    )
+                } else {
+                    path.quadTo(
+                        (repeatInt * (stepDateForGrid / 2)) + paddingHorizontal,
+                        maxVerticalLine,
+                        (repeatInt * (stepDateForGrid / 2)) + paddingHorizontal,
+                        maxVerticalLine
+                    )
+                    path.moveTo(
+                        (repeatInt * (stepDateForGrid / 2)) + paddingHorizontal,
+                        maxVerticalLine
+                    )
+                }
+            }
+
+            canvas.drawPath(path, paintLine)
+        }
+    }
+
+    fun setList(newList: List<GraphBarModel>) {
+        list.clear()
+        list.addAll(newList)
+        requestLayout()
+        invalidate()
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/otus/homework/customview/MainActivity.kt b/app/src/main/java/otus/homework/customview/MainActivity.kt
index 78cb9448..237dff49 100644
--- a/app/src/main/java/otus/homework/customview/MainActivity.kt
+++ b/app/src/main/java/otus/homework/customview/MainActivity.kt
@@ -1,11 +1,213 @@
 package otus.homework.customview
 
-import androidx.appcompat.app.AppCompatActivity
+import android.graphics.Color
 import android.os.Bundle
+import android.util.Log
+import android.view.View
+import android.widget.Button
+import androidx.appcompat.app.AppCompatActivity
+import androidx.core.view.isVisible
+import com.google.gson.Gson
+import com.google.gson.reflect.TypeToken
+import otus.homework.customview.data.CategoryForList
+import otus.homework.customview.data.GraphBarModel
+import otus.homework.customview.data.PayloadModel
+import otus.homework.customview.data.PieChartModel
+import otus.homework.customview.utils.toDateOnlyDayString
 
-class MainActivity : AppCompatActivity() {
+class MainActivity : AppCompatActivity(R.layout.activity_main) {
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
-        setContentView(R.layout.activity_main)
+
+        val pieChartView = findViewById<PieChartView>(R.id.pc)
+        val graphBarView = findViewById<GraphBarView>(R.id.gb)
+        val button = findViewById<Button>(R.id.button)
+
+        val raw = this.resources.openRawResource(R.raw.payload).bufferedReader().use {
+            it.readText()
+        }
+        val type = object : TypeToken<List<PayloadModel>>() {}.type
+        val gson = Gson()
+        val list = gson.fromJson<List<PayloadModel>>(raw, type)
+        val pieChartList: MutableList<PieChartModel> = mutableListOf()
+        val graphBarList: MutableList<GraphBarModel> = mutableListOf()
+        val sumAll = list.sumOf { it.amount }
+        val sumMax = list.maxOf { it.amount }
+
+        list.map { payload ->
+            val pieChartModel = pieChartList.find { payload.category == it.category }
+            if (pieChartModel == null) {
+                pieChartList.add(
+                    PieChartModel(
+                        category = payload.category,
+                        color = 1,
+                        percent = 0f,
+                        sum = payload.amount
+                    )
+                )
+            } else {
+                pieChartList.forEachIndexed { index, it ->
+                    if (it.category == payload.category) {
+                        pieChartList[index] = it.copy(sum = it.sum + payload.amount)
+                    }
+                }
+            }
+
+            val graphBarModel = graphBarList.find { payload.category == it.category }
+            if (graphBarModel == null) {
+                graphBarList.add(
+                    GraphBarModel(
+                        category = payload.category,
+                        color = 1,
+                        listCategory = mutableListOf(
+                            CategoryForList(
+                                day = payload.time.toDateOnlyDayString().toInt(),
+                                sum = payload.amount
+                            )
+                        )
+                    )
+                )
+            } else {
+                graphBarList.map { model ->
+                    if (model.category == payload.category) {
+                        model.listCategory.forEachIndexed { index, it ->
+                            if (it.day == payload.time.toDateOnlyDayString().toInt()){
+                                model.listCategory[index] = it.copy(sum = model.listCategory[index].sum + payload.amount)
+                            } else {
+                                model.listCategory.add(
+                                    CategoryForList(
+                                        day = payload.time.toDateOnlyDayString().toInt(),
+                                        sum = payload.amount
+                                    )
+                                )
+                            }
+                        }
+
+                    }
+                }
+            }
+        }
+
+        val shuffled = colorList.shuffled()
+        pieChartList.forEachIndexed { index, model ->
+            pieChartList[index] = model.copy(
+                color = shuffled[index],
+                percent = model.sum.toFloat() / sumAll,
+            )
+        }
+        graphBarList.forEachIndexed { index, graphBarModel ->
+            graphBarList[index] = graphBarModel.copy(
+                color = shuffled[index]
+            )
+        }
+
+        pieChartView.setList(pieChartList.sortedBy { it.percent }.reversed())
+
+        graphBarView.setMaxPrice(sumMax)
+        graphBarView.setList(graphBarList)
+//        graphBarView.setList(fakeGraph)
+
+        button.setOnClickListener {
+            pieChartView.visibility = if (pieChartView.isVisible) View.GONE else View.VISIBLE
+            graphBarView.visibility = if (graphBarView.isVisible) View.GONE else View.VISIBLE
+        }
     }
-}
\ No newline at end of file
+}
+
+private val fakeGraph = mutableListOf(
+    GraphBarModel(
+        category = "rrr",
+        color = -65536,
+        listCategory = mutableListOf(
+            CategoryForList(
+                day = 1,
+                sum = 6000
+            ),
+            CategoryForList(
+                day = 2,
+                sum = 3000
+            ),
+            CategoryForList(
+                day = 3,
+                sum = 600
+            ),
+            CategoryForList(
+                day = 4,
+                sum = 1500
+            ),
+            CategoryForList(
+                day = 5,
+                sum = 6000
+            ),
+            CategoryForList(
+                day = 6,
+                sum = 2200
+            ),
+            CategoryForList(
+                day = 7,
+                sum = 2500
+            ),
+            CategoryForList(
+                day = 8,
+                sum = 3400
+            ),
+            CategoryForList(
+                day = 9,
+                sum = 800
+            ),
+            CategoryForList(
+                day = 10,
+                sum = 1200
+            ),
+            CategoryForList(
+                day = 11,
+                sum = 7000
+            ),
+            CategoryForList(
+                day = 12,
+                sum = 6500
+            ),
+            CategoryForList(
+                day = 13,
+                sum = 4200
+            ),
+            CategoryForList(
+                day = 14,
+                sum = 3100
+            ),
+            CategoryForList(
+                day = 15,
+                sum = 1500
+            ),
+            CategoryForList(
+                day = 16,
+                sum = 2700
+            ),
+            CategoryForList(
+                day = 17,
+                sum = 4900
+            ),
+            CategoryForList(
+                day = 18,
+                sum = 8000
+            ),
+            CategoryForList(
+                day = 19,
+                sum = 300
+            ),
+        )
+    )
+)
+
+private val colorList = mutableListOf(
+    Color.YELLOW,
+    Color.RED,
+    Color.GREEN,
+    Color.BLACK,
+    Color.BLUE,
+    Color.CYAN,
+    Color.GRAY,
+    Color.MAGENTA,
+    Color.DKGRAY,
+    Color.LTGRAY
+)
\ No newline at end of file
diff --git a/app/src/main/java/otus/homework/customview/PieChartView.kt b/app/src/main/java/otus/homework/customview/PieChartView.kt
new file mode 100644
index 00000000..9942b70e
--- /dev/null
+++ b/app/src/main/java/otus/homework/customview/PieChartView.kt
@@ -0,0 +1,110 @@
+package otus.homework.customview
+
+import android.content.Context
+import android.graphics.Canvas
+import android.graphics.Paint
+import android.graphics.RectF
+import android.util.AttributeSet
+import android.view.MotionEvent
+import android.view.View
+import android.widget.Toast
+import otus.homework.customview.data.PieChartModel
+import otus.homework.customview.utils.dp
+import otus.homework.customview.utils.px
+import java.lang.Integer.min
+import kotlin.math.atan2
+
+class PieChartView @JvmOverloads constructor(
+    context: Context,
+    attrs: AttributeSet? = null
+) : View(context, attrs) {
+
+    private var list: ArrayList<PieChartModel> = arrayListOf()
+    private val paint = Paint().apply {
+        style = Paint.Style.STROKE
+    }
+    private val rect = RectF()
+    private var startAngel = -90f
+    private var barWidth = 50.px.toFloat()
+    private var angles =
+        mutableListOf<Pair<String, Float>>()
+
+    override fun onMeasure(widthMeasureSpec: Int, heightMeasureSpec: Int) {
+        val wMode = MeasureSpec.getMode(widthMeasureSpec)
+        val hMode = MeasureSpec.getMode(heightMeasureSpec)
+        val wSize = MeasureSpec.getSize(widthMeasureSpec)
+        val hSize = MeasureSpec.getSize(heightMeasureSpec)
+
+        when (wMode) {
+            MeasureSpec.EXACTLY -> {
+                setMeasuredDimension(wSize, hSize)
+            }
+
+            MeasureSpec.AT_MOST -> {
+                val newW = min((list.size * barWidth).toInt(), wSize)
+                setMeasuredDimension(newW, hSize)
+            }
+
+            MeasureSpec.UNSPECIFIED -> {
+                setMeasuredDimension((list.size * barWidth).toInt(), hSize)
+            }
+        }
+    }
+
+    override fun onDraw(canvas: Canvas) {
+        super.onDraw(canvas)
+        val padding = if (measuredWidth.dp < 120) 30f else 100f
+
+        angles.clear()
+
+        rect.set(padding, padding, measuredWidth.minus(padding), measuredWidth.minus(padding))
+        list.map { model ->
+            canvas.drawArc(
+                rect,
+                startAngel,
+                360f * model.percent,
+                false,
+                paint.apply {
+                    color = model.color
+                    strokeWidth = if (measuredWidth.dp < 120) 20f else 100f
+                }
+            )
+            startAngel += 360f * model.percent
+            angles.add(model.category to startAngel + 90)
+
+        }
+    }
+
+    override fun onTouchEvent(event: MotionEvent): Boolean {
+        super.onTouchEvent(event)
+
+        when (event.action) {
+            MotionEvent.ACTION_DOWN -> {
+                val clickAngel = convertTouchEventPointToAngle(event.x, event.y).toFloat()
+                for (i in angles.indices){
+                    if (clickAngel < angles[i].second){
+                        Toast.makeText(context, angles[i].first,Toast.LENGTH_LONG).show()
+                        break
+                    }
+                }
+            }
+        }
+        return true
+    }
+
+    private fun convertTouchEventPointToAngle(xPos: Float, yPos: Float): Double {
+        val x = xPos - (measuredWidth * 0.5f)
+        val y = yPos - (measuredWidth * 0.5f)
+
+        var angle = Math.toDegrees(atan2(y.toDouble(), x.toDouble()) + Math.PI / 2)
+        angle = if (angle < 0) angle + 360 else angle
+        return angle
+    }
+
+    fun setList(newList: List<PieChartModel>) {
+        list.clear()
+        list.addAll(newList)
+        requestLayout()
+        invalidate()
+    }
+}
diff --git a/app/src/main/java/otus/homework/customview/data/GraphBarModel.kt b/app/src/main/java/otus/homework/customview/data/GraphBarModel.kt
new file mode 100644
index 00000000..d6f11e23
--- /dev/null
+++ b/app/src/main/java/otus/homework/customview/data/GraphBarModel.kt
@@ -0,0 +1,12 @@
+package otus.homework.customview.data
+
+data class GraphBarModel(
+    val category: String,
+    val color: Int,
+    val listCategory: MutableList<CategoryForList>
+)
+
+data class CategoryForList(
+    val day: Int,
+    val sum: Int
+)
diff --git a/app/src/main/java/otus/homework/customview/data/PayloadModel.kt b/app/src/main/java/otus/homework/customview/data/PayloadModel.kt
new file mode 100644
index 00000000..7d8a87b5
--- /dev/null
+++ b/app/src/main/java/otus/homework/customview/data/PayloadModel.kt
@@ -0,0 +1,9 @@
+package otus.homework.customview.data
+
+data class PayloadModel(
+    val id: Int,
+    val name: String,
+    val amount: Int,
+    val category: String,
+    val time: Long
+)
diff --git a/app/src/main/java/otus/homework/customview/data/PieChartModel.kt b/app/src/main/java/otus/homework/customview/data/PieChartModel.kt
new file mode 100644
index 00000000..dcb10236
--- /dev/null
+++ b/app/src/main/java/otus/homework/customview/data/PieChartModel.kt
@@ -0,0 +1,8 @@
+package otus.homework.customview.data
+
+data class PieChartModel(
+    val category: String,
+    val color: Int,
+    val percent: Float,
+    val sum: Int,
+)
diff --git a/app/src/main/java/otus/homework/customview/utils/DimensionsExt.kt b/app/src/main/java/otus/homework/customview/utils/DimensionsExt.kt
new file mode 100644
index 00000000..1bac64fc
--- /dev/null
+++ b/app/src/main/java/otus/homework/customview/utils/DimensionsExt.kt
@@ -0,0 +1,16 @@
+package otus.homework.customview.utils
+
+import android.content.res.Resources
+import java.text.SimpleDateFormat
+import java.util.Locale
+
+val Int.dp: Int
+    get() = (this / Resources.getSystem().displayMetrics.density).toInt()
+
+val Int.px: Int
+    get() = (this * Resources.getSystem().displayMetrics.density).toInt()
+
+fun Long.toDateString(): String = SimpleDateFormat("dd.MM.yyyy", LocaleRu).format(this * 1000L)
+fun Long.toDateOnlyDayString(): String = SimpleDateFormat("dd", LocaleRu).format(this * 1000L)
+
+val LocaleRu = Locale("ru", "RU")
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index 79ae6993..13b22efa 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -5,15 +5,34 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    tools:context=".MainActivity">
+    tools:context="otus.homework.customview.MainActivity">
 
-    <TextView
+    <otus.homework.customview.PieChartView
+        android:id="@+id/pc"
+        android:visibility="gone"
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        android:layout_width="0dp"
+        android:layout_height="500dp"/>
+
+    <otus.homework.customview.GraphBarView
+        android:id="@+id/gb"
+        android:visibility="visible"
+        android:layout_width="0dp"
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        android:layout_height="500dp"/>
+
+    <Button
+        android:id="@+id/button"
         android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:text="Hello World!"
         app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintLeft_toLeftOf="parent"
-        app:layout_constraintRight_toRightOf="parent"
-        app:layout_constraintTop_toTopOf="parent" />
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        android:layout_marginBottom="16dp"
+        android:text="Изменить видимость"
+        android:layout_height="wrap_content"/>
 
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/build.gradle b/build.gradle
index e47bb55b..bb1f21a3 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,12 +1,12 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 buildscript {
-    ext.kotlin_version = "1.4.32"
+    ext.kotlin_version = "1.9.21"
     repositories {
         google()
         jcenter()
     }
     dependencies {
-        classpath "com.android.tools.build:gradle:4.1.2"
+        classpath "com.android.tools.build:gradle:8.5.2"
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
 
         // NOTE: Do not place your application dependencies here; they belong
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 8734448b..197f3b7a 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Fri Jun 11 17:42:46 MSK 2021
+#Wed Dec 11 20:23:09 MSK 2024
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.5-bin.zip