firka/flutter
firka/flutter
4
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #1317 from jamesr/roll_pubspec_and_mojo_sdk

Browse Source 
Update to Mojo 4e4d51ce28a8edcb32b9c7f555e38e2ae84a825e, update deps
This commit is contained in:
James Robinson 2015-09-23 17:58:54 -07:00
commit 7c854e121b
6 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
examples/fitness/lib/measurement.dart
View File

@ -189,7 +189,7 @@ class MeasurementFragment extends StatefulComponent {
new Input( new Input(
key: weightKey, key: weightKey,
placeholder: 'Enter weight', placeholder: 'Enter weight',
keyboardType: KeyboardType_NUMBER, keyboardType: KeyboardType.NUMBER,
onChanged: _handleWeightChanged onChanged: _handleWeightChanged
), ),
], alignItems: FlexAlignItems.stretch) ], alignItems: FlexAlignItems.stretch)

2
examples/fitness/lib/settings.dart
View File

@ -70,7 +70,7 @@ class SettingsFragment extends StatefulComponent {
content: new Input( content: new Input(
key: weightGoalKey, key: weightGoalKey,
placeholder: 'Goal weight in lbs', placeholder: 'Goal weight in lbs',
keyboardType: KeyboardType_NUMBER, keyboardType: KeyboardType.NUMBER,
onChanged: _handleGoalWeightChanged onChanged: _handleGoalWeightChanged
), ),
onDismiss: () { onDismiss: () {

4
packages/flutter/lib/src/services/keyboard.dart
View File

@ -31,7 +31,7 @@ class Keyboard {
KeyboardHandle _currentHandle; KeyboardHandle _currentHandle;
KeyboardHandle show(KeyboardClientStub stub, int keyboardType) { KeyboardHandle show(KeyboardClientStub stub, KeyboardType keyboardType) {
assert(stub != null); assert(stub != null);
if (_currentHandle != null) { if (_currentHandle != null) {
if (_currentHandle.stub == stub) if (_currentHandle.stub == stub)
@ -46,7 +46,7 @@ class Keyboard {
class KeyboardHandle { class KeyboardHandle {
KeyboardHandle._show(Keyboard keyboard, this.stub, int keyboardType) : _keyboard = keyboard { KeyboardHandle._show(Keyboard keyboard, this.stub, KeyboardType keyboardType) : _keyboard = keyboard {
_keyboard.service.show(stub, keyboardType); _keyboard.service.show(stub, keyboardType);
_attached = true; _attached = true;
} }

6
packages/flutter/lib/src/widgets/input.dart
View File

@ -10,7 +10,7 @@ import 'package:sky/src/widgets/focus.dart';
import 'package:sky/src/widgets/framework.dart'; import 'package:sky/src/widgets/framework.dart';
import 'package:sky/src/widgets/theme.dart'; import 'package:sky/src/widgets/theme.dart';
export 'package:sky/services.dart' show KeyboardType_TEXT, KeyboardType_NUMBER, KeyboardType_PHONE, KeyboardType_DATETIME; export 'package:sky/services.dart' show KeyboardType;
typedef void StringValueChanged(String value); typedef void StringValueChanged(String value);
@ -25,10 +25,10 @@ class Input extends StatefulComponent {
String initialValue: '', String initialValue: '',
this.placeholder, this.placeholder,
this.onChanged, this.onChanged,
this.keyboardType : KeyboardType_TEXT this.keyboardType : KeyboardType.TEXT
}): _value = initialValue, super(key: key); }): _value = initialValue, super(key: key);
int keyboardType; KeyboardType keyboardType;
String placeholder; String placeholder;
StringValueChanged onChanged; StringValueChanged onChanged;

4
packages/flutter/pubspec.yaml
View File

@ -6,8 +6,8 @@ homepage: http://flutter.io
dependencies: dependencies:
cassowary: ^0.1.7 cassowary: ^0.1.7
material_design_icons: ^0.0.3 material_design_icons: ^0.0.3
mojo_services: 0.0.23 mojo_services: '>=0.1.0 <0.2.0'
mojo: 0.0.23 mojo: '>=0.1.0 <0.2.0'
newton: ^0.1.3 newton: ^0.1.3
sky_engine: ^0.0.25 sky_engine: ^0.0.25
sky_services: ^0.0.25 sky_services: ^0.0.25

2
packages/unit/test/widget/input_test.dart
View File

@ -11,7 +11,7 @@ import '../services/mock_services.dart';
class MockKeyboard implements KeyboardService { class MockKeyboard implements KeyboardService {
KeyboardClient client; KeyboardClient client;
void show(KeyboardClientStub client, int type) { void show(KeyboardClientStub client, KeyboardType type) {
this.client = client.impl; this.client = client.impl;
} }