factorizing constants

This commit is contained in:
2017-02-05 20:46:42 +01:00
parent c3537ebdb0
commit 00c548e1de
11 changed files with 108 additions and 71 deletions

View File

@ -47,12 +47,15 @@
</PropertyGroup>
<ItemGroup>
<Compile Include="IAccountBalance.cs" />
<Compile Include="IActivity.cs" />
<Compile Include="IApplicationUser.cs" />
<Compile Include="IBaseTrackedEntity.cs" />
<Compile Include="IBlog.cs" />
<Compile Include="ICircle.cs" />
<Compile Include="ICircleMember.cs" />
<Compile Include="ICommandForm.cs" />
<Compile Include="IContact.cs" />
<Compile Include="ICoWorking.cs" />
<Compile Include="IGoogleCloudMobileDeclaration.cs" />
<Compile Include="ILocation.cs" />
<Compile Include="IPosition.cs" />

View File

@ -327,8 +327,8 @@ namespace ZicMoove.Droid
{
var auth = new YaOAuth2Authenticator(
clientId: Constants.APIKey,
clientSecret: "blouh",
scope: "profile",
clientSecret: Constants.APISecret,
scope: Constants.Scope,
authorizeUrl: new Uri(Constants.AuthorizeUrl),
redirectUrl: new Uri(Constants.RedirectUrl),
accessTokenUrl: new Uri(Constants.AccessTokenUrl));

View File

@ -64,7 +64,7 @@ namespace ZicMoove.Droid
}
#endif
var senderid = MainSettings.GoogleSenderId;
var senderid = Constants.GoogleSenderId;
var token = instanceID.GetToken ( senderid,
GoogleCloudMessaging.InstanceIdScope, null);

View File

@ -112,8 +112,7 @@ namespace ZicMoove.Droid
void SubscribeGCM ()
{
Context context = this.ApplicationContext;
string senders = MainSettings.GoogleSenderId;
// Resources.GetString(GoogleSenderId);
string senders = Constants.GoogleSenderId;
Intent intent = new Intent ("com.google.android.c2dm.intent.REGISTER");
intent.SetPackage ("com.google.android.gsf");
intent.PutExtra ("app", PendingIntent.GetBroadcast (context, 0, new Intent (), 0));

View File

@ -11,7 +11,6 @@ namespace ZicMoove
{
public static readonly string AuthorizeUrl = YavscHomeUrl + "/authorize";
public static readonly string RedirectUrl = YavscHomeUrl + "/oauth/success";
public static readonly string AccessTokenUrl = YavscHomeUrl + "/token";
public static readonly string YavscApiUrl = YavscHomeUrl + "/api";

View File

@ -15,6 +15,7 @@
{
// TODO estimatetemplate rating service product tag
public RemoteEntityRO<BookQuery, long> BookQueries { get; set; }
public RemoteEntityRO<Activity, string> Activities { get; set; }
public ChatUserCollection ChatUsers { get; set; }
public EstimateEntity Estimates { get; set; }
public RemoteEntity<Blog, long> Blogspot { get; set; }
@ -67,6 +68,7 @@
RemoteFiles.Load();
BlackList.Load();
ChatUsers.Load();
Activities.Load();
}
}
}

View File

@ -1,63 +0,0 @@
using ZicMoove.Model.Social;
using System;
using System.Collections.Generic;
using System.Collections.ObjectModel;
using System.Windows.Input;
namespace ZicMoove
{
[Obsolete("Use Helpers.DataManager")]
public static class Manager
{
static Manager ()
{
}
public static ICommand RefreshBookQueries;
// TODO WIP TEST rop this
private static Location[] _places = new Location[] {
new Location { Latitude = 48.8626458, Longitude = 2.2065559, Address = "2 bd Aristide Briand - Suresnes" },
new Location{ Latitude =48.8632757, Longitude =2.2023099, Address ="Théatre Jean Villard - Suresnes" },
new Location{ Latitude =48.8647120, Longitude =2.2054588,Address = "Place de la Paix - Suresnes" },
new Location{ Latitude =48.8640133, Longitude =2.2056573, Address ="Restaurant" },
new Location{ Latitude =48.8634839, Longitude =2.2064137,Address = "Square" },
new Location{ Latitude =48.8653649, Longitude =2.2014945,Address = "Stade de foot" },
};
// TODO WIP TEST rop this
private static ObservableCollection<LocalizedEvent> _your_events = new ObservableCollection<LocalizedEvent> {
new LocalizedEvent {
Title = "Yavsc Party",
Description = "Lancement en fanfare de la version 1.0 de ZicMoove, l'appli des fétards",
ProviderId = "paul",
ProviderName = "Yavsc Fondation",
EventWebPage = "http://lua.pschneider.fr/",
Location = _places[0]
},
new LocalizedEvent {
Title = "Evenement de test",
Description = "Blah bli lo qui est errare, ma no. Blou test allo 3!",
ProviderId = "provid3",
ProviderName = "Prov Entreprise 3",
EventWebPage = "http://lua.pschneider.fr/events/test3",
Location = _places[1]
},
new LocalizedEvent {
Title = "DjFx feat XamCoder, en Concert gratuit",
Description = "Hip Hop à Suresnes",
ProviderId = "brahim",
ProviderName = "Totem Production",
EventWebPage = "http://lua.pschneider.fr/events/totem",
Location = _places[2]
}
};
// TODO WIP TEST rop this
public static ObservableCollection<LocalizedEvent> Events {
get {
return _your_events;
}
}
}
}

View File

@ -0,0 +1,65 @@
using System;
using YavscLib;
namespace ZicMoove.Model.Workflow
{
public class Activity : IActivity
{
public string Code
{
get; set;
}
public DateTime DateCreated
{
get; set;
}
public DateTime DateModified
{
get; set;
}
public string ModeratorGroupName
{
get; set;
}
public string Name
{
get; set;
}
public string ParentCode
{
get; set;
}
public string Photo
{
get; set;
}
public int Rate
{
get; set;
}
public string SettingsClassName
{
get; set;
}
public string UserCreated
{
get; set;
}
public string UserModified
{
get; set;
}
public CommandForm[] Forms { get; set; }
}
}

View File

@ -0,0 +1,32 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using YavscLib;
namespace ZicMoove.Model.Workflow
{
public class CommandForm : ICommandForm
{
public string Action
{
get; set;
}
public string ActivityCode
{
get; set;
}
public long Id
{
get; set;
}
public string Title
{
get; set;
}
}
}

View File

@ -43,7 +43,6 @@ namespace ZicMoove.Settings
string.Empty;
private static readonly bool PushNotificationsDefault = false;
public static readonly string GoogleSenderId = "325408689282";
private const string MusicalKey = "musical_prefs";
private const string EnvironKey = "environ_prefs";

View File

@ -77,6 +77,8 @@
<Compile Include="Model\Social\Chat\ChatStatus.cs" />
<Compile Include="Model\Social\Chat\ChatMessage.cs" />
<Compile Include="Model\Social\LocationType.cs" />
<Compile Include="Model\Workflow\Activity.cs" />
<Compile Include="Model\Workflow\CommandForm.cs" />
<Compile Include="Pages\ClientPages\SearchPage.xaml.cs">
<DependentUpon>SearchPage.xaml</DependentUpon>
</Compile>
@ -180,7 +182,6 @@
<Compile Include="Model\Booking\BookQuery.cs" />
<Compile Include="Model\Market\BaseProduct.cs" />
<Compile Include="Pages\EstimatePages\BillingLine.cs" />
<Compile Include="Model\Manager.cs" />
<Compile Include="Model\Auth\MobileAppDeclaration.cs" />
<Compile Include="Model\Auth\passwrecovery.cs" />
<Compile Include="Model\Social\Calendar\OpenDay.cs" />