This commit is contained in:
xh 2024-07-23 16:33:40 +08:00
parent 0691689152
commit c045614e31
4 changed files with 90 additions and 96 deletions

View File

@ -20,12 +20,13 @@ class LibraryView extends GetView<LibraryController> {
fit: BoxFit.cover, fit: BoxFit.cover,
), ),
), ),
child: Column( child: SafeArea(
children: [ child: Column(
SizedBox(height: MediaQuery.of(context).padding.top), children: [
_buildTabBar(), _buildTabBar(),
_buildBody(), _buildBody(),
], ],
),
), ),
), ),
); );

View File

@ -71,10 +71,7 @@ class RecommendView extends GetView<RecommendController> {
); );
}, },
), ),
Container( SafeArea(
height: double.infinity,
width: double.infinity,
padding: EdgeInsets.only(top: MediaQuery.of(context).padding.top).w,
child: Column( child: Column(
children: [ children: [
SearchAppbar( SearchAppbar(
@ -148,60 +145,59 @@ class RecommendView extends GetView<RecommendController> {
Widget _buildMasonryGridView(context) { Widget _buildMasonryGridView(context) {
return Container( return Container(
height: double.infinity,
width: double.infinity,
padding: EdgeInsets.only(top: MediaQuery.of(context).padding.top).w,
decoration: const BoxDecoration( decoration: const BoxDecoration(
image: DecorationImage( image: DecorationImage(
image: AssetImage(Assets.imagesRecommendBottomBackground), image: AssetImage(Assets.imagesRecommendBottomBackground),
fit: BoxFit.cover, fit: BoxFit.cover,
), ),
), ),
child: Column( child: SafeArea(
children: [ child: Column(
SearchAppbar( children: [
onTapToSearch: controller.toSearch, SearchAppbar(
onTapToCategory: controller.homeController.openHomeDrawer, onTapToSearch: controller.toSearch,
title: appName, onTapToCategory: controller.homeController.openHomeDrawer,
titleStyle: TextStyle( title: appName,
color: Colors.white, titleStyle: TextStyle(
fontSize: 24.sp, color: Colors.white,
fontWeight: FontWeight.w600, fontSize: 24.sp,
fontWeight: FontWeight.w600,
),
), ),
), Obx(() {
Obx(() { return Expanded(
return Expanded( child: BaseEasyRefresh(
child: BaseEasyRefresh( controller: controller.refreshController,
controller: controller.refreshController, onLoad: controller.onLoad,
onLoad: controller.onLoad, viewState: controller.viewState.value,
viewState: controller.viewState.value, height: discoverListHeight,
height: discoverListHeight, child: Scrollbar(
child: Scrollbar(
controller: controller.scrollController,
child: MasonryGridView.count(
controller: controller.scrollController, controller: controller.scrollController,
itemCount: controller.images.length, child: MasonryGridView.count(
crossAxisCount: 2, controller: controller.scrollController,
mainAxisSpacing: 15.w, itemCount: controller.images.length,
crossAxisSpacing: 15.w, crossAxisCount: 2,
padding: const EdgeInsets.fromLTRB(15, 0, 15, 0).w, mainAxisSpacing: 15.w,
itemBuilder: (context, index) { crossAxisSpacing: 15.w,
ImageModel item = controller.images[index]; padding: const EdgeInsets.fromLTRB(15, 0, 15, 0).w,
return GestureDetector( itemBuilder: (context, index) {
onTap: () => controller.gridToImageDetail(index), ImageModel item = controller.images[index];
child: ImageNetworkWidget( return GestureDetector(
url: item.imageUrl, onTap: () => controller.gridToImageDetail(index),
aspectRatio: item.width! / item.height!, child: ImageNetworkWidget(
radius: 15.r, url: item.imageUrl,
), aspectRatio: item.width! / item.height!,
); radius: 15.r,
}, ),
);
},
),
), ),
), ),
), );
); }),
}), ],
], ),
), ),
); );
} }

View File

@ -28,28 +28,27 @@ class SearchImageView extends GetView<SearchImageController> {
), ),
child: GetBuilder<SearchImageController>( child: GetBuilder<SearchImageController>(
builder: (controller) => Obx( builder: (controller) => Obx(
() => Column( () => SafeArea(
crossAxisAlignment: CrossAxisAlignment.start, child: Column(
children: [ crossAxisAlignment: CrossAxisAlignment.start,
SizedBox( children: [
height: MediaQuery.of(context).padding.top, _buildSearchInput(),
), if (controller.searchList.isNotEmpty) ...[
_buildSearchInput(), Container(
if (controller.searchList.isNotEmpty) ...[ padding: const EdgeInsets.symmetric(horizontal: 15).w,
Container( child: Text(
padding: const EdgeInsets.symmetric(horizontal: 15).w, "ALL ${controller.total}",
child: Text( style: TextStyle(color: Colors.white, fontSize: 20.sp),
"ALL ${controller.total}", ),
style: TextStyle(color: Colors.white, fontSize: 20.sp),
), ),
), 10.verticalSpace,
10.verticalSpace, _buildMasonryGridView(),
_buildMasonryGridView(), ] else ...[
] else ...[ Expanded(child: Container()),
Expanded(child: Container()), _buildTags(context),
_buildTags(context), ]
] ],
], ),
), ),
), ),
), ),
@ -163,9 +162,7 @@ class SearchImageView extends GetView<SearchImageController> {
Widget _buildTags(context) { Widget _buildTags(context) {
return Container( return Container(
width: double.infinity, width: double.infinity,
padding: EdgeInsets.only( padding: const EdgeInsets.only(bottom: 10).w,
bottom: MediaQuery.of(context).padding.bottom + 10,
),
child: Column( child: Column(
children: [ children: [
Row( Row(

View File

@ -20,24 +20,24 @@ class SettingsView extends GetView<SettingsController> {
fit: BoxFit.cover, fit: BoxFit.cover,
), ),
), ),
padding: EdgeInsets.only( padding: const EdgeInsets.only(top: 70).w,
top: MediaQuery.of(context).padding.top + 70, child: SafeArea(
).w, child: Column(
child: Column( crossAxisAlignment: CrossAxisAlignment.start,
crossAxisAlignment: CrossAxisAlignment.start, children: [
children: [ _buildUserinfo(),
_buildUserinfo(), Container(
Container( height: 1.w,
height: 1.w, width: double.infinity,
width: double.infinity, margin: const EdgeInsets.symmetric(
margin: const EdgeInsets.symmetric( horizontal: 58,
horizontal: 58, vertical: 15,
vertical: 15, ).w,
).w, decoration: BoxDecoration(color: Colors.white.withOpacity(.5)),
decoration: BoxDecoration(color: Colors.white.withOpacity(.5)), ),
), _buildOptions(context),
_buildOptions(context), ],
], ),
), ),
), ),
); );