Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion frontend/ongi/lib/core/app_colors.dart
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,8 @@ class AppColors {
static const ongiOrange = Color(0xFFFD6C01);
static const ongiBlue = Color(0xFFBFECFF);
static const ongiLigntgrey = Color(0xFFF7F7F7);
static const ongiGrey = Color(0xFFD9D9D9);
static const pillsItemBackground = Color(0xFFFF974A);
static const pillsAddItemBackground = Color(0xFFD9D9D9);
static const pillsAddItemBackgroundDark = Color(0xFF979797);
}
}
6 changes: 4 additions & 2 deletions frontend/ongi/lib/main.dart
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import 'package:firebase_messaging/firebase_messaging.dart';
import 'package:flutter/material.dart';
import 'package:intl/date_symbol_data_local.dart';
import 'package:flutter_native_splash/flutter_native_splash.dart';
import 'package:ongi/screens/login/login_pw_screen.dart';
import 'package:ongi/screens/start_screen.dart';
Expand All @@ -12,6 +13,7 @@ import 'firebase_options.dart';
void main() async {
WidgetsBinding widgetsBinding = WidgetsFlutterBinding.ensureInitialized();
FlutterNativeSplash.preserve(widgetsBinding: widgetsBinding);
await initializeDateFormatting();

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

Future<void> _initializeApp() async {
final hasToken = await PrefsManager.hasAccessToken();

setState(() {
_homeWidget = hasToken ? const BottomNavScreen() : const StartScreen();
});

FlutterNativeSplash.remove();
}

Expand Down
14 changes: 6 additions & 8 deletions frontend/ongi/lib/screens/bottom_nav.dart
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,8 @@ import 'package:flutter_svg/flutter_svg.dart';
import 'package:ongi/screens/add_record_screen.dart';
import 'package:ongi/screens/home/home_screen.dart';
import 'package:ongi/screens/health/health_home_screen.dart';
import 'package:ongi/screens/family_tempbar_screen.dart';
import 'package:ongi/screens/photo/photo_calendar_screen.dart';
import 'package:ongi/screens/photo/photo_date_screen.dart';

import 'package:ongi/screens/mypage/mypage_screen.dart';
import 'package:ongi/core/app_colors.dart';

Expand All @@ -22,8 +21,8 @@ class _BottomNavScreenState extends State<BottomNavScreen> {
final List<Widget> _screens = [
const HomeScreen(),
const HealthHomeScreen(),
const FamilyTempbarScreen(),
const PhotoDateScreen(),
const AddRecordScreen(),
const PhotoCalendarScreen(),
const ProfileScreen(),
];

Expand Down Expand Up @@ -93,7 +92,7 @@ class _BottomNavScreenState extends State<BottomNavScreen> {
gradient: LinearGradient(
begin: Alignment.topCenter,
end: Alignment.bottomCenter,
colors: [ AppColors.ongiBlue, AppColors.ongiOrange ],
colors: [AppColors.ongiBlue, AppColors.ongiOrange],
),
shape: BoxShape.circle,
boxShadow: [
Expand Down Expand Up @@ -153,8 +152,7 @@ class _BottomNavScreenState extends State<BottomNavScreen> {
text,
style: TextStyle(
fontSize: 12,
color:isSelected? AppColors.ongiOrange
: Colors.grey[300],
color: isSelected ? AppColors.ongiOrange : Colors.grey[300],
fontFamily: 'Pretendard',
fontWeight: FontWeight.w600,
),
Expand All @@ -164,4 +162,4 @@ class _BottomNavScreenState extends State<BottomNavScreen> {
),
);
}
}
}
52 changes: 0 additions & 52 deletions frontend/ongi/lib/screens/family_tempbar_screen.dart

This file was deleted.

Loading
Loading