From 0edd1c0fa43d3e39cd7a161af10df0b4d66188e8 Mon Sep 17 00:00:00 2001
From: aayush262 <aayushthakur262006@gmail.com>
Date: Sun, 12 May 2024 21:18:30 +0530
Subject: [PATCH] feat: basic calculations

---
 .idea/deploymentTargetSelector.xml            |   4 +-
 .idea/misc.xml                                |   7 +
 app/build.gradle                              |   2 +-
 .../com/aayush/calculator/MainActivity.kt     |  98 ++++++++++++++
 .../aayush/calculator/saving/PrefManager.kt   |  22 +++-
 .../aayush/calculator/saving/Preferences.kt   |   2 +-
 app/src/main/res/drawable/ic_round_tag_24.xml |  26 ++++
 app/src/main/res/layout/activity_main.xml     | 122 +++++++++++++-----
 app/src/main/res/values/style.xml             |   4 -
 9 files changed, 242 insertions(+), 45 deletions(-)
 create mode 100644 app/src/main/res/drawable/ic_round_tag_24.xml

diff --git a/.idea/deploymentTargetSelector.xml b/.idea/deploymentTargetSelector.xml
index e698509..f6c280b 100644
--- a/.idea/deploymentTargetSelector.xml
+++ b/.idea/deploymentTargetSelector.xml
@@ -4,10 +4,10 @@
     <selectionStates>
       <SelectionState runConfigName="app">
         <option name="selectionMode" value="DROPDOWN" />
-        <DropdownSelection timestamp="2024-05-10T17:47:16.744068200Z">
+        <DropdownSelection timestamp="2024-05-10T18:34:32.623129500Z">
           <Target type="DEFAULT_BOOT">
             <handle>
-              <DeviceId pluginId="LocalEmulator" identifier="path=C:\Users\aayus\.android\avd\Copy_of_Pixel_8_Pro_API_34.avd" />
+              <DeviceId pluginId="Default" identifier="serial=127.0.0.1:58526;connection=222705ff" />
             </handle>
           </Target>
         </DropdownSelection>
diff --git a/.idea/misc.xml b/.idea/misc.xml
index 0ad17cb..7fc3291 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -7,4 +7,11 @@
   <component name="ProjectType">
     <option name="id" value="Android" />
   </component>
+  <component name="VisualizationToolProject">
+    <option name="state">
+      <ProjectState>
+        <option name="scale" value="0.176" />
+      </ProjectState>
+    </option>
+  </component>
 </project>
\ No newline at end of file
diff --git a/app/build.gradle b/app/build.gradle
index 1cdcc49..526740e 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -55,6 +55,6 @@ dependencies {
     implementation 'org.jetbrains.kotlinx:kotlinx-serialization-json:1.6.3'
     implementation 'androidx.preference:preference-ktx:1.2.1'
     implementation 'androidx.webkit:webkit:1.10.0'
-
+    implementation 'org.mariuszgromada.math:MathParser.org-mXparser:4.4.2'
     implementation 'com.google.android.material:material:1.11.0'
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/aayush/calculator/MainActivity.kt b/app/src/main/java/com/aayush/calculator/MainActivity.kt
index 5721228..93da339 100644
--- a/app/src/main/java/com/aayush/calculator/MainActivity.kt
+++ b/app/src/main/java/com/aayush/calculator/MainActivity.kt
@@ -4,6 +4,8 @@ import android.os.Bundle
 import androidx.appcompat.app.AppCompatActivity
 import com.aayush.calculator.databinding.ActivityMainBinding
 import com.aayush.calculator.saving.PrefManager
+import com.aayush.calculator.saving.PrefName
+import org.mariuszgromada.math.mxparser.Expression
 
 class MainActivity : AppCompatActivity() {
     private lateinit var binding: ActivityMainBinding
@@ -13,6 +15,102 @@ class MainActivity : AppCompatActivity() {
         ThemeManager.apply(this)
         binding = ActivityMainBinding.inflate(layoutInflater)
         setContentView(binding.root)
+
+        binding.apply{
+
+            clearButton.setOnClickListener {
+                input.text = ""
+                output.text = ""
+            }
+
+            removeButton.setOnClickListener {
+                val text = input.text.toString()
+                if (text.isNotEmpty()) {
+                    input.text = text.substring(0, text.length - 1)
+                }
+                output.text = ""
+            }
+
+            zeroButton.setOnClickListener {
+                input.text = addToInputText("0")
+            }
+            oneButton.setOnClickListener {
+                input.text = addToInputText("1")
+            }
+            twoButton.setOnClickListener {
+                input.text = addToInputText("2")
+            }
+            threeButton.setOnClickListener {
+                input.text = addToInputText("3")
+            }
+            fourButton.setOnClickListener {
+                input.text = addToInputText("4")
+            }
+            fiveButton.setOnClickListener {
+                input.text = addToInputText("5")
+            }
+            sixButton.setOnClickListener {
+                input.text = addToInputText("6")
+            }
+            sevenButton.setOnClickListener {
+                input.text = addToInputText("7")
+            }
+            eightButton.setOnClickListener {
+                input.text = addToInputText("8")
+            }
+            nineButton.setOnClickListener {
+                input.text = addToInputText("9")
+            }
+            decimalButton.setOnClickListener {
+                input.text = addToInputText(".")
+            }
+            plusButton.setOnClickListener {
+                input.text = addToInputText("+")
+            }
+            subtractButton.setOnClickListener {
+                input.text = addToInputText("-")
+            }
+            multiplyButton.setOnClickListener {
+                input.text = addToInputText("*")
+            }
+            divideButton.setOnClickListener {
+                input.text = addToInputText("/")
+            }
+            parenthesesButton.setOnClickListener {
+                val text = input.text.toString()
+                if (text.isEmpty() || text.last() == '(' || text.last() == '+' || text.last() == '-' || text.last() == '*' || text.last() == '/') {
+                    input.text = addToInputText("(")
+                } else {
+                    input.text = addToInputText(")")
+                }
+            }
+            equalButton.setOnClickListener {
+                showResult()
+            }
+
+        }
+    }
+    private fun addToInputText(buttonValue: String): String {
+
+        return binding.input.text.toString() + "" + buttonValue
+    }
+    private fun getInputExpression(): String {
+        var expression = binding.input.text.replace(Regex("÷"), "/")
+        expression = expression.replace(Regex("×"), "*")
+        return expression
+    }
+    private fun showResult() {
+        val input = getInputExpression()
+        val expression = Expression(input)
+        val result = expression.calculate()
+        val toInt = if (result % 1 == 0.0) {
+            result.toInt()
+        } else {
+            result
+        }
+        binding.output.text = toInt.toString()
+        val currentHistory =  PrefManager.getCustomVal<Set<String>>("history", setOf()).plus(input)
+        PrefManager.setCustomVal("history", currentHistory)
     }
 }
 
diff --git a/app/src/main/java/com/aayush/calculator/saving/PrefManager.kt b/app/src/main/java/com/aayush/calculator/saving/PrefManager.kt
index 77956a8..df7bb53 100644
--- a/app/src/main/java/com/aayush/calculator/saving/PrefManager.kt
+++ b/app/src/main/java/com/aayush/calculator/saving/PrefManager.kt
@@ -20,10 +20,10 @@ object PrefManager {
         if (generalPreferences != null) return
         generalPreferences =
             context.getSharedPreferences(Location.General.location, Context.MODE_PRIVATE)
-        protectedPreferences =
-            context.getSharedPreferences(Location.Protected.location, Context.MODE_PRIVATE)
         irrelevantPreferences =
             context.getSharedPreferences(Location.Irrelevant.location, Context.MODE_PRIVATE)
+        protectedPreferences =
+            context.getSharedPreferences(Location.Protected.location, Context.MODE_PRIVATE)
     }
 
     @Suppress("UNCHECKED_CAST")
@@ -178,7 +178,7 @@ object PrefManager {
                     default as? Set<String> ?: setOf()
                 ) as T?
 
-                else -> throw IllegalArgumentException("Type not supported")
+                else -> deserializeClass(key, default, Location.Irrelevant)
             }
         } catch (e: Exception) {
             default
@@ -206,6 +206,7 @@ object PrefManager {
                 is String -> putString(key, value as String)
                 is Set<*> -> putStringSet(key, value as Set<String>)
                 null -> remove(key)
+                else -> serializeClass(key, value, Location.Irrelevant)
             }
             apply()
         }
@@ -286,6 +287,11 @@ object PrefManager {
     fun SharedPreferenceLiveData<*>.asLiveStringSet(): SharedPreferenceStringSetLiveData =
         this as? SharedPreferenceStringSetLiveData
             ?: throw ClassCastException("Cannot cast to SharedPreferenceLiveData<Set<String>>")
+    fun exportAllPrefs(prefLocation: List<Location>): String {
+        return PreferencePackager.pack(
+            prefLocation.associateWith { getPrefLocation(it) }
+        )
+    }
 
 
     /**
@@ -331,8 +337,8 @@ object PrefManager {
     private fun getPrefLocation(prefLoc: Location): SharedPreferences {
         return when (prefLoc) {
             Location.General -> generalPreferences
-            Location.Protected -> protectedPreferences
             Location.Irrelevant -> irrelevantPreferences
+            Location.Protected -> protectedPreferences
         }!!
     }
 
@@ -348,6 +354,7 @@ object PrefManager {
             pref.edit().putString(key, serialized).apply()
         } catch (e: Exception) {
             println("Error serializing preference: ${e.message}")
+
         }
     }
 
@@ -365,6 +372,13 @@ object PrefManager {
             } else {
                 default
             }
+        } catch (e: java.io.InvalidClassException) {
+            try {
+                getPrefLocation(location).edit().remove(key).apply()
+                default
+            } catch (e: Exception) {
+                default
+            }
         } catch (e: Exception) {
             default
         }
diff --git a/app/src/main/java/com/aayush/calculator/saving/Preferences.kt b/app/src/main/java/com/aayush/calculator/saving/Preferences.kt
index 28ff67f..8088aa8 100644
--- a/app/src/main/java/com/aayush/calculator/saving/Preferences.kt
+++ b/app/src/main/java/com/aayush/calculator/saving/Preferences.kt
@@ -7,5 +7,5 @@ import com.aayush.calculator.saving.internal.Pref
 enum class PrefName(val data: Pref) {
     //General
     Amoled(Pref(Location.General, Boolean::class, false)),
-    History(Pref(Location.General, Set::class, setOf<com.aayush.calculator.History>())),
+    HistoryList(Pref(Location.General, List::class, listOf<History>(History("1+1", "2")))),
 }
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_round_tag_24.xml b/app/src/main/res/drawable/ic_round_tag_24.xml
new file mode 100644
index 0000000..895451e
--- /dev/null
+++ b/app/src/main/res/drawable/ic_round_tag_24.xml
@@ -0,0 +1,26 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:tint="?attr/colorPrimary"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M10.28,20.25H17C19.76,20.25 22,18.01 22,15.25V8.75C22,5.99 19.76,3.75 17,3.75H10.28C8.87,3.75 7.53,4.34 6.58,5.39L3.05,9.27C1.64,10.82 1.64,13.18 3.05,14.73L6.58,18.61C7.53,19.66 8.87,20.25 10.28,20.25Z"
+      android:strokeLineJoin="round"
+      android:strokeWidth="1.5"
+      android:fillColor="#00000000"
+      android:strokeColor="#292D32"
+      android:strokeLineCap="round"/>
+  <path
+      android:pathData="M16,14.47L11.06,9.53"
+      android:strokeWidth="1.5"
+      android:fillColor="#00000000"
+      android:strokeColor="#292D32"
+      android:strokeLineCap="round"/>
+  <path
+      android:pathData="M11.06,14.47L16,9.53"
+      android:strokeWidth="1.5"
+      android:fillColor="#00000000"
+      android:strokeColor="#292D32"
+      android:strokeLineCap="round"/>
+</vector>
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index 77e7062..32a5b6a 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/main"
     android:layout_width="match_parent"
@@ -9,7 +10,35 @@
     tools:context=".MainActivity"
     tools:ignore="HardcodedText">
 
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="0dp"
+        android:layout_weight="1"
+        android:gravity="bottom"
+        android:padding="30dp"
+        android:orientation="vertical">
+
+        <TextView
+            android:id="@+id/input"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:gravity="end"
+            android:textSize="30sp"
+            android:maxLines="3"
+            android:fontFamily="sans-serif-light"
+            tools:text="5+10-3" />
+
+        <TextView
+            android:id="@+id/output"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:gravity="end"
+            android:textSize="50sp"
+            android:maxLines="2"
+            android:fontFamily="sans-serif"
+            tools:text="12" />
 
+    </LinearLayout>
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
@@ -19,15 +48,15 @@
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginVertical="8dp"
+            android:layout_marginVertical="4dp"
             android:baselineAligned="false"
             android:orientation="horizontal">
 
             <Button
-
+                android:id="@+id/clearButton"
                 style="?android:attr/buttonBarButtonStyle"
                 android:layout_width="0dp"
-                android:layout_height="86dp"
+                android:layout_height="72dp"
                 android:layout_gravity="center"
                 android:layout_marginHorizontal="8dp"
                 android:layout_weight="1"
@@ -37,9 +66,10 @@
                 android:textSize="23sp" />
 
             <Button
+                android:id="@+id/parenthesesButton"
                 style="?android:attr/buttonBarButtonStyle"
                 android:layout_width="0dp"
-                android:layout_height="86dp"
+                android:layout_height="72dp"
                 android:layout_gravity="center"
                 android:layout_marginHorizontal="8dp"
                 android:layout_weight="1"
@@ -49,9 +79,10 @@
                 android:textSize="32sp" />
 
             <Button
+                android:id="@+id/percentageButton"
                 style="?android:attr/buttonBarButtonStyle"
                 android:layout_width="0dp"
-                android:layout_height="86dp"
+                android:layout_height="72dp"
                 android:layout_gravity="center"
                 android:layout_marginHorizontal="8dp"
                 android:layout_weight="1"
@@ -61,9 +92,10 @@
                 android:textSize="32sp" />
 
             <Button
+                android:id="@+id/divideButton"
                 style="?android:attr/buttonBarButtonStyle"
                 android:layout_width="0dp"
-                android:layout_height="86dp"
+                android:layout_height="72dp"
                 android:layout_gravity="center"
                 android:layout_marginHorizontal="8dp"
                 android:layout_weight="1"
@@ -78,14 +110,15 @@
             style="?android:attr/buttonBarStyle"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginVertical="8dp"
+            android:layout_marginVertical="4dp"
             android:baselineAligned="false"
             android:orientation="horizontal">
 
             <Button
+                android:id="@+id/sevenButton"
                 style="?android:attr/buttonBarButtonStyle"
                 android:layout_width="0dp"
-                android:layout_height="86dp"
+                android:layout_height="72dp"
                 android:layout_gravity="center"
                 android:layout_marginHorizontal="8dp"
                 android:layout_weight="1"
@@ -95,9 +128,10 @@
                 android:textSize="32sp" />
 
             <Button
+                android:id="@+id/eightButton"
                 style="?android:attr/buttonBarButtonStyle"
                 android:layout_width="0dp"
-                android:layout_height="86dp"
+                android:layout_height="72dp"
                 android:layout_gravity="center"
                 android:layout_marginHorizontal="8dp"
                 android:layout_weight="1"
@@ -107,9 +141,10 @@
                 android:textSize="32sp" />
 
             <Button
+                android:id="@+id/nineButton"
                 style="?android:attr/buttonBarButtonStyle"
                 android:layout_width="0dp"
-                android:layout_height="86dp"
+                android:layout_height="72dp"
                 android:layout_gravity="center"
                 android:layout_marginHorizontal="8dp"
                 android:layout_weight="1"
@@ -119,9 +154,10 @@
                 android:textSize="32sp" />
 
             <Button
+                android:id="@+id/multiplyButton"
                 style="?android:attr/buttonBarButtonStyle"
                 android:layout_width="0dp"
-                android:layout_height="86dp"
+                android:layout_height="72dp"
                 android:layout_gravity="center"
                 android:layout_marginHorizontal="8dp"
                 android:layout_weight="1"
@@ -135,14 +171,15 @@
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginVertical="8dp"
+            android:layout_marginVertical="4dp"
             android:baselineAligned="false"
             android:orientation="horizontal">
 
             <Button
+                android:id="@+id/fourButton"
                 style="?android:attr/buttonBarButtonStyle"
                 android:layout_width="0dp"
-                android:layout_height="86dp"
+                android:layout_height="72dp"
                 android:layout_gravity="center"
                 android:layout_marginHorizontal="8dp"
                 android:layout_weight="1"
@@ -152,9 +189,10 @@
                 android:textSize="32sp" />
 
             <Button
+                android:id="@+id/fiveButton"
                 style="?android:attr/buttonBarButtonStyle"
                 android:layout_width="0dp"
-                android:layout_height="86dp"
+                android:layout_height="72dp"
                 android:layout_gravity="center"
                 android:layout_marginHorizontal="8dp"
                 android:layout_weight="1"
@@ -164,9 +202,10 @@
                 android:textSize="32sp" />
 
             <Button
+                android:id="@+id/sixButton"
                 style="?android:attr/buttonBarButtonStyle"
                 android:layout_width="0dp"
-                android:layout_height="86dp"
+                android:layout_height="72dp"
                 android:layout_gravity="center"
                 android:layout_marginHorizontal="8dp"
                 android:layout_weight="1"
@@ -176,9 +215,10 @@
                 android:textSize="32sp" />
 
             <Button
+                android:id="@+id/subtractButton"
                 style="?android:attr/buttonBarButtonStyle"
                 android:layout_width="0dp"
-                android:layout_height="86dp"
+                android:layout_height="72dp"
                 android:layout_gravity="center"
                 android:layout_marginHorizontal="8dp"
                 android:layout_weight="1"
@@ -191,14 +231,15 @@
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginVertical="8dp"
+            android:layout_marginVertical="4dp"
             android:baselineAligned="false"
             android:orientation="horizontal">
 
             <Button
+                android:id="@+id/oneButton"
                 style="?android:attr/buttonBarButtonStyle"
                 android:layout_width="0dp"
-                android:layout_height="86dp"
+                android:layout_height="72dp"
                 android:layout_gravity="center"
                 android:layout_marginHorizontal="8dp"
                 android:layout_weight="1"
@@ -208,9 +249,10 @@
                 android:textSize="32sp" />
 
             <Button
+                android:id="@+id/twoButton"
                 style="?android:attr/buttonBarButtonStyle"
                 android:layout_width="0dp"
-                android:layout_height="86dp"
+                android:layout_height="72dp"
                 android:layout_gravity="center"
                 android:layout_marginHorizontal="8dp"
                 android:layout_weight="1"
@@ -220,9 +262,10 @@
                 android:textSize="32sp" />
 
             <Button
+                android:id="@+id/threeButton"
                 style="?android:attr/buttonBarButtonStyle"
                 android:layout_width="0dp"
-                android:layout_height="86dp"
+                android:layout_height="72dp"
                 android:layout_gravity="center"
                 android:layout_marginHorizontal="8dp"
                 android:layout_weight="1"
@@ -232,9 +275,10 @@
                 android:textSize="32sp" />
 
             <Button
+                android:id="@+id/plusButton"
                 style="?android:attr/buttonBarButtonStyle"
                 android:layout_width="0dp"
-                android:layout_height="86dp"
+                android:layout_height="72dp"
                 android:layout_gravity="center"
                 android:layout_marginHorizontal="8dp"
                 android:layout_weight="1"
@@ -247,14 +291,15 @@
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginVertical="8dp"
+            android:layout_marginVertical="4dp"
             android:baselineAligned="false"
             android:orientation="horizontal">
 
             <Button
+                android:id="@+id/zeroButton"
                 style="?android:attr/buttonBarButtonStyle"
                 android:layout_width="0dp"
-                android:layout_height="86dp"
+                android:layout_height="72dp"
                 android:layout_gravity="center"
                 android:layout_marginHorizontal="8dp"
                 android:layout_weight="1"
@@ -264,9 +309,10 @@
                 android:textSize="32sp" />
 
             <Button
+                android:id="@+id/decimalButton"
                 style="?android:attr/buttonBarButtonStyle"
                 android:layout_width="0dp"
-                android:layout_height="86dp"
+                android:layout_height="72dp"
                 android:layout_gravity="center"
                 android:layout_marginHorizontal="8dp"
                 android:layout_weight="1"
@@ -275,23 +321,33 @@
                 android:textColor="?attr/colorPrimary"
                 android:textSize="32sp" />
 
-            <Button
-                style="?android:attr/buttonBarButtonStyle"
+            <com.google.android.material.card.MaterialCardView
+                android:id="@+id/removeButton"
                 android:layout_width="0dp"
-                android:layout_height="86dp"
+                android:layout_height="64dp"
                 android:layout_gravity="center"
-                android:layout_marginHorizontal="8dp"
+                android:layout_marginStart="8dp"
                 android:layout_weight="1"
                 android:backgroundTint="?attr/colorOnSecondary"
-                android:text="❌"
-                android:textAlignment="center"
-                android:textColor="?attr/colorPrimary"
-                android:textSize="16sp" />
+                app:cardCornerRadius="124dp"
+                app:strokeColor="@color/transparent">
+
+                <com.google.android.material.imageview.ShapeableImageView
+                    android:layout_width="40dp"
+                    android:layout_height="40dp"
+                    android:layout_gravity="center"
+                    android:tint="?attr/colorPrimary"
+                    app:srcCompat="@drawable/ic_round_tag_24"
+                    tools:ignore="ContentDescription,ImageContrastCheck"
+                    tools:tint="@color/transparent" />
+
+            </com.google.android.material.card.MaterialCardView>
 
             <Button
+                android:id="@+id/equalButton"
                 style="?android:attr/buttonBarButtonStyle"
                 android:layout_width="0dp"
-                android:layout_height="86dp"
+                android:layout_height="72dp"
                 android:layout_gravity="center"
                 android:layout_marginHorizontal="8dp"
                 android:layout_weight="1"
diff --git a/app/src/main/res/values/style.xml b/app/src/main/res/values/style.xml
index 2ff8ba5..090ab0b 100644
--- a/app/src/main/res/values/style.xml
+++ b/app/src/main/res/values/style.xml
@@ -6,8 +6,4 @@
         <item name="colorSurface">#000000</item>
     </style>
 
-    <style name="AppTheme" parent="Theme.MaterialComponents.DayNight.NoActionBar">
-        <item name="android:statusBarColor">@android:color/transparent</item>
-        <item name="android:navigationBarColor">@android:color/transparent</item>
-    </style>
 </resources>
\ No newline at end of file