Skip to content

Commit e113c4b

Browse files
authored
feat: 마음기록 캘린더 화면 구현 및 app_color 추가 (#60)
마음 기록 캘린더 화면을 구현하였고, app_color에 OngiGrey 색상을 추가하였습니다.
1 parent a0e1f06 commit e113c4b

File tree

7 files changed

+345
-63
lines changed

7 files changed

+345
-63
lines changed

frontend/ongi/lib/core/app_colors.dart

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,8 @@ class AppColors {
44
static const ongiOrange = Color(0xFFFD6C01);
55
static const ongiBlue = Color(0xFFBFECFF);
66
static const ongiLigntgrey = Color(0xFFF7F7F7);
7+
static const ongiGrey = Color(0xFFD9D9D9);
78
static const pillsItemBackground = Color(0xFFFF974A);
89
static const pillsAddItemBackground = Color(0xFFD9D9D9);
910
static const pillsAddItemBackgroundDark = Color(0xFF979797);
10-
}
11+
}

frontend/ongi/lib/main.dart

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
import 'package:firebase_messaging/firebase_messaging.dart';
22
import 'package:flutter/material.dart';
3+
import 'package:intl/date_symbol_data_local.dart';
34
import 'package:flutter_native_splash/flutter_native_splash.dart';
45
import 'package:ongi/screens/login/login_pw_screen.dart';
56
import 'package:ongi/screens/start_screen.dart';
@@ -12,6 +13,7 @@ import 'firebase_options.dart';
1213
void main() async {
1314
WidgetsBinding widgetsBinding = WidgetsFlutterBinding.ensureInitialized();
1415
FlutterNativeSplash.preserve(widgetsBinding: widgetsBinding);
16+
await initializeDateFormatting();
1517

1618
// await Firebase.initializeApp(options: DefaultFirebaseOptions.currentPlatform);
1719
// FirebaseMessaging messaging = FirebaseMessaging.instance;
@@ -46,11 +48,11 @@ class _OngiAppState extends State<OngiApp> {
4648

4749
Future<void> _initializeApp() async {
4850
final hasToken = await PrefsManager.hasAccessToken();
49-
51+
5052
setState(() {
5153
_homeWidget = hasToken ? const BottomNavScreen() : const StartScreen();
5254
});
53-
55+
5456
FlutterNativeSplash.remove();
5557
}
5658

frontend/ongi/lib/screens/bottom_nav.dart

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,8 @@ import 'package:flutter_svg/flutter_svg.dart';
33
import 'package:ongi/screens/add_record_screen.dart';
44
import 'package:ongi/screens/home/home_screen.dart';
55
import 'package:ongi/screens/health/health_home_screen.dart';
6-
import 'package:ongi/screens/family_tempbar_screen.dart';
6+
import 'package:ongi/screens/photo/photo_calendar_screen.dart';
77
import 'package:ongi/screens/photo/photo_date_screen.dart';
8-
98
import 'package:ongi/screens/mypage/mypage_screen.dart';
109
import 'package:ongi/core/app_colors.dart';
1110

@@ -22,8 +21,8 @@ class _BottomNavScreenState extends State<BottomNavScreen> {
2221
final List<Widget> _screens = [
2322
const HomeScreen(),
2423
const HealthHomeScreen(),
25-
const FamilyTempbarScreen(),
26-
const PhotoDateScreen(),
24+
const AddRecordScreen(),
25+
const PhotoCalendarScreen(),
2726
const ProfileScreen(),
2827
];
2928

@@ -93,7 +92,7 @@ class _BottomNavScreenState extends State<BottomNavScreen> {
9392
gradient: LinearGradient(
9493
begin: Alignment.topCenter,
9594
end: Alignment.bottomCenter,
96-
colors: [ AppColors.ongiBlue, AppColors.ongiOrange ],
95+
colors: [AppColors.ongiBlue, AppColors.ongiOrange],
9796
),
9897
shape: BoxShape.circle,
9998
boxShadow: [
@@ -153,8 +152,7 @@ class _BottomNavScreenState extends State<BottomNavScreen> {
153152
text,
154153
style: TextStyle(
155154
fontSize: 12,
156-
color:isSelected? AppColors.ongiOrange
157-
: Colors.grey[300],
155+
color: isSelected ? AppColors.ongiOrange : Colors.grey[300],
158156
fontFamily: 'Pretendard',
159157
fontWeight: FontWeight.w600,
160158
),
@@ -164,4 +162,4 @@ class _BottomNavScreenState extends State<BottomNavScreen> {
164162
),
165163
);
166164
}
167-
}
165+
}

frontend/ongi/lib/screens/family_tempbar_screen.dart

Lines changed: 0 additions & 52 deletions
This file was deleted.

0 commit comments

Comments
 (0)