zurichat · Lord-Chris · Oct 7, 2021 · Oct 7, 2021 · Oct 7, 2021 · Oct 8, 2021
diff --git a/lib/app/app.dart b/lib/app/app.dart
@@ -1,4 +1,3 @@
-
 import 'package:zurichat/services/centrifuge_service.dart';
 import 'package:zurichat/services/localization_service.dart';
 import 'package:zurichat/services/media_service.dart';
@@ -33,7 +32,6 @@ import 'package:zurichat/ui/view/forgot_password/forgot_password_email/forgot_pa
 import 'package:zurichat/ui/view/forgot_password/forgot_password_new_password/forgot_password_newview.dart';
 import 'package:zurichat/ui/view/forgot_password/forgot_password_otp/forgot_password_otpview.dart';
 import 'package:zurichat/ui/view/webview_page/webview_page.dart';
-
 import 'package:shared_preferences/shared_preferences.dart';
 import 'package:stacked/stacked_annotations.dart';
 import 'package:stacked_services/stacked_services.dart';

diff --git a/lib/app/app.locator.dart b/lib/app/app.locator.dart
diff --git a/lib/app/app.router.dart b/lib/app/app.router.dart
diff --git a/lib/package/base/server-request/api/api.dart b/lib/package/base/server-request/api/api.dart
@@ -78,7 +78,7 @@ abstract class Api {
   });
 
   // THE SERVICE TO UPDATE AN ORGANIZATION LOGO
-  Future updateOrgLogo(String orgId, File image, token);
+  Future<bool> updateOrgLogo(String orgId, File image, token);
 
   // THE SERVICE TO ADD A MEMBERS TO AN ORGANIZATION
   Future addMemberToOrganization(String orgId, String email, token);

diff --git a/lib/package/base/server-request/api/zuri_api.dart b/lib/package/base/server-request/api/zuri_api.dart
@@ -396,6 +396,7 @@ class ZuriApi implements Api {
     } on DioError catch (e) {
       log.w(e.toString());
       handleApiError(e);
+      throw e.response!.data['message'];
     }
   }
 
@@ -415,32 +416,36 @@ class ZuriApi implements Api {
     } on DioError catch (e) {
       log.w(e.toString());
       handleApiError(e);
+      throw e.response!.data['message'];
     }
   }
 
   /// Updates an organization's logo. The organization's id `orgId` must not be
   /// null or empty
   @override
-  Future updateOrgLogo(String orgId, File image, token) async {
+  Future<bool> updateOrgLogo(String orgId, File image, token) async {
     try {
       var formData = FormData.fromMap({
+        'height': 300,
+        'width': 300,
         "image": await MultipartFile.fromFile(
           image.path,
           filename: image.path.split(Platform.pathSeparator).last,
           contentType: MediaType('image', 'jpeg'),
         ),
       });
-      final res = await dio.patch(
+      await dio.patch(
         '${coreBaseUrl}organizations/$orgId/logo',
         options: Options(
           headers: {'Authorization': 'Bearer $token'},
         ),
         data: formData,
       );
-      return res.data['message'];
+      return true;
     } on DioError catch (e) {
       log.w(e.toString());
       handleApiError(e);
+      throw e.response?.data['message'];
     }
   }
 

diff --git a/lib/ui/shared/text_styles.dart b/lib/ui/shared/text_styles.dart
@@ -55,9 +55,15 @@ class AppTextStyle {
   static TextStyle darkGreySize18Bold =
       _base(_size18, _boldWeight, AppColors.textDark10);
 
+  static TextStyle blackSize20Bold =
+      _base(_size20, _boldWeight, AppColors.textDark10);
+
   static TextStyle blackSize18Bold =
       _base(_size18, _boldWeight, AppColors.textDark10);
 
+  static TextStyle blackSize16Bold =
+      _base(_size16, _boldWeight, AppColors.textDark10);
+
   static TextStyle darkGreySize20Bold =
       _base(_size20, _boldWeight, AppColors.textDark10);
 

diff --git a/lib/ui/view/organization/invite_to_organization/admin_permissions/create_invite_link.dart b/lib/ui/view/organization/invite_to_organization/admin_permissions/create_invite_link.dart
@@ -1,11 +1,9 @@
 import 'package:flutter/material.dart';
-
 import 'package:zurichat/ui/shared/shared.dart';
 import 'package:zurichat/ui/shared/text_styles.dart';
 import 'package:zurichat/ui/shared/zuri_appbar.dart';
 import 'package:zurichat/ui/view/organization/invite_to_organization/invite_via_email/invite_viewmodel.dart';
 import 'package:zurichat/utilities/internalization/localization/app_localization.dart';
-
 import 'package:stacked/stacked.dart';
 
 class CreateInviteLink extends StatelessWidget {

diff --git a/lib/ui/view/organization/invite_to_organization/admin_permissions/invite_via_email.dart b/lib/ui/view/organization/invite_to_organization/admin_permissions/invite_via_email.dart
@@ -1,5 +1,4 @@
 import 'package:flutter/material.dart';
-
 import 'package:zurichat/ui/shared/shared.dart';
 import 'package:zurichat/ui/shared/text_styles.dart';
 import 'package:zurichat/ui/shared/zuri_appbar.dart';

diff --git a/lib/ui/view/organization/invite_to_organization/invitation_sent.dart b/lib/ui/view/organization/invite_to_organization/invitation_sent.dart
@@ -1,14 +1,12 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_svg/svg.dart';
-
 import 'package:zurichat/ui/shared/long_button.dart';
 import 'package:zurichat/ui/shared/shared.dart';
 import 'package:zurichat/ui/shared/text_styles.dart';
 import 'package:zurichat/ui/shared/ui_helpers.dart';
 import 'package:zurichat/ui/shared/zuri_appbar.dart';
 import 'package:zurichat/ui/view/organization/invite_to_organization/invite_via_email/invite_viewmodel.dart';
 import 'package:zurichat/utilities/internalization/localization/app_localization.dart';
-
 import 'package:stacked/stacked.dart';
 
 class InvitationSent extends StatelessWidget {

diff --git a/lib/ui/view/organization/invite_to_organization/invite_via_contact/import_contact.dart b/lib/ui/view/organization/invite_to_organization/invite_via_contact/import_contact.dart
@@ -1,10 +1,8 @@
 import 'package:flutter/material.dart';
-
 import 'package:zurichat/ui/nav_pages/plugin_page/widgets/custom_search_field.dart';
 import 'package:zurichat/ui/shared/text_styles.dart';
 import 'package:zurichat/ui/shared/zuri_appbar.dart';
 import 'package:zurichat/utilities/internalization/localization/app_localization.dart';
-
 import 'package:stacked/stacked.dart';
 
 import '../invite_via_email/invite_viewmodel.dart';

diff --git a/lib/ui/view/organization/invite_to_organization/invite_via_email/invite_via_email.dart b/lib/ui/view/organization/invite_to_organization/invite_via_email/invite_via_email.dart
@@ -1,5 +1,4 @@
 import 'package:flutter/material.dart';
-
 import 'package:zurichat/ui/shared/shared.dart';
 import 'package:zurichat/ui/shared/text_styles.dart';
 import 'package:zurichat/ui/shared/zuri_appbar.dart';

diff --git a/lib/ui/view/organization/invite_to_organization/invite_via_email/invite_viewmodel.dart b/lib/ui/view/organization/invite_to_organization/invite_via_email/invite_viewmodel.dart
@@ -9,7 +9,6 @@ import 'package:zurichat/services/user_service.dart';
 import 'package:zurichat/utilities/constants.dart';
 import 'package:zurichat/utilities/mixins/validators_mixin.dart';
 import 'package:zurichat/utilities/storage_keys.dart';
-
 import '../../../../../../app/app.logger.dart';
 import 'package:stacked_services/stacked_services.dart';
 

diff --git a/lib/ui/view/organization/organization_different_email/different_email_organization_view.dart b/lib/ui/view/organization/organization_different_email/different_email_organization_view.dart
@@ -1,13 +1,11 @@
 import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_hooks/flutter_hooks.dart';
-
 import 'package:zurichat/constants/app_strings.dart';
 import 'package:zurichat/ui/shared/text_styles.dart';
 import 'package:zurichat/ui/shared/text_field.dart';
 import 'package:zurichat/utilities/enums.dart';
 import 'package:zurichat/utilities/internalization/localization/app_localization.dart';
-
 import 'package:stacked/stacked.dart';
 
 import '../../../shared/shared.dart';

diff --git a/...iew/organization/organization_different_email/different_email_organization_viewmodel.dart b/...iew/organization/organization_different_email/different_email_organization_viewmodel.dart
@@ -1,10 +1,8 @@
-
 import 'package:zurichat/app/app.locator.dart';
 import 'package:zurichat/app/app.router.dart';
 import 'package:zurichat/ui/shared/colors.dart';
 import 'package:zurichat/utilities/enums.dart';
 import 'package:zurichat/utilities/mixins/validators_mixin.dart';
-
 import 'package:stacked/stacked.dart';
 import 'package:stacked_services/stacked_services.dart';
 

diff --git a/lib/ui/view/organization/organization_settings/organization_logo.dart b/lib/ui/view/organization/organization_settings/organization_logo.dart
@@ -3,7 +3,6 @@ import 'package:zurichat/ui/shared/text_styles.dart';
 import 'package:stacked/stacked.dart';
 import 'package:zurichat/constants/app_strings.dart';
 import 'package:zurichat/models/organization_model.dart';
-import 'package:zurichat/ui/shared/colors.dart';
 import 'package:zurichat/ui/shared/long_button.dart';
 import 'package:zurichat/ui/shared/zuri_appbar.dart';
 import 'package:zurichat/ui/shared/zuri_loader.dart';
@@ -16,28 +15,29 @@ class OrganizationLogo extends StatelessWidget {
   @override
   Widget build(BuildContext context) {
     final bool _dark = Theme.of(context).brightness == Brightness.dark;
-
     return ViewModelBuilder<OrganizationSettingsViewModel>.reactive(
       viewModelBuilder: () => OrganizationSettingsViewModel(),
       builder: (context, model, child) {
         return Scaffold(
           appBar: ZuriAppBar(
             isDarkMode: _dark,
             whiteBackground: true,
-            leading: Icons.chevron_left,
+            leading: Icons.close,
             leadingPress: () => model.back(),
             orgTitle: Text(
               OrgIcon,
-              style: AppTextStyle.organizationNameText,
+              style: _dark
+                  ? AppTextStyle.whiteSize20Bold
+                  : AppTextStyle.blackSize20Bold,
             ),
             actions: [
               TextButton(
                 onPressed: () => model.updateOrgLogo(org.id.toString()),
                 child: Text(
                   Save,
-                  style: AppTextStyle.lightGreySize16.copyWith(
-                    color: AppColors.zuriPrimaryColor,
-                  ),
+                  style: _dark
+                      ? AppTextStyle.lightGreySize16
+                      : AppTextStyle.darkGreySize16,
                 ),
               ),
             ],
@@ -79,15 +79,18 @@ class OrganizationLogo extends StatelessWidget {
                       width: 200,
                     ),
                     const SizedBox(height: 30),
-                    Text(OrgIconGuide,
-                        style: _dark
-                            ? AppTextStyle.whiteSize18Bold
-                            : AppTextStyle.blackSize18Bold),
+                    Text(
+                      OrgIconGuide,
+                      style: _dark
+                          ? AppTextStyle.whiteSize18Bold
+                          : AppTextStyle.blackSize18Bold,
+                    ),
                     const SizedBox(height: 10),
-                    Padding(
-                      padding: const EdgeInsets.symmetric(horizontal: 10),
-                      child: Text(OrgIconGuideDesc,
-                          style: AppTextStyle.lightGreySize16),
+                    Text(
+                      OrgIconGuideDesc,
+                      style: _dark
+                          ? AppTextStyle.lightGreySize16
+                          : AppTextStyle.darkGreySize16,
                     ),
                   ],
                 ),