fix merge issue

lib/models/Authentication/check_activation_code_response.dart

@@ -270,7 +270,7 @@ class CheckActivationCode {
   }
 }
 
-class List {
+class Lists {
   String setupID;
   int patientType;
   int patientID;
@@ -330,7 +330,7 @@ class List {
   dynamic tempAddress;
   dynamic zipCode;
 
-  List({
+  Lists({
     this.setupID,
     this.patientType,
     this.patientID,
@@ -391,7 +391,7 @@ class List {
     this.zipCode,
   });
 
-  List.fromJson(Map<String, dynamic> json) {
+  Lists.fromJson(Map<String, dynamic> json) {
     setupID = json['SetupID'];
     patientType = json['PatientType'];
     patientID = json['PatientID'];

lib/pages/DrawerPages/family/my-family.dart

@@ -6,24 +6,17 @@ import 'package:diplomaticquarterapp/models/Authentication/check_activation_code
 import 'package:diplomaticquarterapp/core/model/ImagesInfo.dart';
 import 'package:diplomaticquarterapp/core/service/AuthenticatedUserObject.dart';
 import 'package:diplomaticquarterapp/core/viewModels/appointment_rate_view_model.dart';
-import 'package:diplomaticquarterapp/core/viewModels/project_view_model.dart';
 import 'package:diplomaticquarterapp/locator.dart';
 import 'package:diplomaticquarterapp/models/Authentication/authenticated_user.dart';
-import 'package:diplomaticquarterapp/models/Authentication/check_activation_code_response.dart' as list;
 import 'package:diplomaticquarterapp/models/FamilyFiles/GetAllSharedRecordByStatusResponse.dart';
-import 'package:diplomaticquarterapp/pages/BookAppointment/widgets/BranchView.dart';
-import 'package:diplomaticquarterapp/pages/base/base_view.dart';
 import 'package:diplomaticquarterapp/services/family_files/family_files_provider.dart';
 import 'package:diplomaticquarterapp/uitl/app_shared_preferences.dart';
 import 'package:diplomaticquarterapp/uitl/app_toast.dart';
 import 'package:diplomaticquarterapp/uitl/gif_loader_dialog_utils.dart';
 import 'package:diplomaticquarterapp/uitl/translations_delegate_base.dart';
-import 'package:diplomaticquarterapp/uitl/utils.dart';
 import 'package:diplomaticquarterapp/widgets/card/rounded_container.dart';
 import 'package:diplomaticquarterapp/widgets/dialogs/confirm_dialog.dart';
 import 'package:diplomaticquarterapp/widgets/others/app_scaffold_widget.dart';
-import 'package:diplomaticquarterapp/widgets/others/bottom_bar.dart';
-import 'package:diplomaticquarterapp/widgets/progress_indicator/app_circular_progress_Indeicator.dart';
 import 'package:diplomaticquarterapp/widgets/text/app_texts_widget.dart';
 import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
@@ -39,7 +32,6 @@ class MyFamily extends StatefulWidget {
 }
 
 class _MyFamily extends State<MyFamily> with TickerProviderStateMixin {
-  List<ImagesInfo> imagesInfo = List();
   final familyFileProvider = FamilyFilesProvider();
   AppSharedPreferences sharedPref = new AppSharedPreferences();
   var userID;
@@ -51,6 +43,7 @@ class _MyFamily extends State<MyFamily> with TickerProviderStateMixin {
   locator<AppointmentRateViewModel>();
   ProjectViewModel projectViewModel;
   AuthenticatedUser user;
+  List<ImagesInfo> imagesInfo = List();
   @override
   void initState() {
     _tabController = new TabController(length: 2, vsync: this, initialIndex: 0);