Starter/samples
1
0
Fork 0
mirror of https://github.com/flutter/samples.git synced 2025-11-08 13:58:47 +00:00
Code Issues Releases Wiki Activity

adding more named and explicit imports (#1909)

Browse Source
This commit is contained in:
Miguel Beltran
2023-06-27 22:27:20 +02:00
committed by GitHub
parent b45f3d307b
commit 715c4338f6
10 changed files with 43 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
animations/lib/src/misc/carousel.dart
View File

@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be // Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file. // found in the LICENSE file.
import 'dart:ui'; import 'dart:ui' as ui;
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
class CarouselDemo extends StatelessWidget { class CarouselDemo extends StatelessWidget {
@@ -80,8 +80,8 @@ class _CarouselState extends State<Carousel> {
controller: _controller, controller: _controller,
scrollBehavior: ScrollConfiguration.of(context).copyWith( scrollBehavior: ScrollConfiguration.of(context).copyWith(
dragDevices: { dragDevices: {
PointerDeviceKind.touch, ui.PointerDeviceKind.touch,
PointerDeviceKind.mouse, ui.PointerDeviceKind.mouse,
}, },
), ),
itemBuilder: (context, index) => AnimatedBuilder( itemBuilder: (context, index) => AnimatedBuilder(

6
experimental/varfont_shader_puzzle/lib/components/wonky_char.dart
View File

@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be // Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file. // found in the LICENSE file.
import 'dart:ui'; import 'dart:ui' as ui;
import 'package:flutter/foundation.dart' show kDebugMode; import 'package:flutter/foundation.dart' show kDebugMode;
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
@@ -78,10 +78,10 @@ class WonkyCharState extends State<WonkyChar>
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
List<FontVariation> fontVariations = []; List<ui.FontVariation> fontVariations = [];
for (int i = 0; i < _fvAxes.length; i++) { for (int i = 0; i < _fvAxes.length; i++) {
fontVariations fontVariations
.add(FontVariation(_fvAxes[i], _fvAnimations[i].value as double)); .add(ui.FontVariation(_fvAxes[i], _fvAnimations[i].value as double));
} }
return Transform( return Transform(
alignment: Alignment.center, alignment: Alignment.center,

8
next_gen_ui_demo/lib/assets.dart
View File

@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be // Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file. // found in the LICENSE file.
import 'dart:ui'; import 'dart:ui' as ui;
class AssetPaths { class AssetPaths {
/// Images /// Images
@@ -29,13 +29,13 @@ class AssetPaths {
static const String uiShader = '$_shaders/ui_glitch.frag'; 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 => ( Future<Shaders> loadShaders() async => (
orb: (await _loadShader(AssetPaths.orbShader)), orb: (await _loadShader(AssetPaths.orbShader)),
ui: (await _loadShader(AssetPaths.uiShader)), ui: (await _loadShader(AssetPaths.uiShader)),
); );
Future<FragmentShader> _loadShader(String path) async { Future<ui.FragmentShader> _loadShader(String path) async {
return (await FragmentProgram.fromAsset(path)).fragmentShader(); return (await ui.FragmentProgram.fromAsset(path)).fragmentShader();
} }

6
next_gen_ui_demo/lib/common/shader_painter.dart
View File

@@ -2,15 +2,15 @@
// Use of this source code is governed by a BSD-style license that can be // Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file. // found in the LICENSE file.
import 'dart:ui'; import 'dart:ui' as ui;
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
class ShaderPainter extends CustomPainter { class ShaderPainter extends CustomPainter {
ShaderPainter(this.shader, {this.update}); ShaderPainter(this.shader, {this.update});
final FragmentShader shader; final ui.FragmentShader shader;
final void Function(FragmentShader, Size)? update; final void Function(ui.FragmentShader, Size)? update;
@override @override
void paint(Canvas canvas, Size size) { void paint(Canvas canvas, Size size) {

15
next_gen_ui_demo/lib/orb_shader/orb_shader_painter.dart
View File

@@ -2,8 +2,8 @@
// Use of this source code is governed by a BSD-style license that can be // Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file. // found in the LICENSE file.
import 'dart:math'; import 'dart:math' as math;
import 'dart:ui'; import 'dart:ui' as ui;
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:vector_math/vector_math_64.dart' as v64; import 'package:vector_math/vector_math_64.dart' as v64;
@@ -18,7 +18,7 @@ class OrbShaderPainter extends CustomPainter {
required this.mousePos, required this.mousePos,
required this.energy, required this.energy,
}); });
final FragmentShader shader; final ui.FragmentShader shader;
final OrbShaderConfig config; final OrbShaderConfig config;
final double time; final double time;
final Offset mousePos; final Offset mousePos;
@@ -26,7 +26,8 @@ class OrbShaderPainter extends CustomPainter {
@override @override
void paint(Canvas canvas, Size size) { 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 colorToVector3(Color c) =>
v64.Vector3( v64.Vector3(
@@ -37,16 +38,16 @@ class OrbShaderPainter extends CustomPainter {
255.0; 255.0;
v64.Vector3 lightLumP = colorToVector3(config.lightColor).normalized() * 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 albedo = colorToVector3(config.materialColor);
v64.Vector3 ambientLight = colorToVector3(config.ambientLightColor) * v64.Vector3 ambientLight = colorToVector3(config.ambientLightColor) *
max(0.0, config.ambientLightBrightness); math.max(0.0, config.ambientLightBrightness);
shader.setFloat(0, size.width); shader.setFloat(0, size.width);
shader.setFloat(1, size.height); shader.setFloat(1, size.height);
shader.setFloat(2, time); 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(4, fov);
shader.setFloat(5, config.roughness.clamp(0.0, 1.0)); shader.setFloat(5, config.roughness.clamp(0.0, 1.0));
shader.setFloat(6, config.metalness.clamp(0.0, 1.0)); shader.setFloat(6, config.metalness.clamp(0.0, 1.0));

8
next_gen_ui_demo/lib/orb_shader/orb_shader_widget.dart
View File

@@ -3,8 +3,8 @@
// found in the LICENSE file. // found in the LICENSE file.
import 'dart:async'; import 'dart:async';
import 'dart:math'; import 'dart:math' as math;
import 'dart:ui'; import 'dart:ui' as ui;
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:flutter_animate/flutter_animate.dart'; import 'package:flutter_animate/flutter_animate.dart';
@@ -95,13 +95,13 @@ class OrbShaderWidgetState extends State<OrbShaderWidget>
widget.mousePos) widget.mousePos)
.distance; .distance;
final hitSize = size.shortestSide * .5; final hitSize = size.shortestSide * .5;
energyLevel = 1 - min(1, (d / hitSize)); energyLevel = 1 - math.min(1, (d / hitSize));
scheduleMicrotask( scheduleMicrotask(
() => widget.onUpdate?.call(energyLevel)); () => widget.onUpdate?.call(energyLevel));
} }
energyLevel += energyLevel +=
(1.3 - energyLevel) * heartbeatEnergy * 0.1; (1.3 - energyLevel) * heartbeatEnergy * 0.1;
energyLevel = lerpDouble(minEnergy, 1, energyLevel)!; energyLevel = ui.lerpDouble(minEnergy, 1, energyLevel)!;
return CustomPaint( return CustomPaint(
size: size, size: size,
painter: OrbShaderPainter( painter: OrbShaderPainter(

12
next_gen_ui_demo/lib/title_screen_5b/title_screen.dart
View File

@@ -2,8 +2,8 @@
// Use of this source code is governed by a BSD-style license that can be // Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file. // found in the LICENSE file.
import 'dart:math'; import 'dart:math' as math;
import 'dart:ui'; import 'dart:ui' as ui;
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:flutter/services.dart'; import 'package:flutter/services.dart';
@@ -54,17 +54,19 @@ class _TitleScreenState extends State<TitleScreen>
double get _finalReceiveLightAmt { double get _finalReceiveLightAmt {
final light = final light =
lerpDouble(_minReceiveLightAmt, _maxReceiveLightAmt, _orbEnergy) ?? 0; ui.lerpDouble(_minReceiveLightAmt, _maxReceiveLightAmt, _orbEnergy) ??
0;
return light + _pulseEffect.value * .05 * _orbEnergy; return light + _pulseEffect.value * .05 * _orbEnergy;
} }
double get _finalEmitLightAmt { double get _finalEmitLightAmt {
return lerpDouble(_minEmitLightAmt, _maxEmitLightAmt, _orbEnergy) ?? 0; return ui.lerpDouble(_minEmitLightAmt, _maxEmitLightAmt, _orbEnergy) ?? 0;
} }
late final AnimationController _pulseEffect; 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) { double _getMinEnergyForDifficulty(int difficulty) {
if (difficulty == 1) { if (difficulty == 1) {

12
next_gen_ui_demo/lib/title_screen_6/title_screen.dart
View File

@@ -2,8 +2,8 @@
// Use of this source code is governed by a BSD-style license that can be // Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file. // found in the LICENSE file.
import 'dart:math'; import 'dart:math' as math;
import 'dart:ui'; import 'dart:ui' as ui;
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:flutter/services.dart'; import 'package:flutter/services.dart';
@@ -55,17 +55,19 @@ class _TitleScreenState extends State<TitleScreen>
double get _finalReceiveLightAmt { double get _finalReceiveLightAmt {
final light = final light =
lerpDouble(_minReceiveLightAmt, _maxReceiveLightAmt, _orbEnergy) ?? 0; ui.lerpDouble(_minReceiveLightAmt, _maxReceiveLightAmt, _orbEnergy) ??
0;
return light + _pulseEffect.value * .05 * _orbEnergy; return light + _pulseEffect.value * .05 * _orbEnergy;
} }
double get _finalEmitLightAmt { double get _finalEmitLightAmt {
return lerpDouble(_minEmitLightAmt, _maxEmitLightAmt, _orbEnergy) ?? 0; return ui.lerpDouble(_minEmitLightAmt, _maxEmitLightAmt, _orbEnergy) ?? 0;
} }
late final AnimationController _pulseEffect; 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) { double _getMinEnergyForDifficulty(int difficulty) {
if (difficulty == 1) { if (difficulty == 1) {

4
veggieseasons/lib/widgets/close_button.dart
View File

@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be // Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file. // found in the LICENSE file.
import 'dart:ui'; import 'dart:ui' as ui;
import 'package:flutter/cupertino.dart'; import 'package:flutter/cupertino.dart';
import 'package:veggieseasons/styles.dart'; import 'package:veggieseasons/styles.dart';
@@ -19,7 +19,7 @@ class FrostedBox extends StatelessWidget {
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
return BackdropFilter( return BackdropFilter(
filter: ImageFilter.blur(sigmaX: 10, sigmaY: 10), filter: ui.ImageFilter.blur(sigmaX: 10, sigmaY: 10),
child: DecoratedBox( child: DecoratedBox(
decoration: const BoxDecoration( decoration: const BoxDecoration(
color: Styles.frostedBackground, color: Styles.frostedBackground,

4
veggieseasons/lib/widgets/veggie_card.dart
View File

@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be // Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file. // found in the LICENSE file.
import 'dart:ui'; import 'dart:ui' as ui;
import 'package:flutter/cupertino.dart'; import 'package:flutter/cupertino.dart';
import 'package:go_router/go_router.dart'; import 'package:go_router/go_router.dart';
@@ -25,7 +25,7 @@ class FrostyBackground extends StatelessWidget {
Widget build(BuildContext context) { Widget build(BuildContext context) {
return ClipRect( return ClipRect(
child: BackdropFilter( child: BackdropFilter(
filter: ImageFilter.blur(sigmaX: intensity, sigmaY: intensity), filter: ui.ImageFilter.blur(sigmaX: intensity, sigmaY: intensity),
child: DecoratedBox( child: DecoratedBox(
decoration: BoxDecoration( decoration: BoxDecoration(
color: color, color: color,