Merge branch 'master' of https://bitbucket.org/vitalyster/juick-windowsphone

6 files changed, 11 insertions, 79 deletions

diff --git a/Juick/Api/Message.cs b/Juick/Api/Message.cs
deleted file mode 100644
index e5b5611..0000000
--- a/Juick/Api/Message.cs
+++ /dev/null
@@ -1,28 +0,0 @@
-using System;

-using System.Collections.Generic;

-using System.Net;

-using System.Windows;

-using System.Windows.Controls;

-using System.Windows.Documents;

-using System.Windows.Ink;

-using System.Windows.Input;

-using System.Windows.Media;

-using System.Windows.Media.Animation;

-using System.Windows.Shapes;

-using System.Runtime.Serialization;

-using System.Runtime.Serialization.Json;

-

-namespace Juick.Api

-{

-    public class Message

-    {

-        public int Mid { get; set; }

-        public int Rid { get; set; }

-        public string Body { get; set; }

-        public User User { get; set; }

-        public string Timestamp { get; set; }

-        public int Replies { get; set; }

-        public List<string> Tags { get; set; }

-        public Photo Photo { get; set; }

-    }

-}

diff --git a/Juick/Api/Photo.cs b/Juick/Api/Photo.cs
deleted file mode 100644
index a5cf895..0000000
--- a/Juick/Api/Photo.cs
+++ /dev/null
@@ -1,20 +0,0 @@
-using System;

-using System.Net;

-using System.Windows;

-using System.Windows.Controls;

-using System.Windows.Documents;

-using System.Windows.Ink;

-using System.Windows.Input;

-using System.Windows.Media;

-using System.Windows.Media.Animation;

-using System.Windows.Shapes;

-

-namespace Juick.Api

-{

-    public class Photo

-    {

-        public string Thumbnail { get; set; }

-        public string Small { get; set; }

-        public string Medium { get; set; }

-    }

-}

diff --git a/Juick/Api/User.cs b/Juick/Api/User.cs
deleted file mode 100644
index cd823eb..0000000
--- a/Juick/Api/User.cs
+++ /dev/null
@@ -1,21 +0,0 @@
-using System;

-using System.Net;

-using System.Runtime.Serialization;

-using System.Windows;

-using System.Windows.Controls;

-using System.Windows.Documents;

-using System.Windows.Ink;

-using System.Windows.Input;

-using System.Windows.Media;

-using System.Windows.Media.Animation;

-using System.Windows.Shapes;

-

-namespace Juick.Api

-{

-    public class User

-    {

-        public int Uid { get; set; }

-        public string UName { get; set; }

-        public string Fullname { get; set; }

-    }

-}

diff --git a/Juick/Juick.csproj b/Juick/Juick.csproj
index d161046..c330761 100644
--- a/Juick/Juick.csproj
+++ b/Juick/Juick.csproj
@@ -66,9 +66,6 @@
     <Reference Include="System.Xml.Serialization" />

   </ItemGroup>

   <ItemGroup>

-    <Compile Include="Api\Message.cs" />

-    <Compile Include="Api\Photo.cs" />

-    <Compile Include="Api\User.cs" />

     <Compile Include="App.xaml.cs">

       <DependentUpon>App.xaml</DependentUpon>

     </Compile>

@@ -91,8 +88,8 @@
     <Compile Include="ThreadView.xaml.cs">

       <DependentUpon>ThreadView.xaml</DependentUpon>

     </Compile>

-    <Compile Include="ViewModels\MessageViewModel.cs" />

     <Compile Include="ViewModels\MessageListViewModelBase.cs" />

+    <Compile Include="ViewModels\MessageViewModel.cs" />

     <Compile Include="ViewModels\ThreadViewModel.cs" />

   </ItemGroup>

   <ItemGroup>

@@ -169,6 +166,12 @@
     <Content Include="Images\appbar.send.png" />

     <Content Include="SplashScreenImage.jpg" />

   </ItemGroup>

+  <ItemGroup>

+    <ProjectReference Include="..\JuickApi\JuickApi.csproj">

+      <Project>{51F516BC-4EF9-4C81-B4A5-3E97809B70CE}</Project>

+      <Name>JuickApi</Name>

+    </ProjectReference>

+  </ItemGroup>

   <Import Project="$(MSBuildExtensionsPath)\Microsoft\Silverlight for Phone\$(TargetFrameworkVersion)\Microsoft.Silverlight.$(TargetFrameworkProfile).Overrides.targets" />

   <Import Project="$(MSBuildExtensionsPath)\Microsoft\Silverlight for Phone\$(TargetFrameworkVersion)\Microsoft.Silverlight.CSharp.targets" />

   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 

diff --git a/Juick/ViewModels/MessageListViewModelBase.cs b/Juick/ViewModels/MessageListViewModelBase.cs
index 5dc8aed..b9d7070 100644
--- a/Juick/ViewModels/MessageListViewModelBase.cs
+++ b/Juick/ViewModels/MessageListViewModelBase.cs
@@ -5,10 +5,9 @@ using System.ComponentModel;
 using System.Net;

 using System.Windows;

 using System.Windows.Media.Imaging;

-using Juick.Api;

-using RestSharp;

-using System.Windows.Input;

 using Juick.Classes;

+using JuickApi;

+using RestSharp;

 

 namespace Juick.ViewModels

 {

diff --git a/Juick/ViewModels/MessageViewModel.cs b/Juick/ViewModels/MessageViewModel.cs
index 460df38..6a53669 100644
--- a/Juick/ViewModels/MessageViewModel.cs
+++ b/Juick/ViewModels/MessageViewModel.cs
@@ -2,8 +2,7 @@
 using System.ComponentModel;

 using System.Net;

 using System.Windows.Media.Imaging;

-using System.Linq;

-using Juick.Api;

+using JuickApi;

 

 namespace Juick.ViewModels

 {

@@ -98,7 +97,7 @@ namespace Juick.ViewModels
                 if (value != _avatar)

                 {

                     _avatar = value;

-                    NotifyPropertyChanged("Useravatar");

+                    NotifyPropertyChanged("UserAvatar");

                 }

             }

         }