fix : PinLayoutV6

Author: samruddhi-Rahegaonkar

app/src/main/java/io/pslab/activity/MainActivity.java

@@ -1,5 +1,6 @@
 package io.pslab.activity;
 
+import static io.pslab.others.ScienceLabCommon.isWifiConnected;
 import static io.pslab.others.ScienceLabCommon.scienceLab;
 
 import android.app.PendingIntent;
@@ -10,6 +11,7 @@
 import android.content.IntentFilter;
 import android.hardware.usb.UsbDevice;
 import android.hardware.usb.UsbManager;
+import android.net.wifi.WifiManager;
 import android.os.Bundle;
 import android.os.Handler;
 import android.util.Log;
@@ -50,11 +52,13 @@
 import io.pslab.fragment.HomeFragment;
 import io.pslab.fragment.InstrumentsFragment;
 import io.pslab.fragment.PSLabPinLayoutFragment;
+import io.pslab.fragment.PSLabPinLayoutFragment_v6;
 import io.pslab.others.CustomSnackBar;
 import io.pslab.others.CustomTabService;
 import io.pslab.others.InitializationVariable;
 import io.pslab.others.ScienceLabCommon;
 import io.pslab.receivers.USBDetachReceiver;
+import io.pslab.receivers.WifiDisconnectReceiver;
 
 public class MainActivity extends AppCompatActivity {
 
@@ -83,6 +87,7 @@ public class MainActivity extends AppCompatActivity {
     private static final String TAG_INSTRUMENTS = "instruments";
     private static final String TAG_ABOUTUS = "aboutUs";
     private static final String TAG_PINLAYOUT = "pinLayout";
+    private static final String TAG_PINLAYOUT_V6 = "PINLAYOUTV6";
     private static final String TAG_FAQ = "faq";
     private static String CURRENT_TAG = TAG_INSTRUMENTS;
     private String[] activityTitles;
@@ -136,6 +141,11 @@ protected void onCreate(Bundle savedInstanceState) {
         usbDetachReceiver = new USBDetachReceiver(this);
         registerReceiver(usbDetachReceiver, usbDetachFilter);
 
+        IntentFilter wifiDisconnectFilter = new IntentFilter();
+        wifiDisconnectFilter.addAction(WifiManager.NETWORK_STATE_CHANGED_ACTION);
+        WifiDisconnectReceiver wifiDisconnectReceiver = new WifiDisconnectReceiver(this);
+        registerReceiver(wifiDisconnectReceiver, wifiDisconnectFilter);
+
         setSupportActionBar(toolbar);
         mHandler = new Handler();
 
@@ -329,6 +339,7 @@ public boolean onNavigationItemSelected(@NonNull MenuItem item) {
                         OssLicensesMenuActivity.setActivityTitle(getString(R.string.third_party_libs));
                         startActivity(new Intent(MainActivity.this, OssLicensesMenuActivity.class));
                         break;
+
                     default:
                         navItemIndex = 0;
                 }
@@ -414,21 +425,30 @@ public boolean onCreateOptionsMenu(Menu menu) {
     @Override
     public boolean onOptionsItemSelected(MenuItem item) {
         switch (item.getItemId()) {
-            case R.id.menu_pslab_connected:
+            case R.id.menu_wifi_connected, R.id.menu_pslab_connected:
                 CustomSnackBar.showSnackBar(findViewById(android.R.id.content),
                         getString(R.string.device_connected_successfully), null, null, Snackbar.LENGTH_SHORT);
                 break;
             case R.id.menu_pslab_disconnected:
                 attemptToConnectPSLab();
                 break;
-            case R.id.menu_pslab_layout_front:
+            case R.id.menu_pslab_layout_front_v5:
                 PSLabPinLayoutFragment.frontSide = true;
-                displayPSLabPinLayout();
+                displayPSLabPinLayout(TAG_PINLAYOUT);
                 break;
-            case R.id.menu_pslab_layout_back:
+            case R.id.menu_pslab_layout_back_v5:
                 PSLabPinLayoutFragment.frontSide = false;
-                displayPSLabPinLayout();
+                displayPSLabPinLayout(TAG_PINLAYOUT);
+                break;
+            case R.id.menu_pslab_layout_front_v6:
+                PSLabPinLayoutFragment_v6.topside=true;
+                displayPSLabPinLayout(TAG_PINLAYOUT_V6);
+                break;
+            case R.id.menu_pslab_layout_back_v6:
+                PSLabPinLayoutFragment_v6.topside=false;
+                displayPSLabPinLayout(TAG_PINLAYOUT_V6);
                 break;
+
             default:
                 break;
         }
@@ -457,20 +477,36 @@ private void attemptToConnectPSLab() {
         }
     }
 
-    private void displayPSLabPinLayout() {
-        CURRENT_TAG = TAG_PINLAYOUT;
+    private void displayPSLabPinLayout(String fragmentTag) {
+        CURRENT_TAG = fragmentTag;
         navigationView.getMenu().getItem(navItemIndex).setChecked(false);
-        setToolbarTitle(getResources().getString(R.string.pslab_pinlayout));
+
+        // Set toolbar title based on the fragment tag
+        if (fragmentTag.equals(TAG_PINLAYOUT)) {
+            setToolbarTitle(getResources().getString(R.string.pslab_pinlayout));
+        } else if (fragmentTag.equals(TAG_PINLAYOUT_V6)) {
+            setToolbarTitle(getResources().getString(R.string.pslab_pinlayout_v6));
+        }
+
         Runnable mPendingRunnable = new Runnable() {
             @Override
             public void run() {
-                Fragment fragment = PSLabPinLayoutFragment.newInstance();
+                Fragment fragment;
+                if (fragmentTag.equals(TAG_PINLAYOUT)) {
+                    fragment = PSLabPinLayoutFragment.newInstance();
+                } else if (fragmentTag.equals(TAG_PINLAYOUT_V6)) {
+                    fragment = PSLabPinLayoutFragment_v6.newInstance();
+                } else {
+                    return; // Exit if no valid tag is provided
+                }
+
                 FragmentTransaction fragmentTransaction = getSupportFragmentManager().beginTransaction();
                 fragmentTransaction.setCustomAnimations(R.anim.fade_in, R.anim.fade_out)
-                        .replace(R.id.frame, fragment, TAG_PINLAYOUT)
+                        .replace(R.id.frame, fragment, fragmentTag)
                         .commitAllowingStateLoss();
             }
         };
+
         mHandler.post(mPendingRunnable);
     }
 
@@ -496,8 +532,9 @@ private void attemptToGetUSBPermission() {
 
     @Override
     public boolean onPrepareOptionsMenu(Menu menu) {
-        menu.getItem(0).setVisible(PSLabisConnected);
-        menu.getItem(1).setVisible(!PSLabisConnected);
+        menu.getItem(0).setVisible(isWifiConnected);
+        menu.getItem(1).setVisible(PSLabisConnected);
+        menu.getItem(2).setVisible(!PSLabisConnected && !isWifiConnected);
         setPSLabVersionIDs();
         return true;
     }
@@ -552,7 +589,6 @@ public void onReceive(Context context, Intent intent) {
             }
         }
     };
-
     @Override
     protected void onNewIntent(Intent intent) {
         super.onNewIntent(intent);
@@ -573,7 +609,6 @@ protected void onNewIntent(Intent intent) {
             }
         }
     }
-
     @Override
     protected void onPostResume() {
         super.onPostResume();