优化
This commit is contained in:
@@ -117,6 +117,7 @@ class BookInfoActivity :
|
|||||||
|
|
||||||
override fun onCompatCreateOptionsMenu(menu: Menu): Boolean {
|
override fun onCompatCreateOptionsMenu(menu: Menu): Boolean {
|
||||||
menuInflater.inflate(R.menu.book_info, menu)
|
menuInflater.inflate(R.menu.book_info, menu)
|
||||||
|
menu.findItem(R.id.menu_edit)?.isVisible = viewModel.inBookshelf
|
||||||
return super.onCompatCreateOptionsMenu(menu)
|
return super.onCompatCreateOptionsMenu(menu)
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -137,23 +138,21 @@ class BookInfoActivity :
|
|||||||
viewModel.bookData.value?.isLocalTxt ?: false
|
viewModel.bookData.value?.isLocalTxt ?: false
|
||||||
menu.findItem(R.id.menu_upload)?.isVisible =
|
menu.findItem(R.id.menu_upload)?.isVisible =
|
||||||
viewModel.bookData.value?.isLocal ?: false
|
viewModel.bookData.value?.isLocal ?: false
|
||||||
menu.findItem(R.id.menu_edit)?.isVisible =
|
|
||||||
!(viewModel.bookData.value?.isWebFile ?: true)
|
|
||||||
return super.onMenuOpened(featureId, menu)
|
return super.onMenuOpened(featureId, menu)
|
||||||
}
|
}
|
||||||
|
|
||||||
override fun onCompatOptionsItemSelected(item: MenuItem): Boolean {
|
override fun onCompatOptionsItemSelected(item: MenuItem): Boolean {
|
||||||
when (item.itemId) {
|
when (item.itemId) {
|
||||||
R.id.menu_edit -> {
|
R.id.menu_edit -> {
|
||||||
if (viewModel.inBookshelf) {
|
// if (viewModel.inBookshelf) {
|
||||||
viewModel.bookData.value?.let {
|
viewModel.bookData.value?.let {
|
||||||
infoEditResult.launch {
|
infoEditResult.launch {
|
||||||
putExtra("bookUrl", it.bookUrl)
|
putExtra("bookUrl", it.bookUrl)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
} else {
|
// } else {
|
||||||
toastOnUi(R.string.after_add_bookshelf)
|
// toastOnUi(R.string.after_add_bookshelf)
|
||||||
}
|
//}
|
||||||
}
|
}
|
||||||
R.id.menu_share_it -> {
|
R.id.menu_share_it -> {
|
||||||
viewModel.bookData.value?.let {
|
viewModel.bookData.value?.let {
|
||||||
|
|||||||
@@ -4,6 +4,12 @@
|
|||||||
xmlns:tools="http://schemas.android.com/tools"
|
xmlns:tools="http://schemas.android.com/tools"
|
||||||
tools:ignore="AlwaysShowAction">
|
tools:ignore="AlwaysShowAction">
|
||||||
|
|
||||||
|
<item
|
||||||
|
android:id="@+id/menu_search"
|
||||||
|
android:icon="@drawable/ic_search"
|
||||||
|
android:title="@string/search"
|
||||||
|
app:showAsAction="always" />
|
||||||
|
|
||||||
<item
|
<item
|
||||||
android:id="@+id/menu_refresh"
|
android:id="@+id/menu_refresh"
|
||||||
android:icon="@drawable/ic_refresh_black_24dp"
|
android:icon="@drawable/ic_refresh_black_24dp"
|
||||||
|
|||||||
@@ -4,6 +4,12 @@
|
|||||||
xmlns:tools="http://schemas.android.com/tools"
|
xmlns:tools="http://schemas.android.com/tools"
|
||||||
tools:ignore="AlwaysShowAction">
|
tools:ignore="AlwaysShowAction">
|
||||||
|
|
||||||
|
<item
|
||||||
|
android:id="@+id/menu_search"
|
||||||
|
android:icon="@drawable/ic_search"
|
||||||
|
android:title="@string/search"
|
||||||
|
app:showAsAction="always" />
|
||||||
|
|
||||||
<item
|
<item
|
||||||
android:id="@+id/menu_select_folder"
|
android:id="@+id/menu_select_folder"
|
||||||
android:icon="@drawable/ic_folder_open"
|
android:icon="@drawable/ic_folder_open"
|
||||||
|
|||||||
@@ -617,7 +617,6 @@
|
|||||||
<string name="custom_page_key">Defina qué botones pasan de página</string>
|
<string name="custom_page_key">Defina qué botones pasan de página</string>
|
||||||
<string name="prev_page_key">Botón de página anterior</string>
|
<string name="prev_page_key">Botón de página anterior</string>
|
||||||
<string name="next_page_key">Botón de página siguiente</string>
|
<string name="next_page_key">Botón de página siguiente</string>
|
||||||
<string name="after_add_bookshelf">Primero agregue este libro a Estantería</string>
|
|
||||||
<string name="no_group">Sin grupo</string>
|
<string name="no_group">Sin grupo</string>
|
||||||
<string name="prev_sentence">Oración anterior</string>
|
<string name="prev_sentence">Oración anterior</string>
|
||||||
<string name="next_sentence">Siguiente oración</string>
|
<string name="next_sentence">Siguiente oración</string>
|
||||||
@@ -984,7 +983,6 @@
|
|||||||
<string name="import_theme">导入主题</string>
|
<string name="import_theme">导入主题</string>
|
||||||
<string name="import_txt_toc_rule">导入txt目录规则</string>
|
<string name="import_txt_toc_rule">导入txt目录规则</string>
|
||||||
<string name="auto_save_cookie">CookieJar</string>
|
<string name="auto_save_cookie">CookieJar</string>
|
||||||
<string name="click_read_button_load">点击阅读加载目录</string>
|
|
||||||
<string name="cookie">清除cookie</string>
|
<string name="cookie">清除cookie</string>
|
||||||
<string name="download_and_import_file">导入在线书籍文件</string>
|
<string name="download_and_import_file">导入在线书籍文件</string>
|
||||||
<string name="upload_book_success">Upload Success</string>
|
<string name="upload_book_success">Upload Success</string>
|
||||||
|
|||||||
@@ -621,7 +621,6 @@
|
|||||||
<string name="custom_page_key">Set page-turning buttons</string>
|
<string name="custom_page_key">Set page-turning buttons</string>
|
||||||
<string name="prev_page_key">Page up button</string>
|
<string name="prev_page_key">Page up button</string>
|
||||||
<string name="next_page_key">Page down button</string>
|
<string name="next_page_key">Page down button</string>
|
||||||
<string name="after_add_bookshelf">Add this book to Bookshelf first</string>
|
|
||||||
<string name="no_group">Ungrouped</string>
|
<string name="no_group">Ungrouped</string>
|
||||||
<string name="prev_sentence">Prior sentence</string>
|
<string name="prev_sentence">Prior sentence</string>
|
||||||
<string name="next_sentence">Next sentence</string>
|
<string name="next_sentence">Next sentence</string>
|
||||||
@@ -987,7 +986,6 @@
|
|||||||
<string name="import_theme">导入主题</string>
|
<string name="import_theme">导入主题</string>
|
||||||
<string name="import_txt_toc_rule">导入txt目录规则</string>
|
<string name="import_txt_toc_rule">导入txt目录规则</string>
|
||||||
<string name="auto_save_cookie">CookieJar</string>
|
<string name="auto_save_cookie">CookieJar</string>
|
||||||
<string name="click_read_button_load">点击阅读加载目录</string>
|
|
||||||
<string name="cookie">清除cookie</string>
|
<string name="cookie">清除cookie</string>
|
||||||
<string name="download_and_import_file">导入在线书籍文件</string>
|
<string name="download_and_import_file">导入在线书籍文件</string>
|
||||||
<string name="upload_book_success">Upload Success</string>
|
<string name="upload_book_success">Upload Success</string>
|
||||||
|
|||||||
@@ -619,7 +619,6 @@
|
|||||||
<string name="custom_page_key">Definir que botões viram as páginas</string>
|
<string name="custom_page_key">Definir que botões viram as páginas</string>
|
||||||
<string name="prev_page_key">Botão de página anterior</string>
|
<string name="prev_page_key">Botão de página anterior</string>
|
||||||
<string name="next_page_key">Botão de página seguinte</string>
|
<string name="next_page_key">Botão de página seguinte</string>
|
||||||
<string name="after_add_bookshelf">Primeiro adicionar este livro à Estante</string>
|
|
||||||
<string name="no_group">Sem grupo</string>
|
<string name="no_group">Sem grupo</string>
|
||||||
<string name="prev_sentence">Frase anterior</string>
|
<string name="prev_sentence">Frase anterior</string>
|
||||||
<string name="next_sentence">Frase seguinte</string>
|
<string name="next_sentence">Frase seguinte</string>
|
||||||
@@ -987,7 +986,6 @@
|
|||||||
<string name="import_theme">导入主题</string>
|
<string name="import_theme">导入主题</string>
|
||||||
<string name="import_txt_toc_rule">导入txt目录规则</string>
|
<string name="import_txt_toc_rule">导入txt目录规则</string>
|
||||||
<string name="auto_save_cookie">CookieJar</string>
|
<string name="auto_save_cookie">CookieJar</string>
|
||||||
<string name="click_read_button_load">点击阅读加载目录</string>
|
|
||||||
<string name="cookie">清除cookie</string>
|
<string name="cookie">清除cookie</string>
|
||||||
<string name="download_and_import_file">导入在线书籍文件</string>
|
<string name="download_and_import_file">导入在线书籍文件</string>
|
||||||
<string name="upload_book_success">Upload Success</string>
|
<string name="upload_book_success">Upload Success</string>
|
||||||
|
|||||||
@@ -612,7 +612,6 @@
|
|||||||
<string name="custom_page_key">自定義翻頁按鍵</string>
|
<string name="custom_page_key">自定義翻頁按鍵</string>
|
||||||
<string name="prev_page_key">上一頁按鍵</string>
|
<string name="prev_page_key">上一頁按鍵</string>
|
||||||
<string name="next_page_key">下一頁按鍵</string>
|
<string name="next_page_key">下一頁按鍵</string>
|
||||||
<string name="after_add_bookshelf">先將書籍加入書架</string>
|
|
||||||
<string name="no_group">未分組</string>
|
<string name="no_group">未分組</string>
|
||||||
<string name="prev_sentence">上一句</string>
|
<string name="prev_sentence">上一句</string>
|
||||||
<string name="next_sentence">下一句</string>
|
<string name="next_sentence">下一句</string>
|
||||||
@@ -984,7 +983,6 @@
|
|||||||
<string name="import_theme">导入主题</string>
|
<string name="import_theme">导入主题</string>
|
||||||
<string name="import_txt_toc_rule">导入txt目录规则</string>
|
<string name="import_txt_toc_rule">导入txt目录规则</string>
|
||||||
<string name="auto_save_cookie">CookieJar</string>
|
<string name="auto_save_cookie">CookieJar</string>
|
||||||
<string name="click_read_button_load">点击阅读加载目录</string>
|
|
||||||
<string name="cookie">清除cookie</string>
|
<string name="cookie">清除cookie</string>
|
||||||
<string name="download_and_import_file">导入在线书籍文件</string>
|
<string name="download_and_import_file">导入在线书籍文件</string>
|
||||||
<string name="upload_book_success">Upload Success</string>
|
<string name="upload_book_success">Upload Success</string>
|
||||||
|
|||||||
@@ -620,7 +620,6 @@
|
|||||||
<string name="custom_page_key">自訂翻頁按鍵</string>
|
<string name="custom_page_key">自訂翻頁按鍵</string>
|
||||||
<string name="prev_page_key">上一頁按鍵</string>
|
<string name="prev_page_key">上一頁按鍵</string>
|
||||||
<string name="next_page_key">下一頁按鍵</string>
|
<string name="next_page_key">下一頁按鍵</string>
|
||||||
<string name="after_add_bookshelf">先將書籍加入書架</string>
|
|
||||||
<string name="no_group">未分組</string>
|
<string name="no_group">未分組</string>
|
||||||
<string name="prev_sentence">上一句</string>
|
<string name="prev_sentence">上一句</string>
|
||||||
<string name="next_sentence">下一句</string>
|
<string name="next_sentence">下一句</string>
|
||||||
@@ -986,7 +985,6 @@
|
|||||||
<string name="import_theme">匯入主題</string>
|
<string name="import_theme">匯入主題</string>
|
||||||
<string name="import_txt_toc_rule">匯入txt目錄規則</string>
|
<string name="import_txt_toc_rule">匯入txt目錄規則</string>
|
||||||
<string name="auto_save_cookie">CookieJar</string>
|
<string name="auto_save_cookie">CookieJar</string>
|
||||||
<string name="click_read_button_load">點擊閱讀載入目錄</string>
|
|
||||||
<string name="cookie">清除cookie</string>
|
<string name="cookie">清除cookie</string>
|
||||||
<string name="download_and_import_file">匯入線上書籍文件</string>
|
<string name="download_and_import_file">匯入線上書籍文件</string>
|
||||||
<string name="upload_book_success">上傳成功</string>
|
<string name="upload_book_success">上傳成功</string>
|
||||||
|
|||||||
@@ -620,7 +620,6 @@
|
|||||||
<string name="custom_page_key">自定义翻页按键</string>
|
<string name="custom_page_key">自定义翻页按键</string>
|
||||||
<string name="prev_page_key">上一页按键</string>
|
<string name="prev_page_key">上一页按键</string>
|
||||||
<string name="next_page_key">下一页按键</string>
|
<string name="next_page_key">下一页按键</string>
|
||||||
<string name="after_add_bookshelf">先将书籍加入书架</string>
|
|
||||||
<string name="no_group">未分组</string>
|
<string name="no_group">未分组</string>
|
||||||
<string name="prev_sentence">上一句</string>
|
<string name="prev_sentence">上一句</string>
|
||||||
<string name="next_sentence">下一句</string>
|
<string name="next_sentence">下一句</string>
|
||||||
@@ -986,7 +985,6 @@
|
|||||||
<string name="import_theme">导入主题</string>
|
<string name="import_theme">导入主题</string>
|
||||||
<string name="import_txt_toc_rule">导入 TXT 目录规则</string>
|
<string name="import_txt_toc_rule">导入 TXT 目录规则</string>
|
||||||
<string name="auto_save_cookie">CookieJar</string>
|
<string name="auto_save_cookie">CookieJar</string>
|
||||||
<string name="click_read_button_load">点击阅读加载目录</string>
|
|
||||||
<string name="cookie">清除 Cookie</string>
|
<string name="cookie">清除 Cookie</string>
|
||||||
<string name="download_and_import_file">导入在线书籍文件</string>
|
<string name="download_and_import_file">导入在线书籍文件</string>
|
||||||
<string name="upload_book_success">上传成功</string>
|
<string name="upload_book_success">上传成功</string>
|
||||||
|
|||||||
@@ -621,7 +621,6 @@
|
|||||||
<string name="custom_page_key">Set page-turning buttons</string>
|
<string name="custom_page_key">Set page-turning buttons</string>
|
||||||
<string name="prev_page_key">Page up button</string>
|
<string name="prev_page_key">Page up button</string>
|
||||||
<string name="next_page_key">Page down button</string>
|
<string name="next_page_key">Page down button</string>
|
||||||
<string name="after_add_bookshelf">Add this book to Bookshelf first</string>
|
|
||||||
<string name="no_group">Ungrouped</string>
|
<string name="no_group">Ungrouped</string>
|
||||||
<string name="prev_sentence">Prior sentence</string>
|
<string name="prev_sentence">Prior sentence</string>
|
||||||
<string name="next_sentence">Next sentence</string>
|
<string name="next_sentence">Next sentence</string>
|
||||||
@@ -988,7 +987,6 @@
|
|||||||
<string name="import_theme">Import theme</string>
|
<string name="import_theme">Import theme</string>
|
||||||
<string name="import_txt_toc_rule">Import txt directory rules</string>
|
<string name="import_txt_toc_rule">Import txt directory rules</string>
|
||||||
<string name="auto_save_cookie">CookieJar</string>
|
<string name="auto_save_cookie">CookieJar</string>
|
||||||
<string name="click_read_button_load">Click to read the load directory</string>
|
|
||||||
<string name="cookie">Clear cookie</string>
|
<string name="cookie">Clear cookie</string>
|
||||||
<string name="download_and_import_file">Import online book files</string>
|
<string name="download_and_import_file">Import online book files</string>
|
||||||
<string name="upload_book_success">Upload Success</string>
|
<string name="upload_book_success">Upload Success</string>
|
||||||
|
|||||||
Reference in New Issue
Block a user