added progress

Author: syakimchik

Samples/Advanced/DocumentReader-Kotlin/app/src/main/java/com/regula/documentreader/CustomRfidActivity.kt

@@ -158,11 +158,11 @@ class CustomRfidActivity : AppCompatActivity() {
                             binding.currentDataGroupLt.visibility = View.VISIBLE
                             binding.rfidStatus.setTextColor(getColor(android.R.color.holo_orange_light))
                         }
+                        rfidProgress(
+                            results.documentReaderNotification!!.code,
+                            results.documentReaderNotification!!.value
+                        )
                     }
-                    rfidProgress(
-                        results.documentReaderNotification!!.code,
-                        results.documentReaderNotification!!.value
-                    )
                 }
                 DocReaderAction.ERROR -> {
                     val builder =
@@ -179,19 +179,26 @@ class CustomRfidActivity : AppCompatActivity() {
         }
     }
 
-    private fun codeToType(code: Int): Int = code and 0x10000
+//    private fun codeToType(code: Int): Int = code and 0x10000
 
     private fun rfidProgress(code: Int, value: Int) {
-        when (code and -0x10000) {
-            eRFID_NotificationAndErrorCodes.RFID_NOTIFICATION_PCSC_READING_DATAGROUP -> if (value == 0) {
-                handler.post {
-                    binding.currentRfidDgTv.text = String.format(
-                        getString(R.string.strReadingRFIDDG), eRFID_DataFile_Type.getTranslation(
-                            applicationContext, codeToType(code)
-                        )
-                    )
-                }
-            }
+        val hiword = code and -0x10000
+        val loword = code and 0x0000FFFF
+        val progress = value and -0x10
+
+        var currentDataGroup: String? = null
+        if (hiword == eRFID_NotificationAndErrorCodes.RFID_NOTIFICATION_PCSC_READING_DATAGROUP)
+            currentDataGroup = if (value == 100) null else String.format(
+                getString(com.regula.documentreader.api.R.string.strReadingRFIDDG),
+                eRFID_DataFile_Type.getTranslation(applicationContext, loword)
+            )
+
+        if (currentDataGroup != null && currentDataGroup.isNotEmpty()) {
+            binding.currentRfidDgTv.text = currentDataGroup
+        }
+
+        if (progress in 1..100) {
+            binding.progressBar.progress = progress
         }
     }
 

Samples/Advanced/DocumentReader-Kotlin/app/src/main/res/layout/activity_custom_rfid.xml

@@ -5,37 +5,40 @@
     android:layout_height="match_parent"
     tools:context=".CustomRfidActivity">
 
-    <androidx.constraintlayout.widget.ConstraintLayout
+    <LinearLayout
         android:id="@+id/currentDataGroupLt"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_toStartOf="@id/skipRfidBtn"
         android:visibility="gone"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toStartOf="@+id/skipRfidBtn"
-        app:layout_constraintStart_toStartOf="parent">
+        app:layout_constraintStart_toStartOf="parent"
+        android:orientation="vertical"
+        android:layout_margin="10dp">
 
         <ProgressBar
-            android:id="@+id/progress"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:indeterminateTint="?colorAccent"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="parent" />
+            android:id="@+id/progressBar"
+            style="@android:style/Widget.ProgressBar.Horizontal"
+            android:layout_width="200dp"
+            android:layout_height="10dp"
+            android:layout_below="@id/currentRfidDgTv"
+            android:layout_centerHorizontal="true"
+            android:layout_gravity="center_horizontal"
+            android:indeterminate="false"
+            android:visibility="visible"
+            android:layout_marginTop="@dimen/reg_visual_element_margin"
+            android:foregroundTint="@color/imageTintColor" />
 
         <TextView
             android:id="@+id/currentRfidDgTv"
-            android:layout_width="0dp"
+            android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:paddingStart="@dimen/padding_gap"
             android:paddingEnd="@dimen/padding_gap"
-            android:textColor="?colorOnSecondary"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toEndOf="@+id/progress"
-            app:layout_constraintTop_toTopOf="parent" />
-    </androidx.constraintlayout.widget.ConstraintLayout>
+            android:paddingTop="@dimen/padding_gap"
+            android:textColor="?colorOnSecondary" />
+    </LinearLayout>
 
     <TextView
         android:id="@+id/rfidStatus"