diff --git a/LogisticsMgrMobile/LogisticsMgrMobile.Android/LogisticsMgrMobile.Android.csproj b/LogisticsMgrMobile/LogisticsMgrMobile.Android/LogisticsMgrMobile.Android.csproj index a2cc060..db5779d 100644 --- a/LogisticsMgrMobile/LogisticsMgrMobile.Android/LogisticsMgrMobile.Android.csproj +++ b/LogisticsMgrMobile/LogisticsMgrMobile.Android/LogisticsMgrMobile.Android.csproj @@ -64,7 +64,8 @@ - + + diff --git a/LogisticsMgrMobile/LogisticsMgrMobile.Android/Mobile/Droid/Forms/Renderers/SlmEditorRenderer.cs b/LogisticsMgrMobile/LogisticsMgrMobile.Android/Mobile/Droid/Forms/Renderers/SlmEditorRenderer.cs new file mode 100644 index 0000000..5ce1864 --- /dev/null +++ b/LogisticsMgrMobile/LogisticsMgrMobile.Android/Mobile/Droid/Forms/Renderers/SlmEditorRenderer.cs @@ -0,0 +1,62 @@ +using System; +using System.Collections.Generic; +using System.ComponentModel; +using System.Linq; +using System.Text; + +using Android.App; +using Android.Content; +using Android.OS; +using Android.Runtime; +using Android.Views; +using Android.Views.InputMethods; +using Android.Widget; +using Sarand.Core.Base; +using Sarand.Core.Mobile.Forms.Controls; +using Xamarin.Forms; +using Xamarin.Forms.Platform.Android; + +[assembly: ExportRenderer(typeof(Editor), typeof(Sarand.LogisticsMgr.Mobile.Droid.Forms.Renderers.SlmEditorRenderer))] +namespace Sarand.LogisticsMgr.Mobile.Droid.Forms.Renderers +{ + //======================================================================= + /// + /// Replacement Editor Renderer to enable/override default behaviour. + /// 1. Generate 'Enter' Press event. + /// + public class SlmEditorRenderer : EditorRenderer + { + //------------------------------------------------------------------- + // Construction. + public SlmEditorRenderer (Context context) : base(context) + { + Logger.Trace(GetType().Name + " CTR"); + } + + //------------------------------------------------------------------- + // C o n t r o l E v e n t s + //------------------------------------------------------------------- + /// + /// Called when Xamarin control (the 'Element') is assigned. + /// NB The 'Control' is the native Android control. + /// + protected override void OnElementChanged (ElementChangedEventArgs e) + { + base.OnElementChanged(e); + // 'Control' is only ssigned after base method called. + if (Control != null) + { + // Assigning a handler to Control.KeyPress causes all sorts of wierd and wonderful stuff, + // eg. it is continually called. Solution to resizing Editor is now entirely on SaxEditor. + // Ref. SaxEditor_TextChanged + } + } + protected override void OnElementPropertyChanged (object sender, PropertyChangedEventArgs e) + { + base.OnElementPropertyChanged(sender, e); + } + + //------------------------------------------------------------------- + } + //======================================================================= +} \ No newline at end of file diff --git a/LogisticsMgrMobile/LogisticsMgrMobile.Android/Mobile/Droid/Forms/Views/SlmWebViewRenderer.cs b/LogisticsMgrMobile/LogisticsMgrMobile.Android/Mobile/Droid/Forms/Renderers/SlmWebViewRenderer.cs similarity index 91% rename from LogisticsMgrMobile/LogisticsMgrMobile.Android/Mobile/Droid/Forms/Views/SlmWebViewRenderer.cs rename to LogisticsMgrMobile/LogisticsMgrMobile.Android/Mobile/Droid/Forms/Renderers/SlmWebViewRenderer.cs index 663d2ff..b6bbf23 100644 --- a/LogisticsMgrMobile/LogisticsMgrMobile.Android/Mobile/Droid/Forms/Views/SlmWebViewRenderer.cs +++ b/LogisticsMgrMobile/LogisticsMgrMobile.Android/Mobile/Droid/Forms/Renderers/SlmWebViewRenderer.cs @@ -12,12 +12,12 @@ using Sarand.Core.Base; using Xamarin.Forms; using Xamarin.Forms.Platform.Android; -[assembly: ExportRenderer(typeof(WebView), typeof(Sarand.LogisticsMgr.Mobile.Droid.Forms.Views.SlmWebViewRenderer))] -namespace Sarand.LogisticsMgr.Mobile.Droid.Forms.Views +[assembly: ExportRenderer(typeof(WebView), typeof(Sarand.LogisticsMgr.Mobile.Droid.Forms.Renderers.SlmWebViewRenderer))] +namespace Sarand.LogisticsMgr.Mobile.Droid.Forms.Renderers { //======================================================================= /// - /// Rerplacement Web View Renderer to enable/override default behaviour. + /// Replacement Web View Renderer to enable/override default behaviour. /// 1. Enable scrcolling within Scroll View etc. /// Ref. https://forums.xamarin.com/discussion/54365/android-enabling-scrolling-for-a-webview-inside-a-scrollview /// diff --git a/LogisticsMgrMobile/LogisticsMgrMobile/Mobile/App/App.xaml.cs b/LogisticsMgrMobile/LogisticsMgrMobile/Mobile/App/App.xaml.cs index df84e11..feb4085 100644 --- a/LogisticsMgrMobile/LogisticsMgrMobile/Mobile/App/App.xaml.cs +++ b/LogisticsMgrMobile/LogisticsMgrMobile/Mobile/App/App.xaml.cs @@ -98,7 +98,7 @@ namespace Sarand.LogisticsMgr.Mobile.App sites.Add(new SlmSiteDefinition_App(Slm.Site.Southampton, "STN [IP4 ext]", "http://37.48.230.34:34568/SaLogMgr")); sites.Add(new SlmSiteDefinition_App(Slm.Site.Southampton, "STN [IP4 int]", "http://10.1.4.13:34567/SaLogMgr")); sites.Add(new SlmSiteDefinition_App(Slm.Site.Southampton, "STN [IP6 int]", "http://[fe80:f4c9:7720:45d8:f1b0]:34567/SaLogMgr")); - sites.Add(new SlmSiteDefinition_App(Slm.Site.Southampton, "STN - dev [403-IP6]", "http://[2a00:23c4:1b29:cc00:f14f:66b9:c098:242d]:34567/SaLogMgr")); + //sites.Add(new SlmSiteDefinition_App(Slm.Site.Southampton, "STN - dev [403-IP6]", "http://[2a00:23c4:1b29:cc00:f14f:66b9:c098:242d]:34567/SaLogMgr")); bool allowLgp = false; if (allowLgp) { @@ -118,10 +118,11 @@ namespace Sarand.LogisticsMgr.Mobile.App } if (SacsSystem.DebugMode) { - sites.Add(new SlmSiteDefinition_App(Slm.Site.Southampton, "Localhost", "http://localhost:34567/SaLogMgr")); + sites.Add(new SlmSiteDefinition_App(Slm.Site.Southampton, "Sarand106 IP6", "http://[2a00:23c4:1b29:cc00:cc8f:77b4:a561:7801]:34567/SaLogMgr")); sites.Add(new SlmSiteDefinition_App(Slm.Site.Southampton, "Sarand107", "http://Sarand107:34567/SaLogMgr")); sites.Add(new SlmSiteDefinition_App(Slm.Site.Southampton, "Sarand107 IP4", "http://192.168.1.117:34567/SaLogMgr")); sites.Add(new SlmSiteDefinition_App(Slm.Site.Southampton, "Sarand107 IP6", "http://[2a00:23c4:1b29:cc00:87d:e29d:3ee4:7829]:34567/SaLogMgr")); + sites.Add(new SlmSiteDefinition_App(Slm.Site.Southampton, "Localhost", "http://localhost:34567/SaLogMgr")); } } return sites;