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 d550ad66..c0fc4481 100644 --- a/app/src/main/kotlin/com/simplemobiletools/calculator/activities/MainActivity.kt +++ b/app/src/main/kotlin/com/simplemobiletools/calculator/activities/MainActivity.kt @@ -34,7 +34,6 @@ class MainActivity : SimpleActivity(), Calculator { calc = CalculatorImpl(this, applicationContext) - btn_factorial.setOnClickListener{ calc.handleOperation(FACTORIAL); checkHaptic(it) } btn_plus.setOnClickListener { calc.handleOperation(PLUS); checkHaptic(it) } btn_minus.setOnClickListener { calc.handleOperation(MINUS); checkHaptic(it) } btn_multiply.setOnClickListener { calc.handleOperation(MULTIPLY); checkHaptic(it) } diff --git a/app/src/main/kotlin/com/simplemobiletools/calculator/activities/ScientificActivity.kt b/app/src/main/kotlin/com/simplemobiletools/calculator/activities/ScientificActivity.kt index 0c4d3947..969f3bdf 100644 --- a/app/src/main/kotlin/com/simplemobiletools/calculator/activities/ScientificActivity.kt +++ b/app/src/main/kotlin/com/simplemobiletools/calculator/activities/ScientificActivity.kt @@ -4,21 +4,19 @@ import android.os.Bundle import com.simplemobiletools.calculator.R import com.simplemobiletools.calculator.extensions.config import com.simplemobiletools.calculator.extensions.updateViewColors -import com.simplemobiletools.calculator.helpers.* import kotlinx.android.synthetic.main.activity_main.* - +import com.simplemobiletools.calculator.BuildConfig +import com.simplemobiletools.commons.extensions.* class ScientificActivity : SimpleActivity() { - // lateinit var calc: CalculatorImpl override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) setContentView(R.layout.scientific_activity) - //appLaunched(BuildConfig.APPLICATION_ID) - - // calc = CalculatorImpl(this, applicationContext) + appLaunched(BuildConfig.APPLICATION_ID) + updateViewColors(calculator_holder, config.textColor) } -} \ No newline at end of file +} diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml index 556be918..57a5042b 100644 --- a/app/src/main/res/layout/activity_main.xml +++ b/app/src/main/res/layout/activity_main.xml @@ -40,14 +40,6 @@ android:layout_weight="2" android:orientation="horizontal"> -