Improved connection settings and fixed some other bugs #131

Signed-off-by: Christoph Hofmann <[email protected]>
openhab · Jan 12, 2020 · f1b0370 · f1b0370
1 parent 5afd81e
commit f1b0370
Show file tree

Hide file tree

Showing 9 changed files with 52 additions and 17 deletions.
diff --git a/OpenHAB.Windows/Controls/FrameWidget.xaml b/OpenHAB.Windows/Controls/FrameWidget.xaml
@@ -45,7 +45,7 @@
                   SelectionMode="None">
             <GridView.ItemsPanel>
                 <ItemsPanelTemplate>
-                    <VariableSizedWrapGrid ItemHeight="106" ItemWidth="306" />
+                    <VariableSizedWrapGrid ItemHeight="100" ItemWidth="300" />
                 </ItemsPanelTemplate>
             </GridView.ItemsPanel>
         </GridView>

diff --git a/OpenHAB.Windows/Strings/en-us/Resources.resw b/OpenHAB.Windows/Strings/en-us/Resources.resw
@@ -154,7 +154,7 @@
     <value>openHAB URL</value>
   </data>
   <data name="MessageNotConfigured" xml:space="preserve">
-    <value>Connection settings are not invalid.
+    <value>Connection settings are not configured.
 Please select demo mode or configure local/remote OpenHab connection information.</value>
   </data>
   <data name="MessagesNotReachable" xml:space="preserve">
@@ -180,7 +180,7 @@ Go to app settings (gear icon) to check the connection configuration.</value>
     <value>Settings</value>
   </data>
   <data name="UsernameHeader.Text" xml:space="preserve">
-    <value>went</value>
+    <value>Username</value>
   </data>
   <data name="NoItemsOrOpenHabNotAvailable.Text" xml:space="preserve">
     <value>No sitemaps available</value>
@@ -198,7 +198,7 @@ Go to app settings (gear icon) to check the connection configuration.</value>
     <value>Loading data...</value>
   </data>
   <data name="MessageSettingsConnectionConfigInvalid" xml:space="preserve">
-    <value>Connection settings are not invalid.
+    <value>Connection settings are invalid.
 Please select demo mode or configure local/remote connection.</value>
   </data>
   <data name="AppLanguage.Text" xml:space="preserve">

diff --git a/OpenHAB.Windows/View/MainPage.xaml b/OpenHAB.Windows/View/MainPage.xaml
@@ -111,7 +111,7 @@
 							 Color="Black" />
 		</Grid.Background>
 		<NavigationView x:Name="SitemapNavigation"
-						Header="{x:Bind Vm.SelectedSitemap.Label, Mode=OneWay}"
+						Header="{x:Bind Vm.Subtitle, Mode=OneWay}"
 						MenuItemsSource="{x:Bind Vm.Sitemaps, Mode=OneWay}"
 						MenuItemTemplate="{StaticResource NavSitemapTemplate}"
 						IsBackButtonVisible="Collapsed"

diff --git a/OpenHAB.Windows/View/SettingsPage.xaml b/OpenHAB.Windows/View/SettingsPage.xaml
@@ -69,7 +69,6 @@
 				</StackPanel>
 			</StackPanel>
 		</DataTemplate>
-
 	</Page.Resources>
 
 	<ScrollViewer Grid.Row="1"
@@ -145,8 +144,9 @@
 								</Flyout>
 							</Button.Flyout>
 							<StackPanel HorizontalAlignment="Left">
-								<TextBlock x:Uid="LocalSettings" />
-								<TextBlock Text="{Binding Url}" />
+								<TextBlock x:Uid="LocalSettings"
+										   FontSize="16" />
+								<TextBlock Text="{Binding Subtitle}" />
 							</StackPanel>
 						</Button>
 						<Button Margin="10"
@@ -162,8 +162,8 @@
 								</Flyout>
 							</Button.Flyout>
 							<StackPanel>
-								<TextBlock x:Uid="RemoteSettings" />
-								<TextBlock Text="{Binding Url}" />
+								<TextBlock x:Uid="RemoteSettings" FontSize="16" />
+								<TextBlock Text="{Binding Subtitle}" />
 							</StackPanel>
 						</Button>
 					</StackPanel>

diff --git a/OpenHAB.Windows/View/SettingsPage.xaml.cs b/OpenHAB.Windows/View/SettingsPage.xaml.cs
@@ -1,7 +1,6 @@
 using System;
 using GalaSoft.MvvmLight.Messaging;
 using Microsoft.Extensions.Logging;
-using OpenHAB.Core;
 using OpenHAB.Core.Messages;
 using OpenHAB.Core.Services;
 using OpenHAB.Core.ViewModel;
@@ -38,7 +37,6 @@ public SettingsPage()
 
         private async void HandleSettingsUpdate(SettingsUpdatedMessage msg)
         {
-
             try
             {
                 if (msg.IsSettingsValid)

diff --git a/Openhab.Core/Common/OpenHABHttpClient.cs b/Openhab.Core/Common/OpenHABHttpClient.cs
@@ -44,7 +44,9 @@ public static HttpClient Client(OpenHABHttpClientType connectionType, Settings s
         /// <returns>The HttpClient instance.</returns>
         public static HttpClient DisposableClient(OpenHABHttpClientType connectionType, Settings settings)
         {
+            _logger = (ILogger<OpenHABHttpClient>)DIService.Instance.Services.GetService(typeof(ILogger<OpenHABHttpClient>));
             _settings = settings;
+
             return InitClient(connectionType, true);
         }
 

diff --git a/Openhab.Core/SDK/OpenHABClient.cs b/Openhab.Core/SDK/OpenHABClient.cs
@@ -242,7 +242,7 @@ public async Task SendCommand(OpenHABItem item, string command)
                 var settings = _settingsService.Load();
                 var client = OpenHABHttpClient.Client(_connectionType, settings);
                 var content = new StringContent(command);
-                
+
                 var result = await client.PostAsync(item.Link, content);
                 if (!result.IsSuccessStatusCode)
                 {

diff --git a/Openhab.Core/ViewModel/ConnectionConfigViewModel.cs b/Openhab.Core/ViewModel/ConnectionConfigViewModel.cs
@@ -3,6 +3,8 @@
 using GalaSoft.MvvmLight.Command;
 using OpenHAB.Core.Model;
 using OpenHAB.Core.SDK;
+using Windows.ApplicationModel.Core;
+using Windows.UI.Core;
 
 namespace OpenHAB.Core.ViewModel
 {
@@ -59,6 +61,31 @@ public string Url
 
                 SetProperty(ref _url, tempUrl);
                 _connectionConfig.Url = _url;
+
+                OnPropertyChanged(nameof(Subtitle));
+            }
+        }
+
+        /// <summary>
+        /// Gets the subtitle.
+        /// </summary>
+        /// <value>The subtitle.</value>
+        public string Subtitle
+        {
+            get
+            {
+                if (string.IsNullOrEmpty(_url))
+                {
+                    return "Not configured";
+                }
+
+                if (Uri.TryCreate(_url, UriKind.Absolute, out Uri uri) && 
+                    string.Compare(uri.Scheme.ToUpperInvariant(), "HTTPS", StringComparison.InvariantCulture) == 0)
+                {
+                    return "Conntected to " + _url;
+                }
+
+                return "Unsecure connected to" + _url;
             }
         }
 
@@ -121,15 +148,21 @@ private async void CheckLocalUrl(object parameter)
 
             string url = parameter.ToString();
 
-            UrlState = OpenHABUrlState.Unknown;
+            OpenHABUrlState urlState = OpenHABUrlState.Unknown;
             if (await _openHabsdk.CheckUrlReachability(url, Common.OpenHABHttpClientType.Local).ConfigureAwait(false))
             {
-                UrlState = OpenHABUrlState.OK;
+                urlState = OpenHABUrlState.OK;
             }
             else
             {
-                UrlState = OpenHABUrlState.Failed;
+                urlState = OpenHABUrlState.Failed;
             }
+
+            CoreDispatcher dispatcher = CoreApplication.MainView.CoreWindow.Dispatcher;
+            await dispatcher.RunAsync(CoreDispatcherPriority.Normal, async () =>
+            {
+                UrlState = urlState;
+            });
         }
     }
 }
diff --git a/Openhab.Core/ViewModel/MainViewModel.cs b/Openhab.Core/ViewModel/MainViewModel.cs
@@ -244,6 +244,8 @@ await dispatcher.RunAsync(CoreDispatcherPriority.Normal, async () =>
                     _openHabsdk.StartItemUpdates();
 
                     OpenLastOrDefaultSitemap();
+
+                    Subtitle = SelectedSitemap.Label;
                     IsDataLoading = false;
                 });
             }
@@ -321,7 +323,7 @@ public void WidgetGoBack()
         {
             OpenHABWidget widget = WidgetNavigationService.GoBack();
 
-            Subtitle = widget == null ? string.Empty : widget.Label;
+            Subtitle = widget == null ? SelectedSitemap.Label: widget.Label;
             SetWidgetsOnScreen(widget != null ? widget.LinkedPage.Widgets : SelectedSitemap.Widgets);
         }