Skip to content

fix: on pad's ui notification's appbar overlaps the notification area #46

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
Sep 10, 2024
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
14 changes: 10 additions & 4 deletions lib/page/homepage/info_widget/notice_card/notice_card.dart
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@
// SPDX-License-Identifier: MPL-2.0

import 'package:flutter/material.dart';
import 'package:watermeter/page/homepage/info_widget/notice_card/notice_page.dart';
import 'package:watermeter/page/public_widget/context_extension.dart';
import 'package:watermeter/page/public_widget/toast.dart';
import 'package:get/get.dart';
import 'package:styled_widget/styled_widget.dart';
Expand All @@ -20,10 +22,14 @@ class NoticeCard extends StatelessWidget {
() => GestureDetector(
onTap: () {
if (messages.isNotEmpty) {
showDialog(
context: context,
builder: (context) => const NoticeList(),
);
if (!isPhone(context)) {
context.pushReplacement(const NoticePage());
} else {
showDialog(
context: context,
builder: (context) => const NoticeList(),
);
}
} else {
showToast(context: context, msg: "目前没有获取应用公告,请刷新");
}
Expand Down
111 changes: 111 additions & 0 deletions lib/page/homepage/info_widget/notice_card/notice_page.dart
Original file line number Diff line number Diff line change
@@ -0,0 +1,111 @@
// Copyright 2023 BenderBlog Rodriguez and contributors.
// SPDX-License-Identifier: MPL-2.0

import 'package:disclosure/disclosure.dart';
import 'package:flutter/material.dart';
import 'package:get/get.dart';
import 'package:styled_widget/styled_widget.dart';
import 'package:url_launcher/url_launcher_string.dart';
import 'package:watermeter/repository/message_session.dart';
import 'package:watermeter/page/public_widget/public_widget.dart';

class NoticePage extends StatelessWidget {
const NoticePage({super.key});

@override
Widget build(BuildContext context) {
return Obx(
() => Scaffold(
appBar: AppBar(title: const Text("通知列表")),
body: DisclosureGroup(
multiple: false,
clearable: true,
children: List<Widget>.generate(messages.length, (index) {
return Disclosure(
key: ValueKey('disclosure-$index'),
wrapper: (state, child) {
return Card.outlined(
clipBehavior: Clip.antiAlias,
child: child,
);
},
header: DisclosureButton(
child: ListTile(
title: Row(
children: [
TagsBoxes(text: messages[index].type),
const SizedBox(width: 8),
Flexible(
child: Text(
messages[index].title,
overflow: TextOverflow.ellipsis,
),
),
],
),
trailing: const DisclosureSwitcher(
opened: Icon(Icons.arrow_drop_up),
closed: Icon(Icons.arrow_drop_down),
),
),
),
divider: const Divider(height: 1),
child: Builder(builder: (context) {
if (bool.tryParse(messages[index].isLink) ?? false) {
return FilledButton.icon(
onPressed: () => launchUrlString(
messages[index].message,
mode: LaunchMode.externalApplication,
),
label: const Text("访问该链接"),
icon: const Icon(Icons.ads_click),
).center();
}
return SelectableText(messages[index].message);
}).padding(all: 12),
);
}),
).scrollable().padding(top: 20),
),
);

/*
SimpleDialog(
title: const Text(),
children: List.generate(
messages.length,
(index) => SimpleDialogOption(
onPressed: () {
if (bool.parse(messages[index].isLink)) {
launchUrlString(
messages[index].message,
mode: LaunchMode.externalApplication,
);
} else {
showDialog(
context: context,
builder: (context) => AlertDialog(
title: Text(messages[index].title),
content: SelectableText(messages[index].message),
),
);
}
},
child: Row(
children: [
TagsBoxes(text: messages[index].type),
const SizedBox(width: 8),
Flexible(
child: Text(
messages[index].title,
overflow: TextOverflow.ellipsis,
),
),
],
),
),
),
),
);*/
}
}
7 changes: 6 additions & 1 deletion lib/page/xdu_planet/comment_popout.dart
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
// Copyright 2024 BenderBlog Rodriguez and contributors.
// SPDX-License-Identifier: MPL-2.0

import 'dart:convert';

import 'package:crypto/crypto.dart';
import 'package:flutter/material.dart';
import 'package:sn_progress_dialog/sn_progress_dialog.dart';
import 'package:styled_widget/styled_widget.dart';
Expand Down Expand Up @@ -102,11 +105,13 @@ class CommentPopout extends StatelessWidget {
}
var pd = ProgressDialog(context: context);
pd.show(msg: "正在发送评论");
var hashedUid = md5.convert(utf8.encode(
"${pref.getString(pref.Preference.idsAccount)}#${pref.getString(pref.Preference.name)}"));
await PlanetSession()
.sendComments(
id: id,
content: _controller.text,
userId: CommentPopout.userIdGenerator,
userId: hashedUid.toString(),
replyto: replyTo?.ID.toString(),
)
.then((value) {
Expand Down
70 changes: 0 additions & 70 deletions lib/page/xdu_planet/person_page.dart

This file was deleted.