Skip to content

Commit 9c386f9

Browse files
dadachiclaude
andcommitted
Drop unused tags-scanned count and howToUse; tighten ItemTag labels
Port iOS NativeAppTemplate-iOS#61 to Android: - Drop `scannedItemTagsCount` from Attributes/Data and remove the "tags scanned by customers" stat from ShopListCardView. - Add a left-aligned shop_detail_instruction header to ShopDetailView ("Swipe an item tag to change its status."). - Swap OnboardingView's How-To-Use link for the Support Website link and trim onboarding from 13 to 8 descriptions; update placeholder strings to match the iOS copy. - Normalize ItemTag labels: label_add_tag/add_tag_description/ label_edit_item_tag/title_delete_item_tag and message_item_tag_* values now read "Item Tag" / "Item tag" consistently. - Drop unused HOW_TO_USE_URL, R.string.how_to_use, R.string.learn_more. Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
1 parent e23c4ba commit 9c386f9

10 files changed

Lines changed: 34 additions & 47 deletions

File tree

app/src/main/kotlin/com/nativeapptemplate/nativeapptemplatefree/NatConstants.kt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@ package com.nativeapptemplate.nativeapptemplatefree
22

33
object NatConstants {
44
const val SUPPORT_MAIL: String = "support@nativeapptemplate.com"
5-
const val HOW_TO_USE_URL: String = "https://myturntag.com/how"
65
const val SUPPORT_WEBSITE_URL: String = "https://nativeapptemplate.com"
76
const val FAQS_URL: String = "https://nativeapptemplate.com/faqs"
87
const val PRIVACY_POLICY_URL: String = "https://nativeapptemplate.com/privacy"

app/src/main/kotlin/com/nativeapptemplate/nativeapptemplatefree/ui/app_root/OnboardingView.kt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ internal fun OnboardingView(
4747
val fontSizeLarge = 24
4848
val lineHeightLarge = 26
4949
val pagerState = rememberPagerState(pageCount = {
50-
13
50+
8
5151
})
5252

5353
Scaffold(
@@ -144,10 +144,10 @@ private fun TopAppBar(
144144
},
145145
navigationIcon = {
146146
TextButton(
147-
onClick = { context.startActivity(Intent(Intent.ACTION_VIEW, Uri.parse(NatConstants.HOW_TO_USE_URL))) },
147+
onClick = { context.startActivity(Intent(Intent.ACTION_VIEW, Uri.parse(NatConstants.SUPPORT_WEBSITE_URL))) },
148148
) {
149149
Text(
150-
stringResource(R.string.how_to_use),
150+
stringResource(R.string.support_website),
151151
)
152152
}
153153
},

app/src/main/kotlin/com/nativeapptemplate/nativeapptemplatefree/ui/app_root/OnboardingViewModel.kt

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -18,11 +18,6 @@ class OnboardingViewModel @Inject constructor() : ViewModel() {
1818
5 -> R.string.onboarding_description6
1919
6 -> R.string.onboarding_description7
2020
7 -> R.string.onboarding_description8
21-
8 -> R.string.onboarding_description9
22-
9 -> R.string.onboarding_description10
23-
10 -> R.string.onboarding_description11
24-
11 -> R.string.onboarding_description12
25-
12 -> R.string.onboarding_description13
2621
else -> R.string.onboarding_description1
2722
}
2823

@@ -39,11 +34,6 @@ class OnboardingViewModel @Inject constructor() : ViewModel() {
3934
5 -> R.drawable.ic_overview6
4035
6 -> R.drawable.ic_overview7
4136
7 -> R.drawable.ic_overview8
42-
8 -> R.drawable.ic_overview9
43-
9 -> R.drawable.ic_overview10
44-
10 -> R.drawable.ic_overview11
45-
11 -> R.drawable.ic_overview12
46-
12 -> R.drawable.ic_overview13
4737
else -> R.drawable.ic_overview1
4838
}
4939

app/src/main/kotlin/com/nativeapptemplate/nativeapptemplatefree/ui/shop_detail/ShopDetailView.kt

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,11 +29,13 @@ import androidx.compose.runtime.getValue
2929
import androidx.compose.ui.Alignment
3030
import androidx.compose.ui.Modifier
3131
import androidx.compose.ui.graphics.Color
32+
import androidx.compose.ui.res.stringResource
3233
import androidx.compose.ui.unit.dp
3334
import androidx.hilt.navigation.compose.hiltViewModel
3435
import androidx.lifecycle.Lifecycle
3536
import androidx.lifecycle.compose.LifecycleEventEffect
3637
import androidx.lifecycle.compose.collectAsStateWithLifecycle
38+
import com.nativeapptemplate.nativeapptemplatefree.R
3739
import com.nativeapptemplate.nativeapptemplatefree.model.ItemTagState.*
3840
import com.nativeapptemplate.nativeapptemplatefree.ui.common.ActionText
3941
import com.nativeapptemplate.nativeapptemplatefree.ui.common.ErrorView
@@ -140,6 +142,15 @@ private fun ShopDetailContentView(
140142
LazyColumn(
141143
Modifier.padding(24.dp),
142144
) {
145+
item {
146+
Text(
147+
text = stringResource(R.string.shop_detail_instruction),
148+
color = MaterialTheme.colorScheme.onSurface,
149+
modifier = Modifier
150+
.fillMaxWidth()
151+
.padding(start = 16.dp, bottom = 8.dp),
152+
)
153+
}
143154
itemsIndexed(
144155
items = itemTags,
145156
) { index, itemTag ->

app/src/main/kotlin/com/nativeapptemplate/nativeapptemplatefree/ui/shop_settings/item_tag_list/ItemTagCreateView.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,7 @@ fun ItemTagCreateContentView(
119119
shape = CircleShape,
120120

121121
) {
122-
Icon(Icons.Filled.Done, contentDescription = stringResource(R.string.label_add_tag))
122+
Icon(Icons.Filled.Done, contentDescription = stringResource(R.string.label_add_item_tag))
123123
}
124124
},
125125
modifier = Modifier.fillMaxSize(),
@@ -198,7 +198,7 @@ private fun TopAppBar(
198198
containerColor = MaterialTheme.colorScheme.primaryContainer,
199199
titleContentColor = MaterialTheme.colorScheme.primary,
200200
),
201-
title = { Text(text = stringResource(id = R.string.label_add_tag)) },
201+
title = { Text(text = stringResource(id = R.string.label_add_item_tag)) },
202202
navigationIcon = {
203203
IconButton(onClick = {
204204
onBackClick()

app/src/main/kotlin/com/nativeapptemplate/nativeapptemplatefree/ui/shop_settings/item_tag_list/ItemTagListView.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -300,13 +300,13 @@ private fun NoResultsView(
300300
)
301301

302302
Text(
303-
stringResource(R.string.add_tag_description),
303+
stringResource(R.string.add_item_tag_description),
304304
modifier = Modifier
305305
.padding(horizontal = 16.dp),
306306
)
307307

308308
MainButtonView(
309-
title = stringResource(R.string.label_add_tag),
309+
title = stringResource(R.string.label_add_item_tag),
310310
onClick = { onAddItemTagClick(viewModel.shopId) },
311311
modifier = Modifier
312312
.padding(horizontal = 12.dp, vertical = 24.dp),

app/src/main/kotlin/com/nativeapptemplate/nativeapptemplatefree/ui/shops/ShopListCardView.kt

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ import androidx.compose.foundation.layout.padding
99
import androidx.compose.foundation.layout.width
1010
import androidx.compose.material.icons.Icons
1111
import androidx.compose.material.icons.outlined.Flag
12-
import androidx.compose.material.icons.outlined.People
1312
import androidx.compose.material.icons.outlined.Rectangle
1413
import androidx.compose.material3.Icon
1514
import androidx.compose.material3.MaterialTheme
@@ -48,7 +47,6 @@ fun ShopListCardView(
4847
modifier = Modifier
4948
.padding(top = 16.dp),
5049
) {
51-
CountRow(icon = Icons.Outlined.People, count = data.getScannedItemTagsCount(), countLabel = "tags scanned by customers")
5250
CountRow(icon = Icons.Outlined.Flag, count = data.getCompletedItemTagsCount(), countLabel = "completed tags")
5351
CountRow(icon = Icons.Outlined.Rectangle, count = data.getItemTagsCount(), countLabel = "all tags")
5452
}

app/src/main/res/values/strings.xml

Lines changed: 16 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@
2424
<string name="not_connected">⚠️ You aren’t connected to the internet</string>
2525
<string name="instructions">Instructions</string>
2626
<string name="open">Open</string>
27-
<string name="learn_more">Learn More</string>
2827
<string name="are_you_sure">Are you sure?</string>
2928
<string name="full_name">Full Name</string>
3029
<string name="full_name_is_required">Full name is required.</string>
@@ -67,19 +66,14 @@
6766
<string name="terms_of_use_updated">Terms of Use Updated</string>
6867

6968
<!-- On-boarding -->
70-
<string name="onboarding_description1">Welcome to the app.</string>
71-
<string name="onboarding_description2">Welcome to the app.</string>
72-
<string name="onboarding_description3">Welcome to the app.</string>
73-
<string name="onboarding_description4">Welcome to the app.</string>
74-
<string name="onboarding_description5">Welcome to the app.</string>
75-
<string name="onboarding_description6">Welcome to the app.</string>
76-
<string name="onboarding_description7">Welcome to the app.</string>
77-
<string name="onboarding_description8">Welcome to the app.</string>
78-
<string name="onboarding_description9">Welcome to the app.</string>
79-
<string name="onboarding_description10">Welcome to the app.</string>
80-
<string name="onboarding_description11">Welcome to the app.</string>
81-
<string name="onboarding_description12">Welcome to the app.</string>
82-
<string name="onboarding_description13">Welcome to the app.</string>
69+
<string name="onboarding_description1">Welcome to NativeAppTemplate.</string>
70+
<string name="onboarding_description2">Sign in to manage your shops and item tags.</string>
71+
<string name="onboarding_description3">Organize your work across multiple organizations.</string>
72+
<string name="onboarding_description4">Invite teammates to collaborate.</string>
73+
<string name="onboarding_description5">Track item tags with a simple idle/completed state.</string>
74+
<string name="onboarding_description6">Create, edit, and delete item tags from your shop.</string>
75+
<string name="onboarding_description7">Switch between personal and shared organizations.</string>
76+
<string name="onboarding_description8">Have fun!</string>
8377

8478
<!-- Shops Screen -->
8579
<string name="add_shop">Add Shop</string>
@@ -97,6 +91,7 @@
9791
<string name="message_shop_created">Shop added.</string>
9892
<string name="message_shop_deleted">Shop removed.</string>
9993
<string name="message_shop_updated">Shop updated.</string>
94+
<string name="shop_detail_instruction">Swipe an item tag to change its status.</string>
10095
<string name="complete">Complete</string>
10196
<string name="idle">Idle</string>
10297

@@ -112,22 +107,22 @@
112107
<string name="description_label">Description</string>
113108
<string name="completed_at_label">Completed at</string>
114109
<string name="item_tag_name_placeholder">Buy milk</string>
115-
<string name="label_add_tag">Add Tag</string>
116-
<string name="add_tag_description">Add a new item tag and start changing the tag status.</string>
110+
<string name="label_add_item_tag">Add Item Tag</string>
111+
<string name="add_item_tag_description">Add a new item tag and start changing the item tag status.</string>
117112
<string name="item_tag_name_is_invalid">Tag name is invalid.</string>
118113
<string name="item_tag_description_is_invalid">Tag description is invalid.</string>
119114
<string name="item_tag_name_help">Name must be 1-%1$d characters.</string>
120115
<string name="item_tag_description_help">Description must be 0-%1$d characters.</string>
121116
<string name="mark_as_completed">Mark as completed</string>
122117
<string name="mark_as_idled">Mark as idled</string>
123118

124-
<string name="message_item_tag_created">Tag created successfully.</string>
125-
<string name="message_item_tag_updated">Tag updated successfully.</string>
126-
<string name="message_item_tag_deleted">Tag deleted successfully.</string>
119+
<string name="message_item_tag_created">Item tag created successfully.</string>
120+
<string name="message_item_tag_updated">Item tag updated successfully.</string>
121+
<string name="message_item_tag_deleted">Item tag deleted successfully.</string>
127122

128123
<!-- Item Tag Detail Screen -->
129-
<string name="label_edit_item_tag">Edit Tag</string>
130-
<string name="title_delete_item_tag">Delete Tag</string>
124+
<string name="label_edit_item_tag">Edit Item Tag</string>
125+
<string name="title_delete_item_tag">Delete Item Tag</string>
131126

132127
<!-- Settings Screen -->
133128
<string name="mode">Mode</string>
@@ -143,7 +138,6 @@
143138
<string name="app_section">App</string>
144139
<string name="version">Version</string>
145140
<string name="website">Website</string>
146-
<string name="how_to_use">How To Use</string>
147141
<string name="support_website">Support Website</string>
148142
<string name="faqs">FAQs</string>
149143
<string name="rate_app">Rate or Review the App</string>

model/src/main/kotlin/com/nativeapptemplate/nativeapptemplatefree/model/Attributes.kt

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -68,9 +68,6 @@ data class Attributes(
6868
@SerialName("item_tags_count")
6969
val itemTagsCount: Int? = null,
7070

71-
@SerialName("scanned_item_tags_count")
72-
val scannedItemTagsCount: Int? = null,
73-
7471
@SerialName("completed_item_tags_count")
7572
val completedItemTagsCount: Int? = null,
7673

model/src/main/kotlin/com/nativeapptemplate/nativeapptemplatefree/model/Data.kt

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,5 @@ data class Data(
6767

6868
fun getItemTagsCount(): Int = attributes?.itemTagsCount ?: 0
6969

70-
fun getScannedItemTagsCount(): Int = attributes?.scannedItemTagsCount ?: 0
71-
7270
fun getCompletedItemTagsCount(): Int = attributes?.completedItemTagsCount ?: 0
7371
}

0 commit comments

Comments
 (0)