From 9734007b59daa5bdc3f2ccb65c8e6fe846026db8 Mon Sep 17 00:00:00 2001 From: Axel Labarre Date: Wed, 10 May 2023 22:35:02 +0200 Subject: [PATCH] remove empty lines --- .../calculator/activities/MainActivity.kt | 9 --------- .../calculator/helpers/CalculatorImpl.kt | 1 - .../simplemobiletools/calculator/helpers/Constants.kt | 2 -- 3 files changed, 12 deletions(-) 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 681a165e..42e6fa67 100644 --- a/app/src/main/kotlin/com/simplemobiletools/calculator/activities/MainActivity.kt +++ b/app/src/main/kotlin/com/simplemobiletools/calculator/activities/MainActivity.kt @@ -29,12 +29,9 @@ class MainActivity : SimpleActivity(), Calculator { private var storedUseCommaAsDecimalMark = false private var decimalSeparator = DOT private var groupingSeparator = COMMA - private var saveCalculatorState: String = "" - private lateinit var calc: CalculatorImpl - override fun onCreate(savedInstanceState: Bundle?) { isMaterialActivity = true super.onCreate(savedInstanceState) @@ -42,8 +39,6 @@ class MainActivity : SimpleActivity(), Calculator { appLaunched(BuildConfig.APPLICATION_ID) setupOptionsMenu() refreshMenuItems() - - updateMaterialActivityViews(main_coordinator, null, useTransparentNavigation = false, useTopSearchMenu = false) setupMaterialScrollListener(main_nested_scrollview, main_toolbar) @@ -52,8 +47,6 @@ class MainActivity : SimpleActivity(), Calculator { } calc = CalculatorImpl(this, applicationContext, decimalSeparator, groupingSeparator, saveCalculatorState) - - btn_plus.setOnClickOperation(PLUS) btn_minus.setOnClickOperation(MINUS) btn_multiply.setOnClickOperation(MULTIPLY) @@ -62,7 +55,6 @@ class MainActivity : SimpleActivity(), Calculator { btn_power.setOnClickOperation(POWER) btn_root.setOnClickOperation(ROOT) btn_minus.setOnLongClickListener { calc.turnToNegative() } - btn_clear.setVibratingOnClickListener { calc.handleClear() } btn_clear.setOnLongClickListener { calc.handleReset() @@ -78,7 +70,6 @@ class MainActivity : SimpleActivity(), Calculator { btn_equals.setVibratingOnClickListener { calc.handleEquals() } formula.setOnLongClickListener { copyToClipboard(false) } result.setOnLongClickListener { copyToClipboard(true) } - AutofitHelper.create(result) AutofitHelper.create(formula) storeStateVariables() 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 a9682275..dbdf420d 100644 --- a/app/src/main/kotlin/com/simplemobiletools/calculator/helpers/CalculatorImpl.kt +++ b/app/src/main/kotlin/com/simplemobiletools/calculator/helpers/CalculatorImpl.kt @@ -433,7 +433,6 @@ class CalculatorImpl( private fun String.removeGroupSeparator() = formatter.removeGroupingSeparator(this) - fun getCalculatorStateJson(): JSONObject { val jsonObj = JSONObject() jsonObj.put(RES, currentResult) diff --git a/app/src/main/kotlin/com/simplemobiletools/calculator/helpers/Constants.kt b/app/src/main/kotlin/com/simplemobiletools/calculator/helpers/Constants.kt index 6519b925..aa4c0362 100644 --- a/app/src/main/kotlin/com/simplemobiletools/calculator/helpers/Constants.kt +++ b/app/src/main/kotlin/com/simplemobiletools/calculator/helpers/Constants.kt @@ -30,7 +30,6 @@ const val COMMA = "," // shared prefs const val USE_COMMA_AS_DECIMAL_MARK = "use_comma_as_decimal_mark" - const val RES = "res" const val PREVIOUS_CALCULATION = "previousCalculation" const val LAST_KEY = "lastKey" @@ -38,5 +37,4 @@ const val LAST_OPERATION = "lastOperation" const val BASE_VALUE = "baseValue" const val SECOND_VALUE = "secondValue" const val INPUT_DISPLAYED_FORMULA = "inputDisplayedFormula" - const val CALCULATOR_STATE = "calculatorState"