react-native-mytatva-rn-sdk 1.2.33 → 1.2.35

package/android/src/main/java/com/mytatvarnsdk/CgmTrackyLibModule.kt

@@ -321,18 +321,12 @@ class CgmTrackyLibModule(reactContext: ReactApplicationContext) :
     fun reconnectCgmTracky(token: String) {
         try {
             userToken = token
-            val intent = if (areAllPermissionsGranted()) {
-                Intent(currentActivity, SearchTransmitterActivity::class.java).putExtra(
+            currentActivity?.startActivity(
+                Intent(currentActivity, StartCGMActivity::class.java).putExtra(
                     "IsForReconnect",
                     true
                 )
-            } else {
-                Intent(currentActivity, PermissionActivity::class.java).putExtra(
-                    "IsForReconnect",
-                    true
-                )
-            }
-            currentActivity?.startActivity(intent)
+            )
         } catch (e: Exception) {
             Log.e("reconnectCgmTracky", "reconnectCgmTracky: ${e.message}")
         }
@@ -348,27 +342,6 @@ class CgmTrackyLibModule(reactContext: ReactApplicationContext) :
         }
     }
 
-    private fun areAllPermissionsGranted(): Boolean {
-        val requiredPermissions = mutableListOf<String>()
-
-        // Add Bluetooth permissions
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) {
-            requiredPermissions.addAll(PermissionUtils.BLUETOOTH_S)
-        }
-
-        // Add location permissions
-        requiredPermissions.addAll(PermissionUtils.LOCAL_PERMISSION)
-
-        // Add camera permission
-        requiredPermissions.addAll(PermissionUtils.CAMERA_PERMISSION)
-
-        return requiredPermissions.all {
-            ContextCompat.checkSelfPermission(
-                mReactContext!!,
-                it
-            ) == PackageManager.PERMISSION_GRANTED
-        }
-    }
 
     @ReactMethod
     fun observeGlucoseData(token: String) {

package/android/src/main/java/com/mytatvarnsdk/activity/ConnectSensorActivity.kt

@@ -136,8 +136,8 @@ class ConnectSensorActivity : BaseBleActivity() {
             binding.btnSupport.tvProceed.text = "Contact Support"
             binding.btnRetry.tvProceed.text = "Retry"
 
-            binding.btnWatchDemo.post {
-                binding.btnWatchDemo.setOnClickListener {
+            binding.llWatchDemo.post {
+                binding.llWatchDemo.setOnClickListener {
                     Log.d("CLICK", "Layout Clicked")
                     startActivity(
                         Intent(this, VideoActivity::class.java).putExtra("VideoId", "zRlFFdr-QD4")
@@ -318,6 +318,13 @@ class ConnectSensorActivity : BaseBleActivity() {
         ProgressManagement.getInstance().dismissWait(this)
         if (isForReconnect) {
             sendDataToRN("")
+            startActivity(
+                Intent(this, SensorConnectSuccessActivity::class.java)
+                    .putExtra(
+                        "IsForReconnect",
+                        true
+                    )
+            )
         } else {
             startActivity(Intent(this, SensorConnectSuccessActivity::class.java))
         }

package/android/src/main/java/com/mytatvarnsdk/activity/SearchTransmitterActivity.kt

@@ -130,8 +130,8 @@ class SearchTransmitterActivity : BaseBleActivity() {
             binding.btnSupport.tvProceed.text = "Contact Support"
             binding.btnRetry.tvProceed.text = "Retry"
 
-            binding.btnWatchDemo.post {
-                binding.btnWatchDemo.setOnClickListener {
+            binding.llWatchDemo.post {
+                binding.llWatchDemo.setOnClickListener {
                     Log.d("CLICK", "Layout Clicked")
                     val intent = Intent(this, VideoActivity::class.java)
                     intent.putExtra("VideoId", "zRlFFdr-QD4")
@@ -531,7 +531,11 @@ class SearchTransmitterActivity : BaseBleActivity() {
 
             Log.d("onDeviceConnect--->", "onDeviceConnect: " + transmitterDeviceInfo.toString())
             if (enumDevice.getEnumDevice(transmitterDeviceInfo!!.pocDevice.name).isAbleScanQRCode) {
-                proceedToNextStep()
+                if (isForReconnect) {
+                    proceedToNextStep()
+                } else {
+                    bindSuccess()
+                }
             } else {
                 bind(transmitterDeviceInfo!!.pocDevice)
             }

package/android/src/main/java/com/mytatvarnsdk/activity/SensorConnectSuccessActivity.kt

@@ -36,127 +36,138 @@ import java.util.Locale
 
 
 class SensorConnectSuccessActivity : AppCompatActivity() {
-  private lateinit var binding: ActivitySensorConnectSuccessBinding
-  lateinit var authenticateSDKService: AuthenticateSDKService
-  private val job = Job()
-  private val scope = CoroutineScope(Dispatchers.IO + job)
-
-  override fun onCreate(savedInstanceState: Bundle?) {
-    super.onCreate(savedInstanceState)
-    binding = ActivitySensorConnectSuccessBinding.inflate(layoutInflater)
-    enableEdgeToEdge()
-    setContentView(binding.root)
-    ViewCompat.setOnApplyWindowInsetsListener(findViewById(R.id.main)) { v, insets ->
-      val systemBars = insets.getInsets(WindowInsetsCompat.Type.systemBars())
-      v.setPadding(systemBars.left, systemBars.top, systemBars.right, systemBars.bottom)
-      insets
-    }
+    private lateinit var binding: ActivitySensorConnectSuccessBinding
+    lateinit var authenticateSDKService: AuthenticateSDKService
+    private val job = Job()
+    private val scope = CoroutineScope(Dispatchers.IO + job)
+    private var isForReconnect: Boolean = false
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        binding = ActivitySensorConnectSuccessBinding.inflate(layoutInflater)
+        enableEdgeToEdge()
+        setContentView(binding.root)
+        ViewCompat.setOnApplyWindowInsetsListener(findViewById(R.id.main)) { v, insets ->
+            val systemBars = insets.getInsets(WindowInsetsCompat.Type.systemBars())
+            v.setPadding(systemBars.left, systemBars.top, systemBars.right, systemBars.bottom)
+            insets
+        }
 
-    init()
-  }
+        init()
+    }
 
-  private fun init() {
-    val formatter = SimpleDateFormat("hh:mm a", Locale.getDefault())
-    binding.tvDateTime.text =  "Connected on ${formatter.format(Date()).uppercase()}"
+    private fun init() {
+        isForReconnect = intent.getBooleanExtra("IsForReconnect", false)
 
-    Glide.with(this)
-      .asGif()
-      .load(R.drawable.success_anim)
-      .into(binding.ivSuccess)
+        val formatter = SimpleDateFormat("hh:mm a", Locale.getDefault())
+        binding.tvDateTime.text = "Connected on ${formatter.format(Date()).uppercase()}"
 
-    authenticateSDKService = AuthenticateSDKService(scope = scope)
+        Glide.with(this)
+            .asGif()
+            .load(R.drawable.success_anim)
+            .into(binding.ivSuccess)
 
-    binding.toolbar.btnWhatsapp.setOnClickListener {
-      startActivity(Intent(this, HelpActivity::class.java))
-    }
+        authenticateSDKService = AuthenticateSDKService(scope = scope)
 
-    binding.toolbar.btnWatchDemo.setOnClickListener {
-      startActivity(
-        Intent(this, VideoActivity::class.java).putExtra("VideoId", "r5Zemc4R044")
-      )
-    }
+        binding.toolbar.btnWhatsapp.setOnClickListener {
+            startActivity(Intent(this, HelpActivity::class.java))
+        }
 
-    binding.commonButton.btnProceed.setOnClickListener {
-      startActivity(Intent(this, PlaceSensorActivity::class.java))
-      finish()
-    }
+        binding.toolbar.btnWatchDemo.setOnClickListener {
+            startActivity(
+                Intent(this, VideoActivity::class.java).putExtra("VideoId", "r5Zemc4R044")
+            )
+        }
 
-    binding.toolbar.btnClose.setOnClickListener {
-      openExitDialog()
-    }
+        binding.commonButton.btnProceed.setOnClickListener {
+            if (isForReconnect) {
+                startActivity(Intent(this, PlaceTransmitterActivity::class.java))
+            } else {
+                startActivity(Intent(this, PlaceSensorActivity::class.java))
+            }
+            finish()
+        }
 
-    val callback: OnBackPressedCallback = object : OnBackPressedCallback(true) {
-      override fun handleOnBackPressed() {
-        openExitDialog()
-      }
-    }
-    onBackPressedDispatcher.addCallback(this, callback)
-
-    postEventDataToAPI()
-  }
-
-  private fun postEventDataToAPI() {
-    val sharedPreferencesLibraryUtil = SharedPreferencesLibraryUtil(this)
-    val information = sharedPreferencesLibraryUtil.qrInformation
-
-    val rawData = JSONObject()
-    rawData.put("transmitterName", information.transmitterName)
-    rawData.put("SensorId", information.sensor)
-    rawData.put("R", information.r)
-    rawData.put("K", information.k)
-    rawData.put("Sensor", information.sensor)
-    rawData.put("timeInMillis", information.timeInMillis)
-
-    val obj = JSONObject()
-    obj.put("sensorId", information.sensor)
-    obj.put("status", DeviceStatus.CONNECTED.id)
-    obj.put("rawData", rawData)
-
-    authenticateSDKService.postDeviceData(
-      environment = if ("uat".uppercase() == "PROD") TATVA_ENVIRONMENT.PROD else TATVA_ENVIRONMENT.STAGE,
-      data = obj.toString(),
-      token = CgmTrackyLibModule.userToken,
-      loaderListener = object : LoaderListener {
-        override fun onShowLoader() {
-          ProgressManagement.getInstance()
-            .showWait(this@SensorConnectSuccessActivity, ProgressType.PROGRESSDIALOG_CONNECT, null)
+        binding.toolbar.btnClose.setOnClickListener {
+            openExitDialog()
         }
 
-        override fun onHideLoader() {
-          ProgressManagement.getInstance().dismissWait(this@SensorConnectSuccessActivity)
+        val callback: OnBackPressedCallback = object : OnBackPressedCallback(true) {
+            override fun handleOnBackPressed() {
+                openExitDialog()
+            }
         }
-      }
-    )
-  }
+        onBackPressedDispatcher.addCallback(this, callback)
+
+        postEventDataToAPI()
+    }
+
+    private fun postEventDataToAPI() {
+        val sharedPreferencesLibraryUtil = SharedPreferencesLibraryUtil(this)
+        val information = sharedPreferencesLibraryUtil.qrInformation
+
+        val rawData = JSONObject()
+        rawData.put("transmitterName", information.transmitterName)
+        rawData.put("SensorId", information.sensor)
+        rawData.put("R", information.r)
+        rawData.put("K", information.k)
+        rawData.put("Sensor", information.sensor)
+        rawData.put("timeInMillis", information.timeInMillis)
+
+        val obj = JSONObject()
+        obj.put("sensorId", information.sensor)
+        obj.put("status", DeviceStatus.CONNECTED.id)
+        obj.put("rawData", rawData)
+
+        authenticateSDKService.postDeviceData(
+            environment = if ("uat".uppercase() == "PROD") TATVA_ENVIRONMENT.PROD else TATVA_ENVIRONMENT.STAGE,
+            data = obj.toString(),
+            token = CgmTrackyLibModule.userToken,
+            loaderListener = object : LoaderListener {
+                override fun onShowLoader() {
+                    ProgressManagement.getInstance()
+                        .showWait(
+                            this@SensorConnectSuccessActivity,
+                            ProgressType.PROGRESSDIALOG_CONNECT,
+                            null
+                        )
+                }
+
+                override fun onHideLoader() {
+                    ProgressManagement.getInstance().dismissWait(this@SensorConnectSuccessActivity)
+                }
+            }
+        )
+    }
 
-  private fun openExitDialog() {
-    val binding = ExitDialogBottomsheetBinding.inflate(layoutInflater)
+    private fun openExitDialog() {
+        val binding = ExitDialogBottomsheetBinding.inflate(layoutInflater)
 
-    val dialog = Dialog(this)
-    dialog.requestWindowFeature(Window.FEATURE_NO_TITLE)
-    dialog.setContentView(binding.root)
+        val dialog = Dialog(this)
+        dialog.requestWindowFeature(Window.FEATURE_NO_TITLE)
+        dialog.setContentView(binding.root)
 
-    val window = dialog.window
-    window?.setLayout(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.WRAP_CONTENT)
-    window?.setGravity(Gravity.BOTTOM)
-    window?.setBackgroundDrawable(Color.TRANSPARENT.toDrawable())
+        val window = dialog.window
+        window?.setLayout(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.WRAP_CONTENT)
+        window?.setGravity(Gravity.BOTTOM)
+        window?.setBackgroundDrawable(Color.TRANSPARENT.toDrawable())
 
-    binding.btnExit.tvProceed.text = "Exit"
+        binding.btnExit.tvProceed.text = "Exit"
 
-    binding.btnExit.root.setOnClickListener(View.OnClickListener { v: View? ->
-      finish()
-      dialog.dismiss()
-    })
+        binding.btnExit.root.setOnClickListener(View.OnClickListener { v: View? ->
+            finish()
+            dialog.dismiss()
+        })
 
-    binding.btnCancel.root.setOnClickListener(View.OnClickListener { v: View? ->
-      dialog.dismiss()
-    })
+        binding.btnCancel.root.setOnClickListener(View.OnClickListener { v: View? ->
+            dialog.dismiss()
+        })
 
-    binding.closeButton.setOnClickListener(View.OnClickListener { v: View? ->
-      dialog.dismiss()
-    })
+        binding.closeButton.setOnClickListener(View.OnClickListener { v: View? ->
+            dialog.dismiss()
+        })
 
-    dialog.show()
-  }
+        dialog.show()
+    }
 
 }

package/android/src/main/java/com/mytatvarnsdk/activity/StartCGMActivity.kt

@@ -2,7 +2,9 @@ package com.mytatvarnsdk.activity
 
 import android.app.Dialog
 import android.content.Intent
+import android.content.pm.PackageManager
 import android.graphics.Color
+import android.os.Build
 import android.os.Bundle
 import android.view.Gravity
 import android.view.View
@@ -11,9 +13,11 @@ import android.view.Window
 import androidx.activity.OnBackPressedCallback
 import androidx.activity.enableEdgeToEdge
 import androidx.appcompat.app.AppCompatActivity
+import androidx.core.content.ContextCompat
 import androidx.core.graphics.drawable.toDrawable
 import androidx.core.view.ViewCompat
 import androidx.core.view.WindowInsetsCompat
+import com.mytatvarnsdk.CgmTrackyLibModule.Companion.mReactContext
 import com.mytatvarnsdk.R
 import com.mytatvarnsdk.databinding.ActivityStartCgmactivityBinding
 import com.mytatvarnsdk.databinding.ExitDialogBottomsheetBinding
@@ -21,6 +25,7 @@ import com.mytatvarnsdk.databinding.ExitDialogBottomsheetBinding
 
 class StartCGMActivity : AppCompatActivity() {
     private lateinit var binding: ActivityStartCgmactivityBinding
+    private var isForReconnect: Boolean = false
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
@@ -37,9 +42,31 @@ class StartCGMActivity : AppCompatActivity() {
     }
 
     private fun init() {
-        binding.commonButton.tvProceed.text = "Start Connection Journey"
+        isForReconnect = intent.getBooleanExtra("IsForReconnect", false)
+
+        if (isForReconnect) {
+            binding.commonButton.tvProceed.text = "Start Reconnection Journey"
+        } else {
+            binding.commonButton.tvProceed.text = "Start Connection Journey"
+        }
+
         binding.commonButton.btnProceed.setOnClickListener {
-            startActivity(Intent(this@StartCGMActivity, PermissionActivity::class.java))
+            if (isForReconnect) {
+                val intent = if (areAllPermissionsGranted()) {
+                    Intent(this, SearchTransmitterActivity::class.java).putExtra(
+                        "IsForReconnect",
+                        true
+                    )
+                } else {
+                    Intent(this, PermissionActivity::class.java).putExtra(
+                        "IsForReconnect",
+                        true
+                    )
+                }
+                startActivity(intent)
+            } else {
+                startActivity(Intent(this@StartCGMActivity, PermissionActivity::class.java))
+            }
             finish()
         }
 
@@ -65,6 +92,27 @@ class StartCGMActivity : AppCompatActivity() {
         onBackPressedDispatcher.addCallback(this, callback)
     }
 
+    private fun areAllPermissionsGranted(): Boolean {
+        val requiredPermissions = mutableListOf<String>()
+
+        // Add Bluetooth permissions
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) {
+            requiredPermissions.addAll(PermissionUtils.BLUETOOTH_S)
+        }
+
+        // Add location permissions
+        requiredPermissions.addAll(PermissionUtils.LOCAL_PERMISSION)
+
+
+        return requiredPermissions.all {
+            ContextCompat.checkSelfPermission(
+                mReactContext!!,
+                it
+            ) == PackageManager.PERMISSION_GRANTED
+        }
+    }
+
+
     private fun openExitDialog() {
         val binding = ExitDialogBottomsheetBinding.inflate(layoutInflater)
 

package/android/src/main/res/color/radio_text_selector.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
-  <item android:color="@android:color/white" android:state_checked="true"/>
+  <item android:color="#000000" android:state_checked="true"/>
   <item android:color="#333333"/>
 </selector>

package/android/src/main/res/layout/activity_connect_sensor.xml

@@ -440,8 +440,8 @@
         </androidx.constraintlayout.widget.ConstraintLayout>
 
 
-        <androidx.appcompat.widget.LinearLayoutCompat
-            android:id="@+id/btnWatchDemo"
+        <LinearLayout
+            android:id="@+id/llWatchDemo"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_marginHorizontal="20dp"
@@ -473,7 +473,7 @@
                 android:textColor="#2D3282"
                 android:textSize="@dimen/text_12sp" />
 
-        </androidx.appcompat.widget.LinearLayoutCompat>
+        </LinearLayout>
 
         <TextView
             android:layout_width="0dp"
@@ -488,7 +488,7 @@
             android:textSize="14sp"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/btnWatchDemo" />
+            app:layout_constraintTop_toBottomOf="@id/llWatchDemo" />
 
 
         <androidx.appcompat.widget.LinearLayoutCompat

package/android/src/main/res/layout/activity_help.xml

@@ -102,7 +102,6 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginBottom="12dp"
-            android:drawableStart="@drawable/custom_radio_icon_selector"
             android:drawablePadding="10dp"
             android:text="Purchasing New CGM" />
 
@@ -112,7 +111,6 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginBottom="12dp"
-            android:drawableStart="@drawable/custom_radio_icon_selector"
             android:drawablePadding="10dp"
             android:text="Connecting My CGM" />
 
@@ -121,7 +119,6 @@
             style="@style/CustomRadioButton"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:drawableStart="@drawable/custom_radio_icon_selector"
             android:drawablePadding="10dp"
             android:text="Having troubles after connection" />
     </RadioGroup>

package/android/src/main/res/layout/activity_search_transmitter.xml

@@ -691,8 +691,8 @@
         </androidx.constraintlayout.widget.ConstraintLayout>
 
 
-        <androidx.appcompat.widget.LinearLayoutCompat
-            android:id="@+id/btnWatchDemo"
+        <LinearLayout
+            android:id="@+id/llWatchDemo"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_marginHorizontal="20dp"
@@ -724,7 +724,7 @@
                 android:textColor="#2D3282"
                 android:textSize="@dimen/text_12sp" />
 
-        </androidx.appcompat.widget.LinearLayoutCompat>
+        </LinearLayout>
 
         <TextView
             android:layout_width="0dp"
@@ -739,7 +739,7 @@
             android:textSize="14sp"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/btnWatchDemo" />
+            app:layout_constraintTop_toBottomOf="@id/llWatchDemo" />
 
 
         <androidx.appcompat.widget.LinearLayoutCompat