Skip to content

Commit 142b548

Browse files
committed
Fixed attachment display issue and build 2.2.0
1 parent d0f69d5 commit 142b548

File tree

6 files changed

+44
-8
lines changed

6 files changed

+44
-8
lines changed

PassXYZ.Vault.Tests/PassXYZ.Vault.Tests.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<ImplicitUsings>enable</ImplicitUsings>
66
<Nullable>enable</Nullable>
77
<UseMaui>true</UseMaui>
8-
<MauiVersion>8.0.80</MauiVersion>
8+
<MauiVersion>8.0.100</MauiVersion>
99
<IsPackable>false</IsPackable>
1010
</PropertyGroup>
1111

PassXYZ.Vault/PassXYZ.Vault.csproj

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
<OutputType Condition="'$(TargetFramework)'!='net8.0'">Exe</OutputType>
1717
<RootNamespace>PassXYZ.Vault</RootNamespace>
1818
<UseMaui>true</UseMaui>
19-
<MauiVersion>8.0.80</MauiVersion>
19+
<MauiVersion>8.0.100</MauiVersion>
2020
<SingleProject>true</SingleProject>
2121
<ImplicitUsings>enable</ImplicitUsings>
2222
<Nullable>enable</Nullable>
@@ -29,7 +29,7 @@
2929

3030
<!-- Versions -->
3131
<ApplicationDisplayVersion>1.0</ApplicationDisplayVersion>
32-
<ApplicationVersion>5</ApplicationVersion>
32+
<ApplicationVersion>6</ApplicationVersion>
3333

3434
<SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'ios'">11.0</SupportedOSPlatformVersion>
3535
<SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'maccatalyst'">13.1</SupportedOSPlatformVersion>
@@ -41,14 +41,16 @@
4141
<NeutralLanguage>en-US</NeutralLanguage>
4242
<DefaultLanguage>en-us</DefaultLanguage>
4343
<GenerateAppInstallerFile>False</GenerateAppInstallerFile>
44-
<AppxAutoIncrementPackageRevision>True</AppxAutoIncrementPackageRevision>
44+
<AppxAutoIncrementPackageRevision>False</AppxAutoIncrementPackageRevision>
4545
<AppxSymbolPackageEnabled>False</AppxSymbolPackageEnabled>
4646
<GenerateTestArtifacts>True</GenerateTestArtifacts>
4747
<GenerateTemporaryStoreCertificate>True</GenerateTemporaryStoreCertificate>
4848
<HoursBetweenUpdateChecks>0</HoursBetweenUpdateChecks>
4949
<EnableUnsafeBinaryFormatterSerialization>true</EnableUnsafeBinaryFormatterSerialization>
50-
<AssemblyVersion>2.1.0.0</AssemblyVersion>
51-
<FileVersion>2.1.0.0</FileVersion>
50+
<AssemblyVersion>2.2.0.0</AssemblyVersion>
51+
<FileVersion>2.2.0.0</FileVersion>
52+
<AppxPackageSigningEnabled>False</AppxPackageSigningEnabled>
53+
<AppxPackageSigningTimestampDigestAlgorithm>SHA256</AppxPackageSigningTimestampDigestAlgorithm>
5254
</PropertyGroup>
5355

5456
<PropertyGroup Condition="'$(TargetFramework)'=='net8.0-ios'">

PassXYZ.Vault/Platforms/Windows/Package.appxmanifest

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
<Identity
1111
Name="13783RogerYe.37906EDB75B0F"
1212
Publisher="CN=F81DB40B-AF4A-473E-ADEA-A55EE7432C05"
13-
Version="1.1.2.0" />
13+
Version="2.2.1.0" />
1414
<mp:PhoneIdentity PhoneProductId="74832D54-DC81-40D7-A436-EE13D19C3125" PhonePublisherId="00000000-0000-0000-0000-000000000000"/>
1515

1616
<Properties>

PassXYZ.Vault/ViewModels/ItemDetailViewModel.cs

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -99,6 +99,28 @@ public override async void OnSelection(object sender)
9999
}
100100
}
101101

102+
public async void OnFieldSelected(Field field)
103+
{
104+
if (field == null)
105+
{
106+
logger.LogWarning("field is null in OnSelection");
107+
return;
108+
}
109+
110+
if (field.IsBinaries)
111+
{
112+
var bdc = BinaryDataClassifier.ClassifyUrl(field.Key);
113+
if ((bdc == BinaryDataClass.Image) && (field.Binary != null))
114+
{
115+
await Shell.Current.Navigation.PushAsync(new ImagePreviewPage(field.GetBinaryData()));
116+
}
117+
else
118+
{
119+
logger.LogDebug("Attachment {field.Key} selected", field.Key);
120+
}
121+
}
122+
}
123+
102124
public void LoadItemId(string itemId)
103125
{
104126
if (itemId == null) { throw new ArgumentNullException(nameof(itemId)); }

PassXYZ.Vault/Views/ItemDetailPage.xaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@
3535
<ListView x:Name="FieldsListView"
3636
ItemsSource="{Binding Fields}"
3737
VerticalOptions="FillAndExpand"
38+
ItemTapped="OnTap"
3839
HasUnevenRows="True">
3940

4041
<ListView.ItemTemplate>

PassXYZ.Vault/Views/ItemDetailPage.xaml.cs

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,20 @@ namespace PassXYZ.Vault.Views;
99

1010
public partial class ItemDetailPage : ContentPage
1111
{
12+
ItemDetailViewModel viewModel;
1213
public ItemDetailPage(ItemDetailViewModel viewModel)
1314
{
1415
InitializeComponent();
15-
BindingContext = viewModel;
16+
BindingContext = this.viewModel = viewModel;
17+
}
18+
19+
void OnTap(object sender, ItemTappedEventArgs args)
20+
{
21+
var field = args.Item as Field;
22+
if (field == null)
23+
{
24+
return;
25+
}
26+
viewModel.OnFieldSelected(field);
1627
}
1728
}

0 commit comments

Comments
 (0)