Add "Target Android SDK" information to Help > About menu

appinventor/appengine/src/com/google/appinventor/client/OdeMessages.java

@@ -620,6 +620,14 @@ public interface OdeMessages extends Messages, AutogeneratedOdeMessages {
   @Description("Label of the link for About")
   String aboutMenuItem();
 
+  @DefaultMessage("Use Companion: {0} or {1}")
+  @Description("Label showing the companion version")
+  String useCompanion(String version, String alternateVersion);
+
+  @DefaultMessage("Target Android SDK: {0} ({1})")
+  @Description("Label showing the target sdk version and the target android version")
+  String targetSdkVersion(int sdk, String name);
+
   @DefaultMessage("Companion Information")
   @Description("Information about the Companion")
   String companionInformation();

appinventor/appengine/src/com/google/appinventor/client/OdeMessages_nl.properties

@@ -857,6 +857,8 @@ WheelDiameterProperties=WielDiameters
 WithinRangeEventEnabledProperties=BinnenBereikGebeurtenisGeactiveerd
 YProperties=Y
 aboutMenuItem=Over
+useCompanion=Gebruik Companion: {0} of {1}
+targetSdkVersion=Doel Android SDK: {0} ({1})
 accelerometerSensorComponentPallette=VersnellingsSensor
 argumentsParams=argumenten
 backButton=Terug

appinventor/appengine/src/com/google/appinventor/client/TopToolbar.java

@@ -785,7 +785,8 @@ public class TopToolbar extends Composite {
 
       VerticalPanel DialogBoxContents = new VerticalPanel();
       String html = MESSAGES.gitBuildId(GitBuildId.getDate(), GitBuildId.getVersion()) +
-          "<BR/>Use Companion: " + BlocklyPanel.getCompVersion();
+          "<BR/>" + MESSAGES.useCompanion(YaVersion.PREFERRED_COMPANION, YaVersion.PREFERRED_COMPANION + "u") +
+          "<BR/>" + MESSAGES.targetSdkVersion(YaVersion.TARGET_SDK_VERSION, YaVersion.TARGET_ANDROID_VERSION);
       Config config = Ode.getInstance().getSystemConfig();
       String releaseNotesUrl = config.getReleaseNotesUrl();
       if (!Strings.isNullOrEmpty(releaseNotesUrl)) {

appinventor/appengine/src/com/google/appinventor/client/editor/youngandroid/BlocklyPanel.java

@@ -71,7 +71,8 @@ public class BlocklyPanel extends HTMLPanel {
     exportMethodsToJavascript();
     // Tell the blockly world about companion versions.
     setLanguageVersion(YaVersion.YOUNG_ANDROID_VERSION, YaVersion.BLOCKS_LANGUAGE_VERSION);
-    setPreferredCompanion(YaVersion.PREFERRED_COMPANION, YaVersion.COMPANION_UPDATE_URL,
+    setPreferredCompanion(MESSAGES.useCompanion(YaVersion.PREFERRED_COMPANION, YaVersion.PREFERRED_COMPANION + "u"),
+      YaVersion.COMPANION_UPDATE_URL,
       YaVersion.COMPANION_UPDATE_URL1,
       YaVersion.COMPANION_UPDATE_EMULATOR_URL);
     for (int i = 0; i < YaVersion.ACCEPTABLE_COMPANIONS.length; i++) {

appinventor/buildserver/src/com/google/appinventor/buildserver/Compiler.java

@@ -9,6 +9,7 @@ package com.google.appinventor.buildserver;
 import com.google.appinventor.buildserver.util.AARLibraries;
 import com.google.appinventor.buildserver.util.AARLibrary;
 import com.google.appinventor.components.common.ComponentDescriptorConstants;
+import com.google.appinventor.components.common.YaVersion;
 import com.google.common.annotations.VisibleForTesting;
 import com.google.common.base.Charsets;
 import com.google.common.base.Strings;
@@ -78,8 +79,6 @@ public final class Compiler {
 
   public static int currentProgress = 10;
 
-  public static final int TARGET_SDK_VERSION = 28;
-
   // Kawa and DX processes can use a lot of memory. We only launch one Kawa or DX process at a time.
   private static final Object SYNC_KAWA_OR_DX = new Object();
 
@@ -874,7 +873,7 @@ public final class Compiler {
       // the specified SDK version.  We right now support building for minSDK 4.
       // We might also want to allow users to specify minSdk version or targetSDK version.
       out.write("  <uses-sdk android:minSdkVersion=\"" + minSdk + "\" android:targetSdkVersion=\"" +
-          TARGET_SDK_VERSION + "\" />\n");
+          YaVersion.TARGET_SDK_VERSION + "\" />\n");
 
       out.write("  <application ");
 

appinventor/components/src/com/google/appinventor/components/common/YaVersion.java

@@ -538,6 +538,12 @@ public class YaVersion {
 
   public static final int BLOCKS_LANGUAGE_VERSION = 27;
 
+  // ................................. Target SDK Version Number ..................................
+
+  public static final int TARGET_SDK_VERSION = 28;
+
+  public static final String TARGET_ANDROID_VERSION = "Android 9.0 Pie";
+
   // ................................. Component Version Numbers ..................................
 
   // NOTE(lizlooney,user) - when a new component is added:
@@ -1258,7 +1264,7 @@ public class YaVersion {
 
   public static final String ACCEPTABLE_COMPANION_PACKAGE = "edu.mit.appinventor.aicompanion3";
 
-  public static final String PREFERRED_COMPANION = "2.55 or 2.55u";
+  public static final String PREFERRED_COMPANION = "2.55";
   public static final String COMPANION_UPDATE_URL = "";
   public static final String COMPANION_UPDATE_URL1 = "";
   public static final String COMPANION_UPDATE_EMULATOR_URL = "";