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
2 changes: 1 addition & 1 deletion app/src/main/assets/shop.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"type": "shop",
"attributes": {
"name": "Shop1",
"description": "This is a Shop1",
"description": "This is Shop1",
"time_zone": "Tokyo"
},
"meta": {
Expand Down
6 changes: 3 additions & 3 deletions app/src/main/assets/shops.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"type": "shop",
"attributes": {
"name": "Shop1",
"description": "This is a Shop1",
"description": "This is Shop1",
"time_zone": "Tokyo"
},
"meta": {
Expand All @@ -18,7 +18,7 @@
"type": "shop",
"attributes": {
"name": "Shop2",
"description": "This is a Shop2",
"description": "This is Shop2",
"time_zone": "Tokyo"
},
"meta": {
Expand All @@ -31,7 +31,7 @@
"type": "shop",
"attributes": {
"name": "Shop3",
"description": "This is a Shop3",
"description": "This is Shop3",
"time_zone": "Tokyo"
},
"meta": {
Expand Down
6 changes: 3 additions & 3 deletions app/src/main/res/values/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -78,13 +78,13 @@
<string name="shop_name_help">Name must be 1-%1$d characters.</string>
<string name="shop_description_help">Description must be 0-%1$d characters.</string>
<string name="add_shop_description">Add a new shop.</string>
<string name="tap_shop_below">Tap a shop below</string>
<string name="tap_shop_below">Tap shop below</string>

<!-- Shop Detail Screen -->
<string name="message_shop_created">Shop added.</string>
<string name="message_shop_deleted">Shop removed.</string>
<string name="message_shop_updated">Shop updated.</string>
<string name="shop_detail_instruction">Swipe an item tag to change its status.</string>
<string name="shop_detail_instruction">Swipe to change item tag status.</string>
<string name="complete">Complete</string>
<string name="idle">Idle</string>

Expand All @@ -101,7 +101,7 @@
<string name="completed_at_label">Completed at</string>
<string name="item_tag_name_placeholder">Buy milk</string>
<string name="label_add_item_tag">Add Item Tag</string>
<string name="add_item_tag_description">Add a new item tag and start changing the item tag status.</string>
<string name="add_item_tag_description">Add a new item tag and start changing item tag status.</string>
<string name="item_tag_name_is_invalid">Item tag name is invalid.</string>
<string name="item_tag_description_is_invalid">Item tag description is invalid.</string>
<string name="item_tag_name_help">Name must be 1-%1$d characters.</string>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ class DemoShopRepositoryTest {
type = "shop",
attributes = Attributes(
name = "Shop1",
description = "This is a Shop1",
description = "This is Shop1",
timeZone = "Tokyo",
),
meta = Meta(
Expand Down Expand Up @@ -70,7 +70,7 @@ class DemoShopRepositoryTest {
ShopBody(
shopBodyDetail = ShopBodyDetail(
name = "Shop1",
description = "This is a Shop1",
description = "This is Shop1",
timeZone = "Tokyo",
),
),
Expand All @@ -87,7 +87,7 @@ class DemoShopRepositoryTest {
shopUpdateBody = ShopUpdateBody(
shopUpdateBodyDetail = ShopUpdateBodyDetail(
name = "Shop1",
description = "This is a Shop1",
description = "This is Shop1",
timeZone = "Tokyo",
),
),
Expand Down
Loading