From 2de2c2485ef5671eb7ca50a10a83bf497bd99734 Mon Sep 17 00:00:00 2001
From: Claudiu Farcas <farcas.claudiu@gmail.com>
Date: Mon, 4 Apr 2011 09:47:17 +0300
Subject: [PATCH] imrpovements

---
 .../MyFriendsAround.WP7.csproj                |   6 +++
 .../ViewModel/MainViewModel.cs                |  26 +++++++++-
 main/MyFriendsAround.WP7/Views/MainPage.xaml  |  49 +++++++++++-------
 .../icons/appbar.add.rest.png                 | Bin 0 -> 271 bytes
 .../icons/appbar.minus.rest.png               | Bin 0 -> 204 bytes
 5 files changed, 59 insertions(+), 22 deletions(-)
 create mode 100644 main/MyFriendsAround.WP7/icons/appbar.add.rest.png
 create mode 100644 main/MyFriendsAround.WP7/icons/appbar.minus.rest.png

diff --git a/main/MyFriendsAround.WP7/MyFriendsAround.WP7.csproj b/main/MyFriendsAround.WP7/MyFriendsAround.WP7.csproj
index 5573829..237d814 100644
--- a/main/MyFriendsAround.WP7/MyFriendsAround.WP7.csproj
+++ b/main/MyFriendsAround.WP7/MyFriendsAround.WP7.csproj
@@ -228,9 +228,15 @@
     <Content Include="icons\anonymousIcon.png">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
+    <Content Include="icons\appbar.add.rest.png">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
     <Content Include="icons\appbar.feature.settings.rest.png">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
+    <Content Include="icons\appbar.minus.rest.png">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
     <Content Include="icons\appbar.publish.png">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
diff --git a/main/MyFriendsAround.WP7/ViewModel/MainViewModel.cs b/main/MyFriendsAround.WP7/ViewModel/MainViewModel.cs
index f85c727..2e9dbfb 100644
--- a/main/MyFriendsAround.WP7/ViewModel/MainViewModel.cs
+++ b/main/MyFriendsAround.WP7/ViewModel/MainViewModel.cs
@@ -69,6 +69,8 @@ namespace MyFriendsAround.WP7.ViewModel
             CropCancelCommand = new RelayCommand(() => CropCancel());
             MapViewChangedCommand = new RelayCommand<LocationRect>(boundRectangle => MapViewChanged(boundRectangle));
             ShowMyLocationCommand = new RelayCommand(() => ShowMyLocation());
+            MapZoomInCommand = new RelayCommand(() => MapZoomIn());
+            MapZoomOutCommand = new RelayCommand(() => MapZoomOut());
 
             if (IsInDesignMode)
             {
@@ -89,6 +91,24 @@ namespace MyFriendsAround.WP7.ViewModel
             InitGps();
         }
 
+        private void MapZoomOut()
+        {
+            //
+            if(MapZoom<22)
+            {
+                MapZoom++;
+            }
+        }
+
+        private void MapZoomIn()
+        {
+            //
+            if (MapZoom >2 )
+            {
+                MapZoom--;
+            }
+        }
+
 
         private void InitGps()
         {
@@ -286,12 +306,12 @@ namespace MyFriendsAround.WP7.ViewModel
         /// The <see cref="MyPicture" /> property's name.
         /// </summary>
         public const string MyPicturePropertyName = "MyPicture";
-        private BitmapSource _myPicture = new BitmapImage(new Uri("/icons/anonymousIcon.png", UriKind.RelativeOrAbsolute));
+        private ImageSource _myPicture = new BitmapImage(new Uri("/icons/anonymousIcon.png", UriKind.RelativeOrAbsolute));
 
         /// <summary>
         /// Gets the MyPicture property.
         /// </summary>
-        public BitmapSource MyPicture
+        public ImageSource MyPicture
         {
             get
             {
@@ -586,6 +606,8 @@ namespace MyFriendsAround.WP7.ViewModel
         public ICommand CropSaveCommand { get; set; }
         public ICommand CropCancelCommand { get; set; }
         public ICommand MapViewChangedCommand { get; set; }
+        public ICommand MapZoomInCommand { get; set; }
+        public ICommand MapZoomOutCommand { get; set; }
 
         #endregion
 
diff --git a/main/MyFriendsAround.WP7/Views/MainPage.xaml b/main/MyFriendsAround.WP7/Views/MainPage.xaml
index ef98f12..ef9ba31 100644
--- a/main/MyFriendsAround.WP7/Views/MainPage.xaml
+++ b/main/MyFriendsAround.WP7/Views/MainPage.xaml
@@ -144,31 +144,41 @@
 
             <Grid  HorizontalAlignment="Right"
                    VerticalAlignment="Center"
-                   Width="64"
-                   >
+                   Width="64">
                 <Rectangle RadiusX="10"
                            RadiusY="10"
                            Fill="Black"
                            Opacity="0.3"
-                           Margin="0,0,-20,0"
-                           >
+                           Margin="0,0,-20,0">
                 </Rectangle>
 
 
-                <StackPanel HorizontalAlignment="Left" VerticalAlignment="Stretch">
-                    <Image Source="/icons/appbar.location.png"
-                           Margin="0"
-                           Width="64"
-                           Height="64"
-                           VerticalAlignment="Top"
-                           HorizontalAlignment="Left"
-                           />
-                    <Image Source="/icons/appbar.location.png"
-                           Margin="0"
-                           Width="64"
-                           Height="64"
-                           VerticalAlignment="Bottom"
-                           HorizontalAlignment="Left" />
+                <StackPanel HorizontalAlignment="Left"
+                            VerticalAlignment="Stretch">
+                        <Image Source="/icons/appbar.add.rest.png"
+                               Margin="0"
+                               Width="64"
+                               Height="64"
+                               VerticalAlignment="Top"
+                               HorizontalAlignment="Left">
+                        <i:Interaction.Triggers>
+                            <i:EventTrigger EventName="MouseLeftButtonDown">
+                                <cmd:EventToCommand Command="{Binding MapZoomOutCommand}" />
+                            </i:EventTrigger>
+                        </i:Interaction.Triggers>
+                    </Image>
+                        <Image Source="/icons/appbar.minus.rest.png"
+                               Margin="0"
+                               Width="64"
+                               Height="64"
+                               VerticalAlignment="Bottom"
+                               HorizontalAlignment="Left">
+                        <i:Interaction.Triggers>
+                            <i:EventTrigger EventName="MouseLeftButtonDown">
+                                <cmd:EventToCommand Command="{Binding MapZoomInCommand}" />
+                            </i:EventTrigger>
+                        </i:Interaction.Triggers>
+                    </Image>
 
                 </StackPanel>
             </Grid>
@@ -200,8 +210,7 @@
                            Opacity="1"
                            Source="{Binding MyPicture, Mode=OneWay}"
                            Margin="0"
-                           Stretch="Fill"
-                           >
+                           Stretch="Fill">
                     </Image>
                     <Border Background="{StaticResource PhoneAccentBrush}"
                             Width="80"
diff --git a/main/MyFriendsAround.WP7/icons/appbar.add.rest.png b/main/MyFriendsAround.WP7/icons/appbar.add.rest.png
new file mode 100644
index 0000000000000000000000000000000000000000..a90137f7df9d4414b984f95e54f72c22a4e4535f
GIT binary patch
literal 271
zcmeAS@N?(olHy`uVBq!ia0vp^1|ZDA1|-9oezpTC$r9IylHmNblJdl&R0hYC{G?O`
z&)mfH)S%SFl*+=BsWw1G8$DedLn>~)xp9!Q!GOmhP?_(6ht(wEj@dgrt(%lzu;m3P
zSG>{;Q4*_L(C&5l8|S12OQy`4<qXsb0d_1M9hr0ANpEtW{4DQS%;#FG<I{~(KHqyh
zVcSZO`3wvPp09P$&`Bv5wd1Y4y!jgMgS$4pR!a9BbOSG)(LGjLY!+WC)3)cY{@ap$
zA6M+WIKx{OVshTp9b1y#%e8;V7K8{ed{EM3WMdF|oWpy<eZ472(9_k=Wt~$(699mi
BU!wp3

literal 0
HcmV?d00001

diff --git a/main/MyFriendsAround.WP7/icons/appbar.minus.rest.png b/main/MyFriendsAround.WP7/icons/appbar.minus.rest.png
new file mode 100644
index 0000000000000000000000000000000000000000..e7e2303faba124cb86dd4809e38131cc0c5c4ec8
GIT binary patch
literal 204
zcmeAS@N?(olHy`uVBq!ia0vp^1|ZDA1|-9oezpTC$r9IylHmNblJdl&R0hYC{G?O`
z&)mfH)S%SFl*+=BsWw1Gd7dtgAr-gY+}Oz5;K0Fp!TK>n-xIICg2_9Zly`9MYElz<
z@tadtWlvL^oZ#A`WnmyaNT8nejDFg;Cv&&$?(;b?iznjFf$RARD(_3|GT+5@BdG&2
cO^Z1V7!;m!355GTxdoE)boFyt=akR{0Ne#WHUIzs

literal 0
HcmV?d00001