diff --git a/README.md b/README.md index da451f05..546f2c2d 100644 --- a/README.md +++ b/README.md @@ -21,4 +21,8 @@ 4. Реализовывать масштабирование/скроллинг/обработку тач евентов не нужно Примеры дизайна которыми можно вдохновляться: -![Pie Chart](art/second.png) \ No newline at end of file +![Pie Chart](art/second.png) + +### Результат + +![RESULT_SCREENSHOT.png](RESULT_SCREENSHOT.png) \ No newline at end of file diff --git a/RESULT_SCREENSHOT.png b/RESULT_SCREENSHOT.png new file mode 100644 index 00000000..f377ec85 Binary files /dev/null and b/RESULT_SCREENSHOT.png differ diff --git a/app/build.gradle b/app/build.gradle index b4711913..a3d369e4 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -1,10 +1,13 @@ plugins { id 'com.android.application' id 'kotlin-android' + + id 'kotlin-kapt' + id 'dagger.hilt.android.plugin' } android { - compileSdkVersion 30 + compileSdkVersion 31 buildToolsVersion "30.0.3" defaultConfig { @@ -30,6 +33,10 @@ android { kotlinOptions { jvmTarget = '1.8' } + + buildFeatures { + viewBinding true + } } dependencies { @@ -42,4 +49,18 @@ dependencies { testImplementation 'junit:junit:4.+' androidTestImplementation 'androidx.test.ext:junit:1.1.2' androidTestImplementation 'androidx.test.espresso:espresso-core:3.3.0' -} \ No newline at end of file + + implementation 'com.google.code.gson:gson:2.10.1' + implementation 'androidx.activity:activity-ktx:1.3.0' + implementation "androidx.lifecycle:lifecycle-runtime-ktx:2.5.1" + implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:2.5.1" // Add this line + implementation "androidx.fragment:fragment-ktx:1.5.2" + + implementation "com.google.dagger:hilt-android:2.44" // Add this line + kapt "com.google.dagger:hilt-android-compiler:2.44" // Add this line +} + +// Allow references to generated code +kapt { + correctErrorTypes = true +} diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index efd1e519..c338a2f9 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -9,8 +9,9 @@ android:label="@string/app_name" android:roundIcon="@mipmap/ic_launcher_round" android:supportsRtl="true" + android:name=".CustomViewApp" android:theme="@style/Theme.CustomView"> - + diff --git a/app/src/main/java/otus/homework/customview/CustomViewApp.kt b/app/src/main/java/otus/homework/customview/CustomViewApp.kt new file mode 100644 index 00000000..6be3f5b3 --- /dev/null +++ b/app/src/main/java/otus/homework/customview/CustomViewApp.kt @@ -0,0 +1,7 @@ +package otus.homework.customview + +import android.app.Application +import dagger.hilt.android.HiltAndroidApp + +@HiltAndroidApp +class CustomViewApp : Application() \ 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 deleted file mode 100644 index 78cb9448..00000000 --- a/app/src/main/java/otus/homework/customview/MainActivity.kt +++ /dev/null @@ -1,11 +0,0 @@ -package otus.homework.customview - -import androidx.appcompat.app.AppCompatActivity -import android.os.Bundle - -class MainActivity : AppCompatActivity() { - override fun onCreate(savedInstanceState: Bundle?) { - super.onCreate(savedInstanceState) - setContentView(R.layout.activity_main) - } -} \ No newline at end of file diff --git a/app/src/main/java/otus/homework/customview/data/CustomViewRepository.kt b/app/src/main/java/otus/homework/customview/data/CustomViewRepository.kt new file mode 100644 index 00000000..6d024a73 --- /dev/null +++ b/app/src/main/java/otus/homework/customview/data/CustomViewRepository.kt @@ -0,0 +1,10 @@ +package otus.homework.customview.data + +import androidx.annotation.RawRes +import javax.inject.Inject + +class CustomViewRepository @Inject constructor(private val jsonDataSource: JsonDataSource) { + + fun loadPayloads(@RawRes payloadId: Int): List = + jsonDataSource.loadPayloads(payloadId) +} \ No newline at end of file diff --git a/app/src/main/java/otus/homework/customview/data/JsonDataSource.kt b/app/src/main/java/otus/homework/customview/data/JsonDataSource.kt new file mode 100644 index 00000000..5eb7b99b --- /dev/null +++ b/app/src/main/java/otus/homework/customview/data/JsonDataSource.kt @@ -0,0 +1,29 @@ +package otus.homework.customview.data + +import android.content.res.Resources +import com.google.gson.Gson +import java.io.InputStreamReader +import javax.inject.Inject + +class JsonDataSource @Inject constructor(private val resources: Resources) { + + fun loadPayloads(payloadId: Int): List { + readJsonFile(payloadId).let { + return parseJson(it) + } + } + + private fun readJsonFile(resId: Int): String { + val inputStream = resources.openRawResource(resId) + val reader = InputStreamReader(inputStream) + return reader.readText().also { + reader.close() + } + } + + private fun parseJson(jsonString: String): List { + val gson = Gson() + return gson.fromJson(jsonString, Array::class.java).toList() + } + +} \ No newline at end of file diff --git a/app/src/main/java/otus/homework/customview/data/Payload.kt b/app/src/main/java/otus/homework/customview/data/Payload.kt new file mode 100644 index 00000000..afbe2781 --- /dev/null +++ b/app/src/main/java/otus/homework/customview/data/Payload.kt @@ -0,0 +1,9 @@ +package otus.homework.customview.data + +data class Payload( + val id: Int, + val name: String, + val amount: Int, + val category: String, + val time: Long, +) diff --git a/app/src/main/java/otus/homework/customview/di/ApplicationModule.kt b/app/src/main/java/otus/homework/customview/di/ApplicationModule.kt new file mode 100644 index 00000000..1dfed808 --- /dev/null +++ b/app/src/main/java/otus/homework/customview/di/ApplicationModule.kt @@ -0,0 +1,22 @@ +package otus.homework.customview.di + +import android.content.Context +import android.content.res.Resources +import dagger.Module +import dagger.Provides +import dagger.hilt.InstallIn +import dagger.hilt.android.qualifiers.ApplicationContext +import dagger.hilt.components.SingletonComponent +import kotlinx.coroutines.CoroutineDispatcher +import kotlinx.coroutines.Dispatchers + +@Module +@InstallIn(SingletonComponent::class) +object ApplicationModule { + + @Provides + fun provideDispatcherIO() : CoroutineDispatcher = Dispatchers.IO + + @Provides + fun provideResources(@ApplicationContext context: Context): Resources = context.resources +} \ No newline at end of file diff --git a/app/src/main/java/otus/homework/customview/presentation/CustomViewViewModel.kt b/app/src/main/java/otus/homework/customview/presentation/CustomViewViewModel.kt new file mode 100644 index 00000000..7a552c1f --- /dev/null +++ b/app/src/main/java/otus/homework/customview/presentation/CustomViewViewModel.kt @@ -0,0 +1,65 @@ +package otus.homework.customview.presentation + +import androidx.lifecycle.ViewModel +import androidx.lifecycle.viewModelScope +import dagger.hilt.android.lifecycle.HiltViewModel +import kotlinx.coroutines.CoroutineDispatcher +import kotlinx.coroutines.flow.MutableStateFlow +import kotlinx.coroutines.flow.asStateFlow +import kotlinx.coroutines.launch +import otus.homework.customview.R +import otus.homework.customview.data.CustomViewRepository +import otus.homework.customview.data.Payload +import otus.homework.customview.presentation.helpers.GraphCalculator +import otus.homework.customview.presentation.model.PieChartAngle +import otus.homework.customview.presentation.mapper.toPieChartAngles +import otus.homework.customview.utils.DateUtils +import javax.inject.Inject + +@HiltViewModel +class CustomViewViewModel @Inject constructor( + private val repository: CustomViewRepository, + private val dateUtils: DateUtils, + private val graphCalculator: GraphCalculator, + dataLoadDispatcher: CoroutineDispatcher, +) : ViewModel() { + + private lateinit var _payloads: List + private val _pieChartAngles = MutableStateFlow>(emptyList()) + val pieChartAngles = _pieChartAngles.asStateFlow() + + init { + viewModelScope.launch(dataLoadDispatcher) { + _payloads = repository.loadPayloads(R.raw.payload) + _pieChartAngles.value = _payloads.toPieChartAngles() + } + } + + fun getMaxDailyExpenseOfAllCategories(): Int = + graphCalculator.getMaxDailyExpenseOfAllCategories(_payloads) + + fun getDaysToExpenses(payloadCategory: String): Map { + val daysToExpenses = mutableMapOf().withDefault { 0 } + + for (i in 0..MAX_DAYS) { + daysToExpenses[i] = 0 + } + + for (payload in getPayloadsForCategory(payloadCategory)) { + val day: Int = dateUtils.timestampToDayOfMonth(payload.time) + val amount = payload.amount + daysToExpenses[day] = daysToExpenses.getValue(day) + amount + } + + return daysToExpenses + } + + private fun getPayloadsForCategory(category: String): List { + return _payloads.filter { it.category == category } + } + + companion object { + private const val MAX_DAYS = 31 + } +} + diff --git a/app/src/main/java/otus/homework/customview/presentation/MainActivity.kt b/app/src/main/java/otus/homework/customview/presentation/MainActivity.kt new file mode 100644 index 00000000..1d0a24fa --- /dev/null +++ b/app/src/main/java/otus/homework/customview/presentation/MainActivity.kt @@ -0,0 +1,46 @@ +package otus.homework.customview.presentation + +import android.os.Bundle +import android.widget.Toast +import androidx.activity.viewModels +import androidx.appcompat.app.AppCompatActivity +import androidx.lifecycle.Lifecycle +import androidx.lifecycle.lifecycleScope +import androidx.lifecycle.repeatOnLifecycle +import dagger.hilt.android.AndroidEntryPoint +import kotlinx.coroutines.launch +import otus.homework.customview.databinding.ActivityMainBinding + +@AndroidEntryPoint +class MainActivity : AppCompatActivity() { + + private val viewModel by viewModels() + private lateinit var binding: ActivityMainBinding + + override fun onCreate(savedInstanceState: Bundle?) { + super.onCreate(savedInstanceState) + binding = ActivityMainBinding.inflate(layoutInflater) + setContentView(binding.root) + observePieChartAngles() + setPayloadCategorySelectionListener() + } + + private fun observePieChartAngles() { + lifecycleScope.launch { + repeatOnLifecycle(Lifecycle.State.STARTED) { + viewModel.pieChartAngles.collect { + binding.pieChartView.setPieChartAngles(it) + } + } + } + } + + private fun setPayloadCategorySelectionListener() { + binding.pieChartView.setSelectionListener { selectedCategory -> + Toast.makeText(this, selectedCategory, Toast.LENGTH_LONG).show() + + binding.expensesGraphView.setMaxDailyExpenseOfAllCategories(viewModel.getMaxDailyExpenseOfAllCategories()) + binding.expensesGraphView.setDaysToExpenses(viewModel.getDaysToExpenses(selectedCategory)) + } + } +} \ No newline at end of file diff --git a/app/src/main/java/otus/homework/customview/presentation/expensesgraph/AxisDrawer.kt b/app/src/main/java/otus/homework/customview/presentation/expensesgraph/AxisDrawer.kt new file mode 100644 index 00000000..7d480151 --- /dev/null +++ b/app/src/main/java/otus/homework/customview/presentation/expensesgraph/AxisDrawer.kt @@ -0,0 +1,115 @@ +package otus.homework.customview.presentation.expensesgraph + +import android.graphics.Canvas +import android.graphics.Color +import android.graphics.Paint +import otus.homework.customview.utils.dp +import otus.homework.customview.utils.px + +class AxisDrawer( + private val view: ExpensesGraphView +) { + private val axisPaddingPx = 32.dp.px + private val axisTickHeightPx = 10.dp.px + private val gridDotSizePx = 2.dp.px + private val tickCountX = 10 + private val tickCountY = 5 + + private val axisPaint = Paint().apply { + color = Color.BLACK + strokeWidth = 15f + style = Paint.Style.FILL + } + + private val axisTickPaint = Paint().apply { + color = Color.DKGRAY + strokeWidth = 5f + style = Paint.Style.FILL + } + + private val gridDotPaint = Paint().apply { + color = Color.GRAY + strokeWidth = 1f + style = Paint.Style.FILL + } + + internal fun drawAxis(canvas: Canvas) { + val xAxisYPos = (view.height - axisPaddingPx).toFloat() + canvas.drawLine( + axisPaddingPx.toFloat(), xAxisYPos, (view.width - axisPaddingPx).toFloat(), xAxisYPos, axisPaint + ) + canvas.drawLine( + axisPaddingPx.toFloat(), + axisPaddingPx.toFloat(), + axisPaddingPx.toFloat(), + (view.height - axisPaddingPx).toFloat(), + axisPaint + ) + } + + internal fun drawTicksOnXAxis(canvas: Canvas) { + val xAxisYPos = (view.height - axisPaddingPx).toFloat() + val xAxisXPos = (view.width - axisPaddingPx).toFloat() + + val tickStep = (xAxisXPos - axisPaddingPx) / tickCountX + var currentX: Float = axisPaddingPx.toFloat() + tickStep + + repeat(tickCountX) { + drawAxisXTick(canvas, currentX, xAxisYPos, axisTickHeightPx) + currentX += tickStep + } + } + + private fun drawAxisXTick(canvas: Canvas, tickX: Float, tickStartY: Float, tickHeight: Int) = + canvas.drawLine(tickX, tickStartY, tickX, tickStartY - tickHeight, axisTickPaint) + + internal fun drawTicksOnYAxis(canvas: Canvas) { + val yAxisXPos = axisPaddingPx.toFloat() + val yAxisYPos = (view.height - axisPaddingPx).toFloat() + + val tickStep = (yAxisYPos - axisPaddingPx) / tickCountY + var currentY: Float = yAxisYPos - tickStep + + repeat(tickCountY) { + drawAxisYTick(canvas, yAxisXPos, currentY, axisTickHeightPx) + currentY -= tickStep + } + } + + private fun drawAxisYTick(canvas: Canvas, tickX: Float, tickStartY: Float, tickHeight: Int) = + canvas.drawLine(tickX, tickStartY, tickX + tickHeight, tickStartY, axisTickPaint) + + internal fun drawDotsAtTickIntersections(canvas: Canvas) { + val gridDotsX = calculateGridDotsX() + val gridDotsY = calculateGridDotsY() + for (x in gridDotsX) { + for (y in gridDotsY) { + canvas.drawCircle(x, y, gridDotSizePx.toFloat(), gridDotPaint) + } + } + } + + private fun calculateGridDotsX(): MutableList { + val xTickPositions = mutableListOf() + val xAxisXPos = (view.width - axisPaddingPx).toFloat() + val tickStepX = (xAxisXPos - axisPaddingPx) / tickCountX + var currentX: Float = axisPaddingPx.toFloat() + tickStepX + repeat(tickCountX) { + xTickPositions.add(currentX) + currentX += tickStepX + } + return xTickPositions + } + + private fun calculateGridDotsY(): MutableList { + val yTickPositions = mutableListOf() + val yAxisYPos = (view.height - axisPaddingPx).toFloat() + val tickStepY = (yAxisYPos - axisPaddingPx) / tickCountY + var currentY: Float = yAxisYPos - tickStepY + repeat(tickCountY) { + yTickPositions.add(currentY) + currentY -= tickStepY + } + return yTickPositions + } +} \ No newline at end of file diff --git a/app/src/main/java/otus/homework/customview/presentation/expensesgraph/ExpensesGraphView.kt b/app/src/main/java/otus/homework/customview/presentation/expensesgraph/ExpensesGraphView.kt new file mode 100644 index 00000000..19f4c0b6 --- /dev/null +++ b/app/src/main/java/otus/homework/customview/presentation/expensesgraph/ExpensesGraphView.kt @@ -0,0 +1,110 @@ +package otus.homework.customview.presentation.expensesgraph + +import android.content.Context +import android.graphics.Canvas +import android.os.Bundle +import android.os.Parcelable +import android.util.AttributeSet +import android.view.View +import otus.homework.customview.utils.dp +import otus.homework.customview.utils.px +import otus.homework.customview.utils.toBundle +import otus.homework.customview.utils.toMap +import kotlin.math.min + +class ExpensesGraphView(context: Context, attrs: AttributeSet) : View(context, attrs) { + + private val defaultWidthPx = 300.dp.px + private val defaultHeightPx = 300.dp.px + + private val dayToExpenses = mutableMapOf().withDefault { 0 } + private var maxCategoryTotalAmount = 0 + private var axisDrawer: AxisDrawer = AxisDrawer(this) + private var graphDrawer: GraphDrawer? = null + + fun setMaxDailyExpenseOfAllCategories(maxCategoryTotalAmount: Int) { + this.maxCategoryTotalAmount = maxCategoryTotalAmount + initGraphDrawer() + } + + fun setDaysToExpenses(dayToExpenses: Map) { + this.dayToExpenses.clear() + this.dayToExpenses.putAll(dayToExpenses) + initGraphDrawer() + invalidate() + } + + private fun initGraphDrawer() { + graphDrawer = GraphDrawer( + this, + maxCategoryTotalAmount = maxCategoryTotalAmount, + daysToExpenses = dayToExpenses, + ) + } + + 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 size = min(widthSize, heightSize) + + val width: Int = when (widthMode) { + MeasureSpec.EXACTLY -> widthSize + MeasureSpec.AT_MOST -> defaultWidthPx.coerceAtMost(size) + else -> defaultWidthPx + } + + val height: Int = when (heightMode) { + MeasureSpec.EXACTLY -> size + MeasureSpec.AT_MOST -> defaultHeightPx.coerceAtMost(size) + else -> defaultHeightPx + } + + setMeasuredDimension(width, height) + } + + override fun onDraw(canvas: Canvas) { + with(axisDrawer) { + drawTicksOnXAxis(canvas) + drawTicksOnYAxis(canvas) + drawAxis(canvas) + drawDotsAtTickIntersections(canvas) + } + + graphDrawer?.let { + it.drawGraph(canvas) + it.drawDashedLinesThroughGraphPeaksPoints(canvas) + it.drawPurchaseDots(canvas) + it.drawTextAboveDashedLines(canvas) + } + } + + + private val superStateKey = "superState" + private val selectedCategoryKey = "dayToExpensesKey" + private val maxCategoryTotalAmountKey = "maxCategoryTotalAmountKey" + + override fun onSaveInstanceState(): Parcelable { + val superState = super.onSaveInstanceState() + val bundle = Bundle() + bundle.putParcelable(superStateKey, superState) + bundle.putInt(maxCategoryTotalAmountKey, maxCategoryTotalAmount) + bundle.putBundle(selectedCategoryKey, dayToExpenses.toBundle()) + return bundle + } + + override fun onRestoreInstanceState(state: Parcelable) { + val bundle = state as Bundle + super.onRestoreInstanceState(bundle.getParcelable(superStateKey)) + + val dayToExpensesBundle = bundle.getBundle(selectedCategoryKey) + if (dayToExpensesBundle != null) { + dayToExpenses.putAll(dayToExpensesBundle.toMap()) + } + maxCategoryTotalAmount = bundle.getInt(maxCategoryTotalAmountKey) + initGraphDrawer() + invalidate() + } +} diff --git a/app/src/main/java/otus/homework/customview/presentation/expensesgraph/GraphDrawer.kt b/app/src/main/java/otus/homework/customview/presentation/expensesgraph/GraphDrawer.kt new file mode 100644 index 00000000..623397b9 --- /dev/null +++ b/app/src/main/java/otus/homework/customview/presentation/expensesgraph/GraphDrawer.kt @@ -0,0 +1,125 @@ +package otus.homework.customview.presentation.expensesgraph + +import android.graphics.Canvas +import android.graphics.Color +import android.graphics.DashPathEffect +import android.graphics.Paint +import android.graphics.Path +import otus.homework.customview.utils.dp +import otus.homework.customview.utils.px +import otus.homework.customview.utils.sp + +class GraphDrawer( + private val view: ExpensesGraphView, + private val maxCategoryTotalAmount: Int, + private val daysToExpenses: Map, +) { + private val axisPaddingPx = 32.dp.px + private val axisYMaxValue = 10f + private val daysInMonth = 31f + private val axisYRightTextOffset = 30 + private val dashedLineAboveTextOffset = 20 + private val graphPath = Path() + + private val graphPaint = Paint().apply { + color = Color.GREEN + strokeWidth = 10f + style = Paint.Style.STROKE + } + + private val dashPathEffect = DashPathEffect( + /* intervals: [lineLength, gapLength] = */ floatArrayOf(10f, 20f), + /* phase = */ 0f) + private val dashedLinePaint = Paint().apply { + color = Color.BLUE + strokeWidth = 5f + style = Paint.Style.STROKE + pathEffect = dashPathEffect + } + + private val amountTextPaint = Paint().apply { + color = Color.BLACK + textSize = 16.sp.px.toFloat() + style = Paint.Style.FILL_AND_STROKE + strokeWidth = 4f + } + + private val graphPeaksDotsRadius = 15f + private val graphPeaksPaint = Paint().apply { + color = Color.RED + style = Paint.Style.FILL + } + + internal fun drawPurchaseDots(canvas: Canvas) { + for ((day, amount) in daysToExpenses) { + val x = day.toFloat() + val y = mapAmountToYAxis(amount.toFloat()) + + if (amount != 0) { + canvas.drawCircle(axisToScreenX(x), axisToScreenY(y), graphPeaksDotsRadius, graphPeaksPaint) + } + } + } + + internal fun drawDashedLinesThroughGraphPeaksPoints(canvas: Canvas) { + for ((_, amount) in daysToExpenses) { + if (amount != 0) { + val y = mapAmountToYAxis(amount.toFloat()) + val screenY = axisToScreenY(y) + canvas.drawLine( + axisPaddingPx.toFloat(), + screenY, + (view.width - axisPaddingPx).toFloat(), + screenY, + dashedLinePaint + ) + } + } + } + + internal fun drawTextAboveDashedLines(canvas: Canvas) { + for ((_, amount) in daysToExpenses) { + if (amount != 0) { + val y = mapAmountToYAxis(amount.toFloat()) + val screenY = axisToScreenY(y) + val text = amount.toString() + canvas.drawText( + text, + axisPaddingPx.toFloat() + axisYRightTextOffset, + screenY - dashedLineAboveTextOffset, + amountTextPaint + ) + } + } + } + + internal fun drawGraph(canvas: Canvas) { + graphPath.reset() + graphPath.moveTo(axisToScreenX(0f), axisToScreenY(0f)) + + for ((day, amount) in daysToExpenses) { + val x = day.toFloat() + val y = mapAmountToYAxis(amount.toFloat()) + graphPath.lineTo(axisToScreenX(x), axisToScreenY(y)) + } + canvas.drawPath(graphPath, graphPaint) + } + + private fun mapAmountToYAxis(currentAmount: Float): Float { + val maxAmount: Float = maxCategoryTotalAmount.toFloat() + val scaleFactor = axisYMaxValue / maxAmount + return currentAmount * scaleFactor + } + + private fun axisToScreenX(axisX: Float, maxXValue: Float = daysInMonth): Float { + val drawableWidth = view.width - 2 * axisPaddingPx + val xScaleFactor = drawableWidth / maxXValue + return axisPaddingPx + axisX * xScaleFactor + } + + private fun axisToScreenY(axisY: Float, maxYValue: Float = axisYMaxValue): Float { + val drawableHeight = view.height - 2 * axisPaddingPx + val yScaleFactor = drawableHeight / maxYValue + return view.height - axisPaddingPx - axisY * yScaleFactor + } +} \ No newline at end of file diff --git a/app/src/main/java/otus/homework/customview/presentation/helpers/GraphCalculator.kt b/app/src/main/java/otus/homework/customview/presentation/helpers/GraphCalculator.kt new file mode 100644 index 00000000..da8bbf82 --- /dev/null +++ b/app/src/main/java/otus/homework/customview/presentation/helpers/GraphCalculator.kt @@ -0,0 +1,26 @@ +package otus.homework.customview.presentation.helpers + +import otus.homework.customview.data.Payload +import otus.homework.customview.utils.DateUtils +import javax.inject.Inject + +class GraphCalculator @Inject constructor(private val dateUtils: DateUtils) { + + fun getMaxDailyExpenseOfAllCategories(payloads: List): Int { + val categoryToDayToExpenses = mutableMapOf>().withDefault { mutableMapOf() } + + for (payload in payloads) { + val category = payload.category + val day = dateUtils.timestampToDayOfMonth(payload.time) + val dayToExpenses = categoryToDayToExpenses.getOrPut(category) { mutableMapOf() }.withDefault { 0 } + dayToExpenses[day] = dayToExpenses.getValue(day) + payload.amount + categoryToDayToExpenses[category] = dayToExpenses + } + + val categoryToMaxDailyExpense = mutableMapOf() + for ((category, dayToExpenses) in categoryToDayToExpenses) { + categoryToMaxDailyExpense[category] = dayToExpenses.values.maxOrNull() ?: 0 + } + return categoryToMaxDailyExpense.maxOf { it.value } + } +} \ No newline at end of file diff --git a/app/src/main/java/otus/homework/customview/presentation/mapper/PayloadMapper.kt b/app/src/main/java/otus/homework/customview/presentation/mapper/PayloadMapper.kt new file mode 100644 index 00000000..21d106d5 --- /dev/null +++ b/app/src/main/java/otus/homework/customview/presentation/mapper/PayloadMapper.kt @@ -0,0 +1,29 @@ +package otus.homework.customview.presentation.mapper + +import otus.homework.customview.data.Payload +import otus.homework.customview.presentation.model.PieChartAngle +import otus.homework.customview.presentation.model.PieChartColor +import otus.homework.customview.utils.DEGREES_IN_CIRCLE + +fun List.toPieChartAngles() : List { + val angles = mutableListOf() + var startAngle = 0f + var endAngle = 0f + var color = PieChartColor.BLUE + val totalAmount = getTotalAmount(this) + for (payload in this) { + endAngle += getAngleForPayload(payload, totalAmount) + angles.add(PieChartAngle(payload.id, payload.category, startAngle, endAngle, color)) + startAngle = endAngle + color = color.nextColor() + } + return angles +} + +private fun getAngleForPayload(payload: Payload, totalAmount: Int): Float { + return (payload.amount.toFloat() / totalAmount) * DEGREES_IN_CIRCLE +} + +private fun getTotalAmount(payloads: List): Int { + return payloads.sumOf { it.amount } +} \ No newline at end of file diff --git a/app/src/main/java/otus/homework/customview/presentation/model/PieChartAngle.kt b/app/src/main/java/otus/homework/customview/presentation/model/PieChartAngle.kt new file mode 100644 index 00000000..2b8f9ed8 --- /dev/null +++ b/app/src/main/java/otus/homework/customview/presentation/model/PieChartAngle.kt @@ -0,0 +1,13 @@ +package otus.homework.customview.presentation.model + +data class PieChartAngle( + val id: Int, + val category: String, + val startAngle: Float, + val endAngle: Float, + val color: PieChartColor +) { + + val sweepAngle: Float + get() = endAngle - startAngle +} \ No newline at end of file diff --git a/app/src/main/java/otus/homework/customview/presentation/model/PieChartColor.kt b/app/src/main/java/otus/homework/customview/presentation/model/PieChartColor.kt new file mode 100644 index 00000000..ae2018fb --- /dev/null +++ b/app/src/main/java/otus/homework/customview/presentation/model/PieChartColor.kt @@ -0,0 +1,24 @@ +package otus.homework.customview.presentation.model + +enum class PieChartColor(val intColor: Int) { + BLUE(0xFF0000FF.toInt()), + YELLOW(0xFFFFFF00.toInt()), + GREEN(0xFF00FF00.toInt()), + ORANGE(0xFFFFA500.toInt()), + RED(0xFFFF0000.toInt()), + PURPLE(0xFF800080.toInt()), + OLIVE(0xFF808000.toInt()), + DARK_GREEN(0xFF006400.toInt()), + MAROON(0xFF800000.toInt()), + AQUA(0xFF00FFFF.toInt()), + TEAL(0xFF008080.toInt()), + GRAY(0xFF808080.toInt()), + NAVY(0xFF000080.toInt()), + FUCHSIA(0xFFFF00FF.toInt()); + + fun nextColor(): PieChartColor { + val values = values() + val nextOrdinal = (this.ordinal + 1) % values.size + return values[nextOrdinal] + } +} \ No newline at end of file diff --git a/app/src/main/java/otus/homework/customview/presentation/piechartview/GeometryHelper.kt b/app/src/main/java/otus/homework/customview/presentation/piechartview/GeometryHelper.kt new file mode 100644 index 00000000..88792211 --- /dev/null +++ b/app/src/main/java/otus/homework/customview/presentation/piechartview/GeometryHelper.kt @@ -0,0 +1,40 @@ +package otus.homework.customview.presentation.piechartview + +import android.graphics.RectF +import android.view.MotionEvent +import otus.homework.customview.presentation.model.PieChartAngle +import otus.homework.customview.utils.DEGREES_IN_CIRCLE +import kotlin.math.atan2 +import kotlin.math.pow +import kotlin.math.sqrt + +object GeometryHelper { + + fun isClickInsidePieChart(event: MotionEvent, pieChartContainer : RectF): Boolean { + val x = event.x + val y = event.y + + val centerX = pieChartContainer.centerX() + val centerY = pieChartContainer.centerY() + val radius = pieChartContainer.width() / 2 + + val distance = sqrt((x - centerX).toDouble().pow(2.0) + (y - centerY).toDouble().pow(2.0)) + + return distance <= radius + } + + fun isClickWithinPieChartAngle(event: MotionEvent, angle: PieChartAngle, pieChartContainer : RectF): Boolean { + val x = event.x + val y = event.y + + val centerX = pieChartContainer.centerX() + val centerY = pieChartContainer.centerY() + + // Angle of the click relative to the center of the pie chart + val clickAngle = Math.toDegrees(atan2((y - centerY).toDouble(), (x - centerX).toDouble())).toFloat() + + val normalizedClickAngle = (clickAngle + DEGREES_IN_CIRCLE) % DEGREES_IN_CIRCLE + return normalizedClickAngle >= angle.startAngle && normalizedClickAngle <= angle.endAngle + } + +} \ No newline at end of file diff --git a/app/src/main/java/otus/homework/customview/presentation/piechartview/PieChartDrawer.kt b/app/src/main/java/otus/homework/customview/presentation/piechartview/PieChartDrawer.kt new file mode 100644 index 00000000..9f57d49b --- /dev/null +++ b/app/src/main/java/otus/homework/customview/presentation/piechartview/PieChartDrawer.kt @@ -0,0 +1,41 @@ +package otus.homework.customview.presentation.piechartview + +import android.graphics.Canvas +import android.graphics.Paint +import android.graphics.RectF +import android.view.View +import otus.homework.customview.presentation.model.PieChartAngle + +class PieChartDrawer( + private val pieChartContainer: RectF, + private val sectorPaint: Paint, + private val selectionPaint: Paint +) { + + fun setPieChartContainerRectBounds(view : View, pieChartPaddingPx: Int) { + val centerX = view.width / 2 + val centerY = view.height / 2 + val pieChartSizeWithPadding = view.measuredWidth - pieChartPaddingPx + pieChartContainer.left = (centerX - pieChartSizeWithPadding / 2).toFloat() + pieChartContainer.top = (centerY - pieChartSizeWithPadding / 2).toFloat() + pieChartContainer.right = (centerX + pieChartSizeWithPadding / 2).toFloat() + pieChartContainer.bottom = (centerY + pieChartSizeWithPadding / 2).toFloat() + } + + fun drawPieChart(canvas: Canvas, angles: List) { + for (angle in angles) { + drawSector(canvas, angle) + } + } + + private fun drawSector(canvas: Canvas, angle: PieChartAngle) { + sectorPaint.color = angle.color.intColor + canvas.drawArc(pieChartContainer, angle.startAngle, angle.sweepAngle, true, sectorPaint) + } + + fun drawSelectedSector(canvas: Canvas, selectedSector: PieChartAngle?) { + selectedSector?.let { + canvas.drawArc(pieChartContainer, it.startAngle, it.sweepAngle, true, selectionPaint) + } + } +} \ No newline at end of file diff --git a/app/src/main/java/otus/homework/customview/presentation/piechartview/PieChartView.kt b/app/src/main/java/otus/homework/customview/presentation/piechartview/PieChartView.kt new file mode 100644 index 00000000..0b1382c9 --- /dev/null +++ b/app/src/main/java/otus/homework/customview/presentation/piechartview/PieChartView.kt @@ -0,0 +1,135 @@ +package otus.homework.customview.presentation.piechartview + +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 otus.homework.customview.presentation.model.PieChartAngle +import otus.homework.customview.presentation.piechartview.GeometryHelper.isClickWithinPieChartAngle +import otus.homework.customview.utils.dp +import otus.homework.customview.utils.px +import kotlin.math.min + + +class PieChartView @JvmOverloads constructor( + context: Context, + attrs: AttributeSet? = null, +) : View(context, attrs) { + + private val defaultWidthPx = 300.dp.px + private val defaultHeightPx = 300.dp.px + private val pieChartPaddingPx = 32.dp.px + + private val selectionPaint = Paint().apply { + color = Color.BLACK + strokeWidth = 20f + style = Paint.Style.STROKE + } + + private val sectorPaint = Paint().apply { + color = Color.GREEN + strokeWidth = 10f + style = Paint.Style.FILL + } + + private val pieChartContainer = RectF() + private val angles: MutableList = mutableListOf() + private var selectedSector: PieChartAngle? = null + private val pieChartDrawer = PieChartDrawer(pieChartContainer, sectorPaint, selectionPaint) + private var onCategorySelected: ((String) -> Unit)? = null + + fun setPieChartAngles(angles: List) { + this.angles.clear() + this.angles.addAll(angles) + invalidate() + } + + fun setSelectionListener(onCategorySelected: (String) -> Unit) { + this.onCategorySelected = onCategorySelected + } + + 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 size = min(widthSize, heightSize) + + val width: Int = when (widthMode) { + MeasureSpec.EXACTLY -> size + MeasureSpec.AT_MOST -> defaultWidthPx.coerceAtMost(size) + else -> defaultWidthPx + } + + val height: Int = when (heightMode) { + MeasureSpec.EXACTLY -> size + MeasureSpec.AT_MOST -> defaultHeightPx.coerceAtMost(size) + else -> defaultHeightPx + } + + setMeasuredDimension(width, height) + } + + override fun onDraw(canvas: Canvas) { + pieChartDrawer.setPieChartContainerRectBounds(this, pieChartPaddingPx) + pieChartDrawer.drawPieChart(canvas, angles) + pieChartDrawer.drawSelectedSector(canvas, selectedSector) + } + + @Suppress("ClickableViewAccessibility") + override fun onTouchEvent(event: MotionEvent): Boolean { + if (GeometryHelper.isClickInsidePieChart(event, pieChartContainer)) { + selectedSector = getSelectedAngle(event) + + if (event.action == MotionEvent.ACTION_DOWN) { + selectedSector?.category?.let { + onCategorySelected?.invoke(it) + invalidate() + return true + } + } + } + return false + } + + private fun getSelectedAngle(event: MotionEvent): PieChartAngle? { + for (angle in angles) { + if (isClickWithinPieChartAngle(event, angle, pieChartContainer)) { + return angle + } + } + return null + } + + private val superStateKey = "superState" + private val selectedCategoryKey = "selectedCategoryKey" + + override fun onSaveInstanceState(): Parcelable { + val superState = super.onSaveInstanceState() + val bundle = Bundle() + bundle.putParcelable(superStateKey, superState) + + selectedSector?.let { + bundle.putInt(selectedCategoryKey, it.id) + } + return bundle + } + + override fun onRestoreInstanceState(state: Parcelable) { + val bundle = state as Bundle + super.onRestoreInstanceState(bundle.getParcelable(superStateKey)) + val selectedCategoryId = bundle.getInt(selectedCategoryKey, SELECTED_CATEGORY_NOT_FOUND) + selectedSector = angles.find { it.id == selectedCategoryId } + } + + companion object { + private const val SELECTED_CATEGORY_NOT_FOUND = -1 + } +} \ No newline at end of file diff --git a/app/src/main/java/otus/homework/customview/utils/BundleUtils.kt b/app/src/main/java/otus/homework/customview/utils/BundleUtils.kt new file mode 100644 index 00000000..cfd7ecb3 --- /dev/null +++ b/app/src/main/java/otus/homework/customview/utils/BundleUtils.kt @@ -0,0 +1,9 @@ +package otus.homework.customview.utils + +import android.os.Bundle +import androidx.core.os.bundleOf + + +fun Map.toBundle(): Bundle = bundleOf(*this.map { it.key.toString() to it.value }.toTypedArray()) + +fun Bundle.toMap(): Map = this.keySet().associate { it.toInt() to this.getInt(it) } \ No newline at end of file diff --git a/app/src/main/java/otus/homework/customview/utils/DateUtils.kt b/app/src/main/java/otus/homework/customview/utils/DateUtils.kt new file mode 100644 index 00000000..b59020ca --- /dev/null +++ b/app/src/main/java/otus/homework/customview/utils/DateUtils.kt @@ -0,0 +1,24 @@ +package otus.homework.customview.utils + +import java.util.Calendar +import java.util.Date +import javax.inject.Inject + +class DateUtils @Inject constructor() { + + fun timestampToDayOfMonth(timestamp: Long): Int { + val calendar = getCalendar(timestamp) + return calendar[Calendar.DAY_OF_MONTH] + } + + private fun getCalendar(payloadTimestamp: Long): Calendar { + val date = Date(payloadTimestamp * MILLIS_IN_SECOND) + val calendar = Calendar.getInstance() + calendar.time = date + return calendar + } + + companion object { + private const val MILLIS_IN_SECOND = 1000 + } +} \ No newline at end of file diff --git a/app/src/main/java/otus/homework/customview/utils/DimensionsExt.kt b/app/src/main/java/otus/homework/customview/utils/DimensionsExt.kt new file mode 100644 index 00000000..d89a3ca7 --- /dev/null +++ b/app/src/main/java/otus/homework/customview/utils/DimensionsExt.kt @@ -0,0 +1,19 @@ +package otus.homework.customview.utils + +import android.content.res.Resources +import android.util.TypedValue + +val Int.dp: Int + get() = TypedValue.applyDimension( + TypedValue.COMPLEX_UNIT_DIP, this.toFloat(), Resources.getSystem().displayMetrics + ).toInt() + +val Int.px: Int + get() = TypedValue.applyDimension( + TypedValue.COMPLEX_UNIT_PX, this.toFloat(), Resources.getSystem().displayMetrics + ).toInt() + +val Int.sp: Int + get() = TypedValue.applyDimension( + TypedValue.COMPLEX_UNIT_SP, this.toFloat(), Resources.getSystem().displayMetrics + ).toInt() \ No newline at end of file diff --git a/app/src/main/java/otus/homework/customview/utils/LogExtensions.kt b/app/src/main/java/otus/homework/customview/utils/LogExtensions.kt new file mode 100644 index 00000000..866bc40a --- /dev/null +++ b/app/src/main/java/otus/homework/customview/utils/LogExtensions.kt @@ -0,0 +1,4 @@ +package otus.homework.customview.utils + +val Any.TAG: String + get() = javaClass.simpleName \ No newline at end of file diff --git a/app/src/main/java/otus/homework/customview/utils/MathConst.kt b/app/src/main/java/otus/homework/customview/utils/MathConst.kt new file mode 100644 index 00000000..c4254a50 --- /dev/null +++ b/app/src/main/java/otus/homework/customview/utils/MathConst.kt @@ -0,0 +1,3 @@ +package otus.homework.customview.utils + +const val DEGREES_IN_CIRCLE = 360 \ No newline at end of file diff --git a/app/src/main/res/layout-land/activity_main.xml b/app/src/main/res/layout-land/activity_main.xml new file mode 100644 index 00000000..0e2216c8 --- /dev/null +++ b/app/src/main/res/layout-land/activity_main.xml @@ -0,0 +1,21 @@ + + + + + + + + \ 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..4c571b7b 100644 --- a/app/src/main/res/layout/activity_main.xml +++ b/app/src/main/res/layout/activity_main.xml @@ -1,19 +1,21 @@ - + android:orientation="vertical" + tools:context=".presentation.MainActivity"> - + - \ No newline at end of file + + + \ No newline at end of file diff --git a/build.gradle b/build.gradle index e47bb55b..1c21bede 100644 --- a/build.gradle +++ b/build.gradle @@ -1,19 +1,23 @@ // 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.7.10" repositories { google() jcenter() } dependencies { - classpath "com.android.tools.build:gradle:4.1.2" + classpath "com.android.tools.build:gradle:7.1.3" classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" - +// classpath "com.google.dagger:hilt-android-gradle-plugin:2.44" // Add this line // NOTE: Do not place your application dependencies here; they belong // in the individual module build.gradle files } } +plugins { + id 'com.google.dagger.hilt.android' version '2.44' apply false +} + allprojects { repositories { google() 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..e750102e 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.3-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