feat(profile): New layouts for profile, default avatar and moved exit button to navbar

2024-04-24 15:47:41 +03:00
parent ed6b3332fa
commit 7680abb61b
3 changed files with 135 additions and 153 deletions
--- a/lib/presentation/profile/my_profile_screen/my_profile_screen.dart
+++ b/lib/presentation/profile/my_profile_screen/my_profile_screen.dart
@@ -2,15 +2,11 @@ import 'bloc/my_profile_bloc.dart';
 import 'models/my_profile_model.dart';
 import 'package:eatvio_app/core/app_export.dart';
 import 'package:eatvio_app/widgets/app_bar/appbar_subtitle.dart';
-import 'package:eatvio_app/widgets/app_bar/custom_app_bar.dart';
 import 'package:eatvio_app/widgets/custom_bottom_bar.dart';
-import 'package:eatvio_app/widgets/app_bar/exit_button.dart';
-import 'package:eatvio_app/widgets/next_step_button.dart';
 import 'package:eatvio_app/widgets/custom_text_form_field.dart';
 import 'package:carousel_slider/carousel_slider.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_dotenv/flutter_dotenv.dart';
-import 'package:hive/hive.dart';
 import 'package:flutter/services.dart';
 import 'package:cached_network_image/cached_network_image.dart';
 import 'package:http/http.dart' as http;
@@ -55,120 +51,113 @@ class MyProfileScreen extends StatelessWidget {
    mediaQueryData = MediaQuery.of(context);
    return SafeArea(
        child: Scaffold(
-            appBar: _buildAppBar(context, state),
-            body: Container(
-                width: double.maxFinite,
-                padding: EdgeInsets.symmetric(horizontal: 8.h, vertical: 18.v),
-                child: Column(children: [
-                  _buildMyBlog(context),
-                  SizedBox(height: 15.v),
-                  _buildSettings(context),
-                  SizedBox(height: 30.v),
-                  _buildCarousel(context, state),
-                  SizedBox(height: 15.v),
-                  _buildPlans(
-                    context,
-                    state.plans?.map((plan) => plan['name']).toList(),
-                    state.plans?.map((plan) => plan['image']).toList(),
-                    state.plans?.map((plan) => plan['state']).toList(),
-                  ),
-                  SizedBox(height: 5.v),
-                ])),
+            backgroundColor: Colors.grey[200],
+            resizeToAvoidBottomInset: true,
+            body: SingleChildScrollView(
+                child: Container(
+                    width: double.maxFinite,
+                    decoration: BoxDecoration(color: Colors.grey[200]),
+                    child: Padding(
+                        padding: EdgeInsets.all(16),
+                        child: Column(children: [
+                          SizedBox(height: 30.v),
+                          Container(
+                              padding: EdgeInsets.symmetric(
+                                horizontal: 24.h,
+                                vertical: 12.v,
+                              ),
+                              decoration: BoxDecoration(
+                                color: Colors.white,
+                                borderRadius:
+                                    const BorderRadius.all(Radius.circular(12)),
+                                boxShadow: [
+                                  BoxShadow(
+                                    color: Colors.grey.withOpacity(0.5),
+                                    spreadRadius: 2,
+                                    blurRadius: 5,
+                                    offset: Offset(0, 3),
+                                  ),
+                                ],
+                              ),
+                              child: _buildInfo(context, state)),
+                          SizedBox(height: 15.v),
+                          Container(
+                              padding: EdgeInsets.symmetric(
+                                horizontal: 24.h,
+                                vertical: 12.v,
+                              ),
+                              decoration: BoxDecoration(
+                                color: Colors.white,
+                                borderRadius:
+                                    const BorderRadius.all(Radius.circular(12)),
+                                boxShadow: [
+                                  BoxShadow(
+                                    color: Colors.grey.withOpacity(0.5),
+                                    spreadRadius: 2,
+                                    blurRadius: 5,
+                                    offset: Offset(0, 3),
+                                  ),
+                                ],
+                              ),
+                              child: _buildCarousel(context, state)),
+                          SizedBox(height: 15.v),
+                          if (!state.plans!.isEmpty)
+                            Container(
+                                padding: EdgeInsets.symmetric(
+                                  horizontal: 24.h,
+                                  vertical: 12.v,
+                                ),
+                                decoration: BoxDecoration(
+                                  color: Colors.white,
+                                  borderRadius: const BorderRadius.all(
+                                      Radius.circular(12)),
+                                  boxShadow: [
+                                    BoxShadow(
+                                      color: Colors.grey.withOpacity(0.5),
+                                      spreadRadius: 2,
+                                      blurRadius: 5,
+                                      offset: Offset(0, 3),
+                                    ),
+                                  ],
+                                ),
+                                child: _buildPlans(
+                                  context,
+                                  state.plans
+                                      ?.map((plan) => plan['name'])
+                                      .toList(),
+                                  state.plans
+                                      ?.map((plan) => plan['image'])
+                                      .toList(),
+                                  state.plans
+                                      ?.map((plan) => plan['state'])
+                                      .toList(),
+                                )),
+                          SizedBox(height: 5.v),
+                        ])))),
            bottomNavigationBar: _buildBottomBar(context)));
  }

  /// Section Widget
-  _buildAppBar(BuildContext context, MyProfileLoadedState state) {
+  _buildInfo(BuildContext context, MyProfileLoadedState state) {
    print(state.user?['profile_photo_url']);
-    return CustomAppBar(
-        height: 54.v,
-        leadingWidth: 28.h,
-        title: Padding(
-            padding: EdgeInsets.only(left: 20.h),
-            child: Row(children: [
-              CachedNetworkImage(
-                imageUrl: state.user?['profile_photo_url'],
-                imageBuilder: (context, imageProvider) => CircleAvatar(
-                  backgroundImage: imageProvider,
-                  radius: 20,
-                ),
-                placeholder: (context, url) => CircularProgressIndicator(),
-                errorWidget: (context, url, error) => CircleAvatar(
-                  child: Icon(Icons.error),
-                  backgroundColor: Colors.red,
-                  radius: 20,
-                ),
-              ),
-              AppbarSubtitle(
-                  text: state.user?['name'],
-                  margin: EdgeInsets.only(left: 35.h, top: 12.v, bottom: 9.v))
-            ])),
-        actions: [
-          ExitButton(
-            text: "exit".tr,
-            margin: EdgeInsets.symmetric(horizontal: 16.h, vertical: 17.v),
-            onTap: _onTapLogout(context),
-          )
-        ]);
-  }
-
-  Function _onTapLogout(BuildContext context) {
-    return () async {
-      final box = await Hive.openBox('token');
-      final token = box.get('token');
-      final response = await http.post(
-        Uri.parse(dotenv.env['SERVER_ROOT']! + '/profile/logout'),
-        headers: {
-          'Authorization': 'Bearer $token',
-        },
-      );
-
-      if (response.statusCode == 204) {
-        print(response.statusCode);
-        box.delete('token'); // Удаляем токен из Hive
-        Navigator.pushNamed(
-          context,
-          AppRoutes.authScreen,
-        );
-      }
-    };
-  }
-
-  /// Section Widget
-  _buildMyBlog(BuildContext context) {
-    return Padding(
-        padding: EdgeInsets.symmetric(horizontal: 7.h),
-        child: Row(mainAxisAlignment: MainAxisAlignment.center, children: [
-          CustomImageView(
-              imagePath: ImageConstant.imgGrid,
-              height: 24.adaptSize,
-              width: 24.adaptSize,
-              margin: EdgeInsets.symmetric(vertical: 3.v)),
-          Expanded(
-              child: NextStepButton(
-                  buttonStyle: CustomButtonStyles.outlinePrimaryTL15,
-                  text: "my_blog".tr.toUpperCase(),
-                  margin: EdgeInsets.only(left: 10.h)))
-        ]));
-  }
-
-  /// Section Widget
-  _buildSettings(BuildContext context) {
-    return Padding(
-        padding: EdgeInsets.symmetric(horizontal: 7.h),
-        child: Row(mainAxisAlignment: MainAxisAlignment.center, children: [
-          CustomImageView(
-              imagePath: ImageConstant.imgSearch,
-              height: 24.adaptSize,
-              width: 24.adaptSize,
-              margin: EdgeInsets.symmetric(vertical: 3.v)),
-          Expanded(
-              child: NextStepButton(
-                  buttonStyle: CustomButtonStyles.outlinePrimaryTL15,
-                  onPressed: onTapSettings(context),
-                  text: "my_settings".tr.toUpperCase(),
-                  margin: EdgeInsets.only(left: 10.h))),
-        ]));
+    return Column(children: [
+      CachedNetworkImage(
+        imageUrl: state.user?['profile_photo_url'],
+        imageBuilder: (context, imageProvider) => CircleAvatar(
+          backgroundImage: imageProvider,
+          radius: 60,
+        ),
+        placeholder: (context, url) => CircularProgressIndicator(),
+        errorWidget: (context, url, error) => CircleAvatar(
+          child: Icon(Icons.person),
+          backgroundColor: Colors.grey[200],
+          radius: 60,
+        ),
+      ),
+      AppbarSubtitle(text: state.user?['name']),
+      SizedBox(height: 20.v),
+      Text(state.userDetails?['additional_info']),
+    ]);
  }

  onTapSettings(BuildContext context) {
@@ -183,7 +172,7 @@ class MyProfileScreen extends StatelessWidget {

  _buildCarousel(BuildContext contex, MyProfileLoadedState state) {
    return CarouselSlider(
-      options: CarouselOptions(height: 340.0),
+      options: CarouselOptions(height: 265.0),
      items: [1, 2, 3].map((chartType) {
        return Builder(
          builder: (BuildContext context) {
--- a/lib/presentation/profile/my_profile_screen/my_settings_screen.dart
+++ b/lib/presentation/profile/my_profile_screen/my_settings_screen.dart
@@ -61,7 +61,8 @@ class MySettingsScreen extends StatelessWidget {
                  Container(
                      decoration: BoxDecoration(
                        color: Colors.white,
-                        borderRadius: BorderRadius.circular(12),
+                        borderRadius:
+                            const BorderRadius.all(Radius.circular(12)),
                        boxShadow: [
                          BoxShadow(
                            color: Colors.grey.withOpacity(0.5),
@@ -96,7 +97,7 @@ class MySettingsScreen extends StatelessWidget {
                    ),
                    decoration: BoxDecoration(
                      color: Colors.white,
-                      borderRadius: BorderRadius.circular(12),
+                      borderRadius: const BorderRadius.all(Radius.circular(12)),
                      boxShadow: [
                        BoxShadow(
                          color: Colors.grey.withOpacity(0.5),
@@ -121,7 +122,7 @@ class MySettingsScreen extends StatelessWidget {
                    ),
                    decoration: BoxDecoration(
                      color: Colors.white,
-                      borderRadius: BorderRadius.circular(12),
+                      borderRadius: const BorderRadius.all(Radius.circular(12)),
                      boxShadow: [
                        BoxShadow(
                          color: Colors.grey.withOpacity(0.5),
@@ -147,7 +148,7 @@ class MySettingsScreen extends StatelessWidget {
                    ),
                    decoration: BoxDecoration(
                      color: Colors.white,
-                      borderRadius: BorderRadius.circular(12),
+                      borderRadius: const BorderRadius.all(Radius.circular(12)),
                      boxShadow: [
                        BoxShadow(
                          color: Colors.grey.withOpacity(0.5),
@@ -175,38 +176,6 @@ class MySettingsScreen extends StatelessWidget {
    );
  }

-  /// Section Widget
-  _buildAppBar(BuildContext context, String username) {
-    return Container(
-        decoration: BoxDecoration(
-          color: Colors.white,
-          borderRadius: BorderRadius.circular(12),
-          boxShadow: [
-            BoxShadow(
-              color: Colors.grey.withOpacity(0.5),
-              spreadRadius: 2,
-              blurRadius: 5,
-              offset: Offset(0, 3),
-            ),
-          ],
-        ),
-        child: CustomAppBar(
-          height: 54.v,
-          leadingWidth: 28.h,
-          leading: AppbarLeadingImage(
-              imagePath: ImageConstant.imgArrowLeft,
-              margin: EdgeInsets.only(left: 16.h, top: 15.v, bottom: 15.v),
-              onTap: onTapBack(context)),
-          title: Padding(
-              padding: EdgeInsets.only(left: 20.h),
-              child: Row(children: [
-                AppbarSubtitle(
-                    text: username,
-                    margin: EdgeInsets.only(left: 80.h, top: 12.v, bottom: 9.v))
-              ])),
-        ));
-  }
-
  Function onTapBack(BuildContext context) {
    return () {
      onTapArrowLeft(context);
--- a/lib/widgets/custom_navigation_menu.dart
+++ b/lib/widgets/custom_navigation_menu.dart
@@ -1,6 +1,9 @@
 import 'package:eatvio_app/core/app_export.dart';
 import 'package:flutter/material.dart';
 import 'package:eatvio_app/widgets/custom_navigation_menu_item.dart';
+import 'package:hive/hive.dart';
+import 'package:flutter_dotenv/flutter_dotenv.dart';
+import 'package:http/http.dart' as http;

 class CustomNavigationMenu extends StatelessWidget {
  @override
@@ -53,12 +56,33 @@ class CustomNavigationMenu extends StatelessWidget {
          MenuItem(
            icon: ImageConstant.imgExit,
            text: 'Выход',
-            onTap: () {
-              // Действие при нажатии на "Выход"
-            },
+            onTap: _onTapLogout(context),
+            // Действие при нажатии на "Выход"
          ),
        ],
      ),
    );
  }
 }
+
+_onTapLogout(BuildContext context) {
+  return () async {
+    final box = await Hive.openBox('token');
+    final token = box.get('token');
+    final response = await http.post(
+      Uri.parse(dotenv.env['SERVER_ROOT']! + '/profile/logout'),
+      headers: {
+        'Authorization': 'Bearer $token',
+      },
+    );
+
+    if (response.statusCode == 204) {
+      print(response.statusCode);
+      box.delete('token'); // Удаляем токен из Hive
+      Navigator.pushNamed(
+        context,
+        AppRoutes.authScreen,
+      );
+    }
+  };
+}