Skip to content

Commit

Permalink
Use a single project for the iPhone & iPad UIs.
Browse files Browse the repository at this point in the history 
This is supported by MD w/o extra post-build step hacks, and is currently
considered to be the preferred way to do a universal build.
  • Loading branch information
@jonpryor
jonpryor committed Mar 1, 2010
1 parent b7f2ecf commit 85ec16e
Show file tree
Hide file tree
Showing 45 changed files with 181 additions and 479 deletions.
4 changes: 0 additions & 4 deletions monocatalog-md/Main.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,6 @@ class Application
{
static void Main (string [] args)
{
// Ensure that dependent assemblies are loaded first
new MonoCatalog.iPhone.UI ();
new MonoCatalog.iPad.UI ();

// It will load the main UI as specified in the
// Info.plist file (MainWindow.nib)
UIApplication.Main (args, null, null);
Expand Down
76 changes: 0 additions & 76 deletions monocatalog-md/core/monocatalog-core.csproj
View file

This file was deleted.

153 changes: 141 additions & 12 deletions monocatalog-md/monocatalog.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -64,9 +64,130 @@
<Reference Include="System.Core" />
<Reference Include="monotouch" />
<Reference Include="System.Data" />
<Reference Include="Mono.Data.Sqlite" />
</ItemGroup>
<ItemGroup>
<Compile Include="Main.cs" />
<Compile Include="core\CoreTextDemo.cs" />
<Compile Include="core\AlertsViewDemo.cs" />
<Compile Include="ui-iPad\CoreTextController_Pad.xib.cs">
<DependentUpon>ui-iPad\CoreTextController_Pad.xib</DependentUpon>
</Compile>
<Compile Include="ui-iPad\CoreTextController_Pad.xib.designer.cs">
<DependentUpon>ui-iPad\CoreTextController_Pad.xib</DependentUpon>
</Compile>
<Compile Include="ui-iPad\MainWindow_Pad.xib.cs">
<DependentUpon>ui-iPad\MainWindow_Pad.xib</DependentUpon>
</Compile>
<Compile Include="ui-iPad\MainWindow_Pad.xib.designer.cs">
<DependentUpon>ui-iPad\MainWindow_Pad.xib</DependentUpon>
</Compile>
<Compile Include="ui-iPad\DetailView.xib.designer.cs">
<DependentUpon>ui-iPad\DetailView.xib</DependentUpon>
</Compile>
<Compile Include="ui-iPad\AlertsViewController_Pad.xib.cs">
<DependentUpon>ui-iPad\AlertsViewController_Pad.xib</DependentUpon>
</Compile>
<Compile Include="ui-iPad\AlertsViewController_Pad.xib.designer.cs">
<DependentUpon>ui-iPad\AlertsViewController_Pad.xib</DependentUpon>
</Compile>
<Compile Include="ui-iPhone\MainWindow.xib.designer.cs">
<DependentUpon>ui-iPhone\MainWindow.xib</DependentUpon>
</Compile>
<Compile Include="ui-iPhone\AlertsViewController.xib.designer.cs">
<DependentUpon>ui-iPhone\AlertsViewController.xib</DependentUpon>
</Compile>
<Compile Include="ui-iPhone\AlertsViewController.xib.cs">
<DependentUpon>ui-iPhone\AlertsViewController.xib</DependentUpon>
</Compile>
<Compile Include="ui-iPhone\ButtonsViewController.xib.designer.cs">
<DependentUpon>ui-iPhone\ButtonsViewController.xib</DependentUpon>
</Compile>
<Compile Include="ui-iPhone\ButtonsViewController.xib.cs">
<DependentUpon>ui-iPhone\ButtonsViewController.xib</DependentUpon>
</Compile>
<Compile Include="ui-iPhone\ControlsViewController.xib.designer.cs">
<DependentUpon>ui-iPhone\ControlsViewController.xib</DependentUpon>
</Compile>
<Compile Include="ui-iPhone\ControlsViewController.xib.cs">
<DependentUpon>ui-iPhone\ControlsViewController.xib</DependentUpon>
</Compile>
<Compile Include="ui-iPhone\ImagesViewController.xib.designer.cs">
<DependentUpon>ui-iPhone\ImagesViewController.xib</DependentUpon>
</Compile>
<Compile Include="ui-iPhone\ImagesViewController.xib.cs">
<DependentUpon>ui-iPhone\ImagesViewController.xib</DependentUpon>
</Compile>
<Compile Include="ui-iPhone\SegmentViewController.xib.designer.cs">
<DependentUpon>ui-iPhone\SegmentViewController.xib</DependentUpon>
</Compile>
<Compile Include="ui-iPhone\SegmentViewController.xib.cs">
<DependentUpon>ui-iPhone\SegmentViewController.xib</DependentUpon>
</Compile>
<Compile Include="ui-iPhone\TextFieldController.xib.designer.cs">
<DependentUpon>ui-iPhone\TextFieldController.xib</DependentUpon>
</Compile>
<Compile Include="ui-iPhone\TextFieldController.xib.cs">
<DependentUpon>ui-iPhone\TextFieldController.xib</DependentUpon>
</Compile>
<Compile Include="ui-iPhone\TextViewController.xib.designer.cs">
<DependentUpon>ui-iPhone\TextViewController.xib</DependentUpon>
</Compile>
<Compile Include="ui-iPhone\TextViewController.xib.cs">
<DependentUpon>ui-iPhone\TextViewController.xib</DependentUpon>
</Compile>
<Compile Include="ui-iPhone\ToolbarViewController.xib.designer.cs">
<DependentUpon>ui-iPhone\ToolbarViewController.xib</DependentUpon>
</Compile>
<Compile Include="ui-iPhone\ToolbarViewController.xib.cs">
<DependentUpon>ui-iPhone\ToolbarViewController.xib</DependentUpon>
</Compile>
<Compile Include="ui-iPhone\TransitionViewController.xib.designer.cs">
<DependentUpon>ui-iPhone\TransitionViewController.xib</DependentUpon>
</Compile>
<Compile Include="ui-iPhone\TransitionViewController.xib.cs">
<DependentUpon>ui-iPhone\TransitionViewController.xib</DependentUpon>
</Compile>
<Compile Include="ui-iPhone\WebViewController.xib.designer.cs">
<DependentUpon>ui-iPhone\WebViewController.xib</DependentUpon>
</Compile>
<Compile Include="ui-iPhone\WebViewController.xib.cs">
<DependentUpon>ui-iPhone\WebViewController.xib</DependentUpon>
</Compile>
<Compile Include="ui-iPhone\MainWindow.xib.cs">
<DependentUpon>ui-iPhone\MainWindow.xib</DependentUpon>
</Compile>
<Compile Include="ui-iPhone\PickerViewController.xib.designer.cs">
<DependentUpon>ui-iPhone\PickerViewController.xib</DependentUpon>
</Compile>
<Compile Include="ui-iPhone\PickerViewController.xib.cs">
<DependentUpon>ui-iPhone\PickerViewController.xib</DependentUpon>
</Compile>
<Compile Include="ui-iPhone\SearchBarController.xib.designer.cs">
<DependentUpon>ui-iPhone\SearchBarController.xib</DependentUpon>
</Compile>
<Compile Include="ui-iPhone\SearchBarController.xib.cs">
<DependentUpon>ui-iPhone\SearchBarController.xib</DependentUpon>
</Compile>
<Compile Include="ui-iPhone\PickerCustomModel.cs" />
<Compile Include="ui-iPhone\AddressBookController.xib.cs">
<DependentUpon>ui-iPhone\AddressBookController.xib</DependentUpon>
</Compile>
<Compile Include="ui-iPhone\AddressBookController.xib.designer.cs">
<DependentUpon>ui-iPhone\AddressBookController.xib</DependentUpon>
</Compile>
<Compile Include="ui-iPhone\MonoDataSqlite.xib.cs">
<DependentUpon>ui-iPhone\MonoDataSqlite.xib</DependentUpon>
</Compile>
<Compile Include="ui-iPhone\MonoDataSqlite.xib.designer.cs">
<DependentUpon>ui-iPhone\MonoDataSqlite.xib</DependentUpon>
</Compile>
<Compile Include="ui-iPhone\CoreTextController.xib.cs">
<DependentUpon>ui-iPhone\CoreTextController.xib</DependentUpon>
</Compile>
<Compile Include="ui-iPhone\CoreTextController.xib.designer.cs">
<DependentUpon>ui-iPhone\CoreTextController.xib</DependentUpon>
</Compile>
</ItemGroup>
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
<ProjectExtensions>
Expand Down Expand Up @@ -105,17 +226,25 @@
<None Include="Info.plist" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="core\monocatalog-core.csproj">
<Project>{BAC82CEB-9D7B-462F-9A49-58D8ACCE0840}</Project>
<Name>monocatalog-core</Name>
</ProjectReference>
<ProjectReference Include="ui-iPad\monocatalog-ui-iPad.csproj">
<Project>{8E8D89B5-EEA2-4A28-81A9-E9DF0DD58A01}</Project>
<Name>monocatalog-ui-iPad</Name>
</ProjectReference>
<ProjectReference Include="ui-iPhone\monocatalog-ui-iPhone.csproj">
<Project>{E3CE49AE-4927-410F-97D4-1EDC3C31224C}</Project>
<Name>monocatalog-ui-iPhone</Name>
</ProjectReference>
<Page Include="ui-iPad\AlertsViewController_Pad.xib" />
<Page Include="ui-iPad\CoreTextController_Pad.xib" />
<Page Include="ui-iPad\DetailView.xib" />
<Page Include="ui-iPad\MainWindow_Pad.xib" />
<Page Include="ui-iPhone\AddressBookController.xib" />
<Page Include="ui-iPhone\AlertsViewController.xib" />
<Page Include="ui-iPhone\ButtonsViewController.xib" />
<Page Include="ui-iPhone\ControlsViewController.xib" />
<Page Include="ui-iPhone\CoreTextController.xib" />
<Page Include="ui-iPhone\ImagesViewController.xib" />
<Page Include="ui-iPhone\MainWindow.xib" />
<Page Include="ui-iPhone\MonoDataSqlite.xib" />
<Page Include="ui-iPhone\PickerViewController.xib" />
<Page Include="ui-iPhone\SearchBarController.xib" />
<Page Include="ui-iPhone\SegmentViewController.xib" />
<Page Include="ui-iPhone\TextFieldController.xib" />
<Page Include="ui-iPhone\TextViewController.xib" />
<Page Include="ui-iPhone\ToolbarViewController.xib" />
<Page Include="ui-iPhone\TransitionViewController.xib" />
<Page Include="ui-iPhone\WebViewController.xib" />
</ItemGroup>
</Project>
30 changes: 0 additions & 30 deletions monocatalog-md/monocatalog.sln
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,6 @@ Microsoft Visual Studio Solution File, Format Version 10.00
# Visual Studio 2008
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "monocatalog", "monocatalog.csproj", "{B757F754-E31A-4EBD-BDBD-0B86875D78DB}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "monocatalog-ui-iPad", "ui-iPad\monocatalog-ui-iPad.csproj", "{8E8D89B5-EEA2-4A28-81A9-E9DF0DD58A01}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "monocatalog-ui-iPhone", "ui-iPhone\monocatalog-ui-iPhone.csproj", "{E3CE49AE-4927-410F-97D4-1EDC3C31224C}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "monocatalog-core", "core\monocatalog-core.csproj", "{BAC82CEB-9D7B-462F-9A49-58D8ACCE0840}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|iPhoneSimulator = Debug|iPhoneSimulator
Expand All @@ -17,14 +11,6 @@ Global
Release|iPhone = Release|iPhone
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{8E8D89B5-EEA2-4A28-81A9-E9DF0DD58A01}.Debug|iPhone.ActiveCfg = Debug|iPhone
{8E8D89B5-EEA2-4A28-81A9-E9DF0DD58A01}.Debug|iPhone.Build.0 = Debug|iPhone
{8E8D89B5-EEA2-4A28-81A9-E9DF0DD58A01}.Debug|iPhoneSimulator.ActiveCfg = Debug|iPhoneSimulator
{8E8D89B5-EEA2-4A28-81A9-E9DF0DD58A01}.Debug|iPhoneSimulator.Build.0 = Debug|iPhoneSimulator
{8E8D89B5-EEA2-4A28-81A9-E9DF0DD58A01}.Release|iPhone.ActiveCfg = Release|iPhone
{8E8D89B5-EEA2-4A28-81A9-E9DF0DD58A01}.Release|iPhone.Build.0 = Release|iPhone
{8E8D89B5-EEA2-4A28-81A9-E9DF0DD58A01}.Release|iPhoneSimulator.ActiveCfg = Release|iPhoneSimulator
{8E8D89B5-EEA2-4A28-81A9-E9DF0DD58A01}.Release|iPhoneSimulator.Build.0 = Release|iPhoneSimulator
{B757F754-E31A-4EBD-BDBD-0B86875D78DB}.Debug|iPhone.ActiveCfg = Debug|iPhone
{B757F754-E31A-4EBD-BDBD-0B86875D78DB}.Debug|iPhone.Build.0 = Debug|iPhone
{B757F754-E31A-4EBD-BDBD-0B86875D78DB}.Debug|iPhoneSimulator.ActiveCfg = Debug|iPhoneSimulator
Expand All @@ -33,22 +19,6 @@ Global
{B757F754-E31A-4EBD-BDBD-0B86875D78DB}.Release|iPhone.Build.0 = Release|iPhone
{B757F754-E31A-4EBD-BDBD-0B86875D78DB}.Release|iPhoneSimulator.ActiveCfg = Release|iPhoneSimulator
{B757F754-E31A-4EBD-BDBD-0B86875D78DB}.Release|iPhoneSimulator.Build.0 = Release|iPhoneSimulator
{BAC82CEB-9D7B-462F-9A49-58D8ACCE0840}.Debug|iPhone.ActiveCfg = Debug|iPhone
{BAC82CEB-9D7B-462F-9A49-58D8ACCE0840}.Debug|iPhone.Build.0 = Debug|iPhone
{BAC82CEB-9D7B-462F-9A49-58D8ACCE0840}.Debug|iPhoneSimulator.ActiveCfg = Debug|iPhoneSimulator
{BAC82CEB-9D7B-462F-9A49-58D8ACCE0840}.Debug|iPhoneSimulator.Build.0 = Debug|iPhoneSimulator
{BAC82CEB-9D7B-462F-9A49-58D8ACCE0840}.Release|iPhone.ActiveCfg = Release|iPhone
{BAC82CEB-9D7B-462F-9A49-58D8ACCE0840}.Release|iPhone.Build.0 = Release|iPhone
{BAC82CEB-9D7B-462F-9A49-58D8ACCE0840}.Release|iPhoneSimulator.ActiveCfg = Release|iPhoneSimulator
{BAC82CEB-9D7B-462F-9A49-58D8ACCE0840}.Release|iPhoneSimulator.Build.0 = Release|iPhoneSimulator
{E3CE49AE-4927-410F-97D4-1EDC3C31224C}.Debug|iPhone.ActiveCfg = Debug|iPhone
{E3CE49AE-4927-410F-97D4-1EDC3C31224C}.Debug|iPhone.Build.0 = Debug|iPhone
{E3CE49AE-4927-410F-97D4-1EDC3C31224C}.Debug|iPhoneSimulator.ActiveCfg = Debug|iPhoneSimulator
{E3CE49AE-4927-410F-97D4-1EDC3C31224C}.Debug|iPhoneSimulator.Build.0 = Debug|iPhoneSimulator
{E3CE49AE-4927-410F-97D4-1EDC3C31224C}.Release|iPhone.ActiveCfg = Release|iPhone
{E3CE49AE-4927-410F-97D4-1EDC3C31224C}.Release|iPhone.Build.0 = Release|iPhone
{E3CE49AE-4927-410F-97D4-1EDC3C31224C}.Release|iPhoneSimulator.ActiveCfg = Release|iPhoneSimulator
{E3CE49AE-4927-410F-97D4-1EDC3C31224C}.Release|iPhoneSimulator.Build.0 = Release|iPhoneSimulator
EndGlobalSection
GlobalSection(MonoDevelopProperties) = preSolution
StartupItem = monocatalog.csproj
Expand Down
4 changes: 2 additions & 2 deletions monocatalog-md/ui-iPad/AlertsViewController_Pad.xib.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

using MonoTouch.UIKit;

namespace MonoCatalog.iPad {
namespace MonoCatalog {

partial class AlertsViewController_Pad : UITableViewController {

Expand All @@ -24,4 +24,4 @@ public override void ViewDidLoad ()
TableView.Delegate = demo.CreateDelegate ();
}
}
}
}
2 changes: 1 addition & 1 deletion monocatalog-md/ui-iPad/AlertsViewController_Pad.xib.designer.cs
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion monocatalog-md/ui-iPad/CoreTextController_Pad.xib.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
using MonoTouch.Foundation;
using MonoTouch.UIKit;

namespace MonoCatalog.iPad {
namespace MonoCatalog {

public partial class CoreTextController_Pad : UITableViewController
{
Expand Down
2 changes: 1 addition & 1 deletion monocatalog-md/ui-iPad/CoreTextController_Pad.xib.designer.cs
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion monocatalog-md/ui-iPad/DetailView.xib.designer.cs
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion monocatalog-md/ui-iPad/MainWindow_Pad.xib.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
using MonoTouch.Foundation;
using MonoTouch.UIKit;

namespace MonoCatalog.iPad
namespace MonoCatalog
{
public partial class MainWindow_Pad : UIViewController
{
Expand Down
2 changes: 1 addition & 1 deletion monocatalog-md/ui-iPad/MainWindow_Pad.xib.designer.cs
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit 85ec16e

Please sign in to comment.