***2022/09/24***

* font file
Jack251970 · Sep 24, 2022 · 02a6b8b · 02a6b8b
1 parent eb7f595
commit 02a6b8b
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 9 deletions.
diff --git a/app/src/main/java/com/jack/bookshelf/utils/Toasts.kt b/app/src/main/java/com/jack/bookshelf/utils/Toasts.kt
@@ -25,7 +25,7 @@ fun toast(context: Context?, msg: String?, length: Int) {
     if (toast == null) {
         toast = Toast(context)
     }
-    (view.findViewById<View>(R.id.mpp_tv_toast) as TextView).text = msg
+    (view.findViewById<View>(R.id.tv_toast) as TextView).text = msg
     toast!!.view = view
     toast!!.duration = length
     toast?.show()
@@ -41,7 +41,7 @@ fun Context.toastOnUi(message: Int) {
         if (toast == null) {
             toast = Toast(this)
         }
-        (view.findViewById<View>(R.id.mpp_tv_toast) as TextView).text = StringUtils.getString(message)
+        (view.findViewById<View>(R.id.tv_toast) as TextView).text = StringUtils.getString(message)
         toast!!.view = view
         toast!!.duration = Toast.LENGTH_SHORT
         toast?.show()
@@ -54,7 +54,7 @@ fun Context.toastOnUi(message: CharSequence?) {
         if (toast == null) {
             toast = Toast(this)
         }
-        (view.findViewById<View>(R.id.mpp_tv_toast) as TextView).text = message
+        (view.findViewById<View>(R.id.tv_toast) as TextView).text = message
         toast!!.view = view
         toast!!.duration = Toast.LENGTH_SHORT
         toast?.show()
@@ -67,7 +67,7 @@ fun Context.longToastOnUi(message: Int) {
         if (toast == null) {
             toast = Toast(this)
         }
-        (view.findViewById<View>(R.id.mpp_tv_toast) as TextView).text = StringUtils.getString(message)
+        (view.findViewById<View>(R.id.tv_toast) as TextView).text = StringUtils.getString(message)
         toast!!.view = view
         toast!!.duration = Toast.LENGTH_LONG
         toast?.show()
@@ -79,7 +79,7 @@ fun Context.longToastOnUi(message: CharSequence?) {
         if (toast == null) {
             val view: View = inflater.inflate(R.layout.dialog_toast, null)
             toast = Toast(this)
-            (view.findViewById<View>(R.id.mpp_tv_toast) as TextView).text = message
+            (view.findViewById<View>(R.id.tv_toast) as TextView).text = message
             toast!!.view = view
             toast!!.duration = Toast.LENGTH_LONG
         } else {

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
@@ -186,8 +186,8 @@ public View getView(final int position, View convertView, ViewGroup parent) {
             if (convertView == null) {
                 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);
                 convertView.setTag(holder);
             } else {
                 holder = (ViewHolder) convertView.getTag();

diff --git a/app/src/main/res/layout/dialog_toast.xml b/app/src/main/res/layout/dialog_toast.xml
@@ -1,12 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--suppress ALL -->
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="wrap_content"
     android:layout_height="wrap_content"
     android:background="@drawable/shape_toast_background"
     android:orientation="vertical">
     <TextView
-        android:id="@+id/mpp_tv_toast"
+        android:id="@+id/tv_toast"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:layout_marginTop="12dp"