FazBrowse GitHub Viewer | Trending |
URL:
| Home
Tools: [Download Repo ZIP]   [Original HTTPS Page]

[Jetsnack] Update to snapshot 7033025. by nickbutcher · Pull Request #323 · android/compose-samples · GitHub

/ compose-samples Public

[Jetsnack] Update to snapshot 7033025. #323

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
nickbutcher merged 1 commit into from
Dec 15, 2020
Conversation 0 Commits 1 Checks 0 Files changed
Merged

[Jetsnack] Update to snapshot 7033025. #323

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension .gradle  (1) .kt  (10) .properties  (1) All 3 file types selected
Viewed files
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Unified
Split
Hide whitespace
Diff view
Unified
Split
Hide whitespace
        • Button.kt
        • Gradient.kt
        • Scaffold.kt
        • Snacks.kt
        • Categories.kt
        • Results.kt
        • Search.kt
        • SnackDetail.kt
        • Theme.kt
    • build.gradle
      • Dependencies.kt
16 changes: 10 additions & 6 deletions Jetsnack/app/src/main/java/com/example/jetsnack/ui/components/Button.kt
Show comments
View file
Open in desktop
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters. Learn more about bidirectional Unicode characters
Show hidden characters
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
package com.example.jetsnack.ui.components

import androidx.compose.foundation.BorderStroke
import androidx.compose.foundation.background
import androidx.compose.foundation.clickable
import androidx.compose.foundation.layout.Arrangement
import androidx.compose.foundation.layout.PaddingValues
Expand All @@ -26,13 +27,14 @@ import androidx.compose.foundation.layout.defaultMinSizeConstraints
import androidx.compose.foundation.layout.fillMaxWidth
import androidx.compose.foundation.layout.padding
import androidx.compose.foundation.shape.RoundedCornerShape
import androidx.compose.material.ButtonConstants
import androidx.compose.material.ButtonDefaults
import androidx.compose.material.MaterialTheme
import androidx.compose.material.ProvideTextStyle
import androidx.compose.runtime.Composable
import androidx.compose.ui.Alignment
import androidx.compose.ui.Modifier
import androidx.compose.ui.draw.clip
import androidx.compose.ui.graphics.Brush
import androidx.compose.ui.graphics.Color
import androidx.compose.ui.graphics.Shape
import com.example.jetsnack.ui.theme.JetsnackTheme
Expand All @@ -48,7 +50,7 @@ fun JetsnackButton(
disabledBackgroundGradient: List<Color> = JetsnackTheme.colors.interactiveSecondary,
contentColor: Color = JetsnackTheme.colors.textInteractive,
disabledContentColor: Color = JetsnackTheme.colors.textHelp,
contentPadding: PaddingValues = ButtonConstants.DefaultContentPadding,
contentPadding: PaddingValues = ButtonDefaults.ContentPadding,
content: @Composable RowScope.() -> Unit
) {
JetsnackSurface(
Expand All @@ -58,8 +60,10 @@ fun JetsnackButton(
border = border,
modifier = modifier
.clip(shape)
.horizontalGradientBackground(
colors = if (enabled) backgroundGradient else disabledBackgroundGradient
.background(
Brush.horizontalGradient(
colors = if (enabled) backgroundGradient else disabledBackgroundGradient
)
)
.clickable(
onClick = onClick,
Expand All @@ -72,8 +76,8 @@ fun JetsnackButton(
Row(
Modifier
.defaultMinSizeConstraints(
minWidth = ButtonConstants.DefaultMinWidth,
minHeight = ButtonConstants.DefaultMinHeight
minWidth = ButtonDefaults.MinWidth,
minHeight = ButtonDefaults.MinHeight
)
.fillMaxWidth()
.padding(contentPadding),
Expand Down
88 changes: 11 additions & 77 deletions Jetsnack/app/src/main/java/com/example/jetsnack/ui/components/Gradient.kt
Show comments
View file
Open in desktop
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters. Learn more about bidirectional Unicode characters
Show hidden characters
Original file line number Diff line number Diff line change
Expand Up @@ -19,76 +19,34 @@ package com.example.jetsnack.ui.components
import androidx.compose.animation.animate
import androidx.compose.foundation.background
import androidx.compose.foundation.border
import androidx.compose.runtime.getValue
import androidx.compose.runtime.mutableStateOf
import androidx.compose.runtime.remember
import androidx.compose.runtime.setValue
import androidx.compose.ui.Modifier
import androidx.compose.ui.composed
import androidx.compose.ui.draw.drawWithCache
import androidx.compose.ui.draw.drawWithContent
import androidx.compose.ui.geometry.Size
import androidx.compose.ui.graphics.BlendMode
import androidx.compose.ui.graphics.Brush
import androidx.compose.ui.graphics.Color
import androidx.compose.ui.graphics.HorizontalGradient
import androidx.compose.ui.graphics.LinearGradient
import androidx.compose.ui.graphics.Shape
import androidx.compose.ui.graphics.TileMode
import androidx.compose.ui.layout.onSizeChanged
import androidx.compose.ui.unit.Dp
import androidx.compose.ui.unit.IntSize
import androidx.compose.ui.unit.dp

fun Modifier.horizontalGradientBackground(
colors: List<Color>
) = drawWithCache {
// Use drawWithCache modifier to create and cache the gradient once size is known or changes.
val gradient = HorizontalGradient(
startX = 0.0f,
endX = size.width,
colors = colors
)
onDrawBehind {
drawRect(brush = gradient)
}
}

fun Modifier.diagonalGradientTint(
colors: List<Color>,
blendMode: BlendMode
) = gradientTint(colors, blendMode) { gradientColors, size ->
LinearGradient(
colors = gradientColors,
startX = 0f,
startY = 0f,
endX = size.width,
endY = size.height
) = drawWithContent {
drawContent()
drawRect(
brush = Brush.linearGradient(colors),
blendMode = blendMode
)
}

fun Modifier.gradientTint(
colors: List<Color>,
blendMode: BlendMode,
brushProvider: (List<Color>, Size) -> LinearGradient
) = composed {
var size by remember { mutableStateOf(Size.Zero) }
val gradient = remember(colors, size) { brushProvider(colors, size) }
drawWithContent {
drawContent()
size = this.size
drawRect(
brush = gradient,
blendMode = blendMode
)
}
}

fun Modifier.offsetGradientBackground(
colors: List<Color>,
width: Float,
offset: Float = 0f
) = background(
HorizontalGradient(
Brush.horizontalGradient(
colors,
startX = -offset,
endX = width - offset,
Expand All @@ -100,19 +58,11 @@ fun Modifier.diagonalGradientBorder(
colors: List<Color>,
borderSize: Dp = 2.dp,
shape: Shape
) = gradientBorder(
colors = colors,
borderSize = borderSize,
) = border(
width = borderSize,
brush = Brush.linearGradient(colors),
shape = shape
) { gradientColors, size ->
LinearGradient(
colors = gradientColors,
startX = 0f,
startY = 0f,
endX = size.width.toFloat(),
endY = size.height.toFloat()
)
}
)

fun Modifier.fadeInDiagonalGradientBorder(
showBorder: Boolean,
Expand All @@ -129,19 +79,3 @@ fun Modifier.fadeInDiagonalGradientBorder(
shape = shape
)
}

fun Modifier.gradientBorder(
colors: List<Color>,
borderSize: Dp = 2.dp,
shape: Shape,
brushProvider: (List<Color>, IntSize) -> LinearGradient
) = composed {
var size by remember { mutableStateOf(IntSize.Zero) }
val gradient = remember(colors, size) { brushProvider(colors, size) }
val sizeProvider = onSizeChanged { size = it }
sizeProvider then border(
width = borderSize,
brush = gradient,
shape = shape
)
}
4 changes: 2 additions & 2 deletions Jetsnack/app/src/main/java/com/example/jetsnack/ui/components/Scaffold.kt
Show comments
View file
Open in desktop
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters. Learn more about bidirectional Unicode characters
Show hidden characters
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ package com.example.jetsnack.ui.components

import androidx.compose.foundation.layout.ColumnScope
import androidx.compose.foundation.layout.PaddingValues
import androidx.compose.material.DrawerConstants
import androidx.compose.material.DrawerDefaults
import androidx.compose.material.ExperimentalMaterialApi
import androidx.compose.material.FabPosition
import androidx.compose.material.MaterialTheme
Expand Down Expand Up @@ -51,7 +51,7 @@ fun JetsnackScaffold(
isFloatingActionButtonDocked: Boolean = false,
drawerContent: @Composable (ColumnScope.() -> Unit)? = null,
drawerShape: Shape = MaterialTheme.shapes.large,
drawerElevation: Dp = DrawerConstants.DefaultElevation,
drawerElevation: Dp = DrawerDefaults.Elevation,
drawerBackgroundColor: Color = JetsnackTheme.colors.uiBackground,
drawerContentColor: Color = JetsnackTheme.colors.textSecondary,
drawerScrimColor: Color = JetsnackTheme.colors.uiBorder,
Expand Down
13 changes: 7 additions & 6 deletions Jetsnack/app/src/main/java/com/example/jetsnack/ui/components/Snacks.kt
Show comments
View file
Open in desktop
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters. Learn more about bidirectional Unicode characters
Show hidden characters
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ import androidx.compose.foundation.layout.preferredHeightIn
import androidx.compose.foundation.layout.preferredSize
import androidx.compose.foundation.layout.preferredWidth
import androidx.compose.foundation.layout.wrapContentWidth
import androidx.compose.foundation.lazy.LazyRowFor
import androidx.compose.foundation.lazy.LazyRow
import androidx.compose.foundation.rememberScrollState
import androidx.compose.foundation.shape.CircleShape
import androidx.compose.material.Icon
Expand Down Expand Up @@ -61,8 +61,8 @@ private val HighlightCardWidth = 170.dp
private val HighlightCardPadding = 16.dp

// The Cards show a gradient which spans 3 cards and scrolls with parallax.
@Composable
private val gradientWidth
@Composable
get() = with(AmbientDensity.current) {
(3 * (HighlightCardWidth + HighlightCardPadding).toPx())
}
Expand Down Expand Up @@ -144,12 +144,13 @@ private fun Snacks(
onSnackClick: (Long) -> Unit,
modifier: Modifier = Modifier
) {
LazyRowFor(
items = snacks,
LazyRow(
modifier = modifier,
contentPadding = PaddingValues(start = 12.dp, end = 12.dp)
) { snack ->
SnackItem(snack, onSnackClick)
) {
items(snacks) { snack ->
SnackItem(snack, onSnackClick)
}
}
}

Expand Down
13 changes: 8 additions & 5 deletions Jetsnack/app/src/main/java/com/example/jetsnack/ui/home/search/Categories.kt
Show comments
View file
Open in desktop
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters. Learn more about bidirectional Unicode characters
Show hidden characters
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@

package com.example.jetsnack.ui.home.search

import androidx.compose.foundation.background
import androidx.compose.foundation.clickable
import androidx.compose.foundation.layout.Column
import androidx.compose.foundation.layout.Spacer
Expand All @@ -25,14 +26,15 @@ import androidx.compose.foundation.layout.padding
import androidx.compose.foundation.layout.preferredHeight
import androidx.compose.foundation.layout.preferredHeightIn
import androidx.compose.foundation.layout.wrapContentHeight
import androidx.compose.foundation.lazy.LazyColumnForIndexed
import androidx.compose.foundation.lazy.LazyColumn
import androidx.compose.foundation.shape.RoundedCornerShape
import androidx.compose.material.MaterialTheme
import androidx.compose.material.Text
import androidx.compose.runtime.Composable
import androidx.compose.ui.Modifier
import androidx.compose.ui.draw.clip
import androidx.compose.ui.draw.shadow
import androidx.compose.ui.graphics.Brush
import androidx.compose.ui.graphics.Color
import androidx.compose.ui.layout.Layout
import androidx.compose.ui.tooling.preview.Preview
Expand All @@ -42,16 +44,17 @@ import com.example.jetsnack.model.SearchCategory
import com.example.jetsnack.model.SearchCategoryCollection
import com.example.jetsnack.ui.components.SnackImage
import com.example.jetsnack.ui.components.VerticalGrid
import com.example.jetsnack.ui.components.horizontalGradientBackground
import com.example.jetsnack.ui.theme.JetsnackTheme
import kotlin.math.max

@Composable
fun SearchCategories(
categories: List<SearchCategoryCollection>
) {
LazyColumnForIndexed(categories) { index, collection ->
SearchCategoryCollection(collection, index)
LazyColumn {
itemsIndexed(categories) { index, collection ->
SearchCategoryCollection(collection, index)
}
}
Spacer(Modifier.preferredHeight(8.dp))
}
Expand Down Expand Up @@ -104,7 +107,7 @@ private fun SearchCategory(
.aspectRatio(1.45f)
.shadow(elevation = 3.dp, shape = CategoryShape)
.clip(CategoryShape)
.horizontalGradientBackground(gradient)
.background(Brush.horizontalGradient(gradient))
.clickable { /* todo */ },
content = {
Text(
Expand Down
8 changes: 5 additions & 3 deletions Jetsnack/app/src/main/java/com/example/jetsnack/ui/home/search/Results.kt
Show comments
View file
Open in desktop
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters. Learn more about bidirectional Unicode characters
Show hidden characters
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ import androidx.compose.foundation.layout.padding
import androidx.compose.foundation.layout.preferredHeight
import androidx.compose.foundation.layout.preferredSize
import androidx.compose.foundation.layout.wrapContentSize
import androidx.compose.foundation.lazy.LazyColumnForIndexed
import androidx.compose.foundation.lazy.LazyColumn
import androidx.compose.foundation.shape.CircleShape
import androidx.compose.material.Icon
import androidx.compose.material.MaterialTheme
Expand Down Expand Up @@ -70,8 +70,10 @@ fun SearchResults(
color = JetsnackTheme.colors.textPrimary,
modifier = Modifier.padding(horizontal = 24.dp, vertical = 4.dp)
)
LazyColumnForIndexed(searchResults) { index, snack ->
SearchResult(snack, onSnackClick, index != 0)
LazyColumn {
itemsIndexed(searchResults) { index, snack ->
SearchResult(snack, onSnackClick, index != 0)
}
}
}
}
Expand Down
7 changes: 2 additions & 5 deletions Jetsnack/app/src/main/java/com/example/jetsnack/ui/home/search/Search.kt
Show comments
View file
Open in desktop
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters. Learn more about bidirectional Unicode characters
Show hidden characters
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@

package com.example.jetsnack.ui.home.search

import androidx.compose.foundation.ExperimentalFoundationApi
import androidx.compose.foundation.layout.Box
import androidx.compose.foundation.layout.Column
import androidx.compose.foundation.layout.Row
Expand Down Expand Up @@ -47,9 +46,8 @@ import androidx.compose.runtime.remember
import androidx.compose.runtime.setValue
import androidx.compose.ui.Alignment
import androidx.compose.ui.Modifier
import androidx.compose.ui.focus.ExperimentalFocus
import androidx.compose.ui.focus.isFocused
import androidx.compose.ui.focusObserver
import androidx.compose.ui.focus.onFocusChanged
import androidx.compose.ui.res.stringResource
import androidx.compose.ui.text.input.TextFieldValue
import androidx.compose.ui.tooling.preview.Preview
Expand Down Expand Up @@ -160,7 +158,6 @@ class SearchState(
}
}

@OptIn(ExperimentalFoundationApi::class, ExperimentalFocus::class)
@Composable
private fun SearchBar(
query: TextFieldValue,
Expand Down Expand Up @@ -203,7 +200,7 @@ private fun SearchBar(
onValueChange = onQueryChange,
modifier = Modifier
.weight(1f)
.focusObserver {
.onFocusChanged {
onSearchFocusChange(it.isFocused)
}
)
Expand Down
4 changes: 2 additions & 2 deletions Jetsnack/app/src/main/java/com/example/jetsnack/ui/snackdetail/SnackDetail.kt
Show comments
View file
Open in desktop
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters. Learn more about bidirectional Unicode characters
Show hidden characters
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,7 @@ import androidx.compose.runtime.mutableStateOf
import androidx.compose.runtime.remember
import androidx.compose.ui.Alignment
import androidx.compose.ui.Modifier
import androidx.compose.ui.graphics.Brush
import androidx.compose.ui.graphics.graphicsLayer
import androidx.compose.ui.layout.Layout
import androidx.compose.ui.platform.AmbientDensity
Expand All @@ -65,7 +66,6 @@ import com.example.jetsnack.ui.components.JetsnackSurface
import com.example.jetsnack.ui.components.QuantitySelector
import com.example.jetsnack.ui.components.SnackCollection
import com.example.jetsnack.ui.components.SnackImage
import com.example.jetsnack.ui.components.horizontalGradientBackground
import com.example.jetsnack.ui.theme.JetsnackTheme
import com.example.jetsnack.ui.theme.Neutral8
import com.example.jetsnack.ui.utils.formatPrice
Expand Down Expand Up @@ -110,7 +110,7 @@ private fun Header() {
modifier = Modifier
.preferredHeight(280.dp)
.fillMaxWidth()
.horizontalGradientBackground(JetsnackTheme.colors.interactivePrimary)
.background(Brush.horizontalGradient(JetsnackTheme.colors.interactivePrimary))
)
}

Expand Down
2 changes: 1 addition & 1 deletion Jetsnack/app/src/main/java/com/example/jetsnack/ui/theme/Theme.kt
Show comments
View file
Open in desktop
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters. Learn more about bidirectional Unicode characters
Show hidden characters
Original file line number Diff line number Diff line change
Expand Up @@ -102,8 +102,8 @@ fun JetsnackTheme(
}

object JetsnackTheme {
@Composable
val colors: JetsnackColors
@Composable
get() = AmbientJetsnackColors.current
}

Expand Down
2 changes: 1 addition & 1 deletion Jetsnack/build.gradle
Show comments
View file
Open in desktop
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters. Learn more about bidirectional Unicode characters
Show hidden characters
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ buildscript {
}

plugins {
id 'com.diffplug.spotless' version '5.7.0'
id 'com.diffplug.spotless' version '5.8.2'
}

subprojects {
Expand Down
Loading
Back | FazBrowse Home | New Git URL