From 43dac1f1d5f7e7e8a3951ba7c30d89af2131fa44 Mon Sep 17 00:00:00 2001
From: Reuben Mangubat <reuben@newlogic.com>
Date: Tue, 26 Jul 2022 15:30:01 +0800
Subject: [PATCH] Fix distorted ID PASS branding in older android devices

---
 .../org/newlogic/smartscanner/MainActivity.kt |  2 +-
 .../result/IDPassResultActivity.kt            |  6 ++--
 .../res/layout/activity_idpass_result.xml     | 12 ++++----
 app/src/main/res/layout/activity_result.xml   | 14 ++++-----
 app/src/main/res/layout/item_barcode.xml      |  8 ++---
 app/src/main/res/layout/item_idpass_lite.xml  |  8 ++---
 app/src/main/res/layout/item_mrz.xml          |  8 ++---
 app/src/main/res/layout/item_nfc.xml          |  8 ++---
 app/src/main/res/layout/item_qr.xml           |  8 ++---
 app/src/main/res/layout/sheet_qrcode.xml      |  6 ++--
 .../smartscanner/lib/SmartScannerActivity.kt  | 30 +++++++++----------
 .../smartscanner/lib/nfc/NFCFragment.kt       |  2 +-
 .../layout-land/activity_smart_scanner.xml    | 30 +++++++++----------
 .../main/res/layout/activity_nfc_scanner.xml  |  2 +-
 .../res/layout/activity_smart_scanner.xml     | 30 +++++++++----------
 .../main/res/layout/dialog_idpass_verify.xml  | 16 +++++-----
 core-lib/src/main/res/layout/fragment_nfc.xml |  8 ++---
 .../res/layout/fragment_passport_details.xml  |  4 +--
 18 files changed, 101 insertions(+), 101 deletions(-)

diff --git a/app/src/main/java/org/newlogic/smartscanner/MainActivity.kt b/app/src/main/java/org/newlogic/smartscanner/MainActivity.kt
index 05001e5e..bcc4c7cc 100644
--- a/app/src/main/java/org/newlogic/smartscanner/MainActivity.kt
+++ b/app/src/main/java/org/newlogic/smartscanner/MainActivity.kt
@@ -72,7 +72,7 @@ class MainActivity : AppCompatActivity() {
         binding.itemBarcode.item.setOnClickListener { scanBarcode(BarcodeOptions.default) }
         binding.itemIdpassLite.item.setOnClickListener { scanIDPassLite() }
         binding.itemMrz.item.setOnClickListener { scanMRZ() }
-        binding.itemQR.item.setOnClickListener { scanQRCode() }
+        binding.itemQr.item.setOnClickListener { scanQRCode() }
         binding.itemNfc.item.setOnClickListener { scanNFC() }
         // Change language
         binding.languageSettings.setOnClickListener {
diff --git a/app/src/main/java/org/newlogic/smartscanner/result/IDPassResultActivity.kt b/app/src/main/java/org/newlogic/smartscanner/result/IDPassResultActivity.kt
index cf834fc1..fdc59a3f 100755
--- a/app/src/main/java/org/newlogic/smartscanner/result/IDPassResultActivity.kt
+++ b/app/src/main/java/org/newlogic/smartscanner/result/IDPassResultActivity.kt
@@ -60,7 +60,7 @@ class IDPassResultActivity : AppCompatActivity(), View.OnClickListener {
         setContentView(R.layout.activity_idpass_result)
         // Initialize UI
         val toolbar : Toolbar? = findViewById(R.id.toolbar)
-        val pinCodeBtn: Button = findViewById(R.id.pinCodeAuth)
+        val pinCodeBtn: Button = findViewById(R.id.pin_code_auth)
         pinCodeBtn.setOnClickListener(this)
         // Setup toolbar
         setSupportActionBar(toolbar)
@@ -197,8 +197,8 @@ class IDPassResultActivity : AppCompatActivity(), View.OnClickListener {
 
     override fun onClick(v: View?) {
         when (v?.id) {
-            R.id.pinCodeAuth -> {
-                val cardpincode = findViewById<EditText>(R.id.cardPinCode)
+            R.id.pin_code_auth -> {
+                val cardpincode = findViewById<EditText>(R.id.card_pin_code)
                 pinCode = cardpincode.text.toString()
                 displayResult(qrBytes)
                 hideKeyboard(cardpincode)
diff --git a/app/src/main/res/layout/activity_idpass_result.xml b/app/src/main/res/layout/activity_idpass_result.xml
index 2a15afe2..f904d47a 100755
--- a/app/src/main/res/layout/activity_idpass_result.xml
+++ b/app/src/main/res/layout/activity_idpass_result.xml
@@ -4,10 +4,10 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    tools:context="org.idpass.smartscanner.org.newlogic.smartscanner.result.IDPassResultActivity">
+    tools:context="org.newlogic.smartscanner.result.IDPassResultActivity">
 
     <LinearLayout
-        android:id="@+id/linearLayout"
+        android:id="@+id/layout"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:orientation="vertical"
@@ -57,7 +57,7 @@
     </LinearLayout>
 
     <androidx.appcompat.widget.AppCompatEditText
-        android:id="@+id/cardPinCode"
+        android:id="@+id/card_pin_code"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginStart="16dp"
@@ -70,10 +70,10 @@
         android:textSize="14sp"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/linearLayout" />
+        app:layout_constraintTop_toBottomOf="@+id/layout" />
 
     <androidx.appcompat.widget.AppCompatButton
-        android:id="@+id/pinCodeAuth"
+        android:id="@+id/pin_code_auth"
         android:layout_width="match_parent"
         android:layout_height="40dp"
         android:layout_marginStart="16dp"
@@ -85,5 +85,5 @@
         android:textColor="@color/white"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/cardPinCode" />
+        app:layout_constraintTop_toBottomOf="@+id/card_pin_code" />
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_result.xml b/app/src/main/res/layout/activity_result.xml
index f0c11c0b..5f675da0 100755
--- a/app/src/main/res/layout/activity_result.xml
+++ b/app/src/main/res/layout/activity_result.xml
@@ -7,7 +7,7 @@
     tools:context="org.newlogic.smartscanner.result.ResultActivity">
 
     <LinearLayout
-        android:id="@+id/linearLayout"
+        android:id="@+id/linear_layout"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:orientation="vertical"
@@ -25,7 +25,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="match_parent">
                 <TextView
-                    android:id="@+id/toolbarTitle"
+                    android:id="@+id/toolbar_title"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_gravity="center"
@@ -40,7 +40,7 @@
         </androidx.appcompat.widget.Toolbar>
 
         <TextView
-            android:id="@+id/textResult"
+            android:id="@+id/text_result"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_marginStart="16dp"
@@ -55,7 +55,7 @@
             tools:text="54 65 73 74 20 51 52 20  Test QR\n43 6F 64 65              Code" />
 
         <TextView
-            android:id="@+id/imageLabel"
+            android:id="@+id/image_label"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="start"
@@ -69,7 +69,7 @@
             android:visibility="gone" />
 
         <com.jsibbold.zoomage.ZoomageView
-            android:id="@+id/imageResult"
+            android:id="@+id/image_result"
             android:layout_width="match_parent"
             android:layout_height="220dp"
             android:layout_marginStart="16dp"
@@ -81,7 +81,7 @@
             android:visibility="gone" />
 
         <TextView
-            android:id="@+id/textRawLabel"
+            android:id="@+id/text_raw_label"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="start"
@@ -94,7 +94,7 @@
             android:visibility="gone" />
 
         <EditText
-            android:id="@+id/editTextRaw"
+            android:id="@+id/edit_text_raw"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_marginStart="16dp"
diff --git a/app/src/main/res/layout/item_barcode.xml b/app/src/main/res/layout/item_barcode.xml
index 15cbd08f..15baaaa8 100644
--- a/app/src/main/res/layout/item_barcode.xml
+++ b/app/src/main/res/layout/item_barcode.xml
@@ -11,7 +11,7 @@
     android:paddingTop="16dp">
 
     <androidx.appcompat.widget.AppCompatImageView
-        android:id="@+id/appCompatImageView"
+        android:id="@+id/icon"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginStart="16dp"
@@ -20,7 +20,7 @@
         app:layout_constraintTop_toTopOf="parent" />
 
     <TextView
-        android:id="@+id/txtBarcode"
+        android:id="@+id/txt_barcode"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginStart="16dp"
@@ -29,7 +29,7 @@
         android:text="@string/mode_barcode"
         android:textColor="@color/newlogic_black"
         android:textSize="16sp"
-        app:layout_constraintStart_toEndOf="@+id/appCompatImageView"
+        app:layout_constraintStart_toEndOf="@+id/icon"
         app:layout_constraintTop_toTopOf="parent" />
 
     <View
@@ -41,5 +41,5 @@
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/txtBarcode" />
+        app:layout_constraintTop_toBottomOf="@+id/txt_barcode" />
 </androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/layout/item_idpass_lite.xml b/app/src/main/res/layout/item_idpass_lite.xml
index 358a83d7..a657f299 100644
--- a/app/src/main/res/layout/item_idpass_lite.xml
+++ b/app/src/main/res/layout/item_idpass_lite.xml
@@ -11,7 +11,7 @@
     android:paddingTop="16dp">
 
     <androidx.appcompat.widget.AppCompatImageView
-        android:id="@+id/appCompatImageView"
+        android:id="@+id/icon"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginStart="16dp"
@@ -20,7 +20,7 @@
         app:layout_constraintTop_toTopOf="parent" />
 
     <TextView
-        android:id="@+id/txtQR"
+        android:id="@+id/txt_idpass"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginStart="16dp"
@@ -29,7 +29,7 @@
         android:text="@string/mode_idpass_lite"
         android:textColor="@color/newlogic_black"
         android:textSize="16sp"
-        app:layout_constraintStart_toEndOf="@+id/appCompatImageView"
+        app:layout_constraintStart_toEndOf="@+id/icon"
         app:layout_constraintTop_toTopOf="parent" />
 
     <View
@@ -41,5 +41,5 @@
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/txtQR" />
+        app:layout_constraintTop_toBottomOf="@+id/txt_idpass" />
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/item_mrz.xml b/app/src/main/res/layout/item_mrz.xml
index 053ce71e..78ef4706 100644
--- a/app/src/main/res/layout/item_mrz.xml
+++ b/app/src/main/res/layout/item_mrz.xml
@@ -11,7 +11,7 @@
     android:paddingTop="16dp">
 
     <androidx.appcompat.widget.AppCompatImageView
-        android:id="@+id/appCompatImageView"
+        android:id="@+id/icon"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginStart="16dp"
@@ -20,7 +20,7 @@
         app:layout_constraintTop_toTopOf="parent" />
 
     <TextView
-        android:id="@+id/txtMrz"
+        android:id="@+id/txt_mrz"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginStart="16dp"
@@ -29,7 +29,7 @@
         android:text="@string/mode_mrz"
         android:textColor="@color/newlogic_black"
         android:textSize="16sp"
-        app:layout_constraintStart_toEndOf="@+id/appCompatImageView"
+        app:layout_constraintStart_toEndOf="@+id/icon"
         app:layout_constraintTop_toTopOf="parent" />
 
     <View
@@ -41,5 +41,5 @@
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/txtMrz" />
+        app:layout_constraintTop_toBottomOf="@+id/txt_mrz" />
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/item_nfc.xml b/app/src/main/res/layout/item_nfc.xml
index 4cfc18b8..f0a79f86 100644
--- a/app/src/main/res/layout/item_nfc.xml
+++ b/app/src/main/res/layout/item_nfc.xml
@@ -11,7 +11,7 @@
     android:paddingTop="16dp">
 
     <androidx.appcompat.widget.AppCompatImageView
-        android:id="@+id/appCompatImageView"
+        android:id="@+id/icon"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginStart="16dp"
@@ -20,7 +20,7 @@
         app:layout_constraintTop_toTopOf="parent" />
 
     <TextView
-        android:id="@+id/txtNfc"
+        android:id="@+id/txt_nfc"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginStart="16dp"
@@ -29,7 +29,7 @@
         android:text="@string/mode_nfc"
         android:textColor="@color/newlogic_black"
         android:textSize="16sp"
-        app:layout_constraintStart_toEndOf="@+id/appCompatImageView"
+        app:layout_constraintStart_toEndOf="@+id/icon"
         app:layout_constraintTop_toTopOf="parent" />
 
     <View
@@ -41,5 +41,5 @@
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/txtNfc" />
+        app:layout_constraintTop_toBottomOf="@+id/txt_nfc" />
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/item_qr.xml b/app/src/main/res/layout/item_qr.xml
index 5d513693..67cf11d5 100644
--- a/app/src/main/res/layout/item_qr.xml
+++ b/app/src/main/res/layout/item_qr.xml
@@ -11,7 +11,7 @@
     android:paddingTop="16dp">
 
     <androidx.appcompat.widget.AppCompatImageView
-        android:id="@+id/appCompatImageView"
+        android:id="@+id/icon"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginStart="16dp"
@@ -20,7 +20,7 @@
         app:layout_constraintTop_toTopOf="parent" />
 
     <TextView
-        android:id="@+id/txtQR"
+        android:id="@+id/txt_qr"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginStart="16dp"
@@ -29,7 +29,7 @@
         android:text="@string/mode_qr"
         android:textColor="@color/newlogic_black"
         android:textSize="16sp"
-        app:layout_constraintStart_toEndOf="@+id/appCompatImageView"
+        app:layout_constraintStart_toEndOf="@+id/icon"
         app:layout_constraintTop_toTopOf="parent" />
 
     <View
@@ -41,5 +41,5 @@
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/txtQR" />
+        app:layout_constraintTop_toBottomOf="@+id/txt_qr" />
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/sheet_qrcode.xml b/app/src/main/res/layout/sheet_qrcode.xml
index dbb961e5..25bf5592 100644
--- a/app/src/main/res/layout/sheet_qrcode.xml
+++ b/app/src/main/res/layout/sheet_qrcode.xml
@@ -8,7 +8,7 @@
     app:layout_behavior="android.support.design.widget.BottomSheetBehavior">
 
     <LinearLayout
-        android:id="@+id/btnGzipped"
+        android:id="@+id/btn_gzipped"
         android:layout_width="match_parent"
         android:layout_height="60dp"
         android:clickable="true"
@@ -33,7 +33,7 @@
         android:background="@android:color/darker_gray" />
 
     <LinearLayout
-        android:id="@+id/btnRegular"
+        android:id="@+id/btn_regular"
         android:layout_width="match_parent"
         android:layout_height="60dp"
         android:clickable="true"
@@ -58,7 +58,7 @@
         android:background="@android:color/darker_gray" />
 
     <LinearLayout
-        android:id="@+id/btnCancel"
+        android:id="@+id/btn_cancel"
         android:layout_width="match_parent"
         android:layout_height="60dp"
         android:clickable="true"
diff --git a/core-lib/src/main/java/org/idpass/smartscanner/lib/SmartScannerActivity.kt b/core-lib/src/main/java/org/idpass/smartscanner/lib/SmartScannerActivity.kt
index bb10ddff..6ffdf22f 100644
--- a/core-lib/src/main/java/org/idpass/smartscanner/lib/SmartScannerActivity.kt
+++ b/core-lib/src/main/java/org/idpass/smartscanner/lib/SmartScannerActivity.kt
@@ -125,20 +125,20 @@ class SmartScannerActivity : BaseActivity(), OnClickListener {
         setContentView(R.layout.activity_smart_scanner)
 
         // assign view ids
-        coordinatorLayoutView = findViewById(R.id.coordinatorLayout)
-        modelLayoutView = findViewById(R.id.viewLayout)
-        viewFinder = findViewById(R.id.viewFinder)
+        coordinatorLayoutView = findViewById(R.id.coordinator_layout)
+        modelLayoutView = findViewById(R.id.view_layout)
+        viewFinder = findViewById(R.id.view_finder)
         flashButton = findViewById(R.id.flash_button)
         closeButton = findViewById(R.id.close_button)
-        rectangle = findViewById(R.id.rectimage)
+        rectangle = findViewById(R.id.rect_image)
         rectangleMRZGuide = findViewById(R.id.rect_image_crop)
-        modelText = findViewById(R.id.modelText)
-        modelTextLoading = findViewById(R.id.modelTextLoading)
-        brandingImage = findViewById(R.id.brandingImage)
-        manualCapture = findViewById(R.id.manualCapture)
-        captureLabelText = findViewById(R.id.captureLabelText)
-        captureHeaderText = findViewById(R.id.captureHeaderText)
-        captureSubHeaderText = findViewById(R.id.captureSubHeaderText)
+        modelText = findViewById(R.id.model_text)
+        modelTextLoading = findViewById(R.id.model_text_loading)
+        brandingImage = findViewById(R.id.branding_image)
+        manualCapture = findViewById(R.id.manual_capture)
+        captureLabelText = findViewById(R.id.capture_label_text)
+        captureHeaderText = findViewById(R.id.capture_header_text)
+        captureSubHeaderText = findViewById(R.id.capture_sub_header_text)
         // Scanner setup from intent
         hideActionBar()
         if (intent.action != null)  {
@@ -539,7 +539,7 @@ class SmartScannerActivity : BaseActivity(), OnClickListener {
                     }
                 }
             }
-            R.id.manualCapture -> {
+            R.id.manual_capture -> {
                 // hide capture button during image capture
                 manualCapture?.isEnabled = false
                 val imageFile = File(cacheImagePath())
@@ -602,9 +602,9 @@ class SmartScannerActivity : BaseActivity(), OnClickListener {
         // id pass reader
         val reader = IDPassManager.getIDPassReader()
         // bottom sheet ids
-        val pinCodeInpt = sheetView.findViewById<EditText>(R.id.cardPinCode)
-        val verifyBtn = sheetView.findViewById<Button>(R.id.pinCodeVerify)
-        val skipBtn = sheetView.findViewById<Button>(R.id.pinCodeSkip)
+        val pinCodeInpt = sheetView.findViewById<EditText>(R.id.card_pin_code)
+        val verifyBtn = sheetView.findViewById<Button>(R.id.pin_code_verify)
+        val skipBtn = sheetView.findViewById<Button>(R.id.pin_code_skip)
         // stop smartscanner camera scanning
         cameraProvider?.unbindAll()
         // bottom sheet listeners
diff --git a/core-lib/src/main/java/org/idpass/smartscanner/lib/nfc/NFCFragment.kt b/core-lib/src/main/java/org/idpass/smartscanner/lib/nfc/NFCFragment.kt
index 9fd0b945..d6eb8b4b 100644
--- a/core-lib/src/main/java/org/idpass/smartscanner/lib/nfc/NFCFragment.kt
+++ b/core-lib/src/main/java/org/idpass/smartscanner/lib/nfc/NFCFragment.kt
@@ -95,7 +95,7 @@ class NFCFragment : Fragment() {
         if (arguments?.containsKey(IntentData.KEY_CAPTURE_LOG) == true) {
             captureLog = arguments.getBoolean(IntentData.KEY_CAPTURE_LOG)
         }
-        textViewNfcTitle = view.findViewById(R.id.textViewNfcTitle)
+        textViewNfcTitle = view.findViewById(R.id.tv_nfc_title)
         textViewPassportNumber = view.findViewById(R.id.value_passport_number)
         textViewDateOfBirth = view.findViewById(R.id.value_DOB)
         textViewDateOfExpiry = view.findViewById(R.id.value_expiration_date)
diff --git a/core-lib/src/main/res/layout-land/activity_smart_scanner.xml b/core-lib/src/main/res/layout-land/activity_smart_scanner.xml
index 6edd68f9..ab6bcbeb 100644
--- a/core-lib/src/main/res/layout-land/activity_smart_scanner.xml
+++ b/core-lib/src/main/res/layout-land/activity_smart_scanner.xml
@@ -2,7 +2,7 @@
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
-    android:id="@+id/coordinatorLayout"
+    android:id="@+id/coordinator_layout"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:background="@color/transparent_grey"
@@ -11,7 +11,7 @@
     tools:context="org.idpass.smartscanner.lib.SmartScannerActivity">
 
     <androidx.constraintlayout.widget.ConstraintLayout
-        android:id="@+id/viewLayout"
+        android:id="@+id/view_layout"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:elevation="1dp"
@@ -26,7 +26,7 @@
         app:layout_constraintTop_toBottomOf="@+id/action_bar_menu">
 
         <TextView
-            android:id="@+id/captureHeaderText"
+            android:id="@+id/capture_header_text"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:gravity="center"
@@ -39,7 +39,7 @@
             app:layout_constraintTop_toTopOf="parent" />
 
         <TextView
-            android:id="@+id/captureSubHeaderText"
+            android:id="@+id/capture_sub_header_text"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:gravity="center"
@@ -49,10 +49,10 @@
             android:textSize="16sp"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@+id/captureHeaderText" />
+            app:layout_constraintTop_toBottomOf="@+id/capture_header_text" />
 
         <androidx.camera.view.PreviewView
-            android:id="@+id/viewFinder"
+            android:id="@+id/view_finder"
             android:layout_width="0dp"
             android:layout_height="0dp"
             android:layout_marginBottom="42dp"
@@ -65,7 +65,7 @@
             app:layout_constraintTop_toTopOf="parent" />
 
         <ImageView
-            android:id="@+id/rectimage"
+            android:id="@+id/rect_image"
             android:layout_width="0dp"
             android:layout_height="0dp"
             android:layout_marginBottom="36dp"
@@ -78,16 +78,16 @@
             app:layout_constraintTop_toTopOf="parent" />
 
         <androidx.appcompat.widget.AppCompatImageView
-            android:id="@+id/brandingImage"
+            android:id="@+id/branding_image"
             android:layout_width="64dp"
             android:layout_height="32dp"
-            android:src="@drawable/ic_id_pass_logo_greyed"
+            app:srcCompat="@drawable/ic_id_pass_logo_greyed"
             android:textColor="@color/white"
             app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintTop_toBottomOf="@+id/rectimage" />
+            app:layout_constraintTop_toBottomOf="@+id/rect_image" />
 
         <TextView
-            android:id="@+id/captureLabelText"
+            android:id="@+id/capture_label_text"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginTop="36dp"
@@ -99,7 +99,7 @@
             android:textStyle="bold"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@+id/brandingImage" />
+            app:layout_constraintTop_toBottomOf="@+id/branding_image" />
 
         <androidx.constraintlayout.widget.Guideline
             android:id="@+id/bottom"
@@ -125,7 +125,7 @@
     </androidx.constraintlayout.widget.ConstraintLayout>
 
     <TextView
-        android:id="@+id/modelText"
+        android:id="@+id/model_text"
         android:layout_width="0dp"
         android:layout_height="0dp"
         android:layout_marginBottom="48dp"
@@ -145,7 +145,7 @@
         app:layout_constraintTop_toTopOf="parent" />
 
     <ProgressBar
-        android:id="@+id/modelTextLoading"
+        android:id="@+id/model_text_loading"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginHorizontal="96dp"
@@ -160,7 +160,7 @@
 
 
     <androidx.appcompat.widget.AppCompatImageButton
-        android:id="@+id/manualCapture"
+        android:id="@+id/manual_capture"
         style="@style/Widget.AppCompat.Button.Borderless"
         android:layout_width="48dp"
         android:layout_height="48dp"
diff --git a/core-lib/src/main/res/layout/activity_nfc_scanner.xml b/core-lib/src/main/res/layout/activity_nfc_scanner.xml
index ff4017cf..ecc9f88d 100755
--- a/core-lib/src/main/res/layout/activity_nfc_scanner.xml
+++ b/core-lib/src/main/res/layout/activity_nfc_scanner.xml
@@ -17,7 +17,7 @@
             android:layout_width="match_parent"
             android:layout_height="match_parent">
             <TextView
-                android:id="@+id/toolbarTitle"
+                android:id="@+id/toolbar_title"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_gravity="center"
diff --git a/core-lib/src/main/res/layout/activity_smart_scanner.xml b/core-lib/src/main/res/layout/activity_smart_scanner.xml
index ea31f281..04276b7d 100644
--- a/core-lib/src/main/res/layout/activity_smart_scanner.xml
+++ b/core-lib/src/main/res/layout/activity_smart_scanner.xml
@@ -2,7 +2,7 @@
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
-    android:id="@+id/coordinatorLayout"
+    android:id="@+id/coordinator_layout"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:background="@color/transparent_grey"
@@ -11,7 +11,7 @@
     tools:context="org.idpass.smartscanner.lib.SmartScannerActivity">
 
     <androidx.appcompat.widget.AppCompatImageButton
-        android:id="@+id/manualCapture"
+        android:id="@+id/manual_capture"
         style="@style/Widget.AppCompat.Button.Borderless"
         android:layout_width="48dp"
         android:layout_height="48dp"
@@ -33,7 +33,7 @@
         app:layout_constraintStart_toStartOf="parent"/>
 
     <androidx.constraintlayout.widget.ConstraintLayout
-        android:id="@+id/viewLayout"
+        android:id="@+id/view_layout"
         android:layout_width="match_parent"
         android:layout_height="0dp"
         android:layout_marginHorizontal="8dp"
@@ -44,7 +44,7 @@
         app:layout_constraintTop_toTopOf="parent">
 
         <TextView
-            android:id="@+id/captureHeaderText"
+            android:id="@+id/capture_header_text"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:textColor="@color/white"
@@ -57,7 +57,7 @@
             app:layout_constraintTop_toTopOf="parent" />
 
         <TextView
-            android:id="@+id/captureSubHeaderText"
+            android:id="@+id/capture_sub_header_text"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:textColor="@color/white"
@@ -67,7 +67,7 @@
             android:lineSpacingMultiplier="0.9"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@+id/captureHeaderText" />
+            app:layout_constraintTop_toBottomOf="@+id/capture_header_text" />
 
         <androidx.constraintlayout.widget.Guideline
             android:id="@+id/bottom"
@@ -84,7 +84,7 @@
             app:layout_constraintGuide_percent="0.20" />
 
         <androidx.camera.view.PreviewView
-            android:id="@+id/viewFinder"
+            android:id="@+id/view_finder"
             android:layout_width="0dp"
             android:layout_height="0dp"
             android:layout_marginHorizontal="16dp"
@@ -96,7 +96,7 @@
             app:layout_constraintTop_toTopOf="@+id/top" />
 
         <ImageView
-            android:id="@+id/rectimage"
+            android:id="@+id/rect_image"
             android:layout_width="0dp"
             android:layout_height="0dp"
             android:layout_marginHorizontal="10dp"
@@ -110,19 +110,19 @@
             app:layout_constraintTop_toTopOf="@+id/top" />
 
         <androidx.appcompat.widget.AppCompatImageView
-            android:id="@+id/brandingImage"
+            android:id="@+id/branding_image"
             android:layout_width="64dp"
             android:layout_height="32dp"
             android:layout_marginEnd="16dp"
             android:layout_marginBottom="4dp"
-            android:src="@drawable/ic_id_pass_logo_greyed"
+            app:srcCompat="@drawable/ic_id_pass_logo_greyed"
             android:textColor="@color/white"
             android:visibility="invisible"
             app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintTop_toBottomOf="@+id/rectimage" />
+            app:layout_constraintTop_toBottomOf="@+id/rect_image" />
 
         <TextView
-            android:id="@+id/captureLabelText"
+            android:id="@+id/capture_label_text"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginTop="36dp"
@@ -134,12 +134,12 @@
             android:lineSpacingMultiplier="0.9"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@+id/brandingImage" />
+            app:layout_constraintTop_toBottomOf="@+id/branding_image" />
 
     </androidx.constraintlayout.widget.ConstraintLayout>
 
     <TextView
-        android:id="@+id/modelText"
+        android:id="@+id/model_text"
         android:layout_width="0dp"
         android:layout_height="0dp"
         android:background="@color/transparent_grey"
@@ -157,7 +157,7 @@
         app:layout_constraintTop_toTopOf="parent" />
 
     <ProgressBar
-        android:id="@+id/modelTextLoading"
+        android:id="@+id/model_text_loading"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:elevation="2dp"
diff --git a/core-lib/src/main/res/layout/dialog_idpass_verify.xml b/core-lib/src/main/res/layout/dialog_idpass_verify.xml
index ca34e383..38dc19fb 100755
--- a/core-lib/src/main/res/layout/dialog_idpass_verify.xml
+++ b/core-lib/src/main/res/layout/dialog_idpass_verify.xml
@@ -6,7 +6,7 @@
     android:paddingBottom="24dp">
 
     <LinearLayout
-        android:id="@+id/linearLayout"
+        android:id="@+id/linear_layout"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:orientation="vertical"
@@ -24,7 +24,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="match_parent">
                 <TextView
-                    android:id="@+id/toolbarTitle"
+                    android:id="@+id/toolbar_title"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_gravity="center"
@@ -39,7 +39,7 @@
     </LinearLayout>
 
     <androidx.appcompat.widget.AppCompatEditText
-        android:id="@+id/cardPinCode"
+        android:id="@+id/card_pin_code"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginTop="16dp"
@@ -53,10 +53,10 @@
         android:textSize="14sp"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/linearLayout" />
+        app:layout_constraintTop_toBottomOf="@+id/linear_layout" />
 
     <androidx.appcompat.widget.AppCompatButton
-        android:id="@+id/pinCodeVerify"
+        android:id="@+id/pin_code_verify"
         android:layout_width="match_parent"
         android:layout_height="40dp"
         android:layout_marginStart="16dp"
@@ -68,10 +68,10 @@
         android:textColor="@color/white"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/cardPinCode" />
+        app:layout_constraintTop_toBottomOf="@+id/card_pin_code" />
 
     <androidx.appcompat.widget.AppCompatButton
-        android:id="@+id/pinCodeSkip"
+        android:id="@+id/pin_code_skip"
         android:layout_width="match_parent"
         android:layout_height="40dp"
         android:layout_marginStart="16dp"
@@ -83,5 +83,5 @@
         android:textColor="@color/idpass_orange"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/pinCodeVerify" />
+        app:layout_constraintTop_toBottomOf="@+id/pin_code_verify" />
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/core-lib/src/main/res/layout/fragment_nfc.xml b/core-lib/src/main/res/layout/fragment_nfc.xml
index 41b7e427..0e102bd6 100644
--- a/core-lib/src/main/res/layout/fragment_nfc.xml
+++ b/core-lib/src/main/res/layout/fragment_nfc.xml
@@ -92,16 +92,16 @@
         style="?android:attr/progressBarStyleHorizontal"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_alignLeft="@+id/textViewNfcTitle"
-        android:layout_alignRight="@+id/textViewNfcTitle"
-        android:layout_above="@+id/textViewNfcTitle"
+        android:layout_alignLeft="@+id/tv_nfc_title"
+        android:layout_alignRight="@+id/tv_nfc_title"
+        android:layout_above="@+id/tv_nfc_title"
         android:indeterminateTint="@color/grey"
         android:indeterminate="true"
         android:visibility="gone"
         />
 
     <TextView
-        android:id="@+id/textViewNfcTitle"
+        android:id="@+id/tv_nfc_title"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:text="@string/nfc_title"
diff --git a/core-lib/src/main/res/layout/fragment_passport_details.xml b/core-lib/src/main/res/layout/fragment_passport_details.xml
index 031ff890..639cc328 100644
--- a/core-lib/src/main/res/layout/fragment_passport_details.xml
+++ b/core-lib/src/main/res/layout/fragment_passport_details.xml
@@ -35,7 +35,7 @@
                     android:padding="@dimen/margin_small">
 
                     <ImageView
-                        android:id="@+id/iconWarning"
+                        android:id="@+id/icon_warning"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:layout_centerVertical="true"
@@ -61,7 +61,7 @@
                         android:layout_below="@+id/textWarningTitle"
                         android:layout_marginStart="@dimen/margin_small"
                         android:layout_marginEnd="@dimen/margin_small"
-                        android:layout_toEndOf="@+id/iconWarning"
+                        android:layout_toEndOf="@+id/icon_warning"
                         android:text="@string/document_chip_content_success"
                         android:textColor="@color/white" />