pascal.lafourcade
/
thegameextreme
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

resolution conflit

Browse Source
master
Baptiste ARNAUD 5 years ago
parent 6c45665559 8e8fe48ab2
commit 698597dad7
69 changed files with 140 additions and 11824 deletions
Show Stats Download Patch File Download Diff File

14
OrderStacks.Android/OrderStacks.Android.csproj
Unescape View File

@ -35,7 +35,6 @@
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugSymbols>false</DebugSymbols>
<DebugType>portable</DebugType>
<Optimize>true</Optimize>
<OutputPath>bin\Release</OutputPath>
<ErrorReport>prompt</ErrorReport>
@ -82,6 +81,10 @@
<None Include="Properties\AndroidManifest.xml" />
<AndroidResource Include="Resources\drawable\FontStyle\IndieFlower.ttf" />
<AndroidResource Include="Resources\drawable\FontStyle\LicenceFont.pdf" />
<AndroidResource Include="Resources\drawable\TrierImageB.png">
<SubType></SubType>
<Generator></Generator>
</AndroidResource>
</ItemGroup>
<ItemGroup>
<AndroidResource Include="Resources\layout\Tabbar.xml" />
@ -108,21 +111,12 @@
<Folder Include="Assets\fonts\" />
<Folder Include="Services\" />
</ItemGroup>
<ItemGroup>
<AndroidResource Include="Resources\drawable\EngrenageV1.png" />
</ItemGroup>
<ItemGroup>
<AndroidResource Include="Resources\drawable\ArrowSettingsBack.png" />
</ItemGroup>
<ItemGroup>
<AndroidResource Include="Resources\drawable\HomeIcon.png" />
</ItemGroup>
<ItemGroup>
<AndroidResource Include="Resources\drawable\TrierImageB.png">
<Generator>MSBuild:UpdateGeneratedFiles</Generator>
<SubType>Designer</SubType>
</AndroidResource>
</ItemGroup>
<ItemGroup>
<AndroidResource Include="Resources\drawable\LuneSombreTheme.png" />
</ItemGroup>

2
OrderStacks.Android/Properties/AndroidManifest.xml
Unescape View File

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android" android:versionCode="21" android:versionName="5.7" package="com.uca.thegameextreme" android:installLocation="auto">
<manifest xmlns:android="http://schemas.android.com/apk/res/android" android:versionCode="22" android:versionName="6.0" package="com.uca.orderStacks" android:installLocation="auto">
<uses-sdk android:minSdkVersion="19" android:targetSdkVersion="28" />
<application android:icon="@drawable/TrierImageB" android:label="OrderStacks"></application>
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />

59
OrderStacks.Android/Resources/Resource.designer.cs generated
Unescape View File

@ -5777,91 +5777,88 @@ namespace OrderStacks.Droid
public const int Elsole = 2131165283;
// aapt resource value: 0x7F070064
public const int EngrenageV1 = 2131165284;
public const int GMOS = 2131165284;
// aapt resource value: 0x7F070065
public const int GMOS = 2131165285;
public const int HomeIcon = 2131165285;
// aapt resource value: 0x7F070066
public const int HomeIcon = 2131165286;
public const int ic_mtrl_chip_checked_black = 2131165286;
// aapt resource value: 0x7F070067
public const int ic_mtrl_chip_checked_black = 2131165287;
public const int ic_mtrl_chip_checked_circle = 2131165287;
// aapt resource value: 0x7F070068
public const int ic_mtrl_chip_checked_circle = 2131165288;
public const int ic_mtrl_chip_close_circle = 2131165288;
// aapt resource value: 0x7F070069
public const int ic_mtrl_chip_close_circle = 2131165289;
public const int Imagetirer1a6 = 2131165289;
// aapt resource value: 0x7F07006A
public const int Imagetirer1a6 = 2131165290;
public const int LuneSombreTheme = 2131165290;
// aapt resource value: 0x7F07006B
public const int LuneSombreTheme = 2131165291;
public const int mtrl_snackbar_background = 2131165291;
// aapt resource value: 0x7F07006C
public const int mtrl_snackbar_background = 2131165292;
public const int mtrl_tabs_default_indicator = 2131165292;
// aapt resource value: 0x7F07006D
public const int mtrl_tabs_default_indicator = 2131165293;
public const int navigation_empty_icon = 2131165293;
// aapt resource value: 0x7F07006E
public const int navigation_empty_icon = 2131165294;
public const int notification_action_background = 2131165294;
// aapt resource value: 0x7F07006F
public const int notification_action_background = 2131165295;
public const int notification_bg = 2131165295;
// aapt resource value: 0x7F070070
public const int notification_bg = 2131165296;
public const int notification_bg_low = 2131165296;
// aapt resource value: 0x7F070071
public const int notification_bg_low = 2131165297;
public const int notification_bg_low_normal = 2131165297;
// aapt resource value: 0x7F070072
public const int notification_bg_low_normal = 2131165298;
public const int notification_bg_low_pressed = 2131165298;
// aapt resource value: 0x7F070073
public const int notification_bg_low_pressed = 2131165299;
public const int notification_bg_normal = 2131165299;
// aapt resource value: 0x7F070074
public const int notification_bg_normal = 2131165300;
public const int notification_bg_normal_pressed = 2131165300;
// aapt resource value: 0x7F070075
public const int notification_bg_normal_pressed = 2131165301;
public const int notification_icon_background = 2131165301;
// aapt resource value: 0x7F070076
public const int notification_icon_background = 2131165302;
public const int notification_template_icon_bg = 2131165302;
// aapt resource value: 0x7F070077
public const int notification_template_icon_bg = 2131165303;
public const int notification_template_icon_low_bg = 2131165303;
// aapt resource value: 0x7F070078
public const int notification_template_icon_low_bg = 2131165304;
public const int notification_tile_bg = 2131165304;
// aapt resource value: 0x7F070079
public const int notification_tile_bg = 2131165305;
public const int notify_panel_notification_icon_bg = 2131165305;
// aapt resource value: 0x7F07007A
public const int notify_panel_notification_icon_bg = 2131165306;
public const int PointI = 2131165306;
// aapt resource value: 0x7F07007B
public const int PointI = 2131165307;
public const int soleil = 2131165307;
// aapt resource value: 0x7F07007C
public const int soleil = 2131165308;
public const int tooltip_frame_dark = 2131165308;
// aapt resource value: 0x7F07007D
public const int tooltip_frame_dark = 2131165309;
public const int tooltip_frame_light = 2131165309;
// aapt resource value: 0x7F07007E
public const int tooltip_frame_light = 2131165310;
public const int TrierImageB = 2131165310;
// aapt resource value: 0x7F07007F
public const int TrierImageB = 2131165311;
// aapt resource value: 0x7F070080
public const int UpDownStacks = 2131165312;
public const int UpDownStacks = 2131165311;
static Drawable()
{

11596
OrderStacks.Android/Resources/Resource.designer.cs.orig
View File

File diff suppressed because it is too large Load Diff

BIN
OrderStacks.Android/Resources/drawable/EngrenageV1.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 22 KiB

BIN
OrderStacks.Android/Resources/drawable/IconeAppFinale.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 30 KiB

BIN
OrderStacks.Android/Resources/drawable/TrierImageB.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 11 KiB

After

Width:  |  Height:  |  Size: 98 KiB

36
OrderStacks.iOS/Assets.xcassets/AppIcon.appiconset/Contents.json
Unescape View File

@ -1,109 +1,109 @@
{
"images": [
{
"filename": "Icon-Small-40-3.png",
"filename": "Icon-Small-40-2.png",
"size": "20x20",
"scale": "2x",
"idiom": "iphone"
},
{
"filename": "Icon-Notification@3x-1.png",
"filename": "Icon-Notification@3x.png",
"size": "20x20",
"scale": "3x",
"idiom": "iphone"
},
{
"filename": "Icon-Small@2x-2.png",
"filename": "Icon-Small@2x-1.png",
"size": "29x29",
"scale": "2x",
"idiom": "iphone"
},
{
"filename": "Icon-Small@3x-1.png",
"filename": "Icon-Small@3x.png",
"size": "29x29",
"scale": "3x",
"idiom": "iphone"
},
{
"filename": "Icon-Small-40@2x-2.png",
"filename": "Icon-Small-40@2x-1.png",
"size": "40x40",
"scale": "2x",
"idiom": "iphone"
},
{
"filename": "Icon-60@2x-2.png",
"filename": "Icon-60@2x-1.png",
"size": "40x40",
"scale": "3x",
"idiom": "iphone"
},
{
"filename": "Icon-60@2x.png",
"filename": "Icon-60@2x-2.png",
"size": "60x60",
"scale": "2x",
"idiom": "iphone"
},
{
"filename": "Icon-60@3x-1.png",
"filename": "Icon-60@3x.png",
"size": "60x60",
"scale": "3x",
"idiom": "iphone"
},
{
"filename": "Icon-Notification-1.png",
"filename": "Icon-Notification.png",
"size": "20x20",
"scale": "1x",
"idiom": "ipad"
},
{
"filename": "Icon-Small-40.png",
"filename": "Icon-Small-40-3.png",
"size": "20x20",
"scale": "2x",
"idiom": "ipad"
},
{
"filename": "Icon-Small-1.png",
"filename": "Icon-Small.png",
"size": "29x29",
"scale": "1x",
"idiom": "ipad"
},
{
"filename": "Icon-Small@2x.png",
"filename": "Icon-Small@2x-2.png",
"size": "29x29",
"scale": "2x",
"idiom": "ipad"
},
{
"filename": "Icon-Small-40-1.png",
"filename": "Icon-Small-40.png",
"size": "40x40",
"scale": "1x",
"idiom": "ipad"
},
{
"filename": "Icon-Small-40@2x.png",
"filename": "Icon-Small-40@2x-2.png",
"size": "40x40",
"scale": "2x",
"idiom": "ipad"
},
{
"filename": "Icon-83.5@2x-1.png",
"filename": "Icon-83.5@2x.png",
"size": "83.5x83.5",
"scale": "2x",
"idiom": "ipad"
},
{
"filename": "Icon-76-1.png",
"filename": "Icon-76.png",
"size": "76x76",
"scale": "1x",
"idiom": "ipad"
},
{
"filename": "Icon-76@2x-1.png",
"filename": "Icon-76@2x.png",
"size": "76x76",
"scale": "2x",
"idiom": "ipad"
},
{
"filename": "iTunesArtwork@2x-1.png",
"filename": "iTunesArtwork@2x.png",
"size": "1024x1024",
"scale": "1x",
"idiom": "ios-marketing"

BIN
OrderStacks.iOS/Assets.xcassets/AppIcon.appiconset/Icon-60@2x-1.png
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 13 KiB

BIN
OrderStacks.iOS/Assets.xcassets/AppIcon.appiconset/Icon-60@2x-2.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 6.1 KiB

After

Width:  |  Height:  |  Size: 13 KiB

BIN
OrderStacks.iOS/Assets.xcassets/AppIcon.appiconset/Icon-60@2x.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 6.1 KiB

BIN
OrderStacks.iOS/Assets.xcassets/AppIcon.appiconset/Icon-60@3x-1.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 16 KiB

BIN
OrderStacks.iOS/Assets.xcassets/AppIcon.appiconset/Icon-60@3x.png
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 29 KiB

BIN
OrderStacks.iOS/Assets.xcassets/AppIcon.appiconset/Icon-76-1.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 2.9 KiB

BIN
OrderStacks.iOS/Assets.xcassets/AppIcon.appiconset/Icon-76.png
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 6.0 KiB

BIN
OrderStacks.iOS/Assets.xcassets/AppIcon.appiconset/Icon-76@2x-1.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 10 KiB

BIN
OrderStacks.iOS/Assets.xcassets/AppIcon.appiconset/Icon-76@2x.png
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 19 KiB

BIN
OrderStacks.iOS/Assets.xcassets/AppIcon.appiconset/Icon-83.5@2x-1.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 13 KiB

BIN
OrderStacks.iOS/Assets.xcassets/AppIcon.appiconset/Icon-83.5@2x.png
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 26 KiB

BIN
OrderStacks.iOS/Assets.xcassets/AppIcon.appiconset/Icon-Notification-1.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 569 B

BIN
OrderStacks.iOS/Assets.xcassets/AppIcon.appiconset/Icon-Notification.png
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 960 B

BIN
OrderStacks.iOS/Assets.xcassets/AppIcon.appiconset/Icon-Notification@3x-1.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 2.1 KiB

BIN
OrderStacks.iOS/Assets.xcassets/AppIcon.appiconset/Icon-Notification@3x.png
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 3.9 KiB

BIN
OrderStacks.iOS/Assets.xcassets/AppIcon.appiconset/Icon-Small-1.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 854 B

BIN
OrderStacks.iOS/Assets.xcassets/AppIcon.appiconset/Icon-Small-40-1.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 1.2 KiB

BIN
OrderStacks.iOS/Assets.xcassets/AppIcon.appiconset/Icon-Small-40-2.png
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 2.3 KiB

BIN
OrderStacks.iOS/Assets.xcassets/AppIcon.appiconset/Icon-Small-40-3.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.2 KiB

After

Width:  |  Height:  |  Size: 2.3 KiB

BIN
OrderStacks.iOS/Assets.xcassets/AppIcon.appiconset/Icon-Small-40.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.2 KiB

After

Width:  |  Height:  |  Size: 2.3 KiB

BIN
OrderStacks.iOS/Assets.xcassets/AppIcon.appiconset/Icon-Small-40@2x-1.png
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 5.8 KiB

BIN
OrderStacks.iOS/Assets.xcassets/AppIcon.appiconset/Icon-Small-40@2x-2.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 3.0 KiB

After

Width:  |  Height:  |  Size: 5.8 KiB

BIN
OrderStacks.iOS/Assets.xcassets/AppIcon.appiconset/Icon-Small-40@2x.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 3.0 KiB

BIN
OrderStacks.iOS/Assets.xcassets/AppIcon.appiconset/Icon-Small.png
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.5 KiB

BIN
OrderStacks.iOS/Assets.xcassets/AppIcon.appiconset/Icon-Small@2x-1.png
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 4.1 KiB

BIN
OrderStacks.iOS/Assets.xcassets/AppIcon.appiconset/Icon-Small@2x-2.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 2.0 KiB

After

Width:  |  Height:  |  Size: 4.1 KiB

BIN
OrderStacks.iOS/Assets.xcassets/AppIcon.appiconset/Icon-Small@2x.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 2.0 KiB

BIN
OrderStacks.iOS/Assets.xcassets/AppIcon.appiconset/Icon-Small@3x-1.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 3.6 KiB

BIN
OrderStacks.iOS/Assets.xcassets/AppIcon.appiconset/Icon-Small@3x.png
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 8.1 KiB

BIN
OrderStacks.iOS/Assets.xcassets/AppIcon.appiconset/iTunesArtwork@2x-1.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 152 KiB

BIN
OrderStacks.iOS/Assets.xcassets/AppIcon.appiconset/iTunesArtwork@2x.png
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 98 KiB

BIN
OrderStacks.iOS/Icon.png
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 3.7 KiB

BIN
OrderStacks.iOS/IconeApp.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 141 KiB

91
OrderStacks.iOS/OrderStacks.iOS.csproj
Unescape View File

@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@ -14,7 +14,7 @@
<AssemblyName>OrderStacks.iOS</AssemblyName>
<MtouchEnableSGenConc>true</MtouchEnableSGenConc>
<MtouchHttpClientHandler>NSUrlSessionHandler</MtouchHttpClientHandler>
<ApplicationIcon>Resources\IconPique60ptmax.ico</ApplicationIcon>
<ApplicationIcon>TrierImage.ico</ApplicationIcon>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|iPhoneSimulator' ">
<DebugSymbols>true</DebugSymbols>
@ -77,65 +77,30 @@
<None Include="Info.plist" />
<Compile Include="Properties\AssemblyInfo.cs" />
<Compile Include="Services\MessageIOS.cs" />
<None Include="TrierImageB.ico" />
</ItemGroup>
<ItemGroup>
<ImageAsset Include="Assets.xcassets\AppIcon.appiconset\Contents.json">
<Visible>false</Visible>
</ImageAsset>
<ImageAsset Include="Assets.xcassets\AppIcon.appiconset\Icon-Small-40-3.png">
<Visible>false</Visible>
</ImageAsset>
<ImageAsset Include="Assets.xcassets\AppIcon.appiconset\Icon-Notification%403x-1.png">
<Visible>false</Visible>
</ImageAsset>
<ImageAsset Include="Assets.xcassets\AppIcon.appiconset\Icon-Small%402x-2.png">
<Visible>false</Visible>
</ImageAsset>
<ImageAsset Include="Assets.xcassets\AppIcon.appiconset\Icon-Small%403x-1.png">
<Visible>false</Visible>
</ImageAsset>
<ImageAsset Include="Assets.xcassets\AppIcon.appiconset\Icon-Small-40%402x-2.png">
<Visible>false</Visible>
</ImageAsset>
<ImageAsset Include="Assets.xcassets\AppIcon.appiconset\Icon-60%402x-2.png">
<Visible>false</Visible>
</ImageAsset>
<ImageAsset Include="Assets.xcassets\AppIcon.appiconset\Icon-60%402x.png">
<Visible>false</Visible>
</ImageAsset>
<ImageAsset Include="Assets.xcassets\AppIcon.appiconset\Icon-60%403x-1.png">
<Visible>false</Visible>
</ImageAsset>
<ImageAsset Include="Assets.xcassets\AppIcon.appiconset\Icon-Notification-1.png">
<Visible>false</Visible>
</ImageAsset>
<ImageAsset Include="Assets.xcassets\AppIcon.appiconset\Icon-Small-40.png">
<Visible>false</Visible>
</ImageAsset>
<ImageAsset Include="Assets.xcassets\AppIcon.appiconset\Icon-Small-1.png">
<Visible>false</Visible>
</ImageAsset>
<ImageAsset Include="Assets.xcassets\AppIcon.appiconset\Icon-Small%402x.png">
<Visible>false</Visible>
</ImageAsset>
<ImageAsset Include="Assets.xcassets\AppIcon.appiconset\Icon-Small-40-1.png">
<Visible>false</Visible>
</ImageAsset>
<ImageAsset Include="Assets.xcassets\AppIcon.appiconset\Icon-Small-40%402x.png">
<Visible>false</Visible>
</ImageAsset>
<ImageAsset Include="Assets.xcassets\AppIcon.appiconset\Icon-76-1.png">
<Visible>false</Visible>
</ImageAsset>
<ImageAsset Include="Assets.xcassets\AppIcon.appiconset\Icon-76%402x-1.png">
<Visible>false</Visible>
</ImageAsset>
<ImageAsset Include="Assets.xcassets\AppIcon.appiconset\Icon-83.5%402x-1.png">
<Visible>false</Visible>
</ImageAsset>
<ImageAsset Include="Assets.xcassets\AppIcon.appiconset\iTunesArtwork%402x-1.png">
<Visible>false</Visible>
</ImageAsset>
<ImageAsset Include="Assets.xcassets\AppIcon.appiconset\Icon-Small-40-2.png" />
<ImageAsset Include="Assets.xcassets\AppIcon.appiconset\Icon-Notification%403x.png" />
<ImageAsset Include="Assets.xcassets\AppIcon.appiconset\Icon-Small%402x-1.png" />
<ImageAsset Include="Assets.xcassets\AppIcon.appiconset\Icon-Small%403x.png" />
<ImageAsset Include="Assets.xcassets\AppIcon.appiconset\Icon-Small-40%402x-1.png" />
<ImageAsset Include="Assets.xcassets\AppIcon.appiconset\Icon-60%402x-1.png" />
<ImageAsset Include="Assets.xcassets\AppIcon.appiconset\Icon-60%402x-2.png" />
<ImageAsset Include="Assets.xcassets\AppIcon.appiconset\Icon-60%403x.png" />
<ImageAsset Include="Assets.xcassets\AppIcon.appiconset\Icon-Notification.png" />
<ImageAsset Include="Assets.xcassets\AppIcon.appiconset\Icon-Small-40-3.png" />
<ImageAsset Include="Assets.xcassets\AppIcon.appiconset\Icon-Small.png" />
<ImageAsset Include="Assets.xcassets\AppIcon.appiconset\Icon-Small%402x-2.png" />
<ImageAsset Include="Assets.xcassets\AppIcon.appiconset\Icon-Small-40.png" />
<ImageAsset Include="Assets.xcassets\AppIcon.appiconset\Icon-Small-40%402x-2.png" />
<ImageAsset Include="Assets.xcassets\AppIcon.appiconset\Icon-76.png" />
<ImageAsset Include="Assets.xcassets\AppIcon.appiconset\Icon-76%402x.png" />
<ImageAsset Include="Assets.xcassets\AppIcon.appiconset\Icon-83.5%402x.png" />
<ImageAsset Include="Assets.xcassets\AppIcon.appiconset\iTunesArtwork%402x.png" />
</ItemGroup>
<ItemGroup>
<Reference Include="System" />
@ -162,25 +127,18 @@
</PackageReference>
</ItemGroup>
<Import Project="$(MSBuildExtensionsPath)\Xamarin\iOS\Xamarin.iOS.CSharp.targets" />
<ItemGroup>
<ITunesArtwork Include="iTunesArtwork" />
<ITunesArtwork Include="iTunesArtwork%402x" />
</ItemGroup>
<ItemGroup>
<BundleResource Include="Resources\ArrowSettingsBack.png" />
<BundleResource Include="Resources\EngrenageV1.png" />
<BundleResource Include="Resources\GMOS.png" />
<BundleResource Include="Resources\HomeIcon.png" />
<BundleResource Include="Resources\Imagetirer1a6.png" />
<BundleResource Include="Resources\LuneSombreTheme.png" />
<BundleResource Include="Resources\PointI.png" />
<BundleResource Include="Resources\TrierImageB.png" />
<BundleResource Include="Resources\UpDownStacks.png" />
<BundleResource Include="Resources\soleil.png" />
<BundleResource Include="Resources\Elsole.png" />
</ItemGroup>
<ItemGroup>
<BundleResource Include="IconeApp.png" />
<BundleResource Include="Icon.png" />
<BundleResource Include="Resources\TrierImageB.png" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\OrderStacks\OrderStacks.csproj">
@ -189,6 +147,7 @@
</ProjectReference>
</ItemGroup>
<ItemGroup>
<Content Include="TrierImageB.ico" />
<ITunesArtwork Include="iTunesArtwork.png" />
<ITunesArtwork Include="iTunesArtwork%402x.png" />
</ItemGroup>
</Project>

97
OrderStacks.iOS/OrderStacks.iOS.csproj.orig
Unescape View File

@ -14,7 +14,7 @@
<AssemblyName>OrderStacks.iOS</AssemblyName>
<MtouchEnableSGenConc>true</MtouchEnableSGenConc>
<MtouchHttpClientHandler>NSUrlSessionHandler</MtouchHttpClientHandler>
<ApplicationIcon>Resources\IconPique60ptmax.ico</ApplicationIcon>
<ApplicationIcon>TrierImage.ico</ApplicationIcon>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|iPhoneSimulator' ">
<DebugSymbols>true</DebugSymbols>
@ -76,67 +76,31 @@
<None Include="Entitlements.plist" />
<None Include="Info.plist" />
<Compile Include="Properties\AssemblyInfo.cs" />
<BundleResource Include="TrierImageB.ico" />
<Compile Include="Services\MessageIOS.cs" />
<None Include="TrierImageB.ico" />
</ItemGroup>
<ItemGroup>
<ImageAsset Include="Assets.xcassets\AppIcon.appiconset\Contents.json">
<Visible>false</Visible>
</ImageAsset>
<ImageAsset Include="Assets.xcassets\AppIcon.appiconset\Icon-Small-40-3.png">
<Visible>false</Visible>
</ImageAsset>
<ImageAsset Include="Assets.xcassets\AppIcon.appiconset\Icon-Notification%403x-1.png">
<Visible>false</Visible>
</ImageAsset>
<ImageAsset Include="Assets.xcassets\AppIcon.appiconset\Icon-Small%402x-2.png">
<Visible>false</Visible>
</ImageAsset>
<ImageAsset Include="Assets.xcassets\AppIcon.appiconset\Icon-Small%403x-1.png">
<Visible>false</Visible>
</ImageAsset>
<ImageAsset Include="Assets.xcassets\AppIcon.appiconset\Icon-Small-40%402x-2.png">
<Visible>false</Visible>
</ImageAsset>
<ImageAsset Include="Assets.xcassets\AppIcon.appiconset\Icon-60%402x-2.png">
<Visible>false</Visible>
</ImageAsset>
<ImageAsset Include="Assets.xcassets\AppIcon.appiconset\Icon-60%402x.png">
<Visible>false</Visible>
</ImageAsset>
<ImageAsset Include="Assets.xcassets\AppIcon.appiconset\Icon-60%403x-1.png">
<Visible>false</Visible>
</ImageAsset>
<ImageAsset Include="Assets.xcassets\AppIcon.appiconset\Icon-Notification-1.png">
<Visible>false</Visible>
</ImageAsset>
<ImageAsset Include="Assets.xcassets\AppIcon.appiconset\Icon-Small-40.png">
<Visible>false</Visible>
</ImageAsset>
<ImageAsset Include="Assets.xcassets\AppIcon.appiconset\Icon-Small-1.png">
<Visible>false</Visible>
</ImageAsset>
<ImageAsset Include="Assets.xcassets\AppIcon.appiconset\Icon-Small%402x.png">
<Visible>false</Visible>
</ImageAsset>
<ImageAsset Include="Assets.xcassets\AppIcon.appiconset\Icon-Small-40-1.png">
<Visible>false</Visible>
</ImageAsset>
<ImageAsset Include="Assets.xcassets\AppIcon.appiconset\Icon-Small-40%402x.png">
<Visible>false</Visible>
</ImageAsset>
<ImageAsset Include="Assets.xcassets\AppIcon.appiconset\Icon-76-1.png">
<Visible>false</Visible>
</ImageAsset>
<ImageAsset Include="Assets.xcassets\AppIcon.appiconset\Icon-76%402x-1.png">
<Visible>false</Visible>
</ImageAsset>
<ImageAsset Include="Assets.xcassets\AppIcon.appiconset\Icon-83.5%402x-1.png">
<Visible>false</Visible>
</ImageAsset>
<ImageAsset Include="Assets.xcassets\AppIcon.appiconset\iTunesArtwork%402x-1.png">
<Visible>false</Visible>
</ImageAsset>
<ImageAsset Include="Assets.xcassets\AppIcon.appiconset\Icon-Small-40-2.png" />
<ImageAsset Include="Assets.xcassets\AppIcon.appiconset\Icon-Notification%403x.png" />
<ImageAsset Include="Assets.xcassets\AppIcon.appiconset\Icon-Small%402x-1.png" />
<ImageAsset Include="Assets.xcassets\AppIcon.appiconset\Icon-Small%403x.png" />
<ImageAsset Include="Assets.xcassets\AppIcon.appiconset\Icon-Small-40%402x-1.png" />
<ImageAsset Include="Assets.xcassets\AppIcon.appiconset\Icon-60%402x-1.png" />
<ImageAsset Include="Assets.xcassets\AppIcon.appiconset\Icon-60%402x-2.png" />
<ImageAsset Include="Assets.xcassets\AppIcon.appiconset\Icon-60%403x.png" />
<ImageAsset Include="Assets.xcassets\AppIcon.appiconset\Icon-Notification.png" />
<ImageAsset Include="Assets.xcassets\AppIcon.appiconset\Icon-Small-40-3.png" />
<ImageAsset Include="Assets.xcassets\AppIcon.appiconset\Icon-Small.png" />
<ImageAsset Include="Assets.xcassets\AppIcon.appiconset\Icon-Small%402x-2.png" />
<ImageAsset Include="Assets.xcassets\AppIcon.appiconset\Icon-Small-40.png" />
<ImageAsset Include="Assets.xcassets\AppIcon.appiconset\Icon-Small-40%402x-2.png" />
<ImageAsset Include="Assets.xcassets\AppIcon.appiconset\Icon-76.png" />
<ImageAsset Include="Assets.xcassets\AppIcon.appiconset\Icon-76%402x.png" />
<ImageAsset Include="Assets.xcassets\AppIcon.appiconset\Icon-83.5%402x.png" />
<ImageAsset Include="Assets.xcassets\AppIcon.appiconset\iTunesArtwork%402x.png" />
</ItemGroup>
<ItemGroup>
<Reference Include="System" />
@ -163,34 +127,31 @@
</PackageReference>
</ItemGroup>
<Import Project="$(MSBuildExtensionsPath)\Xamarin\iOS\Xamarin.iOS.CSharp.targets" />
<ItemGroup>
<ITunesArtwork Include="iTunesArtwork" />
<ITunesArtwork Include="iTunesArtwork%402x" />
</ItemGroup>
<ItemGroup>
<BundleResource Include="Resources\ArrowSettingsBack.png" />
<BundleResource Include="Resources\EngrenageV1.png" />
<BundleResource Include="Resources\GMOS.png" />
<BundleResource Include="Resources\HomeIcon.png" />
<BundleResource Include="Resources\Imagetirer1a6.png" />
<BundleResource Include="Resources\LuneSombreTheme.png" />
<BundleResource Include="Resources\PointI.png" />
<BundleResource Include="Resources\TrierImageB.png" />
<BundleResource Include="Resources\UpDownStacks.png" />
<BundleResource Include="Resources\soleil.png" />
<BundleResource Include="Resources\Elsole.png" />
<BundleResource Include="Icon.png" />
<BundleResource Include="Resources\TrierImageB.png" />
</ItemGroup>
<ItemGroup>
<BundleResource Include="IconeApp.png" />
</ItemGroup>
<<<<<<< HEAD:OrderStacks.iOS/OrderStacks.iOS.csproj
<ItemGroup>
<ProjectReference Include="..\OrderStacks\OrderStacks.csproj">
<Project>{8DE6C881-FF77-4CC4-B8C4-CDEDD9AB13B3}</Project>
<Name>OrderStacks</Name>
</ProjectReference>
</ItemGroup>
<ItemGroup>
<<<<<<< HEAD
<Content Include="TrierImageB.ico" />
=======
<ItemGroup />
>>>>>>> 739932cd8872a80cb9556f3ed130fe8433f3b380:TheGameExtreme.iOS/OrderStacks.csproj
<ITunesArtwork Include="iTunesArtwork.png" />
<ITunesArtwork Include="iTunesArtwork%402x.png" />
>>>>>>> 8e8fe48ab2250e4815dcee4bbf0b103cb28fa4c6
</ItemGroup>
</Project>

BIN
OrderStacks.iOS/Resources/EngrenageV1.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 22 KiB

BIN
OrderStacks.iOS/Resources/TrierImageB.ico
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 360 KiB

BIN
OrderStacks.iOS/Resources/TrierImageB.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 11 KiB

After

Width:  |  Height:  |  Size: 98 KiB

BIN
OrderStacks.iOS/TrierImageB.ico
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 360 KiB

After

Width:  |  Height:  |  Size: 90 KiB

BIN
OrderStacks.iOS/iTunesArtwork
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 106 KiB

BIN
OrderStacks.iOS/iTunesArtwork.png
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 69 KiB

BIN
OrderStacks.iOS/iTunesArtwork@2x
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 134 KiB

BIN
OrderStacks.iOS/iTunesArtwork@2x.png
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 98 KiB

BIN
OrderStacks/Media/TrierImageBMax.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 31 KiB

BIN
OrderStacks/Media/TrierImageBMin.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 15 KiB

BIN
OrderStacks/Media/thegame.jpg
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 23 KiB

9
OrderStacks/OrderStacks.csproj
Unescape View File

@ -28,7 +28,6 @@
<Folder Include="model\gameActions\" />
<Folder Include="model\gameActions\extreme\" />
<Folder Include="model\gameActions\classic\" />
<Folder Include="Media\" />
<Folder Include="model\card\cardType\" />
<Folder Include="model\piles\" />
<Folder Include="model\gameActions\decimals\" />
@ -47,17 +46,9 @@
<ItemGroup>
<None Remove="AppRessources.config" />
<None Remove="view\MultiPlayerMode.xaml" />
<None Remove="Media\thegame.jpg" />
<None Remove="Media\Engrenage.jpeg" />
<None Remove="Media\moon.jpg" />
<None Remove="AppRessources-br.Designer.cs.orig" />
<None Remove="Media\TrierImageBMax.png" />
<None Remove="Media\TrierImageBMin.png" />
</ItemGroup>
<ItemGroup>
<EmbeddedResource Include="Media\thegame.jpg" />
<EmbeddedResource Include="Media\TrierImageBMax.png" />
<EmbeddedResource Include="Media\TrierImageBMin.png" />
</ItemGroup>
<ItemGroup>
<Reference Include="Mono.Android">

9
OrderStacks/Resx/AppResources.Designer.cs generated
Unescape View File

@ -8,10 +8,11 @@
// </auto-generated>
//------------------------------------------------------------------------------
namespace OrderStacks.Resx
{
namespace OrderStacks.Resx {
using System;
using System.Reflection;
[System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")]
[System.Diagnostics.DebuggerNonUserCodeAttribute()]
[System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

2
OrderStacks/Resx/AppResources.en-US.resx
Unescape View File

@ -165,7 +165,7 @@ An opportunity to change the theme of the application through the images of the
<value>Congratulation, you won</value>
</data>
<data name="StrLocalGame" xml:space="preserve">
<value>Local game</value>
<value>Start game</value>
</data>
<data name="StrLose" xml:space="preserve">
<value />

2
OrderStacks/Resx/AppResources.en.resx
Unescape View File

@ -165,7 +165,7 @@ An opportunity to change the theme of the application through the images of the
<value>Congratulation, you won</value>
</data>
<data name="StrLocalGame" xml:space="preserve">
<value>Local game</value>
<value>Start game</value>
</data>
<data name="StrLose" xml:space="preserve">
<value />

2
OrderStacks/Resx/AppResources.resx
Unescape View File

@ -165,7 +165,7 @@ Une possibilité de changer le thème de l'application grâce aux images du sole
<value>Bravo vous avez gagné!</value>
</data>
<data name="StrLocalGame" xml:space="preserve">
<value>Jeu en local</value>
<value>Lancer une partie</value>
</data>
<data name="StrLose" xml:space="preserve">
<value />

2
OrderStacks/model/gameActions/abstractRules/GameAction.cs
Unescape View File

@ -6,7 +6,7 @@ namespace OrderStacks.model.gameActions.abstractRules
public abstract class GameAction
{
protected Piles ListOrderedStacks { get; set; }
public string ErrorMessage { get; set; }
public string ErrorMessage { get; set; } = "";
protected GameAction(Piles listOrderedStacks)
{

2
OrderStacks/model/gameActions/abstractRules/GameMode.cs
Unescape View File

@ -14,8 +14,8 @@ namespace OrderStacks.model.gameActions.abstractRules
public int NbCardAtBeginOfTurn { get; set; }
protected Deck deck;
protected int nbMaxCard;
public string Message { get; set; }
protected bool end;
public string Message { get; set; } = "";
#region

6
OrderStacks/model/gameActions/classic/GameModeClassic.cs
Unescape View File

@ -26,14 +26,14 @@ namespace OrderStacks.model.gameActions.classic
override public void pioche(List<Card> currentHand, Player player)
{
Message = null;
Message = "";
((PiocherClassic)gameActions[0]).pioche(currentHand, deck, player, nbMaxCard);
quickSort(currentHand, 0, currentHand.Count - 1);
}
override public bool playCard(decimal valueCard, List<Card> currentHand, int orderedStackSelected, Player player, List<Card> CurrentCardPlayed)
{
Message = null;
Message = "";
if (((JouerUneCarteClassic)gameActions[1]).play(valueCard, currentHand, orderedStackSelected, player, CurrentCardPlayed))
{
return true;
@ -50,7 +50,7 @@ namespace OrderStacks.model.gameActions.classic
override public bool endTurn(List<Card> currentHand, List<Card> CurrentCardPlayed, Player player)
{
Message = null;
Message = "";
if (((TerminerSonTourClassic)gameActions[2]).end(currentHand, CurrentCardPlayed))
{
pioche(currentHand, player);

6
OrderStacks/model/gameActions/decimals/GameModeDecimal.cs
Unescape View File

@ -26,14 +26,14 @@ namespace OrderStacks.model.gameActions.decimals
override public void pioche(List<Card> currentHand, Player player)
{
Message = null;
Message = "";
((PiocherClassic)gameActions[0]).pioche(currentHand, deck, player, nbMaxCard);
quickSort(currentHand, 0, currentHand.Count - 1);
}
override public bool playCard(decimal valueCard, List<Card> currentHand, int orderedStackSelected, Player player, List<Card> CurrentCardPlayed)
{
Message = null;
Message = "";
if (((JouerUneCarteDecimal)gameActions[1]).play(valueCard, currentHand, orderedStackSelected, player, CurrentCardPlayed))
{
return true;
@ -50,7 +50,7 @@ namespace OrderStacks.model.gameActions.decimals
override public bool endTurn(List<Card> currentHand, List<Card> CurrentCardPlayed, Player player)
{
Message = null;
Message = "";
if (((TerminerSonTourDecimal)gameActions[2]).end(currentHand, CurrentCardPlayed))
{
pioche(currentHand, player);

6
OrderStacks/model/gameActions/fraction/GameModeFraction.cs
Unescape View File

@ -26,14 +26,14 @@ namespace OrderStacks.model.gameActions.fraction
override public void pioche(List<Card> currentHand, Player player)
{
Message = null;
Message = "";
((PiocherClassic)gameActions[0]).pioche(currentHand, deck, player, nbMaxCard);
quickSort(currentHand, 0, currentHand.Count - 1);
}
override public bool playCard(decimal valueCard, List<Card> currentHand, int orderedStackSelected, Player player, List<Card> CurrentCardPlayed)
{
Message = null;
Message = "";
if (((JouerUneCarteFraction)gameActions[1]).play(valueCard, currentHand, orderedStackSelected, player, CurrentCardPlayed))
{
return true;
@ -50,7 +50,7 @@ namespace OrderStacks.model.gameActions.fraction
override public bool endTurn(List<Card> currentHand, List<Card> CurrentCardPlayed, Player player)
{
Message = null;
Message = "";
if (((TerminerSonTourFraction)gameActions[2]).end(currentHand, CurrentCardPlayed))
{
pioche(currentHand, player);

2
OrderStacks/model/manager/GameManager.cs
Unescape View File

@ -15,7 +15,7 @@ namespace OrderStacks.model.manager
protected Parametreur parametreur;
protected List<Card> CurrentCardPlayed = new List<Card>();
public string EndMessage { get; set; }
public string EndMessage { get; set; } = "";
protected int currentIndexPlayer;
protected List<Card> currentHand;
protected bool win;

11
OrderStacks/view/MainPage.xaml.cs
Unescape View File

@ -77,10 +77,10 @@ namespace OrderStacks.view
*/
private void OnAlertChanged(object sender, EventArgs args)
{
if (viewmodel.Alert != null)
if (viewmodel.Alert != "")
{
DependencyService.Get<IMessage>().ShortAlert(viewmodel.Alert);
viewmodel.Alert = null;
viewmodel.Alert = "";
}
}
@ -393,7 +393,7 @@ namespace OrderStacks.view
* <param name="sender">Instance qui envoi l'événement</param>
* <param name="args">Argument de l'événement</param>
*/
private void EndTurn(object sender, EventArgs args)
private async void EndTurn(object sender, EventArgs args)
{
if (!viewmodel.endTurn())
{
@ -402,7 +402,12 @@ namespace OrderStacks.view
stackCollection.Clear();
canvasView.InvalidateSurface();
InflateStack();
if (playersNames.Count > 1)
{
await DisplayAlert("Veuillez passer le téléphone au joueur suivant : " + viewmodel.Pseudo, null, "OK");
}
InflateHand();
canvasView.InvalidateSurface();
}
}

10
OrderStacks/viewmodel/Main.cs
Unescape View File

@ -22,7 +22,7 @@ namespace OrderStacks.viewmodel
public event PropertyChangedEventHandler PropertyChanged;
private List<PlayerVM> players = new List<PlayerVM>();
private string alert = "";
public String Alert
public string Alert
{
get { return alert; }
set
@ -32,7 +32,7 @@ namespace OrderStacks.viewmodel
}
}
private string pseudo = "Pseudo";
public String Pseudo
public string Pseudo
{
get { return pseudo; }
set
@ -197,8 +197,12 @@ namespace OrderStacks.viewmodel
public bool endTurn()
{
bool isEnd = gameManager.endTurn();
if (string.IsNullOrEmpty(gameManager.EndMessage) && !isEnd)
{
return false;
}
Alert = gameManager.EndMessage;
return isEnd;
return true;
}
}

BIN
com.uca.thegameextreme.apk → com.uca.orderStacks.apk
View File

Binary file not shown.

BIN
com.uca.thegameextreme-Signed.apk
View File

Binary file not shown.
Write Preview
Loading…
Cancel
Save