Merge pull request #208 from sparcs-kaist/feat/add-block-number-info-…

…dialog Feat/add block number info dialog
sparcs-kaist · Jul 27, 2024 · 5311032 · 5311032
2 parents 7ec5c6d + 62eb575
commit 5311032
Show file tree

Hide file tree

Showing 9 changed files with 168 additions and 107 deletions.
diff --git a/.fvm/fvm_config.json b/.fvm/fvm_config.json
@@ -1,4 +1,3 @@
 {
-  "flutterSdkVersion": "3.13.9",
-  "flavors": {}
+  "flutterSdkVersion": "3.13.9"
 }
diff --git a/.fvmrc b/.fvmrc
@@ -0,0 +1,4 @@
+{
+  "flutter": "3.13.9",
+  "flavors": {}
+}
diff --git a/.gitignore b/.gitignore
@@ -1,61 +1,63 @@
-# Miscellaneous
-*.class
-*.log
-*.pyc
-*.swp
-.DS_Store
-.atom/
-.buildlog/
-.history
-.svn/
-.vscode/
-migrate_working_dir/
-
-# IntelliJ related
-*.iml
-*.ipr
-*.iws
-.idea/
-
-# The .vscode folder contains launch configuration and tasks you configure in
-# VS Code which you may wish to be included in version control, so this line
-# is commented out by default.
-#.vscode/
-
-# Flutter/Dart/Pub related
-**/doc/api/
-**/ios/Flutter/.last_build_id
-.dart_tool/
-.flutter-plugins
-.flutter-plugins-dependencies
-.packages
-.pub-cache/
-.pub/
-/build/
-
-# fvm related
-.fvm/flutter_sdk
-
-# Symbolication related
-app.*.symbols
-
-# Obfuscation related
-app.*.map.json
-
-# Android Studio will place build artifacts here
-/android/app/debug
-/android/app/profile
-/android/app/release
-
-android/fastlane/report.xml
-android/fastlane/README.md
-android/fastlane/newara-fastlane.json
-android/fastlane/.env
-ios/fastlane/report.xml
-ios/fastlane/README.md
-ios/fastlane/.env.default
-ios/Runner.app.dSYM.zip
-ios/Runner.ipa
-
-.env
-.env.*
+# Miscellaneous
+*.class
+*.log
+*.pyc
+*.swp
+.DS_Store
+.atom/
+.buildlog/
+.history
+.svn/
+.vscode/
+migrate_working_dir/
+
+# IntelliJ related
+*.iml
+*.ipr
+*.iws
+.idea/
+
+# The .vscode folder contains launch configuration and tasks you configure in
+# VS Code which you may wish to be included in version control, so this line
+# is commented out by default.
+#.vscode/
+
+# Flutter/Dart/Pub related
+**/doc/api/
+**/ios/Flutter/.last_build_id
+.dart_tool/
+.flutter-plugins
+.flutter-plugins-dependencies
+.packages
+.pub-cache/
+.pub/
+/build/
+
+# fvm related
+
+# Symbolication related
+app.*.symbols
+
+# Obfuscation related
+app.*.map.json
+
+# Android Studio will place build artifacts here
+/android/app/debug
+/android/app/profile
+/android/app/release
+
+android/fastlane/report.xml
+android/fastlane/README.md
+android/fastlane/newara-fastlane.json
+android/fastlane/.env
+ios/fastlane/report.xml
+ios/fastlane/README.md
+ios/fastlane/.env.default
+ios/Runner.app.dSYM.zip
+ios/Runner.ipa
+
+.env
+.env.*
+
+# FVM Version Cache
+.fvm/
diff --git a/assets/translations/en.json b/assets/translations/en.json
@@ -133,6 +133,7 @@
     "dialogs": {
         "deleteConfirm": "Do you really want to delete this post?",
         "blockConfirm": "Do you really want to block this user?",
+        "blockConfirmInfo": "You can block up to 10 users per day",
         "logoutConfirm": "Do you really want to sign out?",
         "withdrawalConfirm": "Do you really want to withdraw the membership?",
         "withdrawalEmailInfo": "If you leave the membership, you can't re-sign up with the email you're using now",

diff --git a/assets/translations/ko.json b/assets/translations/ko.json
@@ -133,6 +133,7 @@
     "dialogs": {
         "deleteConfirm": "정말로 삭제하시겠습니까?",
         "blockConfirm": "정말로 차단하시겠습니까?",
+        "blockConfirmInfo": "하루에 최대 10명의 사용자까지\n차단할 수 있습니다",
         "logoutConfirm": "정말로 로그아웃 하시겠습니까?",
         "withdrawalConfirm": "정말로 회원탈퇴 하시겠습니까?",
         "withdrawalEmailInfo": "회원탈퇴하시면 지금 쓰시는 이메일로는 재가입이 불가능합니다",

diff --git a/lib/pages/post_view_page.dart b/lib/pages/post_view_page.dart
@@ -1387,10 +1387,15 @@ class _PostViewPageState extends State<PostViewPage> {
                                       curComment.created_by.profile.nickname
                                           .toString(),
                                       context.locale),
-                                  style: const TextStyle(
-                                    fontSize: 14,
-                                    fontWeight: FontWeight.w500,
-                                  ),
+                                  style: TextStyle(
+                                      fontSize: 14,
+                                      fontWeight: FontWeight.w500,
+                                      //글쓴이의 댓글이면 빨간색으로 표시
+                                      color: (curComment.created_by.id ==
+                                                  _article.created_by.id &&
+                                              _article.name_type == 2)
+                                          ? ColorsInfo.newara
+                                          : Color(0xFF333333)),
                                   maxLines: 1,
                                   overflow: TextOverflow.ellipsis,
                                 )),

diff --git a/lib/translations/codegen_loader.g.dart b/lib/translations/codegen_loader.g.dart
@@ -149,6 +149,7 @@ class CodegenLoader extends AssetLoader{
   "dialogs": {
     "deleteConfirm": "Do you really want to delete this post?",
     "blockConfirm": "Do you really want to block this user?",
+    "blockConfirmInfo": "You can block up to 10 users per day",
     "logoutConfirm": "Do you really want to sign out?",
     "withdrawalConfirm": "Do you really want to withdraw the membership?",
     "withdrawalEmailInfo": "If you leave the membership, you can't re-sign up with the email you're using now",
@@ -350,6 +351,7 @@ static const Map<String,dynamic> ko = {
   "dialogs": {
     "deleteConfirm": "정말로 삭제하시겠습니까?",
     "blockConfirm": "정말로 차단하시겠습니까?",
+    "blockConfirmInfo": "하루에 최대 10명의 사용자까지\n차단할 수 있습니다",
     "logoutConfirm": "정말로 로그아웃 하시겠습니까?",
     "withdrawalConfirm": "정말로 회원탈퇴 하시겠습니까?",
     "withdrawalEmailInfo": "회원탈퇴하시면 지금 쓰시는 이메일로는 재가입이 불가능합니다",