From f9801ab21989e330015ffa274493e775671fe865 Mon Sep 17 00:00:00 2001 From: Jose Date: Wed, 12 Sep 2018 14:48:57 +0200 Subject: Make test controllers layout more consistent Close #184 --- .../controller/controller.iOS/AppDelegate.cs | 64 ------- .../AppIcon.appiconset/Contents.json | 117 ------------ .../AppIcon.appiconset/Icon1024.png | Bin 70429 -> 0 bytes .../Assets.xcassets/AppIcon.appiconset/Icon120.png | Bin 3773 -> 0 bytes .../Assets.xcassets/AppIcon.appiconset/Icon152.png | Bin 4750 -> 0 bytes .../Assets.xcassets/AppIcon.appiconset/Icon167.png | Bin 4692 -> 0 bytes .../Assets.xcassets/AppIcon.appiconset/Icon180.png | Bin 5192 -> 0 bytes .../Assets.xcassets/AppIcon.appiconset/Icon20.png | Bin 1313 -> 0 bytes .../Assets.xcassets/AppIcon.appiconset/Icon29.png | Bin 845 -> 0 bytes .../Assets.xcassets/AppIcon.appiconset/Icon40.png | Bin 1101 -> 0 bytes .../Assets.xcassets/AppIcon.appiconset/Icon58.png | Bin 1761 -> 0 bytes .../Assets.xcassets/AppIcon.appiconset/Icon60.png | Bin 2537 -> 0 bytes .../Assets.xcassets/AppIcon.appiconset/Icon76.png | Bin 2332 -> 0 bytes .../Assets.xcassets/AppIcon.appiconset/Icon80.png | Bin 2454 -> 0 bytes .../Assets.xcassets/AppIcon.appiconset/Icon87.png | Bin 2758 -> 0 bytes .../controller/controller.iOS/Entitlements.plist | 6 - .../xamarin/controller/controller.iOS/Info.plist | 38 ---- csharp/xamarin/controller/controller.iOS/Main.cs | 24 --- .../controller.iOS/Properties/AssemblyInfo.cs | 36 ---- .../controller.iOS/Resources/Default-568h@2x.png | Bin 8884 -> 0 bytes .../controller.iOS/Resources/Default-Portrait.png | Bin 10710 -> 0 bytes .../Resources/Default-Portrait@2x.png | Bin 34540 -> 0 bytes .../controller.iOS/Resources/Default.png | Bin 7243 -> 0 bytes .../controller.iOS/Resources/Default@2x.png | Bin 8368 -> 0 bytes .../Resources/LaunchScreen.storyboard | 39 ---- .../controller.iOS/controller.iOS.csproj | 202 --------------------- 26 files changed, 526 deletions(-) delete mode 100644 csharp/xamarin/controller/controller.iOS/AppDelegate.cs delete mode 100644 csharp/xamarin/controller/controller.iOS/Assets.xcassets/AppIcon.appiconset/Contents.json delete mode 100644 csharp/xamarin/controller/controller.iOS/Assets.xcassets/AppIcon.appiconset/Icon1024.png delete mode 100644 csharp/xamarin/controller/controller.iOS/Assets.xcassets/AppIcon.appiconset/Icon120.png delete mode 100644 csharp/xamarin/controller/controller.iOS/Assets.xcassets/AppIcon.appiconset/Icon152.png delete mode 100644 csharp/xamarin/controller/controller.iOS/Assets.xcassets/AppIcon.appiconset/Icon167.png delete mode 100644 csharp/xamarin/controller/controller.iOS/Assets.xcassets/AppIcon.appiconset/Icon180.png delete mode 100644 csharp/xamarin/controller/controller.iOS/Assets.xcassets/AppIcon.appiconset/Icon20.png delete mode 100644 csharp/xamarin/controller/controller.iOS/Assets.xcassets/AppIcon.appiconset/Icon29.png delete mode 100644 csharp/xamarin/controller/controller.iOS/Assets.xcassets/AppIcon.appiconset/Icon40.png delete mode 100644 csharp/xamarin/controller/controller.iOS/Assets.xcassets/AppIcon.appiconset/Icon58.png delete mode 100644 csharp/xamarin/controller/controller.iOS/Assets.xcassets/AppIcon.appiconset/Icon60.png delete mode 100644 csharp/xamarin/controller/controller.iOS/Assets.xcassets/AppIcon.appiconset/Icon76.png delete mode 100644 csharp/xamarin/controller/controller.iOS/Assets.xcassets/AppIcon.appiconset/Icon80.png delete mode 100644 csharp/xamarin/controller/controller.iOS/Assets.xcassets/AppIcon.appiconset/Icon87.png delete mode 100644 csharp/xamarin/controller/controller.iOS/Entitlements.plist delete mode 100644 csharp/xamarin/controller/controller.iOS/Info.plist delete mode 100644 csharp/xamarin/controller/controller.iOS/Main.cs delete mode 100644 csharp/xamarin/controller/controller.iOS/Properties/AssemblyInfo.cs delete mode 100644 csharp/xamarin/controller/controller.iOS/Resources/Default-568h@2x.png delete mode 100644 csharp/xamarin/controller/controller.iOS/Resources/Default-Portrait.png delete mode 100644 csharp/xamarin/controller/controller.iOS/Resources/Default-Portrait@2x.png delete mode 100644 csharp/xamarin/controller/controller.iOS/Resources/Default.png delete mode 100644 csharp/xamarin/controller/controller.iOS/Resources/Default@2x.png delete mode 100644 csharp/xamarin/controller/controller.iOS/Resources/LaunchScreen.storyboard delete mode 100644 csharp/xamarin/controller/controller.iOS/controller.iOS.csproj (limited to 'csharp/xamarin/controller/controller.iOS') diff --git a/csharp/xamarin/controller/controller.iOS/AppDelegate.cs b/csharp/xamarin/controller/controller.iOS/AppDelegate.cs deleted file mode 100644 index 1f4728470ab..00000000000 --- a/csharp/xamarin/controller/controller.iOS/AppDelegate.cs +++ /dev/null @@ -1,64 +0,0 @@ -// ********************************************************************** -// -// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved. -// -// This copy of Ice is licensed to you under the terms described in the -// ICE_LICENSE file included in this distribution. -// -// ********************************************************************** - -using Foundation; -using UIKit; - -namespace controller.iOS -{ - // The UIApplicationDelegate for the application. This class is responsible for launching the - // User Interface of the application, as well as listening (and optionally responding) to - // application events from iOS. - [Register("AppDelegate")] - public partial class AppDelegate : global::Xamarin.Forms.Platform.iOS.FormsApplicationDelegate, - Test.PlatformAdapter - { - public string processControllerIdentity() - { - if(isEmulator()) - { - return "iPhoneSimulator/com.zeroc.Xamarin-Test-Controller"; - } - else - { - return "iPhoneOS/com.zeroc.Xamarin-Test-Controller"; - } - } - - // - // This method is invoked when the application has loaded and is ready to run. In this - // method you should instantiate the window, load the UI into it and then make the window - // visible. - // - // You have 17 seconds to return from this method, or iOS will terminate your application. - // - public override bool FinishedLaunching(UIApplication app, NSDictionary options) - { - global::Xamarin.Forms.Forms.Init(); - LoadApplication(new App(this)); - - return base.FinishedLaunching(app, options); - } - - public bool isEmulator() - { - return true; - } - - public string processControllerRegistryHost() - { - return "127.0.0.1"; - } - - public bool registerProcessController() - { - return true; - } - } -} diff --git a/csharp/xamarin/controller/controller.iOS/Assets.xcassets/AppIcon.appiconset/Contents.json b/csharp/xamarin/controller/controller.iOS/Assets.xcassets/AppIcon.appiconset/Contents.json deleted file mode 100644 index 8db9066b38a..00000000000 --- a/csharp/xamarin/controller/controller.iOS/Assets.xcassets/AppIcon.appiconset/Contents.json +++ /dev/null @@ -1,117 +0,0 @@ -{ - "images": [ - { - "scale": "2x", - "size": "20x20", - "idiom": "iphone", - "filename": "Icon40.png" - }, - { - "scale": "3x", - "size": "20x20", - "idiom": "iphone", - "filename": "Icon60.png" - }, - { - "scale": "2x", - "size": "29x29", - "idiom": "iphone", - "filename": "Icon58.png" - }, - { - "scale": "3x", - "size": "29x29", - "idiom": "iphone", - "filename": "Icon87.png" - }, - { - "scale": "2x", - "size": "40x40", - "idiom": "iphone", - "filename": "Icon80.png" - }, - { - "scale": "3x", - "size": "40x40", - "idiom": "iphone", - "filename": "Icon120.png" - }, - { - "scale": "2x", - "size": "60x60", - "idiom": "iphone", - "filename": "Icon120.png" - }, - { - "scale": "3x", - "size": "60x60", - "idiom": "iphone", - "filename": "Icon180.png" - }, - { - "scale": "1x", - "size": "20x20", - "idiom": "ipad", - "filename": "Icon20.png" - }, - { - "scale": "2x", - "size": "20x20", - "idiom": "ipad", - "filename": "Icon40.png" - }, - { - "scale": "1x", - "size": "29x29", - "idiom": "ipad", - "filename": "Icon29.png" - }, - { - "scale": "2x", - "size": "29x29", - "idiom": "ipad", - "filename": "Icon58.png" - }, - { - "scale": "1x", - "size": "40x40", - "idiom": "ipad", - "filename": "Icon40.png" - }, - { - "scale": "2x", - "size": "40x40", - "idiom": "ipad", - "filename": "Icon80.png" - }, - { - "scale": "1x", - "size": "76x76", - "idiom": "ipad", - "filename": "Icon76.png" - }, - { - "scale": "2x", - "size": "76x76", - "idiom": "ipad", - "filename": "Icon152.png" - }, - { - "scale": "2x", - "size": "83.5x83.5", - "idiom": "ipad", - "filename": "Icon167.png" - }, - { - "scale": "1x", - "size": "1024x1024", - "idiom": "ios-marketing", - "filename": "Icon1024.png" - } - ], - "properties": {}, - "info": { - "version": 1, - "author": "xcode" - } -} diff --git a/csharp/xamarin/controller/controller.iOS/Assets.xcassets/AppIcon.appiconset/Icon1024.png b/csharp/xamarin/controller/controller.iOS/Assets.xcassets/AppIcon.appiconset/Icon1024.png deleted file mode 100644 index 9174c989a9c..00000000000 Binary files a/csharp/xamarin/controller/controller.iOS/Assets.xcassets/AppIcon.appiconset/Icon1024.png and /dev/null differ diff --git a/csharp/xamarin/controller/controller.iOS/Assets.xcassets/AppIcon.appiconset/Icon120.png b/csharp/xamarin/controller/controller.iOS/Assets.xcassets/AppIcon.appiconset/Icon120.png deleted file mode 100644 index 9c60a1761db..00000000000 Binary files a/csharp/xamarin/controller/controller.iOS/Assets.xcassets/AppIcon.appiconset/Icon120.png and /dev/null differ diff --git a/csharp/xamarin/controller/controller.iOS/Assets.xcassets/AppIcon.appiconset/Icon152.png b/csharp/xamarin/controller/controller.iOS/Assets.xcassets/AppIcon.appiconset/Icon152.png deleted file mode 100644 index 448d6efb577..00000000000 Binary files a/csharp/xamarin/controller/controller.iOS/Assets.xcassets/AppIcon.appiconset/Icon152.png and /dev/null differ diff --git a/csharp/xamarin/controller/controller.iOS/Assets.xcassets/AppIcon.appiconset/Icon167.png b/csharp/xamarin/controller/controller.iOS/Assets.xcassets/AppIcon.appiconset/Icon167.png deleted file mode 100644 index 8524768f8d7..00000000000 Binary files a/csharp/xamarin/controller/controller.iOS/Assets.xcassets/AppIcon.appiconset/Icon167.png and /dev/null differ diff --git a/csharp/xamarin/controller/controller.iOS/Assets.xcassets/AppIcon.appiconset/Icon180.png b/csharp/xamarin/controller/controller.iOS/Assets.xcassets/AppIcon.appiconset/Icon180.png deleted file mode 100644 index 60a64703c0f..00000000000 Binary files a/csharp/xamarin/controller/controller.iOS/Assets.xcassets/AppIcon.appiconset/Icon180.png and /dev/null differ diff --git a/csharp/xamarin/controller/controller.iOS/Assets.xcassets/AppIcon.appiconset/Icon20.png b/csharp/xamarin/controller/controller.iOS/Assets.xcassets/AppIcon.appiconset/Icon20.png deleted file mode 100644 index 45268a641c5..00000000000 Binary files a/csharp/xamarin/controller/controller.iOS/Assets.xcassets/AppIcon.appiconset/Icon20.png and /dev/null differ diff --git a/csharp/xamarin/controller/controller.iOS/Assets.xcassets/AppIcon.appiconset/Icon29.png b/csharp/xamarin/controller/controller.iOS/Assets.xcassets/AppIcon.appiconset/Icon29.png deleted file mode 100644 index 6a6c77a8b4c..00000000000 Binary files a/csharp/xamarin/controller/controller.iOS/Assets.xcassets/AppIcon.appiconset/Icon29.png and /dev/null differ diff --git a/csharp/xamarin/controller/controller.iOS/Assets.xcassets/AppIcon.appiconset/Icon40.png b/csharp/xamarin/controller/controller.iOS/Assets.xcassets/AppIcon.appiconset/Icon40.png deleted file mode 100644 index cc7edcf5cb4..00000000000 Binary files a/csharp/xamarin/controller/controller.iOS/Assets.xcassets/AppIcon.appiconset/Icon40.png and /dev/null differ diff --git a/csharp/xamarin/controller/controller.iOS/Assets.xcassets/AppIcon.appiconset/Icon58.png b/csharp/xamarin/controller/controller.iOS/Assets.xcassets/AppIcon.appiconset/Icon58.png deleted file mode 100644 index 1ad04f004b6..00000000000 Binary files a/csharp/xamarin/controller/controller.iOS/Assets.xcassets/AppIcon.appiconset/Icon58.png and /dev/null differ diff --git a/csharp/xamarin/controller/controller.iOS/Assets.xcassets/AppIcon.appiconset/Icon60.png b/csharp/xamarin/controller/controller.iOS/Assets.xcassets/AppIcon.appiconset/Icon60.png deleted file mode 100644 index 2dd52620a8f..00000000000 Binary files a/csharp/xamarin/controller/controller.iOS/Assets.xcassets/AppIcon.appiconset/Icon60.png and /dev/null differ diff --git a/csharp/xamarin/controller/controller.iOS/Assets.xcassets/AppIcon.appiconset/Icon76.png b/csharp/xamarin/controller/controller.iOS/Assets.xcassets/AppIcon.appiconset/Icon76.png deleted file mode 100644 index b058cae2f44..00000000000 Binary files a/csharp/xamarin/controller/controller.iOS/Assets.xcassets/AppIcon.appiconset/Icon76.png and /dev/null differ diff --git a/csharp/xamarin/controller/controller.iOS/Assets.xcassets/AppIcon.appiconset/Icon80.png b/csharp/xamarin/controller/controller.iOS/Assets.xcassets/AppIcon.appiconset/Icon80.png deleted file mode 100644 index 02e47a26115..00000000000 Binary files a/csharp/xamarin/controller/controller.iOS/Assets.xcassets/AppIcon.appiconset/Icon80.png and /dev/null differ diff --git a/csharp/xamarin/controller/controller.iOS/Assets.xcassets/AppIcon.appiconset/Icon87.png b/csharp/xamarin/controller/controller.iOS/Assets.xcassets/AppIcon.appiconset/Icon87.png deleted file mode 100644 index 4954a4bd33f..00000000000 Binary files a/csharp/xamarin/controller/controller.iOS/Assets.xcassets/AppIcon.appiconset/Icon87.png and /dev/null differ diff --git a/csharp/xamarin/controller/controller.iOS/Entitlements.plist b/csharp/xamarin/controller/controller.iOS/Entitlements.plist deleted file mode 100644 index 9ae599370b4..00000000000 --- a/csharp/xamarin/controller/controller.iOS/Entitlements.plist +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - diff --git a/csharp/xamarin/controller/controller.iOS/Info.plist b/csharp/xamarin/controller/controller.iOS/Info.plist deleted file mode 100644 index 6ac54ed218e..00000000000 --- a/csharp/xamarin/controller/controller.iOS/Info.plist +++ /dev/null @@ -1,38 +0,0 @@ - - - - - UIDeviceFamily - - 1 - 2 - - UISupportedInterfaceOrientations - - UIInterfaceOrientationPortrait - UIInterfaceOrientationLandscapeLeft - UIInterfaceOrientationLandscapeRight - - UISupportedInterfaceOrientations~ipad - - UIInterfaceOrientationPortrait - UIInterfaceOrientationPortraitUpsideDown - UIInterfaceOrientationLandscapeLeft - UIInterfaceOrientationLandscapeRight - - MinimumOSVersion - 8.0 - CFBundleDisplayName - TestController - CFBundleIdentifier - com.zeroc.Xamarin-Test-Controller - CFBundleVersion - 1.0 - UILaunchStoryboardName - LaunchScreen - CFBundleName - controller - XSAppIconAssets - Assets.xcassets/AppIcon.appiconset - - diff --git a/csharp/xamarin/controller/controller.iOS/Main.cs b/csharp/xamarin/controller/controller.iOS/Main.cs deleted file mode 100644 index 70afb4f1b8d..00000000000 --- a/csharp/xamarin/controller/controller.iOS/Main.cs +++ /dev/null @@ -1,24 +0,0 @@ -// ********************************************************************** -// -// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved. -// -// This copy of Ice is licensed to you under the terms described in the -// ICE_LICENSE file included in this distribution. -// -// ********************************************************************** - -using UIKit; - -namespace controller.iOS -{ - public class Application - { - // This is the main entry point of the application. - static void Main(string[] args) - { - // if you want to use a different Application Delegate class from "AppDelegate" - // you can specify it here. - UIApplication.Main(args, null, "AppDelegate"); - } - } -} diff --git a/csharp/xamarin/controller/controller.iOS/Properties/AssemblyInfo.cs b/csharp/xamarin/controller/controller.iOS/Properties/AssemblyInfo.cs deleted file mode 100644 index e1e48515913..00000000000 --- a/csharp/xamarin/controller/controller.iOS/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,36 +0,0 @@ -using System.Reflection; -using System.Runtime.CompilerServices; -using System.Runtime.InteropServices; - -// 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("controller.iOS")] -[assembly: AssemblyDescription("")] -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("")] -[assembly: AssemblyProduct("controller.iOS")] -[assembly: AssemblyCopyright("Copyright © 2014")] -[assembly: AssemblyTrademark("")] -[assembly: AssemblyCulture("")] - -// Setting ComVisible to false makes the types in this assembly not visible -// to COM components. If you need to access a type in this assembly from -// COM, set the ComVisible attribute to true on that type. -[assembly: ComVisible(false)] - -// The following GUID is for the ID of the typelib if this project is exposed to COM -[assembly: Guid("72bdc44f-c588-44f3-b6df-9aace7daafdd")] - -// Version information for an assembly consists of the following four values: -// -// Major Version -// Minor Version -// Build Number -// Revision -// -// You can specify all the values or you can default the Build and Revision Numbers -// by using the '*' as shown below: -// [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("1.0.0.0")] -[assembly: AssemblyFileVersion("1.0.0.0")] diff --git a/csharp/xamarin/controller/controller.iOS/Resources/Default-568h@2x.png b/csharp/xamarin/controller/controller.iOS/Resources/Default-568h@2x.png deleted file mode 100644 index 26c6461e50a..00000000000 Binary files a/csharp/xamarin/controller/controller.iOS/Resources/Default-568h@2x.png and /dev/null differ diff --git a/csharp/xamarin/controller/controller.iOS/Resources/Default-Portrait.png b/csharp/xamarin/controller/controller.iOS/Resources/Default-Portrait.png deleted file mode 100644 index 5d0d1ab4c6d..00000000000 Binary files a/csharp/xamarin/controller/controller.iOS/Resources/Default-Portrait.png and /dev/null differ diff --git a/csharp/xamarin/controller/controller.iOS/Resources/Default-Portrait@2x.png b/csharp/xamarin/controller/controller.iOS/Resources/Default-Portrait@2x.png deleted file mode 100644 index 0ee2688e8f1..00000000000 Binary files a/csharp/xamarin/controller/controller.iOS/Resources/Default-Portrait@2x.png and /dev/null differ diff --git a/csharp/xamarin/controller/controller.iOS/Resources/Default.png b/csharp/xamarin/controller/controller.iOS/Resources/Default.png deleted file mode 100644 index b74643c0aa3..00000000000 Binary files a/csharp/xamarin/controller/controller.iOS/Resources/Default.png and /dev/null differ diff --git a/csharp/xamarin/controller/controller.iOS/Resources/Default@2x.png b/csharp/xamarin/controller/controller.iOS/Resources/Default@2x.png deleted file mode 100644 index dbd6bd3e864..00000000000 Binary files a/csharp/xamarin/controller/controller.iOS/Resources/Default@2x.png and /dev/null differ diff --git a/csharp/xamarin/controller/controller.iOS/Resources/LaunchScreen.storyboard b/csharp/xamarin/controller/controller.iOS/Resources/LaunchScreen.storyboard deleted file mode 100644 index a639c2f1a5b..00000000000 --- a/csharp/xamarin/controller/controller.iOS/Resources/LaunchScreen.storyboard +++ /dev/null @@ -1,39 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/csharp/xamarin/controller/controller.iOS/controller.iOS.csproj b/csharp/xamarin/controller/controller.iOS/controller.iOS.csproj deleted file mode 100644 index dd38ce358c3..00000000000 --- a/csharp/xamarin/controller/controller.iOS/controller.iOS.csproj +++ /dev/null @@ -1,202 +0,0 @@ - - - - Debug - iPhoneSimulator - 8.0.30703 - 2.0 - {FD70EC29-8D51-4F4F-8AD7-64170F22575D} - {FEACFBD2-3405-455C-9665-78FE426C6842};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} - {6143fdea-f3c2-4a09-aafa-6e230626515e} - Exe - controller.iOS - Resources - controller.iOS - - - - - true - full - false - bin\iPhoneSimulator\Debug - DEBUG - prompt - 4 - false - x86_64 - None - true - iPhone Developer - - - - - - true - - - none - true - bin\iPhoneSimulator\Release - prompt - 4 - None - x86_64 - false - true - true - iPhone Developer - - - - - - true - - - true - full - false - bin\iPhone\Debug - DEBUG - prompt - 4 - false - ARM64 - iPhone Developer - true - Entitlements.plist - - - - none - true - bin\iPhone\Release - prompt - 4 - ARM64 - false - iPhone Developer: Jose Gutierrez de la Concha (D477889FLX) - - - true - VS: WildCard Development - - - - - none - True - bin\iPhone\Ad-Hoc - prompt - 4 - False - ARM64 - True - Automatic:AdHoc - iPhone Distribution - Entitlements.plist - - - none - True - bin\iPhone\AppStore - prompt - 4 - False - ARM64 - Automatic:AppStore - iPhone Distribution - Entitlements.plist - - - - - - - - - - - - - - - - - - - - - - - - - - - - - false - - - false - - - false - - - false - - - false - - - false - - - false - - - false - - - false - - - false - - - false - - - false - - - false - - - false - - - - - - - - - - - - - - - {a62bf5e3-ad66-4edb-9bba-3e9bd6148425} - testcommon - - - {D86C4CA0-7EF8-4A9B-B42F-CB2FBBC7B68F} - controller - - - \ No newline at end of file -- cgit v1.2.3