Skip to content

Commit 937fa89

Browse files
authored
Merge pull request #26 from CODE-LG/ui/sign_up_profile_interest
[UI] 코드 프로필 작성 페이지 (관심사/취향)
2 parents a043167 + 2a9a0f7 commit 937fa89

18 files changed

Lines changed: 491 additions & 302 deletions

lib/auth/presentation/pages/congratulation/congratulation_page.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -114,4 +114,4 @@ class CongratulationPage extends StatelessWidget {
114114
),
115115
);
116116
}
117-
}
117+
}

lib/auth/presentation/pages/congratulation/widgets/congratulation_app_bar.dart

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,7 @@ class CongratulationAppBar extends StatelessWidget
1919
mainAxisAlignment: MainAxisAlignment.spaceBetween,
2020
crossAxisAlignment: CrossAxisAlignment.center,
2121
children: [
22-
SizedBox(
23-
width: AppGaps.gap36,
24-
),
22+
SizedBox(width: AppGaps.gap36),
2523
Text(
2624
"회원가입",
2725
style: AppTypography.subtitle2.copyWith(color: AppColors.grey900),

lib/auth/presentation/pages/login/login_viewmodel.dart

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,10 @@ class LoginViewModel extends ChangeNotifier {
1515
try {
1616
bool installed = await isKakaoTalkInstalled();
1717

18-
OAuthToken token = installed
19-
? await UserApi.instance.loginWithKakaoTalk()
20-
: await UserApi.instance.loginWithKakaoAccount();
18+
OAuthToken token =
19+
installed
20+
? await UserApi.instance.loginWithKakaoTalk()
21+
: await UserApi.instance.loginWithKakaoAccount();
2122

2223
final user = await UserApi.instance.me();
2324

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
import 'package:code_l/auth/presentation/pages/terms_and_conditions/terms_and_conditions_viewmodel.dart';
22
import 'package:flutter_riverpod/flutter_riverpod.dart';
33

4-
final termsAndConditionsViewModelProvider =
5-
ChangeNotifierProvider((ref) => TermsAndConditionsViewmodel());
4+
final termsAndConditionsViewModelProvider = ChangeNotifierProvider(
5+
(ref) => TermsAndConditionsViewmodel(),
6+
);

lib/auth/presentation/pages/terms_and_conditions/terms_and_condition_page.dart

Lines changed: 19 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,8 @@ class TermsAndConditionPage extends ConsumerWidget {
4343
Navigator.push(
4444
context,
4545
MaterialPageRoute(
46-
builder: (context) => const WomanVerificationPage()),
46+
builder: (context) => const WomanVerificationPage(),
47+
),
4748
);
4849
},
4950
),
@@ -72,19 +73,21 @@ class TermsAndConditionPage extends ConsumerWidget {
7273
Text(
7374
"모두 동의합니다.",
7475
style: AppTypography.subtitle2.copyWith(
75-
color: viewmodel.checkState[0]
76-
? AppColors.grey900
77-
: AppColors.grey500,
76+
color:
77+
viewmodel.checkState[0]
78+
? AppColors.grey900
79+
: AppColors.grey500,
7880
),
7981
),
8082
IconButton(
8183
onPressed: () => notifier.toggleAll(),
8284
iconSize: 36,
8385
icon: Icon(
8486
Icons.check_circle_outline,
85-
color: viewmodel.checkState[0]
86-
? AppColors.grey900
87-
: AppColors.grey500,
87+
color:
88+
viewmodel.checkState[0]
89+
? AppColors.grey900
90+
: AppColors.grey500,
8891
),
8992
),
9093
],
@@ -95,17 +98,16 @@ class TermsAndConditionPage extends ConsumerWidget {
9598
mainAxisAlignment: MainAxisAlignment.spaceBetween,
9699
children: [
97100
TextButton(
98-
style: TextButton.styleFrom(
99-
padding: EdgeInsets.zero,
100-
),
101+
style: TextButton.styleFrom(padding: EdgeInsets.zero),
101102
onPressed: () {},
102103
child: Text(
103104
getLabel(i),
104105
style: AppTypography.body2.copyWith(
105106
decoration: TextDecoration.underline,
106-
color: viewmodel.checkState[i]
107-
? AppColors.grey900
108-
: AppColors.grey500,
107+
color:
108+
viewmodel.checkState[i]
109+
? AppColors.grey900
110+
: AppColors.grey500,
109111
),
110112
),
111113
),
@@ -114,9 +116,10 @@ class TermsAndConditionPage extends ConsumerWidget {
114116
iconSize: 24,
115117
icon: Icon(
116118
Icons.check,
117-
color: viewmodel.checkState[i]
118-
? AppColors.grey900
119-
: AppColors.grey500,
119+
color:
120+
viewmodel.checkState[i]
121+
? AppColors.grey900
122+
: AppColors.grey500,
120123
),
121124
),
122125
],

lib/auth/presentation/pages/terms_and_conditions/terms_and_conditions_viewmodel.dart

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,10 @@ class TermsAndConditionsViewmodel extends ChangeNotifier {
2121

2222
void toggleAll() {
2323
final allAgree = !checkState[0];
24-
checkState = [allAgree, for (int i = 1; i < checkState.length; i++) allAgree];
24+
checkState = [
25+
allAgree,
26+
for (int i = 1; i < checkState.length; i++) allAgree,
27+
];
2528
if (checkState.sublist(1, 4).every((checked) => checked)) {
2629
isValid = true;
2730
} else {
Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
import 'package:code_l/auth/presentation/pages/woman/woman_verification_viewmodel.dart';
22
import 'package:flutter_riverpod/flutter_riverpod.dart';
33

4-
final womanViewmodelProvider =
5-
ChangeNotifierProvider((ref) => WomanVerificationViewmodel());
4+
final womanViewmodelProvider = ChangeNotifierProvider(
5+
(ref) => WomanVerificationViewmodel(),
6+
);

lib/auth/presentation/pages/woman/widgets/woman_verification_app_bar.dart

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,7 @@ class WomanVerificationAppBar extends StatelessWidget
1919
mainAxisAlignment: MainAxisAlignment.spaceBetween,
2020
crossAxisAlignment: CrossAxisAlignment.center,
2121
children: [
22-
SizedBox(
23-
width: AppGaps.gap36,
24-
),
22+
SizedBox(width: AppGaps.gap36),
2523
Text(
2624
"여성확인 안내",
2725
style: AppTypography.subtitle2.copyWith(color: AppColors.grey900),

0 commit comments

Comments
 (0)