Hydrogen/Solian
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

✨ Status basis

Browse Source
This commit is contained in:
LittleSheep 2024-06-27 00:31:03 +08:00
parent 7c35323279
commit d91680ada7
11 changed files with 236 additions and 66 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/main.dart
View File

@ -15,6 +15,7 @@ import 'package:solian/providers/content/channel.dart';
import 'package:solian/providers/content/post.dart';
import 'package:solian/providers/content/realm.dart';
import 'package:solian/providers/friend.dart';
import 'package:solian/providers/status.dart';
import 'package:solian/router.dart';
import 'package:solian/theme.dart';
import 'package:solian/translations.dart';
@ -79,6 +80,7 @@ class SolianApp extends StatelessWidget {
Get.lazyPut(() => AttachmentProvider());
Get.lazyPut(() => ChatProvider());
Get.lazyPut(() => AccountProvider());
Get.lazyPut(() => StatusController());
Get.lazyPut(() => ChannelProvider());
Get.lazyPut(() => RealmProvider());
Get.lazyPut(() => ChatCallProvider());

27
lib/models/account_status.dart Normal file
View File

@ -0,0 +1,27 @@
class AccountStatus {
bool isDisturbable;
bool isOnline;
DateTime? lastSeenAt;
dynamic status;
AccountStatus({
required this.isDisturbable,
required this.isOnline,
required this.lastSeenAt,
required this.status,
});
factory AccountStatus.fromJson(Map<String, dynamic> json) => AccountStatus(
isDisturbable: json['is_disturbable'],
isOnline: json['is_online'],
lastSeenAt: json['last_seen_at'] != null ? DateTime.parse(json['last_seen_at']) : null,
status: json['status'],
);
Map<String, dynamic> toJson() => {
'is_disturbable': isDisturbable,
'is_online': isOnline,
'last_seen_at': lastSeenAt?.toIso8601String(),
'status': status,
};
}

49
lib/models/personal_page.dart
View File

@ -1,49 +0,0 @@
class PersonalPage {
int id;
DateTime createdAt;
DateTime updatedAt;
DateTime? deletedAt;
String content;
String script;
String style;
Map<String, String>? links;
int accountId;
PersonalPage({
required this.id,
required this.createdAt,
required this.updatedAt,
required this.deletedAt,
required this.content,
required this.script,
required this.style,
required this.links,
required this.accountId,
});
factory PersonalPage.fromJson(Map<String, dynamic> json) => PersonalPage(
id: json['id'],
createdAt: DateTime.parse(json['created_at']),
updatedAt: DateTime.parse(json['updated_at']),
deletedAt: json['deleted_at'] != null
? DateTime.parse(json['deleted_at'])
: null,
content: json['content'],
script: json['script'],
style: json['style'],
links: json['links'],
accountId: json['account_id'],
);
Map<String, dynamic> toJson() => {
'id': id,
'created_at': createdAt.toIso8601String(),
'updated_at': updatedAt.toIso8601String(),
'deleted_at': deletedAt?.toIso8601String(),
'content': content,
'script': script,
'style': style,
'links': links,
'account_id': accountId,
};
}

56
lib/providers/status.dart Normal file
View File

@ -0,0 +1,56 @@
import 'package:flutter/material.dart';
import 'package:get/get.dart';
import 'package:solian/models/account_status.dart';
import 'package:solian/providers/auth.dart';
import 'package:solian/services.dart';
class StatusController extends GetConnect {
static Map<String, (Widget, String, String?)> presetStatuses = {
'online': (
const Icon(Icons.circle, color: Colors.green),
'accountStatusOnline'.tr,
null,
),
'silent': (
const Icon(Icons.do_not_disturb_on, color: Colors.red),
'accountStatusSilent'.tr,
'accountStatusSilentDesc'.tr,
),
'invisible': (
const Icon(Icons.circle, color: Colors.grey),
'accountStatusInvisible'.tr,
'accountStatusInvisibleDesc'.tr,
),
};
@override
void onInit() {
final AuthProvider auth = Get.find();
httpClient.baseUrl = ServiceFinder.services['passport'];
httpClient.addAuthenticator(auth.requestAuthenticator);
}
Future<Response> getCurrentStatus() => get('/api/users/me/status');
Future<Response> getSomeoneStatus(String name) =>
get('/api/users/$name/status');
static (Widget, String) determineStatus(AccountStatus status,
{double size = 14}) {
Widget icon;
String? text = status.status?.label;
if (status.isDisturbable && status.isOnline) {
icon = Icon(Icons.circle, color: Colors.green, size: size);
text ??= 'accountStatusOnline'.tr;
} else if (!status.isDisturbable && status.isOnline) {
icon = Icon(Icons.do_not_disturb_on, color: Colors.red, size: size);
text ??= 'accountStatusSilent'.tr;
} else {
icon = Icon(Icons.circle, color: Colors.grey, size: size);
text ??= 'accountStatusOffline'.tr;
}
return (icon, text);
}
}

2
lib/screens/account.dart
View File

@ -2,6 +2,7 @@ import 'package:flutter/material.dart';
import 'package:get/get.dart';
import 'package:solian/models/account.dart';
import 'package:solian/providers/auth.dart';
import 'package:solian/providers/status.dart';
import 'package:solian/router.dart';
import 'package:solian/screens/auth/signin.dart';
import 'package:solian/screens/auth/signup.dart';
@ -132,6 +133,7 @@ class AccountHeading extends StatelessWidget {
name: prof.body['name'],
nick: prof.body['nick'],
desc: prof.body['description'],
status: Get.find<StatusController>().getCurrentStatus(),
badges: prof.body['badges']
?.map((e) => AccountBadge.fromJson(e))
.toList()

18
lib/translations.dart
View File

@ -216,6 +216,15 @@ class SolianMessages extends Translations {
'pushNotifyRegisterDone': 'Push notifications has been activated.',
'pushNotifyRegisterFailed':
'Unable to active push notification... @reason',
'accountChangeStatus': 'Change Status',
'accountCustomStatus': 'Set Custom Status',
'accountClearStatus': 'Clear Status',
'accountStatusOnline': 'Online',
'accountStatusSilent': 'Do not Disturb',
'accountStatusSilentDesc': 'The notification will stop popping up',
'accountStatusInvisible': 'Invisible',
'accountStatusInvisibleDesc': 'Will show as offline, but all features still remain normal',
'accountStatusOffline': 'Offline',
},
'zh_CN': {
'hide': '隐藏',
@ -415,6 +424,15 @@ class SolianMessages extends Translations {
'激活推送通知便可以让你在应用程序完全关闭的时候仍然获取到我们最新的通知。在 iOS/macOS 设备上我们使用 Apple 官方的推送服务；其他设备则通过 Google Firebase 提供推送通知。要注册推送通知设备，您可能需要连接到 Google 的服务器（在中国大陆不可用）并在您的设备上安装 Google Framework。即使您关闭此对话框，下次启动应用程序时仍会自动执行此注册。',
'pushNotifyRegisterDone': '推送通知已成功激活',
'pushNotifyRegisterFailed': '推送通知激活失败…… @reason',
'accountChangeStatus': '变更状态',
'accountCustomStatus': '自定义状态',
'accountClearStatus': '清除状态',
'accountStatusOnline': '在线',
'accountStatusSilent': '请勿打扰',
'accountStatusSilentDesc': '将会暂停所有通知推送',
'accountStatusInvisible': '隐身',
'accountStatusInvisibleDesc': '将会在他人界面显示离线，但不影响功能使用',
'accountStatusOffline': '离线',
}
};
}

52
lib/widgets/account/account_heading.dart
View File

@ -1,9 +1,12 @@
import 'package:flutter/material.dart';
import 'package:get/get.dart';
import 'package:solian/models/account.dart';
import 'package:solian/models/account_status.dart';
import 'package:solian/platform.dart';
import 'package:solian/providers/status.dart';
import 'package:solian/widgets/account/account_avatar.dart';
import 'package:solian/widgets/account/account_badge.dart';
import 'package:solian/widgets/account/account_status_action.dart';
class AccountHeadingWidget extends StatelessWidget {
final dynamic avatar;
@ -13,6 +16,9 @@ class AccountHeadingWidget extends StatelessWidget {
final String? desc;
final List<AccountBadge>? badges;
final Future<Response>? status;
final Function? onEditStatus;
const AccountHeadingWidget({
super.key,
this.avatar,
@ -21,8 +27,18 @@ class AccountHeadingWidget extends StatelessWidget {
required this.nick,
required this.desc,
required this.badges,
this.status,
this.onEditStatus,
});
void showStatusAction(BuildContext context, bool hasStatus) {
showModalBottomSheet(
useRootNavigator: true,
context: context,
builder: (context) => AccountStatusAction(hasStatus: hasStatus),
);
}
@override
Widget build(BuildContext context) {
return Material(
@ -55,6 +71,8 @@ class AccountHeadingWidget extends StatelessWidget {
),
],
),
Column(
children: [
Row(
crossAxisAlignment: CrossAxisAlignment.baseline,
textBaseline: TextBaseline.alphabetic,
@ -73,6 +91,40 @@ class AccountHeadingWidget extends StatelessWidget {
),
),
],
),
if (status != null)
SizedBox(
width: double.infinity,
child: FutureBuilder(
future: status,
builder: (context, snapshot) {
if (!snapshot.hasData || snapshot.data!.body == null) {
return Text('loading'.tr);
}
final info = StatusController.determineStatus(
AccountStatus.fromJson(snapshot.data!.body),
);
return GestureDetector(
child: Row(
crossAxisAlignment: CrossAxisAlignment.center,
children: [
Text(info.$2),
info.$1.paddingSymmetric(horizontal: 6),
],
),
onTap: () {
showStatusAction(
context,
snapshot.data!.body['status'] != null,
);
},
);
},
),
),
],
).paddingOnly(left: 116, top: 6),
const SizedBox(height: 4),
if (badges?.isNotEmpty ?? false)

2
lib/widgets/account/account_profile_popup.dart
View File

@ -2,6 +2,7 @@ import 'package:flutter/material.dart';
import 'package:get/get.dart';
import 'package:solian/exts.dart';
import 'package:solian/models/account.dart';
import 'package:solian/providers/status.dart';
import 'package:solian/services.dart';
import 'package:solian/widgets/account/account_heading.dart';
@ -60,6 +61,7 @@ class _AccountProfilePopupState extends State<AccountProfilePopup> {
nick: _userinfo!.nick,
desc: _userinfo!.description,
badges: _userinfo!.badges,
status: Get.find<StatusController>().getSomeoneStatus(_userinfo!.name),
).paddingOnly(top: 16),
],
),

62
lib/widgets/account/account_status_action.dart Normal file
View File

@ -0,0 +1,62 @@
import 'package:flutter/material.dart';
import 'package:get/get.dart';
import 'package:solian/providers/status.dart';
class AccountStatusAction extends StatelessWidget {
final bool hasStatus;
const AccountStatusAction({super.key, this.hasStatus = false});
@override
Widget build(BuildContext context) {
return SizedBox(
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Text(
'accountChangeStatus'.tr,
style: Theme.of(context).textTheme.headlineSmall,
).paddingOnly(left: 24, right: 24, top: 32, bottom: 16),
Expanded(
child: ListView(
children: [
SizedBox(
height: 48,
child: ListView(
scrollDirection: Axis.horizontal,
children: StatusController.presetStatuses.entries
.map(
(x) => ActionChip(
avatar: x.value.$1,
label: Text(x.value.$2),
tooltip: x.value.$3,
onPressed: () {},
).paddingOnly(right: 6),
)
.toList(),
).paddingSymmetric(horizontal: 18),
),
const Divider(thickness: 0.3, height: 0.3)
.paddingSymmetric(vertical: 16),
ListTile(
contentPadding: const EdgeInsets.symmetric(horizontal: 24),
leading: hasStatus
? const Icon(Icons.edit)
: const Icon(Icons.add),
title: Text('accountCustomStatus'.tr),
onTap: () {},
),
ListTile(
contentPadding: const EdgeInsets.symmetric(horizontal: 24),
leading: const Icon(Icons.clear),
title: Text('accountClearStatus'.tr),
onTap: () {},
),
],
),
),
],
),
);
}
}

1
lib/widgets/posts/post_quick_action.dart
View File

@ -31,7 +31,6 @@ class _PostQuickActionState extends State<PostQuickAction> {
void showReactMenu() {
showModalBottomSheet(
useRootNavigator: true,
isScrollControlled: true,
context: context,
builder: (context) => PostReactionPopup(
item: widget.item,

1
lib/widgets/posts/post_reaction.dart
View File

@ -12,7 +12,6 @@ class PostReactionPopup extends StatelessWidget {
@override
Widget build(BuildContext context) {
return SizedBox(
height: MediaQuery.of(context).size.height * 0.85,
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [