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
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion lib/app_configuration/widgets/ad_platform_config_form.dart
Original file line number Diff line number Diff line change
Expand Up @@ -299,7 +299,7 @@ class _AdPlatformConfigFormState extends State<AdPlatformConfigForm> {
),
],
),
const SizedBox(height: AppSpacing.lg),
const SizedBox(height: AppSpacing.lg),
],
);
}
Expand Down
4 changes: 3 additions & 1 deletion lib/authentication/view/request_code_page.dart
Original file line number Diff line number Diff line change
Expand Up @@ -145,7 +145,9 @@ class _RequestCodeView extends StatelessWidget {
top: AppSpacing.lg,
),
child: Text(
l10n.demoEmailHint('admin@example.com'),
l10n.demoEmailHint(
'admin@example.com | publisher@example.com',
),
style: textTheme.bodyMedium?.copyWith(
color: colorScheme.secondary,
fontWeight: FontWeight.bold,
Expand Down
2 changes: 1 addition & 1 deletion lib/bootstrap.dart
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,7 @@ Future<Widget> bootstrap(
usersClient = DataInMemory<User>(
toJson: (i) => i.toJson(),
getId: (i) => i.id,
// No initial data for users in demo mode.
initialData: usersFixturesData,
logger: Logger('DataInMemory<User>'),
);
} else {
Expand Down
6 changes: 0 additions & 6 deletions lib/l10n/app_localizations.dart
Original file line number Diff line number Diff line change
Expand Up @@ -2174,12 +2174,6 @@ abstract class AppLocalizations {
/// **'AdMob'**
String get adPlatformTypeAdmob;

/// The name of the Local ad platform for custom ads.
///
/// In en, this message translates to:
/// **'Local'**
String get adPlatformTypeLocal;

/// Tab title for Native Ads in local ads management.
///
/// In en, this message translates to:
Expand Down
3 changes: 0 additions & 3 deletions lib/l10n/app_localizations_ar.dart
Original file line number Diff line number Diff line change
Expand Up @@ -1163,9 +1163,6 @@ class AppLocalizationsAr extends AppLocalizations {
@override
String get adPlatformTypeAdmob => 'أدموب';

@override
String get adPlatformTypeLocal => 'محلي';

@override
String get nativeAdsTab => 'إعلانات أصلية';

Expand Down
3 changes: 0 additions & 3 deletions lib/l10n/app_localizations_en.dart
Original file line number Diff line number Diff line change
Expand Up @@ -1162,9 +1162,6 @@ class AppLocalizationsEn extends AppLocalizations {
@override
String get adPlatformTypeAdmob => 'AdMob';

@override
String get adPlatformTypeLocal => 'Local';

@override
String get nativeAdsTab => 'Native Ads';

Expand Down
4 changes: 0 additions & 4 deletions lib/l10n/arb/app_ar.arb
Original file line number Diff line number Diff line change
Expand Up @@ -1448,10 +1448,6 @@
"@adPlatformTypeAdmob": {
"description": "اسم منصة إعلانات أدموب."
},
"adPlatformTypeLocal": "محلي",
"@adPlatformTypeLocal": {
"description": "اسم منصة الإعلانات المحلية للإعلانات المخصصة."
},
"nativeAdsTab": "إعلانات أصلية",
"@nativeAdsTab": {
"description": "عنوان تبويب الإعلانات الأصلية في إدارة الإعلانات المحلية."
Expand Down
4 changes: 0 additions & 4 deletions lib/l10n/arb/app_en.arb
Original file line number Diff line number Diff line change
Expand Up @@ -1448,10 +1448,6 @@
"@adPlatformTypeAdmob": {
"description": "The name of the AdMob ad platform."
},
"adPlatformTypeLocal": "Local",
"@adPlatformTypeLocal": {
"description": "The name of the Local ad platform for custom ads."
},
"nativeAdsTab": "Native Ads",
"@nativeAdsTab": {
"description": "Tab title for Native Ads in local ads management."
Expand Down
2 changes: 1 addition & 1 deletion lib/router/router.dart
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,7 @@ GoRouter createRouter({
})
.whereType<String>()
.toList();

// Check if the destination path starts with any of the authorized base
// paths, or if it's the universally accessible settings page.
final isAuthorized =
Expand Down
2 changes: 0 additions & 2 deletions lib/shared/extensions/ad_platform_type_l10n.dart
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,6 @@ extension AdPlatformTypeL10n on AdPlatformType {
switch (this) {
case AdPlatformType.admob:
return l10n.adPlatformTypeAdmob;
case AdPlatformType.local:
return l10n.adPlatformTypeLocal;
case AdPlatformType.demo:
throw UnimplementedError(
'Demo ad platform type is not intended for dashboard usage, rather for mobile client, demo env specific usecase.',
Expand Down
1 change: 0 additions & 1 deletion lib/shared/extensions/extensions.dart
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,5 @@ export 'content_status_l10n.dart';
export 'dashboard_user_role_l10n.dart';
export 'feed_decorator_type_l10n.dart';
export 'in_article_ad_slot_type_l10n.dart';
export 'local_ad_to_ad_type.dart';
export 'source_type_l10n.dart';
export 'string_truncate.dart';
23 changes: 0 additions & 23 deletions lib/shared/extensions/local_ad_to_ad_type.dart

This file was deleted.

10 changes: 5 additions & 5 deletions pubspec.lock
Original file line number Diff line number Diff line change
Expand Up @@ -31,11 +31,11 @@ packages:
dependency: "direct main"
description:
path: "."
ref: "v1.0.1"
resolved-ref: b999691989447aff05a936414e6f6fdfbbb73a07
ref: "v1.1.0"
resolved-ref: a37ed3cc6e305b1285a77619b1d7272b42517ea9
url: "https://github.com/flutter-news-app-full-source-code/auth-inmemory"
source: git
version: "1.0.1"
version: "1.1.0"
auth_repository:
dependency: "direct main"
description:
Expand Down Expand Up @@ -89,8 +89,8 @@ packages:
dependency: "direct main"
description:
path: "."
ref: "v1.3.1"
resolved-ref: a03efff11b7577974cb444a1a6a46fee8b05ea42
ref: e7c808c9d459233196e2eac3137a9c87d3976af3
resolved-ref: e7c808c9d459233196e2eac3137a9c87d3976af3
url: "https://github.com/flutter-news-app-full-source-code/core.git"
source: git
version: "1.3.1"
Expand Down
10 changes: 9 additions & 1 deletion pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ dependencies:
auth_inmemory:
git:
url: https://github.com/flutter-news-app-full-source-code/auth-inmemory
ref: v1.0.1
ref: v1.1.0
auth_repository:
git:
url: https://github.com/flutter-news-app-full-source-code/auth-repository.git
Expand Down Expand Up @@ -89,3 +89,11 @@ dev_dependencies:
flutter:
uses-material-design: true
generate: true

dependency_overrides:
# TODO: Remove this override when core version > 1.3.1 is released.
# This is needed for the removal of LocalAd.
core:
git:
url: https://github.com/flutter-news-app-full-source-code/core.git
ref: e7c808c9d459233196e2eac3137a9c87d3976af3
Loading