Refine code
This commit is contained in:
parent
5d2112dfd5
commit
6d8d0a5077
10 changed files with 10 additions and 10 deletions
|
|
@ -29,7 +29,7 @@ class AboutActivity : BaseActivity() {
|
||||||
}
|
}
|
||||||
binding.appVersion.text = "$verName($verCode)"
|
binding.appVersion.text = "$verName($verCode)"
|
||||||
|
|
||||||
binding.toolbar.setNavigationOnClickListener {
|
binding.toolBar.setNavigationOnClickListener {
|
||||||
finish()
|
finish()
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -43,7 +43,7 @@ class AllTasksActivity : BaseActivity() {
|
||||||
build()
|
build()
|
||||||
}
|
}
|
||||||
|
|
||||||
binding.toolbar.setNavigationOnClickListener {
|
binding.toolBar.setNavigationOnClickListener {
|
||||||
finish()
|
finish()
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -21,7 +21,7 @@ class MainActivity : BaseActivity() {
|
||||||
binding = ActivityMainBinding.inflate(layoutInflater)
|
binding = ActivityMainBinding.inflate(layoutInflater)
|
||||||
setContentView(binding.root)
|
setContentView(binding.root)
|
||||||
|
|
||||||
binding.toolbar.setOnMenuItemClickListener { menuItem ->
|
binding.toolBar.setOnMenuItemClickListener { menuItem ->
|
||||||
when (menuItem.itemId) {
|
when (menuItem.itemId) {
|
||||||
R.id.item_settings -> {
|
R.id.item_settings -> {
|
||||||
val intent = Intent(ToDoApp.context, SettingsActivity::class.java)
|
val intent = Intent(ToDoApp.context, SettingsActivity::class.java)
|
||||||
|
|
|
||||||
|
|
@ -45,7 +45,7 @@ class SettingsActivity : BaseActivity() {
|
||||||
}
|
}
|
||||||
supportActionBar?.setDisplayHomeAsUpEnabled(true)
|
supportActionBar?.setDisplayHomeAsUpEnabled(true)
|
||||||
|
|
||||||
binding.toolbar.setNavigationOnClickListener {
|
binding.toolBar.setNavigationOnClickListener {
|
||||||
finish()
|
finish()
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -14,7 +14,7 @@
|
||||||
app:liftOnScroll="true">
|
app:liftOnScroll="true">
|
||||||
|
|
||||||
<com.google.android.material.appbar.MaterialToolbar
|
<com.google.android.material.appbar.MaterialToolbar
|
||||||
android:id="@+id/toolbar"
|
android:id="@+id/tool_bar"
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="?attr/actionBarSize"
|
android:layout_height="?attr/actionBarSize"
|
||||||
app:menu="@menu/main"
|
app:menu="@menu/main"
|
||||||
|
|
|
||||||
|
|
@ -14,7 +14,7 @@
|
||||||
app:liftOnScrollTargetViewId="@id/progress_frag">
|
app:liftOnScrollTargetViewId="@id/progress_frag">
|
||||||
|
|
||||||
<com.google.android.material.appbar.MaterialToolbar
|
<com.google.android.material.appbar.MaterialToolbar
|
||||||
android:id="@+id/toolbar"
|
android:id="@+id/tool_bar"
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="?attr/actionBarSize"
|
android:layout_height="?attr/actionBarSize"
|
||||||
app:menu="@menu/main"
|
app:menu="@menu/main"
|
||||||
|
|
|
||||||
|
|
@ -14,7 +14,7 @@
|
||||||
app:liftOnScroll="true">
|
app:liftOnScroll="true">
|
||||||
|
|
||||||
<com.google.android.material.appbar.MaterialToolbar
|
<com.google.android.material.appbar.MaterialToolbar
|
||||||
android:id="@+id/toolbar"
|
android:id="@+id/tool_bar"
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="?attr/actionBarSize"
|
android:layout_height="?attr/actionBarSize"
|
||||||
app:navigationIcon="@drawable/ic_arrow_back"
|
app:navigationIcon="@drawable/ic_arrow_back"
|
||||||
|
|
|
||||||
|
|
@ -15,7 +15,7 @@
|
||||||
app:liftOnScrollTargetViewId="@+id/all_tasks_list">
|
app:liftOnScrollTargetViewId="@+id/all_tasks_list">
|
||||||
|
|
||||||
<com.google.android.material.appbar.MaterialToolbar
|
<com.google.android.material.appbar.MaterialToolbar
|
||||||
android:id="@+id/toolbar"
|
android:id="@+id/tool_bar"
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="?attr/actionBarSize"
|
android:layout_height="?attr/actionBarSize"
|
||||||
app:navigationIcon="@drawable/ic_arrow_back"
|
app:navigationIcon="@drawable/ic_arrow_back"
|
||||||
|
|
|
||||||
|
|
@ -14,7 +14,7 @@
|
||||||
app:liftOnScrollTargetViewId="@id/progress_frag">
|
app:liftOnScrollTargetViewId="@id/progress_frag">
|
||||||
|
|
||||||
<com.google.android.material.appbar.MaterialToolbar
|
<com.google.android.material.appbar.MaterialToolbar
|
||||||
android:id="@+id/toolbar"
|
android:id="@+id/tool_bar"
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="?attr/actionBarSize"
|
android:layout_height="?attr/actionBarSize"
|
||||||
app:menu="@menu/main"
|
app:menu="@menu/main"
|
||||||
|
|
|
||||||
|
|
@ -13,7 +13,7 @@
|
||||||
android:fitsSystemWindows="true">
|
android:fitsSystemWindows="true">
|
||||||
|
|
||||||
<com.google.android.material.appbar.MaterialToolbar
|
<com.google.android.material.appbar.MaterialToolbar
|
||||||
android:id="@+id/toolbar"
|
android:id="@+id/tool_bar"
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="?attr/actionBarSize"
|
android:layout_height="?attr/actionBarSize"
|
||||||
app:navigationIcon="@drawable/ic_arrow_back"
|
app:navigationIcon="@drawable/ic_arrow_back"
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue