-
Notifications
You must be signed in to change notification settings - Fork 2
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
22: add timeline feature #85
Merged
Merged
Changes from all commits
Commits
Show all changes
3 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
Large diffs are not rendered by default.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,78 @@ | ||
import 'package:collection/collection.dart'; | ||
import 'package:dantex/src/data/book/book_repository.dart'; | ||
import 'package:dantex/src/data/book/entity/book.dart'; | ||
import 'package:dantex/src/data/settings/settings_repository.dart'; | ||
|
||
import 'package:dantex/src/ui/timeline/timeline_sort.dart'; | ||
import 'package:rxdart/rxdart.dart'; | ||
|
||
class Timeline { | ||
final SettingsRepository _settingsRepository; | ||
final BookRepository _bookRepository; | ||
|
||
final BehaviorSubject<TimelineSortStrategy> _sortStrategySubject; | ||
|
||
Stream<TimelineSortStrategy> get sortStrategy => _sortStrategySubject.stream; | ||
|
||
Timeline(this._settingsRepository, this._bookRepository) | ||
: _sortStrategySubject = BehaviorSubject.seeded( | ||
_settingsRepository.getTimelineSortStrategy(), | ||
); | ||
|
||
void setSortStrategy(TimelineSortStrategy sortStrategy) { | ||
_sortStrategySubject.add(sortStrategy); | ||
_settingsRepository.setTimelineSortStrategy(sortStrategy); | ||
} | ||
|
||
Stream<List<TimelineMonthGrouping>> getTimelineData() { | ||
return _sortStrategySubject.flatMap(_createTimelineForSortStrategy); | ||
} | ||
|
||
Stream<List<TimelineMonthGrouping>> _createTimelineForSortStrategy( | ||
TimelineSortStrategy sortStrategy, | ||
) { | ||
return _bookRepository.getAllBooks().map((books) { | ||
return books | ||
.where( | ||
(element) { | ||
return switch (sortStrategy) { | ||
TimelineSortStrategy.byStartDate => element.startDate != null, | ||
TimelineSortStrategy.byEndState => element.endDate != null, | ||
}; | ||
}, | ||
) | ||
.groupListsBy( | ||
(e) { | ||
return switch (_sortStrategySubject.value) { | ||
TimelineSortStrategy.byStartDate => DateTime( | ||
e.startDate!.year, | ||
e.startDate!.month, | ||
), | ||
TimelineSortStrategy.byEndState => DateTime( | ||
e.endDate!.year, | ||
e.endDate!.month, | ||
), | ||
}; | ||
}, | ||
) | ||
.entries | ||
// Sort descending | ||
.sorted((a, b) => a.key.isBefore(b.key) ? 1 : -1) | ||
.map<TimelineMonthGrouping>( | ||
(MapEntry<DateTime, List<Book>> entry) => | ||
TimelineMonthGrouping(month: entry.key, books: entry.value), | ||
) | ||
.toList(); | ||
}); | ||
} | ||
} | ||
|
||
class TimelineMonthGrouping { | ||
final DateTime month; | ||
final List<Book> books; | ||
|
||
TimelineMonthGrouping({ | ||
required this.month, | ||
required this.books, | ||
}); | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,33 @@ | ||
import 'package:flutter/material.dart'; | ||
import 'package:lottie/lottie.dart'; | ||
|
||
class LottieView extends StatelessWidget { | ||
final String lottieAsset; | ||
final String text; | ||
|
||
const LottieView({ | ||
required this.lottieAsset, | ||
required this.text, | ||
super.key, | ||
}); | ||
|
||
@override | ||
Widget build(BuildContext context) { | ||
return Padding( | ||
padding: const EdgeInsets.all(16.0), | ||
child: Column( | ||
mainAxisAlignment: MainAxisAlignment.center, | ||
children: [ | ||
LottieBuilder.asset(lottieAsset), | ||
Text( | ||
text, | ||
style: Theme.of(context).textTheme.titleMedium?.copyWith( | ||
color: Theme.of(context).colorScheme.onSurface, | ||
), | ||
textAlign: TextAlign.center, | ||
), | ||
], | ||
), | ||
); | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Not part of your change, but can you add translations for the
add_label_bottom_sheet
entries at line 9?