Flutter controller v2

android/robot/src/main/java/org/openbot/autopilot/AutopilotFragment.java

@@ -589,4 +589,3 @@ private void disconnectPhoneController() {
         binding.controllerContainer.driveMode.setAlpha(1.0f);
     }
 }
-

android/robot/src/main/java/org/openbot/env/SharedPreferencesManager.java

@@ -1,5 +1,6 @@
 package org.openbot.env;
 
+import android.app.Fragment;
 import android.content.Context;
 import android.content.SharedPreferences;
 import com.google.common.reflect.TypeToken;
@@ -43,6 +44,9 @@ public class SharedPreferencesManager {
   private static final String DELAY = "DELAY";
   private static final String PROJECTS_LIST = "PROJECTS_LIST";
 
+  private static final String FRAGMENT_TYPE = "FRAGMENT_TYPE";
+
+
   private final SharedPreferences preferences;
 
   public SharedPreferencesManager(Context context) {
@@ -51,6 +55,11 @@ public SharedPreferencesManager(Context context) {
             .getApplicationContext()
             .getSharedPreferences(PREFERENCES_NAME, Context.MODE_PRIVATE);
   }
+  public String getFragment(){return preferences.getString(FRAGMENT_TYPE, "" );}
+  public void setFragment(String fragment)
+  {
+    preferences.edit().putString(FRAGMENT_TYPE, fragment).apply();
+  }
 
   public int getBaudrate() {
     return preferences.getInt(BAUD_RATE, DEFAULT_BAUD_RATE);

android/robot/src/main/java/org/openbot/env/WebRtcServer.java

@@ -127,6 +127,7 @@ public void startClient() {
   @Override
   public void sendServerUrl() {
     BotToControllerEventBus.emitEvent(ConnectionUtils.createStatus("VIDEO_SERVER_URL", ""));
+    BotToControllerEventBus.emitEvent(ConnectionUtils.createFragment(""));
   }
 
   @Override
@@ -369,7 +370,6 @@ public void onTrack(RtpTransceiver transceiver) {}
 
     return factory.createPeerConnection(rtcConfig, pcConstraints, pcObserver);
   }
-
   private void sendMessage(JSONObject message) {
     BotToControllerEventBus.emitEvent(ConnectionUtils.createStatus("WEB_RTC_EVENT", message));
   }

android/robot/src/main/java/org/openbot/logging/LoggerFragment.java

@@ -85,6 +85,8 @@ public View onCreateView(
   @Override
   public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceState) {
     super.onViewCreated(view, savedInstanceState);
+    preferencesManager.setFragment(Enums.fragmentType.DATACOLLECTION.getFragment());
+    BotToControllerEventBus.emitEvent(ConnectionUtils.createFragment(preferencesManager.getFragment()));
     binding.controllerContainer.speedInfo.setText(getString(R.string.speedInfo, "---,---"));
 
     intentSensorService = new Intent(requireActivity(), SensorService.class);

android/robot/src/main/java/org/openbot/objectNav/ObjectNavFragment.java

@@ -33,12 +33,14 @@
 import org.openbot.common.CameraFragment;
 import org.openbot.databinding.FragmentObjectNavBinding;
 import org.openbot.env.BorderedText;
+import org.openbot.env.BotToControllerEventBus;
 import org.openbot.env.ImageUtils;
 import org.openbot.tflite.Detector;
 import org.openbot.tflite.Model;
 import org.openbot.tflite.Network;
 import org.openbot.tracking.MultiBoxTracker;
 import org.openbot.utils.CameraUtils;
+import org.openbot.utils.ConnectionUtils;
 import org.openbot.utils.Constants;
 import org.openbot.utils.Enums;
 import org.openbot.utils.MovingAverage;
@@ -97,9 +99,9 @@ public View onCreateView(
   @Override
   public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceState) {
     super.onViewCreated(view, savedInstanceState);
-
+    preferencesManager.setFragment(Enums.fragmentType.OBJECTDETECTION.getFragment());
+    BotToControllerEventBus.emitEvent(ConnectionUtils.createFragment(preferencesManager.getFragment()));
     binding.confidenceValue.setText((int) (MINIMUM_CONFIDENCE_TF_OD_API * 100) + "%");
-
     binding.plusConfidence.setOnClickListener(
         v -> {
           String trimConfValue = binding.confidenceValue.getText().toString().trim();

android/robot/src/main/java/org/openbot/robot/FreeRoamFragment.java

@@ -20,7 +20,9 @@
 import org.openbot.R;
 import org.openbot.common.ControlsFragment;
 import org.openbot.databinding.FragmentFreeRoamBinding;
+import org.openbot.env.BotToControllerEventBus;
 import org.openbot.env.PhoneController;
+import org.openbot.utils.ConnectionUtils;
 import org.openbot.utils.Constants;
 import org.openbot.utils.Enums;
 import org.openbot.utils.PermissionUtils;
@@ -45,6 +47,10 @@ public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceStat
 
     phoneController = PhoneController.getInstance(requireContext());
 
+    preferencesManager.setFragment(Enums.fragmentType.FREEROAM.getFragment());
+
+    BotToControllerEventBus.emitEvent(ConnectionUtils.createFragment(preferencesManager.getFragment()));
+
     binding.voltageInfo.setText(getString(R.string.voltageInfo, "--.-"));
     binding.controllerContainer.speedInfo.setText(getString(R.string.speedInfo, "---,---"));
     binding.sonarInfo.setText(getString(R.string.distanceInfo, "---"));

android/robot/src/main/java/org/openbot/utils/ConnectionUtils.java

@@ -24,6 +24,7 @@ public static JSONObject createStatus(String name, String value) {
     return new JSONObject();
   }
 
+
   public static JSONObject createStatus(String name, JSONObject value) {
     try {
       return new JSONObject().put("status", new JSONObject().put(name, value.toString()));
@@ -33,6 +34,15 @@ public static JSONObject createStatus(String name, JSONObject value) {
     return new JSONObject();
   }
 
+  public static JSONObject createFragment(String value){
+    try {
+      return new JSONObject().put("FRAGMENT_TYPE", value);
+    } catch (JSONException e) {
+      e.printStackTrace();
+    }
+    return new JSONObject();
+  }
+
   public static JSONObject getStatus(
       boolean loggingEnabled,
       boolean noiseEnabled,

android/robot/src/main/java/org/openbot/utils/Enums.java

@@ -29,6 +29,16 @@ public String getSensor() {
     }
   }
 
+  public enum fragmentType{
+    AUTOPILOT("Autopilot"),
+    OBJECTDETECTION("ObjectDetection"),
+    DATACOLLECTION("DataCollection"),
+    FREEROAM("FreeRoam");
+    private String fragmentType;
+    fragmentType(String fragmentType) {this.fragmentType=fragmentType;}
+    public String getFragment() {return fragmentType;}
+  }
+
   public enum LogMode {
     ALL_IMGS(0),
     CROP_IMG(1),

controller/flutter/README.md

@@ -10,7 +10,7 @@
 
 This Controller app serves as a `remote controller` for the [OpenBot](https://www.openbot.org) vehicle similar as a BT controller (e.g. PS3/4 or Xbox). It runs on another Android/iOS device and supports live video/audio streaming in addition to control.
 
- ## Getting Started
+## Getting Started
 Begin by installing [Flutter](https://flutter.dev/) on your system. Choose the appropriate download for your operating system, which includes options for Windows, macOS, Linux, and ChromeOS. Follow the official Flutter installation guide for detailed instructions: [Flutter Installation Guide](https://docs.flutter.dev/get-started/install)
 
 ### Using Terminal
@@ -22,16 +22,16 @@ Begin by installing [Flutter](https://flutter.dev/) on your system. Choose the a
     ```bash
      flutter pub get 
     ```
-    Run the project:
+  Run the project:
     ```bash
      flutter run
     ```
-    If you encounter any issues, run the following command:
+  If you encounter any issues, run the following command:
     ```bash
      flutter doctor
     ```
 ### Using Editor
-- Follow the official Flutter guide for setting up an editor:  [Set up an editor ](https://docs.flutter.dev/tools/android-studio) 
+- Follow the official Flutter guide for setting up an editor:  [Set up an editor ](https://docs.flutter.dev/tools/android-studio)
 - Ensure that your editor is configured for Flutter development. Install any required plugins or extensions, following the editor-specific instructions in the Flutter documentation for the best development experience.
 
 - Once you open your project in the editor after the setup, it will appear as shown in the following image.
@@ -46,7 +46,7 @@ Begin by installing [Flutter](https://flutter.dev/) on your system. Choose the a
     <img src="../../docs/images/run_editor.jpg" width="50%" />
   </p>
 
-## Connection 
+## Connection
 
 When the controller app is started, it immediately tries to connect to the robot and shows the following screen:
 
@@ -89,7 +89,7 @@ above/below the center of the slider.
 
 - ``Switch Camera``: switch between the front and back camera modes.
 - ``Mute``: enable/disable audio transmission.
-- ``Mirror view``: mirror the the video feed. 
+- ``Mirror view``: mirror the the video feed.
 
 ### Tilt to drive
 
@@ -112,4 +112,18 @@ Use the `accelerator` and `brake` buttons to move forward/backward.
   robot will come to a stop.
 - The robot is steered by tilting the controller phone left or right.
 
+### Controller Settings UI
+
+Here is a picture of the `Controller Settings` screen:
+
+- Controller Selection: Switch between different controller types (e.g., mobile, joystick) using the provided icons.
+
+- Server: Displays the current server status with a dropdown to select or change the server.
+
+- Noise Toggle : Enable or disable noise simulation through the toggle switch.
+
+<p float="left">
+  <img src="../../docs/images/flutter_controller_setting.jpg" width="50%" />
+</p>
+
 Here is a [Technical Overview](../../docs/technical/OpenBotController.pdf) of the controller app.

controller/flutter/android/build.gradle

@@ -1,5 +1,5 @@
 buildscript {
-    ext.kotlin_version = '1.6.10'
+    ext.kotlin_version = '1.7.0'
     repositories {
         google()
         mavenCentral()

controller/flutter/ios/Runner/Assets.xcassets/LaunchImage.imageset/README.md

@@ -10,4 +10,4 @@
 
 You can customize the launch screen with your own desired assets by replacing the image files in this directory.
 
-You can also do it by opening your Flutter project's Xcode project with `open ios/Runner.xcworkspace`, selecting `Runner/Assets.xcassets` in the Project Navigator and dropping in the desired images.
+You can also do it by opening your Flutter project's Xcode project with `open ios/Runner.xcworkspace`, selecting `Runner/Assets.xcassets` in the Project Navigator and dropping in the desired images.

controller/flutter/lib/screens/component/onScreenIcon.dart

@@ -2,15 +2,17 @@ import 'package:flutter/material.dart';
 import 'package:flutter_webrtc/flutter_webrtc.dart';
 import 'package:openbot_controller/buttonCommands/buttonCommands.dart';
 import 'package:openbot_controller/screens/component/blinkingButton.dart';
+import 'package:openbot_controller/globals.dart';
 
 class OnScreenIcon extends StatefulWidget {
   final dynamic updateMirrorView;
   final bool indicatorLeft;
   final bool indicatorRight;
   final RTCPeerConnection? peerConnection;
+  final String fragmentType;
 
   const OnScreenIcon(this.updateMirrorView, this.indicatorLeft,
-      this.indicatorRight, this.peerConnection,
+      this.indicatorRight, this.peerConnection, this.fragmentType,
       {super.key});
 
   @override
@@ -24,13 +26,15 @@ class OnScreenIconState extends State<OnScreenIcon> {
   bool speaker = false;
   bool leftIndicator = false;
   bool rightIndicator = false;
+  String typeOfFragment = "";
 
   @override
   void didUpdateWidget(covariant OnScreenIcon oldWidget) {
     // TODO: implement didUpdateWidget
     setState(() {
       leftIndicator = widget.indicatorLeft;
       rightIndicator = widget.indicatorRight;
+      typeOfFragment = widget.fragmentType;
     });
     super.didUpdateWidget(oldWidget);
   }
@@ -186,6 +190,52 @@ class OnScreenIconState extends State<OnScreenIcon> {
                         width: 23,
                       ),
               )),
+          const SizedBox(
+            width: 15,
+          ),
+          GestureDetector(
+              onTap: () {
+                if (typeOfFragment == "DataCollection") {
+                  clientSocket?.writeln("{command: LOGS}");
+                }
+              }, // Image tapped
+              child: Container(
+                padding: const EdgeInsets.all(15),
+                decoration: BoxDecoration(
+                  borderRadius: BorderRadius.circular(45),
+                  color: typeOfFragment == "DataCollection"
+                      ? Colors.white.withOpacity(0.5)
+                      : Colors.grey.withOpacity(0.5),
+                ),
+                child: const Icon(
+                  Icons.file_present,
+                  color: Colors.blue,
+                ),
+              )),
+          const SizedBox(
+            width: 15,
+          ),
+          GestureDetector(
+              onTap: () {
+                if (typeOfFragment == "Autopilot" ||
+                    typeOfFragment == "ObjectDetection") {
+                  clientSocket?.writeln("{command: NETWORK}");
+                }
+              }, // Image tapped
+              child: Container(
+                padding: const EdgeInsets.all(15),
+                decoration: BoxDecoration(
+                  borderRadius: BorderRadius.circular(45),
+                  color: typeOfFragment == "Autopilot" ||
+                          typeOfFragment == "ObjectDetection"
+                      ? Colors.white.withOpacity(0.5)
+                      : Colors.grey.withOpacity(0.5),
+                ),
+                child: const Icon(
+                  Icons.network_check,
+                  color: Colors.blue,
+                ),
+              )),
         ],
       ),
     );