Merge branch 'master' into issue1157

Author: Sakya-Kanuparthy

app/src/main/java/org/greenstand/android/TreeTracker/profile/ProfileScreen.kt

@@ -59,6 +59,12 @@ import org.greenstand.android.TreeTracker.view.LocalImage
 import org.greenstand.android.TreeTracker.view.ProfileField
 import org.greenstand.android.TreeTracker.view.TreeTrackerButton
 import java.io.File
+import org.greenstand.android.TreeTracker.utils.ValidationUtils
+import androidx.compose.material.MaterialTheme
+import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.remember
+import androidx.compose.runtime.setValue
+import androidx.compose.runtime.getValue
 
 @Composable
 fun ProfileScreen(
@@ -79,6 +85,21 @@ fun ProfileScreen(
             }
         }
     }
+    var firstNameError by remember { mutableStateOf<String?>(null) }
+    var lastNameError by remember { mutableStateOf<String?>(null) }
+
+    fun validateNames(): Boolean {
+        val firstName = state.selectedUser?.firstName ?: ""
+        val lastName = state.selectedUser?.lastName ?: ""
+
+        val (firstNameValid, firstError) = ValidationUtils.validateName(firstName)
+        val (lastNameValid, lastError) = ValidationUtils.validateName(lastName)
+
+        firstNameError = firstError
+        lastNameError = lastError
+
+        return firstNameValid && lastNameValid
+    }
     Scaffold(
         topBar = {
             ActionBar(
@@ -155,11 +176,45 @@ fun ProfileScreen(
                 Spacer(modifier = Modifier.height(16.dp))
 
                 ProfileField(stringResource(id = R.string.first_name_hint), selectedUser.firstName, state.editMode) {
-                    viewModel.updateSelectedUser(firstName = it)
+                    newFirstName ->
+
+                    val filtered = ValidationUtils.filterNameInput(newFirstName)
+                    viewModel.updateSelectedUser(firstName = filtered)
+                    if (state.editMode) {
+                        val (_, error) = ValidationUtils.validateName(filtered)
+                        firstNameError = error
+                    }
+                }
+
+                if (state.editMode && firstNameError != null) {
+                    Text(
+                        text = firstNameError!!,
+                        color = MaterialTheme.colors.error,
+                        style = CustomTheme.typography.small,
+                        modifier = Modifier.padding(start = 8.dp, top = 4.dp)
+                    )
                 }
+                Spacer(modifier = Modifier.height(8.dp))
 
-                ProfileField(stringResource(id = R.string.last_name_hint), selectedUser.lastName ?: "", state.editMode) {
-                    viewModel.updateSelectedUser(lastName = it)
+                ProfileField(
+                    stringResource(id = R.string.last_name_hint), selectedUser.lastName ?: "", state.editMode) {
+                    newLastName ->
+                    val filtered = ValidationUtils.filterNameInput(newLastName)
+                    viewModel.updateSelectedUser(lastName = filtered)
+
+                    if (state.editMode) {
+                        val (_, error) = ValidationUtils.validateName(filtered)
+                        lastNameError = error
+                    }
+                }
+
+                if (state.editMode && lastNameError != null) {
+                    Text(
+                        text = lastNameError!!,
+                        color = MaterialTheme.colors.error,
+                        style = CustomTheme.typography.small,
+                        modifier = Modifier.padding(start = 8.dp, top = 4.dp)
+                    )
                 }
                 if (selectedUser.wallet.contains("@")) {
                     ProfileField(stringResource(id = R.string.email_placeholder), selectedUser.wallet ?: "", state.editMode) {
@@ -180,10 +235,16 @@ fun ProfileScreen(
                             .align(Alignment.CenterHorizontally)
                             .size(width = 150.dp, 60.dp),
                         onClick = {
+                            // 验证名字
+                            val firstName = state.selectedUser?.firstName ?: ""
+                            val lastName = state.selectedUser?.lastName ?: ""
 
-                            scope.launch {
-                                viewModel.updateUserInDatabase()
-                                viewModel.updateEditEnabled()
+                            if (ValidationUtils.validateName(firstName).first &&
+                                ValidationUtils.validateName(lastName).first) {
+                                scope.launch {
+                                    viewModel.updateUserInDatabase()
+                                    viewModel.updateEditEnabled()
+                                }
                             }
                         }
                     ) {

app/src/main/java/org/greenstand/android/TreeTracker/signup/NameEntryView.kt

@@ -49,6 +49,13 @@ import org.greenstand.android.TreeTracker.view.ArrowButton
 import org.greenstand.android.TreeTracker.view.BorderedTextField
 import org.greenstand.android.TreeTracker.view.LanguageButton
 import org.greenstand.android.TreeTracker.view.TopBarTitle
+import org.greenstand.android.TreeTracker.utils.ValidationUtils
+import androidx.compose.material.MaterialTheme
+import androidx.compose.material.Text
+import androidx.compose.foundation.layout.padding
+import androidx.compose.ui.unit.dp
+import androidx.compose.foundation.layout.Spacer
+import androidx.compose.foundation.layout.height
 
 @Composable
 fun NameEntryView(viewModel: SignupViewModel, state: SignUpState) {
@@ -95,8 +102,7 @@ fun NameEntryView(viewModel: SignupViewModel, state: SignUpState) {
                 rightAction = {
                     ArrowButton(
                         isLeft = false,
-                        isEnabled = !state.firstName.isNullOrBlank() &&
-                            !state.lastName.isNullOrBlank()
+                        isEnabled = viewModel.isFormValid()
                     ) {
                         cameraLauncher.launch(true)
                     }
@@ -128,6 +134,15 @@ fun NameEntryView(viewModel: SignupViewModel, state: SignUpState) {
                     }
                 )
             )
+            state.firstNameError?.let { error ->
+                Text(
+                    text = error,
+                    color = MaterialTheme.colors.error,
+                    style = MaterialTheme.typography.caption,
+                    modifier = Modifier.padding(start = 8.dp, top = 4.dp)
+                )
+            }
+            Spacer(modifier = Modifier.height(8.dp))
             BorderedTextField(
                 value = state.lastName ?: "",
                 padding = PaddingValues(4.dp),
@@ -146,6 +161,14 @@ fun NameEntryView(viewModel: SignupViewModel, state: SignUpState) {
                     }
                 )
             )
+            state.lastNameError?.let { error ->
+                Text(
+                    text = error,
+                    color = MaterialTheme.colors.error,
+                    style = MaterialTheme.typography.caption,
+                    modifier = Modifier.padding(start = 8.dp, top = 4.dp)
+                )
+            }
         }
     }
 }

app/src/main/java/org/greenstand/android/TreeTracker/signup/SignupViewModel.kt

@@ -25,6 +25,7 @@ import org.greenstand.android.TreeTracker.models.UserRepo
 import org.greenstand.android.TreeTracker.models.user.User
 import org.greenstand.android.TreeTracker.usecases.CheckForInternetUseCase
 import org.greenstand.android.TreeTracker.utilities.Validation
+import org.greenstand.android.TreeTracker.utils.ValidationUtils
 
 // Dequeue breaks equals so state will not be updated when navigating
 data class SignUpState(
@@ -43,6 +44,8 @@ data class SignUpState(
     val isTherePowerUser: Boolean? = null,
     val showSelfieTutorial: Boolean? = null,
     val showPrivacyDialog: Boolean? = true,
+    val firstNameError: String? = null,
+    val lastNameError: String? = null,
 )
 
 sealed class Credential {
@@ -90,11 +93,27 @@ class SignupViewModel(
     }
 
     fun updateFirstName(firstName: String?) {
-        _state.value = _state.value?.copy(firstName = firstName)
+        val filtered = firstName?.let { ValidationUtils.filterNameInput(it) }
+        val (isValid, error) = ValidationUtils.validateName(filtered)
+        _state.value = _state.value?.copy(
+            firstName = filtered,
+            firstNameError = if (filtered.isNullOrEmpty()) null else error
+        )
     }
 
     fun updateLastName(lastName: String?) {
-        _state.value = _state.value?.copy(lastName = lastName)
+        val filtered = lastName?.let { ValidationUtils.filterNameInput(it) }
+        val (isValid, error) = ValidationUtils.validateName(filtered)
+        _state.value = _state.value?.copy(
+            lastName = filtered,
+            lastNameError = if (filtered.isNullOrEmpty()) null else error
+        )
+    }
+    fun isFormValid(): Boolean {
+        val state = _state.value ?: return false
+        val (firstNameValid, _) = ValidationUtils.validateName(state.firstName)
+        val (lastNameValid, _) = ValidationUtils.validateName(state.lastName)
+        return firstNameValid && lastNameValid
     }
 
     fun setExistingUserAsPowerUser(id: Long){

app/src/main/java/org/greenstand/android/TreeTracker/utils/ValidationUtils.kt

@@ -0,0 +1,48 @@
+package org.greenstand.android.TreeTracker.utils
+
+/**
+ * Utility class for validating user input fields
+ */
+object ValidationUtils {
+
+    private val NAME_PATTERN = """^[\p{L}\s'-]+$""".toRegex()
+
+    private val INVALID_CHARS_PATTERN = """[0-9!@#$%^&*()_+=\[\]{};:"|<>?,./\\~`]""".toRegex()
+
+    /**
+     * Validates a name field (first name or last name)
+     * @param name The name to validate
+     * @return Pair of (isValid, errorMessage)
+     */
+    fun validateName(name: String?): Pair<Boolean, String?> {
+        return when {
+            name.isNullOrBlank() -> {
+                false to "Name cannot be empty"
+            }
+            name.trim().length < 2 -> {
+                false to "Name must be at least 2 characters"
+            }
+            name.length > 50 -> {
+                false to "Name cannot exceed 50 characters"
+            }
+            INVALID_CHARS_PATTERN.containsMatchIn(name) -> {
+                false to "Name cannot contain numbers or special characters"
+            }
+            !NAME_PATTERN.matches(name.trim()) -> {
+                false to "Name can only contain letters, spaces, hyphens and apostrophes"
+            }
+            else -> {
+                true to null
+            }
+        }
+    }
+
+    /**
+     * Filters out invalid characters from input
+     */
+    fun filterNameInput(input: String): String {
+        return input.filter { char ->
+            char.isLetter() || char.isWhitespace() || char == '-' || char == '\''
+        }.take(50) // Also enforce max length
+    }
+}

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

@@ -168,6 +168,42 @@
     <string name="no_gps_device_header">Hakuna GPS kwenye kifaa hiki</string>
     <string name="no_gps_device_content">Kifaa hiki hakina uwezo wa kuwa na GPS. Tafadhali tumia kifaa chenye GPS ili kuendelea.</string>
     <string name="tree_capture_review_text">bonyeza kitufe ili kuongeza taarifa</string>
+
+
+    <string name="settings">Mipangilio</string>
+    <string name="profile_title">Tazama / Hariri Wasifu</string>
+    <string name="cancel_edit">Ghairi Hariri</string>
+    <string name="edit_profile">Hariri Wasifu</string>
+    <string name="save_changes">Hifadhi Mabadiliko</string>
+    <string name="loading_user_profile">Inapakia wasifu wa mtumiaji.....</string>
+    <string name="profile_description">Bofya hapa kutazama au kuhariri maelezo ya wasifu wako</string>
+    <string name="privacy_title">Tazama sera ya faragha.</string>
+    <string name="privacy_description">Bofya hapa kutazama sera ya faragha ya Greenstand kuhusu taarifa zako.</string>
+    <string name="logout_title">Toka kwenye akaunti</string>
+    <string name="logout_description">Toka kwenye akaunti yako</string>
+    <string name="delete_account_title">Futa akaunti</string>
+    <string name="account_deleted">Akaunti imefutwa</string>
+    <string name="account_deleted_message">Taarifa zako zote zimefutwa</string>
+    <string name="delete_account_description">Anza mchakato wa kufuta akaunti yako kabisa.</string>
+    <string name="logout_dialog_title">Una uhakika unataka kutoka kwenye akaunto yako?</string>
+    <string name="delete_account_dialog_title">Una uhakika unataka kufuta akauti hii?</string>
+    <string name="delete_account_dialog_message">Una uhakika unataka kufuta akaunti yako? Ukifanya hivi, hutaweza kurudisha tena na data zako zote zitapotea. Hakikisha umeunganishwa na intaneti ili kukamilisha hatua hii.</string>
+    <string name="logout_dialog_message">Una uhakika unataka kutoka kwenya akaunti yako?</string>
+    <string name="announcement">Tangazo</string>
+    <string name="click_to_write_message">Bofya kuandika ujumbe.</string>
+    <string name="no_internet_header">Hamna intaneti.</string>
+    <string name="no_internet_content">Tafadhali ungana na WiFi au washa data ya simu ili kufungua kiungo hiki.</string>
+    <string name="tracking_progress_header">Ufuatiliaji unaendelea.</string>
+    <string name="tracking_progress_message">Usisongeshe simu mpaka ufuatiliaji ukamilike.</string>
+    <string name="privacy_policy">Sera ya faragha</string>
+    <string name="select_tree_height_colour">Chagua rangi ya urefu wa mti.</string>
+    <string name="select_organization">Chagua shirika.</string>
+    <string name="no_messages_yet">Bado hakuna ujumbe.</string>
+    <string name="survey_completed">Utafuti umekamilika.</string>
+    <string name="upload_trees_soon_title">Pakia miti hivi karibuni.</string>
+    <string name="upload_trees_text_content">Una zaidi ya miti 2000, tafadhali pakia haraka iwezekanavyo.</string>
+    <string name="add_note_to_session">Ongeza kumbukumbu kwenye kikao.</string>
+
 </resources>
 
 

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

@@ -204,4 +204,10 @@ Privacy Policy
     <string name="survey_completed">Survey Completed</string>
     <string name="upload_trees_soon_title">Upload Trees Soon</string>
     <string name="upload_trees_text_content">You have over 2000 trees, please upload as soon as you can.</string>
+
+    <string name="error_name_empty">Name cannot be empty</string>
+    <string name="error_name_too_short">Name must be at least 2 characters</string>
+    <string name="error_name_too_long">Name cannot exceed 50 characters</string>
+    <string name="error_name_invalid">Name cannot contain numbers or special characters</string>
+    <string name="error_name_format">Name can only contain letters, spaces, hyphens and apostrophes</string>
 </resources>

app/src/test/java/org/greenstand/android/TreeTracker/utils/ValidationUtilsTest.kt

@@ -0,0 +1,61 @@
+package org.greenstand.android.TreeTracker.utils
+
+import org.junit.Assert.*
+import org.junit.Test
+
+class ValidationUtilsTest {
+
+    @Test
+    fun `valid names should pass validation`() {
+        val validNames = listOf(
+            "John",
+            "Mary-Jane",
+            "O'Connor",
+            "José María",
+            "李明",
+            "François"
+        )
+
+        validNames.forEach { name ->
+            val (isValid, error) = ValidationUtils.validateName(name)
+            assertTrue("$name should be valid", isValid)
+            assertNull("$name should have no error", error)
+        }
+    }
+
+    @Test
+    fun `names with numbers should fail`() {
+        val invalidNames = listOf("John123", "4ever", "Test1")
+
+        invalidNames.forEach { name ->
+            val (isValid, error) = ValidationUtils.validateName(name)
+            assertFalse("$name should be invalid", isValid)
+            assertEquals("Name cannot contain numbers or special characters", error)
+        }
+    }
+
+    @Test
+    fun `names with special characters should fail`() {
+        val invalidNames = listOf("John@Doe", "Test!", "Name#1")
+
+        invalidNames.forEach { name ->
+            val (isValid, error) = ValidationUtils.validateName(name)
+            assertFalse("$name should be invalid", isValid)
+            assertNotNull(error)
+        }
+    }
+
+    @Test
+    fun `empty name should fail`() {
+        val (isValid, error) = ValidationUtils.validateName("")
+        assertFalse(isValid)
+        assertEquals("Name cannot be empty", error)
+    }
+
+    @Test
+    fun `filterNameInput removes invalid characters`() {
+        assertEquals("John", ValidationUtils.filterNameInput("John123"))
+        assertEquals("MaryJane", ValidationUtils.filterNameInput("Mary@Jane"))
+        assertEquals("Test", ValidationUtils.filterNameInput("Test!@#"))
+    }
+}