SolarNetwork/App
3
3
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: SolarNetwork:cfbe6e580be4fa96d5d407aee92fe8caf4c01977
Branches Tags
SolarNetwork:v3 SolarNetwork:v2
SolarNetwork:3.5.0+160 SolarNetwork:3.5.0+159 SolarNetwork:3.5.0+138 SolarNetwork:3.5.0+157 SolarNetwork:3.5.0+156 SolarNetwork:3.5.0+155 SolarNetwork:3.5.0+151 SolarNetwork:3.5.0+150 SolarNetwork:3.4.0+149 SolarNetwork:3.3.0+148 SolarNetwork:3.3.0+147 SolarNetwork:3.3.0+146 SolarNetwork:3.3.0+145 SolarNetwork:3.3.0+144 SolarNetwork:3.3.0+138 SolarNetwork:3.3.0+137 SolarNetwork:3.3.0+136 SolarNetwork:3.3.0+135 SolarNetwork:3.2.0+134 SolarNetwork:3.2.0+133 SolarNetwork:3.2.0+132 SolarNetwork:3.2.0+131 SolarNetwork:3.2.0+129 SolarNetwork:3.2.0+128 SolarNetwork:3.2.0+127 SolarNetwork:3.2.0+126 SolarNetwork:3.2.0+125 SolarNetwork:3.2.0+124 SolarNetwork:3.1.0+123 SolarNetwork:3.1.0+122 SolarNetwork:3.1.0+121 SolarNetwork:3.1.0+120 SolarNetwork:3.1.0+119 SolarNetwork:3.1.0+118 SolarNetwork:3.1.0+116 SolarNetwork:3.1.0+115 SolarNetwork:3.1.0+114 SolarNetwork:3.1.0+113 SolarNetwork:3.0.0+112 SolarNetwork:3.0.0+111 SolarNetwork:3.0.0+110 SolarNetwork:3.0.0+109 SolarNetwork:3.0.0+108 SolarNetwork:3.0.0+107 SolarNetwork:3.0.0+106 SolarNetwork:3.0.0+104 SolarNetwork:3.0.0+103 SolarNetwork:3.0.0+102 SolarNetwork:3.0.0+100 SolarNetwork:3.0.0+96 SolarNetwork:3.0.0+95 SolarNetwork:3.0.0+94 SolarNetwork:3.0.0+93 SolarNetwork:2.5.2+92 SolarNetwork:2.4.2+89 SolarNetwork:2.4.2+88 SolarNetwork:2.4.2+86 SolarNetwork:2.4.2+85 SolarNetwork:2.4.2+84 SolarNetwork:2.4.2+81 SolarNetwork:2.4.2+80 SolarNetwork:2.4.2+78 SolarNetwork:2.4.2+76 SolarNetwork:2.3.2+75 SolarNetwork:2.3.2+73 SolarNetwork:2.3.2+72 SolarNetwork:2.3.2+71 SolarNetwork:2.3.2+70 SolarNetwork:2.3.2+69 SolarNetwork:2.3.2+68 SolarNetwork:2.3.2+67 SolarNetwork:2.3.2+66 SolarNetwork:2.3.2+65 SolarNetwork:2.3.2+64 SolarNetwork:2.3.2+63 SolarNetwork:2.2.2+62 SolarNetwork:2.2.2+61 SolarNetwork:2.2.2+60 SolarNetwork:2.2.2+59 SolarNetwork:2.2.2+58 SolarNetwork:2.2.2+57 SolarNetwork:2.2.2+56 SolarNetwork:2.2.2+55 SolarNetwork:2.2.2+54 SolarNetwork:2.2.2+53 SolarNetwork:2.2.2+52 SolarNetwork:2.2.2+51 SolarNetwork:2.2.2+40 SolarNetwork:2.2.2+49 SolarNetwork:2.2.1+48 SolarNetwork:2.2.1+47 SolarNetwork:2.2.1+46 SolarNetwork:2.2.1+44 SolarNetwork:2.2.1+43 SolarNetwork:2.2.1+42 SolarNetwork:2.1.1+41 SolarNetwork:2.1.1+39 SolarNetwork:2.1.1+38 SolarNetwork:2.1.1+37 SolarNetwork:2.1.1+36 SolarNetwork:2.1.1+35 SolarNetwork:2.0.0+4 SolarNetwork:2.0.0+2
..
compare: SolarNetwork:d764b042fe2c31c1dff7d87f269ac19bfe42a9f8
Branches Tags
SolarNetwork:v3 SolarNetwork:v2
SolarNetwork:3.5.0+160 SolarNetwork:3.5.0+159 SolarNetwork:3.5.0+138 SolarNetwork:3.5.0+157 SolarNetwork:3.5.0+156 SolarNetwork:3.5.0+155 SolarNetwork:3.5.0+151 SolarNetwork:3.5.0+150 SolarNetwork:3.4.0+149 SolarNetwork:3.3.0+148 SolarNetwork:3.3.0+147 SolarNetwork:3.3.0+146 SolarNetwork:3.3.0+145 SolarNetwork:3.3.0+144 SolarNetwork:3.3.0+138 SolarNetwork:3.3.0+137 SolarNetwork:3.3.0+136 SolarNetwork:3.3.0+135 SolarNetwork:3.2.0+134 SolarNetwork:3.2.0+133 SolarNetwork:3.2.0+132 SolarNetwork:3.2.0+131 SolarNetwork:3.2.0+129 SolarNetwork:3.2.0+128 SolarNetwork:3.2.0+127 SolarNetwork:3.2.0+126 SolarNetwork:3.2.0+125 SolarNetwork:3.2.0+124 SolarNetwork:3.1.0+123 SolarNetwork:3.1.0+122 SolarNetwork:3.1.0+121 SolarNetwork:3.1.0+120 SolarNetwork:3.1.0+119 SolarNetwork:3.1.0+118 SolarNetwork:3.1.0+116 SolarNetwork:3.1.0+115 SolarNetwork:3.1.0+114 SolarNetwork:3.1.0+113 SolarNetwork:3.0.0+112 SolarNetwork:3.0.0+111 SolarNetwork:3.0.0+110 SolarNetwork:3.0.0+109 SolarNetwork:3.0.0+108 SolarNetwork:3.0.0+107 SolarNetwork:3.0.0+106 SolarNetwork:3.0.0+104 SolarNetwork:3.0.0+103 SolarNetwork:3.0.0+102 SolarNetwork:3.0.0+100 SolarNetwork:3.0.0+96 SolarNetwork:3.0.0+95 SolarNetwork:3.0.0+94 SolarNetwork:3.0.0+93 SolarNetwork:2.5.2+92 SolarNetwork:2.4.2+89 SolarNetwork:2.4.2+88 SolarNetwork:2.4.2+86 SolarNetwork:2.4.2+85 SolarNetwork:2.4.2+84 SolarNetwork:2.4.2+81 SolarNetwork:2.4.2+80 SolarNetwork:2.4.2+78 SolarNetwork:2.4.2+76 SolarNetwork:2.3.2+75 SolarNetwork:2.3.2+73 SolarNetwork:2.3.2+72 SolarNetwork:2.3.2+71 SolarNetwork:2.3.2+70 SolarNetwork:2.3.2+69 SolarNetwork:2.3.2+68 SolarNetwork:2.3.2+67 SolarNetwork:2.3.2+66 SolarNetwork:2.3.2+65 SolarNetwork:2.3.2+64 SolarNetwork:2.3.2+63 SolarNetwork:2.2.2+62 SolarNetwork:2.2.2+61 SolarNetwork:2.2.2+60 SolarNetwork:2.2.2+59 SolarNetwork:2.2.2+58 SolarNetwork:2.2.2+57 SolarNetwork:2.2.2+56 SolarNetwork:2.2.2+55 SolarNetwork:2.2.2+54 SolarNetwork:2.2.2+53 SolarNetwork:2.2.2+52 SolarNetwork:2.2.2+51 SolarNetwork:2.2.2+40 SolarNetwork:2.2.2+49 SolarNetwork:2.2.1+48 SolarNetwork:2.2.1+47 SolarNetwork:2.2.1+46 SolarNetwork:2.2.1+44 SolarNetwork:2.2.1+43 SolarNetwork:2.2.1+42 SolarNetwork:2.1.1+41 SolarNetwork:2.1.1+39 SolarNetwork:2.1.1+38 SolarNetwork:2.1.1+37 SolarNetwork:2.1.1+36 SolarNetwork:2.1.1+35 SolarNetwork:2.0.0+4 SolarNetwork:2.0.0+2

2 Commits
cfbe6e580b ... d764b042fe

Author SHA1 Message Date
LittleSheep
d764b042fe ✨ Shows account own activities on account page 2025-11-02 16:59:58 +08:00
LittleSheep
a76b97d1d2 💄 Shows listening activities are from spotfiy 2025-11-02 16:55:16 +08:00
2 changed files with 246 additions and 188 deletions
Expand all files Collapse all files

34
lib/screens/account.dart
View File

@@ -8,6 +8,7 @@ import 'package:island/pods/userinfo.dart';
import 'package:island/screens/notification.dart'; import 'package:island/screens/notification.dart';
import 'package:island/services/responsive.dart'; import 'package:island/services/responsive.dart';
import 'package:island/widgets/account/account_name.dart'; import 'package:island/widgets/account/account_name.dart';
import 'package:island/widgets/account/activity_presence.dart';
import 'package:island/widgets/account/status.dart'; import 'package:island/widgets/account/status.dart';
import 'package:island/widgets/account/leveling_progress.dart'; import 'package:island/widgets/account/leveling_progress.dart';
import 'package:island/widgets/alert.dart'; import 'package:island/widgets/alert.dart';
@@ -177,7 +178,21 @@ class AccountScreen extends HookConsumerWidget {
).padding(horizontal: 8), ).padding(horizontal: 8),
Card( Card(
margin: EdgeInsets.zero, margin: EdgeInsets.zero,
child: AccountStatusCreationWidget(uname: user.value!.name), child: Column(
children: [
AccountStatusCreationWidget(uname: user.value!.name),
ActivityPresenceWidget(
uname: user.value!.name,
isCompact: true,
compactPadding: const EdgeInsets.only(
left: 16,
right: 16,
bottom: 8,
top: 4,
),
),
],
),
).padding(horizontal: 12, bottom: 4), ).padding(horizontal: 12, bottom: 4),
LevelingProgressCard( LevelingProgressCard(
isCompact: true, isCompact: true,
@@ -251,7 +266,9 @@ class AccountScreen extends HookConsumerWidget {
).padding(horizontal: 12), ).padding(horizontal: 12),
const SizedBox.shrink(), const SizedBox.shrink(),
ConstrainedBox( ConstrainedBox(
constraints: BoxConstraints(maxWidth: MediaQuery.of(context).size.width), constraints: BoxConstraints(
maxWidth: MediaQuery.of(context).size.width,
),
child: LayoutBuilder( child: LayoutBuilder(
builder: (context, constraints) { builder: (context, constraints) {
const minWidth = 160.0; const minWidth = 160.0;
@@ -312,14 +329,23 @@ class AccountScreen extends HookConsumerWidget {
if (availableWidth > totalMin) { if (availableWidth > totalMin) {
return Row( return Row(
spacing: 8, spacing: 8,
children: children.map((child) => Expanded(child: child)).toList(), children:
children
.map((child) => Expanded(child: child))
.toList(),
).padding(horizontal: 12).height(48); ).padding(horizontal: 12).height(48);
} else { } else {
return SingleChildScrollView( return SingleChildScrollView(
scrollDirection: Axis.horizontal, scrollDirection: Axis.horizontal,
child: Row( child: Row(
spacing: 8, spacing: 8,
children: children.map((child) => SizedBox(width: minWidth, child: child)).toList(), children:
children
.map(
(child) =>
SizedBox(width: minWidth, child: child),
)
.toList(),
).padding(horizontal: 12), ).padding(horizontal: 12),
).height(48); ).height(48);
} }

70
lib/widgets/account/activity_presence.dart
View File

@@ -393,9 +393,11 @@ class _ActivityPresenceWidgetState extends State<ActivityPresenceWidget>
], ],
).opacity(0.75).padding(horizontal: 16, bottom: 8), ).opacity(0.75).padding(horizontal: 16, bottom: 8),
...activities.map((activity) { ...activities.map((activity) {
final dcImages = _buildImages(ref, activity); final images = _buildImages(ref, activity);
return Card( return Stack(
children: [
Card(
elevation: 0, elevation: 0,
shape: RoundedRectangleBorder( shape: RoundedRectangleBorder(
side: BorderSide( side: BorderSide(
@@ -409,11 +411,12 @@ class _ActivityPresenceWidgetState extends State<ActivityPresenceWidget>
title: Column( title: Column(
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start,
children: [ children: [
if (dcImages.isNotEmpty) if (images.isNotEmpty)
Row( Row(
crossAxisAlignment: CrossAxisAlignment.end, crossAxisAlignment:
CrossAxisAlignment.end,
spacing: 8, spacing: 8,
children: dcImages, children: images,
).padding(vertical: 4), ).padding(vertical: 4),
Row( Row(
spacing: 2, spacing: 2,
@@ -431,7 +434,9 @@ class _ActivityPresenceWidgetState extends State<ActivityPresenceWidget>
onPressed: () { onPressed: () {
launchUrlString(activity.titleUrl!); launchUrlString(activity.titleUrl!);
}, },
icon: const Icon(Symbols.launch_rounded), icon: const Icon(
Symbols.launch_rounded,
),
iconSize: 16, iconSize: 16,
padding: EdgeInsets.all(4), padding: EdgeInsets.all(4),
constraints: const BoxConstraints( constraints: const BoxConstraints(
@@ -468,11 +473,13 @@ class _ActivityPresenceWidgetState extends State<ActivityPresenceWidget>
builder: (context, snapshot) { builder: (context, snapshot) {
final now = DateTime.now(); final now = DateTime.now();
final meta = final meta =
activity.meta as Map<String, dynamic>; activity.meta
as Map<String, dynamic>;
final progressMs = final progressMs =
meta['progress_ms'] as int? ?? 0; meta['progress_ms'] as int? ?? 0;
final durationMs = final durationMs =
meta['track_duration_ms'] as int? ?? 1; meta['track_duration_ms'] as int? ??
1;
final elapsed = final elapsed =
now now
.difference(activity.createdAt) .difference(activity.createdAt)
@@ -488,7 +495,9 @@ class _ActivityPresenceWidgetState extends State<ActivityPresenceWidget>
begin: _startProgress, begin: _startProgress,
end: _endProgress, end: _endProgress,
).animate(_progressController); ).animate(_progressController);
_progressController.forward(from: 0.0); _progressController.forward(
from: 0.0,
);
} }
return AnimatedBuilder( return AnimatedBuilder(
animation: _progressAnimation, animation: _progressAnimation,
@@ -503,7 +512,8 @@ class _ActivityPresenceWidgetState extends State<ActivityPresenceWidget>
final currentSec = final currentSec =
(animatedProgressMs % 60000) ~/ (animatedProgressMs % 60000) ~/
1000; 1000;
final totalMin = durationMs ~/ 60000; final totalMin =
durationMs ~/ 60000;
final totalSec = final totalSec =
(durationMs % 60000) ~/ 1000; (durationMs % 60000) ~/ 1000;
return Column( return Column(
@@ -516,11 +526,12 @@ class _ActivityPresenceWidgetState extends State<ActivityPresenceWidget>
backgroundColor: backgroundColor:
Colors.grey.shade300, Colors.grey.shade300,
trackGap: 0, trackGap: 0,
stopIndicatorColor: Colors.green, stopIndicatorColor:
valueColor:
AlwaysStoppedAnimation<Color>(
Colors.green, Colors.green,
), valueColor:
AlwaysStoppedAnimation<
Color
>(Colors.green),
).padding(top: 3), ).padding(top: 3),
Text( Text(
'${currentMin.toString().padLeft(2, '0')}:${currentSec.toString().padLeft(2, '0')} / ${totalMin.toString().padLeft(2, '0')}:${totalSec.toString().padLeft(2, '0')}', '${currentMin.toString().padLeft(2, '0')}:${currentSec.toString().padLeft(2, '0')} / ${totalMin.toString().padLeft(2, '0')}:${totalSec.toString().padLeft(2, '0')}',
@@ -549,10 +560,12 @@ class _ActivityPresenceWidgetState extends State<ActivityPresenceWidget>
final hours = duration.inHours final hours = duration.inHours
.toString() .toString()
.padLeft(2, '0'); .padLeft(2, '0');
final minutes = (duration.inMinutes % 60) final minutes = (duration.inMinutes %
60)
.toString() .toString()
.padLeft(2, '0'); .padLeft(2, '0');
final seconds = (duration.inSeconds % 60) final seconds = (duration.inSeconds %
60)
.toString() .toString()
.padLeft(2, '0'); .padLeft(2, '0');
return Text( return Text(
@@ -564,12 +577,16 @@ class _ActivityPresenceWidgetState extends State<ActivityPresenceWidget>
Row( Row(
spacing: 2, spacing: 2,
children: [ children: [
Flexible(child: Text(activity.subtitle!)), Flexible(
child: Text(activity.subtitle!),
),
if (activity.titleUrl != null && if (activity.titleUrl != null &&
activity.titleUrl!.isNotEmpty) activity.titleUrl!.isNotEmpty)
IconButton( IconButton(
onPressed: () { onPressed: () {
launchUrlString(activity.titleUrl!); launchUrlString(
activity.titleUrl!,
);
}, },
icon: const Icon( icon: const Icon(
Symbols.launch_rounded, Symbols.launch_rounded,
@@ -588,7 +605,22 @@ class _ActivityPresenceWidgetState extends State<ActivityPresenceWidget>
], ],
), ),
), ),
).padding(horizontal: 8); ).padding(horizontal: 8),
if (activity.manualId == 'spotify')
Positioned(
top: 16,
right: 24,
child: Tooltip(
message: 'Listening on Spotify',
child: Image.asset(
'assets/images/oidc/spotify.png',
width: 24,
height: 24,
),
),
),
],
);
}), }),
], ],
).padding(horizontal: 8, top: 8, bottom: 16), ).padding(horizontal: 8, top: 8, bottom: 16),