Skip to content

Commit 4f2a950

Browse files
authored
Preparations for release of version 0.69.0 (#68)
* Phrase pull w/ new keys and content * CHANGELOG adjusted
1 parent 5435f89 commit 4f2a950

File tree

23 files changed

+407
-331
lines changed

23 files changed

+407
-331
lines changed

.phrase.yml

Lines changed: 40 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -1,119 +1,130 @@
11
# Configuration for Android projects: https://help.phrase.com/help/examples
22
phrase:
3-
project_id: 3e43b3f90cf19e83c7d85652df5766ca
43
file_format: xml
54
pull:
65
targets:
76
# ui module
87
- file: ./ui/src/main/res/values/strings.xml
8+
project_id: &id_core 3e43b3f90cf19e83c7d85652df5766ca
99
params: &defaults
1010
locale_id: b220db5757be359631c55ec54fb65ac6 # en-US
1111
fallback_locale_id: b220db5757be359631c55ec54fb65ac6 # en-US
12-
tags: SDK,Coupons
1312
include_empty_translations: true
1413
format_options:
1514
convert_placeholder: true
1615
escape_linebreaks: true
1716
- file: ./ui/src/main/res/values-de/strings.xml
17+
project_id: *id_core
1818
params:
1919
<<: *defaults
2020
locale_id: 512f99f8cd03c80affd16303fb5de9c2 # de
2121
- file: ./ui/src/main/res/values-fr/strings.xml
22+
project_id: *id_core
2223
params:
2324
<<: *defaults
2425
locale_id: edf0b29dd998221329199f185d360ae4 # fr
2526
- file: ./ui/src/main/res/values-fr-rCH/strings.xml
27+
project_id: *id_core
2628
params:
2729
<<: *defaults
2830
locale_id: fae2e092d1704da2ed88f3f56eb6f219 # fr-CH
2931
- file: ./ui/src/main/res/values-hu/strings.xml
32+
project_id: *id_core
3033
params:
3134
<<: *defaults
3235
locale_id: 8f797bd77008e27f6286531a5ad55f67 # hu
3336
- file: ./ui/src/main/res/values-it/strings.xml
37+
project_id: *id_core
3438
params:
3539
<<: *defaults
3640
locale_id: a4dea5c3e2c77e7c6ea344e69db63ed9 # it
3741
- file: ./ui/src/main/res/values-sk/strings.xml
42+
project_id: *id_core
3843
params:
3944
<<: *defaults
4045
locale_id: 9ee4c528e480d56878c98ee8bfbc521b # sk
4146

4247
# ui-toolkit module
43-
- file: ./ui-toolkit/src/debug/res/values/strings.xml
44-
params:
45-
<<: *defaults
46-
locale_id: b220db5757be359631c55ec54fb65ac6 # en-US
47-
tags: Sample
4848
- file: ./ui-toolkit/src/main/res/values/strings.xml
49+
project_id: *id_core
4950
params:
5051
<<: *defaults
5152
locale_id: b220db5757be359631c55ec54fb65ac6 # en-US
5253
tags: Onboarding,Shop
5354
- file: ./ui-toolkit/src/main/res/values-de/strings.xml
55+
project_id: *id_core
5456
params:
5557
<<: *defaults
5658
locale_id: 512f99f8cd03c80affd16303fb5de9c2 # de
5759
tags: Onboarding,Shop
5860
- file: ./ui-toolkit/src/main/res/values-fr/strings.xml
61+
project_id: *id_core
5962
params:
6063
<<: *defaults
6164
locale_id: edf0b29dd998221329199f185d360ae4 # fr
6265
tags: Onboarding,Shop
6366
- file: ./ui-toolkit/src/main/res/values-fr-rCH/strings.xml
67+
project_id: *id_core
6468
params:
6569
<<: *defaults
6670
locale_id: fae2e092d1704da2ed88f3f56eb6f219 # fr-CH
6771
tags: Onboarding,Shop
6872
- file: ./ui-toolkit/src/main/res/values-hu/strings.xml
73+
project_id: *id_core
6974
params:
7075
<<: *defaults
7176
locale_id: 8f797bd77008e27f6286531a5ad55f67 # hu
7277
tags: Onboarding,Shop
7378
- file: ./ui-toolkit/src/main/res/values-it/strings.xml
79+
project_id: *id_core
7480
params:
7581
<<: *defaults
7682
locale_id: a4dea5c3e2c77e7c6ea344e69db63ed9 # it
7783
tags: Onboarding,Shop
7884
- file: ./ui-toolkit/src/main/res/values-sk/strings.xml
85+
project_id: *id_core
7986
params:
8087
<<: *defaults
8188
locale_id: 9ee4c528e480d56878c98ee8bfbc521b # sk
8289
tags: Onboarding,Shop
8390

8491
# kotlin-sample module
8592
- file: ./kotlin-sample/src/main/res/values/strings.xml
86-
params:
87-
<<: *defaults
88-
locale_id: b220db5757be359631c55ec54fb65ac6 # en-US
89-
tags: Sample
93+
project_id: &id_sample 02f8f3eb9dabfb0aa81565e94a450a78
94+
params: &sample
95+
locale_id: 8a496aa8b2a5b608340772cdac21a04f # en-US
96+
fallback_locale_id: 8a496aa8b2a5b608340772cdac21a04f # en-US
97+
include_empty_translations: true
98+
format_options:
99+
convert_placeholder: true
100+
escape_linebreaks: true
90101
- file: ./kotlin-sample/src/main/res/values-de/strings.xml
102+
project_id: *id_sample
91103
params:
92-
<<: *defaults
93-
locale_id: 512f99f8cd03c80affd16303fb5de9c2 # de
94-
tags: Sample
104+
<<: *sample
105+
locale_id: 13770d8e586ebda4408ab2c847520941 # de
95106
- file: ./kotlin-sample/src/main/res/values-fr/strings.xml
107+
project_id: *id_sample
96108
params:
97-
<<: *defaults
98-
locale_id: edf0b29dd998221329199f185d360ae4 # fr
99-
tags: Sample
109+
<<: *sample
110+
locale_id: 6745aa0eb2ceabbe5896d06693ce167a # fr
100111
- file: ./kotlin-sample/src/main/res/values-fr-rCH/strings.xml
112+
project_id: *id_sample
101113
params:
102-
<<: *defaults
103-
locale_id: fae2e092d1704da2ed88f3f56eb6f219 # fr-CH
104-
tags: Sample
114+
<<: *sample
115+
locale_id: ab0af54393819090368225ef021ab08e # fr-CH
105116
- file: ./kotlin-sample/src/main/res/values-hu/strings.xml
117+
project_id: *id_sample
106118
params:
107-
<<: *defaults
108-
locale_id: 8f797bd77008e27f6286531a5ad55f67 # hu
109-
tags: Sample
119+
<<: *sample
120+
locale_id: fc083051fda750bca9f1d46086e39d11 # hu
110121
- file: ./kotlin-sample/src/main/res/values-it/strings.xml
122+
project_id: *id_sample
111123
params:
112-
<<: *defaults
113-
locale_id: a4dea5c3e2c77e7c6ea344e69db63ed9 # it
114-
tags: Sample
124+
<<: *sample
125+
locale_id: 5eefa9c0b0961371fd9c771066c7f9e5 # it
115126
- file: ./kotlin-sample/src/main/res/values-sk/strings.xml
127+
project_id: *id_sample
116128
params:
117-
<<: *defaults
118-
locale_id: 9ee4c528e480d56878c98ee8bfbc521b # sk
119-
tags: Sample
129+
<<: *sample
130+
locale_id: 1edff90fbc4524afa8b3678650211fac # sk

CHANGELOG.md

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,16 @@
11
# Changelog
22
All notable changes to this project will be documented in this file.
33

4-
## [0.69.0] (not yet released)
4+
## [0.69.0]
55

66
### Changed
77
- Added ui-toolkit for more realistic sample app with onboarding
88
- Moved accessibility toolbox to an own dependency
9+
- Report cart change events only on user interactions (#67)
10+
- Phrase content and keys updated
911

1012
### Breaking Changes
11-
- Renamed some colors which should be only used internal only
13+
- Renamed some colors which should be used internally only
1214

1315
## [0.68.6]
1416

kotlin-customization-sample/src/main/res/layout/product_dialog.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,4 +22,4 @@
2222
android:layout_marginRight="16dp"
2323
android:text="@string/Snabble.Scanner.addToCart" />
2424

25-
</LinearLayout>
25+
</LinearLayout>

kotlin-sample/src/main/res/menu/bottom_nav_menu.xml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,22 +4,22 @@
44
<item
55
android:id="@+id/navigation_home"
66
android:icon="@drawable/ic_home_black_24dp"
7-
android:title="@string/Sample.home" />
7+
android:title="@string/home" />
88

99
<item
1010
android:id="@+id/navigation_scanner"
1111
android:icon="@drawable/ic_baseline_linked_camera_24"
12-
android:title="@string/Sample.scanner" />
12+
android:title="@string/scanner" />
1313

1414
<item
1515
android:id="@id/navigation_shop"
1616
android:icon="@drawable/ic_baseline_menu_24"
17-
android:title="@string/Sample.shops" />
17+
android:title="@string/shops" />
1818

1919
<item
2020
android:id="@+id/navigation_cart"
2121
android:icon="@drawable/ic_baseline_shopping_cart_24"
22-
android:title="@string/Sample.shoppingCart" />
22+
android:title="@string/shoppingCart" />
2323

2424
<!-- <item-->
2525
<!-- android:id="@+id/navigation_dummy_cart"-->

kotlin-sample/src/main/res/navigation/mobile_navigation.xml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
app:argType="string" />
2020
<argument
2121
android:name="headerTitle"
22-
android:defaultValue="@string/Sample.Onboarding.message3"
22+
android:defaultValue="@string/Onboarding.message3"
2323
app:argType="reference" />
2424
<argument
2525
android:name="hideBottomNavigation"
@@ -51,12 +51,12 @@
5151
<fragment
5252
android:id="@+id/navigation_home"
5353
android:name="io.snabble.sdk.sample.HomeFragment"
54-
android:label="@string/Sample.home" />
54+
android:label="@string/home" />
5555

5656
<fragment
5757
android:id="@+id/navigation_scanner"
5858
android:name="io.snabble.sdk.ui.scanner.SelfScanningFragment"
59-
android:label="@string/Sample.scanner">
59+
android:label="@string/scanner">
6060
<argument
6161
android:name="showProductCode"
6262
app:argType="string" />
@@ -65,7 +65,7 @@
6565
<fragment
6666
android:id="@+id/navigation_cart"
6767
android:name="io.snabble.sdk.ui.cart.ShoppingCartFragment"
68-
android:label="@string/Sample.shoppingCart" />
68+
android:label="@string/shoppingCart" />
6969

7070
<navigation
7171
android:id="@+id/navigation_shop"
@@ -86,7 +86,7 @@
8686
<fragment
8787
android:id="@+id/navigation_dummy_cart"
8888
android:name="io.snabble.sdk.sample.CustomShoppingCartDummy"
89-
android:label="@string/Sample.shoppingCart" />
89+
android:label="@string/shoppingCart" />
9090

9191
<fragment
9292
android:id="@+id/navigation_barcode_search"
Lines changed: 25 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,28 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<resources>
3-
<string name="Sample.Dashboard.button">Jetzt starten</string>
4-
<string name="Sample.Dashboard.Information.text1">Hinterlege direkt ein Bezahlverfahren, um schon bei deinem ersten Einkauf ohne Wartezeit einzukaufen.</string>
5-
<string name="Sample.Dashboard.Information.text2">Nutze die Vorteile deiner Kundenkarten automatisch.</string>
6-
<string name="Sample.Dashboard.text">Besuche eine unterstütze Filiale, um mit Snabble einzukaufen!</string>
7-
<string name="Sample.Dashboard.title">Willkommen bei Snabble</string>
8-
<string name="Sample.home">Start</string>
9-
<string name="Sample.Onboarding.accept">Akzeptieren</string>
10-
<string name="Sample.Onboarding.message1">Mit Snabble scannst du deinen Einkauf selbst und bezahlt direkt in der App. Ohne in der Schlange zu stehen und ohne deinen Einkauf auf’s Band zu legen.</string>
11-
<string name="Sample.Onboarding.message2">Betrete eine teilnehmende Filiale, starte den Einkauf und halte den Barcode eines Artikels vor die Kamera. Der Rest erklärt sich von selbst.</string>
12-
<string name="Sample.Onboarding.message3">Bitte akzeptiere die Nutzungsbedingungen und lies die Datenschutzhinweise.</string>
13-
<string name="Sample.profile">Profil</string>
14-
<string name="Sample.scanner">Scanner</string>
15-
<string name="Sample.Section.Profile.deleteAccount">Account löschen</string>
16-
<string name="Sample.Section.Profile.header">Dein Profil</string>
17-
<string name="Sample.Section.Profile.paymentMethods">Bezahlverfahren</string>
18-
<string name="Sample.Section.Profile.saveEnergy">Strom sparen</string>
19-
<string name="Sample.Section.Profile.showOnboarding">Zeige Onboarding</string>
20-
<string name="Sample.shoppingCart">Warenkorb</string>
21-
<string name="Sample.shops">Filialen</string>
3+
<string name="Dashboard.text">Besuche eine unterstütze Filiale, um mit Snabble einzukaufen!</string>
4+
<string name="Dashboard.title">Willkommen bei Snabble</string>
5+
<string name="home">Start</string>
6+
<string name="Onboarding.accept">Akzeptieren</string>
7+
<string name="Onboarding.message1">Mit Snabble scannst du deinen Einkauf selbst und bezahlt direkt in der App. Ohne in der Schlange zu stehen und ohne deinen Einkauf auf’s Band zu legen.</string>
8+
<string name="Onboarding.message2">Betrete eine teilnehmende Filiale, starte den Einkauf und halte den Barcode eines Artikels vor die Kamera. Der Rest erklärt sich von selbst.</string>
9+
<string name="Onboarding.message3">Bitte akzeptiere die Nutzungsbedingungen und lies die Datenschutzhinweise.</string>
10+
<string name="profile">Profil</string>
11+
<string name="Profile.customerCard">Kundenkarte</string>
12+
<string name="Profile.deleteAccount">Account löschen</string>
13+
<string name="Profile.header">Dein Profil</string>
14+
<string name="Profile.imprint">Impressum</string>
15+
<string name="Profile.lastPurchases">Vorherige Einkäufe</string>
16+
<string name="Profile.legalNotes">Rechtliche Hinweise</string>
17+
<string name="Profile.licences">Lizenzen</string>
18+
<string name="Profile.paymentMethods">Bezahlverfahren</string>
19+
<string name="Profile.privacy">Datenschutzerklärung</string>
20+
<string name="Profile.pushMessages">Push-Benachrichtigungen</string>
21+
<string name="Profile.saveEnergy">Strom sparen</string>
22+
<string name="Profile.settings">Einstellungen</string>
23+
<string name="Profile.showOnboarding">Zeige Onboarding</string>
24+
<string name="Profile.terms">Nutzungsbedingungen</string>
25+
<string name="scanner">Scanner</string>
26+
<string name="shoppingCart">Warenkorb</string>
27+
<string name="shops">Filialen</string>
2228
</resources>
Lines changed: 25 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,28 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<resources>
3-
<string name="Sample.Dashboard.button">Start now</string>
4-
<string name="Sample.Dashboard.Information.text1">You can choose a payment method directly to make your first purchase without having to wait.</string>
5-
<string name="Sample.Dashboard.Information.text2">Take advantage of your store cards automatically.</string>
6-
<string name="Sample.Dashboard.text">Visit a supported store to shop with Snabble!</string>
7-
<string name="Sample.Dashboard.title">Welcome to Snabble</string>
8-
<string name="Sample.home">Start</string>
9-
<string name="Sample.Onboarding.accept">Agree</string>
10-
<string name="Sample.Onboarding.message1">Using Snabble, you scan your purchase yourself and pay directly in the app. No queueing and without putting your purchase on the belt.</string>
11-
<string name="Sample.Onboarding.message2">Enter a participating store, start shopping and hold the barcode of an article in front of the camera. The rest is self-explanatory.</string>
12-
<string name="Sample.Onboarding.message3">Please accept the terms of use and take note of the privacy policy.</string>
13-
<string name="Sample.profile">Profile</string>
14-
<string name="Sample.scanner">Scanner</string>
15-
<string name="Sample.Section.Profile.deleteAccount">Delete Account</string>
16-
<string name="Sample.Section.Profile.header">Your Profile</string>
17-
<string name="Sample.Section.Profile.paymentMethods">Payment Methods</string>
18-
<string name="Sample.Section.Profile.saveEnergy">Save energy</string>
19-
<string name="Sample.Section.Profile.showOnboarding">Show Onboarding</string>
20-
<string name="Sample.shoppingCart">Shopping Cart</string>
21-
<string name="Sample.shops">Shops</string>
3+
<string name="Dashboard.text">Visit a supported store to shop with Snabble!</string>
4+
<string name="Dashboard.title">Welcome to Snabble</string>
5+
<string name="home">Start</string>
6+
<string name="Onboarding.accept">Agree</string>
7+
<string name="Onboarding.message1">Using Snabble, you scan your purchase yourself and pay directly in the app. No queueing and without putting your purchase on the belt.</string>
8+
<string name="Onboarding.message2">Enter a participating store, start shopping and hold the barcode of an article in front of the camera. The rest is self-explanatory.</string>
9+
<string name="Onboarding.message3">Please accept the terms of use and take note of the privacy policy.</string>
10+
<string name="profile">Profile</string>
11+
<string name="Profile.customerCard">Customer Card</string>
12+
<string name="Profile.deleteAccount">Delete Account</string>
13+
<string name="Profile.header">Your Profile</string>
14+
<string name="Profile.imprint">Imprint</string>
15+
<string name="Profile.lastPurchases">Last Purchases</string>
16+
<string name="Profile.legalNotes">Legal Notes</string>
17+
<string name="Profile.licences">Licences</string>
18+
<string name="Profile.paymentMethods">Payment Methods</string>
19+
<string name="Profile.privacy">Privacy Policy</string>
20+
<string name="Profile.pushMessages">Push Messages</string>
21+
<string name="Profile.saveEnergy">Save energy</string>
22+
<string name="Profile.settings">Settings</string>
23+
<string name="Profile.showOnboarding">Show Onboarding</string>
24+
<string name="Profile.terms">Terms</string>
25+
<string name="scanner">Scanner</string>
26+
<string name="shoppingCart">Shopping Cart</string>
27+
<string name="shops">Shops</string>
2228
</resources>

0 commit comments

Comments
 (0)