Skip to content

Commit dbe2767

Browse files
StarProximaStarProxima
authored
Merge pull request #32 from StarProxima/fixes-for-app-store
Fixes for app store
2 parents 0a4999b + ec14cf6 commit dbe2767

File tree

7 files changed

+63
-80
lines changed

7 files changed

+63
-80
lines changed

‎lib/features/landing_page/ui/widgets/git_info_card.dart‎

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
import 'package:cube_system/features/analytics/logger.dart';
2+
import 'package:cube_system/features/landing_page/ui/widgets/landing_service_card.dart';
3+
import 'package:cube_system/styles/app_theme_context_extension.dart';
4+
import 'package:flutter/material.dart';
5+
6+
class GitInfoCard extends StatelessWidget {
7+
const GitInfoCard({
8+
super.key,
9+
required this.launchFrom,
10+
});
11+
12+
final String launchFrom;
13+
14+
@override
15+
Widget build(BuildContext context) {
16+
return LandingServiceCard(
17+
title: 'GitHub',
18+
subTitle: Text(
19+
'Это проект с открытым исходным кодом',
20+
style: context.textStyles.smallSubTitle.copyWith(
21+
color: context.colors.subduedText.withOpacity(0.65),
22+
),
23+
),
24+
description:
25+
'Тут можно посмотреть код, предложить новые функции и оставить сообщение об ошибке',
26+
linkName: 'github.com/StarProxima/cube',
27+
uri: Uri.parse('https://github.com/StarProxima/cube'),
28+
onLaunch: (uri) => logger.launch(uri: uri, launchFrom: launchFrom),
29+
);
30+
}
31+
}

‎lib/features/landing_page/ui/widgets/landing_services_page.dart‎

Lines changed: 3 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
import 'package:cube_system/features/analytics/logger.dart';
2+
import 'package:cube_system/features/landing_page/ui/widgets/git_info_card.dart';
23
import 'package:cube_system/gen/assets/assets.gen.dart';
34
import 'package:cube_system/styles/app_theme_context_extension.dart';
45
import 'package:flutter/material.dart';
@@ -19,21 +20,14 @@ class LandingServicesPage extends ConsumerWidget {
1920
child: Column(
2021
crossAxisAlignment: CrossAxisAlignment.start,
2122
children: [
22-
// Center(
23-
// child: Assets.brooklyn.beingProductive3.svg(
24-
// height: 280,
25-
// width: 280,
26-
// ),
27-
// ),
28-
// const SizedBox(height: 24),
2923
Center(
3024
child: Column(
3125
children: [
3226
FadeAnimatedWidget(
3327
child: Assets.brooklyn.managerDesk2.svg(),
3428
),
3529
Text(
36-
'Доступно с любого устройства',
30+
'Все сервисы',
3731
style: context.textStyles.smallSubTitle.copyWith(
3832
fontSize: 16,
3933
),
@@ -60,44 +54,7 @@ class LandingServicesPage extends ConsumerWidget {
6054
onLaunch: (uri) => logger.launch(uri: uri, launchFrom: 'Landing'),
6155
),
6256
const SizedBox(height: 16),
63-
LandingServiceCard(
64-
title: 'Приложение',
65-
subTitle: Text.rich(
66-
TextSpan(
67-
children: [
68-
const TextSpan(
69-
text: 'Android',
70-
),
71-
const TextSpan(
72-
text: ' / ',
73-
),
74-
const TextSpan(
75-
text: 'iOS',
76-
),
77-
const TextSpan(
78-
text: ' / ',
79-
),
80-
const TextSpan(
81-
text: 'Desktop',
82-
),
83-
const TextSpan(
84-
text: ' / ',
85-
),
86-
TextSpan(
87-
text: 'Web',
88-
style: context.textStyles.smallSubTitle.copyWith(
89-
color: context.colors.subduedText.withOpacity(0.65),
90-
),
91-
),
92-
],
93-
),
94-
),
95-
description:
96-
'Многофункциональное приложение для различных платформ',
97-
linkName: 'github.com/StarProxima/cube',
98-
uri: Uri.parse('https://github.com/StarProxima/cube'),
99-
onLaunch: (uri) => logger.launch(uri: uri, launchFrom: 'Landing'),
100-
),
57+
const GitInfoCard(launchFrom: 'Landing'),
10158
const SizedBox(height: 92),
10259
],
10360
),

‎lib/features/navigation/models/main_navigation_bar_item_type.dart‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -4,26 +4,26 @@ enum MainNavigationBarItemType {
44
// 'SEARCH',
55
// 'SEARCH_Interactivity',
66
// ),
7-
notifications(
8-
'Уведомления',
9-
'BELL',
10-
'BELL_Interactivity',
11-
),
12-
notes(
13-
'Заметки',
14-
'CHAT',
15-
'CHAT_Interactivity',
16-
),
7+
// notifications(
8+
// 'Уведомления',
9+
// 'BELL',
10+
// 'BELL_Interactivity',
11+
// ),
12+
// notes(
13+
// 'Заметки',
14+
// 'CHAT',
15+
// 'CHAT_Interactivity',
16+
// ),
1717
timetable(
1818
'Расписание',
1919
'TIMER',
2020
'TIMER_Interactivity',
2121
),
22-
profile(
23-
'Профиль',
24-
'USER',
25-
'USER_Interactivity',
26-
),
22+
// profile(
23+
// 'Профиль',
24+
// 'USER',
25+
// 'USER_Interactivity',
26+
// ),
2727
settings(
2828
'Настройки',
2929
'SETTINGS',

‎lib/features/navigation/ui/main_navigation_bar.dart‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ class _MainBottomNavigationBarState extends ConsumerState<MainNavigationBar> {
4444
unselectedItemColor: context.colors.text,
4545
selectedLabelStyle: context.textStyles.smallLabel,
4646
unselectedLabelStyle: context.textStyles.smallSubTitle,
47-
type: BottomNavigationBarType.shifting,
47+
// type: BottomNavigationBarType.shifting,
4848
currentIndex: type.index,
4949
onTap: (index) {
5050
manager.selectItem(items[index].type);

‎lib/features/settings/ui/settings_page.dart‎

Lines changed: 11 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
import 'package:cube_system/features/analytics/logger.dart';
2+
import 'package:cube_system/features/landing_page/ui/widgets/git_info_card.dart';
23
import 'package:cube_system/features/settings/state_holders/app_settings_state_holder.dart';
34
import 'package:cube_system/styles/app_theme_context_extension.dart';
45
import 'package:cube_system/ui/ui_kit/app_button.dart';
@@ -59,21 +60,7 @@ class _SettingsPageState extends ConsumerState<_SettingsPage> {
5960
padding: const EdgeInsets.all(20),
6061
child: Column(
6162
children: [
62-
LandingServiceCard(
63-
title: 'GitHub',
64-
subTitle: Text(
65-
'Это проект с открытым исходным кодом',
66-
style: context.textStyles.smallSubTitle.copyWith(
67-
color: context.colors.subduedText.withOpacity(0.65),
68-
),
69-
),
70-
description:
71-
'Тут можно оставить сообщение об ошибке и найти последниe версии приложения на Windows и другие платформы',
72-
linkName: 'github.com/StarProxima/cube',
73-
uri: Uri.parse('https://github.com/StarProxima/cube'),
74-
onLaunch: (uri) =>
75-
logger.launch(uri: uri, launchFrom: 'Settings'),
76-
),
63+
const GitInfoCard(launchFrom: 'Settings'),
7764
const SizedBox(height: 20),
7865
const _SettingsPageLessonColors(),
7966
const SizedBox(height: 20),
@@ -95,7 +82,7 @@ class _SettingsPageState extends ConsumerState<_SettingsPage> {
9582
),
9683
const SizedBox(height: 8),
9784
AppButton(
98-
text: 'По всем вопросам',
85+
text: 'Поддержка',
9986
isExpanded: true,
10087
rightIcon: const Icon(
10188
Icons.arrow_forward_ios_rounded,
@@ -111,6 +98,14 @@ class _SettingsPageState extends ConsumerState<_SettingsPage> {
11198
logger.launch(uri: uri, launchFrom: 'Settings');
11299
},
113100
),
101+
const SizedBox(height: 8),
102+
Text(
103+
'Если заметили неточности в расписании или у вас есть предложения по улучшению, обращайтесь в поддержку.',
104+
style: context.textStyles.smallSubTitle.copyWith(
105+
color: context.colors.subduedText,
106+
),
107+
textAlign: TextAlign.center,
108+
),
114109
const SizedBox(height: 32),
115110
const _SettingsPageAppInfo(),
116111
const SizedBox(height: 16),

‎lib/features/settings/ui/widgets/settings_page_lesson_colors.dart‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ class _SettingsPageLessonColors extends ConsumerWidget {
1414
return AppRadioSelector<AppLessonColorsMode>(
1515
label: const Text('Цветовая тема для занятий'),
1616
value: lessonColorsMode,
17-
onSelect: (value) => settingsNotifier.editLessonColorsMode(value),
17+
onSelect: settingsNotifier.editLessonColorsMode,
1818
items: const [
1919
AppRadioSelectorItem(
2020
title: Text('Cube'),

‎pubspec.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
name: cube_system
22
description: Modern electronic timetable
33
publish_to: 'none'
4-
version: 1.1.2+11
4+
version: 1.1.4+12
55

66
environment:
77
sdk: '>=3.0.0 <4.0.0'

0 commit comments

Comments
 (0)