Skip to content

Commit

Permalink
Merge pull request #100 from Fam-Story/fix/99-fix-설정창-수정
Browse files Browse the repository at this point in the history
✏️ Fix: 한글로 적은 부분 영어로 수정
  • Loading branch information
gw282 authored Dec 11, 2023
2 parents b2ce8c3 + 124809d commit d89b83e
Show file tree
Hide file tree
Showing 2 changed files with 35 additions and 15 deletions.
24 changes: 22 additions & 2 deletions lib/pages/setting_page.dart
Original file line number Diff line number Diff line change
Expand Up @@ -326,7 +326,7 @@ class _SettingPageState extends State<SettingPage> with TickerProviderStateMixin
Text("Gender"),
const SizedBox(height: 20),
Text(
context.read<IdProvider>().gender == 0 ? "남자" : "여자",
context.read<IdProvider>().gender == 0 ? "Male" : "Female",
// TODO: 수정해야됨
style: TextStyle(
fontSize: 16,
Expand All @@ -347,7 +347,7 @@ class _SettingPageState extends State<SettingPage> with TickerProviderStateMixin
),
),
Positioned(
left: 300,
left: 320,
right: 0,
top: 110,
child: Row(
Expand Down Expand Up @@ -416,6 +416,26 @@ class _SettingPageState extends State<SettingPage> with TickerProviderStateMixin
),
),
),
if(!isEditMode)
Positioned(
left: 320,
right: 0,
top: 480,
child: Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: [
IconButton(
onPressed: () {
setState(() {
// Toggle the edit mode when the button is pressed
isEditMode = !isEditMode;
});
},
icon: const Icon(CupertinoIcons.pen)),
],
),
),
if(!isEditMode)
Positioned(
left: 0,
right: 0,
Expand Down
26 changes: 13 additions & 13 deletions pubspec.lock
Original file line number Diff line number Diff line change
Expand Up @@ -53,10 +53,10 @@ packages:
dependency: transitive
description:
name: collection
sha256: ee67cb0715911d28db6bf4af1026078bd6f0128b07a5f66fb2ed94ec6783c09a
sha256: f092b211a4319e98e5ff58223576de6c2803db36221657b46c82574721240687
url: "https://pub.dev"
source: hosted
version: "1.18.0"
version: "1.17.2"
crypto:
dependency: transitive
description:
Expand Down Expand Up @@ -340,10 +340,10 @@ packages:
dependency: transitive
description:
name: meta
sha256: a6e590c838b18133bb482a2745ad77c5bb7715fb0451209e1a7567d416678b8e
sha256: "3c74dbf8763d36539f114c799d8a2d87343b5067e9d796ca22b5eb8437090ee3"
url: "https://pub.dev"
source: hosted
version: "1.10.0"
version: "1.9.1"
nested:
dependency: transitive
description:
Expand Down Expand Up @@ -481,18 +481,18 @@ packages:
dependency: transitive
description:
name: stack_trace
sha256: "73713990125a6d93122541237550ee3352a2d84baad52d375a4cad2eb9b7ce0b"
sha256: c3c7d8edb15bee7f0f74debd4b9c5f3c2ea86766fe4178eb2a18eb30a0bdaed5
url: "https://pub.dev"
source: hosted
version: "1.11.1"
version: "1.11.0"
stream_channel:
dependency: transitive
description:
name: stream_channel
sha256: ba2aa5d8cc609d96bbb2899c28934f9e1af5cddbd60a827822ea467161eb54e7
sha256: "83615bee9045c1d322bbbd1ba209b7a749c2cbcdcb3fdd1df8eb488b3279c1c8"
url: "https://pub.dev"
source: hosted
version: "2.1.2"
version: "2.1.1"
string_scanner:
dependency: transitive
description:
Expand All @@ -513,10 +513,10 @@ packages:
dependency: transitive
description:
name: test_api
sha256: "5c2f730018264d276c20e4f1503fd1308dfbbae39ec8ee63c5236311ac06954b"
sha256: "75760ffd7786fffdfb9597c35c5b27eaeec82be8edfb6d71d32651128ed7aab8"
url: "https://pub.dev"
source: hosted
version: "0.6.1"
version: "0.6.0"
timezone:
dependency: transitive
description:
Expand Down Expand Up @@ -545,10 +545,10 @@ packages:
dependency: transitive
description:
name: web
sha256: afe077240a270dcfd2aafe77602b4113645af95d0ad31128cc02bce5ac5d5152
sha256: dc8ccd225a2005c1be616fe02951e2e342092edf968cf0844220383757ef8f10
url: "https://pub.dev"
source: hosted
version: "0.3.0"
version: "0.1.4-beta"
web_socket_channel:
dependency: "direct main"
description:
Expand Down Expand Up @@ -582,5 +582,5 @@ packages:
source: hosted
version: "6.3.0"
sdks:
dart: ">=3.2.0-194.0.dev <4.0.0"
dart: ">=3.1.0 <4.0.0"
flutter: ">=3.7.0"

0 comments on commit d89b83e

Please sign in to comment.