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

Commit d3c8741

Browse files
Fix issue
1 parent 620f01d commit d3c8741

File tree

10 files changed

+165
-133
lines changed

10 files changed

+165
-133
lines changed

‎ios/Flutter/AppFrameworkInfo.plist

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,6 @@
2121
<key>CFBundleVersion</key>
2222
<string>1.0</string>
2323
<key>MinimumOSVersion</key>
24-
<string>8.0</string>
24+
<string>12.0</string>
2525
</dict>
2626
</plist>

‎ios/Runner.xcodeproj/project.pbxproj

Lines changed: 9 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -3,17 +3,13 @@
33
archiveVersion = 1;
44
classes = {
55
};
6-
objectVersion = 46;
6+
objectVersion = 54;
77
objects = {
88

99
/* Begin PBXBuildFile section */
1010
1498D2341E8E89220040F4C2 /* GeneratedPluginRegistrant.m in Sources */ = {isa = PBXBuildFile; fileRef = 1498D2331E8E89220040F4C2 /* GeneratedPluginRegistrant.m */; };
1111
3B3967161E833CAA004F5970 /* AppFrameworkInfo.plist in Resources */ = {isa = PBXBuildFile; fileRef = 3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */; };
12-
3B80C3941E831B6300D905FE /* App.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 3B80C3931E831B6300D905FE /* App.framework */; };
13-
3B80C3951E831B6300D905FE /* App.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 3B80C3931E831B6300D905FE /* App.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
1412
74858FAF1ED2DC5600515810 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 74858FAE1ED2DC5600515810 /* AppDelegate.swift */; };
15-
9705A1C61CF904A100538489 /* Flutter.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 9740EEBA1CF902C7004384FC /* Flutter.framework */; };
16-
9705A1C71CF904A300538489 /* Flutter.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 9740EEBA1CF902C7004384FC /* Flutter.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
1713
9740EEB41CF90195004384FC /* Debug.xcconfig in Resources */ = {isa = PBXBuildFile; fileRef = 9740EEB21CF90195004384FC /* Debug.xcconfig */; };
1814
97C146FC1CF9000F007C117D /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FA1CF9000F007C117D /* Main.storyboard */; };
1915
97C146FE1CF9000F007C117D /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FD1CF9000F007C117D /* Assets.xcassets */; };
@@ -27,8 +23,6 @@
2723
dstPath = "";
2824
dstSubfolderSpec = 10;
2925
files = (
30-
3B80C3951E831B6300D905FE /* App.framework in Embed Frameworks */,
31-
9705A1C71CF904A300538489 /* Flutter.framework in Embed Frameworks */,
3226
);
3327
name = "Embed Frameworks";
3428
runOnlyForDeploymentPostprocessing = 0;
@@ -39,13 +33,11 @@
3933
1498D2321E8E86230040F4C2 /* GeneratedPluginRegistrant.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = GeneratedPluginRegistrant.h; sourceTree = "<group>"; };
4034
1498D2331E8E89220040F4C2 /* GeneratedPluginRegistrant.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GeneratedPluginRegistrant.m; sourceTree = "<group>"; };
4135
3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = AppFrameworkInfo.plist; path = Flutter/AppFrameworkInfo.plist; sourceTree = "<group>"; };
42-
3B80C3931E831B6300D905FE /* App.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = App.framework; path = Flutter/App.framework; sourceTree = "<group>"; };
4336
74858FAD1ED2DC5600515810 /* Runner-Bridging-Header.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "Runner-Bridging-Header.h"; sourceTree = "<group>"; };
4437
74858FAE1ED2DC5600515810 /* AppDelegate.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = "<group>"; };
4538
7AFA3C8E1D35360C0083082E /* Release.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; name = Release.xcconfig; path = Flutter/Release.xcconfig; sourceTree = "<group>"; };
4639
9740EEB21CF90195004384FC /* Debug.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; name = Debug.xcconfig; path = Flutter/Debug.xcconfig; sourceTree = "<group>"; };
4740
9740EEB31CF90195004384FC /* Generated.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; name = Generated.xcconfig; path = Flutter/Generated.xcconfig; sourceTree = "<group>"; };
48-
9740EEBA1CF902C7004384FC /* Flutter.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Flutter.framework; path = Flutter/Flutter.framework; sourceTree = "<group>"; };
4941
97C146EE1CF9000F007C117D /* Runner.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = Runner.app; sourceTree = BUILT_PRODUCTS_DIR; };
5042
97C146FB1CF9000F007C117D /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/Main.storyboard; sourceTree = "<group>"; };
5143
97C146FD1CF9000F007C117D /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = "<group>"; };
@@ -58,8 +50,6 @@
5850
isa = PBXFrameworksBuildPhase;
5951
buildActionMask = 2147483647;
6052
files = (
61-
9705A1C61CF904A100538489 /* Flutter.framework in Frameworks */,
62-
3B80C3941E831B6300D905FE /* App.framework in Frameworks */,
6353
);
6454
runOnlyForDeploymentPostprocessing = 0;
6555
};
@@ -69,9 +59,7 @@
6959
9740EEB11CF90186004384FC /* Flutter */ = {
7060
isa = PBXGroup;
7161
children = (
72-
3B80C3931E831B6300D905FE /* App.framework */,
7362
3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */,
74-
9740EEBA1CF902C7004384FC /* Flutter.framework */,
7563
9740EEB21CF90195004384FC /* Debug.xcconfig */,
7664
7AFA3C8E1D35360C0083082E /* Release.xcconfig */,
7765
9740EEB31CF90195004384FC /* Generated.xcconfig */,
@@ -148,7 +136,7 @@
148136
97C146E61CF9000F007C117D /* Project object */ = {
149137
isa = PBXProject;
150138
attributes = {
151-
LastUpgradeCheck = 1020;
139+
LastUpgradeCheck = 1510;
152140
ORGANIZATIONNAME = "The Chromium Authors";
153141
TargetAttributes = {
154142
97C146ED1CF9000F007C117D = {
@@ -194,20 +182,23 @@
194182
/* Begin PBXShellScriptBuildPhase section */
195183
3B06AD1E1E4923F5004D2608 /* Thin Binary */ = {
196184
isa = PBXShellScriptBuildPhase;
185+
alwaysOutOfDate = 1;
197186
buildActionMask = 2147483647;
198187
files = (
199188
);
200189
inputPaths = (
190+
"${TARGET_BUILD_DIR}/${INFOPLIST_PATH}",
201191
);
202192
name = "Thin Binary";
203193
outputPaths = (
204194
);
205195
runOnlyForDeploymentPostprocessing = 0;
206196
shellPath = /bin/sh;
207-
shellScript = "/bin/sh \"$FLUTTER_ROOT/packages/flutter_tools/bin/xcode_backend.sh\" thin";
197+
shellScript = "/bin/sh \"$FLUTTER_ROOT/packages/flutter_tools/bin/xcode_backend.sh\" embed_and_thin";
208198
};
209199
9740EEB61CF901F6004384FC /* Run Script */ = {
210200
isa = PBXShellScriptBuildPhase;
201+
alwaysOutOfDate = 1;
211202
buildActionMask = 2147483647;
212203
files = (
213204
);
@@ -256,7 +247,6 @@
256247
/* Begin XCBuildConfiguration section */
257248
249021D3217E4FDB00AE95B9 /* Profile */ = {
258249
isa = XCBuildConfiguration;
259-
baseConfigurationReference = 7AFA3C8E1D35360C0083082E /* Release.xcconfig */;
260250
buildSettings = {
261251
ALWAYS_SEARCH_USER_PATHS = NO;
262252
CLANG_ANALYZER_NONNULL = YES;
@@ -296,7 +286,7 @@
296286
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
297287
GCC_WARN_UNUSED_FUNCTION = YES;
298288
GCC_WARN_UNUSED_VARIABLE = YES;
299-
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
289+
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
300290
MTL_ENABLE_DEBUG_INFO = NO;
301291
SDKROOT = iphoneos;
302292
TARGETED_DEVICE_FAMILY = "1,2";
@@ -333,7 +323,6 @@
333323
};
334324
97C147031CF9000F007C117D /* Debug */ = {
335325
isa = XCBuildConfiguration;
336-
baseConfigurationReference = 9740EEB21CF90195004384FC /* Debug.xcconfig */;
337326
buildSettings = {
338327
ALWAYS_SEARCH_USER_PATHS = NO;
339328
CLANG_ANALYZER_NONNULL = YES;
@@ -379,7 +368,7 @@
379368
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
380369
GCC_WARN_UNUSED_FUNCTION = YES;
381370
GCC_WARN_UNUSED_VARIABLE = YES;
382-
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
371+
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
383372
MTL_ENABLE_DEBUG_INFO = YES;
384373
ONLY_ACTIVE_ARCH = YES;
385374
SDKROOT = iphoneos;
@@ -389,7 +378,6 @@
389378
};
390379
97C147041CF9000F007C117D /* Release */ = {
391380
isa = XCBuildConfiguration;
392-
baseConfigurationReference = 7AFA3C8E1D35360C0083082E /* Release.xcconfig */;
393381
buildSettings = {
394382
ALWAYS_SEARCH_USER_PATHS = NO;
395383
CLANG_ANALYZER_NONNULL = YES;
@@ -429,7 +417,7 @@
429417
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
430418
GCC_WARN_UNUSED_FUNCTION = YES;
431419
GCC_WARN_UNUSED_VARIABLE = YES;
432-
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
420+
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
433421
MTL_ENABLE_DEBUG_INFO = NO;
434422
SDKROOT = iphoneos;
435423
SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";

‎ios/Runner.xcodeproj/project.xcworkspace/contents.xcworkspacedata

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Scheme
3-
LastUpgradeVersion = "1020"
3+
LastUpgradeVersion = "1510"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"

‎ios/Runner/AppDelegate.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import UIKit
22
import Flutter
33

4-
@UIApplicationMain
4+
@main
55
@objc class AppDelegate: FlutterAppDelegate {
66
override func application(
77
_ application: UIApplication,

‎ios/Runner/Info.plist

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,5 +41,9 @@
4141
</array>
4242
<key>UIViewControllerBasedStatusBarAppearance</key>
4343
<false/>
44+
<key>CADisableMinimumFrameDurationOnPhone</key>
45+
<true/>
46+
<key>UIApplicationSupportsIndirectInputEvents</key>
47+
<true/>
4448
</dict>
4549
</plist>

‎lib/FadeAnimation.dart

Lines changed: 30 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -1,35 +1,35 @@
1-
import 'package:flutter/material.dart';
2-
import 'package:simple_animations/simple_animations.dart';
1+
// import 'package:flutter/material.dart';
2+
// import 'package:simple_animations/simple_animations.dart';
33

4-
class FadeAnimation extends StatelessWidget {
5-
final double delay;
6-
final Widget child;
4+
// class FadeAnimation extends StatelessWidget {
5+
// final double delay;
6+
// final Widget child;
77

8-
FadeAnimation(this.delay, this.child);
8+
// FadeAnimation(this.delay, this.child);
99

10-
@override
11-
Widget build(BuildContext context) {
12-
final tween = MultiTrackTween([
13-
Track('opacity').add(Duration(milliseconds: 500),
14-
Tween(begin: 0.0, end: 1.0)),
10+
// @override
11+
// Widget build(BuildContext context) {
12+
// final tween = MultiTrackTween([
13+
// Track('opacity').add(Duration(milliseconds: 500),
14+
// Tween(begin: 0.0, end: 1.0)),
1515

16-
Track('translateY').add(Duration(milliseconds: 500),
17-
Tween(begin: 120.0, end: 0.0),
18-
curve: Curves.easeOut)
19-
]);
16+
// Track('translateY').add(Duration(milliseconds: 500),
17+
// Tween(begin: 120.0, end: 0.0),
18+
// curve: Curves.easeOut)
19+
// ]);
2020

21-
return ControlledAnimation(
22-
delay: Duration(milliseconds: (500 * delay).round()),
23-
duration: tween.duration,
24-
tween: tween,
25-
child: child,
26-
builderWithChild: (context, child, animation) => Opacity(
27-
opacity: animation['opacity'],
28-
child: Transform.translate(
29-
offset: Offset(0, animation['translateY']),
30-
child: child,
31-
),
32-
),
33-
);
34-
}
35-
}
21+
// return ControlledAnimation(
22+
// delay: Duration(milliseconds: (500 * delay).round()),
23+
// duration: tween.duration,
24+
// tween: tween,
25+
// child: child,
26+
// builderWithChild: (context, child, animation) => Opacity(
27+
// opacity: animation['opacity'],
28+
// child: Transform.translate(
29+
// offset: Offset(0, animation['translateY']),
30+
// child: child,
31+
// ),
32+
// ),
33+
// );
34+
// }
35+
// }

‎lib/main.dart

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import 'package:day2_trip/FadeAnimation.dart';
1+
import 'package:animate_do/animate_do.dart';
22
import 'package:flutter/material.dart';
33

44
void main() => runApp(
@@ -15,7 +15,7 @@ class HomePage extends StatefulWidget {
1515
}
1616

1717
class _HomePageState extends State<HomePage> with SingleTickerProviderStateMixin {
18-
PageController _pageController;
18+
latePageController _pageController;
1919
int totalPage = 4;
2020

2121
void _onScroll() {
@@ -46,25 +46,25 @@ class _HomePageState extends State<HomePage> with SingleTickerProviderStateMixin
4646
page: 1,
4747
image: 'assets/images/one.jpg',
4848
title: 'Yosemite National Park',
49-
description: 'Yosemite National Park is in California’s Sierra Nevada mountains. It’s famed for its giant, ancient sequoia trees, and for Tunnel View, the iconic vista of towering Bridalveil Fall and the granite cliffs of El Capitan and Half Dome.'
49+
description: 'Yosemite National Park is in California’s Sierra Nevada mountains.'
5050
),
5151
makePage(
5252
page: 2,
5353
image: 'assets/images/two.jpg',
5454
title: 'Golden Gate Bridge',
55-
description: 'The Golden Gate Bridge is a suspension bridge spanning the Golden Gate, the one-mile-wide strait connecting San Francisco Bay and the Pacific Ocean.'
55+
description: 'The Golden Gate Bridge is a suspension bridge spanning the Golden Gate, the one-mile-wide strait.'
5656
),
5757
makePage(
5858
page: 3,
5959
image: 'assets/images/three.jpg',
6060
title: 'Sedona',
61-
description: "Sedona is regularly described as one of America's most beautiful places. Nowhere else will you find a landscape as dramatically colorful."
61+
description: "Sedona is regularly described as one of America's most beautiful places."
6262
),
6363
makePage(
6464
page: 4,
6565
image: 'assets/images/four.jpg',
6666
title: 'Savannah',
67-
description: "Savannah, with its Spanish moss, Southern accents and creepy graveyards, is a lot like Charleston, South Carolina. But this city about 100 miles to the south has an eccentric streak."
67+
description: "Savannah, with its Spanish moss, Southern accents and creepy graveyards, is a lot like Charleston, South Carolina."
6868
),
6969
],
7070
),
@@ -103,7 +103,7 @@ class _HomePageState extends State<HomePage> with SingleTickerProviderStateMixin
103103
crossAxisAlignment: CrossAxisAlignment.baseline,
104104
textBaseline: TextBaseline.alphabetic,
105105
children: <Widget>[
106-
FadeAnimation(2, Text(page.toString(), style: TextStyle(color: Colors.white, fontSize: 30, fontWeight: FontWeight.bold),)),
106+
FadeInUp(child: Text(page.toString(), style: TextStyle(color: Colors.white, fontSize: 30, fontWeight: FontWeight.bold),)),
107107
Text('/' + totalPage.toString(), style: TextStyle(color: Colors.white, fontSize: 15),)
108108
],
109109
),
@@ -112,13 +112,13 @@ class _HomePageState extends State<HomePage> with SingleTickerProviderStateMixin
112112
mainAxisAlignment: MainAxisAlignment.end,
113113
crossAxisAlignment: CrossAxisAlignment.start,
114114
children: <Widget>[
115-
FadeAnimation(1,
115+
FadeInUp(child:
116116
Text(title, style: TextStyle(color: Colors.white, fontSize: 50, height: 1.2, fontWeight: FontWeight.bold),)
117117
),
118118
SizedBox(
119119
height: 20,
120120
),
121-
FadeAnimation(1.5, Row(
121+
FadeInUp(child: Row(
122122
children: <Widget>[
123123
Container(
124124
margin: EdgeInsets.only(right: 3),
@@ -147,12 +147,12 @@ class _HomePageState extends State<HomePage> with SingleTickerProviderStateMixin
147147
SizedBox(
148148
height: 20,
149149
),
150-
FadeAnimation(2, Padding(
150+
FadeInUp(child: Padding(
151151
padding: const EdgeInsets.only(right: 50),
152152
child: Text(description, style: TextStyle(color: Colors.white.withOpacity(.7), height: 1.9, fontSize: 15),),
153153
)),
154154
SizedBox(height: 20,),
155-
FadeAnimation(2.5, Text('READ MORE', style: TextStyle(color: Colors.white),)),
155+
FadeInUp(child: Text('READ MORE', style: TextStyle(color: Colors.white),)),
156156
SizedBox(height: 30,),
157157
],
158158
),

0 commit comments

Comments
(0)

AltStyle によって変換されたページ (->オリジナル) /