-
Notifications
You must be signed in to change notification settings - Fork 114
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #289 from michael-hawker/llama/fix-samples
Fix Samples to Unified Namespace Update, and other sample clean-up
- Loading branch information
Showing
48 changed files
with
555 additions
and
2,163 deletions.
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,129 +1,118 @@ | ||
| using System; | ||
| using System.Collections.Generic; | ||
| using System.IO; | ||
| using System.Linq; | ||
| using System.Runtime.InteropServices.WindowsRuntime; | ||
| using Windows.ApplicationModel; | ||
| using Windows.ApplicationModel.Activation; | ||
| using Windows.Foundation; | ||
| using Windows.Foundation.Collections; | ||
| using Windows.Foundation.Metadata; | ||
| using Windows.UI.Xaml; | ||
| using Windows.UI.Xaml.Controls; | ||
| using Windows.UI.Xaml.Controls.Primitives; | ||
| using Windows.UI.Xaml.Data; | ||
| using Windows.UI.Xaml.Input; | ||
| using Windows.UI.Xaml.Media; | ||
| using Windows.UI.Xaml.Navigation; | ||
|
|
||
| namespace XAMLBehaviorsSample | ||
| namespace XAMLBehaviorsSample; | ||
|
|
||
| /// <summary> | ||
| /// Provides application-specific behavior to supplement the default Application class. | ||
| /// </summary> | ||
| sealed partial class App : Application | ||
| { | ||
| /// <summary> | ||
| /// Provides application-specific behavior to supplement the default Application class. | ||
| /// Initializes the singleton application object. This is the first line of authored code | ||
| /// executed, and as such is the logical equivalent of main() or WinMain(). | ||
| /// </summary> | ||
| sealed partial class App : Application | ||
| public App() | ||
| { | ||
| /// <summary> | ||
| /// Initializes the singleton application object. This is the first line of authored code | ||
| /// executed, and as such is the logical equivalent of main() or WinMain(). | ||
| /// </summary> | ||
| public App() | ||
| { | ||
| this.InitializeComponent(); | ||
| this.Suspending += OnSuspending; | ||
| } | ||
| this.InitializeComponent(); | ||
| this.Suspending += OnSuspending; | ||
| } | ||
|
|
||
| /// <summary> | ||
| /// Invoked when the application is launched normally by the end user. Other entry points | ||
| /// will be used such as when the application is launched to open a specific file. | ||
| /// </summary> | ||
| /// <param name="e">Details about the launch request and process.</param> | ||
| protected override void OnLaunched(LaunchActivatedEventArgs e) | ||
| { | ||
| /// <summary> | ||
| /// Invoked when the application is launched normally by the end user. Other entry points | ||
| /// will be used such as when the application is launched to open a specific file. | ||
| /// </summary> | ||
| /// <param name="e">Details about the launch request and process.</param> | ||
| protected override void OnLaunched(LaunchActivatedEventArgs e) | ||
| { | ||
|
|
||
| #if DEBUG | ||
| if (System.Diagnostics.Debugger.IsAttached) | ||
| { | ||
| this.DebugSettings.EnableFrameRateCounter = true; | ||
| } | ||
| if (System.Diagnostics.Debugger.IsAttached) | ||
| { | ||
| this.DebugSettings.EnableFrameRateCounter = true; | ||
| } | ||
| #endif | ||
|
|
||
| Frame rootFrame = Window.Current.Content as Frame; | ||
|
|
||
| // Do not repeat app initialization when the Window already has content, | ||
| // just ensure that the window is active | ||
| if (rootFrame == null) | ||
| { | ||
| // Create a Frame to act as the navigation context and navigate to the first page | ||
| rootFrame = new Frame(); | ||
|
|
||
| rootFrame.NavigationFailed += OnNavigationFailed; | ||
| Frame rootFrame = Window.Current.Content as Frame; | ||
|
|
||
| if (e.PreviousExecutionState == ApplicationExecutionState.Terminated) | ||
| { | ||
| //TODO: Load state from previously suspended application | ||
| } | ||
| // Do not repeat app initialization when the Window already has content, | ||
| // just ensure that the window is active | ||
| if (rootFrame == null) | ||
| { | ||
| // Create a Frame to act as the navigation context and navigate to the first page | ||
| rootFrame = new Frame(); | ||
|
|
||
| // Place the frame in the current Window | ||
| Window.Current.Content = rootFrame; | ||
| } | ||
| rootFrame.NavigationFailed += OnNavigationFailed; | ||
|
|
||
| if (rootFrame.Content == null) | ||
| if (e.PreviousExecutionState == ApplicationExecutionState.Terminated) | ||
| { | ||
| // When the navigation stack isn't restored navigate to the first page, | ||
| // configuring the new page by passing required information as a navigation | ||
| // parameter | ||
| //TODO: Load state from previously suspended application | ||
| } | ||
|
|
||
| //if (DetectMobile()) | ||
| //{ | ||
| // rootFrame.Navigate(typeof(MainPage_Mobile), e.Arguments); | ||
| //} | ||
| //else | ||
| //{ | ||
| rootFrame.Navigate(typeof(MainPage), e.Arguments); | ||
| // } | ||
| } | ||
| // Ensure the current window is active | ||
| Window.Current.Activate(); | ||
| // Place the frame in the current Window | ||
| Window.Current.Content = rootFrame; | ||
| } | ||
|
|
||
| /// <summary> | ||
| /// Invoked when Navigation to a certain page fails | ||
| /// </summary> | ||
| /// <param name="sender">The Frame which failed navigation</param> | ||
| /// <param name="e">Details about the navigation failure</param> | ||
| void OnNavigationFailed(object sender, NavigationFailedEventArgs e) | ||
| if (rootFrame.Content == null) | ||
| { | ||
| throw new Exception("Failed to load Page " + e.SourcePageType.FullName); | ||
| } | ||
| // When the navigation stack isn't restored navigate to the first page, | ||
| // configuring the new page by passing required information as a navigation | ||
| // parameter | ||
|
|
||
| /// <summary> | ||
| /// Invoked when application execution is being suspended. Application state is saved | ||
| /// without knowing whether the application will be terminated or resumed with the contents | ||
| /// of memory still intact. | ||
| /// </summary> | ||
| /// <param name="sender">The source of the suspend request.</param> | ||
| /// <param name="e">Details about the suspend request.</param> | ||
| private void OnSuspending(object sender, SuspendingEventArgs e) | ||
| //if (DetectMobile()) | ||
| //{ | ||
| // rootFrame.Navigate(typeof(MainPage_Mobile), e.Arguments); | ||
| //} | ||
| //else | ||
| //{ | ||
| rootFrame.Navigate(typeof(MainPage), e.Arguments); | ||
| // } | ||
| } | ||
| // Ensure the current window is active | ||
| Window.Current.Activate(); | ||
| } | ||
|
|
||
| /// <summary> | ||
| /// Invoked when Navigation to a certain page fails | ||
| /// </summary> | ||
| /// <param name="sender">The Frame which failed navigation</param> | ||
| /// <param name="e">Details about the navigation failure</param> | ||
| void OnNavigationFailed(object sender, NavigationFailedEventArgs e) | ||
| { | ||
| throw new Exception("Failed to load Page " + e.SourcePageType.FullName); | ||
| } | ||
|
|
||
| /// <summary> | ||
| /// Invoked when application execution is being suspended. Application state is saved | ||
| /// without knowing whether the application will be terminated or resumed with the contents | ||
| /// of memory still intact. | ||
| /// </summary> | ||
| /// <param name="sender">The source of the suspend request.</param> | ||
| /// <param name="e">Details about the suspend request.</param> | ||
| private void OnSuspending(object sender, SuspendingEventArgs e) | ||
| { | ||
| var deferral = e.SuspendingOperation.GetDeferral(); | ||
| //TODO: Save application state and stop any background activity | ||
| deferral.Complete(); | ||
| } | ||
|
|
||
| private bool DetectMobile() | ||
| { | ||
| bool isHardwareButtonsAPIPresent = | ||
| ApiInformation.IsTypePresent("Windows.Phone.UI.Input.HardwareButtons"); | ||
|
|
||
| if (isHardwareButtonsAPIPresent) | ||
| { | ||
| var deferral = e.SuspendingOperation.GetDeferral(); | ||
| //TODO: Save application state and stop any background activity | ||
| deferral.Complete(); | ||
| return true; | ||
| } | ||
|
|
||
| private bool DetectMobile() | ||
| else | ||
| { | ||
| bool isHardwareButtonsAPIPresent = | ||
| ApiInformation.IsTypePresent("Windows.Phone.UI.Input.HardwareButtons"); | ||
|
|
||
| if (isHardwareButtonsAPIPresent) | ||
| { | ||
| return true; | ||
| } | ||
| else | ||
| { | ||
| return false; | ||
| } | ||
| return false; | ||
| } | ||
| } | ||
| } |
68 changes: 0 additions & 68 deletions
68
samples/CS/XAMLBehaviorsSample/CallMethodControl.DeviceFamily-Mobile.xaml
This file was deleted.
Oops, something went wrong.
Oops, something went wrong.