diff --git a/assets/icon/back_big.png b/assets/icon/back_big.png index 797258f..5445214 100644 Binary files a/assets/icon/back_big.png and b/assets/icon/back_big.png differ diff --git a/assets/icon/category.png b/assets/icon/category.png new file mode 100644 index 0000000..3bae586 Binary files /dev/null and b/assets/icon/category.png differ diff --git a/assets/icon/download.png b/assets/icon/download.png index 63427b0..627a544 100644 Binary files a/assets/icon/download.png and b/assets/icon/download.png differ diff --git a/assets/icon/favorite.png b/assets/icon/favorite.png index 71f2b86..761937a 100644 Binary files a/assets/icon/favorite.png and b/assets/icon/favorite.png differ diff --git a/assets/icon/group.png b/assets/icon/group.png deleted file mode 100644 index 812b667..0000000 Binary files a/assets/icon/group.png and /dev/null differ diff --git a/assets/icon/img_info.png b/assets/icon/img_info.png index 028236a..58c956a 100644 Binary files a/assets/icon/img_info.png and b/assets/icon/img_info.png differ diff --git a/assets/icon/search.png b/assets/icon/search.png index 6e17f93..b7eea77 100644 Binary files a/assets/icon/search.png and b/assets/icon/search.png differ diff --git a/assets/icon/un_favorite.png b/assets/icon/un_favorite.png index e509cba..8069b23 100644 Binary files a/assets/icon/un_favorite.png and b/assets/icon/un_favorite.png differ diff --git a/assets/images/collection_selected.png b/assets/images/collection_selected.png index 3e27256..7ec88d3 100644 Binary files a/assets/images/collection_selected.png and b/assets/images/collection_selected.png differ diff --git a/assets/images/recommend_selected.png b/assets/images/recommend_selected.png index f4b0ff6..8970608 100644 Binary files a/assets/images/recommend_selected.png and b/assets/images/recommend_selected.png differ diff --git a/assets/images/setting_selected.png b/assets/images/setting_selected.png index c482611..25cf0a1 100644 Binary files a/assets/images/setting_selected.png and b/assets/images/setting_selected.png differ diff --git a/lib/common/components/navigation_bar/custom_appbar.dart b/lib/common/components/navigation_bar/custom_appbar.dart index 9246e28..d9c60b8 100644 --- a/lib/common/components/navigation_bar/custom_appbar.dart +++ b/lib/common/components/navigation_bar/custom_appbar.dart @@ -34,12 +34,7 @@ class CustomAppbar extends StatelessWidget implements PreferredSizeWidget { child: Material( color: Colors.transparent, child: InkWell( - onTap: onBackTap ?? - () { - Get.back(); - // ApplovinManage() - // .showAdIfReady(ApplovinManage().adUnitId3); - }, + onTap: onBackTap ?? () => 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); } }