Skip to content
This repository has been archived by the owner on Oct 8, 2019. It is now read-only.

Added dummy user initialization for UWP. #596

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Added dummy user initialization for UWP. #596

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
bbeb751
Added dummy user initialization for UWP
prkhandelwal Mar 29, 2018
ce64a30
Fixed Navigation issue without SplitViewShell.
prkhandelwal Mar 29, 2018
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
12 changes: 7 additions & 5 deletions src/MobileApps/MyDriving.sln
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@

Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 14
VisualStudioVersion = 14.0.24720.0
# Visual Studio 15
VisualStudioVersion = 15.0.27428.2015
MinimumVisualStudioVersion = 10.0.40219.1
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MyDriving.iOS", "MyDriving\MyDriving.iOS\MyDriving.iOS.csproj", "{DE56E591-0655-43D7-A1B9-B3280F78B667}"
EndProject
Expand Down Expand Up @@ -43,12 +43,12 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ObdLibiOS", "..\OBDLibrary\
EndProject
Global
GlobalSection(SharedMSBuildProjectFiles) = preSolution
MyDriving\MyDriving.DataObjects\MyDriving.DataObjects.projitems*{bd4403c0-6cd5-4030-b1a3-7ad98b9b80ca}*SharedItemsImports = 13
MyDriving\MyDriving.Shared\MyDriving.Shared.projitems*{219edca6-56bb-4ebd-ae46-c691f0aed767}*SharedItemsImports = 4
MyDriving\MyDriving.DataObjects\MyDriving.DataObjects.projitems*{649300ce-70ea-4606-983f-f4476fdd6c7e}*SharedItemsImports = 4
MyDriving\MyDriving.Shared\MyDriving.Shared.projitems*{efa3478d-88c0-41a8-ad5e-5878e42fe3e2}*SharedItemsImports = 13
MyDriving\MyDriving.Shared\MyDriving.Shared.projitems*{b09661c2-82a6-4d16-b4fd-7b23d0ffe1fe}*SharedItemsImports = 4
MyDriving\MyDriving.DataObjects\MyDriving.DataObjects.projitems*{bd4403c0-6cd5-4030-b1a3-7ad98b9b80ca}*SharedItemsImports = 13
MyDriving\MyDriving.Shared\MyDriving.Shared.projitems*{de56e591-0655-43d7-a1b9-b3280f78b667}*SharedItemsImports = 4
MyDriving\MyDriving.Shared\MyDriving.Shared.projitems*{efa3478d-88c0-41a8-ad5e-5878e42fe3e2}*SharedItemsImports = 13
EndGlobalSection
GlobalSection(SolutionConfigurationPlatforms) = preSolution
AppStore|Any CPU = AppStore|Any CPU
Expand Down Expand Up @@ -216,7 +216,6 @@ Global
{219EDCA6-56BB-4EBD-AE46-C691F0AED767}.Debug|iPhone.Deploy.0 = Debug|x86
{219EDCA6-56BB-4EBD-AE46-C691F0AED767}.Debug|iPhoneSimulator.ActiveCfg = Debug|x86
{219EDCA6-56BB-4EBD-AE46-C691F0AED767}.Debug|iPhoneSimulator.Build.0 = Debug|x86
{219EDCA6-56BB-4EBD-AE46-C691F0AED767}.Debug|iPhoneSimulator.Deploy.0 = Debug|x86
{219EDCA6-56BB-4EBD-AE46-C691F0AED767}.Debug|Mixed Platforms.ActiveCfg = Debug|x86
{219EDCA6-56BB-4EBD-AE46-C691F0AED767}.Debug|Mixed Platforms.Build.0 = Debug|x86
{219EDCA6-56BB-4EBD-AE46-C691F0AED767}.Debug|Mixed Platforms.Deploy.0 = Debug|x86
Expand Down Expand Up @@ -922,4 +921,7 @@ Global
{7A88DA9B-A374-4DE2-B46E-ED2C45434508} = {3CE83CE0-11E9-4CE8-83CE-0EE6C6700B7F}
{8B136D60-8E68-4871-BF25-52E27C61E8E9} = {3CE83CE0-11E9-4CE8-83CE-0EE6C6700B7F}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {B4FF5FB5-ECF1-4A3B-822E-7519BC22ED88}
EndGlobalSection
EndGlobal
107 changes: 58 additions & 49 deletions src/MobileApps/MyDriving/MyDriving.Android/Resources/Resource.designer.cs
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 0 additions & 1 deletion src/MobileApps/MyDriving/MyDriving.Android/Resources/layout/activity_login.axml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@
android:orientation="vertical">
<Space
android:layout_width="match_parent"

android:layout_height="0dp"
android:layout_weight="1" />
<ImageView
Expand Down
5 changes: 2 additions & 3 deletions src/MobileApps/MyDriving/MyDriving.UITests/MyDriving.UITests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,9 +84,8 @@
<None Include="packages.config" />
</ItemGroup>
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
<ItemGroup />
<ItemGroup>
<Folder Include="Pages\" />
<Folder Include="Helpers\" />
<Folder Include="Tests\" />
<Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
</ItemGroup>
</Project>
3 changes: 0 additions & 3 deletions src/MobileApps/MyDriving/MyDriving.UWP/MyDriving.UWP.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -400,9 +400,6 @@
<SDKReference Include="Microsoft.VCLibs, Version=14.0">
<Name>Visual C++ 2015 Runtime for Universal Windows Platform Apps</Name>
</SDKReference>
<SDKReference Include="SQLite.UWP.2015, Version=3.12.1">
<Name>SQLite for Universal Windows Platform</Name>
</SDKReference>
</ItemGroup>
<ItemGroup />
<Import Project="..\MyDriving.Shared\MyDriving.Shared.projitems" Label="Shared" />
Expand Down
17 changes: 13 additions & 4 deletions src/MobileApps/MyDriving/MyDriving.UWP/MyDriving.UWP.nuget.props
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,18 @@
<?xml version="1.0" encoding="utf-8" standalone="no"?>
<Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup Condition="'$(NuGetPackageRoot)' == ''">
<NuGetPackageRoot>$(UserProfile)\.nuget\packages\</NuGetPackageRoot>
<PropertyGroup Condition=" '$(ExcludeRestorePackageImports)' != 'true' ">
<RestoreSuccess Condition=" '$(RestoreSuccess)' == '' ">True</RestoreSuccess>
<RestoreTool Condition=" '$(RestoreTool)' == '' ">NuGet</RestoreTool>
<ProjectAssetsFile Condition=" '$(ProjectAssetsFile)' == '' ">C:\Users\Pratik\Source\Repos\MyDriving2\src\MobileApps\MyDriving\MyDriving.UWP\project.lock.json</ProjectAssetsFile>
<NuGetPackageRoot Condition=" '$(NuGetPackageRoot)' == '' ">$(UserProfile)\.nuget\packages\</NuGetPackageRoot>
<NuGetPackageFolders Condition=" '$(NuGetPackageFolders)' == '' ">C:\Users\Pratik\.nuget\packages\;C:\Program Files (x86)\Microsoft SDKs\NuGetPackagesFallback\</NuGetPackageFolders>
<NuGetProjectStyle Condition=" '$(NuGetProjectStyle)' == '' ">ProjectJson</NuGetProjectStyle>
<NuGetToolVersion Condition=" '$(NuGetToolVersion)' == '' ">4.6.1</NuGetToolVersion>
</PropertyGroup>
<ImportGroup>
<Import Project="$(NuGetPackageRoot)\SQLitePCL\3.8.7.2\build\netcore451\SQLitePCL.props" Condition="Exists('$(NuGetPackageRoot)\SQLitePCL\3.8.7.2\build\netcore451\SQLitePCL.props')" />
<PropertyGroup>
<MSBuildAllProjects>$(MSBuildAllProjects);$(MSBuildThisFileFullPath)</MSBuildAllProjects>
</PropertyGroup>
<ImportGroup Condition=" '$(ExcludeRestorePackageImports)' != 'true' ">
<Import Project="$(NuGetPackageRoot)sqlitepcl\3.8.7.2\build\netcore451\SQLitePCL.props" Condition="Exists('$(NuGetPackageRoot)sqlitepcl\3.8.7.2\build\netcore451\SQLitePCL.props')" />
</ImportGroup>
</Project>
10 changes: 5 additions & 5 deletions src/MobileApps/MyDriving/MyDriving.UWP/MyDriving.UWP.nuget.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
<?xml version="1.0" encoding="utf-8" standalone="no"?>
<Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup Condition="'$(NuGetPackageRoot)' == ''">
<NuGetPackageRoot>$(UserProfile)\.nuget\packages\</NuGetPackageRoot>
<PropertyGroup>
<MSBuildAllProjects>$(MSBuildAllProjects);$(MSBuildThisFileFullPath)</MSBuildAllProjects>
</PropertyGroup>
<ImportGroup>
<Import Project="$(NuGetPackageRoot)\Microsoft.Bcl.Build\1.0.21\build\Microsoft.Bcl.Build.targets" Condition="Exists('$(NuGetPackageRoot)\Microsoft.Bcl.Build\1.0.21\build\Microsoft.Bcl.Build.targets')" />
<Import Project="$(NuGetPackageRoot)\SQLitePCL\3.8.7.2\build\netcore451\SQLitePCL.targets" Condition="Exists('$(NuGetPackageRoot)\SQLitePCL\3.8.7.2\build\netcore451\SQLitePCL.targets')" />
<ImportGroup Condition=" '$(ExcludeRestorePackageImports)' != 'true' ">
<Import Project="$(NuGetPackageRoot)sqlitepcl\3.8.7.2\build\netcore451\SQLitePCL.targets" Condition="Exists('$(NuGetPackageRoot)sqlitepcl\3.8.7.2\build\netcore451\SQLitePCL.targets')" />
<Import Project="$(NuGetPackageRoot)microsoft.bcl.build\1.0.21\build\Microsoft.Bcl.Build.targets" Condition="Exists('$(NuGetPackageRoot)microsoft.bcl.build\1.0.21\build\Microsoft.Bcl.Build.targets')" />
</ImportGroup>
</Project>
9 changes: 9 additions & 0 deletions src/MobileApps/MyDriving/MyDriving.UWP/Views/LoginView.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,15 @@
</StackPanel>

</Button>

<Button x:Name="SkipButtonLogin" Style="{StaticResource LoginButtonStyle}" Click="SkipButtonLogin_Click"
Background="DarkSlateGray" >

<StackPanel Orientation="Horizontal" HorizontalAlignment="Left" Margin="20,0,0,0">
<TextBlock Text="Skip Authentication" Style="{StaticResource LoginButtonTextStyle}" />
</StackPanel>

</Button>
</StackPanel>

<Button x:Name="ContinueButton" HorizontalAlignment="Center" Margin="0,10,0,0" Content="Continue" Click="Continue_Click" Grid.Row="2" VerticalAlignment="Top" Visibility="Collapsed" />
Expand Down
7 changes: 7 additions & 0 deletions src/MobileApps/MyDriving/MyDriving.UWP/Views/LoginView.xaml.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,5 +81,12 @@ private void SetImageSource()
{
ProfileImage.Source = new BitmapImage(new Uri(Settings.Current.UserProfileUrl));
}

private void SkipButtonLogin_Click(object sender, RoutedEventArgs e)
{
viewModel.InitFakeUser();
viewModel.IsLoggedIn = true;
viewModel.PropertyChanged += ViewModel_PropertyChanged;
}
}
}
3 changes: 2 additions & 1 deletion src/MobileApps/MyDriving/MyDriving.UWP/project.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,14 +9,15 @@
"Newtonsoft.Json": "8.0.3",
"Plugin.Share": "4.0.0",
"Refractored.MvvmHelpers": "1.0.1",
"SQLite.uwp": "3.22.0",
"Xam.Plugin.Connectivity": "2.1.2",
"Xam.Plugin.DeviceInfo": "2.0.2",
"Xam.Plugin.Geolocator": "3.0.4",
"Xam.Plugin.Media": "2.4.0-beta3",
"Xam.Plugins.Settings": "2.1.0"
},
"frameworks": {
"uap10.0": {}
"uap10.0.10240": {}
},
"runtimes": {
"win10-arm": {},
Expand Down
Loading