react-native-mytatva-rn-sdk 1.2.93 → 1.2.94

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

@@ -2,7 +2,6 @@ package com.mytatvarnsdk.activity
 
 import android.Manifest
 import android.annotation.SuppressLint
-import android.app.AlertDialog
 import android.app.Dialog
 import android.bluetooth.BluetoothAdapter
 import android.content.Context
@@ -18,6 +17,7 @@ import android.view.Gravity
 import android.view.View
 import android.view.ViewGroup
 import android.view.Window
+import android.widget.TextView
 import android.widget.Toast
 import androidx.activity.OnBackPressedCallback
 import androidx.activity.enableEdgeToEdge
@@ -34,6 +34,7 @@ import com.facebook.react.bridge.CatalystInstance
 import com.facebook.react.bridge.WritableMap
 import com.facebook.react.modules.core.DeviceEventManagerModule
 import com.mytatvarnsdk.CgmTrackyLibModule
+import com.mytatvarnsdk.R
 import com.mytatvarnsdk.base.BasePermissionActivity
 import com.mytatvarnsdk.databinding.ActivityPermissionBinding
 import com.mytatvarnsdk.databinding.BluetoothDialogBottomsheetBinding
@@ -46,12 +47,18 @@ class PermissionActivity : BasePermissionActivity() {
     private val BLUETOOTH_REQUEST_CODE = 102
 
     private val REQUEST_ENABLE_BT = 1
+
+    companion object {
+        private const val CGM_PERMISSION_PREFS = "cgm_permission_prefs"
+        private const val REQUESTED_PREFIX = "requested_"
+    }
     private val bluetoothAdapter: BluetoothAdapter? by lazy {
         BluetoothAdapter.getDefaultAdapter()
     }
     private val reactContext = CgmTrackyLibModule.mReactContext
 
     private var isForReconnect: Boolean = false
+    private var pendingBluetoothAfterLocation = false
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
@@ -71,11 +78,6 @@ class PermissionActivity : BasePermissionActivity() {
     override fun getPermission(): Array<out Array<out String?>?>? {
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) {
             return arrayOf<Array<String?>?>(ConstantsLibrary.BLUETOOTH_S)
-        } else if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
-            return arrayOf<Array<String?>?>(
-                ConstantsLibrary.LOCAL_PERMISSION,
-                ConstantsLibrary.BACKGROUND_LOCATION_Q
-            )
         } else {
             return arrayOf<Array<String?>?>(ConstantsLibrary.LOCAL_PERMISSION)
         }
@@ -136,20 +138,18 @@ class PermissionActivity : BasePermissionActivity() {
 
         sendDataToRN("", "cgm_permissions_page_landing")
 
-        bluetoothAdapter?.let {
-            binding.switchBluetooth.isChecked = isBluetoothPermissionGranted(this) && it.isEnabled
-        }
-
-        binding.switchLocation.isChecked = isLocationPermissionGranted(this)
+        refreshPermissionSwitchStates()
 
         binding.switchBluetooth.setOnCheckedChangeListener { _, isChecked ->
             if (isChecked) {
+                setSwitchChecked(binding.switchBluetooth, false)
                 requestBluetoothPermission()
             }
         }
 
         binding.switchLocation.setOnCheckedChangeListener { _, isChecked ->
             if (isChecked) {
+                setSwitchChecked(binding.switchLocation, false)
                 requestLocationPermission()
             }
         }
@@ -294,50 +294,224 @@ class PermissionActivity : BasePermissionActivity() {
     }
 
 
-    private fun requestForegroundLocationPermission() {
-        val locationPermissions = PermissionUtils.LOCAL_PERMISSION
-
-        if (hasPermissions(locationPermissions)) {
-            onForegroundLocationGranted()
+    private fun setSwitchChecked(switch: androidx.appcompat.widget.SwitchCompat, checked: Boolean) {
+        switch.setOnCheckedChangeListener(null)
+        switch.isChecked = checked
+        if (switch.id == binding.switchBluetooth.id) {
+            switch.setOnCheckedChangeListener { _, isChecked ->
+                if (isChecked) {
+                    setSwitchChecked(binding.switchBluetooth, false)
+                    requestBluetoothPermission()
+                }
+            }
         } else {
-            ActivityCompat.requestPermissions(
-                this,
-                locationPermissions,
-                LOCATION_REQUEST_CODE
-            )
+            switch.setOnCheckedChangeListener { _, isChecked ->
+                if (isChecked) {
+                    setSwitchChecked(binding.switchLocation, false)
+                    requestLocationPermission()
+                }
+            }
         }
     }
 
-    private fun requestLocationPermission() {
-        val permissions = mutableListOf(*PermissionUtils.LOCAL_PERMISSION)
+    private fun showPermissionDisclosure(
+        title: String,
+        message: String,
+        onContinue: () -> Unit,
+        onCancel: () -> Unit,
+    ) {
+        showActionBottomSheet(
+            title = title,
+            message = message,
+            continueText = getString(R.string.cgm_disclosure_continue),
+            onContinue = onContinue,
+            onCancel = onCancel,
+        )
+    }
 
-        val permissionArray = permissions.toTypedArray()
+    private fun showPermissionSettingsPrompt(
+        title: String,
+        message: String,
+        onCancel: () -> Unit,
+    ) {
+        showActionBottomSheet(
+            title = title,
+            message = message,
+            continueText = getString(R.string.cgm_open_settings),
+            onContinue = { openAppPermissionSettings() },
+            onCancel = onCancel,
+        )
+    }
 
-        if (hasPermissions(permissionArray)) {
-            onLocationPermissionGranted()
-        } else {
-            val rationaleNeeded = permissionArray.any {
-                ActivityCompat.shouldShowRequestPermissionRationale(this, it)
+    private fun showActionBottomSheet(
+        title: String,
+        message: String,
+        continueText: String,
+        onContinue: () -> Unit,
+        onCancel: () -> Unit,
+    ) {
+        val sheetView =
+            layoutInflater.inflate(R.layout.permission_disclosure_bottomsheet, null)
+
+        sheetView.findViewById<TextView>(R.id.disclosure_title).text = title
+        sheetView.findViewById<TextView>(R.id.disclosure_message).text = message
+
+        val dialog = Dialog(this)
+        dialog.requestWindowFeature(Window.FEATURE_NO_TITLE)
+        dialog.setContentView(sheetView)
+        dialog.setCancelable(false)
+        dialog.setCanceledOnTouchOutside(false)
+
+        val window = dialog.window
+        window?.setLayout(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.WRAP_CONTENT)
+        window?.setGravity(Gravity.BOTTOM)
+        window?.setBackgroundDrawable(Color.TRANSPARENT.toDrawable())
+
+        var pendingAction: (() -> Unit)? = null
+        dialog.setOnDismissListener {
+            val action = pendingAction
+            pendingAction = null
+            if (action != null) {
+                binding.root.post { action() }
             }
+        }
 
-            if (rationaleNeeded) {
-                showPermissionRationale(
-                    title = "Location Permission Needed",
-                    message = "We need location access for Bluetooth scanning.",
-                    onProceed = {
-                        ActivityCompat.requestPermissions(
-                            this,
-                            permissionArray,
-                            LOCATION_REQUEST_CODE
-                        )
-                    }
-                )
-            } else {
-                ActivityCompat.requestPermissions(this, permissionArray, LOCATION_REQUEST_CODE)
+        val notNowButton = sheetView.findViewById<View>(R.id.btn_not_now)
+        notNowButton.findViewById<TextView>(R.id.tvProceed).text =
+            getString(R.string.cgm_disclosure_not_now)
+        notNowButton.findViewById<View>(R.id.btnProceed).setOnClickListener {
+            pendingAction = onCancel
+            dialog.dismiss()
+        }
+
+        val continueButton = sheetView.findViewById<View>(R.id.btn_continue)
+        continueButton.findViewById<TextView>(R.id.tvProceed).text = continueText
+        continueButton.findViewById<View>(R.id.btnProceed).setOnClickListener {
+            pendingAction = onContinue
+            dialog.dismiss()
+        }
+
+        dialog.show()
+    }
+
+    private fun getMissingPermissions(permissions: Array<String>): Array<String> {
+        return permissions.filter {
+            ContextCompat.checkSelfPermission(this, it) != PackageManager.PERMISSION_GRANTED
+        }.toTypedArray()
+    }
+
+    private fun hasRequestedPermissionBefore(permission: String): Boolean {
+        return permissionPrefs().getBoolean("$REQUESTED_PREFIX$permission", false)
+    }
+
+    private fun markPermissionsRequested(permissions: Array<String>) {
+        val editor = permissionPrefs().edit()
+        permissions.forEach { editor.putBoolean("$REQUESTED_PREFIX$it", true) }
+        editor.apply()
+    }
+
+    private fun permissionPrefs() =
+        getSharedPreferences(CGM_PERMISSION_PREFS, Context.MODE_PRIVATE)
+
+    private fun isPermissionBlocked(permission: String): Boolean {
+        if (ContextCompat.checkSelfPermission(this, permission) ==
+            PackageManager.PERMISSION_GRANTED
+        ) {
+            return false
+        }
+        if (ActivityCompat.shouldShowRequestPermissionRationale(this, permission)) {
+            return false
+        }
+        return hasRequestedPermissionBefore(permission)
+    }
+
+    private fun canRequestSystemPermission(permissions: Array<String>): Boolean {
+        val missing = getMissingPermissions(permissions)
+        if (missing.isEmpty()) {
+            return false
+        }
+        return missing.none { isPermissionBlocked(it) }
+    }
+
+    private fun openAppPermissionSettings() {
+        startActivity(
+            Intent(Settings.ACTION_APPLICATION_DETAILS_SETTINGS).apply {
+                data = Uri.fromParts("package", packageName, null)
+            },
+        )
+    }
+
+    private fun requestMissingPermissionsAfterDisclosure(
+        permissions: Array<String>,
+        requestCode: Int,
+        settingsTitle: String,
+        settingsMessage: String,
+        onBlockedCancel: () -> Unit,
+    ) {
+        val missing = getMissingPermissions(permissions)
+        if (missing.isEmpty()) {
+            completePermissionRequest(requestCode)
+            return
+        }
+        if (canRequestSystemPermission(missing)) {
+            markPermissionsRequested(missing)
+            ActivityCompat.requestPermissions(this, missing, requestCode)
+            return
+        }
+        showPermissionSettingsPrompt(
+            title = settingsTitle,
+            message = settingsMessage,
+            onCancel = onBlockedCancel,
+        )
+    }
+
+    private fun completePermissionRequest(requestCode: Int) {
+        when (requestCode) {
+            LOCATION_REQUEST_CODE -> {
+                if (pendingBluetoothAfterLocation) {
+                    pendingBluetoothAfterLocation = false
+                    onBluetoothPermissionGranted()
+                } else {
+                    onLocationPermissionGranted()
+                }
             }
+            BLUETOOTH_REQUEST_CODE -> onBluetoothPermissionGranted()
         }
     }
 
+    private fun refreshPermissionSwitchStates() {
+        setSwitchChecked(binding.switchLocation, isLocationPermissionGranted(this))
+        val isBluetoothReady = isBluetoothPermissionGranted(this) &&
+            bluetoothAdapter?.isEnabled == true
+        setSwitchChecked(binding.switchBluetooth, isBluetoothReady)
+    }
+
+    private fun requestLocationPermission() {
+        val permissionArray = PermissionUtils.LOCAL_PERMISSION
+
+        if (hasPermissions(permissionArray)) {
+            onLocationPermissionGranted()
+            return
+        }
+
+        showPermissionDisclosure(
+            title = getString(R.string.cgm_location_disclosure_title),
+            message = getString(R.string.cgm_location_disclosure_message),
+            onContinue = {
+                requestMissingPermissionsAfterDisclosure(
+                    permissions = permissionArray,
+                    requestCode = LOCATION_REQUEST_CODE,
+                    settingsTitle = getString(R.string.cgm_location_settings_title),
+                    settingsMessage = getString(R.string.cgm_location_settings_message),
+                    onBlockedCancel = { setSwitchChecked(binding.switchLocation, false) },
+                )
+            },
+            onCancel = {
+                setSwitchChecked(binding.switchLocation, false)
+            },
+        )
+    }
+
     @RequiresPermission(Manifest.permission.BLUETOOTH_CONNECT)
     private fun requestBluetoothPermission() {
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) {
@@ -345,42 +519,53 @@ class PermissionActivity : BasePermissionActivity() {
 
             if (hasPermissions(permissions)) {
                 onBluetoothPermissionGranted()
-            } else {
-                val rationaleNeeded = permissions.any {
-                    ActivityCompat.shouldShowRequestPermissionRationale(this, it)
-                }
+                return
+            }
 
-                if (rationaleNeeded) {
-                    showPermissionRationale(
-                        title = "Bluetooth Permission Needed",
-                        message = "We need Bluetooth access to connect your device.",
-                        onProceed = {
-                            ActivityCompat.requestPermissions(
-                                this,
-                                permissions,
-                                BLUETOOTH_REQUEST_CODE
-                            )
-                        }
+            showPermissionDisclosure(
+                title = getString(R.string.cgm_bluetooth_disclosure_title),
+                message = getString(R.string.cgm_bluetooth_disclosure_message),
+                onContinue = {
+                    requestMissingPermissionsAfterDisclosure(
+                        permissions = permissions,
+                        requestCode = BLUETOOTH_REQUEST_CODE,
+                        settingsTitle = getString(R.string.cgm_bluetooth_settings_title),
+                        settingsMessage = getString(R.string.cgm_bluetooth_settings_message),
+                        onBlockedCancel = { setSwitchChecked(binding.switchBluetooth, false) },
                     )
-                } else {
-                    ActivityCompat.requestPermissions(this, permissions, BLUETOOTH_REQUEST_CODE)
-                }
-            }
+                },
+                onCancel = {
+                    setSwitchChecked(binding.switchBluetooth, false)
+                },
+            )
         } else {
-            onBluetoothPermissionGranted()
+            if (!hasPermissions(PermissionUtils.LOCAL_PERMISSION)) {
+                showPermissionDisclosure(
+                    title = getString(R.string.cgm_bluetooth_disclosure_title),
+                    message = getString(R.string.cgm_bluetooth_disclosure_message),
+                    onContinue = {
+                        pendingBluetoothAfterLocation = true
+                        requestMissingPermissionsAfterDisclosure(
+                            permissions = PermissionUtils.LOCAL_PERMISSION,
+                            requestCode = LOCATION_REQUEST_CODE,
+                            settingsTitle = getString(R.string.cgm_location_settings_title),
+                            settingsMessage = getString(R.string.cgm_location_settings_message),
+                            onBlockedCancel = {
+                                pendingBluetoothAfterLocation = false
+                                setSwitchChecked(binding.switchBluetooth, false)
+                            },
+                        )
+                    },
+                    onCancel = {
+                        setSwitchChecked(binding.switchBluetooth, false)
+                    },
+                )
+            } else {
+                onBluetoothPermissionGranted()
+            }
         }
     }
 
-    private fun showPermissionRationale(title: String, message: String, onProceed: () -> Unit) {
-        AlertDialog.Builder(this)
-            .setTitle(title)
-            .setMessage(message)
-            .setPositiveButton("OK") { _, _ -> onProceed() }
-            .setNegativeButton("Cancel", null)
-            .show()
-    }
-
-
     private fun hasPermissions(permissions: Array<String>): Boolean {
         return permissions.all {
             ContextCompat.checkSelfPermission(this, it) == PackageManager.PERMISSION_GRANTED
@@ -413,17 +598,6 @@ class PermissionActivity : BasePermissionActivity() {
         }
     }
 
-    private fun onForegroundLocationGranted() {
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q &&
-            ContextCompat.checkSelfPermission(this, Manifest.permission.ACCESS_BACKGROUND_LOCATION)
-            != PackageManager.PERMISSION_GRANTED
-        ) {
-            onLocationPermissionGranted()
-        } else {
-            Log.d("Permission", "All location permissions granted")
-        }
-    }
-
     @RequiresPermission(Manifest.permission.BLUETOOTH_CONNECT)
     override fun onRequestPermissionsResult(
         requestCode: Int,
@@ -444,13 +618,24 @@ class PermissionActivity : BasePermissionActivity() {
 
             LOCATION_REQUEST_CODE -> {
                 if (allGranted) {
-                    onLocationPermissionGranted()
+                    if (pendingBluetoothAfterLocation) {
+                        pendingBluetoothAfterLocation = false
+                        onBluetoothPermissionGranted()
+                    } else {
+                        onLocationPermissionGranted()
+                    }
+                } else {
+                    pendingBluetoothAfterLocation = false
+                    setSwitchChecked(binding.switchLocation, false)
+                    setSwitchChecked(binding.switchBluetooth, false)
                 }
             }
 
             BLUETOOTH_REQUEST_CODE -> {
                 if (allGranted) {
                     onBluetoothPermissionGranted()
+                } else {
+                    setSwitchChecked(binding.switchBluetooth, false)
                 }
             }
         }
@@ -458,8 +643,8 @@ class PermissionActivity : BasePermissionActivity() {
     }
 
     private fun onLocationPermissionGranted() {
+        setSwitchChecked(binding.switchLocation, true)
         updateProceedButtonState()
-        // Start location-based action
     }
 
     @RequiresPermission(Manifest.permission.BLUETOOTH_CONNECT)
@@ -473,12 +658,13 @@ class PermissionActivity : BasePermissionActivity() {
             }
         }
 
+        setSwitchChecked(binding.switchBluetooth, true)
         updateProceedButtonState()
-        // Start Bluetooth device scan or connect
     }
 
     override fun onResume() {
         super.onResume()
+        refreshPermissionSwitchStates()
         updateProceedButtonState()
     }
 
@@ -486,7 +672,10 @@ class PermissionActivity : BasePermissionActivity() {
         super.onActivityResult(requestCode, resultCode, data)
         if (requestCode == REQUEST_ENABLE_BT) {
             if (resultCode == RESULT_OK) {
+                setSwitchChecked(binding.switchBluetooth, true)
                 updateProceedButtonState()
+            } else {
+                setSwitchChecked(binding.switchBluetooth, false)
             }
         }
     }

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

@@ -290,7 +290,6 @@
 
   </androidx.constraintlayout.widget.ConstraintLayout>
 
-
   <include
     android:id="@+id/commonButton"
     layout="@layout/layout_button"

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

@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+  xmlns:app="http://schemas.android.com/apk/res-auto"
+  android:layout_width="match_parent"
+  android:layout_height="wrap_content"
+  android:background="@color/white">
+
+  <androidx.cardview.widget.CardView
+    android:id="@+id/btnProceed"
+    android:layout_width="match_parent"
+    android:layout_height="60dp"
+    android:layout_marginTop="10dp"
+    android:layout_marginBottom="10dp"
+    app:cardBackgroundColor="#2A805A"
+    app:cardCornerRadius="12dp"
+    app:cardElevation="0dp"
+    app:layout_constraintBottom_toBottomOf="parent"
+    app:layout_constraintEnd_toEndOf="parent"
+    app:layout_constraintStart_toStartOf="parent"
+    app:layout_constraintTop_toTopOf="parent">
+
+    <androidx.constraintlayout.widget.ConstraintLayout
+      android:layout_width="match_parent"
+      android:layout_height="50dp"
+      android:background="@drawable/bg_green_border_20">
+
+      <TextView
+        android:id="@+id/tvProceed"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:fontFamily="@font/roboto_semibold"
+        android:text="Continue"
+        android:textColor="#ffffff"
+        android:textSize="16sp"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
+
+    </androidx.constraintlayout.widget.ConstraintLayout>
+  </androidx.cardview.widget.CardView>
+
+</androidx.constraintlayout.widget.ConstraintLayout>

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

@@ -0,0 +1,70 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+  android:layout_width="match_parent"
+  android:layout_height="wrap_content"
+  android:background="@drawable/bottom_sheet_background"
+  android:gravity="center_horizontal"
+  android:orientation="vertical"
+  android:paddingHorizontal="16dp"
+  android:paddingTop="12dp"
+  android:paddingBottom="8dp">
+
+  <View
+    android:layout_width="40dp"
+    android:layout_height="4dp"
+    android:layout_marginBottom="20dp"
+    android:background="@drawable/bg_grey" />
+
+  <ImageView
+    android:id="@+id/disclosure_icon"
+    android:layout_width="56dp"
+    android:layout_height="56dp"
+    android:contentDescription="@null"
+    android:src="@drawable/poput_request_permission_icon" />
+
+  <TextView
+    android:id="@+id/disclosure_title"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:layout_marginTop="12dp"
+    android:fontFamily="@font/roboto_bold"
+    android:gravity="center"
+    android:textColor="#212121"
+    android:textSize="20sp" />
+
+  <TextView
+    android:id="@+id/disclosure_message"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:layout_marginTop="12dp"
+    android:fontFamily="@font/roboto_regular"
+    android:gravity="center"
+    android:lineSpacingExtra="4dp"
+    android:paddingHorizontal="8dp"
+    android:textColor="#212121"
+    android:textSize="14sp" />
+
+  <LinearLayout
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:layout_marginTop="16dp"
+    android:orientation="horizontal"
+    android:weightSum="2">
+
+    <include
+      android:id="@+id/btn_not_now"
+      layout="@layout/layout_green_border_button"
+      android:layout_width="0dp"
+      android:layout_height="wrap_content"
+      android:layout_marginEnd="6dp"
+      android:layout_weight="1" />
+
+    <include
+      android:id="@+id/btn_continue"
+      layout="@layout/layout_green_solid_button"
+      android:layout_width="0dp"
+      android:layout_height="wrap_content"
+      android:layout_marginStart="6dp"
+      android:layout_weight="1" />
+  </LinearLayout>
+</LinearLayout>

package/android/src/main/res/values/strings.xml

@@ -201,4 +201,16 @@
     <string name="txt_know_more"><u>Know More</u></string>
     <string name="txt_open_setting"><u>Open System Settings</u></string>
 
+    <string name="cgm_disclosure_not_now">Not now</string>
+    <string name="cgm_disclosure_continue">Continue</string>
+    <string name="cgm_location_disclosure_title">Location data</string>
+    <string name="cgm_location_disclosure_message">GoodFlip uses location data to discover and connect to your CGM device when you set up or sync readings. Location is used only while you use this feature and is not used for advertising.</string>
+    <string name="cgm_bluetooth_disclosure_title">Bluetooth and location</string>
+    <string name="cgm_bluetooth_disclosure_message">GoodFlip uses Bluetooth and location data to discover and connect to your CGM device when you set up or sync readings. Location is used only while you use this feature and is not used for advertising.</string>
+    <string name="cgm_open_settings">Open Settings</string>
+    <string name="cgm_bluetooth_settings_title">Enable Bluetooth permission</string>
+    <string name="cgm_bluetooth_settings_message">Bluetooth access was denied. Open Settings, go to Permissions, and allow Bluetooth so GoodFlip can connect your CGM device.</string>
+    <string name="cgm_location_settings_title">Enable Location permission</string>
+    <string name="cgm_location_settings_message">Location access was denied. Open Settings, go to Permissions, and allow Location so GoodFlip can discover your CGM device.</string>
+
 </resources>