Skip to content

Commit

Permalink
Merge pull request #20 from thekaailashsharma/minors
Browse files Browse the repository at this point in the history 
Minor changes
  • Loading branch information
@thekaailashsharma
thekaailashsharma authored Dec 16, 2023
2 parents 212fe5c + f39c42a commit 510d5bb
Show file tree
Hide file tree
Showing 5 changed files with 109 additions and 190 deletions.
17 changes: 17 additions & 0 deletions .idea/deploymentTargetDropDown.xml
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

170 changes: 85 additions & 85 deletions app/src/main/java/ai/travel/app/home/ui/HomeScreenMain.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -228,91 +228,91 @@ fun HomeScreenMain(
}
)
}
Row(
modifier = Modifier
.fillMaxWidth()
.padding(
bottom = 20.dp,
start = 25.dp,
end = 25.dp
),
horizontalArrangement = Arrangement.SpaceBetween
) {
Column(
modifier = Modifier
.padding(top = 15.dp),
horizontalAlignment = Alignment.CenterHorizontally,
verticalArrangement = Arrangement.Center
) {
Text(
text = "Points Earned",
color = textColor,
fontSize = 14.sp,
fontFamily = monteSB,
softWrap = true,
modifier = Modifier.padding(start = 7.dp)
)
Row(
modifier = Modifier.padding(
end = 0.dp,
top = 7.dp
)
) {
Icon(
Icons.Filled.Wallet,
contentDescription = "coins",
modifier = Modifier
.size(20.dp)
.padding(end = 5.dp),
tint = lightText
)
Text(
text = "100",
color = textColor,
fontSize = 15.sp,
fontFamily = monteSB,
)
}

}
Column(
modifier = Modifier
.padding(top = 15.dp),
horizontalAlignment = Alignment.CenterHorizontally,
verticalArrangement = Arrangement.Center
) {
Text(
text = "Points Earned",
color = textColor,
fontSize = 14.sp,
fontFamily = monteSB,
softWrap = true,
modifier = Modifier.padding(start = 7.dp)
)
Row(
modifier = Modifier.padding(
end = 0.dp,
top = 7.dp
)
) {
Icon(
Icons.Filled.Wallet,
contentDescription = "coins",
modifier = Modifier
.size(20.dp)
.padding(end = 5.dp),
tint = lightText
)
Text(
text = "100",
color = textColor,
fontSize = 15.sp,
fontFamily = monteSB,
)
}

}
}
// Row(
// modifier = Modifier
// .fillMaxWidth()
// .padding(
// bottom = 20.dp,
// start = 25.dp,
// end = 25.dp
// ),
// horizontalArrangement = Arrangement.SpaceBetween
// ) {
// Column(
// modifier = Modifier
// .padding(top = 15.dp),
// horizontalAlignment = Alignment.CenterHorizontally,
// verticalArrangement = Arrangement.Center
// ) {
// Text(
// text = "Points Earned",
// color = textColor,
// fontSize = 14.sp,
// fontFamily = monteSB,
// softWrap = true,
// modifier = Modifier.padding(start = 7.dp)
// )
// Row(
// modifier = Modifier.padding(
// end = 0.dp,
// top = 7.dp
// )
// ) {
// Icon(
// Icons.Filled.Wallet,
// contentDescription = "coins",
// modifier = Modifier
// .size(20.dp)
// .padding(end = 5.dp),
// tint = lightText
// )
// Text(
// text = "100",
// color = textColor,
// fontSize = 15.sp,
// fontFamily = monteSB,
// )
// }
//
// }
// Column(
// modifier = Modifier
// .padding(top = 15.dp),
// horizontalAlignment = Alignment.CenterHorizontally,
// verticalArrangement = Arrangement.Center
// ) {
// Text(
// text = "Points Earned",
// color = textColor,
// fontSize = 14.sp,
// fontFamily = monteSB,
// softWrap = true,
// modifier = Modifier.padding(start = 7.dp)
// )
// Row(
// modifier = Modifier.padding(
// end = 0.dp,
// top = 7.dp
// )
// ) {
// Icon(
// Icons.Filled.Wallet,
// contentDescription = "coins",
// modifier = Modifier
// .size(20.dp)
// .padding(end = 5.dp),
// tint = lightText
// )
// Text(
// text = "100",
// color = textColor,
// fontSize = 15.sp,
// fontFamily = monteSB,
// )
// }
//
// }
// }
Spacer(modifier = Modifier.height(15.dp))
}
}
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/java/ai/travel/app/home/ui/PersonalRoutes.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ fun PersonalRoutes(
item {
NewRouteCard(sheetState)
}
items(newItems) { item ->
items(newItems.reversed()) { item ->
RouteCard(item, navController, homeViewModel)
}

Expand Down
2 changes: 1 addition & 1 deletion app/src/main/java/ai/travel/app/riveanimation/LoginUI.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -277,7 +277,7 @@ fun LoginUI(
fontFamily = monteSB,
)
) {
append("Rive")
append("Tripify")
}
append(" ")
}, fontSize = 25.sp)
Expand Down
108 changes: 5 additions & 103 deletions app/src/main/java/ai/travel/app/tripDetails/MoreInfoTrips.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ fun MoreInfoTrips(viewModel: HomeViewModel, paddingValues: PaddingValues) {
Column(
modifier = Modifier
.fillMaxWidth()
.fillMaxHeight(0.95f)
.fillMaxHeight(0.88f)
.background(appGradient)
.padding(paddingValues)
) {
Expand Down Expand Up @@ -139,109 +139,11 @@ fun MoreInfoTrips(viewModel: HomeViewModel, paddingValues: PaddingValues) {
contentScale = ContentScale.Crop
)
}
}
} //IMAGE

Column {
Spacer(modifier = Modifier.fillMaxHeight(0.13f))
Text(
text = viewModel.currentDestination.value,
color = textColor,
fontSize = 35.sp,
modifier = Modifier.padding(
start = 20.dp,
top = 20.dp,
bottom = 8.dp
)
)

LazyVerticalGrid(
columns = GridCells.Fixed(2),
modifier = Modifier.height(100.dp)
) {
items(cardData1) {
GridCard(
topText = it.topText,
bottomText = it.bottomText,
icon = it.icon
)
}

}

Row(
verticalAlignment = Alignment.CenterVertically, modifier = Modifier
.padding(
start = 12.dp,
top = 0.dp,
bottom = 0.dp,
end = 12.dp
)
) {
Icon(
imageVector = Icons.Filled.PhotoAlbum,
contentDescription = "topText",
tint = lightText,
modifier = Modifier.size(20.dp)
)
Spacer(modifier = Modifier.width(7.dp))
Text(
text = "Collections",
color = textColor,
fontSize = 12.sp,
)
}

Spacer(modifier = Modifier.height(10.dp))
Card(
modifier = Modifier
.width(220.dp)
.height(180.dp)
.padding(16.dp),
colors = CardDefaults.cardColors(
containerColor = CardBackground
),
shape = RoundedCornerShape(16.dp),
elevation = CardDefaults.cardElevation(10.dp)
) {
Column(horizontalAlignment = Alignment.CenterHorizontally,
verticalArrangement = Arrangement.Center) {
Card(
modifier = Modifier
.padding(4.dp)
.fillMaxHeight(0.6f)
.dashedBorder(1.dp, textColor, 4.dp),
colors = CardDefaults.cardColors(
containerColor = CardBackground
),
shape = RoundedCornerShape(16.dp),
elevation = CardDefaults.cardElevation(10.dp),
) {
Column(
modifier = Modifier.fillMaxSize(),
horizontalAlignment = Alignment.CenterHorizontally,
verticalArrangement = Arrangement.Center
) {
Icon(
Icons.Filled.PhotoLibrary,
contentDescription = "",
modifier = Modifier.size(50.dp),
tint = lightText
)
Spacer(modifier = Modifier.height(8.dp))
}
}

Spacer(modifier = Modifier.height(12.dp))
Text(
text = "Photo Gallery",
fontSize = 15.sp,
color = textColor,
modifier = Modifier.weight(1f)
)

}
}
}
Text(text = "Mumbai")
/////////////


}

Expand Down

0 comments on commit 510d5bb

Please sign in to comment.