profile thumbnail removed, with minor UI updates and fixes

Author: danishjamal104

app/src/main/java/com/github/code/gambit/helper/auth/AuthData.kt

@@ -4,6 +4,5 @@ data class AuthData(
     var fullname: String,
     var email: String,
     var password: String,
-    var thumbnail: String?,
     var confirmationCode: String?
 )

app/src/main/java/com/github/code/gambit/ui/activity/main/MainActivity.kt

@@ -24,6 +24,7 @@ import com.github.code.gambit.databinding.ActivityMainBinding
 import com.github.code.gambit.helper.file.FileUploadState
 import com.github.code.gambit.ui.OnItemClickListener
 import com.github.code.gambit.ui.fragment.BottomNavController
+import com.github.code.gambit.ui.fragment.auth.AuthFragment
 import com.github.code.gambit.ui.fragment.home.main.HomeFragment
 import com.github.code.gambit.utility.SystemManager
 import com.github.code.gambit.utility.extention.bottomNavHide
@@ -212,6 +213,12 @@ class MainActivity : AppCompatActivity(), BottomNavController {
 
     override fun onBackPressed() {
         if (!userManager.isAuthenticated()) {
+            val fragment =
+                supportFragmentManager.findFragmentById(R.id.nav_host_fragment_container)?.childFragmentManager?.fragments?.first()
+            if (fragment is AuthFragment && fragment.currentPage != 0) {
+                fragment.setPage(0)
+                return
+            }
             super.onBackPressed()
             return
         }

app/src/main/java/com/github/code/gambit/ui/fragment/auth/AuthFragment.kt

@@ -27,7 +27,7 @@ class AuthFragment : Fragment(R.layout.fragment_auth) {
     private lateinit var _binding: FragmentAuthBinding
     private val binding get() = _binding
 
-    private val currentPage get() = binding.fragmentContainer.currentItem
+    val currentPage get() = binding.fragmentContainer.currentItem
 
     private val viewModel: AuthViewModel by viewModels()
 
@@ -171,4 +171,10 @@ class AuthFragment : Fragment(R.layout.fragment_auth) {
     private fun enableInteraction() {
         binding.buttonSubmit.isEnabled = true
     }
+
+    fun setPage(page: Int) {
+        if (page == 0 || page == 1) {
+            binding.tabLayout.getTabAt(page)?.select()
+        }
+    }
 }

app/src/main/java/com/github/code/gambit/ui/fragment/auth/AuthViewModel.kt

@@ -101,7 +101,7 @@ constructor(
     }
 
     private suspend fun resetForgotPassword(userEmail: String, newPassword: String, confirmationCode: String) {
-        when (val res = authRepository.resetForgotPassword(AuthData("", userEmail, newPassword, null, confirmationCode))) {
+        when (val res = authRepository.resetForgotPassword(AuthData("", userEmail, newPassword, confirmationCode))) {
             is ServiceResult.Error -> {
                 if (res.exception.cause is CodeMismatchException) {
                     postValue(AuthState.CodeMissMatch)

app/src/main/java/com/github/code/gambit/ui/fragment/auth/LoginFragment.kt

@@ -96,7 +96,7 @@ class LoginFragment : Fragment(R.layout.fragment_login) {
         if (error) {
             return null
         }
-        return AuthData("", username, password, null, null)
+        return AuthData("", username, password, null)
     }
 
     // validates the input fields
@@ -122,6 +122,6 @@ class LoginFragment : Fragment(R.layout.fragment_login) {
             binding.root.snackbar("Validation error!!")
             return null
         }
-        return AuthData("", username, password, null, null)
+        return AuthData("", username, password, null)
     }
 }

app/src/main/java/com/github/code/gambit/ui/fragment/auth/SignUpFragment.kt

@@ -1,19 +1,14 @@
 package com.github.code.gambit.ui.fragment.auth
 
-import android.content.Intent
-import android.net.Uri
 import android.os.Bundle
-import android.provider.MediaStore
 import android.view.View
-import androidx.activity.result.ActivityResultLauncher
 import androidx.fragment.app.Fragment
 import com.github.code.gambit.R
 import com.github.code.gambit.databinding.FragmentSignUpBinding
 import com.github.code.gambit.helper.auth.AuthData
 import com.github.code.gambit.utility.SystemManager
 import com.github.code.gambit.utility.extention.snackbar
 import dagger.hilt.android.AndroidEntryPoint
-import timber.log.Timber
 import javax.inject.Inject
 
 @AndroidEntryPoint
@@ -30,31 +25,9 @@ class SignUpFragment : Fragment(R.layout.fragment_sign_up) {
     @Inject
     lateinit var systemManager: SystemManager
 
-    lateinit var launcher: ActivityResultLauncher<Intent>
-    var profileImage: Uri? = null
-
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
         _binding = FragmentSignUpBinding.bind(view)
-
-        binding.dpContainer.setOnClickListener {
-            systemManager.launchActivity(launcher, Intent(Intent.ACTION_PICK, MediaStore.Images.Media.EXTERNAL_CONTENT_URI))
-        }
-    }
-
-    override fun onCreate(savedInstanceState: Bundle?) {
-        super.onCreate(savedInstanceState)
-        registerCallback()
-    }
-
-    private fun registerCallback() {
-        launcher = systemManager.requestImage(this) {
-            if (it != null) {
-                binding.profileImage.setImageURI(it)
-                Timber.i(it.toString())
-                profileImage = it
-            }
-        }
     }
 
     // validates the input fields
@@ -106,6 +79,6 @@ class SignUpFragment : Fragment(R.layout.fragment_sign_up) {
             binding.root.snackbar("Validation error!!")
             return null
         }
-        return AuthData(fullName, userEmail, password, profileImage.toString(), null)
+        return AuthData(fullName, userEmail, password, null)
     }
 }

app/src/main/java/com/github/code/gambit/utility/extention/extension.kt

@@ -34,7 +34,7 @@ fun AuthSignUpOptions.Builder<*>.defaultBuilder(authData: AuthData): AuthSignUpO
         mutableListOf
         (
             AuthUserAttribute(AuthUserAttributeKey.email(), authData.email),
-            AuthUserAttribute(AuthUserAttributeKey.custom(AppConstant.AUTH_ATTRIBUTE_CUSTOM_PROFILE), authData.thumbnail),
+            AuthUserAttribute(AuthUserAttributeKey.custom(AppConstant.AUTH_ATTRIBUTE_CUSTOM_PROFILE), ""),
             AuthUserAttribute(AuthUserAttributeKey.name(), authData.fullname)
         )
     ).build()