mirror of
https://github.com/bitfireAT/davx5-ose.git
synced 2025-12-23 23:17:50 -05:00
Update Compose BOM and use PrimaryTabRow (#1772)
- Update Compose BOM version to 2025.10.01 - Replace `TabRow` with `PrimaryTabRow`
This commit is contained in:
@@ -2,7 +2,6 @@
|
||||
* Copyright © All Contributors. See LICENSE and AUTHORS in the root directory for details.
|
||||
*/
|
||||
|
||||
|
||||
import android.Manifest
|
||||
import android.accounts.Account
|
||||
import android.content.Intent
|
||||
@@ -29,7 +28,6 @@ import androidx.compose.material.icons.filled.DriveFileRenameOutline
|
||||
import androidx.compose.material.icons.filled.Group
|
||||
import androidx.compose.material.icons.filled.Link
|
||||
import androidx.compose.material.icons.filled.MoreVert
|
||||
import androidx.compose.material.icons.filled.Person
|
||||
import androidx.compose.material.icons.filled.Settings
|
||||
import androidx.compose.material.icons.filled.Sync
|
||||
import androidx.compose.material.icons.filled.SyncProblem
|
||||
@@ -46,13 +44,13 @@ import androidx.compose.material3.IconButton
|
||||
import androidx.compose.material3.LocalMinimumInteractiveComponentSize
|
||||
import androidx.compose.material3.MaterialTheme
|
||||
import androidx.compose.material3.OutlinedButton
|
||||
import androidx.compose.material3.PrimaryTabRow
|
||||
import androidx.compose.material3.Scaffold
|
||||
import androidx.compose.material3.SnackbarDuration
|
||||
import androidx.compose.material3.SnackbarHost
|
||||
import androidx.compose.material3.SnackbarHostState
|
||||
import androidx.compose.material3.SnackbarResult
|
||||
import androidx.compose.material3.Tab
|
||||
import androidx.compose.material3.TabRow
|
||||
import androidx.compose.material3.Text
|
||||
import androidx.compose.material3.TopAppBar
|
||||
import androidx.compose.material3.pulltorefresh.PullToRefreshBox
|
||||
@@ -90,7 +88,6 @@ import at.bitfire.davdroid.ui.account.CollectionsList
|
||||
import at.bitfire.davdroid.ui.account.RenameAccountDialog
|
||||
import at.bitfire.davdroid.ui.composable.ActionCard
|
||||
import at.bitfire.davdroid.ui.composable.ProgressBar
|
||||
import at.bitfire.davdroid.ui.icon.CalendarImport
|
||||
import at.bitfire.ical4android.TaskProvider
|
||||
import com.google.accompanist.permissions.ExperimentalPermissionsApi
|
||||
import com.google.accompanist.permissions.rememberMultiplePermissionsState
|
||||
@@ -340,7 +337,7 @@ fun AccountScreen(
|
||||
AnimatedContent(
|
||||
targetState = currentPageScrollState?.canScrollBackward != true
|
||||
) { showIcon ->
|
||||
TabRow(selectedTabIndex = idxCurrentPage) {
|
||||
PrimaryTabRow(selectedTabIndex = idxCurrentPage) {
|
||||
if (idxCalDav != null)
|
||||
AccountScreen_Tab(
|
||||
selected = idxCurrentPage == idxCalDav,
|
||||
|
||||
@@ -22,7 +22,7 @@ bitfire-cert4android = "41009d48ed"
|
||||
bitfire-dav4jvm = "f11523619b"
|
||||
bitfire-synctools = "1a7f70b1a0"
|
||||
compose-accompanist = "0.37.3"
|
||||
compose-bom = "2025.10.00"
|
||||
compose-bom = "2025.10.01"
|
||||
dnsjava = "3.6.3"
|
||||
glance = "1.1.1"
|
||||
guava = "33.5.0-android"
|
||||
|
||||
Reference in New Issue
Block a user