diff --git a/CHANGELOG.md b/CHANGELOG.md index d196ad85b422..f15e1c2efd92 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -22,4 +22,4 @@ * [#691](https://www.github.com/openfoodfacts/smooth-app/issues/691) - regenerated golden screenshots for profile with bottom bar ([#692](https://www.github.com/openfoodfacts/smooth-app/issues/692)) ([85970d9](https://www.github.com/openfoodfacts/smooth-app/commit/85970d92ae8b4c7d2d457c2566eec97996d4a90c)) * contributors dialog ([#641](https://www.github.com/openfoodfacts/smooth-app/issues/641)) ([b7b7983](https://www.github.com/openfoodfacts/smooth-app/commit/b7b798342559abfaab6824227fd1aea586023b9c)) * deprecated share package + analyzer warnings ([#656](https://www.github.com/openfoodfacts/smooth-app/issues/656)) ([61576de](https://www.github.com/openfoodfacts/smooth-app/commit/61576ded7128aa34b8ac5283532cced4872c8226)) -* null crash in new product page with knowledge panels builder ([#675](https://www.github.com/openfoodfacts/smooth-app/issues/675)) ([76222ac](https://www.github.com/openfoodfacts/smooth-app/commit/76222ac7c106873ef233b42c82b823172305837a)) \ No newline at end of file +* null crash in new product page with knowledge panels builder ([#675](https://www.github.com/openfoodfacts/smooth-app/issues/675)) ([76222ac](https://www.github.com/openfoodfacts/smooth-app/commit/76222ac7c106873ef233b42c82b823172305837a)) diff --git a/packages/smooth_app/lib/pages/personalized_ranking_page.dart b/packages/smooth_app/lib/pages/personalized_ranking_page.dart index cb6d187f08e7..838af776266e 100644 --- a/packages/smooth_app/lib/pages/personalized_ranking_page.dart +++ b/packages/smooth_app/lib/pages/personalized_ranking_page.dart @@ -54,6 +54,8 @@ class _PersonalizedRankingPageState extends State { context.watch(); final LocalDatabase localDatabase = context.watch(); final DaoProductList daoProductList = DaoProductList(localDatabase); + final ThemeData themeData = Theme.of(context); + final ColorScheme colorScheme = themeData.colorScheme; _model.refresh( widget.products, productPreferences, @@ -88,8 +90,8 @@ class _PersonalizedRankingPageState extends State { initialIndex: _ORDERED_MATCH_TABS.indexOf(MatchTab.YES), child: Scaffold( appBar: AppBar( - backgroundColor: Colors.white, - foregroundColor: Colors.black, + backgroundColor: colorScheme.background, + foregroundColor: colorScheme.onBackground, bottom: TabBar( unselectedLabelStyle: const TextStyle( fontSize: 15, @@ -111,7 +113,9 @@ class _PersonalizedRankingPageState extends State { (final int index) => Tab( child: Text( titles[index], - style: TextStyle(color: colors[index]), + style: index == 0 + ? TextStyle(color: themeData.hintColor) + : TextStyle(color: colors[index]), ), ), ), @@ -121,7 +125,10 @@ class _PersonalizedRankingPageState extends State { mainAxisSize: MainAxisSize.max, children: [ Flexible( - child: Text(widget.title, overflow: TextOverflow.fade), + child: Text( + widget.title, + overflow: TextOverflow.fade, + ), ), ], ), diff --git a/packages/smooth_app/pubspec.lock b/packages/smooth_app/pubspec.lock index c3df143d2645..960f6a87e42f 100644 --- a/packages/smooth_app/pubspec.lock +++ b/packages/smooth_app/pubspec.lock @@ -357,13 +357,13 @@ packages: url: "https://pub.dartlang.org" source: hosted version: "2.0.2" - google_ml_barcode_scanner: + google_ml_kit: dependency: "direct main" description: - name: google_ml_barcode_scanner + name: google_ml_kit url: "https://pub.dartlang.org" source: hosted - version: "0.0.2" + version: "0.6.0" hive: dependency: "direct main" description: diff --git a/version.txt b/version.txt index 6e8bf73aa550..0ea3a944b399 100644 --- a/version.txt +++ b/version.txt @@ -1 +1 @@ -0.1.0 +0.2.0