Aligning Development branches #30
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
Added CI/CD Config for Sickler
* Building emergency section * ui: building emergency screen
* code: lint fixes * code: update packages * code: refactored SizedBoxes to Gap * code: refactored SicklerButton to use FluentIcons, removed SicklerChipButton widget * code: updated build.gradle config * code: building emergency ui * code: building emergency ui * style: icon font generator * ui: fixing weekly selector ui bugs * ui: built emergency contact screen * ui: building emergency section * code: linter fixes * code: ios stuff * code: lint fixes * CI: updated config.yml * UI: small ui updates * UI: Built Emergency alert disclaimer dialog * UI: Built Emergency alert disclaimer dialog * ui: Finished building emergency section - kinda
* ui: building profile section widgets * ui: building profile screen * ui: building profile screen * ui: built settings screen * ui: some refactoring * ui: built profile section
* built water homescreen * Built water screens --------- Co-authored-by: Nuikweh Lewis <[email protected]>
* ui: editing water section * ci: disabled ci tests * ui: refactoring water section
# Conflicts: # .github/workflows/config.yml # lib/core/constants.dart # lib/main.dart # lib/screens/auth/register_screen.dart # lib/screens/auth/sign_in_screen.dart # lib/screens/emergency/add_emergency_contact_screen.dart # lib/screens/emergency/components/contact_card.dart # lib/screens/emergency/components/crisis_history_monthly.dart # lib/screens/emergency/components/crisis_history_weekly.dart # lib/screens/emergency/components/crisis_log_card.dart # lib/screens/emergency/components/dialogs/emergency_alert_disclaimer_dialog.dart # lib/screens/emergency/components/dialogs/emergency_alert_no_contact_dialog.dart # lib/screens/emergency/components/dialogs/emergency_alert_select_contact_dialog.dart # lib/screens/emergency/components/dialogs/emergency_select_contacts_dialog.dart # lib/screens/emergency/components/emergency_contact_radio_item.dart # lib/screens/emergency/components/feeling_checkup_card.dart # lib/screens/emergency/crisis_logs_screen.dart # lib/screens/emergency/emergency_screen.dart # lib/screens/global_components/global_components.dart # lib/screens/global_components/sickler_alert_dialog.dart # lib/screens/global_components/sickler_app_bar.dart # lib/screens/global_components/sickler_chip.dart # lib/screens/global_components/sickler_circular_percent_indicator.dart # lib/screens/global_components/sickler_date_switcher.dart # lib/screens/global_components/sickler_editable_avatar.dart # lib/screens/home/components/emergency_sharing_card.dart # lib/screens/home/components/feeling_card.dart # lib/screens/home/components/meds_reminder_item.dart # lib/screens/home/components/water_card.dart # lib/screens/home/home_screen.dart # lib/screens/meds/add_edit_meds_screen.dart # lib/screens/meds/components/meds_history_item.dart # lib/screens/meds/components/meds_reminder_card.dart # lib/screens/meds/components/meds_type_item.dart # lib/screens/meds/components/my_meds_card.dart # lib/screens/meds/meds_details_screen.dart # lib/screens/meds/meds_schedule_screen.dart # lib/screens/meds/meds_screen.dart # lib/screens/profile/components/vitals_item_card.dart # lib/screens/profile/profile_basic_info_screen.dart # lib/screens/profile/profile_medical_info_screen.dart # lib/screens/profile/profile_screen.dart # lib/screens/profile/profile_vitals_info_screen.dart # lib/screens/profile/settings_screen.dart # lib/screens/water/components/water_bar_chart.dart # lib/screens/water/components/water_log_list_item.dart # lib/screens/water/components/water_statistics.dart # lib/screens/water/components/water_volume_selector.dart # lib/screens/water/edit_daily_goal_screen.dart # lib/screens/water/suggested_water_daily_goal_screen.dart # lib/screens/water/water_empty_screen.dart # lib/screens/water/water_screen.dart # pubspec.yaml
nuilewis
merged commit faf9d9a
into
circle-app-project:development
2 of 3 checks passed
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.
No description provided.