Merge pull request #323 from BlythMeister/MyBetaVersion

Fix #322 added a "filler" which is present when hiding images on account...
chrislacy · Sep 27, 2013 · 37a616c · 37a616c
2 parents 6cd546b + d08c5df
commit 37a616c
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 1 deletion.
diff --git a/android/clientbeta/AndroidManifest.xml b/android/clientbeta/AndroidManifest.xml
@@ -2,7 +2,7 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="com.tweetlanes.android.beta"
     android:versionCode="51"
-    android:versionName="1.2.1_b7">
+    android:versionName="1.2.1_b8">
 
 
 

diff --git a/android/libraries/TweetLanesCore/res/layout/account_row.xml b/android/libraries/TweetLanesCore/res/layout/account_row.xml
@@ -38,4 +38,11 @@
             android:text="ScreenName"
             android:textSize="@dimen/account_row_size"
             android:layout_marginLeft="10dp"/>
+
+    <TextView
+            android:id="@+id/filler"
+            android:layout_width="1px"
+            android:layout_height="48dp"
+            android:adjustViewBounds="true"
+            />
 </LinearLayout>
diff --git a/android/libraries/TweetLanesCore/src/com/tweetlanes/android/core/view/HomeActivity.java b/android/libraries/TweetLanesCore/src/com/tweetlanes/android/core/view/HomeActivity.java
@@ -814,6 +814,7 @@ public View getView(int position, View convertView, ViewGroup parent) {
                 holder.AvatarImage = (ImageView) row.findViewById(R.id.accountAvatar);
                 holder.ServiceImage = (ImageView) row.findViewById(R.id.serviceImage);
                 holder.ScreenName = (TextView) row.findViewById(R.id.accountScreenName);
+                holder.Filler = (TextView) row.findViewById(R.id.filler);
 
                 row.setTag(holder);
             } else {
@@ -833,9 +834,11 @@ public View getView(int position, View convertView, ViewGroup parent) {
 
             if (mShowImages) {
                 setProfileImage(account.AvatarImageUrl, account.ServiceType, holder.AvatarImage, holder.ServiceImage);
+                holder.Filler.setVisibility(View.GONE);
             } else {
                 holder.AvatarImage.setVisibility(View.GONE);
                 holder.ServiceImage.setVisibility(View.GONE);
+                holder.Filler.setVisibility(View.VISIBLE);
             }
 
             return row;
@@ -859,6 +862,7 @@ class AccountHolder {
             public ImageView AvatarImage;
             public ImageView ServiceImage;
             public TextView ScreenName;
+            public TextView Filler;
         }
 
         private void setProfileImage(String profileImageUrl, SocialNetConstant.Type serviceType, ImageView avatar, ImageView service) {