Skip to content

Calculator issue#160 #178

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
naveensingh merged 7 commits into from
Nov 7, 2025
Merged

Calculator issue#160 #178

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
00d06c3
fix calculator issue that occurs after doing a percent operation
aricodeine Nov 4, 2025
51098ad
update CHANGELOG.md
aricodeine Nov 4, 2025
463d6d7
Merge branch 'main' into calculator_issue#160
aricodeine Nov 4, 2025
6a33ac2
remove previously added if condition check and call resetValues() whe…
aricodeine Nov 5, 2025
cfe268d
Merge remote-tracking branch 'origin/calculator_issue#160' into calcu…
aricodeine Nov 5, 2025
5aec224
update CHANGELOG.md
aricodeine Nov 5, 2025
dace354
update CalculatorImpl.kt to fix the state handling of lastOperation
aricodeine Nov 5, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

## [Unreleased]

### Fixed
- Fixed issue that occurs after doing a percent operation ([#160])

## [1.2.0] - 2025-10-29
### Changed
- Compatibility updates for Android 15 & 16
Expand Down Expand Up @@ -60,6 +63,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
[#31]: https://github.com/FossifyOrg/Calculator/issues/31
[#44]: https://github.com/FossifyOrg/Calculator/issues/44
[#64]: https://github.com/FossifyOrg/Calculator/issues/64
[#160]: https://github.com/FossifyOrg/Calculator/issues/160

[Unreleased]: https://github.com/FossifyOrg/Calculator/compare/1.2.0...HEAD
[1.2.0]: https://github.com/FossifyOrg/Calculator/compare/1.1.0...1.2.0
Expand Down
4 changes: 3 additions & 1 deletion app/src/main/kotlin/org/fossify/math/helpers/CalculatorImpl.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,6 +114,7 @@ class CalculatorImpl(
if (lastKey == DIGIT || lastKey == DECIMAL) {
if (lastOperation != "" && operation == PERCENT) {
handlePercent()
lastOperation = ""
} else {
// split to multiple lines just to see when does the crash happen
secondValue = when (operation) {
Expand All @@ -140,7 +141,7 @@ class CalculatorImpl(
if (getSecondValue() == BigDecimal.ZERO && inputDisplayedFormula.contains("÷")) {
lastKey = DIVIDE
lastOperation = DIVIDE
} else {
} else if(operation != PERCENT) {
lastKey = operation
lastOperation = operation
}
Expand Down Expand Up @@ -376,6 +377,7 @@ class CalculatorImpl(
if (newValue == "" || newValue == "0") {
newValue = "0"
lastKey = CLEAR
resetValues()
} else {
if (operations.contains(lastDeletedValue) || lastKey == EQUALS) {
lastOperation = ""
Expand Down
Loading