Skip to content

코드 프로필 작성 페이지 (프로필 사진) #34

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
kkosang merged 6 commits into from
Apr 25, 2025
Merged

코드 프로필 작성 페이지 (프로필 사진) #34

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
f104944
feat: pub add image_picker
kkosang Apr 25, 2025
93a42b0
feat: 프로필 이미지 위젯 구현
kkosang Apr 25, 2025
5f34ee1
feat: 프로필 이미지 페이지 구현
kkosang Apr 25, 2025
86e9ebe
feat: 얼굴 이미지 등록 페이지 구현
kkosang Apr 25, 2025
786e404
Merge branch 'develop' into ui/sign_up_profile_image
kkosang Apr 25, 2025
d067775
chore: dart format
kkosang Apr 25, 2025
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
2 changes: 2 additions & 0 deletions ios/Runner.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,7 @@
B955AE8AC425CE69815F5900 /* Pods_RunnerTests.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_RunnerTests.framework; sourceTree = BUILT_PRODUCTS_DIR; };
C7F447F3DE684CF75971C579 /* Pods-Runner.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.release.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.release.xcconfig"; sourceTree = "<group>"; };
E1FBF0C02DAE7C460017C51F /* GoogleService-Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = "GoogleService-Info.plist"; sourceTree = "<group>"; };
E1FBF0C22DBBDA7A0017C51F /* Runner.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = Runner.entitlements; sourceTree = "<group>"; };
E6228E8708160B7145026049 /* Pods_Runner.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_Runner.framework; sourceTree = BUILT_PRODUCTS_DIR; };
E771DCC6EFA21C1573E7EC1E /* Pods-RunnerTests.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-RunnerTests.debug.xcconfig"; path = "Target Support Files/Pods-RunnerTests/Pods-RunnerTests.debug.xcconfig"; sourceTree = "<group>"; };
/* End PBXFileReference section */
Expand Down Expand Up @@ -146,6 +147,7 @@
97C146F01CF9000F007C117D /* Runner */ = {
isa = PBXGroup;
children = (
E1FBF0C22DBBDA7A0017C51F /* Runner.entitlements */,
AFE368912DBBC8390072E7EF /* Runner.entitlements */,
E1FBF0C02DAE7C460017C51F /* GoogleService-Info.plist */,
97C146FA1CF9000F007C117D /* Main.storyboard */,
Expand Down
4 changes: 2 additions & 2 deletions lib/auth/data/datasources/remote/login_remote_datasource.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@ class LoginRemoteDataSource {
}

Future<AuthorizationCredentialAppleID> loginWithApple() async {
final AuthorizationCredentialAppleID credential =
await SignInWithApple.getAppleIDCredential(
final AuthorizationCredentialAppleID
credential = await SignInWithApple.getAppleIDCredential(
scopes: [
AppleIDAuthorizationScopes.email,
AppleIDAuthorizationScopes.fullName,
Expand Down
17 changes: 10 additions & 7 deletions lib/auth/presentation/pages/login/login_viewmodel.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,10 @@ class LoginViewModel extends ChangeNotifier {
try {
bool installed = await isKakaoTalkInstalled();

OAuthToken token = installed
? await UserApi.instance.loginWithKakaoTalk()
: await UserApi.instance.loginWithKakaoAccount();
OAuthToken token =
installed
? await UserApi.instance.loginWithKakaoTalk()
: await UserApi.instance.loginWithKakaoAccount();

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

Expand All @@ -44,8 +45,9 @@ class LoginViewModel extends ChangeNotifier {
// 애플 인증 정보 가져오기
final credential = useCase.callAppleLogin(LoginType.apple);
// authorizationCode와 identityToken 확인
final authorizationCode =
credential.then((value) => value.authorizationCode);
final authorizationCode = credential.then(
(value) => value.authorizationCode,
);
final identityToken = credential.then((value) => value.identityToken);

if (authorizationCode == null || identityToken == null) {
Expand All @@ -56,8 +58,9 @@ class LoginViewModel extends ChangeNotifier {
await loginOauth(LoginType.apple, identityToken.toString());

log(
name: 'LoginViewModel::loginWithApple',
'success: ${identityToken.toString()}');
name: 'LoginViewModel::loginWithApple',
'success: ${identityToken.toString()}',
);
} catch (e) {
log(name: 'LoginViewModel::loginWithApple', 'error: $e');
}
Expand Down
28 changes: 16 additions & 12 deletions lib/auth/presentation/pages/terms_and_conditions/terms_and_condition_page.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,19 +73,21 @@ class TermsAndConditionPage extends ConsumerWidget {
Text(
"모두 동의합니다.",
style: AppTypography.subtitle2.copyWith(
color: viewmodel.checkState[0]
? AppColors.grey900
: AppColors.grey500,
color:
viewmodel.checkState[0]
? AppColors.grey900
: AppColors.grey500,
),
),
IconButton(
onPressed: () => notifier.toggleAll(),
iconSize: 36,
icon: Icon(
Icons.check_circle_outline,
color: viewmodel.checkState[0]
? AppColors.grey900
: AppColors.grey500,
color:
viewmodel.checkState[0]
? AppColors.grey900
: AppColors.grey500,
),
),
],
Expand All @@ -102,9 +104,10 @@ class TermsAndConditionPage extends ConsumerWidget {
getLabel(i),
style: AppTypography.body2.copyWith(
decoration: TextDecoration.underline,
color: viewmodel.checkState[i]
? AppColors.grey900
: AppColors.grey500,
color:
viewmodel.checkState[i]
? AppColors.grey900
: AppColors.grey500,
),
),
),
Expand All @@ -113,9 +116,10 @@ class TermsAndConditionPage extends ConsumerWidget {
iconSize: 24,
icon: Icon(
Icons.check,
color: viewmodel.checkState[i]
? AppColors.grey900
: AppColors.grey500,
color:
viewmodel.checkState[i]
? AppColors.grey900
: AppColors.grey500,
),
),
],
Expand Down
14 changes: 8 additions & 6 deletions lib/auth/presentation/pages/woman/woman_verification_Page.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -130,9 +130,10 @@ class WomanVerificationPage extends ConsumerWidget {
Text(
"위 안내사항을 모두 확인하였습니다.",
style: AppTypography.subtitle2.copyWith(
color: viewModel.isChecked
? AppColors.grey800
: AppColors.grey400,
color:
viewModel.isChecked
? AppColors.grey800
: AppColors.grey400,
),
),
IconButton(
Expand All @@ -141,9 +142,10 @@ class WomanVerificationPage extends ConsumerWidget {
},
icon: Icon(
Icons.check_circle_outline,
color: viewModel.isChecked
? AppColors.grey800
: AppColors.grey400,
color:
viewModel.isChecked
? AppColors.grey800
: AppColors.grey400,
),
),
],
Expand Down
75 changes: 39 additions & 36 deletions lib/sign_up/presentation/pages/code_job/code_job_page.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,44 +63,47 @@ class _JobSelectionPageState extends ConsumerState<CodeJobPage> {
mainAxisSpacing: 12,
crossAxisSpacing: 12,
childAspectRatio: 1.1,
children: jobList.map((job) {
final isSelected = selectedJob == job['label'];
return GestureDetector(
onTap: () {
setState(() => selectedJob = job['label']);
},
child: Container(
decoration: BoxDecoration(
color: isSelected
? AppColors.primaryLight
: AppColors.grey100,
border: Border.all(
color: isSelected
? AppColors.primary
: AppColors.grey100,
width: 1.5,
),
borderRadius: BorderRadius.circular(8),
),
padding: EdgeInsets.symmetric(vertical: 16),
child: Column(
mainAxisAlignment: MainAxisAlignment.center,
children: [
Image.asset(
job['image']!,
width: 16,
height: 22,
children:
jobList.map((job) {
final isSelected = selectedJob == job['label'];
return GestureDetector(
onTap: () {
setState(() => selectedJob = job['label']);
},
child: Container(
decoration: BoxDecoration(
color:
isSelected
? AppColors.primaryLight
: AppColors.grey100,
border: Border.all(
color:
isSelected
? AppColors.primary
: AppColors.grey100,
width: 1.5,
),
borderRadius: BorderRadius.circular(8),
),
SizedBox(height: AppGaps.gap4),
Text(
job['label'] ?? '',
style: AppTypography.body2,
padding: EdgeInsets.symmetric(vertical: 16),
child: Column(
mainAxisAlignment: MainAxisAlignment.center,
children: [
Image.asset(
job['image']!,
width: 16,
height: 22,
),
SizedBox(height: AppGaps.gap4),
Text(
job['label'] ?? '',
style: AppTypography.body2,
),
],
),
],
),
),
);
}).toList(),
),
);
}).toList(),
),
),
],
Expand Down
18 changes: 10 additions & 8 deletions lib/sign_up/presentation/pages/code_lifestyle/code_lifestyle_drink_page.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,8 +55,8 @@ class _CodeLifestyleDrinkPageState extends State<CodeLifestyleDrinkPage> {
Expanded(
child: ListView.separated(
itemCount: drinkOptions.length,
separatorBuilder: (_, __) =>
const SizedBox(height: AppGaps.gap16),
separatorBuilder:
(_, __) => const SizedBox(height: AppGaps.gap16),
itemBuilder: (context, index) {
final item = drinkOptions[index];
final isSelected = selectedIndex == index;
Expand All @@ -74,13 +74,15 @@ class _CodeLifestyleDrinkPageState extends State<CodeLifestyleDrinkPage> {
),
decoration: BoxDecoration(
border: Border.all(
color: isSelected
? AppColors.primary
: AppColors.grey400,
color:
isSelected
? AppColors.primary
: AppColors.grey400,
),
color: isSelected
? AppColors.primaryLight
: AppColors.white,
color:
isSelected
? AppColors.primaryLight
: AppColors.white,
),
child: Row(
children: [
Expand Down
18 changes: 10 additions & 8 deletions lib/sign_up/presentation/pages/code_lifestyle/code_lifestyle_smoke_page.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,8 +63,8 @@ class _CodeLifestyleDrinkPageState extends State<CodeLifestyleSmokePage> {
Expanded(
child: ListView.separated(
itemCount: drinkOptions.length,
separatorBuilder: (_, __) =>
const SizedBox(height: AppGaps.gap16),
separatorBuilder:
(_, __) => const SizedBox(height: AppGaps.gap16),
itemBuilder: (context, index) {
final item = drinkOptions[index];
final isSelected = selectedIndex == index;
Expand All @@ -82,13 +82,15 @@ class _CodeLifestyleDrinkPageState extends State<CodeLifestyleSmokePage> {
),
decoration: BoxDecoration(
border: Border.all(
color: isSelected
? AppColors.primary
: AppColors.grey400,
color:
isSelected
? AppColors.primary
: AppColors.grey400,
),
color: isSelected
? AppColors.primaryLight
: AppColors.white,
color:
isSelected
? AppColors.primaryLight
: AppColors.white,
),
child: Row(
children: [
Expand Down
Loading