From 0078dc4b1819f7164ccfc8fbc82f89ae96ef1850 Mon Sep 17 00:00:00 2001 From: Enzo Conty Date: Wed, 20 Dec 2023 11:42:43 +0100 Subject: [PATCH 1/6] feat: Removing the Expanded widget that make the button full width --- .../lib/src/search/search_page.dart | 48 +++++++++---------- 1 file changed, 23 insertions(+), 25 deletions(-) diff --git a/packages/app_center/lib/src/search/search_page.dart b/packages/app_center/lib/src/search/search_page.dart index b3a8333e4..8dcb02985 100644 --- a/packages/app_center/lib/src/search/search_page.dart +++ b/packages/app_center/lib/src/search/search_page.dart @@ -48,31 +48,29 @@ class SearchPage extends StatelessWidget { Row(children: [ Text(l10n.searchPageSortByLabel), const SizedBox(width: 8), - Expanded( - child: Consumer(builder: (context, ref, child) { - final sortOrder = ref.watch(snapSortOrderProvider); - return MenuButtonBuilder( - values: const [ - null, - SnapSortOrder.alphabeticalAsc, - SnapSortOrder.alphabeticalDesc, - SnapSortOrder.downloadSizeAsc, - SnapSortOrder.downloadSizeDesc, - ], - itemBuilder: (context, sortOrder, child) => Text( - sortOrder?.localize(l10n) ?? - l10n.snapSortOrderRelevance, - ), - onSelected: (value) => ref - .read(snapSortOrderProvider.notifier) - .state = value, - child: Text( - sortOrder?.localize(l10n) ?? - l10n.snapSortOrderRelevance, - ), - ); - }), - ), + Consumer(builder: (context, ref, child) { + final sortOrder = ref.watch(snapSortOrderProvider); + return MenuButtonBuilder( + values: const [ + null, + SnapSortOrder.alphabeticalAsc, + SnapSortOrder.alphabeticalDesc, + SnapSortOrder.downloadSizeAsc, + SnapSortOrder.downloadSizeDesc, + ], + itemBuilder: (context, sortOrder, child) => Text( + sortOrder?.localize(l10n) ?? + l10n.snapSortOrderRelevance, + ), + onSelected: (value) => ref + .read(snapSortOrderProvider.notifier) + .state = value, + child: Text( + sortOrder?.localize(l10n) ?? + l10n.snapSortOrderRelevance, + ), + ); + }), if (query != null) ...[ const SizedBox(width: 24), Text(l10n.searchPageFilterByLabel), From ac73b2ef79b0cc84de3ecdc9517db6fd3fa83091 Mon Sep 17 00:00:00 2001 From: Enzo Conty Date: Wed, 20 Dec 2023 12:29:35 +0100 Subject: [PATCH 2/6] deps: Upgrading ubuntu_widgets --- packages/app_center/pubspec.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/app_center/pubspec.yaml b/packages/app_center/pubspec.yaml index faf8e4146..093512c74 100644 --- a/packages/app_center/pubspec.yaml +++ b/packages/app_center/pubspec.yaml @@ -43,7 +43,7 @@ dependencies: ubuntu_logger: ^0.1.0 ubuntu_service: ^0.3.0 ubuntu_test: ^0.1.0-0 - ubuntu_widgets: ^0.3.0 + ubuntu_widgets: ^0.3.1 url_launcher: ^6.2.1 xdg_directories: ^1.0.3 yaru: ^1.2.0 From dc043fb79ab52e8f127c2a6771da5c850d1811a5 Mon Sep 17 00:00:00 2001 From: Enzo Conty Date: Wed, 20 Dec 2023 13:18:19 +0100 Subject: [PATCH 3/6] chore: regenerating mocks --- packages/app_center_ratings_client/lib/src/chart.freezed.dart | 2 +- packages/app_center_ratings_client/lib/src/user.freezed.dart | 2 +- .../test/ratings_client_test.mocks.dart | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/app_center_ratings_client/lib/src/chart.freezed.dart b/packages/app_center_ratings_client/lib/src/chart.freezed.dart index 29a230a05..9c612f049 100644 --- a/packages/app_center_ratings_client/lib/src/chart.freezed.dart +++ b/packages/app_center_ratings_client/lib/src/chart.freezed.dart @@ -115,7 +115,7 @@ class _$ChartDataImpl implements _ChartData { } @override - bool operator ==(dynamic other) { + bool operator ==(Object other) { return identical(this, other) || (other.runtimeType == runtimeType && other is _$ChartDataImpl && diff --git a/packages/app_center_ratings_client/lib/src/user.freezed.dart b/packages/app_center_ratings_client/lib/src/user.freezed.dart index e52bb5738..2b062d248 100644 --- a/packages/app_center_ratings_client/lib/src/user.freezed.dart +++ b/packages/app_center_ratings_client/lib/src/user.freezed.dart @@ -142,7 +142,7 @@ class _$VoteImpl implements _Vote { } @override - bool operator ==(dynamic other) { + bool operator ==(Object other) { return identical(this, other) || (other.runtimeType == runtimeType && other is _$VoteImpl && diff --git a/packages/app_center_ratings_client/test/ratings_client_test.mocks.dart b/packages/app_center_ratings_client/test/ratings_client_test.mocks.dart index 024a105c2..01103ca21 100644 --- a/packages/app_center_ratings_client/test/ratings_client_test.mocks.dart +++ b/packages/app_center_ratings_client/test/ratings_client_test.mocks.dart @@ -1,4 +1,4 @@ -// Mocks generated by Mockito 5.4.3 from annotations +// Mocks generated by Mockito 5.4.4 from annotations // in app_center_ratings_client/test/ratings_client_test.dart. // Do not manually edit this file. From 24fd23aa20a80bb8e53e14ddad2a90e295504af9 Mon Sep 17 00:00:00 2001 From: Enzo Conty Date: Wed, 20 Dec 2023 13:38:37 +0100 Subject: [PATCH 4/6] chores: Bump flutter version --- melos.yaml | 2 +- packages/app_center/pubspec.yaml | 2 +- snap/snapcraft.yaml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/melos.yaml b/melos.yaml index 920dc4b0f..e8b9645cf 100644 --- a/melos.yaml +++ b/melos.yaml @@ -7,7 +7,7 @@ command: bootstrap: environment: sdk: '>=3.1.0 <4.0.0' - flutter: 3.13.9 + flutter: 3.16.4 dev_dependencies: ubuntu_lints: ^0.3.0 diff --git a/packages/app_center/pubspec.yaml b/packages/app_center/pubspec.yaml index faf8e4146..a3335062f 100644 --- a/packages/app_center/pubspec.yaml +++ b/packages/app_center/pubspec.yaml @@ -5,7 +5,7 @@ publish_to: 'none' environment: sdk: '>=3.1.0 <4.0.0' - flutter: 3.13.9 + flutter: 3.16.4 dependencies: app_center_ratings_client: ^1.0.0 diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml index 878179543..743d8a475 100644 --- a/snap/snapcraft.yaml +++ b/snap/snapcraft.yaml @@ -9,7 +9,7 @@ version: git parts: flutter-git: source: https://github.com/flutter/flutter.git - source-tag: 3.13.9 + source-tag: 3.16.4 source-depth: 1 plugin: nil override-build: | From 6c1d118bbac20bbb472a717abaa7fce9b1a555f6 Mon Sep 17 00:00:00 2001 From: Enzo Conty Date: Wed, 20 Dec 2023 13:43:25 +0100 Subject: [PATCH 5/6] chores: Bump version of tool-versions --- .tool-versions | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.tool-versions b/.tool-versions index 3876cc312..cbe24c642 100644 --- a/.tool-versions +++ b/.tool-versions @@ -1 +1 @@ -flutter 3.16.0-stable +flutter 3.16.4-stable From 6d964e981a8fb8220beef74e00dab140bd51e39c Mon Sep 17 00:00:00 2001 From: Enzo Conty Date: Wed, 20 Dec 2023 13:49:15 +0100 Subject: [PATCH 6/6] chores: regenerating mocks --- packages/app_center_ratings_client/lib/src/chart.freezed.dart | 2 +- packages/app_center_ratings_client/lib/src/user.freezed.dart | 2 +- .../test/ratings_client_test.mocks.dart | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/app_center_ratings_client/lib/src/chart.freezed.dart b/packages/app_center_ratings_client/lib/src/chart.freezed.dart index 29a230a05..9c612f049 100644 --- a/packages/app_center_ratings_client/lib/src/chart.freezed.dart +++ b/packages/app_center_ratings_client/lib/src/chart.freezed.dart @@ -115,7 +115,7 @@ class _$ChartDataImpl implements _ChartData { } @override - bool operator ==(dynamic other) { + bool operator ==(Object other) { return identical(this, other) || (other.runtimeType == runtimeType && other is _$ChartDataImpl && diff --git a/packages/app_center_ratings_client/lib/src/user.freezed.dart b/packages/app_center_ratings_client/lib/src/user.freezed.dart index e52bb5738..2b062d248 100644 --- a/packages/app_center_ratings_client/lib/src/user.freezed.dart +++ b/packages/app_center_ratings_client/lib/src/user.freezed.dart @@ -142,7 +142,7 @@ class _$VoteImpl implements _Vote { } @override - bool operator ==(dynamic other) { + bool operator ==(Object other) { return identical(this, other) || (other.runtimeType == runtimeType && other is _$VoteImpl && diff --git a/packages/app_center_ratings_client/test/ratings_client_test.mocks.dart b/packages/app_center_ratings_client/test/ratings_client_test.mocks.dart index 024a105c2..01103ca21 100644 --- a/packages/app_center_ratings_client/test/ratings_client_test.mocks.dart +++ b/packages/app_center_ratings_client/test/ratings_client_test.mocks.dart @@ -1,4 +1,4 @@ -// Mocks generated by Mockito 5.4.3 from annotations +// Mocks generated by Mockito 5.4.4 from annotations // in app_center_ratings_client/test/ratings_client_test.dart. // Do not manually edit this file.