Skip to content

Commit

Permalink
Squashed commit of the following:
Browse files Browse the repository at this point in the history
commit 692de25
Author: jasmeet0817 <jasmeet0817@gmail.com>
Date:   Thu Jan 20 21:48:53 2022 +0100

    Add new product addition page [partial impl] (#989)

commit 954449e
Author: monsieurtanuki <fabrice_fontaine@hotmail.com>
Date:   Thu Jan 20 20:28:07 2022 +0100

    feat: #935 - now we display localized (downloaded) data during onboarding (#986)

    Deleted files:
    * `sample_eco_knowledge_panels.json`: replaced by new file `sample_knowledge_panels.json`
    * `sample_health_knowledge_panels.json`: replaced by new file `sample_knowledge_panels.json`

    New files:
    * `abstract_onboarding_data.dart`: Abstraction of data we download, store and reuse at onboarding.
    * `dao_string.dart`: Where we store strings.
    * `loading_dialog.dart`: Dialog with a stop button, while a future is running.
    * `onboarding_data_knowledge_panels.dart`: Helper around knowledge panels we download, store and reuse at onboarding.
    * `onboarding_data_product.dart`: Helper around a product we download, store and reuse at onboarding.
    * `onboarding_loader.dart`: Helper around data we download, store and reuse at onboarding.
    * `sample_knowledge_panels.json`: json data downloaded today for en_US, cf. onboarding_data_knowledge_panels.dart
    * `tmp.dart`: Fixes to off-dart.

    Impacted files:
    * `knowledge_panel_page_template.dart`: added parameters to 1. use the database (and downloaded data) and 2. limit the display to a given panel
    * `knowlegde_panel_builder.dart`: added a method to display only one panel
    * `local_database.dart`: added new dao `DaoString`
    * `new_product_page.dart`: refactored
    * `next_button.dart`: added an optional call to async methods at "next" time - e.g. data download
    * `nutrition_page_loaded.dart`: now uses the new `LoadingDialog`
    * `onboarding_flow_navigator.dart`: now using the database to get more relevant (previoulsy downloaded) data
    * `preferences_page.dart`: now using previously downloaded data instead of assets
    * `product_dialog_helper.dart`: now uses the new `LoadingDialog`
    * `question_card.dart`: unrelated minor refactoring
    * `sample_eco_card_page.dart`: now using previously downloaded data instead of assets, and displaying only the environment card
    * `sample_health_card_page.dart`: now using previously downloaded data instead of assets, and displaying only the health card
    * `sample_product_json.dart`: json data downloaded today for en_US, cf. onboarding_data_product.dart
    * `sign_up_page.dart`: now uses the new `LoadingDialog`

commit fe682a6
Author: Moises <50844424+gatodenegocios@users.noreply.github.com>
Date:   Wed Jan 19 13:49:00 2022 -0300

    feat: sign out confirmation step. Issue: #884 (#979)

    * feat: 🎸 add a confirmation step to log out

    * fix: 🐛 Change the 'log out' term to 'sign out'

    * refactor: 💡 Change the alert dialogue to smooth alert dialog

    * refactor: 💡 removing unused variable 'theme'

    * refactor: 💡 specifying widgets on SmoothAlertDialog actions

    Co-authored-by: Moises Alonso <moises.alonso@codeminer42.com>

commit 6a166aa
Author: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Date:   Wed Jan 19 12:17:47 2022 +0100

    chore: New Crowdin translations to review and merge (#978)

    * New Crowdin translations by Github Action (#677)

    Co-authored-by: Crowdin Bot <support+bot@crowdin.com>

    * chore: New Crowdin translations

    * Update packages/smooth_app/lib/l10n/app_es.arb

    Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
    Co-authored-by: Crowdin Bot <support+bot@crowdin.com>
    Co-authored-by: Pierre Slamich <pierre@openfoodfacts.org>
    Co-authored-by: M123-dev <marvinmoel05@gmail.com>

commit 76f29c8
Author: monsieurtanuki <fabrice_fontaine@hotmail.com>
Date:   Wed Jan 19 10:09:36 2022 +0100

    feat: #931 - displaying the history in dialog instead of log print (#983)

    Impacted files:
    * `smooth_app/pubspec.yaml`: upgraded
    * `smooth_ui_library/pubspec.yaml`: upgraded
    * `smooth_app/pubspec.lock`: impacted by yaml upgrade
    * `smooth_ui_library/pubspec.lock`: impacted by yaml upgrade
    * `smooth_ui_library/example/pubspec.lock`: impacted by yaml upgrade
    * `user_preferences_dev_mode.dart`: displaying the history in dialog instead of log print

commit e7ebbb7
Author: monsieurtanuki <fabrice_fontaine@hotmail.com>
Date:   Wed Jan 19 09:48:30 2022 +0100

    feat: #880 - cosmetic changes and refactoring (#985)

    Impacted files:
    * `app_en.arb`: added a label for "unknown match"
    * `app_fr.arb`: added a label for "unknown match"
    * `personalized_ranking_page.dart`: added style for selected/unselected tab; added label for "unknown match"; added label even when empty list; now using new enum `MatchTab` in order to prevent confusion between indices
    * `smooth_it_model.dart`: added enum `MatchTab` and refactored accordingly

commit e145883
Author: monsieurtanuki <fabrice_fontaine@hotmail.com>
Date:   Tue Jan 18 19:13:57 2022 +0100

    feat: #880 - ranking page similar to mock-ups (#984)

    Impacted files:
    * `app_en.arb`: added 3 labels
    * `app_fr.arb`: added 3 labels
    * `personalized_ranking_page.dart`: reordered the tabs; now using tabs instead of bottom navigation bar; added optional subtitle
    * `smooth_it_model.dart`: removed now useless method and field

commit 8cb5529
Author: jasmeet0817 <jasmeet0817@gmail.com>
Date:   Tue Jan 18 16:09:44 2022 +0100

    Set min length for columns in a row (#980)

    * Scan example onboarding page: Switch svgs of ecoscore and nutriscore

    * Set min length for columns in a row

    * Format

    Co-authored-by: Jasmeet Singh <jasmeetsingh@google.com>
  • Loading branch information
M123-dev committed Jan 23, 2022
1 parent 9d423c1 commit dd368a4
Show file tree
Hide file tree
Showing 166 changed files with 3,720 additions and 2,487 deletions.
617 changes: 0 additions & 617 deletions packages/smooth_app/assets/onboarding/sample_eco_knowledge_panels.json

This file was deleted.

This file was deleted.

0 comments on commit dd368a4

Please sign in to comment.