TalkBack, 8 of 10: Improve shared navigation and action labels

V2rayNG/app/src/main/java/com/v2ray/ang/ui/apppicker/AppPickerActivity.kt

@@ -159,7 +159,7 @@ fun AppPickerScreen(
                         IconButton(onClick = { showMenu = true }) {
                             Icon(
                                 painterResource(R.drawable.ic_more_vert_24dp),
-                                contentDescription = null
+                                contentDescription = stringResource(R.string.acc_more)
                             )
                         }
                         DropdownMenu(

V2rayNG/app/src/main/java/com/v2ray/ang/ui/compose/AccessibilityModifiers.kt

@@ -0,0 +1,9 @@
+package com.v2ray.ang.ui.compose
+
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.semantics.semantics
+import androidx.compose.ui.semantics.traversalIndex
+
+internal fun Modifier.accessibilityTraversalIndex(index: Float): Modifier = semantics {
+    traversalIndex = index
+}

V2rayNG/app/src/main/java/com/v2ray/ang/ui/compose/Components.kt

@@ -85,7 +85,10 @@ fun AppTopBar(
                         placeholder = searchPlaceholder
                     )
                 } else {
-                    Text(text = title)
+                    Text(
+                        text = title,
+                        modifier = Modifier.accessibilityTraversalIndex(-1f)
+                    )
                 }
             },
             navigationIcon = {
@@ -151,7 +154,10 @@ private fun SearchInputField(
         )
         if (query.isNotEmpty()) {
             IconButton(onClick = { onQueryChange("") }) {
-                Icon(painterResource(android.R.drawable.ic_menu_close_clear_cancel), "Clear")
+                Icon(
+                    painter = painterResource(android.R.drawable.ic_menu_close_clear_cancel),
+                    contentDescription = stringResource(R.string.acc_clear_search)
+                )
             }
         }
     }

V2rayNG/app/src/main/java/com/v2ray/ang/ui/main/MainBottomBar.kt

@@ -21,6 +21,7 @@ import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Alignment
+import androidx.compose.ui.semantics.onClick
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.res.painterResource
@@ -42,6 +43,7 @@ fun MainBottomBar(
     onAction: (MainAction) -> Unit
 ) {
     Box(modifier = Modifier.fillMaxWidth()) {
+        val serviceActionLabel = stringResource(if (isRunning) R.string.acc_disconnect else R.string.acc_connect)
         Column(
             modifier = Modifier
                 .fillMaxWidth()
@@ -73,7 +75,8 @@ fun MainBottomBar(
                 .align(Alignment.TopEnd)
                 .padding(end = 24.dp)
                 .offset(y = (-28).dp)
-                .navigationBarsPadding(),
+                .navigationBarsPadding()
+                .semantics { onClick(label = serviceActionLabel, action = null) },
             containerColor = if (isRunning) colorFabActive
             else if (isDarkTheme) colorFabInactiveDark
             else colorFabInactiveLight

V2rayNG/app/src/main/java/com/v2ray/ang/ui/main/MainDrawer.kt

@@ -28,6 +28,8 @@ import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.graphics.ColorFilter
 import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.semantics.hideFromAccessibility
+import androidx.compose.ui.semantics.semantics
 import androidx.compose.ui.unit.dp
 import com.v2ray.ang.R
 import com.v2ray.ang.ui.compose.AppDivider
@@ -81,6 +83,8 @@ fun MainDrawerContent(drawerState: DrawerState, onNavigate: (MainDestination) ->
                 modifier = Modifier
                     .fillMaxWidth()
                     .height(180.dp)
+                    // The decorative Surface must not become an empty accessibility stop.
+                    .semantics { hideFromAccessibility() }
             ) {
                 Column(
                     modifier = Modifier
@@ -102,6 +106,7 @@ fun MainDrawerContent(drawerState: DrawerState, onNavigate: (MainDestination) ->
                     )
                     Text(
                         text = stringResource(R.string.app_name),
+                        modifier = Modifier.semantics { hideFromAccessibility() },
                         style = MaterialTheme.typography.titleLarge,
                         color = MaterialTheme.colorScheme.onSurface
                     )

V2rayNG/app/src/main/java/com/v2ray/ang/ui/main/MainTopBar.kt

@@ -22,6 +22,8 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.platform.LocalConfiguration
 import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.semantics.onClick
+import androidx.compose.ui.semantics.semantics
 import androidx.compose.ui.unit.dp
 import com.v2ray.ang.R
 import com.v2ray.ang.ui.compose.AppTopBar
@@ -62,8 +64,12 @@ fun MainTopBar(
                     Icon(painterResource(R.drawable.ic_arrow_back_24dp), contentDescription = stringResource(R.string.acc_back))
                 }
             } else {
-                IconButton(onClick = onMenuClick) {
-                    Icon(painterResource(R.drawable.ic_menu_24dp), contentDescription = stringResource(R.string.acc_open_menu))
+                val menuLabel = stringResource(R.string.acc_open_menu)
+                IconButton(
+                    onClick = onMenuClick,
+                    modifier = Modifier.semantics { onClick(label = menuLabel, action = null) },
+                ) {
+                    Icon(painterResource(R.drawable.ic_menu_24dp), contentDescription = menuLabel)
                 }
             }
         },

V2rayNG/app/src/main/res/values-ar/strings.xml

@@ -512,13 +512,16 @@
     <string name="acc_add_asset">إضافة مصدر موارد</string>
     <string name="acc_download_file">تنزيل ملفات الموارد</string>
     <string name="acc_qr_code">رمز QR</string>
-    <string name="acc_copy_log">نسخ السجل</string>
+    <string name="acc_copy_log">نسخ السجل إلى الحافظة</string>
     <string name="acc_clear_log">مسح السجل</string>
     <string name="acc_add_rule">إضافة قاعدة توجيه</string>
     <string name="acc_start">بدء الخدمة</string>
     <string name="acc_stop">إيقاف الخدمة</string>
+    <string name="acc_connect">اتصال</string>
+    <string name="acc_disconnect">قطع الاتصال</string>
     <string name="acc_back">رجوع</string>
     <string name="acc_search">بحث</string>
+    <string name="acc_clear_search">مسح البحث</string>
     <string name="acc_add">إضافة تكوين</string>
     <string name="acc_more">المزيد من الخيارات</string>
     <string name="acc_selected_server">Selected</string>

V2rayNG/app/src/main/res/values-bn/strings.xml

@@ -512,13 +512,16 @@
     <string name="acc_add_asset">অ্যাসেট উৎস যোগ করুন</string>
     <string name="acc_download_file">অ্যাসেট ফাইল ডাউনলোড করুন</string>
     <string name="acc_qr_code">QR কোড</string>
-    <string name="acc_copy_log">লগ কপি করুন</string>
+    <string name="acc_copy_log">ক্লিপবোর্ডে লগ কপি করুন</string>
     <string name="acc_clear_log">লগ মুছুন</string>
     <string name="acc_add_rule">রাউটিং নিয়ম যোগ করুন</string>
     <string name="acc_start">সার্ভিস শুরু করুন</string>
     <string name="acc_stop">সার্ভিস বন্ধ করুন</string>
+    <string name="acc_connect">সংযোগ করুন</string>
+    <string name="acc_disconnect">সংযোগ বিচ্ছিন্ন করুন</string>
     <string name="acc_back">ফিরে যান</string>
     <string name="acc_search">অনুসন্ধান করুন</string>
+    <string name="acc_clear_search">অনুসন্ধান মুছুন</string>
     <string name="acc_add">কনফিগারেশন যোগ করুন</string>
     <string name="acc_more">আরও বিকল্প</string>
     <string name="acc_selected_server">Selected</string>

V2rayNG/app/src/main/res/values-bqi-rIR/strings.xml

@@ -512,13 +512,16 @@
     <string name="acc_add_asset">ٱووردن بونچک فایلا جغرافیایی</string>
     <string name="acc_download_file">دانلود فایلا بونچک جغرافیایی</string>
     <string name="acc_qr_code">کود QR</string>
-    <string name="acc_copy_log">لف گیری گوزارش</string>
+    <string name="acc_copy_log">لف گیری گوزارش من ویرگا</string>
     <string name="acc_clear_log">روفتن گوزارش</string>
     <string name="acc_add_rule">ٱووردن قانووݩ</string>
     <string name="acc_start">ره وستن سرویس</string>
     <string name="acc_stop">واڌاشتن سرویس</string>
+    <string name="acc_connect">منپیز کردن</string>
+    <string name="acc_disconnect">واڌاشتن منپیز</string>
     <string name="acc_back">برگشت</string>
     <string name="acc_search">پیتینیڌن</string>
+    <string name="acc_clear_search">روفتن پیتینیڌن</string>
     <string name="acc_add">ٱووردن کانفیگ</string>
     <string name="acc_more">امکووݩا بؽتر</string>
     <string name="acc_selected_server">Selected</string>

V2rayNG/app/src/main/res/values-fa/strings.xml

@@ -512,13 +512,16 @@
     <string name="acc_add_asset">افزودن منبع فایل‌های جغرافیایی</string>
     <string name="acc_download_file">دانلود فایل‌های منبع</string>
     <string name="acc_qr_code">کد QR</string>
-    <string name="acc_copy_log">کپی گزارش</string>
+    <string name="acc_copy_log">کپی گزارش در کلیپ‌بورد</string>
     <string name="acc_clear_log">پاک کردن گزارش</string>
     <string name="acc_add_rule">افزودن قانون مسیریابی</string>
     <string name="acc_start">شروع سرویس</string>
     <string name="acc_stop">توقف سرویس</string>
+    <string name="acc_connect">اتصال</string>
+    <string name="acc_disconnect">قطع اتصال</string>
     <string name="acc_back">بازگشت</string>
     <string name="acc_search">جستجو</string>
+    <string name="acc_clear_search">پاک کردن جستجو</string>
     <string name="acc_add">افزودن کانفیگ</string>
     <string name="acc_more">گزینه‌های بیشتر</string>
     <string name="acc_selected_server">انتخاب شده</string>

V2rayNG/app/src/main/res/values-ru/strings.xml

@@ -512,13 +512,16 @@
     <string name="acc_add_asset">Добавить источник ресурсов</string>
     <string name="acc_download_file">Загрузить файлы ресурсов</string>
     <string name="acc_qr_code">QR-код</string>
-    <string name="acc_copy_log">Копировать журнал</string>
+    <string name="acc_copy_log">Копировать журнал в буфер обмена</string>
     <string name="acc_clear_log">Очистить журнал</string>
     <string name="acc_add_rule">Добавить правило маршрутизации</string>
     <string name="acc_start">Запустить службу</string>
     <string name="acc_stop">Остановить службу</string>
+    <string name="acc_connect">Подключиться</string>
+    <string name="acc_disconnect">Отключиться</string>
     <string name="acc_back">Назад</string>
     <string name="acc_search">Поиск</string>
+    <string name="acc_clear_search">Очистить поиск</string>
     <string name="acc_add">Добавить профиль</string>
     <string name="acc_more">Дополнительные параметры</string>
     <string name="acc_selected_server">Selected</string>

V2rayNG/app/src/main/res/values-vi/strings.xml

@@ -512,13 +512,16 @@
     <string name="acc_add_asset">Thêm nguồn tệp tài nguyên</string>
     <string name="acc_download_file">Tải xuống tệp tài nguyên</string>
     <string name="acc_qr_code">Mã QR</string>
-    <string name="acc_copy_log">Sao chép nhật ký</string>
+    <string name="acc_copy_log">Sao chép nhật ký vào bộ nhớ tạm</string>
     <string name="acc_clear_log">Xóa nhật ký</string>
     <string name="acc_add_rule">Thêm quy tắc định tuyến</string>
     <string name="acc_start">Khởi động dịch vụ</string>
     <string name="acc_stop">Dừng dịch vụ</string>
+    <string name="acc_connect">Kết nối</string>
+    <string name="acc_disconnect">Ngắt kết nối</string>
     <string name="acc_back">Quay lại</string>
     <string name="acc_search">Tìm kiếm</string>
+    <string name="acc_clear_search">Xóa tìm kiếm</string>
     <string name="acc_add">Thêm cấu hình</string>
     <string name="acc_more">Tùy chọn khác</string>
     <string name="acc_selected_server">Selected</string>

V2rayNG/app/src/main/res/values-zh-rCN/strings.xml

@@ -512,13 +512,16 @@
     <string name="acc_add_asset">添加资源来源</string>
     <string name="acc_download_file">下载资源文件</string>
     <string name="acc_qr_code">二维码</string>
-    <string name="acc_copy_log">复制日志</string>
+    <string name="acc_copy_log">将日志复制到剪贴板</string>
     <string name="acc_clear_log">清除日志</string>
     <string name="acc_add_rule">添加路由规则</string>
     <string name="acc_start">启动服务</string>
     <string name="acc_stop">停止服务</string>
+    <string name="acc_connect">连接</string>
+    <string name="acc_disconnect">断开连接</string>
     <string name="acc_back">返回</string>
     <string name="acc_search">搜索</string>
+    <string name="acc_clear_search">清除搜索</string>
     <string name="acc_add">添加配置</string>
     <string name="acc_more">更多选项</string>
     <string name="acc_selected_server">Selected</string>

V2rayNG/app/src/main/res/values-zh-rTW/strings.xml

@@ -512,13 +512,16 @@
     <string name="acc_add_asset">新增資源來源</string>
     <string name="acc_download_file">下載資源檔案</string>
     <string name="acc_qr_code">QR Code</string>
-    <string name="acc_copy_log">複製日誌</string>
+    <string name="acc_copy_log">將日誌複製到剪貼簿</string>
     <string name="acc_clear_log">清除日誌</string>
     <string name="acc_add_rule">新增路由規則</string>
     <string name="acc_start">啟動服務</string>
     <string name="acc_stop">停止服務</string>
+    <string name="acc_connect">連線</string>
+    <string name="acc_disconnect">中斷連線</string>
     <string name="acc_back">返回</string>
     <string name="acc_search">搜尋</string>
+    <string name="acc_clear_search">清除搜尋</string>
     <string name="acc_add">新增設定</string>
     <string name="acc_more">更多選項</string>
     <string name="acc_selected_server">Selected</string>

V2rayNG/app/src/main/res/values/strings.xml

@@ -512,13 +512,16 @@
     <string name="acc_add_asset">Add asset source</string>
     <string name="acc_download_file">Download asset files</string>
     <string name="acc_qr_code">QR code</string>
-    <string name="acc_copy_log">Copy log</string>
+    <string name="acc_copy_log">Copy log to clipboard</string>
     <string name="acc_clear_log">Clear log</string>
     <string name="acc_add_rule">Add routing rule</string>
     <string name="acc_start">Start service</string>
     <string name="acc_stop">Stop service</string>
+    <string name="acc_connect">Connect</string>
+    <string name="acc_disconnect">Disconnect</string>
     <string name="acc_back">Back</string>
     <string name="acc_search">Search</string>
+    <string name="acc_clear_search">Clear search</string>
     <string name="acc_add">Add configuration</string>
     <string name="acc_more">More options</string>
     <string name="acc_selected_server">Selected</string>