Skip to content

Commit a163a53

Browse files
paul-fresquetpaul-fresquet
committed
feat: feat improve ux
1 parent 26146c7 commit a163a53

File tree

7 files changed

+41
-27
lines changed

7 files changed

+41
-27
lines changed

‎src/ByteSync.Client/Assets/Resources/Resources.Designer.cs‎

Lines changed: 0 additions & 6 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎src/ByteSync.Client/Assets/Resources/Resources.fr.resx‎

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -570,7 +570,7 @@ Voulez-vous continuer ?</value>
570570
<data name="JoinCloudSession_WrongPassword" xml:space="preserve">
571571
<value>Le mot de passe fourni est incorrect. Veuillez réessayer.</value>
572572
</data>
573-
<data name="Header_Update" xml:space="preserve">
573+
<data name="Header_Update_Tooltip_Header" xml:space="preserve">
574574
<value>Mise à jour disponible</value>
575575
</data>
576576
<data name="Header_Update_Tooltip" xml:space="preserve">
@@ -1457,9 +1457,6 @@ Voulez-vous enregistrer ce nouveau Profil de Session avec ce nom ?</value>
14571457
<data name="ConnectionStatus_ConnectionFailed" xml:space="preserve">
14581458
<value>Connexion échouée</value>
14591459
</data>
1460-
<data name="ConnectionStatus_UpdateNeeded" xml:space="preserve">
1461-
<value>Mise à jour nécessaire</value>
1462-
</data>
14631460
<data name="ConnectionStatus_NotConnected" xml:space="preserve">
14641461
<value>Non connecté</value>
14651462
</data>
@@ -1550,4 +1547,13 @@ Voulez-vous enregistrer ce nouveau Profil de Session avec ce nom ?</value>
15501547
<data name="CreateCloudSession_CanceledByUser" xml:space="preserve">
15511548
<value>Opération annulée par l'utilisateur.</value>
15521549
</data>
1550+
<data name="Header_Update_Required" xml:space="preserve">
1551+
<value>MISE A JOUR REQUISE</value>
1552+
</data>
1553+
<data name="Header_Update_Required_Tooltip_Header" xml:space="preserve">
1554+
<value>Mise à jour requise</value>
1555+
</data>
1556+
<data name="Header_Update_Required_Tooltip" xml:space="preserve">
1557+
<value>Une mise à jour est requise. Afficher plus de détails.</value>
1558+
</data>
15531559
</root>

‎src/ByteSync.Client/Assets/Resources/Resources.resx‎

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -681,7 +681,7 @@ Would you like to continue ?</value>
681681
<data name="JoinCloudSession_WrongPassword" xml:space="preserve">
682682
<value>The provided password is incorrect. Please try again..</value>
683683
</data>
684-
<data name="Header_Update" xml:space="preserve">
684+
<data name="Header_Update_Tooltip_Header" xml:space="preserve">
685685
<value>Update available</value>
686686
</data>
687687
<data name="Header_Update_Tooltip" xml:space="preserve">
@@ -1580,9 +1580,6 @@ Do you want to save this new Session Profile with this name?</value>
15801580
<data name="ConnectionStatus_Connecting" xml:space="preserve">
15811581
<value>Connecting...</value>
15821582
</data>
1583-
<data name="ConnectionStatus_UpdateNeeded" xml:space="preserve">
1584-
<value>Update Needed</value>
1585-
</data>
15861583
<data name="ConnectionStatus_NotConnected" xml:space="preserve">
15871584
<value>Not connected</value>
15881585
</data>
@@ -1685,4 +1682,13 @@ Do you want to save this new Session Profile with this name?</value>
16851682
<data name="CreateCloudSession_CanceledByUser" xml:space="preserve">
16861683
<value>Operation canceled by the user.</value>
16871684
</data>
1685+
<data name="Header_Update_Required" xml:space="preserve">
1686+
<value>UPDATE REQUIRED</value>
1687+
</data>
1688+
<data name="Header_Update_Required_Tooltip_Header" xml:space="preserve">
1689+
<value>Update required</value>
1690+
</data>
1691+
<data name="Header_Update_Required_Tooltip" xml:space="preserve">
1692+
<value>An update is required. Display more details.</value>
1693+
</data>
16881694
</root>

‎src/ByteSync.Client/Business/Communications/ConnectionStatuses.cs‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,5 +7,4 @@ public enum ConnectionStatuses
77
Connected = 2,
88
RetryConnectingSoon = 3,
99
ConnectionFailed = 4,
10-
UpdateNeeded = 5,
1110
}

‎src/ByteSync.Client/Services/Communications/ConnectionService.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ await retryPolicy.ExecuteAsync(async () =>
100100
{
101101
if (result.AuthenticateResponseStatus == InitialConnectionStatus.VersionNotAllowed)
102102
{
103-
ConnectionStatusSubject.OnNext(ConnectionStatuses.UpdateNeeded);
103+
ConnectionStatusSubject.OnNext(ConnectionStatuses.NotConnected);
104104
}
105105

106106
throw new BuildConnectionException("Unable to connect", result.AuthenticateResponseStatus);

‎src/ByteSync.Client/ViewModels/Headers/ConnectionStatusViewModel.cs‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,6 @@ public ConnectionStatusViewModel(IConnectionService connectionService, ILocaliza
6565
ConnectionStatuses.Connected => "Green",
6666
ConnectionStatuses.Connecting => "Blue",
6767
ConnectionStatuses.ConnectionFailed => "Red",
68-
ConnectionStatuses.UpdateNeeded => "Red",
6968
ConnectionStatuses.NotConnected => "Red",
7069
ConnectionStatuses.RetryConnectingSoon => "Gray",
7170
_ => "Disconnected"
@@ -96,7 +95,6 @@ private void SetBrush()
9695
ConnectionStatuses.Connected => ConnectedBadgeBrush,
9796
ConnectionStatuses.Connecting => ConnectingBadgeBrush,
9897
ConnectionStatuses.ConnectionFailed => ConnectionFailedBadgeBrush,
99-
ConnectionStatuses.UpdateNeeded => ConnectionFailedBadgeBrush,
10098
ConnectionStatuses.NotConnected => NotConnectedBadgeBrush,
10199
ConnectionStatuses.RetryConnectingSoon => RetryConnectingSoonBadgeBrush,
102100
_ => UnknownBadgeBrush
@@ -124,7 +122,6 @@ private void SetText()
124122
ConnectionStatuses.Connected => _localizationService[nameof(Resources.ConnectionStatus_Connected)],
125123
ConnectionStatuses.Connecting => _localizationService[nameof(Resources.ConnectionStatus_Connecting)],
126124
ConnectionStatuses.ConnectionFailed => _localizationService[nameof(Resources.ConnectionStatus_ConnectionFailed)],
127-
ConnectionStatuses.UpdateNeeded => _localizationService[nameof(Resources.ConnectionStatus_UpdateNeeded)],
128125
ConnectionStatuses.NotConnected => _localizationService[nameof(Resources.ConnectionStatus_NotConnected)],
129126
ConnectionStatuses.RetryConnectingSoon => _localizationService[nameof(Resources.ConnectionStatus_RetryConnectingSoon)],
130127
_ => _localizationService[nameof(Resources.ConnectionStatus_Unkown)]

‎src/ByteSync.Client/Views/Headers/HeaderView.axaml‎

Lines changed: 20 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,11 @@
1717
<Grid Background="{DynamicResource VeryLightGray}">
1818
<Grid.ColumnDefinitions>
1919
<ColumnDefinition Width="*"></ColumnDefinition>
20-
<ColumnDefinition Width="*"></ColumnDefinition>
20+
<ColumnDefinition Width="Auto"></ColumnDefinition>
2121
<ColumnDefinition Width="*"></ColumnDefinition>
2222
</Grid.ColumnDefinitions>
2323

24-
<StackPanel Grid.Column="0" HorizontalAlignment="Left" Orientation="Horizontal" VerticalAlignment="Center">
24+
<StackPanel Grid.Column="0" HorizontalAlignment="Left" Orientation="Horizontal" VerticalAlignment="Center" Margin="6 0">
2525
<Image Source="/Assets/Logo.png"
2626
Width="40"
2727
Height="40"
@@ -33,7 +33,7 @@
3333
</StackPanel>
3434

3535
<!-- TITRE CENTRAL -->
36-
<StackPanel Grid.Column="1" Orientation="Horizontal" HorizontalAlignment="Center">
36+
<StackPanel Grid.Column="1" Orientation="Horizontal" HorizontalAlignment="Center" Margin="6 0">
3737
<misc:Icon FontSize="26" Value="{Binding IconName}" Foreground="{DynamicResource SystemBaseHighColor}"
3838
Margin="6 0" VerticalAlignment="Center"/>
3939

@@ -63,13 +63,26 @@
6363
</Interaction.Behaviors>
6464

6565
<StackPanel Orientation="Horizontal">
66-
<misc:Icon FontSize="20" Value="RegularSync" Margin="2" />
66+
<StackPanel IsVisible="{Binding !IsAVersionMandatory}">
67+
<misc:Icon FontSize="20" Value="RegularSync" Margin="2" />
68+
</StackPanel>
69+
70+
<StackPanel IsVisible="{Binding IsAVersionMandatory}" Orientation="Horizontal">
71+
<misc:Icon FontSize="20" Value="RegularSync" Margin="0 2" />
72+
<TextBlock Text="{localizations:Loc Header_Update_Required}"/>
73+
</StackPanel>
6774
</StackPanel>
6875

6976
<ToolTip.Tip>
70-
<StackPanel Classes="ByteSyncToolTip">
71-
<TextBlock Text="{localizations:Loc Header_Update}"/>
72-
<TextBlock Text="{localizations:Loc Header_Update_Tooltip}"/>
77+
<StackPanel>
78+
<StackPanel IsVisible="{Binding !IsAVersionMandatory}" Classes="ByteSyncToolTip">
79+
<TextBlock Text="{localizations:Loc Header_Update_Tooltip_Header}"/>
80+
<TextBlock Text="{localizations:Loc Header_Update_Tooltip}"/>
81+
</StackPanel>
82+
<StackPanel IsVisible="{Binding IsAVersionMandatory}" Classes="ByteSyncToolTip">
83+
<TextBlock Text="{localizations:Loc Header_Update_Required_Tooltip_Header}"/>
84+
<TextBlock Text="{localizations:Loc Header_Update_Required_Tooltip}"/>
85+
</StackPanel>
7386
</StackPanel>
7487
</ToolTip.Tip>
7588
</Button>
@@ -116,7 +129,6 @@
116129
<ToolTip.Tip>
117130
<StackPanel Classes="ByteSyncToolTip">
118131
<TextBlock Text="{localizations:Loc Header_Documentation}"/>
119-
<TextBlock Text="{localizations:Loc Header_Documentation_Tooltip}"/>
120132
</StackPanel>
121133
</ToolTip.Tip>
122134
</Button>

0 commit comments

Comments
 (0)