From 46dbbe257844dc54b4e3a7e4f6a6fa1bb466b42e Mon Sep 17 00:00:00 2001 From: xh <36baea72@gmail.com> Date: Mon, 22 Jul 2024 19:13:11 +0800 Subject: [PATCH] 1 --- assets/icon/back_big.png | Bin 387 -> 2992 bytes assets/icon/category.png | Bin 0 -> 4058 bytes assets/icon/download.png | Bin 399 -> 3192 bytes assets/icon/favorite.png | Bin 484 -> 2861 bytes assets/icon/group.png | Bin 713 -> 0 bytes assets/icon/img_info.png | Bin 703 -> 4852 bytes assets/icon/search.png | Bin 1113 -> 3996 bytes assets/icon/un_favorite.png | Bin 782 -> 3637 bytes assets/images/collection_selected.png | Bin 3616 -> 3805 bytes assets/images/recommend_selected.png | Bin 3675 -> 5089 bytes assets/images/setting_selected.png | Bin 3282 -> 3310 bytes .../navigation_bar/custom_appbar.dart | 7 +- .../navigation_bar/search_appbar.dart | 42 ++++++--- lib/generated/assets.dart | 2 +- lib/main.dart | 5 +- lib/page/home/home_controller.dart | 2 - .../wallpaper_detail_controller.dart | 1 - .../wallpaper_detail_view.dart | 82 ++++++++++-------- .../wallpaper_detail_v2_controller.dart | 1 - 19 files changed, 78 insertions(+), 64 deletions(-) create mode 100644 assets/icon/category.png delete mode 100644 assets/icon/group.png diff --git a/assets/icon/back_big.png b/assets/icon/back_big.png index 797258f74f3e3368964837d43101a77334fc7a60..5445214ec73339f58b286084dc9428b58bf27c6d 100644 GIT binary patch literal 2992 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 diff --git a/assets/icon/category.png b/assets/icon/category.png new file mode 100644 index 0000000000000000000000000000000000000000..3bae586c953d1cd10b23a4b8d9c82cdbb95bde1b GIT binary patch literal 4058 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 MFy>Zf475A(zw^zRm;e9( literal 0 HcmV?d00001 diff --git a/assets/icon/download.png b/assets/icon/download.png index 63427b0e249d806ad2dce6f846fa7c4a2e5be40d..627a544a812087e1861e7c8417a8262a5a519bcb 100644 GIT binary patch literal 3192 zcmeH~S5%YP7RN&wDWL{NkZMAr0@90@GE9UI_y|ox@1QdxjG$7LCQTtqNfZKtp@bGn zKw6aU2uLS_G+_V*r1w758z1ibUF)v9?#q2R`|PvV`R%<U_E1OnkU z0s$b3hX;REyA)AVj3d8{50yo#Rbf+ zxTMElu%G=U=yblXP$rIkyrH!{p%MhTc(qBgUi=E6wQ35KSTAPddNTJj9AUHb~zWc}sAQ9rp!-Txajebvnz%-ciG+6O*YX2cbaUt&~o$h7Z zpJQ9vi?j&dojU$*ik4NWw`Qvv8JX(wP4f(ZsST)pp#1r@Rd_oE%lW|94j1TWXOveH zo1j(@cBG=BJkK$@EFgp-RlPNQ80sd>E9eYr!x&mJWy zTWr!uq!j7sH69S<9JlmIUd*4LT*!=V3Rh%vipeowj(pUwQh<{Q1lSBluhAfS;24$JFUiKNQDdVzP_>TN=p zA^~@Ws=tS3a};gFhGlUE?K1_;HOxZ}zb1rn$@H;Dk~m6v@#(7}f2^h0(C1TMZudp6 zczzPa#jtVwiK(OKeM%K)S`^s`dps!0fNy<{3fF8-e?68TYm?7sXPa-UG@`43guVU< zzaf48VOk*?S-x*@f~S0U0Y&{pmL7iA>sv%XB570-{b;%gtPYVC`f8wz?pqvCVY;ri zMbnaYA=7So7vtxL>~93+nzz%FEj+XeR=kaE8vyTpJ*Y~k@RpS1Pt>BNg0a9zlB;P$ z>0<>_UXNJ@(1gwpO^Ek4%r-^13XM*qylNwNY${g=z>;Lvv9;&;J0x)=rq*Ozg0Y&v zuOr|T&K5kF=8uF$6)SS#VvG#`ANt?z1bHI+^uG4#GCITj{M+Ee!@^Ek_`qZgoS>Kj z?#NSGW;P`gu=EscmiOtn~?3_Hz=a7Uq47b6)0 z_ypVuxsm&8(pesHsZjhNJk!-wN02P1!#HbcfIJngsU57U?%=xe;hJRVM&{w>vg?zF z&w2C^?uU4GT%g>~NL>V+iD63ew`lw+>^Mf0AwK*t4SBc>KMc-rU}yx=*Gbn3!I*{g zWoQvN`!0q8fH4dQgy8TU4>&A-VE7J(G{FfoF!B!!PLTSMwjBka7?>`CA#X82qH!FC zfiWD`A9Ygs{u>2VHAS+dshO(_x7C}|wf)7&l)2;Tu5tgGQtleXme}(0=2x|s?CJyY zbtm8Ya|LpD-`3B4gIX<(NQ+D2W?{YMmt2OMQ_b=?c=$*5L{-PqK4&bae&)M1KYAJF zZRD@*BVTqoCrG+6b>WP!aJ!__GZCuO`WnB$Jw$t6GO+abv9Ir%6kD6|AX<2}d76@5 z%nxhqCwrS-$?cmTc{wLEOgamOTa1ShuwFF97E8%%guYgmpa=j{)39366;XbaQ&8># z4m#9LUHwZ2D0U{(1Zsyc8}Cw<6M&Mf#xqKY-$|Ay)%7oi#Bw^6YW>dHK-d}*}MHu$o|B?Og685@^e0)+icv1Nk>m7C#S(q5V2 zS6iB7AC$oo65Go)eHyPq`?Pwa=Ce~%?nFNbyZJeEC%3!li|v-p(3L$lHx**X0juny zY%Baj*vy^-x!1kraHn9|l!7$(R{FC%YTfEzfFR(1uMzfH5utHea!c^W&nX^I>i6qK^UOGx}@HzaSTxe}AG$Lx%aY@{jQc z(lbs-hcGx+&a7IwDp|54f#4@&0qN4pj1>C*jZlPg=v1-OwlN@i=Ok>6vE*R~Q81ih z08~UgDJbk`&4U&xOU&R_Tm8b+)+$l$=nk^dBj}!S=Sw@iaCe0i;00St-a$e6{En}= zAPeO;CF(r?EWx1ywX}8Mf_zrN9HRJi)6 zclogZ%pyf7Z^+uuuEnjxAXeP>duYhv}-czCsc=K+z%B8l>7d>Ng9OJS)tFQ767Rp;+ol@(-};ed?DO5%P5(a4bhTf@TYc`--1Yr@ z#`i;&?)rynpL)En=5b5h6f<3Cu7LC%%vO_T>6h!&wwTxHx__S)xkK9WlquiY#)d-| z>;;@B%XBQ16LfYvA`l>=l*FOIBWUPyL_pBlrLdzzQK_v%LMf@EW8s$zezJyB?oCv3 zQ|6y}H?n76@Co-RtFQN1#fSCR|OD^C1E6_oLxavlKu*%2(8U{weJ#uxNGmMQ&6#uqSbo<#?|5C&3$AT z8dU^vZ{wg~GC+KTKmka(dsH6e$*~anC|ZGlG~VZaZW#d2h)z@zF#wH2H5;%%0VKQq zE~qmAH6EGgJF5o}qgr3USen?}#dzKLJyx@a>8-PZ|QE9X*1w){(ch3#6YON3VQ+Ewj7ZL=M%yOgFG|-+dZkidxTBme-}6 zj9F%mZqy5dR*b;nB~;j{#SIGEoyX&Gy-wfALwaJCYjs6WvsTl_zbvOXF!W>MTyGuE zaM!Qx?{RtAci>xh+OAmj?mclHUw-ZbhLmZ2RoU}3V`GOK@5I~%o-v-c_|^<~EtWdA z53X!{P$sL(?$+RqE4pOpFGdomF1?M^YHm-6Bztkd#QG|Gw@YfPGVy9WRTj(uUXK0$_R_BuD`)Qx%s$RokJy*W;P%Gxb?xKwcA5wXX70PB7td8&3XOp5tP^F z;s-Cq6ke@%`Q@C_w&pT;tR@RXRG9s8;6*3PVP~T~nDBY3Bk0R%k0aPFU6Dr$g8wq} z3hQHV95n50Mc`1=UK+F1la%bK7AY*~=rY+8VH@rMiau!-!HoR(Z^tk+ccwBbVfu0N zVais2{}HQf=Sy(iV}8D)0>{-W8RUQOyLDJ4X~y&v7WcJ{pOdJ7yWo`!NYtFYDt(oZ zeZL{l$uL&rw8ou5;^yVDclyWJYn>N>B@yboH~ldz3tcS;jXG$&_W?}%%^20=!yqOq zxW;*?IEteqw&_X5yhG4J%v|!HJhL6~qrRDL@{xT`Y7)p0BYUeM9aFT4cgUyOSzVn_ zBhLsakTV-I69rY){tB?XqmhN`s-zY$XLB3_ptoDb?N`_hqQ@Uc4p%@rSL=ai6^B(M zv(&<6@2J+lC~}ma=<*k6hjvFuCa`NvR68+SVA?a9{X2bO=nwy5%V;{vMmQjj9*ro} z_O^B>*PQ^%mG{#wbCA~Y338YmMu!6NZO|pYJa*a&O!g<1A4uD_@zU0l-+y2$%NDu-*&x9 zPq`-SQKj;^JNLZZHsV|STg!)ux=rY7t5OjGoxYWqv;MZ9ftq<;0-v34mB zYl9+Y$}8v3&CB|ys;&%*T4~oEXKGr0$^WwnQX4(|5_PuPlCArGzSY0bF*pCY!{RA< zJ*ekg8l&!fJ-0ujLTR?_mLej-aC-28gH95zVKnbhk}BneVZH6Kp5@^1 z#4JLc9>oUYN})(xp8tK5@Q@r7l9sopX_$JN@1cexrhn(H-FU(G*ohYwByn>zW#rIfXG-2SByIlDjoIA0iCrin)pV%hgPi})?fYSX z9<}n0QY=Gp1-Uw18Ob`-C_>^?=QA2o%40rGFK!J;PGGIYw8VEYr4BsLwBdeRP&5*D zPATECE*J#xMu)WtH6X~fDD!R%lSzuE!lbURGI>r>dtb$Cn*3{+nSO%~`f>kwk~2j8 z@_X-G{^Q|2nt)~oYg`XW(9Ciw8zE+}V7wGN1m@5k5qJ!nBS~o=X=)NJ(<4oKx^On6 z0hX4w_MyU_N-71v77}yz+ZPn`KVM>I1na-;B`G6sZMR;&EEak-&}$W2hxEjsm-`;hcfSF8P)|=JASuSNpsDC>TU^$HN(xS;?8~AQf&Gg)L`iXD9y9z#fmsa(9TOG(q-lO1O#R zeV^3J_(`W7-ljd6f2;M7I_kBacycnQRbP=hG;!{xESM!_CLMx)mWkCO71i57g!oYH zo9J7<#0)~B$10Ihy1)ckbtwI#5P@IsnOsWrDgB@nLjHq`Eg}VUO7JK5kZzJO7swev zQW&93qxU!kbmN=BKHM!$2XVVG|B++khuzni~cy>%7 x_hudh6zLdgL^A-Yg;n~22a<*D|NeUu)Jl4RLeRsUCHpTxKW=MPbM#{Te*jQ@|EvH2 literal 484 zcmeAS@N?(olHy`uVBq!ia0vp^9w5xY3?!3`olAj~S%6Q7E0F$AI{27;><>_#Y42(XWE{-7)hu>cJ?rSy>V7c&3{xQSK-|=N` z8bO_n6Izlcc7EEn&Fd|HZeslZxEI-;3^C#D8*CSfn)`QDs;j9r-1<;n^NOKpy0xWn z^0sAdJLLA~O}*SG7T6Qny;|n|hP9Qyr&|6|SlMvRHS|JV(9yoA4atR7%zecNPdEz9 zyzD$NB8dHDin-jZK5b#vbv~ExHwn31O=Db@w3%n>&JFSyk4b>)j+*&lcza{06$ zXHSV2v0dHqroXB`M}T+xf|qORO0ItYHK#2^{QTku|CF%Z7cH~1-2|If2VOYuQ$JC! zdx1`#X=#+>l%q`qJXJZd()5P*FYCbAZQ?&)9Fcf6z1L=Ij{8r= kZIc?F9Glf#TRTg>QsCS#edQ?+fPv27>FVdQ&MBb@0KN(F9{>OV diff --git a/assets/icon/group.png b/assets/icon/group.png deleted file mode 100644 index 812b66779a3a2b40b654feefeebe6fb98991b5a7..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 713 zcmeAS@N?(olHy`uVBq!ia0vp^2_VeD3?#3*wSy$Q1AIbUfwY{QoUE)Ykd%>;fv|yG zAX`B}K|nwNC;}G*ibDWUfl1oa#W5t~-ql;2>lPdEuq9Y4awlfKcB=et|1w0m zchPc1?g{^O?=u!8@3!#uDs8&nEPeCD?8Mh>Z<)6WT{*KUc~0o{2QP1Vwe6KS9IaW@ z|5<+CQZ8*PXX(o3)(<-Q8wBP~KKzXNX_%pPhil93IVJp|FB2_$wJ(`S?rd0|^y}#& zC&eu>%N)=5ml)b_(DA)=V#@pTug~OdXPcH*@m{)odfU4NOzv8t3=xufmu4`lYJ8f{ zw87-~0#+BP%?&47-Z0s1dm5Q|)5!aTUP5(P)zsA=Cdhi{HY~m4!6$m)QvBREk=e{^ zCW#f%a7_pk+S zNsUQHo8CX(I%RppOhwNdpMuv!DLEuQ(AlqeVAlMktCw8krhgLAHvVBI%X;ciyy%DN zvVTf>{5>07UtE}d|Bhxz)uOBCEnKIZx%kcI$<$K;M((FKGI+nU zIJlU}=8}D~vGCfuV};K)7#d%El^$bb{HmA1z%`2Din#3aBW_N54Y&HA&9r;%^O&VH zzIKgg?sjqJzw4j3alX=In$l?f<)huNrbXYnp0>w5%J^X#e(*?9lLr}Umv{LzyE(v-i3Xi9@aDPU-+|frjkGjFcC3$y85}Sb4q9e0Mp1dQ~&?~ diff --git a/assets/icon/img_info.png b/assets/icon/img_info.png index 028236add01d68161798e255b2136b3cefab620d..58c956a93bcc71a417f4222ddeb3e17abb5d29a2 100644 GIT binary patch literal 4852 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 literal 703 zcmeAS@N?(olHy`uVBq!ia0vp^9w5xY3?!3`olAj~Wq?nJE0F$A7T~fn%?D~0Dhcun zW^hp0pU`k$;Qjga6XpjjD9AUM_{VS#0|S$?r;B4q#NnqiZkDwu@Hougp!LA$|No7) z!KXX@I3%~))@H~#=7$-4d@S$nz`(#$E|GCrK>ogv@1}~*M{Vqr56(?(tmH^~W`cM$!+~9e+h^S`D(E!b!+Gf9g_GCUMxOr`k<7UEZPKbh$HLR$J&iT-t7I* zu&t>h_qb8`2GJEel4o_w{+ZSv^KwSH z??O@aT^3GP^ zkKBqojDHh0X#U;IHOc(&K84Sw7d%)!OY6jr_=hX~KG*c(!X?v1O<%HEI;(|Dt}c1o zB(lE2#&!BUR#ug{Cd=#kN(BDPNF7|l!0e zgSAZ^4|zCl%l2e`ZCRbZj&tqIYrj|(B6qKqKe@)_xR>!Mrlj))pYqM#e0S&YJGJ6` z$*+nf{%ci*+~xlSNYB}u_ASKyqEg~3pXDcG_*b3(5Hv?~)58d9fz>lEMlxuWon&5X zbbRW{shsk2N~cUTtp7Nw$@h!PC{xWt~$( F69C03T|58) diff --git a/assets/icon/search.png b/assets/icon/search.png index 6e17f93b7278c5f56cb2999aa7e3c04feed32916..b7eea7728b425b28b4010581f8c6e9ca6d268c3f 100644 GIT binary patch literal 3996 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 diff --git a/assets/icon/un_favorite.png b/assets/icon/un_favorite.png index e509cba546f3cc955839d7ed6fdaea9a80a7419d..8069b23f18d4d6bf5fdc2a3e2b327fbdc866de50 100644 GIT binary patch literal 3637 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 G75`s%l5`{h literal 782 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 diff --git a/assets/images/recommend_selected.png b/assets/images/recommend_selected.png index f4b0ff61e79fa847a27b6fab493bafd24bc9503e..8970608f333e134a4c65f174b0fcd7ab42284044 100644 GIT binary patch literal 5089 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 G=Dz^FMGx}; literal 3675 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 RSdg@ma(D5j)jKh`{{wWRDWL!W diff --git a/assets/images/setting_selected.png b/assets/images/setting_selected.png index c482611a25bfe77fffd2b453615f9017d37771cc..25cf0a19f2a6ba6bc0236914cab72390a904edb2 100644 GIT binary patch literal 3310 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 Get.back(), child: Padding( padding: const EdgeInsets.all(10).w, child: Image.asset( diff --git a/lib/common/components/navigation_bar/search_appbar.dart b/lib/common/components/navigation_bar/search_appbar.dart index df80a3d..72067b6 100644 --- a/lib/common/components/navigation_bar/search_appbar.dart +++ b/lib/common/components/navigation_bar/search_appbar.dart @@ -32,11 +32,19 @@ class SearchAppbar extends StatelessWidget implements PreferredSizeWidget { child: Row( mainAxisAlignment: MainAxisAlignment.spaceBetween, children: [ - GestureDetector( - onTap: onTapToCategory, - child: Image.asset( - width: iconWitch ?? 32.w, - groupIcon ?? Assets.iconGroup, + Container( + padding: const EdgeInsets.all(5).w, + decoration: BoxDecoration( + color: Colors.black87, + borderRadius: BorderRadius.circular(10).w, + ), + child: GestureDetector( + onTap: onTapToCategory, + child: Image.asset( + width: iconWitch ?? 20.w, + color: Colors.white, + groupIcon ?? Assets.iconCategory, + ), ), ), title == null @@ -45,9 +53,9 @@ class SearchAppbar extends StatelessWidget implements PreferredSizeWidget { children: [ showDown ?? true ? Image.asset( - width: 24.w, - Assets.iconDown, - ) + width: 24.w, + Assets.iconDown, + ) : Container(), Stack( clipBehavior: Clip.none, @@ -90,11 +98,19 @@ class SearchAppbar extends StatelessWidget implements PreferredSizeWidget { : Container(), ], ), - GestureDetector( - onTap: onTapToSearch, - child: Image.asset( - width: iconWitch ?? 32.w, - searchIcon ?? Assets.iconSearch, + Container( + padding: const EdgeInsets.all(5).w, + decoration: BoxDecoration( + color: Colors.black87, + borderRadius: BorderRadius.circular(10).w, + ), + child: GestureDetector( + onTap: onTapToSearch, + child: Image.asset( + width: iconWitch ?? 20.w, + color: Colors.white, + searchIcon ?? Assets.iconSearch, + ), ), ), ], diff --git a/lib/generated/assets.dart b/lib/generated/assets.dart index 4258da6..956745c 100644 --- a/lib/generated/assets.dart +++ b/lib/generated/assets.dart @@ -20,12 +20,12 @@ class Assets { static const String iconArrowTop = 'assets/icon/arrow_top.png'; static const String iconBack = 'assets/icon/back.png'; static const String iconBackBig = 'assets/icon/back_big.png'; + static const String iconCategory = 'assets/icon/category.png'; static const String iconCfgScale = 'assets/icon/cfg_scale.png'; static const String iconDataEmpty = 'assets/icon/data_empty.png'; static const String iconDown = 'assets/icon/down.png'; static const String iconDownload = 'assets/icon/download.png'; static const String iconFavorite = 'assets/icon/favorite.png'; - static const String iconGroup = 'assets/icon/group.png'; static const String iconIconApp = 'assets/icon/icon_app.png'; static const String iconImgDelTip = 'assets/icon/img_del_tip.png'; static const String iconImgErrorType = 'assets/icon/img_error_type.png'; diff --git a/lib/main.dart b/lib/main.dart index bdf15b6..e95b75a 100644 --- a/lib/main.dart +++ b/lib/main.dart @@ -21,8 +21,8 @@ import 'package:wallpaperx/routes/app_pages.dart'; void main() async { WidgetsFlutterBinding.ensureInitialized(); - // 初始化Firebase try { + // 初始化Firebase await Firebase.initializeApp( options: DefaultFirebaseOptions.currentPlatform, ); @@ -48,9 +48,6 @@ void main() async { DeviceOrientation.portraitDown, ]); - // 初始化广告sdk - // await ApplovinManage().initApplovin(); - // 初始化Hive await initHive(); diff --git a/lib/page/home/home_controller.dart b/lib/page/home/home_controller.dart index f19899f..79c54ee 100644 --- a/lib/page/home/home_controller.dart +++ b/lib/page/home/home_controller.dart @@ -66,7 +66,6 @@ class HomeController extends GetxController with WidgetsBindingObserver { Future didChangeAppLifecycleState(AppLifecycleState state) async { switch (state) { case AppLifecycleState.resumed: - // await ApplovinManage().showAdIfReady(ApplovinManage().adUnitId1); break; case AppLifecycleState.inactive: case AppLifecycleState.hidden: @@ -88,7 +87,6 @@ class HomeController extends GetxController with WidgetsBindingObserver { /// 点击BottomNavigationBar void onTapNavigationBar(int index) { pageController.jumpToPage(index); - // ApplovinManage().showAdIfReady(ApplovinManage().adUnitId1); } /// 获取用户信息 diff --git a/lib/page/wallpaper_detail/wallpaper_detail_controller.dart b/lib/page/wallpaper_detail/wallpaper_detail_controller.dart index 3648979..1e6f0de 100644 --- a/lib/page/wallpaper_detail/wallpaper_detail_controller.dart +++ b/lib/page/wallpaper_detail/wallpaper_detail_controller.dart @@ -169,6 +169,5 @@ class WallpaperDetailController extends GetxController { /// 显示广告 void showAd() { Get.back(); - // ApplovinManage().showAdIfReady(ApplovinManage().adUnitId3); } } diff --git a/lib/page/wallpaper_detail/wallpaper_detail_view.dart b/lib/page/wallpaper_detail/wallpaper_detail_view.dart index 40e680b..8d00d22 100644 --- a/lib/page/wallpaper_detail/wallpaper_detail_view.dart +++ b/lib/page/wallpaper_detail/wallpaper_detail_view.dart @@ -100,7 +100,7 @@ class WallpaperDetailView extends GetView { 16.horizontalSpace, _buildOptionItem( Assets.iconBackBig, - 'Blur', + '', controller.showAd, ), Expanded(child: Container()), @@ -114,13 +114,13 @@ class WallpaperDetailView extends GetView { 24.horizontalSpace, _buildOptionItem( Assets.iconDownload, - 'Download', + '', controller.downloadImg, ), 24.horizontalSpace, _buildOptionItem( Assets.iconImgInfo, - 'Blur', + '', controller.flipCard, ), 16.horizontalSpace, @@ -154,12 +154,6 @@ class WallpaperDetailView extends GetView { child: BackdropFilter( filter: ImageFilter.blur(sigmaX: 10.0, sigmaY: 10.0), child: Container( - padding: EdgeInsets.fromLTRB( - 30, - 0, - 30, - MediaQuery.of(context).padding.bottom + 55, - ).w, width: double.infinity, decoration: BoxDecoration( color: const Color(0xff000000).withOpacity(.8), @@ -169,10 +163,9 @@ class WallpaperDetailView extends GetView { children: [ 63.verticalSpace, Row( - mainAxisAlignment: MainAxisAlignment.spaceBetween, + mainAxisAlignment: MainAxisAlignment.center, crossAxisAlignment: CrossAxisAlignment.start, children: [ - 24.horizontalSpace, Stack( clipBehavior: Clip.none, children: [ @@ -207,20 +200,12 @@ class WallpaperDetailView extends GetView { ), ], ), - GestureDetector( - onTap: controller.flipCard, - child: Icon( - Icons.close, - color: Colors.white, - size: 24.w, - ), - ), ], ), 37.verticalSpace, Expanded( child: ListView( - padding: EdgeInsets.zero, + padding: const EdgeInsets.symmetric(horizontal: 30).w, children: [ Wrap( spacing: 8.w, @@ -297,22 +282,47 @@ class WallpaperDetailView extends GetView { ), ), 24.verticalSpace, - GestureDetector( - onTap: () => controller.copyPrompt(model.generateInfo), - child: Container( - width: double.infinity, - padding: const EdgeInsets.symmetric( - vertical: 15, horizontal: 8) - .w, - decoration: BoxDecoration( - color: const Color(0xff322E31), - borderRadius: BorderRadius.circular(30).r, - ), - child: Text( - "copy", - textAlign: TextAlign.center, - style: TextStyle(color: Colors.white, fontSize: 14.sp), - ), + Container( + height: 70.h, + width: double.infinity, + padding: EdgeInsets.only( + left: 16, + right: 16, + top: 15, + bottom: MediaQuery.of(context).padding.bottom + 15).w, + child: Row( + mainAxisAlignment: MainAxisAlignment.spaceBetween, + children: [ + _buildOptionItem( + Assets.iconBackBig, + '', + controller.showAd, + ), + GestureDetector( + onTap: () => + controller.copyPrompt(model.generateInfo), + child: Container( + width: 200.w, + height: 70.h, + alignment: Alignment.center, + decoration: BoxDecoration( + color: Colors.white.withOpacity(.2), + borderRadius: BorderRadius.circular(50).r, + ), + child: Text( + "Copy Prompt", + textAlign: TextAlign.center, + style: TextStyle( + color: Colors.white, fontSize: 14.sp), + ), + ), + ), + _buildOptionItem( + Assets.iconImgInfo, + '', + controller.flipCard, + ), + ], ), ), ], diff --git a/lib/page/wallpaper_detail_v2/wallpaper_detail_v2_controller.dart b/lib/page/wallpaper_detail_v2/wallpaper_detail_v2_controller.dart index abf2c16..9ce0618 100644 --- a/lib/page/wallpaper_detail_v2/wallpaper_detail_v2_controller.dart +++ b/lib/page/wallpaper_detail_v2/wallpaper_detail_v2_controller.dart @@ -167,6 +167,5 @@ class WallpaperDetailV2Controller extends GetxController { /// 显示广告 void showAd() { Get.back(); - // ApplovinManage().showAdIfReady(ApplovinManage().adUnitId3); } }