Skip to content

Commit 7572541

Browse files
authored
Merge pull request #2 from fluttercommunity/dev
fixing sticky header
2 parents 2fcb0ea + 3fbb357 commit 7572541

File tree

8 files changed

+38
-12
lines changed

8 files changed

+38
-12
lines changed

CHANGELOG.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,9 @@
1+
# CHANGELOG
2+
3+
## 1.3.3
4+
5+
* Fix for Sticky Header
6+
17
## 1.3.2 - 05.0629.2019
28

39
* Upgrading Packages
Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
//
2+
// Generated file. Do not edit.
3+
//
4+
import Foundation
5+
import FlutterMacOS
6+
7+
8+
func RegisterGeneratedPlugins(registry: FlutterPluginRegistry) {
9+
}
Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
// This is a generated file; do not edit or check into version control.
2+
FLUTTER_ROOT=/usr/local/Caskroom/flutter/1.2.1/flutter
3+
FLUTTER_APPLICATION_PATH=/Users/rodydavis/Development/github/flutter/native_widgets/example
4+
FLUTTER_BUILD_DIR=build
5+
FLUTTER_FRAMEWORK_DIR=/usr/local/Caskroom/flutter/1.2.1/flutter/bin/cache/artifacts/engine/darwin-x64

example/pubspec.lock

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# Generated by pub
2-
# See https://www.dartlang.org/tools/pub/glossary#lockfile
2+
# See https://dart.dev/tools/pub/glossary#lockfile
33
packages:
44
async:
55
dependency: transitive
@@ -120,7 +120,7 @@ packages:
120120
path: ".."
121121
relative: true
122122
source: path
123-
version: "1.3.2"
123+
version: "1.3.3"
124124
path:
125125
dependency: transitive
126126
description:
@@ -134,7 +134,7 @@ packages:
134134
name: pedantic
135135
url: "https://pub.dartlang.org"
136136
source: hosted
137-
version: "1.5.0"
137+
version: "1.7.0"
138138
quiver:
139139
dependency: transitive
140140
description:

lib/scaffold/list_view_scaffold.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,7 @@ class NativeListViewSection {
128128

129129
NativeListViewSection({
130130
this.header,
131-
@required List<Widget> children = const <Widget>[],
131+
@required List<Widget> children,
132132
bool addAutomaticKeepAlives = true,
133133
bool addRepaintBoundaries = true,
134134
bool addSemanticIndexes = true,

lib/utils/ios_search_bar.dart

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ class IOSSearchBar extends AnimatedWidget {
4444
static final _paddingTween = new Tween(begin: 0.0, end: 60.0);
4545
static final _kFontSize = 13.0;
4646
final bool autoFocus;
47-
Key _inputKey = new GlobalKey(debugLabel: 'inputText');
47+
final Key _inputKey = new GlobalKey(debugLabel: 'inputText');
4848
@override
4949
Widget build(BuildContext context) {
5050
// if (!isSearching) {
@@ -167,6 +167,7 @@ class IOSSearchBar extends AnimatedWidget {
167167
fontSize: _kFontSize,
168168
),
169169
cursorColor: CupertinoColors.black,
170+
backgroundCursorColor: Colors.grey,
170171
// backgroundCursorColor: Colors.grey,
171172
),
172173
),

pubspec.lock

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# Generated by pub
2-
# See https://www.dartlang.org/tools/pub/glossary#lockfile
2+
# See https://dart.dev/tools/pub/glossary#lockfile
33
packages:
44
async:
55
dependency: transitive
@@ -84,9 +84,11 @@ packages:
8484
flutter_sticky_header:
8585
dependency: "direct main"
8686
description:
87-
name: flutter_sticky_header
88-
url: "https://pub.dartlang.org"
89-
source: hosted
87+
path: "."
88+
ref: HEAD
89+
resolved-ref: b2f5cd11d73bcf9c661333f65d36b75e80406112
90+
url: "https://github.com/AppleEducate/flutter_sticky_header"
91+
source: git
9092
version: "0.4.0"
9193
flutter_test:
9294
dependency: "direct dev"
@@ -127,7 +129,7 @@ packages:
127129
name: pedantic
128130
url: "https://pub.dartlang.org"
129131
source: hosted
130-
version: "1.5.0"
132+
version: "1.7.0"
131133
quiver:
132134
dependency: transitive
133135
description:
@@ -205,4 +207,3 @@ packages:
205207
version: "2.0.8"
206208
sdks:
207209
dart: ">=2.2.0 <3.0.0"
208-
flutter: ">=1.5.9-pre.94 <2.0.0"

pubspec.yaml

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
name: native_widgets
22
description: A new Flutter package for using Android and iOS natively on each platform.
3-
version: 1.3.2
3+
version: 1.3.3
44
author: Rhodes Davis Jr. <[email protected]>
55
homepage: https://github.com/fluttercommunity/native_widgets
66
maintainer: Rody Davis (@AppleEducate)
@@ -24,6 +24,10 @@ dev_dependencies:
2424
flutter_test:
2525
sdk: flutter
2626

27+
dependency_overrides:
28+
flutter_sticky_header:
29+
git: https://github.com/AppleEducate/flutter_sticky_header
30+
2731
# For information on the generic Dart part of this file, see the
2832
# following page: https://www.dartlang.org/tools/pub/pubspec
2933

0 commit comments

Comments
 (0)