From 4cae752f8db0eec2bdb86b089b622e427e2c6f85 Mon Sep 17 00:00:00 2001 From: BLoC Date: Mon, 10 Mar 2025 15:46:09 +0300 Subject: [PATCH] feat: remove calendar, increase fontSize in comments, settings, blog posts and plans --- .DS_Store | Bin 10244 -> 10244 bytes assets/.DS_Store | Bin 6148 -> 6148 bytes lib/core/app_router.dart | 2 +- lib/core/locator_service.dart | 2 +- lib/core/token_storage.dart | 5 ++--- .../presentation/widgets/comments_widget.dart | 10 +++++----- .../presentation/widgets/plan_widget.dart | 4 ++-- .../menu/presentation/pages/menu_screen.dart | 12 ++++++------ .../widgets/profile_blog_post_widget.dart | 2 ++ .../presentation/pages/settings_screen.dart | 2 +- 10 files changed, 20 insertions(+), 19 deletions(-) diff --git a/.DS_Store b/.DS_Store index b237a450f14bf60bedd2561b8eb1898ef575efd1..50b6c093799f8145f1674ed47c7eb89c98032404 100644 GIT binary patch delta 803 zcmcgou}&L75S;;nZ4&Sr&IF?r2vbC&p`eW*jznTb$d?!)I|R(#d3{+}c2B!&6KLGf zrAb7SCLcfk2(R@(}?@TDL4l zTdIE}M7kFRh6-(e9yVGTEt zMg4sk8^4G#2HZL%*0B!ku~2NHo+39F0|Nsi1A_nqL;l97jf{&6n3=ReVyp~_45bVy44Dl1 zo;mr+NjdpRKvAGFMp+=O_a6)x7$);D=}NN#RV6dzGvqN8qp9tlti^PK!^q4)N5Rh zJqEHo17;Oa92i~B)qu~2NHo+3930|Nsi1A_nqL-EF_jf{*elg(IkC-<`K const AuthScreen(), routes: [ GoRoute( diff --git a/lib/core/locator_service.dart b/lib/core/locator_service.dart index 7e79faf4..d88e8746 100644 --- a/lib/core/locator_service.dart +++ b/lib/core/locator_service.dart @@ -167,7 +167,7 @@ Future init() async { sl.registerLazySingleton( () => Dio( BaseOptions( - baseUrl: baseUrl, + baseUrl: baseUrl, headers: { 'accept': 'application/json', 'content-type': 'application/json', diff --git a/lib/core/token_storage.dart b/lib/core/token_storage.dart index 5b28ffc7..a3eba6cc 100644 --- a/lib/core/token_storage.dart +++ b/lib/core/token_storage.dart @@ -1,12 +1,11 @@ import 'package:flutter_secure_storage/flutter_secure_storage.dart'; abstract class TokenStorage { - static Future haveTokenInStorage() async { try { if (await FlutterSecureStorage().read(key: 'token') == null) { return false; - } else { + } else { return true; } } catch (e) { @@ -17,7 +16,7 @@ abstract class TokenStorage { static Future getTokenFromStorage() async => await FlutterSecureStorage().read(key: 'token'); static saveTokenInStorage(String token) async { - await FlutterSecureStorage().write(key: 'token', value: token); + await FlutterSecureStorage().write(key: 'token', value: token); } static Future removeTokenInStorage() async => (await FlutterSecureStorage().delete(key: 'token')); diff --git a/lib/features/feed/presentation/widgets/comments_widget.dart b/lib/features/feed/presentation/widgets/comments_widget.dart index ac4ea977..d9e44fb3 100644 --- a/lib/features/feed/presentation/widgets/comments_widget.dart +++ b/lib/features/feed/presentation/widgets/comments_widget.dart @@ -72,7 +72,7 @@ class _CommentsWidgetState extends State { style: TextStyle( height: 1, color: appTheme.gray, - fontSize: 12, + fontSize: 14, fontWeight: FontWeight.w500, ), ), @@ -84,7 +84,7 @@ class _CommentsWidgetState extends State { style: TextStyle( height: 1, color: appTheme.black, - fontSize: 12, + fontSize: 16, fontWeight: FontWeight.w500, ), ), @@ -97,7 +97,7 @@ class _CommentsWidgetState extends State { style: TextStyle( height: 1, color: appTheme.gray, - fontSize: 12, + fontSize: 14, fontWeight: FontWeight.w500, ), ), @@ -112,8 +112,8 @@ class _CommentsWidgetState extends State { style: TextStyle( height: 1, color: appTheme.gray, - fontSize: 12, - fontWeight: FontWeight.w500, + fontSize: 14, + fontWeight: FontWeight.w600, ), ), ), diff --git a/lib/features/feed/presentation/widgets/plan_widget.dart b/lib/features/feed/presentation/widgets/plan_widget.dart index 3166aa96..5d3f5bda 100644 --- a/lib/features/feed/presentation/widgets/plan_widget.dart +++ b/lib/features/feed/presentation/widgets/plan_widget.dart @@ -102,7 +102,7 @@ class _PlanWidgetState extends State { padding: const EdgeInsets.symmetric(horizontal: 16), child: Text( widget.plan.name, - style: TextStyles.textMSemibold.copyWith(color: appTheme.black), + style: TextStyles.textMSemibold.copyWith(color: appTheme.black, fontSize: 18), ), ), if (widget.plan.details.isNotEmpty) ...[ @@ -117,7 +117,7 @@ class _PlanWidgetState extends State { "*": Style( margin: Margins.zero, color: appTheme.black, - fontSize: FontSize(TextStyles.textSMedium.fontSize ?? 14), + fontSize: FontSize(16), fontWeight: TextStyles.textSMedium.fontWeight ?? FontWeight.w400, ), }, diff --git a/lib/features/menu/presentation/pages/menu_screen.dart b/lib/features/menu/presentation/pages/menu_screen.dart index 7c359acb..73a3a358 100644 --- a/lib/features/menu/presentation/pages/menu_screen.dart +++ b/lib/features/menu/presentation/pages/menu_screen.dart @@ -69,12 +69,12 @@ class MenuScreen extends StatelessWidget { } }, ), - _divider(context), - _tile( - leading: 'assets/icons/calendar.svg', - title: 'Календарь', - onTap: () => GoRouter.of(context).push('/calendar-screen'), - ), + // _divider(context), + // _tile( + // leading: 'assets/icons/calendar.svg', + // title: 'Календарь', + // onTap: () => GoRouter.of(context).push('/calendar-screen'), + // ), _divider(context), _tile( leading: ImageConstant.icnGlossary, diff --git a/lib/features/profile/presentation/widgets/profile_blog_post_widget.dart b/lib/features/profile/presentation/widgets/profile_blog_post_widget.dart index dd1389bc..1b19f2b8 100644 --- a/lib/features/profile/presentation/widgets/profile_blog_post_widget.dart +++ b/lib/features/profile/presentation/widgets/profile_blog_post_widget.dart @@ -106,6 +106,7 @@ class _ProfileBlogPostWidgetState extends State { state.blogPosts[widget.index].title, style: TextStyle( fontWeight: FontWeight.w600, + fontSize: 18, color: Colors.black87, ), ), @@ -120,6 +121,7 @@ class _ProfileBlogPostWidgetState extends State { : state.blogPosts[widget.index].description, style: { "*": Style( + fontSize: FontSize(16), color: Colors.black87, ), }, diff --git a/lib/features/settings/presentation/pages/settings_screen.dart b/lib/features/settings/presentation/pages/settings_screen.dart index c7ac0a30..00ce51c0 100644 --- a/lib/features/settings/presentation/pages/settings_screen.dart +++ b/lib/features/settings/presentation/pages/settings_screen.dart @@ -420,7 +420,7 @@ class _SettingsScreenState extends State { title: Text( title, style: TextStyle( - fontSize: 14, + fontSize: 16, fontWeight: FontWeight.w500, height: 1, ),