Minor type fix
This commit is contained in:
parent
0e22af7ba0
commit
98ac8a69c2
@ -279,7 +279,7 @@ class MainActivity : BaseActivity() {
|
|||||||
fun getToolbarNavigationIcon(toolbar: Toolbar): View? {
|
fun getToolbarNavigationIcon(toolbar: Toolbar): View? {
|
||||||
try {
|
try {
|
||||||
//check if contentDescription previously was set
|
//check if contentDescription previously was set
|
||||||
val hadContentDescription = TextUtils.isEmpty(toolbar.navigationContentDescription)
|
val hadContentDescription = !TextUtils.isEmpty(toolbar.navigationContentDescription)
|
||||||
val contentDescription = if (!hadContentDescription) toolbar.navigationContentDescription else "navigationIcon"
|
val contentDescription = if (!hadContentDescription) toolbar.navigationContentDescription else "navigationIcon"
|
||||||
toolbar.navigationContentDescription = contentDescription
|
toolbar.navigationContentDescription = contentDescription
|
||||||
|
|
||||||
@ -292,7 +292,7 @@ class MainActivity : BaseActivity() {
|
|||||||
val navIcon = potentialViews.firstOrNull()
|
val navIcon = potentialViews.firstOrNull()
|
||||||
|
|
||||||
//Clear content description if not previously present
|
//Clear content description if not previously present
|
||||||
if (hadContentDescription)
|
if (!hadContentDescription)
|
||||||
toolbar.navigationContentDescription = null
|
toolbar.navigationContentDescription = null
|
||||||
return navIcon
|
return navIcon
|
||||||
} catch(t: Throwable) {
|
} catch(t: Throwable) {
|
||||||
|
Loading…
x
Reference in New Issue
Block a user