Skip to content

Commit e7526b3

Browse files
committed
Merge branch 'disable_controls'
# Conflicts: # .idea/workspace.xml # doc/api/flutter_form_builder/FormBuilder-class.html # doc/api/flutter_form_builder/FormBuilder/FormBuilder.html # doc/api/flutter_form_builder/FormBuilder/autovalidate.html # doc/api/flutter_form_builder/FormBuilder/context.html # doc/api/flutter_form_builder/FormBuilder/controls.html # doc/api/flutter_form_builder/FormBuilder/createElement.html # doc/api/flutter_form_builder/FormBuilder/createState.html # doc/api/flutter_form_builder/FormBuilder/debugFillProperties.html # doc/api/flutter_form_builder/FormBuilder/hashCode.html # doc/api/flutter_form_builder/FormBuilder/key.html # doc/api/flutter_form_builder/FormBuilder/noSuchMethod.html # doc/api/flutter_form_builder/FormBuilder/onChanged.html # doc/api/flutter_form_builder/FormBuilder/onSubmit.html # doc/api/flutter_form_builder/FormBuilder/onWillPop.html # doc/api/flutter_form_builder/FormBuilder/operator_equals.html # doc/api/flutter_form_builder/FormBuilder/resetButtonContent.html # doc/api/flutter_form_builder/FormBuilder/runtimeType.html # doc/api/flutter_form_builder/FormBuilder/showResetButton.html # doc/api/flutter_form_builder/FormBuilder/submitButtonContent.html # doc/api/flutter_form_builder/FormBuilder/toString.html # doc/api/flutter_form_builder/FormBuilder/toStringShort.html # doc/api/flutter_form_builder/FormBuilderInput-class.html # doc/api/flutter_form_builder/FormBuilderInput/FormBuilderInput.checkbox.html # doc/api/flutter_form_builder/FormBuilderInput/FormBuilderInput.checkboxList.html # doc/api/flutter_form_builder/FormBuilderInput/FormBuilderInput.chipsInput.html # doc/api/flutter_form_builder/FormBuilderInput/FormBuilderInput.datePicker.html # doc/api/flutter_form_builder/FormBuilderInput/FormBuilderInput.dropdown.html # doc/api/flutter_form_builder/FormBuilderInput/FormBuilderInput.number.html # doc/api/flutter_form_builder/FormBuilderInput/FormBuilderInput.password.html # doc/api/flutter_form_builder/FormBuilderInput/FormBuilderInput.radio.html # doc/api/flutter_form_builder/FormBuilderInput/FormBuilderInput.rate.html # doc/api/flutter_form_builder/FormBuilderInput/FormBuilderInput.segmentedControl.html # doc/api/flutter_form_builder/FormBuilderInput/FormBuilderInput.slider.html # doc/api/flutter_form_builder/FormBuilderInput/FormBuilderInput.stepper.html # doc/api/flutter_form_builder/FormBuilderInput/FormBuilderInput.switchInput.html # doc/api/flutter_form_builder/FormBuilderInput/FormBuilderInput.textField.html # doc/api/flutter_form_builder/FormBuilderInput/FormBuilderInput.timePicker.html # doc/api/flutter_form_builder/FormBuilderInput/FormBuilderInput.typeAhead.html # doc/api/flutter_form_builder/FormBuilderInput/TYPE_CHECKBOX-constant.html # doc/api/flutter_form_builder/FormBuilderInput/TYPE_CHECKBOX_LIST-constant.html # doc/api/flutter_form_builder/FormBuilderInput/TYPE_CHIPS_INPUT-constant.html # doc/api/flutter_form_builder/FormBuilderInput/TYPE_DATE_PICKER-constant.html # doc/api/flutter_form_builder/FormBuilderInput/TYPE_DROPDOWN-constant.html # doc/api/flutter_form_builder/FormBuilderInput/TYPE_EMAIL-constant.html # doc/api/flutter_form_builder/FormBuilderInput/TYPE_MULTILINE_TEXT-constant.html # doc/api/flutter_form_builder/FormBuilderInput/TYPE_NUMBER-constant.html # doc/api/flutter_form_builder/FormBuilderInput/TYPE_PASSWORD-constant.html # doc/api/flutter_form_builder/FormBuilderInput/TYPE_PHONE-constant.html # doc/api/flutter_form_builder/FormBuilderInput/TYPE_RADIO-constant.html # doc/api/flutter_form_builder/FormBuilderInput/TYPE_RATE-constant.html # doc/api/flutter_form_builder/FormBuilderInput/TYPE_SEGMENTED_CONTROL-constant.html # doc/api/flutter_form_builder/FormBuilderInput/TYPE_SLIDER-constant.html # doc/api/flutter_form_builder/FormBuilderInput/TYPE_STEPPER-constant.html # doc/api/flutter_form_builder/FormBuilderInput/TYPE_SWITCH-constant.html # doc/api/flutter_form_builder/FormBuilderInput/TYPE_TEXT-constant.html # doc/api/flutter_form_builder/FormBuilderInput/TYPE_TIME_PICKER-constant.html # doc/api/flutter_form_builder/FormBuilderInput/TYPE_TYPE_AHEAD-constant.html # doc/api/flutter_form_builder/FormBuilderInput/TYPE_URL-constant.html # doc/api/flutter_form_builder/FormBuilderInput/attribute.html # doc/api/flutter_form_builder/FormBuilderInput/chipBuilder.html # doc/api/flutter_form_builder/FormBuilderInput/divisions.html # doc/api/flutter_form_builder/FormBuilderInput/firstDate.html # doc/api/flutter_form_builder/FormBuilderInput/format.html # doc/api/flutter_form_builder/FormBuilderInput/hasHint.html # doc/api/flutter_form_builder/FormBuilderInput/hashCode.html # doc/api/flutter_form_builder/FormBuilderInput/hint.html # doc/api/flutter_form_builder/FormBuilderInput/icon.html # doc/api/flutter_form_builder/FormBuilderInput/iconSize.html # doc/api/flutter_form_builder/FormBuilderInput/itemBuilder.html # doc/api/flutter_form_builder/FormBuilderInput/label.html # doc/api/flutter_form_builder/FormBuilderInput/lastDate.html # doc/api/flutter_form_builder/FormBuilderInput/max.html # doc/api/flutter_form_builder/FormBuilderInput/min.html # doc/api/flutter_form_builder/FormBuilderInput/noSuchMethod.html # doc/api/flutter_form_builder/FormBuilderInput/operator_equals.html # doc/api/flutter_form_builder/FormBuilderInput/options.html # doc/api/flutter_form_builder/FormBuilderInput/require.html # doc/api/flutter_form_builder/FormBuilderInput/runtimeType.html # doc/api/flutter_form_builder/FormBuilderInput/step.html # doc/api/flutter_form_builder/FormBuilderInput/suggestionBuilder.html # doc/api/flutter_form_builder/FormBuilderInput/suggestionsCallback.html # doc/api/flutter_form_builder/FormBuilderInput/toString.html # doc/api/flutter_form_builder/FormBuilderInput/type.html # doc/api/flutter_form_builder/FormBuilderInput/validator.html # doc/api/flutter_form_builder/FormBuilderInput/value.html # doc/api/flutter_form_builder/FormBuilderInputOption-class.html # doc/api/flutter_form_builder/FormBuilderInputOption/FormBuilderInputOption.html # doc/api/flutter_form_builder/FormBuilderInputOption/hashCode.html # doc/api/flutter_form_builder/FormBuilderInputOption/label.html # doc/api/flutter_form_builder/FormBuilderInputOption/noSuchMethod.html # doc/api/flutter_form_builder/FormBuilderInputOption/operator_equals.html # doc/api/flutter_form_builder/FormBuilderInputOption/runtimeType.html # doc/api/flutter_form_builder/FormBuilderInputOption/toString.html # doc/api/flutter_form_builder/FormBuilderInputOption/value.html # doc/api/flutter_form_builder/flutter_form_builder-library.html # doc/api/index.html # doc/api/index.json
2 parents 965030c + 7f2ec1f commit e7526b3

File tree

115 files changed

+2945
-268
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

115 files changed

+2945
-268
lines changed

.idea/libraries/Dart_Packages.xml

Lines changed: 16 additions & 6 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/workspace.xml

Lines changed: 296 additions & 157 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

CHANGELOG.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
## [1.4.0] - 29-Jan-2019
2+
* The entire form or individual controls can now be made readonly by making `readonly` property to `true`. Default value is `false`. Closes [#11](https://github.com/danvick/flutter_form_builder/issues/11) and[#16](https://github.com/danvick/flutter_form_builder/issues/16)
3+
14
## [1.3.5] - 28-Jan-2019
25
* Fixed bug on Slider where current value not updated on slider & label
36

README.md

Lines changed: 17 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ To use this plugin, add `flutter_form_builder` as a [dependency in your pubspec.
1919
FormBuilder(
2020
context,
2121
autovalidate: true,
22+
// readonly: true,
2223
showResetButton: true,
2324
// resetButtonContent: Text("Clear Form"),
2425
controls: [
@@ -51,8 +52,8 @@ FormBuilder(
5152
attribute: 'chips_test',
5253
require: true,
5354
value: [
54-
AppProfile('Andrew', '[email protected]',
55-
'https://d2gg9evh47fn9z.cloudfront.net/800px_COLOURBOX4057996.jpg')
55+
Contact('Andrew', '[email protected]',
56+
'https://d2gg9evh47fn9z.cloudfront.net/800px_COLOURBOX4057996.jpg'),
5657
],
5758
suggestionsCallback: (String query) {
5859
if (query.length != 0) {
@@ -68,9 +69,10 @@ FormBuilder(
6869
..sort((a, b) => a.name
6970
.toLowerCase()
7071
.indexOf(lowercaseQuery)
71-
.compareTo(b.name.toLowerCase().indexOf(lowercaseQuery)));
72+
.compareTo(
73+
b.name.toLowerCase().indexOf(lowercaseQuery)));
7274
} else {
73-
return const <AppProfile>[];
75+
return const <Contact>[];
7476
}
7577
},
7678
chipBuilder: (context, state, profile) {
@@ -100,7 +102,9 @@ FormBuilder(
100102
type: FormBuilderInput.TYPE_TEXT,
101103
attribute: "name",
102104
label: "Name",
105+
value: "John Doe",
103106
require: true,
107+
readonly: true,
104108
min: 3,
105109
),
106110
FormBuilderInput.dropdown(
@@ -145,12 +149,12 @@ FormBuilder(
145149
min: 8,
146150
),
147151
FormBuilderInput.datePicker(
148-
label: "Date of Birth",
149-
attribute: "dob",
150-
firstDate: DateTime(1970),
151-
lastDate: DateTime.now().add(Duration(days: 1)),
152-
format: 'dd, MM yyyy'
153-
),
152+
label: "Date of Birth",
153+
readonly: true,
154+
attribute: "dob",
155+
firstDate: DateTime(1970),
156+
lastDate: DateTime.now().add(Duration(days: 1)),
157+
format: 'dd, MM yyyy'),
154158
FormBuilderInput.timePicker(
155159
label: "Appointment Time",
156160
attribute: "time",
@@ -188,6 +192,7 @@ FormBuilder(
188192
FormBuilderInput.switchInput(
189193
label: "I accept the terms and conditions",
190194
attribute: "accept_terms_switch",
195+
value: true,
191196
hint:
192197
"Kindly make sure you've read all the terms and conditions",
193198
validator: (value) {
@@ -221,6 +226,7 @@ FormBuilder(
221226
FormBuilderInput.segmentedControl(
222227
label: "Movie Rating (Archer)",
223228
attribute: "movie_rating",
229+
// value: 2,
224230
require: true,
225231
options: List.generate(5, (i) => i + 1)
226232
.map((number) => FormBuilderInputOption(value: number))
@@ -249,8 +255,7 @@ FormBuilder(
249255
* MaskedText
250256
* Allow options for Checkboxes and Radios to appear left or right
251257
* Allow addition of custom input types
252-
* Fire `onChanged()` on every control allowing reaction to changes
253258

254259
## KNOWN ISSUES - HELP NEEDED (Send help ;-P)
255-
* Proper validation for URL [doesn't work without http(s)]
260+
* Proper validation for URL [doesn't work without protocol - http(s)]
256261

0 commit comments

Comments
 (0)