Skip to content

Commit

Permalink
🦺 Feat: solve conflicts
Browse files Browse the repository at this point in the history 
Feat: solve conflicts
  • Loading branch information
@gw282
gw282 committed Dec 11, 2023
1 parent bcf6d2b commit 1175d39
Showing 1 changed file with 13 additions and 61 deletions.
74 changes: 13 additions & 61 deletions lib/pages/setting_page.dart
View file
Original file line number Diff line number Diff line change
Expand Up @@ -164,12 +164,12 @@ class _SettingPageState extends State<SettingPage>
style: TextStyle(fontSize: 14),
decoration: InputDecoration(
focusedBorder:
const UnderlineInputBorder(
const UnderlineInputBorder(
borderSide: BorderSide(
color: AppColor.swatchColor),
),
enabledBorder:
const UnderlineInputBorder(
const UnderlineInputBorder(
borderSide: BorderSide(
color: AppColor.swatchColor),
),
Expand All @@ -195,7 +195,7 @@ class _SettingPageState extends State<SettingPage>
if (!isEditMode)
Column(
crossAxisAlignment:
CrossAxisAlignment.start,
CrossAxisAlignment.start,
children: [
const SizedBox(height: 16),
Text(
Expand Down Expand Up @@ -224,12 +224,12 @@ class _SettingPageState extends State<SettingPage>
controller: _nickNameController,
decoration: InputDecoration(
focusedBorder:
const UnderlineInputBorder(
const UnderlineInputBorder(
borderSide: BorderSide(
color: AppColor.swatchColor),
),
enabledBorder:
const UnderlineInputBorder(
const UnderlineInputBorder(
borderSide: BorderSide(
color: AppColor.swatchColor),
),
Expand All @@ -255,7 +255,7 @@ class _SettingPageState extends State<SettingPage>
if (!isEditMode)
Column(
crossAxisAlignment:
CrossAxisAlignment.start,
CrossAxisAlignment.start,
children: [
const SizedBox(height: 16),
Text(
Expand Down Expand Up @@ -290,13 +290,13 @@ class _SettingPageState extends State<SettingPage>
keyboardType: TextInputType.number,
decoration: InputDecoration(
focusedBorder:
const UnderlineInputBorder(
const UnderlineInputBorder(
// 선택 시 하단 밑줄 색상 변경
borderSide: BorderSide(
color: AppColor.swatchColor),
),
enabledBorder:
const UnderlineInputBorder(
const UnderlineInputBorder(
// 비활성 시 하단 밑줄 색상
borderSide: BorderSide(
color: AppColor.swatchColor),
Expand All @@ -305,7 +305,7 @@ class _SettingPageState extends State<SettingPage>
hintStyle: TextStyle(
fontSize: 14,
color:
Colors.grey.withOpacity(0.7),
Colors.grey.withOpacity(0.7),
),
),
validator: (value) {
Expand All @@ -328,7 +328,7 @@ class _SettingPageState extends State<SettingPage>
if (!isEditMode)
Column(
crossAxisAlignment:
CrossAxisAlignment.start,
CrossAxisAlignment.start,
children: [
const SizedBox(height: 20),
Text(context
Expand Down Expand Up @@ -363,27 +363,6 @@ class _SettingPageState extends State<SettingPage>
Divider(
color: AppColor.swatchColor,
)
const SizedBox(width: 20),
// Gender

SizedBox(
width: 150,
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Text("Gender"),
const SizedBox(height: 20),
Text(
context.read<IdProvider>().gender == 0 ? "Male" : "Female",
// TODO: 수정해야됨
style: TextStyle(
fontSize: 16,
),
),
Divider(color: AppColor.swatchColor,)
],
),
),
],
),
),
Expand All @@ -398,7 +377,7 @@ class _SettingPageState extends State<SettingPage>
),
),
Positioned(
left: 320,
left: 300,
right: 0,
top: 110,
child: Row(
Expand Down Expand Up @@ -552,33 +531,6 @@ class _SettingPageState extends State<SettingPage>
fontWeight: FontWeight.bold,
color: AppColor.swatchColor,
),
),

if(!isEditMode)
Positioned(
left: 0,
right: 0,
top: 620,
child: Row(
mainAxisAlignment: MainAxisAlignment.center,
children: [
ElevatedButton(
onPressed: () {
setState(() {
buttonText = 'Log Out';
});
showDialog(
context: context,
builder: (BuildContext buildContext) {
return AlertDialog(
backgroundColor: AppColor.objectColor,
content: const Text(
'Do you wanna leave?',
textAlign: TextAlign.center,
style: TextStyle(
fontSize: 20,
fontWeight: FontWeight.bold,
color: AppColor.swatchColor,
),
actions: [
Center(
Expand All @@ -590,7 +542,7 @@ class _SettingPageState extends State<SettingPage>
context,
MaterialPageRoute(
builder: (context) =>
const LoginSignUpPage()));
const LoginSignUpPage()));
},
style: TextButton.styleFrom(
foregroundColor: AppColor.objectColor,
Expand Down Expand Up @@ -636,4 +588,4 @@ class _SettingPageState extends State<SettingPage>
),
);
}
}
}

0 comments on commit 1175d39

Please sign in to comment.