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

Compare commits

base: SolarNetwork:7740cf78303a3ed2f077e42842116aaaf0747269
Branches Tags
SolarNetwork:v3 SolarNetwork:refactor/webrtc SolarNetwork:v2
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:0bbfa6ddde5ecbe36e7e496e5b44d59fb6c0478b
Branches Tags
SolarNetwork:v3 SolarNetwork:refactor/webrtc SolarNetwork:v2
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
7740cf7830 ... 0bbfa6ddde

Author SHA1 Message Date
LittleSheep
0bbfa6ddde 🚀 Launch 3.0.0+104 2025-06-09 01:10:43 +08:00
LittleSheep
1f46f89056 👽 Support new activity API 2025-06-09 01:06:52 +08:00
9 changed files with 51 additions and 126 deletions
Expand all files Collapse all files

5
lib/models/activity.dart
View File

@@ -10,13 +10,10 @@ sealed class SnActivity with _$SnActivity {
required String id, required String id,
required String type, required String type,
required String resourceIdentifier, required String resourceIdentifier,
required int visibility,
required String accountId,
required SnAccount account,
required dynamic data, required dynamic data,
required DateTime createdAt, required DateTime createdAt,
required DateTime updatedAt, required DateTime updatedAt,
required dynamic deletedAt, required DateTime? deletedAt,
}) = _SnActivity; }) = _SnActivity;
factory SnActivity.fromJson(Map<String, dynamic> json) => factory SnActivity.fromJson(Map<String, dynamic> json) =>

65
lib/models/activity.freezed.dart
View File

@@ -16,7 +16,7 @@ T _$identity<T>(T value) => value;
/// @nodoc /// @nodoc
mixin _$SnActivity { mixin _$SnActivity {
String get id; String get type; String get resourceIdentifier; int get visibility; String get accountId; SnAccount get account; dynamic get data; DateTime get createdAt; DateTime get updatedAt; dynamic get deletedAt; String get id; String get type; String get resourceIdentifier; dynamic get data; DateTime get createdAt; DateTime get updatedAt; DateTime? get deletedAt;
/// Create a copy of SnActivity /// Create a copy of SnActivity
/// with the given fields replaced by the non-null parameter values. /// with the given fields replaced by the non-null parameter values.
@JsonKey(includeFromJson: false, includeToJson: false) @JsonKey(includeFromJson: false, includeToJson: false)
@@ -29,16 +29,16 @@ $SnActivityCopyWith<SnActivity> get copyWith => _$SnActivityCopyWithImpl<SnActiv
@override @override
bool operator ==(Object other) { bool operator ==(Object other) {
return identical(this, other) || (other.runtimeType == runtimeType&&other is SnActivity&&(identical(other.id, id) || other.id == id)&&(identical(other.type, type) || other.type == type)&&(identical(other.resourceIdentifier, resourceIdentifier) || other.resourceIdentifier == resourceIdentifier)&&(identical(other.visibility, visibility) || other.visibility == visibility)&&(identical(other.accountId, accountId) || other.accountId == accountId)&&(identical(other.account, account) || other.account == account)&&const DeepCollectionEquality().equals(other.data, data)&&(identical(other.createdAt, createdAt) || other.createdAt == createdAt)&&(identical(other.updatedAt, updatedAt) || other.updatedAt == updatedAt)&&const DeepCollectionEquality().equals(other.deletedAt, deletedAt)); return identical(this, other) || (other.runtimeType == runtimeType&&other is SnActivity&&(identical(other.id, id) || other.id == id)&&(identical(other.type, type) || other.type == type)&&(identical(other.resourceIdentifier, resourceIdentifier) || other.resourceIdentifier == resourceIdentifier)&&const DeepCollectionEquality().equals(other.data, data)&&(identical(other.createdAt, createdAt) || other.createdAt == createdAt)&&(identical(other.updatedAt, updatedAt) || other.updatedAt == updatedAt)&&(identical(other.deletedAt, deletedAt) || other.deletedAt == deletedAt));
} }
@JsonKey(includeFromJson: false, includeToJson: false) @JsonKey(includeFromJson: false, includeToJson: false)
@override @override
int get hashCode => Object.hash(runtimeType,id,type,resourceIdentifier,visibility,accountId,account,const DeepCollectionEquality().hash(data),createdAt,updatedAt,const DeepCollectionEquality().hash(deletedAt)); int get hashCode => Object.hash(runtimeType,id,type,resourceIdentifier,const DeepCollectionEquality().hash(data),createdAt,updatedAt,deletedAt);
@override @override
String toString() { String toString() {
return 'SnActivity(id: $id, type: $type, resourceIdentifier: $resourceIdentifier, visibility: $visibility, accountId: $accountId, account: $account, data: $data, createdAt: $createdAt, updatedAt: $updatedAt, deletedAt: $deletedAt)'; return 'SnActivity(id: $id, type: $type, resourceIdentifier: $resourceIdentifier, data: $data, createdAt: $createdAt, updatedAt: $updatedAt, deletedAt: $deletedAt)';
} }
@@ -49,11 +49,11 @@ abstract mixin class $SnActivityCopyWith<$Res> {
factory $SnActivityCopyWith(SnActivity value, $Res Function(SnActivity) _then) = _$SnActivityCopyWithImpl; factory $SnActivityCopyWith(SnActivity value, $Res Function(SnActivity) _then) = _$SnActivityCopyWithImpl;
@useResult @useResult
$Res call({ $Res call({
String id, String type, String resourceIdentifier, int visibility, String accountId, SnAccount account, dynamic data, DateTime createdAt, DateTime updatedAt, dynamic deletedAt String id, String type, String resourceIdentifier, dynamic data, DateTime createdAt, DateTime updatedAt, DateTime? deletedAt
}); });
$SnAccountCopyWith<$Res> get account;
} }
/// @nodoc /// @nodoc
@@ -66,31 +66,19 @@ class _$SnActivityCopyWithImpl<$Res>
/// Create a copy of SnActivity /// Create a copy of SnActivity
/// with the given fields replaced by the non-null parameter values. /// with the given fields replaced by the non-null parameter values.
@pragma('vm:prefer-inline') @override $Res call({Object? id = null,Object? type = null,Object? resourceIdentifier = null,Object? visibility = null,Object? accountId = null,Object? account = null,Object? data = freezed,Object? createdAt = null,Object? updatedAt = null,Object? deletedAt = freezed,}) { @pragma('vm:prefer-inline') @override $Res call({Object? id = null,Object? type = null,Object? resourceIdentifier = null,Object? data = freezed,Object? createdAt = null,Object? updatedAt = null,Object? deletedAt = freezed,}) {
return _then(_self.copyWith( return _then(_self.copyWith(
id: null == id ? _self.id : id // ignore: cast_nullable_to_non_nullable id: null == id ? _self.id : id // ignore: cast_nullable_to_non_nullable
as String,type: null == type ? _self.type : type // ignore: cast_nullable_to_non_nullable as String,type: null == type ? _self.type : type // ignore: cast_nullable_to_non_nullable
as String,resourceIdentifier: null == resourceIdentifier ? _self.resourceIdentifier : resourceIdentifier // ignore: cast_nullable_to_non_nullable as String,resourceIdentifier: null == resourceIdentifier ? _self.resourceIdentifier : resourceIdentifier // ignore: cast_nullable_to_non_nullable
as String,visibility: null == visibility ? _self.visibility : visibility // ignore: cast_nullable_to_non_nullable as String,data: freezed == data ? _self.data : data // ignore: cast_nullable_to_non_nullable
as int,accountId: null == accountId ? _self.accountId : accountId // ignore: cast_nullable_to_non_nullable
as String,account: null == account ? _self.account : account // ignore: cast_nullable_to_non_nullable
as SnAccount,data: freezed == data ? _self.data : data // ignore: cast_nullable_to_non_nullable
as dynamic,createdAt: null == createdAt ? _self.createdAt : createdAt // ignore: cast_nullable_to_non_nullable as dynamic,createdAt: null == createdAt ? _self.createdAt : createdAt // ignore: cast_nullable_to_non_nullable
as DateTime,updatedAt: null == updatedAt ? _self.updatedAt : updatedAt // ignore: cast_nullable_to_non_nullable as DateTime,updatedAt: null == updatedAt ? _self.updatedAt : updatedAt // ignore: cast_nullable_to_non_nullable
as DateTime,deletedAt: freezed == deletedAt ? _self.deletedAt : deletedAt // ignore: cast_nullable_to_non_nullable as DateTime,deletedAt: freezed == deletedAt ? _self.deletedAt : deletedAt // ignore: cast_nullable_to_non_nullable
as dynamic, as DateTime?,
)); ));
} }
/// Create a copy of SnActivity
/// with the given fields replaced by the non-null parameter values.
@override
@pragma('vm:prefer-inline')
$SnAccountCopyWith<$Res> get account {
return $SnAccountCopyWith<$Res>(_self.account, (value) {
return _then(_self.copyWith(account: value));
});
}
} }
@@ -98,19 +86,16 @@ $SnAccountCopyWith<$Res> get account {
@JsonSerializable() @JsonSerializable()
class _SnActivity implements SnActivity { class _SnActivity implements SnActivity {
const _SnActivity({required this.id, required this.type, required this.resourceIdentifier, required this.visibility, required this.accountId, required this.account, required this.data, required this.createdAt, required this.updatedAt, required this.deletedAt}); const _SnActivity({required this.id, required this.type, required this.resourceIdentifier, required this.data, required this.createdAt, required this.updatedAt, required this.deletedAt});
factory _SnActivity.fromJson(Map<String, dynamic> json) => _$SnActivityFromJson(json); factory _SnActivity.fromJson(Map<String, dynamic> json) => _$SnActivityFromJson(json);
@override final String id; @override final String id;
@override final String type; @override final String type;
@override final String resourceIdentifier; @override final String resourceIdentifier;
@override final int visibility;
@override final String accountId;
@override final SnAccount account;
@override final dynamic data; @override final dynamic data;
@override final DateTime createdAt; @override final DateTime createdAt;
@override final DateTime updatedAt; @override final DateTime updatedAt;
@override final dynamic deletedAt; @override final DateTime? deletedAt;
/// Create a copy of SnActivity /// Create a copy of SnActivity
/// with the given fields replaced by the non-null parameter values. /// with the given fields replaced by the non-null parameter values.
@@ -125,16 +110,16 @@ Map<String, dynamic> toJson() {
@override @override
bool operator ==(Object other) { bool operator ==(Object other) {
return identical(this, other) || (other.runtimeType == runtimeType&&other is _SnActivity&&(identical(other.id, id) || other.id == id)&&(identical(other.type, type) || other.type == type)&&(identical(other.resourceIdentifier, resourceIdentifier) || other.resourceIdentifier == resourceIdentifier)&&(identical(other.visibility, visibility) || other.visibility == visibility)&&(identical(other.accountId, accountId) || other.accountId == accountId)&&(identical(other.account, account) || other.account == account)&&const DeepCollectionEquality().equals(other.data, data)&&(identical(other.createdAt, createdAt) || other.createdAt == createdAt)&&(identical(other.updatedAt, updatedAt) || other.updatedAt == updatedAt)&&const DeepCollectionEquality().equals(other.deletedAt, deletedAt)); return identical(this, other) || (other.runtimeType == runtimeType&&other is _SnActivity&&(identical(other.id, id) || other.id == id)&&(identical(other.type, type) || other.type == type)&&(identical(other.resourceIdentifier, resourceIdentifier) || other.resourceIdentifier == resourceIdentifier)&&const DeepCollectionEquality().equals(other.data, data)&&(identical(other.createdAt, createdAt) || other.createdAt == createdAt)&&(identical(other.updatedAt, updatedAt) || other.updatedAt == updatedAt)&&(identical(other.deletedAt, deletedAt) || other.deletedAt == deletedAt));
} }
@JsonKey(includeFromJson: false, includeToJson: false) @JsonKey(includeFromJson: false, includeToJson: false)
@override @override
int get hashCode => Object.hash(runtimeType,id,type,resourceIdentifier,visibility,accountId,account,const DeepCollectionEquality().hash(data),createdAt,updatedAt,const DeepCollectionEquality().hash(deletedAt)); int get hashCode => Object.hash(runtimeType,id,type,resourceIdentifier,const DeepCollectionEquality().hash(data),createdAt,updatedAt,deletedAt);
@override @override
String toString() { String toString() {
return 'SnActivity(id: $id, type: $type, resourceIdentifier: $resourceIdentifier, visibility: $visibility, accountId: $accountId, account: $account, data: $data, createdAt: $createdAt, updatedAt: $updatedAt, deletedAt: $deletedAt)'; return 'SnActivity(id: $id, type: $type, resourceIdentifier: $resourceIdentifier, data: $data, createdAt: $createdAt, updatedAt: $updatedAt, deletedAt: $deletedAt)';
} }
@@ -145,11 +130,11 @@ abstract mixin class _$SnActivityCopyWith<$Res> implements $SnActivityCopyWith<$
factory _$SnActivityCopyWith(_SnActivity value, $Res Function(_SnActivity) _then) = __$SnActivityCopyWithImpl; factory _$SnActivityCopyWith(_SnActivity value, $Res Function(_SnActivity) _then) = __$SnActivityCopyWithImpl;
@override @useResult @override @useResult
$Res call({ $Res call({
String id, String type, String resourceIdentifier, int visibility, String accountId, SnAccount account, dynamic data, DateTime createdAt, DateTime updatedAt, dynamic deletedAt String id, String type, String resourceIdentifier, dynamic data, DateTime createdAt, DateTime updatedAt, DateTime? deletedAt
}); });
@override $SnAccountCopyWith<$Res> get account;
} }
/// @nodoc /// @nodoc
@@ -162,32 +147,20 @@ class __$SnActivityCopyWithImpl<$Res>
/// Create a copy of SnActivity /// Create a copy of SnActivity
/// with the given fields replaced by the non-null parameter values. /// with the given fields replaced by the non-null parameter values.
@override @pragma('vm:prefer-inline') $Res call({Object? id = null,Object? type = null,Object? resourceIdentifier = null,Object? visibility = null,Object? accountId = null,Object? account = null,Object? data = freezed,Object? createdAt = null,Object? updatedAt = null,Object? deletedAt = freezed,}) { @override @pragma('vm:prefer-inline') $Res call({Object? id = null,Object? type = null,Object? resourceIdentifier = null,Object? data = freezed,Object? createdAt = null,Object? updatedAt = null,Object? deletedAt = freezed,}) {
return _then(_SnActivity( return _then(_SnActivity(
id: null == id ? _self.id : id // ignore: cast_nullable_to_non_nullable id: null == id ? _self.id : id // ignore: cast_nullable_to_non_nullable
as String,type: null == type ? _self.type : type // ignore: cast_nullable_to_non_nullable as String,type: null == type ? _self.type : type // ignore: cast_nullable_to_non_nullable
as String,resourceIdentifier: null == resourceIdentifier ? _self.resourceIdentifier : resourceIdentifier // ignore: cast_nullable_to_non_nullable as String,resourceIdentifier: null == resourceIdentifier ? _self.resourceIdentifier : resourceIdentifier // ignore: cast_nullable_to_non_nullable
as String,visibility: null == visibility ? _self.visibility : visibility // ignore: cast_nullable_to_non_nullable as String,data: freezed == data ? _self.data : data // ignore: cast_nullable_to_non_nullable
as int,accountId: null == accountId ? _self.accountId : accountId // ignore: cast_nullable_to_non_nullable
as String,account: null == account ? _self.account : account // ignore: cast_nullable_to_non_nullable
as SnAccount,data: freezed == data ? _self.data : data // ignore: cast_nullable_to_non_nullable
as dynamic,createdAt: null == createdAt ? _self.createdAt : createdAt // ignore: cast_nullable_to_non_nullable as dynamic,createdAt: null == createdAt ? _self.createdAt : createdAt // ignore: cast_nullable_to_non_nullable
as DateTime,updatedAt: null == updatedAt ? _self.updatedAt : updatedAt // ignore: cast_nullable_to_non_nullable as DateTime,updatedAt: null == updatedAt ? _self.updatedAt : updatedAt // ignore: cast_nullable_to_non_nullable
as DateTime,deletedAt: freezed == deletedAt ? _self.deletedAt : deletedAt // ignore: cast_nullable_to_non_nullable as DateTime,deletedAt: freezed == deletedAt ? _self.deletedAt : deletedAt // ignore: cast_nullable_to_non_nullable
as dynamic, as DateTime?,
)); ));
} }
/// Create a copy of SnActivity
/// with the given fields replaced by the non-null parameter values.
@override
@pragma('vm:prefer-inline')
$SnAccountCopyWith<$Res> get account {
return $SnAccountCopyWith<$Res>(_self.account, (value) {
return _then(_self.copyWith(account: value));
});
}
} }

13
lib/models/activity.g.dart
View File

@@ -10,13 +10,13 @@ _SnActivity _$SnActivityFromJson(Map<String, dynamic> json) => _SnActivity(
id: json['id'] as String, id: json['id'] as String,
type: json['type'] as String, type: json['type'] as String,
resourceIdentifier: json['resource_identifier'] as String, resourceIdentifier: json['resource_identifier'] as String,
visibility: (json['visibility'] as num).toInt(),
accountId: json['account_id'] as String,
account: SnAccount.fromJson(json['account'] as Map<String, dynamic>),
data: json['data'], data: json['data'],
createdAt: DateTime.parse(json['created_at'] as String), createdAt: DateTime.parse(json['created_at'] as String),
updatedAt: DateTime.parse(json['updated_at'] as String), updatedAt: DateTime.parse(json['updated_at'] as String),
deletedAt: json['deleted_at'], deletedAt:
json['deleted_at'] == null
? null
: DateTime.parse(json['deleted_at'] as String),
); );
Map<String, dynamic> _$SnActivityToJson(_SnActivity instance) => Map<String, dynamic> _$SnActivityToJson(_SnActivity instance) =>
@@ -24,13 +24,10 @@ Map<String, dynamic> _$SnActivityToJson(_SnActivity instance) =>
'id': instance.id, 'id': instance.id,
'type': instance.type, 'type': instance.type,
'resource_identifier': instance.resourceIdentifier, 'resource_identifier': instance.resourceIdentifier,
'visibility': instance.visibility,
'account_id': instance.accountId,
'account': instance.account.toJson(),
'data': instance.data, 'data': instance.data,
'created_at': instance.createdAt.toIso8601String(), 'created_at': instance.createdAt.toIso8601String(),
'updated_at': instance.updatedAt.toIso8601String(), 'updated_at': instance.updatedAt.toIso8601String(),
'deleted_at': instance.deletedAt, 'deleted_at': instance.deletedAt?.toIso8601String(),
}; };
_SnCheckInResult _$SnCheckInResultFromJson(Map<String, dynamic> json) => _SnCheckInResult _$SnCheckInResultFromJson(Map<String, dynamic> json) =>

2
lib/screens/chat/room_detail.g.dart
View File

@@ -7,7 +7,7 @@ part of 'room_detail.dart';
// ************************************************************************** // **************************************************************************
String _$chatMemberListNotifierHash() => String _$chatMemberListNotifierHash() =>
r'f14dbb3c6ccfef26a49d8bf5dd53b05f7c63eb6c'; r'f2191a631ba00ae3de39ccac10e4cdd065ffee17';
/// Copied from Dart SDK /// Copied from Dart SDK
class _SystemHash { class _SystemHash {

18
lib/screens/explore.dart
View File

@@ -168,12 +168,6 @@ class _ActivityListView extends HookConsumerWidget {
); );
} }
break; break;
case 'accounts.check-in':
itemWidget = CheckInActivityWidget(item: item);
break;
case 'accounts.status':
itemWidget = StatusActivityWidget(item: item);
break;
default: default:
itemWidget = const Placeholder(); itemWidget = const Placeholder();
} }
@@ -196,12 +190,14 @@ class ActivityListNotifier extends _$ActivityListNotifier
@override @override
Future<CursorPagingData<SnActivity>> fetch({required String? cursor}) async { Future<CursorPagingData<SnActivity>> fetch({required String? cursor}) async {
final client = ref.read(apiClientProvider); final client = ref.read(apiClientProvider);
final offset = cursor == null ? 0 : int.parse(cursor);
final take = 20; final take = 20;
final response = await client.get( final response = await client.get(
'/activities', '/activities',
queryParameters: {'offset': offset, 'take': take}, queryParameters: {
if (cursor != null) 'reading_cursor': cursor,
'take': take,
},
); );
final List<SnActivity> items = final List<SnActivity> items =
@@ -209,9 +205,9 @@ class ActivityListNotifier extends _$ActivityListNotifier
.map((e) => SnActivity.fromJson(e as Map<String, dynamic>)) .map((e) => SnActivity.fromJson(e as Map<String, dynamic>))
.toList(); .toList();
final total = int.tryParse(response.headers['x-total']?.first ?? '') ?? 0; final hasMore = (items.firstOrNull?.type ?? 'empty') != 'empty';
final hasMore = offset + items.length < total; final nextCursor =
final nextCursor = hasMore ? (offset + items.length).toString() : null; items.map((x) => x.createdAt).lastOrNull?.toIso8601String().toString();
return CursorPagingData( return CursorPagingData(
items: items, items: items,

2
lib/screens/explore.g.dart
View File

@@ -7,7 +7,7 @@ part of 'explore.dart';
// ************************************************************************** // **************************************************************************
String _$activityListNotifierHash() => String _$activityListNotifierHash() =>
r'8a67d302e828408c7c4cf724d84c2c5958f2dc7e'; r'1baf0bb961bc02bfc8a5b5f515981072c6ce1750';
/// See also [ActivityListNotifier]. /// See also [ActivityListNotifier].
@ProviderFor(ActivityListNotifier) @ProviderFor(ActivityListNotifier)

51
lib/widgets/account/status.dart
View File

@@ -133,54 +133,3 @@ class AccountStatusWidget extends HookConsumerWidget {
).opacity((userStatus.value?.isCustomized ?? false) ? 1 : 0.85); ).opacity((userStatus.value?.isCustomized ?? false) ? 1 : 0.85);
} }
} }
class StatusActivityWidget extends StatelessWidget {
final SnActivity item;
const StatusActivityWidget({super.key, required this.item});
@override
Widget build(BuildContext context) {
final result = SnAccountStatus.fromJson(item.data);
return Row(
spacing: 12,
crossAxisAlignment: CrossAxisAlignment.start,
children: [
ProfilePictureWidget(
fileId: item.account.profile.picture?.id,
radius: 12,
),
Expanded(
child: Column(
crossAxisAlignment: CrossAxisAlignment.stretch,
children: [
Row(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
const Icon(Symbols.circle, size: 12).padding(top: 1, left: 2),
const Gap(4),
Text('status').fontSize(11).tr(),
],
).opacity(0.85),
Text(
result.clearedAt == null
? 'statusActivityTitle'
: 'statusActivityEndedTitle',
)
.tr(
args: [
item.account.nick,
result.label,
RelativeTime(context).format(result.createdAt),
if (result.clearedAt != null)
RelativeTime(context).format(result.clearedAt!),
],
)
.fontSize(13)
.padding(left: 2),
],
),
),
],
).padding(horizontal: 16, vertical: 12);
}
}

15
lib/widgets/response.dart
View File

@@ -9,7 +9,11 @@ class ResponseErrorWidget extends StatelessWidget {
final dynamic error; final dynamic error;
final VoidCallback onRetry; final VoidCallback onRetry;
const ResponseErrorWidget({super.key, required this.error, required this.onRetry}); const ResponseErrorWidget({
super.key,
required this.error,
required this.onRetry,
});
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
@@ -36,6 +40,15 @@ class ResponseErrorWidget extends StatelessWidget {
], ],
), ),
).center() ).center()
else if (error is DioException && error.response != null)
ConstrainedBox(
constraints: const BoxConstraints(maxWidth: 320),
child: Text(
error.response.toString(),
textAlign: TextAlign.center,
style: const TextStyle(color: Color(0xFF757575)),
),
).center()
else else
ConstrainedBox( ConstrainedBox(
constraints: const BoxConstraints(maxWidth: 320), constraints: const BoxConstraints(maxWidth: 320),

2
pubspec.yaml
View File

@@ -16,7 +16,7 @@ publish_to: "none" # Remove this line if you wish to publish to pub.dev
# https://developer.apple.com/library/archive/documentation/General/Reference/InfoPlistKeyReference/Articles/CoreFoundationKeys.html # https://developer.apple.com/library/archive/documentation/General/Reference/InfoPlistKeyReference/Articles/CoreFoundationKeys.html
# In Windows, build-name is used as the major, minor, and patch parts # In Windows, build-name is used as the major, minor, and patch parts
# of the product and file versions while build-number is used as the build suffix. # of the product and file versions while build-number is used as the build suffix.
version: 3.0.0+103 version: 3.0.0+104
environment: environment:
sdk: ^3.7.2 sdk: ^3.7.2