Compare commits

..

No commits in common. "04b9427cdf663604ac7a8e0826d4eaef5597b6c2" and "d3148ab89d3aa78ba4d014acf8383e0d96d1d49e" have entirely different histories.

7 changed files with 72 additions and 177 deletions

View File

@ -274,12 +274,6 @@
"attachmentUnsetAsPostThumbnail": "Unset as post thumbnail", "attachmentUnsetAsPostThumbnail": "Unset as post thumbnail",
"attachmentSetThumbnail": "Set thumbnail", "attachmentSetThumbnail": "Set thumbnail",
"attachmentUpload": "Upload", "attachmentUpload": "Upload",
"notification": "Notification",
"notificationUnreadCount": {
"zero": "All notifications read",
"one": "{} unread notification",
"other": "{} unread notifications"
},
"notificationUnread": "Unread", "notificationUnread": "Unread",
"notificationRead": "Read", "notificationRead": "Read",
"notificationMarkAllRead": "Mark all notifications as read", "notificationMarkAllRead": "Mark all notifications as read",
@ -430,6 +424,5 @@
"unauthorizedDescription": "Login to explore the entire Solar Network.", "unauthorizedDescription": "Login to explore the entire Solar Network.",
"serviceStatus": "Service Status", "serviceStatus": "Service Status",
"termRelated": "Related Terms", "termRelated": "Related Terms",
"appDetails": "App Details", "appDetails": "App Details"
"postRecommendation": "Highlight Posts"
} }

View File

@ -35,7 +35,7 @@
"errorRequestForbidden": "被禁止的请求,您没有足够的权限去做那件事。", "errorRequestForbidden": "被禁止的请求,您没有足够的权限去做那件事。",
"errorRequestNotFound": "您正查找的资源无法被找到。", "errorRequestNotFound": "您正查找的资源无法被找到。",
"errorRequestConnection": "网络连接错误,请检查您的网络状态或者检查我们的服务状态。", "errorRequestConnection": "网络连接错误,请检查您的网络状态或者检查我们的服务状态。",
"errorRequestUnknown": "未知请求错误,您可能想将此对话框截图并发送给我们。", "errorRequestUnknown": "位置请求错误,您可能想将此对话框截图并发送给我们。",
"unknown": "未知", "unknown": "未知",
"loading": "加载中…", "loading": "加载中…",
"prev": "上一步", "prev": "上一步",
@ -272,12 +272,6 @@
"attachmentUnsetAsPostThumbnail": "取消设置为帖子缩略图", "attachmentUnsetAsPostThumbnail": "取消设置为帖子缩略图",
"attachmentSetThumbnail": "设置缩略图", "attachmentSetThumbnail": "设置缩略图",
"attachmentUpload": "上传", "attachmentUpload": "上传",
"notification": "通知",
"notificationUnreadCount": {
"zero": "无未读通知",
"one": "有 {} 个未读通知",
"other": "有 {} 个未读通知"
},
"notificationUnread": "未读", "notificationUnread": "未读",
"notificationRead": "已读", "notificationRead": "已读",
"notificationMarkAllRead": "已读所有通知", "notificationMarkAllRead": "已读所有通知",
@ -428,6 +422,5 @@
"unauthorizedDescription": "登陆以探索整个 Solar Network。", "unauthorizedDescription": "登陆以探索整个 Solar Network。",
"serviceStatus": "服务状态", "serviceStatus": "服务状态",
"termRelated": "相关条款", "termRelated": "相关条款",
"appDetails": "应用程序详情", "appDetails": "应用程序详情"
"postRecommendation": "推荐帖子"
} }

View File

@ -60,14 +60,6 @@ class SnPostContentProvider {
return out; return out;
} }
Future<List<SnPost>> listRecommendations() async {
final resp = await _sn.client.get('/cgi/co/recommendations');
final out = _preloadRelatedDataInBatch(
List.from(resp.data.map((ele) => SnPost.fromJson(ele))),
);
return out;
}
Future<(List<SnPost>, int)> listPosts({ Future<(List<SnPost>, int)> listPosts({
int take = 10, int take = 10,
int offset = 0, int offset = 0,

View File

@ -3,20 +3,16 @@ import 'dart:math' as math;
import 'package:easy_localization/easy_localization.dart'; import 'package:easy_localization/easy_localization.dart';
import 'package:flutter_staggered_grid_view/flutter_staggered_grid_view.dart'; import 'package:flutter_staggered_grid_view/flutter_staggered_grid_view.dart';
import 'package:gap/gap.dart'; import 'package:gap/gap.dart';
import 'package:go_router/go_router.dart';
import 'package:google_fonts/google_fonts.dart'; import 'package:google_fonts/google_fonts.dart';
import 'package:material_symbols_icons/symbols.dart'; import 'package:material_symbols_icons/symbols.dart';
import 'package:provider/provider.dart'; import 'package:provider/provider.dart';
import 'package:styled_widget/styled_widget.dart'; import 'package:styled_widget/styled_widget.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:surface/providers/post.dart';
import 'package:surface/providers/sn_network.dart'; import 'package:surface/providers/sn_network.dart';
import 'package:surface/providers/userinfo.dart'; import 'package:surface/providers/userinfo.dart';
import 'package:surface/types/check_in.dart'; import 'package:surface/types/check_in.dart';
import 'package:surface/types/post.dart';
import 'package:surface/widgets/app_bar_leading.dart'; import 'package:surface/widgets/app_bar_leading.dart';
import 'package:surface/widgets/dialog.dart'; import 'package:surface/widgets/dialog.dart';
import 'package:surface/widgets/post/post_item.dart';
class HomeScreenDashEntry { class HomeScreenDashEntry {
final String name; final String name;
@ -40,20 +36,10 @@ class HomeScreen extends StatefulWidget {
class _HomeScreenState extends State<HomeScreen> { class _HomeScreenState extends State<HomeScreen> {
static const List<HomeScreenDashEntry> kCards = [ static const List<HomeScreenDashEntry> kCards = [
HomeScreenDashEntry(
name: 'dashEntryRecommendation',
cols: 2,
rows: 2,
child: _HomeDashRecommendationPostWidget(),
),
HomeScreenDashEntry( HomeScreenDashEntry(
name: 'dashEntryCheckIn', name: 'dashEntryCheckIn',
child: _HomeDashCheckInWidget(), child: _HomeDashCheckInWidget(),
), ),
HomeScreenDashEntry(
name: 'dashEntryNotification',
child: _HomeDashNotificationWidget(),
),
]; ];
@override @override
@ -66,12 +52,16 @@ class _HomeScreenState extends State<HomeScreen> {
body: LayoutBuilder( body: LayoutBuilder(
builder: (context, constraints) { builder: (context, constraints) {
return Align( return Align(
alignment: constraints.maxWidth > 640 ? Alignment.center : Alignment.topCenter, alignment: constraints.maxWidth > 640
? Alignment.center
: Alignment.topCenter,
child: Container( child: Container(
constraints: const BoxConstraints(maxWidth: 640), constraints: const BoxConstraints(maxWidth: 640),
child: SingleChildScrollView( child: SingleChildScrollView(
child: Column( child: Column(
mainAxisAlignment: constraints.maxWidth > 640 ? MainAxisAlignment.center : MainAxisAlignment.start, mainAxisAlignment: constraints.maxWidth > 640
? MainAxisAlignment.center
: MainAxisAlignment.start,
children: [ children: [
if (constraints.maxWidth <= 640) const Gap(8), if (constraints.maxWidth <= 640) const Gap(8),
_HomeDashSpecialDayWidget().padding(top: 8, horizontal: 8), _HomeDashSpecialDayWidget().padding(top: 8, horizontal: 8),
@ -106,7 +96,9 @@ class _HomeDashSpecialDayWidget extends StatelessWidget {
final ua = context.watch<UserProvider>(); final ua = context.watch<UserProvider>();
final today = DateTime.now(); final today = DateTime.now();
final birthday = ua.user?.profile?.birthday?.toLocal(); final birthday = ua.user?.profile?.birthday?.toLocal();
final isBirthday = birthday != null && birthday.day == today.day && birthday.month == today.month; final isBirthday = birthday != null &&
birthday.day == today.day &&
birthday.month == today.month;
return Column( return Column(
children: [ children: [
if (isBirthday) if (isBirthday)
@ -162,15 +154,20 @@ class _HomeDashCheckInWidgetState extends State<_HomeDashCheckInWidget> {
} }
Widget _buildDetailChunk(int index, bool positive) { Widget _buildDetailChunk(int index, bool positive) {
final prefix = positive ? 'dailyCheckPositiveHint' : 'dailyCheckNegativeHint'; final prefix =
final mod = positive ? kSuggestionPositiveHintCount : kSuggestionNegativeHintCount; positive ? 'dailyCheckPositiveHint' : 'dailyCheckNegativeHint';
final mod =
positive ? kSuggestionPositiveHintCount : kSuggestionNegativeHintCount;
final pos = math.max(1, _todayRecord!.resultModifiers[index] % mod); final pos = math.max(1, _todayRecord!.resultModifiers[index] % mod);
return Column( return Column(
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start,
children: [ children: [
Text( Text(
prefix.tr(args: ['$prefix$pos'.tr()]), prefix.tr(args: ['$prefix$pos'.tr()]),
style: Theme.of(context).textTheme.titleMedium!.copyWith(fontWeight: FontWeight.bold), style: Theme.of(context)
.textTheme
.titleMedium!
.copyWith(fontWeight: FontWeight.bold),
).tr(), ).tr(),
Text( Text(
'$prefix${pos}Description', '$prefix${pos}Description',
@ -205,7 +202,10 @@ class _HomeDashCheckInWidgetState extends State<_HomeDashCheckInWidget> {
else else
Text( Text(
'dailyCheckEverythingIsNegative', 'dailyCheckEverythingIsNegative',
style: Theme.of(context).textTheme.titleMedium!.copyWith(fontWeight: FontWeight.bold), style: Theme.of(context)
.textTheme
.titleMedium!
.copyWith(fontWeight: FontWeight.bold),
).tr(), ).tr(),
const Gap(8), const Gap(8),
if (_todayRecord?.resultTier != 4) if (_todayRecord?.resultTier != 4)
@ -221,7 +221,10 @@ class _HomeDashCheckInWidgetState extends State<_HomeDashCheckInWidget> {
else else
Text( Text(
'dailyCheckEverythingIsPositive', 'dailyCheckEverythingIsPositive',
style: Theme.of(context).textTheme.titleMedium!.copyWith(fontWeight: FontWeight.bold), style: Theme.of(context)
.textTheme
.titleMedium!
.copyWith(fontWeight: FontWeight.bold),
).tr(), ).tr(),
], ],
), ),
@ -335,28 +338,14 @@ class _HomeDashCheckInWidgetState extends State<_HomeDashCheckInWidget> {
} }
} }
class _HomeDashNotificationWidget extends StatefulWidget { class _HomeDashLinkWidget extends StatelessWidget {
const _HomeDashNotificationWidget({super.key}); final String title;
final String subtitle;
@override const _HomeDashLinkWidget({
State<_HomeDashNotificationWidget> createState() => _HomeDashNotificationWidgetState(); super.key,
} required this.title,
required this.subtitle,
class _HomeDashNotificationWidgetState extends State<_HomeDashNotificationWidget> { });
int? _count;
Future<void> _fetchNotificationCount() async {
final sn = context.read<SnNetworkProvider>();
final resp = await sn.client.get('/cgi/id/notifications/count');
_count = resp.data['count'];
setState(() {});
}
@override
void initState() {
super.initState();
_fetchNotificationCount();
}
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
@ -369,11 +358,11 @@ class _HomeDashNotificationWidgetState extends State<_HomeDashNotificationWidget
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start,
children: [ children: [
Text( Text(
'notification', title,
style: Theme.of(context).textTheme.titleLarge, style: Theme.of(context).textTheme.titleLarge,
).tr(), ),
Text( Text(
_count == null ? 'loading'.tr() : 'notificationUnreadCount'.plural(_count ?? 0), subtitle,
style: Theme.of(context).textTheme.bodyLarge, style: Theme.of(context).textTheme.bodyLarge,
), ),
], ],
@ -388,9 +377,7 @@ class _HomeDashNotificationWidgetState extends State<_HomeDashNotificationWidget
), ),
child: IconButton( child: IconButton(
icon: const Icon(Symbols.arrow_right_alt), icon: const Icon(Symbols.arrow_right_alt),
onPressed: () { onPressed: () {},
GoRouter.of(context).goNamed('notification');
},
), ),
), ),
) )
@ -399,75 +386,3 @@ class _HomeDashNotificationWidgetState extends State<_HomeDashNotificationWidget
); );
} }
} }
class _HomeDashRecommendationPostWidget extends StatefulWidget {
const _HomeDashRecommendationPostWidget({super.key});
@override
State<_HomeDashRecommendationPostWidget> createState() => _HomeDashRecommendationPostWidgetState();
}
class _HomeDashRecommendationPostWidgetState extends State<_HomeDashRecommendationPostWidget> {
bool _isBusy = false;
List<SnPost>? _posts;
Future<void> _fetchRecommendationPosts() async {
setState(() => _isBusy = true);
try {
final pt = context.read<SnPostContentProvider>();
_posts = await pt.listRecommendations();
} catch (err) {
if (!mounted) return;
context.showErrorDialog(err);
} finally {
setState(() => _isBusy = false);
}
}
@override
void initState() {
super.initState();
_fetchRecommendationPosts();
}
@override
Widget build(BuildContext context) {
if (_isBusy) {
return Card(
child: CircularProgressIndicator().center(),
);
}
return Card(
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Text(
'postRecommendation',
style: Theme.of(context).textTheme.titleLarge,
).tr().padding(horizontal: 20, top: 16, bottom: 8),
Expanded(
child: PageView.builder(
itemCount: _posts?.length ?? 0,
itemBuilder: (context, index) {
return SingleChildScrollView(
child: GestureDetector(
child: PostItem(
data: _posts![index],
showMenu: false,
).padding(left: 8, right: 8, bottom: 8),
onTap: () {
GoRouter.of(context).pushNamed('postDetail', pathParameters: {
'slug': _posts![index].id.toString(),
});
},
),
);
},
),
),
],
),
);
}
}

View File

@ -1,4 +1,8 @@
import 'dart:io';
import 'package:flutter/foundation.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:path_provider/path_provider.dart';
import 'package:shared_preferences/shared_preferences.dart'; import 'package:shared_preferences/shared_preferences.dart';
const kMaterialYouToggleStoreKey = 'app_theme_material_you'; const kMaterialYouToggleStoreKey = 'app_theme_material_you';

View File

@ -60,7 +60,8 @@ class _AppNavigationDrawerState extends State<AppNavigationDrawer> {
], ],
).padding( ).padding(
horizontal: 32, horizontal: 32,
vertical: 12, top: MediaQuery.of(context).padding.top + 12,
bottom: 12,
), ),
...destinations.where((ele) => ele.isPinned).map((ele) { ...destinations.where((ele) => ele.isPinned).map((ele) {
return NavigationDrawerDestination( return NavigationDrawerDestination(

View File

@ -720,9 +720,7 @@ class _PostTruncatedHint extends StatelessWidget {
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
return SingleChildScrollView( return Row(
scrollDirection: Axis.horizontal,
child: Row(
children: [ children: [
if (data.body['content_length'] != null) if (data.body['content_length'] != null)
Row( Row(
@ -747,8 +745,7 @@ class _PostTruncatedHint extends StatelessWidget {
], ],
), ),
], ],
).opacity(0.75), ).opacity(0.75);
);
} }
} }