Update profile design

Author: MarkNjunge

app/src/main/java/com/marknkamau/justjava/ui/profile/ProfileActivity.kt

@@ -46,37 +46,40 @@ class ProfileActivity : BaseActivity(), ProfileView {
         val database = (application as JustJavaApp).databaseService
         presenter = ProfilePresenter(this, preferencesRepository, auth, database)
 
-        btnSave.setOnClickListener { saveChanges() }
+        btnUpdateProfile.setOnClickListener { saveChanges() }
     }
 
-    override fun showProgressBar() {
+    override fun showOrdersProgressBar() {
         pbLoadingOrders.visibility = View.VISIBLE
     }
 
-    override fun hideProgressBar() {
-        pbLoadingOrders.visibility = View.INVISIBLE
+    override fun hideOrdersProgressBar() {
+        pbLoadingOrders.visibility = View.GONE
+    }
+
+    override fun showProfileProgressBar() {
+        pbUpdatingProject.visibility = View.VISIBLE
+    }
+
+    override fun hideProfileProgressBar() {
+        pbUpdatingProject.visibility = View.GONE
     }
 
     override fun displayNoPreviousOrders() {
-        pbLoadingOrders.visibility = View.GONE
         tvNoOrders.visibility = View.VISIBLE
         rvPreviousOrders.visibility = View.GONE
-//        Toast.makeText(this, "No previous orders", Toast.LENGTH_SHORT).show()
     }
 
     override fun displayPreviousOrders(orderList: MutableList<Order>) {
-        pbLoadingOrders.visibility = View.GONE
         adapter.setItems(orderList)
     }
 
     override fun displayMessage(message: String?) {
-        pbLoadingOrders.visibility = View.GONE
         Toast.makeText(this, message, Toast.LENGTH_SHORT).show()
     }
 
     private fun saveChanges() {
         if (fieldsOk()) {
-            pbLoadingOrders.visibility = View.VISIBLE
             presenter.updateUserDetails(name!!, phone!!, address!!)
         }
     }

app/src/main/java/com/marknkamau/justjava/ui/profile/ProfilePresenter.kt

@@ -5,8 +5,9 @@ import com.marknkamau.justjava.data.local.PreferencesRepository
 import com.marknkamau.justjava.data.network.db.DatabaseService
 import com.marknkamau.justjava.data.models.Order
 import com.marknkamau.justjava.data.models.UserDetails
+import timber.log.Timber
 
-internal class ProfilePresenter(private val activityView: ProfileView,
+internal class ProfilePresenter(private val view: ProfileView,
                                 private val preferencesRepository: PreferencesRepository,
                                 private val authenticationService: AuthenticationService,
                                 private val databaseService: DatabaseService) {
@@ -20,48 +21,52 @@ internal class ProfilePresenter(private val activityView: ProfileView,
 
     private fun getUserDetails() {
         userDetails = preferencesRepository.getUserDetails()
-        activityView.displayUserDetails(userDetails)
+        view.displayUserDetails(userDetails)
     }
 
     private fun getPreviousOrders() {
+        view.showOrdersProgressBar()
         databaseService.getPreviousOrders(authenticationService.getUserId()!!, object : DatabaseService.PreviousOrdersListener {
             override fun onSuccess(previousOrders: MutableList<Order>) {
+                view.hideOrdersProgressBar()
                 if (previousOrders.isEmpty()) {
-                    activityView.displayNoPreviousOrders()
+                    view.displayNoPreviousOrders()
                 } else {
                     val sorted = previousOrders.sortedBy { it.date }.reversed().toMutableList()
-                    activityView.displayPreviousOrders(sorted)
+                    view.displayPreviousOrders(sorted)
                 }
             }
 
             override fun onError(reason: String) {
-                activityView.displayMessage(reason)
+                view.hideOrdersProgressBar()
+                view.displayMessage(reason)
             }
         })
     }
 
     fun updateUserDetails(name: String, phone: String, address: String) {
-        activityView.showProgressBar()
-
+        view.showProfileProgressBar()
         authenticationService.setUserDisplayName(name, object : AuthenticationService.AuthActionListener {
             override fun actionSuccessful(response: String) {
                 databaseService.updateUserDetails(userDetails.id, name, phone, address, object : DatabaseService.WriteListener {
                     override fun onSuccess() {
                         val newUserDetails = UserDetails(userDetails.id, userDetails.email, name, phone, address)
 
                         preferencesRepository.saveUserDetails(newUserDetails)
-                        activityView.hideProgressBar()
-                        activityView.displayMessage("Default values updated")
+                        view.hideProfileProgressBar()
+                        view.displayMessage("Profile updated")
                     }
 
                     override fun onError(reason: String) {
-
+                        Timber.e(reason)
+                        view.hideProfileProgressBar()
+                        view.displayMessage(reason)
                     }
                 })
             }
 
             override fun actionFailed(response: String?) {
-                activityView.displayMessage(response)
+                view.displayMessage(response)
             }
         })
     }

app/src/main/java/com/marknkamau/justjava/ui/profile/ProfileView.kt

@@ -5,8 +5,10 @@ import com.marknkamau.justjava.data.models.UserDetails
 
 internal interface ProfileView {
     fun displayUserDetails(userDetails: UserDetails)
-    fun showProgressBar()
-    fun hideProgressBar()
+    fun showOrdersProgressBar()
+    fun hideOrdersProgressBar()
+    fun showProfileProgressBar()
+    fun hideProfileProgressBar()
     fun displayNoPreviousOrders()
     fun displayPreviousOrders(orderList: MutableList<Order>)
     fun displayMessage(message: String?)