Merge pull request #11 from arpadbarta/feature/adds-text-only-format

Feature/adds text only format
arpadbarta · Sep 24, 2023 · 60dbad4 · 60dbad4
2 parents 8a3191f + c281a59
commit 60dbad4
Show file tree

Hide file tree

Showing 6 changed files with 27 additions and 4 deletions.
diff --git a/Time.Package/Package.appxmanifest b/Time.Package/Package.appxmanifest
@@ -10,7 +10,7 @@
   <Identity
     Name="2766ABDEV.DateTime"
     Publisher="CN=2C978AE4-500A-46CC-8E4F-229072C4E4D2"
-    Version="2.3.0.0" />
+    Version="2.4.0.0" />
 
   <Properties>
     <DisplayName>Date &amp; Time</DisplayName>

diff --git a/Time/SettingsWindow.xaml b/Time/SettingsWindow.xaml
@@ -328,10 +328,12 @@
                                 </ComboBox>
 
                                 <TextBlock Text="{x:Static translations:Resource.PrefixLabel}"/>
-                                <TextBox Text="{Binding Prefix, UpdateSourceTrigger=PropertyChanged}"/>
+                                <TextBox Text="{Binding Prefix, UpdateSourceTrigger=PropertyChanged}"
+                                         AcceptsReturn="True"/>
 
                                 <TextBlock Text="{x:Static translations:Resource.SuffixLabel}"/>
-                                <TextBox Text="{Binding Suffix, UpdateSourceTrigger=PropertyChanged}"/>
+                                <TextBox Text="{Binding Suffix, UpdateSourceTrigger=PropertyChanged}"
+                                         AcceptsReturn="True"/>
                             </StackPanel>
                         </DataTemplate>
                     </ContentControl.ContentTemplate>

diff --git a/Time/Time.csproj b/Time/Time.csproj
@@ -10,7 +10,7 @@
 		<Company>AB Dev</Company>
 		<Description>Just shows the time and date. That is all.</Description>
 		<Platforms>x86;x64</Platforms>
-		<Version>2.3.0.0</Version>
+		<Version>2.4.0.0</Version>
 		<AssemblyVersion>$(Version)</AssemblyVersion>
 		<FileVersion>$(Version)</FileVersion>
 	</PropertyGroup>

diff --git a/Time/Translations/Resource.Designer.cs b/Time/Translations/Resource.Designer.cs
diff --git a/Time/Translations/Resource.resx b/Time/Translations/Resource.resx
@@ -229,6 +229,9 @@ will result in:
   <data name="SuffixLabel" xml:space="preserve">
     <value>Suffix (text shown after the segment)</value>
   </data>
+  <data name="TextOnlyFormatLabel" xml:space="preserve">
+    <value>Text only</value>
+  </data>
   <data name="TimeLabel" xml:space="preserve">
     <value>Time</value>
   </data>

diff --git a/Time/ViewModels/SegmentViewModel.cs b/Time/ViewModels/SegmentViewModel.cs
@@ -26,6 +26,7 @@ public record SegmentConfiguration
     public class SegmentViewModel : ObservableObject
     {
         private const string CustomFormat = "custom-format";
+        private const string TextOnly = "text-only";
         private const string LocalZone = "local";
 
         private static readonly FormatDefinition[] _formats;
@@ -125,6 +126,7 @@ static SegmentViewModel()
                 new FormatDefinition(Resource.ShortDateLabel, Resource.DateLabel, "d"),
                 new FormatDefinition(Resource.LongDateLabel, Resource.DateLabel, "D"),
                 new FormatDefinition(Resource.CustomFormatLabel, Resource.CustomFormatLabel, CustomFormat),
+                new FormatDefinition(Resource.TextOnlyFormatLabel, Resource.CustomFormatLabel, TextOnly),
             };
         }
 
@@ -157,6 +159,13 @@ public void Update(DateTime dateTime)
         {
             ArgumentNullException.ThrowIfNull(dateTime);
 
+            if (Format == TextOnly)
+            {
+                Content = string.Empty;
+
+                return;
+            }
+
             try
             {
                 Content = TimeZoneInfo.ConvertTime(dateTime, _selectedTimeZoneInfo).ToString(Format);