diff --git a/AboutPage.xaml b/AboutPage.xaml index 2f40828312b7443eb878a72515845f70ea8d98c2..2d7b7959ff9d675fa6f8c529645dfdefb5c5316c 100644 --- a/AboutPage.xaml +++ b/AboutPage.xaml @@ -72,19 +72,19 @@ VerticalScrollBarVisibility="Hidden"> <StackPanel MaxWidth="500" Width="310"> - <TextBlock Text="Ring v2.0.0" + <TextBlock Text="Ring v1.1.15.0_x64" TextWrapping="Wrap" TextAlignment="Justify" Margin="0,0,0,24" FontSize="12" FontWeight="Bold" HorizontalAlignment="Center"/> - <TextBlock Text="version:" + <TextBlock Text="version: 2016/12/14" TextWrapping="Wrap" TextAlignment="Justify" FontSize="12" HorizontalAlignment="Center"/> - <TextBlock Text="Release: Alpha - Gaston Miron" + <TextBlock Text="Release: Beta 2 - Gaston Miron" TextWrapping="Wrap" TextAlignment="Justify" FontSize="12" diff --git a/Assets/StoreLogo.png b/Assets/StoreLogo.png index 2d6dbb8dba91536e6611154e7ee10e028210b5a7..a909daaf53e0fb90878885abc8343e9c4630d7be 100644 Binary files a/Assets/StoreLogo.png and b/Assets/StoreLogo.png differ diff --git a/Assets/StoreLogo.scale-100.png b/Assets/StoreLogo.scale-100.png new file mode 100644 index 0000000000000000000000000000000000000000..a909daaf53e0fb90878885abc8343e9c4630d7be Binary files /dev/null and b/Assets/StoreLogo.scale-100.png differ diff --git a/Assets/StoreLogo.scale-125.png b/Assets/StoreLogo.scale-125.png new file mode 100644 index 0000000000000000000000000000000000000000..566d37f89f327624783c2a989ee615330fb90de4 Binary files /dev/null and b/Assets/StoreLogo.scale-125.png differ diff --git a/Assets/StoreLogo.scale-150.png b/Assets/StoreLogo.scale-150.png new file mode 100644 index 0000000000000000000000000000000000000000..b6be5e735335a028a552ba25e0798cf9e03aabd7 Binary files /dev/null and b/Assets/StoreLogo.scale-150.png differ diff --git a/Assets/StoreLogo.scale-200.png b/Assets/StoreLogo.scale-200.png new file mode 100644 index 0000000000000000000000000000000000000000..787014e21ebff904ded57e0526a7fc8a952e293f Binary files /dev/null and b/Assets/StoreLogo.scale-200.png differ diff --git a/Assets/StoreLogo.scale-400.png b/Assets/StoreLogo.scale-400.png new file mode 100644 index 0000000000000000000000000000000000000000..58de42cf2bdc8b8e9a929056f6ee882d1b850782 Binary files /dev/null and b/Assets/StoreLogo.scale-400.png differ diff --git a/Package.appxmanifest b/Package.appxmanifest index 9030203152959ba533dfcba3bb469b7dc69020d0..59fedefae3e0652c308cfc6eba03a1a64abddea8 100644 --- a/Package.appxmanifest +++ b/Package.appxmanifest @@ -1,10 +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" - xmlns:uap3="http://schemas.microsoft.com/appx/manifest/uap/windows10/3" - IgnorableNamespaces="uap uap3 mp"> - <Identity Name="Savoir-faireLinux.GNURing" Publisher="CN=8121A5F7-3CA1-4CAA-92B2-4F595B011941" Version="1.1.12.0" /> +<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" xmlns:uap3="http://schemas.microsoft.com/appx/manifest/uap/windows10/3" IgnorableNamespaces="uap uap3 mp"> + <Identity Name="Savoir-faireLinux.GNURing" Publisher="CN=8121A5F7-3CA1-4CAA-92B2-4F595B011941" Version="1.1.15.0" /> <mp:PhoneIdentity PhoneProductId="2385953f-9019-423d-aa82-d1bbacfa258b" PhonePublisherId="00000000-0000-0000-0000-000000000000" /> <Properties> <DisplayName>GNU Ring</DisplayName> @@ -31,7 +27,7 @@ <Capability Name="internetClientServer" /> <Capability Name="internetClient" /> <Capability Name="privateNetworkClientServer" /> - <uap3:Capability Name="backgroundMediaPlayback"/> + <uap3:Capability Name="backgroundMediaPlayback" /> <uap:Capability Name="userAccountInformation" /> <DeviceCapability Name="microphone" /> <DeviceCapability Name="webcam" /> diff --git a/_language-fr.appx b/_language-fr.appx index b22ae49ffe46e0d82e291d60d3cf991e64ddf283..031c4df266ce7edcf453f745c33e0964793301e5 100644 Binary files a/_language-fr.appx and b/_language-fr.appx differ diff --git a/_scale-100.appx b/_scale-100.appx index ad0467ac4f56800b0c9e3b336cdb26f7b059cba6..f1a2d01666bb727d4c4de62593830d5c56639c78 100644 Binary files a/_scale-100.appx and b/_scale-100.appx differ diff --git a/_scale-125.appx b/_scale-125.appx index 2ba90d6da72f0a113c2b1f56638461d9dbd25383..ffc069be9977f05eb313024bfeaa5a2a4671cc11 100644 Binary files a/_scale-125.appx and b/_scale-125.appx differ diff --git a/_scale-150.appx b/_scale-150.appx index e807d8e4d18afddb87a876581adf0a2fad519b66..db75963bfbffdbacb116598fcc2172b743cc5ea8 100644 Binary files a/_scale-150.appx and b/_scale-150.appx differ diff --git a/_scale-400.appx b/_scale-400.appx index 4f1bc39b1b145798352bb9800d54373ad3daebd5..e6aa98e376ead9f5e7e0811b7d7f2648731b2226 100644 Binary files a/_scale-400.appx and b/_scale-400.appx differ diff --git a/ring-client-uwp.sln b/ring-client-uwp.sln index c8640dfd771048145231c5ccbe35071ee94ad7db..b3b09cb0dead4de1e7e850c651ef3e05e0b9bc3c 100644 --- a/ring-client-uwp.sln +++ b/ring-client-uwp.sln @@ -5,13 +5,10 @@ VisualStudioVersion = 14.0.25420.1 MinimumVisualStudioVersion = 10.0.40219.1 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ring-client-uwp", "ring-client-uwp.vcxproj", "{90928671-346F-42E4-934F-7A7A512A2D11}" ProjectSection(ProjectDependencies) = postProject - {9A90BF5C-84B0-41F6-B83C-C20EADC1F46C} = {9A90BF5C-84B0-41F6-B83C-C20EADC1F46C} + {79F8DE42-595D-49D9-A66F-55244FD9DCC3} = {79F8DE42-595D-49D9-A66F-55244FD9DCC3} EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ring-daemon", "..\ring-daemon\MSVC\ring-daemon.vcxproj", "{79F8DE42-595D-49D9-A66F-55244FD9DCC3}" - ProjectSection(ProjectDependencies) = postProject - {6BD59A09-0768-40D3-A04B-10F95555689B} = {6BD59A09-0768-40D3-A04B-10F95555689B} - EndProjectSection EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "contrib daemon", "contrib daemon", "{96846C59-E0A1-4132-B779-065C2EAE3E51}" EndProject diff --git a/ring-client-uwp.vcxproj b/ring-client-uwp.vcxproj index cd2788c3c65b1af9111d84b8ab1191afc702beb2..e8e5bc9f42704c945fc899e2d1610117572e40c4 100644 --- a/ring-client-uwp.vcxproj +++ b/ring-client-uwp.vcxproj @@ -292,7 +292,24 @@ <Image Include="Assets\Square150x150Logo.scale-200.png" /> <Image Include="Assets\Square44x44Logo.scale-200.png" /> <Image Include="Assets\Square44x44Logo.targetsize-24_altform-unplated.png" /> - <Image Include="Assets\StoreLogo.png" /> + <Image Include="Assets\StoreLogo.png"> + <DeploymentContent>true</DeploymentContent> + </Image> + <Image Include="Assets\StoreLogo.scale-100.png"> + <DeploymentContent>true</DeploymentContent> + </Image> + <Image Include="Assets\StoreLogo.scale-125.png"> + <DeploymentContent>true</DeploymentContent> + </Image> + <Image Include="Assets\StoreLogo.scale-150.png"> + <DeploymentContent>true</DeploymentContent> + </Image> + <Image Include="Assets\StoreLogo.scale-200.png"> + <DeploymentContent>true</DeploymentContent> + </Image> + <Image Include="Assets\StoreLogo.scale-400.png"> + <DeploymentContent>true</DeploymentContent> + </Image> <Image Include="Assets\TESTS\blank.png" /> <Image Include="Assets\TESTS\contactAvatar.png" /> <Image Include="Assets\TESTS\logo-ring.scale-100.png" /> diff --git a/ring-client-uwp.vcxproj.filters b/ring-client-uwp.vcxproj.filters index 66fc73d41db9e5760343a10ebc4f0cd658d49d1a..0b9c806a58d1037e2e5eb37e097b56f334925193 100644 --- a/ring-client-uwp.vcxproj.filters +++ b/ring-client-uwp.vcxproj.filters @@ -214,6 +214,11 @@ <Image Include="Assets\qrCodeIconWhite.png"> <Filter>Assets</Filter> </Image> + <Image Include="Assets\StoreLogo.scale-125.png" /> + <Image Include="Assets\StoreLogo.scale-150.png" /> + <Image Include="Assets\StoreLogo.scale-100.png" /> + <Image Include="Assets\StoreLogo.scale-200.png" /> + <Image Include="Assets\StoreLogo.scale-400.png" /> </ItemGroup> <ItemGroup> <AppxManifest Include="Package.appxmanifest" />