Permalink
Browse files

Merge remote branch 'origin/master'

  • Loading branch information...
2 parents 3bf570f + 7c0fff1 commit 2b3baf082bd2ce6191c3a533650aabddb7bd17e2 @vivekrk committed Nov 25, 2011
Showing with 79 additions and 63 deletions.
  1. +2 −0 .gitignore
  2. +2 −1 AndroidManifest.xml
  3. +1 −1 project.properties
  4. +8 −2 res/layout/post_tweet.xml
  5. +66 −59 res/layout/show_tweet_layout.xml
View
@@ -114,3 +114,5 @@ gen/com/company/tweeter/R.java
project.properties
bin/classes/com/company/tweeter/TimelineAdapter$ViewHolder.class
+
+project.properties
View
@@ -10,6 +10,7 @@
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>
<application
android:icon="@drawable/ic_launcher"
+ android:theme="@android:style/Theme.Light"
android:label="@string/app_name" >
<activity
android:label="@string/app_name"
@@ -40,4 +41,4 @@
</activity>
</application>
-</manifest>
+</manifest>
View
@@ -10,4 +10,4 @@
# Project target.
target=android-8
android.library=false
-android.library.reference.1=../android-pulltorefresh/pulltorefresh
+android.library.reference.1=../../GitHub repos/android-pulltorefresh/pulltorefresh
View
@@ -14,13 +14,17 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentLeft="true"
+ android:layout_marginRight="10dp"
+ android:layout_marginTop="10dp"
android:src="@drawable/ic_launcher" />
<ImageButton
android:id="@+id/newTweetButton"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentRight="true"
+ android:layout_marginLeft="10dp"
+ android:layout_marginTop="10dp"
android:src="@drawable/ic_launcher" />
</RelativeLayout>
@@ -37,17 +41,19 @@
android:layout_alignParentRight="true"
android:textColor="#00FF00"
android:padding="6dp"
+ android:layout_marginRight="10dp"
android:text="0" />
<EditText
android:id="@+id/newTweetTextField"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:layout_below="@id/letterCount"
- android:minLines="5"
+ android:layout_margin="10dp"
android:gravity="top"
android:hint="Enter your Tweet here"
- android:inputType="textMultiLine" >
+ android:inputType="textMultiLine"
+ android:minLines="5" >
<requestFocus />
</EditText>
@@ -1,82 +1,89 @@
<?xml version="1.0" encoding="utf-8"?>
- <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:orientation="vertical" >
- <LinearLayout
- android:id="@+id/friendInfoHeader"
- android:layout_width="match_parent"
- android:layout_height="match_parent"
- android:orientation="horizontal" >
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:orientation="vertical" >
- <ImageView
- android:id="@+id/friendProfileImage"
- android:layout_width="50dp"
- android:layout_height="50dp"
- android:layout_margin="5dp"
- android:scaleType="fitXY"
- android:src="@drawable/ic_launcher" />
-
- <RelativeLayout
- android:id="@+id/friendInfo"
- android:orientation="vertical"
+ <LinearLayout
+ android:id="@+id/friendInfoHeader"
android:layout_width="match_parent"
- android:layout_height="wrap_content" >
-
- <TextView
- android:id="@+id/friendName"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:paddingTop="8dp"
- android:textStyle="bold"
- android:layout_alignParentLeft="true"
- android:layout_alignParentTop="true"
- android:text="friendName" />
-
- <TextView
- android:id="@+id/friendScreenName"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_below="@id/friendName"
- android:text="friendScreenName" />
+ android:layout_height="match_parent"
+ android:layout_marginLeft="10dp"
+ android:layout_marginRight="10dp"
+ android:orientation="horizontal" >
- <TextView
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_alignParentRight="true"
- android:layout_centerHorizontal="true"
- android:paddingTop="10dp"
- android:text=">" />
-
- </RelativeLayout>
- </LinearLayout>
+ <ImageView
+ android:id="@+id/friendProfileImage"
+ android:layout_width="50dp"
+ android:layout_height="50dp"
+ android:layout_margin="5dp"
+ android:scaleType="fitXY"
+ android:src="@drawable/ic_launcher" />
- <LinearLayout
- android:id="@+id/statusDetails"
- android:padding="6dp"
+ <RelativeLayout
+ android:id="@+id/friendInfo"
android:layout_width="match_parent"
android:layout_height="wrap_content"
+ android:layout_marginTop="4dp"
android:orientation="vertical" >
<TextView
- android:id="@+id/statusMessage"
+ android:id="@+id/friendName"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:text="Medium Text"
- android:textAppearance="?android:attr/textAppearanceMedium" />
+ android:layout_alignParentLeft="true"
+ android:layout_alignParentTop="true"
+ android:paddingTop="8dp"
+ android:text="friendName"
+ android:textStyle="bold" />
<TextView
- android:id="@+id/statusTime"
+ android:id="@+id/friendScreenName"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:text="TextView" />
+ android:layout_below="@id/friendName"
+ android:text="friendScreenName" />
<TextView
- android:id="@+id/statusRetweetedBy"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:text="TextView" />
+ android:layout_alignParentRight="true"
+ android:layout_centerHorizontal="true"
+ android:paddingTop="10dp"
+ android:text=">" />
+ </RelativeLayout>
+ </LinearLayout>
- </LinearLayout>
+ <LinearLayout
+ android:id="@+id/statusDetails"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:layout_margin="10dp"
+ android:orientation="vertical"
+ android:padding="6dp" >
+
+ <TextView
+ android:id="@+id/statusMessage"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:padding="4dp"
+ android:autoLink="web"
+ android:text="Medium Text"
+ android:textAppearance="?android:attr/textAppearanceMedium" />
+
+ <TextView
+ android:id="@+id/statusTime"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:padding="4dp"
+ android:text="TextView" />
+
+ <TextView
+ android:id="@+id/statusRetweetedBy"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:padding="4dp"
+ android:text="TextView" />
+ </LinearLayout>
</LinearLayout>

0 comments on commit 2b3baf0

Please sign in to comment.