blallo
/
fenix
1
0
Fork 0
Code Releases Activity

For #12461: Update content description for tabs tray open tab count

master
Sawyer Blatz 2020-07-21 10:05:27 -07:00 committed by Emily Kager
parent 96121a79fa
commit b483067bd9
1 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
app/src/main/java/org/mozilla/fenix/tabtray/TabTrayView.kt
View File

@ -16,6 +16,7 @@ import androidx.lifecycle.LifecycleCoroutineScope
import com.google.android.material.bottomsheet.BottomSheetBehavior import com.google.android.material.bottomsheet.BottomSheetBehavior
import com.google.android.material.tabs.TabLayout import com.google.android.material.tabs.TabLayout
import kotlinx.android.extensions.LayoutContainer import kotlinx.android.extensions.LayoutContainer
import kotlinx.android.synthetic.main.component_tabstray.*
import kotlinx.android.synthetic.main.component_tabstray.view.* import kotlinx.android.synthetic.main.component_tabstray.view.*
import kotlinx.android.synthetic.main.component_tabstray_fab.view.* import kotlinx.android.synthetic.main.component_tabstray_fab.view.*
import kotlinx.android.synthetic.main.tabs_tray_tab_counter.* import kotlinx.android.synthetic.main.tabs_tray_tab_counter.*
@ -37,7 +38,7 @@ import org.mozilla.fenix.ext.settings
/** /**
* View that contains and configures the BrowserAwesomeBar * View that contains and configures the BrowserAwesomeBar
*/ */
@Suppress("LongParameterList") @Suppress("LongParameterList", "TooManyFunctions", "LargeClass")
class TabTrayView( class TabTrayView(
private val container: ViewGroup, private val container: ViewGroup,
private val interactor: TabTrayInteractor, private val interactor: TabTrayInteractor,
@ -248,6 +249,15 @@ class TabTrayView(
view.tab_tray_overflow.isVisible = !hasNoTabs view.tab_tray_overflow.isVisible = !hasNoTabs
counter_text.text = "${state.normalTabs.size}" counter_text.text = "${state.normalTabs.size}"
updateTabCounterContentDescription(state.normalTabs.size)
}
}
private fun updateTabCounterContentDescription(count: Int) {
view.tab_layout.getTabAt(0)?.contentDescription = if (count == 1) {
view.context?.getString(R.string.open_tab_tray_single)
} else {
view.context?.getString(R.string.open_tab_tray_plural, count.toString())
} }
} }