Merge pull request #26 from Ethrel/development

Small fixes, improvements, and bits and pieces...

Author: Ethrel

.github/workflows/build.yml

@@ -44,7 +44,15 @@ jobs:
           SIGNING_KEY_ALIAS: ${{ secrets.SIGNING_KEY_ALIAS }}
           SIGNING_KEY_PASSWORD: ${{ secrets.SIGNING_KEY_PASSWORD }}
           SIGNING_STORE_PASSWORD: ${{ secrets.SIGNING_STORE_PASSWORD }}
-          
+
+      - name: Downloadable release store
+        uses: actions/upload-artifact@v4.5.0
+        with:
+          name: Build Artifacts
+          path: |
+            build/app/intermediates/merged_native_libs/release/out/lib
+          retention-days: 7
+
       - name: Update google play
         uses: r0adkll/upload-google-play@v1
         with:

android/app/build.gradle.kts

@@ -20,10 +20,7 @@ android {
     }
 
     defaultConfig {
-        // TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html).
         applicationId = "net.ethrel.npa_mobile"
-        // You can update the following values to match your application needs.
-        // For more information, see: https://flutter.dev/to/review-gradle-config.
         minSdk = flutter.minSdkVersion
         targetSdk = flutter.targetSdkVersion
         versionCode = flutter.versionCode

lib/bottom_bar_settings.dart

@@ -2,11 +2,12 @@ import 'package:flutter/material.dart';
 import 'package:neptunes_pride_agent_mobile/preferences.dart';
 
 enum _BarButtonData {
-  refresh("Refresh", Icons.refresh, "NPAM:refresh", true),
-  colours("Colours", Icons.palette, "ctrl+a", true),
-  timebase("Timebase", Icons.schedule, "%", false),
+  refresh("  Refresh  ", Icons.refresh, "NPAM:refresh", true),
+  colours("  Colours  ", Icons.palette, "ctrl+a", true),
+  timebase("  Timebase  ", Icons.schedule, "%", false),
   //settings("Settings", Icons.settings, "NPAM:settings", true),
-  npasettings("NPA Options", Icons.settings_applications, "ctrl+`", true),
+  npasettings("  NPA Options  ", Icons.settings_applications, "ctrl+`", true),
+  //npamlabels("  Show button Labels  ", Icons.label, "NPAM:showlabel", true),
   ;
 
   const _BarButtonData(this.label, this.iconData, this.hotkey, this.closeMenu);
@@ -39,6 +40,7 @@ class BottomBarSettings {
       _BarButtonData.refresh,
       _BarButtonData.colours,
       _BarButtonData.timebase,
+      //_BarButtonData.npamlabels,
     ];
   }
 
@@ -49,18 +51,21 @@ class BottomBarSettings {
   double _maxSize = 0.0;
   double get maxSize => _maxSize;
 
-  List<Widget> getNavItems(OnClickCallback onClick) {
+  double _spacingSize = 5.0;
+  double get spacingSize => _spacingSize;
+
+  List<Widget> getNavItems(OnClickCallback onClick, BuildContext context) {
     if (_buttons.isEmpty) {
       _getButtonData();
     }
     List<Widget> items = [];
 
     //if (!_buttons.contains(_BarButtonData.settings)) _buttons.insert(0, _BarButtonData.settings);
 
-    for (_BarButtonData data in _buttons) {
-      Size labelSize = _textSize(data.label, _textStyle);
-      if (labelSize.width > _maxSize) _maxSize = labelSize.width;
-    }
+    double width = MediaQuery.sizeOf(context).width;
+    //todo: How do I deal with a dynamic margin size? Maybe?
+    width = (width - ((_buttons.length + 1) * _spacingSize)) / _buttons.length;
+    _maxSize = width;
 
     for (_BarButtonData data in _buttons) {
       items.add(
@@ -79,15 +84,21 @@ class BottomBarSettings {
                   return Column(
                     mainAxisAlignment: MainAxisAlignment.center,
                     children: [
-                      Icon(
-                        data.iconData,
-                        color: _iconColor,
+                      FittedBox(
+                          fit: BoxFit.contain,
+                        child: Icon(
+                          data.iconData,
+                          color: _iconColor,
+                        ),
                       ),
                       if (value)
-                        Text(
-                          data.label,
-                          style: _textStyle,
-                        ),
+                        FittedBox(
+                          fit: BoxFit.contain,
+                          child: Text(
+                            data.label,
+                            style: _textStyle,
+                          ),
+                        )
                     ],
                   );
                 }),

lib/main.dart

@@ -1,8 +1,11 @@
 import "package:flutter/material.dart";
+import 'package:flutter/services.dart';
 
 import 'npa_mobile.dart';
 
 void main() {
+  WidgetsFlutterBinding.ensureInitialized();
+  SystemChrome.setEnabledSystemUIMode(SystemUiMode.immersiveSticky);
   runApp(const MaterialApp(
     home: NPAMobile(),
   ));

lib/npa_mobile.dart

@@ -33,19 +33,19 @@ class _NPAMobileState extends State<NPAMobile> {
 
   @override
   Widget build(BuildContext context) {
-    List<Widget> navBarItems = barSettings.getNavItems(_handleHotkey);
+    List<Widget> navBarItems = barSettings.getNavItems(_handleHotkey, context);
     navBar = Hideable(
         childHeight: barSettings.maxSize,
         child: Align(
           alignment: Alignment.center,
           child: Wrap(
-            spacing: 20,
+            spacing: barSettings.spacingSize,
             children: [...navBarItems],
           ),
         ));
-    return SafeArea(
-      child: Scaffold(
-        body: Stack(
+    return //SafeArea(
+        /*child: */ Scaffold(
+      body: Stack(
           children: [
             WebViewWidget(controller: view.controller),
             Align(
@@ -66,7 +66,7 @@ class _NPAMobileState extends State<NPAMobile> {
         ),
         floatingActionButtonLocation: FloatingActionButtonLocation.miniEndDocked,
         //bottomNavigationBar: navBar,
-      ),
-    );
+      );//,
+    //);
   }
 }

lib/npa_webview.dart

@@ -137,6 +137,12 @@ Page resource error:
         case 'settings':
           debugPrint("MPAM Settings!");
           break;
+
+        /*
+        case 'showlabel':
+          prefs.labelsVisible = !prefs.labelsVisible;
+          break;
+        */
       }
     } else {
       await _controller.runJavaScript("Mousetrap.trigger('$hotkey')");

lib/npam_inject.js

@@ -6,3 +6,11 @@ window.setTimeout(
         Mousetrap.trigger("(");
     }
     , 1000);
+
+// TODO: This solves the zoom issue (kinda). Still is too zommed on load for the top bar and such. Need to figure that out.
+//<meta name="viewport" content="width=device-width, initial-scale=1">
+var flutterViewPort=document.createElement('meta');
+flutterViewPort.name = "viewport";
+flutterViewPort.content = "width=device-width, initial-scale=0.75";
+document.getElementsByTagName('head')[0].appendChild(flutterViewPort);
+