Merge pull request #397 from raisingthefloor/christopher/remove-vesti…

…gial-window Remove vestigial 'CommunityPickerWindow' and related strings
raisingthefloor · Nov 5, 2024 · 6581bce · 6581bce
2 parents d8bf454 + 542e7e9
commit 6581bce
Show file tree

Hide file tree

Showing 5 changed files with 4 additions and 127 deletions.
diff --git a/Morphic.Client/Bar/BarManager.cs b/Morphic.Client/Bar/BarManager.cs
@@ -273,47 +273,10 @@ public async Task LoadSessionBarAsync(MorphicSession session, string communityId
             UserCommunity? community = null;
             UserBar? userBar = null;
 
-            //if (session.Communities.Length == 0)
-            //{
-            //    MessageBox.Show("You are not part of a Morphic community yet.", "Morphic");
-            //}
-            //else if (session.Communities.Length == 1)
-            //{
-            //    community = session.Communities.First();
-            //}
-            //else
-            //{
-                // The user is a member of multiple communities.
-
-                //// See if any membership has changed
-                //bool changed = session.Communities.Length != lastCommunities.Length
-                //    || !session.Communities.Select(c => c.Id).OrderBy(id => id)
-                //        .SequenceEqual(lastCommunities.OrderBy(id => id));
-
-                if (/*!changed &&*/ communityId is not null)
-                {
-                    community = session.Communities.FirstOrDefault(c => c.Id == communityId);
-                }
-
-                //if (community is null)
-                //{
-                //    this.Logger.LogInformation("Showing community picker");
-
-                //    // Load the bars while the picker is shown
-                //    Dictionary<string, Task<UserBar>> bars =
-                //        session.Communities.ToDictionary(c => c.Id, c => session.GetBar(c.Id));
-
-                //    // Show the picker
-                //    CommunityPickerWindow picker = new CommunityPickerWindow(session.Communities);
-                //    bool gotCommunity = picker.ShowDialog() == true;
-                //    community = gotCommunity ? picker.SelectedCommunity : null;
-
-                //    if (community is not null)
-                //    {
-                //        userBar = await bars[community.Id];
-                //    }
-                //}
-            //}
+            if (/*!changed &&*/ communityId is not null)
+            {
+                community = session.Communities.FirstOrDefault(c => c.Id == communityId);
+            }
 
             if (community is not null)
             {

diff --git a/Morphic.Client/Dialogs/CommunityPickerWindow.xaml b/Morphic.Client/Dialogs/CommunityPickerWindow.xaml
diff --git a/Morphic.Client/Dialogs/CommunityPickerWindow.xaml.cs b/Morphic.Client/Dialogs/CommunityPickerWindow.xaml.cs
diff --git a/Morphic.Client/Localization/StringResources.es.xaml b/Morphic.Client/Localization/StringResources.es.xaml
@@ -221,10 +221,6 @@
     <system:String x:Key="MorphicBarButtonContextMenuItem_LearnMore">Más información</system:String>
     <system:String x:Key="MorphicBarButtonContextMenuItem_Settings">Ajustes</system:String>
 
-    <system:String x:Key="MorphicGroupPickerDialog_ChangePreferenceLaterUsingMorphicMenuNote">Puede cambiar esta preferencia más tarde usando el Menú de Morphic.</system:String>
-    <system:String x:Key="MorphicGroupPickerDialog_SelectGroupHeader">Seleccione el grupo cuya barra de Morphic le gustaría ver:</system:String>
-    <system:String x:Key="MorphicGroupPickerDialog_YouAreMemberOfMultipleGroups">Usted es miembro de varios Grupos de Morphic.</system:String>
-
     <system:String x:Key="RestoreDialog_BackupDate">Fecha de la copia de seguridad</system:String>
     <system:String x:Key="RestoreDialog_ClickingBelowWillRestoreSettings_Part1">Haciendo clic</system:String>
     <system:String x:Key="RestoreDialog_ClickingBelowWillRestoreSettings_Part2">Restaurar de la copia de seguridad</system:String>

diff --git a/Morphic.Client/Localization/StringResources.xaml b/Morphic.Client/Localization/StringResources.xaml
@@ -225,10 +225,6 @@
     <system:String x:Key="MorphicBarButtonContextMenuItem_LearnMore">_Learn more</system:String>
     <system:String x:Key="MorphicBarButtonContextMenuItem_Settings">_Settings</system:String>
 
-    <system:String x:Key="MorphicGroupPickerDialog_ChangePreferenceLaterUsingMorphicMenuNote">You can change this preference later, by using the Morphic Menu.</system:String>
-    <system:String x:Key="MorphicGroupPickerDialog_SelectGroupHeader">Select the group whose bar you would like to see now:</system:String>
-    <system:String x:Key="MorphicGroupPickerDialog_YouAreMemberOfMultipleGroups">You are a member of several Morphic Groups.</system:String>
-
     <system:String x:Key="RestoreDialog_BackupDate">Backup Date</system:String>
     <system:String x:Key="RestoreDialog_ClickingBelowWillRestoreSettings_Part1">Clicking</system:String>
     <system:String x:Key="RestoreDialog_ClickingBelowWillRestoreSettings_Part2">Restore from backup</system:String>