diff --git a/app/src/main/kotlin/com/simplemobiletools/calculator/activities/MainActivity.kt b/app/src/main/kotlin/com/simplemobiletools/calculator/activities/MainActivity.kt index e7a2d24..1804d68 100644 --- a/app/src/main/kotlin/com/simplemobiletools/calculator/activities/MainActivity.kt +++ b/app/src/main/kotlin/com/simplemobiletools/calculator/activities/MainActivity.kt @@ -62,7 +62,6 @@ class MainActivity : SimpleActivity(), Calculator { //============================================================ - //Log.v("SAVEDRES : ", savedRes) //Log.v("SAVEDPREVIOUS : ", savedPreviousCalculation) //Log.v("SAVEDLASTKEY : ", savedLastKey) @@ -73,8 +72,7 @@ class MainActivity : SimpleActivity(), Calculator { //Log.v("SECONDVALUE : ", savedSecondValue.toString()) - - if(savedInstanceState != null) { + if (savedInstanceState != null) { Log.v("MainActivity", "LOG TEST"); //savedRes = savedInstanceState?.getCharSequence("res") as String //savedPreviousCalculation = savedInstanceState?.getCharSequence("savedPreviousCalculation") as String @@ -86,7 +84,7 @@ class MainActivity : SimpleActivity(), Calculator { json = savedInstanceState.getCharSequence("myJsonObject") as String } - calc = CalculatorImpl(this, applicationContext,decimalSeparator, groupingSeparator, json) + calc = CalculatorImpl(this, applicationContext, decimalSeparator, groupingSeparator, json) //============================================================ @@ -292,7 +290,6 @@ class MainActivity : SimpleActivity(), Calculator { //============================================================ - // ****** ADD ONSAVEINSTANCESTATE FUNCTION ****** override fun onSaveInstanceState(bundle: Bundle) { super.onSaveInstanceState(bundle) /* diff --git a/app/src/main/kotlin/com/simplemobiletools/calculator/helpers/CalculatorImpl.kt b/app/src/main/kotlin/com/simplemobiletools/calculator/helpers/CalculatorImpl.kt index 17e0344..efda9ef 100644 --- a/app/src/main/kotlin/com/simplemobiletools/calculator/helpers/CalculatorImpl.kt +++ b/app/src/main/kotlin/com/simplemobiletools/calculator/helpers/CalculatorImpl.kt @@ -43,7 +43,7 @@ class CalculatorImpl( init { //============================================================ - if(jsonObj != "") { + if (jsonObj != "") { setFromSaveInstanceState(jsonObj) } Log.v("BASEVALUE INIT :", baseValue.toString()) @@ -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,17 +470,16 @@ 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) + jsonObj.put("res", mResult) jsonObj.put("previousCalculation", previousCalculation) jsonObj.put("lastKey", lastKey) jsonObj.put("lastOperation", lastOperation) @@ -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( } - } diff --git a/app/src/main/res/values-zgh/strings 2.xml b/app/src/main/res/values-zgh/strings 2.xml deleted file mode 100644 index e8a0fd2..0000000 --- a/app/src/main/res/values-zgh/strings 2.xml +++ /dev/null @@ -1,19 +0,0 @@ - - - ⵜⴰⵙⵎⵙⵙⵉⴹⵏⵜ ⵜⴰⴼⵔⴰⵔⵜ - ⵜⴰⵙⵎⵙⵙⵉⴹⵏⵜ - ⵜⴰⵙⵎⵙⵙⵉⴹⵏⵜ ⵜⴰⵎⴰⵙⵙⴰⵏⵜ - - ⵜⴰⵣⴳⵍⵜ: ⴰⴱⵟⵟⵓ ⵅⴼ ⵓⵎⵢⴰ - - ⴰⵎⵣⵔⵓⵢ - ⴰⵎⵣⵔⵓⵢ ⵢⵓⵔⴰ - ⴽⴽⵙ - ⵉⵜⵜⵡⴰⴽⴽⵙ ⵓⵎⵣⵔⵓⵢ - - ⴰⵔⵎⵉⵎⵎⵉ ⴳ ⵡⴰⴱⴱⴰⵥ ⵅⴼ ⵜⴳⵎⵎⵓⵜⵉⵏ - ⵙⵎⵔⵙ ⵜⵉⵙⴽⵔⵜ ⴷ ⵜⴰⵎⴰⵜⴰⵔⵜ ⵜⴰⵎⵔⴰⵡⴰⵏⵜ - - ⵎⴰⵎⴽ ⵜⵙⵡⵓⵔⵓⵢ ⵜⴳⵎⵎⵓⵜ C (ⴽⴽⵙ)\? - ⴰⴱⴱⴰⵥ ⵅⴼ ⵓⵢⵏⵏⴰ ⴰⴷ ⵉⴽⴽⵙ ⵢⴰⵏ ⵓⵙⴽⴽⵉⵍ ⴳ ⵢⴰⵏ ⵓⵣⵎⵣ. ⵎⵛ ⵉⵍⵍⴰ ⵡⴰⴱⴱⴰⵥ ⴰⵙⵓⵍⴰⵏ ⵔⴰⴷ ⵜⵜⵓⵙⵏⴼⵍⵏ ⵎⴰⵕⵕⴰ ⵉⴳⵔⴰⵏ ⴳ ⵢⴰⵏ ⵓⵣⵎⵣ. - diff --git a/fastlane/metadata/android/en-US/changelogs/59 2.txt b/fastlane/metadata/android/en-US/changelogs/59 2.txt deleted file mode 100644 index 17b882f..0000000 --- a/fastlane/metadata/android/en-US/changelogs/59 2.txt +++ /dev/null @@ -1 +0,0 @@ - * Added some UI, translation and stability improvements diff --git a/fastlane/metadata/android/pt-BR/short_description 2.txt b/fastlane/metadata/android/pt-BR/short_description 2.txt deleted file mode 100644 index c19d0cc..0000000 --- a/fastlane/metadata/android/pt-BR/short_description 2.txt +++ /dev/null @@ -1 +0,0 @@ -Uma linda calculadora para calculos rápidos com uma interface de usuário suave diff --git a/fastlane/metadata/android/pt-BR/title 2.txt b/fastlane/metadata/android/pt-BR/title 2.txt deleted file mode 100644 index 43ef335..0000000 --- a/fastlane/metadata/android/pt-BR/title 2.txt +++ /dev/null @@ -1 +0,0 @@ -Calculadora Simples