Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
2 changes: 1 addition & 1 deletion .github/workflows/ads_consent_client.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,6 @@ jobs:
build:
uses: VeryGoodOpenSource/very_good_workflows/.github/workflows/flutter_package.yml@v1
with:
flutter_version: 3.27.0
flutter_version: 3.35.5
working_directory: flutter_news_example/packages/ads_consent_client
coverage_excludes: "lib/src/generated/*.dart"
2 changes: 1 addition & 1 deletion .github/workflows/api.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ jobs:
build:
uses: VeryGoodOpenSource/very_good_workflows/.github/workflows/dart_package.yml@v1
with:
dart_sdk: 3.6.0
dart_sdk: 3.9.2
working_directory: flutter_news_example/api
analyze_directories: "routes lib test"
coverage_excludes: "**/*.g.dart"
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/app_ui.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,6 @@ jobs:
build:
uses: VeryGoodOpenSource/very_good_workflows/.github/workflows/flutter_package.yml@v1
with:
flutter_version: 3.27.0
flutter_version: 3.35.5
working_directory: flutter_news_example/packages/app_ui
coverage_excludes: "lib/src/generated/*.dart"
2 changes: 1 addition & 1 deletion .github/workflows/article_repository.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -16,5 +16,5 @@ jobs:
build:
uses: VeryGoodOpenSource/very_good_workflows/.github/workflows/dart_package.yml@v1
with:
dart_sdk: 3.6.0
dart_sdk: 3.9.2
working_directory: flutter_news_example/packages/article_repository
2 changes: 1 addition & 1 deletion .github/workflows/authentication_client.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -16,5 +16,5 @@ jobs:
build:
uses: VeryGoodOpenSource/very_good_workflows/.github/workflows/dart_package.yml@v1
with:
dart_sdk: 3.6.0
dart_sdk: 3.9.2
working_directory: flutter_news_example/packages/authentication_client/authentication_client
2 changes: 1 addition & 1 deletion .github/workflows/deep_link_client.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -16,5 +16,5 @@ jobs:
build:
uses: VeryGoodOpenSource/very_good_workflows/.github/workflows/dart_package.yml@v1
with:
dart_sdk: 3.6.0
dart_sdk: 3.9.2
working_directory: flutter_news_example/packages/deep_link_client/deep_link_client
2 changes: 1 addition & 1 deletion .github/workflows/email_launcher.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,6 @@ jobs:
build:
uses: VeryGoodOpenSource/very_good_workflows/.github/workflows/flutter_package.yml@v1
with:
flutter_version: 3.27.0
flutter_version: 3.35.5
working_directory: flutter_news_example/packages/email_launcher
coverage_excludes: "lib/src/generated/*.dart"
2 changes: 1 addition & 1 deletion .github/workflows/firebase_authentication_client.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -16,5 +16,5 @@ jobs:
build:
uses: VeryGoodOpenSource/very_good_workflows/.github/workflows/flutter_package.yml@v1
with:
flutter_version: 3.27.0
flutter_version: 3.35.5
working_directory: flutter_news_example/packages/authentication_client/firebase_authentication_client
2 changes: 1 addition & 1 deletion .github/workflows/firebase_deep_link_client.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -16,5 +16,5 @@ jobs:
build:
uses: VeryGoodOpenSource/very_good_workflows/.github/workflows/flutter_package.yml@v1
with:
flutter_version: 3.27.0
flutter_version: 3.35.5
working_directory: flutter_news_example/packages/deep_link_client/firebase_deep_link_client
2 changes: 1 addition & 1 deletion .github/workflows/firebase_notifications_client.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -16,5 +16,5 @@ jobs:
build:
uses: VeryGoodOpenSource/very_good_workflows/.github/workflows/flutter_package.yml@v1
with:
flutter_version: 3.27.0
flutter_version: 3.35.5
working_directory: flutter_news_example/packages/notifications_client/firebase_notifications_client
2 changes: 1 addition & 1 deletion .github/workflows/flutter_news_example.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ jobs:
- uses: subosito/flutter-action@e938fdf56512cc96ef2f93601a5a40bde3801046
with:
channel: ${{matrix.channel}}
flutter-version: "3.27.0"
flutter-version: "3.35.5"
cache: false

- name: Install Dependencies
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/form_inputs.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -16,5 +16,5 @@ jobs:
build:
uses: VeryGoodOpenSource/very_good_workflows/.github/workflows/dart_package.yml@v1
with:
dart_sdk: 3.6.0
dart_sdk: 3.9.2
working_directory: flutter_news_example/packages/form_inputs
2 changes: 1 addition & 1 deletion .github/workflows/in_app_purchase_repository.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -16,5 +16,5 @@ jobs:
build:
uses: VeryGoodOpenSource/very_good_workflows/.github/workflows/flutter_package.yml@v1
with:
flutter_version: 3.27.0
flutter_version: 3.35.5
working_directory: flutter_news_example/packages/in_app_purchase_repository
2 changes: 1 addition & 1 deletion .github/workflows/news_blocks.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -17,5 +17,5 @@ jobs:
uses: VeryGoodOpenSource/very_good_workflows/.github/workflows/dart_package.yml@v1
with:
coverage_excludes: "**/*.g.dart"
dart_sdk: 3.6.0
dart_sdk: 3.9.2
working_directory: flutter_news_example/api/packages/news_blocks
2 changes: 1 addition & 1 deletion .github/workflows/news_blocks_ui.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,6 @@ jobs:
build:
uses: VeryGoodOpenSource/very_good_workflows/.github/workflows/flutter_package.yml@v1
with:
flutter_version: 3.27.0
flutter_version: 3.35.5
working_directory: flutter_news_example/packages/news_blocks_ui
coverage_excludes: "lib/src/generated/*.dart"
2 changes: 1 addition & 1 deletion .github/workflows/news_repository.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -16,5 +16,5 @@ jobs:
build:
uses: VeryGoodOpenSource/very_good_workflows/.github/workflows/flutter_package.yml@v1
with:
flutter_version: 3.27.0
flutter_version: 3.35.5
working_directory: flutter_news_example/packages/news_repository
2 changes: 1 addition & 1 deletion .github/workflows/notifications_client.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -16,5 +16,5 @@ jobs:
build:
uses: VeryGoodOpenSource/very_good_workflows/.github/workflows/dart_package.yml@v1
with:
dart_sdk: 3.6.0
dart_sdk: 3.9.2
working_directory: flutter_news_example/packages/notifications_client/notifications_client
2 changes: 1 addition & 1 deletion .github/workflows/notifications_repository.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -16,5 +16,5 @@ jobs:
build:
uses: VeryGoodOpenSource/very_good_workflows/.github/workflows/flutter_package.yml@v1
with:
flutter_version: 3.27.0
flutter_version: 3.35.5
working_directory: flutter_news_example/packages/notifications_repository
2 changes: 1 addition & 1 deletion .github/workflows/one_signal_notifications_client.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -16,5 +16,5 @@ jobs:
build:
uses: VeryGoodOpenSource/very_good_workflows/.github/workflows/flutter_package.yml@v1
with:
flutter_version: 3.27.0
flutter_version: 3.35.5
working_directory: flutter_news_example/packages/notifications_client/one_signal_notifications_client
2 changes: 1 addition & 1 deletion .github/workflows/package_info_client.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -16,5 +16,5 @@ jobs:
build:
uses: VeryGoodOpenSource/very_good_workflows/.github/workflows/dart_package.yml@v1
with:
dart_sdk: 3.6.0
dart_sdk: 3.9.2
working_directory: flutter_news_example/packages/package_info_client
2 changes: 1 addition & 1 deletion .github/workflows/permission_client.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -16,5 +16,5 @@ jobs:
build:
uses: VeryGoodOpenSource/very_good_workflows/.github/workflows/flutter_package.yml@v1
with:
flutter_version: 3.27.0
flutter_version: 3.35.5
working_directory: flutter_news_example/packages/permission_client
2 changes: 1 addition & 1 deletion .github/workflows/persistent_storage.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -17,5 +17,5 @@ jobs:
uses: VeryGoodOpenSource/very_good_workflows/.github/workflows/flutter_package.yml@v1
with:
coverage_excludes: "**/*.g.dart"
flutter_version: 3.27.0
flutter_version: 3.35.5
working_directory: flutter_news_example/packages/storage/persistent_storage
2 changes: 1 addition & 1 deletion .github/workflows/purchase_client.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -16,5 +16,5 @@ jobs:
build:
uses: VeryGoodOpenSource/very_good_workflows/.github/workflows/flutter_package.yml@v1
with:
flutter_version: 3.27.0
flutter_version: 3.35.5
working_directory: flutter_news_example/packages/purchase_client
2 changes: 1 addition & 1 deletion .github/workflows/secure_storage.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -17,5 +17,5 @@ jobs:
uses: VeryGoodOpenSource/very_good_workflows/.github/workflows/flutter_package.yml@v1
with:
coverage_excludes: "**/*.g.dart"
flutter_version: 3.27.0
flutter_version: 3.35.5
working_directory: flutter_news_example/packages/storage/secure_storage
2 changes: 1 addition & 1 deletion .github/workflows/share_launcher.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -16,5 +16,5 @@ jobs:
build:
uses: VeryGoodOpenSource/very_good_workflows/.github/workflows/flutter_package.yml@v1
with:
flutter_version: 3.27.0
flutter_version: 3.35.5
working_directory: flutter_news_example/packages/share_launcher
2 changes: 1 addition & 1 deletion .github/workflows/storage.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -16,5 +16,5 @@ jobs:
build:
uses: VeryGoodOpenSource/very_good_workflows/.github/workflows/dart_package.yml@v1
with:
dart_sdk: 3.6.0
dart_sdk: 3.9.2
working_directory: flutter_news_example/packages/storage/storage
2 changes: 1 addition & 1 deletion .github/workflows/token_storage.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -16,5 +16,5 @@ jobs:
build:
uses: VeryGoodOpenSource/very_good_workflows/.github/workflows/dart_package.yml@v1
with:
dart_sdk: 3.6.0
dart_sdk: 3.9.2
working_directory: flutter_news_example/packages/authentication_client/token_storage
2 changes: 1 addition & 1 deletion .github/workflows/user_repository.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -16,5 +16,5 @@ jobs:
build:
uses: VeryGoodOpenSource/very_good_workflows/.github/workflows/flutter_package.yml@v1
with:
flutter_version: 3.27.0
flutter_version: 3.35.5
working_directory: flutter_news_example/packages/user_repository
1 change: 1 addition & 0 deletions flutter_news_example/.gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -93,6 +93,7 @@ unlinked_spec.ds
**/ios/Flutter/app.zip
**/ios/Flutter/flutter_assets/
**/ios/Flutter/flutter_export_environment.sh
**/ios/Flutter/ephemeral/**
**/ios/ServiceDefinitions.json
**/ios/Runner/GeneratedPluginRegistrant.*

Expand Down
3 changes: 2 additions & 1 deletion flutter_news_example/.vscode/cspell.json
Original file line number Diff line number Diff line change
Expand Up @@ -132,7 +132,8 @@
"xxlg",
"xxxlg",
"xxxs",
"ARGB"
"ARGB",
"canonicalized"
],
"ignorePaths": [
".github/workflows/**",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -47,10 +47,10 @@ class FlutterNewsExampleApiClient {
required TokenProvider tokenProvider,
http.Client? httpClient,
}) : this._(
baseUrl: 'https://example-api.a.run.app',
httpClient: httpClient,
tokenProvider: tokenProvider,
);
baseUrl: 'https://example-api.a.run.app',
httpClient: httpClient,
tokenProvider: tokenProvider,
);

/// Create an instance of [FlutterNewsExampleApiClient] that integrates
/// with a local instance of the API (http://localhost:8080).
Expand All @@ -60,19 +60,19 @@ class FlutterNewsExampleApiClient {
required TokenProvider tokenProvider,
http.Client? httpClient,
}) : this._(
baseUrl: 'http://localhost:8080',
httpClient: httpClient,
tokenProvider: tokenProvider,
);
baseUrl: 'http://localhost:8080',
httpClient: httpClient,
tokenProvider: tokenProvider,
);

/// {@macro flutter_news_example_api_client}
FlutterNewsExampleApiClient._({
required String baseUrl,
required TokenProvider tokenProvider,
http.Client? httpClient,
}) : _baseUrl = baseUrl,
_httpClient = httpClient ?? http.Client(),
_tokenProvider = tokenProvider;
}) : _baseUrl = baseUrl,
_httpClient = httpClient ?? http.Client(),
_tokenProvider = tokenProvider;

final String _baseUrl;
final http.Client _httpClient;
Expand Down Expand Up @@ -250,9 +250,9 @@ class FlutterNewsExampleApiClient {
/// GET /api/v1/search/relevant?q=term
/// Requests relevant content based on the provided search [term].
Future<RelevantSearchResponse> relevantSearch({required String term}) async {
final uri = Uri.parse('$_baseUrl/api/v1/search/relevant').replace(
queryParameters: <String, String>{'q': term},
);
final uri = Uri.parse(
'$_baseUrl/api/v1/search/relevant',
).replace(queryParameters: <String, String>{'q': term});
final response = await _httpClient.get(
uri,
headers: await _getRequestHeaders(),
Expand Down Expand Up @@ -289,9 +289,7 @@ class FlutterNewsExampleApiClient {

/// POST /api/v1/subscriptions
/// Creates a new subscription for the associated user.
Future<void> createSubscription({
required String subscriptionId,
}) async {
Future<void> createSubscription({required String subscriptionId}) async {
final uri = Uri.parse('$_baseUrl/api/v1/subscriptions').replace(
queryParameters: <String, String>{'subscriptionId': subscriptionId},
);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -44,14 +44,18 @@ class InMemoryNewsDataSource implements NewsDataSource {
final result = _newsItems.where((item) => item.post.id == id);
if (result.isEmpty) return null;
final articleNewsItem = result.first;
final article = (preview
? articleNewsItem.contentPreview
: articleNewsItem.content)
.toArticle(title: articleNewsItem.post.title, url: articleNewsItem.url);
final article =
(preview ? articleNewsItem.contentPreview : articleNewsItem.content)
.toArticle(
title: articleNewsItem.post.title,
url: articleNewsItem.url,
);
final totalBlocks = article.totalBlocks;
final normalizedOffset = math.min(offset, totalBlocks);
final blocks =
article.blocks.sublist(normalizedOffset).take(limit).toList();
final blocks = article.blocks
.sublist(normalizedOffset)
.take(limit)
.toList();
return Article(
title: article.title,
blocks: blocks,
Expand Down
20 changes: 10 additions & 10 deletions flutter_news_example/api/lib/src/data/models/article.g.dart

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

12 changes: 6 additions & 6 deletions flutter_news_example/api/lib/src/data/models/feed.g.dart

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

18 changes: 8 additions & 10 deletions flutter_news_example/api/lib/src/data/models/subscription.g.dart

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading