Hiding the vibrate setting if vibration is not available

UWPX · Aug 13, 2019 · f82bd94 · f82bd94
1 parent 91da54e
commit f82bd94
Show file tree

Hide file tree

Showing 11 changed files with 30 additions and 7 deletions.
diff --git a/Data_Manager2/Classes/Toast/ToastHelper.cs b/Data_Manager2/Classes/Toast/ToastHelper.cs
@@ -5,7 +5,6 @@
 using Microsoft.Toolkit.Uwp.Notifications;
 using Shared.Classes;
 using Windows.Data.Xml.Dom;
-using Windows.Foundation.Metadata;
 using Windows.Phone.Devices.Notification;
 using Windows.UI.Notifications;
 
@@ -229,9 +228,8 @@ private static void popToastReduced()
             lastVibration = DateTime.Now;
 
             // Vibrate:
-            if (ApiInformation.IsTypePresent("Windows.Phone.Devices.Notification.VibrationDevice") && !Settings.getSettingBoolean(SettingsConsts.DISABLE_VIBRATION_FOR_NEW_CHAT_MESSAGES))
+            if (DeviceFamilyHelper.SupportsVibration() && !Settings.getSettingBoolean(SettingsConsts.DISABLE_VIBRATION_FOR_NEW_CHAT_MESSAGES))
             {
-
                 VibrationDevice.GetDefault().Vibrate(VIBRATE_TS);
             }
 

diff --git a/..._UI_Context/Classes/DeviceFamilyHelper.cs → Shared/Classes/DeviceFamilyHelper.cs b/..._UI_Context/Classes/DeviceFamilyHelper.cs → Shared/Classes/DeviceFamilyHelper.cs
@@ -1,7 +1,8 @@
-using Windows.System.Profile;
+using Windows.Foundation.Metadata;
+using Windows.System.Profile;
 using Windows.UI.ViewManagement;
 
-namespace UWPX_UI_Context.Classes
+namespace Shared.Classes
 {
     public enum DeviceFamilyType
     {
@@ -88,6 +89,15 @@ public static bool ShouldShowBackButton()
                 || type == DeviceFamilyType.IoT;
         }
 
+        /// <summary>
+        /// Checks whether the device supports vibration and has the specific APIs available.
+        /// </summary>
+        /// <returns>True if the device has a vibration motor and the required APIs available.</returns>
+        public static bool SupportsVibration()
+        {
+            return ApiInformation.IsTypePresent("Windows.Phone.Devices.Notification.VibrationDevice");
+        }
+
         #endregion
         //--------------------------------------------------------Misc Methods:---------------------------------------------------------------\\
         #region --Misc Methods (Public)--

diff --git a/Shared/Shared.csproj b/Shared/Shared.csproj
@@ -135,6 +135,7 @@
     <Compile Include="Classes\Collections\ITimedEntry.cs" />
     <Compile Include="Classes\Collections\TimedListEntry.cs" />
     <Compile Include="Classes\Collections\TSTimedList.cs" />
+    <Compile Include="Classes\DeviceFamilyHelper.cs" />
     <Compile Include="Classes\Network\AbstractDownloadableObject.cs" />
     <Compile Include="Classes\Network\DownloadError.cs" />
     <Compile Include="Classes\Network\DownloadHandler.cs" />

diff --git a/UWPX_UI/App.xaml.cs b/UWPX_UI/App.xaml.cs
@@ -7,6 +7,7 @@
 using Data_Manager2.Classes.Toast;
 using Logging;
 using Microsoft.AppCenter.Push;
+using Shared.Classes;
 using UWPX_UI.Dialogs;
 using UWPX_UI.Pages;
 using UWPX_UI_Context.Classes;

diff --git a/UWPX_UI/Controls/CustomSettingsTitleBarControl.xaml.cs b/UWPX_UI/Controls/CustomSettingsTitleBarControl.xaml.cs
@@ -1,4 +1,5 @@
 using System;
+using Shared.Classes;
 using UWPX_UI.Pages;
 using UWPX_UI.Pages.Settings;
 using UWPX_UI_Context.Classes;

diff --git a/UWPX_UI/Controls/CustomTitleBarControl.xaml.cs b/UWPX_UI/Controls/CustomTitleBarControl.xaml.cs
@@ -1,4 +1,5 @@
 using System;
+using Shared.Classes;
 using UWPX_UI.Controls.Toolkit.MasterDetailsView;
 using UWPX_UI.Pages;
 using UWPX_UI_Context.Classes;

diff --git a/UWPX_UI/Pages/Settings/ChatSettingsPage.xaml b/UWPX_UI/Pages/Settings/ChatSettingsPage.xaml
@@ -72,7 +72,8 @@
                                               IsOn="{x:Bind VIEW_MODEL.MODEL.AdvancedChatMessageProcessing, Mode=TwoWay}"/>
                                 <ToggleSwitch x:Name="enableVibrateForNewMessage_tgls"
                                               Header="Vibrate device for new messages"
-                                              IsOn="{x:Bind VIEW_MODEL.MODEL.VibrateForNewChatMessages, Mode=TwoWay}"/>
+                                              IsOn="{x:Bind VIEW_MODEL.MODEL.VibrateForNewChatMessages, Mode=TwoWay}"
+                                              Visibility="{x:Bind VIEW_MODEL.MODEL.VibrationSupported, Mode=TwoWay, Converter={StaticResource BoolVisibilityValueConverter}}"/>
                                 <ToggleSwitch x:Name="enablePlaySoundForNewMessage_tgls"
                                               Header="Play sound for new messages"
                                               IsOn="{x:Bind VIEW_MODEL.MODEL.PlaySoundForNewChatMessages, Mode=TwoWay}"/>

diff --git a/UWPX_UI/Pages/Settings/SettingsPage.xaml.cs b/UWPX_UI/Pages/Settings/SettingsPage.xaml.cs
@@ -1,6 +1,7 @@
 using System.Collections.ObjectModel;
 using System.Text;
 using Microsoft.Toolkit.Uwp.UI.Animations;
+using Shared.Classes;
 using UWPX_UI_Context.Classes;
 using UWPX_UI_Context.Classes.DataContext.Pages;
 using UWPX_UI_Context.Classes.DataTemplates;

diff --git a/UWPX_UI_Context/Classes/AppUpdateHelper.cs b/UWPX_UI_Context/Classes/AppUpdateHelper.cs
@@ -6,6 +6,7 @@
 using Data_Manager2.Classes.DBTables;
 using Data_Manager2.Classes.DBTables.Omemo;
 using Logging;
+using Shared.Classes;
 using Shared.Classes.SQLite;
 using Windows.ApplicationModel;
 using XMPP_API.Classes.Network;

diff --git a/UWPX_UI_Context/Classes/DataTemplates/Pages/ChatSettingsPageDataTemplate.cs b/UWPX_UI_Context/Classes/DataTemplates/Pages/ChatSettingsPageDataTemplate.cs
@@ -80,6 +80,12 @@ public int ShowAccountColor
             get => _ShowAccountColor;
             set => SetIntProperty(ref _ShowAccountColor, value, SettingsConsts.CHAT_SHOW_ACCOUNT_COLOR);
         }
+        private bool _VibrationSupported;
+        public bool VibrationSupported
+        {
+            get => _VibrationSupported;
+            set => SetProperty(ref _VibrationSupported, value);
+        }
 
         #endregion
         //--------------------------------------------------------Constructor:----------------------------------------------------------------\\
@@ -123,6 +129,9 @@ private void LoadSettings()
 
             // OMEMO:
             EnableOmemoForNewChats = Settings.getSettingBoolean(SettingsConsts.ENABLE_OMEMO_BY_DEFAULT_FOR_NEW_CHATS);
+
+            // Misc:
+            VibrationSupported = DeviceFamilyHelper.SupportsVibration();
         }
 
         private bool SetBoolProperty(ref bool storage, bool value, string settingsToken, [CallerMemberName] string propertyName = null)

diff --git a/UWPX_UI_Context/UWPX_UI_Context.csproj b/UWPX_UI_Context/UWPX_UI_Context.csproj
@@ -261,7 +261,6 @@
     <Compile Include="Classes\DataTemplates\SettingsPageButtonDataTemplate.cs" />
     <Compile Include="Classes\DataTemplates\UintDataTemplate.cs" />
     <Compile Include="Classes\DataTemplates\XMPPClientDataTemplate.cs" />
-    <Compile Include="Classes\DeviceFamilyHelper.cs" />
     <Compile Include="Classes\Events\NavigatedToContactInfoPageEventArgs.cs" />
     <Compile Include="Classes\Events\OnErrorEventArgs.cs" />
     <Compile Include="Classes\Localisation.cs" />