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

chore(all): Format

Browse Source
This commit is contained in:
PapaTutuWawa 2023-04-12 16:16:58 +02:00
parent 67c1903bd1
commit 9dcc99ca36
22 changed files with 913 additions and 625 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

396
lib/licenses.g.dart
View File

File diff suppressed because it is too large Load Diff

12
lib/main.dart
View File

@ -81,10 +81,14 @@ class MyApp extends StatelessWidget {
onGenerateRoute: (settings) {
switch (settings.name) {
case '/':
case animeListRoute: return AnimeListPage.route;
case animeSearchRoute: return AnimeSearchPage.route;
case detailsRoute: return DetailsPage.route;
case aboutRoute: return AboutPage.route;
case animeListRoute:
return AnimeListPage.route;
case animeSearchRoute:
return AnimeSearchPage.route;
case detailsRoute:
return DetailsPage.route;
case aboutRoute:
return AboutPage.route;
}
return null;

8
lib/src/data/anime.dart
View File

@ -10,18 +10,24 @@ class AnimeTrackingData with _$AnimeTrackingData, TrackingMedium {
factory AnimeTrackingData(
/// The ID of the anime
String id,
/// The state of the anime
@MediumTrackingStateConverter() MediumTrackingState state,
/// The title of the anime
String title,
/// Episodes in total.
int episodesWatched,
/// Episodes watched.
int? episodesTotal,
/// URL to the thumbnail/cover art for the anime.
String thumbnailUrl,
) = _AnimeTrackingData;
/// JSON
factory AnimeTrackingData.fromJson(Map<String, dynamic> json) => _$AnimeTrackingDataFromJson(json);
factory AnimeTrackingData.fromJson(Map<String, dynamic> json) =>
_$AnimeTrackingDataFromJson(json);
}

9
lib/src/data/manga.dart
View File

@ -10,20 +10,27 @@ class MangaTrackingData with _$MangaTrackingData, TrackingMedium {
factory MangaTrackingData(
/// The ID of the manga
String id,
/// The state of the manga
@MediumTrackingStateConverter() MediumTrackingState state,
/// The title of the manga
String title,
/// Chapters read.
int chaptersRead,
/// Chapters read.
int volumesOwned,
/// Episodes watched.
int? chaptersTotal,
/// URL to the thumbnail/cover art for the manga.
String thumbnailUrl,
) = _MangaTrackingData;
/// JSON
factory MangaTrackingData.fromJson(Map<String, dynamic> json) => _$MangaTrackingDataFromJson(json);
factory MangaTrackingData.fromJson(Map<String, dynamic> json) =>
_$MangaTrackingDataFromJson(json);
}

61
lib/src/data/type.dart
View File

@ -32,47 +32,70 @@ abstract class TrackingMedium {
extension MediumStateExtension on MediumTrackingState {
int toInteger() {
assert(this != MediumTrackingState.all, 'MediumTrackingState.all must not be serialized');
assert(
this != MediumTrackingState.all,
'MediumTrackingState.all must not be serialized',
);
switch (this) {
case MediumTrackingState.ongoing: return 0;
case MediumTrackingState.completed: return 1;
case MediumTrackingState.planned: return 2;
case MediumTrackingState.dropped: return 3;
case MediumTrackingState.all: return -1;
case MediumTrackingState.ongoing:
return 0;
case MediumTrackingState.completed:
return 1;
case MediumTrackingState.planned:
return 2;
case MediumTrackingState.dropped:
return 3;
case MediumTrackingState.all:
return -1;
}
}
String toNameString(TrackingMediumType type) {
assert(this != MediumTrackingState.all, 'MediumTrackingState.all must not be stringified');
assert(
this != MediumTrackingState.all,
'MediumTrackingState.all must not be stringified',
);
switch (this) {
case MediumTrackingState.ongoing:
switch (type) {
case TrackingMediumType.anime: return 'Watching';
case TrackingMediumType.manga: return 'Reading';
case TrackingMediumType.anime:
return 'Watching';
case TrackingMediumType.manga:
return 'Reading';
}
case MediumTrackingState.completed: return 'Completed';
case MediumTrackingState.completed:
return 'Completed';
case MediumTrackingState.planned:
switch (type) {
case TrackingMediumType.anime: return 'Plan to watch';
case TrackingMediumType.manga: return 'Plan to read';
case TrackingMediumType.anime:
return 'Plan to watch';
case TrackingMediumType.manga:
return 'Plan to read';
}
case MediumTrackingState.dropped: return 'Dropped';
case MediumTrackingState.all: return 'All';
case MediumTrackingState.dropped:
return 'Dropped';
case MediumTrackingState.all:
return 'All';
}
}
}
class MediumTrackingStateConverter implements JsonConverter<MediumTrackingState, int> {
class MediumTrackingStateConverter
implements JsonConverter<MediumTrackingState, int> {
const MediumTrackingStateConverter();
@override
MediumTrackingState fromJson(int json) {
switch (json) {
case 0: return MediumTrackingState.ongoing;
case 1: return MediumTrackingState.completed;
case 2: return MediumTrackingState.planned;
case 3: return MediumTrackingState.dropped;
case 0:
return MediumTrackingState.ongoing;
case 1:
return MediumTrackingState.completed;
case 2:
return MediumTrackingState.planned;
case 3:
return MediumTrackingState.dropped;
}
return MediumTrackingState.planned;

103
lib/src/ui/bloc/anime_list_bloc.dart
View File

@ -30,30 +30,35 @@ class AnimeListBloc extends Bloc<AnimeListEvent, AnimeListState> {
}
/// Internal anime state
final List<AnimeTrackingData> _animes = List<AnimeTrackingData>.empty(growable: true);
final List<MangaTrackingData> _mangas = List<MangaTrackingData>.empty(growable: true);
final List<AnimeTrackingData> _animes =
List<AnimeTrackingData>.empty(growable: true);
final List<MangaTrackingData> _mangas =
List<MangaTrackingData>.empty(growable: true);
List<AnimeTrackingData> _getFilteredAnime({MediumTrackingState? trackingState}) {
List<AnimeTrackingData> _getFilteredAnime({
MediumTrackingState? trackingState,
}) {
final filterState = trackingState ?? state.animeFilterState;
if (filterState == MediumTrackingState.all) return _animes;
return _animes
.where((anime) => anime.state == filterState)
.toList();
return _animes.where((anime) => anime.state == filterState).toList();
}
List<MangaTrackingData> _getFilteredManga({MediumTrackingState? trackingState}) {
List<MangaTrackingData> _getFilteredManga({
MediumTrackingState? trackingState,
}) {
final filterState = trackingState ?? state.mangaFilterState;
if (state.mangaFilterState == MediumTrackingState.all) return _mangas;
return _mangas
.where((manga) => manga.state == filterState)
.toList();
return _mangas.where((manga) => manga.state == filterState).toList();
}
Future<void> _onAnimeAdded(AnimeAddedEvent event, Emitter<AnimeListState> emit) async {
Future<void> _onAnimeAdded(
AnimeAddedEvent event,
Emitter<AnimeListState> emit,
) async {
// Add the anime to the database
await GetIt.I.get<DatabaseService>().addAnime(event.data);
@ -67,7 +72,10 @@ class AnimeListBloc extends Bloc<AnimeListEvent, AnimeListState> {
);
}
Future<void> _onMangaAdded(MangaAddedEvent event, Emitter<AnimeListState> emit) async {
Future<void> _onMangaAdded(
MangaAddedEvent event,
Emitter<AnimeListState> emit,
) async {
// Add the manga to the database
await GetIt.I.get<DatabaseService>().addManga(event.data);
@ -81,12 +89,16 @@ class AnimeListBloc extends Bloc<AnimeListEvent, AnimeListState> {
);
}
Future<void> _onAnimeIncremented(AnimeEpisodeIncrementedEvent event, Emitter<AnimeListState> emit) async {
Future<void> _onAnimeIncremented(
AnimeEpisodeIncrementedEvent event,
Emitter<AnimeListState> emit,
) async {
final index = state.animes.indexWhere((item) => item.id == event.id);
if (index == -1) return;
final anime = state.animes[index];
if (anime.episodesTotal != null && anime.episodesWatched + 1 > anime.episodesTotal!) return;
if (anime.episodesTotal != null &&
anime.episodesWatched + 1 > anime.episodesTotal!) return;
final newList = List<AnimeTrackingData>.from(state.animes);
final newAnime = anime.copyWith(
@ -103,7 +115,10 @@ class AnimeListBloc extends Bloc<AnimeListEvent, AnimeListState> {
await GetIt.I.get<DatabaseService>().updateAnime(newAnime);
}
Future<void> _onAnimeDecremented(AnimeEpisodeDecrementedEvent event, Emitter<AnimeListState> emit) async {
Future<void> _onAnimeDecremented(
AnimeEpisodeDecrementedEvent event,
Emitter<AnimeListState> emit,
) async {
final index = state.animes.indexWhere((item) => item.id == event.id);
if (index == -1) return;
@ -125,7 +140,10 @@ class AnimeListBloc extends Bloc<AnimeListEvent, AnimeListState> {
await GetIt.I.get<DatabaseService>().updateAnime(newAnime);
}
Future<void> _onAnimesLoaded(AnimesLoadedEvent event, Emitter<AnimeListState> emit) async {
Future<void> _onAnimesLoaded(
AnimesLoadedEvent event,
Emitter<AnimeListState> emit,
) async {
_animes.addAll(
await GetIt.I.get<DatabaseService>().loadAnimes(),
);
@ -141,7 +159,10 @@ class AnimeListBloc extends Bloc<AnimeListEvent, AnimeListState> {
);
}
Future<void> _onAnimesFiltered(AnimeFilterChangedEvent event, Emitter<AnimeListState> emit) async {
Future<void> _onAnimesFiltered(
AnimeFilterChangedEvent event,
Emitter<AnimeListState> emit,
) async {
emit(
state.copyWith(
animeFilterState: event.filterState,
@ -150,7 +171,10 @@ class AnimeListBloc extends Bloc<AnimeListEvent, AnimeListState> {
);
}
Future<void> _onMangasFiltered(MangaFilterChangedEvent event, Emitter<AnimeListState> emit) async {
Future<void> _onMangasFiltered(
MangaFilterChangedEvent event,
Emitter<AnimeListState> emit,
) async {
emit(
state.copyWith(
mangaFilterState: event.filterState,
@ -159,7 +183,10 @@ class AnimeListBloc extends Bloc<AnimeListEvent, AnimeListState> {
);
}
Future<void> _onTrackingTypeChanged(AnimeTrackingTypeChanged event, Emitter<AnimeListState> emit) async {
Future<void> _onTrackingTypeChanged(
AnimeTrackingTypeChanged event,
Emitter<AnimeListState> emit,
) async {
emit(
state.copyWith(
trackingType: event.type,
@ -168,12 +195,16 @@ class AnimeListBloc extends Bloc<AnimeListEvent, AnimeListState> {
);
}
Future<void> _onMangaIncremented(MangaChapterIncrementedEvent event, Emitter<AnimeListState> emit) async {
Future<void> _onMangaIncremented(
MangaChapterIncrementedEvent event,
Emitter<AnimeListState> emit,
) async {
final index = state.mangas.indexWhere((item) => item.id == event.id);
assert(index != -1, 'The manga must exist');
final manga = state.mangas[index];
if (manga.chaptersTotal != null && manga.chaptersRead + 1 > manga.chaptersTotal!) return;
if (manga.chaptersTotal != null &&
manga.chaptersRead + 1 > manga.chaptersTotal!) return;
final newList = List<MangaTrackingData>.from(state.mangas);
final newManga = manga.copyWith(
@ -195,7 +226,10 @@ class AnimeListBloc extends Bloc<AnimeListEvent, AnimeListState> {
await GetIt.I.get<DatabaseService>().updateManga(newManga);
}
Future<void> _onMangaDecremented(MangaChapterDecrementedEvent event, Emitter<AnimeListState> emit) async {
Future<void> _onMangaDecremented(
MangaChapterDecrementedEvent event,
Emitter<AnimeListState> emit,
) async {
final index = state.mangas.indexWhere((item) => item.id == event.id);
if (index == -1) return;
@ -222,7 +256,10 @@ class AnimeListBloc extends Bloc<AnimeListEvent, AnimeListState> {
await GetIt.I.get<DatabaseService>().updateManga(newManga);
}
Future<void> _onAnimeUpdated(AnimeUpdatedEvent event, Emitter<AnimeListState> emit) async {
Future<void> _onAnimeUpdated(
AnimeUpdatedEvent event,
Emitter<AnimeListState> emit,
) async {
final index = _animes.indexWhere((anime) => anime.id == event.anime.id);
assert(index != -1, 'The anime must exist');
@ -235,7 +272,10 @@ class AnimeListBloc extends Bloc<AnimeListEvent, AnimeListState> {
);
}
Future<void> _onMangaUpdated(MangaUpdatedEvent event, Emitter<AnimeListState> emit) async {
Future<void> _onMangaUpdated(
MangaUpdatedEvent event,
Emitter<AnimeListState> emit,
) async {
final index = _mangas.indexWhere((manga) => manga.id == event.manga.id);
assert(index != -1, 'The manga must exist');
@ -248,7 +288,10 @@ class AnimeListBloc extends Bloc<AnimeListEvent, AnimeListState> {
);
}
Future<void> _onAnimeRemoved(AnimeRemovedEvent event, Emitter<AnimeListState> emit) async {
Future<void> _onAnimeRemoved(
AnimeRemovedEvent event,
Emitter<AnimeListState> emit,
) async {
emit(
state.copyWith(
animes: List.from(
@ -266,7 +309,10 @@ class AnimeListBloc extends Bloc<AnimeListEvent, AnimeListState> {
await GetIt.I.get<DatabaseService>().deleteAnime(event.id);
}
Future<void> _onMangaRemoved(MangaRemovedEvent event, Emitter<AnimeListState> emit) async {
Future<void> _onMangaRemoved(
MangaRemovedEvent event,
Emitter<AnimeListState> emit,
) async {
emit(
state.copyWith(
mangas: List.from(
@ -284,7 +330,10 @@ class AnimeListBloc extends Bloc<AnimeListEvent, AnimeListState> {
await GetIt.I.get<DatabaseService>().deleteManga(event.id);
}
Future<void> _onButtonVisibilityToggled(AddButtonVisibilitySetEvent event, Emitter<AnimeListState> emit) async {
Future<void> _onButtonVisibilityToggled(
AddButtonVisibilitySetEvent event,
Emitter<AnimeListState> emit,
) async {
emit(
state.copyWith(
buttonVisibility: event.state,

44
lib/src/ui/bloc/anime_search_bloc.dart
View File

@ -22,7 +22,10 @@ class AnimeSearchBloc extends Bloc<AnimeSearchEvent, AnimeSearchState> {
on<ResultTappedEvent>(_onResultTapped);
}
Future<void> _onRequested(AnimeSearchRequestedEvent event, Emitter<AnimeSearchState> emit) async {
Future<void> _onRequested(
AnimeSearchRequestedEvent event,
Emitter<AnimeSearchState> emit,
) async {
emit(
state.copyWith(
searchQuery: '',
@ -39,7 +42,10 @@ class AnimeSearchBloc extends Bloc<AnimeSearchEvent, AnimeSearchState> {
);
}
Future<void> _onQueryChanged(SearchQueryChangedEvent event, Emitter<AnimeSearchState> emit) async {
Future<void> _onQueryChanged(
SearchQueryChangedEvent event,
Emitter<AnimeSearchState> emit,
) async {
emit(
state.copyWith(
searchQuery: event.query,
@ -47,7 +53,10 @@ class AnimeSearchBloc extends Bloc<AnimeSearchEvent, AnimeSearchState> {
);
}
Future<void> _onQuerySubmitted(SearchQuerySubmittedEvent event, Emitter<AnimeSearchState> emit) async {
Future<void> _onQuerySubmitted(
SearchQuerySubmittedEvent event,
Emitter<AnimeSearchState> emit,
) async {
if (state.searchQuery.isEmpty) return;
emit(
@ -65,13 +74,17 @@ class AnimeSearchBloc extends Bloc<AnimeSearchEvent, AnimeSearchState> {
emit(
state.copyWith(
working: false,
searchResults: result.map((Anime anime) => SearchResult(
searchResults: result
.map(
(Anime anime) => SearchResult(
anime.title,
anime.malId.toString(),
anime.episodes,
anime.imageUrl,
anime.synopsis ?? '',
),).toList(),
),
)
.toList(),
),
);
} else {
@ -83,22 +96,29 @@ class AnimeSearchBloc extends Bloc<AnimeSearchEvent, AnimeSearchState> {
emit(
state.copyWith(
working: false,
searchResults: result.map((Manga manga) => SearchResult(
searchResults: result
.map(
(Manga manga) => SearchResult(
manga.title,
manga.malId.toString(),
manga.chapters,
manga.imageUrl,
manga.synopsis ?? '',
),).toList(),
),
)
.toList(),
),
);
}
}
Future<void> _onResultTapped(ResultTappedEvent event, Emitter<AnimeSearchState> emit) async {
Future<void> _onResultTapped(
ResultTappedEvent event,
Emitter<AnimeSearchState> emit,
) async {
GetIt.I.get<list.AnimeListBloc>().add(
state.trackingType == TrackingMediumType.anime ?
list.AnimeAddedEvent(
state.trackingType == TrackingMediumType.anime
? list.AnimeAddedEvent(
AnimeTrackingData(
event.result.id,
MediumTrackingState.ongoing,
@ -107,8 +127,8 @@ class AnimeSearchBloc extends Bloc<AnimeSearchEvent, AnimeSearchState> {
event.result.total,
event.result.thumbnailUrl,
),
) :
list.MangaAddedEvent(
)
: list.MangaAddedEvent(
MangaTrackingData(
event.result.id,
MediumTrackingState.ongoing,

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

@ -21,7 +21,10 @@ class DetailsBloc extends Bloc<DetailsEvent, DetailsState> {
on<ItemRemovedEvent>(_onItemRemoved);
}
Future<void> _onAnimeRequested(AnimeDetailsRequestedEvent event, Emitter<DetailsState> emit) async {
Future<void> _onAnimeRequested(
AnimeDetailsRequestedEvent event,
Emitter<DetailsState> emit,
) async {
emit(
state.copyWith(
trackingType: TrackingMediumType.anime,
@ -36,7 +39,10 @@ class DetailsBloc extends Bloc<DetailsEvent, DetailsState> {
);
}
Future<void> _onMangaRequested(MangaDetailsRequestedEvent event, Emitter<DetailsState> emit) async {
Future<void> _onMangaRequested(
MangaDetailsRequestedEvent event,
Emitter<DetailsState> emit,
) async {
emit(
state.copyWith(
trackingType: TrackingMediumType.manga,
@ -51,7 +57,10 @@ class DetailsBloc extends Bloc<DetailsEvent, DetailsState> {
);
}
Future<void> _onDetailsUpdated(DetailsUpdatedEvent event, Emitter<DetailsState> emit) async {
Future<void> _onDetailsUpdated(
DetailsUpdatedEvent event,
Emitter<DetailsState> emit,
) async {
if (state.trackingType == TrackingMediumType.anime) {
emit(
state.copyWith(
@ -59,7 +68,9 @@ class DetailsBloc extends Bloc<DetailsEvent, DetailsState> {
),
);
await GetIt.I.get<DatabaseService>().updateAnime(event.data as AnimeTrackingData);
await GetIt.I
.get<DatabaseService>()
.updateAnime(event.data as AnimeTrackingData);
GetIt.I.get<AnimeListBloc>().add(
AnimeUpdatedEvent(event.data as AnimeTrackingData),
@ -71,7 +82,9 @@ class DetailsBloc extends Bloc<DetailsEvent, DetailsState> {
),
);
await GetIt.I.get<DatabaseService>().updateManga(event.data as MangaTrackingData);
await GetIt.I
.get<DatabaseService>()
.updateManga(event.data as MangaTrackingData);
GetIt.I.get<AnimeListBloc>().add(
MangaUpdatedEvent(event.data as MangaTrackingData),
@ -79,7 +92,10 @@ class DetailsBloc extends Bloc<DetailsEvent, DetailsState> {
}
}
Future<void> _onItemRemoved(ItemRemovedEvent event, Emitter<DetailsState> emit) async {
Future<void> _onItemRemoved(
ItemRemovedEvent event,
Emitter<DetailsState> emit,
) async {
emit(
state.copyWith(
data: null,

20
lib/src/ui/bloc/navigation_bloc.dart
View File

@ -13,14 +13,20 @@ class NavigationBloc extends Bloc<NavigationEvent, NavigationState> {
}
final GlobalKey<NavigatorState> navigationKey;
Future<void> _onPushedNamed(PushedNamedEvent event, Emitter<NavigationState> emit) async {
Future<void> _onPushedNamed(
PushedNamedEvent event,
Emitter<NavigationState> emit,
) async {
await navigationKey.currentState!.pushNamed(
event.destination.path,
arguments: event.destination.arguments,
);
}
Future<void> _onPushedNamedAndRemoveUntil(PushedNamedAndRemoveUntilEvent event, Emitter<NavigationState> emit) async {
Future<void> _onPushedNamedAndRemoveUntil(
PushedNamedAndRemoveUntilEvent event,
Emitter<NavigationState> emit,
) async {
await navigationKey.currentState!.pushNamedAndRemoveUntil(
event.destination.path,
event.predicate,
@ -28,14 +34,20 @@ class NavigationBloc extends Bloc<NavigationEvent, NavigationState> {
);
}
Future<void> _onPushedNamedReplaceEvent(PushedNamedReplaceEvent event, Emitter<NavigationState> emit) async {
Future<void> _onPushedNamedReplaceEvent(
PushedNamedReplaceEvent event,
Emitter<NavigationState> emit,
) async {
await navigationKey.currentState!.pushReplacementNamed(
event.destination.path,
arguments: event.destination.arguments,
);
}
Future<void> _onPoppedRoute(PoppedRouteEvent event, Emitter<NavigationState> emit) async {
Future<void> _onPoppedRoute(
PoppedRouteEvent event,
Emitter<NavigationState> emit,
) async {
navigationKey.currentState!.pop();
}

6
lib/src/ui/bloc/navigation_event.dart
View File

@ -2,11 +2,9 @@ part of 'navigation_bloc.dart';
class NavigationDestination {
const NavigationDestination(
this.path,
{
this.path, {
this.arguments,
}
);
});
final String path;
final Object? arguments;
}

1
lib/src/ui/pages/about.dart
View File

@ -34,7 +34,6 @@ class AboutPage extends StatelessWidget {
'AniTrack',
style: Theme.of(context).textTheme.titleLarge,
),
ElevatedButton(
onPressed: () async {
await launchUrl(

34
lib/src/ui/pages/anime_list.dart
View File

@ -16,7 +16,7 @@ class AnimeListPage extends StatefulWidget {
});
static MaterialPageRoute<dynamic> get route => MaterialPageRoute<dynamic>(
builder: (_) => AnimeListPage(),
builder: (_) => const AnimeListPage(),
settings: const RouteSettings(
name: animeListRoute,
),
@ -39,7 +39,8 @@ class AnimeListPageState extends State<AnimeListPage> {
void _onAnimeListScrolled() {
//print(_animeScrollController.position.maxScrollExtent);
final bloc = GetIt.I.get<AnimeListBloc>();
if (_animeScrollController.offset + 20 >= _animeScrollController.position.maxScrollExtent) {
if (_animeScrollController.offset + 20 >=
_animeScrollController.position.maxScrollExtent) {
if (bloc.state.buttonVisibility) {
bloc.add(
AddButtonVisibilitySetEvent(false),
@ -56,12 +57,16 @@ class AnimeListPageState extends State<AnimeListPage> {
String _getPageTitle(TrackingMediumType type) {
switch (type) {
case TrackingMediumType.anime: return 'Anime';
case TrackingMediumType.manga: return 'Manga';
case TrackingMediumType.anime:
return 'Anime';
case TrackingMediumType.manga:
return 'Manga';
}
}
List<PopupMenuItem<MediumTrackingState>> _getPopupButtonItems(TrackingMediumType type) {
List<PopupMenuItem<MediumTrackingState>> _getPopupButtonItems(
TrackingMediumType type,
) {
return [
PopupMenuItem<MediumTrackingState>(
value: MediumTrackingState.ongoing,
@ -145,7 +150,6 @@ class AnimeListPageState extends State<AnimeListPage> {
),
),
),
ListTile(
leading: const Icon(Icons.info),
title: const Text('About'),
@ -266,13 +270,12 @@ class AnimeListPageState extends State<AnimeListPage> {
],
),
floatingActionButton: BlocBuilder<AnimeListBloc, AnimeListState>(
buildWhen: (prev, next) => prev.buttonVisibility != next.buttonVisibility,
buildWhen: (prev, next) =>
prev.buttonVisibility != next.buttonVisibility,
builder: (context, state) {
return AnimatedScale(
duration: const Duration(milliseconds: 250),
scale: state.buttonVisibility ?
1 :
0,
scale: state.buttonVisibility ? 1 : 0,
curve: Curves.easeInOutQuint,
child: FloatingActionButton(
onPressed: () {
@ -287,15 +290,14 @@ class AnimeListPageState extends State<AnimeListPage> {
},
),
bottomNavigationBar: BottomBar(
selectedIndex: state.trackingType == TrackingMediumType.anime ?
0 :
1,
selectedIndex:
state.trackingType == TrackingMediumType.anime ? 0 : 1,
onTap: (int index) {
context.read<AnimeListBloc>().add(
AnimeTrackingTypeChanged(
index == 0 ?
TrackingMediumType.anime :
TrackingMediumType.manga,
index == 0
? TrackingMediumType.anime
: TrackingMediumType.manga,
),
);

7
lib/src/ui/pages/anime_search.dart
View File

@ -24,9 +24,9 @@ class AnimeSearchPage extends StatelessWidget {
return Scaffold(
appBar: AppBar(
title: Text(
state.trackingType == TrackingMediumType.anime ?
'Anime Search' :
'Manga Search',
state.trackingType == TrackingMediumType.anime
? 'Anime Search'
: 'Manga Search',
),
),
body: Column(
@ -50,7 +50,6 @@ class AnimeSearchPage extends StatelessWidget {
},
),
),
if (state.working)
const Expanded(
child: Align(

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

@ -30,19 +30,19 @@ class DetailsPage extends StatelessWidget {
),
body: BlocBuilder<DetailsBloc, DetailsState>(
builder: (context, state) {
return state.data == null ?
Container() :
Padding(
return state.data == null
? Container()
: Padding(
padding: const EdgeInsets.all(8),
child: ListView(
children: [
Row(
crossAxisAlignment: CrossAxisAlignment.start,
children: [AnimeCoverImage(
children: [
AnimeCoverImage(
url: state.data!.thumbnailUrl,
hero: state.data!.id,
),
Expanded(
child: Padding(
padding: const EdgeInsets.only(
@ -55,24 +55,29 @@ class DetailsPage extends StatelessWidget {
Text(
state.data!.title,
textAlign: TextAlign.left,
style: Theme.of(context).textTheme.titleLarge,
style:
Theme.of(context).textTheme.titleLarge,
maxLines: 2,
softWrap: true,
overflow: TextOverflow.ellipsis,
),
ElevatedButton(
onPressed: () async {
final result = await showDialog<bool>(
context: context,
builder: (context) {
return AlertDialog(
title: Text('Remove "${state.data!.title}"?'),
content: Text('Are you sure you want to remove "${state.data!.title}" from the list?'),
title: Text(
'Remove "${state.data!.title}"?',
),
content: Text(
'Are you sure you want to remove "${state.data!.title}" from the list?',
),
actions: [
TextButton(
onPressed: () {
Navigator.of(context).pop(true);
Navigator.of(context)
.pop(true);
},
style: TextButton.styleFrom(
foregroundColor: Colors.red,
@ -81,7 +86,8 @@ class DetailsPage extends StatelessWidget {
),
TextButton(
onPressed: () {
Navigator.of(context).pop(false);
Navigator.of(context)
.pop(false);
},
child: const Text('Cancel'),
),
@ -108,28 +114,31 @@ class DetailsPage extends StatelessWidget {
),
],
),
Padding(
padding: const EdgeInsets.symmetric(
vertical: 8,
),
child: DropdownSelector<MediumTrackingState>(
title: state.trackingType == TrackingMediumType.anime ?
'Watch state' :
'Read state',
title: state.trackingType == TrackingMediumType.anime
? 'Watch state'
: 'Read state',
onChanged: (MediumTrackingState newState) {
if (state.trackingType == TrackingMediumType.anime) {
if (state.trackingType ==
TrackingMediumType.anime) {
context.read<DetailsBloc>().add(
DetailsUpdatedEvent(
(state.data! as AnimeTrackingData).copyWith(
(state.data! as AnimeTrackingData)
.copyWith(
state: newState,
),
),
);
} else if (state.trackingType == TrackingMediumType.manga) {
} else if (state.trackingType ==
TrackingMediumType.manga) {
context.read<DetailsBloc>().add(
DetailsUpdatedEvent(
(state.data! as MangaTrackingData).copyWith(
(state.data! as MangaTrackingData)
.copyWith(
state: newState,
),
),
@ -139,33 +148,37 @@ class DetailsPage extends StatelessWidget {
values: [
SelectorItem(
MediumTrackingState.ongoing,
MediumTrackingState.ongoing.toNameString(state.trackingType),
MediumTrackingState.ongoing
.toNameString(state.trackingType),
),
SelectorItem(
MediumTrackingState.completed,
MediumTrackingState.completed.toNameString(state.trackingType),
MediumTrackingState.completed
.toNameString(state.trackingType),
),
SelectorItem(
MediumTrackingState.planned,
MediumTrackingState.planned.toNameString(state.trackingType),
MediumTrackingState.planned
.toNameString(state.trackingType),
),
SelectorItem(
MediumTrackingState.dropped,
MediumTrackingState.dropped.toNameString(state.trackingType),
MediumTrackingState.dropped
.toNameString(state.trackingType),
),
],
initialValue: state.data!.state,
),
),
Padding(
padding: const EdgeInsets.symmetric(
vertical: 8,
),
child: IntegerInput(
labelText: state.trackingType == TrackingMediumType.anime ?
'Episodes' :
'Chapters',
labelText:
state.trackingType == TrackingMediumType.anime
? 'Episodes'
: 'Chapters',
onChanged: (value) {
switch (state.trackingType) {
case TrackingMediumType.anime:
@ -190,12 +203,13 @@ class DetailsPage extends StatelessWidget {
break;
}
},
initialValue: state.trackingType == TrackingMediumType.anime ?
(state.data! as AnimeTrackingData).episodesWatched :
(state.data! as MangaTrackingData).chaptersRead,
initialValue: state.trackingType ==
TrackingMediumType.anime
? (state.data! as AnimeTrackingData)
.episodesWatched
: (state.data! as MangaTrackingData).chaptersRead,
),
),
if (state.trackingType == TrackingMediumType.manga)
Padding(
padding: const EdgeInsets.symmetric(
@ -213,7 +227,11 @@ class DetailsPage extends StatelessWidget {
),
);
},
initialValue: (GetIt.I.get<DetailsBloc>().state.data! as MangaTrackingData).volumesOwned,
initialValue: (GetIt.I
.get<DetailsBloc>()
.state
.data! as MangaTrackingData)
.volumesOwned,
),
),
],

6
lib/src/ui/widgets/dropdown.dart
View File

@ -76,7 +76,8 @@ class DropdownSelectorState<T> extends State<DropdownSelector<T>> {
void initState() {
super.initState();
index = widget.values.indexWhere((item) => item.value == widget.initialValue);
index =
widget.values.indexWhere((item) => item.value == widget.initialValue);
}
@override
@ -99,7 +100,8 @@ class DropdownSelectorState<T> extends State<DropdownSelector<T>> {
if (result == widget.values[index].value) return;
setState(() {
index = widget.values.indexWhere((item) => item.value == result);
index =
widget.values.indexWhere((item) => item.value == result);
});
widget.onChanged(result);

2
lib/src/ui/widgets/grid_item.dart
View File

@ -28,7 +28,7 @@ class GridItemState extends State<GridItem> {
onHorizontalDragUpdate: (details) {
setState(() {
_offset += details.delta.dx;
_translationX = 160 / (1 + exp(-1 * (1/30) * _offset)) - 80;
_translationX = 160 / (1 + exp(-1 * (1 / 30) * _offset)) - 80;
});
},
onHorizontalDragEnd: (_) {

7
lib/src/ui/widgets/image.dart
View File

@ -48,15 +48,14 @@ class AnimeCoverImage extends StatelessWidget {
child: DecoratedBox(
decoration: BoxDecoration(
image: DecorationImage(
image: cached ?
CachedNetworkImageProvider(url) as ImageProvider :
NetworkImage(url),
image: cached
? CachedNetworkImageProvider(url) as ImageProvider
: NetworkImage(url),
fit: BoxFit.cover,
),
),
),
),
if (extra != null)
Positioned(
left: 0,

2
lib/src/ui/widgets/integer_input.dart
View File

@ -59,7 +59,6 @@ class IntegerInputState extends State<IntegerInput> {
},
child: const Icon(Icons.remove),
),
Expanded(
child: Padding(
padding: const EdgeInsets.symmetric(
@ -84,7 +83,6 @@ class IntegerInputState extends State<IntegerInput> {
),
),
),
ElevatedButton(
onPressed: () {
_value++;

8
lib/src/ui/widgets/list_item.dart
View File

@ -66,9 +66,9 @@ class ListItem extends StatelessWidget {
return Container();
},
color: Theme.of(context).scaffoldBackgroundColor,
direction: onRightSwipe != null && onLeftSwipe != null ?
SwipeDirection.horizontal :
SwipeDirection.none,
direction: onRightSwipe != null && onLeftSwipe != null
? SwipeDirection.horizontal
: SwipeDirection.none,
child: Padding(
padding: const EdgeInsets.all(8),
child: Row(
@ -81,7 +81,6 @@ class ListItem extends StatelessWidget {
extra: imageExtra,
url: thumbnailUrl,
),
Expanded(
child: Padding(
padding: const EdgeInsets.symmetric(horizontal: 8),
@ -97,7 +96,6 @@ class ListItem extends StatelessWidget {
softWrap: true,
overflow: TextOverflow.ellipsis,
),
...extra,
],
),