[TaskyPortable] tidy up graphics

conceptdev · Nov 13, 2013 · 6565023 · 6565023
1 parent ff05b0b
commit 6565023
Show file tree

Hide file tree

Showing 11 changed files with 20 additions and 21 deletions.
diff --git a/TaskyProPortable/TaskyWinPhone/ApplicationIcon.png b/TaskyProPortable/TaskyWinPhone/ApplicationIcon.png
diff --git a/TaskyProPortable/TaskyWinPhone/Background.png b/TaskyProPortable/TaskyWinPhone/Background.png
diff --git a/TaskyProPortable/TaskyWinPhone/Images/add.png b/TaskyProPortable/TaskyWinPhone/Images/add.png
diff --git a/TaskyProPortable/TaskyWinPhone/Images/delete.png b/TaskyProPortable/TaskyWinPhone/Images/delete.png
diff --git a/TaskyProPortable/TaskyWinPhone/Images/save.png b/TaskyProPortable/TaskyWinPhone/Images/save.png
diff --git a/TaskyProPortable/TaskyWinPhone/MainPage.xaml b/TaskyProPortable/TaskyWinPhone/MainPage.xaml
@@ -65,7 +65,7 @@
         <shell:ApplicationBar Opacity="1" IsVisible="True" IsMenuEnabled="True">
 
             <shell:ApplicationBarIconButton 
-                IconUri="/Images/appbar.add.rest.jpg"
+                IconUri="/Images/add.png"
                 Text="add" 
                 Click="HandleAdd"/>
 

diff --git a/TaskyProPortable/TaskyWinPhone/SplashScreenImage.jpg b/TaskyProPortable/TaskyWinPhone/SplashScreenImage.jpg
diff --git a/TaskyProPortable/TaskyWinPhone/TaskDetailsPage.xaml b/TaskyProPortable/TaskyWinPhone/TaskDetailsPage.xaml
@@ -30,25 +30,30 @@
         <Grid x:Name="ContentPanel" Grid.Row="1" Margin="12,0,12,0">
 
             <Grid.RowDefinitions>
+                <RowDefinition Height="Auto"/>
+                <RowDefinition Height="Auto"/>
                 <RowDefinition Height="Auto"/>
                 <RowDefinition Height="Auto"/>
                 <RowDefinition Height="Auto"/>
                 <RowDefinition Height="*"/>
             </Grid.RowDefinitions>
-
+            <TextBlock Grid.Row="0" Grid.Column="0"
+                       Text="Name"/>
             <TextBox
-                Grid.Row="0" Grid.Column="0"
+                Grid.Row="1" Grid.Column="0"
                 x:Name="NameText"
                 Text="{Binding Name,Mode=TwoWay}"></TextBox>
+            <TextBlock Grid.Row="2" Grid.Column="0"
+                       Text="Notes"/>
             <TextBox
-                Grid.Row="1" Grid.Column="0"
+                Grid.Row="3" Grid.Column="0"
                 x:Name="NotesText"
                 Text="{Binding Notes,Mode=TwoWay}"></TextBox>
             <CheckBox
-                Grid.Row="2" Grid.Column="0"
+                Grid.Row="4" Grid.Column="0"
                 x:Name="DoneCheck"
                 IsChecked="{Binding Done,Mode=TwoWay}"
-                />
+                >Done</CheckBox>
         </Grid>
     </Grid>
 
@@ -57,12 +62,12 @@
         <shell:ApplicationBar Opacity="1" IsVisible="True" IsMenuEnabled="True">
 
             <shell:ApplicationBarIconButton 
-                IconUri="/Images/appbar.add.rest.jpg"
+                IconUri="/Images/save.png"
                 Text="save" 
                 Click="HandleSave"/>
 
             <shell:ApplicationBarIconButton 
-                IconUri="/Images/appbar.add.rest.jpg"
+                IconUri="/Images/delete.png"
                 Text="delete" 
                 Click="HandleDelete"/>
 

diff --git a/TaskyProPortable/TaskyWinPhone/TaskDetailsPage.xaml.cs b/TaskyProPortable/TaskyWinPhone/TaskDetailsPage.xaml.cs
@@ -46,6 +46,8 @@ private void HandleSave(object sender, EventArgs e)
             var taskvm = (TaskViewModel)DataContext;
             var task = taskvm.GetTask();
             (App.Current as TaskyWP7.App).TaskMgr.SaveTask(task);
+
+            NavigationService.GoBack();
         }
 
         private void HandleDelete(object sender, EventArgs e)

diff --git a/TaskyProPortable/TaskyWinPhone/TaskyWinPhone.csproj b/TaskyProPortable/TaskyWinPhone/TaskyWinPhone.csproj
@@ -154,11 +154,12 @@
     <Content Include="Background.png">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
+    <Content Include="Images\add.png" />
+    <Content Include="Images\delete.png" />
+    <Content Include="Images\save.png" />
     <Content Include="SplashScreenImage.jpg" />
   </ItemGroup>
-  <ItemGroup>
-    <Folder Include="Images\" />
-  </ItemGroup>
+  <ItemGroup />
   <ItemGroup>
     <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
       <Visible>False</Visible>

diff --git a/TaskyProPortable/TaskyiOS/TaskyiOS.csproj b/TaskyProPortable/TaskyiOS/TaskyiOS.csproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -78,16 +78,7 @@
   <Import Project="$(MSBuildExtensionsPath)\Xamarin\iOS\Xamarin.MonoTouch.CSharp.targets" Condition="'$(windir)' != '' " />
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
   <ItemGroup>
-    <Folder Include="Screens\" />
-    <Folder Include="ApplicationLayer\" />
     <Folder Include="DataLayer\" />
-    <Folder Include="Resources\" />
-  </ItemGroup>
-  <ItemGroup>
-    <Content Include="Default-Landscape~ipad.png" />
-    <Content Include="Default-Portrait~ipad.png" />
-    <Content Include="Default.png" />
-    <Content Include="Default%402x.png" />
   </ItemGroup>
   <ItemGroup>
     <BundleResource Include="Resources\Default-568h%402x.png" />