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

Some small bug fixes #45

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

Some small bug fixes #45

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
11f0e25
Update registerScreen.dart
Mainakdey1 Dec 2, 2021
9fb6657
Update settingsValues.dart
Mainakdey1 Dec 2, 2021
dcab1ee
Merge branch 'master' into master
Mainakdey1 Dec 2, 2021
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
10 changes: 5 additions & 5 deletions lib/screens/registerScreen.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,6 @@ class _RegisterScreenState extends State<RegisterScreen> {
await showDialog(
context: context,
builder: (context) => AlertDialog(
title: Text(message),
content: Text(message),
),
).then(
Expand Down Expand Up @@ -133,7 +132,7 @@ class _RegisterScreenState extends State<RegisterScreen> {
TextFormField(
obscureText: true,
decoration: inputDecoration.copyWith(
labelText: 'Password',
labelText: 'Confirm Password',
),
validator: (value) {
if (_confirmPassword.compareTo(_password) != 0) {
Expand Down Expand Up @@ -165,8 +164,9 @@ class _RegisterScreenState extends State<RegisterScreen> {
),
const Flexible(
child: Text(
'I acknowledge I have read and agree to enviroCar\'s Terms and Conditions',
),

'I acknowledge that I have read and agree to enviroCar\'s Terms and Conditions'),

),
],
),
Expand Down Expand Up @@ -247,7 +247,7 @@ class _RegisterScreenState extends State<RegisterScreen> {
_showDialogbox('Email already in use');
} else {
_logger.w('Unknown error while registering');
_showDialogbox('Some other error');
_showDialogbox('An error was encountered.Please try again.');
}
}
},
Expand Down
6 changes: 3 additions & 3 deletions lib/values/settingsValues.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ List<SettingsTileModel> obdModeSettings = [
SettingsTileModel(
title: 'Diesel Consumption Estimation',
subtitle:
'Enables the estimation of consumption values for diesel. NOTE: This feature is just a beta feature.',
'Enables the estimation of consumption values for diesel. NOTE: This is a beta feature.',
isChecked: false,
),
];
Expand All @@ -58,13 +58,13 @@ List<SettingsTileModel> gpsModeSettings = [
SettingsTileModel(
title: 'Enable GPS based track recording',
subtitle:
"Activates an additional recording mode that enables the recording of plain GPS based tracks that does not require an OBD-II adapter.\n\nNOTE: This feature is just a beta feature.",
"Activates an additional recording mode that enables the recording of plain GPS based tracks that does not require an OBD-II adapter.\n\nNOTE: This is a beta feature.",
isChecked: false,
),
SettingsTileModel(
title: 'Automatic Recording (GPS)',
subtitle:
'Activates automatic recording of GPS-based trips based on activity detection mechanisms.\n\nNote: This Android function does not work reliably on some smartphone models.',
'Activates automatic recording of GPS-based trips based on activity detection mechanisms.\n\nNOTE: This Android function does not work reliably on some smartphone models.',
isChecked: false,
),
];
Expand Down