From ef83b93fa62dd93e1df098bf695f6977df71b436 Mon Sep 17 00:00:00 2001 From: Erik Everardo Date: Sat, 11 Nov 2023 16:58:44 -0600 Subject: [PATCH] WIP sign up --- .idea/navEditor.xml | 64 ++++++++++++++++++ app/src/main/AndroidManifest.xml | 1 + .../isolaatti/connectivity/RetrofitClient.kt | 5 +- .../java/com/isolaatti/login/LogInActivity.kt | 5 ++ .../isolaatti/sign_up/ui/GetCodeFragment.kt | 21 ++++++ .../sign_up/ui/MakeAccountFragment.kt | 6 ++ .../isolaatti/sign_up/ui/SignUpActivity.kt | 26 ++++++++ .../sign_up/ui/ValidateCodeFragment.kt | 6 ++ app/src/main/res/layout/activity_sign_up.xml | 14 ++++ app/src/main/res/layout/fragment_get_code.xml | 65 +++++++++++++++++++ .../main/res/layout/fragment_make_account.xml | 6 ++ .../res/layout/fragment_validate_code.xml | 6 ++ .../res/navigation/sign_up_navigation.xml | 28 ++++++++ app/src/main/res/values/strings.xml | 3 + app/src/main/res/values/themes.xml | 2 +- 15 files changed, 256 insertions(+), 2 deletions(-) create mode 100644 app/src/main/java/com/isolaatti/sign_up/ui/GetCodeFragment.kt create mode 100644 app/src/main/java/com/isolaatti/sign_up/ui/MakeAccountFragment.kt create mode 100644 app/src/main/java/com/isolaatti/sign_up/ui/SignUpActivity.kt create mode 100644 app/src/main/java/com/isolaatti/sign_up/ui/ValidateCodeFragment.kt create mode 100644 app/src/main/res/layout/activity_sign_up.xml create mode 100644 app/src/main/res/layout/fragment_get_code.xml create mode 100644 app/src/main/res/layout/fragment_make_account.xml create mode 100644 app/src/main/res/layout/fragment_validate_code.xml create mode 100644 app/src/main/res/navigation/sign_up_navigation.xml diff --git a/.idea/navEditor.xml b/.idea/navEditor.xml index f86a504..a77cb68 100644 --- a/.idea/navEditor.xml +++ b/.idea/navEditor.xml @@ -386,6 +386,70 @@ + + + + + + + diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index c5a705e..a86231d 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -35,6 +35,7 @@ + \ No newline at end of file diff --git a/app/src/main/java/com/isolaatti/connectivity/RetrofitClient.kt b/app/src/main/java/com/isolaatti/connectivity/RetrofitClient.kt index ba0b91b..22fbc5d 100644 --- a/app/src/main/java/com/isolaatti/connectivity/RetrofitClient.kt +++ b/app/src/main/java/com/isolaatti/connectivity/RetrofitClient.kt @@ -13,7 +13,10 @@ class RetrofitClient @Inject constructor(private val authenticationInterceptor: companion object { // These urls don't need auth header val excludedUrlsFromAuthentication = listOf( - "/api/LogIn" + "/api/LogIn", + "/api/signUp/get_code", + "/api/signUp/validate_code", + "/api/signUp/sign_up_with_code" ) const val BASE_URL = "${BuildConfig.backend}/api/" } diff --git a/app/src/main/java/com/isolaatti/login/LogInActivity.kt b/app/src/main/java/com/isolaatti/login/LogInActivity.kt index 391a6a2..c1eee3c 100644 --- a/app/src/main/java/com/isolaatti/login/LogInActivity.kt +++ b/app/src/main/java/com/isolaatti/login/LogInActivity.kt @@ -17,6 +17,7 @@ import com.isolaatti.R import com.isolaatti.common.IsolaattiBaseActivity import com.isolaatti.databinding.ActivityLoginBinding import com.isolaatti.home.HomeActivity +import com.isolaatti.sign_up.ui.SignUpActivity import com.isolaatti.utils.Resource import dagger.hilt.android.AndroidEntryPoint @@ -87,6 +88,10 @@ class LogInActivity: AppCompatActivity() { openForgotPassword() } + viewBinding.signUpBtn.setOnClickListener { + SignUpActivity.startActivity(this) + } + } private fun openForgotPassword() { diff --git a/app/src/main/java/com/isolaatti/sign_up/ui/GetCodeFragment.kt b/app/src/main/java/com/isolaatti/sign_up/ui/GetCodeFragment.kt new file mode 100644 index 0000000..c9e4597 --- /dev/null +++ b/app/src/main/java/com/isolaatti/sign_up/ui/GetCodeFragment.kt @@ -0,0 +1,21 @@ +package com.isolaatti.sign_up.ui + +import android.os.Bundle +import android.view.LayoutInflater +import android.view.View +import android.view.ViewGroup +import androidx.fragment.app.Fragment +import com.isolaatti.databinding.FragmentGetCodeBinding + +class GetCodeFragment : Fragment() { + + private lateinit var binding: FragmentGetCodeBinding + override fun onCreateView( + inflater: LayoutInflater, + container: ViewGroup?, + savedInstanceState: Bundle? + ): View? { + binding = FragmentGetCodeBinding.inflate(inflater) + return binding.root + } +} \ No newline at end of file diff --git a/app/src/main/java/com/isolaatti/sign_up/ui/MakeAccountFragment.kt b/app/src/main/java/com/isolaatti/sign_up/ui/MakeAccountFragment.kt new file mode 100644 index 0000000..b0fe772 --- /dev/null +++ b/app/src/main/java/com/isolaatti/sign_up/ui/MakeAccountFragment.kt @@ -0,0 +1,6 @@ +package com.isolaatti.sign_up.ui + +import androidx.fragment.app.Fragment + +class MakeAccountFragment : Fragment() { +} \ No newline at end of file diff --git a/app/src/main/java/com/isolaatti/sign_up/ui/SignUpActivity.kt b/app/src/main/java/com/isolaatti/sign_up/ui/SignUpActivity.kt new file mode 100644 index 0000000..a34a4f1 --- /dev/null +++ b/app/src/main/java/com/isolaatti/sign_up/ui/SignUpActivity.kt @@ -0,0 +1,26 @@ +package com.isolaatti.sign_up.ui + +import android.content.Context +import android.content.Intent +import android.os.Bundle +import androidx.appcompat.app.AppCompatActivity +import androidx.core.app.ActivityCompat +import com.isolaatti.databinding.ActivitySignUpBinding + +class SignUpActivity : AppCompatActivity() { + private lateinit var binding: ActivitySignUpBinding + + override fun onCreate(savedInstanceState: Bundle?) { + super.onCreate(savedInstanceState) + + binding = ActivitySignUpBinding.inflate(layoutInflater) + + setContentView(binding.root) + } + + companion object { + fun startActivity(context: Context) { + context.startActivity(Intent(context, SignUpActivity::class.java)) + } + } +} \ No newline at end of file diff --git a/app/src/main/java/com/isolaatti/sign_up/ui/ValidateCodeFragment.kt b/app/src/main/java/com/isolaatti/sign_up/ui/ValidateCodeFragment.kt new file mode 100644 index 0000000..d2d8b33 --- /dev/null +++ b/app/src/main/java/com/isolaatti/sign_up/ui/ValidateCodeFragment.kt @@ -0,0 +1,6 @@ +package com.isolaatti.sign_up.ui + +import androidx.fragment.app.Fragment + +class ValidateCodeFragment : Fragment() { +} \ No newline at end of file diff --git a/app/src/main/res/layout/activity_sign_up.xml b/app/src/main/res/layout/activity_sign_up.xml new file mode 100644 index 0000000..2f42cf1 --- /dev/null +++ b/app/src/main/res/layout/activity_sign_up.xml @@ -0,0 +1,14 @@ + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_get_code.xml b/app/src/main/res/layout/fragment_get_code.xml new file mode 100644 index 0000000..a5e468e --- /dev/null +++ b/app/src/main/res/layout/fragment_get_code.xml @@ -0,0 +1,65 @@ + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_make_account.xml b/app/src/main/res/layout/fragment_make_account.xml new file mode 100644 index 0000000..77d9ef6 --- /dev/null +++ b/app/src/main/res/layout/fragment_make_account.xml @@ -0,0 +1,6 @@ + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_validate_code.xml b/app/src/main/res/layout/fragment_validate_code.xml new file mode 100644 index 0000000..77d9ef6 --- /dev/null +++ b/app/src/main/res/layout/fragment_validate_code.xml @@ -0,0 +1,6 @@ + + + + \ No newline at end of file diff --git a/app/src/main/res/navigation/sign_up_navigation.xml b/app/src/main/res/navigation/sign_up_navigation.xml new file mode 100644 index 0000000..9c78d16 --- /dev/null +++ b/app/src/main/res/navigation/sign_up_navigation.xml @@ -0,0 +1,28 @@ + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 412cfcd..4ad3d8a 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -88,4 +88,7 @@ Change profile photo Profile photo Remove photo + The first step to create an account is to provide your email address. We will send a code that you will need to enter in the next step. + Send + Already have a code? \ No newline at end of file diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml index bb3237f..69fb3b8 100644 --- a/app/src/main/res/values/themes.xml +++ b/app/src/main/res/values/themes.xml @@ -21,7 +21,7 @@ @font/zen_dots_regular 30sp - + @color/purple