Screen Display Fixups

prs.mobile.new/PRS.Mobile.Droid/MainActivity.cs

@@ -100,9 +100,9 @@ namespace PRS.Mobile.Droid
 
             ZXing.Net.Mobile.Forms.Android.Platform.Init();
 
-            XF.Material.Droid.Material.Init(this, savedInstanceState);
-
-            LoadApplication(new App());
+            
+            var app = new App();
+            LoadApplication(app);
             
             // FV 23-07-07 Not sure what this does - can we strip it out?
             // Window.SetSoftInputMode(Android.Views.SoftInput.AdjustResize);

prs.mobile.new/PRS.Mobile/App.xaml.cs

@@ -92,10 +92,10 @@ namespace PRS.Mobile
         {
             InitializeComponent();
             
+            // https://github.com/Baseflow/XF-Material-Library
             XF.Material.Forms.Material.Init(this);
-
             XF.Material.Forms.Material.Use("Material.Configuration");
-
+            
             MobileUtils.Init();
             CoreUtils.RegisterClasses();
             ComalUtils.RegisterClasses();
@@ -110,7 +110,9 @@ namespace PRS.Mobile
             // 1. App Startup => Autologin
             // 2. SettingsPage.Save() => AutoLogin
             // 3. Main Window => Always manual login?
-            MainPage = new MaterialNavigationPage(new PinLoginPage());
+            var login = new PinLoginPage();
+            var navigation = new MaterialNavigationPage(login); 
+            MainPage = navigation;
         }
 
         protected override void OnStart()

prs.mobile.new/PRS.Mobile/CustomControls/BasePage/BasePage.xaml

@@ -3,75 +3,75 @@
     x:Name="_basepage" 
     NavigationPage.HasNavigationBar="false" 
     NavigationPage.HasBackButton="false"
-    xmlns:ios="clr-namespace:Xamarin.Forms.PlatformConfiguration.iOSSpecific;assembly=Xamarin.Forms.Core" 
-    ios:Page.UseSafeArea="true" 
+    xmlns:iOS="clr-namespace:Xamarin.Forms.PlatformConfiguration.iOSSpecific;assembly=Xamarin.Forms.Core"
+    iOS:Page.UseSafeArea="true"
     xmlns="http://xamarin.com/schemas/2014/forms" 
     xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
     xmlns:ui="clr-namespace:XF.Material.Forms.UI;assembly=XF.Material"
     x:Class="PRS.Mobile.BasePage" >
-    
-    <Grid 
-        x:Name="_rootGrid" 
-        RowSpacing="0" 
-        ColumnSpacing="0" 
-        VerticalOptions="FillAndExpand" 
-        HorizontalOptions="FillAndExpand">
-
-        <Grid.RowDefinitions>
-            <RowDefinition Height="48" />
-            <RowDefinition Height="*" />
-        </Grid.RowDefinitions>
-        
         <Grid 
-            x:Name="_titleBar"
-            Grid.Row="0"
-            Padding="5,0,5,0">
-            
-            <Grid.ColumnDefinitions>
-                <ColumnDefinition Width="Auto" />
-                <ColumnDefinition Width="*" />
-                <ColumnDefinition Width="Auto" />
-                <ColumnDefinition Width="Auto" />
-            </Grid.ColumnDefinitions>
-            
-            <ImageButton 
-                Grid.Column="0" 
-                x:Name="_backButton"
-                Aspect="AspectFit"
-                Source="arrow_white_left" 
-                Clicked="_backButton_OnClicked"/>
-            
-            <ui:MaterialLabel 
-                x:Name="_titleLabel"
-                Grid.Column="1"
-                Text="{Binding Title, Source={x:Reference _basepage}}" 
-                TypeScale="H6"
-                VerticalTextAlignment="Center" 
-                HorizontalTextAlignment="Start"
-                LineBreakMode="TailTruncation"/>
+            x:Name="_rootGrid" 
+            RowSpacing="0" 
+            ColumnSpacing="0" 
+            VerticalOptions="FillAndExpand" 
+            HorizontalOptions="FillAndExpand">
 
-            <Image
-                x:Name="_connectionIndicator"
-                Grid.Column="2"
-                Source="disconnected"
-                IsVisible="False"/>
+            <Grid.RowDefinitions>
+                <RowDefinition Height="48" />
+                <RowDefinition Height="*" />
+            </Grid.RowDefinitions>
             
-            <StackLayout 
-                x:Name="_actionButtons" 
-                Grid.Column="3" 
-                Orientation="Horizontal" 
-                HorizontalOptions="EndAndExpand" />
-            
-        </Grid>
-            
-        <Grid
-            x:Name="_content"
-            Grid.Row="1"
-            RowSpacing="0"
-            ColumnSpacing="0"
-            Padding="0"
-            Margin="0"/>
+            <Grid 
+                x:Name="_titleBar"
+                Grid.Row="0"
+                Padding="5,0,5,0">
+                
+                <Grid.ColumnDefinitions>
+                    <ColumnDefinition Width="Auto" />
+                    <ColumnDefinition Width="*" />
+                    <ColumnDefinition Width="Auto" />
+                    <ColumnDefinition Width="Auto" />
+                </Grid.ColumnDefinitions>
+                
+                <ImageButton 
+                    Grid.Column="0" 
+                    x:Name="_backButton"
+                    Aspect="AspectFit"
+                    Source="arrow_white_left" 
+                    Clicked="_backButton_OnClicked"/>
+                
+                <ui:MaterialLabel 
+                    x:Name="_titleLabel"
+                    Grid.Column="1"
+                    Text="{Binding Title, Source={x:Reference _basepage}}" 
+                    TypeScale="H6"
+                    VerticalTextAlignment="Center" 
+                    HorizontalTextAlignment="Start"
+                    LineBreakMode="TailTruncation"/>
+
+                <Image
+                    x:Name="_connectionIndicator"
+                    Grid.Column="2"
+                    Source="disconnected"
+                    IsVisible="False"/>
+                
+                <StackLayout 
+                    x:Name="_actionButtons" 
+                    Grid.Column="3" 
+                    Orientation="Horizontal" 
+                    HorizontalOptions="EndAndExpand" />
+                
+            </Grid>
+                
+            <Grid
+                x:Name="_content"
+                Grid.Row="1"
+                RowSpacing="0"
+                ColumnSpacing="0"
+                Padding="0"
+                Margin="0"/>
+
+       </Grid>
 
-   </Grid>
     
 </ContentPage>

prs.mobile.new/PRS.Mobile/Main/PINLoginPage.xaml.cs

@@ -33,7 +33,7 @@ namespace PRS.Mobile
         
         private DatabaseSettings _settings { get; set; }
         
-        public PinLoginPage()
+        public PinLoginPage(): base()
         {
             InitializeComponent();
             SelectSubPage(SubPage.Autologin);
@@ -227,16 +227,19 @@ namespace PRS.Mobile
              {
                  _settings.URLs = new String[]
                  {
-                     "remote.com-al.com.au:8050",
-                     //"192.168.0.247:8010"
-                     //"demo.prsdigital.com.au:8003",
-                     //"demo2.prsdigital.com.au:8003",
+                     //"remote.com-al.com.au:8050",
+                     //"192.168.0.247:8050",
+                     //"192.168.100.54:8050",
+                     //"remote.com-al.com.au:8030",
+                     //"192.168.100.242:8030",
+                     "demo.prsdigital.com.au:8033",
+                     "demo2.prsdigital.com.au:8033",
                      //"demo3.prsdigital.com.au:8003"
                  };
                  //_settings.UserID = "frank";
                  //_settings.Password = "frankvb22";
-                 //_settings.UserID = "GUEST";
-                 //_settings.Password = "guest";
+                 _settings.UserID = "GUEST";
+                 _settings.Password = "guest";
                  //_settings.UserID = "ADMIN";
                  //_settings.Password = "admin";
                  new LocalConfiguration<DatabaseSettings>().Save(_settings);