apoloz/eatvio_app
1
0
Fork 0
forked from eatvio/eatvio_app
Code Pull Requests Activity

feat: remove calendar, increase fontSize in comments, settings, blog posts and plans

Browse Source
This commit is contained in:
BLoC
2025-03-10 15:46:09 +03:00
parent 3dea50b4c2
commit 4cae752f8d
10 changed files with 20 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
.DS_Store vendored
View File

Binary file not shown.

BIN
assets/.DS_Store vendored
View File

Binary file not shown.

2
lib/core/app_router.dart
View File

@@ -65,7 +65,7 @@ class AppRouter {
routes: [ routes: [
GoRoute( GoRoute(
path: '/auth-screen', path: '/auth-screen',
name: 'authScreen', name: 'authScreen',
builder: (context, state) => const AuthScreen(), builder: (context, state) => const AuthScreen(),
routes: [ routes: [
GoRoute( GoRoute(

2
lib/core/locator_service.dart
View File

@@ -167,7 +167,7 @@ Future<void> init() async {
sl.registerLazySingleton( sl.registerLazySingleton(
() => Dio( () => Dio(
BaseOptions( BaseOptions(
baseUrl: baseUrl, baseUrl: baseUrl,
headers: { headers: {
'accept': 'application/json', 'accept': 'application/json',
'content-type': 'application/json', 'content-type': 'application/json',

5
lib/core/token_storage.dart
View File

@@ -1,12 +1,11 @@
import 'package:flutter_secure_storage/flutter_secure_storage.dart'; import 'package:flutter_secure_storage/flutter_secure_storage.dart';
abstract class TokenStorage { abstract class TokenStorage {
static Future<bool> haveTokenInStorage() async { static Future<bool> haveTokenInStorage() async {
try { try {
if (await FlutterSecureStorage().read(key: 'token') == null) { if (await FlutterSecureStorage().read(key: 'token') == null) {
return false; return false;
} else { } else {
return true; return true;
} }
} catch (e) { } catch (e) {
@@ -17,7 +16,7 @@ abstract class TokenStorage {
static Future<String?> getTokenFromStorage() async => await FlutterSecureStorage().read(key: 'token'); static Future<String?> getTokenFromStorage() async => await FlutterSecureStorage().read(key: 'token');
static saveTokenInStorage(String token) async { static saveTokenInStorage(String token) async {
await FlutterSecureStorage().write(key: 'token', value: token); await FlutterSecureStorage().write(key: 'token', value: token);
} }
static Future<void> removeTokenInStorage() async => (await FlutterSecureStorage().delete(key: 'token')); static Future<void> removeTokenInStorage() async => (await FlutterSecureStorage().delete(key: 'token'));

10
lib/features/feed/presentation/widgets/comments_widget.dart
View File

@@ -72,7 +72,7 @@ class _CommentsWidgetState extends State<CommentsWidget> {
style: TextStyle( style: TextStyle(
height: 1, height: 1,
color: appTheme.gray, color: appTheme.gray,
fontSize: 12, fontSize: 14,
fontWeight: FontWeight.w500, fontWeight: FontWeight.w500,
), ),
), ),
@@ -84,7 +84,7 @@ class _CommentsWidgetState extends State<CommentsWidget> {
style: TextStyle( style: TextStyle(
height: 1, height: 1,
color: appTheme.black, color: appTheme.black,
fontSize: 12, fontSize: 16,
fontWeight: FontWeight.w500, fontWeight: FontWeight.w500,
), ),
), ),
@@ -97,7 +97,7 @@ class _CommentsWidgetState extends State<CommentsWidget> {
style: TextStyle( style: TextStyle(
height: 1, height: 1,
color: appTheme.gray, color: appTheme.gray,
fontSize: 12, fontSize: 14,
fontWeight: FontWeight.w500, fontWeight: FontWeight.w500,
), ),
), ),
@@ -112,8 +112,8 @@ class _CommentsWidgetState extends State<CommentsWidget> {
style: TextStyle( style: TextStyle(
height: 1, height: 1,
color: appTheme.gray, color: appTheme.gray,
fontSize: 12, fontSize: 14,
fontWeight: FontWeight.w500, fontWeight: FontWeight.w600,
), ),
), ),
), ),

4
lib/features/feed/presentation/widgets/plan_widget.dart
View File

@@ -102,7 +102,7 @@ class _PlanWidgetState extends State<PlanWidget> {
padding: const EdgeInsets.symmetric(horizontal: 16), padding: const EdgeInsets.symmetric(horizontal: 16),
child: Text( child: Text(
widget.plan.name, widget.plan.name,
style: TextStyles.textMSemibold.copyWith(color: appTheme.black), style: TextStyles.textMSemibold.copyWith(color: appTheme.black, fontSize: 18),
), ),
), ),
if (widget.plan.details.isNotEmpty) ...[ if (widget.plan.details.isNotEmpty) ...[
@@ -117,7 +117,7 @@ class _PlanWidgetState extends State<PlanWidget> {
"*": Style( "*": Style(
margin: Margins.zero, margin: Margins.zero,
color: appTheme.black, color: appTheme.black,
fontSize: FontSize(TextStyles.textSMedium.fontSize ?? 14), fontSize: FontSize(16),
fontWeight: TextStyles.textSMedium.fontWeight ?? FontWeight.w400, fontWeight: TextStyles.textSMedium.fontWeight ?? FontWeight.w400,
), ),
}, },

12
lib/features/menu/presentation/pages/menu_screen.dart
View File

@@ -69,12 +69,12 @@ class MenuScreen extends StatelessWidget {
} }
}, },
), ),
_divider(context), // _divider(context),
_tile( // _tile(
leading: 'assets/icons/calendar.svg', // leading: 'assets/icons/calendar.svg',
title: 'Календарь', // title: 'Календарь',
onTap: () => GoRouter.of(context).push('/calendar-screen'), // onTap: () => GoRouter.of(context).push('/calendar-screen'),
), // ),
_divider(context), _divider(context),
_tile( _tile(
leading: ImageConstant.icnGlossary, leading: ImageConstant.icnGlossary,

2
lib/features/profile/presentation/widgets/profile_blog_post_widget.dart
View File

@@ -106,6 +106,7 @@ class _ProfileBlogPostWidgetState extends State<ProfileBlogPostWidget> {
state.blogPosts[widget.index].title, state.blogPosts[widget.index].title,
style: TextStyle( style: TextStyle(
fontWeight: FontWeight.w600, fontWeight: FontWeight.w600,
fontSize: 18,
color: Colors.black87, color: Colors.black87,
), ),
), ),
@@ -120,6 +121,7 @@ class _ProfileBlogPostWidgetState extends State<ProfileBlogPostWidget> {
: state.blogPosts[widget.index].description, : state.blogPosts[widget.index].description,
style: { style: {
"*": Style( "*": Style(
fontSize: FontSize(16),
color: Colors.black87, color: Colors.black87,
), ),
}, },

2
lib/features/settings/presentation/pages/settings_screen.dart
View File

@@ -420,7 +420,7 @@ class _SettingsScreenState extends State<SettingsScreen> {
title: Text( title: Text(
title, title,
style: TextStyle( style: TextStyle(
fontSize: 14, fontSize: 16,
fontWeight: FontWeight.w500, fontWeight: FontWeight.w500,
height: 1, height: 1,
), ),