Skip to content

Commit

Permalink
Treat warnings as errors enabled
Browse files Browse the repository at this point in the history
  • Loading branch information
@ValeraFinebits
ValeraFinebits committed Jun 15, 2024
1 parent 43213ea commit aad6da2
Show file tree
Hide file tree
Showing 3 changed files with 30 additions and 20 deletions.
24 changes: 12 additions & 12 deletions src/Eppie.App/Eppie.App.Converters/BoolToValueConverter.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,10 @@ namespace Tuvi.App.Converters
{
public class BoolToValueConverter<T> : IValueConverter
{
public T FalseValue { get; set; }
public T TrueValue { get; set; }
public T? FalseValue { get; set; }
public T? TrueValue { get; set; }

public object Convert(object value, Type targetType, object parameter, string language)
public object? Convert(object value, Type targetType, object parameter, string language)
{
if (value == null)
return FalseValue;
Expand Down Expand Up @@ -46,9 +46,9 @@ public class BoolToThicknessConverter : BoolToValueConverter<Thickness> { }

public class BoolToResourceConverter : BoolToStringConverter
{
private ResourceLoader _resourceLoader;
private string _resource;
public String Resource
private ResourceLoader? _resourceLoader;
private string? _resource;
public String? Resource
{
get { return _resource; }
set
Expand All @@ -61,8 +61,8 @@ public String Resource
}
}

private string _falseKey;
public String FalseKey
private string? _falseKey;
public String? FalseKey
{
get { return _falseKey; }
set
Expand All @@ -73,8 +73,8 @@ public String FalseKey
}
}

private string _trueKey;
public String TrueKey
private string? _trueKey;
public String? TrueKey
{
get { return _trueKey; }
set
Expand Down Expand Up @@ -105,12 +105,12 @@ private void Update()

if (TrueKey != null && TrueValue == null)
{
TrueValue = _resourceLoader.GetString(TrueKey);
TrueValue = _resourceLoader?.GetString(TrueKey);
}

if (FalseKey != null && FalseValue == null)
{
FalseValue = _resourceLoader.GetString(FalseKey);
FalseValue = _resourceLoader?.GetString(FalseKey);
}
}
}
Expand Down
14 changes: 12 additions & 2 deletions src/Eppie.App/Eppie.App.Converters/Eppie.App.Converters.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,36 +12,46 @@
<DefineConstants>$(DefineConstants);__WASM__</DefineConstants>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
<TreatWarningsAsErrors>false</TreatWarningsAsErrors>
<WarningLevel>9999</WarningLevel>
<TreatWarningsAsErrors>True</TreatWarningsAsErrors>
<NoWarn>CA1014</NoWarn>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
<TreatWarningsAsErrors>false</TreatWarningsAsErrors>
<WarningLevel>9999</WarningLevel>
<TreatWarningsAsErrors>True</TreatWarningsAsErrors>
<NoWarn>CA1014</NoWarn>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Debug|uap10.0.19041|AnyCPU'">
<WarningLevel>9999</WarningLevel>
<TreatWarningsAsErrors>True</TreatWarningsAsErrors>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Release|uap10.0.19041|AnyCPU'">
<WarningLevel>9999</WarningLevel>
<TreatWarningsAsErrors>True</TreatWarningsAsErrors>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Debug|netstandard2.0|AnyCPU'">
<WarningLevel>9999</WarningLevel>
<TreatWarningsAsErrors>True</TreatWarningsAsErrors>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Release|netstandard2.0|AnyCPU'">
<WarningLevel>9999</WarningLevel>
<TreatWarningsAsErrors>True</TreatWarningsAsErrors>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Debug|xamarinios10|AnyCPU'">
<WarningLevel>9999</WarningLevel>
<TreatWarningsAsErrors>True</TreatWarningsAsErrors>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Release|xamarinios10|AnyCPU'">
<WarningLevel>9999</WarningLevel>
<TreatWarningsAsErrors>True</TreatWarningsAsErrors>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Debug|monoandroid12.0|AnyCPU'">
<WarningLevel>9999</WarningLevel>
<TreatWarningsAsErrors>True</TreatWarningsAsErrors>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Release|monoandroid12.0|AnyCPU'">
<WarningLevel>9999</WarningLevel>
<TreatWarningsAsErrors>True</TreatWarningsAsErrors>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Uno.UI" Version="4.8.39" />
Expand Down
12 changes: 6 additions & 6 deletions src/Eppie.App/Eppie.App.Converters/StringConverters.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ namespace Tuvi.App.Converters
{
public abstract class ValueToStringConverter<T> : IValueConverter
{
public T DefaultValue { get; set; }
public T? DefaultValue { get; set; }

public string DefaultString { get; set; }

Expand All @@ -15,18 +15,18 @@ protected ValueToStringConverter()
DefaultString = "";
}

public virtual string Convert(T value)
public virtual string? Convert(T value)
{
return value.ToString();
return value?.ToString();
}
public abstract T ConvertBack(string value);

public object Convert(object value, Type targetType, object parameter, string language)
public object? Convert(object value, Type targetType, object parameter, string language)
{
return value != null ? Convert((T)value) : DefaultString;
}

public object ConvertBack(object value, Type targetType, object parameter, string language)
public object? ConvertBack(object value, Type targetType, object parameter, string language)
{
return value != null ? ConvertBack((string)value) : DefaultValue;
}
Expand All @@ -46,4 +46,4 @@ public override int ConvertBack(string value)
}
}

}
}

0 comments on commit aad6da2

Please sign in to comment.