diff --git a/app/build.gradle b/app/build.gradle index 0d2dad3..e01127c 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -25,6 +25,9 @@ android { abiFilters "armeabi", "arm64-v8a"// "armeabi-v7a", } multiDexEnabled true + resConfigs "zh", "zh-rCN" + resConfigs "zh", "zh-rTW" + resConfigs "zh", "zh-rHK" } signingConfigs { diff --git a/app/src/main/java/com/novel/read/ui/widget/HeadLayout.java b/app/src/main/java/com/novel/read/ui/widget/HeadLayout.java index 1272057..a72b821 100644 --- a/app/src/main/java/com/novel/read/ui/widget/HeadLayout.java +++ b/app/src/main/java/com/novel/read/ui/widget/HeadLayout.java @@ -34,10 +34,10 @@ public class HeadLayout extends LinearLayout { TypedArray typedArray = getContext().obtainStyledAttributes(attrs, R.styleable.HeadLayout); boolean showHead = typedArray.getBoolean(R.styleable.HeadLayout_showHead, true); int headText=typedArray.getResourceId(R.styleable.HeadLayout_headText,R.string.empty_info); - int headImg= typedArray.getResourceId(R.styleable.HeadLayout_headImg, R.mipmap.ic_launcher); + int headImg= typedArray.getResourceId(R.styleable.HeadLayout_headImg, R.mipmap.icon_read_book); boolean showRight = typedArray.getBoolean(R.styleable.HeadLayout_showRightText, true); int rightText=typedArray.getResourceId(R.styleable.HeadLayout_rightText,R.string.empty_info); - int rightImg=typedArray.getResourceId(R.styleable.HeadLayout_rightImg,R.mipmap.ic_launcher); + int rightImg=typedArray.getResourceId(R.styleable.HeadLayout_rightImg,R.mipmap.icon_read_book); if (showHead){ mTvHead.setText(headText); Drawable drawable = ContextCompat.getDrawable(getContext(), headImg); @@ -48,7 +48,7 @@ public class HeadLayout extends LinearLayout { } if (showRight){ mTvMore.setText(rightText); - if (rightImg!=R.mipmap.ic_launcher){ + if (rightImg!=R.mipmap.icon_read_book){ Drawable drawable = ContextCompat.getDrawable(getContext(), rightImg); drawable.setBounds(0, 0, drawable.getMinimumWidth(), drawable.getMinimumHeight()); mTvHead.setCompoundDrawables(null, null, drawable, null); diff --git a/app/src/main/res/drawable-night-xxhdpi/ic_arrow_right.png b/app/src/main/res/drawable-night-xxhdpi/ic_arrow_right.png deleted file mode 100644 index e50fe6b..0000000 Binary files a/app/src/main/res/drawable-night-xxhdpi/ic_arrow_right.png and /dev/null differ diff --git a/app/src/main/res/drawable-night-xxhdpi/ic_arrow_right.webp b/app/src/main/res/drawable-night-xxhdpi/ic_arrow_right.webp new file mode 100644 index 0000000..e881a1b Binary files /dev/null and b/app/src/main/res/drawable-night-xxhdpi/ic_arrow_right.webp differ diff --git a/app/src/main/res/drawable-night-xxhdpi/ic_go_add.png b/app/src/main/res/drawable-night-xxhdpi/ic_go_add.png deleted file mode 100644 index f618b83..0000000 Binary files a/app/src/main/res/drawable-night-xxhdpi/ic_go_add.png and /dev/null differ diff --git a/app/src/main/res/drawable-night-xxhdpi/ic_go_add.webp b/app/src/main/res/drawable-night-xxhdpi/ic_go_add.webp new file mode 100644 index 0000000..a80a2c9 Binary files /dev/null and b/app/src/main/res/drawable-night-xxhdpi/ic_go_add.webp differ diff --git a/app/src/main/res/drawable-night-xxhdpi/ic_net_error.png b/app/src/main/res/drawable-night-xxhdpi/ic_net_error.png deleted file mode 100644 index 17a1493..0000000 Binary files a/app/src/main/res/drawable-night-xxhdpi/ic_net_error.png and /dev/null differ diff --git a/app/src/main/res/drawable-night-xxhdpi/ic_net_error.webp b/app/src/main/res/drawable-night-xxhdpi/ic_net_error.webp new file mode 100644 index 0000000..27c2c45 Binary files /dev/null and b/app/src/main/res/drawable-night-xxhdpi/ic_net_error.webp differ diff --git a/app/src/main/res/drawable-night-xxhdpi/ic_no_data.png b/app/src/main/res/drawable-night-xxhdpi/ic_no_data.png deleted file mode 100644 index f08d158..0000000 Binary files a/app/src/main/res/drawable-night-xxhdpi/ic_no_data.png and /dev/null differ diff --git a/app/src/main/res/drawable-night-xxhdpi/ic_no_data.webp b/app/src/main/res/drawable-night-xxhdpi/ic_no_data.webp new file mode 100644 index 0000000..c08a447 Binary files /dev/null and b/app/src/main/res/drawable-night-xxhdpi/ic_no_data.webp differ diff --git a/app/src/main/res/drawable-xxhdpi/ic_appraise.png b/app/src/main/res/drawable-xxhdpi/ic_appraise.png deleted file mode 100644 index 07d518e..0000000 Binary files a/app/src/main/res/drawable-xxhdpi/ic_appraise.png and /dev/null differ diff --git a/app/src/main/res/drawable-xxhdpi/ic_appraise.webp b/app/src/main/res/drawable-xxhdpi/ic_appraise.webp new file mode 100644 index 0000000..ecc49c2 Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/ic_appraise.webp differ diff --git a/app/src/main/res/drawable-xxhdpi/ic_arrow_right.png b/app/src/main/res/drawable-xxhdpi/ic_arrow_right.png deleted file mode 100644 index 52b8736..0000000 Binary files a/app/src/main/res/drawable-xxhdpi/ic_arrow_right.png and /dev/null differ diff --git a/app/src/main/res/drawable-xxhdpi/ic_arrow_right.webp b/app/src/main/res/drawable-xxhdpi/ic_arrow_right.webp new file mode 100644 index 0000000..0c0bac5 Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/ic_arrow_right.webp differ diff --git a/app/src/main/res/drawable-xxhdpi/ic_book_end.png b/app/src/main/res/drawable-xxhdpi/ic_book_end.png deleted file mode 100644 index 8f637ec..0000000 Binary files a/app/src/main/res/drawable-xxhdpi/ic_book_end.png and /dev/null differ diff --git a/app/src/main/res/drawable-xxhdpi/ic_book_end.webp b/app/src/main/res/drawable-xxhdpi/ic_book_end.webp new file mode 100644 index 0000000..9a4c067 Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/ic_book_end.webp differ diff --git a/app/src/main/res/drawable-xxhdpi/ic_book_type.png b/app/src/main/res/drawable-xxhdpi/ic_book_type.png deleted file mode 100644 index 01cb78c..0000000 Binary files a/app/src/main/res/drawable-xxhdpi/ic_book_type.png and /dev/null differ diff --git a/app/src/main/res/drawable-xxhdpi/ic_book_type.webp b/app/src/main/res/drawable-xxhdpi/ic_book_type.webp new file mode 100644 index 0000000..05044e0 Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/ic_book_type.webp differ diff --git a/app/src/main/res/drawable-xxhdpi/ic_click.png b/app/src/main/res/drawable-xxhdpi/ic_click.png deleted file mode 100644 index 97cfa50..0000000 Binary files a/app/src/main/res/drawable-xxhdpi/ic_click.png and /dev/null differ diff --git a/app/src/main/res/drawable-xxhdpi/ic_click.webp b/app/src/main/res/drawable-xxhdpi/ic_click.webp new file mode 100644 index 0000000..a95f907 Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/ic_click.webp differ diff --git a/app/src/main/res/drawable-xxhdpi/ic_daily.png b/app/src/main/res/drawable-xxhdpi/ic_daily.png deleted file mode 100644 index 8b89b05..0000000 Binary files a/app/src/main/res/drawable-xxhdpi/ic_daily.png and /dev/null differ diff --git a/app/src/main/res/drawable-xxhdpi/ic_daily.webp b/app/src/main/res/drawable-xxhdpi/ic_daily.webp new file mode 100644 index 0000000..1e2b6dc Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/ic_daily.webp differ diff --git a/app/src/main/res/drawable-xxhdpi/ic_delete_search.png b/app/src/main/res/drawable-xxhdpi/ic_delete_search.png deleted file mode 100644 index 8ed88e9..0000000 Binary files a/app/src/main/res/drawable-xxhdpi/ic_delete_search.png and /dev/null differ diff --git a/app/src/main/res/drawable-xxhdpi/ic_delete_search.webp b/app/src/main/res/drawable-xxhdpi/ic_delete_search.webp new file mode 100644 index 0000000..8089c05 Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/ic_delete_search.webp differ diff --git a/app/src/main/res/drawable-xxhdpi/ic_end.png b/app/src/main/res/drawable-xxhdpi/ic_end.png deleted file mode 100644 index e04647d..0000000 Binary files a/app/src/main/res/drawable-xxhdpi/ic_end.png and /dev/null differ diff --git a/app/src/main/res/drawable-xxhdpi/ic_end.webp b/app/src/main/res/drawable-xxhdpi/ic_end.webp new file mode 100644 index 0000000..5ebb4ed Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/ic_end.webp differ diff --git a/app/src/main/res/drawable-xxhdpi/ic_geng.png b/app/src/main/res/drawable-xxhdpi/ic_geng.png deleted file mode 100644 index cfbf491..0000000 Binary files a/app/src/main/res/drawable-xxhdpi/ic_geng.png and /dev/null differ diff --git a/app/src/main/res/drawable-xxhdpi/ic_geng.webp b/app/src/main/res/drawable-xxhdpi/ic_geng.webp new file mode 100644 index 0000000..51612a2 Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/ic_geng.webp differ diff --git a/app/src/main/res/drawable-xxhdpi/ic_go_add.png b/app/src/main/res/drawable-xxhdpi/ic_go_add.png deleted file mode 100644 index 19053ac..0000000 Binary files a/app/src/main/res/drawable-xxhdpi/ic_go_add.png and /dev/null differ diff --git a/app/src/main/res/drawable-xxhdpi/ic_go_add.webp b/app/src/main/res/drawable-xxhdpi/ic_go_add.webp new file mode 100644 index 0000000..bfae685 Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/ic_go_add.webp differ diff --git a/app/src/main/res/drawable-xxhdpi/ic_go_appraise.png b/app/src/main/res/drawable-xxhdpi/ic_go_appraise.png deleted file mode 100644 index 6464418..0000000 Binary files a/app/src/main/res/drawable-xxhdpi/ic_go_appraise.png and /dev/null differ diff --git a/app/src/main/res/drawable-xxhdpi/ic_go_appraise.webp b/app/src/main/res/drawable-xxhdpi/ic_go_appraise.webp new file mode 100644 index 0000000..639a66b Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/ic_go_appraise.webp differ diff --git a/app/src/main/res/drawable-xxhdpi/ic_hot.png b/app/src/main/res/drawable-xxhdpi/ic_hot.png deleted file mode 100644 index 0b697f9..0000000 Binary files a/app/src/main/res/drawable-xxhdpi/ic_hot.png and /dev/null differ diff --git a/app/src/main/res/drawable-xxhdpi/ic_hot.webp b/app/src/main/res/drawable-xxhdpi/ic_hot.webp new file mode 100644 index 0000000..acd22f3 Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/ic_hot.webp differ diff --git a/app/src/main/res/drawable-xxhdpi/ic_hot_search.png b/app/src/main/res/drawable-xxhdpi/ic_hot_search.png deleted file mode 100644 index 98ce3c4..0000000 Binary files a/app/src/main/res/drawable-xxhdpi/ic_hot_search.png and /dev/null differ diff --git a/app/src/main/res/drawable-xxhdpi/ic_hot_search.webp b/app/src/main/res/drawable-xxhdpi/ic_hot_search.webp new file mode 100644 index 0000000..49c30f8 Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/ic_hot_search.webp differ diff --git a/app/src/main/res/drawable-xxhdpi/ic_idea.png b/app/src/main/res/drawable-xxhdpi/ic_idea.png deleted file mode 100644 index 4aecba8..0000000 Binary files a/app/src/main/res/drawable-xxhdpi/ic_idea.png and /dev/null differ diff --git a/app/src/main/res/drawable-xxhdpi/ic_idea.webp b/app/src/main/res/drawable-xxhdpi/ic_idea.webp new file mode 100644 index 0000000..7b6bd6f Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/ic_idea.webp differ diff --git a/app/src/main/res/drawable-xxhdpi/ic_net_error.png b/app/src/main/res/drawable-xxhdpi/ic_net_error.png deleted file mode 100644 index bec631e..0000000 Binary files a/app/src/main/res/drawable-xxhdpi/ic_net_error.png and /dev/null differ diff --git a/app/src/main/res/drawable-xxhdpi/ic_net_error.webp b/app/src/main/res/drawable-xxhdpi/ic_net_error.webp new file mode 100644 index 0000000..895552f Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/ic_net_error.webp differ diff --git a/app/src/main/res/drawable-xxhdpi/ic_no_data.png b/app/src/main/res/drawable-xxhdpi/ic_no_data.png deleted file mode 100644 index 8c66fbf..0000000 Binary files a/app/src/main/res/drawable-xxhdpi/ic_no_data.png and /dev/null differ diff --git a/app/src/main/res/drawable-xxhdpi/ic_no_data.webp b/app/src/main/res/drawable-xxhdpi/ic_no_data.webp new file mode 100644 index 0000000..8f2761a Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/ic_no_data.webp differ diff --git a/app/src/main/res/drawable-xxhdpi/ic_rank.png b/app/src/main/res/drawable-xxhdpi/ic_rank.png deleted file mode 100644 index 360efb1..0000000 Binary files a/app/src/main/res/drawable-xxhdpi/ic_rank.png and /dev/null differ diff --git a/app/src/main/res/drawable-xxhdpi/ic_rank.webp b/app/src/main/res/drawable-xxhdpi/ic_rank.webp new file mode 100644 index 0000000..55e3618 Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/ic_rank.webp differ diff --git a/app/src/main/res/drawable-xxhdpi/ic_recommend.png b/app/src/main/res/drawable-xxhdpi/ic_recommend.png deleted file mode 100644 index 3892399..0000000 Binary files a/app/src/main/res/drawable-xxhdpi/ic_recommend.png and /dev/null differ diff --git a/app/src/main/res/drawable-xxhdpi/ic_recommend.webp b/app/src/main/res/drawable-xxhdpi/ic_recommend.webp new file mode 100644 index 0000000..6796861 Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/ic_recommend.webp differ diff --git a/app/src/main/res/drawable-xxhdpi/ic_setting.png b/app/src/main/res/drawable-xxhdpi/ic_setting.png deleted file mode 100644 index 8ba6eea..0000000 Binary files a/app/src/main/res/drawable-xxhdpi/ic_setting.png and /dev/null differ diff --git a/app/src/main/res/drawable-xxhdpi/ic_setting.webp b/app/src/main/res/drawable-xxhdpi/ic_setting.webp new file mode 100644 index 0000000..e42b1a8 Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/ic_setting.webp differ diff --git a/app/src/main/res/drawable/bg_banner.xml b/app/src/main/res/drawable/bg_banner.xml deleted file mode 100644 index 6033be6..0000000 --- a/app/src/main/res/drawable/bg_banner.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - \ No newline at end of file diff --git a/app/src/main/res/drawable/bg_google_login.xml b/app/src/main/res/drawable/bg_google_login.xml deleted file mode 100644 index 91e683c..0000000 --- a/app/src/main/res/drawable/bg_google_login.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - \ No newline at end of file diff --git a/app/src/main/res/drawable/ic_google.xml b/app/src/main/res/drawable/ic_google.xml deleted file mode 100644 index da0354a..0000000 --- a/app/src/main/res/drawable/ic_google.xml +++ /dev/null @@ -1,18 +0,0 @@ - - - - - - diff --git a/app/src/main/res/layout/activity_login.xml b/app/src/main/res/layout/activity_login.xml deleted file mode 100644 index dd54241..0000000 --- a/app/src/main/res/layout/activity_login.xml +++ /dev/null @@ -1,62 +0,0 @@ - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/activity_vip_shop.xml b/app/src/main/res/layout/activity_vip_shop.xml deleted file mode 100644 index 1b00a78..0000000 --- a/app/src/main/res/layout/activity_vip_shop.xml +++ /dev/null @@ -1,42 +0,0 @@ - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_mine.xml b/app/src/main/res/layout/fragment_mine.xml index 27c4bc6..bd023eb 100644 --- a/app/src/main/res/layout/fragment_mine.xml +++ b/app/src/main/res/layout/fragment_mine.xml @@ -60,7 +60,7 @@ android:layout_width="70dp" android:layout_height="70dp" android:layout_marginStart="15dp" - android:src="@mipmap/ic_launcher" + android:src="@mipmap/icon_read_book" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintTop_toTopOf="parent" /> diff --git a/app/src/main/res/layout/view_dynamic.xml b/app/src/main/res/layout/view_dynamic.xml deleted file mode 100644 index 30a5396..0000000 --- a/app/src/main/res/layout/view_dynamic.xml +++ /dev/null @@ -1,20 +0,0 @@ - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/view_tab_layout_min.xml b/app/src/main/res/layout/view_tab_layout_min.xml deleted file mode 100644 index badf89a..0000000 --- a/app/src/main/res/layout/view_tab_layout_min.xml +++ /dev/null @@ -1,11 +0,0 @@ - - \ No newline at end of file diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher.png b/app/src/main/res/mipmap-hdpi/ic_launcher.png deleted file mode 100644 index a571e60..0000000 Binary files a/app/src/main/res/mipmap-hdpi/ic_launcher.png and /dev/null differ diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_round.png b/app/src/main/res/mipmap-hdpi/ic_launcher_round.png deleted file mode 100644 index 61da551..0000000 Binary files a/app/src/main/res/mipmap-hdpi/ic_launcher_round.png and /dev/null differ diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher.png b/app/src/main/res/mipmap-mdpi/ic_launcher.png deleted file mode 100644 index c41dd28..0000000 Binary files a/app/src/main/res/mipmap-mdpi/ic_launcher.png and /dev/null differ diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher_round.png b/app/src/main/res/mipmap-mdpi/ic_launcher_round.png deleted file mode 100644 index db5080a..0000000 Binary files a/app/src/main/res/mipmap-mdpi/ic_launcher_round.png and /dev/null differ diff --git a/app/src/main/res/mipmap-xhdpi/bg_splash.png b/app/src/main/res/mipmap-xhdpi/bg_splash.png deleted file mode 100644 index 1af98b4..0000000 Binary files a/app/src/main/res/mipmap-xhdpi/bg_splash.png and /dev/null differ diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher.png b/app/src/main/res/mipmap-xhdpi/ic_launcher.png deleted file mode 100644 index 6dba46d..0000000 Binary files a/app/src/main/res/mipmap-xhdpi/ic_launcher.png and /dev/null differ diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png b/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png deleted file mode 100644 index da31a87..0000000 Binary files a/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png and /dev/null differ diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher.png b/app/src/main/res/mipmap-xxhdpi/ic_launcher.png deleted file mode 100644 index 15ac681..0000000 Binary files a/app/src/main/res/mipmap-xxhdpi/ic_launcher.png and /dev/null differ diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png b/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png deleted file mode 100644 index b216f2d..0000000 Binary files a/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png and /dev/null differ diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png deleted file mode 100644 index f25a419..0000000 Binary files a/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png and /dev/null differ diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png deleted file mode 100644 index e96783c..0000000 Binary files a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png and /dev/null differ diff --git a/build.gradle b/build.gradle index acef512..2f79e4b 100644 --- a/build.gradle +++ b/build.gradle @@ -29,4 +29,5 @@ allprojects { task clean(type: Delete) { delete rootProject.buildDir -} \ No newline at end of file +} +