kunfei 3 роки тому
батько
коміт
18057795e7

+ 4 - 2
app/src/main/java/io/legado/app/ui/dict/rule/DictRuleActivity.kt

@@ -76,11 +76,13 @@ class DictRuleActivity : VMBaseActivity<ActivityDictRuleBinding, DictRuleViewMod
         }
     }
 
-    override fun onContextItemSelected(item: MenuItem): Boolean {
+    override fun onCompatOptionsItemSelected(item: MenuItem): Boolean {
         when (item.itemId) {
             R.id.menu_create -> showDialogFragment<DictRuleEditDialog>()
+            R.id.menu_import_default -> viewModel.importDefault()
+            R.id.menu_help -> {}
         }
-        return super.onContextItemSelected(item)
+        return super.onCompatOptionsItemSelected(item)
     }
 
     override fun onMenuItemClick(item: MenuItem): Boolean {

+ 7 - 0
app/src/main/java/io/legado/app/ui/dict/rule/DictRuleViewModel.kt

@@ -4,6 +4,7 @@ import android.app.Application
 import io.legado.app.base.BaseViewModel
 import io.legado.app.data.appDb
 import io.legado.app.data.entities.DictRule
+import io.legado.app.help.DefaultData
 
 class DictRuleViewModel(application: Application) : BaseViewModel(application) {
 
@@ -30,4 +31,10 @@ class DictRuleViewModel(application: Application) : BaseViewModel(application) {
         }
     }
 
+    fun importDefault() {
+        execute {
+            DefaultData.importDefaultDictRules()
+        }
+    }
+
 }

+ 0 - 2
app/src/main/res/layout/activity_dict_rule.xml

@@ -11,8 +11,6 @@
         android:id="@+id/title_bar"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        app:contentInsetStartWithNavigation="0dp"
-        app:contentLayout="@layout/view_search"
         app:title="@string/dict_rule" />
 
     <FrameLayout

+ 10 - 2
app/src/main/res/menu/dict_rule.xml

@@ -1,12 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
 <menu xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto">
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    tools:ignore="AlwaysShowAction">
 
     <item
         android:id="@+id/menu_create"
         android:icon="@drawable/ic_add"
         android:title="@string/create"
-        app:showAsAction="never" />
+        app:showAsAction="always" />
 
     <item
         android:id="@+id/menu_import_local"
@@ -26,6 +28,12 @@
         android:title="@string/import_by_qr_code"
         app:showAsAction="never" />
 
+    <item
+        android:id="@+id/menu_import_default"
+        android:icon="@drawable/ic_import"
+        android:title="@string/import_default_rule"
+        app:showAsAction="never" />
+
     <item
         android:id="@+id/menu_help"
         android:icon="@drawable/ic_help"