From 6d8d0a5077aa253703026fae5d7f9b2094be3cde Mon Sep 17 00:00:00 2001
From: Super12138 <70494801+Super12138@users.noreply.github.com>
Date: Sat, 2 Mar 2024 08:18:37 +0800
Subject: [PATCH] Refine code

---
 .../main/kotlin/cn/super12138/todo/views/about/AboutActivity.kt | 2 +-
 .../kotlin/cn/super12138/todo/views/all/AllTasksActivity.kt     | 2 +-
 .../main/kotlin/cn/super12138/todo/views/main/MainActivity.kt   | 2 +-
 .../cn/super12138/todo/views/settings/SettingsActivity.kt       | 2 +-
 app/src/main/res/layout-land/activity_main.xml                  | 2 +-
 app/src/main/res/layout-small/activity_main.xml                 | 2 +-
 app/src/main/res/layout/activity_about.xml                      | 2 +-
 app/src/main/res/layout/activity_all_tasks.xml                  | 2 +-
 app/src/main/res/layout/activity_main.xml                       | 2 +-
 app/src/main/res/layout/activity_settings.xml                   | 2 +-
 10 files changed, 10 insertions(+), 10 deletions(-)

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">
 
         <com.google.android.material.appbar.MaterialToolbar
-            android:id="@+id/toolbar"
+            android:id="@+id/tool_bar"
             android:layout_width="match_parent"
             android:layout_height="?attr/actionBarSize"
             app:menu="@menu/main"
diff --git a/app/src/main/res/layout-small/activity_main.xml b/app/src/main/res/layout-small/activity_main.xml
index ba968c8..9c1a15f 100644
--- a/app/src/main/res/layout-small/activity_main.xml
+++ b/app/src/main/res/layout-small/activity_main.xml
@@ -14,7 +14,7 @@
         app:liftOnScrollTargetViewId="@id/progress_frag">
 
         <com.google.android.material.appbar.MaterialToolbar
-            android:id="@+id/toolbar"
+            android:id="@+id/tool_bar"
             android:layout_width="match_parent"
             android:layout_height="?attr/actionBarSize"
             app:menu="@menu/main"
diff --git a/app/src/main/res/layout/activity_about.xml b/app/src/main/res/layout/activity_about.xml
index efac606..f0e476a 100644
--- a/app/src/main/res/layout/activity_about.xml
+++ b/app/src/main/res/layout/activity_about.xml
@@ -14,7 +14,7 @@
         app:liftOnScroll="true">
 
         <com.google.android.material.appbar.MaterialToolbar
-            android:id="@+id/toolbar"
+            android:id="@+id/tool_bar"
             android:layout_width="match_parent"
             android:layout_height="?attr/actionBarSize"
             app:navigationIcon="@drawable/ic_arrow_back"
diff --git a/app/src/main/res/layout/activity_all_tasks.xml b/app/src/main/res/layout/activity_all_tasks.xml
index 301b0cf..8183cbd 100644
--- a/app/src/main/res/layout/activity_all_tasks.xml
+++ b/app/src/main/res/layout/activity_all_tasks.xml
@@ -15,7 +15,7 @@
         app:liftOnScrollTargetViewId="@+id/all_tasks_list">
 
         <com.google.android.material.appbar.MaterialToolbar
-            android:id="@+id/toolbar"
+            android:id="@+id/tool_bar"
             android:layout_width="match_parent"
             android:layout_height="?attr/actionBarSize"
             app:navigationIcon="@drawable/ic_arrow_back"
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index 2a9b253..07228b3 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -14,7 +14,7 @@
         app:liftOnScrollTargetViewId="@id/progress_frag">
 
         <com.google.android.material.appbar.MaterialToolbar
-            android:id="@+id/toolbar"
+            android:id="@+id/tool_bar"
             android:layout_width="match_parent"
             android:layout_height="?attr/actionBarSize"
             app:menu="@menu/main"
diff --git a/app/src/main/res/layout/activity_settings.xml b/app/src/main/res/layout/activity_settings.xml
index aa07eed..f679d1b 100644
--- a/app/src/main/res/layout/activity_settings.xml
+++ b/app/src/main/res/layout/activity_settings.xml
@@ -13,7 +13,7 @@
         android:fitsSystemWindows="true">
 
         <com.google.android.material.appbar.MaterialToolbar
-            android:id="@+id/toolbar"
+            android:id="@+id/tool_bar"
             android:layout_width="match_parent"
             android:layout_height="?attr/actionBarSize"
             app:navigationIcon="@drawable/ic_arrow_back"