Fixes #99 : profile thumbnail removed, with minor UI updates and fixes

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()

app/src/main/res/drawable/ic_next.xml

@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24"
+    android:tint="?attr/colorControlNormal">
+  <path
+      android:fillColor="@android:color/white"
+      android:pathData="M10,6L8.59,7.41 13.17,12l-4.58,4.59L10,18l6,-6z"/>
+</vector>

app/src/main/res/layout/fragment_auth.xml

@@ -45,10 +45,9 @@
             app:layout_anchorGravity="top|end"
             android:backgroundTint="@color/login_signup_button_color"
             app:icon="@drawable/ic_next"
-            app:iconTint="@color/raw_white"
             app:iconGravity="textEnd"
             app:cornerRadius="12dp"
-            app:iconSize="16dp"
+            app:iconSize="22dp"
             android:layout_marginEnd="32dp"/>
 
 

app/src/main/res/layout/fragment_login.xml

@@ -63,34 +63,6 @@
                 android:inputType="textPassword" />
         </com.google.android.material.textfield.TextInputLayout>
 
-        <LinearLayout
-            android:id="@+id/linearLayout"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="16dp"
-            android:layout_marginTop="16dp"
-            android:weightSum="3">
-
-            <ImageButton
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_gravity="center_vertical"
-                android:layout_weight="2"
-                android:background="@android:color/transparent"
-                android:contentDescription="@string/facebook_authentication"
-                android:src="@drawable/ic_fb" />
-
-            <ImageButton
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginStart="12dp"
-                android:layout_weight="1"
-                android:background="@android:color/transparent"
-                android:contentDescription="@string/google_authentication"
-                android:src="@drawable/ic_gp" />
-
-        </LinearLayout>
-
     </LinearLayout>
 
     <LinearLayout
@@ -100,10 +72,10 @@
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@+id/linearLayout2"
+        app:layout_constraintVertical_bias="0.3"
         android:layout_marginStart="16dp"
         android:layout_marginBottom="32dp">
 
-
         <TextView
             android:id="@+id/forgot_password_text"
             android:layout_width="match_parent"

app/src/main/res/layout/fragment_sign_up.xml

@@ -16,43 +16,22 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_marginStart="16dp"
+            android:paddingTop="64dp"
+            android:paddingBottom="64dp"
             android:orientation="horizontal"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="parent">
 
-            <androidx.cardview.widget.CardView
-                android:id="@+id/profile_upload_image_container"
-                android:layout_width="64dp"
-                android:layout_height="64dp"
-                app:cardCornerRadius="32dp">
-                <ImageView
-                    android:id="@+id/profile_image"
-                    android:layout_width="match_parent"
-                    android:layout_height="match_parent"
-                    android:contentDescription="@string/profile_image"
-                    android:scaleType="centerCrop"
-                    android:src="@drawable/ic_default_dp" />
-            </androidx.cardview.widget.CardView>
-
-            <!--com.google.android.material.floatingactionbutton.FloatingActionButton
-                android:id="@+id/upload_dp_fab"
-                style="@style/Widget.App.FloatingActionButton"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:contentDescription="@string/upload_a_profile_picture_optional"
-                android:src="@drawable/iclink" -->
-
             <TextView
                 android:id="@+id/upload_dp_text"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_gravity="center_vertical"
-                android:layout_marginStart="32dp"
-                android:text="@string/upload_a_profile_picture_optional"
-                android:textColor="@color/black" />
+                android:text="@string/create_new_account"
+                android:textColor="@color/black"
+                android:textSize="24sp"/>
         </LinearLayout>
 
-
         <com.google.android.material.textfield.TextInputLayout
             android:id="@+id/full_name_input"
             style="@style/input_theme"
@@ -121,35 +100,5 @@
                 android:layout_height="match_parent"
                 android:inputType="textPassword" />
         </com.google.android.material.textfield.TextInputLayout>
-
-
-        <LinearLayout
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="16dp"
-            android:visibility="gone"
-            android:weightSum="3"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/password_input">
-
-            <ImageButton
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_gravity="center_vertical"
-                android:layout_weight="2"
-                android:background="@android:color/transparent"
-                android:contentDescription="@string/facebook_authentication"
-                android:src="@drawable/ic_fb" />
-
-            <ImageButton
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginStart="12dp"
-                android:layout_weight="1"
-                android:background="@android:color/transparent"
-                android:contentDescription="@string/google_authentication"
-                android:src="@drawable/ic_gp" />
-
-        </LinearLayout>
     </androidx.constraintlayout.widget.ConstraintLayout>
 </ScrollView>

app/src/main/res/values/strings.xml

@@ -29,7 +29,6 @@
     <string name="forgot_password">Forgot Password?</string>
     <string name="full_name">Full Name</string>
     <string name="confirm_password">Confirm Password</string>
-    <string name="upload_a_profile_picture_optional">Upload a profile picture [Optional]</string>
     <string name="user_email">User Email</string>
     <string name="verification_code">Verification Code</string>
     <string name="please_type_the_verification_code_send_to">Please type the verification code send to</string>
@@ -91,4 +90,5 @@
     <string name="submit">Submit</string>
     <string name="no_change">No change</string>
     <string name="delete">Delete</string>
+    <string name="create_new_account">Create a new account</string>
 </resources>