diff --git a/app/.gitignore b/app/.gitignore index e25efbd..796b96d 100644 --- a/app/.gitignore +++ b/app/.gitignore @@ -1,3 +1 @@ /build -/release -/google \ No newline at end of file diff --git a/app/release/output-metadata.json b/app/release/output-metadata.json new file mode 100644 index 0000000..91ba7de --- /dev/null +++ b/app/release/output-metadata.json @@ -0,0 +1,18 @@ +{ + "version": 2, + "artifactType": { + "type": "APK", + "kind": "Directory" + }, + "applicationId": "com.novel.read", + "variantName": "processAppReleaseResources", + "elements": [ + { + "type": "SINGLE", + "filters": [], + "versionCode": 1, + "versionName": "1.0.0", + "outputFile": "reader_app_1.0.0.apk" + } + ] +} \ No newline at end of file diff --git a/app/release/reader_app_1.0.0.apk b/app/release/reader_app_1.0.0.apk new file mode 100644 index 0000000..6416edf Binary files /dev/null and b/app/release/reader_app_1.0.0.apk differ diff --git a/app/src/main/java/com/novel/read/ui/read/ReadMenu.kt b/app/src/main/java/com/novel/read/ui/read/ReadMenu.kt index 9d9f116..95b227c 100644 --- a/app/src/main/java/com/novel/read/ui/read/ReadMenu.kt +++ b/app/src/main/java/com/novel/read/ui/read/ReadMenu.kt @@ -1,10 +1,8 @@ package com.novel.read.ui.read import android.content.Context -import android.content.Intent import android.content.res.ColorStateList import android.graphics.drawable.GradientDrawable -import android.net.Uri import android.util.AttributeSet import android.view.LayoutInflater import android.view.WindowManager @@ -118,14 +116,6 @@ class ReadMenu @JvmOverloads constructor( private fun bindEvent() = with(binding){ tvChapterName.onClick { - } - tvChapterUrl.onClick { - runCatching { - val url = tvChapterUrl.text.toString() - val intent = Intent(Intent.ACTION_VIEW) - intent.data = Uri.parse(url) - context.startActivity(intent) - } } //阅读进度 seekReadPage.setOnSeekBarChangeListener(object : SeekBar.OnSeekBarChangeListener { @@ -145,7 +135,7 @@ class ReadMenu @JvmOverloads constructor( //搜索 fabSearch.onClick { runMenuOut { - callBack?.openSearchActivity(null) + callBack.openSearchActivity(null) } } @@ -164,31 +154,31 @@ class ReadMenu @JvmOverloads constructor( //目录 llCatalog.onClick { runMenuOut { - callBack?.openChapterList() + callBack.openChapterList() } } //朗读 llReadAloud.onClick { runMenuOut { - callBack?.onClickReadAloud() + callBack.onClickReadAloud() } } llReadAloud.onLongClick { - runMenuOut { callBack?.showReadAloudDialog() } + runMenuOut { callBack.showReadAloudDialog() } true } //界面 llFont.onClick { runMenuOut { - callBack?.showAdjust() + callBack.showAdjust() } } //设置 llSetting.onClick { runMenuOut { - callBack?.showReadStyle() + callBack.showReadStyle() } } } @@ -199,7 +189,7 @@ class ReadMenu @JvmOverloads constructor( menuBottomIn = AnimationUtilsSupport.loadAnimation(context, R.anim.anim_readbook_bottom_in) menuTopIn.setAnimationListener(object : Animation.AnimationListener { override fun onAnimationStart(animation: Animation) { - callBack?.upSystemUiVisibility() + callBack.upSystemUiVisibility() } override fun onAnimationEnd(animation: Animation) { @@ -232,7 +222,7 @@ class ReadMenu @JvmOverloads constructor( binding.bottomMenu.invisible() cnaShowMenu = false onMenuOutEnd?.invoke() - callBack?.upSystemUiVisibility() + callBack.upSystemUiVisibility() } override fun onAnimationRepeat(animation: Animation) = Unit @@ -248,19 +238,12 @@ class ReadMenu @JvmOverloads constructor( ReadBook.curTextChapter?.let { binding.tvChapterName.text = it.title binding.tvChapterName.visible() - if (!ReadBook.isLocalBook) { - binding.tvChapterUrl.text = it.title - binding.tvChapterUrl.visible() - } else { - binding.tvChapterUrl.gone() - } binding.seekReadPage.max = it.pageSize.minus(1) binding.seekReadPage.progress = ReadBook.durPageIndex binding.tvPre.isEnabled = ReadBook.durChapterIndex != 0 binding.tvNext.isEnabled = ReadBook.durChapterIndex != ReadBook.chapterSize - 1 } ?: let { binding.tvChapterName.gone() - binding.tvChapterUrl.gone() } } diff --git a/app/src/main/res/layout/view_read_menu.xml b/app/src/main/res/layout/view_read_menu.xml index c999a5d..18fa124 100644 --- a/app/src/main/res/layout/view_read_menu.xml +++ b/app/src/main/res/layout/view_read_menu.xml @@ -30,16 +30,6 @@ android:textSize="12sp" android:visibility="gone" /> - -