diff --git a/app/debug/output-metadata.json b/app/debug/output-metadata.json
index 277a99f..6d176a0 100644
--- a/app/debug/output-metadata.json
+++ b/app/debug/output-metadata.json
@@ -12,8 +12,8 @@
"filters": [],
"attributes": [],
"versionCode": 10095,
- "versionName": "2.22.0924.103117.6286debug",
- "outputFile": "Read_For_MatePadPaper_2.22.0924.103117.6286.apk"
+ "versionName": "2.22.0924.175516.3461debug",
+ "outputFile": "Read_For_MatePadPaper_2.22.0924.175516.3461.apk"
}
],
"elementType": "File"
diff --git a/app/src/main/assets/font/HarmonyOS_Sans/HarmonyOS_Sans_Black.ttf b/app/src/main/assets/font/HarmonyOS_Sans/HarmonyOS_Sans_Black.ttf
new file mode 100644
index 0000000..855943b
Binary files /dev/null and b/app/src/main/assets/font/HarmonyOS_Sans/HarmonyOS_Sans_Black.ttf differ
diff --git a/app/src/main/assets/font/HarmonyOS_Sans/HarmonyOS_Sans_Bold.ttf b/app/src/main/assets/font/HarmonyOS_Sans/HarmonyOS_Sans_Bold.ttf
new file mode 100644
index 0000000..8ea60c1
Binary files /dev/null and b/app/src/main/assets/font/HarmonyOS_Sans/HarmonyOS_Sans_Bold.ttf differ
diff --git a/app/src/main/assets/font/HarmonyOS_Sans_SC/LICENSE.txt b/app/src/main/assets/font/HarmonyOS_Sans/LICENSE.txt
similarity index 100%
rename from app/src/main/assets/font/HarmonyOS_Sans_SC/LICENSE.txt
rename to app/src/main/assets/font/HarmonyOS_Sans/LICENSE.txt
diff --git a/app/src/main/assets/font/HarmonyOS_Sans_SC/HarmonyOS_Sans_SC_Bold.ttf b/app/src/main/assets/font/HarmonyOS_Sans_SC/HarmonyOS_Sans_SC_Bold.ttf
deleted file mode 100644
index 5c925d1..0000000
Binary files a/app/src/main/assets/font/HarmonyOS_Sans_SC/HarmonyOS_Sans_SC_Bold.ttf and /dev/null differ
diff --git a/app/src/main/assets/font/HarmonyOS_Sans_SC/HarmonyOS_Sans_SC_Regular.ttf b/app/src/main/assets/font/HarmonyOS_Sans_SC/HarmonyOS_Sans_SC_Regular.ttf
deleted file mode 100644
index aff150a..0000000
Binary files a/app/src/main/assets/font/HarmonyOS_Sans_SC/HarmonyOS_Sans_SC_Regular.ttf and /dev/null differ
diff --git a/app/src/main/assets/font/HarmonyOS_Sans_SC/HarmonyOS_Sans_SC_Thin.ttf b/app/src/main/assets/font/HarmonyOS_Sans_SC/HarmonyOS_Sans_SC_Thin.ttf
deleted file mode 100644
index 6a58b15..0000000
Binary files a/app/src/main/assets/font/HarmonyOS_Sans_SC/HarmonyOS_Sans_SC_Thin.ttf and /dev/null differ
diff --git a/app/src/main/java/com/jack/bookshelf/widget/dialog/FontSelectorDialog.java b/app/src/main/java/com/jack/bookshelf/widget/dialog/FontSelectorDialog.java
index 1edd956..4024bdb 100644
--- a/app/src/main/java/com/jack/bookshelf/widget/dialog/FontSelectorDialog.java
+++ b/app/src/main/java/com/jack/bookshelf/widget/dialog/FontSelectorDialog.java
@@ -6,6 +6,7 @@
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
+import android.widget.ImageView;
import android.widget.PopupWindow;
import com.jack.bookshelf.R;
@@ -42,13 +43,10 @@ public FontSelectorDialog(Context context) {
private void initView() {
switch (readBookControl.getFontItem()) {
case 0:
- view.findViewById(R.id.iv_font_harmony_regular).setVisibility(View.VISIBLE);
+ ((ImageView)view.findViewById(R.id.iv_indicator_font_harmony_regular)).setImageResource(R.drawable.ic_select_menu_selected);
break;
case 1:
- view.findViewById(R.id.iv_font_harmony_bold).setVisibility(View.VISIBLE);
- break;
- case 2:
- view.findViewById(R.id.iv_font_harmony_thin).setVisibility(View.VISIBLE);
+ ((ImageView)view.findViewById(R.id.iv_indicator_font_harmony_bold)).setImageResource(R.drawable.ic_select_menu_selected);
break;
}
}
@@ -66,10 +64,6 @@ private void bindView() {
dismiss();
thisListener.forMenuItem(1);
});
- view.findViewById(R.id.tv_font_harmony_thin).setOnClickListener(v -> {
- dismiss();
- thisListener.forMenuItem(2);
- });
}
public FontSelectorDialog setListener(OnThisListener thisListener) {
diff --git a/app/src/main/java/com/jack/bookshelf/widget/menu/SelectMenu.java b/app/src/main/java/com/jack/bookshelf/widget/menu/SelectMenu.java
index bdb2919..aaaf886 100644
--- a/app/src/main/java/com/jack/bookshelf/widget/menu/SelectMenu.java
+++ b/app/src/main/java/com/jack/bookshelf/widget/menu/SelectMenu.java
@@ -121,10 +121,10 @@ public SelectMenu(Context context) {
}
private void bindView(View view) {
- tvTitle = view.findViewById(R.id.mpp_tv_title_selectMenu);
- llBottomButton = view.findViewById(R.id.mpp_ll_bottom_button_select_menu);
- tvBottomButton = view.findViewById(R.id.mpp_tv_bottom_button_select_menu);
- lvMenu = view.findViewById(R.id.mpp_lv_arrange_rule_main);
+ tvTitle = view.findViewById(R.id.tv_title_selectMenu);
+ llBottomButton = view.findViewById(R.id.ll_bottom_button_select_menu);
+ tvBottomButton = view.findViewById(R.id.tv_bottom_button_select_menu);
+ lvMenu = view.findViewById(R.id.lv_arrange_rule_main);
}
public void show(View mainView) {
@@ -172,8 +172,8 @@ public View getView(final int position, View convertView, ViewGroup parent) {
ViewHolder holder;
holder = new ViewHolder();
convertView = LayoutInflater.from(mContext).inflate(R.layout.item_select_menu, null);
- holder.tv_name_select_menu_item = convertView.findViewById(R.id.mpp_tv_name_select_menu_item);
- holder.iv_indicator_select_menu_item = convertView.findViewById(R.id.mpp_iv_indicator_select_menu_item);
+ holder.tv_name_select_menu_item = convertView.findViewById(R.id.tv_name_select_menu_item);
+ holder.iv_indicator_select_menu_item = convertView.findViewById(R.id.iv_indicator_select_menu_item);
String menuName = menuList.get(position);
holder.tv_name_select_menu_item.setText(menuName);
if (lastChoose == -1) {
diff --git a/app/src/main/java/com/jack/bookshelf/widget/page/PageLoader.java b/app/src/main/java/com/jack/bookshelf/widget/page/PageLoader.java
index 3373613..2b8e17e 100644
--- a/app/src/main/java/com/jack/bookshelf/widget/page/PageLoader.java
+++ b/app/src/main/java/com/jack/bookshelf/widget/page/PageLoader.java
@@ -117,7 +117,6 @@ public abstract class PageLoader {
private int readTextLength; //已读字符数
private boolean resetReadAloud; //是否重新朗读
private int readAloudParagraph; //正在朗读章节
- Bitmap cover;
CompositeDisposable compositeDisposable;
private long skipPageTime = 0; //翻页时间
@@ -914,7 +913,6 @@ private synchronized void drawContent(Bitmap bitmap, TxtChapter txtChapter, TxtP
for (int i = txtPage.getTitleLines(); i < txtPage.size(); ++i) {
str = txtPage.getLine(i);
strLength = strLength + str.length();
- int paragraphLength = txtPage.getPosition() == 0 ? strLength : txtChapter.getPageLength(txtPage.getPosition() - 1) + strLength;
mTextPaint.setColor(readBookControl.getTextColor());
Layout tempLayout = StaticLayout.Builder.obtain(str, 0, str.length(), mTextPaint, mVisibleWidth)
.setAlignment(Layout.Alignment.ALIGN_NORMAL)
diff --git a/app/src/main/res/layout/dialog_font_selector.xml b/app/src/main/res/layout/dialog_font_selector.xml
index 4b0d5b0..923bba0 100644
--- a/app/src/main/res/layout/dialog_font_selector.xml
+++ b/app/src/main/res/layout/dialog_font_selector.xml
@@ -30,62 +30,42 @@
android:id="@+id/tv_font_harmony_regular"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:padding="5dp"
- android:text="HarmonyOS_Sans_SC_Regular.ttf"
+ android:paddingTop="15dp"
+ android:paddingBottom="15dp"
+ android:text="HarmonyOS_Sans_Bold"
android:textSize="16sp"
android:textColor="@color/text_color"
tools:ignore="HardcodedText"
app:layout_constraintTop_toTopOf="parent"/>
+ app:layout_constraintRight_toRightOf="parent"/>
-
-
+ app:layout_constraintRight_toRightOf="parent"/>
@@ -45,7 +45,7 @@
android:layout_width="match_parent"
android:layout_height="23dp"/>
- - font/HarmonyOS_Sans_SC/HarmonyOS_Sans_SC_Regular.ttf
- - font/HarmonyOS_Sans_SC/HarmonyOS_Sans_SC_Bold.ttf
- - font/HarmonyOS_Sans_SC/HarmonyOS_Sans_SC_Thin.ttf
+ - font/HarmonyOS_Sans/HarmonyOS_Sans_Bold.ttf
+ - font/HarmonyOS_Sans/HarmonyOS_Sans_Black.ttf
\ No newline at end of file
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 05bda0f..0c93b8a 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -356,7 +356,7 @@
选择字体
自定义字体
- 字体文件未找到！
+ 字体文件未找到
请将字体文件放到内部存储根目录下的Fonts文件夹中重新选择
名称