Skip to content
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

adding more named and explicit imports #1909

Merged
merged 4 commits into from
Jun 27, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions animations/lib/src/misc/carousel.dart
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.

import 'dart:ui';
import 'dart:ui' as ui;
import 'package:flutter/material.dart';

class CarouselDemo extends StatelessWidget {
Expand Down Expand Up @@ -80,8 +80,8 @@ class _CarouselState extends State<Carousel> {
controller: _controller,
scrollBehavior: ScrollConfiguration.of(context).copyWith(
dragDevices: {
PointerDeviceKind.touch,
PointerDeviceKind.mouse,
ui.PointerDeviceKind.touch,
ui.PointerDeviceKind.mouse,
},
),
itemBuilder: (context, index) => AnimatedBuilder(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.

import 'dart:ui';
import 'dart:ui' as ui;

import 'package:flutter/foundation.dart' show kDebugMode;
import 'package:flutter/material.dart';
Expand Down Expand Up @@ -78,10 +78,10 @@ class WonkyCharState extends State<WonkyChar>

@override
Widget build(BuildContext context) {
List<FontVariation> fontVariations = [];
List<ui.FontVariation> fontVariations = [];
for (int i = 0; i < _fvAxes.length; i++) {
fontVariations
.add(FontVariation(_fvAxes[i], _fvAnimations[i].value as double));
.add(ui.FontVariation(_fvAxes[i], _fvAnimations[i].value as double));
}
return Transform(
alignment: Alignment.center,
Expand Down
8 changes: 4 additions & 4 deletions next_gen_ui_demo/lib/assets.dart
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.

import 'dart:ui';
import 'dart:ui' as ui;

class AssetPaths {
/// Images
Expand All @@ -29,13 +29,13 @@ class AssetPaths {
static const String uiShader = '$_shaders/ui_glitch.frag';
}

typedef Shaders = ({FragmentShader orb, FragmentShader ui});
typedef Shaders = ({ui.FragmentShader orb, ui.FragmentShader ui});

Future<Shaders> loadShaders() async => (
orb: (await _loadShader(AssetPaths.orbShader)),
ui: (await _loadShader(AssetPaths.uiShader)),
);

Future<FragmentShader> _loadShader(String path) async {
return (await FragmentProgram.fromAsset(path)).fragmentShader();
Future<ui.FragmentShader> _loadShader(String path) async {
return (await ui.FragmentProgram.fromAsset(path)).fragmentShader();
}
6 changes: 3 additions & 3 deletions next_gen_ui_demo/lib/common/shader_painter.dart
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,15 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.

import 'dart:ui';
import 'dart:ui' as ui;

import 'package:flutter/material.dart';

class ShaderPainter extends CustomPainter {
ShaderPainter(this.shader, {this.update});

final FragmentShader shader;
final void Function(FragmentShader, Size)? update;
final ui.FragmentShader shader;
final void Function(ui.FragmentShader, Size)? update;

@override
void paint(Canvas canvas, Size size) {
Expand Down
15 changes: 8 additions & 7 deletions next_gen_ui_demo/lib/orb_shader/orb_shader_painter.dart
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.

import 'dart:math';
import 'dart:ui';
import 'dart:math' as math;
import 'dart:ui' as ui;

import 'package:flutter/material.dart';
import 'package:vector_math/vector_math_64.dart' as v64;
Expand All @@ -18,15 +18,16 @@ class OrbShaderPainter extends CustomPainter {
required this.mousePos,
required this.energy,
});
final FragmentShader shader;
final ui.FragmentShader shader;
final OrbShaderConfig config;
final double time;
final Offset mousePos;
final double energy;

@override
void paint(Canvas canvas, Size size) {
double fov = v64.mix(pi / 4.3, pi / 2.0, config.zoom.clamp(0.0, 1.0));
double fov =
v64.mix(math.pi / 4.3, math.pi / 2.0, config.zoom.clamp(0.0, 1.0));

v64.Vector3 colorToVector3(Color c) =>
v64.Vector3(
Expand All @@ -37,16 +38,16 @@ class OrbShaderPainter extends CustomPainter {
255.0;

v64.Vector3 lightLumP = colorToVector3(config.lightColor).normalized() *
max(0.0, config.lightBrightness);
math.max(0.0, config.lightBrightness);
v64.Vector3 albedo = colorToVector3(config.materialColor);

v64.Vector3 ambientLight = colorToVector3(config.ambientLightColor) *
max(0.0, config.ambientLightBrightness);
math.max(0.0, config.ambientLightBrightness);

shader.setFloat(0, size.width);
shader.setFloat(1, size.height);
shader.setFloat(2, time);
shader.setFloat(3, max(0.0, config.exposure));
shader.setFloat(3, math.max(0.0, config.exposure));
shader.setFloat(4, fov);
shader.setFloat(5, config.roughness.clamp(0.0, 1.0));
shader.setFloat(6, config.metalness.clamp(0.0, 1.0));
Expand Down
8 changes: 4 additions & 4 deletions next_gen_ui_demo/lib/orb_shader/orb_shader_widget.dart
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
// found in the LICENSE file.

import 'dart:async';
import 'dart:math';
import 'dart:ui';
import 'dart:math' as math;
import 'dart:ui' as ui;

import 'package:flutter/material.dart';
import 'package:flutter_animate/flutter_animate.dart';
Expand Down Expand Up @@ -95,13 +95,13 @@ class OrbShaderWidgetState extends State<OrbShaderWidget>
widget.mousePos)
.distance;
final hitSize = size.shortestSide * .5;
energyLevel = 1 - min(1, (d / hitSize));
energyLevel = 1 - math.min(1, (d / hitSize));
scheduleMicrotask(
() => widget.onUpdate?.call(energyLevel));
}
energyLevel +=
(1.3 - energyLevel) * heartbeatEnergy * 0.1;
energyLevel = lerpDouble(minEnergy, 1, energyLevel)!;
energyLevel = ui.lerpDouble(minEnergy, 1, energyLevel)!;
return CustomPaint(
size: size,
painter: OrbShaderPainter(
Expand Down
12 changes: 7 additions & 5 deletions next_gen_ui_demo/lib/title_screen_5b/title_screen.dart
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.

import 'dart:math';
import 'dart:ui';
import 'dart:math' as math;
import 'dart:ui' as ui;

import 'package:flutter/material.dart';
import 'package:flutter/services.dart';
Expand Down Expand Up @@ -54,17 +54,19 @@ class _TitleScreenState extends State<TitleScreen>

double get _finalReceiveLightAmt {
final light =
lerpDouble(_minReceiveLightAmt, _maxReceiveLightAmt, _orbEnergy) ?? 0;
ui.lerpDouble(_minReceiveLightAmt, _maxReceiveLightAmt, _orbEnergy) ??
0;
return light + _pulseEffect.value * .05 * _orbEnergy;
}

double get _finalEmitLightAmt {
return lerpDouble(_minEmitLightAmt, _maxEmitLightAmt, _orbEnergy) ?? 0;
return ui.lerpDouble(_minEmitLightAmt, _maxEmitLightAmt, _orbEnergy) ?? 0;
}

late final AnimationController _pulseEffect;

Duration _getRndPulseDuration() => 100.ms + 200.ms * Random().nextDouble();
Duration _getRndPulseDuration() =>
100.ms + 200.ms * math.Random().nextDouble();

double _getMinEnergyForDifficulty(int difficulty) {
if (difficulty == 1) {
Expand Down
12 changes: 7 additions & 5 deletions next_gen_ui_demo/lib/title_screen_6/title_screen.dart
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.

import 'dart:math';
import 'dart:ui';
import 'dart:math' as math;
import 'dart:ui' as ui;

import 'package:flutter/material.dart';
import 'package:flutter/services.dart';
Expand Down Expand Up @@ -55,17 +55,19 @@ class _TitleScreenState extends State<TitleScreen>

double get _finalReceiveLightAmt {
final light =
lerpDouble(_minReceiveLightAmt, _maxReceiveLightAmt, _orbEnergy) ?? 0;
ui.lerpDouble(_minReceiveLightAmt, _maxReceiveLightAmt, _orbEnergy) ??
0;
return light + _pulseEffect.value * .05 * _orbEnergy;
}

double get _finalEmitLightAmt {
return lerpDouble(_minEmitLightAmt, _maxEmitLightAmt, _orbEnergy) ?? 0;
return ui.lerpDouble(_minEmitLightAmt, _maxEmitLightAmt, _orbEnergy) ?? 0;
}

late final AnimationController _pulseEffect;

Duration _getRndPulseDuration() => 100.ms + 200.ms * Random().nextDouble();
Duration _getRndPulseDuration() =>
100.ms + 200.ms * math.Random().nextDouble();

double _getMinEnergyForDifficulty(int difficulty) {
if (difficulty == 1) {
Expand Down
4 changes: 2 additions & 2 deletions veggieseasons/lib/widgets/close_button.dart
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.

import 'dart:ui';
import 'dart:ui' as ui;

import 'package:flutter/cupertino.dart';
import 'package:veggieseasons/styles.dart';
Expand All @@ -19,7 +19,7 @@ class FrostedBox extends StatelessWidget {
@override
Widget build(BuildContext context) {
return BackdropFilter(
filter: ImageFilter.blur(sigmaX: 10, sigmaY: 10),
filter: ui.ImageFilter.blur(sigmaX: 10, sigmaY: 10),
child: DecoratedBox(
decoration: const BoxDecoration(
color: Styles.frostedBackground,
Expand Down
4 changes: 2 additions & 2 deletions veggieseasons/lib/widgets/veggie_card.dart
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.

import 'dart:ui';
import 'dart:ui' as ui;

import 'package:flutter/cupertino.dart';
import 'package:go_router/go_router.dart';
Expand All @@ -25,7 +25,7 @@ class FrostyBackground extends StatelessWidget {
Widget build(BuildContext context) {
return ClipRect(
child: BackdropFilter(
filter: ImageFilter.blur(sigmaX: intensity, sigmaY: intensity),
filter: ui.ImageFilter.blur(sigmaX: intensity, sigmaY: intensity),
child: DecoratedBox(
decoration: BoxDecoration(
color: color,
Expand Down