Bump to SDK 2.11.1

iZettle · Feb 12, 2024 · 1a5d331 · 1a5d331
1 parent 6bfef75
commit 1a5d331
Show file tree

Hide file tree

Showing 7 changed files with 13 additions and 12 deletions.
diff --git a/Examples/Example-Java/app/src/main/res/values/colors.xml b/Examples/Example-Java/app/src/main/res/values/colors.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <color name="colorPrimary">#A18EF0</color>
-    <color name="colorPrimaryDark">#192550</color>
-    <color name="colorAccent">#81DBA2</color>
+    <color name="colorPrimary">@color/brandLilac</color>
+    <color name="colorPrimaryDark">@color/brandMagnetic</color>
+    <color name="colorAccent">@color/brandMint</color>
     <color name="divider">#BEBEBE</color>
     <color name="divider_text">#BEBEBE</color>
 </resources>
diff --git a/Examples/Example-Java/app/src/main/res/values/styles.xml b/Examples/Example-Java/app/src/main/res/values/styles.xml
@@ -1,11 +1,12 @@
 <resources>
 
     <!-- Base application theme. -->
-    <style name="AppTheme" parent="Theme.MaterialComponents.Light.NoActionBar">
+    <style name="AppTheme" parent="Theme.AppCompat.Light.NoActionBar">
         <!-- Customize your theme here. -->
         <item name="colorPrimary">@color/colorPrimary</item>
         <item name="colorPrimaryDark">@color/colorPrimaryDark</item>
         <item name="colorAccent">@color/colorAccent</item>
+        <item name="colorSurface">@color/colorAccent</item>
     </style>
 
 </resources>
diff --git a/Examples/Example-Java/build.gradle b/Examples/Example-Java/build.gradle
@@ -2,7 +2,7 @@
 
 buildscript {
 
-    ext.zettle_version = '2.6.7'
+    ext.zettle_version = '2.11.1'
 
     apply from: 'zettleSDK.gradle'
 

diff --git a/Examples/Example-Kotlin/app/src/main/AndroidManifest.xml b/Examples/Example-Kotlin/app/src/main/AndroidManifest.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    package="com.zettle.payments.android.kotlin_example">
+    xmlns:tools="http://schemas.android.com/tools">
 
     <application
         android:name=".MainApplication"

diff --git a/Examples/Example-Kotlin/app/src/main/res/values/colors.xml b/Examples/Example-Kotlin/app/src/main/res/values/colors.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <color name="colorPrimary">#A18EF0</color>
-    <color name="colorPrimaryDark">#192550</color>
-    <color name="colorAccent">#81DBA2</color>
+    <color name="colorPrimary">@color/brandLilac</color>
+    <color name="colorPrimaryDark">@color/brandMagnetic</color>
+    <color name="colorAccent">@color/brandMint</color>
     <color name="divider">#BEBEBE</color>
     <color name="divider_text">#BEBEBE</color>
 </resources>
diff --git a/Examples/Example-Kotlin/app/src/main/res/values/styles.xml b/Examples/Example-Kotlin/app/src/main/res/values/styles.xml
@@ -1,11 +1,12 @@
 <resources>
 
     <!-- Base application theme. -->
-    <style name="AppTheme" parent="Theme.MaterialComponents.Light.NoActionBar">
+    <style name="AppTheme" parent="Theme.AppCompat.Light.NoActionBar">
         <!-- Customize your theme here. -->
         <item name="colorPrimary">@color/colorPrimary</item>
         <item name="colorPrimaryDark">@color/colorPrimaryDark</item>
         <item name="colorAccent">@color/colorAccent</item>
+        <item name="colorSurface">@color/colorAccent</item>
     </style>
 
 </resources>
diff --git a/Examples/Example-Kotlin/build.gradle b/Examples/Example-Kotlin/build.gradle
@@ -3,7 +3,7 @@
 buildscript {
 
     ext.kotlin_version = '1.8.22'
-    ext.zettle_version = '2.6.7'
+    ext.zettle_version = '2.11.1'
 
     apply from: 'zettleSDK.gradle'