Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions app/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@

<activity
android:name=".MainActivity"
android:windowSoftInputMode="adjustResize"
android:exported="true"
android:theme="@style/Theme.EateryBlue">
<intent-filter>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@ package com.cornellappdev.android.eatery
import android.os.Bundle
import androidx.activity.ComponentActivity
import androidx.activity.compose.setContent
import androidx.activity.enableEdgeToEdge
import androidx.activity.result.ActivityResultLauncher
import androidx.activity.result.IntentSenderRequest
import androidx.activity.result.contract.ActivityResultContracts
import androidx.core.view.WindowCompat
import androidx.lifecycle.DefaultLifecycleObserver
import androidx.lifecycle.LifecycleOwner
import androidx.lifecycle.lifecycleScope
Expand Down Expand Up @@ -51,7 +51,7 @@ class MainActivity : ComponentActivity() {

val hasOnboarded = runBlocking { userRepository.hasOnboarded() }

WindowCompat.setDecorFitsSystemWindows(window, false)
enableEdgeToEdge()

setContent {
LockScreenOrientation()
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@ fun OnboardingCarousel(
Box {
HorizontalPager(
modifier = Modifier
.padding(top = 16.dp, start = 0.dp, end = 0.dp)
.padding(top = 16.dp)
.zIndex(1f),
state = phonePagerState,
contentPadding = PaddingValues(horizontal = 55.dp)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ fun SwitchOption(
initialValue: Boolean = true
) {
var switched by remember { mutableStateOf(initialValue) }
Column(modifier = Modifier.padding(start = 16.dp, end = 16.dp)) {
Column(modifier = Modifier.padding(horizontal = 16.dp)) {
SettingsOption(
title = title, description = description, onClick = { },
trailingIcon = {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ import androidx.compose.foundation.layout.height
import androidx.compose.foundation.layout.navigationBarsPadding
import androidx.compose.foundation.layout.padding
import androidx.compose.foundation.layout.size
import androidx.compose.foundation.layout.statusBarsPadding
import androidx.compose.foundation.layout.width
import androidx.compose.foundation.lazy.LazyRow
import androidx.compose.foundation.lazy.rememberLazyListState
Expand Down Expand Up @@ -61,7 +62,8 @@ fun AboutScreen() {
Column(modifier = Modifier.fillMaxSize()) {
Column(
modifier = Modifier
.padding(top = 36.dp, start = 16.dp, end = 16.dp)
.padding(horizontal = 16.dp)
.then(Modifier.statusBarsPadding())
.fillMaxWidth()
) {
Text(
Expand Down Expand Up @@ -130,7 +132,7 @@ fun AboutScreen() {
Button(
shape = RoundedCornerShape(24.dp),
modifier = Modifier
.padding(start = 16.dp, end = 16.dp)
.padding(horizontal = 16.dp)
.then(Modifier.navigationBarsPadding())
.height(48.dp)
.fillMaxWidth(),
Expand Down Expand Up @@ -319,7 +321,7 @@ fun CreditsRow(position: TeamPosition) {
tint = GrayOne,
modifier = Modifier
.height(7.dp)
.padding(start = 12.33.dp, end = 12.33.dp)
.padding(horizontal = 12.33.dp)
.width(7.33.dp)
)
})
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ import androidx.compose.foundation.layout.IntrinsicSize
import androidx.compose.foundation.layout.PaddingValues
import androidx.compose.foundation.layout.Row
import androidx.compose.foundation.layout.Spacer
import androidx.compose.foundation.layout.WindowInsets
import androidx.compose.foundation.layout.fillMaxHeight
import androidx.compose.foundation.layout.fillMaxSize
import androidx.compose.foundation.layout.fillMaxWidth
Expand Down Expand Up @@ -229,7 +230,8 @@ fun EateryDetailScreenContent(
openBottomSheet(BottomSheetContent.COMPARE_MENUS)
}
},
floatingActionButtonPosition = FabPosition.End
floatingActionButtonPosition = FabPosition.End,
contentWindowInsets = WindowInsets(0, 0, 0, 0)
) { paddingValues ->
Box(
modifier = Modifier
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ import androidx.compose.foundation.layout.fillMaxSize
import androidx.compose.foundation.layout.fillMaxWidth
import androidx.compose.foundation.layout.height
import androidx.compose.foundation.layout.padding
import androidx.compose.foundation.layout.statusBarsPadding
import androidx.compose.foundation.layout.width
import androidx.compose.foundation.lazy.LazyColumn
import androidx.compose.foundation.lazy.items
Expand Down Expand Up @@ -105,7 +106,8 @@ private fun FavoritesScreenContent(

Column(
modifier = Modifier
.padding(top = 36.dp, start = 10.dp, end = 10.dp)
.padding(horizontal = 10.dp)
.then(Modifier.statusBarsPadding())
.fillMaxSize()
) {
Row(
Expand Down Expand Up @@ -134,7 +136,7 @@ private fun FavoritesScreenContent(
text = stringResource(R.string.favorites_title),
color = EateryBlue,
style = EateryBlueTypography.h2,
modifier = Modifier.padding(start = 6.dp, end = 6.dp)
modifier = Modifier.padding(horizontal = 6.dp)
)

Spacer(modifier = Modifier.height(12.dp))
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ import androidx.compose.foundation.layout.Box
import androidx.compose.foundation.layout.Column
import androidx.compose.foundation.layout.Row
import androidx.compose.foundation.layout.Spacer
import androidx.compose.foundation.layout.WindowInsets
import androidx.compose.foundation.layout.fillMaxHeight
import androidx.compose.foundation.layout.fillMaxSize
import androidx.compose.foundation.layout.fillMaxWidth
Expand Down Expand Up @@ -206,6 +207,7 @@ fun HomeScreen(
}
},
floatingActionButtonPosition = FabPosition.End,
contentWindowInsets = WindowInsets(0, 0, 0, 0),
content = { paddingValues ->
Box(
modifier = Modifier
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ package com.cornellappdev.android.eatery.ui.screens
import androidx.compose.foundation.layout.Column
import androidx.compose.foundation.layout.fillMaxSize
import androidx.compose.foundation.layout.padding
import androidx.compose.foundation.layout.statusBarsPadding
import androidx.compose.material.icons.Icons
import androidx.compose.material.icons.outlined.ArrowOutward
import androidx.compose.material3.Icon
Expand All @@ -27,7 +28,8 @@ fun LegalScreen() {
val uriCurrent = LocalUriHandler.current
Column(
modifier = Modifier
.padding(top = 36.dp, start = 16.dp, end = 16.dp)
.padding(horizontal = 16.dp)
.then(Modifier.statusBarsPadding())
.fillMaxSize()
) {
Text(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ import androidx.compose.foundation.layout.fillMaxSize
import androidx.compose.foundation.layout.fillMaxWidth
import androidx.compose.foundation.layout.height
import androidx.compose.foundation.layout.padding
import androidx.compose.foundation.layout.statusBarsPadding
import androidx.compose.foundation.layout.width
import androidx.compose.foundation.lazy.LazyColumn
import androidx.compose.foundation.lazy.items
Expand Down Expand Up @@ -51,7 +52,8 @@ fun NearestScreen(

Column(
modifier = Modifier
.padding(top = 36.dp, start = 16.dp, end = 16.dp)
.padding(horizontal = 16.dp)
.then(Modifier.statusBarsPadding())
.fillMaxSize()
) {
Text(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ package com.cornellappdev.android.eatery.ui.screens
import androidx.compose.foundation.layout.Column
import androidx.compose.foundation.layout.fillMaxSize
import androidx.compose.foundation.layout.padding
import androidx.compose.foundation.layout.statusBarsPadding
import androidx.compose.foundation.lazy.LazyColumn
import androidx.compose.material3.Text
import androidx.compose.runtime.Composable
Expand All @@ -20,7 +21,8 @@ fun NotificationsHomeScreen(
) {
Column(
modifier = Modifier
.padding(top = 40.dp, start = 16.dp, end = 16.dp)
.padding(horizontal = 16.dp)
.then(Modifier.statusBarsPadding())
.fillMaxSize()
) {
Text(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ import androidx.compose.foundation.layout.Spacer
import androidx.compose.foundation.layout.fillMaxSize
import androidx.compose.foundation.layout.height
import androidx.compose.foundation.layout.padding
import androidx.compose.foundation.layout.statusBarsPadding
import androidx.compose.material3.Text
import androidx.compose.runtime.Composable
import androidx.compose.ui.Modifier
Expand All @@ -24,7 +25,8 @@ fun NotificationsSettingsScreen() {

Column(
modifier = Modifier
.padding(top = 36.dp, start = 16.dp, end = 16.dp)
.padding(horizontal = 16.dp)
.then(Modifier.statusBarsPadding())
.fillMaxSize()
) {
Text(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ import android.net.Uri
import androidx.compose.foundation.layout.Column
import androidx.compose.foundation.layout.fillMaxSize
import androidx.compose.foundation.layout.padding
import androidx.compose.foundation.layout.statusBarsPadding
import androidx.compose.material.icons.Icons
import androidx.compose.material.icons.outlined.ArrowOutward
import androidx.compose.material3.Icon
Expand Down Expand Up @@ -37,7 +38,8 @@ fun PrivacyScreen(privacyViewModel: PrivacyViewModel = hiltViewModel()) {

Column(
modifier = Modifier
.padding(top = 36.dp, start = 16.dp, end = 16.dp)
.padding(horizontal = 16.dp)
.then(Modifier.statusBarsPadding())
.fillMaxSize()
) {
Text(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ import androidx.compose.foundation.layout.fillMaxWidth
import androidx.compose.foundation.layout.height
import androidx.compose.foundation.layout.padding
import androidx.compose.foundation.layout.size
import androidx.compose.foundation.layout.statusBarsPadding
import androidx.compose.foundation.layout.width
import androidx.compose.foundation.lazy.LazyColumn
import androidx.compose.foundation.lazy.LazyRow
Expand Down Expand Up @@ -145,15 +146,19 @@ fun SearchScreen(

LazyColumn(state = listState, modifier = Modifier.fillMaxSize()) {
stickyHeader {
Column(modifier = Modifier.background(Color.White)) {
Column(
modifier = Modifier
.background(Color.White)
.then(Modifier.statusBarsPadding())
) {
SearchBar(
searchText = query,
onSearchTextChange = {
searchViewModel.queryEateries(it)
},
placeholderText = stringResource(R.string.search_placeholder_grub),
modifier = Modifier.padding(
top = 64.dp,
top = 12.dp,
bottom = 6.dp,
start = 16.dp,
end = 16.dp
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ import androidx.compose.foundation.layout.Spacer
import androidx.compose.foundation.layout.fillMaxWidth
import androidx.compose.foundation.layout.padding
import androidx.compose.foundation.layout.size
import androidx.compose.foundation.layout.statusBarsPadding
import androidx.compose.foundation.shape.RoundedCornerShape
import androidx.compose.material.icons.Icons
import androidx.compose.material.icons.automirrored.filled.Logout
Expand Down Expand Up @@ -84,7 +85,8 @@ fun SettingsScreen(
Column(
modifier = Modifier
.fillMaxWidth()
.padding(top = 48.dp, start = 16.dp, end = 16.dp)
.padding(horizontal = 16.dp)
.then(Modifier.statusBarsPadding())
) {
Text(
text = stringResource(R.string.settings_title),
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,7 @@ fun SupportScreen(supportViewModel: SupportViewModel = hiltViewModel()) {

Column(
modifier = Modifier
.padding(start = 16.dp, end = 16.dp)
.padding(horizontal = 16.dp)
.fillMaxSize()
.then(Modifier.statusBarsPadding())
) {
Expand Down
Loading