diff --git a/lib/api/api_client.dart b/lib/api/api_client.dart
index 3f554fd..17b1781 100644
--- a/lib/api/api_client.dart
+++ b/lib/api/api_client.dart
@@ -69,7 +69,7 @@ class ApiClient {
     try {
       var jsonData = jsonDecode(response.body);
       return factoryConstructor(jsonData);
-    } catch (ex, tr) {
+    } catch (ex) {
       throw APIException(APIException.BAD_RESPONSE_FORMAT, arguments: ex);
     }
   }
diff --git a/lib/models/aya_model.dart b/lib/models/aya_model.dart
index 006b41d..322375b 100644
--- a/lib/models/aya_model.dart
+++ b/lib/models/aya_model.dart
@@ -11,7 +11,7 @@ class AyaModel {
     statusCode = json['statusCode'];
     message = json['message'];
     if (json['data'] != null) {
-      data = new List<AyaModelData>();
+      data = [];
       json['data'].forEach((v) {
         data.add(new AyaModelData.fromJson(v));
       });
diff --git a/lib/models/aya_tangheem_property.dart b/lib/models/aya_tangheem_property.dart
index d2f1b96..d480dba 100644
--- a/lib/models/aya_tangheem_property.dart
+++ b/lib/models/aya_tangheem_property.dart
@@ -11,7 +11,7 @@ class AyaTangheemProperty {
     statusCode = json['statusCode'];
     message = json['message'];
     if (json['data'] != null) {
-      data = new List<AyaTangheemPropertyData>();
+      data = [];
       json['data'].forEach((v) {
         data.add(new AyaTangheemPropertyData.fromJson(v));
       });
diff --git a/lib/models/aya_tangheem_type.dart b/lib/models/aya_tangheem_type.dart
index 625521e..6edb060 100644
--- a/lib/models/aya_tangheem_type.dart
+++ b/lib/models/aya_tangheem_type.dart
@@ -11,7 +11,7 @@ class AyaTangheemType {
     statusCode = json['statusCode'];
     message = json['message'];
     if (json['data'] != null) {
-      data = new List<AyaTangheemTypeData>();
+      data = [];
       json['data'].forEach((v) {
         data.add(new AyaTangheemTypeData.fromJson(v));
       });
diff --git a/lib/models/aya_tangheem_type_mapped.dart b/lib/models/aya_tangheem_type_mapped.dart
index 2c43bb6..a5de608 100644
--- a/lib/models/aya_tangheem_type_mapped.dart
+++ b/lib/models/aya_tangheem_type_mapped.dart
@@ -11,7 +11,7 @@ class AyatTangheemTypeMapped {
     statusCode = json['statusCode'];
     message = json['message'];
     if (json['data'] != null) {
-      data = new List<AyatTangheemTypeMappedData>();
+      data = [];
       json['data'].forEach((v) {
         data.add(new AyatTangheemTypeMappedData.fromJson(v));
       });
@@ -76,13 +76,13 @@ class AyatTangheemTypeMappedData {
     userId = json['userId'];
     ayahTextBase = json['ayahTextBase'];
     if (json['property'] != null) {
-      property = new List<TangheemProperty>();
+      property = [];
       json['property'].forEach((v) {
         property.add(new TangheemProperty.fromJson(v));
       });
     }
     if (json['voiceNote'] != null) {
-      voiceNote = new List<VoiceNote>();
+      voiceNote = [];
       json['voiceNote'].forEach((v) {
         voiceNote.add(new VoiceNote.fromJson(v));
       });
diff --git a/lib/models/bookmark_model.dart b/lib/models/bookmark_model.dart
index 7de7a3b..934fd43 100644
--- a/lib/models/bookmark_model.dart
+++ b/lib/models/bookmark_model.dart
@@ -50,6 +50,6 @@ class BookMarkModel {
     SharedPreferences prefs = await SharedPreferences.getInstance();
 
     List encodedList = list.map((e) => jsonEncode(e.toJson())).toList();
-    var abc = await prefs.setStringList(GlobalConsts.bookmark, encodedList);
+    await prefs.setStringList(GlobalConsts.bookmark, encodedList);
   }
 }
diff --git a/lib/models/content_info_model.dart b/lib/models/content_info_model.dart
index 172477b..07169fa 100644
--- a/lib/models/content_info_model.dart
+++ b/lib/models/content_info_model.dart
@@ -11,7 +11,7 @@ class ContentInfoModel {
     statusCode = json['statusCode'];
     message = json['message'];
     if (json['data'] != null) {
-      data = new List<ContentInfoDataModel>();
+      data = [];
       json['data'].forEach((v) {
         data.add(new ContentInfoDataModel.fromJson(v));
       });
diff --git a/lib/models/country_model.dart b/lib/models/country_model.dart
index 202ad83..651cd3c 100644
--- a/lib/models/country_model.dart
+++ b/lib/models/country_model.dart
@@ -11,7 +11,7 @@ class CountryModel {
     statusCode = json['statusCode'];
     message = json['message'];
     if (json['data'] != null) {
-      data = new List<CountryModelData>();
+      data = [];
       json['data'].forEach((v) {
         data.add(new CountryModelData.fromJson(v));
       });
diff --git a/lib/models/discussion_model.dart b/lib/models/discussion_model.dart
index 8c8e834..fd1638e 100644
--- a/lib/models/discussion_model.dart
+++ b/lib/models/discussion_model.dart
@@ -11,7 +11,7 @@ class DiscussionModel {
     statusCode = json['statusCode'];
     message = json['message'];
     if (json['data'] != null) {
-      data = new List<DiscussionModelData>();
+      data = [];
       json['data'].forEach((v) {
         data.add(new DiscussionModelData.fromJson(v));
       });
diff --git a/lib/models/member_model.dart b/lib/models/member_model.dart
index 9b5e4ba..beb65ae 100644
--- a/lib/models/member_model.dart
+++ b/lib/models/member_model.dart
@@ -11,7 +11,7 @@ class MemberModel {
     statusCode = json['statusCode'];
     message = json['message'];
     if (json['data'] != null) {
-      data = new List<MemberDataModel>();
+      data = [];
       json['data'].forEach((v) {
         data.add(new MemberDataModel.fromJson(v));
       });
diff --git a/lib/models/navigation_model.dart b/lib/models/navigation_model.dart
index 1707673..fb888ca 100644
--- a/lib/models/navigation_model.dart
+++ b/lib/models/navigation_model.dart
@@ -11,7 +11,7 @@ class NavigationModel {
     statusCode = json['statusCode'];
     message = json['message'];
     if (json['data'] != null) {
-      data = new List<NavigationDataModel>();
+      data = [];
       json['data'].forEach((v) {
         data.add(new NavigationDataModel.fromJson(v));
       });
diff --git a/lib/models/quick_links_model.dart b/lib/models/quick_links_model.dart
index 2d3d6f8..1d6197b 100644
--- a/lib/models/quick_links_model.dart
+++ b/lib/models/quick_links_model.dart
@@ -11,7 +11,7 @@ class QuickLinksModel {
     statusCode = json['statusCode'];
     message = json['message'];
     if (json['data'] != null) {
-      data = new List<QuickLinksData>();
+      data = [];
       json['data'].forEach((v) {
         data.add(new QuickLinksData.fromJson(v));
       });
diff --git a/lib/models/surah_model.dart b/lib/models/surah_model.dart
index 52adaea..00da090 100644
--- a/lib/models/surah_model.dart
+++ b/lib/models/surah_model.dart
@@ -11,7 +11,7 @@ class SurahModel {
     statusCode = json['statusCode'];
     message = json['message'];
     if (json['data'] != null) {
-      data = new List<SurahModelData>();
+      data = [];
       json['data'].forEach((v) {
         data.add(new SurahModelData.fromJson(v));
       });
diff --git a/lib/models/tangheem_type_model.dart b/lib/models/tangheem_type_model.dart
index dce0d9e..8b4cb72 100644
--- a/lib/models/tangheem_type_model.dart
+++ b/lib/models/tangheem_type_model.dart
@@ -11,7 +11,7 @@ class TangheemType {
     statusCode = json['statusCode'];
     message = json['message'];
     if (json['data'] != null) {
-      data = new List<TangheemTypeData>();
+      data = [];
       json['data'].forEach((v) {
         data.add(new TangheemTypeData.fromJson(v));
       });
diff --git a/lib/ui/dialogs/loading_dialog.dart b/lib/ui/dialogs/loading_dialog.dart
index 11f1e4a..7cdd231 100644
--- a/lib/ui/dialogs/loading_dialog.dart
+++ b/lib/ui/dialogs/loading_dialog.dart
@@ -1,4 +1,3 @@
-
 import 'package:flutter/cupertino.dart';
 import 'package:flutter/foundation.dart';
 import 'package:flutter/material.dart';
diff --git a/lib/ui/screens/bookmark_screen.dart b/lib/ui/screens/bookmark_screen.dart
index 2d2a5ee..fa9af26 100644
--- a/lib/ui/screens/bookmark_screen.dart
+++ b/lib/ui/screens/bookmark_screen.dart
@@ -36,11 +36,9 @@ class _BookmarkScreenState extends State<BookmarkScreen> {
     getBookMark();
   }
 
-  void handleSlideAnimationChanged(Animation<double> slideAnimation) {
-  }
+  void handleSlideAnimationChanged(Animation<double> slideAnimation) {}
 
-  void handleSlideIsOpenChanged(bool isOpen) {
-  }
+  void handleSlideIsOpenChanged(bool isOpen) {}
 
   void getBookMark() async {
     Utils.showLoading(context);
diff --git a/lib/ui/screens/contact_us_screen.dart b/lib/ui/screens/contact_us_screen.dart
index 420e27e..0a5b7ba 100644
--- a/lib/ui/screens/contact_us_screen.dart
+++ b/lib/ui/screens/contact_us_screen.dart
@@ -36,7 +36,7 @@ class _ContactUsScreenState extends State<ContactUsScreen> {
       Utils.showToast("شكرا لك على مراسلتنا ، نحن نقدر كلماتك.");
       Utils.hideLoading(context);
       Navigator.pop(context);
-    } catch (ex, tr) {
+    } catch (ex) {
       Utils.handleException(ex, null);
       Utils.hideLoading(context);
     }
diff --git a/lib/ui/screens/content_info_screen.dart b/lib/ui/screens/content_info_screen.dart
index 872473d..9332ad6 100644
--- a/lib/ui/screens/content_info_screen.dart
+++ b/lib/ui/screens/content_info_screen.dart
@@ -1,4 +1,3 @@
-
 import 'package:flutter/material.dart';
 import 'package:flutter_svg/svg.dart';
 import 'package:tangheem/api/tangheem_user_api_client.dart';
@@ -31,7 +30,7 @@ class _ContentInfoScreenState extends State<ContentInfoScreen> {
     try {
       var membersData = await TangheemUserApiClient().getContentInfo(widget.contentId);
       contentList = membersData?.data ?? [];
-    } catch (ex, tr) {
+    } catch (ex) {
       contentList = [];
       Utils.handleException(ex, null);
     } finally {
diff --git a/lib/ui/screens/forgot_password_screen.dart b/lib/ui/screens/forgot_password_screen.dart
index d2239bd..0d33bef 100644
--- a/lib/ui/screens/forgot_password_screen.dart
+++ b/lib/ui/screens/forgot_password_screen.dart
@@ -37,7 +37,7 @@ class _ForgotPasswordScreenState extends State<ForgotPasswordScreen> {
     try {
       await UserApiClient().forgotPassword(email);
       Utils.showToast("تم إرسال OTP");
-    } catch (ex, tr) {
+    } catch (ex) {
       Utils.handleException(ex, null);
       Utils.hideLoading(context);
       return;
@@ -51,7 +51,7 @@ class _ForgotPasswordScreenState extends State<ForgotPasswordScreen> {
     Utils.showLoading(context);
     try {
       await UserApiClient().verifyOTP(email, otp);
-    } catch (ex, tr) {
+    } catch (ex) {
       Utils.handleException(ex, null);
       Utils.hideLoading(context);
       return;
@@ -66,7 +66,7 @@ class _ForgotPasswordScreenState extends State<ForgotPasswordScreen> {
     Utils.showLoading(context);
     try {
       await UserApiClient().updatePassword(email, otp, password);
-    } catch (ex, tr) {
+    } catch (ex) {
       Utils.handleException(ex, null);
       Utils.hideLoading(context);
       return;
diff --git a/lib/ui/screens/home_screen.dart b/lib/ui/screens/home_screen.dart
index 2fd68ab..1eae928 100644
--- a/lib/ui/screens/home_screen.dart
+++ b/lib/ui/screens/home_screen.dart
@@ -53,7 +53,7 @@ class _HomeScreenState extends State<HomeScreen> {
       TangheemUserApiClient().addStatistics(1);
       setState(() {});
       Utils.hideLoading(context);
-    } catch (ex, tr) {
+    } catch (ex) {
       Utils.hideLoading(context);
       Utils.handleException(ex, null);
     }
@@ -63,7 +63,7 @@ class _HomeScreenState extends State<HomeScreen> {
     try {
       _tangheemType = await TangheemUserApiClient().getTangheemType();
       _tangheemListNotifier.value = _tangheemType?.data?.where((element) => element.isActive)?.toList()?.map((element) => element.tangheemTypeName)?.toList() ?? [];
-    } catch (ex, tr) {}
+    } catch (ex) {}
   }
 
   @override
diff --git a/lib/ui/screens/login_screen.dart b/lib/ui/screens/login_screen.dart
index 7967f7b..de8ea96 100644
--- a/lib/ui/screens/login_screen.dart
+++ b/lib/ui/screens/login_screen.dart
@@ -69,7 +69,7 @@ class _LoginScreenState extends State<LoginScreen> {
       await prefs.setString(GlobalConsts.password, _password);
       Utils.hideLoading(context);
       Navigator.pop(context);
-    } catch (ex, tr) {
+    } catch (ex) {
       Utils.handleException(ex, null);
       Utils.hideLoading(context);
     }
diff --git a/lib/ui/screens/member_screen.dart b/lib/ui/screens/member_screen.dart
index e1e7dcd..da76b2b 100644
--- a/lib/ui/screens/member_screen.dart
+++ b/lib/ui/screens/member_screen.dart
@@ -32,7 +32,7 @@ class _MemberScreenState extends State<MemberScreen> {
       var membersData = await TangheemUserApiClient().getMembers();
       membersList = membersData?.data ?? [];
       membersList.sort((a, b) => a.orderNo.compareTo(b.orderNo));
-    } catch (ex, tr) {
+    } catch (ex) {
       membersList = [];
       Utils.handleException(ex, null);
     } finally {
diff --git a/lib/ui/screens/quran_screen.dart b/lib/ui/screens/quran_screen.dart
index 9610679..f3b3b4b 100644
--- a/lib/ui/screens/quran_screen.dart
+++ b/lib/ui/screens/quran_screen.dart
@@ -79,7 +79,7 @@ class _QuranScreenState extends State<QuranScreen> {
       _surahList = _surahModel.data.map((element) => element.nameAR).toList();
       _currentPage = widget.bookmark?.page ?? 1;
       Utils.hideLoading(context);
-    } catch (ex, tr) {
+    } catch (ex) {
       Utils.hideLoading(context);
       Utils.handleException(ex, null);
     }
@@ -115,7 +115,7 @@ class _QuranScreenState extends State<QuranScreen> {
     try {
       _ayatTangheemTypeMapped = await TangheemUserApiClient().getTangheemBySurah(_selectedSurah + 1);
       _tangheemWords = _ayatTangheemTypeMapped?.data?.map((e) => e.highlightText)?.toList() ?? [];
-    } catch (ex, tr) {
+    } catch (ex) {
       Utils.handleException(ex, null);
     } finally {}
     setState(() {});
@@ -125,7 +125,7 @@ class _QuranScreenState extends State<QuranScreen> {
     Utils.showLoading(context);
     try {
       _ayaModel = await TangheemUserApiClient().getAyaByFilter(_selectedSurah + 1, _fromAyaList[_selectedFromAya], _toAyaList[_selectedToAya]);
-    } catch (ex, tr) {
+    } catch (ex) {
       Utils.handleException(ex, null);
     } finally {
       Utils.hideLoading(context);
@@ -139,7 +139,7 @@ class _QuranScreenState extends State<QuranScreen> {
       _ayaModel = await TangheemUserApiClient().getQuranByPageNo(_currentPage);
       Utils.hideLoading(context);
       setState(() {});
-    } catch (ex, tr) {
+    } catch (ex) {
       Utils.handleException(ex, null);
       Utils.hideLoading(context);
     }
@@ -234,7 +234,7 @@ class _QuranScreenState extends State<QuranScreen> {
                 child: CommonDropDownButton(_selectedFromAya, hintText: "من الاية", list: _fromAyaList.map((e) => "من الاية" + " $e").toList(), onSelect: (index) {
                   if (_selectedFromAya != index) {
                     _selectedFromAya = index;
-                    var abc = filteredAyahList.indexOf(_selectedFromAya);
+                    filteredAyahList.indexOf(_selectedFromAya);
                     _toAyaList = filteredAyahList.getRange(_selectedFromAya + 1, filteredAyahList.length)?.toList() ?? [];
                     setState(() {});
                   }
diff --git a/lib/ui/screens/registration_screen.dart b/lib/ui/screens/registration_screen.dart
index cbdd350..a9f68c4 100644
--- a/lib/ui/screens/registration_screen.dart
+++ b/lib/ui/screens/registration_screen.dart
@@ -47,7 +47,7 @@ class _RegistrationScreenState extends State<RegistrationScreen> {
         _selectedCountry = _countryModel.data.first;
       }
       setState(() {});
-    } catch (ex, tr) {
+    } catch (ex) {
       Utils.handleException(ex, null);
     } finally {
       Utils.hideLoading(context);
@@ -61,7 +61,7 @@ class _RegistrationScreenState extends State<RegistrationScreen> {
       Utils.showToast("تسجيل بنجاح");
       Utils.hideLoading(context);
       Navigator.pop(context);
-    } catch (ex, tr) {
+    } catch (ex) {
       Utils.handleException(ex, null);
       Utils.hideLoading(context);
     }
diff --git a/lib/ui/screens/tangheem_detail_screen.dart b/lib/ui/screens/tangheem_detail_screen.dart
index d101205..e4338f7 100644
--- a/lib/ui/screens/tangheem_detail_screen.dart
+++ b/lib/ui/screens/tangheem_detail_screen.dart
@@ -21,6 +21,7 @@ import 'login_screen.dart';
 class TangheemDetailScreen extends StatefulWidget {
   static const String routeName = "/tangheem_detail";
   final List<AyatTangheemTypeMappedData> ayatTangheemTypeMappedDataList;
+
   TangheemDetailScreen({Key key, this.ayatTangheemTypeMappedDataList}) : super(key: key);
 
   @override
@@ -82,7 +83,7 @@ class _TangheemDetailScreenState extends State<TangheemDetailScreen> {
       _discussionModel = await TangheemUserApiClient().getDiscussionByTangheemID(_discussionPage, _ayatTangheemTypeMappedFirstData.ayaTangheemTypeId);
       Utils.hideLoading(context);
       setState(() {});
-    } catch (ex, tr) {
+    } catch (ex) {
       Utils.handleException(ex, null);
       Utils.hideLoading(context);
     }
@@ -95,7 +96,7 @@ class _TangheemDetailScreenState extends State<TangheemDetailScreen> {
       Utils.showToast("تم إرسال التعليق ، سيكون مرئيًا بمجرد موافقة المسؤول عليه");
       Utils.hideLoading(context);
       Navigator.pop(context);
-    } catch (ex, tr) {
+    } catch (ex) {
       Utils.handleException(ex, null);
       Utils.hideLoading(context);
     }
diff --git a/lib/ui/screens/tangheem_screen.dart b/lib/ui/screens/tangheem_screen.dart
index aeaaed6..bcd3bb2 100644
--- a/lib/ui/screens/tangheem_screen.dart
+++ b/lib/ui/screens/tangheem_screen.dart
@@ -38,7 +38,7 @@ class _TangheemScreenState extends State<TangheemScreen> {
     try {
       _ayatTangheemTypeMapped = await TangheemUserApiClient().getAyaTangheemTypeMapped(widget.surah?.surahID, widget.tangheemTypeName, widget.tangheemQuery);
       _dataList = _ayatTangheemTypeMapped?.data ?? [];
-    } catch (ex, tr) {
+    } catch (ex) {
       _dataList = [];
       Utils.handleException(ex, null);
     } finally {
diff --git a/lib/widgets/text_highlight_widget.dart b/lib/widgets/text_highlight_widget.dart
index 27916f5..9ce59b1 100644
--- a/lib/widgets/text_highlight_widget.dart
+++ b/lib/widgets/text_highlight_widget.dart
@@ -48,9 +48,9 @@ class TextHighLightWidget extends StatelessWidget {
       }
     }
 
-    List<TextSpan> _spans = List();
+    List<TextSpan> _spans = [];
     int _start = 0;
-    List<String> _lowerCaseHighlights = List();
+    List<String> _lowerCaseHighlights = [];
 
     highlights.forEach((element) {
       _lowerCaseHighlights.add(element.toLowerCase());
@@ -67,7 +67,7 @@ class TextHighLightWidget extends StatelessWidget {
       }
 
       if (_highlightsMap.isNotEmpty) {
-        List<int> _indexes = List();
+        List<int> _indexes = [];
         _highlightsMap.forEach((key, value) => _indexes.add(key));
 
         int _currentIndex = _indexes.reduce(min);