Skip to content
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

Jump to bottom

Error message hard to read #938 #985

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Error message hard to read #938 #985

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
dec1563
first change attempt
abdullah-maher-abbod Jun 30, 2022
5174c2a
change Error text color + add Examples to Phone eroor message
abdullah-maher-abbod Jul 2, 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
1 change: 1 addition & 0 deletions app/src/main/java/org/greenstand/android/TreeTracker/activities/TreeTrackerActivity.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ class TreeTrackerActivity : ComponentActivity() {
private val languageSwitcher: LanguageSwitcher by inject()
private val viewModelFactory: TreeTrackerViewModelFactory by inject()

//hello this is the first change i have made
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

No need to add this comment. Github automatically the lines and file you made changes to.

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yeah this was on the first commit, i was trying learn how deal with github.


@OptIn(ExperimentalComposeApi::class)
override fun onCreate(savedInstanceState: Bundle?) {
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/java/org/greenstand/android/TreeTracker/view/TextButton.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -281,7 +281,7 @@ fun CustomSnackbar(
Text(
text = data.message,
style = CustomTheme.typography.regular,
color = CustomTheme.textColors.darkText
color = CustomTheme.textColors.lightText
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This looks good.

)
},
action = {
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/res/values/strings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@
<string name="selfie_instruction">to take a selfie to continue your registration.</string>
<string name="recapture_tutorial">Click on the button to try capturing the tree again.</string>
<string name="capture_tutorial">Click on the button to save tree.</string>
<string name="phone_validation_error">Invalid Phone number. Phone number must contain at least 7 digits and not more than 15</string>
<string name="phone_validation_error">Invalid Phone number. Phone number must contain at least 7 digits and not more than 15 \n\n Examples: \n\n\t\t- 0123456789 \n\t\t- +44 1123 456789 </string>
<string name="email_validation_error">Invalid email. Email must contain @ symbol</string>
<string name="tree_capture_review_text">Click on the button to add note.</string>
<string name="survey">Survey</string>
Expand Down