Merge branch 'vnext' of https://github.com/pazof/yavsc into vnext
* 'vnext' of https://github.com/pazof/yavsc: (38 commits) fixe le premier démarrage Corrige le mot de passe perdu d'un utilisateur au nom contenant des espaces traductions fixe la reccupération du mot de passe refabrique: MEP index blogs Specialized the book query notification Updated the Licence validity cleaned up log warnings label event date cleans the code Adds support for SIREN exceptions to validation from the external provider layout trads refactoring refactoring Google maps: a map image implements an AccessDenied page A better layout ... # Conflicts: # Yavsc.Api/project.lock.json # Yavsc.Client/Yavsc.Client.csproj # Yavsc.Client/packages.config # sendmsg/Program.cs
This commit is contained in:
commit
e3a73e8146
190 changed files with 6664 additions and 763 deletions
|
|
@ -35,7 +35,7 @@
|
|||
<ErrorReport>prompt</ErrorReport>
|
||||
<WarningLevel>4</WarningLevel>
|
||||
<AndroidUseSharedRuntime>True</AndroidUseSharedRuntime>
|
||||
<AndroidLinkMode>None</AndroidLinkMode>
|
||||
<AndroidLinkMode>Full</AndroidLinkMode>
|
||||
<EmbedAssembliesIntoApk>False</EmbedAssembliesIntoApk>
|
||||
<BundleAssemblies>False</BundleAssemblies>
|
||||
<AndroidCreatePackagePerAbi>False</AndroidCreatePackagePerAbi>
|
||||
|
|
@ -76,6 +76,10 @@
|
|||
<HintPath>..\..\packages\Xamarin.Forms.2.3.0.107\lib\MonoAndroid10\FormsViewGroup.dll</HintPath>
|
||||
<Private>True</Private>
|
||||
</Reference>
|
||||
<Reference Include="MarkdownDeep, Version=1.5.2.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\..\packages\MarkdownDeep-av.NET.1.5.2\lib\MonoAndroid10\MarkdownDeep.dll</HintPath>
|
||||
<Private>True</Private>
|
||||
</Reference>
|
||||
<Reference Include="Media.Plugin, Version=1.0.1.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\..\packages\Xam.Plugin.Media.1.0.1\lib\MonoAndroid10\Media.Plugin.dll</HintPath>
|
||||
<Private>True</Private>
|
||||
|
|
@ -100,10 +104,12 @@
|
|||
</Reference>
|
||||
<Reference Include="System" />
|
||||
<Reference Include="System.Core" />
|
||||
<Reference Include="System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
|
||||
<SpecificVersion>False</SpecificVersion>
|
||||
<HintPath>..\..\..\..\..\..\..\Program Files (x86)\Reference Assemblies\Microsoft\Framework\.NETFramework\v4.5.1\System.Drawing.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="System.Json" />
|
||||
<Reference Include="System.Net.Http" />
|
||||
<Reference Include="System.Xml.Linq" />
|
||||
<Reference Include="System.Xml" />
|
||||
<Reference Include="Xamarin.Android.Support.Animated.Vector.Drawable, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\..\packages\Xamarin.Android.Support.Animated.Vector.Drawable.23.3.0\lib\MonoAndroid403\Xamarin.Android.Support.Animated.Vector.Drawable.dll</HintPath>
|
||||
<Private>True</Private>
|
||||
|
|
@ -264,7 +270,7 @@
|
|||
<AndroidResource Include="Resources\drawable\ic_corp_icon.png" />
|
||||
<AndroidResource Include="Resources\drawable\nfqrcode.png" />
|
||||
<AndroidResource Include="Resources\drawable\visuel_sexion.jpg" />
|
||||
<Content Include="Resources\values\values-21\styles.xml" />
|
||||
<AndroidResource Include="Resources\values\values-21\styles.xml" />
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<Folder Include="Resources\drawable-hdpi\" />
|
||||
|
|
|
|||
|
|
@ -3,4 +3,7 @@
|
|||
<PropertyGroup>
|
||||
<AndroidDesignerPreferredDevice>Nexus 4</AndroidDesignerPreferredDevice>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup>
|
||||
<ReferencePath>C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\MonoAndroid\v6.0\</ReferencePath>
|
||||
</PropertyGroup>
|
||||
</Project>
|
||||
|
|
@ -22,6 +22,7 @@ using BookAStar.Model.Auth.Account;
|
|||
using BookAStar.Droid.OAuth;
|
||||
using Yavsc.Helpers;
|
||||
using Yavsc.Models.Identity;
|
||||
using static Android.Content.Res.Resources;
|
||||
|
||||
namespace BookAStar.Droid
|
||||
{
|
||||
|
|
@ -37,8 +38,11 @@ namespace BookAStar.Droid
|
|||
global::Xamarin.Forms.Forms.Init(this, bundle);
|
||||
global::Xamarin.FormsMaps.Init(this, bundle);
|
||||
LoadApplication(new App(this));
|
||||
/* var x = typeof(Themes.DarkThemeResources);
|
||||
x = typeof(Themes.LightThemeResources);
|
||||
x = typeof(Themes.Android.UnderlineEffect); */
|
||||
}
|
||||
|
||||
|
||||
|
||||
public bool EnablePushNotifications(bool enable)
|
||||
{
|
||||
|
|
|
|||
|
|
@ -31,12 +31,12 @@
|
|||
<uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
|
||||
<permission android:name="fr.pschneider.bas.permission.MAPS_RECEIVE" android:protectionLevel="signature" />
|
||||
<uses-permission android:name="fr.pschneider.bas.permission.MAPS_RECEIVE" />
|
||||
<permission android:name="fr.pschneider.bas.permission.C2D_MESSAGE" android:protectionLevel="signature" />
|
||||
<permission android:name="fr.pschneider.bas.permission.C2D_MESSAGE" android:protectionLevel="signature" />
|
||||
<uses-permission android:name="fr.pschneider.bas.permission.C2D_MESSAGE" />
|
||||
<uses-permission android:name="com.google.android.c2dm.intent.RECEIVE" />
|
||||
<uses-permission android:name="com.google.android.c2dm.intent.REGISTRATION" />
|
||||
<uses-permission android:name="com.google.android.c2dm.intent.RETRY" />
|
||||
<uses-permission android:name="android.permission.ACCOUNT_MANAGER" />
|
||||
<uses-permission android:name="android.permission.AUTHENTICATE_ACCOUNTS" />
|
||||
<uses-permission android:name="android.permission.GET_ACCOUNTS" />
|
||||
<uses-permission android:name="android.permission.GET_ACCOUNTS" />
|
||||
</manifest>
|
||||
|
|
@ -48,10 +48,13 @@ namespace BookAStar.Droid
|
|||
var instanceID = InstanceID.GetInstance(this);
|
||||
|
||||
#if DEBUG
|
||||
// When debugging, and application data/cache is preserved,
|
||||
// a previous instance comes from another application installation
|
||||
// and the old registration against GCM fails,
|
||||
// until one delete it.
|
||||
try
|
||||
{
|
||||
instanceID.DeleteInstanceID();
|
||||
|
||||
}
|
||||
catch(Exception ex)
|
||||
{
|
||||
|
|
@ -97,7 +100,11 @@ namespace BookAStar.Droid
|
|||
{
|
||||
var pubSub = GcmPubSub.GetInstance(this);
|
||||
pubSub.Subscribe(token, "/topics/global", null);
|
||||
pubSub.Subscribe (token, "/topics/jobs", null);
|
||||
|
||||
// TODO if a Activity is specified,
|
||||
// and general annonces in this activity are accepted:
|
||||
//
|
||||
// pubSub.Subscribe(token, "/topics/jobs/"+ActivityCode, null);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -1,5 +1,6 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<packages>
|
||||
<package id="MarkdownDeep-av.NET" version="1.5.2" targetFramework="monoandroid60" />
|
||||
<package id="Newtonsoft.Json" version="9.0.1" targetFramework="monoandroid60" />
|
||||
<package id="Xam.Plugin.Connectivity" version="1.0.1" targetFramework="monoandroid60" />
|
||||
<package id="Xam.Plugin.DeviceInfo" version="1.0.0.2" targetFramework="monoandroid60" />
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue