Merge tag 'v196' into punya/master

Change-Id: Ia519897f1d0348c9bf25a0513d46ce303540d84a
mit-dig · Apr 27, 2024 · c0a2fb2 · c0a2fb2
2 parents c31d537 + 15fb754
commit c0a2fb2
Show file tree

Hide file tree

Showing 122 changed files with 20,182 additions and 3,393 deletions.
diff --git a/appinventor/AICompanionApp.xcodeproj/project.pbxproj b/appinventor/AICompanionApp.xcodeproj/project.pbxproj
@@ -166,9 +166,9 @@
 				066FE95625AC9E7300C6193B /* Settings.bundle */,
 				063D67911FA0CEB1002E907D /* AIComponentKit.framework */,
 				063D678E1FA0CEB1002E907D /* SchemeKit.framework */,
-				06463EFA1D95956800B23DCD /* src */,
-				06463F0F1D95956800B23DCD /* tests */,
-				06463F1A1D95956800B23DCD /* uitests */,
+				06463EFA1D95956800B23DCD /* aicompanionapp/src */,
+				06463F0F1D95956800B23DCD /* aicompanionapp/tests */,
+				06463F1A1D95956800B23DCD /* aicompanionapp/uitests */,
 				06463EF91D95956800B23DCD /* Products */,
 				06EC0A1A1D959648001CD8DC /* Frameworks */,
 				9F048C59E0A8D7BC18969732 /* Pods */,
@@ -187,7 +187,7 @@
 			name = Products;
 			sourceTree = "<group>";
 		};
-		06463EFA1D95956800B23DCD /* src */ = {
+		06463EFA1D95956800B23DCD /* aicompanionapp/src */ = {
 			isa = PBXGroup;
 			children = (
 				06B2161D1DBC7B4C000B3366 /* resources */,
@@ -207,7 +207,7 @@
 			path = aicompanionapp/src;
 			sourceTree = "<group>";
 		};
-		06463F0F1D95956800B23DCD /* tests */ = {
+		06463F0F1D95956800B23DCD /* aicompanionapp/tests */ = {
 			isa = PBXGroup;
 			children = (
 				06463F101D95956800B23DCD /* AICompanionTests.swift */,
@@ -216,7 +216,7 @@
 			path = aicompanionapp/tests;
 			sourceTree = "<group>";
 		};
-		06463F1A1D95956800B23DCD /* uitests */ = {
+		06463F1A1D95956800B23DCD /* aicompanionapp/uitests */ = {
 			isa = PBXGroup;
 			children = (
 				06463F1B1D95956800B23DCD /* AICompanionUITests.swift */,

diff --git a/appinventor/aicompanionapp/src/Info.plist b/appinventor/aicompanionapp/src/Info.plist
@@ -43,6 +43,10 @@
 	<string>App Inventor accesses your photo library when you include an ImagePicker component in your app.</string>
 	<key>NSSpeechRecognitionUsageDescription</key>
 	<string>App Inventor uses speech recognition when you include a SpeechRecognizer component in your app</string>
+	<key>UIBackgroundModes</key>
+	<array>
+		<string>audio</string>
+	</array>
 	<key>UIFileSharingEnabled</key>
 	<true/>
 	<key>UILaunchStoryboardName</key>

diff --git a/appinventor/aiplayapp/youngandroidproject/project.properties b/appinventor/aiplayapp/youngandroidproject/project.properties
@@ -7,14 +7,14 @@ icon=AI2Companion-Icon.png
 # The Version code is an integer. Each new version of an App uploaded
 # to the Play Store must have a version greater then the version in
 # the store
-versioncode=13326900
+versioncode=13327000
 # The Version Name is displayed to the user and can contain numbers
 # and letters. It generally should be congruent to the Version Code
 # Terms used by AI2:
 # Version code XYZ turns into X.YZ. ai2 indicates a Companion for AI2
 # and an optional "zx1" indicates it has internal Zebra Crossing (QR
 # Code) scanning builtin.
-versionname=2.69punya1
+versionname=2.70punya1
 useslocation=False
 androidminsdk=7
 actionbar=true

diff --git a/appinventor/appengine/src/com/google/appinventor/YaClient.gwt.xml b/appinventor/appengine/src/com/google/appinventor/YaClient.gwt.xml
@@ -166,6 +166,8 @@
   <extend-property name="locale" values="ca"/>
   <!-- Ukrainian -->
   <extend-property name="locale" values="uk"/>
+  <!-- Japanese -->
+  <extend-property name="locale" values="ja"/>
 
   <set-property-fallback name="locale" value="en"/>
 </module>
diff --git a/appinventor/appengine/src/com/google/appinventor/client/Images.java b/appinventor/appengine/src/com/google/appinventor/client/Images.java
@@ -1020,4 +1020,22 @@ public interface Images extends Resources {
    */
   @Source("com/google/appinventor/images/get-app.png")
   ImageResource GetApp();
+
+  /**
+   * Designer palette item: progressbar circular component
+   */
+  @Source("com/google/appinventor/images/circularProgress.png")
+  ImageResource circularProgress();
+
+  /**
+   * Designer palette item: progressbar circular component
+   */
+  @Source("com/google/appinventor/images/linearProgress.png")
+  ImageResource linearProgress();
+
+  /**
+   * Designer palette item: Trendline.
+   */
+  @Source("com/google/appinventor/images/trendline.png")
+  ImageResource trendline();
 }
diff --git a/appinventor/appengine/src/com/google/appinventor/client/OdeMessages.java b/appinventor/appengine/src/com/google/appinventor/client/OdeMessages.java
@@ -1,6 +1,6 @@
 // -*- mode: java; c-basic-offset: 2; -*-
 // Copyright 2009-2011 Google, All Rights reserved
-// Copyright 2011-2022 MIT, All rights reserved
+// Copyright 2011-2024 MIT, All rights reserved
 // Released under the Apache License, Version 2.0
 // http://www.apache.org/licenses/LICENSE-2.0
 
@@ -943,9 +943,13 @@ public interface OdeMessages extends Messages, AutogeneratedOdeMessages {
   @Description("Caption for source structure box.")
   String sourceStructureBoxCaptionNonVisible();
 
+  @DefaultMessage("{0} components selected")
+  @Description("Component multi-select caption.")
+  String componentsSelected(int componentCount);
+
   // Used in BlocksToolkit (SubsetJSONPropertyEditor)
 
-  @DefaultMessage("Blocks Toolkit")
+  @DefaultMessage("Toolkit")
   @Description("Title for Blocks Toolkit custom editor.")
   String blocksToolkitTitle();
 
@@ -1908,6 +1912,18 @@ public interface OdeMessages extends Messages, AutogeneratedOdeMessages {
   @Description("Error shown after validation of input text failed.")
   String malformedInputError();
 
+  @DefaultMessage("Beginner")
+  @Description("List item in Subset Property Editor")
+  String beginnerToolkitButton();
+
+  @DefaultMessage("Intermediate")
+  @Description("List item in Subset Property Editor")
+  String intermediateToolkitButton();
+
+  @DefaultMessage("Expert")
+  @Description("List item in Subset Property Editor")
+  String expertToolkitButton();
+
   @DefaultMessage("All")
   @Description("List item in Subset Property Editor")
   String allButton();
@@ -5133,6 +5149,11 @@ String newerVersionComponentException(String componentType, int srcCompVersion,
   @Description("")
   String FusionTablesDeprecated();
 
+  @DefaultMessage("WARNING: The library the Twitter component uses, Twitter4J, no longer works as of 2024. " +
+  "The component no longer works and has been deprecated.")
+  @Description("")
+  String TwitterDeprecated();
+
   // Missing translations from 4/8/2015 -- Should sort into appropriate place
 
   @DefaultMessage("LaunchPicker")
@@ -6208,6 +6229,11 @@ String newerVersionComponentException(String componentType, int srcCompVersion,
   @Description("")
   String reloadWindow();
 
+  //ThemeChoiceEditor
+  @DefaultMessage("Theme")
+  @Description("")
+  String themeTitle();
+
   @DefaultMessage("Classic")
   @Description("")
   String classicTheme();
@@ -6538,50 +6564,45 @@ String newerVersionComponentException(String componentType, int srcCompVersion,
   @Description("Text to Display Publishing Project Property Category in Project Property Dialog")
   String projectPropertyPublishingCategoryTitle();
 
-  // GraphQL component
+  // Best Fit Model names
 
-  @DefaultMessage("GraphQL")
+  @DefaultMessage("Linear")
   @Description("")
-  String graphQLComponentPallette();
+  String fitModelLinear();
 
-  @DefaultMessage("A non-visible component that allows you to interact with a GraphQL endpoint. " +
-      "Learn more at <a target=\"_blank\" href=\"https://graphql.org/\">graphql.org</a>.")
+  @DefaultMessage("Quadratic")
   @Description("")
-  String GraphQLHelpStringComponentPallette();
+  String fitModelQuadratic();
 
-  @DefaultMessage("EndpointURL")
+  @DefaultMessage("Cubic")
   @Description("")
-  String GqlEndpointUrlProperties();
+  String fitModelCubic();
 
-  @DefaultMessage("HttpHeaders")
+  @DefaultMessage("Exponential")
   @Description("")
-  String GqlHttpHeadersProperties();
+  String fitModelExponential();
 
-  @DefaultMessage("Query")
+  @DefaultMessage("Logarithmic")
   @Description("")
-  String GqlQueryMethods();
+  String fitModelLogarithmic();
 
-  @DefaultMessage("query")
-  @Description("")
-  String gqlQueryParams();
+  // Stroke Style names
 
-  @DefaultMessage("queryName")
+  @DefaultMessage("Solid")
   @Description("")
-  String gqlQueryNameParams();
+  String strokeStyleSolid();
 
-  @DefaultMessage("response")
+  @DefaultMessage("Dashed")
   @Description("")
-  String gqlResponseParams();
+  String strokeStyleDashed();
 
-  @DefaultMessage("error")
+  @DefaultMessage("Dotted")
   @Description("")
-  String gqlErrorParams();
+  String strokeStyleDotted();
 
-  @DefaultMessage("GotResponse")
-  @Description("")
-  String GqlGotResponseEvents();
+  // Trendline customization
 
-  @DefaultMessage("GotError")
+  @DefaultMessage("XIntercept(s)")
   @Description("")
-  String GqlGotErrorEvents();
+  String XInterceptsProperties();
 }