Skip to content
Merged
Show file tree
Hide file tree
Changes from 9 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
import me.ghui.v2er.module.user.UserHomeActivity;
import me.ghui.v2er.network.bean.DailyHotInfo;
import me.ghui.v2er.util.ViewUtils;
import me.ghui.v2er.util.ViewHolderFontHelper;

/**
* Created by ghui on 27/03/2017.
Expand All @@ -41,13 +42,14 @@ protected void convert(ViewHolder holder, DailyHotInfo.Item item, int position)
.load(item.getMember().getAvatar())
.placeholder(R.drawable.avatar_placeholder_drawable)
.into((ImageView) holder.getView(R.id.avatar_img));
holder.setText(R.id.user_name_tv, item.getMember().getUserName());
holder.setText(R.id.time_tv, item.getTime());
holder.setText(R.id.tagview, item.getNode().getTitle());
holder.setText(R.id.title_tv, item.getTitle());
TextView commentTV = holder.getTextView(R.id.comment_num_tv);
commentTV.setText("评论" + item.getReplies());
ViewUtils.highlightCommentNum(commentTV);

// Use centralized font helper
ViewHolderFontHelper.applyCommonListItemFonts(holder,
item.getTitle(),
item.getMember().getUserName(),
item.getTime(),
item.getNode().getTitle(),
"评论" + item.getReplies());
}

@Override
Expand Down
25 changes: 17 additions & 8 deletions app/src/main/java/me/ghui/v2er/injector/module/MsgModule.java
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,11 @@
import me.ghui.v2er.module.user.UserHomeActivity;
import me.ghui.v2er.network.bean.NotificationInfo;
import me.ghui.v2er.util.Utils;
import me.ghui.v2er.util.ViewHolderFontHelper;
import me.ghui.v2er.util.FontSizeUtil;
import me.ghui.v2er.widget.LoadMoreRecyclerView;
import me.ghui.v2er.widget.richtext.RichText;
import android.widget.TextView;

/**
* Created by ghui on 10/05/2017.
Expand All @@ -41,19 +44,25 @@ protected void convert(ViewHolder holder, NotificationInfo.Reply reply, int posi
GlideApp.with(mView.getContext()).load(reply.getAvatar())
.placeholder(R.drawable.avatar_placeholder_drawable)
.into((ImageView) holder.getView(R.id.avatar_img));

// Apply font sizing
CharSequence titleWithUserName = Utils.highlight(reply.getName() + " " + reply.getTitle(),
true, new int[]{0, reply.getName().length()});
holder.setText(R.id.msg_title_tv, titleWithUserName);
holder.getView(R.id.msg_content_tv);
TextView titleTv = holder.getTextView(R.id.msg_title_tv);
titleTv.setTextSize(android.util.TypedValue.COMPLEX_UNIT_PX, FontSizeUtil.getTitleSize());
titleTv.setText(titleWithUserName);

TextView contentTv = holder.getTextView(R.id.msg_content_tv);
if (!Check.isEmpty(reply.getContent())) {
holder.getView(R.id.msg_content_tv).setVisibility(View.VISIBLE);
// holder.setText(R.id.msg_content_tv, reply.getContent());
RichText.from(reply.getContent())
.into(holder.getTextView(R.id.msg_content_tv));
contentTv.setVisibility(View.VISIBLE);
contentTv.setTextSize(android.util.TypedValue.COMPLEX_UNIT_PX, FontSizeUtil.getContentSize());
RichText.from(reply.getContent()).into(contentTv);
} else {
holder.getView(R.id.msg_content_tv).setVisibility(View.GONE);
contentTv.setVisibility(View.GONE);
}
holder.setText(R.id.time_tv, reply.getTime());

ViewHolderFontHelper.setTextWithSize(holder, R.id.time_tv,
reply.getTime(), FontSizeUtil.getSubTextSize());
}

@Override
Expand Down
16 changes: 9 additions & 7 deletions app/src/main/java/me/ghui/v2er/injector/module/NewsModule.java
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
import me.ghui.v2er.network.bean.NewsInfo;
import me.ghui.v2er.util.L;
import me.ghui.v2er.util.ViewUtils;
import me.ghui.v2er.util.ViewHolderFontHelper;
import me.ghui.v2er.widget.LoadMoreRecyclerView;

/**
Expand Down Expand Up @@ -52,13 +53,14 @@ protected void convert(ViewHolder holder, NewsInfo.Item item, int position) {
.load(item.getAvatar())
.placeholder(R.drawable.avatar_placeholder_drawable)
.into(holder.getImgView(R.id.avatar_img));
holder.setText(R.id.user_name_tv, item.getUserName());
holder.setText(R.id.time_tv, item.getTime());
holder.setText(R.id.tagview, item.getTagName());
holder.setText(R.id.title_tv, item.getTitle());
TextView commentTV = holder.getTextView(R.id.comment_num_tv);
commentTV.setText("评论" + item.getReplies());
ViewUtils.highlightCommentNum(commentTV);

// Use centralized font helper
ViewHolderFontHelper.applyCommonListItemFonts(holder,
item.getTitle(),
item.getUserName(),
item.getTime(),
item.getTagName(),
"评论" + item.getReplies());
}

@Override
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,8 @@
import me.ghui.v2er.module.user.UserHomeActivity;
import me.ghui.v2er.network.bean.NodeTopicInfo;
import me.ghui.v2er.util.ViewUtils;
import me.ghui.v2er.util.ViewHolderFontHelper;
import me.ghui.v2er.util.FontSizeUtil;
import me.ghui.v2er.widget.LoadMoreRecyclerView;

/**
Expand All @@ -40,11 +42,18 @@ protected void convert(ViewHolder holder, NodeTopicInfo.Item item, int position)
.load(item.getAvatar())
.placeholder(R.drawable.avatar_placeholder_drawable)
.into((ImageView) holder.getView(R.id.avatar_img));
holder.setText(R.id.user_name_tv, item.getUserName());
holder.setText(R.id.title_tv, item.getTitle());
holder.setText(R.id.click_count_tv, "点击" + item.getClickNum());

// Use helper methods for cleaner code
ViewHolderFontHelper.setTextWithSize(holder, R.id.title_tv,
item.getTitle(), FontSizeUtil.getTitleSize());
ViewHolderFontHelper.setTextWithSize(holder, R.id.user_name_tv,
item.getUserName(), FontSizeUtil.getSubTextSize());
ViewHolderFontHelper.setTextWithSize(holder, R.id.click_count_tv,
"点击" + item.getClickNum(), FontSizeUtil.getSubTextSize());

TextView commentTV = holder.getTextView(R.id.comment_num_tv);
commentTV.setText("评论" + item.getCommentNum());
ViewHolderFontHelper.setTextWithSize(holder, R.id.comment_num_tv,
"评论" + item.getCommentNum(), FontSizeUtil.getSubTextSize());
ViewUtils.highlightCommentNum(commentTV);
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,8 @@
import me.ghui.v2er.module.home.NodesNavFragment;
import me.ghui.v2er.module.home.NodesNavPresenter;
import me.ghui.v2er.network.bean.NodesNavInfo;
import me.ghui.v2er.util.ViewHolderFontHelper;
import me.ghui.v2er.util.FontSizeUtil;
import me.ghui.v2er.widget.NavNodesWrapper;

/**
Expand All @@ -28,9 +30,13 @@ public CommonAdapter<NodesNavInfo.Item> provideAdapter() {
return new CommonAdapter<NodesNavInfo.Item>(mNavFragment.getContext(), R.layout.nodes_nav_item) {
@Override
protected void convert(ViewHolder holder, NodesNavInfo.Item item, int position) {
holder.setText(R.id.node_nav_category_tv, item.getCategory());
// Apply font sizing for category title
ViewHolderFontHelper.setTextWithSize(holder, R.id.node_nav_category_tv,
item.getCategory(), FontSizeUtil.getTitleSize());

NavNodesWrapper nodesWrapper = holder.getView(R.id.nodes_nav_node_wrapper);
nodesWrapper.setData(item.getNodes());
// The NavNodesWrapper should handle its own font sizing internally
}
};
}
Expand Down
13 changes: 11 additions & 2 deletions app/src/main/java/me/ghui/v2er/injector/module/SearchModule.java
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,8 @@
import me.ghui.v2er.network.bean.SoV2EXSearchResultInfo;
import me.ghui.v2er.widget.LoadMoreRecyclerView;
import me.ghui.v2er.widget.richtext.RichText;
import me.ghui.v2er.util.ViewHolderFontHelper;
import me.ghui.v2er.util.FontSizeUtil;

/**
* Created by ghui on 02/06/2017.
Expand All @@ -35,9 +37,16 @@ public LoadMoreRecyclerView.Adapter<SoV2EXSearchResultInfo.Hit> provideAdapter()
return new CommonLoadMoreAdapter<SoV2EXSearchResultInfo.Hit>(mFragment.getContext(), R.layout.item_bing_search) {
@Override
protected void convert(ViewHolder holder, SoV2EXSearchResultInfo.Hit hit, int position) {
holder.setText(R.id.search_result_title_tv, hit.getSource().getTitle());
// Use helper for cleaner code
ViewHolderFontHelper.setTextWithSize(holder, R.id.search_result_title_tv,
hit.getSource().getTitle(), FontSizeUtil.getTitleSize());

String footnote = hit.getSource().getCreator() + " 于 " + hit.getSource().getTime() + " 发表, " + hit.getSource().getReplies() + " 回复";
holder.setText(R.id.search_result_footnote_tv, footnote);
ViewHolderFontHelper.setTextWithSize(holder, R.id.search_result_footnote_tv,
footnote, FontSizeUtil.getSubTextSize());

ViewHolderFontHelper.setTextWithSize(holder, R.id.search_result_content_tv,
"", FontSizeUtil.getContentSize());
RichText.from(hit.getSource().getContent())
.supportUrlClick(false)
.into(holder.getTextView(R.id.search_result_content_tv));
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
import me.ghui.v2er.module.user.UserHomeActivity;
import me.ghui.v2er.network.bean.CareInfo;
import me.ghui.v2er.util.ViewUtils;
import me.ghui.v2er.util.ViewHolderFontHelper;
import me.ghui.v2er.widget.LoadMoreRecyclerView;

/**
Expand All @@ -43,19 +44,21 @@ protected void convert(ViewHolder holder, CareInfo.Item item, int position) {
.load(item.getAvatar())
.placeholder(R.drawable.avatar_placeholder_drawable)
.into((ImageView) holder.getView(R.id.avatar_img));
holder.setText(R.id.user_name_tv, item.getUserName());
// TODO: 2018/6/9 time is null
if (Check.isEmpty(item.getTime())) {

// Use centralized font helper - handle null time
String timeText = Check.isEmpty(item.getTime()) ? null : item.getTime();
if (timeText == null) {
holder.getView(R.id.time_tv).setVisibility(View.INVISIBLE);
} else {
holder.getView(R.id.time_tv).setVisibility(View.VISIBLE);
holder.setText(R.id.time_tv, item.getTime());
}
holder.setText(R.id.tagview, item.getTagName());
holder.setText(R.id.title_tv, item.getTitle());
TextView commentTV = holder.getTextView(R.id.comment_num_tv);
commentTV.setText("评论" + item.getComentNum());
ViewUtils.highlightCommentNum(commentTV);

ViewHolderFontHelper.applyCommonListItemFonts(holder,
item.getTitle(),
item.getUserName(),
timeText,
item.getTagName(),
"评论" + item.getComentNum());
}

@Override
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
import me.ghui.v2er.module.user.UserHomeActivity;
import me.ghui.v2er.network.bean.TopicStarInfo;
import me.ghui.v2er.util.ViewUtils;
import me.ghui.v2er.util.ViewHolderFontHelper;
import me.ghui.v2er.widget.LoadMoreRecyclerView;

/**
Expand All @@ -40,13 +41,14 @@ protected void convert(ViewHolder holder, TopicStarInfo.Item item, int position)
.load(item.getAvatar())
.placeholder(R.drawable.avatar_placeholder_drawable)
.into((ImageView) holder.getView(R.id.avatar_img));
holder.setText(R.id.user_name_tv, item.getUserName());
holder.setText(R.id.time_tv, item.getTime());
holder.setText(R.id.tagview, item.getTag());
holder.setText(R.id.title_tv, item.getTitle());
TextView commentTV = holder.getTextView(R.id.comment_num_tv);
commentTV.setText("评论" + item.getCommentNum());
ViewUtils.highlightCommentNum(commentTV);

// Use centralized font helper
ViewHolderFontHelper.applyCommonListItemFonts(holder,
item.getTitle(),
item.getUserName(),
item.getTime(),
item.getTag(),
"评论" + item.getCommentNum());
}

@Override
Expand Down
29 changes: 20 additions & 9 deletions app/src/main/java/me/ghui/v2er/injector/module/UserHomeModule.java
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,8 @@
import me.ghui.v2er.module.user.UserHomePresenter;
import me.ghui.v2er.network.bean.UserPageInfo;
import me.ghui.v2er.util.ViewUtils;
import me.ghui.v2er.util.ViewHolderFontHelper;
import me.ghui.v2er.util.FontSizeUtil;
import me.ghui.v2er.widget.richtext.RichText;

/**
Expand Down Expand Up @@ -60,13 +62,14 @@ public boolean isForViewType(@Nullable UserPageInfo.Item item, int position) {
@Override
public void convert(ViewHolder holder, UserPageInfo.Item item, int position) {
UserPageInfo.TopicItem topicItem = (UserPageInfo.TopicItem) item;
holder.setText(R.id.user_name_tv, topicItem.getUserName());
holder.setText(R.id.time_tv, topicItem.getTime());
holder.setText(R.id.tagview, topicItem.getTag());
holder.setText(R.id.title_tv, topicItem.getTitle());
TextView commentTV = holder.getTextView(R.id.comment_num_tv);
commentTV.setText("评论" + topicItem.getReplyNum());
ViewUtils.highlightCommentNum(commentTV);

// Use centralized font helper
ViewHolderFontHelper.applyCommonListItemFonts(holder,
topicItem.getTitle(),
topicItem.getUserName(),
topicItem.getTime(),
topicItem.getTag(),
"评论" + topicItem.getReplyNum());
}
});

Expand All @@ -84,11 +87,19 @@ public boolean isForViewType(@Nullable UserPageInfo.Item item, int position) {
@Override
public void convert(ViewHolder holder, UserPageInfo.Item item, int position) {
UserPageInfo.ReplyItem replyItem = (UserPageInfo.ReplyItem) item;
holder.setText(R.id.reply_title_tv, replyItem.getTitle());

// Use helper for cleaner code
ViewHolderFontHelper.setTextWithSize(holder, R.id.reply_title_tv,
replyItem.getTitle(), FontSizeUtil.getTitleSize());

ViewHolderFontHelper.setTextWithSize(holder, R.id.reply_content_tv,
"", FontSizeUtil.getContentSize());
RichText.from(replyItem.getContent())
.widthDelta(43)
.into(holder.getTextView(R.id.reply_content_tv));
holder.setText(R.id.reply_time_tv, replyItem.getTime());

ViewHolderFontHelper.setTextWithSize(holder, R.id.reply_time_tv,
replyItem.getTime(), FontSizeUtil.getSubTextSize());
}
});

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,10 @@
import android.view.animation.Animation;
import android.view.animation.AnimationUtils;
import android.widget.TextView;
import android.util.TypedValue;

import me.ghui.v2er.util.Theme;
import me.ghui.v2er.util.FontSizeUtil;
import me.ghui.v2er.R;
import me.ghui.v2er.adapter.base.CommonAdapter;
import me.ghui.v2er.adapter.base.MultiItemTypeAdapter;
Expand Down Expand Up @@ -80,7 +82,10 @@ private void initView() {
CommonAdapter<TabInfo> adapter = new CommonAdapter<TabInfo>(mContext, R.layout.tab_info_item) {
@Override
protected void convert(ViewHolder holder, TabInfo tabInfo, int position) {
holder.setText(R.id.tab_title_tv, tabInfo.title);
TextView titleTv = holder.getTextView(R.id.tab_title_tv);
// Apply font size scaling
titleTv.setTextSize(TypedValue.COMPLEX_UNIT_PX, FontSizeUtil.getTitleSize());
titleTv.setText(tabInfo.title);
}
};
adapter.setData(TabInfo.getDefault());
Expand Down
Loading
Loading