public-mirrors/NewsBlur
1
0
Fork 0
mirror of https://github.com/samuelclay/NewsBlur.git synced 2025-09-18 21:50:56 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Various style fixes as per feedback 09-14

Browse source
This commit is contained in:
RyanBateman 2012-09-17 10:51:14 -04:00
parent c1bafcede6
commit cbb34ccefb
15 changed files with 223 additions and 149 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
media/android/NewsBlur/res/drawable/list_background_pressed.xml
View file

@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="rectangle" >
<solid android:color="@color/highlight" />
<solid android:color="#D2E6FD" />
</shape>

5
media/android/NewsBlur/res/drawable/selector_sharebutton_background.xml Normal file
View file

@ -0,0 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android" >
<item android:state_pressed="true" android:drawable="@drawable/sharebutton_background_pressed" />
<item android:drawable="@drawable/sharebutton_background_default" />
</selector>

16
media/android/NewsBlur/res/drawable/sharebutton_background_default.xml Normal file
View file

@ -0,0 +1,16 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle" >
<gradient
android:angle="270"
android:endColor="#1e78c1"
android:startColor="#42aaff" />
<corners
android:bottomLeftRadius="5dp"
android:bottomRightRadius="5dp"
android:topLeftRadius="5dp"
android:topRightRadius="5dp" />
</shape>

15
media/android/NewsBlur/res/drawable/sharebutton_background_pressed.xml Normal file
View file

@ -0,0 +1,15 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle" >
<gradient
android:angle="270"
android:endColor="#2379bf"
android:startColor="#1e78c1" />
<corners
android:bottomLeftRadius="5dp"
android:bottomRightRadius="5dp"
android:topLeftRadius="5dp"
android:topRightRadius="5dp" />
</shape>

69
media/android/NewsBlur/res/layout/fragment_readingitem.xml
View file

@ -30,28 +30,26 @@
android:layout_height="wrap_content"
android:layout_marginLeft="10dp" >
<TextView
android:id="@+id/reading_item_date"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentRight="true"
android:layout_marginBottom="5dp"
android:layout_marginRight="10dp"
android:paddingBottom="10dp"
android:paddingTop="10dp"
android:textColor="@color/linkblue"
android:textSize="13sp" />
<TextView
android:id="@+id/reading_feed_title"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_alignParentLeft="true"
android:layout_toLeftOf="@id/reading_item_date"
android:paddingBottom="10dp"
android:paddingTop="10dp"
android:textColor="@color/newsblur_blue"
android:textSize="13sp" />
<TextView
android:id="@+id/reading_item_date"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_below="@id/reading_feed_title"
android:layout_marginBottom="5dp"
android:layout_marginRight="10dp"
android:paddingTop="10dp"
android:textColor="@color/linkblue"
android:textSize="13sp" />
<TextView
android:id="@+id/reading_item_title"
@ -99,8 +97,8 @@
android:id="@+id/reading_share_bar"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center_vertical"
android:layout_gravity="center_vertical"
android:paddingBottom="10dp"
android:paddingTop="10dp"
android:visibility="gone" >
@ -116,9 +114,10 @@
android:layout_height="wrap_content"
android:layout_alignParentLeft="true"
android:layout_centerVertical="true"
android:layout_marginLeft="5dp"
android:layout_marginLeft="20dp"
android:textColor="@color/darkgray"
android:textSize="10sp" />
android:textSize="13sp"
android:textStyle="bold" />
<TextView
android:id="@+id/shared_by"
@ -126,15 +125,17 @@
android:layout_height="wrap_content"
android:layout_alignParentRight="true"
android:layout_centerVertical="true"
android:layout_marginRight="5dp"
android:layout_marginRight="20dp"
android:textColor="@color/darkgray"
android:textSize="10sp" />
android:textSize="13sp"
android:textStyle="bold" />
<android.support.v7.widget.GridLayout
xmlns:app="http://schemas.android.com/apk/res-auto"
android:id="@+id/reading_social_commentimages"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_centerVertical="true"
android:layout_toLeftOf="@id/center_filler"
android:layout_toRightOf="@id/comment_by"
android:paddingLeft="5dp"
@ -145,41 +146,45 @@
android:id="@+id/reading_social_shareimages"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerVertical="true"
android:layout_toLeftOf="@+id/shared_by"
android:paddingRight="5dp"
android:paddingBottom="10dp"
app:columnCount="3" />
<View
android:layout_width="match_parent"
android:layout_height="3dp"
android:layout_alignParentBottom="true"
android:background="@drawable/divider_light" />
</RelativeLayout>
<View
android:layout_width="match_parent"
android:layout_height="3dp"
android:id="@+id/share_bar_underline"
android:visibility="gone"
android:layout_marginTop="3dp"
android:background="@drawable/divider_light" />
<com.newsblur.view.NewsblurWebview
android:id="@+id/reading_webview"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@color/item_background"
android:paddingLeft="20dp"
android:paddingRight="20dp"
android:scrollbars="none" />
<Button
android:id="@+id/share_story_button"
style="@style/shareButton"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginLeft="30dp"
android:layout_marginRight="30dp"
android:layout_marginLeft="20dp"
android:layout_marginRight="20dp"
android:background="@drawable/selector_sharebutton_background"
android:padding="10dp"
style="@style/shareButton"
android:layout_marginBottom="10dp"
android:text="@string/share_this" />
<RelativeLayout
android:id="@+id/reading_shared_container"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:visibility="gone" >
android:layout_height="wrap_content" >
<LinearLayout
android:id="@+id/reading_friend_comment_container"

152
media/android/NewsBlur/res/layout/include_comment.xml
View file

@ -1,85 +1,89 @@
<?xml version="1.0" encoding="utf-8"?>
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:background="@color/item_background"
android:gravity="center_vertical"
android:orientation="horizontal"
android:paddingBottom="8dp"
android:paddingTop="8dp" >
android:orientation="vertical" >
<ImageView
android:id="@+id/comment_user_image"
android:layout_width="25dp"
android:layout_height="25dp"
android:layout_alignParentTop="true"
android:layout_marginLeft="10dp"
android:layout_marginRight="10dp"
android:layout_marginTop="8dp"
android:contentDescription="@string/description_comment_user"
android:scaleType="fitCenter" />
<ImageView
android:id="@+id/comment_reply_icon"
android:layout_width="16dp"
android:layout_height="16dp"
android:layout_alignParentRight="true"
android:layout_marginRight="10dp"
android:scaleType="fitCenter"
android:src="@drawable/reply" />
<TextView
android:id="@+id/comment_shareddate"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginRight="10dp"
android:layout_toLeftOf="@id/comment_reply_icon"
android:textColor="@color/lightgray"
android:textSize="11dp" />
<ImageView
android:id="@+id/comment_favourite_icon"
android:layout_width="15dp"
android:layout_height="15dp"
android:layout_alignBottom="@id/comment_shareddate"
android:layout_marginRight="8dp"
android:layout_toLeftOf="@id/comment_shareddate"
android:scaleType="fitCenter"
android:src="@drawable/favourite" />
<TextView
android:id="@+id/comment_favourite_count"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignBottom="@id/comment_shareddate"
android:layout_marginRight="4dp"
android:layout_toLeftOf="@id/comment_favourite_icon"
android:textColor="@color/darkgray"
android:textSize="11dp" />
<TextView
android:id="@+id/comment_username"
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_toRightOf="@id/comment_user_image"
android:textColor="@color/darkorange"
android:textSize="11dp" />
android:background="@color/item_background"
android:gravity="center_vertical"
android:orientation="horizontal"
android:paddingBottom="8dp"
android:paddingTop="8dp" >
<TextView
android:id="@+id/comment_text"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_below="@id/comment_shareddate"
android:layout_marginRight="10dp"
android:layout_marginTop="4dp"
android:layout_toRightOf="@id/comment_user_image"
android:textColor="@color/darkgray"
android:textSize="14dp" />
<ImageView
android:id="@+id/comment_user_image"
android:layout_width="50dp"
android:layout_height="50dp"
android:layout_alignParentTop="true"
android:layout_marginLeft="10dp"
android:layout_marginRight="10dp"
android:contentDescription="@string/description_comment_user"
android:scaleType="fitCenter" />
<ImageView
android:id="@+id/comment_reply_icon"
android:layout_width="16dp"
android:layout_height="16dp"
android:layout_alignParentRight="true"
android:layout_marginRight="10dp"
android:scaleType="fitCenter"
android:src="@drawable/reply" />
<TextView
android:id="@+id/comment_shareddate"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginRight="10dp"
android:layout_toLeftOf="@id/comment_reply_icon"
android:textColor="@color/lightgray"
android:textSize="11dp" />
<ImageView
android:id="@+id/comment_favourite_icon"
android:layout_width="15dp"
android:layout_height="15dp"
android:layout_alignBottom="@id/comment_shareddate"
android:layout_marginRight="8dp"
android:layout_toLeftOf="@id/comment_shareddate"
android:scaleType="fitCenter"
android:src="@drawable/favourite" />
<TextView
android:id="@+id/comment_favourite_count"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignBottom="@id/comment_shareddate"
android:layout_marginRight="4dp"
android:layout_toLeftOf="@id/comment_favourite_icon"
android:textColor="@color/darkgray"
android:textSize="11dp" />
<TextView
android:id="@+id/comment_username"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_toRightOf="@id/comment_user_image"
android:textColor="@color/newsblur_blue"
android:textSize="11dp" />
<TextView
android:id="@+id/comment_text"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_below="@id/comment_shareddate"
android:layout_marginRight="10dp"
android:layout_marginTop="4dp"
android:layout_toRightOf="@id/comment_user_image"
android:textColor="@color/darkgray"
android:textSize="14dp" />
</RelativeLayout>
<LinearLayout
android:id="@+id/comment_replies_container"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_below="@id/comment_text" />
android:layout_height="wrap_content" />
</RelativeLayout>
</LinearLayout>

12
media/android/NewsBlur/res/layout/include_reply.xml
View file

@ -6,17 +6,17 @@
android:gravity="center_vertical"
android:orientation="horizontal"
android:paddingBottom="12dp"
android:paddingLeft="25dp"
android:paddingLeft="60dp"
android:paddingRight="10dp"
android:paddingTop="12dp" >
<ImageView
android:id="@+id/reply_user_image"
android:layout_width="25dp"
android:layout_height="25dp"
android:layout_width="30dp"
android:layout_height="30dp"
android:layout_alignParentTop="true"
android:layout_marginLeft="10dp"
android:layout_marginRight="10dp"
android:layout_marginTop="12dp"
android:contentDescription="@string/description_comment_user"
android:scaleType="fitCenter" />
@ -25,7 +25,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentRight="true"
android:layout_marginRight="10dp"
android:layout_marginRight="26dp"
android:textColor="@color/lightgray"
android:textSize="11dp" />
@ -33,7 +33,7 @@
android:id="@+id/reply_username"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:textColor="@color/darkorange"
android:textColor="@color/newsblur_blue"
android:layout_toRightOf="@id/reply_user_image"
android:textSize="11dp" />

4
media/android/NewsBlur/res/layout/row_socialitem.xml
View file

@ -41,12 +41,12 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="8dp"
android:layout_marginTop="12dp"
android:layout_toRightOf="@id/row_item_feedicon"
android:layout_alignBottom="@id/row_item_feedicon"
android:ellipsize="end"
android:singleLine="true"
android:textColor="@color/darkgray"
android:textSize="11dp" />
android:textSize="14sp" />
<TextView
android:id="@+id/row_item_title"

9
media/android/NewsBlur/res/values/colors.xml
View file

@ -15,6 +15,15 @@
<color name="feed_background">#F2F2F2</color>
<color name="feed_title_text_background">#606060</color>
<color name="story_title_unread">#606060</color>
<color name="story_title_read">#C0C0C0</color>
<color name="story_feed_unread">#333333</color>
<color name="story_feed_read">#C0C0C0</color>
<color name="story_author_unread">#959595</color>
<color name="story_author_read">#C0C0C0</color>
<color name="story_date_unread">#262C6C</color>
<color name="story_date_read">#BABDD1</color>
<color name="twitter_blue">#4099FF</color>
<color name="facebook_blue">#3B5998</color>

19
media/android/NewsBlur/src/com/newsblur/database/FeedItemsAdapter.java
View file

@ -18,16 +18,19 @@ public class FeedItemsAdapter extends SimpleCursorAdapter {
private Cursor cursor;
private final Feed feed;
private int darkGray;
private int lightGray;
private int storyTitleUnread, storyTitleRead, storyAuthorUnread, storyAuthorRead, storyDateUnread, storyDateRead;
public FeedItemsAdapter(Context context, Feed feed, int layout, Cursor c, String[] from, int[] to, int flags) {
super(context, layout, c, from, to, flags);
this.feed = feed;
this.cursor = c;
darkGray = context.getResources().getColor(R.color.darkgray);
lightGray = context.getResources().getColor(R.color.lightgray);
storyTitleUnread = context.getResources().getColor(R.color.story_title_unread);
storyTitleRead = context.getResources().getColor(R.color.story_title_read);
storyAuthorUnread = context.getResources().getColor(R.color.story_author_unread);
storyAuthorRead = context.getResources().getColor(R.color.story_author_read);
storyDateUnread = context.getResources().getColor(R.color.story_date_unread);
storyDateRead = context.getResources().getColor(R.color.story_date_read);
}
@Override
@ -59,15 +62,15 @@ public class FeedItemsAdapter extends SimpleCursorAdapter {
// 1 is read
if (Story.fromCursor(cursor).read == 0) {
((TextView) v.findViewById(R.id.row_item_author)).setTextColor(darkGray);
((TextView) v.findViewById(R.id.row_item_date)).setTextColor(darkGray);
((TextView) v.findViewById(R.id.row_item_author)).setTextColor(storyAuthorUnread);
((TextView) v.findViewById(R.id.row_item_date)).setTextColor(storyDateUnread);
((TextView) v.findViewById(R.id.row_item_title)).setTypeface(null, Typeface.BOLD);
borderOne.getBackground().setAlpha(255);
sidebar.getBackground().setAlpha(255);
borderTwo.getBackground().setAlpha(255);
} else {
((TextView) v.findViewById(R.id.row_item_author)).setTextColor(lightGray);
((TextView) v.findViewById(R.id.row_item_date)).setTextColor(lightGray);
((TextView) v.findViewById(R.id.row_item_author)).setTextColor(storyAuthorRead);
((TextView) v.findViewById(R.id.row_item_date)).setTextColor(storyDateRead);
((TextView) v.findViewById(R.id.row_item_title)).setTypeface(null, Typeface.NORMAL);
borderOne.getBackground().setAlpha(125);
sidebar.getBackground().setAlpha(125);

29
media/android/NewsBlur/src/com/newsblur/database/MultipleFeedItemsAdapter.java
View file

@ -21,16 +21,21 @@ public class MultipleFeedItemsAdapter extends SimpleCursorAdapter {
private Cursor cursor;
private ImageLoader imageLoader;
private int darkGray;
private int lightGray;
private int storyTitleUnread, storyAuthorUnread, storyTitleRead, storyAuthorRead, storyDateUnread, storyDateRead, storyFeedUnread, storyFeedRead;
public MultipleFeedItemsAdapter(Context context, int layout, Cursor c, String[] from, int[] to, int flags) {
super(context, layout, c, from, to, flags);
imageLoader = ((NewsBlurApplication) context.getApplicationContext()).getImageLoader();
this.cursor = c;
darkGray = context.getResources().getColor(R.color.darkgray);
lightGray = context.getResources().getColor(R.color.lightgray);
storyTitleUnread = context.getResources().getColor(R.color.story_title_unread);
storyTitleRead = context.getResources().getColor(R.color.story_title_read);
storyAuthorUnread = context.getResources().getColor(R.color.story_author_unread);
storyAuthorRead = context.getResources().getColor(R.color.story_author_read);
storyDateUnread = context.getResources().getColor(R.color.story_date_unread);
storyDateRead = context.getResources().getColor(R.color.story_date_read);
storyFeedUnread = context.getResources().getColor(R.color.story_feed_unread);
storyFeedRead = context.getResources().getColor(R.color.story_feed_read);
}
@Override
@ -68,20 +73,20 @@ public class MultipleFeedItemsAdapter extends SimpleCursorAdapter {
// 1 is read
if (Story.fromCursor(cursor).read == 0) {
((TextView) v.findViewById(R.id.row_item_author)).setTextColor(darkGray);
((TextView) v.findViewById(R.id.row_item_date)).setTextColor(darkGray);
((TextView) v.findViewById(R.id.row_item_feedtitle)).setTextColor(darkGray);
((TextView) v.findViewById(R.id.row_item_title)).setTextColor(darkGray);
((TextView) v.findViewById(R.id.row_item_author)).setTextColor(storyAuthorUnread);
((TextView) v.findViewById(R.id.row_item_date)).setTextColor(storyDateUnread);
((TextView) v.findViewById(R.id.row_item_feedtitle)).setTextColor(storyFeedUnread);
((TextView) v.findViewById(R.id.row_item_title)).setTextColor(storyTitleUnread);
((TextView) v.findViewById(R.id.row_item_title)).setTypeface(null, Typeface.BOLD);
borderOne.getBackground().setAlpha(255);
sidebar.getBackground().setAlpha(255);
borderTwo.getBackground().setAlpha(255);
} else {
((TextView) v.findViewById(R.id.row_item_author)).setTextColor(lightGray);
((TextView) v.findViewById(R.id.row_item_date)).setTextColor(lightGray);
((TextView) v.findViewById(R.id.row_item_feedtitle)).setTextColor(lightGray);
((TextView) v.findViewById(R.id.row_item_title)).setTextColor(lightGray);
((TextView) v.findViewById(R.id.row_item_author)).setTextColor(storyAuthorRead);
((TextView) v.findViewById(R.id.row_item_date)).setTextColor(storyDateRead);
((TextView) v.findViewById(R.id.row_item_feedtitle)).setTextColor(storyFeedRead);
((TextView) v.findViewById(R.id.row_item_title)).setTextColor(storyTitleRead);
((TextView) v.findViewById(R.id.row_item_title)).setTypeface(null, Typeface.NORMAL);
borderOne.getBackground().setAlpha(125);

2
media/android/NewsBlur/src/com/newsblur/fragment/AllSharedStoriesItemListFragment.java
View file

@ -67,7 +67,7 @@ public class AllSharedStoriesItemListFragment extends ItemListFragment implement
calculateTotals();
String[] groupFrom = new String[] { DatabaseConstants.STORY_TITLE, DatabaseConstants.STORY_AUTHORS, DatabaseConstants.STORY_READ, DatabaseConstants.STORY_SHORTDATE, DatabaseConstants.STORY_INTELLIGENCE_AUTHORS, DatabaseConstants.FEED_TITLE };
String[] groupFrom = new String[] { DatabaseConstants.STORY_TITLE, DatabaseConstants.STORY_AUTHORS, DatabaseConstants.STORY_TITLE, DatabaseConstants.STORY_SHORTDATE, DatabaseConstants.STORY_INTELLIGENCE_AUTHORS, DatabaseConstants.FEED_TITLE };
int[] groupTo = new int[] { R.id.row_item_title, R.id.row_item_author, R.id.row_item_title, R.id.row_item_date, R.id.row_item_sidebar, R.id.row_item_feedtitle };
getLoaderManager().initLoader(ITEMLIST_LOADER , null, this);

2
media/android/NewsBlur/src/com/newsblur/fragment/AllStoriesItemListFragment.java
View file

@ -66,7 +66,7 @@ public class AllStoriesItemListFragment extends ItemListFragment implements Load
calculateTotals();
String[] groupFrom = new String[] { DatabaseConstants.STORY_TITLE, DatabaseConstants.STORY_AUTHORS, DatabaseConstants.STORY_READ, DatabaseConstants.STORY_SHORTDATE, DatabaseConstants.STORY_INTELLIGENCE_AUTHORS, DatabaseConstants.FEED_TITLE };
String[] groupFrom = new String[] { DatabaseConstants.STORY_TITLE, DatabaseConstants.STORY_AUTHORS, DatabaseConstants.STORY_TITLE, DatabaseConstants.STORY_SHORTDATE, DatabaseConstants.STORY_INTELLIGENCE_AUTHORS, DatabaseConstants.FEED_TITLE };
int[] groupTo = new int[] { R.id.row_item_title, R.id.row_item_author, R.id.row_item_title, R.id.row_item_date, R.id.row_item_sidebar, R.id.row_item_feedtitle };
getLoaderManager().initLoader(ITEMLIST_LOADER , null, this);

1
media/android/NewsBlur/src/com/newsblur/fragment/ReadingItemFragment.java
View file

@ -99,6 +99,7 @@ public class ReadingItemFragment extends Fragment {
if (story.sharedUserIds.length > 0 || story.commentCount > 0 ) {
view.findViewById(R.id.reading_share_bar).setVisibility(View.VISIBLE);
view.findViewById(R.id.share_bar_underline).setVisibility(View.VISIBLE);
setupItemCommentsAndShares(view);
}

35
media/android/NewsBlur/src/com/newsblur/network/SetupCommentSectionTask.java
View file

@ -71,23 +71,24 @@ public class SetupCommentSectionTask extends AsyncTask<Void, Void, Void> {
@Override
protected Void doInBackground(Void... arg0) {
for (String userId : story.sharedUserIds) {
ProfileResponse user = apiManager.getUser(userId);
friendUserMap.put(userId, user.user);
publicUserMap.put(userId, user.user);
}
for (String userId : story.friendUserIds) {
ProfileResponse user = apiManager.getUser(userId);
friendUserMap.put(userId, user.user);
publicUserMap.put(userId, user.user);
}
for (String userId : story.publicUserIds) {
ProfileResponse user = apiManager.getUser(userId);
publicUserMap.put(userId, user.user);
}
for (String userId : story.sharedUserIds) {
if (!publicUserMap.containsKey(userId) && !friendUserMap.containsKey(userId)) {
ProfileResponse user = apiManager.getUser(userId);
publicUserMap.put(userId, user.user);
}
}
commentCursor = resolver.query(FeedProvider.COMMENTS_URI, null, null, new String[] { story.id }, null);
publicCommentViews = new ArrayList<View>();
@ -127,7 +128,7 @@ public class SetupCommentSectionTask extends AsyncTask<Void, Void, Void> {
@Override
public void onClick(View v) {
if (story != null) {
DialogFragment newFragment = ReplyDialogFragment.newInstance(story.id, story.feedId, comment.userId, friendUserMap.get(comment.userId).username);
DialogFragment newFragment = ReplyDialogFragment.newInstance(story.id, story.feedId, comment.userId, publicUserMap.get(comment.userId).username);
newFragment.show(manager, "dialog");
}
}
@ -180,13 +181,23 @@ public class SetupCommentSectionTask extends AsyncTask<Void, Void, Void> {
GridLayout commentGrid = (GridLayout) viewHolder.get().findViewById(R.id.reading_social_commentimages);
TextView commentText = (TextView) viewHolder.get().findViewById(R.id.comment_by);
commentText.setText(String.format(comment, commentCursor.getCount()));
if (commentCursor.getCount() > 0) {
comment = String.format(comment, commentCursor.getCount());
commentText.setText(commentCursor.getCount() > 1 ? comment : comment.substring(0, comment.length() - 1));
} else {
commentText.setVisibility(View.INVISIBLE);
}
TextView sharesText = (TextView) viewHolder.get().findViewById(R.id.shared_by);
sharesText.setText(String.format(sharedBy, story.sharedUserIds.length));
if (story.sharedUserIds.length > 0) {
sharedBy = String.format(sharedBy, story.sharedUserIds.length);
sharesText.setText(story.sharedUserIds.length > 1 ? sharedBy : sharedBy.substring(0, sharedBy.length() - 1));
} else {
sharesText.setVisibility(View.INVISIBLE);
}
for (final String userId : story.sharedUserIds) {
for (final String userId : story.publicUserIds) {
ImageView image = new ImageView(context);
int imageLength = UIUtils.convertDPsToPixels(context, 25);
image.setMaxHeight(imageLength);