diff --git a/myapp/_shared/pubspec.lock b/myapp/_shared/pubspec.lock index d7db8d9..4d00883 100644 --- a/myapp/_shared/pubspec.lock +++ b/myapp/_shared/pubspec.lock @@ -5,42 +5,42 @@ packages: dependency: transitive description: name: async - sha256: "947bfcf187f74dbc5e146c9eb9c0f10c9f8b30743e341481c1e2ed3ecc18c20c" + sha256: "758e6d74e971c3e5aceb4110bfd6698efc7f501675bcfe0c775459a8140750eb" url: "https://pub.dev" source: hosted - version: "2.11.0" + version: "2.13.0" boolean_selector: dependency: transitive description: name: boolean_selector - sha256: "6cfb5af12253eaf2b368f07bacc5a80d1301a071c73360d746b7f2e32d762c66" + sha256: "8aab1771e1243a5063b8b0ff68042d67334e3feab9e95b9490f9a6ebf73b42ea" url: "https://pub.dev" source: hosted - version: "2.1.1" + version: "2.1.2" characters: dependency: transitive description: name: characters - sha256: "04a925763edad70e8443c99234dc3328f442e811f1d8fd1a72f1c8ad0f69a605" + sha256: f71061c654a3380576a52b451dd5532377954cf9dbd272a78fc8479606670803 url: "https://pub.dev" source: hosted - version: "1.3.0" + version: "1.4.0" clock: dependency: transitive description: name: clock - sha256: cb6d7f03e1de671e34607e909a7213e31d7752be4fb66a86d29fe1eb14bfb5cf + sha256: fddb70d9b5277016c77a80201021d40a2247104d9f4aa7bab7157b7e3f05b84b url: "https://pub.dev" source: hosted - version: "1.1.1" + version: "1.1.2" collection: dependency: transitive description: name: collection - sha256: ee67cb0715911d28db6bf4af1026078bd6f0128b07a5f66fb2ed94ec6783c09a + sha256: "2f5709ae4d3d59dd8f7cd309b4e023046b57d8a6c82130785d2b0e5868084e76" url: "https://pub.dev" source: hosted - version: "1.18.0" + version: "1.19.1" cupertino_icons: dependency: "direct main" description: @@ -53,10 +53,10 @@ packages: dependency: transitive description: name: fake_async - sha256: "511392330127add0b769b75a987850d136345d9227c6b94c96a04cf4a391bf78" + sha256: "5368f224a74523e8d2e7399ea1638b37aecfca824a3cc4dfdf77bf1fa905ac44" url: "https://pub.dev" source: hosted - version: "1.3.1" + version: "1.3.3" flutter: dependency: "direct main" description: flutter @@ -71,111 +71,111 @@ packages: dependency: transitive description: name: leak_tracker - sha256: "78eb209deea09858f5269f5a5b02be4049535f568c07b275096836f01ea323fa" + sha256: "6bb818ecbdffe216e81182c2f0714a2e62b593f4a4f13098713ff1685dfb6ab0" url: "https://pub.dev" source: hosted - version: "10.0.0" + version: "10.0.9" leak_tracker_flutter_testing: dependency: transitive description: name: leak_tracker_flutter_testing - sha256: b46c5e37c19120a8a01918cfaf293547f47269f7cb4b0058f21531c2465d6ef0 + sha256: f8b613e7e6a13ec79cfdc0e97638fddb3ab848452eff057653abd3edba760573 url: "https://pub.dev" source: hosted - version: "2.0.1" + version: "3.0.9" leak_tracker_testing: dependency: transitive description: name: leak_tracker_testing - sha256: a597f72a664dbd293f3bfc51f9ba69816f84dcd403cdac7066cb3f6003f3ab47 + sha256: "6ba465d5d76e67ddf503e1161d1f4a6bc42306f9d66ca1e8f079a47290fb06d3" url: "https://pub.dev" source: hosted - version: "2.0.1" + version: "3.0.1" matcher: dependency: transitive description: name: matcher - sha256: d2323aa2060500f906aa31a895b4030b6da3ebdcc5619d14ce1aada65cd161cb + sha256: dc58c723c3c24bf8d3e2d3ad3f2f9d7bd9cf43ec6feaa64181775e60190153f2 url: "https://pub.dev" source: hosted - version: "0.12.16+1" + version: "0.12.17" material_color_utilities: dependency: transitive description: name: material_color_utilities - sha256: "0e0a020085b65b6083975e499759762399b4475f766c21668c4ecca34ea74e5a" + sha256: f7142bb1154231d7ea5f96bc7bde4bda2a0945d2806bb11670e30b850d56bdec url: "https://pub.dev" source: hosted - version: "0.8.0" + version: "0.11.1" meta: dependency: transitive description: name: meta - sha256: d584fa6707a52763a52446f02cc621b077888fb63b93bbcb1143a7be5a0c0c04 + sha256: e3641ec5d63ebf0d9b41bd43201a66e3fc79a65db5f61fc181f04cd27aab950c url: "https://pub.dev" source: hosted - version: "1.11.0" + version: "1.16.0" path: dependency: transitive description: name: path - sha256: "087ce49c3f0dc39180befefc60fdb4acd8f8620e5682fe2476afd0b3688bb4af" + sha256: "75cca69d1490965be98c73ceaea117e8a04dd21217b37b292c9ddbec0d955bc5" url: "https://pub.dev" source: hosted - version: "1.9.0" + version: "1.9.1" sky_engine: dependency: transitive description: flutter source: sdk - version: "0.0.99" + version: "0.0.0" source_span: dependency: transitive description: name: source_span - sha256: "53e943d4206a5e30df338fd4c6e7a077e02254531b138a15aec3bd143c1a8b3c" + sha256: "254ee5351d6cb365c859e20ee823c3bb479bf4a293c22d17a9f1bf144ce86f7c" url: "https://pub.dev" source: hosted - version: "1.10.0" + version: "1.10.1" stack_trace: dependency: transitive description: name: stack_trace - sha256: "73713990125a6d93122541237550ee3352a2d84baad52d375a4cad2eb9b7ce0b" + sha256: "8b27215b45d22309b5cddda1aa2b19bdfec9df0e765f2de506401c071d38d1b1" url: "https://pub.dev" source: hosted - version: "1.11.1" + version: "1.12.1" stream_channel: dependency: transitive description: name: stream_channel - sha256: ba2aa5d8cc609d96bbb2899c28934f9e1af5cddbd60a827822ea467161eb54e7 + sha256: "969e04c80b8bcdf826f8f16579c7b14d780458bd97f56d107d3950fdbeef059d" url: "https://pub.dev" source: hosted - version: "2.1.2" + version: "2.1.4" string_scanner: dependency: transitive description: name: string_scanner - sha256: "556692adab6cfa87322a115640c11f13cb77b3f076ddcc5d6ae3c20242bedcde" + sha256: "921cd31725b72fe181906c6a94d987c78e3b98c2e205b397ea399d4054872b43" url: "https://pub.dev" source: hosted - version: "1.2.0" + version: "1.4.1" term_glyph: dependency: transitive description: name: term_glyph - sha256: a29248a84fbb7c79282b40b8c72a1209db169a2e0542bce341da992fe1bc7e84 + sha256: "7f554798625ea768a7518313e58f83891c7f5024f88e46e7182a4558850a4b8e" url: "https://pub.dev" source: hosted - version: "1.2.1" + version: "1.2.2" test_api: dependency: transitive description: name: test_api - sha256: "5c2f730018264d276c20e4f1503fd1308dfbbae39ec8ee63c5236311ac06954b" + sha256: fb31f383e2ee25fbbfe06b40fe21e1e458d14080e3c67e7ba0acfde4df4e0bbd url: "https://pub.dev" source: hosted - version: "0.6.1" + version: "0.7.4" vector_math: dependency: transitive description: @@ -188,9 +188,10 @@ packages: dependency: transitive description: name: vm_service - sha256: b3d56ff4341b8f182b96aceb2fa20e3dcb336b9f867bc0eafc0de10f1048e957 + sha256: ddfa8d30d89985b96407efce8acbdd124701f96741f2d981ca860662f1c0dc02 url: "https://pub.dev" source: hosted - version: "13.0.0" + version: "15.0.0" sdks: - dart: ">=3.2.0-0 <=3.3.1" + dart: ">=3.7.0-0 <4.0.0" + flutter: ">=3.18.0-18.0.pre.54" diff --git a/myapp/assets/images/RecommendImageButton.png b/myapp/assets/images/RecommendImageButton.png new file mode 100644 index 0000000..afaa13d Binary files /dev/null and b/myapp/assets/images/RecommendImageButton.png differ diff --git a/myapp/lib/component/search.dart b/myapp/lib/component/search.dart index 70149da..4908bed 100644 --- a/myapp/lib/component/search.dart +++ b/myapp/lib/component/search.dart @@ -84,7 +84,7 @@ class _BookSearchContentState extends State { return Scaffold( appBar: _buildAppBar(), - backgroundColor: Color(0xFF726953), + backgroundColor: Color(0xFF938971), body: Padding( padding: EdgeInsets.all(16.0), child: Column( @@ -101,11 +101,11 @@ class _BookSearchContentState extends State { PreferredSizeWidget _buildAppBar() { return AppBar( - backgroundColor: Color(0xFF9AD9B8), + backgroundColor: Color(0xFFFFFAE3), centerTitle: true, title: Text( '어떤 책을 찾으시나요?', - style: GoogleFonts.nanumBrushScript( + style: GoogleFonts.nanumPenScript( fontSize: 40, color: Colors.black, ), @@ -239,7 +239,7 @@ class _BookSearchContentState extends State { ); }, child: Card( - color: Color(0xFF726953), + color: Color(0xFF938971), margin: EdgeInsets.symmetric(vertical: 4), elevation: 0, shape: RoundedRectangleBorder( @@ -325,7 +325,7 @@ class _BookSearchContentState extends State { book['categoryName'], style: GoogleFonts.jua( fontSize: 13, - color: Color(0xFF9AD9B8), + color: Color(0xFFFFFAE3), ), maxLines: 3, overflow: TextOverflow.ellipsis, diff --git a/myapp/lib/content/bookmark.dart b/myapp/lib/content/bookmark.dart index 62e2b07..208f92d 100644 --- a/myapp/lib/content/bookmark.dart +++ b/myapp/lib/content/bookmark.dart @@ -49,7 +49,7 @@ class _BookmarkContentState extends State { client: client, child: Scaffold( appBar: _buildAppBar(), - backgroundColor: Color(0xFF726953), + backgroundColor: Color(0xFF938971), body: Padding( padding: EdgeInsets.all(16.0), child: Column( @@ -123,7 +123,7 @@ class _BookmarkContentState extends State { ); }, child: Card( - color: Color(0xFF726953), + color: Color(0xFF938971), margin: EdgeInsets.symmetric(vertical: 4), elevation: 0, shape: RoundedRectangleBorder( @@ -182,7 +182,7 @@ class _BookmarkContentState extends State { PreferredSizeWidget _buildAppBar() { return AppBar( - backgroundColor: Color(0xFF726953), + backgroundColor: Color(0xFF938971), centerTitle: true, title: Container( width: MediaQuery.of(context).size.width * 0.85, @@ -193,7 +193,7 @@ class _BookmarkContentState extends State { ), child: Text( '나만의 책장', - style: GoogleFonts.nanumBrushScript( + style: GoogleFonts.nanumPenScript( fontSize: 40, color: Colors.black, ), diff --git a/myapp/lib/content/home.dart b/myapp/lib/content/home.dart index 2c381c5..d737fd1 100644 --- a/myapp/lib/content/home.dart +++ b/myapp/lib/content/home.dart @@ -61,6 +61,10 @@ class HomeContent extends StatelessWidget { decoration: BoxDecoration( color: const Color(0xFFFFFFFF), borderRadius: BorderRadius.circular(8), + border: Border.all( + color: Colors.black, + width: 0.4, + ), ), child: Text( '전투모의지원중대', @@ -98,16 +102,18 @@ class HomeContent extends StatelessWidget { Widget _buildBookStack(BuildContext context) { final screenWidth = MediaQuery.of(context).size.width; return Container( - width: screenWidth * 0.8, // 화면 너비의 90% (좌우에 약간 여백) + width: screenWidth * 0.85, // 화면 너비의 80% decoration: BoxDecoration( color: const Color(0xFFF7F2AF), - borderRadius: BorderRadius.circular(16), + borderRadius: BorderRadius.circular(50), border: Border.all( + // ignore: deprecated_member_use color: Colors.black.withOpacity(0.1), width: 1, ), boxShadow: [ BoxShadow( + // ignore: deprecated_member_use color: Colors.black.withOpacity(0.1), blurRadius: 8, offset: Offset(0, 4), @@ -121,21 +127,13 @@ Widget _buildBookStack(BuildContext context) { Stack( alignment: Alignment.center, children: [ - Image.asset( - 'assets/images/book.png', - fit: BoxFit.contain, - width: 275, - height: 335, - ), - Positioned( - top: 75, - child: Text( - '오늘의 책을 \n 추천해드립니다', - style: GoogleFonts.nanumBrushScript( - fontSize: 50, - color: Colors.black, - ), - textAlign: TextAlign.center, + ClipRRect( + borderRadius: BorderRadius.circular(30), + child: Image.asset( + 'assets/images/RecommendImageButton.png', + fit: BoxFit.cover, + width: 350, + height: 350, ), ), ], @@ -143,15 +141,17 @@ Widget _buildBookStack(BuildContext context) { const SizedBox(height: 25), Text( '마음이 따뜻해지는 한 권을 만나보세요.', - style: GoogleFonts.nanumBrushScript( - fontSize: 20, + style: GoogleFonts.nanumPenScript( + fontSize: 28, color: Colors.black87, ), textAlign: TextAlign.center, ), ], ), - );} + ); +} + @@ -163,6 +163,7 @@ Widget _buildBookStack(BuildContext context) { borderRadius: BorderRadius.circular(12), boxShadow: [ BoxShadow( + // ignore: deprecated_member_use color: Colors.black.withOpacity(0.1), blurRadius: 6, offset: Offset(0, 3), @@ -175,8 +176,9 @@ Widget _buildBookStack(BuildContext context) { children: [ Text( '유저들이 읽은 책들을\n찾아보세요!', - style: GoogleFonts.nanumBrushScript( - fontSize: 20, + style: GoogleFonts.nanumPenScript( + fontSize: 22, + // ignore: deprecated_member_use color: const Color(0xFF000000).withOpacity(0.8), ), textAlign: TextAlign.center, @@ -184,6 +186,7 @@ Widget _buildBookStack(BuildContext context) { Icon( Icons.keyboard_double_arrow_down, size: 32, + // ignore: deprecated_member_use color: const Color(0xFF000000).withOpacity(0.8), ), ], diff --git a/myapp/lib/content/login.dart b/myapp/lib/content/login.dart index f51aef0..7fa922c 100644 --- a/myapp/lib/content/login.dart +++ b/myapp/lib/content/login.dart @@ -23,7 +23,7 @@ class AppDimensions { } class AppStyles { - static TextStyle get titleStyle => GoogleFonts.nanumBrushScript( + static TextStyle get titleStyle => GoogleFonts.nanumPenScript( fontSize: 40, color: Colors.black, ); diff --git a/myapp/pubspec.yaml b/myapp/pubspec.yaml index 6623cdb..74fc9e7 100644 --- a/myapp/pubspec.yaml +++ b/myapp/pubspec.yaml @@ -29,4 +29,5 @@ dev_dependencies: flutter: uses-material-design: true assets: - - assets/images/book.png \ No newline at end of file + - assets/images/book.png + - assets/images/RecommendImageButton.png \ No newline at end of file