upgrades

merge

FtcRobotController/src/main/java/com/qualcomm/ftcrobotcontroller/testscreen.java

@@ -36,7 +36,7 @@ public void onClick(View arg0) {
                 AlertDialog.Builder alertDialogBuilder = new AlertDialog.Builder(
                         context);
 
-                alertDialogBuilder.setTitle("Your Title");
+                alertDialogBuilder.setTitle(R.string.title);
 
                 alertDialogBuilder
                         .setMessage("github.com/polygonnedpotato")

FtcRobotController/src/main/java/org/firstinspires/ftc/robotcontroller/internal/FtcOpModeRegister.java

@@ -37,7 +37,8 @@ OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 import org.firstinspires.ftc.robotcontroller.external.samples.ConceptNullOp;
 
 /**
- * {@link FtcOpModeRegister} is responsible for registering opmodes for use in an FTC game.
+ * {@link FtcOpModeRegister} is responsible for registering OpModes for use in an FTC game.
+ *
  * @see #register(OpModeManager)
  */
 public class FtcOpModeRegister implements OpModeRegister {

FtcRobotController/src/main/res/layout/activity_ftc_controller.xml

@@ -44,17 +44,17 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
   <RelativeLayout
       android:id="@+id/top_bar"
       android:layout_width="fill_parent"
-      android:layout_height="80dp"
+      android:layout_height="@dimen/layout_height000"
       android:background="@color/background_black">
 
     <ImageView
         android:id="@+id/robotIcon"
         android:layout_width="wrap_content"
         android:layout_height="fill_parent"
-        android:layout_marginStart="1dp"
-        android:layout_marginTop="1dp"
-        android:layout_marginEnd="1dp"
-        android:layout_marginBottom="1dp"
+        android:layout_marginStart="@dimen/margenStart"
+        android:layout_marginTop="@dimen/marginTop"
+        android:layout_marginEnd="@dimen/marginEnd"
+        android:layout_marginBottom="@dimen/marginBottom"
         android:adjustViewBounds="true"
         android:contentDescription="@string/icon"
         android:src="@drawable/icon_robotcontroller" />
@@ -65,7 +65,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
         android:layout_height="wrap_content"
         android:layout_toEndOf="@id/robotIcon"
         android:contentDescription="@string/just_the_device_name"
-        android:padding="8dp"
+        android:padding="@dimen/padding"
         android:textAppearance="?android:attr/textAppearanceMedium"
         android:textColor="?attr/textWhite"
         android:textStyle="bold"
@@ -77,14 +77,14 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
         android:layout_height="wrap_content"
         android:layout_alignParentEnd="true"
         android:layout_centerInParent="true"
-        android:layout_marginStart="10dp"
-        android:layout_marginTop="10dp"
-        android:layout_marginEnd="10dp"
-        android:layout_marginBottom="10dp"
+        android:layout_marginStart="@dimen/marginStart2"
+        android:layout_marginTop="@dimen/marginTop2"
+        android:layout_marginEnd="@dimen/marginEnd2"
+        android:layout_marginBottom="@dimen/marginBottom2"
         android:adjustViewBounds="true"
         android:background="@android:color/transparent"
         android:contentDescription="@string/isbutton"
-        android:padding="15dp"
+        android:padding="@dimen/padding2"
         android:scaleType="fitXY"
         android:src="@drawable/icon_menu" />
 
@@ -110,23 +110,23 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
         android:id="@+id/textNetworkConnectionStatus"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:text=""
+        android:text="@string/NOTHING2"
         android:visibility="invisible" />
 
     <TextView
         android:id="@+id/textRobotStatus"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_below="@+id/textNetworkConnectionStatus"
-        android:text=""
+        android:text="@string/NOTHING1"
         android:visibility="invisible" />
 
     <TextView
         android:id="@+id/textOpMode"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_below="@+id/textRobotStatus"
-        android:text=""
+        android:text="@string/NOTHING3"
         android:visibility="invisible" />
 
     <FrameLayout
@@ -144,15 +144,15 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
         <LinearLayout
             android:id="@+id/cameraMonitorViewId"
             android:layout_width="match_parent"
-            android:layout_height="0dp"
+            android:layout_height="@dimen/layout_height001"
             android:layout_weight="1"
             android:orientation="vertical"
             android:visibility="gone" />
 
         <FrameLayout
             android:id="@+id/tfodMonitorViewId"
             android:layout_width="match_parent"
-            android:layout_height="0dp"
+            android:layout_height="@dimen/layout_height002"
             android:layout_weight="1"
             android:visibility="gone" />
 
@@ -168,7 +168,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
           style="@style/FtcTextViewStyleBold"
           android:layout_width="match_parent"
           android:layout_height="wrap_content"
-          android:text=""
+          android:text="@string/NOTHING4"
           android:textColor="?attr/textMediumDark"
           android:visibility="invisible" />
 
@@ -179,22 +179,22 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_above="@+id/textGamepad2"
-        android:text=""
+        android:text="@string/NOTHING5"
         android:visibility="invisible" />
 
     <TextView
         android:id="@+id/textGamepad2"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_alignParentBottom="true"
-        android:text=""
+        android:text="@string/NOTHING6"
         android:visibility="invisible" />
 
   </RelativeLayout>
 
   <WebView
       android:id="@+id/webViewBlocksRuntime"
-      android:layout_width="1dp"
-      android:layout_height="1dp" />
+      android:layout_width="@dimen/layout_width000"
+      android:layout_height="@dimen/layout_width003" />
 
 </LinearLayout>

FtcRobotController/src/main/res/layout/testscreen_activity.xml

@@ -16,14 +16,14 @@
         <ImageView
             android:id="@+id/imageView2"
             android:layout_width="match_parent"
-            android:layout_height="648dp"
+            android:layout_height="@dimen/imageheight"
             android:contentDescription="@string/obamium"
             app:srcCompat="@drawable/testimage" />
 
         <Button
             android:id="@+id/buttonAlert"
             android:layout_width="match_parent"
-            android:layout_height="87dp"
+            android:layout_height="@dimen/button_height"
             android:text="@string/dev" />
     </LinearLayout>
 

FtcRobotController/src/main/res/values/strings.xml

@@ -79,5 +79,15 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
     <string name="vla2">com.qualcomm.ftccommon.ViewLogsActivity</string>
     <string name="rcsa">com.qualcomm.ftccommon.FtcAdvancedRCSettingsActivity</string>
     <string name="t000">true</string>
+    <string name="NOTHING" />
+    <string name="testscreen">com.qualcomm.ftccommon.testscreen</string>
+    <string name="testscreen2">com.qualcomm.ftccommon.testscreen</string>
+    <string name="NOTHING2" />
+    <string name="NOTHING1" />
+    <string name="NOTHING3" />
+    <string name="NOTHING4" />
+    <string name="NOTHING5" />
+    <string name="NOTHING6" />
+    <string name="title">Your Title</string>
 
 </resources>

FtcRobotController/src/main/res/xml/app_settings.xml

@@ -50,7 +50,7 @@ See https://developer.android.com/guide/topics/ui/settings.html
         android:title="@string/prefedit_device_name_rc"
         android:summary="@string/prefedit_device_name_summary_rc"
         android:key="@string/pref_device_name"
-        android:defaultValue=""
+        android:defaultValue="@string/NOTHING"
         />
 
     <org.firstinspires.ftc.robotcore.internal.ui.ColorListPreference
@@ -108,12 +108,12 @@ See https://developer.android.com/guide/topics/ui/settings.html
           android:summary="@string/obamium"
           android:title="@string/obamium">
         <intent
-            android:targetClass="com.qualcomm.ftccommon.testscreen"
+            android:targetClass="@string/testscreen"
             android:targetPackage="@string/packageName" />
       </PreferenceScreen>
       <intent
-          android:targetPackage="@string/packageName"
-          android:targetClass="com.qualcomm.ftccommon.testscreen" />
+          android:targetClass="@string/testscreen2"
+          android:targetPackage="@string/packageName" />
     </PreferenceScreen>
 
   </PreferenceCategory>

build.gradle

@@ -9,7 +9,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:4.1.1'
+        classpath 'com.android.tools.build:gradle:4.2.0-beta03'
     }
 }
 

gradle/wrapper/gradle-wrapper.properties

@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.5-bin.zip
+distributionUrl=https://services.gradle.org/distributions/gradle-6.7.1-bin.zip

libs/TODO.TXT

@@ -0,0 +1,2 @@
+TODO: update tensorflow-lite. it is at 0.0.0, and since it is a NIGHTLY build, there should be a new version.
+TODO: