Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
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
25 changes: 21 additions & 4 deletions app/src/main/java/me/ghui/v2er/injector/module/DailyHotModule.java
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,8 @@
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.FontSizeUtil;
import android.util.TypedValue;

/**
* Created by ghui on 27/03/2017.
Expand All @@ -41,11 +43,26 @@ 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());

// Apply dynamic font sizing
TextView titleTv = holder.getTextView(R.id.title_tv);
titleTv.setTextSize(TypedValue.COMPLEX_UNIT_PX, FontSizeUtil.getTitleSize());
titleTv.setText(item.getTitle());

TextView userNameTv = holder.getTextView(R.id.user_name_tv);
userNameTv.setTextSize(TypedValue.COMPLEX_UNIT_PX, FontSizeUtil.getSubTextSize());
userNameTv.setText(item.getMember().getUserName());

TextView timeTv = holder.getTextView(R.id.time_tv);
timeTv.setTextSize(TypedValue.COMPLEX_UNIT_PX, FontSizeUtil.getSubTextSize());
timeTv.setText(item.getTime());

TextView tagTv = holder.getTextView(R.id.tagview);
tagTv.setTextSize(TypedValue.COMPLEX_UNIT_PX, FontSizeUtil.getSubTextSize());
tagTv.setText(item.getNode().getTitle());

TextView commentTV = holder.getTextView(R.id.comment_num_tv);
commentTV.setTextSize(TypedValue.COMPLEX_UNIT_PX, FontSizeUtil.getSubTextSize());
commentTV.setText("评论" + item.getReplies());
ViewUtils.highlightCommentNum(commentTV);
}
Expand Down
25 changes: 21 additions & 4 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,7 +18,9 @@
import me.ghui.v2er.network.bean.NewsInfo;
import me.ghui.v2er.util.L;
import me.ghui.v2er.util.ViewUtils;
import me.ghui.v2er.util.FontSizeUtil;
import me.ghui.v2er.widget.LoadMoreRecyclerView;
import android.util.TypedValue;

/**
* Created by ghui on 03/04/2017.
Expand Down Expand Up @@ -52,11 +54,26 @@ 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());

// Apply dynamic font sizing
TextView titleTv = holder.getTextView(R.id.title_tv);
titleTv.setTextSize(TypedValue.COMPLEX_UNIT_PX, FontSizeUtil.getTitleSize());
titleTv.setText(item.getTitle());

TextView userNameTv = holder.getTextView(R.id.user_name_tv);
userNameTv.setTextSize(TypedValue.COMPLEX_UNIT_PX, FontSizeUtil.getSubTextSize());
userNameTv.setText(item.getUserName());

TextView timeTv = holder.getTextView(R.id.time_tv);
timeTv.setTextSize(TypedValue.COMPLEX_UNIT_PX, FontSizeUtil.getSubTextSize());
timeTv.setText(item.getTime());

TextView tagTv = holder.getTextView(R.id.tagview);
tagTv.setTextSize(TypedValue.COMPLEX_UNIT_PX, FontSizeUtil.getSubTextSize());
tagTv.setText(item.getTagName());

TextView commentTV = holder.getTextView(R.id.comment_num_tv);
commentTV.setTextSize(TypedValue.COMPLEX_UNIT_PX, FontSizeUtil.getSubTextSize());
commentTV.setText("评论" + item.getReplies());
ViewUtils.highlightCommentNum(commentTV);
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,9 @@
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.FontSizeUtil;
import me.ghui.v2er.widget.LoadMoreRecyclerView;
import android.util.TypedValue;

/**
* Created by ghui on 16/05/2017.
Expand All @@ -43,17 +45,32 @@ 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());

// Apply dynamic font sizing
TextView titleTv = holder.getTextView(R.id.title_tv);
titleTv.setTextSize(TypedValue.COMPLEX_UNIT_PX, FontSizeUtil.getTitleSize());
titleTv.setText(item.getTitle());

TextView userNameTv = holder.getTextView(R.id.user_name_tv);
userNameTv.setTextSize(TypedValue.COMPLEX_UNIT_PX, FontSizeUtil.getSubTextSize());
userNameTv.setText(item.getUserName());

// TODO: 2018/6/9 time is null
TextView timeTv = holder.getTextView(R.id.time_tv);
if (Check.isEmpty(item.getTime())) {
holder.getView(R.id.time_tv).setVisibility(View.INVISIBLE);
timeTv.setVisibility(View.INVISIBLE);
} else {
holder.getView(R.id.time_tv).setVisibility(View.VISIBLE);
holder.setText(R.id.time_tv, item.getTime());
timeTv.setVisibility(View.VISIBLE);
timeTv.setTextSize(TypedValue.COMPLEX_UNIT_PX, FontSizeUtil.getSubTextSize());
timeTv.setText(item.getTime());
}
holder.setText(R.id.tagview, item.getTagName());
holder.setText(R.id.title_tv, item.getTitle());

TextView tagTv = holder.getTextView(R.id.tagview);
tagTv.setTextSize(TypedValue.COMPLEX_UNIT_PX, FontSizeUtil.getSubTextSize());
tagTv.setText(item.getTagName());

TextView commentTV = holder.getTextView(R.id.comment_num_tv);
commentTV.setTextSize(TypedValue.COMPLEX_UNIT_PX, FontSizeUtil.getSubTextSize());
commentTV.setText("评论" + item.getComentNum());
ViewUtils.highlightCommentNum(commentTV);
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,9 @@
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.FontSizeUtil;
import me.ghui.v2er.widget.LoadMoreRecyclerView;
import android.util.TypedValue;

/**
* Created by ghui on 17/05/2017.
Expand All @@ -40,11 +42,26 @@ 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());

// Apply dynamic font sizing
TextView titleTv = holder.getTextView(R.id.title_tv);
titleTv.setTextSize(TypedValue.COMPLEX_UNIT_PX, FontSizeUtil.getTitleSize());
titleTv.setText(item.getTitle());

TextView userNameTv = holder.getTextView(R.id.user_name_tv);
userNameTv.setTextSize(TypedValue.COMPLEX_UNIT_PX, FontSizeUtil.getSubTextSize());
userNameTv.setText(item.getUserName());

TextView timeTv = holder.getTextView(R.id.time_tv);
timeTv.setTextSize(TypedValue.COMPLEX_UNIT_PX, FontSizeUtil.getSubTextSize());
timeTv.setText(item.getTime());

TextView tagTv = holder.getTextView(R.id.tagview);
tagTv.setTextSize(TypedValue.COMPLEX_UNIT_PX, FontSizeUtil.getSubTextSize());
tagTv.setText(item.getTag());

TextView commentTV = holder.getTextView(R.id.comment_num_tv);
commentTV.setTextSize(TypedValue.COMPLEX_UNIT_PX, FontSizeUtil.getSubTextSize());
commentTV.setText("评论" + item.getCommentNum());
ViewUtils.highlightCommentNum(commentTV);
}
Expand Down
40 changes: 40 additions & 0 deletions app/src/main/java/me/ghui/v2er/util/FontSizeUtil.java
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,46 @@ public static float getContentSize() {
return App.get().getResources().getDimension(id);
}

public static float getTitleSize() {
String size = Pref.read(R.string.pref_key_fontsize);
int id;
switch (size) {
case "小":
id = R.dimen.smallTextSize;
break;
case "大":
id = R.dimen.largeTextSize;
break;
case "特大":
id = R.dimen.extralargeTextSize;
break;
case "中":
default:
id = R.dimen.mediumTextSize;
}
return App.get().getResources().getDimension(id);
}

public static float getSubTextSize() {
String size = Pref.read(R.string.pref_key_fontsize);
int id;
switch (size) {
case "小":
id = R.dimen.microTextSize;
break;
case "大":
id = R.dimen.mediumTextSize;
break;
case "特大":
id = R.dimen.largeTextSize;
break;
case "中":
default:
id = R.dimen.smallTextSize;
}
return App.get().getResources().getDimension(id);
}
Copy link

Copilot AI Sep 20, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The getTitleSize() and getSubTextSize() methods contain duplicated logic for reading preferences and switch statement structure. Consider extracting a common helper method that takes a mapping of size strings to dimension resources to reduce code duplication.

Copilot uses AI. Check for mistakes.

public static float getHtmlFontSize() {
return ScaleUtils.px2Dp(getContentSize());
}
Expand Down
3 changes: 2 additions & 1 deletion app/src/main/res/layout/common_list_item.xml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,8 @@
<me.ghui.v2er.widget.CommonTitleTextView
android:id="@+id/title_tv"
style="@style/TopicTitle"
android:layout_below="@id/avatar_img"
android:layout_below="@id/time_tv"
android:layout_marginTop="8dp"
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

2dp

tools:text="[macOS]有人用 magnet 分屏的吗?好像有会导致系统卡顿的奇怪是的呵呵,里" />

<de.hdodenhof.circleimageview.CircleImageView
Expand Down
4 changes: 2 additions & 2 deletions app/src/main/res/values-night/colors.xml
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@
<color name="transparent_navbar_color">#66000000</color>
<color name="default_page_bg">#ffffff</color>
<color name="night_default_page_bg">#111214</color>
<color name="night_bodyTextColor">#E6FFFFFF</color>
<color name="night_hintTextColor">#B3B3B3</color>
<color name="night_bodyTextColor">#F2FFFFFF</color>
<color name="night_hintTextColor">#CCCCCC</color>
<color name="autofill_color">#1A000000</color>
<color name="autofill_color_night">#1AFFFFFF</color>
</resources>
8 changes: 4 additions & 4 deletions app/src/main/res/values/dimens.xml
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
<resources>
<dimen name="extralargeTextSize">20dp</dimen>
<dimen name="largeTextSize">18dp</dimen>
<dimen name="mediumTextSize">16dp</dimen>
<dimen name="smallTextSize">14dp</dimen>
<dimen name="extralargeTextSize">24dp</dimen>
<dimen name="largeTextSize">20dp</dimen>
<dimen name="mediumTextSize">17dp</dimen>
<dimen name="smallTextSize">15dp</dimen>

<dimen name="microTextSize">12dp</dimen>
<dimen name="tinyTextSize">10dp</dimen>
Expand Down
1 change: 1 addition & 0 deletions app/src/main/res/values/styles.xml
Original file line number Diff line number Diff line change
Expand Up @@ -134,6 +134,7 @@
<item name="android:textSize">@dimen/mediumTextSize</item>
<item name="android:textStyle">normal</item>
<item name="android:paddingTop">6dp</item>
<item name="android:lineSpacingMultiplier">1.3</item>
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

1.1

<!--<item name="android:transitionName">@string/share_element_topic_title</item>-->
</style>

Expand Down
Loading