Merge pull request #17 from cashfree/task/update_android_library_latest

Android: Library update
cashfree · Dec 26, 2023 · 2462ba4 · 2462ba4
2 parents 6620cb3 + 23432ff
commit 2462ba4
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 10 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -61,10 +61,10 @@ dependencies {
     implementation 'androidx.compose.ui:ui-tooling-preview'
     implementation 'androidx.compose.material3:material3'
     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.test.ext:junit:1.1.5'
+    androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.1'
 
-    implementation 'com.cashfree.pg:api:2.1.5'
+    implementation 'com.cashfree.pg:api:2.1.6'
 
     androidTestImplementation platform('androidx.compose:compose-bom:2022.10.00')
     androidTestImplementation 'androidx.compose.ui:ui-test-junit4'

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -21,20 +21,35 @@
         android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
         android:theme="@style/Theme.CashfreeAndroidSample">
+
+        <activity android:name=".java.DropCheckoutActivity"
+            android:exported="false"/>
+        <activity android:name=".java.ElementCheckoutActivity"
+            android:exported="false"/>
+        <activity android:name=".java.UPIIntentActivity"
+            android:exported="false"/>
+        <activity android:name=".java.WebCheckoutActivity"
+            android:exported="false"/>
+
         <activity
             android:name=".kotlin.WebCheckoutActivity"
             android:exported="false" />
         <activity
             android:name=".kotlin.UPIIntentActivity"
             android:exported="false" />
         <activity
-            android:name=".compose.DropCheckoutActivity"
+            android:name=".kotlin.ElementCheckoutActivity"
             android:exported="false" />
         <activity
-            android:name=".kotlin.ElementCheckoutActivity"
+            android:name=".kotlin.DropCheckoutActivity"
             android:exported="false" />
+
+        <activity
+            android:name=".compose.DropCheckoutActivity"
+            android:exported="false" />
+
         <activity
-            android:name=".compose.MainActivity"
+            android:name=".java.MainActivity"
             android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />

diff --git a/app/src/main/java/com/cashfree/sdk_sample/java/MainActivity.java b/app/src/main/java/com/cashfree/sdk_sample/java/MainActivity.java
@@ -25,10 +25,10 @@ public void startElementCheckout(View view) {
     }
 
     public void startUPIIntentCheckout(View view) {
-        startActivity(new Intent(MainActivity.this, ElementCheckoutActivity.class));
+        startActivity(new Intent(MainActivity.this, UPIIntentActivity.class));
     }
 
     public void startWebCheckout(View view) {
-        startActivity(new Intent(MainActivity.this, ElementCheckoutActivity.class));
+        startActivity(new Intent(MainActivity.this, WebCheckoutActivity.class));
     }
 }
diff --git a/app/src/main/java/com/cashfree/sdk_sample/kotlin/MainActivity.kt b/app/src/main/java/com/cashfree/sdk_sample/kotlin/MainActivity.kt
@@ -21,10 +21,10 @@ class MainActivity : AppCompatActivity() {
     }
 
     fun startUPIIntentCheckout(view: View?) {
-        startActivity(Intent(this@MainActivity, ElementCheckoutActivity::class.java))
+        startActivity(Intent(this@MainActivity, UPIIntentActivity::class.java))
     }
 
     fun startWebCheckout(view: View?) {
-        startActivity(Intent(this@MainActivity, ElementCheckoutActivity::class.java))
+        startActivity(Intent(this@MainActivity, WebCheckoutActivity::class.java))
     }
 }