diff --git a/app/build.gradle b/app/build.gradle index b4711913..e3b501bc 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -23,6 +23,9 @@ android { proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro' } } + buildFeatures { + viewBinding = true + } compileOptions { sourceCompatibility JavaVersion.VERSION_1_8 targetCompatibility JavaVersion.VERSION_1_8 diff --git a/app/src/main/java/otus/homework/customview/Category.kt b/app/src/main/java/otus/homework/customview/Category.kt new file mode 100644 index 00000000..ef0250d2 --- /dev/null +++ b/app/src/main/java/otus/homework/customview/Category.kt @@ -0,0 +1,9 @@ +package otus.homework.customview + +data class Category( + val id: Int, + val name: String, + val amount: Int, + val category: String, + var time: Long +) \ No newline at end of file diff --git a/app/src/main/java/otus/homework/customview/CategoryGroupedByDay.kt b/app/src/main/java/otus/homework/customview/CategoryGroupedByDay.kt new file mode 100644 index 00000000..379e310d --- /dev/null +++ b/app/src/main/java/otus/homework/customview/CategoryGroupedByDay.kt @@ -0,0 +1,7 @@ +package otus.homework.customview + +data class CategoryGroupedByDate( + val category: String, + val sum: Int, + var time: Long +) \ No newline at end of file diff --git a/app/src/main/java/otus/homework/customview/DimensionsExt.kt b/app/src/main/java/otus/homework/customview/DimensionsExt.kt new file mode 100644 index 00000000..936b003c --- /dev/null +++ b/app/src/main/java/otus/homework/customview/DimensionsExt.kt @@ -0,0 +1,9 @@ +package otus.homework.customview + +import android.content.res.Resources + +val Int.dp: Int + get() = (this / Resources.getSystem().displayMetrics.density).toInt() + +val Int.px: Int + get() = (this * Resources.getSystem().displayMetrics.density).toInt() \ No newline at end of file diff --git a/app/src/main/java/otus/homework/customview/LinearChart.kt b/app/src/main/java/otus/homework/customview/LinearChart.kt new file mode 100644 index 00000000..29d7545c --- /dev/null +++ b/app/src/main/java/otus/homework/customview/LinearChart.kt @@ -0,0 +1,221 @@ +package otus.homework.customview + +import android.content.Context +import android.graphics.Canvas +import android.graphics.Color +import android.graphics.Paint +import android.graphics.Path +import android.graphics.RectF +import android.util.AttributeSet +import android.view.View +import androidx.core.content.ContextCompat +import androidx.core.graphics.ColorUtils +import java.lang.Exception +import java.lang.Integer.max +import java.time.Instant +import java.time.LocalDateTime +import java.time.ZoneOffset +import java.time.format.DateTimeFormatterBuilder +import java.time.format.ResolverStyle +import java.time.format.SignStyle +import java.time.temporal.ChronoField + +class LinearChart @JvmOverloads constructor( + context: Context, + attr: AttributeSet? = null, +) : View(context, attr) { + + private var newCategoryList = emptyList() + private var maxSum = 1 + + private val defaultViewSize = 240 + private val rectangle = RectF() + private var padding = 100f + private var horizontalMultiply = 1f + private var verticalMultiply = 1f + private var paddingMultiply = 0.9f + + private var startTimeStamp = 0L + private var finishTimeStamp = 1L + private var time = 1L + + private var categoryByDateList = groupByCategory(newCategoryList) + private var path = Path() + + private val paintText = Paint() + .apply { + color = ColorUtils.setAlphaComponent(Color.GRAY, 255) + textSize = 14.px.toFloat() + } + + private val paintGrid = Paint() + .apply { + color = ColorUtils.setAlphaComponent(Color.GRAY, 30) + strokeWidth = 4f + style = Paint.Style.STROKE + } + + private val paintAxis = Paint() + .apply { + color = Color.BLACK + style = Paint.Style.STROKE + strokeWidth = 4f + } + + private val paintList = listOf( + ContextCompat.getColor(context, R.color.color_0), + ContextCompat.getColor(context, R.color.color_1), + ContextCompat.getColor(context, R.color.color_2), + ContextCompat.getColor(context, R.color.color_3), + ContextCompat.getColor(context, R.color.color_4), + ContextCompat.getColor(context, R.color.color_5), + ContextCompat.getColor(context, R.color.color_6), + ContextCompat.getColor(context, R.color.color_7), + ContextCompat.getColor(context, R.color.color_8), + ContextCompat.getColor(context, R.color.color_9) + ).map { paintColor -> + Paint().apply { + color = paintColor + style = Paint.Style.STROKE + strokeWidth = 4f + } + } + + override fun onDraw(canvas: Canvas?) { + super.onDraw(canvas) + drawAxes(canvas) + drawChartLines(canvas) + drawVerticalGridLines(canvas) + drawHorizontalGridLines(canvas) + } + + private fun drawAxes(canvas: Canvas?) { + with(rectangle) { + canvas?.drawLine(left, top, left, bottom, paintAxis) + canvas?.drawLine(left, bottom, right, bottom, paintAxis) + } + } + + private fun drawChartLines(canvas: Canvas?) { + val categories = mutableListOf() + for (item in categoryByDateList) { + categories.add(item.category) + } + val distinctCategories = categories.distinct() + for (i in distinctCategories.indices) { + path.reset() + path.moveTo(padding, rectangle.bottom) + for (item in categoryByDateList) { + if (item.category == distinctCategories[i]) + path.lineTo( + padding + (item.time - startTimeStamp) * horizontalMultiply, + rectangle.bottom - item.sum * verticalMultiply + ) + } + canvas?.drawPath(path, paintList[i]) + } + } + + private fun drawHorizontalGridLines(canvas: Canvas?) { + val step = maxSum / 4 + for (i in 0..3) { + if (i > 0) { + canvas?.drawLine( + rectangle.left, + rectangle.bottom - i * step * verticalMultiply, + rectangle.right, + rectangle.bottom - i * step * verticalMultiply, + paintGrid + ) + } + canvas?.drawText( + (i * step).toString(), + 0f, rectangle.bottom - i * step * verticalMultiply, paintText + ) + } + } + + private fun drawVerticalGridLines(canvas: Canvas?) { + for (i in 0..time) { + canvas?.drawLine( + padding + i * paddingMultiply * (rectangle.right - rectangle.left) / time, + rectangle.top, + padding + i * paddingMultiply * (rectangle.right - rectangle.left) / time, + rectangle.bottom, + paintGrid + ) + canvas?.drawText( + (startTimeStamp + i).toString(), + padding + i * paddingMultiply * (rectangle.right - rectangle.left) / time, + rectangle.bottom + paintText.textSize, paintText + ) + } + } + + fun setData(categoryList: List) { + newCategoryList = categoryList + newCategoryList.forEach { category -> + category.time = timeStampToDayOfMonth(category.time) + } + + categoryByDateList = groupByCategory(newCategoryList) + maxSum = categoryByDateList.maxOf { it.sum } + + startTimeStamp = newCategoryList.minOf { it.time } + finishTimeStamp = newCategoryList.maxOf { it.time } + time = finishTimeStamp - startTimeStamp + } + + private fun groupByCategory(categoryGroups: List): List { + val resultMap = mutableMapOf() + for (group in categoryGroups) { + val key = "${group.category}-${group.time}" + val newCategory = resultMap[key] + + if (newCategory == null) { + resultMap[key] = CategoryGroupedByDate(group.category, group.amount, group.time) + } else { + resultMap[key] = newCategory.copy(sum = newCategory.sum + group.amount) + } + } + return resultMap.values + .toList() + .sortedBy { it.time } + } + + override fun onMeasure(widthMeasureSpec: Int, heightMeasureSpec: Int) { + super.onMeasure(widthMeasureSpec, heightMeasureSpec) + val widthSize = calculateSize(widthMeasureSpec) + val heightSize = calculateSize(heightMeasureSpec) + rectangle.apply { + top = padding + bottom = heightSize.toFloat() - padding + left = padding + right = widthSize.toFloat() - padding + } + horizontalMultiply = paddingMultiply * (rectangle.right - rectangle.left) / time + verticalMultiply = (rectangle.bottom - rectangle.top) / maxSum + padding = maxOf(padding, paintText.measureText(maxSum.toString()) + 20) + setMeasuredDimension(widthSize, heightSize) + } + + private fun calculateSize(measureSpec: Int): Int { + val size = MeasureSpec.getSize(measureSpec) + return when (MeasureSpec.getMode(measureSpec)) { + MeasureSpec.UNSPECIFIED -> defaultViewSize + MeasureSpec.EXACTLY -> size + MeasureSpec.AT_MOST -> max(defaultViewSize, size) + else -> throw Exception("MeasureSpec is not implemented") + } + } + + private fun timeStampToDayOfMonth(timestamp: Long): Long { + val formatter = DateTimeFormatterBuilder() + .appendValue(ChronoField.DAY_OF_MONTH, 1, 2, SignStyle.NORMAL) + .toFormatter() + .withResolverStyle(ResolverStyle.STRICT) + val instant = Instant.ofEpochSecond(timestamp) + val localDate = LocalDateTime.ofInstant(instant, ZoneOffset.UTC) + return formatter.format(localDate).toLong() + } +} \ 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..7e6c3477 100644 --- a/app/src/main/java/otus/homework/customview/MainActivity.kt +++ b/app/src/main/java/otus/homework/customview/MainActivity.kt @@ -2,10 +2,37 @@ package otus.homework.customview import androidx.appcompat.app.AppCompatActivity import android.os.Bundle +import org.json.JSONArray +import otus.homework.customview.databinding.ActivityMainBinding class MainActivity : AppCompatActivity() { + override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) - setContentView(R.layout.activity_main) + val binding = ActivityMainBinding.inflate(layoutInflater) + setContentView(binding.root) + + val parsedData = parseData() + binding.pieChart.setData(parsedData) + binding.linearChart.setData(parsedData) + } + + private fun parseData(): List { + val rowData = JSONArray( + this.resources + .openRawResource(R.raw.payload) + .reader() + .readText() + ) + return (0 until rowData.length()).map { + val obj = rowData.getJSONObject(it) + return@map Category( + obj.optInt("id"), + obj.optString("name", ""), + obj.optInt("amount"), + obj.optString("category", ""), + obj.optLong("time") + ) + } } } \ No newline at end of file diff --git a/app/src/main/java/otus/homework/customview/PieChart.kt b/app/src/main/java/otus/homework/customview/PieChart.kt new file mode 100644 index 00000000..c0bb38a1 --- /dev/null +++ b/app/src/main/java/otus/homework/customview/PieChart.kt @@ -0,0 +1,226 @@ +package otus.homework.customview + +import android.annotation.SuppressLint +import android.content.Context +import android.graphics.Canvas +import android.graphics.Color +import android.graphics.Paint +import android.graphics.RectF +import android.os.Bundle +import android.os.Parcelable +import android.util.AttributeSet +import android.util.TypedValue +import android.view.MotionEvent +import android.view.View +import androidx.core.content.ContextCompat +import java.lang.Exception +import java.lang.Integer.max +import kotlin.math.atan2 +import kotlin.math.pow +import kotlin.math.sqrt + +class PieChart @JvmOverloads constructor( + context: Context, + attr: AttributeSet? = null, +) : View(context, attr) { + + companion object { + private const val BUNDLE_KEY_STATE = "bundle_key_state" + private const val BUNDLE_KEY_INDEX = "bundle_key_index" + } + + private var categoryList = emptyList() + + private val rectangle = RectF() + private val topPadding = 24 + private val defaultViewSize = 320 + private var total = 1 + private var index = -1 + + private val paintInner = Paint() + .apply { + color = Color.WHITE + style = Paint.Style.FILL + } + + private val paintText = Paint() + .apply { + color = Color.GRAY + style = Paint.Style.FILL + textSize = TypedValue.applyDimension( + TypedValue.COMPLEX_UNIT_SP, + 14f, + resources.displayMetrics + ) + } + + private val paintList = listOf( + ContextCompat.getColor(context, R.color.color_0), + ContextCompat.getColor(context, R.color.color_1), + ContextCompat.getColor(context, R.color.color_2), + ContextCompat.getColor(context, R.color.color_3), + ContextCompat.getColor(context, R.color.color_4), + ContextCompat.getColor(context, R.color.color_5), + ContextCompat.getColor(context, R.color.color_6), + ContextCompat.getColor(context, R.color.color_7), + ContextCompat.getColor(context, R.color.color_8), + ContextCompat.getColor(context, R.color.color_9) + ).map { paintColor -> + Paint().apply { + color = paintColor + style = Paint.Style.FILL + } + } + + private var partByCategories = categoryList + .groupBy { it.category } + .mapValues { entry -> ((entry.value.sumBy { it.amount }) * 360).toFloat() / total } + .toList() + + override fun onMeasure(widthMeasureSpec: Int, heightMeasureSpec: Int) { + super.onMeasure(widthMeasureSpec, heightMeasureSpec) + val widthSize = calculateSize(widthMeasureSpec) + rectangle.apply { + top = 0f + bottom = widthSize.toFloat() + left = 0f + right = widthSize.toFloat() + } + setMeasuredDimension(widthSize, widthSize) + } + + private fun calculateSize(measureSpec: Int): Int { + val size = MeasureSpec.getSize(measureSpec) + return when (MeasureSpec.getMode(measureSpec)) { + MeasureSpec.UNSPECIFIED -> defaultViewSize + MeasureSpec.EXACTLY -> size + MeasureSpec.AT_MOST -> max(defaultViewSize, size) + else -> throw Exception("MeasureSpec is not implemented") + } + } + + override fun onDraw(canvas: Canvas?) { + super.onDraw(canvas) + drawSlices(canvas) + drawCentralCircle(canvas) + drawText(canvas) + } + + private fun drawSlices(canvas: Canvas?) { + var start = 0f + for ((i, s) in partByCategories.withIndex()) { + if (i == index - 1) { + canvas?.drawArc(rectangle, start, s.second, true, paintList[i]) + } + canvas?.drawArc( + rectangle.left + topPadding, + rectangle.top + topPadding, + rectangle.right - topPadding, + rectangle.bottom - topPadding, + start, + s.second, + true, + paintList[i] + ) + start += s.second + } + } + + private fun drawCentralCircle(canvas: Canvas?) { + with(rectangle) { + canvas?.drawCircle( + (top + bottom) / 2, + (left + right) / 2, + (right - left) / 3, paintInner + ) + } + } + + private fun drawText(canvas: Canvas?) { + if (index > 0) { + val text = "%s: %.1f".format( + partByCategories[index - 1].first, + partByCategories[index - 1].second + ) + val textWidth = paintText.measureText(text) + canvas?.drawText( + text, + (rectangle.left + rectangle.right - textWidth) / 2, + (rectangle.top + rectangle.bottom) / 2, + paintText + ) + } + } + + override fun onSaveInstanceState(): Parcelable { + val bundle = Bundle() + bundle.putInt(BUNDLE_KEY_INDEX, index) + bundle.putParcelable(BUNDLE_KEY_STATE, super.onSaveInstanceState()) + return bundle + } + + override fun onRestoreInstanceState(state: Parcelable?) { + val bundle = state as Bundle + index = bundle.getInt(BUNDLE_KEY_INDEX) + super.onRestoreInstanceState(bundle.getParcelable(BUNDLE_KEY_STATE)) + } + + @SuppressLint("ClickableViewAccessibility") + override fun onTouchEvent(event: MotionEvent?): Boolean { + if (event?.actionMasked == MotionEvent.ACTION_UP) { + setIndex(event.x, event.y) + invalidate() + requestLayout() + } + return true + } + + private fun setIndex(x: Float, y: Float) { + var start = 0f + val centerX = (rectangle.left + rectangle.right) / 2f + val centerY = (rectangle.bottom + rectangle.top) / 2f + val angle = getTouchAngle(x, y, centerX, centerY) + for ((i, s) in partByCategories.withIndex()) { + if (angle == null) { + index = -1 + } else if (angle in start..start + s.second) { + index = if (index != i + 1) i + 1 else -1 + } + start += s.second + } + } + + private fun getTouchAngle( + touchX: Float, + touchY: Float, + centerX: Float, + centerY: Float + ): Float? { + if (!isSlice(touchX, touchY)) return null + return Math.toDegrees( + atan2( + (centerY - touchY).toDouble(), + (centerX - touchX).toDouble() + ) + ).toFloat() + 180 + } + + private fun isSlice(touchX: Float, touchY: Float): Boolean { + val outerRadius = (rectangle.bottom - rectangle.top) / 2f + val innerRadius = outerRadius / 1.5f + val centerX = (rectangle.left + rectangle.right) / 2f + val centerY = (rectangle.bottom + rectangle.top) / 2f + val realRadius = sqrt((touchX - centerX).pow(2) + (touchY - centerY).pow(2)) + return (realRadius in innerRadius..outerRadius) + } + + fun setData(categoryList: List) { + this.categoryList = categoryList + total = + if (this.categoryList.sumOf { it.amount } > 0) this.categoryList.sumOf { it.amount } else 1 + partByCategories = this.categoryList + .groupBy { it.category } + .mapValues { entry -> ((entry.value.sumBy { it.amount }) * 360).toFloat() / total } + .toList() + } +} \ 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..9f324468 100644 --- a/app/src/main/res/layout/activity_main.xml +++ b/app/src/main/res/layout/activity_main.xml @@ -1,19 +1,20 @@ - - + + - - \ No newline at end of file + android:layout_margin="16dp" /> + \ 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..56b9c28e 100644 --- a/app/src/main/res/values/colors.xml +++ b/app/src/main/res/values/colors.xml @@ -7,4 +7,14 @@ #FF018786 #FF000000 #FFFFFFFF + #E53935 + #D81B60 + #8E24AA + #5E35B1 + #3949AB + #00ACC1 + #43A047 + #FDD835 + #FB8C00 + #F4511E \ No newline at end of file diff --git a/build.gradle b/build.gradle index e47bb55b..af92b412 100644 --- a/build.gradle +++ b/build.gradle @@ -1,12 +1,12 @@ // Top-level build file where you can add configuration options common to all sub-projects/modules. buildscript { - ext.kotlin_version = "1.4.32" + ext.kotlin_version = '1.6.21' repositories { google() jcenter() } dependencies { - classpath "com.android.tools.build:gradle:4.1.2" + classpath 'com.android.tools.build:gradle:7.4.2' classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" // NOTE: Do not place your application dependencies here; they belong diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index f6b961fd..7454180f 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..8049c684 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,5 @@ -#Fri Jun 11 17:42:46 MSK 2021 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-bin.zip 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..1b6c7873 100755 --- a/gradlew +++ b/gradlew @@ -1,78 +1,129 @@ -#!/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/master/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_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit APP_NAME="Gradle" -APP_BASE_NAME=`basename "$0"` +APP_BASE_NAME=${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="" +DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' # 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,7 +132,7 @@ Please set the JAVA_HOME variable in your environment to match the location of your Java installation." fi else - JAVACMD="java" + 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. Please set the JAVA_HOME variable in your environment to match the @@ -89,84 +140,95 @@ location of your Java installation." 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*) + MAX_FD=$( ulimit -H -n ) || + warn "Could not query maximum file descriptor limit" + esac + case $MAX_FD in #( + '' | soft) :;; #( + *) + 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")" -fi +# Collect all arguments for the java command; +# * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of +# shell script including quotes and variable substitutions, so put them in +# double quotes to make sure that they get re-expanded; and +# * put everything else in single quotes, so that it's not re-expanded. + +set -- \ + "-Dorg.gradle.appname=$APP_BASE_NAME" \ + -classpath "$CLASSPATH" \ + org.gradle.wrapper.GradleWrapperMain \ + "$@" + +# 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..107acd32 100644 --- a/gradlew.bat +++ b/gradlew.bat @@ -1,3 +1,19 @@ +@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 @@ -13,15 +29,18 @@ if "%DIRNAME%" == "" set DIRNAME=. 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%" == "0" goto execute echo. echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. @@ -35,7 +54,7 @@ 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% @@ -45,28 +64,14 @@ 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% +"%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