- Fix shocker name overflow in non grouped control page

- Removed 'No shockers selected' text from devices page as it just looks weird (if you even see it)
- Fixed crash which could occurr when opening the app with the shares page last opened
- Fixed padding slightly on desktop and mobile to be dynamic

Author: ComputerElite

fastlane/metadata/android/en-US/changelogs/45.txt

@@ -1,3 +1,7 @@
 **Changelog:**
 - Added incoming invites to top of devices page
-- Fixed reference from 'shocker' page to 'devices' page in invite accepted dialog
+- Fixed reference from 'shocker' page to 'devices' page in invite accepted dialog
+- Fix shocker name overflow in non grouped control page
+- Removed 'No shockers selected' text from devices page as it just looks weird (if you even see it)
+- Fixed crash which could occurr when opening the app with the shares page last opened
+- Fixed padding slightly on desktop and mobile to be dynamic

lib/screens/shockers/grouped/grouped_shocker_selector.dart

@@ -110,6 +110,7 @@ class GroupedShockerSelectorState extends State<GroupedShockerSelector> {
                 return children[index];
               },
               itemCount: children.length,
+              padding: EdgeInsets.all(0),
             ),
     ));
   }

lib/screens/shockers/grouped/grouped_shockers.dart

@@ -181,9 +181,10 @@ class _GroupedShockerScreenState extends State<GroupedShockerScreen> {
         child: Flex(
           direction: Axis.vertical,
           children: [
-            InineInviteManager(reloadMethod: () => setState(() {
+            SafeArea(child: SizedBox.shrink()),
+            ConstrainedContainer(child: InineInviteManager(reloadMethod: () => setState(() {
 
-            }),),
+            }),)),
             GroupedShockerSelector(onChanged: onRebuild, onlyLive: liveEnabled),
             if (AlarmListManager.getInstance().selectedShockers.isNotEmpty)
               ConstrainedContainer(
@@ -332,7 +333,7 @@ class _GroupedShockerScreenState extends State<GroupedShockerScreen> {
                 ),
               )
             else
-              Text("No shockers selected", style: t.textTheme.headlineMedium)
+              SizedBox.shrink()
           ],
         ));
   }

lib/screens/shockers/individual/shockers.dart

@@ -365,15 +365,10 @@ class ShockerScreenState extends State<ShockerScreen> {
       child: Column(
         children: [
           Expanded(child: SingleChildScrollView(child: Column(children: [
-            InineInviteManager(reloadMethod: () => setState(() {
+            SafeArea(child: SizedBox.shrink()),
+            ConstrainedContainer(child: InineInviteManager(reloadMethod: () => setState(() {
 
-            }),),
-            Padding(padding: PredefinedSpacing.paddingLarge()),
-            Text(
-              'All devices',
-              style: t.textTheme.headlineMedium,
-              textAlign: TextAlign.center,
-            ),
+            }),)),
             if (groupedShockers.isEmpty)
               Text(
                 "No shockers found",

lib/screens/shockers/shocker_item.dart

@@ -324,10 +324,10 @@ class ShockerItemState extends State<ShockerItem>
                       widget.onRebuild();
                     },
                   ),
-                  Text(
+                  Expanded(child: Text(
                     widget.shocker.name,
                     overflow: TextOverflow.ellipsis,
-                  ),
+                  ),)
                 ],
               )),
               Row(

lib/screens/user_shares/invites_screen.dart

@@ -214,7 +214,6 @@ class _InlineInviteManagerState extends State<InineInviteManager> {
     ThemeData t = Theme.of(context);
     return Column(
       children: [
-        Padding(padding: PredefinedSpacing.paddingLarge()),
         Text("Incoming invites", style: t.textTheme.headlineSmall,),
         ...incoming.map((x) => InviteItem(
                 invite: x,

lib/screens/user_shares/user_share_screen.dart

@@ -87,8 +87,8 @@ class _UserShareScreen extends State<UserShareScreen> {
     return ConstrainedContainer(
         child: Column(
       children: [
-        Padding(padding: PredefinedSpacing.paddingLarge()),
-        SegmentedButton<int>(
+          SafeArea(child: SizedBox.shrink()),
+          SegmentedButton<int>(
           segments: [
             ButtonSegment(value: 0, label: Text("Share links")),
             ButtonSegment(value: 1, label: Text("Shared")),

lib/screens/user_shares/user_shares_screen.dart

@@ -32,12 +32,15 @@ class UserSharesScreen extends StatefulWidget {
 
 class _UserSharesScreen extends State<UserSharesScreen> {
   bool initialLoading = false;
+  bool error = false;
 
   Future loadShares() async {
-    await AlarmListManager.getInstance().updateUserShares();
+    this.error = false;
+    bool success = await AlarmListManager.getInstance().updateUserShares();
     if (!mounted) return;
     setState(() {
       initialLoading = false;
+      this.error = !success;
     });
   }
 
@@ -85,7 +88,7 @@ class _UserSharesScreen extends State<UserSharesScreen> {
         : DesktopMobileRefreshIndicator(
             onRefresh: loadShares,
             child: ConstrainedContainer(
-              child: ListView(children: shareEntries),
+              child: ListView(children: error ? [Text("An error occured while loading the shares. Please try again", style: t.textTheme.headlineSmall, textAlign: TextAlign.center,)] : shareEntries),
             ));
   }
 }

lib/services/alarm_list_manager.dart

@@ -1156,15 +1156,21 @@ class AlarmListManager {
     return error;
   }
 
-  Future<void> updateUserShares() async {
+  Future<bool> updateUserShares() async {
     OpenShockUserShares shares = OpenShockUserShares();
     OpenShockClient client = OpenShockClient();
-    for (Token token in getTokens()) {
-      ErrorContainer<OpenShockUserShares> s = await client.getShares(token);
-      if(s.value == null) continue;
-      shares.incoming.addAll(s.value!.incoming);
-      shares.outgoing.addAll(s.value!.outgoing);
+    // Duct tape fix for loading shares before shockers are present
+    try {
+      for (Token token in getTokens()) {
+        ErrorContainer<OpenShockUserShares> s = await client.getShares(token);
+        if(s.value == null) continue;
+        shares.incoming.addAll(s.value!.incoming);
+        shares.outgoing.addAll(s.value!.outgoing);
+      }
+      userShares = shares;
+      return true;
+    } catch(e) { 
+      return false;
     }
-    userShares = shares;
   }
 }

pubspec.yaml

@@ -16,7 +16,7 @@ publish_to: 'none' # Remove this line if you wish to publish to pub.dev
 # https://developer.apple.com/library/archive/documentation/General/Reference/InfoPlistKeyReference/Articles/CoreFoundationKeys.html
 # In Windows, build-name is used as the major, minor, and patch parts
 # of the product and file versions while build-number is used as the build suffix.
-version: 0.4.0+44
+version: 0.4.1+45
 environment:
   sdk: ^3.6.0
   flutter: ">=3.29.2"