fixed #2: Bug corregido

hall9zeha · Mar 1, 2022 · 6a64e86 · 6a64e86
1 parent 15d24a7
commit 6a64e86
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 32 deletions.
diff --git a/NiloPartner/.idea/deploymentTargetDropDown.xml b/NiloPartner/.idea/deploymentTargetDropDown.xml
diff --git a/NiloPartner/app/src/main/java/com/barryzea/niloclient/MainActivity.kt b/NiloPartner/app/src/main/java/com/barryzea/niloclient/MainActivity.kt
@@ -299,7 +299,10 @@ class MainActivity : AppCompatActivity(), OnProductListener, MainAux {
                         }
                     }
             }
-            R.id.itemOrder->{startActivity(Intent(this, OrderActivity::class.java))}
+            R.id.itemOrder->{
+
+                startActivity(Intent(this, OrderActivity::class.java)
+                    .putExtra(Constants.ACTION_INTENT,Constants.ORIGIN_INTENT))}
             R.id.itemProfile->{
                 val fragment=ProfileFragment()
                 supportFragmentManager.beginTransaction()

diff --git a/NiloPartner/app/src/main/java/com/barryzea/niloclient/commons/Constants.kt b/NiloPartner/app/src/main/java/com/barryzea/niloclient/commons/Constants.kt
@@ -17,4 +17,5 @@ object Constants {
     const val MY_PHOTO="my_photo"
     const val ACTION_INTENT="action_intent"
     const val PROP_ID="id"
+    const val ORIGIN_INTENT="locale"
 }
diff --git a/NiloPartner/app/src/main/java/com/barryzea/niloclient/order/OrderActivity.kt b/NiloPartner/app/src/main/java/com/barryzea/niloclient/order/OrderActivity.kt
@@ -35,25 +35,28 @@ class OrderActivity : AppCompatActivity(), OnOrderListener, OrderAux {
 
         setupRecyclerView()
         setupFirestore()
+
         checkIntent(intent)
     }
 
     private fun checkIntent(intent: Intent?) {
-        intent?.let{
-            val actionIntent=it.getIntExtra(Constants.ACTION_INTENT,0)
-            actionIntent?.let{
-                val id=intent.getStringExtra(Constants.PROP_ID)?:""
-                val status=intent.getIntExtra(Constants.STATUS, 0)
-                orderSelected= Order(id=id, status=status)
-                val fragment=TrackFragment()
-
-                supportFragmentManager
-                    .beginTransaction()
-                    .add(R.id.containerMainOrder, fragment)
-                    .addToBackStack(null)
-                    .commit()
-            }
+        intent?.let {
+            if (it.getStringExtra(Constants.ACTION_INTENT).isNullOrEmpty()) {
+                val actionIntent = it.getIntExtra(Constants.ACTION_INTENT, 0)
+                actionIntent?.let {
+                    val id = intent.getStringExtra(Constants.PROP_ID) ?: ""
+                    val status = intent.getIntExtra(Constants.STATUS, 0)
+                    orderSelected = Order(id = id, status = status)
+                    val fragment = TrackFragment()
+
+                    supportFragmentManager
+                        .beginTransaction()
+                        .add(R.id.containerMainOrder, fragment)
+                        .addToBackStack(null)
+                        .commit()
+                }
 
+            }
         }
     }