Skip to content

Updated 'Mark all messages as read' icon (#1357) #1395

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

Closed
Closed
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
4 changes: 2 additions & 2 deletions .idea/zulip.iml

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

Binary file modified assets/icons/ZulipIcons.ttf
Binary file not shown.
4 changes: 4 additions & 0 deletions assets/icons/mark_read_icon.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
17 changes: 17 additions & 0 deletions check_icons_output.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
Running icons...
npm notice
npm notice New major version of npm available! 10.9.0 -> 11.2.0
npm notice Changelog: https://github.com/npm/cli/releases/tag/v11.2.0
npm notice To update run: npm install -g [email protected]
npm notice

added 162 packages in 7s
warning: in the working copy of 'lib/widgets/icons.dart', LF will be replaced by CRLF the next time Git touches it
Error: there were icon updates:
M assets/icons/ZulipIcons.ttf
M lib/widgets/icons.dart

FAILED: icons

To rerun the suites that failed, run:
$ tools/check icons
Empty file added icons_check_output.txt
Empty file.
32 changes: 18 additions & 14 deletions lib/widgets/icons.dart
Original file line number Diff line number Diff line change
Expand Up @@ -99,47 +99,51 @@ abstract final class ZulipIcons {
/// The Zulip custom icon "lock".
static const IconData lock = IconData(0xf119, fontFamily: "Zulip Icons");

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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


// END GENERATED ICON DATA
}
Expand Down
8 changes: 7 additions & 1 deletion lib/widgets/message_list.dart
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ import 'dart:math';
import 'package:collection/collection.dart';
import 'package:flutter/material.dart';
import 'package:flutter_color_models/flutter_color_models.dart';
import 'package:flutter_svg/flutter_svg.dart';
import 'package:intl/intl.dart' hide TextDirection;

import '../api/model/model.dart';
Expand Down Expand Up @@ -826,7 +827,12 @@ class _MarkAsReadWidgetState extends State<MarkAsReadWidget> {
backgroundColor: WidgetStatePropertyAll(messageListTheme.unreadMarker),
),
onPressed: _loading ? null : () => _handlePress(context),
icon: const Icon(Icons.playlist_add_check),
icon: SvgPicture.asset(
colorFilter: const ColorFilter.mode(Colors.white, BlendMode.srcIn),
'assets/icons/mark_read_icon.svg',
width: 24,
height: 24,
),
label: Text(zulipLocalizations.markAllAsReadLabel))))));
}
}
Expand Down
40 changes: 40 additions & 0 deletions pubspec.lock
Original file line number Diff line number Diff line change
Expand Up @@ -450,6 +450,14 @@ packages:
url: "https://pub.dev"
source: hosted
version: "2.0.26"
flutter_svg:
dependency: "direct main"
description:
name: flutter_svg
sha256: c200fd79c918a40c5cd50ea0877fa13f81bdaf6f0a5d3dbcc2a13e3285d6aa1b
url: "https://pub.dev"
source: hosted
version: "2.0.17"
flutter_test:
dependency: "direct dev"
description: flutter
Expand Down Expand Up @@ -766,6 +774,14 @@ packages:
url: "https://pub.dev"
source: hosted
version: "1.9.1"
path_parsing:
dependency: transitive
description:
name: path_parsing
sha256: "883402936929eac138ee0a45da5b0f2c80f89913e6dc3bf77eb65b84b409c6ca"
url: "https://pub.dev"
source: hosted
version: "1.1.0"
path_provider:
dependency: "direct main"
description:
Expand Down Expand Up @@ -1179,6 +1195,30 @@ packages:
url: "https://pub.dev"
source: hosted
version: "4.5.1"
vector_graphics:
dependency: transitive
description:
name: vector_graphics
sha256: "44cc7104ff32563122a929e4620cf3efd584194eec6d1d913eb5ba593dbcf6de"
url: "https://pub.dev"
source: hosted
version: "1.1.18"
vector_graphics_codec:
dependency: transitive
description:
name: vector_graphics_codec
sha256: "99fd9fbd34d9f9a32efd7b6a6aae14125d8237b10403b422a6a6dfeac2806146"
url: "https://pub.dev"
source: hosted
version: "1.1.13"
vector_graphics_compiler:
dependency: transitive
description:
name: vector_graphics_compiler
sha256: "1b4b9e706a10294258727674a340ae0d6e64a7231980f9f9a3d12e4b42407aad"
url: "https://pub.dev"
source: hosted
version: "1.1.16"
vector_math:
dependency: transitive
description:
Expand Down
2 changes: 2 additions & 0 deletions pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,7 @@ dependencies:
url_launcher_android: ">=6.1.0"
video_player: ^2.8.3
wakelock_plus: ^1.2.8
flutter_svg: ^2.0.17
zulip_plugin:
path: ./packages/zulip_plugin
# Keep list sorted when adding dependencies; it helps prevent merge conflicts.
Expand Down Expand Up @@ -114,6 +115,7 @@ flutter:
uses-material-design: true

assets:
- assets/icons/mark_read_icon.svg
- assets/Noto_Color_Emoji/LICENSE
- assets/Pygments/AUTHORS.txt
- assets/Pygments/LICENSE.txt
Expand Down