diff --git a/app/build.gradle b/app/build.gradle index b4711913..b67f9355 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -1,6 +1,8 @@ plugins { id 'com.android.application' id 'kotlin-android' + id 'kotlin-parcelize' + id 'kotlinx-serialization' } android { @@ -8,9 +10,10 @@ android { buildToolsVersion "30.0.3" defaultConfig { + namespace = "otus.homework.customview" applicationId "otus.homework.customview" minSdkVersion 23 - targetSdkVersion 30 + targetSdkVersion 34 versionCode 1 versionName "1.0" @@ -30,10 +33,15 @@ android { kotlinOptions { jvmTarget = '1.8' } + buildFeatures { + viewBinding = true + } } dependencies { - + implementation 'com.google.code.gson:gson:2.8.8' + implementation "org.jetbrains.kotlinx:kotlinx-serialization-json:1.5.0" + implementation "org.jetbrains.kotlin:kotlin-serialization:1.9.24" implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version" implementation 'androidx.core:core-ktx:1.3.2' implementation 'androidx.appcompat:appcompat:1.2.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/CategoryView.kt b/app/src/main/java/otus/homework/customview/CategoryView.kt new file mode 100644 index 00000000..9b9b2de5 --- /dev/null +++ b/app/src/main/java/otus/homework/customview/CategoryView.kt @@ -0,0 +1,112 @@ +package otus.homework.customview + +import android.content.Context +import android.graphics.Canvas +import android.graphics.Paint +import android.graphics.RectF +import android.os.Bundle +import android.os.Parcelable +import android.util.AttributeSet +import android.view.View +import androidx.core.content.withStyledAttributes +import kotlinx.serialization.decodeFromString +import kotlinx.serialization.encodeToString +import kotlinx.serialization.json.Json + +class CategoryView @JvmOverloads constructor( + context: Context, attrs: AttributeSet? = null, defStyleAttr: Int = 0 +) : View(context, attrs, defStyleAttr) { + + private val rectangle by lazy { RectF() } + private val paint by lazy { Paint() } + + private var labelText: String? = null + private var overHead: Float? = null + private var maxValue: Double = 0.0 + + private var categoryWidth: Int = 0 + private var categoryHeight: Int = 0 + + private var defaultBlockWidth = 30.px.toFloat() + + private var categories: List = emptyList() + + init { + initAttributes(attrs) + paint.apply { + style = Paint.Style.FILL + } + } + + override fun onMeasure(widthMeasureSpec: Int, heightMeasureSpec: Int) { + val wMode = MeasureSpec.getMode(widthMeasureSpec) + val hMode = MeasureSpec.getMode(heightMeasureSpec) + + when (wMode) { + MeasureSpec.AT_MOST, MeasureSpec.UNSPECIFIED -> { + categoryWidth = (defaultBlockWidth * categories.size).toInt() + categoryHeight = MeasureSpec.getSize(heightMeasureSpec) + } + + MeasureSpec.EXACTLY -> { + categoryWidth = MeasureSpec.getSize(widthMeasureSpec) + categoryHeight = MeasureSpec.getSize(heightMeasureSpec) + } + } + setMeasuredDimension(categoryWidth, categoryHeight) + } + + override fun onDraw(canvas: Canvas?) { + super.onDraw(canvas) + val blockWidth = categoryWidth / categories.size + val blockHeight = categoryHeight / maxValue + + var currentValueX = 0.0 + categories.forEach { category -> + paint.apply { color = category.color } + rectangle.set( + currentValueX.toFloat(), + (categoryHeight - blockHeight * category.value).toFloat(), + (currentValueX + blockWidth).toFloat(), + categoryHeight.toFloat() + ) + canvas?.drawRect(rectangle, paint) + currentValueX += blockWidth + } + } + + override fun onRestoreInstanceState(state: Parcelable?) { + val bundle = state as Bundle + val savedState = bundle.getString(SAVED_STATE_VIEW_KEY) + savedState?.let { + val viewState = Json.decodeFromString(it) + this@CategoryView.categories = viewState.charts + } + super.onRestoreInstanceState(bundle.getParcelable(INSTANCE_CATEGORY_KEY)) + } + + override fun onSaveInstanceState(): Parcelable { + val bundle = Bundle() + bundle.putString(SAVED_STATE_VIEW_KEY, Json.encodeToString(SavedCategoryState(categories))) + bundle.putParcelable(INSTANCE_CATEGORY_KEY, super.onSaveInstanceState()) + return bundle + } + + private fun initAttributes(attrs: AttributeSet?) { + context.withStyledAttributes(attrs, R.styleable.CategoryView, 0, 0) { + labelText = getString(R.styleable.CategoryView_chart_label) + overHead = getFloat(R.styleable.CategoryView_chart_sum_overhead, 0F) + } + } + + fun setCharts(charts: List) { + this@CategoryView.categories = charts + maxValue = charts.maxOf { it.value } + requestLayout() + } + + private companion object { + private const val SAVED_STATE_VIEW_KEY = "saved_state_view_key" + private const val INSTANCE_CATEGORY_KEY = "instance_category_key" + } +} \ 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..80023f83 100644 --- a/app/src/main/java/otus/homework/customview/MainActivity.kt +++ b/app/src/main/java/otus/homework/customview/MainActivity.kt @@ -2,10 +2,29 @@ package otus.homework.customview import androidx.appcompat.app.AppCompatActivity import android.os.Bundle +import otus.homework.customview.databinding.ActivityMainBinding class MainActivity : AppCompatActivity() { + + private val payloads by lazy { this.readData() } + + private lateinit var binding: ActivityMainBinding + override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) - setContentView(R.layout.activity_main) + binding = ActivityMainBinding.inflate(layoutInflater) + val view = binding.root + setContentView(view) + initCategory() + } + + private fun initPieChart() { + val pieces = payloads.mapPieces() + /* binding.pieChart.setPieces(pieces) */ + } + + private fun initCategory() { + val charts = payloads.mapCategories() + binding.view.setCharts(charts) } } \ No newline at end of file diff --git a/app/src/main/java/otus/homework/customview/PayloadData.kt b/app/src/main/java/otus/homework/customview/PayloadData.kt new file mode 100644 index 00000000..6b8cc62d --- /dev/null +++ b/app/src/main/java/otus/homework/customview/PayloadData.kt @@ -0,0 +1,90 @@ +package otus.homework.customview + +import android.content.Context +import android.content.res.Resources +import android.graphics.Color +import com.google.gson.Gson +import com.google.gson.reflect.TypeToken +import kotlinx.serialization.Serializable +import java.util.Random + +const val DEFAULT_ANGLE = 0.0 +const val MAX_SWEEP_ANGLE = 360 + +data class PayloadData( + val id: Int, + val time: Long, + val name: String, + val amount: Double, + val category: String, +) + +@Serializable +data class PieData( + val color: Int, + val name: String, + val startAngle: Double, + val sweepAngle: Double +) + +@Serializable +data class Category( + val color: Int, + val value: Double, + val name: String +) + +@Serializable +data class SavedPiecesState( + val pieces: List +) + +@Serializable +data class SavedCategoryState( + val charts: List +) + +fun List.mapPieces(): List { + val totalSum = this.sumOf { it.amount } + var startAngle = DEFAULT_ANGLE + + return this.map { payload -> + val sweepAngle = payload.amount.calculateSweepAngle(totalSum) + val data = PieData( + name = payload.name, + color = generateColor(), + startAngle = startAngle, + sweepAngle = sweepAngle + ) + startAngle += sweepAngle + data + } +} + +fun List.mapCategories(): List = this.map { + Category( + name = it.name, + value = it.amount, + color = generateColor() + ) +} + +private fun generateColor(): Int { + val rnd = Random() + return Color.argb(255, rnd.nextInt(256), rnd.nextInt(256), rnd.nextInt(256)) +} + +private fun Double.calculateSweepAngle(total: Double): Double = this / total * MAX_SWEEP_ANGLE + +fun Context.readData(): List { + val data = this.resources.openRawResource(R.raw.payload) + val str = data.bufferedReader().use { it.readText() } + val gson = Gson() + + val listType = object : TypeToken>() {}.type + val itemList: List = gson.fromJson(str, listType) + return itemList +} + +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/PieChart.kt b/app/src/main/java/otus/homework/customview/PieChart.kt new file mode 100644 index 00000000..4970f037 --- /dev/null +++ b/app/src/main/java/otus/homework/customview/PieChart.kt @@ -0,0 +1,153 @@ +package otus.homework.customview + +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.view.MotionEvent +import android.view.View +import android.widget.Toast +import androidx.core.content.withStyledAttributes +import kotlinx.serialization.decodeFromString +import kotlinx.serialization.encodeToString +import kotlinx.serialization.json.Json +import kotlin.math.atan2 + +class PieChart @JvmOverloads constructor( + context: Context, attrs: AttributeSet? = null, defStyleAttr: Int = 0 +) : View(context, attrs, defStyleAttr) { + + private var pieces: List = emptyList() + private val rectangle by lazy { RectF(0F, 0F, pieWidth.toFloat(), pieHeight.toFloat()) } + + private val sumPaint by lazy { + Paint().apply { + textSize = 32F + isAntiAlias = true + color = Color.WHITE + textAlign = Paint.Align.CENTER + } + } + private val circlePaint = Paint() + private val centerPaint = Paint() + + private var labelText: String? = null + private var labelDescription: String? = null + private var pieHeight: Int = 0 + private var pieWidth: Int = 0 + + init { + initAttributes(attrs) + centerPaint.apply { + color = Color.WHITE + } + } + + override fun onMeasure(widthMeasureSpec: Int, heightMeasureSpec: Int) { + val wMode = MeasureSpec.getMode(widthMeasureSpec) + val hMode = MeasureSpec.getMode(heightMeasureSpec) + when (wMode) { + MeasureSpec.AT_MOST, MeasureSpec.UNSPECIFIED -> { + pieWidth = MeasureSpec.getSize(widthMeasureSpec) + pieHeight = MeasureSpec.getSize(heightMeasureSpec) + } + + MeasureSpec.EXACTLY -> { + if (MeasureSpec.getSize(widthMeasureSpec) > MeasureSpec.getSize(heightMeasureSpec)) { + pieWidth = MeasureSpec.getSize(widthMeasureSpec) / 2 + pieHeight = MeasureSpec.getSize(heightMeasureSpec) + + } else { + pieWidth = MeasureSpec.getSize(widthMeasureSpec) + pieHeight = MeasureSpec.getSize(heightMeasureSpec) / 2 + } + } + + } + setMeasuredDimension(pieWidth, pieHeight) + } + + override fun onDraw(canvas: Canvas?) { + super.onDraw(canvas) + pieces.forEach { pie -> + circlePaint.apply { color = pie.color } + canvas?.drawArc( + rectangle, + pie.startAngle.toFloat(), + pie.sweepAngle.toFloat(), + USE_ARC_CENTER_FLAG, circlePaint + ) + } + } + + override fun onTouchEvent(event: MotionEvent?): Boolean { + when (event?.action) { + MotionEvent.ACTION_DOWN -> { + val touchX = event.x + val touchY = event.y + val angle = getAngleFromTouch(pieWidth / 2, pieHeight / 2, touchX, touchY) + val category = getCategory(angle) + Toast.makeText(context, category, Toast.LENGTH_SHORT).show() + } + + else -> {} + } + performClick() + return super.onTouchEvent(event) + } + + private fun getAngleFromTouch(centerX: Int, centerY: Int, x: Float, y: Float): Float { + val dx = x - centerX + val dy = y - centerY + val angleInRadians = atan2(dy, dx).toDouble() + val angleInDegrees = Math.toDegrees(angleInRadians).toFloat() + return (angleInDegrees + 360f) % 360f + } + + private fun getCategory(angle: Float): String { + val category = + pieces.find { angle > it.startAngle && angle < it.startAngle + it.sweepAngle } + return category?.name ?: "" + } + + override fun performClick(): Boolean = super.performClick() + + override fun onRestoreInstanceState(state: Parcelable?) { + val bundle = state as Bundle + val savedState = bundle.getString(SAVED_STATE_VIEW_KEY) + savedState?.let { + val viewState = Json.decodeFromString(it) + this@PieChart.pieces = viewState.pieces + } + super.onRestoreInstanceState(bundle.getParcelable(INSTANCE_KEY)) + } + + override fun onSaveInstanceState(): Parcelable { + val bundle = Bundle() + bundle.putString(SAVED_STATE_VIEW_KEY, Json.encodeToString(SavedPiecesState(pieces))) + bundle.putParcelable(INSTANCE_KEY, super.onSaveInstanceState()) + return bundle + } + + private fun initAttributes(attrs: AttributeSet?) { + context.withStyledAttributes(attrs, R.styleable.CustomPieChart, 0, 0) { + labelText = getString(R.styleable.CustomPieChart_pie_label) + labelDescription = getString(R.styleable.CustomPieChart_pie_description) + } + } + + fun setPieces(list: List) { + this@PieChart.pieces = list + requestLayout() + } + + private companion object { + private const val SAVED_STATE_VIEW_KEY = "saved_state_view_key" + private const val INSTANCE_KEY = "instance_key" + private const val USE_ARC_CENTER_FLAG = true + } +} \ 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..fd749a96 100644 --- a/app/src/main/res/layout/activity_main.xml +++ b/app/src/main/res/layout/activity_main.xml @@ -1,19 +1,15 @@ - - - + \ No newline at end of file diff --git a/app/src/main/res/values/attrs.xml b/app/src/main/res/values/attrs.xml new file mode 100644 index 00000000..164b5d22 --- /dev/null +++ b/app/src/main/res/values/attrs.xml @@ -0,0 +1,12 @@ + + + + + + + + + + + + \ 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..a43a8096 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -1,3 +1,5 @@ Custom View + Диаграма расходов + Визуализирует распределение расходов по различным категориям.\nПомогает понять, какая доля каждого типа расходов занимает в общем бюджете \ No newline at end of file diff --git a/build.gradle b/build.gradle index e47bb55b..33fc7794 100644 --- a/build.gradle +++ b/build.gradle @@ -6,8 +6,9 @@ buildscript { jcenter() } dependencies { - classpath "com.android.tools.build:gradle:4.1.2" - classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" + classpath "com.android.tools.build:gradle:8.6.1" + classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.9.24" + classpath "org.jetbrains.kotlin:kotlin-serialization:1.9.24" // NOTE: Do not place your application dependencies here; they belong // in the individual module build.gradle files diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 8734448b..48c0a02c 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-8.7-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..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..93e3f59f 100644 --- a/gradlew.bat +++ b/gradlew.bat @@ -1,4 +1,20 @@ -@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 + +@if "%DEBUG%"=="" @echo off @rem ########################################################################## @rem @rem Gradle startup script for Windows @@ -9,19 +25,23 @@ 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. @@ -35,7 +55,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,38 +65,26 @@ 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 -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