Update MIT AICompanaion App to version 2.04 (versionCode 204). The App

will now tell the user that they don't have a Bar Code Scanning App if
they don't (instead of giving a generic error).

Change-Id: I5788d648c4d84c7d77c7020b3e6e5956bec84ded

appinventor/aiplayapp/src/edu/mit/appinventor/aicompanion2/Screen1.scm

 #|
 $JSON
-{"YaVersion":"68","Source":"Form","Properties":{"$Name":"Screen1","$Type":"Form","$Version":"10","Uuid":"0","ScreenOrientation":"portrait","Scrollable":"False","Title":"MIT AICompanion","VersionCode":"203","VersionName":"2.03","$Components":[{"$Name":"HorizontalArrangement2","$Type":"HorizontalArrangement","$Version":"2","Uuid":"-1890222609","Width":"-2","$Components":[{"$Name":"Label1","$Type":"Label","$Version":"2","Uuid":"-333340163","Text":"Your IP Address: "},{"$Name":"iplabel","$Type":"Label","$Version":"2","Uuid":"1435778230","Text":"IP ADDRESS","Width":"-2"}]},{"$Name":"Label5","$Type":"Label","$Version":"2","Uuid":"1468302777","Text":"     ","Width":"-2"},{"$Name":"Label2","$Type":"Label","$Version":"2","Uuid":"-28249960","Text":"Directions: \\n1) On the Blocks Editor, press \"Connect to Device\" and select WiFi.\\n2) Type the 6-letter code or scan the QR code displayed on the Blocks Editor.\\n3) Click the 'Connect to App Inventor' button below.\\n4) If not connected in 30 seconds, click reset and repeat steps 1-4.","Width":"-2"},{"$Name":"Label6","$Type":"Label","$Version":"2","Uuid":"1263643189","Text":"        ","Width":"-2"},{"$Name":"ScanButton","$Type":"Button","$Version":"4","Uuid":"-928166843","Text":"Scan the QR Code","Width":"-2"},{"$Name":"HorizontalArrangement1","$Type":"HorizontalArrangement","$Version":"2","Uuid":"-1363356191","Width":"-2","$Components":[{"$Name":"code","$Type":"TextBox","$Version":"4","Uuid":"2091318480","Hint":"Or type the 6-letter code here.","Width":"-2"}]},{"$Name":"Button1","$Type":"Button","$Version":"4","Uuid":"933636264","Text":"Connect to App Inventor","Width":"-2"},{"$Name":"Label8","$Type":"Label","$Version":"2","Uuid":"-1656721742","Text":"An Error Occurred. Please try pressing \"Connect to App Inventor\" again.","TextColor":"&HFFFF0000","Visible":"False"},{"$Name":"HorizontalArrangement5","$Type":"HorizontalArrangement","$Version":"2","Uuid":"1374735927","Visible":"False","$Components":[{"$Name":"Label7","$Type":"Label","$Version":"2","Uuid":"677206225","Text":"You did not enter 6 characters, please try again.","TextColor":"&HFFFF0000"}]},{"$Name":"RetryButton","$Type":"Button","$Version":"4","Uuid":"796723612","Text":"Reset","Visible":"False","Width":"-2"},{"$Name":"HorizontalArrangement3","$Type":"HorizontalArrangement","$Version":"2","Uuid":"-1743769894","Visible":"False","$Components":[{"$Name":"Label3","$Type":"Label","$Version":"2","Uuid":"-1412894374","Text":"Or you Can Scan a Bar Code","Visible":"False"}]},{"$Name":"HorizontalArrangement4","$Type":"HorizontalArrangement","$Version":"2","Uuid":"1722789622","Visible":"False","$Components":[{"$Name":"Label4","$Type":"Label","$Version":"2","Uuid":"-1681239855","Text":"If the Blocks Editor is already running"},{"$Name":"RestartButton","$Type":"Button","$Version":"4","Uuid":"1759990306","Text":"Restart"}]},{"$Name":"ConnectFailLabel","$Type":"Label","$Version":"2","Uuid":"1331553180","Text":"Your phone does not appear to be connected to a Wireless (WiFi) network.","TextColor":"&HFFFF0000","Visible":"False"},{"$Name":"Expireblock","$Type":"VerticalArrangement","$Version":"2","Uuid":"-1616116264","AlignHorizontal":"3","Visible":"False","$Components":[{"$Name":"expirewarning","$Type":"Label","$Version":"2","Uuid":"-243410660","Text":"This version of the App Inventor Companion is not compatible with your blocks editor. You can download a new version from the Play Store","TextColor":"&HFFFF0000"},{"$Name":"MarketButton","$Type":"Button","$Version":"4","Uuid":"566867955","Text":"Go to the Play Store"}]},{"$Name":"Web1","$Type":"Web","$Version":"2","Uuid":"-1902677450","Url":"http:\/\/osiris.mit.edu\/rendezvous\/"},{"$Name":"Clock1","$Type":"Clock","$Version":"1","Uuid":"1668438698"},{"$Name":"BarcodeScanner1","$Type":"BarcodeScanner","$Version":"1","Uuid":"240579661"},{"$Name":"TinyDB1","$Type":"TinyDB","$Version":"1","Uuid":"-587391114"},{"$Name":"ActivityStarter1","$Type":"ActivityStarter","$Version":"4","Uuid":"506337611","Action":"android.intent.action.VIEW","DataUri":"market:\/\/details?id=edu.mit.appinventor.aicompanion2"},{"$Name":"PhoneStatus1","$Type":"PhoneStatus","$Version":"1","Uuid":"-315198317"}]}}
+{"YaVersion":"69","Source":"Form","Properties":{"$Name":"Screen1","$Type":"Form","$Version":"10","Uuid":"0","ScreenOrientation":"portrait","Scrollable":"False","Title":"MIT AICompanion","VersionCode":"204","VersionName":"2.04","$Components":[{"$Name":"HorizontalArrangement2","$Type":"HorizontalArrangement","$Version":"2","Uuid":"-1890222609","Width":"-2","$Components":[{"$Name":"Label1","$Type":"Label","$Version":"2","Uuid":"-333340163","Text":"Your IP Address: "},{"$Name":"iplabel","$Type":"Label","$Version":"2","Uuid":"1435778230","Text":"IP ADDRESS","Width":"-2"}]},{"$Name":"Label5","$Type":"Label","$Version":"2","Uuid":"1468302777","Text":"     ","Width":"-2"},{"$Name":"Label2","$Type":"Label","$Version":"2","Uuid":"-28249960","Text":"Directions: \\n1) On the Blocks Editor, press \"Connect to Device\" and select WiFi.\\n2) Type the 6-letter code or scan the QR code displayed on the Blocks Editor.\\n3) Click the 'Connect to App Inventor' button below.\\n4) If not connected in 30 seconds, click reset and repeat steps 1-4.","Width":"-2"},{"$Name":"Label6","$Type":"Label","$Version":"2","Uuid":"1263643189","Text":"        ","Width":"-2"},{"$Name":"ScanButton","$Type":"Button","$Version":"4","Uuid":"-928166843","Text":"Scan the QR Code","Width":"-2"},{"$Name":"HorizontalArrangement1","$Type":"HorizontalArrangement","$Version":"2","Uuid":"-1363356191","Width":"-2","$Components":[{"$Name":"code","$Type":"TextBox","$Version":"4","Uuid":"2091318480","Hint":"Or type the 6-letter code here.","Width":"-2"}]},{"$Name":"Button1","$Type":"Button","$Version":"4","Uuid":"933636264","Text":"Connect to App Inventor","Width":"-2"},{"$Name":"Label8","$Type":"Label","$Version":"2","Uuid":"-1656721742","TextColor":"&HFFFF0000","Visible":"False"},{"$Name":"HorizontalArrangement5","$Type":"HorizontalArrangement","$Version":"2","Uuid":"1374735927","Visible":"False","$Components":[{"$Name":"Label7","$Type":"Label","$Version":"2","Uuid":"677206225","Text":"You did not enter 6 characters, please try again.","TextColor":"&HFFFF0000"}]},{"$Name":"RetryButton","$Type":"Button","$Version":"4","Uuid":"796723612","Text":"Reset","Visible":"False","Width":"-2"},{"$Name":"HorizontalArrangement3","$Type":"HorizontalArrangement","$Version":"2","Uuid":"-1743769894","Visible":"False","$Components":[{"$Name":"Label3","$Type":"Label","$Version":"2","Uuid":"-1412894374","Text":"Or you Can Scan a Bar Code","Visible":"False"}]},{"$Name":"HorizontalArrangement4","$Type":"HorizontalArrangement","$Version":"2","Uuid":"1722789622","Visible":"False","$Components":[{"$Name":"Label4","$Type":"Label","$Version":"2","Uuid":"-1681239855","Text":"If the Blocks Editor is already running"},{"$Name":"RestartButton","$Type":"Button","$Version":"4","Uuid":"1759990306","Text":"Restart"}]},{"$Name":"ConnectFailLabel","$Type":"Label","$Version":"2","Uuid":"1331553180","Text":"Your phone does not appear to be connected to a Wireless (WiFi) network.","TextColor":"&HFFFF0000","Visible":"False"},{"$Name":"Expireblock","$Type":"VerticalArrangement","$Version":"2","Uuid":"-1616116264","AlignHorizontal":"3","Visible":"False","$Components":[{"$Name":"expirewarning","$Type":"Label","$Version":"2","Uuid":"-243410660","Text":"This version of the App Inventor Companion is not compatible with your blocks editor. You can download a new version from the Play Store","TextColor":"&HFFFF0000"},{"$Name":"MarketButton","$Type":"Button","$Version":"4","Uuid":"566867955","Text":"Go to the Play Store"}]},{"$Name":"Web1","$Type":"Web","$Version":"2","Uuid":"-1902677450","Url":"http:\/\/osiris.mit.edu\/rendezvous\/"},{"$Name":"Clock1","$Type":"Clock","$Version":"1","Uuid":"1668438698"},{"$Name":"BarcodeScanner1","$Type":"BarcodeScanner","$Version":"1","Uuid":"240579661"},{"$Name":"TinyDB1","$Type":"TinyDB","$Version":"1","Uuid":"-587391114"},{"$Name":"ActivityStarter1","$Type":"ActivityStarter","$Version":"4","Uuid":"506337611","Action":"android.intent.action.VIEW","DataUri":"market:\/\/details?id=edu.mit.appinventor.aicompanion2"},{"$Name":"PhoneStatus1","$Type":"PhoneStatus","$Version":"1","Uuid":"-315198317"}]}}
 |#
\ No newline at end of file

appinventor/aiplayapp/src/edu/mit/appinventor/aicompanion2/Screen1.yail

@@ -12,35 +12,7 @@ $Source $Yail
 (set-and-coerce-property! 'RetryButton 'Visible #f 'boolean)
 
  )
-(def (Setup)
-(set-var! ipaddress  (call-component-method 'PhoneStatus1 'GetWifiIpAddress (*list-for-runtime*)
- '())
-)
-
-(set-and-coerce-property! 'iplabel 'Text (get-var ipaddress)
- 'text)
-
-(set-and-coerce-property! 'Button1 'Enabled #t 'boolean)
-
-(set-and-coerce-property! 'ScanButton 'Enabled #t 'boolean)
-
-(set-and-coerce-property! 'RetryButton 'Visible #f 'boolean)
-
-(if (call-yail-primitive yail-not (*list-for-runtime* (call-component-method 'PhoneStatus1 'isConnected (*list-for-runtime*)
- '())
-)
- '( boolean)
- "not")
- (begin (set-and-coerce-property! 'ConnectFailLabel 'Visible #t 'boolean)
-
-)
- (begin (set-and-coerce-property! 'ConnectFailLabel 'Visible #f 'boolean)
-
-)
-)
-
- )
-(def expired #f)
+(def ipaddress "IPADDRESS")
 
 (def (PostData)
 (set-and-coerce-property! 'Web1 'Url (call-yail-primitive string-append (*list-for-runtime* "http://" (call-yail-primitive string-append (*list-for-runtime* "rendezvous.appinventor.mit.edu" "/rendezvous/")
@@ -76,26 +48,66 @@ $Source $Yail
  '())
 
  )
-(def ipaddress "IPADDRESS")
+(def expired #f)
+
+(def (Setup)
+(set-var! ipaddress  (call-component-method 'PhoneStatus1 'GetWifiIpAddress (*list-for-runtime*)
+ '())
+)
+
+(set-and-coerce-property! 'iplabel 'Text (get-var ipaddress)
+ 'text)
 
+(set-and-coerce-property! 'Button1 'Enabled #t 'boolean)
+
+(set-and-coerce-property! 'ScanButton 'Enabled #t 'boolean)
+
+(set-and-coerce-property! 'RetryButton 'Visible #f 'boolean)
+
+(if (call-yail-primitive yail-not (*list-for-runtime* (call-component-method 'PhoneStatus1 'isConnected (*list-for-runtime*)
+ '())
+)
+ '( boolean)
+ "not")
+ (begin (set-and-coerce-property! 'ConnectFailLabel 'Visible #t 'boolean)
+
+)
+ (begin (set-and-coerce-property! 'ConnectFailLabel 'Visible #f 'boolean)
+
+)
+)
+
+ )
 ;;; Screen1
 (do-after-form-creation (set-and-coerce-property! 'Screen1 'ScreenOrientation "portrait" 'text)
 (set-and-coerce-property! 'Screen1 'Scrollable #f 'boolean)
 (set-and-coerce-property! 'Screen1 'Title "MIT AICompanion" 'text)
-(set-and-coerce-property! 'Screen1 'VersionCode 203 'number)
-(set-and-coerce-property! 'Screen1 'VersionName "2.03" 'text)
-)
-(define-event Screen1 Initialize()
- (set-this-form)
- ((get-var Setup))
-
+(set-and-coerce-property! 'Screen1 'VersionCode 204 'number)
+(set-and-coerce-property! 'Screen1 'VersionName "2.04" 'text)
 )
 (define-event Screen1 ErrorOccurred( component  functionName  errorNumber  message )
  (set-this-form)
  (set-and-coerce-property! 'Label8 'Visible #t 'boolean)
 
+(if (call-yail-primitive yail-equal? (*list-for-runtime* (lexical-value errorNumber)
+ 1501)
+ '( any any)
+ "=")
+ (begin (set-and-coerce-property! 'Label8 'Text "Your phone does not appear to have a Bar Code Scanning Application Installed." 'text)
+
+)
+ (begin (set-and-coerce-property! 'Label8 'Text "An Error Occurred. Please try pressing \"Connect to App Inventor\" again." 'text)
+
+)
+)
+
 ((get-var Setup))
 
+)
+(define-event Screen1 Initialize()
+ (set-this-form)
+ ((get-var Setup))
+
 )
 ;;; HorizontalArrangement2
 (add-component Screen1 HorizontalArrangement HorizontalArrangement2 (set-and-coerce-property! 'HorizontalArrangement2 'Width -2 'number)
@@ -125,7 +137,9 @@ $Source $Yail
 )
 (define-event ScanButton Click()
  (set-this-form)
- (call-component-method 'BarcodeScanner1 'DoScan (*list-for-runtime*)
+ (set-and-coerce-property! 'Label8 'Visible #f 'boolean)
+
+(call-component-method 'BarcodeScanner1 'DoScan (*list-for-runtime*)
  '())
 
 )
@@ -177,8 +191,7 @@ $Source $Yail
 
 )
 ;;; Label8
-(add-component Screen1 Label Label8 (set-and-coerce-property! 'Label8 'Text "An Error Occurred. Please try pressing \"Connect to App Inventor\" again." 'text)
-(set-and-coerce-property! 'Label8 'TextColor #xFFFF0000 'number)
+(add-component Screen1 Label Label8 (set-and-coerce-property! 'Label8 'TextColor #xFFFF0000 'number)
 (set-and-coerce-property! 'Label8 'Visible #f 'boolean)
 )
 ;;; HorizontalArrangement5

appinventor/aiplayapp/youngandroidproject/project.properties

@@ -4,5 +4,5 @@ assets=../assets
 source=../src
 build=../build
 icon=AICompanion.png
-versioncode=203
-versionname=2.03
+versioncode=204
+versionname=2.04