Squashed commit of the following:

commit 8cbb46c
Merge: ddc27f4 2985260
Author: hamed-deriv <[email protected]>
Date:   Thu Aug 3 12:04:21 2023 +0800

    Merge branch 'dev' into flutter-version-3

commit 2985260
Author: Osama Ghazal <[email protected]>
Date:   Thu Aug 3 12:03:32 2023 +0800

    osama/cancel_old_timer_to_avoid_redundant api_calls_from_old_timers (deriv-com#272)

    - cancel old timer to avoid redundant api calls from old timers

commit 213c704
Author: Ahrar <[email protected]>
Date:   Wed Jul 5 17:22:12 2023 +0800

    ahrar/fix_reconnect_recovery (deriv-com#263)

    - fix reconnect recovery

commit 3eba7ed
Author: Ali Akbar <[email protected]>
Date:   Wed Jul 5 13:20:38 2023 +0400

    aliakbar/added_p2p_ping_api_call (deriv-com#267)

    - added p2p ping api call

commit ddc27f4
Merge: 11a07ac 6deb910
Author: hamed-deriv <[email protected]>
Date:   Fri Jun 23 11:20:44 2023 +0800

    Merge branch 'dev' into flutter-version-3

commit 6deb910
Author: Hamed Rezaee <[email protected]>
Date:   Fri Jun 16 11:15:28 2023 +0800

    hamed/update_readme_file

commit 11a07ac
Author: Hamed Rezaee <[email protected]>
Date:   Thu Jun 15 11:35:08 2023 +0800

    hamed/improve_test_coverage (deriv-com#265)

    - improve test coverage

commit 198ac7c
Author: sahani-deriv <[email protected]>
Date:   Mon Jun 12 09:50:21 2023 +0800

    sahani/ upgrade_kotlin_version (deriv-com#266)

    - upgrade kotlin version

commit 3db0b4a
Author: Hamed Rezaee <[email protected]>
Date:   Thu Jun 1 15:03:25 2023 +0800

    hamed/update_dependencies (deriv-com#264)

    - update dependencies

commit 665e9a7
Merge: d0facdf f24bf41
Author: hamed-deriv <[email protected]>
Date:   Thu Jun 1 14:58:07 2023 +0800

    Merge branch 'dev' into flutter-version-3

commit d0facdf
Author: Bassam El Obeid <[email protected]>
Date:   Thu Jun 1 10:44:32 2023 +0400

    bassam/migrate_flutter_version_to_3_10 (deriv-com#261)

    - migrate flutter version to 3.10.0

commit 8ba6902
Author: Bassam El Obeid <[email protected]>
Date:   Thu May 25 06:30:40 2023 +0400

    bassam/upgrade_to_flutter_3.10.0 (deriv-com#254)

    - upgrade to flutter 3.10.0

commit e1544fd
Merge: 9d6e570 987703e
Author: hamed-deriv <[email protected]>
Date:   Thu May 25 10:29:30 2023 +0800

    Merge branch 'dev' into flutter-version-3

commit 9d6e570
Author: sahani-deriv <[email protected]>
Date:   Wed Apr 19 10:10:27 2023 +0800

    sahani/upgrade_deriv_api_to_flutter_version_3 (deriv-com#251)

    - upgrade deriv api to flutter version 3

commit fbf0ffe
Merge: 8c01473 bf57f53
Author: hamed-deriv <[email protected]>
Date:   Thu Mar 30 11:50:42 2023 +0800

    Merge branch 'dev' into flutter-version-3

commit 8c01473
Merge: ba31043 9d77e36
Author: hamed-deriv <[email protected]>
Date:   Mon Mar 27 17:03:08 2023 +0800

    Merge branch 'dev' into flutter-version-3

commit ba31043
Merge: 6d12981 756411a
Author: hamed-deriv <[email protected]>
Date:   Mon Mar 27 16:24:12 2023 +0800

    Merge branch 'dev' into flutter-version-3

commit 6d12981
Author: naif-deriv <[email protected]>
Date:   Tue Feb 21 11:14:36 2023 +0400

    naif/add_dart_new_features_to_code_generator (deriv-com#244)

    - add dart new features to the code generator

Author: hamed-rezaee

README.md

@@ -141,6 +141,8 @@ dependencies:
 ```
 $ git submodule init
 $ git submodule update --remote
+$ ./setup.sh
+$ flutter pub run build_runner build --delete-conflicting-outputs
 ```
 
 ### Run the tests

analysis_options.yaml

@@ -2,9 +2,9 @@ analyzer:
   exclude:
     - lib/basic_api/generated/api.dart
 
-  strong-mode:
-    implicit-dynamic: false
-
+  language:
+    strict-raw-types: true
+    
   errors:
     todo: ignore
     missing_required_param: warning
@@ -92,7 +92,6 @@ linter:
     - prefer_const_literals_to_create_immutables
     - prefer_constructors_over_static_methods
     - prefer_contains
-    - prefer_equal_for_default_values
     - prefer_expression_function_bodies # https://github.com/flutter/flutter/wiki/Style-guide-for-Flutter-repo#consider-using--for-short-functions-and-methods
     - prefer_final_fields
     - prefer_final_in_for_each

android/build.gradle

@@ -2,14 +2,14 @@ group 'com.deriv.flutter_deriv_api'
 version '1.0-SNAPSHOT'
 
 buildscript {
-    ext.kotlin_version = '1.3.50'
+    ext.kotlin_version = '1.7.10'
     repositories {
         google()
         jcenter()
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.5.0'
+        classpath 'com.android.tools.build:gradle:7.3.0'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
     }
 }

android/gradle/wrapper/gradle-wrapper.properties

@@ -2,4 +2,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.2-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.6.1-all.zip

api_builder.dart

@@ -122,8 +122,8 @@ class APIBuilder extends Builder {
               /// Initialize $classFullName.
               const $classFullName({
                   ${_getConstructorParameters(methodName, schema, schemaType, properties)}
-                  ${_getSuperClassParameters(schemaType)},
-                }): super(${_getSuperClassCallParameters(schemaType, methodName)},);
+                  ${_getSuperClassConstructorParameters(schemaType, methodName)},
+                });
               
               ${_getFromJsonMethod(classFullName, schema, schemaType, properties)}
               
@@ -169,6 +169,7 @@ class APIBuilder extends Builder {
         return '${_isFieldRequired(key, schemaType, property) ? 'required ' : ''} this.${ReCase(key).camelCase}';
       },
     ).join(', ');
+
     return fields.isEmpty ? result : '$result , ';
   }
 
@@ -380,6 +381,7 @@ class APIBuilder extends Builder {
         fields.map(
           (String key) {
             final String name = ReCase(key).camelCase;
+
             return '$name: $name ?? this.$name';
           },
         ).join(', '),
@@ -388,40 +390,45 @@ class APIBuilder extends Builder {
       ..write('${_getSupperClassAssignments(schemaType)},);');
   }
 
-  static String _getSuperClassParameters(String? schemaType) {
+  static String _getSuperClassParameters(String schemaType) {
     final Map<String, String> superClassFields =
         _getSuperClassFields(schemaType);
 
-    return superClassFields.keys
-        .map((String key) =>
-            '${typeMap[superClassFields[key]!]} ${ReCase(key).camelCase}')
-        .join(', ');
+    final Iterable<String> parameters = superClassFields.keys.map((String key) {
+      final String type = typeMap[superClassFields[key]!] ?? 'dynamic';
+      final String parameterName = ReCase(key).camelCase;
+
+      return '$type $parameterName';
+    });
+
+    return parameters.join(', ');
   }
 
-  static String _getSuperClassCallParameters(
+  static String _getSuperClassConstructorParameters(
     String schemaType,
     String methodName,
   ) {
-    final StringBuffer superCallParameters = StringBuffer();
+    final Map<String, String> superClassFields =
+        _getSuperClassFields(schemaType);
+    final StringBuffer superClassParameters = StringBuffer();
 
     if (schemaType == 'send') {
-      superCallParameters.write('msgType: \'$methodName\',');
+      superClassParameters.write('super.msgType = \'$methodName\', ');
     }
 
-    superCallParameters.write(_getSuperClassFields(schemaType).keys.map(
-      (String key) {
-        final String parameterName = ReCase(key).camelCase;
-        return '$parameterName: $parameterName';
-      },
-    ).join(', '));
+    final Iterable<String> parameters = superClassFields.keys
+        .map((String key) => 'super.${ReCase(key).camelCase}');
 
-    return superCallParameters.toString();
+    superClassParameters.write(parameters.join(', '));
+
+    return superClassParameters.toString();
   }
 
   static String _getSupperClassAssignments(String schemaType) =>
       _getSuperClassFields(schemaType).keys.map(
         (String key) {
           final String propertyName = ReCase(key).camelCase;
+
           return '$propertyName: $propertyName ?? this.$propertyName';
         },
       ).join(', ');
@@ -458,7 +465,7 @@ class APIBuilder extends Builder {
   }
 }
 
-class GeneratedResponseJson extends Comparable<GeneratedResponseJson> {
+class GeneratedResponseJson implements Comparable<GeneratedResponseJson> {
   GeneratedResponseJson({
     this.msgType,
     this.fileName,

example/android/app/build.gradle

@@ -26,7 +26,7 @@ apply plugin: 'kotlin-android'
 apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle"
 
 android {
-    compileSdkVersion 28
+    compileSdkVersion 33
 
     sourceSets {
         main.java.srcDirs += 'src/main/kotlin'

example/android/build.gradle

@@ -1,12 +1,12 @@
 buildscript {
-    ext.kotlin_version = '1.3.50'
+    ext.kotlin_version = '1.7.10'
     repositories {
         google()
         jcenter()
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.5.0'
+        classpath 'com.android.tools.build:gradle:7.3.0'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
     }
 }
@@ -26,6 +26,6 @@ subprojects {
     project.evaluationDependsOn(':app')
 }
 
-task clean(type: Delete) {
+tasks.register("clean", Delete) {
     delete rootProject.buildDir
 }

example/android/gradle/wrapper/gradle-wrapper.properties

@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.2-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.6.1-all.zip

example/lib/blocs/active_symbols/active_symbols_bloc.dart

@@ -11,31 +11,40 @@ part 'active_symbols_state.dart';
 /// ActiveSymbolsBloc
 class ActiveSymbolsBloc extends Bloc<ActiveSymbolsEvent, ActiveSymbolsState> {
   /// ActiveSymbolsBloc initializer
-  ActiveSymbolsBloc() : super(ActiveSymbolsLoading());
-
-  @override
-  Stream<ActiveSymbolsState> mapEventToState(ActiveSymbolsEvent event) async* {
-    if (event is FetchActiveSymbols) {
-      yield ActiveSymbolsLoading();
-
-      try {
-        final ActiveSymbolsResponse symbols = await _fetchActiveSymbols();
-        yield ActiveSymbolsLoaded(activeSymbols: symbols.activeSymbols!);
-      } on ActiveSymbolsException catch (error) {
-        yield ActiveSymbolsError(error.message);
-      }
-    } else if (event is SelectActiveSymbol) {
-      if (state is ActiveSymbolsLoaded) {
-        final ActiveSymbolsLoaded loadedState = state as ActiveSymbolsLoaded;
-
-        yield ActiveSymbolsLoaded(
-          activeSymbols: loadedState.activeSymbols,
-          selectedSymbol: loadedState.activeSymbols[event.index],
-        );
-      } else {
-        yield ActiveSymbolsLoading();
-        add(FetchActiveSymbols());
-      }
+  ActiveSymbolsBloc() : super(ActiveSymbolsLoading()) {
+    on<FetchActiveSymbols>(
+        (FetchActiveSymbols event, Emitter<ActiveSymbolsState> emit) =>
+            _handleFetchActiveSymbols(event, emit));
+
+    on<SelectActiveSymbol>(
+        (SelectActiveSymbol event, Emitter<ActiveSymbolsState> emit) =>
+            _handleSelectActiveSymbol(event, emit));
+  }
+
+  Future<void> _handleFetchActiveSymbols(
+      FetchActiveSymbols event, Emitter<ActiveSymbolsState> emit) async {
+    emit(ActiveSymbolsLoading());
+
+    try {
+      final ActiveSymbolsResponse symbols = await _fetchActiveSymbols();
+      emit(ActiveSymbolsLoaded(activeSymbols: symbols.activeSymbols!));
+    } on BaseAPIException catch (error) {
+      emit(ActiveSymbolsError(error.message));
+    }
+  }
+
+  Future<void> _handleSelectActiveSymbol(
+      SelectActiveSymbol event, Emitter<ActiveSymbolsState> emit) async {
+    if (state is ActiveSymbolsLoaded) {
+      final ActiveSymbolsLoaded loadedState = state as ActiveSymbolsLoaded;
+
+      emit(ActiveSymbolsLoaded(
+        activeSymbols: loadedState.activeSymbols,
+        selectedSymbol: loadedState.activeSymbols[event.index],
+      ));
+    } else {
+      emit(ActiveSymbolsLoading());
+      add(FetchActiveSymbols());
     }
   }
 

example/lib/blocs/available_contracts/available_contracts_bloc.dart

@@ -26,36 +26,47 @@ class AvailableContractsBloc
         );
       }
     });
+
+    on<FetchAvailableContracts>((FetchAvailableContracts event,
+            Emitter<AvailableContractsState> emit) =>
+        _handleFetchAvailableContracts(event, emit));
+
+    on<SelectContract>(
+        (SelectContract event, Emitter<AvailableContractsState> emit) =>
+            _handleSelectContract(event, emit));
   }
 
-  @override
-  Stream<AvailableContractsState> mapEventToState(
-    AvailableContractsEvent event,
-  ) async* {
-    if (event is FetchAvailableContracts) {
-      yield AvailableContractsLoading();
+  Future<void> _handleFetchAvailableContracts(
+    FetchAvailableContracts event,
+    Emitter<AvailableContractsState> emit,
+  ) async {
+    emit(AvailableContractsLoading());
 
-      try {
-        final ContractsForResponse contracts =
-            await _fetchAvailableContracts(event.activeSymbol);
+    try {
+      final ContractsForResponse contracts =
+          await _fetchAvailableContracts(event.activeSymbol);
 
-        yield AvailableContractsLoaded(contracts: contracts.contractsFor!);
-      } on ContractsForSymbolException catch (error) {
-        yield AvailableContractsError(error.message);
-      }
-    } else if (event is SelectContract) {
-      if (state is AvailableContractsLoaded) {
-        final AvailableContractsLoaded loadedState =
-            state as AvailableContractsLoaded;
+      emit(AvailableContractsLoaded(contracts: contracts.contractsFor!));
+    } on BaseAPIException catch (error) {
+      emit(AvailableContractsError(error.message));
+    }
+  }
 
-        yield AvailableContractsLoaded(
-          contracts: loadedState.contracts,
-          selectedContract: loadedState.contracts.available[event.index],
-        );
-      } else {
-        yield AvailableContractsLoading();
-        add(FetchAvailableContracts());
-      }
+  void _handleSelectContract(
+    SelectContract event,
+    Emitter<AvailableContractsState> emit,
+  ) {
+    if (state is AvailableContractsLoaded) {
+      final AvailableContractsLoaded loadedState =
+          state as AvailableContractsLoaded;
+
+      emit(AvailableContractsLoaded(
+        contracts: loadedState.contracts,
+        selectedContract: loadedState.contracts.available[event.index],
+      ));
+    } else {
+      emit(AvailableContractsLoading());
+      add(FetchAvailableContracts());
     }
   }
 

example/lib/blocs/price_proposal/price_proposal_bloc.dart

@@ -22,28 +22,33 @@ class PriceProposalBloc extends Bloc<PriceProposalEvent, PriceProposalState> {
         add(SubscribeProposal(state.selectedContract));
       }
     });
+
+    on<SubscribeProposal>(
+        (SubscribeProposal event, Emitter<PriceProposalState> emit) =>
+            _handleSubscribeProposal(event, emit));
+
+    on<YieldProposalLoaded>(
+        (YieldProposalLoaded event, Emitter<PriceProposalState> emit) =>
+            emit(PriceProposalLoaded(event.proposal.proposal)));
+
+    on<YieldError>((YieldError event, Emitter<PriceProposalState> emit) =>
+        emit(PriceProposalError(event.message)));
   }
 
-  @override
-  Stream<PriceProposalState> mapEventToState(
-    PriceProposalEvent event,
-  ) async* {
-    if (event is SubscribeProposal) {
-      yield PriceProposalLoading();
+  Future<void> _handleSubscribeProposal(
+    SubscribeProposal event,
+    Emitter<PriceProposalState> emit,
+  ) async {
+    emit(PriceProposalLoading());
 
-      await _unsubscribeProposal();
+    await _unsubscribeProposal();
 
-      _subscribeProposal(event)
-          .handleError((dynamic error) => error is ContractOperationException
-              ? add(YieldError(error.message))
-              : add(YieldError(error.toString())))
-          .listen((ProposalResponse? proposal) =>
-              add(YieldProposalLoaded(proposal!)));
-    } else if (event is YieldProposalLoaded) {
-      yield PriceProposalLoaded(event.proposal.proposal);
-    } else if (event is YieldError) {
-      yield PriceProposalError(event.message);
-    }
+    _subscribeProposal(event)
+        .handleError((dynamic error) => error is BaseAPIException
+            ? add(YieldError(error.message))
+            : add(YieldError(error.toString())))
+        .listen((ProposalResponse? proposal) =>
+            add(YieldProposalLoaded(proposal!)));
   }
 
   Stream<ProposalResponse?> _subscribeProposal(SubscribeProposal event) =>