fenix/Simple-Calculator
1
0
Fork 0
mirror of https://github.com/SimpleMobileTools/Simple-Calculator.git synced 2025-02-08 15:49:03 +01:00
Code Issues Packages Projects Releases Wiki Activity

resolve merge conflicts

Browse Source
This commit is contained in:
Axel Labarre 2023-02-22 17:07:59 +01:00
commit f1a8e8c03d
2 changed files with 27 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
app/src/main/kotlin/com/simplemobiletools/calculator/activities/MainActivity.kt
View File

@ -290,7 +290,17 @@ class MainActivity : SimpleActivity(), Calculator {
// ****** ADD ONSAVEINSTANCESTATE FUNCTION ******
override fun onSaveInstanceState(bundle: Bundle) {
super.onSaveInstanceState(bundle)
/*
bundle.putString("res", calc.mResult)
bundle.putString("savedPreviousCalculation", calc.previousCalculation)
bundle.putString("savedLastKey", calc.lastKey)
bundle.putString("savedLastOperation", calc.lastOperation)
bundle.putDouble("savedBaseValue", calc.baseValue)
bundle.putDouble("savedSecondValue", calc.getSecondValueV2())
bundle.putString("savedInputDisplayedFormula", calc.inputDisplayedFormula)
*/
//JSON
bundle.putString("myJsonObject", calc.getjson())
}
//============================================================
}

16
app/src/main/kotlin/com/simplemobiletools/calculator/helpers/CalculatorImpl.kt
View File

@ -484,4 +484,20 @@ class CalculatorImpl(
return this.secondValue
}
//JSON
public fun getJson() : String
{
val jsonObject = buildJsonObject{
put("res", mResult)
put("savedPreviousCalculation", previousCalculation)
put("savedLastKey", lastKey)
put("savedLastOperation", lastOperation)
put("savedBaseValue", baseValue)
put("savedSecondValue", secondValue)
put("savedInputDisplayedFormula", inputDisplayedFormula)
return jsonObject.toString()
}
}
}