Skip to content
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

Scavenger hunt #9

Open
wants to merge 39 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
39 commits
Select commit Hold shift + click to select a range
21daf31
Initial commit of models
echeung-amzn Jun 18, 2015
4adfec0
Merge branch 'master' of github.com:randysingh/scavengerhunt
echeung-amzn Jun 18, 2015
3848960
Merge branch 'master' of github.com:randysingh/scavengerhunt
echeung-amzn Jun 18, 2015
583a17f
Add boilerplate views/viewmodels
echeung-amzn Jun 18, 2015
b0a4f07
Prelim work on login
echeung-amzn Jun 18, 2015
6bfc43f
/shrug
echeung-amzn Jun 19, 2015
8e5b66a
Merge branch 'master' of github.com:randysingh/scavengerhunt
echeung-amzn Jun 19, 2015
b12bdd5
Logging in via Google should be functional. View/viewmodel/model edits
echeung-amzn Jun 19, 2015
5efa541
Clue and map views
echeung-amzn Jun 19, 2015
94d1e59
ClubPageViewModel methods
echeung-amzn Jun 19, 2015
8771910
Clean up App.xaml.cs
echeung-amzn Jun 19, 2015
961f516
Fix navigation issue
echeung-amzn Jun 19, 2015
b16d31a
DataService work
echeung-amzn Jun 19, 2015
1c307da
More API work
echeung-amzn Jun 19, 2015
b345e74
I accidentally the string
echeung-amzn Jun 19, 2015
140757a
Model updates
echeung-amzn Jun 19, 2015
ab4465a
Functional map
echeung-amzn Jun 19, 2015
f495160
Placeholder team name
echeung-amzn Jun 19, 2015
96d9345
Work on map and leaderboard
echeung-amzn Jun 19, 2015
821c069
Merge branch 'master' of github.com:randysingh/scavengerhunt
echeung-amzn Jun 19, 2015
6b8bc4e
Now saves profile data in settingsservice
Jun 19, 2015
4df6921
Merge remote-tracking branch 'origin/master' into lord-vader
Jun 19, 2015
be9a61c
Add Background Task files
echeung-amzn Jun 19, 2015
38e32c9
Saves team to setting service with key "team"
Jun 19, 2015
24eed19
Merge branch 'master' into lord-vader
Jun 19, 2015
5cfcd94
Leaderboard work
echeung-amzn Jun 19, 2015
084438a
Name
echeung-amzn Jun 19, 2015
a1d827e
Register BTask
echeung-amzn Jun 19, 2015
5d469d6
Show welcome message
echeung-amzn Jun 19, 2015
2cee1b6
Functional leaderboards!
echeung-amzn Jun 19, 2015
77d6377
Add symbols to buttons!!!
echeung-amzn Jun 19, 2015
fdcaee5
BackgroundTask work
echeung-amzn Jun 19, 2015
b4d4026
Merge branch 'master' of github.com:randysingh/scavengerhunt
echeung-amzn Jun 19, 2015
7bf99a6
Dependency fixes and password vault things
echeung-amzn Jun 19, 2015
2b6b997
Added clue functionality
Jun 19, 2015
f65e4b1
Merge branch 'master' into clue-page-data
Jun 19, 2015
42279e5
Merge conflict
echeung-amzn Jun 19, 2015
2b60136
Fix typo
echeung-amzn Jun 19, 2015
b60d027
Create README.md
echeung-amzn Jun 20, 2015
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
18 changes: 16 additions & 2 deletions Bootcamp2015-AmazingRace.sln
Original file line number Diff line number Diff line change
@@ -1,12 +1,14 @@

Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 14
VisualStudioVersion = 14.0.22823.1
# Visual Studio 2013
VisualStudioVersion = 12.0.31101.0
MinimumVisualStudioVersion = 10.0.40219.1
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Bootcamp2015.AmazingRace", "Bootcamp2015-AmazingRace\Bootcamp2015.AmazingRace.csproj", "{2A293FDA-A504-4000-B179-B911DECD3B32}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Bootcamp2015.AmazingRace.Base", "Bootcamp2015.AmazingRace.Base\Bootcamp2015.AmazingRace.Base.csproj", "{58BA43C5-0DC9-4AF1-9EE6-4B8F7453C560}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Bootcamp2015.AmazingRace.BackgroundTask", "Bootcamp2015.AmazingRace.BackgroundTask\Bootcamp2015.AmazingRace.BackgroundTask.csproj", "{0FC89175-DC9A-4C60-AFD3-6252BE25154E}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Expand Down Expand Up @@ -47,6 +49,18 @@ Global
{58BA43C5-0DC9-4AF1-9EE6-4B8F7453C560}.Release|ARM.Build.0 = Release|ARM
{58BA43C5-0DC9-4AF1-9EE6-4B8F7453C560}.Release|x86.ActiveCfg = Release|x86
{58BA43C5-0DC9-4AF1-9EE6-4B8F7453C560}.Release|x86.Build.0 = Release|x86
{0FC89175-DC9A-4C60-AFD3-6252BE25154E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{0FC89175-DC9A-4C60-AFD3-6252BE25154E}.Debug|Any CPU.Build.0 = Debug|Any CPU
{0FC89175-DC9A-4C60-AFD3-6252BE25154E}.Debug|ARM.ActiveCfg = Debug|ARM
{0FC89175-DC9A-4C60-AFD3-6252BE25154E}.Debug|ARM.Build.0 = Debug|ARM
{0FC89175-DC9A-4C60-AFD3-6252BE25154E}.Debug|x86.ActiveCfg = Debug|x86
{0FC89175-DC9A-4C60-AFD3-6252BE25154E}.Debug|x86.Build.0 = Debug|x86
{0FC89175-DC9A-4C60-AFD3-6252BE25154E}.Release|Any CPU.ActiveCfg = Release|Any CPU
{0FC89175-DC9A-4C60-AFD3-6252BE25154E}.Release|Any CPU.Build.0 = Release|Any CPU
{0FC89175-DC9A-4C60-AFD3-6252BE25154E}.Release|ARM.ActiveCfg = Release|ARM
{0FC89175-DC9A-4C60-AFD3-6252BE25154E}.Release|ARM.Build.0 = Release|ARM
{0FC89175-DC9A-4C60-AFD3-6252BE25154E}.Release|x86.ActiveCfg = Release|x86
{0FC89175-DC9A-4C60-AFD3-6252BE25154E}.Release|x86.Build.0 = Release|x86
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
Expand Down
2 changes: 2 additions & 0 deletions Bootcamp2015-AmazingRace/App.xaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,14 @@
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:cal="using:Caliburn.Micro"
xmlns:converters="using:Bootcamp2015.AmazingRace.Converters"
xmlns:cm="using:Caliburn.Micro"
xmlns:local="using:Bootcamp2015.AmazingRace">

<cal:CaliburnApplication.Resources>
<ResourceDictionary>
<ResourceDictionary.MergedDictionaries>
<ResourceDictionary Source="ms-appx:///ApplicationStyles.xaml"/>
<ResourceDictionary Source="Resources/DataTemplates.xaml" />
</ResourceDictionary.MergedDictionaries>

<converters:BooleanToVisibilityConverter x:Key="bool2vis"/>
Expand Down
49 changes: 24 additions & 25 deletions Bootcamp2015-AmazingRace/App.xaml.cs
Original file line number Diff line number Diff line change
@@ -1,30 +1,21 @@
using Bootcamp2015.AmazingRace.Base.ServiceInterfaces;
using Bootcamp2015.AmazingRace.Base;
using Bootcamp2015.AmazingRace.Base.ServiceInterfaces;
using Bootcamp2015.AmazingRace.Base.Services;
using Bootcamp2015.AmazingRace.Helpers;
using Bootcamp2015.AmazingRace.ViewModels;
using Bootcamp2015.AmazingRace.Views;
using Caliburn.Micro;
using Microsoft.WindowsAzure.MobileServices;
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.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.Media.Animation;
using Windows.UI.Xaml.Navigation;

namespace Bootcamp2015.AmazingRace
{
public sealed partial class App
public sealed partial class App
{
private WinRTContainer container;
private SettingsService settings;
Expand All @@ -41,18 +32,20 @@ public App()

protected override void Configure()
{
ViewModelLocator.AddNamespaceMapping("Bootcamp2015.AmazingRace.Views", "Bootcamp2015.AmazingRace.ViewModels");
ViewLocator.AddNamespaceMapping("Bootcamp2015.AmazingRace.ViewModels", "Bootcamp2015.AmazingRace.Views");

container = new WinRTContainer();
container.RegisterWinRTServices();
container.RegisterSharingService();

container
.PerRequest<MainPageViewModel>()
;

container.RegisterSingleton(typeof(IEventAggregator), "ea", typeof(EventAggregator));
container.RegisterSingleton(typeof(IMessageDialogService), null, typeof(MessageDialogService));
container.RegisterInstance(typeof(ISettingsService), null, settings);
container.PerRequest<CluePageViewModel>();
container.PerRequest<JoinTeamPageViewModel>();
container.PerRequest<LeaderboardPageViewModel>();
container.PerRequest<MainPageViewModel>();
container.PerRequest<MapPageViewModel>();

PrepareViewFirst();
}

protected override object GetInstance(Type service, string key)
Expand All @@ -78,21 +71,26 @@ protected override void BuildUp(object instance)

#region Navigation Service

public INavigationService NavigationService
protected override void PrepareViewFirst(Frame rootFrame)
{
get { return (INavigationService)container.GetInstance(typeof(INavigationService), null); }
container.RegisterNavigationService(rootFrame);

container.RegisterSingleton(typeof(IEventAggregator), "ea", typeof(EventAggregator));
container.RegisterSingleton(typeof(IDataService), null, typeof(DataService));
container.RegisterSingleton(typeof(IMessageDialogService), null, typeof(MessageDialogService));
container.RegisterInstance(typeof(ISettingsService), null, settings);
}

protected override void PrepareViewFirst(Frame rootFrame)
public INavigationService NavigationService
{
container.RegisterNavigationService(rootFrame);
get { return (INavigationService)container.GetInstance(typeof(INavigationService), null); }
}

#endregion

#endregion

#region Application Lifecylcle
#region Application Lifecycle

protected override void OnLaunched(LaunchActivatedEventArgs args)
{
Expand Down Expand Up @@ -120,6 +118,7 @@ protected override void OnResuming(object sender, object e)
{
base.OnResuming(sender, e);
}

protected override void OnSuspending(object sender, SuspendingEventArgs e)
{
base.OnSuspending(sender, e);
Expand Down
1 change: 0 additions & 1 deletion Bootcamp2015-AmazingRace/ApplicationConstants.cs
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,5 @@ public static class ApplicationConstants
{
public static string MapToken = "kCuNbSR2vTk52kkDXaylmQ";
public static string MapAppId = "931ea402-227c-4723-b4a4-68e799a1f30d";

}
}
61 changes: 47 additions & 14 deletions Bootcamp2015-AmazingRace/Bootcamp2015.AmazingRace.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
<MinimumVisualStudioVersion>12</MinimumVisualStudioVersion>
<FileAlignment>512</FileAlignment>
<ProjectTypeGuids>{76F1466A-8B6D-4E39-A767-685A06062A39};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
<NuGetPackageImportStamp>ea74816e</NuGetPackageImportStamp>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<PlatformTarget>AnyCPU</PlatformTarget>
Expand Down Expand Up @@ -85,11 +86,27 @@
<Compile Include="ApplicationConstants.cs" />
<Compile Include="Converters\BooleanToVisibilityConverter.cs" />
<Compile Include="Helpers\ContinuationManager.cs" />
<Compile Include="ViewModels\CluePageViewModel.cs" />
<Compile Include="ViewModels\JoinTeamPageViewModel.cs" />
<Compile Include="ViewModels\LeaderboardPageViewModel.cs" />
<Compile Include="ViewModels\MainPageViewModel.cs" />
<Compile Include="ViewModels\MapPageViewModel.cs" />
<Compile Include="Views\CluePage.xaml.cs">
<DependentUpon>CluePage.xaml</DependentUpon>
</Compile>
<Compile Include="Views\JoinTeamPage.xaml.cs">
<DependentUpon>JoinTeamPage.xaml</DependentUpon>
</Compile>
<Compile Include="Views\LeaderboardPage.xaml.cs">
<DependentUpon>LeaderboardPage.xaml</DependentUpon>
</Compile>
<Compile Include="Properties\AssemblyInfo.cs" />
<Compile Include="Views\MainPage.xaml.cs">
<DependentUpon>MainPage.xaml</DependentUpon>
</Compile>
<Compile Include="Properties\AssemblyInfo.cs" />
<Compile Include="Views\MapPage.xaml.cs">
<DependentUpon>MapPage.xaml</DependentUpon>
</Compile>
</ItemGroup>
<ItemGroup>
<AppxManifest Include="Package.appxmanifest">
Expand All @@ -103,6 +120,7 @@
<Content Include="Assets\Square71x71Logo.scale-240.png" />
<Content Include="Assets\StoreLogo.scale-240.png" />
<Content Include="Assets\WideLogo.scale-240.png" />
<Content Include="StoreManifest.xml" />
<None Include="Package.StoreAssociation.xml" />
</ItemGroup>
<ItemGroup>
Expand All @@ -115,9 +133,29 @@
<Generator>MSBuild:Compile</Generator>
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Page>
<Page Include="Resources\DataTemplates.xaml">
<SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator>
</Page>
<Page Include="Views\CluePage.xaml">
<SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator>
</Page>
<Page Include="Views\JoinTeamPage.xaml">
<SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator>
</Page>
<Page Include="Views\LeaderboardPage.xaml">
<SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator>
</Page>
<Page Include="Views\MainPage.xaml">
<SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator>
</Page>
<Page Include="Views\MapPage.xaml">
<SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator>
</Page>
</ItemGroup>
<ItemGroup>
Expand All @@ -133,25 +171,20 @@
<HintPath>..\packages\Caliburn.Micro.2.0.2\lib\wpa81\Caliburn.Micro.Platform.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Microsoft.WindowsAzure.Mobile, Version=1.3.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<HintPath>..\packages\WindowsAzure.MobileServices.1.3.2\lib\wpa81\Microsoft.WindowsAzure.Mobile.dll</HintPath>
<Private>True</Private>
<Reference Include="Microsoft.WindowsAzure.Mobile">
<HintPath>..\packages\WindowsAzure.MobileServices.2.0.0-beta\lib\wpa81\Microsoft.WindowsAzure.Mobile.dll</HintPath>
</Reference>
<Reference Include="Microsoft.WindowsAzure.Mobile.Ext, Version=1.3.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<HintPath>..\packages\WindowsAzure.MobileServices.1.3.2\lib\wpa81\Microsoft.WindowsAzure.Mobile.Ext.dll</HintPath>
<Private>True</Private>
<Reference Include="Microsoft.WindowsAzure.Mobile.Ext">
<HintPath>..\packages\WindowsAzure.MobileServices.2.0.0-beta\lib\wpa81\Microsoft.WindowsAzure.Mobile.Ext.dll</HintPath>
</Reference>
<Reference Include="Newtonsoft.Json, Version=6.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
<HintPath>..\packages\Newtonsoft.Json.6.0.8\lib\portable-net40+sl5+wp80+win8+wpa81\Newtonsoft.Json.dll</HintPath>
<Private>True</Private>
<Reference Include="Newtonsoft.Json">
<HintPath>..\packages\Newtonsoft.Json.6.0.4\lib\portable-net45+wp80+win8+wpa81\Newtonsoft.Json.dll</HintPath>
</Reference>
<Reference Include="System.Net.Http.Extensions, Version=1.5.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
<Reference Include="System.Net.Http.Extensions">
<HintPath>..\packages\Microsoft.Net.Http.2.2.28\lib\wpa81\System.Net.Http.Extensions.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="System.Net.Http.Primitives, Version=4.2.28.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
<Reference Include="System.Net.Http.Primitives">
<HintPath>..\packages\Microsoft.Net.Http.2.2.28\lib\wpa81\System.Net.Http.Primitives.dll</HintPath>
<Private>True</Private>
</Reference>
</ItemGroup>
<ItemGroup>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ public BooleanToVisibilityConverter()
IsTrue = Visibility.Visible;
IsFalse = Visibility.Collapsed;
}

public object Convert(object value, Type targetType, object parameter, string language)
{
return (bool)value ? IsTrue : IsFalse;
Expand Down
13 changes: 12 additions & 1 deletion Bootcamp2015-AmazingRace/Package.appxmanifest
Original file line number Diff line number Diff line change
Expand Up @@ -16,14 +16,25 @@
</Resources>
<Applications>
<Application Id="App" Executable="$targetnametoken$.exe" EntryPoint="Bootcamp2015.AmazingRace.App">
<m3:VisualElements DisplayName="Bootcamp2015.AzmazingRace" Square150x150Logo="Assets\Logo.png" Square44x44Logo="Assets\SmallLogo.png" Description="Bootcamp2015-AmazingRace" ForegroundText="light" BackgroundColor="transparent">
<m3:VisualElements DisplayName="Amazing Smart Client Race" Square150x150Logo="Assets\Logo.png" Square44x44Logo="Assets\SmallLogo.png" Description="Amazing Smart Client Race" ForegroundText="light" BackgroundColor="transparent">
<m3:DefaultTile Wide310x150Logo="Assets\WideLogo.png" Square71x71Logo="Assets\Square71x71Logo.png">
</m3:DefaultTile>
<m3:SplashScreen Image="Assets\SplashScreen.png" />
<m3:InitialRotationPreference>
<m3:Rotation Preference="portrait" />
</m3:InitialRotationPreference>
</m3:VisualElements>
<Extensions>
<Extension Category="windows.backgroundTasks" EntryPoint="Bootcamp2015.AmazingRace.BackgroundTask.BTask">
<BackgroundTasks>
<Task Type="timer" />
</BackgroundTasks>
</Extension>
</Extensions>
</Application>
</Applications>
<Capabilities>
<Capability Name="internetClientServer" />
<DeviceCapability Name="location" />
</Capabilities>
</Package>
17 changes: 17 additions & 0 deletions Bootcamp2015-AmazingRace/Resources/DataTemplates.xaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
<ResourceDictionary
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:views="using:Bootcamp2015.AmazingRace.Views">

<DataTemplate x:Key="LeaderboardTeamTemplate">
<StackPanel Orientation="Horizontal">
<TextBlock FontSize="18">
<Run Text="{Binding Name}" />
<Run>(</Run>
<Run Text="{Binding Points}" />
<Run> points)</Run>
</TextBlock>
</StackPanel>
</DataTemplate>

</ResourceDictionary>
8 changes: 8 additions & 0 deletions Bootcamp2015-AmazingRace/StoreManifest.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
<StoreManifest xmlns="http://schemas.microsoft.com/appx/2010/StoreManifest">
<ProductFeatures>
<HardwareRequirements>
<Requirement Name="ID_REQ_FRONTCAMERA" />
<Requirement Name="ID_REQ_REARCAMERA" />
</HardwareRequirements>
</ProductFeatures>
</StoreManifest>
Loading