Skip to content

nav: Add an About Zulip button to the main menu #1157

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.

Sign up for GitHub

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 2 commits into from
Dec 20, 2024
Merged

nav: Add an About Zulip button to the main menu #1157

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
67cd4c8
icons: Add info icon for the main menu
tomlin7 Dec 14, 2024
eb3e2aa
nav: Add an About Zulip button to the main menu
tomlin7 Dec 13, 2024
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 modified assets/icons/ZulipIcons.ttf
View file
Open in desktop
Binary file not shown.
1 change: 1 addition & 0 deletions assets/icons/info.svg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
19 changes: 19 additions & 0 deletions lib/widgets/home.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ import 'package:flutter/material.dart';

import '../generated/l10n/zulip_localizations.dart';
import '../model/narrow.dart';
import 'about_zulip.dart';
import 'action_sheet.dart';
import 'app.dart';
import 'app_bar.dart';
Expand Down Expand Up @@ -269,6 +270,7 @@ void _showMainMenu(BuildContext context, {
// TODO(#97): Settings
// TODO(#661): Notifications
// const SizedBox(height: 8),
const _AboutZulipButton(),
// TODO(#1095): VersionInfo
];

Expand Down Expand Up @@ -556,6 +558,23 @@ class _SwitchAccountButton extends _MenuButton {
}
}

class _AboutZulipButton extends _MenuButton {
const _AboutZulipButton();

@override
IconData get icon => ZulipIcons.info;

@override
String label(ZulipLocalizations zulipLocalizations) {
return zulipLocalizations.aboutPageTitle;
}

@override
void onPressed(BuildContext context) {
Navigator.of(context).push(AboutZulipPage.buildRoute(context));
}
}

/// Apply [Transform.scale] to the child widget when tapped, and reset its scale
/// when released, while animating the transitions.
class AnimatedScaleOnTap extends StatefulWidget {
Expand Down
35 changes: 19 additions & 16 deletions lib/widgets/icons.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,53 +78,56 @@ abstract final class ZulipIcons {
/// The Zulip custom icon "inbox".
static const IconData inbox = IconData(0xf112, fontFamily: "Zulip Icons");

/// The Zulip custom icon "info".
static const IconData info = IconData(0xf113, fontFamily: "Zulip Icons");

/// The Zulip custom icon "inherit".
static const IconData inherit = IconData(0xf113, fontFamily: "Zulip Icons");
static const IconData inherit = IconData(0xf114, fontFamily: "Zulip Icons");

/// The Zulip custom icon "language".
static const IconData language = IconData(0xf114, fontFamily: "Zulip Icons");
static const IconData language = IconData(0xf115, fontFamily: "Zulip Icons");

/// The Zulip custom icon "lock".
static const IconData lock = IconData(0xf115, fontFamily: "Zulip Icons");
static const IconData lock = IconData(0xf116, fontFamily: "Zulip Icons");

/// The Zulip custom icon "menu".
static const IconData menu = IconData(0xf116, fontFamily: "Zulip Icons");
static const IconData menu = IconData(0xf117, fontFamily: "Zulip Icons");

/// The Zulip custom icon "message_feed".
static const IconData message_feed = IconData(0xf117, fontFamily: "Zulip Icons");
static const IconData message_feed = IconData(0xf118, fontFamily: "Zulip Icons");

/// The Zulip custom icon "mute".
static const IconData mute = IconData(0xf118, fontFamily: "Zulip Icons");
static const IconData mute = IconData(0xf119, fontFamily: "Zulip Icons");

/// The Zulip custom icon "read_receipts".
static const IconData read_receipts = IconData(0xf119, fontFamily: "Zulip Icons");
static const IconData read_receipts = IconData(0xf11a, fontFamily: "Zulip Icons");

/// The Zulip custom icon "send".
static const IconData send = IconData(0xf11a, fontFamily: "Zulip Icons");
static const IconData send = IconData(0xf11b, fontFamily: "Zulip Icons");

/// The Zulip custom icon "share".
static const IconData share = IconData(0xf11b, fontFamily: "Zulip Icons");
static const IconData share = IconData(0xf11c, fontFamily: "Zulip Icons");

/// The Zulip custom icon "share_ios".
static const IconData share_ios = IconData(0xf11c, fontFamily: "Zulip Icons");
static const IconData share_ios = IconData(0xf11d, fontFamily: "Zulip Icons");

/// The Zulip custom icon "smile".
static const IconData smile = IconData(0xf11d, fontFamily: "Zulip Icons");
static const IconData smile = IconData(0xf11e, fontFamily: "Zulip Icons");

/// The Zulip custom icon "star".
static const IconData star = IconData(0xf11e, fontFamily: "Zulip Icons");
static const IconData star = IconData(0xf11f, fontFamily: "Zulip Icons");

/// The Zulip custom icon "star_filled".
static const IconData star_filled = IconData(0xf11f, fontFamily: "Zulip Icons");
static const IconData star_filled = IconData(0xf120, fontFamily: "Zulip Icons");

/// The Zulip custom icon "topic".
static const IconData topic = IconData(0xf120, fontFamily: "Zulip Icons");
static const IconData topic = IconData(0xf121, fontFamily: "Zulip Icons");

/// The Zulip custom icon "unmute".
static const IconData unmute = IconData(0xf121, fontFamily: "Zulip Icons");
static const IconData unmute = IconData(0xf122, fontFamily: "Zulip Icons");

/// The Zulip custom icon "user".
static const IconData user = IconData(0xf122, fontFamily: "Zulip Icons");
static const IconData user = IconData(0xf123, fontFamily: "Zulip Icons");

// END GENERATED ICON DATA
}
Expand Down
11 changes: 11 additions & 0 deletions test/widgets/home_test.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ import 'package:flutter_test/flutter_test.dart';
import 'package:zulip/api/model/events.dart';
import 'package:zulip/model/narrow.dart';
import 'package:zulip/model/store.dart';
import 'package:zulip/widgets/about_zulip.dart';
import 'package:zulip/widgets/app.dart';
import 'package:zulip/widgets/app_bar.dart';
import 'package:zulip/widgets/home.dart';
Expand Down Expand Up @@ -238,6 +239,16 @@ void main () {
check(find.byType(ProfilePage)).findsOne();
check(find.text(eg.selfUser.fullName)).findsAny();
});

testWidgets('_AboutZulipButton', (tester) async {
await prepare(tester);
await tapOpenMenu(tester);

await tester.tap(find.byIcon(ZulipIcons.info));
await tester.pump(Duration.zero); // tap the button
await tester.pump(const Duration(milliseconds: 250)); // wait for animation
check(find.byType(AboutZulipPage)).findsOne();
});
});

group('_LoadingPlaceholderPage', () {
Expand Down
Loading