Merge pull request #26 from MurilonND/develop

fix: infinite loading
MurilonND · Aug 9, 2023 · 7482182 · 7482182
2 parents c4c8e3c + 3ff6bb1
commit 7482182
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 4 deletions.
diff --git a/android/app/build.gradle b/android/app/build.gradle
@@ -47,7 +47,7 @@ android {
         applicationId "com.example.liquid_art_ai"
         // You can update the following values to match your application needs.
         // For more information, see: https://docs.flutter.dev/deployment/android#reviewing-the-gradle-build-configuration.
-        minSdkVersion 21
+        minSdkVersion 30
         targetSdkVersion flutter.targetSdkVersion
         versionCode flutterVersionCode.toInteger()
         versionName flutterVersionName

diff --git a/lib/src/features/connection/presentation/page/connection_page.dart b/lib/src/features/connection/presentation/page/connection_page.dart
@@ -26,8 +26,8 @@ class _ConnectionPageState extends State<ConnectionPage> {
     hostnameController = TextEditingController(text: _galaxyCubit.state.hostname);
     ipAddressController = TextEditingController(text: _galaxyCubit.state.ipAddress);
     passwordController = TextEditingController(text: _galaxyCubit.state.password);
-    lgScreensController = TextEditingController(text: _galaxyCubit.state.lgScreens.toString());
-    portController = TextEditingController(text: _galaxyCubit.state.port.toString());
+    lgScreensController = TextEditingController(text: _galaxyCubit.state.lgScreens.toString() == '0'? '': _galaxyCubit.state.lgScreens.toString());
+    portController = TextEditingController(text: _galaxyCubit.state.port.toString() == '0'? '': _galaxyCubit.state.port.toString());
 
 
     super.initState();

diff --git a/lib/src/features/drawer/presentation/pages/drawer_page.dart b/lib/src/features/drawer/presentation/pages/drawer_page.dart
@@ -55,6 +55,7 @@ class _DrawerPageState extends State<DrawerPage> {
   String image = "";
   String imageBytes = "";
   bool isLoaded = false;
+  bool isLoading = true;
   bool isSaving = false;
   bool placeHolder = true;
 
@@ -356,10 +357,11 @@ class _DrawerPageState extends State<DrawerPage> {
                             onTap: modelValue != null &&
                                     sizeValue != null &&
                                     imagePromptController.text.isNotEmpty &&
-                                    isLoaded
+                                    isLoading
                                 ? () async {
                                     setState(() {
                                       isLoaded = false;
+                                      isLoading = false;
                                       placeHolder = false;
                                       image = '';
                                       imageBytes = '';
@@ -393,6 +395,7 @@ class _DrawerPageState extends State<DrawerPage> {
                                     }
                                     setState(() {
                                       isLoaded = true;
+                                      isLoading = true;
                                     });
                                   }
                                 : null,