summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--Juick.sln10
-rw-r--r--Juick/Api/Message.cs28
-rw-r--r--Juick/Api/Photo.cs20
-rw-r--r--Juick/Api/User.cs21
-rw-r--r--Juick/Juick.csproj11
-rw-r--r--Juick/ViewModels/MessageListViewModelBase.cs5
-rw-r--r--Juick/ViewModels/MessageViewModel.cs5
-rw-r--r--JuickApi/JuickApi.csproj52
-rw-r--r--JuickApi/Message.cs16
-rw-r--r--JuickApi/Photo.cs9
-rw-r--r--JuickApi/Properties/AssemblyInfo.cs30
-rw-r--r--JuickApi/User.cs9
12 files changed, 135 insertions, 81 deletions
diff --git a/Juick.sln b/Juick.sln
index 868fde2..25fa975 100644
--- a/Juick.sln
+++ b/Juick.sln
@@ -1,8 +1,10 @@

-Microsoft Visual Studio Solution File, Format Version 11.00
-# Visual Studio 2010
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio 2012
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Juick", "Juick\Juick.csproj", "{324D7F67-600D-4239-90D9-07C9CA17A4F3}"
EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "JuickApi", "JuickApi\JuickApi.csproj", "{51F516BC-4EF9-4C81-B4A5-3E97809B70CE}"
+EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
@@ -15,6 +17,10 @@ Global
{324D7F67-600D-4239-90D9-07C9CA17A4F3}.Release|Any CPU.ActiveCfg = Release|Any CPU
{324D7F67-600D-4239-90D9-07C9CA17A4F3}.Release|Any CPU.Build.0 = Release|Any CPU
{324D7F67-600D-4239-90D9-07C9CA17A4F3}.Release|Any CPU.Deploy.0 = Release|Any CPU
+ {51F516BC-4EF9-4C81-B4A5-3E97809B70CE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {51F516BC-4EF9-4C81-B4A5-3E97809B70CE}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {51F516BC-4EF9-4C81-B4A5-3E97809B70CE}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {51F516BC-4EF9-4C81-B4A5-3E97809B70CE}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
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");
}
}
}
diff --git a/JuickApi/JuickApi.csproj b/JuickApi/JuickApi.csproj
new file mode 100644
index 0000000..b0eb7b4
--- /dev/null
+++ b/JuickApi/JuickApi.csproj
@@ -0,0 +1,52 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
+ <PropertyGroup>
+ <MinimumVisualStudioVersion>10.0</MinimumVisualStudioVersion>
+ <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+ <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+ <ProjectGuid>{51F516BC-4EF9-4C81-B4A5-3E97809B70CE}</ProjectGuid>
+ <OutputType>Library</OutputType>
+ <AppDesignerFolder>Properties</AppDesignerFolder>
+ <RootNamespace>JuickApi</RootNamespace>
+ <AssemblyName>JuickApi</AssemblyName>
+ <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
+ <TargetFrameworkProfile>Profile96</TargetFrameworkProfile>
+ <FileAlignment>512</FileAlignment>
+ <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
+ </PropertyGroup>
+ <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+ <DebugSymbols>true</DebugSymbols>
+ <DebugType>full</DebugType>
+ <Optimize>false</Optimize>
+ <OutputPath>bin\Debug\</OutputPath>
+ <DefineConstants>DEBUG;TRACE</DefineConstants>
+ <ErrorReport>prompt</ErrorReport>
+ <WarningLevel>4</WarningLevel>
+ </PropertyGroup>
+ <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+ <DebugType>pdbonly</DebugType>
+ <Optimize>true</Optimize>
+ <OutputPath>bin\Release\</OutputPath>
+ <DefineConstants>TRACE</DefineConstants>
+ <ErrorReport>prompt</ErrorReport>
+ <WarningLevel>4</WarningLevel>
+ </PropertyGroup>
+ <ItemGroup>
+ <!-- A reference to the entire .NET Framework is automatically included -->
+ </ItemGroup>
+ <ItemGroup>
+ <Compile Include="Message.cs" />
+ <Compile Include="Photo.cs" />
+ <Compile Include="User.cs" />
+ <Compile Include="Properties\AssemblyInfo.cs" />
+ </ItemGroup>
+ <Import Project="$(MSBuildExtensionsPath32)\Microsoft\Portable\$(TargetFrameworkVersion)\Microsoft.Portable.CSharp.targets" />
+ <!-- To modify your build process, add your task inside one of the targets below and uncomment it.
+ Other similar extension points exist, see Microsoft.Common.targets.
+ <Target Name="BeforeBuild">
+ </Target>
+ <Target Name="AfterBuild">
+ </Target>
+ -->
+</Project> \ No newline at end of file
diff --git a/JuickApi/Message.cs b/JuickApi/Message.cs
new file mode 100644
index 0000000..9bd3230
--- /dev/null
+++ b/JuickApi/Message.cs
@@ -0,0 +1,16 @@
+using System.Collections.Generic;
+
+namespace JuickApi
+{
+ 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/JuickApi/Photo.cs b/JuickApi/Photo.cs
new file mode 100644
index 0000000..e6cce2b
--- /dev/null
+++ b/JuickApi/Photo.cs
@@ -0,0 +1,9 @@
+namespace JuickApi
+{
+ public class Photo
+ {
+ public string Thumbnail { get; set; }
+ public string Small { get; set; }
+ public string Medium { get; set; }
+ }
+}
diff --git a/JuickApi/Properties/AssemblyInfo.cs b/JuickApi/Properties/AssemblyInfo.cs
new file mode 100644
index 0000000..58faa6d
--- /dev/null
+++ b/JuickApi/Properties/AssemblyInfo.cs
@@ -0,0 +1,30 @@
+using System.Resources;
+using System.Reflection;
+using System.Runtime.CompilerServices;
+using System.Runtime.InteropServices;
+
+// General Information about an assembly is controlled through the following
+// set of attributes. Change these attribute values to modify the information
+// associated with an assembly.
+[assembly: AssemblyTitle("JuickApi")]
+[assembly: AssemblyDescription("")]
+[assembly: AssemblyConfiguration("")]
+[assembly: AssemblyCompany("")]
+[assembly: AssemblyProduct("JuickApi")]
+[assembly: AssemblyCopyright("Copyright © 2013")]
+[assembly: AssemblyTrademark("")]
+[assembly: AssemblyCulture("")]
+[assembly: NeutralResourcesLanguage("en")]
+
+// Version information for an assembly consists of the following four values:
+//
+// Major Version
+// Minor Version
+// Build Number
+// Revision
+//
+// You can specify all the values or you can default the Build and Revision Numbers
+// by using the '*' as shown below:
+// [assembly: AssemblyVersion("1.0.*")]
+[assembly: AssemblyVersion("1.0.0.0")]
+[assembly: AssemblyFileVersion("1.0.0.0")]
diff --git a/JuickApi/User.cs b/JuickApi/User.cs
new file mode 100644
index 0000000..dd8bae2
--- /dev/null
+++ b/JuickApi/User.cs
@@ -0,0 +1,9 @@
+namespace JuickApi
+{
+ public class User
+ {
+ public int Uid { get; set; }
+ public string UName { get; set; }
+ public string Fullname { get; set; }
+ }
+}
generated by cgit v1.2.3 (git 2.39.1) at 2024-11-30 01:07:45 +0000