Skip to content

Add support for uppercase image extension #770

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
May 10, 2020
Merged

Add support for uppercase image extension #770

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
19f6c55
Add support for uppercase image extension
tsvietOK May 10, 2020
2840c6e
Add null check
tsvietOK May 10, 2020
cbb0941
Use Equals to compare image extensions
tsvietOK May 10, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 11 additions & 8 deletions Files/BaseLayout.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -221,15 +221,18 @@ public void RightClickContextMenu_Opening(object sender, object e)
{
var selectedDataItem = selectedFileSystemItems[0] as ListedItem;

if (selectedDataItem.FileExtension.Equals(".zip", StringComparison.OrdinalIgnoreCase))
if (!string.IsNullOrEmpty(selectedDataItem.FileExtension))
{
UnloadMenuFlyoutItemByName("OpenItem");
this.FindName("UnzipItem");
}
else if (!selectedDataItem.FileExtension.Equals(".zip", StringComparison.OrdinalIgnoreCase))
{
this.FindName("OpenItem");
UnloadMenuFlyoutItemByName("UnzipItem");
if (selectedDataItem.FileExtension.Equals(".zip", StringComparison.OrdinalIgnoreCase))
{
UnloadMenuFlyoutItemByName("OpenItem");
this.FindName("UnzipItem");
}
else if (!selectedDataItem.FileExtension.Equals(".zip", StringComparison.OrdinalIgnoreCase))
{
this.FindName("OpenItem");
UnloadMenuFlyoutItemByName("UnzipItem");
}
}
}
else if (selectedFileSystemItems.Count > 1)
Expand Down
6 changes: 5 additions & 1 deletion Files/View Models/InteractionViewModel.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,11 @@ public void CheckForImage()
{
string ItemExtension = (App.CurrentInstance.ContentPage as BaseLayout).SelectedItem.FileExtension;

if (ItemExtension == ".png" || ItemExtension == ".jpg" || ItemExtension == ".bmp" || ItemExtension == ".jpeg")
if (!string.IsNullOrEmpty(ItemExtension)
&& ItemExtension.ToLower() == ".png"
|| ItemExtension.ToLower() == ".jpg"
|| ItemExtension.ToLower() == ".bmp"
|| ItemExtension.ToLower() == ".jpeg")
{
// Since item is an image, set the IsSelectedItemImage property to true
App.InteractionViewModel.IsSelectedItemImage = true;
Expand Down