Contribute additional operators

.github/workflows/ci.yml

@@ -0,0 +1,29 @@
+name: CI
+
+on:
+  push:
+    branches: [main]
+  pull_request:
+    branches: [main]
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/checkout@v4
+
+      - name: Set up JDK 21
+        uses: actions/setup-java@v4
+        with:
+          java-version: 21
+          distribution: temurin
+
+      - name: Setup Gradle
+        uses: gradle/actions/setup-gradle@v3
+
+      - name: Grant execute permission for gradlew
+        run: chmod +x gradlew
+
+      - name: Build and run unit tests
+        run: ./gradlew assembleDebug test

README.md

@@ -8,6 +8,9 @@ A fully functional calculator app built with Jetpack Compose, following modern A
 - Clean, Material Design 3 UI built entirely with Jetpack Compose
 - State managed via ViewModel — survives configuration changes
 - Supports chained operations and decimal inputs
+- Trigonometry function, factorial, square and square root (updated)
+- Light and Dark theme is available now!
+- Able to keep the expression after calculation and prepare for the upcomming calculation
 
 ## 🛠 Tech Stack
 
@@ -29,9 +32,13 @@ A fully functional calculator app built with Jetpack Compose, following modern A
    ```bash
    git clone https://github.com/santhoshj001/Jetpack-Compose-Calculator.git
    ```
-2. Open in **Android Studio Hedgehog** or later
-3. Let Gradle sync
-4. Run on an emulator or physical device (API 21+)
+2. Install JDK 21
+3. Open in **Android Studio Hedgehog** or later
+4. Change AGP to 8.2.2 and Gradle to 8.5
+5. ![Uploading image.png…]()
+
+6. Let Gradle sync
+7. Run on an emulator or physical device (API 21+)
 
 ## 📄 License
 

app/build.gradle

@@ -4,12 +4,13 @@ plugins {
 }
 
 android {
-    compileSdk 32
+    namespace 'com.teamb.calculator'
+    compileSdk 34
 
     defaultConfig {
         applicationId "com.teamb.calculator"
         minSdk 31
-        targetSdk 32
+        targetSdk 34
         versionCode 1
         versionName "1.0"
 
@@ -36,7 +37,7 @@ android {
         compose true
     }
     composeOptions {
-        kotlinCompilerExtensionVersion compose_version
+        kotlinCompilerExtensionVersion "1.5.8"
     }
     packagingOptions {
         resources {
@@ -46,19 +47,18 @@ android {
 }
 
 dependencies {
-
-    implementation 'androidx.core:core-ktx:1.7.0'
-    implementation "androidx.compose.ui:ui:$compose_version"
-    implementation 'androidx.compose.material3:material3:1.0.0-alpha01'
-    implementation "androidx.compose.ui:ui-tooling-preview:$compose_version"
-    implementation 'androidx.lifecycle:lifecycle-runtime-ktx:2.3.1'
-    implementation 'androidx.activity:activity-compose:1.3.1'
-    implementation 'androidx.lifecycle:lifecycle-viewmodel-compose:2.4.1'
-    implementation 'androidx.core:core-splashscreen:1.0.0-rc01'
+    implementation 'androidx.core:core-ktx:1.12.0'
+    implementation "androidx.compose.ui:ui:1.5.4"
+    implementation 'androidx.compose.material3:material3:1.1.2'
+    implementation "androidx.compose.ui:ui-tooling-preview:1.5.4"
+    implementation 'androidx.lifecycle:lifecycle-runtime-ktx:2.6.2'
+    implementation 'androidx.activity:activity-compose:1.8.2'
+    implementation 'androidx.lifecycle:lifecycle-viewmodel-compose:2.6.2'
+    implementation 'androidx.core:core-splashscreen:1.0.1'
     testImplementation 'junit:junit:4.13.2'
-    androidTestImplementation 'androidx.test.ext:junit:1.1.3'
-    androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0'
-    androidTestImplementation "androidx.compose.ui:ui-test-junit4:$compose_version"
-    debugImplementation "androidx.compose.ui:ui-tooling:$compose_version"
-    debugImplementation "androidx.compose.ui:ui-test-manifest:$compose_version"
-}
+    androidTestImplementation 'androidx.test.ext:junit:1.1.5'
+    androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.1'
+    androidTestImplementation "androidx.compose.ui:ui-test-junit4:1.5.4"
+    debugImplementation "androidx.compose.ui:ui-tooling:1.5.4"
+    debugImplementation "androidx.compose.ui:ui-test-manifest:1.5.4"
+}

app/src/androidTest/java/com/teamb/calculator/CalculatorIntegrationTest.kt

@@ -0,0 +1,157 @@
+package com.teamb.calculator
+
+import androidx.compose.ui.test.*
+import androidx.compose.ui.test.junit4.createAndroidComposeRule
+import androidx.test.ext.junit.runners.AndroidJUnit4
+import org.junit.Rule
+import org.junit.Test
+import org.junit.runner.RunWith
+
+@RunWith(AndroidJUnit4::class)
+class CalculatorIntegrationTest {
+
+    @get:Rule
+    val composeTestRule = createAndroidComposeRule<MainActivity>()
+
+    private fun assertDisplay(expected: String) {
+        composeTestRule.onNode(
+            hasText(expected, substring = false),
+            useUnmergedTree = true
+        ).assertExists()
+    }
+
+    @Test
+    fun basicAddition() {
+        composeTestRule.onNodeWithText("7").performClick()
+        composeTestRule.onNodeWithText("+").performClick()
+        composeTestRule.onNodeWithText("3").performClick()
+        composeTestRule.onNodeWithText("=").performClick()
+        assertDisplay("10.0")
+    }
+
+    @Test
+    fun pemdas() {
+        composeTestRule.onNodeWithText("3").performClick()
+        composeTestRule.onNodeWithText("+").performClick()
+        composeTestRule.onNodeWithText("4").performClick()
+        composeTestRule.onNodeWithText("*").performClick()
+        composeTestRule.onNodeWithText("2").performClick()
+        composeTestRule.onNodeWithText("-").performClick()
+        composeTestRule.onNodeWithText("6").performClick()
+        composeTestRule.onNodeWithText("/").performClick()
+        composeTestRule.onNodeWithText("3").performClick()
+        composeTestRule.onNodeWithText("=").performClick()
+        assertDisplay("9.0")
+    }
+
+    @Test
+    fun decimal() {
+        composeTestRule.onNodeWithText("2").performClick()
+        composeTestRule.onNodeWithText(".").performClick()
+        composeTestRule.onNodeWithText("5").performClick()
+        composeTestRule.onNodeWithText("+").performClick()
+        composeTestRule.onNodeWithText("3").performClick()
+        composeTestRule.onNodeWithText("=").performClick()
+        assertDisplay("5.5")
+    }
+
+    @Test
+    fun chainingAfterResult() {
+        composeTestRule.onNodeWithText("3").performClick()
+        composeTestRule.onNodeWithText("+").performClick()
+        composeTestRule.onNodeWithText("4").performClick()
+        composeTestRule.onNodeWithText("=").performClick()
+        composeTestRule.onNodeWithText("+").performClick()
+        composeTestRule.onNodeWithText("5").performClick()
+        composeTestRule.onNodeWithText("=").performClick()
+        assertDisplay("12.0")
+    }
+
+    @Test
+    fun factorial() {
+        composeTestRule.onNodeWithContentDescription("Expand", substring = true).performClick()
+        composeTestRule.onNodeWithText("5").performClick()
+        composeTestRule.onNodeWithText("!").performClick()
+        composeTestRule.onNodeWithText("=").performClick()
+        assertDisplay("120.0")
+    }
+
+    @Test
+    fun square() {
+        composeTestRule.onNodeWithContentDescription("Expand", substring = true).performClick()
+        composeTestRule.onNodeWithText("5").performClick()
+        composeTestRule.onNodeWithText("x²").performClick()
+        composeTestRule.onNodeWithText("=").performClick()
+        assertDisplay("25.0")
+    }
+
+    @Test
+    fun pi() {
+        composeTestRule.onNodeWithContentDescription("Expand", substring = true).performClick()
+        composeTestRule.onNodeWithText("π").performClick()
+        composeTestRule.onNodeWithText("=").performClick()
+        assertDisplay("3.14159265")
+    }
+
+    @Test
+    fun sin() {
+        composeTestRule.onNodeWithContentDescription("Expand", substring = true).performClick()
+        composeTestRule.onNodeWithText("sin").performClick()
+        composeTestRule.onNodeWithText("3").performClick()
+        composeTestRule.onNodeWithText("0").performClick()
+        composeTestRule.onNodeWithText(")").performClick()
+        composeTestRule.onNodeWithText("=").performClick()
+        assertDisplay("0.5")
+    }
+    @Test
+    fun cos() {
+        composeTestRule.onNodeWithContentDescription("Expand").performClick()
+        composeTestRule.onNodeWithText("cos").performClick()
+        composeTestRule.onNodeWithText("9").performClick()
+        composeTestRule.onNodeWithText("0").performClick()
+        composeTestRule.onNodeWithText(")").performClick()
+        composeTestRule.onNodeWithText("=").performClick()
+//        composeTestRule.onNodeWithTag("Result").assertTextEquals("0.0")
+        assertDisplay("0.0")
+    }
+
+    @Test
+    fun tan() {
+        composeTestRule.onNodeWithContentDescription("Expand").performClick()
+        composeTestRule.onNodeWithText("tan").performClick()
+        composeTestRule.onNodeWithText("4").performClick()
+        composeTestRule.onNodeWithText("5").performClick()
+        composeTestRule.onNodeWithText(")").performClick()
+        composeTestRule.onNodeWithText("=").performClick()
+        assertDisplay("1.0")
+    }
+    @Test
+    fun sqrt() {
+        composeTestRule.onNodeWithContentDescription("Expand", substring = true).performClick()
+        composeTestRule.onNodeWithText("√").performClick()
+        composeTestRule.onNodeWithText("9").performClick()
+        composeTestRule.onNodeWithText(")").performClick()
+        composeTestRule.onNodeWithText("=").performClick()
+        assertDisplay("3.0")
+    }
+
+    @Test
+    fun factorialInExpression() {
+        composeTestRule.onNodeWithContentDescription("Expand", substring = true).performClick()
+        composeTestRule.onNodeWithText("3").performClick()
+        composeTestRule.onNodeWithText("+").performClick()
+        composeTestRule.onNodeWithText("4").performClick()
+        composeTestRule.onNodeWithText("!").performClick()
+        composeTestRule.onNodeWithText("=").performClick()
+        assertDisplay("27.0")
+    }
+    @Test
+    fun clear() {
+        composeTestRule.onNodeWithText("7").performClick()
+        composeTestRule.onNodeWithText("+").performClick()
+        composeTestRule.onNodeWithText("3").performClick()
+        composeTestRule.onNodeWithText("AC").performClick()
+        assertDisplay("")
+    }
+
+}

app/src/main/AndroidManifest.xml

@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    package="com.teamb.calculator">
+    xmlns:tools="http://schemas.android.com/tools">
 
     <application
         android:allowBackup="true"