Skip to content

Commit 8cedfb8

Browse files
author
wangzhengqi
committed
update libs version
1 parent c1cfbd6 commit 8cedfb8

File tree

7 files changed

+49
-47
lines changed

7 files changed

+49
-47
lines changed

‎app/src/main/java/com/wzq/jd/compose/app/page/categories/CategoryScreen.kt‎

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
package com.wzq.jd.compose.app.page.categories
22

3-
import androidx.compose.foundation.ExperimentalFoundationApi
43
import androidx.compose.foundation.background
54
import androidx.compose.foundation.layout.Box
65
import androidx.compose.foundation.layout.Column
@@ -11,11 +10,11 @@ import androidx.compose.foundation.lazy.items
1110
import androidx.compose.foundation.pager.HorizontalPager
1211
import androidx.compose.foundation.pager.rememberPagerState
1312
import androidx.compose.material.icons.Icons
14-
import androidx.compose.material.icons.filled.ArrowBack
13+
import androidx.compose.material.icons.automirrored.filled.ArrowBack
1514
import androidx.compose.material3.CenterAlignedTopAppBar
1615
import androidx.compose.material3.CircularProgressIndicator
17-
import androidx.compose.material3.Divider
1816
import androidx.compose.material3.ExperimentalMaterial3Api
17+
import androidx.compose.material3.HorizontalDivider
1918
import androidx.compose.material3.Icon
2019
import androidx.compose.material3.IconButton
2120
import androidx.compose.material3.MaterialTheme
@@ -34,15 +33,15 @@ import androidx.compose.ui.Modifier
3433
import androidx.compose.ui.graphics.Color
3534
import androidx.compose.ui.unit.dp
3635
import com.wzq.jd.compose.app.page.ErrorScreen
37-
import com.wzq.jd.compose.app.page.route.NavActions
3836
import com.wzq.jd.compose.app.page.home.ArticleItemPage
37+
import com.wzq.jd.compose.app.page.route.NavActions
3938
import kotlinx.coroutines.launch
4039

4140
/**
4241
* create by wzq on 2023/12/11
4342
*
4443
*/
45-
@OptIn(ExperimentalMaterial3Api::class, ExperimentalFoundationApi::class)
44+
@OptIn(ExperimentalMaterial3Api::class)
4645
@Composable
4746
fun CategoryScreen(
4847
navActions: NavActions, viewModel: CategoriesViewModel
@@ -77,7 +76,7 @@ fun CategoryScreen(
7776
},
7877
navigationIcon = {
7978
IconButton(onClick = { navActions.goBack() }) {
80-
Icon(Icons.Default.ArrowBack, null)
79+
Icon(Icons.AutoMirrored.Filled.ArrowBack, null)
8180
}
8281
},
8382
colors = TopAppBarDefaults.centerAlignedTopAppBarColors(containerColor = MaterialTheme.colorScheme.primaryContainer)
@@ -97,9 +96,9 @@ fun CategoryScreen(
9796
}
9897

9998
}
100-
Divider(thickness = 8.dp, color = Color.Transparent)
99+
HorizontalDivider(thickness = 8.dp, color = Color.Transparent)
101100
HorizontalPager(
102-
state = pagerState, beyondBoundsPageCount = 3
101+
state = pagerState, beyondViewportPageCount = 3,
103102
) { page ->
104103
val articleList = viewModel.pagerData[page]
105104
if (articleList.isNullOrEmpty()) {

‎app/src/main/java/com/wzq/jd/compose/app/page/home/HomeIndexPage.kt‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ import androidx.compose.foundation.layout.fillMaxWidth
55
import androidx.compose.foundation.layout.padding
66
import androidx.compose.foundation.lazy.LazyColumn
77
import androidx.compose.material3.Card
8-
import androidx.compose.material3.ExperimentalMaterial3Api
98
import androidx.compose.material3.MaterialTheme
109
import androidx.compose.material3.Text
1110
import androidx.compose.runtime.Composable
@@ -41,7 +40,6 @@ fun HomeIndexPage(
4140

4241
}
4342

44-
@OptIn(ExperimentalMaterial3Api::class)
4543
@Composable
4644
fun ArticleItemPage(itemData: ArticleItem, onItemClick: (String) -> Unit) {
4745
Card(

‎app/src/main/java/com/wzq/jd/compose/app/page/home/HomeProjectPage.kt‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@ import androidx.compose.foundation.lazy.staggeredgrid.LazyVerticalStaggeredGrid
1212
import androidx.compose.foundation.lazy.staggeredgrid.StaggeredGridCells
1313
import androidx.compose.material3.Card
1414
import androidx.compose.material3.CircularProgressIndicator
15-
import androidx.compose.material3.ExperimentalMaterial3Api
1615
import androidx.compose.material3.MaterialTheme
1716
import androidx.compose.material3.Text
1817
import androidx.compose.runtime.Composable
@@ -55,7 +54,6 @@ fun HomeProjectPage(
5554
})
5655
}
5756

58-
@OptIn(ExperimentalMaterial3Api::class)
5957
@Composable
6058
fun ProjectItem(item: ArticleItem, onItemClick: () -> Unit) {
6159
Card(modifier = Modifier.fillMaxWidth(), onClick = onItemClick) {

‎app/src/main/java/com/wzq/jd/compose/app/page/home/HomeScreen.kt‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,13 @@
11
package com.wzq.jd.compose.app.page.home
22

3-
import androidx.compose.foundation.ExperimentalFoundationApi
43
import androidx.compose.foundation.layout.fillMaxSize
54
import androidx.compose.foundation.layout.padding
65
import androidx.compose.foundation.pager.HorizontalPager
76
import androidx.compose.foundation.pager.rememberPagerState
87
import androidx.compose.material.icons.Icons
8+
import androidx.compose.material.icons.automirrored.filled.List
99
import androidx.compose.material.icons.filled.AccountCircle
1010
import androidx.compose.material.icons.filled.Home
11-
import androidx.compose.material.icons.filled.List
1211
import androidx.compose.material.icons.filled.Search
1312
import androidx.compose.material.icons.filled.Settings
1413
import androidx.compose.material.icons.filled.ShoppingCart
@@ -35,7 +34,6 @@ import kotlinx.coroutines.launch
3534
* create by wzq on 2023/11/24
3635
*
3736
*/
38-
@OptIn(ExperimentalFoundationApi::class)
3937
@Composable
4038
fun HomeScreen(viewModel: HomeViewModel, navActions: NavActions) {
4139
val pagerState = rememberPagerState(0) { 4 }
@@ -64,7 +62,7 @@ fun HomeScreen(viewModel: HomeViewModel, navActions: NavActions) {
6462
state = pagerState, modifier = Modifier
6563
.padding(paddingValues)
6664
.fillMaxSize(),
67-
beyondBoundsPageCount = pagerState.pageCount,
65+
beyondViewportPageCount = pagerState.pageCount,
6866
userScrollEnabled = false
6967
) { currentPagerNum ->
7068
when (currentPagerNum) {
@@ -95,7 +93,7 @@ fun HomeBottomBar(selectedIndex: Int, onItemClick: (Int) -> Unit) {
9593
arrayOf(
9694
Icons.Default.Home,
9795
Icons.Default.ShoppingCart,
98-
Icons.Default.List,
96+
Icons.AutoMirrored.Filled.List,
9997
Icons.Default.AccountCircle
10098
).forEachIndexed { index, icon ->
10199
NavigationBarItem(

‎app/src/main/java/com/wzq/jd/compose/app/page/search/SearchPageBar.kt‎

Lines changed: 31 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -6,17 +6,17 @@ import androidx.compose.foundation.lazy.LazyColumn
66
import androidx.compose.foundation.lazy.items
77
import androidx.compose.foundation.text.ClickableText
88
import androidx.compose.material.icons.Icons
9-
import androidx.compose.material.icons.filled.ArrowBack
9+
import androidx.compose.material.icons.automirrored.filled.ArrowBack
1010
import androidx.compose.material3.ExperimentalMaterial3Api
1111
import androidx.compose.material3.Icon
1212
import androidx.compose.material3.IconButton
1313
import androidx.compose.material3.SearchBar
14+
import androidx.compose.material3.SearchBarDefaults
1415
import androidx.compose.runtime.Composable
1516
import androidx.compose.runtime.derivedStateOf
1617
import androidx.compose.runtime.getValue
1718
import androidx.compose.runtime.mutableStateOf
1819
import androidx.compose.runtime.remember
19-
import androidx.compose.ui.ExperimentalComposeUiApi
2020
import androidx.compose.ui.Modifier
2121
import androidx.compose.ui.platform.LocalSoftwareKeyboardController
2222
import androidx.compose.ui.text.AnnotatedString
@@ -28,7 +28,7 @@ import androidx.compose.ui.unit.dp
2828
*/
2929

3030
@Composable
31-
@OptIn(ExperimentalMaterial3Api::class, ExperimentalComposeUiApi::class)
31+
@OptIn(ExperimentalMaterial3Api::class)
3232
fun SearchPageBar(
3333
viewModel: SearchViewModel, onBackPressed: () -> Unit,
3434
) {
@@ -40,32 +40,39 @@ fun SearchPageBar(
4040
derivedStateOf { if (isActive.value) 0.dp else 16.dp }
4141
}
4242
SearchBar(
43-
query = viewModel.keywords.value,
44-
onQueryChange = {
45-
viewModel.setKeyWords(it)
46-
isActive.value = it.isNotEmpty()
47-
},
48-
onSearch = {
49-
viewModel.searchResult(it)
50-
isActive.value = false
51-
},
52-
active = isActive.value, onActiveChange = {},
53-
leadingIcon = {
54-
IconButton(onClick = {
55-
if (isActive.value) {
56-
isActive.value = false
57-
} else {
58-
onBackPressed()
59-
}
60-
}) {
61-
Icon(Icons.Default.ArrowBack, contentDescription = null)
62-
}
63-
},
6443
modifier = Modifier
6544
.padding(
6645
bottom = paddingValues / 2, start = paddingValues, end = paddingValues
6746
)
6847
.fillMaxWidth(),
48+
inputField = {
49+
SearchBarDefaults.InputField(
50+
query = viewModel.keywords.value,
51+
onQueryChange = {
52+
viewModel.setKeyWords(it)
53+
isActive.value = it.isNotEmpty()
54+
},
55+
onSearch = {
56+
viewModel.searchResult(it)
57+
isActive.value = false
58+
},
59+
expanded = isActive.value,
60+
onExpandedChange = {},
61+
leadingIcon = {
62+
IconButton(onClick = {
63+
if (isActive.value) {
64+
isActive.value = false
65+
} else {
66+
onBackPressed()
67+
}
68+
}) {
69+
Icon(Icons.AutoMirrored.Filled.ArrowBack, contentDescription = null)
70+
}
71+
},
72+
)
73+
},
74+
expanded = isActive.value,
75+
onExpandedChange = {},
6976
) {
7077
LazyColumn(content = {
7178
items(viewModel.hotWords) {

‎app/src/main/java/com/wzq/jd/compose/app/page/setting/SettingScreen.kt‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,12 @@ import androidx.compose.foundation.layout.Box
44
import androidx.compose.foundation.layout.Column
55
import androidx.compose.foundation.layout.padding
66
import androidx.compose.material.icons.Icons
7+
import androidx.compose.material.icons.automirrored.filled.ArrowBack
78
import androidx.compose.material.icons.filled.ArrowBack
89
import androidx.compose.material3.CenterAlignedTopAppBar
910
import androidx.compose.material3.Divider
1011
import androidx.compose.material3.ExperimentalMaterial3Api
12+
import androidx.compose.material3.HorizontalDivider
1113
import androidx.compose.material3.Icon
1214
import androidx.compose.material3.IconButton
1315
import androidx.compose.material3.MaterialTheme
@@ -75,7 +77,7 @@ fun SettingScreen(navActions: NavActions) {
7577
},
7678
navigationIcon = {
7779
IconButton(onClick = { navActions.goBack() }) {
78-
Icon(Icons.Default.ArrowBack, null)
80+
Icon(Icons.AutoMirrored.Filled.ArrowBack, null)
7981
}
8082
},
8183
colors = TopAppBarDefaults.centerAlignedTopAppBarColors(containerColor = MaterialTheme.colorScheme.primaryContainer)
@@ -98,10 +100,10 @@ fun SettingScreen(navActions: NavActions) {
98100
}) {
99101
Text(text = "内存缓存: ${memoryCacheSize.floatValue} M")
100102
}
101-
Divider(modifier = Modifier.padding(top = 16.dp, bottom = 16.dp))
103+
HorizontalDivider(modifier = Modifier.padding(top = 16.dp, bottom = 16.dp))
102104
Text(text = "磁盘缓存: $diskCacheSize M")
103105

104-
Divider(modifier = Modifier.padding(top = 16.dp, bottom = 16.dp))
106+
HorizontalDivider(modifier = Modifier.padding(top = 16.dp, bottom = 16.dp))
105107

106108
Text(text = "数据库条目数量: \narticle=${articleSize.intValue} | category=${categoriesSize.intValue}")
107109
}

‎app/src/main/java/com/wzq/jd/compose/app/page/web/WebScreen.kt‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ import androidx.compose.foundation.layout.fillMaxSize
1010
import androidx.compose.foundation.layout.fillMaxWidth
1111
import androidx.compose.foundation.layout.padding
1212
import androidx.compose.material.icons.Icons
13-
import androidx.compose.material.icons.filled.ArrowBack
13+
import androidx.compose.material.icons.automirrored.filled.ArrowBack
1414
import androidx.compose.material.icons.filled.Refresh
1515
import androidx.compose.material3.CenterAlignedTopAppBar
1616
import androidx.compose.material3.ExperimentalMaterial3Api
@@ -27,8 +27,8 @@ import androidx.compose.runtime.mutableStateOf
2727
import androidx.compose.runtime.remember
2828
import androidx.compose.ui.Modifier
2929
import androidx.compose.ui.viewinterop.AndroidView
30-
import com.wzq.jd.compose.app.page.route.CommonActions
3130
import com.wzq.jd.compose.app.page.ErrorScreen
31+
import com.wzq.jd.compose.app.page.route.CommonActions
3232

3333
/**
3434
* create by wzq on 2023/12/4
@@ -50,7 +50,7 @@ fun WebScreen(navActions: CommonActions, url: String?) {
5050
IconButton(onClick = {
5151
navActions.goBack()
5252
}) {
53-
Icon(Icons.Default.ArrowBack, null)
53+
Icon(Icons.AutoMirrored.Filled.ArrowBack, null)
5454

5555
}
5656
},

0 commit comments

Comments
 (0)