diff --git a/Dockerfile b/Dockerfile new file mode 100644 index 00000000..9e58d87a --- /dev/null +++ b/Dockerfile @@ -0,0 +1,21 @@ +FROM eclipse-temurin:17-jdk-jammy + +ENV ANDROID_SDK_ROOT /opt/android-sdk +ENV PATH $PATH:$ANDROID_SDK_ROOT/cmdline-tools/latest/bin:$ANDROID_SDK_ROOT/platform-tools + +RUN apt-get update && \ + apt-get install -y wget unzip git && \ + rm -rf /var/lib/apt/lists/* + +RUN wget -O cmdline-tools.zip "https://dl.google.com/android/repository/commandlinetools-linux-11076708_latest.zip" && \ + mkdir -p $ANDROID_SDK_ROOT/cmdline-tools && \ + unzip -q cmdline-tools.zip -d $ANDROID_SDK_ROOT/cmdline-tools && \ + mv $ANDROID_SDK_ROOT/cmdline-tools/cmdline-tools $ANDROID_SDK_ROOT/cmdline-tools/latest && \ + rm cmdline-tools.zip + +RUN yes | sdkmanager --licenses && \ + sdkmanager "platforms;android-35" "build-tools;35.0.0" "platform-tools" + +RUN curl -Ls "https://sh.jbang.dev" | bash -s - app install --fresh --force jbang + +WORKDIR /app \ No newline at end of file diff --git a/Jenkinsfile b/Jenkinsfile new file mode 100644 index 00000000..784ffdbf --- /dev/null +++ b/Jenkinsfile @@ -0,0 +1,69 @@ +pipeline { + agent { + dockerfile true + } + parameters { + booleanParam(name: 'RUN_PROFILER', defaultValue: false, description: 'Запустить gradle-profiler для анализа производительности сборки?') + } + + stages { + stage('Checkout') { + steps { + checkout scm + } + } + + stage('Grant execution permission') { + steps { + sh 'chmod +x gradlew' + } + } + + stage('Build') { + steps { + script { + if (env.BRANCH_NAME == 'master') { + echo "Building for master branch..." + sh './gradlew assembleRelease' + } else { + echo "Building for branch ${env.BRANCH_NAME}..." + sh './gradlew assembleDebug' + } + } + } + } + + stage('Unit Tests') { + steps { + sh './gradlew test' + } + } + + stage('Static Analysis') { + steps { + sh './gradlew lint' + } + } + + stage('Profiling') { + when { + // Запускать только если параметр RUN_PROFILER установлен в true + expression { params.RUN_PROFILER } + } + steps { + script { + echo "Starting Gradle profiler..." + sh "jbang dev.gradle.profiler.tool.Main --benchmark --project-dir . --scenario-file profiler.scenarios" + archiveArtifacts artifacts: 'profile-out/', followSymlinks: false + } + } + } + } + + post { + always { + echo 'Build finished.' + cleanWs() + } + } +} \ No newline at end of file diff --git a/app/build.gradle b/app/build.gradle index b4711913..32d9482a 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -1,16 +1,16 @@ plugins { id 'com.android.application' - id 'kotlin-android' + id 'org.jetbrains.kotlin.android' } android { - compileSdkVersion 30 - buildToolsVersion "30.0.3" + namespace 'otus.homework.customview' + compileSdk 35 defaultConfig { applicationId "otus.homework.customview" - minSdkVersion 23 - targetSdkVersion 30 + minSdk 23 + targetSdk 34 versionCode 1 versionName "1.0" @@ -23,23 +23,29 @@ android { proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro' } } + 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' + } + + buildFeatures { + viewBinding true } } dependencies { + implementation 'androidx.core:core-ktx:1.12.0' + implementation 'androidx.appcompat:appcompat:1.6.1' + implementation 'com.google.android.material:material:1.11.0' + implementation 'androidx.constraintlayout:constraintlayout:2.1.4' + implementation 'com.google.code.gson:gson:2.10.1' - implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version" - implementation 'androidx.core:core-ktx:1.3.2' - implementation 'androidx.appcompat:appcompat:1.2.0' - implementation 'com.google.android.material:material:1.3.0' - implementation 'androidx.constraintlayout:constraintlayout:2.0.4' - testImplementation 'junit:junit:4.+' - androidTestImplementation 'androidx.test.ext:junit:1.1.2' - androidTestImplementation 'androidx.test.espresso:espresso-core:3.3.0' + testImplementation 'junit:junit:4.13.2' + androidTestImplementation 'androidx.test.ext:junit:1.1.5' + androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.1' } \ No newline at end of file diff --git a/app/src/androidTest/java/otus/homework/customview/ExampleInstrumentedTest.kt b/app/src/androidTest/java/otus/homework/customview/ExampleInstrumentedTest.kt index d5e3dba4..8120c1bb 100644 --- a/app/src/androidTest/java/otus/homework/customview/ExampleInstrumentedTest.kt +++ b/app/src/androidTest/java/otus/homework/customview/ExampleInstrumentedTest.kt @@ -17,7 +17,6 @@ import org.junit.Assert.* class ExampleInstrumentedTest { @Test fun useAppContext() { - // Context of the app under test. val appContext = InstrumentationRegistry.getInstrumentation().targetContext assertEquals("otus.homework.customview", appContext.packageName) } diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index efd1e519..f0d058b6 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -1,6 +1,5 @@ - - + diff --git a/app/src/main/java/otus/homework/customview/MainActivity.kt b/app/src/main/java/otus/homework/customview/MainActivity.kt index 78cb9448..dc1033e5 100644 --- a/app/src/main/java/otus/homework/customview/MainActivity.kt +++ b/app/src/main/java/otus/homework/customview/MainActivity.kt @@ -1,11 +1,62 @@ package otus.homework.customview -import androidx.appcompat.app.AppCompatActivity import android.os.Bundle +import android.widget.Toast +import androidx.appcompat.app.AppCompatActivity +import com.google.gson.Gson +import com.google.gson.reflect.TypeToken +import otus.homework.customview.databinding.ActivityMainBinding +import otus.homework.customview.view.PieChartView +import android.graphics.Color class MainActivity : AppCompatActivity() { + private lateinit var binding: ActivityMainBinding + override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) - setContentView(R.layout.activity_main) + binding = ActivityMainBinding.inflate(layoutInflater) + setContentView(binding.root) + + val data = loadExpenses() + initPieChartView(data) + initLineChartView(data) + } + + private fun loadExpenses(): List { + val json = resources.openRawResource(R.raw.payload) + .bufferedReader() + .use { it.readText() } + val type = object : TypeToken>() {}.type + return Gson().fromJson(json, type) } + + private fun initLineChartView(data: List) { + binding.lineChart.setData(data, getColorsForGradient()) + } + + private fun initPieChartView(data: List) { + binding.pieChart.setData(data, getColorsForGradient()) + binding.pieChart.applyCallback(object : PieChartView.Callback { + override fun onSectorClick(priceData: PriceData) { + Toast.makeText( + this@MainActivity, + "${priceData.name} - ${priceData.amount} USD", + Toast.LENGTH_SHORT + ).show() + } + }) + } + + private fun getColorsForGradient() = listOf( + Color.RED to Color.rgb(255, 165, 0), + Color.BLUE to Color.CYAN, + Color.rgb(138, 43, 226) to Color.rgb(255, 105, 180), + Color.GREEN to Color.rgb(50, 205, 50), + Color.YELLOW to Color.rgb(255, 215, 0), + Color.rgb(255, 0, 0) to Color.rgb(255, 182, 193), + Color.rgb(64, 224, 208) to Color.rgb(0, 191, 255), + Color.BLACK to Color.rgb(169, 169, 169), + Color.rgb(0, 0, 139) to Color.rgb(135, 206, 250), + Color.rgb(128, 0, 128) to Color.rgb(230, 230, 250) + ).shuffled() } \ No newline at end of file diff --git a/app/src/main/java/otus/homework/customview/PriceData.kt b/app/src/main/java/otus/homework/customview/PriceData.kt new file mode 100644 index 00000000..1778555a --- /dev/null +++ b/app/src/main/java/otus/homework/customview/PriceData.kt @@ -0,0 +1,9 @@ +package otus.homework.customview + +data class PriceData( + val id: Long, + val name: String, + val amount: Long, + val category: String, + val time: Long, +) \ No newline at end of file diff --git a/app/src/main/java/otus/homework/customview/view/CategoryChartView.kt b/app/src/main/java/otus/homework/customview/view/CategoryChartView.kt new file mode 100644 index 00000000..55bc1b2f --- /dev/null +++ b/app/src/main/java/otus/homework/customview/view/CategoryChartView.kt @@ -0,0 +1,202 @@ +package otus.homework.customview.view + +import android.content.Context +import android.graphics.Canvas +import android.graphics.Color +import android.graphics.Paint +import android.graphics.Path +import android.os.Bundle +import android.os.Parcelable +import android.util.AttributeSet +import android.view.View +import otus.homework.customview.PriceData +import java.text.SimpleDateFormat +import java.util.Date +import java.util.Locale +import androidx.core.graphics.toColorInt + +class CategoryChartView @JvmOverloads constructor( + context: Context, + attrs: AttributeSet? = null, + defStyleAttr: Int = 0 +) : View(context, attrs, defStyleAttr) { + + private val paint = Paint(Paint.ANTI_ALIAS_FLAG).apply { + color = "#9C27B0".toColorInt() + strokeWidth = 4f + style = Paint.Style.STROKE + } + + private val fillPaint = Paint(Paint.ANTI_ALIAS_FLAG).apply { + color = "#9C27B0".toColorInt() + alpha = 50 + style = Paint.Style.FILL + } + + private val textPaint = Paint(Paint.ANTI_ALIAS_FLAG).apply { + color = Color.BLACK + textSize = 30f + textAlign = Paint.Align.CENTER + } + + private val axisLinePaint = Paint(Paint.ANTI_ALIAS_FLAG).apply { + color = Color.GRAY + strokeWidth = 2f + } + + private var data: List = listOf() + private var category: String = "" + private var maxAmount = 0.0 + private var dateFormat = SimpleDateFormat("dd.MM", Locale.getDefault()) + private val chartPath = Path() + private val fillPath = Path() + + private var paddingHorizontal = 100f + private var paddingVertical = 100f + private var chartWidth = 0f + private var chartHeight = 0f + private var dailyExpenses: Map = emptyMap() + private var sortedKeys: List = emptyList() + + fun setData(newData: List, category: String) { + this.data = newData.filter { it.category == category } + this.category = category + calculateChartDimensions() + recalculatePaths() + invalidate() + } + + private fun calculateChartDimensions() { + if (data.isEmpty()) return + + dailyExpenses = data.groupBy { it.time * 1000L } + .mapValues { it.value.sumOf { expense -> expense.amount }.toDouble() } + sortedKeys = dailyExpenses.keys.sorted() + maxAmount = dailyExpenses.values.maxOrNull() ?: 0.0 + } + + private fun recalculatePaths() { + chartPath.reset() + fillPath.reset() + if (dailyExpenses.isEmpty()) return + if (sortedKeys.isEmpty()) return + val timeRange = sortedKeys.last() - sortedKeys.first() + if (timeRange == 0L) return + val xScale = chartWidth / timeRange + val yScale = if (maxAmount == 0.0) 0f else (chartHeight / maxAmount).toFloat() + var isFirst = true + for (time in sortedKeys) { + val amount = dailyExpenses[time] ?: 0.0 + val x = paddingHorizontal + (time - sortedKeys.first()) * xScale + val y = height - paddingVertical - (amount * yScale).toFloat() + if (isFirst) { + chartPath.moveTo(x, y) + fillPath.moveTo(x, height - paddingVertical) + fillPath.lineTo(x, y) + isFirst = false + } else { + chartPath.lineTo(x, y) + fillPath.lineTo(x, y) + } + } + fillPath.lineTo(paddingHorizontal + chartWidth, height - paddingVertical) + fillPath.close() + } + + override fun onMeasure(widthMeasureSpec: Int, heightMeasureSpec: Int) { + val desiredWidth = suggestedMinimumWidth + paddingLeft + paddingRight + val desiredHeight = suggestedMinimumHeight + paddingTop + paddingBottom + + val width = resolveSize(desiredWidth, widthMeasureSpec) + val height = resolveSize(desiredHeight, heightMeasureSpec) + + setMeasuredDimension(width, height) + } + + override fun onSizeChanged(w: Int, h: Int, oldw: Int, oldh: Int) { + super.onSizeChanged(w, h, oldw, oldh) + chartWidth = w - 2 * paddingHorizontal + chartHeight = h - 2 * paddingVertical + recalculatePaths() + } + + override fun onDraw(canvas: Canvas) { + super.onDraw(canvas) + if (data.isEmpty() || dailyExpenses.isEmpty() || sortedKeys.isEmpty()) return + + canvas.drawLine( + paddingHorizontal, + height - paddingVertical, + width - paddingHorizontal, + height - paddingVertical, + axisLinePaint + ) + canvas.drawLine( + paddingHorizontal, + paddingVertical, + paddingHorizontal, + height - paddingVertical, + axisLinePaint + ) + + canvas.drawPath(fillPath, fillPaint) + canvas.drawPath(chartPath, paint) + + val timeRange = sortedKeys.last() - sortedKeys.first() + val xScale = chartWidth / timeRange + val yScale = if (maxAmount == 0.0) 0f else (chartHeight / maxAmount).toFloat() + + val dateStep = timeRange / 5 + for (i in 0..5) { + val time = sortedKeys.first() + dateStep * i + val x = paddingHorizontal + (time - sortedKeys.first()) * xScale + val date = Date(time) + canvas.drawText( + dateFormat.format(date), + x, + height - paddingVertical + 40, + textPaint + ) + } + + val amountStep = maxAmount / 5 + for (i in 0..5) { + val amount = amountStep * i + val y = height - paddingVertical - (amount * yScale) + canvas.drawText( + String.format("%.0f", amount), + paddingHorizontal - 40, + (y + textPaint.textSize/2).toFloat(), + textPaint + ) + } + + textPaint.textSize = 40f + canvas.drawText( + category, + width / 2f, + paddingVertical - 40, + textPaint + ) + } + + override fun onSaveInstanceState(): Parcelable { + val bundle = Bundle() + bundle.putParcelable("superState", super.onSaveInstanceState()) + bundle.putString("category", category) + bundle.putFloat("chartWidth", chartWidth) + bundle.putFloat("chartHeight", chartHeight) + return bundle + } + + override fun onRestoreInstanceState(state: Parcelable?) { + if (state is Bundle) { + category = state.getString("category", "") + chartWidth = state.getFloat("chartWidth") + chartHeight = state.getFloat("chartHeight") + super.onRestoreInstanceState(state.getParcelable("superState")) + } else { + super.onRestoreInstanceState(state) + } + } +} \ No newline at end of file diff --git a/app/src/main/java/otus/homework/customview/view/LineChartView.kt b/app/src/main/java/otus/homework/customview/view/LineChartView.kt new file mode 100644 index 00000000..a6007c03 --- /dev/null +++ b/app/src/main/java/otus/homework/customview/view/LineChartView.kt @@ -0,0 +1,118 @@ +package otus.homework.customview.view + +import android.content.Context +import android.graphics.* +import android.os.Build +import android.util.AttributeSet +import android.view.View +import androidx.annotation.RequiresApi +import otus.homework.customview.PriceData +import java.time.* +import java.time.format.DateTimeFormatter +import kotlin.math.max + +class LineChartView @JvmOverloads constructor( + context: Context, + attrs: AttributeSet? = null, + defStyleAttr: Int = 0 +) : View(context, attrs, defStyleAttr) { + + private var data: List = listOf() + private var colors: List> = listOf() + private var localDates: Map = emptyMap() + private var groupedByCategories: Map> = emptyMap() + + fun setData(values: List, colors: List>) { + this.data = values + this.colors = colors + if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) { + localDates = data.associate { + it to LocalDateTime.ofInstant( + Instant.ofEpochSecond(it.time), + ZoneId.systemDefault() + ) + } + } + groupedByCategories = data.groupBy { it.category } + invalidate() + } + + @RequiresApi(Build.VERSION_CODES.O) + private val dateFormatter = DateTimeFormatter.ofPattern("dd.MM") + + private val axisPaint = Paint(Paint.ANTI_ALIAS_FLAG).apply { + color = Color.BLACK + strokeWidth = 5f + } + + private val gridPaint = Paint(Paint.ANTI_ALIAS_FLAG).apply { + color = Color.LTGRAY + strokeWidth = 2f + } + + private val linePaint = Paint(Paint.ANTI_ALIAS_FLAG).apply { + color = Color.BLUE + strokeWidth = 5f + style = Paint.Style.STROKE + } + + private val textPaint = Paint(Paint.ANTI_ALIAS_FLAG).apply { + color = Color.BLACK + textSize = 30f + textAlign = Paint.Align.CENTER + } + + @RequiresApi(Build.VERSION_CODES.O) + override fun onDraw(canvas: Canvas) { + super.onDraw(canvas) + + val padding = 100f + val width = width.toFloat() + val height = height.toFloat() + + val numGridLines = 5 + for (i in 0..numGridLines) { + val y = height - padding - (i * (height - 2 * padding) / numGridLines) + canvas.drawLine(padding, y, width - padding, y, gridPaint) + } + + for ((_, categoryData) in groupedByCategories) { + val categoryColor = colors.random().first + linePaint.color = categoryColor + + val maxY = categoryData.maxOf { it.amount } * 1.2f + + val stepX = (width - 2 * padding) / max(1, categoryData.size - 1) + val stepY = (height - 2 * padding) / maxY + + canvas.drawLine( + padding, + height - padding, + width - padding, + height - padding, + axisPaint + ) + canvas.drawLine(padding, padding, padding, height - padding, axisPaint) + + var prevX: Float? = null + var prevY: Float? = null + + for ((index, entry) in categoryData.withIndex()) { + val x = padding + index * stepX + val y = height - padding - (entry.amount * stepY) + + if (prevX != null && prevY != null) { + canvas.drawLine(prevX, prevY, x, y, linePaint) + } + + canvas.drawCircle(x, y, 10f, linePaint) + + val dateText = localDates[entry]?.format(dateFormatter) ?: "" + canvas.drawText(dateText, x, height - padding + 40f, textPaint) + + prevX = x + prevY = y + } + } + } +} \ No newline at end of file diff --git a/app/src/main/java/otus/homework/customview/view/PieChartView.kt b/app/src/main/java/otus/homework/customview/view/PieChartView.kt new file mode 100644 index 00000000..b906ae59 --- /dev/null +++ b/app/src/main/java/otus/homework/customview/view/PieChartView.kt @@ -0,0 +1,183 @@ +package otus.homework.customview.view + +import android.annotation.SuppressLint +import android.content.Context +import android.graphics.* +import android.os.Bundle +import android.os.Parcelable +import android.util.AttributeSet +import android.view.MotionEvent +import android.view.View +import otus.homework.customview.PriceData +import kotlin.math.atan2 +import kotlin.math.min +import kotlin.math.pow +import kotlin.math.sqrt + +class PieChartView @JvmOverloads constructor( + context: Context, + attrs: AttributeSet? = null, + defStyleAttr: Int = 0 +) : View(context, attrs, defStyleAttr) { + + private val sectionPaint = Paint(Paint.ANTI_ALIAS_FLAG).apply { + style = Paint.Style.FILL + } + + private val strokePaint = Paint(Paint.ANTI_ALIAS_FLAG).apply { + style = Paint.Style.STROKE + strokeWidth = 5F + strokeCap = Paint.Cap.ROUND + color = Color.WHITE + } + + private val textPaint = Paint(Paint.ANTI_ALIAS_FLAG).apply { + color = Color.BLACK + textSize = 50f + textAlign = Paint.Align.CENTER + } + + private val holePaint = Paint(Paint.ANTI_ALIAS_FLAG).apply { color = Color.WHITE } + + private val rectF = RectF() + private val sumBounds = Rect() + private val labelBounds = Rect() + private var data: List = listOf() + private var colors: List> = listOf() + private var gradientColors: List = listOf() + + private var callback: Callback? = null + + fun setData(values: List, colors: List>) { + this.data = values + this.colors = colors + gradientColors = buildGradients() + invalidate() + } + + private fun buildGradients(): List { + val width = if (measuredWidth > 0) measuredWidth.toFloat() else 1f + val height = if (measuredHeight > 0) measuredHeight.toFloat() else 1f + return colors.map { SweepGradient(width, height, it.first, it.second) } + } + + @SuppressLint("DrawAllocation") + override fun onDraw(canvas: Canvas) { + super.onDraw(canvas) + + val width = width.toFloat() + val height = height.toFloat() + + val radius = min(width, height) / 2 - 20f + val holeRadius = radius * 0.77f + + rectF.set( + width / 2 - radius, height / 2 - radius, + width / 2 + radius, height / 2 + radius + ) + + var startAngle = 0f + val dataSum = data.sumOf { it.amount } + + for (i in data.indices) { + val dataPercent = 100 * data[i].amount.toFloat() / dataSum + val sweepAngle = (dataPercent / 100) * 360f + + sectionPaint.shader = gradientColors.getOrNull(i % gradientColors.size) + + canvas.drawArc(rectF, startAngle, sweepAngle, true, sectionPaint) + canvas.drawArc(rectF, startAngle, sweepAngle, true, strokePaint) + + startAngle += sweepAngle + } + + canvas.drawCircle(width / 2, height / 2, holeRadius, holePaint) + + val centerX = width / 2f + val centerY = height / 2f + + textPaint.textSize = 60f + textPaint.typeface = Typeface.DEFAULT_BOLD + val sumText = "$dataSum ₽" + textPaint.getTextBounds(sumText, 0, sumText.length, sumBounds) + + textPaint.textSize = 40f + textPaint.typeface = Typeface.DEFAULT + val labelText = "Потрачено в Июне" + textPaint.getTextBounds(labelText, 0, labelText.length, labelBounds) + + val totalTextHeight = sumBounds.height() + labelBounds.height() + 16f + val sumY = centerY - totalTextHeight / 2 + sumBounds.height() + val labelY = sumY + labelBounds.height() + 16f + + textPaint.textSize = 60f + textPaint.typeface = Typeface.DEFAULT_BOLD + canvas.drawText(sumText, centerX, sumY, textPaint) + + textPaint.textSize = 40f + textPaint.typeface = Typeface.DEFAULT + canvas.drawText(labelText, centerX, labelY, textPaint) + } + + @SuppressLint("ClickableViewAccessibility") + override fun onTouchEvent(event: MotionEvent?): Boolean { + when (event?.action) { + MotionEvent.ACTION_DOWN -> { + val touchX = event.x + val touchY = event.y + + val width = width.toFloat() + val height = height.toFloat() + val radius = min(width, height) / 2 - 20f + val centerX = width / 2f + val centerY = height / 2f + + val distance = sqrt((touchX - centerX).pow(2) + (touchY - centerY).pow(2)) + if (distance <= radius) { + val angle = Math.toDegrees( + atan2((touchY - centerY).toDouble(), (touchX - centerX).toDouble()) + ).toFloat() + val adjustedAngle = if (angle < 0) angle + 360 else angle + + var startAngle = 0f + val dataSum = data.sumOf { it.amount } + + for (i in data.indices) { + val sweepAngle = (100 * data[i].amount.toFloat() / dataSum) * 360f / 100 + + if (adjustedAngle >= startAngle && adjustedAngle <= startAngle + sweepAngle) { + callback?.onSectorClick(data[i]) + break + } + startAngle += sweepAngle + } + } + } + } + return true + } + + override fun onSaveInstanceState(): Parcelable { + val bundle = Bundle() + bundle.putParcelable("superState", super.onSaveInstanceState()) + bundle.putFloat("centerX", 0f) + bundle.putFloat("centerY", 0f) + bundle.putFloat("radius", 0f) + bundle.putFloat("innerRadius", 0f) + return bundle + } + + override fun onRestoreInstanceState(state: Parcelable?) { + if (state is Bundle) { + super.onRestoreInstanceState(state.getParcelable("superState")) + } else { + super.onRestoreInstanceState(state) + } + } + + fun applyCallback(callback: Callback) = apply { this.callback = callback } + + interface Callback { + fun onSectorClick(priceData: PriceData) + } +} \ 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..54764367 100644 --- a/app/src/main/res/layout/activity_main.xml +++ b/app/src/main/res/layout/activity_main.xml @@ -1,19 +1,25 @@ - - + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toTopOf="parent" + app:layout_constraintVertical_bias="0.3" /> + + \ No newline at end of file diff --git a/build.gradle b/build.gradle index e47bb55b..41d0fa1a 100644 --- a/build.gradle +++ b/build.gradle @@ -1,26 +1,19 @@ // 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.22' + agp_version = '8.2.2' + } repositories { google() - jcenter() + mavenCentral() } dependencies { - classpath "com.android.tools.build:gradle:4.1.2" + classpath "com.android.tools.build:gradle:$agp_version" classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" - - // NOTE: Do not place your application dependencies here; they belong - // in the individual module build.gradle files - } -} - -allprojects { - repositories { - google() - jcenter() } } -task clean(type: Delete) { +tasks.register('clean', Delete) { delete rootProject.buildDir } \ No newline at end of file diff --git a/gradle.properties b/gradle.properties index 98bed167..9de22e26 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,21 +1,7 @@ -# Project-wide Gradle settings. -# IDE (e.g. Android Studio) users: -# Gradle settings configured through the IDE *will override* -# any settings specified in this file. -# For more details on how to configure your build environment visit -# http://www.gradle.org/docs/current/userguide/build_environment.html -# Specifies the JVM arguments used for the daemon process. -# The setting is particularly useful for tweaking memory settings. +# Project-wide Gradle settings org.gradle.jvmargs=-Xmx2048m -Dfile.encoding=UTF-8 -# When configured, Gradle will run in incubating parallel mode. -# This option should only be used with decoupled projects. More details, visit -# http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects -# org.gradle.parallel=true -# AndroidX package structure to make it clearer which packages are bundled with the -# Android operating system, and which are packaged with your app"s APK -# https://developer.android.com/topic/libraries/support-library/androidx-rn android.useAndroidX=true -# Automatically convert third-party libraries to use AndroidX -android.enableJetifier=true -# Kotlin code style for this project: "official" or "obsolete": -kotlin.code.style=official \ No newline at end of file +kotlin.code.style=official +android.nonTransitiveRClass=true +org.gradle.parallel=true +org.gradle.caching=true \ No newline at end of file diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index f6b961fd..a4b76b95 100644 Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 8734448b..9355b415 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,7 @@ -#Fri Jun 11 17:42:46 MSK 2021 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-8.10-bin.zip +networkTimeout=10000 +validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-6.5-bin.zip diff --git a/gradlew b/gradlew index cccdd3d5..f5feea6d 100755 --- a/gradlew +++ b/gradlew @@ -1,78 +1,130 @@ -#!/usr/bin/env sh +#!/bin/sh + +# +# Copyright © 2015-2021 the original authors. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# https://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# +# SPDX-License-Identifier: Apache-2.0 +# ############################################################################## -## -## Gradle start up script for UN*X -## +# +# Gradle start up script for POSIX generated by Gradle. +# +# Important for running: +# +# (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is +# noncompliant, but you have some other compliant shell such as ksh or +# bash, then to run this script, type that shell name before the whole +# command line, like: +# +# ksh Gradle +# +# Busybox and similar reduced shells will NOT work, because this script +# requires all of these POSIX shell features: +# * functions; +# * expansions «$var», «${var}», «${var:-default}», «${var+SET}», +# «${var#prefix}», «${var%suffix}», and «$( cmd )»; +# * compound commands having a testable exit status, especially «case»; +# * various built-in commands including «command», «set», and «ulimit». +# +# Important for patching: +# +# (2) This script targets any POSIX shell, so it avoids extensions provided +# by Bash, Ksh, etc; in particular arrays are avoided. +# +# The "traditional" practice of packing multiple parameters into a +# space-separated string is a well documented source of bugs and security +# problems, so this is (mostly) avoided, by progressively accumulating +# options in "$@", and eventually passing that to Java. +# +# Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS, +# and GRADLE_OPTS) rely on word-splitting, this is performed explicitly; +# see the in-line comments for details. +# +# There are tweaks for specific operating systems such as AIX, CygWin, +# Darwin, MinGW, and NonStop. +# +# (3) This script is generated from the Groovy template +# https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt +# within the Gradle project. +# +# You can find Gradle at https://github.com/gradle/gradle/. +# ############################################################################## # Attempt to set APP_HOME + # Resolve links: $0 may be a link -PRG="$0" -# Need this for relative symlinks. -while [ -h "$PRG" ] ; do - ls=`ls -ld "$PRG"` - link=`expr "$ls" : '.*-> \(.*\)$'` - if expr "$link" : '/.*' > /dev/null; then - PRG="$link" - else - PRG=`dirname "$PRG"`"/$link" - fi +app_path=$0 + +# Need this for daisy-chained symlinks. +while + APP_HOME=${app_path%"${app_path##*/}"} # leaves a trailing /; empty if no leading path + [ -h "$app_path" ] +do + ls=$( ls -ld "$app_path" ) + link=${ls#*' -> '} + case $link in #( + /*) app_path=$link ;; #( + *) app_path=$APP_HOME$link ;; + esac done -SAVED="`pwd`" -cd "`dirname \"$PRG\"`/" >/dev/null -APP_HOME="`pwd -P`" -cd "$SAVED" >/dev/null - -APP_NAME="Gradle" -APP_BASE_NAME=`basename "$0"` -# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. -DEFAULT_JVM_OPTS="" +# This is normally unused +# shellcheck disable=SC2034 +APP_BASE_NAME=${0##*/} +# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036) +APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s +' "$PWD" ) || exit # Use the maximum available, or set MAX_FD != -1 to use that value. -MAX_FD="maximum" +MAX_FD=maximum warn () { echo "$*" -} +} >&2 die () { echo echo "$*" echo exit 1 -} +} >&2 # OS specific support (must be 'true' or 'false'). cygwin=false msys=false darwin=false nonstop=false -case "`uname`" in - CYGWIN* ) - cygwin=true - ;; - Darwin* ) - darwin=true - ;; - MINGW* ) - msys=true - ;; - NONSTOP* ) - nonstop=true - ;; +case "$( uname )" in #( + CYGWIN* ) cygwin=true ;; #( + Darwin* ) darwin=true ;; #( + MSYS* | MINGW* ) msys=true ;; #( + NONSTOP* ) nonstop=true ;; esac CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar + # Determine the Java command to use to start the JVM. if [ -n "$JAVA_HOME" ] ; then if [ -x "$JAVA_HOME/jre/sh/java" ] ; then # IBM's JDK on AIX uses strange locations for the executables - JAVACMD="$JAVA_HOME/jre/sh/java" + JAVACMD=$JAVA_HOME/jre/sh/java else - JAVACMD="$JAVA_HOME/bin/java" + JAVACMD=$JAVA_HOME/bin/java fi if [ ! -x "$JAVACMD" ] ; then die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME @@ -81,92 +133,120 @@ Please set the JAVA_HOME variable in your environment to match the location of your Java installation." fi else - JAVACMD="java" - which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. + JAVACMD=java + if ! command -v java >/dev/null 2>&1 + then + die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. Please set the JAVA_HOME variable in your environment to match the location of your Java installation." + fi fi # Increase the maximum file descriptors if we can. -if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then - MAX_FD_LIMIT=`ulimit -H -n` - if [ $? -eq 0 ] ; then - if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then - MAX_FD="$MAX_FD_LIMIT" - fi - ulimit -n $MAX_FD - if [ $? -ne 0 ] ; then - warn "Could not set maximum file descriptor limit: $MAX_FD" - fi - else - warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT" - fi +if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then + case $MAX_FD in #( + max*) + # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC2039,SC3045 + MAX_FD=$( ulimit -H -n ) || + warn "Could not query maximum file descriptor limit" + esac + case $MAX_FD in #( + '' | soft) :;; #( + *) + # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC2039,SC3045 + ulimit -n "$MAX_FD" || + warn "Could not set maximum file descriptor limit to $MAX_FD" + esac fi -# For Darwin, add options to specify how the application appears in the dock -if $darwin; then - GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\"" -fi +# Collect all arguments for the java command, stacking in reverse order: +# * args from the command line +# * the main class name +# * -classpath +# * -D...appname settings +# * --module-path (only if needed) +# * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables. + +# For Cygwin or MSYS, switch paths to Windows format before running java +if "$cygwin" || "$msys" ; then + APP_HOME=$( cygpath --path --mixed "$APP_HOME" ) + CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" ) + + JAVACMD=$( cygpath --unix "$JAVACMD" ) -# For Cygwin, switch paths to Windows format before running java -if $cygwin ; then - APP_HOME=`cygpath --path --mixed "$APP_HOME"` - CLASSPATH=`cygpath --path --mixed "$CLASSPATH"` - JAVACMD=`cygpath --unix "$JAVACMD"` - - # We build the pattern for arguments to be converted via cygpath - ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null` - SEP="" - for dir in $ROOTDIRSRAW ; do - ROOTDIRS="$ROOTDIRS$SEP$dir" - SEP="|" - done - OURCYGPATTERN="(^($ROOTDIRS))" - # Add a user-defined pattern to the cygpath arguments - if [ "$GRADLE_CYGPATTERN" != "" ] ; then - OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)" - fi # Now convert the arguments - kludge to limit ourselves to /bin/sh - i=0 - for arg in "$@" ; do - CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -` - CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option - - if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition - eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"` - else - eval `echo args$i`="\"$arg\"" + for arg do + if + case $arg in #( + -*) false ;; # don't mess with options #( + /?*) t=${arg#/} t=/${t%%/*} # looks like a POSIX filepath + [ -e "$t" ] ;; #( + *) false ;; + esac + then + arg=$( cygpath --path --ignore --mixed "$arg" ) fi - i=$((i+1)) + # Roll the args list around exactly as many times as the number of + # args, so each arg winds up back in the position where it started, but + # possibly modified. + # + # NB: a `for` loop captures its iteration list before it begins, so + # changing the positional parameters here affects neither the number of + # iterations, nor the values presented in `arg`. + shift # remove old arg + set -- "$@" "$arg" # push replacement arg done - case $i in - (0) set -- ;; - (1) set -- "$args0" ;; - (2) set -- "$args0" "$args1" ;; - (3) set -- "$args0" "$args1" "$args2" ;; - (4) set -- "$args0" "$args1" "$args2" "$args3" ;; - (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;; - (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;; - (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;; - (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;; - (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;; - esac fi -# Escape application args -save () { - for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done - echo " " -} -APP_ARGS=$(save "$@") - -# Collect all arguments for the java command, following the shell quoting and substitution rules -eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS" -# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong -if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then - cd "$(dirname "$0")" +# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' + +# Collect all arguments for the java command: +# * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments, +# and any embedded shellness will be escaped. +# * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be +# treated as '${Hostname}' itself on the command line. + +set -- \ + "-Dorg.gradle.appname=$APP_BASE_NAME" \ + -classpath "$CLASSPATH" \ + org.gradle.wrapper.GradleWrapperMain \ + "$@" + +# Stop when "xargs" is not available. +if ! command -v xargs >/dev/null 2>&1 +then + die "xargs is not available" fi +# Use "xargs" to parse quoted args. +# +# With -n1 it outputs one arg per line, with the quotes and backslashes removed. +# +# In Bash we could simply go: +# +# readarray ARGS < <( xargs -n1 <<<"$var" ) && +# set -- "${ARGS[@]}" "$@" +# +# but POSIX shell has neither arrays nor command substitution, so instead we +# post-process each arg (as a line of input to sed) to backslash-escape any +# character that might be a shell metacharacter, then use eval to reverse +# that process (while maintaining the separation between arguments), and wrap +# the whole thing up as a single "set" statement. +# +# This will of course break if any of these variables contains a newline or +# an unmatched quote. +# + +eval "set -- $( + printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" | + xargs -n1 | + sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' | + tr '\n' ' ' + )" '"$@"' + exec "$JAVACMD" "$@" diff --git a/gradlew.bat b/gradlew.bat index f9553162..9d21a218 100644 --- a/gradlew.bat +++ b/gradlew.bat @@ -1,4 +1,22 @@ -@if "%DEBUG%" == "" @echo off +@rem +@rem Copyright 2015 the original author or authors. +@rem +@rem Licensed under the Apache License, Version 2.0 (the "License"); +@rem you may not use this file except in compliance with the License. +@rem You may obtain a copy of the License at +@rem +@rem https://www.apache.org/licenses/LICENSE-2.0 +@rem +@rem Unless required by applicable law or agreed to in writing, software +@rem distributed under the License is distributed on an "AS IS" BASIS, +@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +@rem See the License for the specific language governing permissions and +@rem limitations under the License. +@rem +@rem SPDX-License-Identifier: Apache-2.0 +@rem + +@if "%DEBUG%"=="" @echo off @rem ########################################################################## @rem @rem Gradle startup script for Windows @@ -9,25 +27,29 @@ if "%OS%"=="Windows_NT" setlocal set DIRNAME=%~dp0 -if "%DIRNAME%" == "" set DIRNAME=. +if "%DIRNAME%"=="" set DIRNAME=. +@rem This is normally unused set APP_BASE_NAME=%~n0 set APP_HOME=%DIRNAME% +@rem Resolve any "." and ".." in APP_HOME to make it shorter. +for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi + @rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. -set DEFAULT_JVM_OPTS= +set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m" @rem Find java.exe if defined JAVA_HOME goto findJavaFromJavaHome set JAVA_EXE=java.exe %JAVA_EXE% -version >NUL 2>&1 -if "%ERRORLEVEL%" == "0" goto init +if %ERRORLEVEL% equ 0 goto execute -echo. -echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. -echo. -echo Please set the JAVA_HOME variable in your environment to match the -echo location of your Java installation. +echo. 1>&2 +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2 +echo. 1>&2 +echo Please set the JAVA_HOME variable in your environment to match the 1>&2 +echo location of your Java installation. 1>&2 goto fail @@ -35,48 +57,36 @@ goto fail set JAVA_HOME=%JAVA_HOME:"=% set JAVA_EXE=%JAVA_HOME%/bin/java.exe -if exist "%JAVA_EXE%" goto init +if exist "%JAVA_EXE%" goto execute -echo. -echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% -echo. -echo Please set the JAVA_HOME variable in your environment to match the -echo location of your Java installation. +echo. 1>&2 +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2 +echo. 1>&2 +echo Please set the JAVA_HOME variable in your environment to match the 1>&2 +echo location of your Java installation. 1>&2 goto fail -:init -@rem Get command-line arguments, handling Windows variants - -if not "%OS%" == "Windows_NT" goto win9xME_args - -:win9xME_args -@rem Slurp the command line arguments. -set CMD_LINE_ARGS= -set _SKIP=2 - -:win9xME_args_slurp -if "x%~1" == "x" goto execute - -set CMD_LINE_ARGS=%* - :execute @rem Setup the command line set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar + @rem Execute Gradle -"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS% +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %* :end @rem End local scope for the variables with windows NT shell -if "%ERRORLEVEL%"=="0" goto mainEnd +if %ERRORLEVEL% equ 0 goto mainEnd :fail rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of rem the _cmd.exe /c_ return code! -if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 -exit /b 1 +set EXIT_CODE=%ERRORLEVEL% +if %EXIT_CODE% equ 0 set EXIT_CODE=1 +if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE% +exit /b %EXIT_CODE% :mainEnd if "%OS%"=="Windows_NT" endlocal diff --git a/profiler.scenarios b/profiler.scenarios new file mode 100644 index 00000000..51ad6892 --- /dev/null +++ b/profiler.scenarios @@ -0,0 +1,8 @@ +clean-build { + tasks = ["assembleDebug"] + cleanup-tasks = ["clean"] +} + +incremental-build-no-changes { + tasks = ["assembleDebug"] +} \ No newline at end of file diff --git a/settings.gradle b/settings.gradle index 8eeb99dc..c7c4be74 100644 --- a/settings.gradle +++ b/settings.gradle @@ -1,2 +1,17 @@ -include ':app' -rootProject.name = "Custom View" \ No newline at end of file +pluginManagement { + repositories { + google() + mavenCentral() + gradlePluginPortal() + } +} +dependencyResolutionManagement { + repositoriesMode.set(RepositoriesMode.FAIL_ON_PROJECT_REPOS) + repositories { + google() + mavenCentral() + } +} + +rootProject.name = "Custom View" +include ':app' \ No newline at end of file