diff --git a/app/build.gradle b/app/build.gradle index b4711913..ed36dc50 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -4,19 +4,23 @@ plugins { } android { - compileSdkVersion 30 - buildToolsVersion "30.0.3" - + compileSdk 34 + buildToolsVersion '34.0.0' + namespace 'otus.homework.customview' defaultConfig { applicationId "otus.homework.customview" minSdkVersion 23 - targetSdkVersion 30 + targetSdkVersion 34 versionCode 1 versionName "1.0" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" } + buildFeatures { + viewBinding = true + } + buildTypes { release { minifyEnabled false @@ -39,6 +43,7 @@ dependencies { implementation 'androidx.appcompat:appcompat:1.2.0' implementation 'com.google.android.material:material:1.3.0' implementation 'androidx.constraintlayout:constraintlayout:2.0.4' + implementation 'com.google.code.gson:gson:2.10.1' testImplementation 'junit:junit:4.+' androidTestImplementation 'androidx.test.ext:junit:1.1.2' androidTestImplementation 'androidx.test.espresso:espresso-core:3.3.0' 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"> - + diff --git a/app/src/main/java/otus/homework/customview/Extensions.kt b/app/src/main/java/otus/homework/customview/Extensions.kt new file mode 100644 index 00000000..3b694240 --- /dev/null +++ b/app/src/main/java/otus/homework/customview/Extensions.kt @@ -0,0 +1,33 @@ +package otus.homework.customview + +import android.content.Context +import android.graphics.Canvas +import android.text.StaticLayout +import android.util.TypedValue +import androidx.core.graphics.withTranslation + + +/** + * Context Extension для конвертирования значения в пиксели. + * @property dp - значение density-independent pixels + */ +fun Context.dpToPx(dp: Int): Float { + return dp.toFloat() * this.resources.displayMetrics.density +} + +/** + * Context Extension для конвертирования значения размера шрифта в пиксели. + * @property sp - значение scale-independent pixels + */ +fun Context.spToPx(sp: Int): Float { + return TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_SP, sp.toFloat(), this.resources.displayMetrics); +} + +/** + * StaticLayout Extension для удобства отрисовки текста. + */ +fun StaticLayout.draw(canvas: Canvas, x: Float, y: Float) { + canvas.withTranslation(x, y) { + draw(this) + } +} \ No newline at end of file diff --git a/app/src/main/java/otus/homework/customview/LineChart/ColorRandomizer.kt b/app/src/main/java/otus/homework/customview/LineChart/ColorRandomizer.kt new file mode 100644 index 00000000..c9bb416c --- /dev/null +++ b/app/src/main/java/otus/homework/customview/LineChart/ColorRandomizer.kt @@ -0,0 +1,22 @@ +package otus.homework.customview.LineChart +import java.util.ArrayDeque + +internal class ColorRandomizer { + + private val colorsList = listOf( + -0xbbcca, -0x16e19d, -0x63d850, -0x98c549, + -0xc0ae4b, -0xde690d, -0xfc560c, -0xff432c, + -0xff6978, -0xb350b0, -0x743cb6, -0x3223c7, + -0x14c5, -0x3ef9, -0x6800, -0xa8de, + -0x86aab8, -0x616162, -0x9f8275, -0xcccccd + ) + private var colors = ArrayDeque(colorsList) + + val color: Int + get() { + if (colors.size == 0) { + colors = ArrayDeque(colorsList.shuffled()) + } + return colors.pop() + } +} \ No newline at end of file diff --git a/app/src/main/java/otus/homework/customview/LineChart/LineGraphItem.kt b/app/src/main/java/otus/homework/customview/LineChart/LineGraphItem.kt new file mode 100644 index 00000000..58cf5e11 --- /dev/null +++ b/app/src/main/java/otus/homework/customview/LineChart/LineGraphItem.kt @@ -0,0 +1,8 @@ +package otus.homework.customview.LineChart + +import android.graphics.PointF + +data class LineGraphItem( + val points: List, + val color: Int +) \ No newline at end of file diff --git a/app/src/main/java/otus/homework/customview/LineChart/LineGraphView.kt b/app/src/main/java/otus/homework/customview/LineChart/LineGraphView.kt new file mode 100644 index 00000000..27e260dd --- /dev/null +++ b/app/src/main/java/otus/homework/customview/LineChart/LineGraphView.kt @@ -0,0 +1,301 @@ +package otus.homework.customview.LineChart + +import android.content.Context +import android.graphics.Canvas +import android.graphics.Color +import android.graphics.CornerPathEffect +import android.graphics.DashPathEffect +import android.graphics.Paint +import android.graphics.Paint.Align.RIGHT +import android.graphics.Paint.Style +import android.graphics.Path +import android.graphics.PointF +import android.graphics.Rect +import android.util.AttributeSet +import android.util.Log +import android.view.View +import com.google.gson.Gson +import com.google.gson.reflect.TypeToken +import otus.homework.customview.R +import java.text.SimpleDateFormat +import java.util.Calendar +import java.util.Calendar.DAY_OF_MONTH +import java.util.Locale + +class LineGraphView @JvmOverloads constructor( + context: Context, + attrs: AttributeSet? = null, + defStyleAttr: Int = 0 +) : View(context, attrs, defStyleAttr) { + + private val gson = Gson() + + private val minWidth = 250f + private val minHeight = 150f + private var width = minWidth + private var height = minHeight + + private val maxPrice: Int + private val priceDelimiter = 800f + private val priceLines: Int + private val firstDay: Int + private val lastDay: Int + private val daysAmount: Int + private val monthName: String + + private val colorRandomizer = ColorRandomizer() + + private val axisPaint = Paint().apply { + style = Style.STROKE + strokeWidth = 1f + color = Color.GRAY + pathEffect = DashPathEffect(floatArrayOf(1f, 2f), 50f) + } + + private val underGraphLabelPaint = Paint().apply { + textSize = 12f + color = Color.BLACK + } + + private val rightSideGraphLabelPaint = Paint().apply { + textSize = 8f + color = Color.BLACK + textAlign = RIGHT + } + + private val graphLinePaint = Paint().apply { + style = Style.STROKE + strokeWidth = 1f + pathEffect = CornerPathEffect(8f) + } + + private val dateTextBounds = Rect() + private val priceTextBounds = Rect() + + private val strokeOffset = axisPaint.strokeWidth / 2 + private var verticalsInterval = 0f + private var horizontalInterval = 0f + + private val items: MutableList = mutableListOf() + + init { + val json = readPayloadFromRawFiles() + val itemsList = if (json == null) { + emptyList() + } else { + parsePayloadJson(json) + } + + val itemsByCategory = itemsList.groupBy(PayloadDto::category) + maxPrice = itemsByCategory.maxOf { it.value.sumBy(PayloadDto::amount) } + val realFirstDay = extractDayNumber(itemsList.minOf(PayloadDto::time)) + firstDay = if (realFirstDay >= 3) { + realFirstDay - DAYS_BEFORE + } else { + 1 + } + lastDay = extractDayNumber(itemsList.maxOf(PayloadDto::time)) + monthName = extractMonthName(itemsList.firstOrNull()?.time ?: 0L) + daysAmount = lastDay - firstDay + 1 + priceLines = (maxPrice / priceDelimiter + 1).toInt() + + underGraphLabelPaint.getTextBounds(DEFAULT_DATE_LABEL, 0, DEFAULT_DATE_LABEL.length, dateTextBounds) + + val priceDelimiterAsString = priceDelimiter.toString() + rightSideGraphLabelPaint.getTextBounds( + priceDelimiterAsString, + 0, + priceDelimiterAsString.length, + priceTextBounds + ) + initGraphItems(itemsByCategory) + } + + private fun initGraphItems(itemsByCategory: Map>) { + itemsByCategory.values.forEach { category -> + val pointsList = mutableListOf() + val categoryByDayNumber = category.groupBy { extractDayNumber(it.time) } + (firstDay..lastDay).forEach { day -> + val currentDayCategory = categoryByDayNumber[day] + if (currentDayCategory == null) { + pointsList.add( + PointF((day - firstDay).toFloat(), 0f) + ) + } else { + pointsList.add(PointF( + (day - firstDay).toFloat(), + currentDayCategory.sumOf { it.amount } / priceDelimiter) + ) + } + } + items.add(LineGraphItem(pointsList, colorRandomizer.color)) + } + } + + override fun onMeasure(widthMeasureSpec: Int, heightMeasureSpec: Int) { + val widthMode = MeasureSpec.getMode(widthMeasureSpec) + val widthSize = MeasureSpec.getSize(widthMeasureSpec) + val heightMode = MeasureSpec.getMode(heightMeasureSpec) + val heightSize = MeasureSpec.getSize(heightMeasureSpec) + + + val width = calculateMeasureSize(widthMode, widthSize, minWidth.toInt()) + val height = calculateMeasureSize(heightMode, heightSize, minHeight.toInt()) + + this.width = width.toFloat() + this.height = height.toFloat() + + verticalsInterval = (width - strokeOffset * 2) / (daysAmount - 1) + horizontalInterval = (height - GRAPH_LABEL_HORIZONTAL_OFFSET - strokeOffset * 2) / priceLines.toFloat() + + setMeasuredDimension(width, height) + } + + private fun calculateMeasureSize(mode: Int, size: Int, minSize: Int): Int { + return when (mode) { + MeasureSpec.UNSPECIFIED -> minSize + MeasureSpec.EXACTLY, + MeasureSpec.AT_MOST -> minSize.coerceAtLeast(size) + else -> throw IllegalStateException("Invalid measure mode") + } + } + + private fun readPayloadFromRawFiles(): String? { + return try { + val inputStream = context.resources.openRawResource(R.raw.payload) + inputStream.bufferedReader().use { it.readText() } + } catch (e: Exception) { + Log.e("PieChartView", "Error reading payload from raw files", e) + null + } + } + + private fun parsePayloadJson(json: String): List { + return try { + gson.fromJson( + json, + object : TypeToken>() {}.type + ) + } catch (e: Exception) { + Log.e("PieChartView", "Error parsing payload", e) + emptyList() + } + } + + override fun onDraw(canvas: Canvas) { + drawAxis(canvas) + drawLabels(canvas) + drawLines(canvas) + } + + private fun drawAxis(canvas: Canvas) { + (0 until daysAmount).forEach { day -> + val xVertical = day * verticalsInterval + strokeOffset + canvas.drawLine( + xVertical, + 0f, + xVertical, + height - GRAPH_LABEL_HORIZONTAL_OFFSET, + axisPaint + ) + } + + (0..priceLines).forEach { price -> + val yHorizontal = price * horizontalInterval + canvas.drawLine( + 0f, + yHorizontal, + width, + yHorizontal, + axisPaint + ) + } + } + + private fun drawLabels(canvas: Canvas) { + var curGraphVerticalPlace = 0 + (firstDay..lastDay).forEach { dayNumber -> + val offset = when (dayNumber) { + firstDay -> { + 0 + } + lastDay -> { + dateTextBounds.width() + } + else -> { + dateTextBounds.width() / 2 + } + } + + val fullDayNumber = if (dayNumber == firstDay) { + "${dayNumber.toStringWithLeadingZero()} $monthName" + } else { + dayNumber.toStringWithLeadingZero() + } + + canvas.drawText( + fullDayNumber, + curGraphVerticalPlace * verticalsInterval - offset, + height, + underGraphLabelPaint + ) + curGraphVerticalPlace++ + } + + (1 until priceLines).forEach { price -> + canvas.drawText( + (price * priceDelimiter.toInt()).toString(), + width, + height - price * horizontalInterval - GRAPH_LABEL_HORIZONTAL_OFFSET + priceTextBounds.height(), + rightSideGraphLabelPaint + ) + } + } + + private fun drawLines(canvas: Canvas) { + items.forEach { graphItem -> + val path = Path() + graphItem.points.forEachIndexed { index, point -> + if (index == 0) { + path.moveTo( + point.x * verticalsInterval, + height - point.y * horizontalInterval - GRAPH_LABEL_HORIZONTAL_OFFSET + ) + } else { + path.lineTo( + point.x * verticalsInterval, + height - point.y * horizontalInterval - GRAPH_LABEL_HORIZONTAL_OFFSET + ) + } + } + graphLinePaint.color = graphItem.color + canvas.drawPath(path, graphLinePaint) + } + } + + + private fun Int.toStringWithLeadingZero(): String { + if (this < 10) { + return "0$this" + } + return this.toString() + } + + private fun extractMonthName(time: Long): String { + val calendar = Calendar.getInstance() + calendar.timeInMillis = time * 1000 + return SimpleDateFormat("MMM", Locale.getDefault()).format(calendar.time) + } + + private fun extractDayNumber(time: Long): Int { + val calendar = Calendar.getInstance() + calendar.timeInMillis = time * 1000 + return calendar.get(DAY_OF_MONTH) + } + + companion object { + private const val DAYS_BEFORE = 2 + private const val GRAPH_LABEL_HORIZONTAL_OFFSET = 12f + private const val DEFAULT_DATE_LABEL = "01" + } +} \ No newline at end of file diff --git a/app/src/main/java/otus/homework/customview/LineChart/PayloadDto.kt b/app/src/main/java/otus/homework/customview/LineChart/PayloadDto.kt new file mode 100644 index 00000000..87df3f7b --- /dev/null +++ b/app/src/main/java/otus/homework/customview/LineChart/PayloadDto.kt @@ -0,0 +1,9 @@ +package otus.homework.customview.LineChart + +data class PayloadDto( + val id: Int, + val name: String, + val amount: Int, + val category: String, + val time: Long +) \ 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..dbaaad3b 100644 --- a/app/src/main/java/otus/homework/customview/MainActivity.kt +++ b/app/src/main/java/otus/homework/customview/MainActivity.kt @@ -2,10 +2,24 @@ package otus.homework.customview import androidx.appcompat.app.AppCompatActivity import android.os.Bundle +import otus.homework.customview.PieChart.parseData +import otus.homework.customview.databinding.ActivityMainBinding 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) + + binding.pieChart.setDataChart(parseData(this)) + } + + override fun onStart() { + super.onStart() + binding.pieChart.startAnimation() } } \ No newline at end of file diff --git a/app/src/main/java/otus/homework/customview/PieChart/PieChartData.kt b/app/src/main/java/otus/homework/customview/PieChart/PieChartData.kt new file mode 100644 index 00000000..32df3f2b --- /dev/null +++ b/app/src/main/java/otus/homework/customview/PieChart/PieChartData.kt @@ -0,0 +1,40 @@ +package otus.homework.customview.PieChart + +import android.content.Context +import org.json.JSONArray +import otus.homework.customview.R + +data class PieChartData( + val amount: Int, + val category: String +) + +fun parseData( + context: Context +) : List { + val json = JSONArray( + context.resources + .openRawResource(R.raw.payload) + .reader() + .readText() + ) + + val dataList = mutableListOf() + for (i in 0 until json.length()) { + val item = json.getJSONObject(i) + dataList.add( + PieChartData( + amount = item.getInt("amount"), + category = item.getString("category") + ) + ) + } + val aggregatedData = dataList.groupBy { it.category } + .map { (category, items) -> + PieChartData( + amount = items.sumOf { it.amount }, + category = category + ) + } + return aggregatedData +} \ No newline at end of file diff --git a/app/src/main/java/otus/homework/customview/PieChart/PieChartModel.kt b/app/src/main/java/otus/homework/customview/PieChart/PieChartModel.kt new file mode 100644 index 00000000..ed1df20d --- /dev/null +++ b/app/src/main/java/otus/homework/customview/PieChart/PieChartModel.kt @@ -0,0 +1,59 @@ +package otus.homework.customview.PieChart + +import android.graphics.Color +import android.graphics.CornerPathEffect +import android.graphics.Paint +import android.util.Log + +data class PieChartModel( + var percentOfCircle: Float = 0F, + var percentToStartAt: Float = 0F, + var colorOfLine: Int = 0, + var stroke: Float = 0F, + var paint: Paint = Paint(), + var paintRound: Boolean = false +){ + /** + * Блок, в котором значения преобразуются к приближенным значениям круговой диаграммы. + * То есть в модель передается процент (от 0 до 100). + */ + init { + // Проверка на корректность переданного процента. + if (percentOfCircle < 0 || percentOfCircle > 100) { + percentOfCircle = 100F + } + + // Расчет переданного значения на круговой диаграмме. + percentOfCircle = 360 * percentOfCircle / 100 + + // Проверка на корректность переданного процента. + if (percentToStartAt < 0 || percentToStartAt > 100) { + percentToStartAt = 0F + } + + // Расчет переданного значения на круговой диаграмме. + percentToStartAt = 360 * percentToStartAt / 100 + + /** Установка своего цвета в случаи пропуска [colorOfLine] */ + if (colorOfLine == 0) { + colorOfLine = Color.parseColor("#000000") + } + + // Инициализация кисти для отрисовки + paint = Paint() + paint.color = colorOfLine + paint.isAntiAlias = true + paint.style = Paint.Style.STROKE + paint.strokeWidth = stroke + paint.isDither = true; + + // Проверка необходимости закругления концов линии объекта. + if (paintRound){ + paint.strokeJoin = Paint.Join.ROUND; + paint.strokeCap = Paint.Cap.ROUND; + paint.pathEffect = CornerPathEffect(8F); + } + + Log.d("Angle", "percentToStartAt = $percentToStartAt percentOfCircle = $percentOfCircle ${colorOfLine.toString()}") + } +} \ No newline at end of file diff --git a/app/src/main/java/otus/homework/customview/PieChart/PieChartState.kt b/app/src/main/java/otus/homework/customview/PieChart/PieChartState.kt new file mode 100644 index 00000000..6b8eb1d8 --- /dev/null +++ b/app/src/main/java/otus/homework/customview/PieChart/PieChartState.kt @@ -0,0 +1,13 @@ +package otus.homework.customview.PieChart + +import android.os.Parcelable +import android.view.View + + +/** + * Собственный state для сохранения и восстановление данных + */ +class PieChartState( + private val superSavedState: Parcelable?, + val dataList: List +) : View.BaseSavedState(superSavedState), Parcelable \ No newline at end of file diff --git a/app/src/main/java/otus/homework/customview/PieChart/PieChartView.kt b/app/src/main/java/otus/homework/customview/PieChart/PieChartView.kt new file mode 100644 index 00000000..ffc7f525 --- /dev/null +++ b/app/src/main/java/otus/homework/customview/PieChart/PieChartView.kt @@ -0,0 +1,365 @@ +package otus.homework.customview.PieChart + +import android.animation.ValueAnimator +import android.content.Context +import android.graphics.Canvas +import android.graphics.Color +import android.graphics.Paint +import android.graphics.Rect +import android.graphics.RectF +import android.graphics.Typeface +import android.os.Parcelable +import android.text.Layout +import android.text.StaticLayout +import android.text.TextDirectionHeuristic +import android.text.TextDirectionHeuristics +import android.text.TextPaint +import android.util.AttributeSet +import android.view.MotionEvent +import android.view.View +import androidx.interpolator.view.animation.FastOutSlowInInterpolator +import otus.homework.customview.R +import otus.homework.customview.dpToPx +import otus.homework.customview.draw +import otus.homework.customview.spToPx +import kotlin.math.atan2 + +class PieChartView @JvmOverloads constructor( + context: Context, + attrs: AttributeSet? = null, + defStyleAttr: Int = 0 +) : View(context, attrs, defStyleAttr) { + + companion object { + private const val DEFAULT_MARGIN_TEXT_1 = 2 + private const val DEFAULT_MARGIN_TEXT_2 = 10 + private const val DEFAULT_MARGIN_TEXT_3 = 2 + private const val DEFAULT_MARGIN_SMALL_CIRCLE = 12 + + private const val TEXT_WIDTH_PERCENT = 0.40 + private const val CIRCLE_WIDTH_PERCENT = 0.50 + const val DEFAULT_VIEW_SIZE_HEIGHT = 150 + const val DEFAULT_VIEW_SIZE_WIDTH = 250 + } + + private var marginTextFirst: Float = context.dpToPx(DEFAULT_MARGIN_TEXT_1) + private var marginTextSecond: Float = context.dpToPx(DEFAULT_MARGIN_TEXT_2) + private var marginTextThird: Float = context.dpToPx(DEFAULT_MARGIN_TEXT_3) + private var marginSmallCircle: Float = context.dpToPx(DEFAULT_MARGIN_SMALL_CIRCLE) + private val marginText: Float = marginTextFirst + marginTextSecond + private val circleRect = RectF() + private var circleStrokeWidth: Float = context.dpToPx(6) + private var circleRadius: Float = 0F + private var circlePadding: Float = context.dpToPx(8) + private var circlePaintRoundSize: Boolean = true + private var circleSectionSpace: Float = 3F + private var circleCenterX: Float = 0F + private var circleCenterY: Float = 0F + private var numberTextPaint: TextPaint = TextPaint() + private var descriptionTextPain: TextPaint = TextPaint() + private var amountTextPaint: TextPaint = TextPaint() + private var textStartX: Float = 0F + private var textStartY: Float = 0F + private var textHeight: Int = 0 + private var textCircleRadius: Float = context.dpToPx(4) + private var textAmountStr: String = "" + private var textAmountY: Float = 0F + private var textAmountXNumber: Float = 0F + private var textAmountXDescription: Float = 0F + private var textAmountYDescription: Float = 0F + private var totalAmount: Int = 0 + private var pieChartColors: List = listOf() + private var percentageCircleList: List = listOf() + private var textRowList: MutableList = mutableListOf() + private var dataList: List = listOf() + private var animationSweepAngle: Int = 0 + private var selectedIndex: Int = -1 // Индекс выбранного сектора + + init { + var textAmountSize: Float = context.spToPx(22) + var textNumberSize: Float = context.spToPx(20) + var textDescriptionSize: Float = context.spToPx(14) + var textAmountColor: Int = Color.GRAY + var textNumberColor: Int = Color.GRAY + var textDescriptionColor: Int = Color.GRAY + + if (attrs != null) { + val typeArray = context.obtainStyledAttributes(attrs, R.styleable.PieChartView) + + val colorResId = typeArray.getResourceId(R.styleable.PieChartView_pieChartColors, 0) + pieChartColors = typeArray.resources.getStringArray(colorResId).toList() + + marginTextFirst = typeArray.getDimension(R.styleable.PieChartView_pieChartMarginTextFirst, marginTextFirst) + marginTextSecond = typeArray.getDimension(R.styleable.PieChartView_pieChartMarginTextSecond, marginTextSecond) + marginTextThird = typeArray.getDimension(R.styleable.PieChartView_pieChartMarginTextThird, marginTextThird) + marginSmallCircle = typeArray.getDimension(R.styleable.PieChartView_pieChartMarginSmallCircle, marginSmallCircle) + + circleStrokeWidth = typeArray.getDimension(R.styleable.PieChartView_pieChartCircleStrokeWidth, circleStrokeWidth) + circlePadding = typeArray.getDimension(R.styleable.PieChartView_pieChartCirclePadding, circlePadding) + circlePaintRoundSize = typeArray.getBoolean(R.styleable.PieChartView_pieChartCirclePaintRoundSize, circlePaintRoundSize) + circleSectionSpace = typeArray.getFloat(R.styleable.PieChartView_pieChartCircleSectionSpace, circleSectionSpace) + + textCircleRadius = typeArray.getDimension(R.styleable.PieChartView_pieChartTextCircleRadius, textCircleRadius) + textAmountSize = typeArray.getDimension(R.styleable.PieChartView_pieChartTextAmountSize, textAmountSize) + textNumberSize = typeArray.getDimension(R.styleable.PieChartView_pieChartTextNumberSize, textNumberSize) + textDescriptionSize = typeArray.getDimension(R.styleable.PieChartView_pieChartTextDescriptionSize, textDescriptionSize) + textDescriptionColor = typeArray.getColor(R.styleable.PieChartView_pieChartTextDescriptionColor, textDescriptionColor) + textAmountStr = typeArray.getString(R.styleable.PieChartView_pieChartTextAmount) ?: "" + + typeArray.recycle() + } + + circlePadding += circleStrokeWidth + + initPains(amountTextPaint, textAmountSize, textAmountColor) + initPains(numberTextPaint, textNumberSize, textNumberColor) + initPains(descriptionTextPain, textDescriptionSize, textDescriptionColor, true) + } + + override fun onMeasure(widthMeasureSpec: Int, heightMeasureSpec: Int) { + textRowList.clear() + + val initSizeWidth = resolveDefaultSize(widthMeasureSpec, DEFAULT_VIEW_SIZE_WIDTH) + + val textTextWidth = (initSizeWidth * TEXT_WIDTH_PERCENT) + val initSizeHeight = calculateViewHeight(heightMeasureSpec, textTextWidth.toInt()) + + textStartX = initSizeWidth - textTextWidth.toFloat() + textStartY = initSizeHeight.toFloat() / 2 - textHeight / 2 + + calculateCircleRadius(initSizeWidth, initSizeHeight) + + setMeasuredDimension(initSizeWidth, initSizeHeight) + } + + override fun onDraw(canvas: Canvas) { + super.onDraw(canvas) + + drawCircle(canvas) + drawText(canvas) + } + + override fun onRestoreInstanceState(state: Parcelable?) { + val pieChartState = state as? PieChartState + super.onRestoreInstanceState(pieChartState?.superState ?: state) + + dataList = pieChartState?.dataList ?: listOf() + } + + override fun onSaveInstanceState(): Parcelable { + val superState = super.onSaveInstanceState() + return PieChartState(superState, dataList) + } + + fun setDataChart(list: List) { + dataList = list + calculatePercentageOfData() + } + + fun startAnimation() { + val animator = ValueAnimator.ofInt(0, 360).apply { + duration = 1500 + interpolator = FastOutSlowInInterpolator() + addUpdateListener { valueAnimator -> + animationSweepAngle = valueAnimator.animatedValue as Int + invalidate() + } + } + animator.start() + } + + private fun drawCircle(canvas: Canvas) { + for ((index, percent) in percentageCircleList.withIndex()) { + val paint = if (index == selectedIndex) { + Paint(percent.paint).apply { + strokeWidth *= 2f + } + } else { + percent.paint + } + if (animationSweepAngle > percent.percentToStartAt + percent.percentOfCircle) { + canvas.drawArc(circleRect, percent.percentToStartAt, percent.percentOfCircle, false, paint) + } else if (animationSweepAngle > percent.percentToStartAt) { + canvas.drawArc(circleRect, percent.percentToStartAt, animationSweepAngle - percent.percentToStartAt, false, paint) + } + } + } + + private fun drawText(canvas: Canvas) { + var textBuffY = textStartY + textRowList.forEachIndexed { index, staticLayout -> + if (index % 2 == 0) { + staticLayout.draw(canvas, textStartX + marginSmallCircle + textCircleRadius, textBuffY) + canvas.drawCircle( + textStartX + marginSmallCircle / 2, + textBuffY + staticLayout.height / 2 + textCircleRadius / 2, + textCircleRadius, + Paint().apply { + color = Color.parseColor(pieChartColors[(index / 2) % pieChartColors.size]) + } + ) + textBuffY += staticLayout.height + marginTextFirst + } else { + staticLayout.draw(canvas, textStartX, textBuffY) + textBuffY += staticLayout.height + marginTextSecond + } + } + + canvas.drawText(totalAmount.toString(), textAmountXNumber, textAmountY, amountTextPaint) + canvas.drawText(textAmountStr, textAmountXDescription, textAmountYDescription, descriptionTextPain) + } + + private fun initPains(textPaint: TextPaint, textSize: Float, textColor: Int, isDescription: Boolean = false) { + textPaint.color = textColor + textPaint.textSize = textSize + textPaint.isAntiAlias = true + + if (!isDescription) textPaint.typeface = Typeface.create(Typeface.DEFAULT, Typeface.BOLD) + } + + private fun resolveDefaultSize(spec: Int, defValue: Int): Int { + return when (MeasureSpec.getMode(spec)) { + MeasureSpec.UNSPECIFIED -> context.dpToPx(defValue).toInt() + else -> MeasureSpec.getSize(spec) + } + } + + private fun calculateViewHeight(heightMeasureSpec: Int, textWidth: Int): Int { + val initSizeHeight = resolveDefaultSize(heightMeasureSpec, DEFAULT_VIEW_SIZE_HEIGHT) + textHeight = (dataList.size * marginText + getTextViewHeight(textWidth)).toInt() + + val textHeightWithPadding = textHeight + paddingTop + paddingBottom + return if (textHeightWithPadding > initSizeHeight) textHeightWithPadding else initSizeHeight + } + + private fun calculateCircleRadius(width: Int, height: Int) { + val circleViewWidth = (width * CIRCLE_WIDTH_PERCENT) + circleRadius = if (circleViewWidth > height) { + (height.toFloat() - circlePadding) / 2 + } else { + circleViewWidth.toFloat() / 2 + } + + with(circleRect) { + left = circlePadding + top = height / 2 - circleRadius + right = circleRadius * 2 + circlePadding + bottom = height / 2 + circleRadius + } + + circleCenterX = (circleRadius * 2 + circlePadding + circlePadding) / 2 + circleCenterY = (height / 2 + circleRadius + (height / 2 - circleRadius)) / 2 + + textAmountY = circleCenterY + + val sizeTextAmountNumber = getWidthOfAmountText( + totalAmount.toString(), + amountTextPaint + ) + + textAmountXNumber = circleCenterX - sizeTextAmountNumber.width() / 2 + textAmountXDescription = circleCenterX - getWidthOfAmountText(textAmountStr, descriptionTextPain).width() / 2 + textAmountYDescription = circleCenterY + sizeTextAmountNumber.height() + marginTextThird + } + + private fun getTextViewHeight(maxWidth: Int): Int { + var textHeight = 0 + dataList.forEach { + val textLayoutNumber = getMultilineText( + text = it.amount.toString(), + textPaint = numberTextPaint, + width = maxWidth + ) + val textLayoutDescription = getMultilineText( + text = it.category, + textPaint = descriptionTextPain, + width = maxWidth + ) + textRowList.apply { + add(textLayoutNumber) + add(textLayoutDescription) + } + textHeight += textLayoutNumber.height + textLayoutDescription.height + } + + return textHeight + } + + private fun calculatePercentageOfData() { + totalAmount = dataList.fold(0) { res, value -> res + value.amount } + + var startAt = circleSectionSpace + percentageCircleList = dataList.mapIndexed { index, pair -> + var percent = pair.amount * 100 / totalAmount.toFloat() - circleSectionSpace + percent = if (percent < 0F) 0F else percent + + val resultModel = PieChartModel( + percentOfCircle = percent, + percentToStartAt = startAt, + colorOfLine = Color.parseColor(pieChartColors[index % pieChartColors.size]), + stroke = circleStrokeWidth, + paintRound = circlePaintRoundSize + ) + if (percent != 0F) startAt += percent + circleSectionSpace + resultModel + } + } + + private fun getWidthOfAmountText(text: String, textPaint: TextPaint): Rect { + val bounds = Rect() + textPaint.getTextBounds(text, 0, text.length, bounds) + return bounds + } + + private fun getMultilineText( + text: CharSequence, + textPaint: TextPaint, + width: Int, + start: Int = 0, + end: Int = text.length, + alignment: Layout.Alignment = Layout.Alignment.ALIGN_NORMAL, + textDir: TextDirectionHeuristic = TextDirectionHeuristics.LTR, + spacingMult: Float = 1f, + spacingAdd: Float = 0f + ): StaticLayout { + + return StaticLayout.Builder + .obtain(text, start, end, textPaint, width) + .setAlignment(alignment) + .setTextDirection(textDir) + .setLineSpacing(spacingAdd, spacingMult) + .build() + } + + override fun onTouchEvent(event: MotionEvent?): Boolean { + event?.let { + if (event.action == MotionEvent.ACTION_DOWN) { + val angle = getTouchedAngle(event.x, event.y) + selectedIndex = getTouchedSectorIndex(angle) + invalidate() + return true + } + } + return super.onTouchEvent(event) + } + + private fun getTouchedAngle(x: Float, y: Float): Float { + val dx = x - circleCenterX + val dy = y - circleCenterY + var angle = Math.toDegrees(atan2(dy.toDouble(), dx.toDouble())).toFloat() + angle = (angle + 360) % 360 + return angle + } + + private fun getTouchedSectorIndex(angle: Float): Int { + percentageCircleList.forEachIndexed { index, pieChartModel -> + val startAngle = pieChartModel.percentToStartAt + val endAngle = startAngle + pieChartModel.percentOfCircle + + if (angle in startAngle..endAngle) { + return index + } + } + return -1 + } +} \ 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..32cf758f 100644 --- a/app/src/main/res/layout/activity_main.xml +++ b/app/src/main/res/layout/activity_main.xml @@ -1,19 +1,38 @@ - - + + + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintHorizontal_bias="0.5" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toBottomOf="@+id/pieChart" /> \ No newline at end of file diff --git a/app/src/main/res/values/attr.xml b/app/src/main/res/values/attr.xml new file mode 100644 index 00000000..9e5e78e9 --- /dev/null +++ b/app/src/main/res/values/attr.xml @@ -0,0 +1,27 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml index f8c6127d..55ac216f 100644 --- a/app/src/main/res/values/colors.xml +++ b/app/src/main/res/values/colors.xml @@ -7,4 +7,10 @@ #FF018786 #FF000000 #FFFFFFFF + + + #252736 + + + #8B8A92 \ No newline at end of file diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 9213c339..b568e5ff 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -1,3 +1,16 @@ Custom View + Всего + + #81BECE + #E9E9E9 + #E38664 + #e4d6f8 + #5BA0BF + #aaa2d8 + #a27eb8 + #ED413E + #EFB786 + #604d9e + \ No newline at end of file diff --git a/build.gradle b/build.gradle index e47bb55b..211cf85c 100644 --- a/build.gradle +++ b/build.gradle @@ -1,12 +1,15 @@ // Top-level build file where you can add configuration options common to all sub-projects/modules. buildscript { - ext.kotlin_version = "1.4.32" + ext { + agp_version = '8.0.2' + } + ext.kotlin_version = "1.6.21" repositories { google() jcenter() } 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 @@ -16,8 +19,8 @@ buildscript { allprojects { repositories { + mavenCentral() google() - jcenter() } } diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index f6b961fd..d64cd491 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..1af9e093 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.5-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..1aa94a42 100755 --- a/gradlew +++ b/gradlew @@ -1,78 +1,127 @@ -#!/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. +# ############################################################################## -## -## 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/subprojects/plugins/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 "${APP_HOME:-./}" > /dev/null && pwd -P ) || 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 +130,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..6689b85b 100644 --- a/gradlew.bat +++ b/gradlew.bat @@ -1,84 +1,92 @@ -@if "%DEBUG%" == "" @echo off -@rem ########################################################################## -@rem -@rem Gradle startup script for Windows -@rem -@rem ########################################################################## - -@rem Set local scope for the variables with windows NT shell -if "%OS%"=="Windows_NT" setlocal - -set DIRNAME=%~dp0 -if "%DIRNAME%" == "" set DIRNAME=. -set APP_BASE_NAME=%~n0 -set APP_HOME=%DIRNAME% - -@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= - -@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 - -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. - -goto fail - -:findJavaFromJavaHome -set JAVA_HOME=%JAVA_HOME:"=% -set JAVA_EXE=%JAVA_HOME%/bin/java.exe - -if exist "%JAVA_EXE%" goto init - -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. - -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% - -:end -@rem End local scope for the variables with windows NT shell -if "%ERRORLEVEL%"=="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 - -:mainEnd -if "%OS%"=="Windows_NT" endlocal - -:omega +@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 + +@if "%DEBUG%"=="" @echo off +@rem ########################################################################## +@rem +@rem Gradle startup script for Windows +@rem +@rem ########################################################################## + +@rem Set local scope for the variables with windows NT shell +if "%OS%"=="Windows_NT" setlocal + +set DIRNAME=%~dp0 +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="-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% 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. + +goto fail + +:findJavaFromJavaHome +set JAVA_HOME=%JAVA_HOME:"=% +set JAVA_EXE=%JAVA_HOME%/bin/java.exe + +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. + +goto fail + +: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 %* + +:end +@rem End local scope for the variables with windows NT shell +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! +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 + +:omega