Somewhat ready for new release

Simizfo · Simizfo · commit 736081c6c072 · 2021-08-05T18:24:34.000+02:00
diff --git a/Dialer/App.xaml.cs b/Dialer/App.xaml.cs
@@ -71,7 +71,7 @@ private async Task InitializateSystems()
             ResourceLoader = ResourceLoader.GetForViewIndependentUse();
             NotificationSystem.Initializate();
             await CallSystem.Initializate();
-            await ContactSystem.LoadContacts();
+            ContactSystem.LoadContacts();
         }
 
         protected override void OnActivated(IActivatedEventArgs args)
diff --git a/Dialer/Systems/ContactSystem.cs b/Dialer/Systems/ContactSystem.cs
@@ -38,19 +38,19 @@ public static ObservableCollection<ContactControl> ContactControls
             }
         }
 
-        public static async Task LoadContacts()
+        public static async void LoadContacts()
         {
             if(_contacts == null && ContactsLoading == false)
             {
                 ContactsLoading = true;
                 _contactStore = await ContactManager.RequestStoreAsync();
-                _contacts = new ObservableCollection<Contact>(await _contactStore.FindContactsAsync());
+                ObservableCollection<Contact> t_contacts = new ObservableCollection<Contact>(await _contactStore.FindContactsAsync());
 
-                Debug.WriteLine("Found " + _contacts.Count + " contacts");
+                Debug.WriteLine("Found " + t_contacts.Count + " contacts");
 
-                _contactControls = new ObservableCollection<ContactControl>();
+                ObservableCollection<ContactControl> t_contactControls = new ObservableCollection<ContactControl>();
 
-                foreach (Contact contact in _contacts)
+                foreach (Contact contact in t_contacts)
                 {
                     ContactControl cc = new ContactControl();
                     cc.AssociatedContact = contact;
@@ -66,11 +66,15 @@ public static async Task LoadContacts()
                     if (contact.SmallDisplayPicture != null)
                         //TODO: Fix wrong cast
                         cc.ContactPicture = contact.SmallDisplayPicture;
-                    _contactControls.Add(cc);
+                    t_contactControls.Add(cc);
                 }
-            }
+                _contacts = t_contacts;
+                _contactControls = t_contactControls;
+
+                ContactsLoading = false;
 
-            ContactsLoaded?.Invoke(null, EventArgs.Empty);
+                ContactsLoaded?.Invoke(null, EventArgs.Empty);
+            }
         }
 
         public static async Task DeleteContact(Contact contact)
diff --git a/Dialer/UI/Controls/AdditionalPhoneContactPresenter.xaml b/Dialer/UI/Controls/AdditionalPhoneContactPresenter.xaml
@@ -10,12 +10,6 @@
     d:DesignWidth="400">
 
     <Grid>
-        <Grid.ContextFlyout>
-            <MenuFlyout>
-                <MenuFlyoutItem Text="Call" Icon="Phone"></MenuFlyoutItem>
-                <MenuFlyoutItem Text="Copy" Icon="Copy"></MenuFlyoutItem>
-            </MenuFlyout>
-        </Grid.ContextFlyout>
         <StackPanel Orientation="Vertical" HorizontalAlignment="Left" VerticalAlignment="Center">
             <TextBlock x:Name="PhoneTypeTB" Style="{StaticResource CaptionTextBlockStyle}" Margin="0, 0, 0, 5"><Run Text="[PhoneType]"/></TextBlock>
             <TextBlock x:Name="PhoneNumberTB"><Run Text="[+99 999 999999]"/></TextBlock>
diff --git a/Dialer/UI/Controls/ContactControl.xaml b/Dialer/UI/Controls/ContactControl.xaml
@@ -15,12 +15,12 @@
     <muxc:Expander x:Name="ContactExpander" HorizontalAlignment="Stretch" VerticalAlignment="Stretch" HorizontalContentAlignment="Stretch">
         <muxc:Expander.ContextFlyout>
             <MenuFlyout>
-                <MenuFlyoutItem Text="Call" Icon="Phone"></MenuFlyoutItem>
+                <MenuFlyoutItem Text="Call" Icon="Phone" Click="FlyoutCallContact_Click"></MenuFlyoutItem>
                 <MenuFlyoutSeparator></MenuFlyoutSeparator>
-                <MenuFlyoutItem Text="Copy" Icon="Copy"></MenuFlyoutItem>
-                <MenuFlyoutItem Text="Share Contact" Icon="Share"></MenuFlyoutItem>
+                <MenuFlyoutItem Text="Copy" Icon="Copy" IsEnabled="False"></MenuFlyoutItem>
+                <MenuFlyoutItem Text="Share Contact" Icon="Share" IsEnabled="False"></MenuFlyoutItem>
                 <MenuFlyoutSeparator></MenuFlyoutSeparator>
-                <MenuFlyoutItem Text="Delete Contact" Icon="Delete" Click="FlyoutDeleteContact_Click"></MenuFlyoutItem>
+                <MenuFlyoutItem Text="Delete Contact" Icon="Delete" Click="FlyoutDeleteContact_Click" IsEnabled="False"></MenuFlyoutItem>
             </MenuFlyout>
         </muxc:Expander.ContextFlyout>
         <muxc:Expander.Header>
diff --git a/Dialer/UI/Controls/ContactControl.xaml.cs b/Dialer/UI/Controls/ContactControl.xaml.cs
@@ -84,5 +84,14 @@ private async void FlyoutDeleteContact_Click(object sender, RoutedEventArgs e)
             await ContactSystem.DeleteContact(AssociatedContact);
             ContactsPage.CurrentInstance.RemoveContactControl(this);
         }
+
+        private void FlyoutCallContact_Click(object sender, RoutedEventArgs e)
+        {
+            try
+            {
+                App.Current.CallSystem.DefaultLine?.DialWithOptions(new PhoneDialOptions() { Number = ContactMainPhone.ToString() });
+            }
+            catch { }
+        }
     }
 }
diff --git a/Dialer/UI/Pages/ContactsPage.xaml.cs b/Dialer/UI/Pages/ContactsPage.xaml.cs
@@ -27,33 +27,37 @@ public ContactsPage()
             CurrentInstance = this;
         }
 
-        protected async override void OnNavigatedTo(NavigationEventArgs e)
+        protected override void OnNavigatedTo(NavigationEventArgs e)
         {
             base.OnNavigatedTo(e);
             SizeChanged += ContactsPage_SizeChanged;
 
-            await Dispatcher.RunAsync(Windows.UI.Core.CoreDispatcherPriority.High, () =>
-            {
-                LoadingGrid.Visibility = Windows.UI.Xaml.Visibility.Visible;
-            });
+            LoadingGrid.Visibility = Windows.UI.Xaml.Visibility.Visible;
 
-            Aaa(); //Todo: This needs to be run in background, currently it blocks the UI (??)
+            Task.Run(() =>
+            { 
+                Aaa(); 
+            }); //TODO: This still hangs the UI in some cases 🥲 
         }
 
-        private Task Aaa()
+        private void Aaa()
         {
             if (ContactSystem.ContactControls == null)
             {
                 ContactSystem.ContactsLoaded += (object sender, EventArgs e) => LoadDataCompleted();
             }
             else LoadDataCompleted();
-            return Task.CompletedTask;
         }
 
-        private void LoadDataCompleted()
+        private async void LoadDataCompleted()
         {
-            _contactControls = ContactSystem.ContactControls;
-            LoadingGrid.Visibility = Windows.UI.Xaml.Visibility.Collapsed;
+            await Dispatcher.RunAsync(Windows.UI.Core.CoreDispatcherPriority.High, () =>
+            {
+                ContactsItemsControl.ItemsSource = null;
+                _contactControls = ContactSystem.ContactControls;
+                ContactsItemsControl.ItemsSource = _contactControls;
+                LoadingGrid.Visibility = Windows.UI.Xaml.Visibility.Collapsed;
+            });
         }
 
         private void ContactsPage_SizeChanged(object sender, Windows.UI.Xaml.SizeChangedEventArgs e)
@@ -89,11 +93,12 @@ await Dispatcher.RunAsync(Windows.UI.Core.CoreDispatcherPriority.High, () =>
 
             IEnumerable<ContactControl> ContactsWithLetter = from contact in _contactControls where contact.ContactName.ToUpper().StartsWith(letter) select contact;
 
-            //TODO: Fix for missing letter -> move to previous/next letter
             try
             {
                 ContactsWithLetter.First().StartBringIntoView();
-            } catch { }
+            } catch { 
+                //TODO: Fix for missing letter -> move to previous/next letter
+            }
 
             _hideHintTimer.Start();
 

Original file line number	Diff line number	Diff line change
`@@ -71,7 +71,7 @@ private async Task InitializateSystems()`
`71`	`71`	`ResourceLoader = ResourceLoader.GetForViewIndependentUse();`
`72`	`72`	`NotificationSystem.Initializate();`
`73`	`73`	`await CallSystem.Initializate();`
`74`		`- await ContactSystem.LoadContacts();`
	`74`	`+ ContactSystem.LoadContacts();`
`75`	`75`	`}`
`76`	`76`
`77`	`77`	`protected override void OnActivated(IActivatedEventArgs args)`
Original file line number	Diff line number	Diff line change
`@@ -38,19 +38,19 @@ public static ObservableCollection<ContactControl> ContactControls`
`38`	`38`	`}`
`39`	`39`	`}`
`40`	`40`
`41`		`- public static async Task LoadContacts()`
	`41`	`+ public static async void LoadContacts()`
`42`	`42`	`{`
`43`	`43`	`if(_contacts == null && ContactsLoading == false)`
`44`	`44`	`{`
`45`	`45`	`ContactsLoading = true;`
`46`	`46`	`_contactStore = await ContactManager.RequestStoreAsync();`
`47`		`- _contacts = new ObservableCollection<Contact>(await _contactStore.FindContactsAsync());`
	`47`	`+ ObservableCollection<Contact> t_contacts = new ObservableCollection<Contact>(await _contactStore.FindContactsAsync());`
`48`	`48`
`49`		`- Debug.WriteLine("Found " + _contacts.Count + " contacts");`
	`49`	`+ Debug.WriteLine("Found " + t_contacts.Count + " contacts");`
`50`	`50`
`51`		`- _contactControls = new ObservableCollection<ContactControl>();`
	`51`	`+ ObservableCollection<ContactControl> t_contactControls = new ObservableCollection<ContactControl>();`
`52`	`52`
`53`		`- foreach (Contact contact in _contacts)`
	`53`	`+ foreach (Contact contact in t_contacts)`
`54`	`54`	`{`
`55`	`55`	`ContactControl cc = new ContactControl();`
`56`	`56`	`cc.AssociatedContact = contact;`
`@@ -66,11 +66,15 @@ public static async Task LoadContacts()`
`66`	`66`	`if (contact.SmallDisplayPicture != null)`
`67`	`67`	`//TODO: Fix wrong cast`
`68`	`68`	`cc.ContactPicture = contact.SmallDisplayPicture;`
`69`		`- _contactControls.Add(cc);`
	`69`	`+ t_contactControls.Add(cc);`
`70`	`70`	`}`
`71`		`- }`
	`71`	`+ _contacts = t_contacts;`
	`72`	`+ _contactControls = t_contactControls;`
	`73`	`+`
	`74`	`+ ContactsLoading = false;`
`72`	`75`
`73`		`- ContactsLoaded?.Invoke(null, EventArgs.Empty);`
	`76`	`+ ContactsLoaded?.Invoke(null, EventArgs.Empty);`
	`77`	`+ }`
`74`	`78`	`}`
`75`	`79`
`76`	`80`	`public static async Task DeleteContact(Contact contact)`
Original file line number	Diff line number	Diff line change
`@@ -84,5 +84,14 @@ private async void FlyoutDeleteContact_Click(object sender, RoutedEventArgs e)`
`84`	`84`	`await ContactSystem.DeleteContact(AssociatedContact);`
`85`	`85`	`ContactsPage.CurrentInstance.RemoveContactControl(this);`
`86`	`86`	`}`
	`87`	`+`
	`88`	`+ private void FlyoutCallContact_Click(object sender, RoutedEventArgs e)`
	`89`	`+ {`
	`90`	`+ try`
	`91`	`+ {`
	`92`	`+ App.Current.CallSystem.DefaultLine?.DialWithOptions(new PhoneDialOptions() { Number = ContactMainPhone.ToString() });`
	`93`	`+ }`
	`94`	`+ catch { }`
	`95`	`+ }`
`87`	`96`	`}`
`88`	`97`	`}`
Original file line number	Diff line number	Diff line change
`@@ -27,33 +27,37 @@ public ContactsPage()`
`27`	`27`	`CurrentInstance = this;`
`28`	`28`	`}`
`29`	`29`
`30`		`- protected async override void OnNavigatedTo(NavigationEventArgs e)`
	`30`	`+ protected override void OnNavigatedTo(NavigationEventArgs e)`
`31`	`31`	`{`
`32`	`32`	`base.OnNavigatedTo(e);`
`33`	`33`	`SizeChanged += ContactsPage_SizeChanged;`
`34`	`34`
`35`		`- await Dispatcher.RunAsync(Windows.UI.Core.CoreDispatcherPriority.High, () =>`
`36`		`- {`
`37`		`- LoadingGrid.Visibility = Windows.UI.Xaml.Visibility.Visible;`
`38`		`- });`
	`35`	`+ LoadingGrid.Visibility = Windows.UI.Xaml.Visibility.Visible;`
`39`	`36`
`40`		`- Aaa(); //Todo: This needs to be run in background, currently it blocks the UI (??)`
	`37`	`+ Task.Run(() =>`
	`38`	`+ {`
	`39`	`+ Aaa();`
	`40`	`+ }); //TODO: This still hangs the UI in some cases 🥲`
`41`	`41`	`}`
`42`	`42`
`43`		`- private Task Aaa()`
	`43`	`+ private void Aaa()`
`44`	`44`	`{`
`45`	`45`	`if (ContactSystem.ContactControls == null)`
`46`	`46`	`{`
`47`	`47`	`ContactSystem.ContactsLoaded += (object sender, EventArgs e) => LoadDataCompleted();`
`48`	`48`	`}`
`49`	`49`	`else LoadDataCompleted();`
`50`		`- return Task.CompletedTask;`
`51`	`50`	`}`
`52`	`51`
`53`		`- private void LoadDataCompleted()`
	`52`	`+ private async void LoadDataCompleted()`
`54`	`53`	`{`
`55`		`- _contactControls = ContactSystem.ContactControls;`
`56`		`- LoadingGrid.Visibility = Windows.UI.Xaml.Visibility.Collapsed;`
	`54`	`+ await Dispatcher.RunAsync(Windows.UI.Core.CoreDispatcherPriority.High, () =>`
	`55`	`+ {`
	`56`	`+ ContactsItemsControl.ItemsSource = null;`
	`57`	`+ _contactControls = ContactSystem.ContactControls;`
	`58`	`+ ContactsItemsControl.ItemsSource = _contactControls;`
	`59`	`+ LoadingGrid.Visibility = Windows.UI.Xaml.Visibility.Collapsed;`
	`60`	`+ });`
`57`	`61`	`}`
`58`	`62`
`59`	`63`	`private void ContactsPage_SizeChanged(object sender, Windows.UI.Xaml.SizeChangedEventArgs e)`
`@@ -89,11 +93,12 @@ await Dispatcher.RunAsync(Windows.UI.Core.CoreDispatcherPriority.High, () =>`
`89`	`93`
`90`	`94`	`IEnumerable<ContactControl> ContactsWithLetter = from contact in _contactControls where contact.ContactName.ToUpper().StartsWith(letter) select contact;`
`91`	`95`
`92`		`- //TODO: Fix for missing letter -> move to previous/next letter`
`93`	`96`	`try`
`94`	`97`	`{`
`95`	`98`	`ContactsWithLetter.First().StartBringIntoView();`
`96`		`- } catch { }`
	`99`	`+ } catch {`
	`100`	`+ //TODO: Fix for missing letter -> move to previous/next letter`
	`101`	`+ }`
`97`	`102`
`98`	`103`	`_hideHintTimer.Start();`
`99`	`104`