Suppression de la vue dans le model + quelques autres modifications

master
cldupland 5 years ago
parent 3bb8820ae7
commit 13bf2889e7

@ -1,14 +1,12 @@
using System;
using Android.App; using Android.App;
using Android.Content.PM; using Android.Content.PM;
using Android.Runtime; using Android.Runtime;
using Android.Views; using Android.Views;
using Android.Widget;
using Android.OS; using Android.OS;
using Xamarin.Forms; using Xamarin.Forms;
namespace TheGameExtreme.Droid namespace OrderStacks.Droid
{ {
[Activity(Label = "OrderStacks", Theme = "@style/MainTheme", MainLauncher = true, ConfigurationChanges = ConfigChanges.ScreenSize | ConfigChanges.Orientation, ScreenOrientation = ScreenOrientation.Landscape)] [Activity(Label = "OrderStacks", Theme = "@style/MainTheme", MainLauncher = true, ConfigurationChanges = ConfigChanges.ScreenSize | ConfigChanges.Orientation, ScreenOrientation = ScreenOrientation.Landscape)]
@ -18,8 +16,6 @@ namespace TheGameExtreme.Droid
{ {
base.OnCreate(savedInstanceState); base.OnCreate(savedInstanceState);
TabLayoutResource = Resource.Layout.Tabbar;
ToolbarResource = Resource.Layout.Toolbar;
Xamarin.Essentials.Platform.Init(this, savedInstanceState); Xamarin.Essentials.Platform.Init(this, savedInstanceState);
Forms.Init(this, savedInstanceState); Forms.Init(this, savedInstanceState);
LoadApplication(new App()); LoadApplication(new App());

@ -7,8 +7,8 @@
<ProjectTypeGuids>{EFBA0AD7-5A72-4C68-AF49-83D382785DCF};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids> <ProjectTypeGuids>{EFBA0AD7-5A72-4C68-AF49-83D382785DCF};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
<TemplateGuid>{c9e5eea5-ca05-42a1-839b-61506e0a37df}</TemplateGuid> <TemplateGuid>{c9e5eea5-ca05-42a1-839b-61506e0a37df}</TemplateGuid>
<OutputType>Library</OutputType> <OutputType>Library</OutputType>
<RootNamespace>TheGameExtreme.Droid</RootNamespace> <RootNamespace>OrderStacks.Droid</RootNamespace>
<AssemblyName>TheGameExtreme.Android</AssemblyName> <AssemblyName>OrderStacks.Android</AssemblyName>
<AndroidApplication>True</AndroidApplication> <AndroidApplication>True</AndroidApplication>
<AndroidResgenFile>Resources\Resource.designer.cs</AndroidResgenFile> <AndroidResgenFile>Resources\Resource.designer.cs</AndroidResgenFile>
<AndroidResgenClass>Resource</AndroidResgenClass> <AndroidResgenClass>Resource</AndroidResgenClass>
@ -47,14 +47,14 @@
<AndroidSupportedAbis>armeabi-v7a;arm64-v8a;x86_64;x86</AndroidSupportedAbis> <AndroidSupportedAbis>armeabi-v7a;arm64-v8a;x86_64;x86</AndroidSupportedAbis>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<Reference Include="Mono.Android" />
<Reference Include="Mono.Android.Export" />
<Reference Include="System" /> <Reference Include="System" />
<Reference Include="System.Core" /> <Reference Include="System.Core" />
<Reference Include="System.Xml.Linq" /> <Reference Include="System.Xml.Linq" />
<Reference Include="System.Xml" /> <Reference Include="System.Xml" />
<Reference Include="System.Numerics" /> <Reference Include="System.Numerics" />
<Reference Include="System.Numerics.Vectors" /> <Reference Include="System.Numerics.Vectors" />
<Reference Include="Mono.Android" />
<Reference Include="Mono.Android.Export" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="Xamarin.Forms" Version="4.4.0.991265" /> <PackageReference Include="Xamarin.Forms" Version="4.4.0.991265" />
@ -101,12 +101,6 @@
<AndroidResource Include="Resources\mipmap-xxxhdpi\icon.png" /> <AndroidResource Include="Resources\mipmap-xxxhdpi\icon.png" />
<AndroidResource Include="Resources\mipmap-xxxhdpi\launcher_foreground.png" /> <AndroidResource Include="Resources\mipmap-xxxhdpi\launcher_foreground.png" />
</ItemGroup> </ItemGroup>
<ItemGroup>
<ProjectReference Include="..\TheGameExtreme\TheGameExtreme.csproj">
<Project>{8DE6C881-FF77-4CC4-B8C4-CDEDD9AB13B3}</Project>
<Name>TheGameExtreme</Name>
</ProjectReference>
</ItemGroup>
<ItemGroup> <ItemGroup>
<AndroidResource Include="Resources\drawable\FontStyle\SIL_Open_Font_License.txt" /> <AndroidResource Include="Resources\drawable\FontStyle\SIL_Open_Font_License.txt" />
</ItemGroup> </ItemGroup>
@ -150,5 +144,11 @@
<ItemGroup> <ItemGroup>
<AndroidResource Include="Resources\drawable\Elsole.png" /> <AndroidResource Include="Resources\drawable\Elsole.png" />
</ItemGroup> </ItemGroup>
<ItemGroup>
<ProjectReference Include="..\OrderStacks\OrderStacks.csproj">
<Project>{8DE6C881-FF77-4CC4-B8C4-CDEDD9AB13B3}</Project>
<Name>OrderStacks</Name>
</ProjectReference>
</ItemGroup>
<Import Project="$(MSBuildExtensionsPath)\Xamarin\Android\Xamarin.Android.CSharp.targets" /> <Import Project="$(MSBuildExtensionsPath)\Xamarin\Android\Xamarin.Android.CSharp.targets" />
</Project> </Project>

Before

Width:  |  Height:  |  Size: 871 KiB

After

Width:  |  Height:  |  Size: 871 KiB

Before

Width:  |  Height:  |  Size: 19 KiB

After

Width:  |  Height:  |  Size: 19 KiB

Before

Width:  |  Height:  |  Size: 6.9 KiB

After

Width:  |  Height:  |  Size: 6.9 KiB

Before

Width:  |  Height:  |  Size: 4.6 KiB

After

Width:  |  Height:  |  Size: 4.6 KiB

Before

Width:  |  Height:  |  Size: 2.7 KiB

After

Width:  |  Height:  |  Size: 2.7 KiB

@ -3,11 +3,11 @@ using System.Collections;
using Android.App; using Android.App;
using Android.Views; using Android.Views;
using Android.Widget; using Android.Widget;
using TheGameExtreme.Droid.Services; using OrderStacks.Droid.Services;
using TheGameExtreme.Interface; using OrderStacks.Interface;
[assembly: Xamarin.Forms.Dependency(typeof(MessageAndroid))] [assembly: Xamarin.Forms.Dependency(typeof(MessageAndroid))]
namespace TheGameExtreme.Droid.Services namespace OrderStacks.Droid.Services
{ {
public class MessageAndroid : IMessage public class MessageAndroid : IMessage
{ {

@ -1,4 +1,5 @@
using Foundation; using Foundation;
using OrderStacks;
using UIKit; using UIKit;
namespace TheGameExtreme.iOS namespace TheGameExtreme.iOS

@ -1,11 +1,6 @@
using System; using UIKit;
using System.Collections.Generic;
using System.Linq;
using Foundation; namespace OrderStacks.iOS
using UIKit;
namespace TheGameExtreme.iOS
{ {
public class Application public class Application
{ {

@ -9,9 +9,9 @@
<ProjectTypeGuids>{FEACFBD2-3405-455C-9665-78FE426C6842};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids> <ProjectTypeGuids>{FEACFBD2-3405-455C-9665-78FE426C6842};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
<TemplateGuid>{6143fdea-f3c2-4a09-aafa-6e230626515e}</TemplateGuid> <TemplateGuid>{6143fdea-f3c2-4a09-aafa-6e230626515e}</TemplateGuid>
<OutputType>Exe</OutputType> <OutputType>Exe</OutputType>
<RootNamespace>TheGameExtreme.iOS</RootNamespace> <RootNamespace>OrderStacks.iOS</RootNamespace>
<IPhoneResourcePrefix>Resources</IPhoneResourcePrefix> <IPhoneResourcePrefix>Resources</IPhoneResourcePrefix>
<AssemblyName>TheGameExtreme.iOS</AssemblyName> <AssemblyName>OrderStacks.iOS</AssemblyName>
<MtouchEnableSGenConc>true</MtouchEnableSGenConc> <MtouchEnableSGenConc>true</MtouchEnableSGenConc>
<MtouchHttpClientHandler>NSUrlSessionHandler</MtouchHttpClientHandler> <MtouchHttpClientHandler>NSUrlSessionHandler</MtouchHttpClientHandler>
<ApplicationIcon>Resources\IconPique60ptmax.ico</ApplicationIcon> <ApplicationIcon>Resources\IconPique60ptmax.ico</ApplicationIcon>
@ -163,12 +163,6 @@
</PackageReference> </PackageReference>
</ItemGroup> </ItemGroup>
<Import Project="$(MSBuildExtensionsPath)\Xamarin\iOS\Xamarin.iOS.CSharp.targets" /> <Import Project="$(MSBuildExtensionsPath)\Xamarin\iOS\Xamarin.iOS.CSharp.targets" />
<ItemGroup>
<ProjectReference Include="..\TheGameExtreme\TheGameExtreme.csproj">
<Project>{8DE6C881-FF77-4CC4-B8C4-CDEDD9AB13B3}</Project>
<Name>TheGameExtreme</Name>
</ProjectReference>
</ItemGroup>
<ItemGroup> <ItemGroup>
<ITunesArtwork Include="iTunesArtwork" /> <ITunesArtwork Include="iTunesArtwork" />
<ITunesArtwork Include="iTunesArtwork%402x" /> <ITunesArtwork Include="iTunesArtwork%402x" />
@ -190,4 +184,10 @@
<ItemGroup> <ItemGroup>
<Folder Include="Services\" /> <Folder Include="Services\" />
</ItemGroup> </ItemGroup>
<ItemGroup>
<ProjectReference Include="..\OrderStacks\OrderStacks.csproj">
<Project>{8DE6C881-FF77-4CC4-B8C4-CDEDD9AB13B3}</Project>
<Name>OrderStacks</Name>
</ProjectReference>
</ItemGroup>
</Project> </Project>

Before

Width:  |  Height:  |  Size: 9.5 KiB

After

Width:  |  Height:  |  Size: 9.5 KiB

Before

Width:  |  Height:  |  Size: 871 KiB

After

Width:  |  Height:  |  Size: 871 KiB

Before

Width:  |  Height:  |  Size: 22 KiB

After

Width:  |  Height:  |  Size: 22 KiB

Before

Width:  |  Height:  |  Size: 58 KiB

After

Width:  |  Height:  |  Size: 58 KiB

Before

Width:  |  Height:  |  Size: 19 KiB

After

Width:  |  Height:  |  Size: 19 KiB

Before

Width:  |  Height:  |  Size: 16 KiB

After

Width:  |  Height:  |  Size: 16 KiB

Before

Width:  |  Height:  |  Size: 30 KiB

After

Width:  |  Height:  |  Size: 30 KiB

Before

Width:  |  Height:  |  Size: 7.3 KiB

After

Width:  |  Height:  |  Size: 7.3 KiB

Before

Width:  |  Height:  |  Size: 6.9 KiB

After

Width:  |  Height:  |  Size: 6.9 KiB

Before

Width:  |  Height:  |  Size: 360 KiB

After

Width:  |  Height:  |  Size: 360 KiB

Before

Width:  |  Height:  |  Size: 11 KiB

After

Width:  |  Height:  |  Size: 11 KiB

Before

Width:  |  Height:  |  Size: 32 KiB

After

Width:  |  Height:  |  Size: 32 KiB

Before

Width:  |  Height:  |  Size: 69 KiB

After

Width:  |  Height:  |  Size: 69 KiB

@ -1,12 +1,10 @@
using System; using Foundation;
using System.Collections; using OrderStacks.Interface;
using Foundation; using OrderStacks.iOS.Services;
using TheGameExtreme.Interface;
using TheGameExtreme.iOS.Services;
using UIKit; using UIKit;
[assembly: Xamarin.Forms.Dependency(typeof(MessageIOS))] [assembly: Xamarin.Forms.Dependency(typeof(MessageIOS))]
namespace TheGameExtreme.iOS.Services namespace OrderStacks.iOS.Services
{ {
public class MessageIOS : IMessage public class MessageIOS : IMessage
{ {

Before

Width:  |  Height:  |  Size: 360 KiB

After

Width:  |  Height:  |  Size: 360 KiB

Before

Width:  |  Height:  |  Size: 106 KiB

After

Width:  |  Height:  |  Size: 106 KiB

Before

Width:  |  Height:  |  Size: 134 KiB

After

Width:  |  Height:  |  Size: 134 KiB

@ -2,11 +2,11 @@ Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio Version 16 # Visual Studio Version 16
VisualStudioVersion = 16.0.29326.143 VisualStudioVersion = 16.0.29326.143
MinimumVisualStudioVersion = 10.0.40219.1 MinimumVisualStudioVersion = 10.0.40219.1
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TheGameExtreme.Android", "TheGameExtreme.Android\TheGameExtreme.Android.csproj", "{DD6C4FD6-058C-41F9-824F-84DABA5DD444}" Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OrderStacks.Android", "OrderStacks.Android\OrderStacks.Android.csproj", "{DD6C4FD6-058C-41F9-824F-84DABA5DD444}"
EndProject EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OrderStacks", "TheGameExtreme.iOS\OrderStacks.csproj", "{37A0EC21-60A9-43D2-8B43-3851E1CB7932}" Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OrderStacks.iOS", "OrderStacks.iOS\OrderStacks.iOS.csproj", "{37A0EC21-60A9-43D2-8B43-3851E1CB7932}"
EndProject EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TheGameExtreme", "TheGameExtreme\TheGameExtreme.csproj", "{8DE6C881-FF77-4CC4-B8C4-CDEDD9AB13B3}" Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "OrderStacks", "OrderStacks\OrderStacks.csproj", "{8DE6C881-FF77-4CC4-B8C4-CDEDD9AB13B3}"
EndProject EndProject
Project("{9344BDBB-3E7F-41FC-A0DD-8665D75EE146}") = "TestUnitaire", "TestUnitaire\TestUnitaire.csproj", "{A515F99D-F215-4709-BB23-19DB078CE5AE}" Project("{9344BDBB-3E7F-41FC-A0DD-8665D75EE146}") = "TestUnitaire", "TestUnitaire\TestUnitaire.csproj", "{A515F99D-F215-4709-BB23-19DB078CE5AE}"
EndProject EndProject

@ -4,7 +4,7 @@ using System.IO;
using System.Text; using System.Text;
using System.Xml.Serialization; using System.Xml.Serialization;
namespace TheGameExtreme.IO namespace OrderStacks.IO
{ {
class IOGamePreparation class IOGamePreparation
{ {

@ -1,10 +1,8 @@
using System; using System;
using System.Collections.Generic;
using System.IO; using System.IO;
using System.Text;
using System.Xml.Serialization; using System.Xml.Serialization;
namespace TheGameExtreme.IO namespace OrderStacks.IO
{ {
class IOOptions class IOOptions
{ {

@ -1,6 +1,6 @@
using System; using System;
namespace TheGameExtreme.Interface namespace OrderStacks.Interface
{ {
public interface IMessage public interface IMessage
{ {

Before

Width:  |  Height:  |  Size: 31 KiB

After

Width:  |  Height:  |  Size: 31 KiB

Before

Width:  |  Height:  |  Size: 15 KiB

After

Width:  |  Height:  |  Size: 15 KiB

Before

Width:  |  Height:  |  Size: 23 KiB

After

Width:  |  Height:  |  Size: 23 KiB

@ -8,9 +8,8 @@
// </auto-generated> // </auto-generated>
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
namespace TheGameExtreme.Resx { namespace OrderStacks.Resx
using System; {
using System.Reflection;
[System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")] [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")]
@ -30,7 +29,7 @@ namespace TheGameExtreme.Resx {
public static System.Resources.ResourceManager ResourceManager { public static System.Resources.ResourceManager ResourceManager {
get { get {
if (object.Equals(null, resourceMan)) { if (object.Equals(null, resourceMan)) {
System.Resources.ResourceManager temp = new System.Resources.ResourceManager("TheGameExtreme.Resx.AppResources", typeof(AppResources).Assembly); System.Resources.ResourceManager temp = new System.Resources.ResourceManager("OrderStacks.Resx.AppResources", typeof(AppResources).Assembly);
resourceMan = temp; resourceMan = temp;
} }
return resourceMan; return resourceMan;

Some files were not shown because too many files have changed in this diff Show More

Loading…
Cancel
Save