Skip to content
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

feat: Tags #24

Merged
merged 10 commits into from
Sep 24, 2023
Merged

feat: Tags #24

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
a6e8fad
Initiate Tags in ReportWaste
thekaailashsharma Sep 23, 2023
f105ec2
Delete app/release directory
thekaailashsharma Sep 23, 2023
d25bafd
Update .gitignore
thekaailashsharma Sep 23, 2023
6c63450
Initiate Tags in CollectWaste
thekaailashsharma Sep 23, 2023
52c6cc1
Add SearchField
thekaailashsharma Sep 23, 2023
3bf3388
Add Snackbar Tips
thekaailashsharma Sep 24, 2023
18a0c85
Minor Bug Fixes
thekaailashsharma Sep 24, 2023
5763ec2
fix: Remove AutoResized Text Everywhere
thekaailashsharma Sep 24, 2023
6c678e6
feat: Single Select Feature Chips
thekaailashsharma Sep 24, 2023
b330375
Merge pull request #23 from thekaailashsharma/tagsintodev
thekaailashsharma Sep 24, 2023
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
3 changes: 2 additions & 1 deletion .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,4 +13,5 @@
.externalNativeBuild
.cxx
local.properties
app/google-services.json
google-services.json
releases/
3 changes: 1 addition & 2 deletions app/src/main/java/app/waste2wealth/com/bottombar/BottomBar.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,6 @@ import app.waste2wealth.com.ui.theme.CardTextColor
import app.waste2wealth.com.ui.theme.appBackground
import app.waste2wealth.com.ui.theme.monteSB
import app.waste2wealth.com.ui.theme.textColor
import app.waste2wealth.com.utils.AutoResizedText

@Composable
fun BottomBar(
Expand Down Expand Up @@ -85,7 +84,7 @@ fun BottomBar(
},
label = {
it.title?.let {
AutoResizedText(
Text(
text = it,
color = Color.Black,
softWrap = true,
Expand Down
9 changes: 5 additions & 4 deletions app/src/main/java/app/waste2wealth/com/collectwaste/CollectWasteInfo.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,6 @@ import app.waste2wealth.com.ui.theme.CardTextColor
import app.waste2wealth.com.ui.theme.appBackground
import app.waste2wealth.com.ui.theme.monteSB
import app.waste2wealth.com.ui.theme.textColor
import app.waste2wealth.com.utils.AutoResizedText
import coil.compose.AsyncImage
import com.google.accompanist.permissions.ExperimentalPermissionsApi
import com.google.accompanist.permissions.rememberMultiplePermissionsState
Expand Down Expand Up @@ -88,6 +87,7 @@ fun CollectWasteInfo(
viewModel.wastePhoto.value = ""
viewModel.theirLongitude.value = 0.0
viewModel.theirLatitude.value = 0.0
viewModel.tags.value = listOf()
navController.popBackStack()
}
LaunchedEffect(key1 = Unit) {
Expand Down Expand Up @@ -122,7 +122,7 @@ fun CollectWasteInfo(
.offset(x = (-10).dp),
horizontalArrangement = Arrangement.Center
) {
AutoResizedText(
Text(
text = "Collect Waste",
color = textColor,
fontFamily = monteSB,
Expand All @@ -139,6 +139,7 @@ fun CollectWasteInfo(
time = viewModel.time.value,
isCollectedInfo = true,
isEllipsis = false,
tags = viewModel.tags.value,
onCollected = {
val gmmIntentUri =
Uri.parse(
Expand All @@ -149,7 +150,7 @@ fun CollectWasteInfo(
mapIntent.setPackage("com.google.android.apps.maps")
context.startActivity(mapIntent)

}
},
)
Spacer(modifier = Modifier.height(30.dp))
var imageUrlState by remember {
Expand Down Expand Up @@ -196,7 +197,7 @@ fun CollectWasteInfo(
shape = RoundedCornerShape(35.dp),
modifier = Modifier.padding(start = 10.dp)
) {
AutoResizedText(
Text(
text = "Collect Waste",
color = CardTextColor,
fontSize = 12.sp,
Expand Down
Loading