Merge pull request #462 from trimble-oss/459-text-cutoff-issue-and-hide-issue-on-modal-popup

459 text cutoff issue and hide issue on modal popup

Author: amosekr

Trimble.Modus.Components/Controls/Label/ControlLabel.xaml

@@ -5,23 +5,25 @@
              xmlns:local="clr-namespace:Trimble.Modus.Components;assembly=Trimble.Modus.Components"
              x:Class="Trimble.Modus.Components.ControlLabel"
              x:Name="controlLabelView">
-  <Grid x:Name="view"
-        BindingContext="{x:Reference controlLabelView}"
-        ColumnSpacing="6"
-        ColumnDefinitions="auto,auto"
-        IsVisible="{Binding TitleText,Converter={StaticResource IsStringNotNullOrEmptyConverter}}">
+  <Grid x:Name="view" 
+  BindingContext="{x:Reference controlLabelView}"
+  ColumnSpacing="6"
+  ColumnDefinitions="*,Auto" HorizontalOptions="Start"
+  IsVisible="{Binding TitleText,Converter={StaticResource IsStringNotNullOrEmptyConverter}}">
     <Label x:Name="inputLabel"
-           Padding="0,0,0,5"
-           Grid.Column="0"
-           FontFamily="OpenSansSemibold"
-           Text="{Binding TitleText}"
-           VerticalOptions="Center"
-           LineBreakMode="WordWrap"
-           HorizontalOptions="Start" />
+       Padding="0,0,0,5"        
+       Grid.Column="0"
+       FontFamily="OpenSansSemibold"
+       Text="{Binding TitleText}"
+       VerticalOptions="Center"
+       LineBreakMode="WordWrap"           
+       HorizontalOptions="Start" />
     <Label Text="*"
-           Grid.Column="1"
-           IsVisible="{Binding IsRequired}"
-           FontFamily="OpenSansSemibold"
-           TextColor="{DynamicResource Danger}" />
+       Grid.Column="1"         
+       IsVisible="{Binding IsRequired}"
+       FontFamily="OpenSansSemibold"
+       HorizontalOptions="Start"
+       VerticalOptions="Center"
+       TextColor="{DynamicResource Danger}" />
   </Grid>
 </ContentView>

Trimble.Modus.Components/Controls/TMModal/TMModalContents.xaml.cs

@@ -1,4 +1,5 @@
 using CommunityToolkit.Maui.Behaviors;
+using System;
 using Trimble.Modus.Components.Constant;
 using Trimble.Modus.Components.Enums;
 using Trimble.Modus.Components.Popup.Services;
@@ -227,8 +228,8 @@ internal void AddTextInput(Action<TMInput> inputConfigurationHandler = null)
         var inputControl = new TMInput();
 
         inputConfigurationHandler?.Invoke(inputControl);
-
-        ModalBodyContainer.Add(inputControl);
+        inputControl.SetDynamicResource(TMInput.HeaderTextColorProperty, "TMModalInputHeaderTextColor");
+        ModalBodyContainer.Add(inputControl);
     }
 
     /// <summary>

Trimble.Modus.Components/Styles/DarkThemeStyling.xaml

@@ -498,6 +498,8 @@
                          Color="{StaticResource IconDark}" />
   <styles:ReferenceColor x:Key="InputDefaultHelperTextColor"
                       Color="{StaticResource DefaultTextColor}" />
+  <styles:ReferenceColor x:Key="TMModalInputHeaderTextColor"
+                       Color="{StaticResource DefaultTextColor}"/>
 
   <!--Primary-->
   <styles:ReferenceColor x:Key="InputPrimaryBorderColor"

Trimble.Modus.Components/Styles/LightThemeStyling.xaml

@@ -493,6 +493,10 @@
                          Color="{StaticResource IconLight}" />
   <styles:ReferenceColor x:Key="InputDefaultHelperTextColor"
                         Color="{StaticResource DefaultTextColor}" />
+  <styles:ReferenceColor x:Key="TMModalInputHeaderTextColor"
+                       Color="{StaticResource DefaultTextColor}"/>
+
+
 
   <!--Primary-->
   <styles:ReferenceColor x:Key="InputPrimaryBorderColor"

Trimble.Modus.Components/Trimble.Modus.Components.csproj

@@ -27,7 +27,7 @@
     <GeneratePackageOnBuild>True</GeneratePackageOnBuild>
     <PackageId>Trimble.Modus.Components</PackageId>
     <Title>Trimble Modus</Title>
-    <Version>1.4.0.3</Version>
+    <Version>1.4.0.4</Version>
     <Authors>Trimble Inc</Authors>
     <Company>Trimble Inc</Company>
     <Product>Trimble.Modus.Components</Product>