diff --git a/lib/page/category/category_view.dart b/lib/page/category/category_view.dart index 4a54c56..6251b83 100644 --- a/lib/page/category/category_view.dart +++ b/lib/page/category/category_view.dart @@ -14,6 +14,7 @@ class CategoryView extends GetView { @override Widget build(BuildContext context) { return Scaffold( + backgroundColor: Colors.black, body: Container( decoration: const BoxDecoration( image: DecorationImage( diff --git a/lib/page/home/drawer_view/home_drawer_view.dart b/lib/page/home/drawer_view/home_drawer_view.dart index c2e0c63..ec4b2fa 100644 --- a/lib/page/home/drawer_view/home_drawer_view.dart +++ b/lib/page/home/drawer_view/home_drawer_view.dart @@ -21,77 +21,75 @@ class HomeDrawerView extends StatelessWidget { fit: BoxFit.cover, ), ), - child: Column( - crossAxisAlignment: CrossAxisAlignment.start, - children: [ - SizedBox(height: MediaQuery.of(context).padding.top + 15.w), - Container( - margin: EdgeInsets.only(left: 16.w), - child: Text( + child: SafeArea( + bottom: false, + child: Column( + children: [ + Text( "Style classification", style: TextStyle( fontSize: 24.sp, fontWeight: FontWeight.w600, color: Colors.white), ), - ), - 10.verticalSpace, - Expanded( - child: MasonryGridView.count( - itemCount: controller.category.length, - crossAxisCount: 2, - mainAxisSpacing: 10.w, - crossAxisSpacing: 10.w, - padding: EdgeInsets.fromLTRB( - 8, - 0, - 8, - MediaQuery.of(context).padding.bottom + 10, - ).w, - itemBuilder: (context, index) { - return GestureDetector( - onTap: () => controller - .toCategory(controller.category[index]), - child: Stack( - alignment: AlignmentDirectional.bottomStart, - children: [ - Container( - clipBehavior: Clip.hardEdge, - decoration: BoxDecoration( - borderRadius: BorderRadius.circular(12.w), - ), - child: Image.asset( - controller.categoryImages[index], - ), - ), - Container( - decoration: BoxDecoration( - borderRadius: BorderRadius.circular(12.w), - color: Colors.black54, - ), - padding: const EdgeInsets.symmetric( - horizontal: 9, - ).w, - margin: const EdgeInsets.symmetric( - vertical: 9, - horizontal: 9, - ).w, - child: Text( - controller.category[index], - style: TextStyle( - fontSize: 14.sp, - color: Colors.white, - fontWeight: FontWeight.w600, + 10.verticalSpace, + Expanded( + child: MasonryGridView.count( + itemCount: controller.category.length, + crossAxisCount: 2, + mainAxisSpacing: 10.w, + crossAxisSpacing: 10.w, + padding: EdgeInsets.fromLTRB( + 8, + 0, + 8, + MediaQuery.of(context).padding.bottom , + ).w, + itemBuilder: (context, index) { + return GestureDetector( + onTap: () => + controller.toCategory(controller.category[index]), + child: Stack( + alignment: AlignmentDirectional.bottomStart, + children: [ + Container( + clipBehavior: Clip.hardEdge, + decoration: BoxDecoration( + borderRadius: BorderRadius.circular(12.w), + ), + child: Image.asset( + controller.categoryImages[index], ), ), - ), - ], - ), - ); - }, + Container( + decoration: BoxDecoration( + borderRadius: BorderRadius.circular(12.w), + color: Colors.black54, + ), + padding: const EdgeInsets.symmetric( + horizontal: 9, + ).w, + margin: const EdgeInsets.symmetric( + vertical: 9, + horizontal: 9, + ).w, + child: Text( + controller.category[index], + style: TextStyle( + fontSize: 14.sp, + color: Colors.white, + fontWeight: FontWeight.w600, + ), + ), + ), + ], + ), + ); + }, + ), ), - ), - ], + ], + ), ), ), ); diff --git a/lib/page/library/library_view.dart b/lib/page/library/library_view.dart index d150a17..6010f68 100644 --- a/lib/page/library/library_view.dart +++ b/lib/page/library/library_view.dart @@ -21,6 +21,7 @@ class LibraryView extends GetView { ), ), child: SafeArea( + bottom: false, child: Column( children: [ _buildTabBar(), diff --git a/lib/page/recommend/recommend_view.dart b/lib/page/recommend/recommend_view.dart index 07d5cb1..bd1f865 100644 --- a/lib/page/recommend/recommend_view.dart +++ b/lib/page/recommend/recommend_view.dart @@ -72,6 +72,7 @@ class RecommendView extends GetView { }, ), SafeArea( + bottom: false, child: Column( children: [ SearchAppbar( @@ -152,6 +153,7 @@ class RecommendView extends GetView { ), ), child: SafeArea( + bottom: false, child: Column( children: [ SearchAppbar( diff --git a/lib/page/search_image/search_image_view.dart b/lib/page/search_image/search_image_view.dart index 46e8d78..ba4bb69 100644 --- a/lib/page/search_image/search_image_view.dart +++ b/lib/page/search_image/search_image_view.dart @@ -29,6 +29,7 @@ class SearchImageView extends GetView { child: GetBuilder( builder: (controller) => Obx( () => SafeArea( + bottom: false, child: Column( crossAxisAlignment: CrossAxisAlignment.start, children: [