Skip to content
This repository was archived by the owner on Dec 18, 2017. It is now read-only.

Commit 31728be

Browse files
slodgeslodge
committed
ApiExamples updated to 3.1.1-beta4
1 parent 0bdf4de commit 31728be

File tree

78 files changed

+174
-55
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

78 files changed

+174
-55
lines changed

‎ApiExamples/ApiExamples.Core/ApiExamples.Core.csproj‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -45,13 +45,13 @@
4545
</ItemGroup>
4646
<ItemGroup>
4747
<Reference Include="Cirrious.CrossCore">
48-
<HintPath>..\packages\MvvmCross.HotTuna.CrossCore.3.1.1-beta3\lib\portable-win+net45+sl50+wp8+MonoAndroid+MonoTouch\Cirrious.CrossCore.dll</HintPath>
48+
<HintPath>..\packages\MvvmCross.HotTuna.CrossCore.3.1.1-beta4\lib\portable-win+net45+sl50+wp8+MonoAndroid+MonoTouch\Cirrious.CrossCore.dll</HintPath>
4949
</Reference>
5050
<Reference Include="Cirrious.MvvmCross">
51-
<HintPath>..\packages\MvvmCross.HotTuna.MvvmCrossLibraries.3.1.1-beta3\lib\portable-win+net45+sl50+wp8+MonoAndroid+MonoTouch\Cirrious.MvvmCross.dll</HintPath>
51+
<HintPath>..\packages\MvvmCross.HotTuna.MvvmCrossLibraries.3.1.1-beta4\lib\portable-win+net45+sl50+wp8+MonoAndroid+MonoTouch\Cirrious.MvvmCross.dll</HintPath>
5252
</Reference>
5353
<Reference Include="Cirrious.MvvmCross.Localization">
54-
<HintPath>..\packages\MvvmCross.HotTuna.CrossCore.3.1.1-beta3\lib\portable-win+net45+sl50+wp8+MonoAndroid+MonoTouch\Cirrious.MvvmCross.Localization.dll</HintPath>
54+
<HintPath>..\packages\MvvmCross.HotTuna.CrossCore.3.1.1-beta4\lib\portable-win+net45+sl50+wp8+MonoAndroid+MonoTouch\Cirrious.MvvmCross.Localization.dll</HintPath>
5555
</Reference>
5656
</ItemGroup>
5757
<ItemGroup>

‎ApiExamples/ApiExamples.Core/ViewModels/ViewModels.cs‎

Lines changed: 43 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -568,4 +568,47 @@ public int StepSize
568568
set { _stepSize = value; RaisePropertyChanged(() => StepSize); }
569569
}
570570
}
571+
572+
public class CommandViewModel : TestViewModel
573+
{
574+
private bool _shouldEnable;
575+
public bool ShouldEnable
576+
{
577+
get { return _shouldEnable; }
578+
set { _shouldEnable = value; RaisePropertyChanged(() => ShouldEnable); RaiseCanExecuteChanged(); }
579+
}
580+
581+
private void RaiseCanExecuteChanged()
582+
{
583+
if (_myCommand != null)
584+
_myCommand.RaiseCanExecuteChanged();
585+
}
586+
587+
private MvxCommand _myCommand;
588+
public ICommand MyCommand
589+
{
590+
get
591+
{
592+
_myCommand = _myCommand ?? new MvxCommand(DoMyCommand, CanDoMyCommand);
593+
return _myCommand;
594+
}
595+
}
596+
597+
private bool CanDoMyCommand()
598+
{
599+
return ShouldEnable;
600+
}
601+
602+
private void DoMyCommand()
603+
{
604+
Count++;
605+
}
606+
607+
private int _count;
608+
public int Count
609+
{
610+
get { return _count; }
611+
set { _count = value; RaisePropertyChanged(() => Count); }
612+
}
613+
}
571614
}

‎ApiExamples/ApiExamples.Core/packages.config‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<package id="MvvmCross.HotTuna.CrossCore" version="3.1.1-beta3" targetFramework="portable-win+net45+sl50+wp80+MonoAndroid10+MonoTouch10" />
4-
<package id="MvvmCross.HotTuna.MvvmCrossLibraries" version="3.1.1-beta3" targetFramework="portable-win+net45+sl50+wp80+MonoAndroid10+MonoTouch10" />
5-
<package id="MvvmCross.PortableSupport" version="3.1.1-beta3" targetFramework="portable-win+net45+sl50+wp80+MonoAndroid10+MonoTouch10" />
3+
<package id="MvvmCross.HotTuna.CrossCore" version="3.1.1-beta4" targetFramework="portable-win+net45+sl50+wp80+MonoAndroid10+MonoTouch10" />
4+
<package id="MvvmCross.HotTuna.MvvmCrossLibraries" version="3.1.1-beta4" targetFramework="portable-win+net45+sl50+wp80+MonoAndroid10+MonoTouch10" />
5+
<package id="MvvmCross.PortableSupport" version="3.1.1-beta4" targetFramework="portable-win+net45+sl50+wp80+MonoAndroid10+MonoTouch10" />
66
</packages>

‎ApiExamples/ApiExamples.Droid/ApiExamples.Droid.csproj‎

Lines changed: 13 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -52,49 +52,49 @@
5252
<ItemGroup>
5353
<Reference Include="Cirrious.CrossCore, Version=1.0.0.0, Culture=neutral, PublicKeyToken=e16445fd9b451819, processorArchitecture=MSIL">
5454
<SpecificVersion>False</SpecificVersion>
55-
<HintPath>..\packages\MvvmCross.HotTuna.CrossCore.3.1.1-beta3\lib\MonoAndroid\Cirrious.CrossCore.dll</HintPath>
55+
<HintPath>..\packages\MvvmCross.HotTuna.CrossCore.3.1.1-beta4\lib\MonoAndroid\Cirrious.CrossCore.dll</HintPath>
5656
</Reference>
5757
<Reference Include="Cirrious.CrossCore.Droid, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
5858
<SpecificVersion>False</SpecificVersion>
59-
<HintPath>..\packages\MvvmCross.HotTuna.CrossCore.3.1.1-beta3\lib\MonoAndroid\Cirrious.CrossCore.Droid.dll</HintPath>
59+
<HintPath>..\packages\MvvmCross.HotTuna.CrossCore.3.1.1-beta4\lib\MonoAndroid\Cirrious.CrossCore.Droid.dll</HintPath>
6060
</Reference>
6161
<Reference Include="Cirrious.MvvmCross, Version=1.0.0.0, Culture=neutral, PublicKeyToken=e16445fd9b451819, processorArchitecture=MSIL">
6262
<SpecificVersion>False</SpecificVersion>
63-
<HintPath>..\packages\MvvmCross.HotTuna.MvvmCrossLibraries.3.1.1-beta3\lib\MonoAndroid\Cirrious.MvvmCross.dll</HintPath>
63+
<HintPath>..\packages\MvvmCross.HotTuna.MvvmCrossLibraries.3.1.1-beta4\lib\MonoAndroid\Cirrious.MvvmCross.dll</HintPath>
6464
</Reference>
6565
<Reference Include="Cirrious.MvvmCross.Binding, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
6666
<SpecificVersion>False</SpecificVersion>
67-
<HintPath>..\packages\MvvmCross.HotTuna.CrossCore.3.1.1-beta3\lib\MonoAndroid\Cirrious.MvvmCross.Binding.dll</HintPath>
67+
<HintPath>..\packages\MvvmCross.HotTuna.CrossCore.3.1.1-beta4\lib\MonoAndroid\Cirrious.MvvmCross.Binding.dll</HintPath>
6868
</Reference>
6969
<Reference Include="Cirrious.MvvmCross.Binding.Droid, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
7070
<SpecificVersion>False</SpecificVersion>
71-
<HintPath>..\packages\MvvmCross.HotTuna.CrossCore.3.1.1-beta3\lib\MonoAndroid\Cirrious.MvvmCross.Binding.Droid.dll</HintPath>
71+
<HintPath>..\packages\MvvmCross.HotTuna.CrossCore.3.1.1-beta4\lib\MonoAndroid\Cirrious.MvvmCross.Binding.Droid.dll</HintPath>
7272
</Reference>
7373
<Reference Include="Cirrious.MvvmCross.Droid, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
7474
<SpecificVersion>False</SpecificVersion>
75-
<HintPath>..\packages\MvvmCross.HotTuna.MvvmCrossLibraries.3.1.1-beta3\lib\MonoAndroid\Cirrious.MvvmCross.Droid.dll</HintPath>
75+
<HintPath>..\packages\MvvmCross.HotTuna.MvvmCrossLibraries.3.1.1-beta4\lib\MonoAndroid\Cirrious.MvvmCross.Droid.dll</HintPath>
7676
</Reference>
7777
<Reference Include="Cirrious.MvvmCross.Localization, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
7878
<SpecificVersion>False</SpecificVersion>
79-
<HintPath>..\packages\MvvmCross.HotTuna.CrossCore.3.1.1-beta3\lib\MonoAndroid\Cirrious.MvvmCross.Localization.dll</HintPath>
79+
<HintPath>..\packages\MvvmCross.HotTuna.CrossCore.3.1.1-beta4\lib\MonoAndroid\Cirrious.MvvmCross.Localization.dll</HintPath>
8080
</Reference>
8181
<Reference Include="Mono.Android" />
8282
<Reference Include="mscorlib" />
8383
<Reference Include="System" />
8484
<Reference Include="System.Core" />
8585
<Reference Include="System.Net">
8686
<Private>True</Private>
87-
<HintPath>..\packages\MvvmCross.PortableSupport.3.1.1-beta3\lib\MonoAndroid\System.Net.dll</HintPath>
87+
<HintPath>..\packages\MvvmCross.PortableSupport.3.1.1-beta4\lib\MonoAndroid\System.Net.dll</HintPath>
8888
</Reference>
8989
<Reference Include="System.Windows">
9090
<Private>True</Private>
91-
<HintPath>..\packages\MvvmCross.PortableSupport.3.1.1-beta3\lib\MonoAndroid\System.Windows.dll</HintPath>
91+
<HintPath>..\packages\MvvmCross.PortableSupport.3.1.1-beta4\lib\MonoAndroid\System.Windows.dll</HintPath>
9292
</Reference>
9393
<Reference Include="System.Xml.Linq" />
9494
<Reference Include="System.Xml" />
9595
<Reference Include="System.Xml.Serialization">
9696
<Private>True</Private>
97-
<HintPath>..\packages\MvvmCross.PortableSupport.3.1.1-beta3\lib\MonoAndroid\System.Xml.Serialization.dll</HintPath>
97+
<HintPath>..\packages\MvvmCross.PortableSupport.3.1.1-beta4\lib\MonoAndroid\System.Xml.Serialization.dll</HintPath>
9898
</Reference>
9999
</ItemGroup>
100100
<ItemGroup>
@@ -158,6 +158,9 @@
158158
<AndroidResource Include="Resources\Layout\Item_Spinner.axml" />
159159
<AndroidResource Include="Resources\Layout\SubTest_If.axml" />
160160
<AndroidResource Include="Resources\Layout\Test_RatingBar.axml" />
161+
<AndroidResource Include="Resources\Layout\Test_Command.axml">
162+
<SubType>Designer</SubType>
163+
</AndroidResource>
161164
</ItemGroup>
162165
<ItemGroup>
163166
<AndroidResource Include="Resources\Layout\Main.axml" />

‎ApiExamples/ApiExamples.Droid/Resources/Layout/Test_Command.axml‎

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
3+
xmlns:local="http://schemas.android.com/apk/res-auto"
4+
android:orientation="vertical"
5+
android:layout_width="fill_parent"
6+
android:layout_height="fill_parent">
7+
<TextView
8+
android:layout_width="fill_parent"
9+
android:layout_height="wrap_content"
10+
android:text="Click for commands..."
11+
/>
12+
<Button
13+
android:layout_width="fill_parent"
14+
android:layout_height="wrap_content"
15+
android:textSize="40dp"
16+
android:text="Never clicked"
17+
local:MvxBind="Text Format('Clicked {0} times', Count); Click MyCommand"
18+
/>
19+
<CheckBox
20+
android:layout_width="fill_parent"
21+
android:layout_height="wrap_content"
22+
android:text="Enabled the button?"
23+
local:MvxBind="Checked ShouldEnable"
24+
/>
25+
<Button
26+
android:layout_width="fill_parent"
27+
android:layout_height="wrap_content"
28+
android:text="Next test"
29+
local:MvxBind="Click NextCommand"
30+
/>
31+
</LinearLayout>

‎ApiExamples/ApiExamples.Droid/Resources/Resource.Designer.cs‎

Lines changed: 21 additions & 18 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎ApiExamples/ApiExamples.Droid/Views/FirstView.cs‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -202,4 +202,14 @@ protected override void OnCreate(Bundle bundle)
202202
SetContentView(Resource.Layout.Test_RatingBar);
203203
}
204204
}
205+
206+
[Activity(NoHistory = true)]
207+
public class CommandView : MvxActivity
208+
{
209+
protected override void OnCreate(Bundle bundle)
210+
{
211+
base.OnCreate(bundle);
212+
SetContentView(Resource.Layout.Test_Command);
213+
}
214+
}
205215
}

‎ApiExamples/ApiExamples.Droid/packages.config‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<package id="MvvmCross.HotTuna.CrossCore" version="3.1.1-beta3" targetFramework="MonoAndroid403" />
4-
<package id="MvvmCross.HotTuna.MvvmCrossLibraries" version="3.1.1-beta3" targetFramework="MonoAndroid403" />
5-
<package id="MvvmCross.PortableSupport" version="3.1.1-beta3" targetFramework="MonoAndroid403" />
3+
<package id="MvvmCross.HotTuna.CrossCore" version="3.1.1-beta4" targetFramework="MonoAndroid403" />
4+
<package id="MvvmCross.HotTuna.MvvmCrossLibraries" version="3.1.1-beta4" targetFramework="MonoAndroid403" />
5+
<package id="MvvmCross.PortableSupport" version="3.1.1-beta4" targetFramework="MonoAndroid403" />
66
</packages>

‎ApiExamples/ApiExamples.Touch/ApiExamples.Touch.csproj‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -99,25 +99,25 @@
9999
</ItemGroup>
100100
<ItemGroup>
101101
<Reference Include="Cirrious.CrossCore">
102-
<HintPath>..\packages\MvvmCross.HotTuna.CrossCore.3.1.1-beta3\lib\MonoTouch\Cirrious.CrossCore.dll</HintPath>
102+
<HintPath>..\packages\MvvmCross.HotTuna.CrossCore.3.1.1-beta4\lib\MonoTouch\Cirrious.CrossCore.dll</HintPath>
103103
</Reference>
104104
<Reference Include="Cirrious.CrossCore.Touch">
105-
<HintPath>..\packages\MvvmCross.HotTuna.CrossCore.3.1.1-beta3\lib\MonoTouch\Cirrious.CrossCore.Touch.dll</HintPath>
105+
<HintPath>..\packages\MvvmCross.HotTuna.CrossCore.3.1.1-beta4\lib\MonoTouch\Cirrious.CrossCore.Touch.dll</HintPath>
106106
</Reference>
107107
<Reference Include="Cirrious.MvvmCross">
108-
<HintPath>..\packages\MvvmCross.HotTuna.MvvmCrossLibraries.3.1.1-beta3\lib\MonoTouch\Cirrious.MvvmCross.dll</HintPath>
108+
<HintPath>..\packages\MvvmCross.HotTuna.MvvmCrossLibraries.3.1.1-beta4\lib\MonoTouch\Cirrious.MvvmCross.dll</HintPath>
109109
</Reference>
110110
<Reference Include="Cirrious.MvvmCross.Binding">
111-
<HintPath>..\packages\MvvmCross.HotTuna.CrossCore.3.1.1-beta3\lib\MonoTouch\Cirrious.MvvmCross.Binding.dll</HintPath>
111+
<HintPath>..\packages\MvvmCross.HotTuna.CrossCore.3.1.1-beta4\lib\MonoTouch\Cirrious.MvvmCross.Binding.dll</HintPath>
112112
</Reference>
113113
<Reference Include="Cirrious.MvvmCross.Binding.Touch">
114-
<HintPath>..\packages\MvvmCross.HotTuna.CrossCore.3.1.1-beta3\lib\MonoTouch\Cirrious.MvvmCross.Binding.Touch.dll</HintPath>
114+
<HintPath>..\packages\MvvmCross.HotTuna.CrossCore.3.1.1-beta4\lib\MonoTouch\Cirrious.MvvmCross.Binding.Touch.dll</HintPath>
115115
</Reference>
116116
<Reference Include="Cirrious.MvvmCross.Localization">
117-
<HintPath>..\packages\MvvmCross.HotTuna.CrossCore.3.1.1-beta3\lib\MonoTouch\Cirrious.MvvmCross.Localization.dll</HintPath>
117+
<HintPath>..\packages\MvvmCross.HotTuna.CrossCore.3.1.1-beta4\lib\MonoTouch\Cirrious.MvvmCross.Localization.dll</HintPath>
118118
</Reference>
119119
<Reference Include="Cirrious.MvvmCross.Touch">
120-
<HintPath>..\packages\MvvmCross.HotTuna.MvvmCrossLibraries.3.1.1-beta3\lib\MonoTouch\Cirrious.MvvmCross.Touch.dll</HintPath>
120+
<HintPath>..\packages\MvvmCross.HotTuna.MvvmCrossLibraries.3.1.1-beta4\lib\MonoTouch\Cirrious.MvvmCross.Touch.dll</HintPath>
121121
</Reference>
122122
<Reference Include="System" />
123123
<Reference Include="System.Windows" />

‎ApiExamples/ApiExamples.Touch/Views/FirstView.cs‎

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -734,4 +734,33 @@ public class RatingBarView : NotTestedTestViewController
734734
{
735735
// not tested
736736
}
737+
738+
[Register("CommandView")]
739+
public class CommandView : TestViewController
740+
{
741+
public override void ViewDidLoad()
742+
{
743+
base.ViewDidLoad();
744+
745+
var button = new UIButton(UIButtonType.RoundedRect);
746+
button.Frame = new RectangleF(10, 90, 300, 30);
747+
Add(button);
748+
var sw = new UISwitch(new RectangleF(10, 120, 300, 30));
749+
Add(sw);
750+
751+
var set = this.CreateBindingSet<CommandView, CommandViewModel>();
752+
set.Bind(button).To(vm => vm.MyCommand);
753+
set.Bind(button).For("Title").To("Format('Clicked {0} times', Count)");
754+
set.Bind(sw).For(v => v.On).To(vm => vm.ShouldEnable);
755+
set.Apply();
756+
}
757+
758+
protected override string ExplainText
759+
{
760+
get
761+
{
762+
return "Does the button click and en/disable?";
763+
}
764+
}
765+
}
737766
}

0 commit comments

Comments
 (0)