user profile fix

MuindiStephen · Mar 11, 2024 · acdd14b · acdd14b
1 parent 5fcc996
commit acdd14b
Show file tree

Hide file tree

Showing 6 changed files with 14 additions and 10 deletions.
diff --git a/app/src/main/java/com/steve_md/smartmkulima/data/repositories/AuthRepository.kt b/app/src/main/java/com/steve_md/smartmkulima/data/repositories/AuthRepository.kt
@@ -4,6 +4,6 @@ import com.google.firebase.auth.AuthResult
 import com.steve_md.smartmkulima.utils.Resource
 
 interface AuthRepository {
-    suspend fun register(email: String, userName: String, password: String, confirmPassword: String) : Resource<AuthResult>
+    suspend fun register(username: String, email: String,  password: String, confirmPassword: String) : Resource<AuthResult>
     suspend fun login(email: String, password: String) : Resource<AuthResult>
 }
diff --git a/app/src/main/java/com/steve_md/smartmkulima/data/repositories/impl/AuthRepositoryImpl.kt b/app/src/main/java/com/steve_md/smartmkulima/data/repositories/impl/AuthRepositoryImpl.kt
@@ -18,16 +18,16 @@ class AuthRepositoryImpl : AuthRepository{
     private  val firebaseAuth: FirebaseAuth =  FirebaseAuth.getInstance()
 
     override suspend fun register(
+        username: String,
         email: String,
-        userName: String,
         password: String,
         confirmPassword: String
     ): Resource<AuthResult> {
         return withContext(Dispatchers.IO) {
             safeCall{
                 val result = firebaseAuth.createUserWithEmailAndPassword(email, password).await()
                 val uid = result.user?.uid!!
-                val user = User(uid,email,userName,password,confirmPassword)
+                val user = User(uid,email,username,password,confirmPassword)
                 databaseReference.child(uid).setValue(user).await()
                 Resource.Success(result)
             }

diff --git a/...c/main/java/com/steve_md/smartmkulima/ui/fragments/auth/SignUpDetailsWithEmailFragment.kt b/...c/main/java/com/steve_md/smartmkulima/ui/fragments/auth/SignUpDetailsWithEmailFragment.kt
@@ -85,6 +85,7 @@ class SignUpDetailsWithEmailFragment : Fragment() {
         ) {
             binding.progressBarSignUp.isVisible = false
             displaySnackBar("Account created successfully")
+            navigateToLogin()
         })
     }
 

diff --git a/app/src/main/java/com/steve_md/smartmkulima/ui/fragments/main/HomeDashboardFragment.kt b/app/src/main/java/com/steve_md/smartmkulima/ui/fragments/main/HomeDashboardFragment.kt
@@ -51,7 +51,7 @@ class HomeDashboardFragment : Fragment() {
 
         databaseReference = FirebaseDatabase.getInstance().getReference("users").child(userId!!)
 
-         databaseReference.child("username")
+         databaseReference.child("email")
              .addListenerForSingleValueEvent(object : ValueEventListener{
                  override fun onDataChange(snapshot: DataSnapshot) {
                      val username = snapshot.getValue(String::class.java)
@@ -61,7 +61,7 @@ class HomeDashboardFragment : Fragment() {
                              val pascalCaseUsername = username.substring(0, 1)
                                  .uppercase(Locale.getDefault()) + username.substring(1)
                                  .lowercase(Locale.getDefault())
-                             binding.includeToolBar.userNameTextView.text = pascalCaseUsername
+                             binding.includeToolBar.userNameTextView.text = username
                          }
                          Timber.tag("$this@HomeDashboardFragment").d("$username is loggedIn" )
                      }

diff --git a/app/src/main/java/com/steve_md/smartmkulima/utils/Event.kt b/app/src/main/java/com/steve_md/smartmkulima/utils/Event.kt
@@ -3,6 +3,9 @@ package com.steve_md.smartmkulima.utils
 import androidx.lifecycle.Observer
 
 
+/**
+ * Handle events that are happening in the observer
+ */
 class Event<out T>(private val content: T) {
     private var hasBeenHandled = false
 
@@ -21,13 +24,13 @@ class EventObserver<T>(
     private inline val onLoading: (() -> Unit)? = null,
     private inline val onSuccess: (T) -> Unit
 ) : Observer<Event<Resource<T>>> {
-    override fun onChanged(t: Event<Resource<T>>) {
-        when (val content = t.peekContent()) {
+    override fun onChanged(value: Event<Resource<T>>) {
+        when (val content = value.peekContent()) {
             is Resource.Success -> {
                 content.data?.let(onSuccess)
             }
             is Resource.Error -> {
-                t.getContentIfNotHandled().let {
+                value.getContentIfNotHandled().let {
                     onError?.let { error ->
                         error(it?.message!!)
                     }

diff --git a/app/src/main/java/com/steve_md/smartmkulima/viewmodel/AuthViewModel.kt b/app/src/main/java/com/steve_md/smartmkulima/viewmodel/AuthViewModel.kt
@@ -31,8 +31,8 @@ class AuthViewModel @Inject constructor(
 
 
     fun registerUser(
-        email: String,
         username: String,
+        email: String,
         confirmPassword: String,
         password: String,
     ) {
@@ -54,7 +54,7 @@ class AuthViewModel @Inject constructor(
         _registerStatus.postValue(Event(Resource.Loading()))
 
         viewModelScope.launch(dispatcher) {
-            val result = authRepository.register(email, username, password, confirmPassword)
+            val result = authRepository.register(username, email,password, confirmPassword)
             _registerStatus.postValue(Event(result))
         }
     }