Skip to content

Commit d1d8857

Browse files
Merge branch 'development' into apkSize
2 parents fdca7fe + 55f32db commit d1d8857

File tree

3 files changed

+4
-4
lines changed

3 files changed

+4
-4
lines changed

app/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
plugins {
2-
id "com.diffplug.gradle.spotless" version "3.25.0"
2+
id "com.diffplug.gradle.spotless" version "3.26.0"
33
}
44

55
apply plugin: 'com.android.application'

app/src/main/java/org/fossasia/openevent/general/ticket/TicketsViewModel.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,7 @@ class TicketsViewModel(
119119
qty.add(it.second)
120120
}
121121
}
122-
val donation = ticketIdAndQty.map { it.third*it.second }.sum()
122+
val donation = ticketIdAndQty.map { it.third * it.second }.sum()
123123
tickets.value?.filter { ticketIds.contains(it.id) }?.let { tickets ->
124124
var prices = 0F
125125
var index = 0
@@ -130,7 +130,7 @@ class TicketsViewModel(
130130
if (code?.value != null) {
131131
appliedDiscountCode?.tickets?.forEach { ticketId ->
132132
if (ticket.id == ticketId.id.toInt()) {
133-
price -= if (code.type == AMOUNT) code.value else price*(code.value / 100)
133+
price -= if (code.type == AMOUNT) code.value else price * (code.value / 100)
134134
}
135135
}
136136
}

build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
// Top-level build file where you can add configuration options common to all sub-projects/modules.
22

33
buildscript {
4-
ext.kotlin_version = '1.3.50'
4+
ext.kotlin_version = '1.3.60'
55

66
repositories {
77
google()

0 commit comments

Comments
 (0)