nnbd support

Author: alextekartik

example/google_jsapi_picker_example.dart

@@ -13,18 +13,18 @@ import 'package:tekartik_google_jsapi_picker/picker.dart';
 import 'test_config.dart';
 import 'test_setup.dart';
 
-GapiAuth2 gapiAuth;
-GooglePicker gpicker;
+GapiAuth2? gapiAuth;
+GooglePicker? gpicker;
 
 Storage storage = window.localStorage;
 
 String storageKeyPref = 'com.tekartik.google_jsapi_picker_example';
 
-String storageGet(String key) {
+String? storageGet(String key) {
   return storage['$storageKeyPref.$key'];
 }
 
-void storageSet(String key, String value) {
+void storageSet(String key, String? value) {
   var prefKey = '$storageKeyPref.$key';
   if (value == null) {
     storage.remove(prefKey);
@@ -39,12 +39,12 @@ String appMimeTypesKey = 'mime_types';
 String selectFolderEnabledKey = 'select_folder_enabled';
 String includeFoldersKey = 'include_folders';
 
-Element pickResult;
-String _authToken;
-InputElement mimeTypesInput;
+Element? pickResult;
+String? _authToken;
+InputElement? mimeTypesInput;
 
 void _pick() {
-  final mimeTypesText = mimeTypesInput.value;
+  final mimeTypesText = mimeTypesInput!.value!;
   storageSet(appMimeTypesKey, mimeTypesText);
 
   final builder = PickerBuilder(gpicker);
@@ -59,12 +59,12 @@ void _pick() {
   print('includeFolders: $includeFolders');
   // use docs view for folder
   if (selectFolderEnabled || includeFolders) {
-    final pickerDocsView = PickerDocsView(gpicker, gpicker.viewId.docs);
+    final pickerDocsView = PickerDocsView(gpicker!, gpicker!.viewId.docs);
     pickerDocsView.selectFolderEnabled = true;
     pickerDocsView.includeFolders = true;
     pickerView = pickerDocsView;
   } else {
-    pickerView = PickerView(gpicker, gpicker.viewId.docs);
+    pickerView = PickerView(gpicker!, gpicker!.viewId.docs);
   }
   final mimeTypes = mimeTypesText.split(',');
   if (mimeTypes.isNotEmpty && mimeTypes[0].isNotEmpty) {
@@ -73,27 +73,27 @@ void _pick() {
 
   builder.addView(pickerView);
 
-  builder.developerKey = appOptions.developerKey;
+  builder.developerKey = appOptions!.developerKey;
   builder.oauthToken = _authToken;
   final uiPicker = builder.build();
   uiPicker.pick().then((PickerDataDocuments docs) {
-    pickResult.innerHtml = docs.toString();
+    pickResult!.innerHtml = docs.toString();
 
     //pickResult.innerHtml = docs[0].id;
   });
 }
 
 void pickerMain(String authToken) {
-  authorizeResult.innerHtml = 'Authorize token $authToken';
+  authorizeResult!.innerHtml = 'Authorize token $authToken';
   print('token: $authToken');
   _authToken = authToken;
 
-  final pickerForm = querySelector('form.app-picker');
+  final pickerForm = querySelector('form.app-picker')!;
   pickResult = pickerForm.querySelector('.app-result');
   pickerForm.classes.remove('hidden');
   mimeTypesInput =
-      pickerForm.querySelector('input#appInputMimeTypes') as InputElement;
-  final pickButton = pickerForm.querySelector('button.app-pick');
+      pickerForm.querySelector('input#appInputMimeTypes') as InputElement?;
+  final pickButton = pickerForm.querySelector('button.app-pick')!;
 
   final selectFolderEnabledInput = pickerForm
       .querySelector('#appInputSelectFolderEnabled') as CheckboxInputElement;
@@ -113,17 +113,17 @@ void pickerMain(String authToken) {
     storageSet(includeFoldersKey, includeFoldersInput.checked.toString());
   });
 
-  mimeTypesInput.value = storageGet(appMimeTypesKey);
+  mimeTypesInput!.value = storageGet(appMimeTypesKey);
 
   pickButton.onClick.listen((Event event) {
     event.preventDefault();
     _pick();
   });
 }
 
-Element authorizeResult;
-BrowserOAuth2Flow auth2flow;
-AppOptions appOptions;
+Element? authorizeResult;
+BrowserOAuth2Flow? auth2flow;
+AppOptions? appOptions;
 final _setupLock = Lock();
 
 Future configSetup() async {
@@ -133,7 +133,7 @@ Future configSetup() async {
         appOptions = await setup();
 
         void _errorSetup() {
-          authorizeResult.innerText = '''
+          authorizeResult!.innerText = '''
 ERROR: Missing clientId, clientSecret or developerKey
 Create local.config.yaml from sample.local.config.yaml ($appOptions)''';
         }
@@ -142,13 +142,13 @@ Create local.config.yaml from sample.local.config.yaml ($appOptions)''';
         final clientSecret = appOptions?.clientSecret;
         if (clientId?.isNotEmpty != true ||
             clientSecret?.isNotEmpty != true ||
-            appOptions.developerKey?.isNotEmpty != true) {
+            appOptions!.developerKey?.isNotEmpty != true) {
           _errorSetup();
           return;
         }
 
         var authClientId =
-            ClientId(appOptions.clientId, appOptions.clientSecret);
+            ClientId(appOptions!.clientId!, appOptions!.clientSecret);
         final scopes = <String>[GooglePicker.scopeDriveAppFile];
 
         auth2flow?.close();
@@ -158,19 +158,19 @@ Create local.config.yaml from sample.local.config.yaml ($appOptions)''';
   }
 }
 
-Future _authorize({bool auto}) async {
+Future _authorize({bool? auto}) async {
   auto ??= false;
   await configSetup();
 
-  var result = await auth2flow.runHybridFlow(immediate: auto);
+  var result = await auth2flow!.runHybridFlow(immediate: auto);
   var oauthToken = result.credentials.accessToken.data;
   pickerMain(oauthToken);
 }
 
 void authMain() {
-  final authForm = querySelector('form.app-auth');
+  final authForm = querySelector('form.app-auth')!;
   authForm.classes.remove('hidden');
-  final authorizeButton = authForm.querySelector('button.app-authorize');
+  final authorizeButton = authForm.querySelector('button.app-authorize')!;
 
   authorizeResult = authForm.querySelector('.app-result');
   final autoAuthCheckbox =
@@ -193,24 +193,24 @@ void authMain() {
   }
 }
 
-Element loadGapiResult;
+Element? loadGapiResult;
 
 Future _loadPicker() async {
-  loadGapiResult.innerHtml = 'loading Gapi...';
+  loadGapiResult!.innerHtml = 'loading Gapi...';
   try {
     final gapi = await loadGapiPlatform();
-    loadGapiResult.innerHtml = 'loading GooglePicker...';
+    loadGapiResult!.innerHtml = 'loading GooglePicker...';
     gpicker = await loadPicker(gapi);
-    loadGapiResult.innerHtml = 'GooglePicker loaded';
+    loadGapiResult!.innerHtml = 'GooglePicker loaded';
   } catch (e) {
-    loadGapiResult.innerHtml = 'load failed $e';
+    loadGapiResult!.innerHtml = 'load failed $e';
     rethrow;
   }
   authMain();
 }
 
 Future main() async {
-  final loadGapiForm = querySelector('form.app-gapi');
+  final loadGapiForm = querySelector('form.app-gapi')!;
   loadGapiResult = loadGapiForm.querySelector('.app-result');
 
   await await _loadPicker();

example/test_config.dart

@@ -2,11 +2,11 @@ library test_config;
 
 class AppOptions {
   // The developer key needed for the picker API
-  String developerKey;
+  String? developerKey;
   // The Client ID obtained from the Google Cloud Console.
-  String clientId;
+  String? clientId;
   // The Client Secret obtained from the Google Cloud Console.
-  String clientSecret;
+  String? clientSecret;
 
   AppOptions.fromMap(Map<String, dynamic> map) {
     developerKey = map['developerKey']?.toString();

example/test_setup.dart

@@ -5,7 +5,7 @@ import 'package:yaml/yaml.dart';
 
 import 'test_config.dart';
 
-Future<AppOptions> setup() async {
+Future<AppOptions?> setup() async {
   // Load javascript
   var client = BrowserClient();