fixes last commit

This commit is contained in:
Paul Schneider 2017-01-26 13:00:31 +01:00
commit 05e5970bef
197 changed files with 2203 additions and 2204 deletions

View file

@ -11,7 +11,7 @@ using Android.Views;
using Android.Widget;
using Android.Accounts;
namespace BookAStar.Droid.Accounts
namespace ZicMoove.Droid.Accounts
{
class YavscAccountAuthenticator : AbstractAccountAuthenticator
{

View file

@ -3,7 +3,7 @@
using Plugin.Settings;
using Plugin.Settings.Abstractions;
namespace BookAStar.Droid.Helpers
namespace ZicMoove.Droid.Helpers
{
/// <summary>
/// This is the Settings static class that can be used in your Core solution or in any

View file

@ -25,7 +25,7 @@ using System.Threading.Tasks;
using Newtonsoft.Json;
using System;
using System.Diagnostics;
using BookAStar;
using ZicMoove;
namespace Yavsc.Helpers
{

View file

@ -5,9 +5,9 @@ using System.Collections.Specialized;
using System.Net;
using System.Runtime.Serialization.Json;
using System.Text;
using BookAStar.Model.Auth.Account;
using ZicMoove.Model.Auth.Account;
namespace BookAStar.Droid
namespace ZicMoove.Droid
{
public static class YavscHelpers

View file

@ -10,7 +10,7 @@ using Android.Runtime;
using Android.Views;
using Android.Widget;
namespace BookAStar.Droid.Interfaces
namespace ZicMoove.Droid.Interfaces
{
interface IGCMessageHandler
{

View file

@ -35,12 +35,12 @@ using XLabs.Serialization.JsonNET;
using Yavsc.Helpers;
using Yavsc.Models.Identity;
namespace BookAStar.Droid
namespace ZicMoove.Droid
{
using Android.Runtime;
using Android.Support.V4.App;
using Android.Support.V4.Content;
using BookAStar.Interfaces;
using ZicMoove.Interfaces;
using Data;
using Droid.OAuth;
using Helpers;
@ -48,7 +48,7 @@ namespace BookAStar.Droid
using Model.Auth.Account;
using static Android.Manifest;
[Activity(Name = "fr.pschneider.bas.MainActivity", Label = "BookAStar", Theme = "@style/MainTheme", Icon = "@drawable/icon", MainLauncher = true, ConfigurationChanges = ConfigChanges.ScreenSize | ConfigChanges.Orientation)]
[Activity(Name = "fr.pschneider.bas.MainActivity", Label = "ZicMoove", Theme = "@style/MainTheme", Icon = "@drawable/icon", MainLauncher = true, ConfigurationChanges = ConfigChanges.ScreenSize | ConfigChanges.Orientation)]
public class MainActivity :
// global::Xamarin.Forms.Platform.Android.FormsAppCompatActivity,
@ -103,7 +103,7 @@ namespace BookAStar.Droid
}
};
var fapp = new BookAStar.App(this);
var fapp = new ZicMoove.App(this);
LoadApplication(fapp);
@ -307,7 +307,7 @@ namespace BookAStar.Droid
using (var reader = new StreamReader(exception.Response.GetResponseStream()))
{
responseText = reader.ReadToEnd();
Log.Debug("BookAStar", responseText);
Log.Debug("ZicMoove", responseText);
}
}
}

View file

@ -12,7 +12,7 @@ using Android.Widget;
using Android.Webkit;
using Java.Interop;
namespace BookAStar.Droid.Markdown
namespace ZicMoove.Droid.Markdown
{
public class JsBridgeMarkdown : Java.Lang.Object
{

View file

@ -15,7 +15,7 @@ using XLabs.Platform.Mvvm;
using XLabs.Forms;
using static Android.Views.View;
namespace BookAStar.Droid.Markdown
namespace ZicMoove.Droid.Markdown
{
class MDContextMenu : AppCompatDialog
{

View file

@ -11,7 +11,7 @@ using Android.Views;
using Android.Widget;
using Android.Webkit;
namespace BookAStar.Droid.Markdown
namespace ZicMoove.Droid.Markdown
{
class MDWebView : WebView
{

View file

@ -9,7 +9,7 @@
// </auto-generated>
//------------------------------------------------------------------------------
namespace BookAStar.Droid.Markdown
namespace ZicMoove.Droid.Markdown
{
using System;
using System.Collections.Generic;
@ -17,7 +17,7 @@ using System.Linq;
using System.Text;
[System.CodeDom.Compiler.GeneratedCodeAttribute("RazorTemplatePreprocessor", "4.2.1.62")]
[System.CodeDom.Compiler.GeneratedCodeAttribute("RazorTemplatePreprocessor", "4.2.2.11")]
public partial class MarkdownEditor : MarkdownEditorBase
{
@ -171,23 +171,23 @@ WriteLiteral(">\r\n var toolbarOptions = [\r\n [\'bold\', \'ital
"\'header\': 1 }, { \'header\': 2 }, { \'header\': 3 }], // custom button" +
" values\r\n [{ \'list\': \'ordered\' }, { \'list\': \'bullet\' }],\r\n [{ \'indent\'" +
": \'-1\' }, { \'indent\': \'+1\' }], // outdent/indent\r\n [\'link\', \'image" +
"\', \'video\'],\r\n [\'clean\'] // remove " +
"formatting button\r\n ];\r\n\r\n var showImageUI = function (val" +
"ue) {\r\n if (value) {\r\n var href = prompt(\'Ente" +
"r the URL\');\r\n this.quill.format(\'image\', href);\r\n " +
" } else {\r\n this.quill.format(\'image\', false);\r\n " +
" }\r\n };\r\n\r\n $(document).ready(function () {\r\n " +
" var quill = new Quill(\'#bubble-container\', {\r\n modul" +
"es: {\r\n toolbar: toolbarOptions\r\n },\r\n" +
" placeholder: \'Composez votre texte ...\',\r\n " +
" theme: \'snow\'\r\n });\r\n\r\n function getMD() {\r\n " +
" return markdownize($(\'#bubble-container div.ql-editor\').html())\r" +
"\n }\r\n quill.on(\'text-change\', function (delta, old" +
"Delta, source) {\r\n if (source === \"user\") {\r\n " +
" contentEdited(getMD());\r\n }\r\n });\r\n " +
" var toolbar = quill.getModule(\'toolbar\');\r\n toolbar." +
"addHandler(\'image\', showImageUI);\r\n jsLoaded();\r\n });\r" +
"\n </script>\r\n");
"\', \'audio\', \'video\'],\r\n [\'clean\'] /" +
"/ remove formatting button\r\n ];\r\n\r\n var showImageUI = func" +
"tion (value) {\r\n if (value) {\r\n var href = pro" +
"mpt(\'Enter the URL\');\r\n this.quill.format(\'image\', href);\r\n " +
" } else {\r\n this.quill.format(\'image\', false);\r\n" +
" }\r\n };\r\n\r\n $(document).ready(function () {" +
"\r\n var quill = new Quill(\'#bubble-container\', {\r\n " +
" modules: {\r\n toolbar: toolbarOptions\r\n " +
" },\r\n placeholder: \'Composez votre texte ...\',\r\n " +
" theme: \'snow\'\r\n });\r\n\r\n function getMD(" +
") {\r\n return markdownize($(\'#bubble-container div.ql-editor\')" +
".html())\r\n }\r\n quill.on(\'text-change\', function (d" +
"elta, oldDelta, source) {\r\n if (source === \"user\") {\r\n " +
" contentEdited(getMD());\r\n }\r\n " +
" });\r\n var toolbar = quill.getModule(\'toolbar\');\r\n " +
" toolbar.addHandler(\'image\', showImageUI);\r\n jsLoaded();\r\n " +
" });\r\n </script>\r\n");
#line 86 "MarkdownEditor.cshtml"

View file

@ -48,7 +48,7 @@
[{ 'header': 1 }, { 'header': 2 }, { 'header': 3 }], // custom button values
[{ 'list': 'ordered' }, { 'list': 'bullet' }],
[{ 'indent': '-1' }, { 'indent': '+1' }], // outdent/indent
['link', 'image', 'video'],
['link', 'image', 'audio', 'video'],
['clean'] // remove formatting button
];

View file

@ -11,7 +11,7 @@ using Android.Views;
using Android.Widget;
using Android.Graphics;
namespace BookAStar.Droid.Markdown
namespace ZicMoove.Droid.Markdown
{
public class MarkdownViewModel
{

View file

@ -1,15 +1,15 @@
using BookAStar.Views;
using ZicMoove.Views;
using Android.Webkit;
using Xamarin.Forms.Platform.Android;
using BookAStar.Droid;
using ZicMoove.Droid;
using System;
using Java.Interop;
using System.ComponentModel;
using Android.Views;
[assembly: Xamarin.Forms.ExportRenderer(typeof(MarkdownView), typeof(MarkdownViewRenderer))]
namespace BookAStar.Droid
namespace ZicMoove.Droid
{
using Markdown;
using XLabs.Forms;

View file

@ -11,7 +11,7 @@ using Android.Views;
using Android.Widget;
using Android.Webkit;
namespace BookAStar.Droid.Markdown
namespace ZicMoove.Droid.Markdown
{
class MarkdownWebChromeClient : WebChromeClient
{

View file

@ -6,8 +6,8 @@ using Xamarin.Utilities;
using System.Net;
using System.Text;
using Xamarin.Auth;
using BookAStar.Droid.OAuth.Xamarin.Utilities;
namespace BookAStar.Droid.OAuth {
using ZicMoove.Droid.OAuth.Xamarin.Utilities;
namespace ZicMoove.Droid.OAuth {
public class YaOAuth2Authenticator : WebRedirectAuthenticator
{

View file

@ -1,7 +1,7 @@
<?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="fr.pschneider.bas" android:installLocation="auto">
<uses-sdk android:minSdkVersion="15" />
<application android:allowBackup="true" android:label="Booking Star" android:icon="@drawable/icon" android:theme="@style/MainTheme" android:configChanges="navigation|screenLayout|orientation|screenSize|smallestScreenSize">
<application android:allowBackup="true" android:label="@string/app_name" android:icon="@drawable/icon" android:theme="@style/MainTheme" android:configChanges="navigation|screenLayout|orientation|screenSize|smallestScreenSize">
<meta-data android:name="com.google.android.maps.v2.API_KEY" android:value="AIzaSyBLSEDhZixwpHDsWmO2pKwgGDJReoTuQ7A" />
<meta-data android:name="com.google.android.gms.version" android:value="@integer/google_play_services_version" />
<receiver android:name="com.google.android.gms.gcm.GcmReceiver" android:exported="true" android:permission="com.google.android.c2dm.permission.SEND">

View file

@ -6,11 +6,11 @@ using Android.App;
// General Information about an assembly is controlled through the following
// set of attributes. Change these attribute values to modify the information
// associated with an assembly.
[assembly: AssemblyTitle("BookAStar.Droid")]
[assembly: AssemblyTitle("ZicMoove.Droid")]
[assembly: AssemblyDescription("")]
[assembly: AssemblyConfiguration("")]
[assembly: AssemblyCompany("")]
[assembly: AssemblyProduct("BookAStar.Droid")]
[assembly: AssemblyProduct("ZicMoove.Droid")]
[assembly: AssemblyCopyright("Copyright © Paul Albert Schneider 2016")]
[assembly: AssemblyTrademark("")]
[assembly: AssemblyCulture("fr")]

View file

@ -29,18 +29,18 @@ using XLabs.Enums;
using XLabs.Forms.Extensions;
using Color = Xamarin.Forms.Color;
using View = Android.Views.View;
using BookAStar.Rendering;
using BookAStar.Views;
using ZicMoove.Rendering;
using ZicMoove.Views;
using Xamarin.Forms.Platform.Android.AppCompat;
using Xamarin.Forms;
using Xamarin.Forms.Platform.Android;
using System.IO;
using BookAStar.Helpers;
using ZicMoove.Helpers;
using System.Reflection;
using System.Threading;
[assembly: ExportRenderer(typeof(ImageButton), typeof(ImageButtonRenderer))]
namespace BookAStar.Rendering
namespace ZicMoove.Rendering
{
/// <summary>
/// Draws a button on the Android platform with the image shown in the right

File diff suppressed because it is too large Load diff

View file

@ -1,9 +1,9 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<string name="app_name">Booking star</string>
<string name="app_name">ZicMoove</string>
<string name="send_to_app_name">Vers les étoiles</string>
<string name="yavscIdentRemoved">Identification supprimée</string>
<string name="yavscAccountTypeName">Booking star</string>
<string name="yavscAccountTypeName">ZicMoove</string>
<string name="cancel">Annuler</string>
<string name="Settings">Paramètres</string>
<string name="Title">Title</string>
@ -15,8 +15,8 @@
<string name="url_hint">url_hint</string>
<string name="picture">picture</string>
<string name="google_app_id">325408689282</string>
<string name="pref_screen_title">Comptes Booking Star</string>
<string name="account_authenticator_label">Comptes Booking Star</string>
<string name="pref_screen_title">Comptes ZicMoove</string>
<string name="account_authenticator_label">Comptes ZicMoove</string>
<string name="copy">Copier</string>
<string name="past">Coller</string>
@ -33,6 +33,6 @@
<string name="accounts">Comptes</string>
<string name="bookingstar_accounts_pref_screen_summary">
Préférences des comptes Booking Star
Préférences des comptes ZicMoove
</string>
</resources>

View file

@ -10,7 +10,7 @@ using Android.Runtime;
using Android.Views;
using Android.Widget;
namespace BookAStar.Droid
namespace ZicMoove.Droid
{
[Activity(Name= "fr.pschneider.bas.SendFilesActivity", Label = "SendFilesActivity")]
public class SendFilesActivity : Activity

View file

@ -9,9 +9,9 @@ using Android.OS;
using Android.Runtime;
using Android.Views;
using Android.Widget;
using BookAStar.Droid.OAuth;
using ZicMoove.Droid.OAuth;
namespace BookAStar.Droid.Services
namespace ZicMoove.Droid.Services
{
[Service(
Name = "fr.pschneider.bas.AccountChooserService",

View file

@ -9,13 +9,13 @@ using Android.OS;
using Android.Runtime;
using Android.Views;
using Android.Widget;
using BookAStar.Droid.Interfaces;
using ZicMoove.Droid.Interfaces;
using Newtonsoft.Json;
using BookAStar.Model.Social;
using BookAStar.Data;
using BookAStar.Model;
using ZicMoove.Model.Social;
using ZicMoove.Data;
using ZicMoove.Model;
namespace BookAStar.Droid.Services.GCMHandlers
namespace ZicMoove.Droid.Services.GCMHandlers
{
class BookQueryGCMHandler : GCMessageHandler
{

View file

@ -10,12 +10,12 @@ using Android.Runtime;
using Android.Views;
using Android.Widget;
using Newtonsoft.Json;
using BookAStar.Model.Social;
using BookAStar.Model;
using BookAStar.Model.Workflow;
using BookAStar.Data;
using ZicMoove.Model.Social;
using ZicMoove.Model;
using ZicMoove.Model.Workflow;
using ZicMoove.Data;
namespace BookAStar.Droid.Services.GCMHandlers
namespace ZicMoove.Droid.Services.GCMHandlers
{
class EstimateGCMHandler: GCMessageHandler
{

View file

@ -9,9 +9,9 @@ using Android.OS;
using Android.Runtime;
using Android.Views;
using Android.Widget;
using BookAStar.Droid.Interfaces;
using ZicMoove.Droid.Interfaces;
namespace BookAStar.Droid.Services.GCMHandlers
namespace ZicMoove.Droid.Services.GCMHandlers
{
abstract class GCMessageHandler : IGCMessageHandler
{

View file

@ -8,7 +8,7 @@ using System;
using System.Collections.Generic;
using System.Linq;
namespace BookAStar.Droid.Services
namespace ZicMoove.Droid.Services
{
using Model.Social;
using Model;

View file

@ -9,7 +9,7 @@ using Android.Gms.Gcm.Iid;
using Android.OS;
using Android;
namespace BookAStar.Droid
namespace ZicMoove.Droid
{
[Service(Exported = false)]
@ -29,7 +29,7 @@ namespace BookAStar.Droid
{
base.OnCreate();
sWakeLock = PowerManager.FromContext(this).NewWakeLock(WakeLockFlags.Partial,
"BookAStar");
"ZicMoove");
sWakeLock.Acquire();
}
public override void OnDestroy()

View file

@ -5,7 +5,7 @@ using Android.Content;
using Android.Util;
using Android.Widget;
namespace BookAStar.Droid
namespace ZicMoove.Droid
{
[Service]
public class MyGcmIntentService : IntentService

View file

@ -3,7 +3,7 @@ using Android.App;
using Android.Gms.Gcm.Iid;
using Android.Content;
namespace BookAStar.Droid
namespace ZicMoove.Droid
{
[Service(Exported = false), IntentFilter(new[] { "com.google.android.gms.iid.InstanceID" })]
class MyInstanceIDListenerService : InstanceIDListenerService

View file

@ -12,7 +12,7 @@ using Android.Widget;
using Android.Service.Chooser;
using static Android.Manifest;
namespace BookAStar.Droid
namespace ZicMoove.Droid
{
[Service(
Name = "fr.pschneider.bas.YavscChooserTargetService",
@ -33,7 +33,7 @@ namespace BookAStar.Droid
ChooserTarget t = new ChooserTarget(
new Java.Lang.String(
Constants.ApplicationName), i,
.5f, new ComponentName(this, "BookAStar.SendFilesActivity"),
.5f, new ComponentName(this, "ZicMoove.SendFilesActivity"),
null);
var res = new List<ChooserTarget>();
res.Add(t);

View file

@ -9,8 +9,8 @@
<ProjectTypeGuids>{EFBA0AD7-5A72-4C68-AF49-83D382785DCF};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
<OutputType>Library</OutputType>
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>BookAStar.Droid</RootNamespace>
<AssemblyName>BookAStar.Droid</AssemblyName>
<RootNamespace>ZicMoove.Droid</RootNamespace>
<AssemblyName>ZicMoove.Droid</AssemblyName>
<FileAlignment>512</FileAlignment>
<AndroidApplication>true</AndroidApplication>
<AndroidResgenFile>Resources\Resource.Designer.cs</AndroidResgenFile>