Skip to content

Commit d4536bf

Browse files
authored
Merge pull request #32 from aagarwal1012/aa_develop
Updates
2 parents c16eb24 + 8418455 commit d4536bf

File tree

9 files changed

+31
-503
lines changed

9 files changed

+31
-503
lines changed

.travis.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ cache:
1616
env:
1717
- FLUTTER_VERSION=beta
1818
- FLUTTER_VERSION=dev
19+
- FLUTTER_VERSION=stable
1920
matrix:
2021
allow_failures:
2122
- env: FLUTTER_VERSION=dev

CHANGELOG.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
## 2.6.0
2+
* Fix problem padding top in title of pageViews.
3+
* Background property added that can be used to add full screen image to IntroViews.
4+
15
## 2.5.0
26
* Added Next Button to move to the next screen. Overriding doneButtonPersist.
37
* Added Back Button. Overrides showSkipButton starting from the second page.

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ You should ensure that you add the `intro_views_flutter` as a dependency in your
5555

5656
```yaml
5757
dependencies:
58-
intro_views_flutter: '^2.4.0'
58+
intro_views_flutter: '^2.6.0'
5959
```
6060
6161
You can also reference the git repository directly if you want:

example/lib/main.dart

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -68,8 +68,7 @@ class App extends StatelessWidget {
6868
primarySwatch: Colors.blue,
6969
), //ThemeData
7070
home: Builder(
71-
builder: (context) =>
72-
IntroViewsFlutter(
71+
builder: (context) => IntroViewsFlutter(
7372
pages,
7473
onTapDoneButton: () {
7574
Navigator.push(

example/pubspec.lock

Lines changed: 11 additions & 249 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,6 @@
11
# Generated by pub
22
# See https://www.dartlang.org/tools/pub/glossary#lockfile
33
packages:
4-
analyzer:
5-
dependency: transitive
6-
description:
7-
name: analyzer
8-
url: "https://pub.dartlang.org"
9-
source: hosted
10-
version: "0.33.0"
11-
args:
12-
dependency: transitive
13-
description:
14-
name: args
15-
url: "https://pub.dartlang.org"
16-
source: hosted
17-
version: "1.5.0"
184
async:
195
dependency: transitive
206
description:
@@ -43,27 +29,6 @@ packages:
4329
url: "https://pub.dartlang.org"
4430
source: hosted
4531
version: "1.14.11"
46-
convert:
47-
dependency: transitive
48-
description:
49-
name: convert
50-
url: "https://pub.dartlang.org"
51-
source: hosted
52-
version: "2.0.2"
53-
crypto:
54-
dependency: transitive
55-
description:
56-
name: crypto
57-
url: "https://pub.dartlang.org"
58-
source: hosted
59-
version: "2.0.6"
60-
csslib:
61-
dependency: transitive
62-
description:
63-
name: csslib
64-
url: "https://pub.dartlang.org"
65-
source: hosted
66-
version: "0.14.6"
6732
cupertino_icons:
6833
dependency: "direct main"
6934
description:
@@ -81,90 +46,13 @@ packages:
8146
description: flutter
8247
source: sdk
8348
version: "0.0.0"
84-
front_end:
85-
dependency: transitive
86-
description:
87-
name: front_end
88-
url: "https://pub.dartlang.org"
89-
source: hosted
90-
version: "0.1.6"
91-
glob:
92-
dependency: transitive
93-
description:
94-
name: glob
95-
url: "https://pub.dartlang.org"
96-
source: hosted
97-
version: "1.1.7"
98-
html:
99-
dependency: transitive
100-
description:
101-
name: html
102-
url: "https://pub.dartlang.org"
103-
source: hosted
104-
version: "0.13.3+3"
105-
http:
106-
dependency: transitive
107-
description:
108-
name: http
109-
url: "https://pub.dartlang.org"
110-
source: hosted
111-
version: "0.12.0"
112-
http_multi_server:
113-
dependency: transitive
114-
description:
115-
name: http_multi_server
116-
url: "https://pub.dartlang.org"
117-
source: hosted
118-
version: "2.0.5"
119-
http_parser:
120-
dependency: transitive
121-
description:
122-
name: http_parser
123-
url: "https://pub.dartlang.org"
124-
source: hosted
125-
version: "3.1.3"
12649
intro_views_flutter:
12750
dependency: "direct main"
12851
description:
12952
path: ".."
13053
relative: true
13154
source: path
132-
version: "2.3.0"
133-
io:
134-
dependency: transitive
135-
description:
136-
name: io
137-
url: "https://pub.dartlang.org"
138-
source: hosted
139-
version: "0.3.3"
140-
js:
141-
dependency: transitive
142-
description:
143-
name: js
144-
url: "https://pub.dartlang.org"
145-
source: hosted
146-
version: "0.6.1+1"
147-
json_rpc_2:
148-
dependency: transitive
149-
description:
150-
name: json_rpc_2
151-
url: "https://pub.dartlang.org"
152-
source: hosted
153-
version: "2.0.9"
154-
kernel:
155-
dependency: transitive
156-
description:
157-
name: kernel
158-
url: "https://pub.dartlang.org"
159-
source: hosted
160-
version: "0.3.6"
161-
logging:
162-
dependency: transitive
163-
description:
164-
name: logging
165-
url: "https://pub.dartlang.org"
166-
source: hosted
167-
version: "0.11.3+2"
55+
version: "2.6.0"
16856
matcher:
16957
dependency: transitive
17058
description:
@@ -179,130 +67,39 @@ packages:
17967
url: "https://pub.dartlang.org"
18068
source: hosted
18169
version: "1.1.6"
182-
mime:
183-
dependency: transitive
184-
description:
185-
name: mime
186-
url: "https://pub.dartlang.org"
187-
source: hosted
188-
version: "0.9.6+2"
189-
multi_server_socket:
190-
dependency: transitive
191-
description:
192-
name: multi_server_socket
193-
url: "https://pub.dartlang.org"
194-
source: hosted
195-
version: "1.0.2"
196-
node_preamble:
197-
dependency: transitive
198-
description:
199-
name: node_preamble
200-
url: "https://pub.dartlang.org"
201-
source: hosted
202-
version: "1.4.4"
203-
package_config:
204-
dependency: transitive
205-
description:
206-
name: package_config
207-
url: "https://pub.dartlang.org"
208-
source: hosted
209-
version: "1.0.5"
210-
package_resolver:
211-
dependency: transitive
212-
description:
213-
name: package_resolver
214-
url: "https://pub.dartlang.org"
215-
source: hosted
216-
version: "1.0.6"
21770
path:
21871
dependency: transitive
21972
description:
22073
name: path
22174
url: "https://pub.dartlang.org"
22275
source: hosted
22376
version: "1.6.2"
224-
plugin:
225-
dependency: transitive
226-
description:
227-
name: plugin
228-
url: "https://pub.dartlang.org"
229-
source: hosted
230-
version: "0.2.0+3"
231-
pool:
77+
pedantic:
23278
dependency: transitive
23379
description:
234-
name: pool
80+
name: pedantic
23581
url: "https://pub.dartlang.org"
23682
source: hosted
237-
version: "1.3.6"
238-
pub_semver:
239-
dependency: transitive
240-
description:
241-
name: pub_semver
242-
url: "https://pub.dartlang.org"
243-
source: hosted
244-
version: "1.4.2"
83+
version: "1.4.0"
24584
quiver:
24685
dependency: transitive
24786
description:
24887
name: quiver
24988
url: "https://pub.dartlang.org"
25089
source: hosted
251-
version: "2.0.0+1"
252-
shelf:
253-
dependency: transitive
254-
description:
255-
name: shelf
256-
url: "https://pub.dartlang.org"
257-
source: hosted
258-
version: "0.7.3+3"
259-
shelf_packages_handler:
260-
dependency: transitive
261-
description:
262-
name: shelf_packages_handler
263-
url: "https://pub.dartlang.org"
264-
source: hosted
265-
version: "1.0.4"
266-
shelf_static:
267-
dependency: transitive
268-
description:
269-
name: shelf_static
270-
url: "https://pub.dartlang.org"
271-
source: hosted
272-
version: "0.2.8"
273-
shelf_web_socket:
274-
dependency: transitive
275-
description:
276-
name: shelf_web_socket
277-
url: "https://pub.dartlang.org"
278-
source: hosted
279-
version: "0.2.2+4"
90+
version: "2.0.1"
28091
sky_engine:
28192
dependency: transitive
28293
description: flutter
28394
source: sdk
28495
version: "0.0.99"
285-
source_map_stack_trace:
286-
dependency: transitive
287-
description:
288-
name: source_map_stack_trace
289-
url: "https://pub.dartlang.org"
290-
source: hosted
291-
version: "1.1.5"
292-
source_maps:
293-
dependency: transitive
294-
description:
295-
name: source_maps
296-
url: "https://pub.dartlang.org"
297-
source: hosted
298-
version: "0.10.8"
29996
source_span:
30097
dependency: transitive
30198
description:
30299
name: source_span
303100
url: "https://pub.dartlang.org"
304101
source: hosted
305-
version: "1.4.1"
102+
version: "1.5.4"
306103
stack_trace:
307104
dependency: transitive
308105
description:
@@ -330,63 +127,28 @@ packages:
330127
name: term_glyph
331128
url: "https://pub.dartlang.org"
332129
source: hosted
333-
version: "1.0.1"
334-
test:
130+
version: "1.1.0"
131+
test_api:
335132
dependency: transitive
336133
description:
337-
name: test
134+
name: test_api
338135
url: "https://pub.dartlang.org"
339136
source: hosted
340-
version: "1.3.4"
137+
version: "0.2.2"
341138
typed_data:
342139
dependency: transitive
343140
description:
344141
name: typed_data
345142
url: "https://pub.dartlang.org"
346143
source: hosted
347144
version: "1.1.6"
348-
utf:
349-
dependency: transitive
350-
description:
351-
name: utf
352-
url: "https://pub.dartlang.org"
353-
source: hosted
354-
version: "0.9.0+5"
355145
vector_math:
356146
dependency: transitive
357147
description:
358148
name: vector_math
359149
url: "https://pub.dartlang.org"
360150
source: hosted
361151
version: "2.0.8"
362-
vm_service_client:
363-
dependency: transitive
364-
description:
365-
name: vm_service_client
366-
url: "https://pub.dartlang.org"
367-
source: hosted
368-
version: "0.2.6"
369-
watcher:
370-
dependency: transitive
371-
description:
372-
name: watcher
373-
url: "https://pub.dartlang.org"
374-
source: hosted
375-
version: "0.9.7+10"
376-
web_socket_channel:
377-
dependency: transitive
378-
description:
379-
name: web_socket_channel
380-
url: "https://pub.dartlang.org"
381-
source: hosted
382-
version: "1.0.9"
383-
yaml:
384-
dependency: transitive
385-
description:
386-
name: yaml
387-
url: "https://pub.dartlang.org"
388-
source: hosted
389-
version: "2.1.15"
390152
sdks:
391-
dart: ">=2.0.0 <3.0.0"
153+
dart: ">=2.1.0 <3.0.0"
392154
flutter: ">=0.1.4 <2.0.0"

lib/UI/page.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -188,7 +188,7 @@ class _TitlePageTransform extends StatelessWidget {
188188
new Matrix4.translationValues(0.0, 30.0 * (1 - percentVisible), 0.0),
189189
child: new Padding(
190190
padding: new EdgeInsets.only(
191-
top: 60.0,
191+
top: 5.0,
192192
bottom: 30.0,
193193
left: 10.0,
194194
right: 10.0,

lib/intro_views_flutter.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ class IntroViewsFlutter extends StatefulWidget {
9191
///
9292
/// default to 300.0
9393
final double fullTransition;
94-
94+
9595
final Color background;
9696

9797
IntroViewsFlutter(

0 commit comments

Comments
 (0)