Updated some files for better GUI #41
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
lib/screens/activity_edit_sheet.dart
Outdated
| @@ -1,5 +1,8 @@ | |||
| import 'package:flutter/cupertino.dart' as c; | |||
| import 'package:flutter/widgets.dart'; | |||
| import 'package:star_book/models/mood.dart'; | |||
| import 'package:star_book/utils/color.dart'; | |||
| import 'package:star_book/widgets/color_container.dart'; | |||
There was a problem hiding this comment.
Use relative import.
Add them below //Files
There was a problem hiding this comment.
Okay let me check what do you mean.
lib/screens/activity_edit_sheet.dart
Outdated
| @@ -23,6 +26,7 @@ class _ActivityEditSheetState extends State<ActivityEditSheet> { | |||
| Activity activity; | |||
| final TextEditingController titleController = TextEditingController(); | |||
| final TextEditingController noteController = TextEditingController(); | |||
| var containerColor; | |||
There was a problem hiding this comment.
I think that there is no need for this variable
lib/screens/activity_edit_sheet.dart
Outdated
| text: "Mood", | ||
| icon: c.CupertinoIcons.right_chevron, | ||
| color: containerColor, |
There was a problem hiding this comment.
Make a function to get container color
There was a problem hiding this comment.
Working on this
lib/screens/activity_edit_sheet.dart
Outdated
| @@ -70,6 +74,14 @@ class _ActivityEditSheetState extends State<ActivityEditSheet> { | |||
| } | |||
|
|
|||
| Widget _buildBody(BuildContext context) { | |||
| // Before we return the body of the main context/activity sheet, it checks the conditions everytime | |||
There was a problem hiding this comment.
return the result from that function based on the condition.
There was a problem hiding this comment.
Yes let me fix that using the method.
lib/widgets/color_container.dart
Outdated
| ), | ||
| ), | ||
| Container( | ||
| padding: EdgeInsets.symmetric(vertical: 12, horizontal: 12), | ||
| padding: EdgeInsets.symmetric(vertical: 8, horizontal: 8), |
There was a problem hiding this comment.
8 seems a bit small. what do you say?
There was a problem hiding this comment.
8 Looks better but Let me change it to 10
|
Completed all of the tasks, you can review them and let me know for any further changings |
lib/screens/activity_edit_sheet.dart
Outdated
| import '../models/activity.dart'; | ||
| import '../widgets/my_container.dart'; | ||
| import '../controllers/activity.dart'; | ||
| import '../styles/style.dart'; | ||
| import 'package:star_book/utils/color.dart'; |
There was a problem hiding this comment.
Suggested change
| import 'package:star_book/utils/color.dart'; | |
| import '../utils/color.dart'; |
lib/screens/activity_edit_sheet.dart
Outdated
| import '../models/activity.dart'; | ||
| import '../widgets/my_container.dart'; | ||
| import '../controllers/activity.dart'; | ||
| import '../styles/style.dart'; | ||
| import 'package:star_book/utils/color.dart'; | ||
| import 'package:star_book/widgets/color_container.dart'; |
There was a problem hiding this comment.
Suggested change
| import 'package:star_book/widgets/color_container.dart'; | |
| import '../widgets/color_container.dart'; |
lib/screens/activity_edit_sheet.dart
Outdated
| @@ -54,6 +55,14 @@ class _ActivityEditSheetState extends State<ActivityEditSheet> { | |||
| Navigator.of(context, rootNavigator: true).pop(); | |||
| } | |||
|
|
|||
| c.CupertinoDynamicColor _getMoodColor() { | |||
| return activity.moodId == null | |||
| ? c.CupertinoColors.systemGrey | |||
There was a problem hiding this comment.
Suggested change
| ? c.CupertinoColors.systemGrey | |
| ? c.CupertinoDynamicColor.resolve( c.CupertinoColors.tertiarySystemGroupedBackground, context) |
lib/screens/activity_edit_sheet.dart
Outdated
| return activity.moodId == null | ||
| ? c.CupertinoColors.systemGrey | ||
| : getColor( | ||
| EColor.values[activity.moodId], |
There was a problem hiding this comment.
Suggested change
| EColor.values[activity.moodId], | |
| c.CupertinoDynamicColor.resolve(EColor.values[activity.moodId], context) |
There was a problem hiding this comment.
c.CupertinoDynamicColor _getMoodColor() {
return c.CupertinoDynamicColor.resolve(
activity.moodId == null
? c.CupertinoColors.tertiarySystemGroupedBackground
: getColor(
EColor.values[activity.moodId],
),
context,
);
Closed
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Check the GUI please #40