diff --git a/app/src/main/java/io/legado/app/ui/book/read/ReadBookActivity.kt b/app/src/main/java/io/legado/app/ui/book/read/ReadBookActivity.kt index 02040e26d..a8b7835ab 100644 --- a/app/src/main/java/io/legado/app/ui/book/read/ReadBookActivity.kt +++ b/app/src/main/java/io/legado/app/ui/book/read/ReadBookActivity.kt @@ -171,8 +171,6 @@ class ReadBookActivity : ReadBookBaseActivity(), R.id.menu_group_on_line_ns -> item.isVisible = onLine R.id.menu_group_local -> item.isVisible = !onLine R.id.menu_group_text -> item.isVisible = book.isLocalTxt() - R.id.menu_group_login -> - item.isVisible = !ReadBook.webBook?.bookSource?.loginUrl.isNullOrEmpty() else -> when (item.itemId) { R.id.menu_enable_replace -> item.isChecked = book.getUseReplaceRule() R.id.menu_re_segment -> item.isChecked = book.getReSegment() @@ -245,12 +243,6 @@ class ReadBookActivity : ReadBookBaseActivity(), supportFragmentManager, ReadBook.book?.tocUrl ) - R.id.menu_login -> ReadBook.webBook?.bookSource?.let { - startActivity( - Pair("sourceUrl", it.bookSourceUrl), - Pair("loginUrl", it.loginUrl) - ) - } R.id.menu_set_charset -> showCharsetConfig() R.id.menu_get_progress -> ReadBook.book?.let { viewModel.syncBookProgress(it) { progress -> @@ -715,6 +707,15 @@ class ReadBookActivity : ReadBookBaseActivity(), upNavigationBarColor() } + override fun showLogin() { + ReadBook.webBook?.bookSource?.let { + startActivity( + Pair("sourceUrl", it.bookSourceUrl), + Pair("loginUrl", it.loginUrl) + ) + } + } + /** * 朗读按钮 */ diff --git a/app/src/main/java/io/legado/app/ui/book/read/ReadMenu.kt b/app/src/main/java/io/legado/app/ui/book/read/ReadMenu.kt index a73f3d4a2..8dff5e647 100644 --- a/app/src/main/java/io/legado/app/ui/book/read/ReadMenu.kt +++ b/app/src/main/java/io/legado/app/ui/book/read/ReadMenu.kt @@ -140,6 +140,9 @@ class ReadMenu @JvmOverloads constructor( tvChapterUrl.onClick { context.openUrl(binding.tvChapterUrl.text.toString()) } + tvLogin.onClick { + callBack.showLogin() + } ivBrightnessAuto.onClick { context.putPrefBoolean("brightnessAuto", !brightnessAuto()) upBrightnessState() @@ -277,6 +280,7 @@ class ReadMenu @JvmOverloads constructor( } fun upBookView() { + binding.tvLogin.visible(!ReadBook.webBook?.bookSource?.loginUrl.isNullOrEmpty()) ReadBook.curTextChapter?.let { binding.tvChapterName.text = it.title binding.tvChapterName.visible() @@ -323,6 +327,7 @@ class ReadMenu @JvmOverloads constructor( fun upSystemUiVisibility() fun onClickReadAloud() fun showReadMenuHelp() + fun showLogin() } } diff --git a/app/src/main/res/layout/view_read_menu.xml b/app/src/main/res/layout/view_read_menu.xml index e7882c8bc..9653e8def 100644 --- a/app/src/main/res/layout/view_read_menu.xml +++ b/app/src/main/res/layout/view_read_menu.xml @@ -21,25 +21,45 @@ android:theme="?attr/actionBarStyle" app:layout_constraintTop_toTopOf="parent"> - - - + android:layout_height="wrap_content"> + + + + + + + + @@ -48,19 +68,19 @@ android:layout_width="wrap_content" android:layout_height="0dp" android:layout_margin="8dp" - android:orientation="vertical" android:gravity="center_horizontal" - app:layout_constraintTop_toBottomOf="@+id/title_bar" + android:orientation="vertical" + app:layout_constraintBottom_toTopOf="@+id/bottom_menu" app:layout_constraintLeft_toLeftOf="parent" - app:layout_constraintBottom_toTopOf="@+id/bottom_menu"> + app:layout_constraintTop_toBottomOf="@+id/title_bar"> + android:contentDescription="@string/brightness_auto" + android:src="@drawable/ic_brightness_auto" /> @@ -187,8 +207,8 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:background="@color/background_menu" - android:orientation="vertical" - android:importantForAccessibility="no"> + android:importantForAccessibility="no" + android:orientation="vertical"> + android:importantForAccessibility="no" + android:orientation="horizontal"> + android:importantForAccessibility="no" + android:orientation="horizontal"> @@ -322,8 +342,8 @@ android:layout_height="wrap_content" android:layout_gravity="center_horizontal" android:layout_marginTop="3dp" - android:singleLine="true" android:ellipsize="middle" + android:singleLine="true" android:text="@string/read_aloud" android:textColor="@color/primaryText" android:textSize="12sp" /> @@ -363,8 +383,8 @@ android:layout_height="wrap_content" android:layout_gravity="center_horizontal" android:layout_marginTop="3dp" - android:singleLine="true" android:ellipsize="middle" + android:singleLine="true" android:text="@string/interface_setting" android:textColor="@color/primaryText" android:textSize="12sp" /> @@ -404,8 +424,8 @@ android:layout_height="wrap_content" android:layout_gravity="center_horizontal" android:layout_marginTop="3dp" - android:singleLine="true" android:ellipsize="middle" + android:singleLine="true" android:text="@string/setting" android:textColor="@color/primaryText" android:textSize="12sp" /> diff --git a/app/src/main/res/menu/book_read.xml b/app/src/main/res/menu/book_read.xml index f35b5b901..b34861c5a 100644 --- a/app/src/main/res/menu/book_read.xml +++ b/app/src/main/res/menu/book_read.xml @@ -49,14 +49,6 @@ android:title="@string/bookmark_add" app:showAsAction="never" /> - - - -