-
Notifications
You must be signed in to change notification settings - Fork 18
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
Implementing HomePage #1442
Open
DGoiana
wants to merge
50
commits into
ui/redesign
Choose a base branch
from
redesign/homepage
base: ui/redesign
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Implementing HomePage #1442
Changes from 2 commits
Commits
Show all changes
50 commits
Select commit
Hold shift + click to select a range
c47a6b8
beginning homepage
DGoiana 99e94f9
Merge branch 'ui/redesign' into redesign/homepage
DGoiana ba8dc99
Merge branch 'ui/redesign' into redesign/homepage
DGoiana 97d2bb8
adding some initial files
DGoiana 05a11dd
adding exam card
DGoiana c7843c7
adding schedule card
DGoiana 776b2dd
adding library card
DGoiana f28c551
adding calendar
DGoiana 84c99e7
average bar implementation
DGoiana 510194b
adding label string
DGoiana 0c9df17
adding tooltip and removing text
DGoiana 808184a
changing hardcoded text
DGoiana aa1c766
little error fix
DGoiana f498d75
Bump app version [no ci]
thePeras 48a8c84
Fix navbar background not transparent
Process-ing 45d13f5
Fix bottom navigation icons being too small
Process-ing b622b91
Fix misalignment of navbar icons
Process-ing ff5853b
Insert clarifying comments
Process-ing ea15333
starting edit
DGoiana 7beb551
putting drag to work
DGoiana a7a5936
Merge branch 'ui/redesign' into redesign/homepage
DGoiana ae7978f
adding drop feedback
DGoiana 29d6b0b
adding another drop feedback
DGoiana dafed17
integrating local storage to keep favorites' state
DGoiana 847984a
fixing edit icon
DGoiana b674e73
adding next class logic (to test)
DGoiana 6734022
adding icons to uniIcons
DGoiana f2343dd
changing drag and drop logic
DGoiana 201aedc
merging
DGoiana f68aa6e
adding restaurant card
DGoiana 616cb61
removing mock lectures
DGoiana 942c9b4
finishing restaurant card slider
DGoiana f892167
Merge branch 'ui/redesign' into redesign/homepage
DGoiana 1152785
adding onclicks to appropriate cards
DGoiana ff70105
deleting unused code
DGoiana 6d5a811
correcting code
DGoiana 54976e3
Merge branch 'ui/redesign' into redesign/homepage
DGoiana 8739421
changing lectures acronym and events date
DGoiana 1095517
disabling calendar card
DGoiana 9b11f3b
fixing overflow in restaurant card
DGoiana e87805c
fixing top appbar
DGoiana b12d80b
fixing exam timeline
DGoiana c3c261f
fixing theme imports
DGoiana 10e1343
final fixes
DGoiana 9e8ffd4
merging
DGoiana 6472bbd
formatting
DGoiana 4a7070c
fixing linter
DGoiana 688333d
adding timeline shimmer
DGoiana 73c2461
fixing null content restaurants card
DGoiana bd062cf
reestructuring and other shimmers
DGoiana 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
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
84 changes: 84 additions & 0 deletions
84
packages/uni_app/lib/view/home/widgets/timeline_shimmer.dart
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,84 @@ | ||
import 'package:flutter/material.dart'; | ||
import 'package:shimmer/shimmer.dart'; | ||
import 'package:uni_ui/common/generic_squircle.dart'; | ||
|
||
class ShimmerTimelineItem extends StatelessWidget { | ||
const ShimmerTimelineItem({super.key}); | ||
|
||
@override | ||
Widget build(BuildContext context) { | ||
return Shimmer.fromColors( | ||
baseColor: Colors.grey[300]!, | ||
highlightColor: Colors.grey[100]!, | ||
child: Row( | ||
crossAxisAlignment: CrossAxisAlignment.start, | ||
children: [ | ||
SizedBox( | ||
width: 50, | ||
child: Column( | ||
children: [ | ||
Container( | ||
width: 40, | ||
height: 16, | ||
color: Colors.white, | ||
), | ||
const SizedBox(height: 4), | ||
Container( | ||
width: 30, | ||
height: 12, | ||
color: Colors.white, | ||
), | ||
], | ||
), | ||
), | ||
Column( | ||
children: [ | ||
Container( | ||
margin: const EdgeInsets.only(bottom: 5, left: 10, right: 10), | ||
width: 20, | ||
height: 20, | ||
decoration: const BoxDecoration( | ||
shape: BoxShape.circle, | ||
color: Colors.white, | ||
), | ||
), | ||
Container( | ||
margin: const EdgeInsets.only(bottom: 5, left: 10, right: 10), | ||
height: 60, | ||
width: 3, | ||
decoration: const BoxDecoration( | ||
borderRadius: BorderRadius.all(Radius.circular(10)), | ||
color: Colors.white, | ||
), | ||
), | ||
], | ||
), | ||
Expanded( | ||
child: GenericSquircle( | ||
borderRadius: 10, | ||
child: Container( | ||
height: 70, | ||
width: double.infinity, | ||
color: Colors.white, | ||
), | ||
), | ||
), | ||
], | ||
), | ||
); | ||
} | ||
} | ||
|
||
class ShimmerCardTimeline extends StatelessWidget { | ||
const ShimmerCardTimeline({super.key}); | ||
|
||
@override | ||
Widget build(BuildContext context) { | ||
return ListView.builder( | ||
shrinkWrap: true, | ||
physics: const NeverScrollableScrollPhysics(), | ||
itemCount: 2, | ||
itemBuilder: (context, index) => const ShimmerTimelineItem(), | ||
); | ||
} | ||
} |
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.
hardcoded text