bachelor/wonders
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' into feature-landscape-support

Browse Source
This commit is contained in:
Shawn 2022-12-01 20:36:03 -07:00
commit e1143e252e
2 changed files with 32 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/styles/colors.dart
View File

@ -24,7 +24,7 @@ class AppColors {
TextTheme txtTheme = (isDark ? ThemeData.dark() : ThemeData.light()).textTheme; TextTheme txtTheme = (isDark ? ThemeData.dark() : ThemeData.light()).textTheme;
Color txtColor = white; Color txtColor = white;
ColorScheme colorScheme = ColorScheme( ColorScheme colorScheme = ColorScheme(
// Decide how you want to apply your own custom them, to the MaterialApp // Decide how you want to apply your own custom theme, to the MaterialApp
brightness: isDark ? Brightness.dark : Brightness.light, brightness: isDark ? Brightness.dark : Brightness.light,
primary: accent1, primary: accent1,
primaryContainer: accent1, primaryContainer: accent1,

7
lib/ui/screens/photo_gallery/photo_gallery.dart
View File

@ -148,10 +148,7 @@ class _PhotoGalleryState extends State<PhotoGallery> {
gridOffset += Offset(0, -context.mq.padding.top / 2); gridOffset += Offset(0, -context.mq.padding.top / 2);
final offsetTweenDuration = _skipNextOffsetTween ? Duration.zero : swipeDuration; final offsetTweenDuration = _skipNextOffsetTween ? Duration.zero : swipeDuration;
final cutoutTweenDuration = _skipNextOffsetTween ? Duration.zero : swipeDuration * .5; final cutoutTweenDuration = _skipNextOffsetTween ? Duration.zero : swipeDuration * .5;
return Stack( return _AnimatedCutoutOverlay(
children: [
// A overlay with a transparent middle sits on top of everything, animating itself each time index changes
_AnimatedCutoutOverlay(
animationKey: ValueKey(_index), animationKey: ValueKey(_index),
cutoutSize: imgSize, cutoutSize: imgSize,
swipeDir: _lastSwipeDir, swipeDir: _lastSwipeDir,
@ -186,8 +183,6 @@ class _PhotoGalleryState extends State<PhotoGallery> {
), ),
), ),
), ),
),
],
); );
}); });
} }