From 8a2463ae832543ebf03767727a6a7939815e4ba6 Mon Sep 17 00:00:00 2001
From: xh <36baea72@gmail.com>
Date: Mon, 22 Jul 2024 20:01:22 +0800
Subject: [PATCH] 1

---
 android/app/src/main/AndroidManifest.xml |  2 +-
 ios/Runner/Info.plist                    |  2 +-
 lib/main.dart                            |  4 +-
 lib/page/settings/settings_view.dart     | 80 +++++++++++++-----------
 lib/res/values/strings.dart              |  2 +-
 pubspec.yaml                             |  2 +-
 6 files changed, 49 insertions(+), 43 deletions(-)

diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml
index 5363b0c..4b6b220 100644
--- a/android/app/src/main/AndroidManifest.xml
+++ b/android/app/src/main/AndroidManifest.xml
@@ -17,7 +17,7 @@
     <application
         android:name="${applicationName}"
         android:icon="@mipmap/launcher_icon"
-        android:label="Fantasy Wallpaper"
+        android:label="ATPaper"
         android:requestLegacyExternalStorage="true"
         android:enableOnBackInvokedCallback="true"
         tools:targetApi="tiramisu">
diff --git a/ios/Runner/Info.plist b/ios/Runner/Info.plist
index d85a32e..2725409 100644
--- a/ios/Runner/Info.plist
+++ b/ios/Runner/Info.plist
@@ -7,7 +7,7 @@
 	<key>CFBundleDevelopmentRegion</key>
 	<string>$(DEVELOPMENT_LANGUAGE)</string>
 	<key>CFBundleDisplayName</key>
-	<string>Fantasy Wallpaper</string>
+	<string>ATPaper</string>
 	<key>CFBundleExecutable</key>
 	<string>$(EXECUTABLE_NAME)</string>
 	<key>CFBundleIdentifier</key>
diff --git a/lib/main.dart b/lib/main.dart
index e95b75a..a8621c5 100644
--- a/lib/main.dart
+++ b/lib/main.dart
@@ -51,13 +51,13 @@ void main() async {
   // 初始化Hive
   await initHive();
 
+  UPCache.preInit();
+
   runApp(const MyApp());
 
   // EasyLoading配置
   configLoading();
 
-  UPCache.preInit();
-
   // 沉浸式状态栏
   if (Platform.isAndroid) {
     SystemChrome.setSystemUIOverlayStyle(const SystemUiOverlayStyle(
diff --git a/lib/page/settings/settings_view.dart b/lib/page/settings/settings_view.dart
index 99668ec..537fd53 100644
--- a/lib/page/settings/settings_view.dart
+++ b/lib/page/settings/settings_view.dart
@@ -1,3 +1,4 @@
+import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_screenutil/flutter_screenutil.dart';
 import 'package:get/get.dart';
@@ -29,12 +30,13 @@ class SettingsView extends GetView<SettingsController> {
             Container(
               height: 1.w,
               width: double.infinity,
-              margin: const EdgeInsets.symmetric(horizontal: 58,vertical: 15).w,
-              decoration: BoxDecoration(
-                color: Colors.white.withOpacity(.5),
-              ),
+              margin: const EdgeInsets.symmetric(
+                horizontal: 58,
+                vertical: 15,
+              ).w,
+              decoration: BoxDecoration(color: Colors.white.withOpacity(.5)),
             ),
-            _buildOptions(),
+            _buildOptions(context),
           ],
         ),
       ),
@@ -86,39 +88,43 @@ class SettingsView extends GetView<SettingsController> {
     );
   }
 
-  Widget _buildOptions() {
-    return ListView.separated(
-      shrinkWrap: true,
-      padding: EdgeInsets.zero,
-      itemCount: controller.options.length,
-      itemBuilder: (context, index) {
-        return Material(
-          color: Colors.transparent,
-          child: InkWell(
-            onTap: () => controller.settingOptionOnTap(index),
-            child: Row(
-              mainAxisAlignment: MainAxisAlignment.center,
-              children: [
-                Text(
-                  controller.options[index],
-                  maxLines: 1,
-                  overflow: TextOverflow.ellipsis,
-                  style: TextStyle(
-                    color: Colors.white,
-                    fontSize: 22.sp,
-                  ),
-                )
-              ],
+  Widget _buildOptions(context) {
+    return Expanded(
+      child: ListView.separated(
+        shrinkWrap: true,
+        padding: EdgeInsets.only(
+          bottom: MediaQuery.of(context).padding.bottom + 70.w,
+        ),
+        itemCount: controller.options.length,
+        itemBuilder: (context, index) {
+          return Material(
+            color: Colors.transparent,
+            child: InkWell(
+              onTap: () => controller.settingOptionOnTap(index),
+              child: Row(
+                mainAxisAlignment: MainAxisAlignment.center,
+                children: [
+                  Text(
+                    controller.options[index],
+                    maxLines: 1,
+                    overflow: TextOverflow.ellipsis,
+                    style: TextStyle(
+                      color: Colors.white,
+                      fontSize: 22.sp,
+                    ),
+                  )
+                ],
+              ),
             ),
-          ),
-        );
-      },
-      separatorBuilder: (context, index) {
-        return Container(
-          height: 16.w,
-          color: Colors.transparent,
-        );
-      },
+          );
+        },
+        separatorBuilder: (context, index) {
+          return Container(
+            height: 16.w,
+            color: Colors.transparent,
+          );
+        },
+      ),
     );
   }
 }
diff --git a/lib/res/values/strings.dart b/lib/res/values/strings.dart
index db75c57..5bb6ba8 100644
--- a/lib/res/values/strings.dart
+++ b/lib/res/values/strings.dart
@@ -1 +1 @@
-const appName = 'Wallpaper Genie';
\ No newline at end of file
+const appName = 'ATPaper';
\ No newline at end of file
diff --git a/pubspec.yaml b/pubspec.yaml
index 3c601af..23b897d 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -2,7 +2,7 @@ name: wallpaperx
 description: "A new Flutter project."
 publish_to: 'none' # Remove this line if you wish to publish to pub.dev
 
-version: 1.0.0
+version: 1.0.0+1
 
 environment:
   sdk: '>=3.4.3 <4.0.0'