From fb21a94810c78b534cf481bbef3d89753872b1e6 Mon Sep 17 00:00:00 2001
From: Gaurav Naresh Pandit <57807284+gnpandit12@users.noreply.github.com>
Date: Thu, 26 May 2022 19:55:28 +0530
Subject: [PATCH] SDK updated to version 0.6 (#5)

---
 README.md                                     |  5 ++--
 app/build.gradle                              | 11 ++++----
 app/src/main/AndroidManifest.xml              |  3 +--
 .../com/example/attestrapp/MainActivity.kt    | 26 +------------------
 .../main/res/layout-hdpi/activity_main.xml    | 11 --------
 .../main/res/layout-xhdpi/activity_main.xml   | 11 --------
 .../main/res/layout-xxhdpi/activity_main.xml  | 12 ---------
 app/src/main/res/layout/activity_main.xml     | 12 ---------
 build.gradle                                  |  4 +--
 gradle/wrapper/gradle-wrapper.properties      |  2 +-
 10 files changed, 13 insertions(+), 84 deletions(-)

diff --git a/README.md b/README.md
index c572107..0aa055b 100644
--- a/README.md
+++ b/README.md
@@ -14,8 +14,7 @@ Add this dependency to your project:
 <dependency>
  <groupId>com.attestr</groupId>
  <artifactId>attestr-flowx</artifactId>
- <version>0.4.0</version>
-</dependency>
+ <version>0.6</version>
 ```
 
 ### Gradle users
@@ -23,7 +22,7 @@ Add this dependency to your project:
 Add this dependency to your project's build file:
 
 ```groovy
-implementation "com.attestr:attestr-flowx:0.4.0"
+implementation "com.attestr:attestr-flowx:0.6"
 ```
 
 ## Usage
diff --git a/app/build.gradle b/app/build.gradle
index 7c19133..024b252 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -11,7 +11,7 @@ android {
         minSdk 21
         targetSdk 31
         versionCode 1
-        versionName "1.0"
+        versionName "2.0"
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
@@ -32,11 +32,12 @@ android {
     buildFeatures {
         viewBinding true
     }
+    namespace 'com.example.attestrapp'
 }
 
 dependencies {
-    implementation 'androidx.appcompat:appcompat:1.4.0'
-    implementation 'com.google.android.material:material:1.4.0'
-    implementation 'androidx.constraintlayout:constraintlayout:2.1.2'
-    implementation "com.attestr:attestr-flowx:0.4.0"
+    implementation 'androidx.appcompat:appcompat:1.4.1'
+    implementation 'com.google.android.material:material:1.6.0'
+    implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
+    implementation 'com.attestr:attestr-flowx:0.6'
 }
\ No newline at end of file
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index f812a51..6824d13 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/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.example.attestrapp">
+    xmlns:tools="http://schemas.android.com/tools">
 
     <application
         android:allowBackup="true"
diff --git a/app/src/main/java/com/example/attestrapp/MainActivity.kt b/app/src/main/java/com/example/attestrapp/MainActivity.kt
index 4600251..107cfd8 100644
--- a/app/src/main/java/com/example/attestrapp/MainActivity.kt
+++ b/app/src/main/java/com/example/attestrapp/MainActivity.kt
@@ -21,7 +21,6 @@ class MainActivity : AppCompatActivity(), View.OnClickListener, AttestrFlowXList
     private val handShakeError = "Enter handshake id"
     private val clientKeyError = "Enter client key"
     private var retrySpinner: Spinner? = null;
-    private  var localeSpinner:Spinner? = null
     private var isRetry = false
     private var selectedLocale: String? = null
     private var attestrFlowx: AttestrFlowx? = null
@@ -36,7 +35,6 @@ class MainActivity : AppCompatActivity(), View.OnClickListener, AttestrFlowXList
         clientKeyEditText = mainBinding!!.clientKeyEditText
         initiateSessionButton = mainBinding!!.initiateSessionButton
         retrySpinner = mainBinding!!.retrySpinner
-        localeSpinner = mainBinding!!.localeSpinner
 
         initiateSessionButton.setOnClickListener(this)
 
@@ -45,11 +43,6 @@ class MainActivity : AppCompatActivity(), View.OnClickListener, AttestrFlowXList
             R.layout.spinner_items, resources
                 .getStringArray(R.array.retry_array)
         )
-        val localSpinnerAdapter = ArrayAdapter(
-            this,
-            R.layout.spinner_items, resources
-                .getStringArray(R.array.locale_array)
-        )
         retrySpinnerAdapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item)
         retrySpinner!!.prompt = "Select Retry"
         retrySpinner!!.adapter = retrySpinnerAdapter
@@ -68,23 +61,6 @@ class MainActivity : AppCompatActivity(), View.OnClickListener, AttestrFlowXList
             }
         }
 
-        localSpinnerAdapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item)
-        localeSpinner!!.prompt = "Select Locale"
-        localeSpinner!!.adapter = localSpinnerAdapter
-        localeSpinner!!.onItemSelectedListener = object : AdapterView.OnItemSelectedListener {
-            override fun onItemSelected(
-                parent: AdapterView<*>?,
-                view: View,
-                position: Int,
-                id: Long
-            ) {
-                selectedLocale = languages[position]
-            }
-
-            override fun onNothingSelected(parent: AdapterView<*>?) {
-                selectedLocale = languages[0]
-            }
-        }
         attestrFlowx = AttestrFlowx()
     }
 
@@ -96,7 +72,7 @@ class MainActivity : AppCompatActivity(), View.OnClickListener, AttestrFlowXList
                 if (!TextUtils.isEmpty(handShakeID) && !TextUtils.isEmpty(clientKey)) {
                     attestrFlowx?.init(clientKey, handShakeID, this)
                     attestrFlowx?.launch(
-                        selectedLocale,
+                        null,
                         isRetry,
                         null
                     )
diff --git a/app/src/main/res/layout-hdpi/activity_main.xml b/app/src/main/res/layout-hdpi/activity_main.xml
index efc56b2..6c885d3 100644
--- a/app/src/main/res/layout-hdpi/activity_main.xml
+++ b/app/src/main/res/layout-hdpi/activity_main.xml
@@ -61,17 +61,6 @@
             android:spinnerMode="dialog"
             tools:ignore="SpeakableTextPresentCheck" />
 
-        <Spinner
-            android:id="@+id/locale_spinner"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginBottom="5dp"
-            android:popupBackground="@android:color/white"
-            android:scrollbars="none"
-            android:minHeight="48dp"
-            android:spinnerMode="dialog"
-            tools:ignore="SpeakableTextPresentCheck" />
-
         <Button
             android:id="@+id/initiate_session_button"
             android:layout_width="match_parent"
diff --git a/app/src/main/res/layout-xhdpi/activity_main.xml b/app/src/main/res/layout-xhdpi/activity_main.xml
index 4616b2b..c9a1d21 100644
--- a/app/src/main/res/layout-xhdpi/activity_main.xml
+++ b/app/src/main/res/layout-xhdpi/activity_main.xml
@@ -63,17 +63,6 @@
             android:spinnerMode="dialog"
             tools:ignore="SpeakableTextPresentCheck" />
 
-        <Spinner
-            android:id="@+id/locale_spinner"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginBottom="40dp"
-            android:popupBackground="@android:color/white"
-            android:scrollbars="none"
-            android:minHeight="48dp"
-            android:spinnerMode="dialog"
-            tools:ignore="SpeakableTextPresentCheck" />
-
         <Button
             android:id="@+id/initiate_session_button"
             android:layout_width="match_parent"
diff --git a/app/src/main/res/layout-xxhdpi/activity_main.xml b/app/src/main/res/layout-xxhdpi/activity_main.xml
index ec2b1db..97fe498 100644
--- a/app/src/main/res/layout-xxhdpi/activity_main.xml
+++ b/app/src/main/res/layout-xxhdpi/activity_main.xml
@@ -64,18 +64,6 @@
             android:spinnerMode="dialog"
             tools:ignore="SpeakableTextPresentCheck" />
 
-        <Spinner
-            android:id="@+id/locale_spinner"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="5dp"
-            android:layout_marginBottom="5dp"
-            android:popupBackground="@android:color/white"
-            android:scrollbars="none"
-            android:minHeight="48dp"
-            android:spinnerMode="dialog"
-            tools:ignore="SpeakableTextPresentCheck" />
-
         <Button
             android:id="@+id/initiate_session_button"
             android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index ec2b1db..97fe498 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -64,18 +64,6 @@
             android:spinnerMode="dialog"
             tools:ignore="SpeakableTextPresentCheck" />
 
-        <Spinner
-            android:id="@+id/locale_spinner"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="5dp"
-            android:layout_marginBottom="5dp"
-            android:popupBackground="@android:color/white"
-            android:scrollbars="none"
-            android:minHeight="48dp"
-            android:spinnerMode="dialog"
-            tools:ignore="SpeakableTextPresentCheck" />
-
         <Button
             android:id="@+id/initiate_session_button"
             android:layout_width="match_parent"
diff --git a/build.gradle b/build.gradle
index 03ce63f..8488e73 100644
--- a/build.gradle
+++ b/build.gradle
@@ -5,8 +5,8 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:7.0.3'
-        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.5.21"
+        classpath 'com.android.tools.build:gradle:7.2.0'
+        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.6.21"
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index e940ffa..f7faa4c 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 #Wed Aug 25 13:48:53 IST 2021
 distributionBase=GRADLE_USER_HOME
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.0.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-bin.zip
 distributionPath=wrapper/dists
 zipStorePath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME