Homework - Custom View, Canvas #97

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open

bmv-2143 wants to merge 45 commits into Otus-Android:master from bmv-2143:master

README.md

-Original file line number
+Diff line change
@@ Expand Up / @@ -21,4 +21,8 @@ @@
 . Реализовывать масштабирование/скроллинг/обработку тач евентов не нужно
     Примеры дизайна которыми можно вдохновляться:
-    ![Pie Chart](art/second.png)
+    ![Pie Chart](art/second.png)
+    ### Результат
+    ![RESULT_SCREENSHOT.png](RESULT_SCREENSHOT.png)

RESULT_SCREENSHOT.png

Sorry, something went wrong. Reload?

Sorry, we cannot display this file.

Sorry, this file is invalid so it cannot be displayed.

app/build.gradle

-Original file line number
+Diff line change
@@ -1,10 +1,13 @@
     plugins {
         id 'com.android.application'
         id 'kotlin-android'
+        id 'kotlin-kapt'
+        id 'dagger.hilt.android.plugin'
     }
     android {
-        compileSdkVersion 30
+        compileSdkVersion 31
         buildToolsVersion "30.0.3"
         defaultConfig {
@@ Expand All / @@ -30,6 +33,10 @@ android { @@
         kotlinOptions {
             jvmTarget = '1.8'
         }
+        buildFeatures {
+            viewBinding true
+        }
     }
     dependencies {
@@ Expand All / @@ -42,4 +49,18 @@ dependencies { @@
         testImplementation 'junit:junit:4.+'
         androidTestImplementation 'androidx.test.ext:junit:1.1.2'
         androidTestImplementation 'androidx.test.espresso:espresso-core:3.3.0'
-    }
+        implementation 'com.google.code.gson:gson:2.10.1'
+        implementation 'androidx.activity:activity-ktx:1.3.0'
+        implementation "androidx.lifecycle:lifecycle-runtime-ktx:2.5.1"
+        implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:2.5.1" // Add this line
+        implementation "androidx.fragment:fragment-ktx:1.5.2"
+        implementation "com.google.dagger:hilt-android:2.44" // Add this line
+        kapt "com.google.dagger:hilt-android-compiler:2.44" // Add this line
+    }
+    // Allow references to generated code
+    kapt {
+        correctErrorTypes = true
+    }

app/src/main/AndroidManifest.xml

-Original file line number
+Diff line change
@@ Expand Up / @@ -9,8 +9,9 @@ @@
             android:label="@string/app_name"
             android:roundIcon="@mipmap/ic_launcher_round"
             android:supportsRtl="true"
+            android:name=".CustomViewApp"
             android:theme="@style/Theme.CustomView">
-            <activity android:name=".MainActivity">
+            <activity android:name=".presentation.MainActivity">
                 <intent-filter>
                     <action android:name="android.intent.action.MAIN" />
@@ Expand Down @@

app/src/main/java/otus/homework/customview/CustomViewApp.kt

-Original file line number
+Diff line change
@@ -0,0 +1,7 @@
+    package otus.homework.customview
+    import android.app.Application
+    import dagger.hilt.android.HiltAndroidApp
+    @HiltAndroidApp
+    class CustomViewApp : Application()

app/src/main/java/otus/homework/customview/MainActivity.kt

This file was deleted.

app/src/main/java/otus/homework/customview/data/CustomViewRepository.kt

-Original file line number
+Diff line change
@@ -0,0 +1,10 @@
+    package otus.homework.customview.data
+    import androidx.annotation.RawRes
+    import javax.inject.Inject
+    class CustomViewRepository @Inject constructor(private val jsonDataSource: JsonDataSource) {
+        fun loadPayloads(@RawRes payloadId: Int): List<Payload> =
+            jsonDataSource.loadPayloads(payloadId)
+    }

app/src/main/java/otus/homework/customview/data/JsonDataSource.kt

-Original file line number
+Diff line change
@@ -0,0 +1,29 @@
+    package otus.homework.customview.data
+    import android.content.res.Resources
+    import com.google.gson.Gson
+    import java.io.InputStreamReader
+    import javax.inject.Inject
+    class JsonDataSource @Inject constructor(private val resources: Resources) {
+        fun loadPayloads(payloadId: Int): List<Payload> {
+            readJsonFile(payloadId).let {
+                return parseJson(it)
+            }
+        }
+        private fun readJsonFile(resId: Int): String {
+            val inputStream = resources.openRawResource(resId)
+            val reader = InputStreamReader(inputStream)
+            return reader.readText().also {
+                reader.close()
+            }
+        }
+        private fun parseJson(jsonString: String): List<Payload> {
+            val gson = Gson()
+            return gson.fromJson(jsonString, Array<Payload>::class.java).toList()
+        }
+    }

app/src/main/java/otus/homework/customview/data/Payload.kt

-Original file line number
+Diff line change
@@ -0,0 +1,9 @@
+    package otus.homework.customview.data
+    data class Payload(
+        val id: Int,
+        val name: String,
+        val amount: Int,
+        val category: String,
+        val time: Long,
+    )

app/src/main/java/otus/homework/customview/di/ApplicationModule.kt

-Original file line number
+Diff line change
@@ -0,0 +1,22 @@
+    package otus.homework.customview.di
+    import android.content.Context
+    import android.content.res.Resources
+    import dagger.Module
+    import dagger.Provides
+    import dagger.hilt.InstallIn
+    import dagger.hilt.android.qualifiers.ApplicationContext
+    import dagger.hilt.components.SingletonComponent
+    import kotlinx.coroutines.CoroutineDispatcher
+    import kotlinx.coroutines.Dispatchers
+    @Module
+    @InstallIn(SingletonComponent::class)
+    object ApplicationModule {
+        @Provides
+        fun provideDispatcherIO() : CoroutineDispatcher = Dispatchers.IO
+        @Provides
+        fun provideResources(@ApplicationContext context: Context): Resources = context.resources
+    }

app/src/main/java/otus/homework/customview/presentation/CustomViewViewModel.kt

-Original file line number
+Diff line change
@@ -0,0 +1,65 @@
+    package otus.homework.customview.presentation
+    import androidx.lifecycle.ViewModel
+    import androidx.lifecycle.viewModelScope
+    import dagger.hilt.android.lifecycle.HiltViewModel
+    import kotlinx.coroutines.CoroutineDispatcher
+    import kotlinx.coroutines.flow.MutableStateFlow
+    import kotlinx.coroutines.flow.asStateFlow
+    import kotlinx.coroutines.launch
+    import otus.homework.customview.R
+    import otus.homework.customview.data.CustomViewRepository
+    import otus.homework.customview.data.Payload
+    import otus.homework.customview.presentation.helpers.GraphCalculator
+    import otus.homework.customview.presentation.model.PieChartAngle
+    import otus.homework.customview.presentation.mapper.toPieChartAngles
+    import otus.homework.customview.utils.DateUtils
+    import javax.inject.Inject
+    @HiltViewModel
+    class CustomViewViewModel @Inject constructor(
+        private val repository: CustomViewRepository,
+        private val dateUtils: DateUtils,
+        private val graphCalculator: GraphCalculator,
+        dataLoadDispatcher: CoroutineDispatcher,
+    ) : ViewModel() {
+        private lateinit var _payloads: List<Payload>
+        private val _pieChartAngles = MutableStateFlow<List<PieChartAngle>>(emptyList())
+        val pieChartAngles = _pieChartAngles.asStateFlow()
+        init {
+            viewModelScope.launch(dataLoadDispatcher) {
+                _payloads = repository.loadPayloads(R.raw.payload)
+                _pieChartAngles.value = _payloads.toPieChartAngles()
+            }
+        }
+        fun getMaxDailyExpenseOfAllCategories(): Int =
+            graphCalculator.getMaxDailyExpenseOfAllCategories(_payloads)
+        fun getDaysToExpenses(payloadCategory: String): Map<Int, Int> {
+            val daysToExpenses = mutableMapOf<Int, Int>().withDefault { 0 }
+            for (i in 0..MAX_DAYS) {
+                daysToExpenses[i] = 0
+            }
+            for (payload in getPayloadsForCategory(payloadCategory)) {
+                val day: Int = dateUtils.timestampToDayOfMonth(payload.time)
+                val amount = payload.amount
+                daysToExpenses[day] = daysToExpenses.getValue(day) + amount
+            }
+            return daysToExpenses
+        }
+        private fun getPayloadsForCategory(category: String): List<Payload> {
+            return _payloads.filter { it.category == category }
+        }
+        companion object {
+            private const val MAX_DAYS = 31
+        }
+    }

app/src/main/java/otus/homework/customview/presentation/MainActivity.kt

-Original file line number
+Diff line change
@@ -0,0 +1,46 @@
+    package otus.homework.customview.presentation
+    import android.os.Bundle
+    import android.widget.Toast
+    import androidx.activity.viewModels
+    import androidx.appcompat.app.AppCompatActivity
+    import androidx.lifecycle.Lifecycle
+    import androidx.lifecycle.lifecycleScope
+    import androidx.lifecycle.repeatOnLifecycle
+    import dagger.hilt.android.AndroidEntryPoint
+    import kotlinx.coroutines.launch
+    import otus.homework.customview.databinding.ActivityMainBinding
+    @AndroidEntryPoint
+    class MainActivity : AppCompatActivity() {
+        private val viewModel by viewModels<CustomViewViewModel>()
+        private lateinit var binding: ActivityMainBinding
+        override fun onCreate(savedInstanceState: Bundle?) {
+            super.onCreate(savedInstanceState)
+            binding = ActivityMainBinding.inflate(layoutInflater)
+            setContentView(binding.root)
+            observePieChartAngles()
+            setPayloadCategorySelectionListener()
+        }
+        private fun observePieChartAngles() {
+            lifecycleScope.launch {
+                repeatOnLifecycle(Lifecycle.State.STARTED) {
+                    viewModel.pieChartAngles.collect {
+                        binding.pieChartView.setPieChartAngles(it)
+                    }
+                }
+            }
+        }
+        private fun setPayloadCategorySelectionListener() {
+            binding.pieChartView.setSelectionListener { selectedCategory ->
+                Toast.makeText(this, selectedCategory, Toast.LENGTH_LONG).show()
+                binding.expensesGraphView.setMaxDailyExpenseOfAllCategories(viewModel.getMaxDailyExpenseOfAllCategories())
+                binding.expensesGraphView.setDaysToExpenses(viewModel.getDaysToExpenses(selectedCategory))
+            }
+        }
+    }

app/src/main/java/otus/homework/customview/presentation/expensesgraph/AxisDrawer.kt

-Original file line number
+Diff line change
@@ -0,0 +1,115 @@
+    package otus.homework.customview.presentation.expensesgraph
+    import android.graphics.Canvas
+    import android.graphics.Color
+    import android.graphics.Paint
+    import otus.homework.customview.utils.dp
+    import otus.homework.customview.utils.px
+    class AxisDrawer(
+        private val view: ExpensesGraphView
+    ) {
+        private val axisPaddingPx = 32.dp.px
+        private val axisTickHeightPx = 10.dp.px
+        private val gridDotSizePx = 2.dp.px
+        private val tickCountX = 10
+        private val tickCountY = 5
+        private val axisPaint = Paint().apply {
+            color = Color.BLACK
+            strokeWidth = 15f
+            style = Paint.Style.FILL
+        }
+        private val axisTickPaint = Paint().apply {
+            color = Color.DKGRAY
+            strokeWidth = 5f
+            style = Paint.Style.FILL
+        }
+        private val gridDotPaint = Paint().apply {
+            color = Color.GRAY
+            strokeWidth = 1f
+            style = Paint.Style.FILL
+        }
+        internal fun drawAxis(canvas: Canvas) {
+            val xAxisYPos = (view.height - axisPaddingPx).toFloat()
+            canvas.drawLine(
+                axisPaddingPx.toFloat(), xAxisYPos, (view.width - axisPaddingPx).toFloat(), xAxisYPos, axisPaint
+            )
+            canvas.drawLine(
+                axisPaddingPx.toFloat(),
+                axisPaddingPx.toFloat(),
+                axisPaddingPx.toFloat(),
+                (view.height - axisPaddingPx).toFloat(),
+                axisPaint
+            )
+        }
+        internal fun drawTicksOnXAxis(canvas: Canvas) {
+            val xAxisYPos = (view.height - axisPaddingPx).toFloat()
+            val xAxisXPos = (view.width - axisPaddingPx).toFloat()
+            val tickStep = (xAxisXPos - axisPaddingPx) / tickCountX
+            var currentX: Float = axisPaddingPx.toFloat() + tickStep
+            repeat(tickCountX) {
+                drawAxisXTick(canvas, currentX, xAxisYPos, axisTickHeightPx)
+                currentX += tickStep
+            }
+        }
+        private fun drawAxisXTick(canvas: Canvas, tickX: Float, tickStartY: Float, tickHeight: Int) =
+            canvas.drawLine(tickX, tickStartY, tickX, tickStartY - tickHeight, axisTickPaint)
+        internal fun drawTicksOnYAxis(canvas: Canvas) {
+            val yAxisXPos = axisPaddingPx.toFloat()
+            val yAxisYPos = (view.height - axisPaddingPx).toFloat()
+            val tickStep = (yAxisYPos - axisPaddingPx) / tickCountY
+            var currentY: Float = yAxisYPos - tickStep
+            repeat(tickCountY) {
+                drawAxisYTick(canvas, yAxisXPos, currentY, axisTickHeightPx)
+                currentY -= tickStep
+            }
+        }
+        private fun drawAxisYTick(canvas: Canvas, tickX: Float, tickStartY: Float, tickHeight: Int) =
+            canvas.drawLine(tickX, tickStartY, tickX + tickHeight, tickStartY, axisTickPaint)
+        internal fun drawDotsAtTickIntersections(canvas: Canvas) {
+            val gridDotsX = calculateGridDotsX()
+            val gridDotsY = calculateGridDotsY()
+            for (x in gridDotsX) {
+                for (y in gridDotsY) {
+                    canvas.drawCircle(x, y, gridDotSizePx.toFloat(), gridDotPaint)
+                }
+            }
+        }
+        private fun calculateGridDotsX(): MutableList<Float> {
+            val xTickPositions = mutableListOf<Float>()
+            val xAxisXPos = (view.width - axisPaddingPx).toFloat()
+            val tickStepX = (xAxisXPos - axisPaddingPx) / tickCountX
+            var currentX: Float = axisPaddingPx.toFloat() + tickStepX
+            repeat(tickCountX) {
+                xTickPositions.add(currentX)
+                currentX += tickStepX
+            }
+            return xTickPositions
+        }
+        private fun calculateGridDotsY(): MutableList<Float> {
+            val yTickPositions = mutableListOf<Float>()
+            val yAxisYPos = (view.height - axisPaddingPx).toFloat()
+            val tickStepY = (yAxisYPos - axisPaddingPx) / tickCountY
+            var currentY: Float = yAxisYPos - tickStepY
+            repeat(tickCountY) {
+                yTickPositions.add(currentY)
+                currentY -= tickStepY
+            }
+            return yTickPositions
+        }
+    }

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Homework - Custom View, Canvas #97

Uh oh!

Diff view

Diff view

There are no files selected for viewing

Uh oh!

Uh oh!

Homework - Custom View, Canvas #97

Are you sure you want to change the base?

Uh oh!

Homework - Custom View, Canvas #97

Uh oh!

Uh oh!

Diff view

Diff view

There are no files selected for viewing

Uh oh!

Uh oh!