Skip to content

[Gallery] Bring in Fortnightly banner #317

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Feb 6, 2020
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
Binary file added gallery/assets/studies/1.5x/fortnightly_card.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added gallery/assets/studies/2.0x/fortnightly_card.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added gallery/assets/studies/3.0x/fortnightly_card.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added gallery/assets/studies/4.0x/fortnightly_card.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added gallery/assets/studies/fortnightly_card.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added gallery/assets/studies/fortnightly_card_dark.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion gallery/lib/l10n/gallery_localizations.dart
Original file line number Diff line number Diff line change
Expand Up @@ -3461,7 +3461,7 @@ class GalleryLocalizations {
}

String get fortnightlyDescription {
return Intl.message('A news app',
return Intl.message('A content-focused news app',
locale: _localeName,
name: 'fortnightlyDescription',
desc: 'Study description for Fortnightly.');
Expand Down
2 changes: 1 addition & 1 deletion gallery/lib/l10n/intl_en_US.arb
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,7 @@
"@shrineDescription": {
"description": "Study description for Shrine."
},
"fortnightlyDescription": "A news app",
"fortnightlyDescription": "A content-focused news app",
"@fortnightlyDescription": {
"description": "Study description for Fortnightly."
},
Expand Down
2 changes: 1 addition & 1 deletion gallery/lib/l10n/intl_en_US.xml
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,7 @@
<string
name="fortnightlyDescription"
description="Study description for Fortnightly."
>A news app</string>
>A content-focused news app</string>
<string
name="rallyDescription"
description="Study description for Rally."
Expand Down
2 changes: 1 addition & 1 deletion gallery/lib/l10n/messages_en_US.dart
Original file line number Diff line number Diff line change
Expand Up @@ -899,7 +899,7 @@ class MessageLookup extends MessageLookupByLibrary {
"dialogShow": MessageLookupByLibrary.simpleMessage("SHOW DIALOG"),
"dismiss": MessageLookupByLibrary.simpleMessage("DISMISS"),
"fortnightlyDescription":
MessageLookupByLibrary.simpleMessage("A news app"),
MessageLookupByLibrary.simpleMessage("A content-focused news app"),
"fortnightlyHeadlineArmy": MessageLookupByLibrary.simpleMessage(
"Reforming The Green Army From Within"),
"fortnightlyHeadlineBees": MessageLookupByLibrary.simpleMessage(
Expand Down
4 changes: 3 additions & 1 deletion gallery/lib/pages/home.dart
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,8 @@ class HomePage extends StatelessWidget {
_CarouselCard(
title: fortnightlyTitle,
subtitle: GalleryLocalizations.of(context).fortnightlyDescription,
// TODO: Provide asset for study banner.
asset: 'assets/studies/fortnightly_card.png',
assetDark: 'assets/studies/fortnightly_card_dark.png',
study: FortnightlyApp(navigatorKey: NavigatorKeys.fortnightly),
navigatorKey: NavigatorKeys.fortnightly,
),
Expand Down Expand Up @@ -914,6 +915,7 @@ class _DesktopPageButton extends StatelessWidget {
onTap: onTap,
child: Icon(
isEnd ? Icons.arrow_forward_ios : Icons.arrow_back_ios,
color: Colors.white,
),
),
),
Expand Down