PapaTutuWawa/anitrack
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

feat: Allow tracking who you are watching anime with

Browse Source
This commit is contained in:
PapaTutuWawa
2026-07-25 14:49:43 +02:00
parent 52890dd9ea
commit aa72095b98
13 changed files with 870 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

68
lib/src/ui/bloc/details_bloc.dart
View File

@@ -1,4 +1,5 @@
import 'package:anitrack/src/data/anime.dart';
import 'package:anitrack/src/data/anime_watcher.dart';
import 'package:anitrack/src/data/manga.dart';
import 'package:anitrack/src/data/type.dart';
import 'package:anitrack/src/service/database.dart';
@@ -19,17 +20,26 @@ class DetailsBloc extends Bloc<DetailsEvent, DetailsState> {
on<MangaDetailsRequestedEvent>(_onMangaRequested);
on<DetailsUpdatedEvent>(_onDetailsUpdated);
on<ItemRemovedEvent>(_onItemRemoved);
on<AnimeWatcherAddedEvent>(_onAnimeWatcherAdded);
on<AnimeWatcherRemovedEvent>(_onAnimeWatcherRemoved);
on<AnimeWatcherDeletedEvent>(_onAnimeWatcherDeleted);
}
Future<void> _onAnimeRequested(
AnimeDetailsRequestedEvent event,
Emitter<DetailsState> emit,
) async {
// Find out what watchers there are
final watchers = await GetIt.I.get<DatabaseService>().getWatchersForAnime(
event.anime,
);
emit(
state.copyWith(
trackingType: TrackingMediumType.anime,
heroImagePrefix: event.heroImagePrefix,
data: event.anime,
animeWatchers: watchers,
),
);
@@ -117,4 +127,62 @@ class DetailsBloc extends Bloc<DetailsEvent, DetailsState> {
// Navigate back
GetIt.I.get<NavigationBloc>().add(PoppedRouteEvent());
}
Future<void> _onAnimeWatcherAdded(
AnimeWatcherAddedEvent event,
Emitter<DetailsState> emit,
) async {
await GetIt.I.get<DatabaseService>().associateWatcherWithAnime(
event.watcher,
state.data! as AnimeTrackingData,
);
emit(
state.copyWith(
animeWatchers: List.of([
...state.animeWatchers,
event.watcher,
]),
),
);
}
Future<void> _onAnimeWatcherRemoved(
AnimeWatcherRemovedEvent event,
Emitter<DetailsState> emit,
) async {
await GetIt.I.get<DatabaseService>().disassociateWatcherWithAnime(
event.watcher,
state.data! as AnimeTrackingData,
);
emit(
state.copyWith(
animeWatchers: state.animeWatchers
.where((watcher) => watcher.name != event.watcher.name)
.toList(),
),
);
}
Future<void> _onAnimeWatcherDeleted(
AnimeWatcherDeletedEvent event,
Emitter<DetailsState> emit,
) async {
await GetIt.I.get<DatabaseService>().deleteAnimeWatcher(event.watcher);
emit(
state.copyWith(
animeWatchers: state.animeWatchers
.where((watcher) => watcher.name != event.watcher.name)
.toList(),
),
);
}
Future<void> addAnimeWatcher(AnimeWatcher watcher) async {
await GetIt.I.get<DatabaseService>().addWatcher(watcher);
}
Future<List<AnimeWatcher>> getAllAnimeWatchers() async {
return GetIt.I.get<DatabaseService>().getAnimeWatchers();
}
}

49
lib/src/ui/bloc/details_bloc.freezed.dart
View File

@@ -14,7 +14,7 @@ T _$identity<T>(T value) => value;
/// @nodoc
mixin _$DetailsState {
TrackingMedium? get data; String? get heroImagePrefix; TrackingMediumType get trackingType;
TrackingMedium? get data; String? get heroImagePrefix; TrackingMediumType get trackingType; List<AnimeWatcher> get animeWatchers;
/// Create a copy of DetailsState
/// with the given fields replaced by the non-null parameter values.
@JsonKey(includeFromJson: false, includeToJson: false)
@@ -25,16 +25,16 @@ $DetailsStateCopyWith<DetailsState> get copyWith => _$DetailsStateCopyWithImpl<D
@override
bool operator ==(Object other) {
return identical(this, other) || (other.runtimeType == runtimeType&&other is DetailsState&&(identical(other.data, data) || other.data == data)&&(identical(other.heroImagePrefix, heroImagePrefix) || other.heroImagePrefix == heroImagePrefix)&&(identical(other.trackingType, trackingType) || other.trackingType == trackingType));
return identical(this, other) || (other.runtimeType == runtimeType&&other is DetailsState&&(identical(other.data, data) || other.data == data)&&(identical(other.heroImagePrefix, heroImagePrefix) || other.heroImagePrefix == heroImagePrefix)&&(identical(other.trackingType, trackingType) || other.trackingType == trackingType)&&const DeepCollectionEquality().equals(other.animeWatchers, animeWatchers));
}
@override
int get hashCode => Object.hash(runtimeType,data,heroImagePrefix,trackingType);
int get hashCode => Object.hash(runtimeType,data,heroImagePrefix,trackingType,const DeepCollectionEquality().hash(animeWatchers));
@override
String toString() {
return 'DetailsState(data: $data, heroImagePrefix: $heroImagePrefix, trackingType: $trackingType)';
return 'DetailsState(data: $data, heroImagePrefix: $heroImagePrefix, trackingType: $trackingType, animeWatchers: $animeWatchers)';
}
@@ -45,7 +45,7 @@ abstract mixin class $DetailsStateCopyWith<$Res> {
factory $DetailsStateCopyWith(DetailsState value, $Res Function(DetailsState) _then) = _$DetailsStateCopyWithImpl;
@useResult
$Res call({
TrackingMedium? data, String? heroImagePrefix, TrackingMediumType trackingType
TrackingMedium? data, String? heroImagePrefix, TrackingMediumType trackingType, List<AnimeWatcher> animeWatchers
});
@@ -62,12 +62,13 @@ class _$DetailsStateCopyWithImpl<$Res>
/// Create a copy of DetailsState
/// with the given fields replaced by the non-null parameter values.
@pragma('vm:prefer-inline') @override $Res call({Object? data = freezed,Object? heroImagePrefix = freezed,Object? trackingType = null,}) {
@pragma('vm:prefer-inline') @override $Res call({Object? data = freezed,Object? heroImagePrefix = freezed,Object? trackingType = null,Object? animeWatchers = null,}) {
return _then(_self.copyWith(
data: freezed == data ? _self.data : data // ignore: cast_nullable_to_non_nullable
as TrackingMedium?,heroImagePrefix: freezed == heroImagePrefix ? _self.heroImagePrefix : heroImagePrefix // ignore: cast_nullable_to_non_nullable
as String?,trackingType: null == trackingType ? _self.trackingType : trackingType // ignore: cast_nullable_to_non_nullable
as TrackingMediumType,
as TrackingMediumType,animeWatchers: null == animeWatchers ? _self.animeWatchers : animeWatchers // ignore: cast_nullable_to_non_nullable
as List<AnimeWatcher>,
));
}
@@ -152,10 +153,10 @@ return $default(_that);case _:
/// }
/// ```
@optionalTypeArgs TResult maybeWhen<TResult extends Object?>(TResult Function( TrackingMedium? data, String? heroImagePrefix, TrackingMediumType trackingType)? $default,{required TResult orElse(),}) {final _that = this;
@optionalTypeArgs TResult maybeWhen<TResult extends Object?>(TResult Function( TrackingMedium? data, String? heroImagePrefix, TrackingMediumType trackingType, List<AnimeWatcher> animeWatchers)? $default,{required TResult orElse(),}) {final _that = this;
switch (_that) {
case _DetailsState() when $default != null:
return $default(_that.data,_that.heroImagePrefix,_that.trackingType);case _:
return $default(_that.data,_that.heroImagePrefix,_that.trackingType,_that.animeWatchers);case _:
return orElse();
}
@@ -173,10 +174,10 @@ return $default(_that.data,_that.heroImagePrefix,_that.trackingType);case _:
/// }
/// ```
@optionalTypeArgs TResult when<TResult extends Object?>(TResult Function( TrackingMedium? data, String? heroImagePrefix, TrackingMediumType trackingType) $default,) {final _that = this;
@optionalTypeArgs TResult when<TResult extends Object?>(TResult Function( TrackingMedium? data, String? heroImagePrefix, TrackingMediumType trackingType, List<AnimeWatcher> animeWatchers) $default,) {final _that = this;
switch (_that) {
case _DetailsState():
return $default(_that.data,_that.heroImagePrefix,_that.trackingType);case _:
return $default(_that.data,_that.heroImagePrefix,_that.trackingType,_that.animeWatchers);case _:
throw StateError('Unexpected subclass');
}
@@ -193,10 +194,10 @@ return $default(_that.data,_that.heroImagePrefix,_that.trackingType);case _:
/// }
/// ```
@optionalTypeArgs TResult? whenOrNull<TResult extends Object?>(TResult? Function( TrackingMedium? data, String? heroImagePrefix, TrackingMediumType trackingType)? $default,) {final _that = this;
@optionalTypeArgs TResult? whenOrNull<TResult extends Object?>(TResult? Function( TrackingMedium? data, String? heroImagePrefix, TrackingMediumType trackingType, List<AnimeWatcher> animeWatchers)? $default,) {final _that = this;
switch (_that) {
case _DetailsState() when $default != null:
return $default(_that.data,_that.heroImagePrefix,_that.trackingType);case _:
return $default(_that.data,_that.heroImagePrefix,_that.trackingType,_that.animeWatchers);case _:
return null;
}
@@ -208,12 +209,19 @@ return $default(_that.data,_that.heroImagePrefix,_that.trackingType);case _:
class _DetailsState implements DetailsState {
_DetailsState({this.data, this.heroImagePrefix, this.trackingType = TrackingMediumType.anime});
_DetailsState({this.data, this.heroImagePrefix, this.trackingType = TrackingMediumType.anime, final List<AnimeWatcher> animeWatchers = const []}): _animeWatchers = animeWatchers;
@override final TrackingMedium? data;
@override final String? heroImagePrefix;
@override@JsonKey() final TrackingMediumType trackingType;
final List<AnimeWatcher> _animeWatchers;
@override@JsonKey() List<AnimeWatcher> get animeWatchers {
if (_animeWatchers is EqualUnmodifiableListView) return _animeWatchers;
// ignore: implicit_dynamic_type
return EqualUnmodifiableListView(_animeWatchers);
}
/// Create a copy of DetailsState
/// with the given fields replaced by the non-null parameter values.
@@ -225,16 +233,16 @@ _$DetailsStateCopyWith<_DetailsState> get copyWith => __$DetailsStateCopyWithImp
@override
bool operator ==(Object other) {
return identical(this, other) || (other.runtimeType == runtimeType&&other is _DetailsState&&(identical(other.data, data) || other.data == data)&&(identical(other.heroImagePrefix, heroImagePrefix) || other.heroImagePrefix == heroImagePrefix)&&(identical(other.trackingType, trackingType) || other.trackingType == trackingType));
return identical(this, other) || (other.runtimeType == runtimeType&&other is _DetailsState&&(identical(other.data, data) || other.data == data)&&(identical(other.heroImagePrefix, heroImagePrefix) || other.heroImagePrefix == heroImagePrefix)&&(identical(other.trackingType, trackingType) || other.trackingType == trackingType)&&const DeepCollectionEquality().equals(other._animeWatchers, _animeWatchers));
}
@override
int get hashCode => Object.hash(runtimeType,data,heroImagePrefix,trackingType);
int get hashCode => Object.hash(runtimeType,data,heroImagePrefix,trackingType,const DeepCollectionEquality().hash(_animeWatchers));
@override
String toString() {
return 'DetailsState(data: $data, heroImagePrefix: $heroImagePrefix, trackingType: $trackingType)';
return 'DetailsState(data: $data, heroImagePrefix: $heroImagePrefix, trackingType: $trackingType, animeWatchers: $animeWatchers)';
}
@@ -245,7 +253,7 @@ abstract mixin class _$DetailsStateCopyWith<$Res> implements $DetailsStateCopyWi
factory _$DetailsStateCopyWith(_DetailsState value, $Res Function(_DetailsState) _then) = __$DetailsStateCopyWithImpl;
@override @useResult
$Res call({
TrackingMedium? data, String? heroImagePrefix, TrackingMediumType trackingType
TrackingMedium? data, String? heroImagePrefix, TrackingMediumType trackingType, List<AnimeWatcher> animeWatchers
});
@@ -262,12 +270,13 @@ class __$DetailsStateCopyWithImpl<$Res>
/// Create a copy of DetailsState
/// with the given fields replaced by the non-null parameter values.
@override @pragma('vm:prefer-inline') $Res call({Object? data = freezed,Object? heroImagePrefix = freezed,Object? trackingType = null,}) {
@override @pragma('vm:prefer-inline') $Res call({Object? data = freezed,Object? heroImagePrefix = freezed,Object? trackingType = null,Object? animeWatchers = null,}) {
return _then(_DetailsState(
data: freezed == data ? _self.data : data // ignore: cast_nullable_to_non_nullable
as TrackingMedium?,heroImagePrefix: freezed == heroImagePrefix ? _self.heroImagePrefix : heroImagePrefix // ignore: cast_nullable_to_non_nullable
as String?,trackingType: null == trackingType ? _self.trackingType : trackingType // ignore: cast_nullable_to_non_nullable
as TrackingMediumType,
as TrackingMediumType,animeWatchers: null == animeWatchers ? _self._animeWatchers : animeWatchers // ignore: cast_nullable_to_non_nullable
as List<AnimeWatcher>,
));
}

21
lib/src/ui/bloc/details_event.dart
View File

@@ -36,3 +36,24 @@ class ItemRemovedEvent extends DetailsEvent {
/// The type of medium of the item
final TrackingMediumType trackingType;
}
class AnimeWatcherRemovedEvent extends DetailsEvent {
AnimeWatcherRemovedEvent(this.watcher);
/// The watcher that was removed
final AnimeWatcher watcher;
}
class AnimeWatcherAddedEvent extends DetailsEvent {
AnimeWatcherAddedEvent(this.watcher);
/// The watcher that was added
final AnimeWatcher watcher;
}
class AnimeWatcherDeletedEvent extends DetailsEvent {
AnimeWatcherDeletedEvent(this.watcher);
/// The watcher that was deleted
final AnimeWatcher watcher;
}

1
lib/src/ui/bloc/details_state.dart
View File

@@ -6,5 +6,6 @@ abstract class DetailsState with _$DetailsState {
TrackingMedium? data,
String? heroImagePrefix,
@Default(TrackingMediumType.anime) TrackingMediumType trackingType,
@Default([]) List<AnimeWatcher> animeWatchers,
}) = _DetailsState;
}

94
lib/src/ui/pages/details.dart
View File

@@ -1,9 +1,11 @@
import 'package:anitrack/i18n/strings.g.dart';
import 'package:anitrack/src/data/anime.dart';
import 'package:anitrack/src/data/anime_watcher.dart';
import 'package:anitrack/src/data/manga.dart';
import 'package:anitrack/src/data/type.dart';
import 'package:anitrack/src/ui/bloc/details_bloc.dart';
import 'package:anitrack/src/ui/constants.dart';
import 'package:anitrack/src/ui/pages/details/watcher_sheet.dart';
import 'package:anitrack/src/ui/widgets/dropdown.dart';
import 'package:anitrack/src/ui/widgets/image.dart';
import 'package:anitrack/src/ui/widgets/integer_input.dart';
@@ -357,6 +359,96 @@ class DetailsPage extends StatelessWidget {
),
),
),*/
Padding(
padding: const EdgeInsetsGeometry.symmetric(
vertical: 8,
horizontal: 8,
),
child: Column(
mainAxisSize: MainAxisSize.min,
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Padding(
padding: const EdgeInsets.only(
bottom: 8,
),
child: Row(
children: [
Text(
t.details.watchingWith.title,
style: Theme.of(
context,
).textTheme.titleSmall,
),
Padding(
padding: const EdgeInsetsGeometry.only(
left: 4,
),
child: IconButton(
onPressed: () async {
final bloc = context
.read<DetailsBloc>();
final watchers = await bloc
.getAllAnimeWatchers();
final result =
await showModalBottomSheet<
AnimeWatcher?
>(
context: context,
builder: (ctx) =>
DetailsWatcherSheet(
watchers: watchers,
),
);
if (result == null) {
return;
}
// Do not allow adding a watcher twice.
if (state.animeWatchers.any(
(watcher) =>
watcher.name == result.name,
)) {
return;
}
context.read<DetailsBloc>().add(
AnimeWatcherAddedEvent(result),
);
},
icon: const Icon(Icons.add),
),
),
],
),
),
if (state.trackingType == TrackingMediumType.anime)
if (state.animeWatchers.isNotEmpty)
Wrap(
children: [
for (final watcher in state.animeWatchers)
Padding(
padding:
const EdgeInsetsGeometry.symmetric(
horizontal: 4,
),
child: InputChip(
label: Text(watcher.name),
onDeleted: () {
context.read<DetailsBloc>().add(
AnimeWatcherRemovedEvent(watcher),
);
},
),
),
],
)
else
Text(t.details.watchingWith.alone),
],
),
),
Padding(
padding: const EdgeInsets.symmetric(
vertical: 8,
@@ -377,7 +469,6 @@ class DetailsPage extends StatelessWidget {
),
),
);
break;
case TrackingMediumType.manga:
final data = state.data! as MangaTrackingData;
context.read<DetailsBloc>().add(
@@ -387,7 +478,6 @@ class DetailsPage extends StatelessWidget {
),
),
);
break;
}
},
initialValue:

180
lib/src/ui/pages/details/watcher_sheet.dart Normal file
View File

@@ -0,0 +1,180 @@
import 'package:anitrack/i18n/strings.g.dart';
import 'package:anitrack/src/data/anime_watcher.dart';
import 'package:anitrack/src/ui/bloc/details_bloc.dart';
import 'package:flutter/material.dart';
import 'package:flutter_bloc/flutter_bloc.dart';
class DetailsWatcherSheet extends StatefulWidget {
const DetailsWatcherSheet({required this.watchers, super.key});
// The watchers to show.
final List<AnimeWatcher> watchers;
@override
State<StatefulWidget> createState() => DetailsWatcherSheetState();
}
class DetailsWatcherSheetState extends State<DetailsWatcherSheet> {
/// List of all watchers.
late List<AnimeWatcher> _baseWatcherList;
/// List of names to show.
late List<AnimeWatcher> _filteredWatchers;
/// Controller for the text field.
final TextEditingController _controller = TextEditingController();
void _filterList() {
setState(() {
_filteredWatchers = widget.watchers
.where(
(item) => item.name.toLowerCase().contains(
_controller.text.toLowerCase(),
),
)
.toList();
});
}
@override
void initState() {
super.initState();
_baseWatcherList = widget.watchers;
_filteredWatchers = _baseWatcherList;
_controller.addListener(_filterList);
}
@override
void dispose() {
_controller.dispose();
super.dispose();
}
bool _canAdd() {
return _controller.text.isNotEmpty &&
_filteredWatchers.every(
(item) => item.name.toLowerCase() != _controller.text.toLowerCase(),
);
}
@override
Widget build(BuildContext context) {
return DraggableScrollableSheet(
initialChildSize: 1,
builder: (ctx, scrollController) {
return Padding(
padding: const EdgeInsetsGeometry.only(
top: 18,
),
child: CustomScrollView(
controller: scrollController,
slivers: [
SliverToBoxAdapter(
child: Padding(
padding: const EdgeInsets.symmetric(
horizontal: 16,
),
child: Row(
children: [
Expanded(
child: TextField(
controller: _controller,
decoration: InputDecoration(
labelText: t.details.watchingWith.name,
),
),
),
Padding(
padding: const EdgeInsets.all(8),
child: ElevatedButton(
onPressed: _canAdd()
? () async {
final watcher = AnimeWatcher(
_controller.text,
);
await context
.read<DetailsBloc>()
.addAnimeWatcher(watcher);
Navigator.of(context).pop(watcher);
}
: null,
child: Text(t.details.watchingWith.add),
),
),
],
),
),
),
SliverList.builder(
itemBuilder: (ctx, idx) => ListTile(
title: Text(_filteredWatchers[idx].name),
onTap: () {
Navigator.of(context).pop(_filteredWatchers[idx]);
},
trailing: IconButton(
icon: const Icon(
Icons.delete,
color: Colors.red,
),
onPressed: () async {
final result = await showDialog<bool>(
context: context,
barrierDismissible: false,
builder: (context) => AlertDialog(
title: Text(t.details.watchers.removeTitle),
content: Text(
t.details.watchers.removeBody(
watcher: _filteredWatchers[idx].name,
),
),
actions: [
TextButton(
onPressed: () {
Navigator.of(
context,
).pop(true);
},
style: TextButton.styleFrom(
foregroundColor: Colors.red,
),
child: Text(
t.details.removeButton,
),
),
TextButton(
onPressed: () {
Navigator.of(
context,
).pop(false);
},
child: Text(
t.details.cancelButton,
),
),
],
),
);
if (result == null || !result) {
return;
}
final watcher = _filteredWatchers[idx];
_baseWatcherList.remove(watcher);
_filterList();
context.read<DetailsBloc>().add(
AnimeWatcherDeletedEvent(watcher),
);
},
),
),
itemCount: _filteredWatchers.length,
),
],
),
);
},
);
}
}