fenix
/
Simple-Calculator
mirror of https://github.com/SimpleMobileTools/Simple-Calculator.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'dev-axel-saveInstanceState' into fix_data_lost_during_rotation

This commit is contained in:
Axel Labarre 2023-02-22 22:20:35 +01:00
parent 593649db7b 0823b9ef6e
commit 790302184a
6 changed files with 9 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -62,7 +62,6 @@ class MainActivity : SimpleActivity(), Calculator {
//============================================================
//Log.v("SAVEDRES : ", savedRes)
//Log.v("SAVEDPREVIOUS : ", savedPreviousCalculation)
//Log.v("SAVEDLASTKEY : ", savedLastKey)
@ -73,7 +72,6 @@ class MainActivity : SimpleActivity(), Calculator {
//Log.v("SECONDVALUE : ", savedSecondValue.toString())
if (savedInstanceState != null) {
Log.v("MainActivity", "LOG TEST");
//savedRes = savedInstanceState?.getCharSequence("res") as String
@ -292,7 +290,6 @@ class MainActivity : SimpleActivity(), Calculator {
//============================================================
// ****** ADD ONSAVEINSTANCESTATE FUNCTION ******
override fun onSaveInstanceState(bundle: Bundle) {
super.onSaveInstanceState(bundle)
/*

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

@ -359,14 +359,14 @@ class CalculatorImpl(
private fun showNewResult(value: String) {
//============================================================
mResult = value;
mResult = value
//============================================================
callback!!.showNewResult(value, context)
}
private fun showNewFormula(value: String) {
//============================================================
previousCalculation = value;
previousCalculation = value
Log.v("BASEVALUE SHOWNF :", baseValue.toString())
Log.v("SECONDVALUE SHOWNF:", secondValue.toString())
//============================================================
@ -470,14 +470,13 @@ class CalculatorImpl(
private fun String.removeGroupSeparator() = formatter.removeGroupingSeparator(this)
public fun getSecondValueV2() : Double
{
fun getSecondValueV2(): Double {
return this.secondValue
}
//JSON
public fun getJson() : JSONObject {
fun getJson(): JSONObject {
val jsonObj = JSONObject()
jsonObj.put("res", mResult)
@ -491,8 +490,7 @@ class CalculatorImpl(
return jsonObj
}
public fun setFromSaveInstanceState( json: String )
{
private fun setFromSaveInstanceState(json: String) {
val jsonObject = JSONTokener(json).nextValue() as JSONObject
mResult = jsonObject.getString("res")
previousCalculation = jsonObject.getString("previousCalculation")
@ -504,5 +502,4 @@ class CalculatorImpl(
}
}

19
app/src/main/res/values-zgh/strings 2.xml
View File

@ -1,19 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<string name="app_name">ⵜⴰⵙⵎⵙⵙⵉⴹⵏⵜ ⵜⴰⴼⵔⴰⵔⵜ</string>
<string name="app_launcher_name">ⵜⴰⵙⵎⵙⵙⵉⴹⵏⵜ</string>
<string name="scientific_calculator">ⵜⴰⵙⵎⵙⵙⵉⴹⵏⵜ ⵜⴰⵎⴰⵙⵙⴰⵏⵜ</string>
<!-- Calculator field -->
<string name="formula_divide_by_zero_error">ⵜⴰⵣⴳⵍⵜ: ⴰⴱⵟⵟⵓ ⵅⴼ ⵓⵎⵢⴰ</string>
<!-- History -->
<string name="history">ⴰⵎⵣⵔⵓⵢ</string>
<string name="history_empty">ⴰⵎⵣⵔⵓⵢ ⵢⵓⵔⴰ</string>
<string name="clear_history">ⴽⴽⵙ</string>
<string name="history_cleared">ⵉⵜⵜⵡⴰⴽⴽⵙ ⵓⵎⵣⵔⵓⵢ</string>
<!-- Settings -->
<string name="vibrate_on_button_press">ⴰⵔⵎⵉⵎⵎⵉ ⴳ ⵡⴰⴱⴱⴰⵥ ⵅⴼ ⵜⴳⵎⵎⵓⵜⵉⵏ</string>
<string name="use_comma_as_decimal_mark">ⵙⵎⵔⵙ ⵜⵉⵙⴽⵔⵜ ⴷ ⵜⴰⵎⴰⵜⴰⵔⵜ ⵜⴰⵎⵔⴰⵡⴰⵏⵜ</string>
<!-- FAQ -->
<string name="faq_1_title">ⵎⴰⵎⴽ ⵜⵙⵡⵓⵔⵓⵢ ⵜⴳⵎⵎⵓⵜ C (ⴽⴽⵙ)\?</string>
<string name="faq_1_text">ⴰⴱⴱⴰⵥ ⵅⴼ ⵓⵢⵏⵏⴰ ⴰⴷ ⵉⴽⴽⵙ ⵢⴰⵏ ⵓⵙⴽⴽⵉⵍ ⴳ ⵢⴰⵏ ⵓⵣⵎⵣ. ⵎⵛ ⵉⵍⵍⴰ ⵡⴰⴱⴱⴰⵥ ⴰⵙⵓⵍⴰⵏ ⵔⴰⴷ ⵜⵜⵓⵙⵏⴼⵍⵏ ⵎⴰⵕⵕⴰ ⵉⴳⵔⴰⵏ ⴳ ⵢⴰⵏ ⵓⵣⵎⵣ.</string>
</resources>

1
fastlane/metadata/android/en-US/changelogs/59 2.txt
View File

@ -1 +0,0 @@
* Added some UI, translation and stability improvements

1
fastlane/metadata/android/pt-BR/short_description 2.txt
View File

@ -1 +0,0 @@
Uma linda calculadora para calculos rápidos com uma interface de usuário suave

1
fastlane/metadata/android/pt-BR/title 2.txt
View File

@ -1 +0,0 @@
Calculadora Simples