Skip to content

Commit

Permalink
Merge branch 'release/v1.6.2'
Browse files Browse the repository at this point in the history
  • Loading branch information
thedon committed Mar 13, 2018
2 parents 210009e + c8e1326 commit 3ccace3
Show file tree
Hide file tree
Showing 33 changed files with 1,182 additions and 250 deletions.
50 changes: 50 additions & 0 deletions Nester.Deploy.sln
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Nester.Deploy.UWP", "Nester
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Nester.Deploy", "Nester.Deploy\Nester.Deploy\Nester.Deploy.csproj", "{E6E24809-F81B-458F-AA59-4E982AA67C6B}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Nester.Library", "..\nester.library\Nester.Library\Nester.Library.csproj", "{4FA15B95-63BC-46C1-92D5-40075E2A9B37}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Ad-Hoc|Any CPU = Ad-Hoc|Any CPU
Expand Down Expand Up @@ -251,6 +253,54 @@ Global
{E6E24809-F81B-458F-AA59-4E982AA67C6B}.Release|x64.Build.0 = Release|Any CPU
{E6E24809-F81B-458F-AA59-4E982AA67C6B}.Release|x86.ActiveCfg = Release|Any CPU
{E6E24809-F81B-458F-AA59-4E982AA67C6B}.Release|x86.Build.0 = Release|Any CPU
{4FA15B95-63BC-46C1-92D5-40075E2A9B37}.Ad-Hoc|Any CPU.ActiveCfg = Debug|Any CPU
{4FA15B95-63BC-46C1-92D5-40075E2A9B37}.Ad-Hoc|Any CPU.Build.0 = Debug|Any CPU
{4FA15B95-63BC-46C1-92D5-40075E2A9B37}.Ad-Hoc|ARM.ActiveCfg = Debug|Any CPU
{4FA15B95-63BC-46C1-92D5-40075E2A9B37}.Ad-Hoc|ARM.Build.0 = Debug|Any CPU
{4FA15B95-63BC-46C1-92D5-40075E2A9B37}.Ad-Hoc|iPhone.ActiveCfg = Debug|Any CPU
{4FA15B95-63BC-46C1-92D5-40075E2A9B37}.Ad-Hoc|iPhone.Build.0 = Debug|Any CPU
{4FA15B95-63BC-46C1-92D5-40075E2A9B37}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Debug|Any CPU
{4FA15B95-63BC-46C1-92D5-40075E2A9B37}.Ad-Hoc|iPhoneSimulator.Build.0 = Debug|Any CPU
{4FA15B95-63BC-46C1-92D5-40075E2A9B37}.Ad-Hoc|x64.ActiveCfg = Release|x64
{4FA15B95-63BC-46C1-92D5-40075E2A9B37}.Ad-Hoc|x64.Build.0 = Release|x64
{4FA15B95-63BC-46C1-92D5-40075E2A9B37}.Ad-Hoc|x86.ActiveCfg = Debug|Any CPU
{4FA15B95-63BC-46C1-92D5-40075E2A9B37}.Ad-Hoc|x86.Build.0 = Debug|Any CPU
{4FA15B95-63BC-46C1-92D5-40075E2A9B37}.AppStore|Any CPU.ActiveCfg = Debug|Any CPU
{4FA15B95-63BC-46C1-92D5-40075E2A9B37}.AppStore|Any CPU.Build.0 = Debug|Any CPU
{4FA15B95-63BC-46C1-92D5-40075E2A9B37}.AppStore|ARM.ActiveCfg = Debug|Any CPU
{4FA15B95-63BC-46C1-92D5-40075E2A9B37}.AppStore|ARM.Build.0 = Debug|Any CPU
{4FA15B95-63BC-46C1-92D5-40075E2A9B37}.AppStore|iPhone.ActiveCfg = Debug|Any CPU
{4FA15B95-63BC-46C1-92D5-40075E2A9B37}.AppStore|iPhone.Build.0 = Debug|Any CPU
{4FA15B95-63BC-46C1-92D5-40075E2A9B37}.AppStore|iPhoneSimulator.ActiveCfg = Debug|Any CPU
{4FA15B95-63BC-46C1-92D5-40075E2A9B37}.AppStore|iPhoneSimulator.Build.0 = Debug|Any CPU
{4FA15B95-63BC-46C1-92D5-40075E2A9B37}.AppStore|x64.ActiveCfg = Release|x64
{4FA15B95-63BC-46C1-92D5-40075E2A9B37}.AppStore|x64.Build.0 = Release|x64
{4FA15B95-63BC-46C1-92D5-40075E2A9B37}.AppStore|x86.ActiveCfg = Debug|Any CPU
{4FA15B95-63BC-46C1-92D5-40075E2A9B37}.AppStore|x86.Build.0 = Debug|Any CPU
{4FA15B95-63BC-46C1-92D5-40075E2A9B37}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{4FA15B95-63BC-46C1-92D5-40075E2A9B37}.Debug|Any CPU.Build.0 = Debug|Any CPU
{4FA15B95-63BC-46C1-92D5-40075E2A9B37}.Debug|ARM.ActiveCfg = Debug|Any CPU
{4FA15B95-63BC-46C1-92D5-40075E2A9B37}.Debug|ARM.Build.0 = Debug|Any CPU
{4FA15B95-63BC-46C1-92D5-40075E2A9B37}.Debug|iPhone.ActiveCfg = Debug|Any CPU
{4FA15B95-63BC-46C1-92D5-40075E2A9B37}.Debug|iPhone.Build.0 = Debug|Any CPU
{4FA15B95-63BC-46C1-92D5-40075E2A9B37}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
{4FA15B95-63BC-46C1-92D5-40075E2A9B37}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
{4FA15B95-63BC-46C1-92D5-40075E2A9B37}.Debug|x64.ActiveCfg = Debug|x64
{4FA15B95-63BC-46C1-92D5-40075E2A9B37}.Debug|x64.Build.0 = Debug|x64
{4FA15B95-63BC-46C1-92D5-40075E2A9B37}.Debug|x86.ActiveCfg = Debug|Any CPU
{4FA15B95-63BC-46C1-92D5-40075E2A9B37}.Debug|x86.Build.0 = Debug|Any CPU
{4FA15B95-63BC-46C1-92D5-40075E2A9B37}.Release|Any CPU.ActiveCfg = Release|Any CPU
{4FA15B95-63BC-46C1-92D5-40075E2A9B37}.Release|Any CPU.Build.0 = Release|Any CPU
{4FA15B95-63BC-46C1-92D5-40075E2A9B37}.Release|ARM.ActiveCfg = Release|Any CPU
{4FA15B95-63BC-46C1-92D5-40075E2A9B37}.Release|ARM.Build.0 = Release|Any CPU
{4FA15B95-63BC-46C1-92D5-40075E2A9B37}.Release|iPhone.ActiveCfg = Release|Any CPU
{4FA15B95-63BC-46C1-92D5-40075E2A9B37}.Release|iPhone.Build.0 = Release|Any CPU
{4FA15B95-63BC-46C1-92D5-40075E2A9B37}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
{4FA15B95-63BC-46C1-92D5-40075E2A9B37}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
{4FA15B95-63BC-46C1-92D5-40075E2A9B37}.Release|x64.ActiveCfg = Release|x64
{4FA15B95-63BC-46C1-92D5-40075E2A9B37}.Release|x64.Build.0 = Release|x64
{4FA15B95-63BC-46C1-92D5-40075E2A9B37}.Release|x86.ActiveCfg = Release|Any CPU
{4FA15B95-63BC-46C1-92D5-40075E2A9B37}.Release|x86.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -48,9 +48,6 @@
<PackageReference Include="Flurl.Http">
<Version>2.1.0</Version>
</PackageReference>
<PackageReference Include="Inkton.NesterLibrary">
<Version>1.2.0</Version>
</PackageReference>
<PackageReference Include="Newtonsoft.Json">
<Version>10.0.3</Version>
</PackageReference>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android" android:versionCode="1" android:versionName="1.0" package="com.companyname.Nester.Deploy">
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android" android:versionCode="1.6.2" android:versionName="1.6.2" package="com.companyname.Nester.Deploy" android:installLocation="auto">
<uses-sdk android:minSdkVersion="15" />
<application android:label="Nester.Deploy.Android"></application>
</manifest>
</manifest>
2 changes: 1 addition & 1 deletion Nester.Deploy/Nester.Deploy.UWP/MainPage.xaml.cs
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ public sealed partial class MainPage
public MainPage()
{
this.InitializeComponent();

Syncfusion.ListView.XForms.UWP.SfListViewRenderer.Init();
LoadApplication(new Nester.Deploy.App());
}
}
Expand Down
7 changes: 3 additions & 4 deletions Nester.Deploy/Nester.Deploy.UWP/Nester.Deploy.UWP.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
<PackageCertificateKeyFile>Nester.Deploy.UWP_StoreKey.pfx</PackageCertificateKeyFile>
<AppxAutoIncrementPackageRevision>False</AppxAutoIncrementPackageRevision>
<AppxBundle>Always</AppxBundle>
<AppxBundlePlatforms>x64|arm</AppxBundlePlatforms>
<AppxBundlePlatforms>x64</AppxBundlePlatforms>
<PackageCertificateThumbprint>43AF1CD213998B143E3BAEB89FB128BE8AD03B98</PackageCertificateThumbprint>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|ARM'">
Expand Down Expand Up @@ -117,7 +117,9 @@
<Content Include="appjoin32.png" />
<Content Include="appreload32.png" />
<Content Include="appremove32.png" />
<Content Include="apprestore24.png" />
<Content Include="appsettings24.png" />
<Content Include="appupgrade24.png" />
<Content Include="appview24.png" />
<Content Include="Assets\BadgeLogo.scale-100.png" />
<Content Include="Assets\BadgeLogo.scale-125.png" />
Expand Down Expand Up @@ -219,9 +221,6 @@
<PackageReference Include="Flurl.Http">
<Version>2.1.1</Version>
</PackageReference>
<PackageReference Include="Inkton.NesterLibrary">
<Version>1.2.0</Version>
</PackageReference>
<PackageReference Include="Newtonsoft.Json">
<Version>10.0.3</Version>
</PackageReference>
Expand Down
2 changes: 1 addition & 1 deletion Nester.Deploy/Nester.Deploy.UWP/Package.appxmanifest
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<Package xmlns="http://schemas.microsoft.com/appx/manifest/foundation/windows10" xmlns:mp="http://schemas.microsoft.com/appx/2014/phone/manifest" xmlns:uap="http://schemas.microsoft.com/appx/manifest/uap/windows10" IgnorableNamespaces="uap mp">
<Identity Name="Inkton.NesterDeploy" Publisher="CN=22E5DD32-E63A-4D77-8B50-F6601C3590EF" Version="1.6.0.0" />
<Identity Name="Inkton.NesterDeploy" Publisher="CN=22E5DD32-E63A-4D77-8B50-F6601C3590EF" Version="1.6.1.0" />
<mp:PhoneIdentity PhoneProductId="63adfa7b-171e-4a03-9c38-a49e42784732" PhonePublisherId="00000000-0000-0000-0000-000000000000" />
<Properties>
<DisplayName>Nester Deploy</DisplayName>
Expand Down
4 changes: 2 additions & 2 deletions Nester.Deploy/Nester.Deploy.UWP/Properties/AssemblyInfo.cs
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,6 @@
// You can specify all the values or you can default the Build and Revision Numbers
// by using the '*' as shown below:
// [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("1.6.0.0")]
[assembly: AssemblyFileVersion("1.6.0.0")]
[assembly: AssemblyVersion("1.6.2.0")]
[assembly: AssemblyFileVersion("1.6.2.0")]
[assembly: ComVisible(false)]
2 changes: 1 addition & 1 deletion Nester.Deploy/Nester.Deploy.UWP/_pkginfo.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
C:\Users\rajitha\Documents\inkton\github\nester.deploy\Nester.Deploy\Nester.Deploy.UWP\bin\ARM\Release\Upload\Nester.Deploy.UWP_1.6.0.0\Nester.Deploy.UWP_1.6.0.0_x64_arm.appxbundle
C:\Users\rajitha\Documents\inkton\github\nester.deploy\Nester.Deploy\Nester.Deploy.UWP\bin\x64\Release\Upload\Nester.Deploy.UWP_1.6.1.0\Nester.Deploy.UWP_1.6.1.0_x64.appxbundle
Binary file added Nester.Deploy/Nester.Deploy.UWP/apprestore24.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Nester.Deploy/Nester.Deploy.UWP/appupgrade24.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
6 changes: 3 additions & 3 deletions Nester.Deploy/Nester.Deploy.iOS/Nester.Deploy.iOS.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -87,6 +87,9 @@
<CodesignKey>iPhone Distribution</CodesignKey>
<CodesignEntitlements>Entitlements.plist</CodesignEntitlements>
</PropertyGroup>
<PropertyGroup Condition=" '$(RunConfiguration)' == 'Default' ">
<AppExtensionDebugBundleId />
</PropertyGroup>
<ItemGroup>
<Compile Include="Main.cs" />
<Compile Include="AppDelegate.cs" />
Expand Down Expand Up @@ -122,9 +125,6 @@
<PackageReference Include="Flurl.Http">
<Version>2.1.0</Version>
</PackageReference>
<PackageReference Include="Inkton.NesterLibrary">
<Version>1.2.0</Version>
</PackageReference>
<PackageReference Include="Newtonsoft.Json">
<Version>10.0.3</Version>
</PackageReference>
Expand Down
4 changes: 2 additions & 2 deletions Nester.Deploy/Nester.Deploy.iOS/Properties/AssemblyInfo.cs
Original file line number Diff line number Diff line change
Expand Up @@ -32,5 +32,5 @@
// You can specify all the values or you can default the Build and Revision Numbers
// by using the '*' as shown below:
// [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("1.0.0.0")]
[assembly: AssemblyFileVersion("1.0.0.0")]
[assembly: AssemblyVersion("1.6.1.0")]
[assembly: AssemblyFileVersion("1.6.1.0")]
15 changes: 13 additions & 2 deletions Nester.Deploy/Nester.Deploy/Nester.Deploy.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,11 @@

<PropertyGroup>
<TargetFramework>netstandard2.0</TargetFramework>
<Version>1.6.0</Version>
<Version>1.6.2</Version>
<Authors>nest.yt</Authors>
<Company>Inkton</Company>
<Copyright>Copyright © 2018</Copyright>
<RepositoryUrl>https://nest.yt/</RepositoryUrl>
</PropertyGroup>

<ItemGroup>
Expand All @@ -19,7 +21,6 @@

<ItemGroup>
<PackageReference Include="Flurl.Http" Version="2.1.0" />
<PackageReference Include="Inkton.NesterLibrary" Version="1.2.0" />
<PackageReference Include="Newtonsoft.Json" Version="10.0.3" />
<PackageReference Include="Syncfusion.Xamarin.SfBusyIndicator" Version="15.4.0.20" />
<PackageReference Include="Syncfusion.Xamarin.SfChart" Version="15.4.0.20" />
Expand All @@ -28,6 +29,10 @@
<PackageReference Include="Xamarin.Forms" Version="2.4.0.74863" />
</ItemGroup>

<ItemGroup>
<ProjectReference Include="..\..\..\nester.library\Nester.Library\Nester.Library.csproj" />
</ItemGroup>

<ItemGroup>
<Compile Update="Views\AboutPage.xaml.cs">
<SubType>Code</SubType>
Expand All @@ -46,4 +51,10 @@
</Compile>
</ItemGroup>

<ItemGroup>
<EmbeddedResource Update="Views\Homesteads\AppBackupView.xaml">
<Generator>MSBuild:UpdateDesignTimeXaml</Generator>
</EmbeddedResource>
</ItemGroup>

</Project>
1 change: 0 additions & 1 deletion Nester.Deploy/Nester.Deploy/Views/EntryView.xaml.cs
Original file line number Diff line number Diff line change
Expand Up @@ -151,7 +151,6 @@ async private void OnLoginButtonClickedAsync(object sender, EventArgs e)
{
await MainSideView.Detail.Navigation.PopAsync();
NesterControl.Target = _baseModels.AllApps.AppModels.First();
NesterControl.Target.Reload();
NesterControl.ResetView(NesterControl.Target);
}
}
Expand Down
162 changes: 162 additions & 0 deletions Nester.Deploy/Nester.Deploy/Views/Homesteads/AppBackupView.xaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,162 @@
<?xml version="1.0" encoding="utf-8" ?>
<views:View xmlns="http://xamarin.com/schemas/2014/forms"
xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
xmlns:views="clr-namespace:Inkton.Nester.Views"
xmlns:validators="clr-namespace:Inkton.Nester.Helpers.Validators"
xmlns:utils="clr-namespace:Inkton.Nester.Helpers"
xmlns:sync="clr-namespace:Syncfusion.ListView.XForms;assembly=Syncfusion.SfListView.XForms"
Title="Backups"
x:Class="Inkton.Nester.Views.AppBackupView">

<ContentPage.Resources>
<ResourceDictionary>
<DataTemplate x:Name="ItemTemplate" x:Key="ItemTemplate">
<ViewCell>
<ViewCell.View>
<Grid RowSpacing="0" ColumnSpacing="0">

<Grid.RowDefinitions>
<RowDefinition Height="*" />
<RowDefinition Height="1" />
</Grid.RowDefinitions>

<Grid>
<Grid.ColumnDefinitions>
<ColumnDefinition Width="100" />
<ColumnDefinition Width="*" />
</Grid.ColumnDefinitions>

<Label Text="{Binding Tag}"
Style="{StaticResource nesterInfoLabelMinor}"
Margin="0,5,0,5"
>
</Label>

<Grid Grid.Column="1"
RowSpacing="1"
Padding="15,0,0,0"
VerticalOptions="Center">

<Grid.RowDefinitions>
<RowDefinition Height="*" />
<RowDefinition Height="*" />
</Grid.RowDefinitions>

<Grid.ColumnDefinitions>
<ColumnDefinition Width="22*" />
<ColumnDefinition Width="30*" />
<ColumnDefinition Width="30*" />
<ColumnDefinition Width="18*" />
</Grid.ColumnDefinitions>

<Label Grid.Row="0" Grid.Column="0"
Text="Date Created"
Style="{StaticResource nesterListInfoLabelMinor}"
>
</Label>

<Label Grid.Row="1" Grid.Column="0"
Text="{Binding TimeCreated}"
Style="{StaticResource nesterListInfoLabelMinor}"
>
</Label>

<Label Grid.Row="0" Grid.Column="1"
Text="Status"
Style="{StaticResource nesterListInfoLabelMinor}"
>
</Label>

<Label Grid.Row="1" Grid.Column="1"
Text="{Binding Status}"
Style="{StaticResource nesterListInfoLabelMinor}"
>
</Label>

<Label Grid.Row="0" Grid.Column="2"
Text="Description"
Style="{StaticResource nesterListInfoLabelMinor}"
>
</Label>

<Label Grid.Row="1" Grid.Column="2"
Text="{Binding Description}"
Style="{StaticResource nesterListInfoLabelMinor}"
>
</Label>

<Label Grid.Row="0" Grid.Column="3"
Text="Size (Bytes)"
Style="{StaticResource nesterListInfoLabelMinor}"
>
</Label>

<Label Grid.Row="1" Grid.Column="3"
Text="{Binding DeploymentSize}"
Style="{StaticResource nesterListInfoBodyMinor}"
>
</Label>

</Grid>

</Grid>

<Frame Grid.Row="1" OutlineColor="#E4E4E4" HasShadow="True" HeightRequest="1"/>
</Grid>
</ViewCell.View>
</ViewCell>

</DataTemplate>
</ResourceDictionary>
</ContentPage.Resources>

<ContentPage.Content>

<Grid>

<Grid.RowDefinitions>
<RowDefinition Height="5*"/>
<RowDefinition Height="80*"/>
<RowDefinition Height="Auto"/>
<RowDefinition Height="5*"/>
</Grid.RowDefinitions>

<Grid.ColumnDefinitions>
<ColumnDefinition Width="10*"/>
<ColumnDefinition Width="80*"/>
<ColumnDefinition Width="10*"/>
</Grid.ColumnDefinitions>

<StackLayout Grid.Row="1" Grid.Column="1">

<Label Style="{StaticResource nesterFieldLabel}"
Text="Backups"></Label>

<sync:SfListView x:Name="AppBackups"
ItemsSource="{Binding AppBackups}"
SelectionBackgroundColor="{StaticResource selectionColor}"
ItemTemplate="{StaticResource ItemTemplate}">
</sync:SfListView>

<ActivityIndicator x:Name="ServiceActive" ></ActivityIndicator>
</StackLayout>

<StackLayout Grid.Row="2" Grid.Column="1" Orientation="Horizontal" Padding="10,10" VerticalOptions="LayoutOptions.Center" HorizontalOptions="FillAndExpand">
<Button x:Name="ButtonCancel"
Style="{StaticResource buttonPageFlow}"
Text="Cancel" HorizontalOptions="End" />
<Button x:Name="ButtonRestore"
Style="{StaticResource buttonPageFlow}"
Text="Restore" HorizontalOptions="End" />
<Button x:Name="ButtonBackup"
Style="{StaticResource buttonPageFlow}"
Text="Backup" HorizontalOptions="End" />
<Button x:Name="ButtonRefresh"
Style="{StaticResource buttonPageFlow}"
Text="Refresh" HorizontalOptions="End" />

</StackLayout>
</Grid>

</ContentPage.Content>
</views:View>
Loading

0 comments on commit 3ccace3

Please sign in to comment.