LastUpdate 11/02/22

Author: PaulGuillen

.idea/deploymentTargetDropDown.xml

@@ -1,15 +1,17 @@
 plugins {
     id 'com.android.application'
     id 'kotlin-android'
+    id 'com.google.gms.google-services'
+
 }
 
 android {
-    compileSdk 31
+    compileSdk 30
 
     defaultConfig {
         applicationId "com.optic.deliverykotlinudemy"
         minSdk 23
-        targetSdk 31
+        targetSdk 30
         versionCode 1
         versionName "1.0"
 
@@ -62,6 +64,12 @@ dependencies {
     implementation 'com.github.nkzawa:socket.io-client:0.6.0'
     implementation 'io.stormotion:creditcardflow:1.0.0'
 
+    implementation platform('com.google.firebase:firebase-bom:29.0.4')
+    implementation 'com.google.firebase:firebase-messaging-ktx'
+
+    implementation 'com.paypal.checkout:android-sdk:0.2.0'
+
+
     testImplementation 'junit:junit:4.+'
     androidTestImplementation 'androidx.test.ext:junit:1.1.3'
     androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0'

.idea/misc.xml

@@ -15,14 +15,33 @@
     <uses-permission android:name="android.permission.CALL_PHONE" />
 
     <application
+        android:name=".MyApp"
         android:allowBackup="true"
         android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"
+        android:networkSecurityConfig="@xml/network_security_config"
         android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
         android:theme="@style/Theme.DeliveryKotlinUdemy"
         android:usesCleartextTraffic="true"
         tools:ignore="AllowBackup,UnusedAttribute">
+        <activity
+            android:name=".activities.client.payments.paypal.status.ClientPaymentsPaypalStatusActivity"
+            android:exported="false" />
+        <activity
+            android:name=".activities.client.payments.paypal.form.ClientPaymentsPaypalFormActivity"
+            android:exported="false"
+            android:parentActivityName=".activities.client.payments.payment_method.ClientPaymentMethodActivity" />
+        <activity
+            android:name=".activities.client.payments.payment_method.ClientPaymentMethodActivity"
+            android:exported="false"
+            android:parentActivityName=".activities.client.address.list.ClientAddressListActivity" />
+        <activity
+            android:name=".activities.client.payments.mercadopago.status.ClientPaymentsStatusActivity"
+            android:exported="false" />
+        <activity
+            android:name=".activities.client.payments.mercadopago.installments.ClientPaymentsInstallmentsActivity"
+            android:exported="false" />
         <activity
             android:name=".activities.client.orders.map.ClientOrdersMapActivity"
             android:exported="false" />
@@ -42,7 +61,7 @@
             android:exported="false"
             android:parentActivityName=".activities.client.home.ClientHomeActivity" />
         <activity
-            android:name=".activities.client.payments.form.ClientPaymentFormActivity"
+            android:name=".activities.client.payments.mercadopago.form.ClientPaymentFormActivity"
             android:exported="false" />
         <activity
             android:name=".activities.client.address.map.ClientAddressMapActivity"
@@ -64,7 +83,8 @@
             android:exported="false" />
         <activity
             android:name=".activities.client.products.list.ClientProductsListActivity"
-            android:exported="true" />
+            android:exported="true"
+            android:parentActivityName=".activities.client.home.ClientHomeActivity" />
         <activity
             android:name=".activities.client.update.ClientUpdateActivity"
             android:exported="true"
@@ -103,6 +123,17 @@
         <meta-data
             android:name="com.google.android.geo.API_KEY"
             android:value="AIzaSyAT-oqJyn7ZtXXDhxN1WFLx0SV7B9xNIDA" />
+        <meta-data
+            android:name="com.google.firebase.messaging.default_notification_channel_id"
+            android:value="@string/default_notification_channel_id" />
+
+        <service
+            android:name=".services.MyFirebaseMessagingClient"
+            android:exported="false">
+            <intent-filter>
+                <action android:name="com.google.firebase.MESSAGING_EVENT" />
+            </intent-filter>
+        </service>
     </application>
 
 </manifest>

app/build.gradle

@@ -17,7 +17,8 @@ import com.google.gson.Gson
 import com.google.gson.reflect.TypeToken
 import com.optic.deliverykotlinudemy.R
 import com.optic.deliverykotlinudemy.activities.client.address.create.ClientAddressCreateActivity
-import com.optic.deliverykotlinudemy.activities.client.payments.form.ClientPaymentFormActivity
+import com.optic.deliverykotlinudemy.activities.client.payments.mercadopago.form.ClientPaymentFormActivity
+import com.optic.deliverykotlinudemy.activities.client.payments.payment_method.ClientPaymentMethodActivity
 import com.optic.deliverykotlinudemy.adapters.AddressAdapter
 import com.optic.deliverykotlinudemy.models.*
 import com.optic.deliverykotlinudemy.providers.AddressProvider
@@ -148,7 +149,7 @@ class ClientAddressListActivity : AppCompatActivity() {
     }
 
     private fun goToPaymentsForm() {
-        val i = Intent(this, ClientPaymentFormActivity::class.java)
+        val i = Intent(this, ClientPaymentMethodActivity::class.java)
         startActivity(i)
     }
 

app/src/main/AndroidManifest.xml

@@ -1,19 +1,16 @@
 package com.optic.deliverykotlinudemy.activities.client.home
 
-import android.content.Intent
 import androidx.appcompat.app.AppCompatActivity
 import android.os.Bundle
-import android.util.Log
-import android.widget.Button
 import androidx.fragment.app.Fragment
 import com.google.android.material.bottomnavigation.BottomNavigationView
 import com.google.gson.Gson
 import com.optic.deliverykotlinudemy.R
-import com.optic.deliverykotlinudemy.activities.MainActivity
 import com.optic.deliverykotlinudemy.fragments.client.ClientCategoriesFragment
 import com.optic.deliverykotlinudemy.fragments.client.ClientOrdersFragment
 import com.optic.deliverykotlinudemy.fragments.client.ClientProfileFragment
 import com.optic.deliverykotlinudemy.models.User
+import com.optic.deliverykotlinudemy.providers.UsersProvider
 import com.optic.deliverykotlinudemy.utils.SharedPref
 
 class ClientHomeActivity : AppCompatActivity() {
@@ -23,6 +20,8 @@ class ClientHomeActivity : AppCompatActivity() {
     var sharedPref: SharedPref? = null
 
     var bottomNavigation: BottomNavigationView? = null
+    var usersProvider: UsersProvider? = null
+    var user: User? = null
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
@@ -60,6 +59,14 @@ class ClientHomeActivity : AppCompatActivity() {
         }
 
         getUserFromSession()
+
+        usersProvider = UsersProvider(token = user?.sessionToken!!)
+        createToken()
+
+    }
+
+    private fun createToken() {
+        usersProvider?.createToken(user!!,this)
     }
 
     private fun openFragment(fragment: Fragment) {
@@ -77,8 +84,7 @@ class ClientHomeActivity : AppCompatActivity() {
 
         if (!sharedPref?.getData("user").isNullOrBlank()) {
             // SI EL USARIO EXISTE EN SESION
-            val user = gson.fromJson(sharedPref?.getData("user"), User::class.java)
-            Log.d(TAG, "Usuario: $user")
+            user = gson.fromJson(sharedPref?.getData("user"), User::class.java)
         }
 
     }

app/src/main/java/com/optic/deliverykotlinudemy/activities/client/address/list/ClientAddressListActivity.kt

@@ -1,11 +1,13 @@
-package com.optic.deliverykotlinudemy.activities.client.payments.form
+package com.optic.deliverykotlinudemy.activities.client.payments.mercadopago.form
 
+import android.content.Intent
 import androidx.appcompat.app.AppCompatActivity
 import android.os.Bundle
 import android.util.Log
 import android.widget.Toast
 import com.google.gson.JsonObject
 import com.optic.deliverykotlinudemy.R
+import com.optic.deliverykotlinudemy.activities.client.payments.mercadopago.installments.ClientPaymentsInstallmentsActivity
 import com.optic.deliverykotlinudemy.models.Cardholder
 import com.optic.deliverykotlinudemy.models.MercadoPagoCardTokenBody
 import com.optic.deliverykotlinudemy.providers.MercadoPagoProvider
@@ -141,12 +143,11 @@ class ClientPaymentFormActivity : AppCompatActivity() {
             Callback<JsonObject> {
             override fun onResponse(call: Call<JsonObject>, response: Response<JsonObject>) {
 
-           /*     if (response.body() != null) {
+                if (response.body() != null) {
                     val cardToken = response.body()?.get("id")?.asString
                     val firstSixDigits = response.body()?.get("first_six_digits")?.asString
-                   // goToInstallments(cardToken!!, firstSixDigits!!)
+                    gotoInstallments(cardToken!!, firstSixDigits!!)
                 }
-*/
                 Log.d(TAG, "Response: $response")
                 Log.d(TAG, "body: ${response.body()}")
 
@@ -159,6 +160,13 @@ class ClientPaymentFormActivity : AppCompatActivity() {
         })
     }
 
+    private fun gotoInstallments(cardToken: String , firstSixDigits: String){
+        val i = Intent(this, ClientPaymentsInstallmentsActivity::class.java)
+        i.putExtra("cardToken",cardToken)
+        i.putExtra("firstSixDigits",firstSixDigits)
+        startActivity(i)
+    }
+
 
     override fun onBackPressed() {