From bdda0ba2a2274f8bf221536ed0cea116aff0d986 Mon Sep 17 00:00:00 2001 From: mountainash Date: Tue, 25 May 2021 19:13:15 +0200 Subject: [PATCH] Dependency Package updates and minor code mods to allow build on iOS 14+ --- .gitignore | 1 + WLED/WLED.iOS/WLED.iOS.csproj | 9 ++++- WLED/WLED/DeviceListViewPage.xaml.cs | 2 +- .../DeviceModificationListViewPage.xaml.cs | 2 +- WLED/WLED/MenuBar.xaml | 6 +-- WLED/WLED/MenuBar.xaml.cs | 12 ++++-- WLED/WLED/WLED.csproj | 10 ++--- readme.md | 39 ++++++++++++------- 8 files changed, 50 insertions(+), 31 deletions(-) diff --git a/.gitignore b/.gitignore index 3c4efe2..4100177 100644 --- a/.gitignore +++ b/.gitignore @@ -192,6 +192,7 @@ ClientBin/ *.jfm *.pfx *.publishsettings +*.DS_Store node_modules/ orleans.codegen.cs diff --git a/WLED/WLED.iOS/WLED.iOS.csproj b/WLED/WLED.iOS/WLED.iOS.csproj index e76c66e..3b4f4dc 100644 --- a/WLED/WLED.iOS/WLED.iOS.csproj +++ b/WLED/WLED.iOS/WLED.iOS.csproj @@ -28,6 +28,7 @@ x86_64 None true + Entitlements.plist VS: WildCard Development iPhone Developer: Christian Schwinne (K7LH967W38) @@ -57,6 +58,7 @@ true Entitlements.plist VS: WildCard Development + SdkOnly none @@ -68,6 +70,7 @@ false iPhone Developer: Christian Schwinne (K7LH967W38) Entitlements.plist + SdkOnly VS: WildCard Development @@ -82,6 +85,7 @@ VS: WildCard Development iPhone Developer: Christian Schwinne (K7LH967W38) Entitlements.plist + SdkOnly none @@ -95,6 +99,7 @@ iPhone Distribution: Christian Schwinne (A64W9L8Q44) Entitlements.plist true + SdkOnly @@ -315,9 +320,9 @@ - 1.0.0 + 1.6.1 - + diff --git a/WLED/WLED/DeviceListViewPage.xaml.cs b/WLED/WLED/DeviceListViewPage.xaml.cs index 1cf6d44..fc3f2f1 100644 --- a/WLED/WLED/DeviceListViewPage.xaml.cs +++ b/WLED/WLED/DeviceListViewPage.xaml.cs @@ -115,7 +115,7 @@ private void ReinsertDeviceSorted(WLEDDevice d) if (deviceList.Remove(d)) InsertDeviceSorted(d); } - private void OnPowerButtonTapped(object sender, ItemTappedEventArgs e) + private void OnPowerButtonTapped(object sender, EventArgs e) { Button s = sender as Button; if (s.Parent.BindingContext is WLEDDevice targetDevice) diff --git a/WLED/WLED/DeviceModificationListViewPage.xaml.cs b/WLED/WLED/DeviceModificationListViewPage.xaml.cs index 7d47e25..1e1eb3f 100644 --- a/WLED/WLED/DeviceModificationListViewPage.xaml.cs +++ b/WLED/WLED/DeviceModificationListViewPage.xaml.cs @@ -23,7 +23,7 @@ public DeviceModificationListViewPage (ObservableCollection items) DeviceModificationListView.ItemsSource = DeviceList; } - private void OnDeleteButtonTapped(object sender, ItemTappedEventArgs e) + private void OnDeleteButtonTapped(object sender, EventArgs e) { Button s = sender as Button; if (!(s.Parent.BindingContext is WLEDDevice targetDevice)) return; diff --git a/WLED/WLED/MenuBar.xaml b/WLED/WLED/MenuBar.xaml index 608d884..feb077b 100644 --- a/WLED/WLED/MenuBar.xaml +++ b/WLED/WLED/MenuBar.xaml @@ -26,17 +26,17 @@ - + - + - + diff --git a/WLED/WLED/MenuBar.xaml.cs b/WLED/WLED/MenuBar.xaml.cs index aefd1c1..21466ce 100644 --- a/WLED/WLED/MenuBar.xaml.cs +++ b/WLED/WLED/MenuBar.xaml.cs @@ -44,12 +44,18 @@ public void SetButtonIcon(ButtonLocation loc, ButtonIcon ico) } } - void OnLogoTapped(object sender, ItemTappedEventArgs e) + void OnLogoTapped(object sender, EventArgs e) { Device.OpenUri(new Uri("https://github.com/Aircoookie/WLED")); } - protected virtual void OnLeftButtonTapped(object sender, ItemTappedEventArgs e) + //Will be needed for future releases as Device.OpenUri is deprecated + //async Task OnLogoTapped(object sender, EventArgs e) + //{ + // Browser.OpenAsync(new Uri("https://github.com/Aircoookie/WLED"), BrowserLaunchMode.SystemPreferred); + //} + + protected virtual void OnLeftButtonTapped(object sender, EventArgs e) { EventHandler handler = LeftButtonTapped; if (handler != null) @@ -62,7 +68,7 @@ protected virtual void OnLeftButtonTapped(object sender, ItemTappedEventArgs e) } } - protected virtual void OnRightButtonTapped(object sender, ItemTappedEventArgs e) + protected virtual void OnRightButtonTapped(object sender, EventArgs e) { RightButtonTapped?.Invoke(this, e); } diff --git a/WLED/WLED/WLED.csproj b/WLED/WLED/WLED.csproj index 8b31253..327d8f6 100644 --- a/WLED/WLED/WLED.csproj +++ b/WLED/WLED/WLED.csproj @@ -11,9 +11,9 @@ - - - + + + @@ -43,8 +43,6 @@ - - ..\..\..\..\..\..\Library\Frameworks\Xamarin.iOS.framework\Versions\12.14.0.110\lib\mono\Xamarin.iOS\Xamarin.iOS.dll - + \ No newline at end of file diff --git a/readme.md b/readme.md index b22b438..103eded 100644 --- a/readme.md +++ b/readme.md @@ -1,9 +1,9 @@ -Get it on Google Play -Download on the App Store +Get it on Google Play +Download on the Apple App Store -## Welcome to the WLED app! (v1.0.3) +## Welcome to the WLED app! (v1.0.4) -A brand new app for Android, iPhone, iPad and UWP devices for discovering and controlling your [WLED](https://github.com/Aircoookie/WLED) devices easily! +An app for Android, iPhone, iPad and UWP devices for discovering and controlling a [WLED](https://github.com/Aircoookie/WLED) devices easily! ### Features: - Automatic device detection (mDNS) @@ -15,24 +15,33 @@ A brand new app for Android, iPhone, iPad and UWP devices for discovering and co #### My WLED lights are not found! -Ensure your phone/device is in the same network as the ESP. -The "mDNS address" WiFi settings entry in WLED must be unique for every device. -Try restarting both the ESP and your device. -Attempt manually adding the device via its IP. +1. Ensure your phone/device is in the same network as the ESP. +1. The "mDNS address" WiFi settings entry in WLED must be unique for every device. +1. Try restarting both the ESP and your device. +1. Attempt manually adding the device via its IP address. #### Can I control the lights when I'm not home? -In the default configuration this is not possible, the devices need to be in the same local network. -However, you can either use a VPN to connect to your home network (if your router offers this option) or use a [port forwarding](https://github.com/Aircoookie/WLED/wiki/Remote-Access-and-IFTTT). -Keep in mind that this exposes your light(s) to the public internet, so please be aware that it is not a secure solution. -If you want to risk it, at least take the precaution of enabling the WLED [OTA lock](https://github.com/Aircoookie/WLED/wiki/Security) feature and, if possible, only connect it to a guest network. +In the default configuration this is not possible, the devices need to be in the same local network. +However, you can either use a VPN to connect to your home network (if your router offers this option) or use a [port forwarding](https://github.com/Aircoookie/WLED/wiki/Remote-Access-and-IFTTT). +Keep in mind that this exposes your light(s) to the public internet, so please be aware that it is not a secure solution. +If you want to risk it, at least take the precaution of enabling the WLED [OTA lock](https://github.com/Aircoookie/WLED/wiki/Security) feature and, if possible, only connect it to a guest network. #### Where can I get the UWP app? -Right now my primary goal is Android support. +Right now my primary goal is Android support. The UWP platform is tested and confirmed to work, but right now you need to install Xamarin.Forms for Visual Studio and build it yourself. In the future, I will look into ways of distributing the UWP binaries via appstores or releases. -Google Play and the Google Play logo are trademarks of Google LLC. +## Contribute -Apple, the Apple logo, iPhone, and iPad are trademarks of Apple Inc., registered in the U.S. and other countries and regions. App Store is a service mark of Apple Inc. +### Requirements + +- [Visual Studio](https://visualstudio.microsoft.com/) +- [Visual Studio Tools for Xamarin](https://visualstudio.microsoft.com/xamarin/) + +### Trademarks + +Google Play and the Google Play logo are trademarks of Google LLC. + +Apple, the Apple logo, iPhone, and iPad are trademarks of Apple Inc., registered in the U.S. and other countries and regions. App Store is a service mark of Apple Inc. \ No newline at end of file