-
-
Notifications
You must be signed in to change notification settings - Fork 2.2k
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.
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
[Farewell, Interaction]: Step 2 of removing the Interaction class #4189
Merged
Merged
Changes from 9 commits
Commits
Show all changes
10 commits
Select commit
Hold shift + click to select a range
6e766aa
rm1
d2dyno1 ff13499
rm2
d2dyno1 76dea64
rm3
d2dyno1 fcfd57a
rm4
d2dyno1 5c1ae05
rm5
d2dyno1 6ced938
Farewell, Interaction
d2dyno1 31fb2a1
JumpString fix
d2dyno1 0662279
Fix build conflicts
d2dyno1 6b7db72
Fix build error
d2dyno1 232ec15
Re-add jumpTimer
d2dyno1 File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,100 @@ | ||
| using Files.Dialogs; | ||
| using Files.Views; | ||
| using Microsoft.Toolkit.Uwp; | ||
| using System; | ||
| using System.Linq; | ||
| using System.Threading.Tasks; | ||
| using Windows.ApplicationModel.Core; | ||
| using Windows.Foundation; | ||
| using Windows.Foundation.Metadata; | ||
| using Windows.UI.Core; | ||
| using Windows.UI.ViewManagement; | ||
| using Windows.UI.Xaml; | ||
| using Windows.UI.Xaml.Controls; | ||
| using Windows.UI.Xaml.Media.Animation; | ||
| using static Files.Views.Properties; | ||
|
|
||
| namespace Files.Helpers | ||
| { | ||
| public static class FilePropertiesHelpers | ||
| { | ||
| public static async void ShowProperties(IShellPage associatedInstance) | ||
| { | ||
| if (associatedInstance.SlimContentPage.IsItemSelected) | ||
| { | ||
| if (associatedInstance.SlimContentPage.SelectedItems.Count > 1) | ||
| { | ||
| await OpenPropertiesWindowAsync(associatedInstance.SlimContentPage.SelectedItems, associatedInstance); | ||
| } | ||
| else | ||
| { | ||
| await OpenPropertiesWindowAsync(associatedInstance.SlimContentPage.SelectedItem, associatedInstance); | ||
| } | ||
| } | ||
| else | ||
| { | ||
| if (!System.IO.Path.GetPathRoot(associatedInstance.FilesystemViewModel.CurrentFolder.ItemPath) | ||
| .Equals(associatedInstance.FilesystemViewModel.CurrentFolder.ItemPath, StringComparison.OrdinalIgnoreCase)) | ||
| { | ||
| await OpenPropertiesWindowAsync(associatedInstance.FilesystemViewModel.CurrentFolder, associatedInstance); | ||
| } | ||
| else | ||
| { | ||
| await OpenPropertiesWindowAsync(App.DrivesManager.Drives | ||
| .SingleOrDefault(x => x.Path.Equals(associatedInstance.FilesystemViewModel.CurrentFolder.ItemPath)), associatedInstance); | ||
| } | ||
| } | ||
| } | ||
|
|
||
| public static async Task OpenPropertiesWindowAsync(object item, IShellPage associatedInstance) | ||
| { | ||
| if (item == null) | ||
| { | ||
| return; | ||
| } | ||
|
|
||
| if (ApiInformation.IsApiContractPresent("Windows.Foundation.UniversalApiContract", 8)) | ||
| { | ||
| CoreApplicationView newWindow = CoreApplication.CreateNewView(); | ||
| ApplicationView newView = null; | ||
|
|
||
| await newWindow.Dispatcher.RunAsync(CoreDispatcherPriority.Normal, () => | ||
| { | ||
| Frame frame = new Frame(); | ||
| frame.Navigate(typeof(Properties), new PropertiesPageNavigationArguments() | ||
| { | ||
| Item = item, | ||
| AppInstanceArgument = associatedInstance | ||
| }, new SuppressNavigationTransitionInfo()); | ||
| Window.Current.Content = frame; | ||
| Window.Current.Activate(); | ||
|
|
||
| newView = ApplicationView.GetForCurrentView(); | ||
| newWindow.TitleBar.ExtendViewIntoTitleBar = true; | ||
| newView.Title = "PropertiesTitle".GetLocalized(); | ||
| newView.PersistedStateId = "Properties"; | ||
| newView.SetPreferredMinSize(new Size(400, 550)); | ||
| newView.Consolidated += delegate | ||
| { | ||
| Window.Current.Close(); | ||
| }; | ||
| }); | ||
|
|
||
| bool viewShown = await ApplicationViewSwitcher.TryShowAsStandaloneAsync(newView.Id); | ||
| // Set window size again here as sometimes it's not resized in the page Loaded event | ||
| newView.TryResizeView(new Size(400, 550)); | ||
| } | ||
| else | ||
| { | ||
| var propertiesDialog = new PropertiesDialog(); | ||
| propertiesDialog.propertiesFrame.Tag = propertiesDialog; | ||
| propertiesDialog.propertiesFrame.Navigate(typeof(Properties), new PropertiesPageNavigationArguments() | ||
| { | ||
| Item = item, | ||
| AppInstanceArgument = associatedInstance | ||
| }, new SuppressNavigationTransitionInfo()); | ||
| await propertiesDialog.ShowAsync(ContentDialogPlacement.Popup); | ||
| } | ||
| } | ||
| } | ||
| } |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
FINALLY!!!