Resolved conflicts after pullng from the remote

Author: PaulDaviesC

twitter-client-tutorial/_button_click_listener_module.html.md

@@ -1,4 +1,4 @@
 
 If you have followed our Twitter App tutorial so far, you have built a login screen with some basic Layouts & View elements. You have added a login button but it does nothing. 
 
-We have created this module specifically for introducing **Click Listener** . As an Android developer, this is the first time you will be dealing with a *callback code snippet* which gets executed when a button is clicked. 
+We are going to add click functionality to the button. We have created this module specifically for introducing **Click Listener** . As an Android developer, this is the first time you will be dealing with a *callback code snippet* which gets executed when a button is clicked. 

twitter-client-tutorial/_hello_world.html.md

@@ -13,4 +13,4 @@ If you have not setup our Virtual Assistant so far, kindly click the *Go to setu
 
 If you understand the control flow in the Hello World app, here is an assignment for you. 
 
-Change the text of string @hello_world in strings.xml and 'Run' the project in Eclipse with our Virtual Assistant. If you have done it right, you will see a success popup here in the browser & the lesson will be marked complete.
+Change the 'Hello World' text on the screen to 'This is Sparta' (or any other text) as instructed in the screencast. 

twitter-client-tutorial/_iteration_1_plan.html.md

@@ -1,9 +1,9 @@
 
-The first thing an app developer does before he starts building the app is to plan it. The first step is to create [mockups](http://en.wikipedia.org/wiki/Mockup#Software_Engineering). But since we are replicating an already existing app, we know how it will look. So we can bypass the mockup creation step.
+The first thing an app developer does before he starts building an app is to plan it. The first step is to create [mockups](http://en.wikipedia.org/wiki/Mockup#Software_Engineering). But since we are replicating an already existing app, we know how it will look. So we can bypass the mockup creation step.
 
 A good way to start is by building the app skeleton (just the user interface). 
 
-* The first time you open a Twitter app, it shows the login screen. So we will build the interface for it first.
+* The first time you open a Twitter app, it shows the login screen. So we will build its interface first.
 <br/>
 <%= image_tag "twitter-client/login-screenshot.png", alt: "Login Screenshot", title: "Login Screenshot" %>
 <p class="ac">Login Interface Screenshot</p>

twitter-client-tutorial/_login_page_intent_module.html.md

@@ -1,4 +1,26 @@
 
-In the last module, you implemented **Click Listener** on login page button which simply updated the button text. In this module, you will learn how you can load a new Activity on the button click using **Intents**.
+In the last module, you implemented **Click Listener** on login page button which simply updated the button text. Ideally it should open a new screen which provides us the list of tweets.
 
-Intent is the Android way of launching new Activity & even external apps from inside of an Android app. Usually Intent gets fired from button click, List item click or some other user interaction mechanism. 
+In this module, we are going to create a new Activity - TweetListActivity (we are going to build it too). This Activity will get launched when the user clicks the login button. 
+
+<div style="clear:both"></div>
+<div class="row-fluid">
+	<div class="span5">
+		<div class="ac vertical-align-me">
+			<%= image_tag "twitter-client/login-screenshot.png", alt: "Login Screenshot", title: "Login Screenshot" %>
+		</div>
+	</div>
+	<div class="span2">
+		<div class="ac vertical-align-me">
+			<%= image_tag "twitter-client/from-to.jpg", alt: "Login Screenshot", title: "Login Screenshot" %>
+		</div>
+	</div>
+	<div class="span5">
+		<div class="ac vertical-align-me">
+			<%= image_tag "twitter-client/twitter-list-screenshot.png", alt: "Twitter Detail Screenshot", title: "Twitter Detail Screenshot" %>
+		</div>
+	</div>
+</div>
+
+
+You will learn how you can load a new Activity on the button click using **Intents**. Intent is the Android way of launching new Activity & even external apps from inside of an Android app. Usually Intent gets fired from button click, List item click or some other user interaction mechanism. 

twitter-client-tutorial/_tweet_list_dynamic_data.html.md

@@ -5,5 +5,4 @@ In this module, we will add the feature - each tweet item should have different
 
 > In this module, you will going to learn how to access & modify data in a ListView & best practices of storing data using models in Java/Android. 
 
-<div>
 

twitter-client-tutorial/_tweetdetail_intent_module.html.md

@@ -4,3 +4,19 @@ So far you have built a basic Tweet List screen. You also learnt how to attach C
 Ideally, we would need to send the tweet data from the TweetList Activity to TweetDetail Activity but ince this is our first iteration of building the Twitter app & we are not doing any data handling, there will not be any data passed over Intent.
 
 This module is similar to our earlier module where you learnt how to load the TweetList Activity from Login Activity on login button click. 
+
+<div style="clear:both"></div>
+
+<div class="row-fluid">
+	<div class="span5">
+		<%= image_tag "twitter-client/twitter-list-screenshot.png", alt: "Twitter Detail Screenshot", title: "Twitter Detail Screenshot" %>
+	</div>
+	<div class="span2">
+		<div class="vertical-align-me">
+			<%= image_tag "twitter-client/from-to.jpg", alt: "Twitter Detail Screenshot", title: "Twitter Detail Screenshot" %>
+		</div>
+	</div>
+	<div class="span5">
+		<%= image_tag "twitter-client/twitter-details-screenshot.png", alt: "Twitter Detail Screenshot", title: "Twitter Detail Screenshot" %>
+	</div>
+</div>

twitter-client-tutorial/_tweetlist_listview_module.html.md

@@ -2,3 +2,22 @@
 So far, you learnt to work with relatively simple View elements like LinearLayout, RelativeLayout, TextView, EditText & Button. For building the list of tweet screen, we would be needing a different View element called **ListView**.
 
 ListView is one of the most difficult concepts to understand for an Android newbie. To make it easier/simpler, we will be building TweetList screen in multiple iterations. The first iteration will be to build a very simple but useless ListView with just one TextView for each item. We are then going to refine it to come closer to our requirement. 
+
+Below are the images as to how the ListView would be built in the lessons of this module.
+
+<div style="clear:both"></div>
+<div class="row-fluid">
+	<div class="span5">
+		<%= image_tag "twitter-client/twitter_list_view.png", alt: "Login screen Layout overview", title: "Login screen Layout overview" %>
+	</div>
+	<div class="span2">
+		<div class="vertical-align-me">
+			<%= image_tag "twitter-client/from-to.jpg", alt: "Login screen Layout overview", title: "Login screen Layout overview" %>
+		</div>
+	</div>
+	<div class="span5">
+		<div class="vertical-align-me">
+			<%= image_tag "twitter-client/final_tweet_list.png", alt: "Login screen Layout overview", title: "Login screen Layout overview" %>
+		</div>
+	</div>
+</div>