diff --git a/app/src/main/kotlin/cn/super12138/todo/views/about/AboutActivity.kt b/app/src/main/kotlin/cn/super12138/todo/views/about/AboutActivity.kt index 77eaeac..3583578 100644 --- a/app/src/main/kotlin/cn/super12138/todo/views/about/AboutActivity.kt +++ b/app/src/main/kotlin/cn/super12138/todo/views/about/AboutActivity.kt @@ -29,7 +29,7 @@ class AboutActivity : BaseActivity() { } binding.appVersion.text = "$verName($verCode)" - binding.toolbar.setNavigationOnClickListener { + binding.toolBar.setNavigationOnClickListener { finish() } diff --git a/app/src/main/kotlin/cn/super12138/todo/views/all/AllTasksActivity.kt b/app/src/main/kotlin/cn/super12138/todo/views/all/AllTasksActivity.kt index a896252..14d0313 100644 --- a/app/src/main/kotlin/cn/super12138/todo/views/all/AllTasksActivity.kt +++ b/app/src/main/kotlin/cn/super12138/todo/views/all/AllTasksActivity.kt @@ -43,7 +43,7 @@ class AllTasksActivity : BaseActivity() { build() } - binding.toolbar.setNavigationOnClickListener { + binding.toolBar.setNavigationOnClickListener { finish() } diff --git a/app/src/main/kotlin/cn/super12138/todo/views/main/MainActivity.kt b/app/src/main/kotlin/cn/super12138/todo/views/main/MainActivity.kt index 0e0707a..caeb388 100644 --- a/app/src/main/kotlin/cn/super12138/todo/views/main/MainActivity.kt +++ b/app/src/main/kotlin/cn/super12138/todo/views/main/MainActivity.kt @@ -21,7 +21,7 @@ class MainActivity : BaseActivity() { binding = ActivityMainBinding.inflate(layoutInflater) setContentView(binding.root) - binding.toolbar.setOnMenuItemClickListener { menuItem -> + binding.toolBar.setOnMenuItemClickListener { menuItem -> when (menuItem.itemId) { R.id.item_settings -> { val intent = Intent(ToDoApp.context, SettingsActivity::class.java) diff --git a/app/src/main/kotlin/cn/super12138/todo/views/settings/SettingsActivity.kt b/app/src/main/kotlin/cn/super12138/todo/views/settings/SettingsActivity.kt index 626151d..3fa9d99 100644 --- a/app/src/main/kotlin/cn/super12138/todo/views/settings/SettingsActivity.kt +++ b/app/src/main/kotlin/cn/super12138/todo/views/settings/SettingsActivity.kt @@ -45,7 +45,7 @@ class SettingsActivity : BaseActivity() { } supportActionBar?.setDisplayHomeAsUpEnabled(true) - binding.toolbar.setNavigationOnClickListener { + binding.toolBar.setNavigationOnClickListener { finish() } } diff --git a/app/src/main/res/layout-land/activity_main.xml b/app/src/main/res/layout-land/activity_main.xml index 812e6e9..381c841 100644 --- a/app/src/main/res/layout-land/activity_main.xml +++ b/app/src/main/res/layout-land/activity_main.xml @@ -14,7 +14,7 @@ app:liftOnScroll="true">