Release 2.8.0 - Replace kotlin-android-extensions with viewBinding

mircea-yoti · mircea-yoti · commit 7eb007813379 · 2022-02-25T17:40:27.000+02:00
Related to DEP-266
diff --git a/app/build.gradle b/app/build.gradle
@@ -1,6 +1,5 @@
 apply plugin: 'com.android.application'
 apply plugin: 'kotlin-android'
-apply plugin: 'kotlin-android-extensions'
 
 android {
     compileSdkVersion 30
@@ -23,6 +22,10 @@ android {
         targetCompatibility = '1.8'
     }
 
+    buildFeatures {
+        viewBinding true
+    }
+
     buildTypes {
         release {
             minifyEnabled true
@@ -32,7 +35,7 @@ android {
                     'proguard-rules-retrofit.pro'
         }
         debug {
-             matchingFallbacks = ['release']
+            matchingFallbacks = ['release']
         }
     }
 }
diff --git a/app/src/main/java/com/yoti/mobile/android/sdk/yotidocscan/sample/MainActivity.kt b/app/src/main/java/com/yoti/mobile/android/sdk/yotidocscan/sample/MainActivity.kt
@@ -3,33 +3,39 @@ package com.yoti.mobile.android.sdk.yotidocscan.sample
 import android.content.Intent
 import android.os.Bundle
 import androidx.appcompat.app.AppCompatActivity
+import com.yoti.mobile.android.sdk.yotidocscan.sample.databinding.ActivityMainBinding
 import com.yoti.mobile.android.yotisdkcore.YOTI_SDK_REQUEST_CODE
 import com.yoti.mobile.android.yotisdkcore.YotiSdk
-import kotlinx.android.synthetic.main.activity_main.*
 
 class MainActivity : AppCompatActivity() {
 
     private lateinit var yotiSdk: YotiSdk
 
+    private lateinit var binding: ActivityMainBinding
+
     private var sessionId: String = ""
     private var sessionToken: String = ""
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
-        setContentView(R.layout.activity_main)
 
-        edSessionId.setText(sessionId)
-        edTokenId.setText(sessionToken)
+        binding = ActivityMainBinding.inflate(layoutInflater)
+        setContentView(binding.root)
+
+        with(binding) {
+            edSessionId.setText(sessionId)
+            edTokenId.setText(sessionToken)
 
-        yotiSdk = YotiSdk(this)
+            yotiSdk = YotiSdk(this@MainActivity)
 
-        buttonScanDocument.setOnClickListener {
-            val success = yotiSdk
-                .setSessionId(edSessionId.text.toString())
-                .setClientSessionToken(edTokenId.text.toString())
-                .start(this) // Custom request code .start(this, 8888)
-            if (!success) {
-                showSessionStatus()
+            buttonScanDocument.setOnClickListener {
+                val success = yotiSdk
+                        .setSessionId(edSessionId.text.toString())
+                        .setClientSessionToken(edTokenId.text.toString())
+                        .start(this@MainActivity) // Custom request code .start(this, 8888)
+                if (!success) {
+                    showSessionStatus()
+                }
             }
         }
     }
@@ -45,6 +51,6 @@ class MainActivity : AppCompatActivity() {
     private fun showSessionStatus() {
         val code = yotiSdk.sessionStatusCode
         val description = yotiSdk.sessionStatusDescription
-        sessionStatusText.text = getString(R.string.session_status_text, code, description)
+        binding.sessionStatusText.text = getString(R.string.session_status_text, code, description)
     }
 }
diff --git a/webapp/build.gradle b/webapp/build.gradle
@@ -1,6 +1,5 @@
 apply plugin: 'com.android.application'
 apply plugin: 'kotlin-android'
-apply plugin: 'kotlin-android-extensions'
 
 android {
     compileSdkVersion 29
@@ -15,6 +14,10 @@ android {
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
 
+    buildFeatures {
+        viewBinding true
+    }
+
     buildTypes {
         release {
             minifyEnabled false
diff --git a/webapp/src/main/java/com/yoti/mobile/android/sdk/yotidocscan/websample/MainActivity.kt b/webapp/src/main/java/com/yoti/mobile/android/sdk/yotidocscan/websample/MainActivity.kt
@@ -23,7 +23,7 @@ import androidx.core.content.ContextCompat
 import androidx.core.content.FileProvider
 import com.yoti.mobile.android.sdk.yotidocscan.websample.AccelerometerListener.ShakeListener
 import com.yoti.mobile.android.sdk.yotidocscan.websample.SessionBottomSheet.SessionConfigurationListener
-import kotlinx.android.synthetic.main.activity_main.*
+import com.yoti.mobile.android.sdk.yotidocscan.websample.databinding.ActivityMainBinding
 import java.io.File
 import java.text.SimpleDateFormat
 import java.util.Date
@@ -66,7 +66,6 @@ import java.util.Locale
 private const val CAPTURE_REQUEST_CODE = 1112
 private const val PERMISSIONS_REQUEST_CODE = 1114
 
-private const val TAG = "YdsWebSample"
 private const val KEY_IS_VIEW_RECREATED = "MainActivity.KEY_IS_VIEW_RECREATED"
 private const val FINISH_SESSION_URL = "https://www.yoti.com/"
 
@@ -89,15 +88,19 @@ class MainActivity : AppCompatActivity(), SessionConfigurationListener {
             ".jpg" to "image/jpeg"
     )
 
+    private lateinit var binding: ActivityMainBinding
+
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
-        setContentView(R.layout.activity_main)
+
+        binding = ActivityMainBinding.inflate(layoutInflater)
+        setContentView(binding.root)
 
         isViewRecreated = savedInstanceState?.getBoolean(KEY_IS_VIEW_RECREATED) ?: false
 
         requestPermissions()
 
-        webview.configureForYdsWeb()
+        binding.webview.configureForYdsWeb()
     }
 
     override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {
@@ -125,7 +128,7 @@ class MainActivity : AppCompatActivity(), SessionConfigurationListener {
     }
 
     override fun onDestroy() {
-        webview.destroy()
+        binding.webview.destroy()
         super.onDestroy()
     }
 
@@ -296,8 +299,10 @@ class MainActivity : AppCompatActivity(), SessionConfigurationListener {
     }
 
     override fun onSessionConfigurationSuccess(sessionUrl: String) {
-        webview.visibility = VISIBLE
-        webview.loadUrl(sessionUrl)
+        with(binding) {
+            webview.visibility = VISIBLE
+            webview.loadUrl(sessionUrl)
+        }
     }
 
     override fun onSessionConfigurationDismiss() {
diff --git a/webapp/src/main/java/com/yoti/mobile/android/sdk/yotidocscan/websample/SessionBottomSheet.kt b/webapp/src/main/java/com/yoti/mobile/android/sdk/yotidocscan/websample/SessionBottomSheet.kt
@@ -9,7 +9,7 @@ import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import com.google.android.material.bottomsheet.BottomSheetDialogFragment
-import kotlinx.android.synthetic.main.bottom_sheet.*
+import com.yoti.mobile.android.sdk.yotidocscan.websample.databinding.BottomSheetBinding
 
 private const val SESSION_PREFERENCES_ID = "SESSION_PREFERENCES_ID"
 private const val SESSION_CONFIGURATION_KEY = "SESSION_CONFIGURATION_KEY"
@@ -19,30 +19,38 @@ class SessionBottomSheet: BottomSheetDialogFragment() {
     private var sessionConfigurationListener: SessionConfigurationListener? = null
     lateinit var sharedPreferences: SharedPreferences
 
+    private var _binding: BottomSheetBinding? = null
+    private val binding: BottomSheetBinding get() = _binding!!
+
     interface SessionConfigurationListener {
         fun onSessionConfigurationSuccess(sessionUrl: String)
         fun onSessionConfigurationDismiss()
     }
 
     override fun onCreateView(
             inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?
-    ): View? = inflater.inflate(R.layout.bottom_sheet, container, false)
+    ): View {
+        _binding = BottomSheetBinding.inflate(inflater, container, false)
+        return binding.root
+    }
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
 
-        session_url.setText(sharedPreferences.getString(SESSION_CONFIGURATION_KEY, ""))
+        with (binding) {
+            sessionUrl.setText(sharedPreferences.getString(SESSION_CONFIGURATION_KEY, ""))
 
-        start_session_button.setOnClickListener {
-            sessionConfigurationListener?.onSessionConfigurationSuccess(
-                    session_url.text.toString()
-            )
-            this.dismiss()
+            startSessionButton.setOnClickListener {
+                sessionConfigurationListener?.onSessionConfigurationSuccess(
+                        sessionUrl.text.toString()
+                )
+                dismiss()
+            }
         }
     }
 
     override fun onDismiss(dialog: DialogInterface) {
-        sharedPreferences.edit().putString(SESSION_CONFIGURATION_KEY, session_url.text.toString()).apply()
+        sharedPreferences.edit().putString(SESSION_CONFIGURATION_KEY, binding.sessionUrl.text.toString()).apply()
         sessionConfigurationListener?.onSessionConfigurationDismiss()
         super.onDismiss(dialog)
     }
@@ -53,6 +61,11 @@ class SessionBottomSheet: BottomSheetDialogFragment() {
         sessionConfigurationListener = context as? SessionConfigurationListener
     }
 
+    override fun onDestroyView() {
+        super.onDestroyView()
+        _binding = null
+    }
+
     override fun onDetach() {
         sessionConfigurationListener = null
         super.onDetach()

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,5 @@`
`1`	`1`	`apply plugin: 'com.android.application'`
`2`	`2`	`apply plugin: 'kotlin-android'`
`3`		`-apply plugin: 'kotlin-android-extensions'`
`4`	`3`
`5`	`4`	`android {`
`6`	`5`	`compileSdkVersion 30`
`@@ -23,6 +22,10 @@ android {`
`23`	`22`	`targetCompatibility = '1.8'`
`24`	`23`	`}`
`25`	`24`
	`25`	`+ buildFeatures {`
	`26`	`+ viewBinding true`
	`27`	`+ }`
	`28`	`+`
`26`	`29`	`buildTypes {`
`27`	`30`	`release {`
`28`	`31`	`minifyEnabled true`
`@@ -32,7 +35,7 @@ android {`
`32`	`35`	`'proguard-rules-retrofit.pro'`
`33`	`36`	`}`
`34`	`37`	`debug {`
`35`		`- matchingFallbacks = ['release']`
	`38`	`+ matchingFallbacks = ['release']`
`36`	`39`	`}`
`37`	`40`	`}`
`38`	`41`	`}`