Skip to content

Commit 66ea153

Browse files
committed
feat: Update system tts forwarder icon
- Added the string resource "forwarder" in multiple languages (English, Chinese, Japanese, Farsi). - Updated the navigation bar in `MainPager` to use `BottomAppBar` instead of `NavigationBar`. - Update system tts forwarder icon.
1 parent 14a8b6a commit 66ea153

File tree

9 files changed

+42
-22
lines changed

9 files changed

+42
-22
lines changed

app/src/main/java/com/github/jing332/tts_server_android/compose/MainPager.kt

Lines changed: 32 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -3,17 +3,21 @@ package com.github.jing332.tts_server_android.compose
33
import androidx.compose.foundation.ExperimentalFoundationApi
44
import androidx.compose.foundation.layout.ExperimentalLayoutApi
55
import androidx.compose.foundation.layout.fillMaxSize
6+
import androidx.compose.foundation.layout.fillMaxWidth
67
import androidx.compose.foundation.layout.padding
78
import androidx.compose.foundation.pager.HorizontalPager
89
import androidx.compose.foundation.pager.rememberPagerState
9-
import androidx.compose.material3.NavigationBar
10+
import androidx.compose.material3.BottomAppBar
11+
import androidx.compose.material3.BottomAppBarDefaults
12+
import androidx.compose.material3.ExperimentalMaterial3Api
1013
import androidx.compose.material3.NavigationBarDefaults
1114
import androidx.compose.material3.NavigationBarItem
1215
import androidx.compose.material3.Scaffold
1316
import androidx.compose.material3.Text
1417
import androidx.compose.runtime.Composable
1518
import androidx.compose.runtime.rememberCoroutineScope
1619
import androidx.compose.ui.Modifier
20+
import androidx.compose.ui.input.nestedscroll.nestedScroll
1721
import androidx.compose.ui.res.stringResource
1822
import com.github.jing332.compose.widgets.InitSystemNavigation
1923
import com.github.jing332.tts_server_android.compose.forwarder.systts.SystemTtsForwarderScreen
@@ -23,37 +27,46 @@ import com.github.jing332.tts_server_android.compose.systts.TtsLogScreen
2327
import com.github.jing332.tts_server_android.compose.systts.list.ListManagerScreen
2428
import kotlinx.coroutines.launch
2529

26-
@OptIn(ExperimentalFoundationApi::class, ExperimentalLayoutApi::class)
30+
@OptIn(
31+
ExperimentalFoundationApi::class, ExperimentalLayoutApi::class,
32+
ExperimentalMaterial3Api::class
33+
)
2734
@Composable
2835
fun MainPager(sharedVM: SharedViewModel) {
2936
val pagerState = rememberPagerState { PagerDestination.routes.size }
3037
val scope = rememberCoroutineScope()
3138

3239
MigrationTips()
40+
val scrollBehavior = BottomAppBarDefaults.exitAlwaysScrollBehavior()
3341

3442
Scaffold(
43+
modifier = Modifier.nestedScroll(scrollBehavior.nestedScrollConnection),
3544
bottomBar = {
3645
val containerColor = NavigationBarDefaults.containerColor
3746
InitSystemNavigation(containerColor)
38-
NavigationBar(containerColor = containerColor) {
39-
for (destination in PagerDestination.routes) {
40-
val isSelected = pagerState.currentPage == destination.index
41-
NavigationBarItem(
42-
selected = isSelected,
43-
alwaysShowLabel = false,
44-
onClick = {
45-
scope.launch {
46-
pagerState.animateScrollToPage(destination.index)
47+
BottomAppBar(
48+
modifier = Modifier.fillMaxWidth(),
49+
containerColor = containerColor,
50+
scrollBehavior = scrollBehavior,
51+
actions = {
52+
for (destination in PagerDestination.routes) {
53+
val isSelected = pagerState.currentPage == destination.index
54+
NavigationBarItem(
55+
selected = isSelected,
56+
alwaysShowLabel = false,
57+
onClick = {
58+
scope.launch {
59+
pagerState.animateScrollToPage(destination.index)
60+
}
61+
},
62+
icon = destination.icon,
63+
label = {
64+
Text(stringResource(id = destination.strId))
4765
}
48-
},
49-
icon = destination.icon,
50-
label = {
51-
Text(stringResource(id = destination.strId))
52-
}
53-
)
66+
)
67+
}
5468
}
55-
}
56-
69+
)
5770

5871
}
5972
) { paddingValues ->

app/src/main/java/com/github/jing332/tts_server_android/compose/PagerDestination.kt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ import androidx.annotation.StringRes
44
import androidx.compose.foundation.layout.size
55
import androidx.compose.material.icons.Icons
66
import androidx.compose.material.icons.automirrored.filled.TextSnippet
7-
import androidx.compose.material.icons.filled.ArrowCircleUp
87
import androidx.compose.material.icons.filled.Settings
98
import androidx.compose.material3.Icon
109
import androidx.compose.runtime.Composable
@@ -44,9 +43,10 @@ sealed class PagerDestination(
4443
)
4544
})
4645

47-
object SystemTtsForwarder: PagerDestination(2, R.string.forwarder_systts, {
46+
object SystemTtsForwarder : PagerDestination(2, R.string.forwarder, {
4847
Icon(
49-
Icons.Default.ArrowCircleUp,
48+
modifier = Modifier.size(24.dp),
49+
painter = painterResource(R.drawable.ic_app_notification),
5050
contentDescription = null
5151
)
5252
})

app/src/main/res/values-en/strings.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -468,4 +468,5 @@
468468
<string name="collapsed">已收起</string>
469469
<string name="no_new_version">无新版本</string>
470470
<string name="battery_optimization_whitelist_desc">非常重要,后台保活必要设置</string>
471+
<string name="forwarder">转发器</string>
471472
</resources>

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -472,4 +472,5 @@
472472
<string name="collapsed">已收起</string>
473473
<string name="no_new_version">无新版本</string>
474474
<string name="battery_optimization_whitelist_desc">非常重要,后台保活必要设置</string>
475+
<string name="forwarder">转发器</string>
475476
</resources>

app/src/main/res/values-ja/strings.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -465,4 +465,5 @@
465465
<string name="collapsed">已收起</string>
466466
<string name="no_new_version">无新版本</string>
467467
<string name="battery_optimization_whitelist_desc">非常重要,后台保活必要设置</string>
468+
<string name="forwarder">转发器</string>
468469
</resources>

app/src/main/res/values-zh-rHK/strings.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -465,4 +465,5 @@
465465
<string name="collapsed">已收起</string>
466466
<string name="no_new_version">无新版本</string>
467467
<string name="battery_optimization_whitelist_desc">非常重要,后台保活必要设置</string>
468+
<string name="forwarder">转发器</string>
468469
</resources>

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -457,4 +457,5 @@
457457
<string name="collapsed">已收起</string>
458458
<string name="no_new_version">无新版本</string>
459459
<string name="battery_optimization_whitelist_desc">非常重要,后台保活必要设置</string>
460+
<string name="forwarder">转发器</string>
460461
</resources>

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -463,4 +463,5 @@
463463
<string name="collapsed">已收起</string>
464464
<string name="no_new_version">无新版本</string>
465465
<string name="battery_optimization_whitelist_desc">非常重要,后台保活必要设置</string>
466+
<string name="forwarder">转发器</string>
466467
</resources>

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -498,4 +498,5 @@
498498
<string name="collapsed">已收起</string>
499499
<string name="no_new_version">无新版本</string>
500500
<string name="battery_optimization_whitelist_desc">非常重要,后台保活必要设置</string>
501+
<string name="forwarder">转发器</string>
501502
</resources>

0 commit comments

Comments
 (0)