From e30783b8076848b9c616a76573bd2f946e51d717 Mon Sep 17 00:00:00 2001 From: Moez Bhatti Date: Tue, 19 Jun 2018 12:59:03 -0400 Subject: [PATCH] Update ContentDescriptions for QK Reply and nav drawer --- presentation/src/main/java/feature/main/MainActivity.kt | 2 +- presentation/src/main/java/feature/qkreply/QkReplyActivity.kt | 1 + presentation/src/main/res/layout/qkreply_activity.xml | 2 +- presentation/src/main/res/values/strings.xml | 1 + 4 files changed, 4 insertions(+), 2 deletions(-) diff --git a/presentation/src/main/java/feature/main/MainActivity.kt b/presentation/src/main/java/feature/main/MainActivity.kt index 69136420..4e922792 100644 --- a/presentation/src/main/java/feature/main/MainActivity.kt +++ b/presentation/src/main/java/feature/main/MainActivity.kt @@ -96,7 +96,7 @@ class MainActivity : QkThemedActivity(), MainView { override val backPressedIntent: Subject = PublishSubject.create() private val viewModel by lazy { ViewModelProviders.of(this, viewModelFactory)[MainViewModel::class.java] } - private val toggle by lazy { ActionBarDrawerToggle(this, drawerLayout, toolbar, 0, 0) } + private val toggle by lazy { ActionBarDrawerToggle(this, drawerLayout, toolbar, R.string.main_drawer_open_cd, 0) } private val itemTouchHelper by lazy { ItemTouchHelper(itemTouchCallback) } private val archiveSnackbar by lazy { Snackbar.make(drawerLayout, R.string.toast_archived, Snackbar.LENGTH_INDEFINITE).apply { diff --git a/presentation/src/main/java/feature/qkreply/QkReplyActivity.kt b/presentation/src/main/java/feature/qkreply/QkReplyActivity.kt index 3c820729..81cfa355 100644 --- a/presentation/src/main/java/feature/qkreply/QkReplyActivity.kt +++ b/presentation/src/main/java/feature/qkreply/QkReplyActivity.kt @@ -110,6 +110,7 @@ class QkReplyActivity : QkThemedActivity(), QkReplyView { counter.setVisible(counter.text.isNotBlank()) sim.setVisible(state.subscription != null) + sim.contentDescription = getString(R.string.compose_sim_cd, state.subscription?.displayName) simIndex.text = "${state.subscription?.simSlotIndex?.plus(1)}" send.isEnabled = state.canSend diff --git a/presentation/src/main/res/layout/qkreply_activity.xml b/presentation/src/main/res/layout/qkreply_activity.xml index 14103d2a..15b05393 100644 --- a/presentation/src/main/res/layout/qkreply_activity.xml +++ b/presentation/src/main/res/layout/qkreply_activity.xml @@ -121,7 +121,6 @@ android:layout_height="44dp" android:layout_marginEnd="8dp" android:background="?attr/selectableItemBackground" - android:contentDescription="@string/compose_attach_cd" android:padding="10dp" android:src="@drawable/ic_sim_card_black_24dp" android:tint="?android:attr/textColorSecondary" @@ -163,6 +162,7 @@ android:layout_marginBottom="8dp" android:layout_marginEnd="8dp" android:background="@drawable/circle" + android:contentDescription="@string/compose_send_cd" android:elevation="4dp" android:padding="10dp" android:src="@drawable/ic_send_black_24dp" diff --git a/presentation/src/main/res/values/strings.xml b/presentation/src/main/res/values/strings.xml index 1014244d..0a298e7b 100644 --- a/presentation/src/main/res/values/strings.xml +++ b/presentation/src/main/res/values/strings.xml @@ -36,6 +36,7 @@ Details Save to gallery + Open navigation drawer %d selected Clear Mark read