Skip to content

Commit 64e1edb

Browse files
authored
Merge branch 'main' into front/tae
2 parents da9daba + 4b05e2d commit 64e1edb

File tree

3 files changed

+5
-0
lines changed

3 files changed

+5
-0
lines changed

frontend/ongi/lib/core/home_ourfamily_text.dart

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@ class HomeOngiText extends StatelessWidget {
3838
),
3939
),
4040
],
41+
4142
);
4243
}
4344
}

frontend/ongi/lib/screens/home/home_screen.dart

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@ class _HomeScreenState extends State<HomeScreen> {
3232
}
3333

3434
@override
35+
3536
Widget build(BuildContext context) {
3637
return Scaffold(
3738
backgroundColor: Colors.white,
@@ -108,6 +109,7 @@ class CapsuleButton extends StatelessWidget {
108109
duration: const Duration(milliseconds: 200),
109110
width: double.infinity,
110111
height: 68,
112+
111113
margin: const EdgeInsets.symmetric(vertical: 2),
112114
decoration: BoxDecoration(
113115
color: selected ? AppColors.ongiOrange : Colors.white,
@@ -132,6 +134,7 @@ class CapsuleButton extends StatelessWidget {
132134
svgAsset,
133135
width: MediaQuery.of(context).size.width * 0.07,
134136
height: MediaQuery.of(context).size.width * 0.07,
137+
135138
colorFilter: ColorFilter.mode(
136139
selected ? Colors.white : AppColors.ongiOrange,
137140
BlendMode.srcIn,

frontend/ongi/lib/screens/login/login_ready_screen.dart

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ import 'package:flutter/material.dart';
33
import 'package:ongi/core/app_background.dart';
44
import 'package:ongi/screens/bottom_nav.dart';
55

6+
67
class LoginReadyScreen extends StatefulWidget {
78
final String username;
89
const LoginReadyScreen({required this.username, super.key});

0 commit comments

Comments
 (0)