react-native-mytatva-rn-sdk 1.2.10 → 1.2.12

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

@@ -9,8 +9,10 @@ import android.content.Context
 import android.content.Intent
 import android.content.pm.PackageManager
 import android.graphics.Color
+import android.net.Uri
 import android.os.Build
 import android.os.Bundle
+import android.provider.Settings
 import android.util.Log
 import android.view.Gravity
 import android.view.View
@@ -29,9 +31,9 @@ import androidx.core.view.WindowInsetsCompat
 import cgmblelib.utils.ConstantsLibrary
 import com.mytatvarnsdk.base.BasePermissionActivity
 import com.mytatvarnsdk.databinding.ActivityPermissionBinding
+import com.mytatvarnsdk.databinding.BluetoothDialogBottomsheetBinding
 import com.mytatvarnsdk.databinding.ExitDialogBottomsheetBinding
 
-
 class PermissionActivity : BasePermissionActivity() {
   private lateinit var binding: ActivityPermissionBinding
   private val LOCATION_REQUEST_CODE = 101
@@ -147,6 +149,10 @@ class PermissionActivity : BasePermissionActivity() {
       startActivity(Intent(this, HelpActivity::class.java))
     }
 
+    binding.tvKnowMore.setOnClickListener {
+      openBluetoothDialog()
+    }
+
     binding.toolbar.btnClose.setOnClickListener {
       openExitDialog()
     }
@@ -159,6 +165,31 @@ class PermissionActivity : BasePermissionActivity() {
     onBackPressedDispatcher.addCallback(this, callback)
   }
 
+  private fun openBluetoothDialog() {
+    val binding = BluetoothDialogBottomsheetBinding.inflate(layoutInflater)
+
+    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())
+
+    binding.tvKnowMore.setOnClickListener {
+      val intent = Intent(Settings.ACTION_APPLICATION_DETAILS_SETTINGS).apply {
+        data = Uri.fromParts("package", packageName, null)
+      }
+      startActivity(intent)
+    }
+
+    binding.closeButton.setOnClickListener(View.OnClickListener { v: View? ->
+      dialog.dismiss()
+    })
+
+    dialog.show()
+  }
 
   private fun openExitDialog() {
     val binding = ExitDialogBottomsheetBinding.inflate(layoutInflater)

package/android/src/main/res/drawable/bg_light_yellow.xml

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+  android:shape="rectangle">
+  <solid android:color="#FFFBEE" />
+  <corners
+    android:bottomLeftRadius="15dp"
+    android:bottomRightRadius="15dp"
+    android:topLeftRadius="15dp"
+    android:topRightRadius="15dp" />
+</shape>

package/android/src/main/res/drawable/ic_setting.xml

@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="17dp"
+    android:height="18dp"
+    android:viewportWidth="17"
+    android:viewportHeight="18">
+  <path
+      android:pathData="M8.51,0.875C9.122,0.882 9.731,0.953 10.328,1.086C10.589,1.144 10.784,1.361 10.813,1.627L10.955,2.899C11.019,3.483 11.513,3.926 12.101,3.926C12.259,3.927 12.415,3.894 12.561,3.829L13.728,3.316C13.971,3.21 14.255,3.268 14.436,3.461C15.28,4.362 15.908,5.443 16.273,6.621C16.352,6.875 16.261,7.152 16.047,7.31L15.013,8.072C14.717,8.289 14.543,8.633 14.543,9C14.543,9.366 14.717,9.71 15.013,9.927L16.049,10.69C16.263,10.848 16.354,11.124 16.275,11.379C15.91,12.557 15.282,13.637 14.439,14.538C14.258,14.732 13.974,14.79 13.731,14.684L12.559,14.17C12.224,14.024 11.839,14.045 11.522,14.228C11.205,14.411 10.995,14.734 10.954,15.098L10.814,16.37C10.784,16.633 10.594,16.848 10.337,16.91C9.13,17.197 7.872,17.197 6.665,16.91C6.409,16.848 6.218,16.633 6.189,16.37L6.048,15.1C6.007,14.737 5.796,14.415 5.479,14.233C5.162,14.05 4.778,14.029 4.444,14.175L3.272,14.688C3.029,14.794 2.745,14.736 2.564,14.542C1.721,13.64 1.093,12.559 0.728,11.379C0.649,11.125 0.74,10.849 0.954,10.691L1.99,9.928C2.286,9.711 2.46,9.367 2.46,9C2.46,8.634 2.286,8.29 1.99,8.073L0.955,7.311C0.74,7.153 0.649,6.876 0.728,6.622C1.094,5.443 1.722,4.363 2.565,3.462C2.747,3.269 3.03,3.21 3.273,3.317L4.44,3.83C4.776,3.977 5.162,3.955 5.48,3.769C5.797,3.585 6.008,3.262 6.049,2.898L6.19,1.627C6.22,1.361 6.415,1.144 6.676,1.086C7.274,0.953 7.884,0.882 8.51,0.875ZM8.5,6.5C7.119,6.5 6,7.619 6,9C6,10.381 7.119,11.5 8.5,11.5C9.881,11.5 11,10.381 11,9C11,7.619 9.881,6.5 8.5,6.5Z"
+      android:fillColor="#299D6B"/>
+</vector>

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

@@ -0,0 +1,106 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+  xmlns:app="http://schemas.android.com/apk/res-auto"
+  android:id="@+id/bottom_sheet"
+  android:layout_width="match_parent"
+  android:layout_height="wrap_content"
+  android:layout_marginHorizontal="10dp"
+  android:background="@drawable/bottom_sheet_background"
+  android:orientation="vertical"
+  android:padding="16dp">
+
+  <RelativeLayout
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:layout_marginBottom="16dp">
+
+    <TextView
+      android:id="@+id/title_text"
+      android:layout_width="wrap_content"
+      android:layout_height="wrap_content"
+      android:layout_alignParentStart="true"
+      android:layout_centerVertical="true"
+      android:fontFamily="@font/roboto_bold"
+      android:text="Bluetooth Connection"
+      android:textColor="#101828"
+      android:textSize="18sp" />
+
+    <androidx.appcompat.widget.AppCompatImageView
+      android:id="@+id/close_button"
+      android:layout_width="24dp"
+      android:layout_height="24dp"
+      android:layout_alignParentEnd="true"
+      android:layout_centerVertical="true"
+      android:src="@drawable/ic_close_gray" />
+  </RelativeLayout>
+
+  <TextView
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:layout_marginBottom="20dp"
+    android:fontFamily="@font/roboto_regular"
+    android:text="GoodFlip needs Bluetooth access to sync your CGM data. Please allow Bluetooth access to continue connecting your device."
+    android:textColor="#344054"
+    android:textSize="15sp" />
+
+  <androidx.constraintlayout.widget.ConstraintLayout
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:background="@drawable/bg_light_yellow">
+
+    <androidx.appcompat.widget.AppCompatImageView
+      android:id="@+id/iv1"
+      android:layout_width="120dp"
+      android:layout_height="80dp"
+      android:layout_marginHorizontal="15dp"
+      android:layout_marginVertical="10dp"
+      android:src="@drawable/img_permission_1"
+      app:layout_constraintEnd_toStartOf="@+id/iv2"
+      app:layout_constraintHorizontal_chainStyle="packed"
+      app:layout_constraintStart_toStartOf="parent"
+      app:layout_constraintTop_toTopOf="parent" />
+
+    <androidx.appcompat.widget.AppCompatImageView
+      android:id="@+id/iv2"
+      android:layout_width="120dp"
+      android:layout_height="80dp"
+      android:layout_marginHorizontal="15dp"
+      android:layout_marginVertical="10dp"
+      android:src="@drawable/img_permission_2"
+      app:layout_constraintEnd_toEndOf="parent"
+      app:layout_constraintHorizontal_chainStyle="packed"
+      app:layout_constraintStart_toEndOf="@+id/iv1"
+      app:layout_constraintTop_toTopOf="parent" />
+
+
+    <androidx.appcompat.widget.AppCompatImageView
+      android:id="@+id/ivSetting"
+      android:layout_width="16dp"
+      android:layout_height="16dp"
+      android:layout_marginVertical="15dp"
+      android:src="@drawable/ic_setting"
+      app:layout_constraintBottom_toBottomOf="parent"
+      app:layout_constraintEnd_toStartOf="@+id/tvKnowMore"
+      app:layout_constraintHorizontal_chainStyle="packed"
+      app:layout_constraintStart_toStartOf="parent"
+      app:layout_constraintTop_toBottomOf="@+id/iv1" />
+
+    <TextView
+      android:id="@+id/tvKnowMore"
+      android:layout_width="wrap_content"
+      android:layout_height="wrap_content"
+      android:layout_marginHorizontal="5dp"
+      android:layout_marginVertical="15dp"
+      android:fontFamily="@font/roboto_semibold"
+      android:text="@string/txt_open_setting"
+      android:textColor="#299D6B"
+      android:textSize="14sp"
+      app:layout_constraintBottom_toBottomOf="parent"
+      app:layout_constraintEnd_toEndOf="parent"
+      app:layout_constraintHorizontal_chainStyle="packed"
+      app:layout_constraintStart_toEndOf="@+id/ivSetting"
+      app:layout_constraintTop_toBottomOf="@+id/iv1" />
+  </androidx.constraintlayout.widget.ConstraintLayout>
+
+
+</LinearLayout>

package/ios/Custom/CustomOverlayButton.swift

@@ -46,7 +46,7 @@ class CustomOverlayButton: UIView {
         }
     }
 
-    @IBInspectable var image: UIImage? = UIImage(named: "ic_arrow") {
+    @IBInspectable var image: UIImage? = loadImage(named: "ic_arrow") {
         didSet {
             rightImageView.image = image
         }
@@ -90,12 +90,12 @@ class CustomOverlayButton: UIView {
         // ImageView
         rightImageView.translatesAutoresizingMaskIntoConstraints = false
         rightImageView.contentMode = .scaleAspectFit
-        rightImageView.image = UIImage(named: "ic_arrow")
+        rightImageView.image = loadImage(named: "ic_arrow")
         foregroundView.addSubview(rightImageView)
        
         leftImageView.translatesAutoresizingMaskIntoConstraints = false
         leftImageView.contentMode = .scaleAspectFit
-        leftImageView.image = UIImage(named: "ic_back_arrow")
+        leftImageView.image = loadImage(named: "ic_back_arrow")
         leftImageView.isHidden = true
         foregroundView.addSubview(leftImageView)
         
@@ -194,7 +194,7 @@ class CustomOverlayButton: UIView {
     func showLeftWhatsappImage() {
         rightImageView.isHidden = true
         leftImageView.isHidden = false
-        leftImageView.image = UIImage(named: "ic_whatsApp_only")
+        leftImageView.image = loadImage(named: "ic_whatsApp_only")
         textLabelCenterXConstraint.constant = 12
         
         setNeedsLayout()

package/ios/Custom/CustomTopUIView.swift

@@ -18,7 +18,7 @@ class CustomTopUIView: UIView {
         button.layer.masksToBounds = true
         button.titleLabel?.font = FontManager.font(ofSize: 14, weight: .medium)
         button.tintColor = .white
-        let playImage = UIImage(named: "ic_play")?.withTintColor(.white) ?? UIImage(systemName: "play.fill")?.withRenderingMode(.alwaysOriginal).withTintColor(.white)
+        let playImage = loadImage(named: "ic_play")?.withTintColor(.white) ?? UIImage(systemName: "play.fill")?.withRenderingMode(.alwaysOriginal).withTintColor(.white)
         button.setImage(playImage, for: .normal)
 
         button.translatesAutoresizingMaskIntoConstraints = false
@@ -27,7 +27,7 @@ class CustomTopUIView: UIView {
 
     private let whatsappButton: UIButton = {
         let button = UIButton(type: .system)
-        let image = UIImage(named: "ic_whatsapp") ?? UIImage(systemName: "message.fill")!
+        let image = loadImage(named: "ic_whatsapp") ?? UIImage(systemName: "message.fill")!
         button.setImage(image.withRenderingMode(.alwaysOriginal), for: .normal)
         button.backgroundColor = .green
         button.layer.cornerRadius = 18
@@ -37,7 +37,7 @@ class CustomTopUIView: UIView {
 
     private let closeButton: UIButton = {
         let button = UIButton(type: .custom)
-        let image = UIImage(named: "ic_close")
+        let image = loadImage(named: "ic_close")
         button.setImage(image, for: .normal)
         button.translatesAutoresizingMaskIntoConstraints = false
         return button

package/ios/MyReactNativeBridge.m

@@ -27,12 +27,10 @@ RCT_EXPORT_METHOD(emitEvent:(NSString *)message) {
 }
 
 @end
-
+UIViewController *globalAttachTransmitterVC = nil;
 
 @implementation CgmTrackyLib
 
-//static FinalViewModel *sharedViewModel = nil;
-
 RCT_EXPORT_MODULE();
 
 // This method returns the list of events the module supports
@@ -95,14 +93,15 @@ RCT_EXPORT_METHOD(startCgmTracky:(NSString *)token)
   });
 }
 
-RCT_EXPORT_METHOD(reconnectCgmTracky)
+RCT_EXPORT_METHOD(reconnectCgmTracky:(NSString *)token)
 {
+    [[NSUserDefaults standardUserDefaults] setObject:token forKey:@"authToken"];
+    [[NSUserDefaults standardUserDefaults] synchronize];
   dispatch_async(dispatch_get_main_queue(), ^{
     UIWindow *keyWindow = [UIApplication sharedApplication].delegate.window;
     UIViewController *rootVC = keyWindow.rootViewController;
-
     // Load the storyboard
-    UIStoryboard *storyboard = [UIStoryboard storyboardWithName:@"MainCGM" bundle:nil];
+    UIStoryboard *storyboard = [UIStoryboard storyboardWithName:@"MainCGM" bundle:[NSBundle mainBundle]];
 
     // Instantiate the target ViewController
     UIViewController *reconnectVC = [storyboard instantiateViewControllerWithIdentifier:@"ConnectToTransmitterViewController"];
@@ -145,14 +144,27 @@ RCT_EXPORT_METHOD(openHelpSupport)
 
 RCT_EXPORT_METHOD(observeAllGlucoseData:(NSString *)token)
 {
-//     [[NSUserDefaults standardUserDefaults] setObject:token forKey:@"authToken"];
-//   [[NSUserDefaults standardUserDefaults] synchronize]; 
-//
-// 
-//   if (!sharedViewModel) {
-//     sharedViewModel = [[FinalViewModel alloc] init];
-//   }
-//   [sharedViewModel initialize];
+     [[NSUserDefaults standardUserDefaults] setObject:token forKey:@"authToken"];
+   [[NSUserDefaults standardUserDefaults] synchronize];
+    
+    dispatch_async(dispatch_get_main_queue(), ^{
+      UIWindow *keyWindow = [UIApplication sharedApplication].delegate.window;
+      UIViewController *rootVC = keyWindow.rootViewController;
+
+      // Load the storyboard
+      UIStoryboard *storyboard = [UIStoryboard storyboardWithName:@"MainCGM" bundle:nil];
+
+      // Instantiate the target ViewController
+     globalAttachTransmitterVC = [storyboard instantiateViewControllerWithIdentifier:@"AttachTransmitterViewController"];
+
+      // Set presentation style
+     // chatWithExpertVC.modalPresentationStyle = UIModalPresentationOverFullScreen;
+
+      // Present it directly without navigation
+      //if (chatWithExpertVC) {
+       // [rootVC presentViewController:chatWithExpertVC animated:YES completion:nil];
+     // }
+    });
 }
 
 @end