Skip to content

Android platform & binding utilities #27

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
hrodrick merged 13 commits into from
Aug 30, 2022
Merged

Android platform & binding utilities #27

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
5794e99
Merge branch 'feature/sign_up_example' into feature/android-utilities
Jul 28, 2022
67cb169
Utility extensions for android. Usage in activity
Aug 3, 2022
496657e
api method name changes
Aug 4, 2022
8b5f1b6
Merge example form to android utilities and apply the extensions
Aug 9, 2022
28e81e9
Add Kdoc to FlowForms utilities and LiveData binding
Aug 10, 2022
b8d57dc
Updated github action to make a general build & test
Aug 10, 2022
749e8bd
Improve Kdocs, add Required optional config vars
Aug 18, 2022
7cb0fc5
Renamed OnFieldFocusChangeListener to OnFocusChangeListenerDecorator
Aug 18, 2022
15f3a00
merge develop into Android utilities
Aug 18, 2022
942224d
Fix references not found on FlowFormTest class
Aug 19, 2022
ebc6c5f
Remove spaces requested in CR
Aug 23, 2022
cc55987
Remove spaces before colons
Aug 24, 2022
3e30f80
Merge branch 'main' into feature/android-utilities
hrodrick Aug 30, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions .github/workflows/gradle.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# This workflow will build a Kotlin project with Gradle and cache/restore any dependencies to improve the workflow execution time

name: Test FlowForms core - jvm
name: Build & Test FlowForms Core

# Runs on every push to main and every pull request to main
on:
Expand All @@ -26,6 +26,6 @@ jobs:
distribution: 'temurin'
- name: Setup Gradle
uses: gradle/gradle-build-action@v2
- name: Build and test FF Core - jvm with Gradle
run: ./gradlew FlowForms-Core:jvmTest
- name: Gradle check task - Build and Test FlowForms-Core
run: ./gradlew FlowForms-Core:check

146 changes: 61 additions & 85 deletions ExampleApp Android/src/main/java/com/rootstrap/flowforms/example/MainActivity.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,12 @@ package com.rootstrap.flowforms.example

import android.os.Bundle
import androidx.appcompat.app.AppCompatActivity
import androidx.core.widget.doAfterTextChanged
import androidx.lifecycle.Lifecycle
import androidx.lifecycle.ViewModelProvider
import androidx.lifecycle.lifecycleScope
import androidx.lifecycle.repeatOnLifecycle
import com.rootstrap.flowforms.core.common.StatusCodes.CORRECT
import com.rootstrap.flowforms.core.common.StatusCodes.UNMODIFIED
import com.rootstrap.flowforms.core.field.FieldStatus
import com.rootstrap.flowforms.core.form.FormStatus
import com.rootstrap.flowforms.example.SignUpFormModel.Companion.CONFIRMATION
import com.rootstrap.flowforms.example.SignUpFormModel.Companion.CONFIRM_PASSWORD
import com.rootstrap.flowforms.example.SignUpFormModel.Companion.EMAIL
Expand All @@ -19,12 +18,12 @@ import com.rootstrap.flowforms.example.databinding.ActivityMainBinding
import com.rootstrap.flowforms.example.validations.ValidEmail.Companion.INVALID_EMAIL
import com.rootstrap.flowforms.example.validations.ValidEmail.Companion.MIN_LENGTH_UNSATISFIED
import com.rootstrap.flowforms.example.validations.ValidEmail.Companion.PASSWORD_MATCH_UNSATISFIED
import kotlinx.coroutines.launch

import com.rootstrap.flowforms.util.bind
import com.rootstrap.flowforms.util.repeatOnLifeCycleScope

class MainActivity : AppCompatActivity() {

lateinit var viewModel: SignUpViewModel
private lateinit var viewModel: SignUpViewModel
private lateinit var binding: ActivityMainBinding

override fun onCreate(savedInstanceState: Bundle?) {
Expand All @@ -35,96 +34,73 @@ class MainActivity : AppCompatActivity() {
binding.lifecycleOwner = this
binding.formModel = viewModel.formModel

lifecycleScope.launch {
repeatOnLifecycle(Lifecycle.State.STARTED) {
launch {
viewModel.form.fields.collect {
lifecycleScope.launch {
repeatOnLifecycle(Lifecycle.State.STARTED) {
launch {
it[NAME]?.status?.collect { status ->
when (status.code) {
CORRECT, UNMODIFIED -> binding.nameInputLayout.error = null
else -> binding.nameInputLayout.error = getString(R.string.required_field)
}
}
}
launch {
it[EMAIL]?.status?.collect { status ->
when (status.code) {
CORRECT, UNMODIFIED -> binding.emailInputLayout.error = null
INVALID_EMAIL -> binding.emailInputLayout.error = getString(R.string.invalid_email)
else -> binding.emailInputLayout.error = getString(R.string.required_field)
}
}
}
launch {
it[NEW_PASSWORD]?.status?.collect { status ->
when (status.code) {
CORRECT, UNMODIFIED -> binding.passwordInputLayout.error = null
MIN_LENGTH_UNSATISFIED -> binding.passwordInputLayout.error = getString(R.string.min_length, MIN_PASSWORD_LENGTH)
else -> binding.passwordInputLayout.error = getString(R.string.required_field)
}
}
}
launch {
it[CONFIRM_PASSWORD]?.status?.collect { status ->
when (status.code) {
CORRECT, UNMODIFIED -> binding.confirmPasswordInputLayout.error = null
MIN_LENGTH_UNSATISFIED -> binding.confirmPasswordInputLayout.error = getString(R.string.min_length, MIN_PASSWORD_LENGTH)
PASSWORD_MATCH_UNSATISFIED -> binding.confirmPasswordInputLayout.error = getString(R.string.password_match)
else -> binding.confirmPasswordInputLayout.error = getString(R.string.required_field)
}
}
}
}
}
}
}
listenStatusChanges()
bindFields()
}

launch {
viewModel.form.status.collect { status ->
when (status.code) {
CORRECT -> {
binding.continueButton.isEnabled = true
}
else -> {
binding.continueButton.isEnabled = false
}
}
}
}
}
private fun listenStatusChanges() {
viewModel.form.fields.value.let {
repeatOnLifeCycleScope(
{ it[NAME]?.status?.collect(::onNameStatusChange) },
{ it[EMAIL]?.status?.collect(::onEmailStatusChange) },
{ it[NEW_PASSWORD]?.status?.collect(::onPasswordStatusChange) },
{ it[CONFIRM_PASSWORD]?.status?.collect(::onConfirmPasswordChange) },
{ viewModel.form.status.collect(::onFormStatusChange) }
)
}
}

binding.nameInputEditText.doAfterTextChanged {
lifecycleScope.launch {
viewModel.form.validateOnValueChange(NAME)
}
private fun bindFields() {
binding.apply {
viewModel.form.bind(lifecycleScope,
nameInputEditText to NAME,
emailInputEditText to EMAIL,
passwordInputEditText to NEW_PASSWORD,
confirmPasswordInputEditText to CONFIRM_PASSWORD
)
viewModel.form.bind(this@MainActivity, lifecycleScope,
viewModel.formModel.confirm to CONFIRMATION
)
}
}

binding.emailInputEditText.doAfterTextChanged {
lifecycleScope.launch {
viewModel.form.validateOnValueChange(EMAIL)
}
private fun onNameStatusChange(status: FieldStatus) {
when (status.code) {
CORRECT, UNMODIFIED -> binding.nameInputLayout.error = null
else -> binding.nameInputLayout.error = getString(R.string.required_field)
}
}

binding.passwordInputEditText.doAfterTextChanged {
lifecycleScope.launch {
viewModel.form.validateOnValueChange(NEW_PASSWORD)
}
private fun onEmailStatusChange(status: FieldStatus) {
when (status.code) {
CORRECT, UNMODIFIED -> binding.emailInputLayout.error = null
INVALID_EMAIL -> binding.emailInputLayout.error = getString(R.string.invalid_email)
else -> binding.emailInputLayout.error = getString(R.string.required_field)
}
}

binding.confirmPasswordInputEditText.doAfterTextChanged {
lifecycleScope.launch {
viewModel.form.validateOnValueChange(CONFIRM_PASSWORD)
}
private fun onPasswordStatusChange(status: FieldStatus) {
when (status.code) {
CORRECT, UNMODIFIED -> binding.passwordInputLayout.error = null
MIN_LENGTH_UNSATISFIED -> binding.passwordInputLayout.error = getString(R.string.min_length, MIN_PASSWORD_LENGTH)
else -> binding.passwordInputLayout.error = getString(R.string.required_field)
}
}

viewModel.formModel.confirm.observe(this) {
lifecycleScope.launch {
viewModel.form.validateOnValueChange(CONFIRMATION)
}
private fun onConfirmPasswordChange(status: FieldStatus) {
when (status.code) {
CORRECT, UNMODIFIED -> binding.confirmPasswordInputLayout.error = null
MIN_LENGTH_UNSATISFIED -> binding.confirmPasswordInputLayout.error = getString(R.string.min_length, MIN_PASSWORD_LENGTH)
PASSWORD_MATCH_UNSATISFIED -> binding.confirmPasswordInputLayout.error = getString(R.string.password_match)
else -> binding.confirmPasswordInputLayout.error = getString(R.string.required_field)
}
}

private fun onFormStatusChange(status: FormStatus) {
when (status.code) {
CORRECT -> binding.continueButton.isEnabled = true
else -> binding.continueButton.isEnabled = false
}
}

}
5 changes: 3 additions & 2 deletions ExampleApp Android/src/main/java/com/rootstrap/flowforms/example/SignUpViewModel.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,16 +10,17 @@ import com.rootstrap.flowforms.example.SignUpFormModel.Companion.EMAIL
import com.rootstrap.flowforms.example.SignUpFormModel.Companion.MIN_PASSWORD_LENGTH
import com.rootstrap.flowforms.example.SignUpFormModel.Companion.NAME
import com.rootstrap.flowforms.example.SignUpFormModel.Companion.NEW_PASSWORD
import com.rootstrap.flowforms.example.validations.MinLength
import com.rootstrap.flowforms.example.validations.Match
import com.rootstrap.flowforms.example.validations.MinLength
import com.rootstrap.flowforms.example.validations.RequiredTrue
import com.rootstrap.flowforms.example.validations.ValidEmail

class SignUpViewModel : ViewModel() {

val formModel = SignUpFormModel()

val form = FlowForm().withFields(
// TODO : Add async validation example
val form = FlowForm().setFields(
FlowField(NAME, listOf(Required { formModel.name })),
FlowField(EMAIL, listOf(Required { formModel.email }, ValidEmail { formModel.email })),
FlowField(NEW_PASSWORD, listOf(
Expand Down
1 change: 0 additions & 1 deletion FlowForms-Android-Ext/.gitignore
View file
Open in desktop

This file was deleted.

53 changes: 0 additions & 53 deletions FlowForms-Android-Ext/build.gradle.kts
View file
Open in desktop

This file was deleted.

1 change: 0 additions & 1 deletion FlowForms-Android-Ext/consumer-rules.pro
View file
Open in desktop

This file was deleted.

21 changes: 0 additions & 21 deletions FlowForms-Android-Ext/proguard-rules.pro
View file
Open in desktop

This file was deleted.

5 changes: 0 additions & 5 deletions FlowForms-Android-Ext/src/main/AndroidManifest.xml
View file
Open in desktop

This file was deleted.

17 changes: 0 additions & 17 deletions ...ms-Android-Ext/src/test/java/com/rootstrap/flowforms/flowforms_android/ExampleUnitTest.kt
View file
Open in desktop

This file was deleted.

6 changes: 5 additions & 1 deletion FlowForms-Core/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,11 @@ kotlin {
}
val jvmMain by getting
val jvmTest by getting
val androidMain by getting
val androidMain by getting {
dependencies {
implementations(Dependencies.flowFormsAndroidLibraries)
}
}
val androidTest by getting
}
}
Expand Down
Loading