From 97d40799a857de137c3f2222a9983d621b305d03 Mon Sep 17 00:00:00 2001 From: codeJiwon Date: Fri, 27 Dec 2024 01:29:19 +0900 Subject: [PATCH 1/2] =?UTF-8?q?[Fix/#62]=20=EB=B2=84=EC=A0=84=20=EC=88=98?= =?UTF-8?q?=EC=A0=95=20=EB=B0=8F=20=EC=9D=B4=EB=AF=B8=EC=A7=80=20ClipOval?= =?UTF-8?q?=20=EC=A0=81=EC=9A=A9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- outfoot/lib/screens/checkpage_image.dart | 91 ++++---- .../lib/screens/login/login_page_screen.dart | 1 + outfoot/pubspec.lock | 194 ++++++------------ outfoot/pubspec.yaml | 11 +- 4 files changed, 116 insertions(+), 181 deletions(-) diff --git a/outfoot/lib/screens/checkpage_image.dart b/outfoot/lib/screens/checkpage_image.dart index 2167f2a..19abdb0 100644 --- a/outfoot/lib/screens/checkpage_image.dart +++ b/outfoot/lib/screens/checkpage_image.dart @@ -127,7 +127,7 @@ class _CheckPageImageState extends State { borderRadius: BorderRadius.circular(6.r), ), child: Text( - Data.date, + Data.date, style: TextStyle( fontSize: 11.sp, color: blackBrownColor, @@ -182,51 +182,50 @@ class _CheckPageImageState extends State { ), ), SizedBox(height: 40), // 이미지 그리드 상단 여백 -Container( - padding: EdgeInsets.only( - left: 16.95.w, - right: 16.95.w, - top: 17.35.h, - bottom: 35.23.h, - ), - decoration: BoxDecoration( - color: Colors.white, - borderRadius: BorderRadius.circular(10.r), - ), - child: GridView.builder( - shrinkWrap: true, - itemCount: 30, // 총 30개로 변경 - gridDelegate: SliverGridDelegateWithFixedCrossAxisCount( - crossAxisCount: 5, - mainAxisSpacing: 10.63.h, - crossAxisSpacing: 10.75.w, - ), - itemBuilder: (context, index) { - if (index < 26) { // 이미지가 있는 경우 - return Container( - decoration: BoxDecoration( - shape: BoxShape.circle, - color: Colors.white, - ), - child: Padding( - padding: EdgeInsets.all(7.18.w), - child: Image.asset( - 'assets/data/${index + 1}.svg', // 이미지 경로 - fit: BoxFit.contain, - ), - ), - ); - } else { // 나머지 빈칸은 점선 원으로 표시 - return DashedCircle( - size: 24.57.w, - color: mainBrownColor, - ); - } - }, -), - -), - + Container( + padding: EdgeInsets.only( + left: 16.95.w, + right: 16.95.w, + top: 17.35.h, + bottom: 35.23.h, + ), + decoration: BoxDecoration( + color: Colors.white, + borderRadius: BorderRadius.circular(10.r), + ), + child: GridView.builder( + shrinkWrap: true, + itemCount: 30, // 총 30개로 변경 + gridDelegate: SliverGridDelegateWithFixedCrossAxisCount( + crossAxisCount: 5, + mainAxisSpacing: 10.63.h, + crossAxisSpacing: 10.75.w, + ), + itemBuilder: (context, index) { + if (index < 26) { + // 이미지가 있는 경우 + return Container( + child: ClipOval( + // 자식 위젯(SvgPicture)을 원형으로 클리핑합니다. + child: Padding( + padding: EdgeInsets.all(0.w), + child: SvgPicture.asset( + 'assets/data/${index + 1}.svg', // 이미지 경로 + fit: BoxFit.cover, + ), + ), + ), + ); + } else { + // 나머지 빈칸은 점선 원으로 표시 + return DashedCircle( + size: 24.57.w, + color: mainBrownColor, + ); + } + }, + ), + ), ], ), ], diff --git a/outfoot/lib/screens/login/login_page_screen.dart b/outfoot/lib/screens/login/login_page_screen.dart index 501f9bb..2e4d5c1 100644 --- a/outfoot/lib/screens/login/login_page_screen.dart +++ b/outfoot/lib/screens/login/login_page_screen.dart @@ -1,6 +1,7 @@ import 'package:flutter/material.dart'; import 'package:flutter_svg/flutter_svg.dart'; import 'package:carousel_slider/carousel_slider.dart'; +import 'package:carousel_slider/carousel_controller.dart'; import 'package:outfoot/colors/colors.dart'; import 'package:flutter_screenutil/flutter_screenutil.dart'; diff --git a/outfoot/pubspec.lock b/outfoot/pubspec.lock index e6597d1..e6ee0da 100644 --- a/outfoot/pubspec.lock +++ b/outfoot/pubspec.lock @@ -1,14 +1,6 @@ # Generated by pub # See https://dart.dev/tools/pub/glossary#lockfile packages: - args: - dependency: transitive - description: - name: args - sha256: bf9f5caeea8d8fe6721a9c358dd8a5c1947b27f1cfaa18b39c301273594919e6 - url: "https://pub.dev" - source: hosted - version: "2.6.0" async: dependency: transitive description: @@ -61,10 +53,10 @@ packages: dependency: transitive description: name: cross_file - sha256: "7caf6a750a0c04effbb52a676dce9a4a592e10ad35c34d6d2d0e4811160d5670" + sha256: fedaadfa3a6996f75211d835aaeb8fede285dae94262485698afd832371b9a5e url: "https://pub.dev" source: hosted - version: "0.3.4+2" + version: "0.3.3+8" cupertino_icons: dependency: "direct main" description: @@ -85,10 +77,10 @@ packages: dependency: transitive description: name: dio_web_adapter - sha256: "33259a9276d6cea88774a0000cfae0d861003497755969c92faa223108620dc8" + sha256: "36c5b2d79eb17cdae41e974b7a8284fec631651d2a6f39a8a2ff22327e90aeac" url: "https://pub.dev" source: hosted - version: "2.0.0" + version: "1.0.1" fake_async: dependency: transitive description: @@ -101,10 +93,10 @@ packages: dependency: transitive description: name: ffi - sha256: "16ed7b077ef01ad6170a3d0c57caa4a112a38d7a2ed5602e0aca9ca6f3d98da6" + sha256: "7bf0adc28a23d395f19f3f1eb21dd7cfd1dd9f8e1c50051c069122e6853bc878" url: "https://pub.dev" source: hosted - version: "2.1.3" + version: "2.1.0" file: dependency: transitive description: @@ -117,18 +109,18 @@ packages: dependency: transitive description: name: file_selector_linux - sha256: "54cbbd957e1156d29548c7d9b9ec0c0ebb6de0a90452198683a7d23aed617a33" + sha256: "045d372bf19b02aeb69cacf8b4009555fb5f6f0b7ad8016e5f46dd1387ddd492" url: "https://pub.dev" source: hosted - version: "0.9.3+2" + version: "0.9.2+1" file_selector_macos: dependency: transitive description: name: file_selector_macos - sha256: "271ab9986df0c135d45c3cdb6bd0faa5db6f4976d3e4b437cf7d0f258d941bfc" + sha256: f42eacb83b318e183b1ae24eead1373ab1334084404c8c16e0354f9a3e55d385 url: "https://pub.dev" source: hosted - version: "0.9.4+2" + version: "0.9.4" file_selector_platform_interface: dependency: transitive description: @@ -141,10 +133,10 @@ packages: dependency: transitive description: name: file_selector_windows - sha256: "8f5d2f6590d51ecd9179ba39c64f722edc15226cc93dcc8698466ad36a4a85a4" + sha256: "2ad726953f6e8affbc4df8dc78b77c3b4a060967a291e528ef72ae846c60fb69" url: "https://pub.dev" source: hosted - version: "0.9.3+3" + version: "0.9.3+2" flutter: dependency: "direct main" description: flutter @@ -162,18 +154,18 @@ packages: dependency: "direct dev" description: name: flutter_lints - sha256: "3f41d009ba7172d5ff9be5f6e6e6abb4300e263aab8866d2a0842ed2a70f8f0c" + sha256: a25a15ebbdfc33ab1cd26c63a6ee519df92338a9c10f122adda92938253bef04 url: "https://pub.dev" source: hosted - version: "4.0.0" + version: "2.0.3" flutter_plugin_android_lifecycle: dependency: transitive description: name: flutter_plugin_android_lifecycle - sha256: "9ee02950848f61c4129af3d6ec84a1cfc0e47931abc746b03e7a3bc3e8ff6eda" + sha256: "8cf40eebf5dec866a6d1956ad7b4f7016e6c0cc69847ab946833b7d43743809f" url: "https://pub.dev" source: hosted - version: "2.0.22" + version: "2.0.19" flutter_screenutil: dependency: "direct main" description: @@ -186,10 +178,10 @@ packages: dependency: "direct main" description: name: flutter_svg - sha256: "54900a1a1243f3c4a5506d853a2b5c2dbc38d5f27e52a52618a8054401431123" + sha256: "6ff9fa12892ae074092de2fa6a9938fb21dbabfdaa2ff57dc697ff912fc8d4b2" url: "https://pub.dev" source: hosted - version: "2.0.16" + version: "1.1.6" flutter_test: dependency: "direct dev" description: flutter @@ -204,10 +196,10 @@ packages: dependency: "direct main" description: name: http - sha256: b9c29a161230ee03d3ccf545097fccd9b87a5264228c5d348202e0f0c28f9010 + sha256: "5895291c13fa8a3bd82e76d5627f69e0d85ca6a30dcac95c4ea19a5d555879c2" url: "https://pub.dev" source: hosted - version: "1.2.2" + version: "0.13.6" http_parser: dependency: transitive description: @@ -220,34 +212,34 @@ packages: dependency: "direct main" description: name: image_picker - sha256: "021834d9c0c3de46bf0fe40341fa07168407f694d9b2bb18d532dc1261867f7a" + sha256: b6951e25b795d053a6ba03af5f710069c99349de9341af95155d52665cb4607c url: "https://pub.dev" source: hosted - version: "1.1.2" + version: "0.8.9" image_picker_android: dependency: transitive description: name: image_picker_android - sha256: "8c5abf0dcc24fe6e8e0b4a5c0b51a5cf30cefdf6407a3213dae61edc75a70f56" + sha256: "844c6da4e4f2829dffdab97816bca09d0e0977e8dcef7450864aba4e07967a58" url: "https://pub.dev" source: hosted - version: "0.8.12+12" + version: "0.8.9+6" image_picker_for_web: dependency: transitive description: name: image_picker_for_web - sha256: "717eb042ab08c40767684327be06a5d8dbb341fe791d514e4b92c7bbe1b7bb83" + sha256: "869fe8a64771b7afbc99fc433a5f7be2fea4d1cb3d7c11a48b6b579eb9c797f0" url: "https://pub.dev" source: hosted - version: "3.0.6" + version: "2.2.0" image_picker_ios: dependency: transitive description: name: image_picker_ios - sha256: "4f0568120c6fcc0aaa04511cb9f9f4d29fc3d0139884b1d06be88dcec7641d6b" + sha256: fadafce49e8569257a0cad56d24438a6fa1f0cbd7ee0af9b631f7492818a4ca3 url: "https://pub.dev" source: hosted - version: "0.8.12+1" + version: "0.8.9+1" image_picker_linux: dependency: transitive description: @@ -268,10 +260,10 @@ packages: dependency: transitive description: name: image_picker_platform_interface - sha256: "9ec26d410ff46f483c5519c29c02ef0e02e13a543f882b152d4bfd2f06802f80" + sha256: fa4e815e6fcada50e35718727d83ba1c92f1edf95c0b4436554cec301b56233b url: "https://pub.dev" source: hosted - version: "2.10.0" + version: "2.9.3" image_picker_windows: dependency: transitive description: @@ -280,70 +272,46 @@ packages: url: "https://pub.dev" source: hosted version: "0.2.1+1" - leak_tracker: - dependency: transitive - description: - name: leak_tracker - sha256: "7f0df31977cb2c0b88585095d168e689669a2cc9b97c309665e3386f3e9d341a" - url: "https://pub.dev" - source: hosted - version: "10.0.4" - leak_tracker_flutter_testing: - dependency: transitive - description: - name: leak_tracker_flutter_testing - sha256: "06e98f569d004c1315b991ded39924b21af84cf14cc94791b8aea337d25b57f8" - url: "https://pub.dev" - source: hosted - version: "3.0.3" - leak_tracker_testing: - dependency: transitive - description: - name: leak_tracker_testing - sha256: "6ba465d5d76e67ddf503e1161d1f4a6bc42306f9d66ca1e8f079a47290fb06d3" - url: "https://pub.dev" - source: hosted - version: "3.0.1" lints: dependency: transitive description: name: lints - sha256: "976c774dd944a42e83e2467f4cc670daef7eed6295b10b36ae8c85bcbf828235" + sha256: "0a217c6c989d21039f1498c3ed9f3ed71b354e69873f13a8dfc3c9fe76f1b452" url: "https://pub.dev" source: hosted - version: "4.0.0" + version: "2.1.1" matcher: dependency: transitive description: name: matcher - sha256: d2323aa2060500f906aa31a895b4030b6da3ebdcc5619d14ce1aada65cd161cb + sha256: "1803e76e6653768d64ed8ff2e1e67bea3ad4b923eb5c56a295c3e634bad5960e" url: "https://pub.dev" source: hosted - version: "0.12.16+1" + version: "0.12.16" material_color_utilities: dependency: transitive description: name: material_color_utilities - sha256: "0e0a020085b65b6083975e499759762399b4475f766c21668c4ecca34ea74e5a" + sha256: "9528f2f296073ff54cb9fee677df673ace1218163c3bc7628093e7eed5203d41" url: "https://pub.dev" source: hosted - version: "0.8.0" + version: "0.5.0" meta: dependency: transitive description: name: meta - sha256: "7687075e408b093f36e6bbf6c91878cc0d4cd10f409506f7bc996f68220b9136" + sha256: a6e590c838b18133bb482a2745ad77c5bb7715fb0451209e1a7567d416678b8e url: "https://pub.dev" source: hosted - version: "1.12.0" + version: "1.10.0" mime: dependency: transitive description: name: mime - sha256: "41a20518f0cb1256669420fdba0cd90d21561e560ac240f26ef8322e45bb7ed6" + sha256: "801fd0b26f14a4a58ccb09d5892c3fbdeff209594300a542492cf13fba9d247a" url: "https://pub.dev" source: hosted - version: "2.0.0" + version: "1.0.6" nested: dependency: transitive description: @@ -356,10 +324,10 @@ packages: dependency: transitive description: name: path - sha256: "087ce49c3f0dc39180befefc60fdb4acd8f8620e5682fe2476afd0b3688bb4af" + sha256: "8829d8a55c13fc0e37127c29fedf290c102f4e40ae94ada574091fe0ff96c917" url: "https://pub.dev" source: hosted - version: "1.9.0" + version: "1.8.3" path_drawing: dependency: "direct main" description: @@ -372,10 +340,10 @@ packages: dependency: transitive description: name: path_parsing - sha256: "883402936929eac138ee0a45da5b0f2c80f89913e6dc3bf77eb65b84b409c6ca" + sha256: e3e67b1629e6f7e8100b367d3db6ba6af4b1f0bb80f64db18ef1fbabd2fa9ccf url: "https://pub.dev" source: hosted - version: "1.1.0" + version: "1.0.1" path_provider_linux: dependency: transitive description: @@ -436,34 +404,34 @@ packages: dependency: "direct main" description: name: shared_preferences - sha256: "95f9997ca1fb9799d494d0cb2a780fd7be075818d59f00c43832ed112b158a82" + sha256: d3bbe5553a986e83980916ded2f0b435ef2e1893dfaa29d5a7a790d0eca12180 url: "https://pub.dev" source: hosted - version: "2.3.3" + version: "2.2.3" shared_preferences_android: dependency: transitive description: name: shared_preferences_android - sha256: "480ba4345773f56acda9abf5f50bd966f581dac5d514e5fc4a18c62976bbba7e" + sha256: "1ee8bf911094a1b592de7ab29add6f826a7331fb854273d55918693d5364a1f2" url: "https://pub.dev" source: hosted - version: "2.3.2" + version: "2.2.2" shared_preferences_foundation: dependency: transitive description: name: shared_preferences_foundation - sha256: "6a52cfcdaeac77cad8c97b539ff688ccfc458c007b4db12be584fbe5c0e49e03" + sha256: "7708d83064f38060c7b39db12aefe449cb8cdc031d6062280087bc4cdb988f5c" url: "https://pub.dev" source: hosted - version: "2.5.4" + version: "2.3.5" shared_preferences_linux: dependency: transitive description: name: shared_preferences_linux - sha256: "580abfd40f415611503cae30adf626e6656dfb2f0cee8f465ece7b6defb40f2f" + sha256: "2ba0510d3017f91655b7543e9ee46d48619de2a2af38e5c790423f7007c7ccc1" url: "https://pub.dev" source: hosted - version: "2.4.1" + version: "2.4.0" shared_preferences_platform_interface: dependency: transitive description: @@ -476,18 +444,18 @@ packages: dependency: transitive description: name: shared_preferences_web - sha256: d2ca4132d3946fec2184261726b355836a82c33d7d5b67af32692aff18a4684e + sha256: "7b15ffb9387ea3e237bb7a66b8a23d2147663d391cafc5c8f37b2e7b4bde5d21" url: "https://pub.dev" source: hosted - version: "2.4.2" + version: "2.2.2" shared_preferences_windows: dependency: transitive description: name: shared_preferences_windows - sha256: "94ef0f72b2d71bc3e700e025db3710911bd51a71cefb65cc609dd0d9a982e3c1" + sha256: "398084b47b7f92110683cac45c6dc4aae853db47e470e5ddcd52cab7f7196ab2" url: "https://pub.dev" source: hosted - version: "2.4.1" + version: "2.4.0" sky_engine: dependency: transitive description: flutter @@ -537,10 +505,10 @@ packages: dependency: transitive description: name: test_api - sha256: "9955ae474176f7ac8ee4e989dadfb411a58c30415bcfb648fa04b2b8a03afa7f" + sha256: "5c2f730018264d276c20e4f1503fd1308dfbbae39ec8ee63c5236311ac06954b" url: "https://pub.dev" source: hosted - version: "0.7.0" + version: "0.6.1" typed_data: dependency: transitive description: @@ -549,30 +517,6 @@ packages: url: "https://pub.dev" source: hosted version: "1.3.2" - vector_graphics: - dependency: transitive - description: - name: vector_graphics - sha256: "27d5fefe86fb9aace4a9f8375b56b3c292b64d8c04510df230f849850d912cb7" - url: "https://pub.dev" - source: hosted - version: "1.1.15" - vector_graphics_codec: - dependency: transitive - description: - name: vector_graphics_codec - sha256: "2430b973a4ca3c4dbc9999b62b8c719a160100dcbae5c819bae0cacce32c9cdb" - url: "https://pub.dev" - source: hosted - version: "1.1.12" - vector_graphics_compiler: - dependency: transitive - description: - name: vector_graphics_compiler - sha256: "1b4b9e706a10294258727674a340ae0d6e64a7231980f9f9a3d12e4b42407aad" - url: "https://pub.dev" - source: hosted - version: "1.1.16" vector_math: dependency: transitive description: @@ -581,30 +525,22 @@ packages: url: "https://pub.dev" source: hosted version: "2.1.4" - vm_service: - dependency: transitive - description: - name: vm_service - sha256: "3923c89304b715fb1eb6423f017651664a03bf5f4b29983627c4da791f74a4ec" - url: "https://pub.dev" - source: hosted - version: "14.2.1" web: - dependency: "direct main" + dependency: transitive description: name: web - sha256: cd3543bd5798f6ad290ea73d210f423502e71900302dde696f8bff84bf89a1cb + sha256: afe077240a270dcfd2aafe77602b4113645af95d0ad31128cc02bce5ac5d5152 url: "https://pub.dev" source: hosted - version: "1.1.0" + version: "0.3.0" xdg_directories: dependency: transitive description: name: xdg_directories - sha256: "7a3f37b05d989967cdddcbb571f1ea834867ae2faa29725fd085180e0883aa15" + sha256: faea9dee56b520b55a566385b84f2e8de55e7496104adada9962e0bd11bcff1d url: "https://pub.dev" source: hosted - version: "1.1.0" + version: "1.0.4" xml: dependency: transitive description: @@ -614,5 +550,5 @@ packages: source: hosted version: "6.5.0" sdks: - dart: ">=3.4.0 <4.0.0" - flutter: ">=3.22.0" + dart: ">=3.2.3 <4.0.0" + flutter: ">=3.16.0" diff --git a/outfoot/pubspec.yaml b/outfoot/pubspec.yaml index b9a3271..5195e61 100644 --- a/outfoot/pubspec.yaml +++ b/outfoot/pubspec.yaml @@ -32,12 +32,12 @@ environment: dependencies: flutter: sdk: flutter - image_picker: ^1.1.2 - carousel_slider: ^4.2.1 + image_picker: ^0.8.7+4 + carousel_slider: ^4.2.0 dio: ^5.0.0 path_drawing: ^1.0.1 - flutter_svg: ^2.0.16 - http: ^1.2.2 + flutter_svg: ^1.0.3 + http: ^0.13.4 provider: ^6.1.2 shared_preferences: ^2.0.15 flutter_screenutil: ^5.9.3 @@ -47,7 +47,6 @@ dependencies: # Use with the CupertinoIcons class for iOS style icons. cupertino_icons: ^1.0.2 flutter_dotenv: ^5.2.1 - web: ^1.1.0 dev_dependencies: flutter_test: @@ -58,7 +57,7 @@ dev_dependencies: # activated in the `analysis_options.yaml` file located at the root of your # package. See that file for information about deactivating specific lint # rules and activating additional ones. - flutter_lints: ^4.0.0 + flutter_lints: ^2.0.0 # For information on the generic Dart part of this file, see the # following page: https://dart.dev/tools/pub/pubspec From 19c40730affa390242f6e43bd4be759738d69435 Mon Sep 17 00:00:00 2001 From: codeJiwon Date: Fri, 27 Dec 2024 01:36:28 +0900 Subject: [PATCH 2/2] =?UTF-8?q?[Chore/#62]=20=EB=85=B9=ED=99=94=EB=A5=BC?= =?UTF-8?q?=20=EC=9C=84=ED=95=B4=20token=20=EA=B4=80=EB=A0=A8=20=EB=B6=80?= =?UTF-8?q?=EB=B6=84=20=EC=A3=BC=EC=84=9D=20=EC=B2=98=EB=A6=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- outfoot/lib/screens/make_goal/make_personal_goal.dart | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/outfoot/lib/screens/make_goal/make_personal_goal.dart b/outfoot/lib/screens/make_goal/make_personal_goal.dart index 6756dac..e1c91f5 100644 --- a/outfoot/lib/screens/make_goal/make_personal_goal.dart +++ b/outfoot/lib/screens/make_goal/make_personal_goal.dart @@ -33,8 +33,8 @@ class _MakePersonalGoalPageState extends State { token = dotenv.env['TOKEN']; if (token == null) { - debugPrint("Error: TOKEN is not defined in .env"); - return; + // debugPrint("Error: TOKEN is not defined in .env"); + // return; } // 목표 생성 API 호출