Skip to content

Commit

Permalink
Merge pull request #11 from PLGuerraDesigns/dev
Browse files Browse the repository at this point in the history
Expandable Timeline Section & General Improvements
  • Loading branch information
PLGuerraDesigns authored May 12, 2024
2 parents d727630 + dd0eb70 commit 3eda8a4
Show file tree
Hide file tree
Showing 8 changed files with 263 additions and 132 deletions.
7 changes: 7 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,10 @@
## 2.4.0

- NEW: Added the ability to expand and collapse the timeline view.
- FIX: Removed scroll under elevation for the home page app bar.
- REVISED: Wrapping timeline title widgets instead of text.
- REVISED: Project timeline entry subtitle now displays the subtitle instead of the description.

## 2.3.1

- REVISED: Revised home header banner padding.
Expand Down
4 changes: 4 additions & 0 deletions lib/common/strings.dart
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,10 @@ class Strings {
'assets/images/professional/ambots/logo.webp';

// General
static const String explore = 'Explore';
static const String expand = 'Expand';
static const String collapse = 'Collapse';
static const String show = 'Show';
static const String github = 'GitHub';
static const String thingiverse = 'Thingiverse';
static const String linkedin = 'LinkedIn';
Expand Down
12 changes: 9 additions & 3 deletions lib/models/app_state.dart
Original file line number Diff line number Diff line change
Expand Up @@ -144,20 +144,26 @@ class AppState extends ChangeNotifier {
Future<List<TimelineEntry>> loadTimelineEntries() async {
final List<TimelineEntry> entries = <TimelineEntry>[];

await loadProfessionalExperiences();
if (_professionalExperiences.isEmpty) {
await loadProfessionalExperiences();
}
if (_professionalExperiencesVisible) {
entries.addAll(_professionalExperiences.map(
(ProfessionalExperience professionalExperience) =>
professionalExperience.timelineEntry));
}

await loadEducation();
if (_education.isEmpty) {
await loadEducation();
}
if (_educationVisible) {
entries.addAll(
_education.map((Education education) => education.timelineEntry));
}

await loadProjects();
if (_projects.isEmpty) {
await loadProjects();
}
if (_projectsVisible) {
entries.addAll(_projects.map((Project project) => project.timelineEntry));
}
Expand Down
2 changes: 1 addition & 1 deletion lib/models/project.dart
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@ class Project {
labelColor: Colors.grey,
startDate: startDate,
finalDateString: finalDateString,
description: description,
description: subtitle,
urlString:
'https://plguerradesigns.github.io/portfolio/#/home/personal/details/$titleAsPath',
);
Expand Down
Loading

0 comments on commit 3eda8a4

Please sign in to comment.