Formatting

android · Aug 9, 2024 · d66341e · d66341e
1 parent 9f8b5e5
commit d66341e
Show file tree

Hide file tree

Showing 22 changed files with 93 additions and 102 deletions.
diff --git a/Jetsnack/app/src/main/AndroidManifest.xml b/Jetsnack/app/src/main/AndroidManifest.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
+<?xml version="1.0" encoding="utf-8"?><!--
   Copyright 2020 The Android Open Source Project
 
   Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except
@@ -27,12 +26,14 @@
 
         >
 
-        <profileable android:shell="true" tools:targetApi="q" />
+        <profileable
+            android:shell="true"
+            tools:targetApi="q" />
 
         <activity
             android:name=".ui.MainActivity"
-            android:theme="@style/Theme.Jetsnack"
             android:exported="true"
+            android:theme="@style/Theme.Jetsnack"
             android:windowSoftInputMode="adjustResize">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />

diff --git a/Jetsnack/app/src/main/java/com/example/jetsnack/model/Filter.kt b/Jetsnack/app/src/main/java/com/example/jetsnack/model/Filter.kt
@@ -32,6 +32,7 @@ class Filter(
 ) {
     val enabled = mutableStateOf(enabled)
 }
+
 val filters = listOf(
     Filter(name = "Organic"),
     Filter(name = "Gluten-free"),

diff --git a/Jetsnack/app/src/main/java/com/example/jetsnack/model/SnackbarManager.kt b/Jetsnack/app/src/main/java/com/example/jetsnack/model/SnackbarManager.kt
@@ -17,11 +17,11 @@
 package com.example.jetsnack.model
 
 import androidx.annotation.StringRes
-import java.util.UUID
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.StateFlow
 import kotlinx.coroutines.flow.asStateFlow
 import kotlinx.coroutines.flow.update
+import java.util.UUID
 
 data class Message(val id: Long, @StringRes val messageId: Int)
 

diff --git a/Jetsnack/app/src/main/java/com/example/jetsnack/ui/components/Divider.kt b/Jetsnack/app/src/main/java/com/example/jetsnack/ui/components/Divider.kt
@@ -18,7 +18,6 @@ package com.example.jetsnack.ui.components
 
 import android.content.res.Configuration
 import androidx.compose.foundation.layout.Box
-import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.size
 import androidx.compose.material3.HorizontalDivider
 import androidx.compose.runtime.Composable

diff --git a/Jetsnack/app/src/main/java/com/example/jetsnack/ui/components/Snackbar.kt b/Jetsnack/app/src/main/java/com/example/jetsnack/ui/components/Snackbar.kt
@@ -23,8 +23,6 @@ import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.graphics.Shape
-import androidx.compose.ui.unit.Dp
-import androidx.compose.ui.unit.dp
 import com.example.jetsnack.ui.theme.JetsnackTheme
 
 /**

diff --git a/Jetsnack/app/src/main/java/com/example/jetsnack/ui/components/Snacks.kt b/Jetsnack/app/src/main/java/com/example/jetsnack/ui/components/Snacks.kt
@@ -29,7 +29,6 @@ import androidx.compose.animation.SharedTransitionScope
 import androidx.compose.animation.core.animateDp
 import androidx.compose.animation.fadeIn
 import androidx.compose.animation.fadeOut
-import androidx.compose.foundation.Image
 import androidx.compose.foundation.border
 import androidx.compose.foundation.clickable
 import androidx.compose.foundation.layout.Arrangement
@@ -51,13 +50,13 @@ import androidx.compose.foundation.lazy.itemsIndexed
 import androidx.compose.foundation.lazy.rememberLazyListState
 import androidx.compose.foundation.shape.CircleShape
 import androidx.compose.foundation.shape.RoundedCornerShape
+import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.automirrored.outlined.ArrowBack
+import androidx.compose.material.icons.automirrored.outlined.ArrowForward
 import androidx.compose.material3.Icon
 import androidx.compose.material3.IconButton
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.Text
-import androidx.compose.material.icons.Icons
-import androidx.compose.material.icons.automirrored.outlined.ArrowBack
-import androidx.compose.material.icons.automirrored.outlined.ArrowForward
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.CompositionLocalProvider
 import androidx.compose.runtime.getValue

diff --git a/Jetsnack/app/src/main/java/com/example/jetsnack/ui/components/Surface.kt b/Jetsnack/app/src/main/java/com/example/jetsnack/ui/components/Surface.kt
@@ -51,7 +51,8 @@ fun JetsnackSurface(
     content: @Composable () -> Unit
 ) {
     Box(
-        modifier = modifier.shadow(elevation = elevation, shape = shape, clip = false)
+        modifier = modifier
+            .shadow(elevation = elevation, shape = shape, clip = false)
             .zIndex(elevation.value)
             .then(if (border != null) Modifier.border(border, shape) else Modifier)
             .background(
@@ -67,8 +68,8 @@ fun JetsnackSurface(
 @Composable
 private fun getBackgroundColorForElevation(color: Color, elevation: Dp): Color {
     return if (elevation > 0.dp // && https://issuetracker.google.com/issues/161429530
-        // JetsnackTheme.colors.isDark //&&
-        // color == JetsnackTheme.colors.uiBackground
+    // JetsnackTheme.colors.isDark //&&
+    // color == JetsnackTheme.colors.uiBackground
     ) {
         color.withElevation(elevation)
     } else {

diff --git a/Jetsnack/app/src/main/java/com/example/jetsnack/ui/home/DestinationBar.kt b/Jetsnack/app/src/main/java/com/example/jetsnack/ui/home/DestinationBar.kt
@@ -25,18 +25,14 @@ import androidx.compose.animation.slideOutVertically
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.Row
 import androidx.compose.foundation.layout.WindowInsets
-import androidx.compose.foundation.layout.WindowInsetsSides.Companion.Horizontal
-import androidx.compose.foundation.layout.only
-import androidx.compose.foundation.layout.systemBars
-import androidx.compose.foundation.layout.windowInsetsPadding
+import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.outlined.ExpandMore
+import androidx.compose.material3.ExperimentalMaterial3Api
 import androidx.compose.material3.Icon
 import androidx.compose.material3.IconButton
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.Text
 import androidx.compose.material3.TopAppBar
-import androidx.compose.material.icons.Icons
-import androidx.compose.material.icons.outlined.ExpandMore
-import androidx.compose.material3.ExperimentalMaterial3Api
 import androidx.compose.material3.TopAppBarDefaults
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Alignment
@@ -53,7 +49,6 @@ import com.example.jetsnack.ui.components.JetsnackPreviewWrapper
 import com.example.jetsnack.ui.snackdetail.spatialExpressiveSpring
 import com.example.jetsnack.ui.theme.AlphaNearOpaque
 import com.example.jetsnack.ui.theme.JetsnackTheme
-import java.lang.IllegalStateException
 
 @OptIn(ExperimentalMaterial3Api::class)
 @Composable
@@ -102,7 +97,8 @@ fun DestinationBar(modifier: Modifier = Modifier) {
                     },
                     colors = TopAppBarDefaults.topAppBarColors().copy(
                         containerColor = JetsnackTheme.colors.uiBackground.copy(alpha = AlphaNearOpaque),
-                        titleContentColor = JetsnackTheme.colors.textSecondary ),
+                        titleContentColor = JetsnackTheme.colors.textSecondary
+                    ),
                 )
                 JetsnackDivider()
             }

diff --git a/Jetsnack/app/src/main/java/com/example/jetsnack/ui/home/Feed.kt b/Jetsnack/app/src/main/java/com/example/jetsnack/ui/home/Feed.kt
@@ -23,19 +23,14 @@ import androidx.compose.animation.AnimatedVisibility
 import androidx.compose.animation.ExperimentalSharedTransitionApi
 import androidx.compose.animation.SharedTransitionLayout
 import androidx.compose.animation.SharedTransitionScope
-import androidx.compose.animation.core.tween
 import androidx.compose.animation.fadeIn
 import androidx.compose.animation.fadeOut
 import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.Spacer
 import androidx.compose.foundation.layout.WindowInsets
 import androidx.compose.foundation.layout.add
 import androidx.compose.foundation.layout.fillMaxSize
-import androidx.compose.foundation.layout.safeContent
-import androidx.compose.foundation.layout.safeDrawing
 import androidx.compose.foundation.layout.statusBars
-import androidx.compose.foundation.layout.systemBars
-import androidx.compose.foundation.layout.windowInsetsBottomHeight
 import androidx.compose.foundation.layout.windowInsetsTopHeight
 import androidx.compose.foundation.lazy.LazyColumn
 import androidx.compose.foundation.lazy.itemsIndexed
@@ -84,14 +79,16 @@ private fun Feed(
         }
         SharedTransitionLayout {
             Box {
-                SnackCollectionList(snackCollections,
+                SnackCollectionList(
+                    snackCollections,
                     filters,
                     filtersVisible = filtersVisible,
                     onFiltersSelected = {
                         filtersVisible = true
                     },
                     sharedTransitionScope = this@SharedTransitionLayout,
-                    onSnackClick = onSnackClick)
+                    onSnackClick = onSnackClick
+                )
                 DestinationBar()
                 AnimatedVisibility(filtersVisible, enter = fadeIn(), exit = fadeOut()) {
                     FilterScreen(
@@ -122,10 +119,12 @@ private fun SnackCollectionList(
                     WindowInsets.statusBars.add(WindowInsets(top = 56.dp))
                 )
             )
-            FilterBar(filters,
+            FilterBar(
+                filters,
                 sharedTransitionScope = sharedTransitionScope,
                 filterScreenVisible = filtersVisible,
-                onShowFilters = onFiltersSelected)
+                onShowFilters = onFiltersSelected
+            )
         }
         itemsIndexed(snackCollections) { index, snackCollection ->
             if (index > 0) {

diff --git a/Jetsnack/app/src/main/java/com/example/jetsnack/ui/home/FilterScreen.kt b/Jetsnack/app/src/main/java/com/example/jetsnack/ui/home/FilterScreen.kt
@@ -21,7 +21,6 @@ package com.example.jetsnack.ui.home
 import androidx.compose.animation.AnimatedVisibilityScope
 import androidx.compose.animation.ExperimentalSharedTransitionApi
 import androidx.compose.animation.SharedTransitionScope
-import androidx.compose.animation.core.tween
 import androidx.compose.foundation.background
 import androidx.compose.foundation.clickable
 import androidx.compose.foundation.interaction.MutableInteractionSource
@@ -42,15 +41,15 @@ import androidx.compose.foundation.layout.wrapContentSize
 import androidx.compose.foundation.rememberScrollState
 import androidx.compose.foundation.selection.selectable
 import androidx.compose.foundation.verticalScroll
+import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.filled.Close
+import androidx.compose.material.icons.filled.Done
 import androidx.compose.material3.Icon
 import androidx.compose.material3.IconButton
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.Slider
 import androidx.compose.material3.SliderDefaults
 import androidx.compose.material3.Text
-import androidx.compose.material.icons.Icons
-import androidx.compose.material.icons.filled.Close
-import androidx.compose.material.icons.filled.Done
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableFloatStateOf

diff --git a/Jetsnack/app/src/main/java/com/example/jetsnack/ui/home/Home.kt b/Jetsnack/app/src/main/java/com/example/jetsnack/ui/home/Home.kt
@@ -42,14 +42,14 @@ import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.wrapContentSize
 import androidx.compose.foundation.selection.selectable
 import androidx.compose.foundation.shape.RoundedCornerShape
-import androidx.compose.material3.Icon
-import androidx.compose.material3.MaterialTheme
-import androidx.compose.material3.Text
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.outlined.AccountCircle
 import androidx.compose.material.icons.outlined.Home
 import androidx.compose.material.icons.outlined.Search
 import androidx.compose.material.icons.outlined.ShoppingCart
+import androidx.compose.material3.Icon
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.CompositionLocalProvider
 import androidx.compose.runtime.LaunchedEffect
@@ -94,25 +94,25 @@ fun NavGraphBuilder.composableWithCompositionLocal(
     arguments: List<NamedNavArgument> = emptyList(),
     deepLinks: List<NavDeepLink> = emptyList(),
     enterTransition: (
-        @JvmSuppressWildcards
-        AnimatedContentTransitionScope<NavBackStackEntry>.() -> EnterTransition?
+    @JvmSuppressWildcards
+    AnimatedContentTransitionScope<NavBackStackEntry>.() -> EnterTransition?
     )? = {
         fadeIn(nonSpatialExpressiveSpring())
     },
     exitTransition: (
-        @JvmSuppressWildcards
-        AnimatedContentTransitionScope<NavBackStackEntry>.() -> ExitTransition?
+    @JvmSuppressWildcards
+    AnimatedContentTransitionScope<NavBackStackEntry>.() -> ExitTransition?
     )? = {
         fadeOut(nonSpatialExpressiveSpring())
     },
     popEnterTransition: (
-        @JvmSuppressWildcards
-        AnimatedContentTransitionScope<NavBackStackEntry>.() -> EnterTransition?
+    @JvmSuppressWildcards
+    AnimatedContentTransitionScope<NavBackStackEntry>.() -> EnterTransition?
     )? =
         enterTransition,
     popExitTransition: (
-        @JvmSuppressWildcards
-        AnimatedContentTransitionScope<NavBackStackEntry>.() -> ExitTransition?
+    @JvmSuppressWildcards
+    AnimatedContentTransitionScope<NavBackStackEntry>.() -> ExitTransition?
     )? =
         exitTransition,
     content: @Composable AnimatedContentScope.(NavBackStackEntry) -> Unit

diff --git a/Jetsnack/app/src/main/java/com/example/jetsnack/ui/home/cart/SwipeDismissItem.kt b/Jetsnack/app/src/main/java/com/example/jetsnack/ui/home/cart/SwipeDismissItem.kt
@@ -28,9 +28,9 @@ import androidx.compose.ui.Modifier
 
 @OptIn(ExperimentalMaterial3Api::class)
 @Composable
-/**
- * Holds the Swipe to dismiss composable, its animation and the current state
- */
+        /**
+         * Holds the Swipe to dismiss composable, its animation and the current state
+         */
 fun SwipeDismissItem(
     modifier: Modifier = Modifier,
     enter: EnterTransition = expandVertically(),
@@ -41,21 +41,21 @@ fun SwipeDismissItem(
     // Hold the current state from the Swipe to Dismiss composable
     val dismissState = rememberSwipeToDismissBoxState()
     // Boolean value used for hiding the item if the current state is dismissed
-   // val isDismissed = dismissState.currentValue == SwipeToDismissBoxValue.
+    // val isDismissed = dismissState.currentValue == SwipeToDismissBoxValue.
     // Returns the swiped value in dp
-   // val offset = with(LocalDensity.current) { dismissState.offset.value.toDp() }
+    // val offset = with(LocalDensity.current) { dismissState.offset.value.toDp() }
 
-   /* AnimatedVisibility(
+    /* AnimatedVisibility(
+         modifier = modifier,
+         visible = !isDismissed,
+         enter = enter,
+         exit = exit
+     ) {*/
+    SwipeToDismissBox(
         modifier = modifier,
-        visible = !isDismissed,
-        enter = enter,
-        exit = exit
-    ) {*/
-        SwipeToDismissBox(
-            modifier = modifier,
-            state = dismissState,
-            backgroundContent = { background(/*offset*/) },
-            content = { content(/*isDismissed*/) }
-        )
- /*   }*/
+        state = dismissState,
+        backgroundContent = { background(/*offset*/) },
+        content = { content(/*isDismissed*/) }
+    )
+    /*   }*/
 }
diff --git a/Jetsnack/app/src/main/java/com/example/jetsnack/ui/home/search/Search.kt b/Jetsnack/app/src/main/java/com/example/jetsnack/ui/home/search/Search.kt
@@ -31,13 +31,13 @@ import androidx.compose.foundation.layout.width
 import androidx.compose.foundation.layout.wrapContentHeight
 import androidx.compose.foundation.layout.wrapContentSize
 import androidx.compose.foundation.text.BasicTextField
+import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.outlined.Search
 import androidx.compose.material3.CircularProgressIndicator
 import androidx.compose.material3.Icon
 import androidx.compose.material3.IconButton
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.Text
-import androidx.compose.material.icons.Icons
-import androidx.compose.material.icons.outlined.Search
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.runtime.Stable
@@ -96,11 +96,13 @@ fun Search(
                         state.query = TextFieldValue(suggestion)
                     }
                 )
+
                 SearchDisplay.Results -> SearchResults(
                     state.searchResults,
                     state.filters,
                     onSnackClick
                 )
+
                 SearchDisplay.NoResults -> NoResults(state.query.text)
             }
         }

diff --git a/Jetsnack/app/src/main/java/com/example/jetsnack/ui/snackdetail/SnackDetail.kt b/Jetsnack/app/src/main/java/com/example/jetsnack/ui/snackdetail/SnackDetail.kt
@@ -575,7 +575,7 @@ private fun CartBottomBar(modifier: Modifier = Modifier) {
                             )
                         ) { it } + fadeIn(tween(300, delayMillis = 300)),
                         exit = slideOutVertically(tween(50)) { it } +
-                            fadeOut(tween(50))
+                                fadeOut(tween(50))
                     )
             ) {
                 Column {

diff --git a/Jetsnack/app/src/main/res/drawable-night/empty_state_search.xml b/Jetsnack/app/src/main/res/drawable-night/empty_state_search.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
+<?xml version="1.0" encoding="utf-8"?><!--
   Copyright 2020 The Android Open Source Project
 
   Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except