From 19cfd3674f2c4c07b1fed8d0c906418c07524c6f Mon Sep 17 00:00:00 2001
From: Steve Grosbois <steve@playmoweb.com>
Date: Wed, 5 Feb 2020 11:42:47 +0100
Subject: [PATCH] Added a themeable attribute to change the close button color

---
 README.md                                     | 12 +++++++++
 android-sdk/build.gradle                      |  2 +-
 .../src/main/res/layout/activity_payment.xml  | 12 ++++-----
 .../src/main/res/layout/activity_wallet.xml   | 26 +++++++++----------
 android-sdk/src/main/res/values/attrs.xml     |  4 +++
 android-sdk/src/main/res/values/colors.xml    |  4 +++
 android-sdk/src/main/res/values/styles.xml    |  7 +++--
 build.gradle                                  |  4 +--
 8 files changed, 47 insertions(+), 24 deletions(-)
 create mode 100644 android-sdk/src/main/res/values/attrs.xml
 create mode 100644 android-sdk/src/main/res/values/colors.xml

diff --git a/README.md b/README.md
index 175b272..980a974 100644
--- a/README.md
+++ b/README.md
@@ -71,6 +71,18 @@ walletController.manageWebWallet(uri)
 Ces deux méthodes requièrent l'uri de la page vers laquelle nous devons être redirigés. La récupération du paramètre `uri` se fera selon vos choix d'implementation.
 Pour plus d'informations, veuillez vous référer à la documentation Payline en cliquant [ici](https://support.payline.com/hc/fr/articles/360000844007-PW-Int%C3%A9gration-Widget)
 
+### Personnalisation
+
+Vous pouvez personnaliser certains attributs de la page de paiement et de la page de gestion du portefeuille en surchargeant le theme du SDK.
+
+```xml
+    <!-- Override Payline Theme -->
+    <style name="AppTheme.PaylineSDK">
+        <item name="closeButtonColor">@color/my_button_color</item>
+    </style>
+```
+
+- `closeButtonColor` : Couleur de la croix permettant de fermer la page.
 
 # Payline Documentation
 
diff --git a/android-sdk/build.gradle b/android-sdk/build.gradle
index 38deb61..9273e99 100644
--- a/android-sdk/build.gradle
+++ b/android-sdk/build.gradle
@@ -46,7 +46,7 @@ android {
 dependencies {
 
     implementation 'androidx.appcompat:appcompat:1.1.0'
-    implementation 'androidx.lifecycle:lifecycle-extensions:2.1.0'
+    implementation 'androidx.lifecycle:lifecycle-extensions:2.2.0'
     implementation 'com.google.android.material:material:1.0.0'
 
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
diff --git a/android-sdk/src/main/res/layout/activity_payment.xml b/android-sdk/src/main/res/layout/activity_payment.xml
index 6516823..fd86ff8 100644
--- a/android-sdk/src/main/res/layout/activity_payment.xml
+++ b/android-sdk/src/main/res/layout/activity_payment.xml
@@ -2,32 +2,32 @@
 <androidx.coordinatorlayout.widget.CoordinatorLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="match_parent">
 
     <FrameLayout
         android:id="@+id/frameLayout_fragmentContainer"
         android:layout_width="match_parent"
-        android:layout_height="match_parent"/>
+        android:layout_height="match_parent" />
 
     <ImageView
+        android:id="@+id/b_cancel_payment_activity"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:src="@drawable/ic_cross"
         android:layout_gravity="end"
         android:layout_margin="16dp"
-        android:id="@+id/b_cancel_payment_activity"/>
+        android:src="@drawable/ic_cross"
+        android:tint="?closeButtonColor" />
 
     <androidx.core.widget.ContentLoadingProgressBar
         android:id="@+id/progressBar"
         style="?android:attr/progressBarStyleLarge"
         android:layout_width="@dimen/progress_dialog_size"
         android:layout_height="@dimen/progress_dialog_size"
-        android:layout_margin="@dimen/standard_margin"
         android:layout_gravity="center"
+        android:layout_margin="@dimen/standard_margin"
         android:indeterminate="true"
         android:visibility="gone"
-        tools:visibility="visible"/>
+        tools:visibility="visible" />
 
 </androidx.coordinatorlayout.widget.CoordinatorLayout>
diff --git a/android-sdk/src/main/res/layout/activity_wallet.xml b/android-sdk/src/main/res/layout/activity_wallet.xml
index 164a3b9..56d14e6 100644
--- a/android-sdk/src/main/res/layout/activity_wallet.xml
+++ b/android-sdk/src/main/res/layout/activity_wallet.xml
@@ -2,30 +2,30 @@
 <androidx.coordinatorlayout.widget.CoordinatorLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    xmlns:app="http://schemas.android.com/apk/res-auto">
+    android:layout_height="match_parent">
 
     <FrameLayout
         android:id="@+id/frameLayout_fragmentContainer_wallet"
         android:layout_width="match_parent"
-        android:layout_height="wrap_content" />
+        android:layout_height="match_parent" />
 
     <ImageView
+        android:id="@+id/b_cancel_wallet_activity"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:src="@drawable/ic_cross"
         android:layout_gravity="end"
         android:layout_margin="16dp"
-        android:id="@+id/b_cancel_wallet_activity"/>
+        android:src="@drawable/ic_cross"
+        android:tint="?closeButtonColor" />
 
     <androidx.core.widget.ContentLoadingProgressBar
-            android:id="@+id/progressBar"
-            style="@style/Widget.AppCompat.ProgressBar"
-            android:layout_width="@dimen/progress_dialog_size"
-            android:layout_height="@dimen/progress_dialog_size"
-            android:layout_margin="@dimen/standard_margin"
-            android:layout_gravity="center"
-            android:indeterminate="true"
-            android:visibility="gone" />
+        android:id="@+id/progressBar"
+        style="@style/Widget.AppCompat.ProgressBar"
+        android:layout_width="@dimen/progress_dialog_size"
+        android:layout_height="@dimen/progress_dialog_size"
+        android:layout_gravity="center"
+        android:layout_margin="@dimen/standard_margin"
+        android:indeterminate="true"
+        android:visibility="gone" />
 
 </androidx.coordinatorlayout.widget.CoordinatorLayout>
diff --git a/android-sdk/src/main/res/values/attrs.xml b/android-sdk/src/main/res/values/attrs.xml
new file mode 100644
index 0000000..ce80c40
--- /dev/null
+++ b/android-sdk/src/main/res/values/attrs.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <attr name="closeButtonColor" format="reference"/>
+</resources>
diff --git a/android-sdk/src/main/res/values/colors.xml b/android-sdk/src/main/res/values/colors.xml
new file mode 100644
index 0000000..6796aa7
--- /dev/null
+++ b/android-sdk/src/main/res/values/colors.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <color name="black">#000000</color>
+</resources>
diff --git a/android-sdk/src/main/res/values/styles.xml b/android-sdk/src/main/res/values/styles.xml
index 4d7cebc..ea25f2b 100644
--- a/android-sdk/src/main/res/values/styles.xml
+++ b/android-sdk/src/main/res/values/styles.xml
@@ -3,9 +3,12 @@
 
     <style name="AppTheme" parent="Theme.MaterialComponents.Light.DarkActionBar"/>
 
-    <style name="AppTheme.PaylineSDK">
+    <style name="AppTheme.BasePaylineSDK">
         <item name="windowNoTitle">true</item>
         <item name="windowActionBar">false</item>
+        <item name="closeButtonColor">@color/black</item>
     </style>
 
-</resources>
\ No newline at end of file
+    <style name="AppTheme.PaylineSDK" parent="AppTheme.BasePaylineSDK" />
+
+</resources>
diff --git a/build.gradle b/build.gradle
index e04ec42..b19cbd0 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,13 +1,13 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 
 buildscript {
-    ext.kotlin_version = '1.3.60'
+    ext.kotlin_version = '1.3.61'
     repositories {
         google()
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.5.2'
+        classpath 'com.android.tools.build:gradle:3.5.3'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
         classpath "org.jetbrains.dokka:dokka-android-gradle-plugin:0.9.17"
     }