From ce425b3087ed5e50324d9e56f16945cb337058ff Mon Sep 17 00:00:00 2001
From: Sissy Dalampira <sissydk97@gmail.com>
Date: Sun, 7 Oct 2018 21:04:40 +0300
Subject: [PATCH] General impovements of the ScientificActivity

---
 .../calculator/activities/MainActivity.kt            |  1 -
 .../calculator/activities/ScientificActivity.kt      | 12 +++++-------
 app/src/main/res/layout/activity_main.xml            |  8 --------
 app/src/main/res/layout/scientific_activity.xml      |  2 +-
 4 files changed, 6 insertions(+), 17 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 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">
 
-        <Button
-            android:id="@+id/btn_factorial"
-            style="@style/MyButton"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:layout_weight="1"
-            android:text="!"/>
-
         <Button
             android:id="@+id/btn_percent"
             style="@style/MyButton"
diff --git a/app/src/main/res/layout/scientific_activity.xml b/app/src/main/res/layout/scientific_activity.xml
index 12024cd4..f205381d 100644
--- a/app/src/main/res/layout/scientific_activity.xml
+++ b/app/src/main/res/layout/scientific_activity.xml
@@ -32,7 +32,7 @@
         android:paddingLeft="@dimen/activity_margin"
         android:paddingRight="@dimen/activity_margin"
         android:textSize="@dimen/display_text_size"
-        tools:text="0"/>
+        android:text="0"/>
 
     <LinearLayout
         android:layout_width="match_parent"