Skip to content
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

Switch accounts icon update #1251

Closed
wants to merge 2 commits into from
Closed

Switch accounts icon update #1251

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
335ed2a
updated switch accounts icon to the one specified
rishichirchi Jan 3, 2025
f7ab509
Reorder account list as desired
rishichirchi Jan 3, 2025
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/arrow_left_right.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.
362 changes: 281 additions & 81 deletions lib/widgets/app.dart
View file
Open in desktop

Large diffs are not rendered by default.

6 changes: 3 additions & 3 deletions lib/widgets/home.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -543,10 +543,10 @@ class _SwitchAccountButton extends _MenuButton {

@override
// TODO(design): choose an icon
IconData? get icon => null;
IconData? get icon => ZulipIcons.arrow_left_right;

@override
Widget buildLeading(BuildContext context) => const SizedBox.shrink();
// @override
// Widget buildLeading(BuildContext context) => const SizedBox.shrink();

@override
String label(ZulipLocalizations zulipLocalizations) {
Expand Down
71 changes: 37 additions & 34 deletions lib/widgets/icons.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,107 +27,110 @@ abstract final class ZulipIcons {
/// The Zulip custom icon "arrow_down".
static const IconData arrow_down = IconData(0xf101, fontFamily: "Zulip Icons");

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

/// The Zulip custom icon "arrow_right".
static const IconData arrow_right = IconData(0xf102, fontFamily: "Zulip Icons");
static const IconData arrow_right = IconData(0xf103, fontFamily: "Zulip Icons");

/// The Zulip custom icon "at_sign".
static const IconData at_sign = IconData(0xf103, fontFamily: "Zulip Icons");
static const IconData at_sign = IconData(0xf104, fontFamily: "Zulip Icons");

/// The Zulip custom icon "attach_file".
static const IconData attach_file = IconData(0xf104, fontFamily: "Zulip Icons");
static const IconData attach_file = IconData(0xf105, fontFamily: "Zulip Icons");

/// The Zulip custom icon "bot".
static const IconData bot = IconData(0xf105, fontFamily: "Zulip Icons");
static const IconData bot = IconData(0xf106, fontFamily: "Zulip Icons");

/// The Zulip custom icon "camera".
static const IconData camera = IconData(0xf106, fontFamily: "Zulip Icons");
static const IconData camera = IconData(0xf107, fontFamily: "Zulip Icons");

/// The Zulip custom icon "chevron_right".
static const IconData chevron_right = IconData(0xf107, fontFamily: "Zulip Icons");
static const IconData chevron_right = IconData(0xf108, fontFamily: "Zulip Icons");

/// The Zulip custom icon "clock".
static const IconData clock = IconData(0xf108, fontFamily: "Zulip Icons");
static const IconData clock = IconData(0xf109, fontFamily: "Zulip Icons");

/// The Zulip custom icon "contacts".
static const IconData contacts = IconData(0xf109, fontFamily: "Zulip Icons");
static const IconData contacts = IconData(0xf10a, fontFamily: "Zulip Icons");

/// The Zulip custom icon "copy".
static const IconData copy = IconData(0xf10a, fontFamily: "Zulip Icons");
static const IconData copy = IconData(0xf10b, fontFamily: "Zulip Icons");

/// The Zulip custom icon "follow".
static const IconData follow = IconData(0xf10b, fontFamily: "Zulip Icons");
static const IconData follow = IconData(0xf10c, fontFamily: "Zulip Icons");

/// The Zulip custom icon "format_quote".
static const IconData format_quote = IconData(0xf10c, fontFamily: "Zulip Icons");
static const IconData format_quote = IconData(0xf10d, fontFamily: "Zulip Icons");

/// The Zulip custom icon "globe".
static const IconData globe = IconData(0xf10d, fontFamily: "Zulip Icons");
static const IconData globe = IconData(0xf10e, fontFamily: "Zulip Icons");

/// The Zulip custom icon "group_dm".
static const IconData group_dm = IconData(0xf10e, fontFamily: "Zulip Icons");
static const IconData group_dm = IconData(0xf10f, fontFamily: "Zulip Icons");

/// The Zulip custom icon "hash_italic".
static const IconData hash_italic = IconData(0xf10f, fontFamily: "Zulip Icons");
static const IconData hash_italic = IconData(0xf110, fontFamily: "Zulip Icons");

/// The Zulip custom icon "hash_sign".
static const IconData hash_sign = IconData(0xf110, fontFamily: "Zulip Icons");
static const IconData hash_sign = IconData(0xf111, fontFamily: "Zulip Icons");

/// The Zulip custom icon "image".
static const IconData image = IconData(0xf111, fontFamily: "Zulip Icons");
static const IconData image = IconData(0xf112, fontFamily: "Zulip Icons");

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

// END GENERATED ICON DATA
}
Expand Down
Binary file added packages/zulip_plugin/android/.gradle/8.12/checksums/checksums.lock
View file
Open in desktop
Binary file not shown.
Binary file added packages/zulip_plugin/android/.gradle/8.12/fileChanges/last-build.bin
View file
Open in desktop
Binary file not shown.
Binary file added packages/zulip_plugin/android/.gradle/8.12/fileHashes/fileHashes.lock
View file
Open in desktop
Binary file not shown.
Empty file added packages/zulip_plugin/android/.gradle/8.12/gc.properties
View file
Open in desktop
Empty file.
Binary file added packages/zulip_plugin/android/.gradle/buildOutputCleanup/buildOutputCleanup.lock
View file
Open in desktop
Binary file not shown.
2 changes: 2 additions & 0 deletions packages/zulip_plugin/android/.gradle/buildOutputCleanup/cache.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
#Fri Jan 03 15:29:26 IST 2025
gradle.version=8.12
Empty file added packages/zulip_plugin/android/.gradle/vcs-1/gc.properties
View file
Open in desktop
Empty file.
6 changes: 6 additions & 0 deletions packages/zulip_plugin/pubspec.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
# Generated by pub
# See https://dart.dev/tools/pub/glossary#lockfile
packages: {}
sdks:
dart: ">=3.4.0-256.0.dev <4.0.0"
flutter: ">=3.3.0"
32 changes: 16 additions & 16 deletions pubspec.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -138,10 +138,10 @@ packages:
dependency: transitive
description:
name: characters
sha256: "04a925763edad70e8443c99234dc3328f442e811f1d8fd1a72f1c8ad0f69a605"
sha256: f71061c654a3380576a52b451dd5532377954cf9dbd272a78fc8479606670803
url: "https://pub.dev"
source: hosted
version: "1.3.0"
version: "1.4.0"
charcode:
dependency: transitive
description:
Expand Down Expand Up @@ -194,10 +194,10 @@ packages:
dependency: "direct main"
description:
name: collection
sha256: a1ace0a119f20aabc852d165077c036cd864315bd99b7eaa10a60100341941bf
sha256: "2f5709ae4d3d59dd8f7cd309b4e023046b57d8a6c82130785d2b0e5868084e76"
url: "https://pub.dev"
source: hosted
version: "1.19.0"
version: "1.19.1"
color_models:
dependency: "direct overridden"
description:
Expand Down Expand Up @@ -711,10 +711,10 @@ packages:
dependency: transitive
description:
name: matcher
sha256: d2323aa2060500f906aa31a895b4030b6da3ebdcc5619d14ce1aada65cd161cb
sha256: dc58c723c3c24bf8d3e2d3ad3f2f9d7bd9cf43ec6feaa64181775e60190153f2
url: "https://pub.dev"
source: hosted
version: "0.12.16+1"
version: "0.12.17"
material_color_utilities:
dependency: transitive
description:
Expand All @@ -727,10 +727,10 @@ packages:
dependency: transitive
description:
name: meta
sha256: bdb68674043280c3428e9ec998512fb681678676b3c54e773629ffe74419f8c7
sha256: e3641ec5d63ebf0d9b41bd43201a66e3fc79a65db5f61fc181f04cd27aab950c
url: "https://pub.dev"
source: hosted
version: "1.15.0"
version: "1.16.0"
mime:
dependency: "direct main"
description:
Expand Down Expand Up @@ -1044,18 +1044,18 @@ packages:
dependency: "direct dev"
description:
name: stack_trace
sha256: "9f47fd3630d76be3ab26f0ee06d213679aa425996925ff3feffdec504931c377"
sha256: "8b27215b45d22309b5cddda1aa2b19bdfec9df0e765f2de506401c071d38d1b1"
url: "https://pub.dev"
source: hosted
version: "1.12.0"
version: "1.12.1"
stream_channel:
dependency: transitive
description:
name: stream_channel
sha256: ba2aa5d8cc609d96bbb2899c28934f9e1af5cddbd60a827822ea467161eb54e7
sha256: "4ac0537115a24d772c408a2520ecd0abb99bca2ea9c4e634ccbdbfae64fe17ec"
url: "https://pub.dev"
source: hosted
version: "2.1.2"
version: "2.1.3"
stream_transform:
dependency: transitive
description:
Expand All @@ -1068,10 +1068,10 @@ packages:
dependency: transitive
description:
name: string_scanner
sha256: "0bd04f5bb74fcd6ff0606a888a30e917af9bd52820b178eaa464beb11dca84b6"
sha256: "921cd31725b72fe181906c6a94d987c78e3b98c2e205b397ea399d4054872b43"
url: "https://pub.dev"
source: hosted
version: "1.4.0"
version: "1.4.1"
sync_http:
dependency: transitive
description:
Expand All @@ -1084,10 +1084,10 @@ packages:
dependency: transitive
description:
name: term_glyph
sha256: a29248a84fbb7c79282b40b8c72a1209db169a2e0542bce341da992fe1bc7e84
sha256: "7f554798625ea768a7518313e58f83891c7f5024f88e46e7182a4558850a4b8e"
url: "https://pub.dev"
source: hosted
version: "1.2.1"
version: "1.2.2"
test:
dependency: "direct dev"
description:
Expand Down
Loading