diff --git a/lib/page/library/library_view.dart b/lib/page/library/library_view.dart index 846add1..d150a17 100644 --- a/lib/page/library/library_view.dart +++ b/lib/page/library/library_view.dart @@ -20,12 +20,13 @@ class LibraryView extends GetView { fit: BoxFit.cover, ), ), - child: Column( - children: [ - SizedBox(height: MediaQuery.of(context).padding.top), - _buildTabBar(), - _buildBody(), - ], + child: SafeArea( + child: Column( + children: [ + _buildTabBar(), + _buildBody(), + ], + ), ), ), ); diff --git a/lib/page/recommend/recommend_view.dart b/lib/page/recommend/recommend_view.dart index e2cbce4..07d5cb1 100644 --- a/lib/page/recommend/recommend_view.dart +++ b/lib/page/recommend/recommend_view.dart @@ -71,10 +71,7 @@ class RecommendView extends GetView { ); }, ), - Container( - height: double.infinity, - width: double.infinity, - padding: EdgeInsets.only(top: MediaQuery.of(context).padding.top).w, + SafeArea( child: Column( children: [ SearchAppbar( @@ -148,60 +145,59 @@ class RecommendView extends GetView { Widget _buildMasonryGridView(context) { return Container( - height: double.infinity, - width: double.infinity, - padding: EdgeInsets.only(top: MediaQuery.of(context).padding.top).w, decoration: const BoxDecoration( image: DecorationImage( image: AssetImage(Assets.imagesRecommendBottomBackground), fit: BoxFit.cover, ), ), - child: Column( - children: [ - SearchAppbar( - onTapToSearch: controller.toSearch, - onTapToCategory: controller.homeController.openHomeDrawer, - title: appName, - titleStyle: TextStyle( - color: Colors.white, - fontSize: 24.sp, - fontWeight: FontWeight.w600, + child: SafeArea( + child: Column( + children: [ + SearchAppbar( + onTapToSearch: controller.toSearch, + onTapToCategory: controller.homeController.openHomeDrawer, + title: appName, + titleStyle: TextStyle( + color: Colors.white, + fontSize: 24.sp, + fontWeight: FontWeight.w600, + ), ), - ), - Obx(() { - return Expanded( - child: BaseEasyRefresh( - controller: controller.refreshController, - onLoad: controller.onLoad, - viewState: controller.viewState.value, - height: discoverListHeight, - child: Scrollbar( - controller: controller.scrollController, - child: MasonryGridView.count( + Obx(() { + return Expanded( + child: BaseEasyRefresh( + controller: controller.refreshController, + onLoad: controller.onLoad, + viewState: controller.viewState.value, + height: discoverListHeight, + child: Scrollbar( controller: controller.scrollController, - itemCount: controller.images.length, - crossAxisCount: 2, - mainAxisSpacing: 15.w, - crossAxisSpacing: 15.w, - padding: const EdgeInsets.fromLTRB(15, 0, 15, 0).w, - itemBuilder: (context, index) { - ImageModel item = controller.images[index]; - return GestureDetector( - onTap: () => controller.gridToImageDetail(index), - child: ImageNetworkWidget( - url: item.imageUrl, - aspectRatio: item.width! / item.height!, - radius: 15.r, - ), - ); - }, + child: MasonryGridView.count( + controller: controller.scrollController, + itemCount: controller.images.length, + crossAxisCount: 2, + mainAxisSpacing: 15.w, + crossAxisSpacing: 15.w, + padding: const EdgeInsets.fromLTRB(15, 0, 15, 0).w, + itemBuilder: (context, index) { + ImageModel item = controller.images[index]; + return GestureDetector( + onTap: () => controller.gridToImageDetail(index), + child: ImageNetworkWidget( + url: item.imageUrl, + aspectRatio: item.width! / item.height!, + radius: 15.r, + ), + ); + }, + ), ), ), - ), - ); - }), - ], + ); + }), + ], + ), ), ); } diff --git a/lib/page/search_image/search_image_view.dart b/lib/page/search_image/search_image_view.dart index de35c25..46e8d78 100644 --- a/lib/page/search_image/search_image_view.dart +++ b/lib/page/search_image/search_image_view.dart @@ -28,28 +28,27 @@ class SearchImageView extends GetView { ), child: GetBuilder( builder: (controller) => Obx( - () => Column( - crossAxisAlignment: CrossAxisAlignment.start, - children: [ - SizedBox( - height: MediaQuery.of(context).padding.top, - ), - _buildSearchInput(), - if (controller.searchList.isNotEmpty) ...[ - Container( - padding: const EdgeInsets.symmetric(horizontal: 15).w, - child: Text( - "ALL ${controller.total}", - style: TextStyle(color: Colors.white, fontSize: 20.sp), + () => SafeArea( + child: Column( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + _buildSearchInput(), + if (controller.searchList.isNotEmpty) ...[ + Container( + padding: const EdgeInsets.symmetric(horizontal: 15).w, + child: Text( + "ALL ${controller.total}", + style: TextStyle(color: Colors.white, fontSize: 20.sp), + ), ), - ), - 10.verticalSpace, - _buildMasonryGridView(), - ] else ...[ - Expanded(child: Container()), - _buildTags(context), - ] - ], + 10.verticalSpace, + _buildMasonryGridView(), + ] else ...[ + Expanded(child: Container()), + _buildTags(context), + ] + ], + ), ), ), ), @@ -163,9 +162,7 @@ class SearchImageView extends GetView { Widget _buildTags(context) { return Container( width: double.infinity, - padding: EdgeInsets.only( - bottom: MediaQuery.of(context).padding.bottom + 10, - ), + padding: const EdgeInsets.only(bottom: 10).w, child: Column( children: [ Row( diff --git a/lib/page/settings/settings_view.dart b/lib/page/settings/settings_view.dart index 537fd53..04600d2 100644 --- a/lib/page/settings/settings_view.dart +++ b/lib/page/settings/settings_view.dart @@ -20,24 +20,24 @@ class SettingsView extends GetView { fit: BoxFit.cover, ), ), - padding: EdgeInsets.only( - top: MediaQuery.of(context).padding.top + 70, - ).w, - child: Column( - crossAxisAlignment: CrossAxisAlignment.start, - children: [ - _buildUserinfo(), - Container( - height: 1.w, - width: double.infinity, - margin: const EdgeInsets.symmetric( - horizontal: 58, - vertical: 15, - ).w, - decoration: BoxDecoration(color: Colors.white.withOpacity(.5)), - ), - _buildOptions(context), - ], + padding: const EdgeInsets.only(top: 70).w, + child: SafeArea( + child: Column( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + _buildUserinfo(), + Container( + height: 1.w, + width: double.infinity, + margin: const EdgeInsets.symmetric( + horizontal: 58, + vertical: 15, + ).w, + decoration: BoxDecoration(color: Colors.white.withOpacity(.5)), + ), + _buildOptions(context), + ], + ), ), ), );