Merge branch 'development' into feature/autocomplete-place

Author: Rohan Maity

app/build.gradle

@@ -90,9 +90,10 @@ repositories {
 dependencies {
     def lifecycle_version = "2.1.0-alpha03"
     def koin_version = "1.0.2"
-    def roomVersion = "2.1.0-alpha04"
+    def roomVersion = "2.1.0-alpha06"
     def ktx_version = "1.0.0"
     def ktx2_version = "2.0.0"
+    def nav_version = "2.1.0-alpha01"
 
     implementation fileTree(dir: 'libs', include: ['*.jar'])
     implementation 'androidx.multidex:multidex:2.0.1'
@@ -158,12 +159,12 @@ dependencies {
     implementation 'com.journeyapps:zxing-android-embedded:3.6.0'
 
     //Navigation
-    implementation 'android.arch.navigation:navigation-fragment-ktx:1.0.0'
-    implementation 'android.arch.navigation:navigation-ui-ktx:1.0.0'
+    implementation "androidx.navigation:navigation-fragment-ktx:$nav_version" // For Kotlin use navigation-fragment-ktx
+    implementation "androidx.navigation:navigation-ui-ktx:$nav_version" // For Kotlin use navigation-ui-ktx
 
     // Stetho
     debugImplementation 'com.facebook.stetho:stetho:1.5.1'
-    debugImplementation 'com.facebook.stetho:stetho-okhttp3:1.5.0'
+    debugImplementation 'com.facebook.stetho:stetho-okhttp3:1.5.1'
     releaseImplementation 'com.github.iamareebjamal:stetho-noop:1.2.1'
     testImplementation 'com.github.iamareebjamal:stetho-noop:1.2.1'
 
@@ -174,7 +175,7 @@ dependencies {
     testImplementation "io.mockk:mockk:1.9.2"
     testImplementation 'org.threeten:threetenbp:1.3.8'
     testImplementation "org.koin:koin-test:$koin_version"
-    testImplementation 'androidx.arch.core:core-testing:2.0.0'
+    testImplementation 'androidx.arch.core:core-testing:2.0.1'
     androidTestImplementation 'androidx.test:runner:1.1.1'
     androidTestImplementation 'androidx.test.espresso:espresso-core:3.1.1'
 }

app/src/main/java/org/fossasia/openevent/general/MainActivity.kt

@@ -10,6 +10,7 @@ import com.google.android.material.snackbar.Snackbar
 import kotlinx.android.synthetic.main.activity_main.navigation
 import kotlinx.android.synthetic.main.activity_main.navigationAuth
 import kotlinx.android.synthetic.main.activity_main.mainFragmentCoordinatorLayout
+import org.fossasia.openevent.general.auth.EditProfileFragment
 import org.fossasia.openevent.general.search.RC_CREDENTIALS_READ
 import org.fossasia.openevent.general.search.RC_CREDENTIALS_SAVE
 import org.fossasia.openevent.general.search.SmartAuthViewModel
@@ -68,10 +69,23 @@ class MainActivity : AppCompatActivity() {
             }
             R.id.orderCompletedFragment -> navController.popBackStack(R.id.eventDetailsFragment, false)
             R.id.welcomeFragment -> finish()
+            R.id.editProfileFragment -> {
+
+                // Calls the handleBackPress method in EditProfileFragment
+                val hostFragment = supportFragmentManager.findFragmentById(R.id.frameContainer) as? NavHostFragment
+                (hostFragment?.childFragmentManager?.fragments?.get(0) as? EditProfileFragment)?.handleBackPress()
+            }
             else -> super.onBackPressed()
         }
     }
 
+    /**
+     * Called by EditProfileFragment to go to previous fragment
+     */
+    fun onSuperBackPressed() {
+        super.onBackPressed()
+    }
+
     override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {
         if (requestCode == RC_CREDENTIALS_READ || requestCode == RC_CREDENTIALS_SAVE)
             SmartAuthViewModel().onActivityResult(requestCode, resultCode, data, this)

app/src/main/java/org/fossasia/openevent/general/about/AboutEventFragment.kt

@@ -34,16 +34,6 @@ class AboutEventFragment : Fragment(), AppBarLayout.OnOffsetChangedListener {
     private var title: String = ""
     private val safeArgs: AboutEventFragmentArgs by navArgs()
 
-    override fun onCreate(savedInstanceState: Bundle?) {
-        super.onCreate(savedInstanceState)
-
-        aboutEventViewModel.event
-            .nonNull()
-            .observe(this, Observer {
-                loadEvent(it)
-            })
-    }
-
     override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
         rootView = layoutInflater.inflate(R.layout.fragment_about_event, container, false)
 
@@ -54,17 +44,23 @@ class AboutEventFragment : Fragment(), AppBarLayout.OnOffsetChangedListener {
         }
         setHasOptionsMenu(true)
 
+        aboutEventViewModel.event
+            .nonNull()
+            .observe(viewLifecycleOwner, Observer {
+                loadEvent(it)
+            })
+
         rootView.appBar.addOnOffsetChangedListener(this)
 
         aboutEventViewModel.error
             .nonNull()
-            .observe(this, Observer {
+            .observe(viewLifecycleOwner, Observer {
                 Snackbar.make(rootView, it, Snackbar.LENGTH_SHORT).show()
             })
 
         aboutEventViewModel.progressAboutEvent
             .nonNull()
-            .observe(this, Observer {
+            .observe(viewLifecycleOwner, Observer {
                 rootView.progressBarAbout.isVisible = it
             })
 

app/src/main/java/org/fossasia/openevent/general/attendees/AttendeeFragment.kt

@@ -146,9 +146,7 @@ class AttendeeFragment : Fragment() {
             }
 
             override fun onClick(widget: View) {
-                context?.let {
-                    Utils.openUrl(it, getString(R.string.terms_of_service))
-                }
+                Utils.openUrl(requireContext(), getString(R.string.terms_of_service))
             }
         }
 
@@ -159,9 +157,7 @@ class AttendeeFragment : Fragment() {
             }
 
             override fun onClick(widget: View) {
-                context?.let {
-                    Utils.openUrl(it, getString(R.string.privacy_policy))
-                }
+                Utils.openUrl(requireContext(), getString(R.string.privacy_policy))
             }
         }
 
@@ -193,7 +189,7 @@ class AttendeeFragment : Fragment() {
         paymentOptions.add(getString(R.string.stripe))
         attendeeViewModel.paymentSelectorVisibility
             .nonNull()
-            .observe(this, Observer {
+            .observe(viewLifecycleOwner, Observer {
                 if (it) {
                     rootView.paymentSelector.visibility = View.VISIBLE
                 } else {
@@ -255,8 +251,9 @@ class AttendeeFragment : Fragment() {
                         else -> 0
                     }
                 }
-                    setCardSelectorAndError(pos, visibility = false, error = false)
+                setCardSelectorAndError(pos, visibility = false, error = false)
             }
+
             fun setCardSelectorAndError(pos: Int, visibility: Boolean, error: Boolean) {
                 rootView.cardSelector.setSelection(pos, true)
                 rootView.cardSelector.isVisible = visibility
@@ -314,7 +311,7 @@ class AttendeeFragment : Fragment() {
         }
         attendeeViewModel.qtyList
             .nonNull()
-            .observe(this, Observer {
+            .observe(viewLifecycleOwner, Observer {
                 ticketsRecyclerAdapter.setQty(it)
             })
 
@@ -329,40 +326,40 @@ class AttendeeFragment : Fragment() {
 
         attendeeViewModel.ticketDetailsVisibility
             .nonNull()
-            .observe(this, Observer {
+            .observe(viewLifecycleOwner, Observer {
                 rootView.view.text = if (it) getString(R.string.hide) else getString(R.string.view)
                 rootView.ticketDetails.visibility = if (it) View.VISIBLE else View.GONE
             })
 
         attendeeViewModel.message
             .nonNull()
-            .observe(this, Observer {
+            .observe(viewLifecycleOwner, Observer {
                 Snackbar.make(rootView, it, Snackbar.LENGTH_LONG).show()
             })
 
         attendeeViewModel.progress
             .nonNull()
-            .observe(this, Observer {
+            .observe(viewLifecycleOwner, Observer {
                 rootView.progressBarAttendee.isVisible = it
                 rootView.register.isEnabled = !it
             })
 
         attendeeViewModel.event
             .nonNull()
-            .observe(this, Observer {
+            .observe(viewLifecycleOwner, Observer {
                 loadEventDetails(it)
             })
 
         attendeeViewModel.totalAmount
             .nonNull()
-            .observe(this, Observer {
+            .observe(viewLifecycleOwner, Observer {
                 amount = it
             })
 
         attendeeRecyclerAdapter.eventId = eventId
         attendeeViewModel.tickets
             .nonNull()
-            .observe(this, Observer { tickets ->
+            .observe(viewLifecycleOwner, Observer { tickets ->
                 ticketsRecyclerAdapter.addAll(tickets)
                 ticketsRecyclerAdapter.notifyDataSetChanged()
                 if (!singleTicket)
@@ -377,21 +374,21 @@ class AttendeeFragment : Fragment() {
 
         attendeeViewModel.totalQty
             .nonNull()
-            .observe(this, Observer {
+            .observe(viewLifecycleOwner, Observer {
                 rootView.qty.text = " — $it items"
             })
 
         attendeeViewModel.countryVisibility
             .nonNull()
-            .observe(this, Observer {
+            .observe(viewLifecycleOwner, Observer {
                 if (singleTicket) {
                     rootView.countryPickerContainer.visibility = if (it) View.VISIBLE else View.GONE
                 }
             })
 
         attendeeViewModel.paymentCompleted
             .nonNull()
-            .observe(this, Observer {
+            .observe(viewLifecycleOwner, Observer {
                 if (it)
                     openOrderCompletedFragment()
             })
@@ -401,7 +398,7 @@ class AttendeeFragment : Fragment() {
 
         attendeeViewModel.attendee
             .nonNull()
-            .observe(this, Observer { user ->
+            .observe(viewLifecycleOwner, Observer { user ->
                 helloUser.text = "Hello ${user.firstName.nullToEmpty()}"
                 firstName.text = Editable.Factory.getInstance().newEditable(user.firstName.nullToEmpty())
                 lastName.text = Editable.Factory.getInstance().newEditable(user.lastName.nullToEmpty())
@@ -422,7 +419,7 @@ class AttendeeFragment : Fragment() {
 
         attendeeViewModel.forms
             .nonNull()
-            .observe(this, Observer {
+            .observe(viewLifecycleOwner, Observer {
                 if (singleTicket)
                     fillInformationSection(it)
                 attendeeRecyclerAdapter.setCustomForm(it)
@@ -443,43 +440,53 @@ class AttendeeFragment : Fragment() {
                     "Please accept the terms and conditions!", Snackbar.LENGTH_LONG).show()
                 return@setOnClickListener
             }
-            val attendees = ArrayList<Attendee>()
-            if (singleTicket) {
-                val pos = ticketIdAndQty?.map { it.second }?.indexOf(1)
-                val ticket = pos?.let { it1 -> ticketIdAndQty?.get(it1)?.first?.toLong() } ?: -1
-                val attendee = Attendee(id = attendeeViewModel.getId(),
-                    firstname = firstName.text.toString(),
-                    lastname = lastName.text.toString(),
-                    city = getAttendeeField("city"),
-                    address = getAttendeeField("address"),
-                    state = getAttendeeField("state"),
-                    email = email.text.toString(),
-                    ticket = TicketId(ticket),
-                    event = eventId)
-                attendees.add(attendee)
-            } else {
-                attendees.addAll(attendeeRecyclerAdapter.attendeeList)
+
+            val builder = AlertDialog.Builder(requireContext())
+            builder.setTitle(R.string.confirmation_dialog)
+
+            builder.setPositiveButton(android.R.string.yes) { dialog, which ->
+                val attendees = ArrayList<Attendee>()
+                if (singleTicket) {
+                    val pos = ticketIdAndQty?.map { it.second }?.indexOf(1)
+                    val ticket = pos?.let { it1 -> ticketIdAndQty?.get(it1)?.first?.toLong() } ?: -1
+                    val attendee = Attendee(id = attendeeViewModel.getId(),
+                        firstname = firstName.text.toString(),
+                        lastname = lastName.text.toString(),
+                        city = getAttendeeField("city"),
+                        address = getAttendeeField("address"),
+                        state = getAttendeeField("state"),
+                        email = email.text.toString(),
+                        ticket = TicketId(ticket),
+                        event = eventId)
+                    attendees.add(attendee)
+                } else {
+                    attendees.addAll(attendeeRecyclerAdapter.attendeeList)
+                }
+
+                if (attendeeViewModel.areAttendeeEmailsValid(attendees)) {
+                    val country = rootView.countryPicker.selectedItem.toString()
+                    attendeeViewModel.createAttendees(attendees, country, paymentOptions[selectedPaymentOption])
+
+                    attendeeViewModel.isAttendeeCreated.observe(viewLifecycleOwner, Observer { isAttendeeCreated ->
+                        if (isAttendeeCreated && selectedPaymentOption ==
+                            paymentOptions.indexOf(getString(R.string.stripe))) {
+                            sendToken()
+                        }
+                    })
+                } else Snackbar.make(rootView.attendeeScrollView, "Invalid email address!", Snackbar.LENGTH_LONG).show()
             }
 
-            if (attendeeViewModel.areAttendeeEmailsValid(attendees)) {
-                val country = rootView.countryPicker.selectedItem.toString()
-                attendeeViewModel.createAttendees(attendees, country, paymentOptions[selectedPaymentOption])
+            builder.setNegativeButton(android.R.string.no) { dialog, which ->
+                Snackbar.make(rootView, R.string.order_not_completed, Snackbar.LENGTH_SHORT).show()
+            }
+            builder.show()
 
-                attendeeViewModel.isAttendeeCreated.observe(this, Observer { isAttendeeCreated ->
-                    if (isAttendeeCreated && selectedPaymentOption ==
-                        paymentOptions.indexOf(getString(R.string.stripe))) {
-                        sendToken()
-                    }
+            attendeeViewModel.ticketSoldOut
+                .nonNull()
+                .observe(this, Observer {
+                    showTicketSoldOutDialog(it)
                 })
-            } else Snackbar.make(rootView.attendeeScrollView, "Invalid email address!", Snackbar.LENGTH_LONG).show()
         }
-
-        attendeeViewModel.ticketSoldOut
-            .nonNull()
-            .observe(this, Observer {
-                showTicketSoldOutDialog(it)
-            })
-
         return rootView
     }