From bbd71073a1a21ba281ce63b67529aab64866bc7d Mon Sep 17 00:00:00 2001
From: Vitaly Takmazov
Date: Sat, 10 Mar 2012 22:31:11 +0400
Subject: small fixes
---
Juick/ThreadView.xaml | 39 +++++++-----
Juick/ViewModels/MainViewModel.cs | 125 --------------------------------------
2 files changed, 23 insertions(+), 141 deletions(-)
delete mode 100644 Juick/ViewModels/MainViewModel.cs
diff --git a/Juick/ThreadView.xaml b/Juick/ThreadView.xaml
index 2decd6e..407b90d 100644
--- a/Juick/ThreadView.xaml
+++ b/Juick/ThreadView.xaml
@@ -9,7 +9,7 @@
FontFamily="{StaticResource PhoneFontFamilyNormal}"
FontSize="{StaticResource PhoneFontSizeNormal}"
Foreground="{StaticResource PhoneForegroundBrush}"
- SupportedOrientations="Portrait" Orientation="Portrait"
+ SupportedOrientations="PortraitOrLandscape" Orientation="Portrait"
mc:Ignorable="d" d:DesignHeight="696" d:DesignWidth="480"
shell:SystemTray.IsVisible="True">
@@ -37,29 +37,36 @@
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
-
+ Style="{StaticResource PhoneTextAccentStyle}" />
-
+ TextWrapping="Wrap" HorizontalAlignment="Left"/>
+
+
+
diff --git a/Juick/ViewModels/MainViewModel.cs b/Juick/ViewModels/MainViewModel.cs
deleted file mode 100644
index 3ee4a16..0000000
--- a/Juick/ViewModels/MainViewModel.cs
+++ /dev/null
@@ -1,125 +0,0 @@
-using System;
-using System.ComponentModel;
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
-using System.Net;
-using System.Runtime.Serialization.Json;
-using System.Collections.ObjectModel;
-using System.Windows;
-using System.Windows.Controls;
-using System.Windows.Media.Imaging;
-using Juick.Api;
-using RestSharp;
-
-namespace Juick.ViewModels
-{
- public class MainViewModel : INotifyPropertyChanged
- {
- public MainViewModel()
- {
- this.MyFeed = new ObservableCollection();
- this.Last = new ObservableCollection();
- }
-
- ///
- /// A collection for MessageViewModel objects.
- ///
- public ObservableCollection MyFeed { get; private set; }
-
- ///
- /// A collection for MessageViewModel objects.
- ///
- public ObservableCollection Last { get; private set; }
-
- public bool IsDataLoaded
- {
- get;
- private set;
- }
-
- ///
- /// Creates and adds a few MessageViewModel objects into the MyFeed collection.
- ///
- public void LoadData()
- {
- var request = new RestRequest("/home?1=1" + "&rnd=" + Environment.TickCount);
- App.Client.Authenticator = new HttpBasicAuthenticator(App.Account.Credentials.UserName, App.Account.Credentials.Password);
- App.Client.ExecuteAsync>(request, response =>
- {
- if (response.StatusCode != HttpStatusCode.OK)
- {
- MessageBox.Show(response.StatusCode.ToString());
- return;
- }
-
- var messages = response.Data;
- MyFeed.Clear();
- messages.ForEach(post =>
- {
- var item = new MessageViewModel(post)
- {
- Status =
- string.Format(
- "Posted on: {0}, replies: {1}",
- post.Timestamp,
- post.Replies)
- };
- MyFeed.Add(item);
- var imageUri = new Uri(string.Format("http://i.juick.com/as/{0}.png", post.User.Uid), UriKind.Absolute);
- item.UserAvatar = new BitmapImage
- {
- UriSource = imageUri
- };
- item.NotifyPropertyChanged("UserAvatar");
-
- });
- NotifyPropertyChanged("MyFeed");
-
- });
- var lastrequest = new RestRequest("/messages?1=1&media=all" + "&rnd=" + Environment.TickCount);
- App.Client.ExecuteAsync>(lastrequest, response =>
- {
-
- var messages = response.Data;
- if (messages.Count == 0) return;
- Last.Clear();
- messages.ForEach(post =>
- {
- var item = new MessageViewModel(post)
- {
- Status =
- string.Format(
- "Posted on: {0}, replies: {1}",
- post.Timestamp,
- post.Replies)
- };
- Last.Add(item);
- var imageUri = new Uri(string.Format("http://i.juick.com/as/{0}.png", post.User.Uid), UriKind.Absolute);
- item.UserAvatar = new BitmapImage {UriSource = imageUri};
- item.NotifyPropertyChanged("UserAvatar");
-
- if (post.Photo != null)
- {
- item.Attachment = new BitmapImage {UriSource = new Uri(post.Photo.Small, UriKind.Absolute)};
- item.NotifyPropertyChanged("Attachment");
- }
-
- });
- NotifyPropertyChanged("Last");
-
- });
- }
-
-
- public event PropertyChangedEventHandler PropertyChanged;
- public void NotifyPropertyChanged(String propertyName)
- {
- PropertyChangedEventHandler handler = PropertyChanged;
- if (null != handler)
- {
- handler(this, new PropertyChangedEventArgs(propertyName));
- }
- }
- }
-}
\ No newline at end of file
--
cgit v1.2.3