Skip to content

Commit

Permalink
Add upgrading to dropdowns
Browse files Browse the repository at this point in the history
  • Loading branch information
@BeksOmega
BeksOmega committed Aug 7, 2020
1 parent 716fcbd commit 52dd1cd
Show file tree
Hide file tree
Showing 3 changed files with 158 additions and 6 deletions.
13 changes: 13 additions & 0 deletions ...or/appengine/src/com/google/appinventor/client/youngandroid/YoungAndroidFormUpgrader.java
View file
Expand Up @@ -520,6 +520,10 @@ private static int upgradeBallProperties(Map<String, JSONValue> componentPropert
// The OriginAtCenter property was added.
srcCompVersion = 6;
}
if (srcCompVersion < 7) {
// Direction dropdown blocks were added.
srcCompVersion = 7;
}
return srcCompVersion;
}
private static int upgradeBarcodeScannerProperties(Map<String, JSONValue> componentProperties,
Expand Down Expand Up @@ -1034,6 +1038,11 @@ private static int upgradeFormProperties(Map<String, JSONValue> componentPropert
srcCompVersion = 27;
}

if (srcCompVersion < 28) {
// ScreenAnimation dropdown blocks were added.
srcCompVersion = 28;
}

return srcCompVersion;
}

Expand Down Expand Up @@ -1150,6 +1159,10 @@ private static int upgradeImageSpriteProperties(Map<String, JSONValue> component
// The callback parameters speed and heading were added to Flung.
srcCompVersion = 6;
}
if (srcCompVersion < 7) {
// Direction dropdown blocks were added.
srcCompVersion = 7;
}
return srcCompVersion;
}

Expand Down
138 changes: 135 additions & 3 deletions appinventor/blocklyeditor/src/versioning.js
View file
Expand Up @@ -957,6 +957,126 @@ Blockly.Versioning.changePropertyName = function(componentType, oldPropertyName,
}
};

/**
* Upgrades the given method param to use a dropdown. Upgrades iff the block
* currently used as the arguement is a constant (like a number or text block).
* @param {string} componentType Name of the component type for method.
* @param {string} methodName Name of the method.
* @param {number} argNum The arguement that needs to be upgraded (zero indexed).
* @param {string} dropdownKey The key for the dropdown block we want to use now.
*/
Blockly.Versioning.makeMethodUseDropdown =
function(componentType, methodName, argNum, dropdownKey) {
return function (blocksRep, workspace) {
var valueMap = Blockly.Versioning
.getOptionListValueMap(workspace, dropdownKey);
var dom = Blockly.Versioning.ensureDom(blocksRep);
var methodNodes = Blockly.Versioning
.findAllMethodCalls(dom, componentType, methodName);
for (var i = 0, method; method = methodNodes[i]; i++) {
for (var j = 0, child; child = method.children[j]; j++) {
if (child.tagName == 'value' &&
child.getAttribute('name') == 'ARG' + argNum) {
Blockly.Versioning.tryReplaceTargetBlock(
child, valueMap, dropdownKey);
break;
}
}
}
return blocksRep;
}
}

/**
* Upgrades the given setter to use a dropdown. Upgrades iff the block
* currently used as the arguement is a constant (like a number or text block).
* @param {string} componentType Name of the component type for method.
* @param {string} propertyName Name of the property.
* @param {string} dropdownKey The key for the dropdown block we want to use now.
*/
Blockly.Versioning.makeSetterUseDropdown =
function(componentType, propertyName, dropdownKey) {
return function(blocksRep, workspace) {
var valueMap = Blockly.Versioning
.getOptionListValueMap(workspace, dropdownKey);
var dom = Blockly.Versioning.ensureDom(blocksRep);
var props = Blockly.Versioning
.findAllPropertyBlocks(dom, componentType, propertyName);
for (var i = 0, prop; prop = props[i]; i++) {
var mutation = Blockly.Versioning.firstChildWithTagName(prop, 'mutation');
if (mutation.getAttribute('set_or_get') != 'set') {
continue;
}
var value = Blockly.Versioning.firstChildWithTagName(prop, 'value');
Blockly.Versioning.tryReplaceTargetBlock(value, valueMap, dropdownKey);
}
return dom;
}
}

/**
* Gets the available option values for the given option list key.
* @param {!Blockly.Workspace} workspace Used to get the component database.
* @param {string} key The key to the option list.
* @return {!Object<!string, !string>} A map of values to their enum constant
* names.
*/
Blockly.Versioning.getOptionListValueMap = function(workspace, key) {
var map = {};
var db = workspace.getComponentDatabase();
var optionList = db.getOptionList(key);
for (var i = 0, option; option = optionList.options[i]; i++) {
map[option.value] = option.name;
}
return map;
}

/**
* Replaces the block currently attached to the passed value input with a
* dropdown block. The currently block is replaced iff it is a constant (eg a
* text or number block) and the value is present in the passed valueMap.
* @param {Element} valueNode The node to modify.
* @param {!Object<!string, !string>} valueToNameMap A map of values to their
* enum constant names.
* @param {string} dropdownKey The key for the dropdown block we want to create.
*/
Blockly.Versioning.tryReplaceTargetBlock =
function(valueNode, valueToNameMap, dropdownKey) {
if (!valueNode) {
return;
}

// The node describing the value input's target block.
var targetNode = Blockly.Versioning
.firstChildWithTagName(valueNode, 'block');
if (!targetNode) {
return;
}

var name = targetNode.getAttribute('type');
if (name != 'text' && name != 'math_number') {
return;
}
var field = Blockly.Versioning.firstChildWithTagName(targetNode, 'field');
var targetValue = field.textContent;
if (!valueToNameMap[targetValue]) {
return;
}

valueNode.removeChild(targetNode);
var newBlock = document.createElement('block');
newBlock.setAttribute('type', 'helpers_dropdown');
var mutation = document.createElement('mutation');
mutation.setAttribute('key', dropdownKey);
var field = document.createElement('field');
field.setAttribute('name', 'OPTION');
var option = document.createTextNode(valueToNameMap[targetValue]);
field.appendChild(option);
newBlock.appendChild(mutation);
newBlock.appendChild(field);
valueNode.appendChild(newBlock);
}

/**
* Returns the list of top-level blocks that are event handlers for the given eventName for
* componentType.
Expand Down Expand Up @@ -1213,7 +1333,10 @@ Blockly.Versioning.AllUpgradeMaps =

// The CenterAtOrigin property was added.
// The default value of false is correct for upgraded apps.
6: "noUpgrade"
6: "noUpgrade",

// Adds dropdown blocks for Direction.
7: Blockly.Versioning.makeMethodUseDropdown('Ball', 'Bounce', 0, 'Direction')
}, // End Ball upgraders

"BarcodeScanner": {
Expand Down Expand Up @@ -1650,7 +1773,10 @@ Blockly.Versioning.AllUpgradeMaps =
markBlockBad(block, String.format(CHANGED_FLUNG_WARNING, "Flung"));
}
*/
6: "ai1CantDoUpgrade" // Just indicates we couldn't do upgrade even if we wanted to
6: "ai1CantDoUpgrade", // Just indicates we couldn't do upgrade even if we wanted to

// Adds dropdown blocks for Direction.
7: Blockly.Versioning.makeMethodUseDropdown('Sprite', 'Bounce', 0, 'Direction')

}, // End ImageSprite upgraders

Expand Down Expand Up @@ -2347,8 +2473,14 @@ Blockly.Versioning.AllUpgradeMaps =

// For FORM_COMPONENT_VERSION 27:
// - Platform and PlatformVersion read-only blocks were added
27: "noUpgrade"
27: "noUpgrade",

// For FORM_COMPONENT_VERSION 28:
// - Adds dropdown blocks for ScreenAnimation.
28: [Blockly.Versioning.makeSetterUseDropdown(
'Form', 'OpenScreenAnimation', 'ScreenAnimation'),
Blockly.Versioning.makeSetterUseDropdown(
'Form', 'CloseScreenAnimation', 'ScreenAnimation')]

}, // End Screen

Expand Down
13 changes: 10 additions & 3 deletions appinventor/components/src/com/google/appinventor/components/common/YaVersion.java
View file
Expand Up @@ -513,6 +513,7 @@ private YaVersion() {
// For YOUNG_ANDROID_VERSION 207:
// - BLOCKS_LANGUAGE_VERSION was incremented to 32

// TODO: Bump this before merge. Include notes about all upgraded components.
public static final int YOUNG_ANDROID_VERSION = 207;

// ............................... Blocks Language Version Number ...............................
Expand Down Expand Up @@ -676,7 +677,9 @@ private YaVersion() {
// - Callback parameters speed and heading were added to Flung. (for all sprites)
// For BALL_COMPONENT_VERSION 6:
// - The CenterAtOrigin property was added
public static final int BALL_COMPONENT_VERSION = 6;
// For Ball_COMPONENT_VERSION 7:
// - Adds dropdown blocks for Direction.
public static final int BALL_COMPONENT_VERSION = 7;

// For BARCODESCANNER_COMPONENT_VERSION 2:
// -- UseExternalScanner property was added (default true)
Expand Down Expand Up @@ -879,7 +882,9 @@ private YaVersion() {
// - Updated the default value of ShowListsAsJson from false -> true
// For FORM_COMPONENT_VERSION 27:
// - Added the Platform and PlatformVersion read-only blocks
public static final int FORM_COMPONENT_VERSION = 27;
// For FORM_COMPONENT_VERSION 28:
// - Adds dropdown blocks for ScreenAnimation.
public static final int FORM_COMPONENT_VERSION = 28;

// For FUSIONTABLESCONTROL_COMPONENT_VERSION 2:
// - The Fusiontables API was migrated from SQL to V1
Expand Down Expand Up @@ -937,7 +942,9 @@ private YaVersion() {
// - The TouchUp, TouchDown, and Flung events were added. (for all sprites)
// For IMAGESPRITE_COMPONENT_VERSION 6:
// - Callback parameters speed and heading were added to Flung. (for all sprites)
public static final int IMAGESPRITE_COMPONENT_VERSION = 6;
// For IMAGESPRITE_COMPONENT_VERSION 7:
// - Adds dropdown blocks for Direction.
public static final int IMAGESPRITE_COMPONENT_VERSION = 7;

// For LABEL_COMPONENT_VERSION 2:
// - The Alignment property was renamed to TextAlignment.
Expand Down

0 comments on commit 52dd1cd

Please sign in to comment.