Skip to content

[CI Check, ignore]Inbox page design implement appearance when empty#386 #1293

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
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 modified assets/icons/ZulipIcons.ttf
Binary file not shown.
7 changes: 7 additions & 0 deletions assets/icons/inbox_done.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
37 changes: 20 additions & 17 deletions lib/widgets/icons.dart
Original file line number Diff line number Diff line change
Expand Up @@ -78,56 +78,59 @@ abstract final class ZulipIcons {
/// The Zulip custom icon "inbox".
static const IconData inbox = IconData(0xf112, fontFamily: "Zulip Icons");

/// The Zulip custom icon "inbox_done".
static const IconData inbox_done = 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
68 changes: 68 additions & 0 deletions lib/widgets/inbox.dart
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
import 'package:flutter/gestures.dart';
import 'package:flutter/material.dart';

import '../api/model/model.dart';
Expand Down Expand Up @@ -34,6 +35,7 @@ class _InboxPageState extends State<InboxPageBody> with PerAccountStoreAwareStat

Set<int> get collapsedStreamIds => _collapsedStreamIds;
final Set<int> _collapsedStreamIds = {};
final sections = <_InboxSectionData>[];
void collapseStream(int streamId) {
setState(() {
_collapsedStreamIds.add(streamId);
Expand Down Expand Up @@ -153,9 +155,75 @@ class _InboxPageState extends State<InboxPageBody> with PerAccountStoreAwareStat
});
sections.add(_StreamSectionData(streamId, countInStream, streamHasMention, topicItems));
}
if (sections.isEmpty) {
return Center(
child: Column(
mainAxisAlignment: MainAxisAlignment.start, // Centered vertically
crossAxisAlignment: CrossAxisAlignment.center, // Centered horizontally
children: [
const SizedBox(
height: 50,
),
Icon(
ZulipIcons.inbox_done,
color: Colors.grey[600], // Lighter gray for the icon
size: 80,
),
const SizedBox(height: 20),
Text(
"There are no unread messages in your Inbox.",
textAlign: TextAlign.center,
style: TextStyle(
color:Colors.grey[600], // Light gray for the main text
fontSize: 17,
fontWeight: FontWeight.w500,
),
),
const SizedBox(height: 10),
RichText(
textAlign: TextAlign.center,
text: TextSpan(
text: "You might want to subscribe to more ",
style: TextStyle(
color: Colors.grey[600], // Light gray for regular text
fontSize: 17,
),
children: [
TextSpan(
text: "channels",
style: const TextStyle(
color: Color(0xFF1E88E5), // Light blue for link
fontSize: 17,
fontWeight: FontWeight.w600,
decoration: TextDecoration.underline,
),
recognizer: TapGestureRecognizer()
..onTap = () {
// Handle "channels" click
// print("Channels clicked");
},
),
TextSpan(
text: ".",
style: TextStyle(
color:Colors.grey[600] , // Light blue for link
fontSize: 17,
),

),
],
),
),
],
),
);
}



return SafeArea(
// Don't pad the bottom here; we want the list content to do that.

bottom: false,
child: StickyHeaderListView.builder(
itemCount: sections.length,
Expand Down
6 changes: 6 additions & 0 deletions test/widgets/autocomplete_test.dart
Original file line number Diff line number Diff line change
Expand Up @@ -330,13 +330,19 @@ void main() {
text: 'some',
selection: TextSelection(baseOffset: 1, extentOffset: 3)));
await tester.pump();
// Add an extra pump to account for any potential frame delays introduced
// by the post frame callback in RawAutocomplete's implementation.
await tester.pump();

check(controller.value)
..text.equals('some')
..selection.equals(
const TextSelection(baseOffset: 1, extentOffset: 3));

await tester.tap(find.text('some topic'));
await tester.pump();
await tester.pump();

check(controller.value)
..text.equals('some topic')
..selection.equals(
Expand Down