Skip to content

Commit 469b498

Browse files
authored
Merge pull request #32 from finol-digital/develop
Develop
2 parents decc852 + 6dd23d5 commit 469b498

4 files changed

Lines changed: 23 additions & 5 deletions

File tree

.idea/copilot.data.migration.agent.xml

Lines changed: 6 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/copilot.data.migration.edit.xml

Lines changed: 6 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

app/build.gradle.kts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@ android {
1414
applicationId = "com.finoldigital.ygolp"
1515
minSdk = 33
1616
targetSdk = 36
17-
versionCode = 8
18-
versionName = "2.3.1"
17+
versionCode = 9
18+
versionName = "2.4.0"
1919

2020
}
2121

app/src/main/java/com/finoldigital/ygolp/presentation/CalculatorActivity.kt

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -159,7 +159,7 @@ fun CalculatorScreen(
159159
verticalAlignment = Alignment.CenterVertically,
160160
horizontalArrangement = Arrangement.spacedBy(2.dp)
161161
) {
162-
Spacer(modifier = Modifier.weight(1f))
162+
Spacer(modifier = Modifier.weight(0.5f))
163163
OperatorButton(
164164
text = operatorTextAndColor.first,
165165
modifier = Modifier.weight(1f),
@@ -171,9 +171,15 @@ fun CalculatorScreen(
171171
fontSize = 20.sp,
172172
color = operatorTextAndColor.second,
173173
textAlign = TextAlign.Center,
174-
modifier = Modifier.weight(2f)
174+
modifier = Modifier.weight(1.5f)
175175
)
176-
Spacer(modifier = Modifier.weight(1f))
176+
OperatorButton(
177+
text = "1/2",
178+
modifier = Modifier.weight(1f),
179+
color = MaterialTheme.colors.primary,
180+
onClick = { onFinish(lifePoints / 2) }
181+
)
182+
Spacer(modifier = Modifier.weight(0.5f))
177183
}
178184

179185
// Calculator Buttons

0 commit comments

Comments
 (0)