Release : 1.8.9

feat: Tags
Waste2Wealth · Sep 24, 2023 · ecb133b · ecb133b
2 parents dd8ea32 + b330375
commit ecb133b
Show file tree

Hide file tree

Showing 61 changed files with 1,989 additions and 559 deletions.
diff --git a/app/src/main/java/app/waste2wealth/com/bottombar/BottomBar.kt b/app/src/main/java/app/waste2wealth/com/bottombar/BottomBar.kt
@@ -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(
@@ -85,7 +84,7 @@ fun BottomBar(
                             },
                             label = {
                                 it.title?.let {
-                                    AutoResizedText(
+                                    Text(
                                         text = it,
                                         color = Color.Black,
                                         softWrap = true,

diff --git a/app/src/main/java/app/waste2wealth/com/collectwaste/CollectWasteInfo.kt b/app/src/main/java/app/waste2wealth/com/collectwaste/CollectWasteInfo.kt
@@ -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
@@ -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) {
@@ -122,7 +122,7 @@ fun CollectWasteInfo(
                     .offset(x = (-10).dp),
                 horizontalArrangement = Arrangement.Center
             ) {
-                AutoResizedText(
+                Text(
                     text = "Collect Waste",
                     color = textColor,
                     fontFamily = monteSB,
@@ -139,6 +139,7 @@ fun CollectWasteInfo(
             time = viewModel.time.value,
             isCollectedInfo = true,
             isEllipsis = false,
+            tags = viewModel.tags.value,
             onCollected = {
                 val gmmIntentUri =
                     Uri.parse(
@@ -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 {
@@ -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,