Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

migrate to null safety#6

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 ourterms of service andprivacy statement. We’ll occasionally send you account related emails.

Already on GitHub?Sign in to your account

Closed
britannio wants to merge2 commits intolokesh-coder:masterfrombritannio:null-safety
Closed
Show file tree
Hide file tree
Changes fromall 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
1 change: 1 addition & 0 deletionsexample/ios/Flutter/Debug.xcconfig
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1 +1,2 @@
#include? "Pods/Target Support Files/Pods-Runner/Pods-Runner.debug.xcconfig"
#include "Generated.xcconfig"
1 change: 1 addition & 0 deletionsexample/ios/Flutter/Release.xcconfig
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1 +1,2 @@
#include? "Pods/Target Support Files/Pods-Runner/Pods-Runner.release.xcconfig"
#include "Generated.xcconfig"
41 changes: 41 additions & 0 deletionsexample/ios/Podfile
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,41 @@
# Uncomment this line to define a global platform for your project
# platform :ios, '9.0'

# CocoaPods analytics sends network stats synchronously affecting flutter build latency.
ENV['COCOAPODS_DISABLE_STATS']='true'

project'Runner',{
'Debug'=>:debug,
'Profile'=>:release,
'Release'=>:release,
}

defflutter_root
generated_xcode_build_settings_path=File.expand_path(File.join('..','Flutter','Generated.xcconfig'),__FILE__)
unlessFile.exist?(generated_xcode_build_settings_path)
raise"#{generated_xcode_build_settings_path} must exist. If you're running pod install manually, make sure flutter pub get is executed first"
end

File.foreach(generated_xcode_build_settings_path)do |line|
matches=line.match(/FLUTTER_ROOT\=(.*)/)
returnmatches[1].stripifmatches
end
raise"FLUTTER_ROOT not found in#{generated_xcode_build_settings_path}. Try deleting Generated.xcconfig, then run flutter pub get"
end

requireFile.expand_path(File.join('packages','flutter_tools','bin','podhelper'),flutter_root)

flutter_ios_podfile_setup

target'Runner'do
use_frameworks!
use_modular_headers!

flutter_install_all_ios_podsFile.dirname(File.realpath(__FILE__))
end

post_installdo |installer|
installer.pods_project.targets.eachdo |target|
flutter_additional_ios_build_settings(target)
end
end
99 changes: 39 additions & 60 deletionsexample/pubspec.lock
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,55 +1,55 @@
# Generated by pub
# See https://dart.dev/tools/pub/glossary#lockfile
packages:
archive:
dependency: transitive
description:
name: archive
url: "https://pub.dartlang.org"
source: hosted
version: "2.0.13"
args:
dependency: transitive
description:
name: args
url: "https://pub.dartlang.org"
source: hosted
version: "1.6.0"
async:
dependency: transitive
description:
name: async
url: "https://pub.dartlang.org"
source: hosted
version: "2.4.1"
version: "2.5.0"
blobs:
dependency: "direct main"
description:
path: ".."
relative: true
source: path
version: "1.2.0"
version: "2.0.0"
boolean_selector:
dependency: transitive
description:
name: boolean_selector
url: "https://pub.dartlang.org"
source: hosted
version: "2.0.0"
version: "2.1.0"
characters:
dependency: transitive
description:
name: characters
url: "https://pub.dartlang.org"
source: hosted
version: "1.1.0"
charcode:
dependency: transitive
description:
name: charcode
url: "https://pub.dartlang.org"
source: hosted
version: "1.1.3"
version: "1.2.0"
clock:
dependency: transitive
description:
name: clock
url: "https://pub.dartlang.org"
source: hosted
version: "1.1.0"
collection:
dependency: transitive
description:
name: collection
url: "https://pub.dartlang.org"
source: hosted
version: "1.14.12"
version: "1.15.0"
convert:
dependency: transitive
description:
Expand All@@ -71,6 +71,13 @@ packages:
url: "https://pub.dartlang.org"
source: hosted
version: "0.1.3"
fake_async:
dependency: transitive
description:
name: fake_async
url: "https://pub.dartlang.org"
source: hosted
version: "1.2.0"
flutter:
dependency: "direct main"
description: flutter
Expand DownExpand Up@@ -102,34 +109,27 @@ packages:
url: "https://pub.dartlang.org"
source: hosted
version: "3.1.4"
image:
dependency: transitive
description:
name: image
url: "https://pub.dartlang.org"
source: hosted
version: "2.1.12"
matcher:
dependency: transitive
description:
name: matcher
url: "https://pub.dartlang.org"
source: hosted
version: "0.12.6"
version: "0.12.10"
meta:
dependency: transitive
description:
name: meta
url: "https://pub.dartlang.org"
source: hosted
version: "1.1.8"
version: "1.3.0"
path:
dependency: transitive
description:
name: path
url: "https://pub.dartlang.org"
source: hosted
version: "1.6.4"
version: "1.8.0"
path_provider:
dependency: transitive
description:
Expand DownExpand Up@@ -158,13 +158,6 @@ packages:
url: "https://pub.dartlang.org"
source: hosted
version: "1.9.0"
petitparser:
dependency: transitive
description:
name: petitparser
url: "https://pub.dartlang.org"
source: hosted
version: "2.4.0"
platform:
dependency: transitive
description:
Expand All@@ -179,13 +172,6 @@ packages:
url: "https://pub.dartlang.org"
source: hosted
version: "1.0.2"
quiver:
dependency: transitive
description:
name: quiver
url: "https://pub.dartlang.org"
source: hosted
version: "2.1.3"
sky_engine:
dependency: transitive
description: flutter
Expand All@@ -197,63 +183,56 @@ packages:
name: source_span
url: "https://pub.dartlang.org"
source: hosted
version: "1.7.0"
version: "1.8.0"
stack_trace:
dependency: transitive
description:
name: stack_trace
url: "https://pub.dartlang.org"
source: hosted
version: "1.9.3"
version: "1.10.0"
stream_channel:
dependency: transitive
description:
name: stream_channel
url: "https://pub.dartlang.org"
source: hosted
version: "2.0.0"
version: "2.1.0"
string_scanner:
dependency: transitive
description:
name: string_scanner
url: "https://pub.dartlang.org"
source: hosted
version: "1.0.5"
version: "1.1.0"
term_glyph:
dependency: transitive
description:
name: term_glyph
url: "https://pub.dartlang.org"
source: hosted
version: "1.1.0"
version: "1.2.0"
test_api:
dependency: transitive
description:
name: test_api
url: "https://pub.dartlang.org"
source: hosted
version: "0.2.15"
version: "0.2.19"
typed_data:
dependency: transitive
description:
name: typed_data
url: "https://pub.dartlang.org"
source: hosted
version: "1.1.6"
version: "1.3.0"
vector_math:
dependency: transitive
description:
name: vector_math
url: "https://pub.dartlang.org"
source: hosted
version: "2.0.8"
xml:
dependency: transitive
description:
name: xml
url: "https://pub.dartlang.org"
source: hosted
version: "3.6.1"
version: "2.1.0"
sdks:
dart: ">=2.7.0 <3.0.0"
flutter: ">=1.17.0 <2.0.0"
dart: ">=2.12.0 <3.0.0"
flutter: ">=1.17.0"
2 changes: 1 addition & 1 deletionlib/src/clipper/clipper.dart
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -4,7 +4,7 @@ import 'package:blobs/src/services/blob_generator.dart';
import 'package:flutter/material.dart';

class BlobClipper extends CustomClipper<Path> {
final String id;
final String? id;
final int edgesCount;
final int minGrowth;
BlobClipper({
Expand Down
6 changes: 3 additions & 3 deletionslib/src/config.dart
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -4,8 +4,8 @@ import 'package:flutter/material.dart';
class BlobConfig {
static const Color color = Color(0xff3c40c6);
static const BlobFillType fillType = BlobFillType.fill;
static constnum edgesCount = 6;
static constnum minGrowth = 6;
static constnum animDurationMs = 500;
static constint edgesCount = 6;
static constint minGrowth = 6;
static constint animDurationMs = 500;
static const int strokeWidth = 3;
}
41 changes: 21 additions & 20 deletionslib/src/models.dart
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,25 @@
import 'package:blobs/src/config.dart';
import 'package:flutter/material.dart';

class BlobData {
int growth;
num size;
int edges;
BlobPoints points;
String id;
String? id;
Path path;
String svgPath;
String? svgPath;
BlobCurves curves;

BlobData({
this.growth,
this.size,
this.edges,
this.points,
this.id,
this.path,
this.svgPath,
this.curves,
requiredthis.growth,
requiredthis.size,
requiredthis.edges,
requiredthis.points,
requiredthis.id,
requiredthis.path,
requiredthis.svgPath,
requiredthis.curves,
});
}

Expand All@@ -33,14 +34,14 @@ enum BlobFillType { fill, stroke }

class BlobStyles {
Color color;
Shader gradient;
Shader? gradient;
int strokeWidth;
BlobFillType fillType;
BlobStyles({
this.color,
this.color = BlobConfig.color,
this.gradient,
this.fillType,
this.strokeWidth,
this.fillType = BlobConfig.fillType,
this.strokeWidth = BlobConfig.strokeWidth,
});
}

Expand All@@ -49,12 +50,12 @@ class BlobPoints {
List<Offset> destPoints;
Offset center;
double innerRad;
String id;
String? id;
BlobPoints({
this.originPoints,
this.destPoints,
this.center,
this.id,
this.innerRad,
requiredthis.originPoints,
requiredthis.destPoints,
requiredthis.center,
requiredthis.id,
requiredthis.innerRad,
});
}
Loading
[8]ページ先頭
©2009-2025 Movatter.jp