Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
36 changes: 35 additions & 1 deletion V2rayNG/app/src/main/java/com/v2ray/ang/ui/main/MainBottomBar.kt
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,15 @@ import androidx.compose.material3.MaterialTheme
import androidx.compose.material3.Surface
import androidx.compose.material3.Text
import androidx.compose.runtime.Composable
import androidx.compose.runtime.LaunchedEffect
import androidx.compose.runtime.getValue
import androidx.compose.runtime.mutableStateOf
import androidx.compose.runtime.remember
import androidx.compose.runtime.setValue
import androidx.compose.ui.Alignment
import androidx.compose.ui.Modifier
import androidx.compose.ui.graphics.Color
import androidx.compose.ui.platform.LocalContext
import androidx.compose.ui.res.painterResource
import androidx.compose.ui.res.stringResource
import androidx.compose.ui.unit.dp
Expand All @@ -31,6 +37,8 @@ import com.v2ray.ang.ui.compose.AppDivider
import com.v2ray.ang.ui.compose.colorFabActive
import com.v2ray.ang.ui.compose.colorFabInactiveDark
import com.v2ray.ang.ui.compose.colorFabInactiveLight
import android.view.accessibility.AccessibilityEvent
import android.view.accessibility.AccessibilityManager

@Composable
fun MainBottomBar(
Expand All @@ -39,6 +47,32 @@ fun MainBottomBar(
isDarkTheme: Boolean,
onAction: (MainAction) -> Unit
) {
val context = LocalContext.current
var lastAnnouncedText by remember { mutableStateOf("") }
var isInitialLoad by remember { mutableStateOf(true) }

LaunchedEffect(displayText) {
if (isInitialLoad) {
isInitialLoad = false
return@LaunchedEffect
}

if (displayText.isNotEmpty() && displayText != lastAnnouncedText) {
lastAnnouncedText = displayText
try {
val am = context.getSystemService(android.content.Context.ACCESSIBILITY_SERVICE) as AccessibilityManager
if (am.isEnabled) {
val event = AccessibilityEvent.obtain(AccessibilityEvent.TYPE_ANNOUNCEMENT)
event.text.add(displayText)
am.sendAccessibilityEvent(event)
event.recycle()
}
} catch (e: Exception) {
// ignore
}
}
}

Box(modifier = Modifier.fillMaxWidth()) {
Column(modifier = Modifier.fillMaxWidth()) {
AppDivider()
Expand Down Expand Up @@ -84,4 +118,4 @@ fun MainBottomBar(
)
}
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@ import androidx.compose.ui.Alignment
import androidx.compose.ui.Modifier
import androidx.compose.ui.draw.clip
import androidx.compose.ui.res.painterResource
import androidx.compose.ui.res.stringResource
import androidx.compose.ui.text.font.FontWeight
import androidx.compose.ui.text.style.LineBreak
import androidx.compose.ui.text.style.TextOverflow
Expand Down Expand Up @@ -351,12 +352,12 @@ fun ServerListItem(
Text(remarks, Modifier.weight(1f), style = MaterialTheme.typography.bodyLarge.copy(lineBreak = LineBreak.Paragraph), maxLines = 2, overflow = TextOverflow.Ellipsis)
if (doubleColumnDisplay) {
IconButton(onClick = onMore, Modifier.size(36.dp)) {
Icon(painterResource(R.drawable.ic_more_vert_24dp), null, Modifier.size(24.dp))
Icon(painterResource(R.drawable.ic_more_vert_24dp), stringResource(R.string.acc_more), Modifier.size(24.dp))
}
} else {
IconButton(onClick = onShare, Modifier.size(36.dp)) { Icon(painterResource(R.drawable.ic_share_24dp), null, Modifier.size(24.dp)) }
IconButton(onClick = onEdit, Modifier.size(36.dp)) { Icon(painterResource(R.drawable.ic_edit_24dp), null, Modifier.size(24.dp)) }
IconButton(onClick = onRemove, Modifier.size(36.dp)) { Icon(painterResource(R.drawable.ic_delete_24dp), null, Modifier.size(24.dp)) }
IconButton(onClick = onShare, Modifier.size(36.dp)) { Icon(painterResource(R.drawable.ic_share_24dp), stringResource(R.string.acc_share_server), Modifier.size(24.dp)) }
IconButton(onClick = onEdit, Modifier.size(36.dp)) { Icon(painterResource(R.drawable.ic_edit_24dp), stringResource(R.string.acc_edit), Modifier.size(24.dp)) }
IconButton(onClick = onRemove, Modifier.size(36.dp)) { Icon(painterResource(R.drawable.ic_delete_24dp), stringResource(R.string.acc_delete), Modifier.size(24.dp)) }
}
}
Spacer(modifier = Modifier.height(6.dp))
Expand Down Expand Up @@ -414,4 +415,4 @@ internal suspend fun PagerState.navigateToPageOptimized(
} else {
scrollToPage(target)
}
}
}
1 change: 1 addition & 0 deletions V2rayNG/app/src/main/res/values-fa/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -516,6 +516,7 @@
<string name="acc_search">جستجو</string>
<string name="acc_add">افزودن کانفیگ</string>
<string name="acc_more">گزینه‌های بیشتر</string>
<string name="acc_share_server">اشتراک‌گذاری</string>
<string name="acc_share_subscription">اشتراک‌گذاری لینک اشتراک</string>
<string name="acc_share_log">اشتراک‌گذاری گزارش</string>
<string name="acc_remove">حذف عضو زنجیره پروکسی</string>
Expand Down
1 change: 1 addition & 0 deletions V2rayNG/app/src/main/res/values/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -532,6 +532,7 @@
<string name="acc_save">Save</string>
<string name="acc_update_subscriptions">Update subscriptions</string>
<string name="acc_per_app_proxy_information">Per-app proxy information</string>
<string name="acc_share_server">Share</string>
<string name="permission_camera">Camera</string>
<string name="permission_notification">Notification</string>
<string name="permission_local_network">Local network</string>
Expand Down