Merge pull request #146 from sparcs-kaist/design/change-fab-input-com…

…ment v1.0.2 디자인 피드백 반영
sparcs-kaist · Mar 1, 2024 · 748c802 · 748c802
2 parents b580045 + 6dfdd1e
commit 748c802
Show file tree

Hide file tree

Showing 25 changed files with 30 additions and 43 deletions.
diff --git a/assets/fonts/NotoSansKR-Black.otf b/assets/fonts/NotoSansKR-Black.otf
diff --git a/assets/fonts/NotoSansKR-Bold.otf b/assets/fonts/NotoSansKR-Bold.otf
diff --git a/assets/fonts/NotoSansKR-Light.otf b/assets/fonts/NotoSansKR-Light.otf
diff --git a/assets/fonts/NotoSansKR-Medium.otf b/assets/fonts/NotoSansKR-Medium.otf
diff --git a/assets/fonts/NotoSansKR-Regular.otf b/assets/fonts/NotoSansKR-Regular.otf
diff --git a/assets/fonts/NotoSansKR-Thin.otf b/assets/fonts/NotoSansKR-Thin.otf
diff --git a/assets/fonts/Pretendard-Black.otf b/assets/fonts/Pretendard-Black.otf
diff --git a/assets/fonts/Pretendard-Bold.otf b/assets/fonts/Pretendard-Bold.otf
diff --git a/assets/fonts/Pretendard-ExtraBold.otf b/assets/fonts/Pretendard-ExtraBold.otf
diff --git a/assets/fonts/Pretendard-ExtraLight.otf b/assets/fonts/Pretendard-ExtraLight.otf
diff --git a/assets/fonts/Pretendard-Light.otf b/assets/fonts/Pretendard-Light.otf
diff --git a/assets/fonts/Pretendard-Medium.otf b/assets/fonts/Pretendard-Medium.otf
diff --git a/assets/fonts/Pretendard-Regular.otf b/assets/fonts/Pretendard-Regular.otf
diff --git a/assets/fonts/Pretendard-SemiBold.otf b/assets/fonts/Pretendard-SemiBold.otf
diff --git a/assets/fonts/Pretendard-Thin.otf b/assets/fonts/Pretendard-Thin.otf
diff --git a/assets/icons/comment.svg b/assets/icons/comment.svg
diff --git a/lib/main.dart b/lib/main.dart
@@ -144,7 +144,7 @@ class _MyAppState extends State<MyApp> {
     return ThemeData(
       appBarTheme:
           const AppBarTheme(elevation: 0, backgroundColor: Colors.white),
-      fontFamily: 'NotoSansKR',
+      fontFamily: 'Pretendard',
       scaffoldBackgroundColor: Colors.white,
       splashColor: Colors.transparent,
       textSelectionTheme: const TextSelectionThemeData(

diff --git a/lib/pages/bulletin_list_page.dart b/lib/pages/bulletin_list_page.dart
@@ -152,7 +152,6 @@ class _BulletinListPageState extends State<BulletinListPage> {
                               hintStyle: const TextStyle(
                                 color: Color(0xFFBBBBBB),
                                 fontSize: 16,
-                                fontFamily: 'NotoSansKR',
                                 height: null,
                                 fontWeight: FontWeight.w500,
                               ),
@@ -341,7 +340,6 @@ class _BulletinListPageState extends State<BulletinListPage> {
                                     style: const TextStyle(
                                       color: Color(0xFF333333),
                                       fontSize: 20,
-                                      fontFamily: 'NotoSansKR',
                                       fontWeight: FontWeight.w700,
                                     ),
                                   ),

diff --git a/lib/pages/post_list_show_page.dart b/lib/pages/post_list_show_page.dart
@@ -272,15 +272,15 @@ class _PostListShowPageState extends State<PostListShowPage>
                 updateAllBulletinList();
                 debugPrint('FloatingActionButton pressed');
               },
-              backgroundColor: Colors.white,
+              backgroundColor: ColorsInfo.newara,
               child: SizedBox(
                 width: 42,
                 height: 42,
                 child: SvgPicture.asset(
                   'assets/icons/modify.svg',
                   fit: BoxFit.fill,
                   colorFilter: const ColorFilter.mode(
-                      ColorsInfo.newara, BlendMode.srcIn), // 글쓰기 아이콘 색상 변경
+                      Colors.white, BlendMode.srcIn), // 글쓰기 아이콘 색상 변경
                 ),
               ),
             ),

diff --git a/lib/pages/post_view_page.dart b/lib/pages/post_view_page.dart
@@ -1641,6 +1641,7 @@ class _PostViewPageState extends State<PostViewPage> {
               width: 1.0, color: Color(0xFFF0F0F0)), // 원하는 색상과 두께로 설정
         ),
       ),
+      padding: const EdgeInsets.only(top: 7),
       child: Column(
         key: _textFieldKey,
         crossAxisAlignment: CrossAxisAlignment.start,
@@ -1715,7 +1716,6 @@ class _PostViewPageState extends State<PostViewPage> {
               // TextFormField
               Expanded(
                 child: Container(
-                  margin: const EdgeInsets.only(top: 7),
                   constraints: const BoxConstraints(
                     minHeight: 36,
                   ),
@@ -1774,9 +1774,9 @@ class _PostViewPageState extends State<PostViewPage> {
     return Form(
       key: _formKey,
       child: Container(
-          margin: const EdgeInsets.only(left: 15),
+          margin: const EdgeInsets.only(left: 13),
           child: TextFormField(
-            style: TextStyle(
+            style: const TextStyle(
               fontSize: 14,
             ),
             cursorColor: ColorsInfo.newara,

diff --git a/lib/pages/post_write_page.dart b/lib/pages/post_write_page.dart
@@ -1278,7 +1278,6 @@ class _PostWritePageState extends State<PostWritePage>
     TextStyle h1h2h3h4h5h6CommonStyle = const TextStyle(
       color: Colors.black,
       fontWeight: FontWeight.w600,
-      fontFamily: 'NotoSansKR',
       height: 1.15,
     );
     return quill.DefaultStyles(
@@ -1312,7 +1311,6 @@ class _PostWritePageState extends State<PostWritePage>
         const TextStyle(
           color: Color(0xFF4a4a4a),
           fontWeight: FontWeight.w500,
-          fontFamily: 'NotoSansKR',
           height: 1.5,
           fontSize: 16,
         ),
@@ -1322,23 +1320,18 @@ class _PostWritePageState extends State<PostWritePage>
       ),
 
       bold: const TextStyle(
-          color: Color(0xff363636),
-          fontFamily: 'NotoSansKR',
-          fontWeight: FontWeight.w700),
+          color: Color(0xff363636), fontWeight: FontWeight.w700),
       italic: const TextStyle(
-        fontFamily: 'NotoSansKR',
         fontStyle: FontStyle.italic,
       ),
       underline: const TextStyle(
-        fontFamily: 'NatoSansKR',
         decoration: TextDecoration.underline,
       ),
       //<code> 태그
       inlineCode: quill.InlineCodeStyle(
         style: const TextStyle(
           color: Color(0xffff3860),
           fontWeight: FontWeight.w400,
-          fontFamily: 'NotoSansKR',
           height: 1.5,
           fontSize: 14,
         ),
@@ -1350,7 +1343,6 @@ class _PostWritePageState extends State<PostWritePage>
         const TextStyle(
           color: Color(0xffBBBBBB),
           fontWeight: FontWeight.w500,
-          fontFamily: 'NotoSansKR',
           height: 1.5,
           fontSize: 16,
         ),
@@ -1364,7 +1356,6 @@ class _PostWritePageState extends State<PostWritePage>
           //  backgroundColor: Colors.grey,
           color: Color(0xFF4a4a4a),
           fontWeight: FontWeight.w400,
-          fontFamily: 'NotoSansKR',
           height: 1.5,
           fontSize: 16,
         ),

diff --git a/lib/pages/setting_page.dart b/lib/pages/setting_page.dart
@@ -356,6 +356,7 @@ class SettingPageState extends State<SettingPage> {
                           ),
                         ),
                         child: Column(
+                          mainAxisAlignment: MainAxisAlignment.center,
                           crossAxisAlignment: CrossAxisAlignment.center,
                           children: [
                             const SizedBox(height: 10),

diff --git a/lib/pages/terms_and_conditions_page.dart b/lib/pages/terms_and_conditions_page.dart
@@ -156,7 +156,7 @@ class _TermsAndConditionsPageState extends State<TermsAndConditionsPage> {
                                       ],
                                     ),
                                   ),
-                              
+
                                   _buildBoldText("제 4조. 게시물에 대한 권리"),
                                   Padding(
                                     padding: const EdgeInsets.only(left: 20.0),
@@ -173,7 +173,7 @@ class _TermsAndConditionsPageState extends State<TermsAndConditionsPage> {
                                       ],
                                     ),
                                   ),
-                              
+
                                   _buildBoldText("제 5조. 책임의 제한"),
                                   Padding(
                                     padding: const EdgeInsets.only(left: 20.0),
@@ -202,7 +202,7 @@ class _TermsAndConditionsPageState extends State<TermsAndConditionsPage> {
                                       ],
                                     ),
                                   ),
-                              
+
                                   _buildBoldText("제 6조. 문의 및 제보"),
                                   Padding(
                                     padding: const EdgeInsets.only(left: 20.0),
@@ -252,9 +252,9 @@ class _TermsAndConditionsPageState extends State<TermsAndConditionsPage> {
                                       ],
                                     ),
                                   ),
-                              
+
                                   _buildNormalText("본 약관은 2020-09-26부터 적용됩니다."),
-                              
+
                                   // 제 3조 이후의 내용도 같은 방식으로 추가...
                                 ],
                               ),
@@ -348,7 +348,6 @@ class _TermsAndConditionsPageState extends State<TermsAndConditionsPage> {
       style: const TextStyle(
         color: Color(0xFF4a4a4a),
         fontWeight: FontWeight.w500,
-        fontFamily: 'NotoSansKR',
         height: 1.6,
         fontSize: 16,
       ),
@@ -360,7 +359,6 @@ class _TermsAndConditionsPageState extends State<TermsAndConditionsPage> {
       text,
       style: const TextStyle(
         color: Color(0xff363636),
-        fontFamily: 'NotoSansKR',
         fontWeight: FontWeight.w700,
         height: 1.6,
         fontSize: 16,

diff --git a/lib/utils/html_info.dart b/lib/utils/html_info.dart
@@ -91,7 +91,7 @@ String getContentHtml(String content, {double? width}) {
       html {
           -webkit-box-sizing: border-box;
           box-sizing: border-box
-          font-family: "Noto Sans KR",sans-serif;
+          font-family: "Pretendard",sans-serif;
       }
 
       audio,img,video {
@@ -129,7 +129,7 @@ String getContentHtml(String content, {double? width}) {
       }
 
       body,button,input,select,textarea {
-        font-family: "Noto Sans KR",sans-serif
+        font-family: "Pretendard",sans-serif
       }
 
       code,pre {

diff --git a/pubspec.yaml b/pubspec.yaml
@@ -55,17 +55,23 @@ flutter:
   - assets/images/
   - assets/icons/
   fonts:
-  - family: NotoSansKR
+  - family: Pretendard
     fonts:
-    - asset: assets/fonts/NotoSansKR-Black.otf
+    - asset: assets/fonts/Pretendard-Black.otf
       weight: 900
-    - asset: assets/fonts/NotoSansKR-Bold.otf
+    - asset: assets/fonts/Pretendard-ExtraBold.otf
+      weight: 800
+    - asset: assets/fonts/Pretendard-Bold.otf
       weight: 700
-    - asset: assets/fonts/NotoSansKR-Medium.otf
+    - asset: assets/fonts/Pretendard-SemiBold.otf
+      weight: 600
+    - asset: assets/fonts/Pretendard-Medium.otf
       weight: 500
-    - asset: assets/fonts/NotoSansKR-Regular.otf
+    - asset: assets/fonts/Pretendard-Regular.otf
       weight: 400
-    - asset: assets/fonts/NotoSansKR-Light.otf
+    - asset: assets/fonts/Pretendard-Light.otf
       weight: 300
-    - asset: assets/fonts/NotoSansKR-Thin.otf
+    - asset: assets/fonts/Pretendard-ExtraLight.otf
+      weight: 200
+    - asset: assets/fonts/Pretendard-Thin.otf
       weight: 100