Merge pull request #7 from NoahAndrews/extreme-turbo-webserver

Reduce RobotServer module size and add it to the Extreme Turbo build config

Author: Frogbots4634

Blocks/src/main/AndroidManifest.xml

@@ -8,13 +8,4 @@
     <uses-permission
         android:name="android.permission.READ_EXTERNAL_STORAGE"
         android:required="true" />
-
-    <application>
-        <activity
-            android:name="org.firstinspires.ftc.ftccommon.internal.ProgramAndManageActivity"
-            android:configChanges="orientation|screenSize"
-            android:label="@string/program_and_manage_activity" >
-        </activity>
-    </application>
-
 </manifest>

Blocks/src/main/res/values/values.xml

@@ -11,7 +11,6 @@
     <string name="network_not_ok">Network not OK.</string>
     <string name="not_available">&lt;NOT AVAILABLE></string>
     <string name="passphrase_label">Use the following passphrase to gain access to the network:</string>
-    <string name="program_and_manage_activity">Program &amp; Manage</string>
     <string name="server_not_ok">Server not OK.</string>
     <string name="server_ok">Server OK (Running since %1$s)</string>
     <string name="server_status_label">Server status:</string>

FtcCommon/build.gradle

@@ -20,8 +20,8 @@ dependencies {
     implementation project(':Hardware')
     implementation project(':Inspection')
     implementation project(':RobotCore')
+    implementation project(':RobotServer')
 
-    turboImplementation project(':RobotServer')
     //turboImplementation project(':OpenRC')
 
     //extremeTurboImplementation project(':OpenRC')

FtcCommon/src/extremeTurbo/java/org/firstinspires/ftc/ftccommon/internal/ProgramAndManageActivity.java

@@ -205,6 +205,11 @@
             android:label="@string/edit_analog_output_devices_activity"
             android:windowSoftInputMode="stateHidden|adjustResize" >
         </activity>
+        <activity
+            android:name="org.firstinspires.ftc.ftccommon.internal.ProgramAndManageActivity"
+            android:configChanges="orientation|screenSize"
+            android:label="@string/program_and_manage_activity" >
+        </activity>
 
         <!-- Assistant that autostarts the robot controller on android boot (if it's supposed to) -->
         <receiver

FtcCommon/src/extremeTurbo/java/org/firstinspires/ftc/robotserver/internal/webserver/CoreRobotWebServer.java

@@ -55,15 +55,13 @@ OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 import com.qualcomm.robotcore.robot.RobotState;
 import com.qualcomm.robotcore.robot.RobotStatus;
 import com.qualcomm.robotcore.util.Device;
-import com.qualcomm.robotcore.util.Intents;
 import com.qualcomm.robotcore.util.RobotLog;
 import com.qualcomm.robotcore.util.ThreadPool;
 import com.qualcomm.robotcore.util.WebServer;
 import com.qualcomm.robotcore.wifi.NetworkConnection;
 import com.qualcomm.robotcore.wifi.NetworkConnectionFactory;
 import com.qualcomm.robotcore.wifi.NetworkType;
 
-import org.firstinspires.ftc.robotcore.internal.hardware.android.AndroidBoard;
 import org.firstinspires.ftc.robotcore.internal.hardware.android.DragonboardIndicatorLED;
 import org.firstinspires.ftc.robotcore.internal.network.CallbackResult;
 import org.firstinspires.ftc.robotcore.internal.network.NetworkConnectionHandler;

FtcCommon/src/main/AndroidManifest.xml

@@ -221,6 +221,7 @@
     <string name="pref_wifi_automute">Wifi Auto Mute</string>
     <string name="prefedit_wifi_automute">Wifi Auto Mute</string>
     <string name="prefedit_wifi_automute_summary">Turn wifi off automatically after a period of inactivity.</string>
+    <string name="program_and_manage_activity">Program &amp; Manage</string>
     <string name="readOnlyConfigFeedback">read-only</string>
     <string name="readOnlyExplanation">Read-only configurations can be edited, but must be saved under a new name.</string>
     <string name="readXML_text">Select an XML file to instantiate a Robot from that file</string>

FtcCommon/src/main/java/com/qualcomm/ftccommon/FtcRobotControllerService.java

@@ -41,6 +41,7 @@ dependencies {
     extremeTurboApi project(':Inspection')
     extremeTurboApi project(':Hardware')
     extremeTurboApi project(':OpenRC')
+    extremeTurboApi project(':RobotServer')
 
     stockApi 'org.firstinspires.ftc:Inspection:5.5'
     stockApi 'org.firstinspires.ftc:Blocks:5.5'