Replaced Webcal tab icon in collections list (#1628) (2f45b705) · Commits · e / os / AccountManager

app/src/main/kotlin/at/bitfire/davdroid/ui/account/AccountScreen.kt

+3 −3

Original line number	Diff line number	Diff line
		@@ -31,7 +31,6 @@ 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
		import androidx.compose.material.icons.filled.Upcoming
		import androidx.compose.material.icons.outlined.RuleFolder
		import androidx.compose.material3.AlertDialog
		import androidx.compose.material3.Button
		@@ -89,6 +88,7 @@ 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
		@@ -336,7 +336,7 @@ fun AccountScreen(
		else -> null
		}
		AnimatedContent(
		targetState = currentPageScrollState?.canScrollBackward == false
		targetState = currentPageScrollState?.canScrollBackward != true
		) { showIcon ->
		TabRow(selectedTabIndex = idxCurrentPage) {
		if (idxCalDav != null)
		@@ -371,7 +371,7 @@ fun AccountScreen(
		AccountScreen_Tab(
		selected = idxCurrentPage == idxWebcal,
		showIcon = showIcon,
		icon = Icons.Default.Upcoming,
		icon = Icons.Default.CalendarImport,
		text = stringResource(R.string.account_webcal),
		animatedVisibilityScope = this@AnimatedContent,
		sharedTransitionScope = this@SharedTransitionLayout,

app/src/main/kotlin/at/bitfire/davdroid/ui/icon/CalendarImport.kt

0 → 100644

+67 −0

Original line number	Diff line number	Diff line
		/*
		* Copyright © All Contributors. See LICENSE and AUTHORS in the root directory for details.
		*/

		package at.bitfire.davdroid.ui.icon

		import androidx.compose.material.icons.Icons
		import androidx.compose.ui.graphics.Color
		import androidx.compose.ui.graphics.SolidColor
		import androidx.compose.ui.graphics.vector.ImageVector
		import androidx.compose.ui.graphics.vector.path
		import androidx.compose.ui.unit.dp

		val Icons.Filled.CalendarImport: ImageVector
		get() {
		if (_CalendarImport != null) {
		return _CalendarImport!!
		}
		_CalendarImport = ImageVector.Builder(
		name = "Filled.CalendarImport",
		defaultWidth = 24.dp,
		defaultHeight = 24.dp,
		viewportWidth = 24f,
		viewportHeight = 24f
		).apply {
		path(fill = SolidColor(Color.Black)) {
		moveTo(12f, 12f)
		lineTo(8f, 16f)
		horizontalLineTo(11f)
		verticalLineTo(22f)
		horizontalLineTo(13f)
		verticalLineTo(16f)
		horizontalLineTo(16f)
		moveTo(19f, 3f)
		horizontalLineTo(18f)
		verticalLineTo(1f)
		horizontalLineTo(16f)
		verticalLineTo(3f)
		horizontalLineTo(8f)
		verticalLineTo(1f)
		horizontalLineTo(6f)
		verticalLineTo(3f)
		horizontalLineTo(5f)
		curveTo(3.9f, 3f, 3f, 3.9f, 3f, 5f)
		verticalLineTo(19f)
		curveTo(3f, 20.11f, 3.9f, 21f, 5f, 21f)
		horizontalLineTo(9f)
		verticalLineTo(19f)
		horizontalLineTo(5f)
		verticalLineTo(8f)
		horizontalLineTo(19f)
		verticalLineTo(19f)
		horizontalLineTo(15f)
		verticalLineTo(21f)
		horizontalLineTo(19f)
		curveTo(20.11f, 21f, 21f, 20.11f, 21f, 19f)
		verticalLineTo(5f)
		curveTo(21f, 3.9f, 20.11f, 3f, 19f, 3f)
		close()
		}
		}.build()

		return _CalendarImport!!
		}

		@Suppress("ObjectPropertyName")
		private var _CalendarImport: ImageVector? = null