From f7eec73a2dfb8e542077caf627a2fd374d0e5fc3 Mon Sep 17 00:00:00 2001 From: zakaria zakaria Date: Tue, 29 Jun 2021 20:55:21 +0100 Subject: [PATCH] migrate to null-safety --- lib/commune.dart | 32 ++++++++++++++++---------------- lib/daira.dart | 34 +++++++++++++++++----------------- lib/postCode.dart | 16 ++++++++-------- lib/wilaya.dart | 34 +++++++++++++++++----------------- pubspec.lock | 40 ++++++++++++++++++++-------------------- pubspec.yaml | 2 +- 6 files changed, 79 insertions(+), 79 deletions(-) diff --git a/lib/commune.dart b/lib/commune.dart index 2dde6ec..9f19801 100644 --- a/lib/commune.dart +++ b/lib/commune.dart @@ -3,7 +3,7 @@ import 'langs.dart'; import 'postCode.dart'; class Commune { - Map data; + Map? data; Commune({this.data}); /** @@ -14,7 +14,7 @@ class Commune { */ List getPostCodes() { return algeria_postcodes - .where((element) => ((element['commune_name'] == data['commune_name']))) + .where((element) => element['commune_name'] == data!['commune_name']) .map((e) => PostCode(data: e)) .toSet() .toList(); @@ -26,14 +26,14 @@ class Commune { * this method take [language] (FR or AR) as parameter * and return wilaya name of the commune */ - String getWilayaName(Language lang) { + String? getWilayaName(Language lang) { if (lang == Language.AR) { - return data['wilaya_name']; + return data!['wilaya_name']; } else if (lang == Language.FR) { - return data['wilaya_name_ascii']; + return data!['wilaya_name_ascii']; //for additional languages } else - return data['wilaya_name_ascii']; + return data!['wilaya_name_ascii']; } /** @@ -42,14 +42,14 @@ class Commune { * this method take [language] (FR or AR) as parameter * and return daira name of the commune */ - String getDairaName(Language lang) { + String? getDairaName(Language lang) { if (lang == Language.AR) { - return data['daira_name']; + return data!['daira_name']; } else if (lang == Language.FR) { - return data['daira_name_ascii']; + return data!['daira_name_ascii']; //for additional languages } else - return data['daira_name_ascii']; + return data!['daira_name_ascii']; } /** @@ -58,14 +58,14 @@ class Commune { * this method take [language] (FR or AR) as parameter * and return the name of the commune */ - String getCommuneName(Language lang) { + String? getCommuneName(Language lang) { if (lang == Language.AR) { - return data['commune_name']; + return data!['commune_name']; } else if (lang == Language.FR) { - return data['commune_name_ascii']; + return data!['commune_name_ascii']; //for additional languages } else - return data['commune_name_ascii']; + return data!['commune_name_ascii']; } /** @@ -73,7 +73,7 @@ class Commune { * * this method return the code number of the wilaya */ - String getWilayaCode() { - return data['wilaya_code']; + String? getWilayaCode() { + return data!['wilaya_code']; } } diff --git a/lib/daira.dart b/lib/daira.dart index ad75868..92c6056 100644 --- a/lib/daira.dart +++ b/lib/daira.dart @@ -5,7 +5,7 @@ import 'langs.dart'; import 'postCode.dart'; class Daira { - Map data; + Map? data; Daira({this.data}); /** @@ -16,7 +16,7 @@ class Daira { */ List getCommunes() { return algeria_cites - .where((element) => (element['daira_name'] == data['daira_name'])) + .where((element) => (element['daira_name'] == data!['daira_name'])) .map((e) => Commune(data: e)) .toSet() .toList(); @@ -30,7 +30,7 @@ class Daira { */ List getPostCodes() { return algeria_postcodes - .where((element) => ((element['daira_name'] == data['daira_name']))) + .where((element) => element['daira_name'] == data!['daira_name']) .map((e) => PostCode(data: e)) .toSet() .toList(); @@ -42,14 +42,14 @@ class Daira { * this method take [language] (FR or AR) as parameter * and return wilaya name of the daira */ - String getWilayaName(Language lang) { + String? getWilayaName(Language lang) { if (lang == Language.AR) { - return data['wilaya_name']; + return data!['wilaya_name']; } else if (lang == Language.FR) { - return data['wilaya_name _ascii']; + return data!['wilaya_name _ascii']; //for additional languages } else - return data['wilaya_name_ascii']; + return data!['wilaya_name_ascii']; } /** @@ -58,14 +58,14 @@ class Daira { * this method take [language] (FR or AR) as parameter * and return the name of the daira */ - String getDairaName(Language lang) { + String? getDairaName(Language lang) { if (lang == Language.AR) { - return data['daira_name']; + return data!['daira_name']; } else if (lang == Language.FR) { - return data['daira_name_ascii']; + return data!['daira_name_ascii']; //for additional languages } else - return data['daira_name_ascii']; + return data!['daira_name_ascii']; } /** @@ -74,14 +74,14 @@ class Daira { * this method take [language] (FR or AR) as parameter * and return commune name of the daira */ - String getCommuneName(Language lang) { + String? getCommuneName(Language lang) { if (lang == Language.AR) { - return data['commune_name']; + return data!['commune_name']; } else if (lang == Language.FR) { - return data['commune_name_ascii']; + return data!['commune_name_ascii']; //for additional languages } else - return data['commune_name_ascii']; + return data!['commune_name_ascii']; } /** @@ -89,7 +89,7 @@ class Daira { * * this method return the code number of the wilaya */ - String getWilayaCode() { - return data['wilaya_code']; + String? getWilayaCode() { + return data!['wilaya_code']; } } diff --git a/lib/postCode.dart b/lib/postCode.dart index 5d9b7da..1bc9757 100644 --- a/lib/postCode.dart +++ b/lib/postCode.dart @@ -1,12 +1,12 @@ class PostCode { - Map data; + late Map data; PostCode({data}); /** * return [String] object * this method returns the post code */ - String getPostCode() { + String? getPostCode() { return data['post_code']; } @@ -14,7 +14,7 @@ class PostCode { * return [String] object * this method returns the code name */ - String getPostName() { + String? getPostName() { return data['post_name']; } @@ -22,7 +22,7 @@ class PostCode { * return [String] object * this method returns the code address */ - String getPostAddress() { + String? getPostAddress() { return data['post_address']; } @@ -30,7 +30,7 @@ class PostCode { * return [String] object * this method returns the commune name */ - String getCommuneName() { + String? getCommuneName() { return data['commune_name']; } @@ -38,7 +38,7 @@ class PostCode { * return [String] object * this method returns the daira name */ - String getDairaName() { + String? getDairaName() { return data['diara_name']; } @@ -46,7 +46,7 @@ class PostCode { * return [String] object * this method returns the wilaya name */ - String getWilayaName() { + String? getWilayaName() { return data['wilaya_name']; } @@ -54,7 +54,7 @@ class PostCode { * return [String] object * this method returns the wilaya code */ - String getWilayaCode() { + String? getWilayaCode() { return data['wilaya_code']; } } diff --git a/lib/wilaya.dart b/lib/wilaya.dart index f3d4c3d..bb59722 100644 --- a/lib/wilaya.dart +++ b/lib/wilaya.dart @@ -6,7 +6,7 @@ import 'postCode.dart'; import 'data/algeria_cites.dart'; class Wilaya { - Map data; + Map? data; Wilaya({this.data}); /** @@ -18,7 +18,7 @@ class Wilaya { List getDairas() { return algeria_cites .where((element) => - (element['wilaya_name_ascii'] == data['wilaya_name_ascii']) && + (element['wilaya_name_ascii'] == data!['wilaya_name_ascii']) && (element['daira_name'] == element['commune_name'])) .map((e) => Daira(data: e)) .toSet() @@ -34,7 +34,7 @@ class Wilaya { List getCommunes() { return algeria_cites .where((element) => - (element['wilaya_name_ascii'] == data['wilaya_name_ascii'])) + (element['wilaya_name_ascii'] == data!['wilaya_name_ascii'])) .map((e) => Commune(data: e)) .toSet() .toList(); @@ -48,9 +48,9 @@ class Wilaya { */ List getPostCodes() { return algeria_postcodes - .where((element) => ((element['wilaya_name'] == data['wilaya_name']) && - (element['wilaya_name'] == data['daira_name']) && - (element['wilaya_name'] == data['commune_name']))) + .where((element) => ((element['wilaya_name'] == data!['wilaya_name']) && + (element['wilaya_name'] == data!['daira_name']) && + (element['wilaya_name'] == data!['commune_name']))) .map((e) => PostCode(data: e)) .toSet() .toList(); @@ -67,11 +67,11 @@ class Wilaya { return algeria_cites .where((element) { if (language == Language.AR) { - return (((element['wilaya_name'] == data['wilaya_name'])) && + return (element['wilaya_name'] == data!['wilaya_name'] && (element['daira_name'] == element['commune_name']) && (element['daira_name'].toString().contains(diaraName))); } else { - return ((element['wilaya_name'] == data['wilaya_name']) && + return ((element['wilaya_name'] == data!['wilaya_name']) && (element['daira_name'] == element['commune_name']) && (element['daira_name_ascii'].toString().contains(diaraName))); } @@ -92,10 +92,10 @@ class Wilaya { return algeria_cites .where((element) { if (language == Language.AR) { - return ((element['wilaya_name'] == data['wilaya_name']) && + return ((element['wilaya_name'] == data!['wilaya_name']) && (element['commune_name'].toString().contains(communeName))); } else { - return ((element['wilaya_name'] == data['wilaya_name']) && + return ((element['wilaya_name'] == data!['wilaya_name']) && (element['commune_name_ascii'] .toString() .contains(communeName))); @@ -112,17 +112,17 @@ class Wilaya { * this method take [language] (FR or AR) as parameter * and return the name of the wilaya */ - String getWilayaName(Language lang) { + String? getWilayaName(Language lang) { if (lang == Language.AR) { - return data['wilaya_name']; + return data!['wilaya_name']; } else if (lang == Language.FR) { - if (data.containsKey('wilaya_name_ascii')) { - return data['wilaya_name_ascii']; + if (data!.containsKey('wilaya_name_ascii')) { + return data!['wilaya_name_ascii']; } return "not available"; //for additional languages } else - return data['wilaya_name_ascii']; + return data!['wilaya_name_ascii']; } /** @@ -130,7 +130,7 @@ class Wilaya { * * this method return the code number of the wilaya */ - String getWilayaCode() { - return data['wilaya_code']; + String? getWilayaCode() { + return data!['wilaya_code']; } } diff --git a/pubspec.lock b/pubspec.lock index 59449b7..010beab 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -7,49 +7,49 @@ packages: name: async url: "https://pub.dartlang.org" source: hosted - version: "2.4.2" + version: "2.6.1" boolean_selector: dependency: transitive description: name: boolean_selector url: "https://pub.dartlang.org" source: hosted - version: "2.0.0" + version: "2.1.0" characters: dependency: transitive description: name: characters url: "https://pub.dartlang.org" source: hosted - version: "1.0.0" + version: "1.1.0" charcode: dependency: transitive description: name: charcode url: "https://pub.dartlang.org" source: hosted - version: "1.1.3" + version: "1.2.0" clock: dependency: transitive description: name: clock url: "https://pub.dartlang.org" source: hosted - version: "1.0.1" + version: "1.1.0" collection: dependency: transitive description: name: collection url: "https://pub.dartlang.org" source: hosted - version: "1.14.13" + version: "1.15.0" fake_async: dependency: transitive description: name: fake_async url: "https://pub.dartlang.org" source: hosted - version: "1.1.0" + version: "1.2.0" flutter: dependency: "direct main" description: flutter @@ -66,21 +66,21 @@ packages: name: matcher url: "https://pub.dartlang.org" source: hosted - version: "0.12.8" + version: "0.12.10" meta: dependency: transitive description: name: meta url: "https://pub.dartlang.org" source: hosted - version: "1.1.8" + version: "1.3.0" path: dependency: transitive description: name: path url: "https://pub.dartlang.org" source: hosted - version: "1.7.0" + version: "1.8.0" sky_engine: dependency: transitive description: flutter @@ -92,56 +92,56 @@ packages: name: source_span url: "https://pub.dartlang.org" source: hosted - version: "1.7.0" + version: "1.8.1" stack_trace: dependency: transitive description: name: stack_trace url: "https://pub.dartlang.org" source: hosted - version: "1.9.5" + version: "1.10.0" stream_channel: dependency: transitive description: name: stream_channel url: "https://pub.dartlang.org" source: hosted - version: "2.0.0" + version: "2.1.0" string_scanner: dependency: transitive description: name: string_scanner url: "https://pub.dartlang.org" source: hosted - version: "1.0.5" + version: "1.1.0" term_glyph: dependency: transitive description: name: term_glyph url: "https://pub.dartlang.org" source: hosted - version: "1.1.0" + version: "1.2.0" test_api: dependency: transitive description: name: test_api url: "https://pub.dartlang.org" source: hosted - version: "0.2.17" + version: "0.3.0" typed_data: dependency: transitive description: name: typed_data url: "https://pub.dartlang.org" source: hosted - version: "1.2.0" + version: "1.3.0" vector_math: dependency: transitive description: name: vector_math url: "https://pub.dartlang.org" source: hosted - version: "2.0.8" + version: "2.1.0" sdks: - dart: ">=2.9.0-14.0.dev <3.0.0" - flutter: ">=1.17.0 <2.0.0" + dart: ">=2.12.0 <3.0.0" + flutter: ">=1.17.0" diff --git a/pubspec.yaml b/pubspec.yaml index 01e922f..c54a8c8 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -5,7 +5,7 @@ author: homepage: https://github.com/dfourcfive/dzair_data_usage environment: - sdk: ">=2.7.0 <3.0.0" + sdk: '>=2.12.0 <3.0.0' flutter: ">=1.17.0 <2.0.0" dependencies: