forked from eatvio/eatvio_app
feat: remove calendar, increase fontSize in comments, settings, blog posts and plans
This commit is contained in:
BIN
assets/.DS_Store
vendored
BIN
assets/.DS_Store
vendored
Binary file not shown.
@@ -65,7 +65,7 @@ class AppRouter {
|
||||
routes: [
|
||||
GoRoute(
|
||||
path: '/auth-screen',
|
||||
name: 'authScreen',
|
||||
name: 'authScreen',
|
||||
builder: (context, state) => const AuthScreen(),
|
||||
routes: [
|
||||
GoRoute(
|
||||
|
||||
@@ -167,7 +167,7 @@ Future<void> init() async {
|
||||
sl.registerLazySingleton(
|
||||
() => Dio(
|
||||
BaseOptions(
|
||||
baseUrl: baseUrl,
|
||||
baseUrl: baseUrl,
|
||||
headers: {
|
||||
'accept': 'application/json',
|
||||
'content-type': 'application/json',
|
||||
|
||||
@@ -1,12 +1,11 @@
|
||||
import 'package:flutter_secure_storage/flutter_secure_storage.dart';
|
||||
|
||||
abstract class TokenStorage {
|
||||
|
||||
static Future<bool> 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<String?> 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<void> removeTokenInStorage() async => (await FlutterSecureStorage().delete(key: 'token'));
|
||||
|
||||
@@ -72,7 +72,7 @@ class _CommentsWidgetState extends State<CommentsWidget> {
|
||||
style: TextStyle(
|
||||
height: 1,
|
||||
color: appTheme.gray,
|
||||
fontSize: 12,
|
||||
fontSize: 14,
|
||||
fontWeight: FontWeight.w500,
|
||||
),
|
||||
),
|
||||
@@ -84,7 +84,7 @@ class _CommentsWidgetState extends State<CommentsWidget> {
|
||||
style: TextStyle(
|
||||
height: 1,
|
||||
color: appTheme.black,
|
||||
fontSize: 12,
|
||||
fontSize: 16,
|
||||
fontWeight: FontWeight.w500,
|
||||
),
|
||||
),
|
||||
@@ -97,7 +97,7 @@ class _CommentsWidgetState extends State<CommentsWidget> {
|
||||
style: TextStyle(
|
||||
height: 1,
|
||||
color: appTheme.gray,
|
||||
fontSize: 12,
|
||||
fontSize: 14,
|
||||
fontWeight: FontWeight.w500,
|
||||
),
|
||||
),
|
||||
@@ -112,8 +112,8 @@ class _CommentsWidgetState extends State<CommentsWidget> {
|
||||
style: TextStyle(
|
||||
height: 1,
|
||||
color: appTheme.gray,
|
||||
fontSize: 12,
|
||||
fontWeight: FontWeight.w500,
|
||||
fontSize: 14,
|
||||
fontWeight: FontWeight.w600,
|
||||
),
|
||||
),
|
||||
),
|
||||
|
||||
@@ -102,7 +102,7 @@ class _PlanWidgetState extends State<PlanWidget> {
|
||||
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<PlanWidget> {
|
||||
"*": Style(
|
||||
margin: Margins.zero,
|
||||
color: appTheme.black,
|
||||
fontSize: FontSize(TextStyles.textSMedium.fontSize ?? 14),
|
||||
fontSize: FontSize(16),
|
||||
fontWeight: TextStyles.textSMedium.fontWeight ?? FontWeight.w400,
|
||||
),
|
||||
},
|
||||
|
||||
@@ -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,
|
||||
|
||||
@@ -106,6 +106,7 @@ class _ProfileBlogPostWidgetState extends State<ProfileBlogPostWidget> {
|
||||
state.blogPosts[widget.index].title,
|
||||
style: TextStyle(
|
||||
fontWeight: FontWeight.w600,
|
||||
fontSize: 18,
|
||||
color: Colors.black87,
|
||||
),
|
||||
),
|
||||
@@ -120,6 +121,7 @@ class _ProfileBlogPostWidgetState extends State<ProfileBlogPostWidget> {
|
||||
: state.blogPosts[widget.index].description,
|
||||
style: {
|
||||
"*": Style(
|
||||
fontSize: FontSize(16),
|
||||
color: Colors.black87,
|
||||
),
|
||||
},
|
||||
|
||||
@@ -420,7 +420,7 @@ class _SettingsScreenState extends State<SettingsScreen> {
|
||||
title: Text(
|
||||
title,
|
||||
style: TextStyle(
|
||||
fontSize: 14,
|
||||
fontSize: 16,
|
||||
fontWeight: FontWeight.w500,
|
||||
height: 1,
|
||||
),
|
||||
|
||||
Reference in New Issue
Block a user