Preparations for release of version 0.69.0 (#68)

* Phrase pull w/ new keys and content
* CHANGELOG adjusted

Author: cmaier

.phrase.yml

@@ -1,119 +1,130 @@
 # Configuration for Android projects: https://help.phrase.com/help/examples
 phrase:
-  project_id: 3e43b3f90cf19e83c7d85652df5766ca
   file_format: xml
   pull:
     targets:
       # ui module
       - file: ./ui/src/main/res/values/strings.xml
+        project_id: &id_core 3e43b3f90cf19e83c7d85652df5766ca
         params: &defaults
           locale_id: b220db5757be359631c55ec54fb65ac6 # en-US
           fallback_locale_id: b220db5757be359631c55ec54fb65ac6 # en-US
-          tags: SDK,Coupons
           include_empty_translations: true
           format_options:
             convert_placeholder: true
             escape_linebreaks: true
       - file: ./ui/src/main/res/values-de/strings.xml
+        project_id: *id_core
         params:
           <<: *defaults
           locale_id: 512f99f8cd03c80affd16303fb5de9c2 # de
       - file: ./ui/src/main/res/values-fr/strings.xml
+        project_id: *id_core
         params:
           <<: *defaults
           locale_id: edf0b29dd998221329199f185d360ae4 # fr
       - file: ./ui/src/main/res/values-fr-rCH/strings.xml
+        project_id: *id_core
         params:
           <<: *defaults
           locale_id: fae2e092d1704da2ed88f3f56eb6f219 # fr-CH
       - file: ./ui/src/main/res/values-hu/strings.xml
+        project_id: *id_core
         params:
           <<: *defaults
           locale_id: 8f797bd77008e27f6286531a5ad55f67 # hu
       - file: ./ui/src/main/res/values-it/strings.xml
+        project_id: *id_core
         params:
           <<: *defaults
           locale_id: a4dea5c3e2c77e7c6ea344e69db63ed9 # it
       - file: ./ui/src/main/res/values-sk/strings.xml
+        project_id: *id_core
         params:
           <<: *defaults
           locale_id: 9ee4c528e480d56878c98ee8bfbc521b # sk
 
       # ui-toolkit module
-      - file: ./ui-toolkit/src/debug/res/values/strings.xml
-        params:
-          <<: *defaults
-          locale_id: b220db5757be359631c55ec54fb65ac6 # en-US
-          tags: Sample
       - file: ./ui-toolkit/src/main/res/values/strings.xml
+        project_id: *id_core
         params:
           <<: *defaults
           locale_id: b220db5757be359631c55ec54fb65ac6 # en-US
           tags: Onboarding,Shop
       - file: ./ui-toolkit/src/main/res/values-de/strings.xml
+        project_id: *id_core
         params:
           <<: *defaults
           locale_id: 512f99f8cd03c80affd16303fb5de9c2 # de
           tags: Onboarding,Shop
       - file: ./ui-toolkit/src/main/res/values-fr/strings.xml
+        project_id: *id_core
         params:
           <<: *defaults
           locale_id: edf0b29dd998221329199f185d360ae4 # fr
           tags: Onboarding,Shop
       - file: ./ui-toolkit/src/main/res/values-fr-rCH/strings.xml
+        project_id: *id_core
         params:
           <<: *defaults
           locale_id: fae2e092d1704da2ed88f3f56eb6f219 # fr-CH
           tags: Onboarding,Shop
       - file: ./ui-toolkit/src/main/res/values-hu/strings.xml
+        project_id: *id_core
         params:
           <<: *defaults
           locale_id: 8f797bd77008e27f6286531a5ad55f67 # hu
           tags: Onboarding,Shop
       - file: ./ui-toolkit/src/main/res/values-it/strings.xml
+        project_id: *id_core
         params:
           <<: *defaults
           locale_id: a4dea5c3e2c77e7c6ea344e69db63ed9 # it
           tags: Onboarding,Shop
       - file: ./ui-toolkit/src/main/res/values-sk/strings.xml
+        project_id: *id_core
         params:
           <<: *defaults
           locale_id: 9ee4c528e480d56878c98ee8bfbc521b # sk
           tags: Onboarding,Shop
 
       # kotlin-sample module
       - file: ./kotlin-sample/src/main/res/values/strings.xml
-        params:
-          <<: *defaults
-          locale_id: b220db5757be359631c55ec54fb65ac6 # en-US
-          tags: Sample
+        project_id: &id_sample 02f8f3eb9dabfb0aa81565e94a450a78
+        params: &sample
+          locale_id: 8a496aa8b2a5b608340772cdac21a04f # en-US
+          fallback_locale_id: 8a496aa8b2a5b608340772cdac21a04f # en-US
+          include_empty_translations: true
+          format_options:
+            convert_placeholder: true
+            escape_linebreaks: true
       - file: ./kotlin-sample/src/main/res/values-de/strings.xml
+        project_id: *id_sample
         params:
-          <<: *defaults
-          locale_id: 512f99f8cd03c80affd16303fb5de9c2 # de
-          tags: Sample
+          <<: *sample
+          locale_id: 13770d8e586ebda4408ab2c847520941 # de
       - file: ./kotlin-sample/src/main/res/values-fr/strings.xml
+        project_id: *id_sample
         params:
-          <<: *defaults
-          locale_id: edf0b29dd998221329199f185d360ae4 # fr
-          tags: Sample
+          <<: *sample
+          locale_id: 6745aa0eb2ceabbe5896d06693ce167a # fr
       - file: ./kotlin-sample/src/main/res/values-fr-rCH/strings.xml
+        project_id: *id_sample
         params:
-          <<: *defaults
-          locale_id: fae2e092d1704da2ed88f3f56eb6f219 # fr-CH
-          tags: Sample
+          <<: *sample
+          locale_id: ab0af54393819090368225ef021ab08e # fr-CH
       - file: ./kotlin-sample/src/main/res/values-hu/strings.xml
+        project_id: *id_sample
         params:
-          <<: *defaults
-          locale_id: 8f797bd77008e27f6286531a5ad55f67 # hu
-          tags: Sample
+          <<: *sample
+          locale_id: fc083051fda750bca9f1d46086e39d11 # hu
       - file: ./kotlin-sample/src/main/res/values-it/strings.xml
+        project_id: *id_sample
         params:
-          <<: *defaults
-          locale_id: a4dea5c3e2c77e7c6ea344e69db63ed9 # it
-          tags: Sample
+          <<: *sample
+          locale_id: 5eefa9c0b0961371fd9c771066c7f9e5 # it
       - file: ./kotlin-sample/src/main/res/values-sk/strings.xml
+        project_id: *id_sample
         params:
-          <<: *defaults
-          locale_id: 9ee4c528e480d56878c98ee8bfbc521b # sk
-          tags: Sample
+          <<: *sample
+          locale_id: 1edff90fbc4524afa8b3678650211fac # sk

CHANGELOG.md

@@ -1,14 +1,16 @@
 # Changelog
 All notable changes to this project will be documented in this file.
 
-## [0.69.0] (not yet released)
+## [0.69.0]
 
 ### Changed
 - Added ui-toolkit for more realistic sample app with onboarding
 - Moved accessibility toolbox to an own dependency
+- Report cart change events only on user interactions (#67)
+- Phrase content and keys updated
 
 ### Breaking Changes
-- Renamed some colors which should be only used internal only
+- Renamed some colors which should be used internally only
 
 ## [0.68.6]
 

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

@@ -22,4 +22,4 @@
         android:layout_marginRight="16dp"
         android:text="@string/Snabble.Scanner.addToCart" />
 
-</LinearLayout>
+</LinearLayout>

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

@@ -4,22 +4,22 @@
     <item
         android:id="@+id/navigation_home"
         android:icon="@drawable/ic_home_black_24dp"
-        android:title="@string/Sample.home" />
+        android:title="@string/home" />
 
     <item
         android:id="@+id/navigation_scanner"
         android:icon="@drawable/ic_baseline_linked_camera_24"
-        android:title="@string/Sample.scanner" />
+        android:title="@string/scanner" />
 
     <item
         android:id="@id/navigation_shop"
         android:icon="@drawable/ic_baseline_menu_24"
-        android:title="@string/Sample.shops" />
+        android:title="@string/shops" />
 
     <item
         android:id="@+id/navigation_cart"
         android:icon="@drawable/ic_baseline_shopping_cart_24"
-        android:title="@string/Sample.shoppingCart" />
+        android:title="@string/shoppingCart" />
 
     <!--    <item-->
     <!--        android:id="@+id/navigation_dummy_cart"-->

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

@@ -19,7 +19,7 @@
             app:argType="string" />
         <argument
             android:name="headerTitle"
-            android:defaultValue="@string/Sample.Onboarding.message3"
+            android:defaultValue="@string/Onboarding.message3"
             app:argType="reference" />
         <argument
             android:name="hideBottomNavigation"
@@ -51,12 +51,12 @@
     <fragment
         android:id="@+id/navigation_home"
         android:name="io.snabble.sdk.sample.HomeFragment"
-        android:label="@string/Sample.home" />
+        android:label="@string/home" />
 
     <fragment
         android:id="@+id/navigation_scanner"
         android:name="io.snabble.sdk.ui.scanner.SelfScanningFragment"
-        android:label="@string/Sample.scanner">
+        android:label="@string/scanner">
         <argument
             android:name="showProductCode"
             app:argType="string" />
@@ -65,7 +65,7 @@
     <fragment
         android:id="@+id/navigation_cart"
         android:name="io.snabble.sdk.ui.cart.ShoppingCartFragment"
-        android:label="@string/Sample.shoppingCart" />
+        android:label="@string/shoppingCart" />
 
     <navigation
         android:id="@+id/navigation_shop"
@@ -86,7 +86,7 @@
     <fragment
         android:id="@+id/navigation_dummy_cart"
         android:name="io.snabble.sdk.sample.CustomShoppingCartDummy"
-        android:label="@string/Sample.shoppingCart" />
+        android:label="@string/shoppingCart" />
 
     <fragment
         android:id="@+id/navigation_barcode_search"

kotlin-sample/src/main/res/values-de/strings.xml

@@ -1,22 +1,28 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <resources>
-    <string name="Sample.Dashboard.button">Jetzt starten</string>
-    <string name="Sample.Dashboard.Information.text1">Hinterlege direkt ein Bezahlverfahren, um schon bei deinem ersten Einkauf ohne Wartezeit einzukaufen.</string>
-    <string name="Sample.Dashboard.Information.text2">Nutze die Vorteile deiner Kundenkarten automatisch.</string>
-    <string name="Sample.Dashboard.text">Besuche eine unterstütze Filiale, um mit Snabble einzukaufen!</string>
-    <string name="Sample.Dashboard.title">Willkommen bei Snabble</string>
-    <string name="Sample.home">Start</string>
-    <string name="Sample.Onboarding.accept">Akzeptieren</string>
-    <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>
-    <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>
-    <string name="Sample.Onboarding.message3">Bitte akzeptiere die Nutzungsbedingungen und lies die Datenschutzhinweise.</string>
-    <string name="Sample.profile">Profil</string>
-    <string name="Sample.scanner">Scanner</string>
-    <string name="Sample.Section.Profile.deleteAccount">Account löschen</string>
-    <string name="Sample.Section.Profile.header">Dein Profil</string>
-    <string name="Sample.Section.Profile.paymentMethods">Bezahlverfahren</string>
-    <string name="Sample.Section.Profile.saveEnergy">Strom sparen</string>
-    <string name="Sample.Section.Profile.showOnboarding">Zeige Onboarding</string>
-    <string name="Sample.shoppingCart">Warenkorb</string>
-    <string name="Sample.shops">Filialen</string>
+    <string name="Dashboard.text">Besuche eine unterstütze Filiale, um mit Snabble einzukaufen!</string>
+    <string name="Dashboard.title">Willkommen bei Snabble</string>
+    <string name="home">Start</string>
+    <string name="Onboarding.accept">Akzeptieren</string>
+    <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>
+    <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>
+    <string name="Onboarding.message3">Bitte akzeptiere die Nutzungsbedingungen und lies die Datenschutzhinweise.</string>
+    <string name="profile">Profil</string>
+    <string name="Profile.customerCard">Kundenkarte</string>
+    <string name="Profile.deleteAccount">Account löschen</string>
+    <string name="Profile.header">Dein Profil</string>
+    <string name="Profile.imprint">Impressum</string>
+    <string name="Profile.lastPurchases">Vorherige Einkäufe</string>
+    <string name="Profile.legalNotes">Rechtliche Hinweise</string>
+    <string name="Profile.licences">Lizenzen</string>
+    <string name="Profile.paymentMethods">Bezahlverfahren</string>
+    <string name="Profile.privacy">Datenschutzerklärung</string>
+    <string name="Profile.pushMessages">Push-Benachrichtigungen</string>
+    <string name="Profile.saveEnergy">Strom sparen</string>
+    <string name="Profile.settings">Einstellungen</string>
+    <string name="Profile.showOnboarding">Zeige Onboarding</string>
+    <string name="Profile.terms">Nutzungsbedingungen</string>
+    <string name="scanner">Scanner</string>
+    <string name="shoppingCart">Warenkorb</string>
+    <string name="shops">Filialen</string>
 </resources>

kotlin-sample/src/main/res/values-fr-rCH/strings.xml

@@ -1,22 +1,28 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <resources>
-    <string name="Sample.Dashboard.button">Start now</string>
-    <string name="Sample.Dashboard.Information.text1">You can choose a payment method directly to make your first purchase without having to wait.</string>
-    <string name="Sample.Dashboard.Information.text2">Take advantage of your store cards automatically.</string>
-    <string name="Sample.Dashboard.text">Visit a supported store to shop with Snabble!</string>
-    <string name="Sample.Dashboard.title">Welcome to Snabble</string>
-    <string name="Sample.home">Start</string>
-    <string name="Sample.Onboarding.accept">Agree</string>
-    <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>
-    <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>
-    <string name="Sample.Onboarding.message3">Please accept the terms of use and take note of the privacy policy.</string>
-    <string name="Sample.profile">Profile</string>
-    <string name="Sample.scanner">Scanner</string>
-    <string name="Sample.Section.Profile.deleteAccount">Delete Account</string>
-    <string name="Sample.Section.Profile.header">Your Profile</string>
-    <string name="Sample.Section.Profile.paymentMethods">Payment Methods</string>
-    <string name="Sample.Section.Profile.saveEnergy">Save energy</string>
-    <string name="Sample.Section.Profile.showOnboarding">Show Onboarding</string>
-    <string name="Sample.shoppingCart">Shopping Cart</string>
-    <string name="Sample.shops">Shops</string>
+    <string name="Dashboard.text">Visit a supported store to shop with Snabble!</string>
+    <string name="Dashboard.title">Welcome to Snabble</string>
+    <string name="home">Start</string>
+    <string name="Onboarding.accept">Agree</string>
+    <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>
+    <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>
+    <string name="Onboarding.message3">Please accept the terms of use and take note of the privacy policy.</string>
+    <string name="profile">Profile</string>
+    <string name="Profile.customerCard">Customer Card</string>
+    <string name="Profile.deleteAccount">Delete Account</string>
+    <string name="Profile.header">Your Profile</string>
+    <string name="Profile.imprint">Imprint</string>
+    <string name="Profile.lastPurchases">Last Purchases</string>
+    <string name="Profile.legalNotes">Legal Notes</string>
+    <string name="Profile.licences">Licences</string>
+    <string name="Profile.paymentMethods">Payment Methods</string>
+    <string name="Profile.privacy">Privacy Policy</string>
+    <string name="Profile.pushMessages">Push Messages</string>
+    <string name="Profile.saveEnergy">Save energy</string>
+    <string name="Profile.settings">Settings</string>
+    <string name="Profile.showOnboarding">Show Onboarding</string>
+    <string name="Profile.terms">Terms</string>
+    <string name="scanner">Scanner</string>
+    <string name="shoppingCart">Shopping Cart</string>
+    <string name="shops">Shops</string>
 </resources>