Commit c514e297 authored by Francesco Carraro's avatar Francesco Carraro
Browse files

fixing Flyout....

parent fddb80b8
Loading
Loading
Loading
Loading
+2 −1
Original line number Diff line number Diff line
@@ -4,12 +4,13 @@ namespace INAF.Apps.Uwp.SLabDataManager.Constants
{
    public class Enums
    {
        public enum FileExt
        public enum StorageItemType
        {
            [Description("txt")]
            Txt,
            [Description("xml")]
            Xml,
            Folder
        }

        public enum FileReadingStatus
+1 −1
Original line number Diff line number Diff line
@@ -611,7 +611,7 @@ namespace INAF.Apps.Uwp.SLabDataManager.Extensions
            return string.Join(string.Empty, "color", type.ToString().ToLowerInvariant());
        }

        public static string ToFileExt(this FileExt fileExt)
        public static string ToFileExt(this StorageItemType fileExt)
        {
            return string.Join(string.Empty, ".", fileExt.GetDescription());
        }
+3 −3
Original line number Diff line number Diff line
@@ -61,7 +61,7 @@ namespace INAF.Apps.Uwp.SLabDataManager.Helpers
        }

        public string createFilenameForLocalSaving(string filepath,
                                                   FileExt fileExt,
                                                   StorageItemType fileExt,
                                                   SpectrumType spectrumType)
        {
            FileInfo fi = new FileInfo(filepath);
@@ -78,8 +78,8 @@ namespace INAF.Apps.Uwp.SLabDataManager.Helpers
            string ext = string.Join(".", temp.ToArray());

            /* create new filename */
            if (fileExt != FileExt.Txt)
                ext = ext.Replace(FileExt.Txt.GetDescription(), fileExt.GetDescription());
            if (fileExt != StorageItemType.Txt)
                ext = ext.Replace(StorageItemType.Txt.GetDescription(), fileExt.GetDescription());
            string filename = string.Join(string.Empty, filenameNoExt, "_", spectrumType, ".", ext);

            return filename;
+14 −17
Original line number Diff line number Diff line
@@ -79,6 +79,7 @@
    <x:String x:Key="Ref">Ref</x:String>
    <x:String x:Key="RefWhite">RefWhite</x:String>
    <x:String x:Key="Xml">Xml</x:String>
    <x:String x:Key="Folder">Folder</x:String>
    
    <!-- CHROMELESS BUTTON STYLE -->
    <Style x:Key="ChromelessButtonStyle" TargetType="Button">
@@ -517,6 +518,7 @@
        </Border>
    </ControlTemplate>

    <!-- FLYOUT FOR OPENING RECENT STORAGE ITEMS -->
    <Flyout x:Name="RecentFilesFlyout"
            x:Key="RecentFilesFlyout"
            Placement="BottomEdgeAlignedLeft">
@@ -537,7 +539,8 @@
                       Visibility="{Binding Path=AreAvailable, Converter={StaticResource BoolToVisibilityInverseConverter}, Mode=OneWay}"
                       Margin="8"
                       Grid.Row="0" />
            <ListView ItemsSource="{Binding Path=RecentFiles, Mode=OneWay}"
            <ListView x:Name="listViewRecentItems"
                      ItemsSource="{Binding Path=RecentFiles, Mode=OneWay}"
                      IsItemClickEnabled="True"
                      SelectionMode="Single"
                      Visibility="{Binding Path=AreAvailable, Converter={StaticResource BoolToVisibilityConverter}, Mode=OneWay}"
@@ -551,12 +554,6 @@
                                   TextTrimming="CharacterEllipsis"/>
                    </DataTemplate>
                </ListView.ItemTemplate>
                <!-- BEHAVIORS -->
                <Interactivity:Interaction.Behaviors>
                    <Core:EventTriggerBehavior EventName="ItemClick">
                        <Core:InvokeCommandAction Command="{Binding CommandOpenSelectedSpectrumFile}"/>
                    </Core:EventTriggerBehavior>
                </Interactivity:Interaction.Behaviors>
            </ListView>
        </Grid>
    </Flyout>
+1 −1
Original line number Diff line number Diff line
@@ -67,7 +67,7 @@ namespace INAF.Apps.Uwp.SLabDataManager.ViewModels
            }
        }

        protected async Task<StorageFile> selectFileAsync(List<FileExt> fileExts)
        protected async Task<StorageFile> selectFileAsync(List<StorageItemType> fileExts)
        {
            StorageFile file = null;

Loading