From 231cd69b5ace20f6e700dda3332d345772c69eeb Mon Sep 17 00:00:00 2001 From: Aaron Louie Date: Thu, 10 Sep 2020 15:49:43 -0400 Subject: [PATCH] Increments version and build numbers as well --- android/app/build.gradle | 11 ++++++++++- android/app/src/main/assets/index.android.bundle | 4 ++-- android/app/version.properties | 8 ++++---- 3 files changed, 16 insertions(+), 7 deletions(-) diff --git a/android/app/build.gradle b/android/app/build.gradle index c3bdec5..973d111 100644 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -136,8 +136,17 @@ android { def Properties versionProps = new Properties() versionProps.load(new FileInputStream(versionPropsFile)) - def name = versionProps['VERSION_NAME'] + + // Increment the version + def version = versionProps['VERSION_NAME'] + def build = versionProps['VERSION_BUILD'].toInteger() + 1 def code = versionProps['VERSION_CODE'].toInteger() + 1 + def incstep = '0.0.1'.split(/\./).collect{it.toInteger()} + def indexedVersionList = version.split(/\./).toList().withIndex() + def updatedVersionList = indexedVersionList.collect{num, idx -> num.toInteger()+incstep[idx]} + + versionProps['VERSION_NAME']=updatedVersionList.join(".") + versionProps['VERSION_BUILD']=build.toString() versionProps['VERSION_CODE']=code.toString() versionProps.store(versionPropsFile.newWriter(), null) diff --git a/android/app/src/main/assets/index.android.bundle b/android/app/src/main/assets/index.android.bundle index ffc0131..ca75831 100644 --- a/android/app/src/main/assets/index.android.bundle +++ b/android/app/src/main/assets/index.android.bundle @@ -965,7 +965,7 @@ __d(function(g,r,i,a,m,e,d){var t=r(d[0]),n=r(d[1]);Object.defineProperty(e,"__e __d(function(g,r,i,a,m,e,d){var t=r(d[0]),n=r(d[1]);Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0;var o=n(r(d[2])),c=n(r(d[3])),l=n(r(d[4])),u=n(r(d[5])),f=n(r(d[6])),p=n(r(d[7])),s=t(r(d[8])),y=r(d[9]),O=n(r(d[10])),b=r(d[11]);function h(){if("undefined"==typeof Reflect||!Reflect.construct)return!1;if(Reflect.construct.sham)return!1;if("function"==typeof Proxy)return!0;try{return Date.prototype.toString.call(Reflect.construct(Date,[],function(){})),!0}catch(t){return!1}}function v(){return(v=Object.assign||function(t){for(var n=1;n=0||Object.prototype.propertyIsEnumerable.call(t,o)&&(l[o]=t[o])}return l}function R(t,n){if(null==t)return{};var o,c,l={},u=Object.keys(t);for(c=0;c=0||(l[o]=t[o]);return l}var x=(function(t){(0,l.default)(w,t);var n,b,j=(n=w,b=h(),function(){var t,o=(0,f.default)(n);if(b){var c=(0,f.default)(this).constructor;t=Reflect.construct(o,arguments,c)}else t=o.apply(this,arguments);return(0,u.default)(this,t)});function w(){return(0,o.default)(this,w),j.apply(this,arguments)}return(0,c.default)(w,[{key:"render",value:function(){var t=this.props,n=t.theme,o=t.alpha,c=t.family,l=t.style,u=D(t,["theme","alpha","family","style"]),f=(0,p.default)(n.colors.text).alpha(o).rgb().string(),b=n.fonts[c],h=y.I18nManager.isRTL?'rtl':'ltr';return s.createElement(O.default,v({},u,{style:[P(P({color:f},b),{},{textAlign:'left',writingDirection:h}),l,this.props.style]}))}}]),w})(s.Component),S=(0,b.withTheme)(x);e.default=S},959,[12,1,29,30,40,42,39,896,59,5,905,906]); __d(function(s,o,i,e,a,t,n){a.exports={expo:{description:"UVA Testing Kiosk",name:"uva-covid19-testing-kiosk",slug:"uva-covid19-testing-kiosk",version:"1.0.0",orientation:"portrait",icon:"./assets/icon.png",splash:{image:"./assets/splash.png",resizeMode:"contain",backgroundColor:"#ffffff"},updates:{fallbackToCacheTimeout:0},assetBundlePatterns:["**/*"],ios:{supportsTablet:!0,bundleIdentifier:"com.sartography.uvacovid19testingkiosk",requireFullScreen:!0},web:{favicon:"./assets/favicon.png"},sdkVersion:"38.0.0",platforms:["ios","android","web"],android:{package:"com.sartography.uvacovid19testingkiosk"}}}},960,[]); __d(function(g,r,i,a,m,e,d){var t=r(d[0]);Object.defineProperty(e,"__esModule",{value:!0}),e.CancelButton=void 0;var l=t(r(d[1])),n=t(r(d[2])),o=r(d[3]);e.CancelButton=function(t){return l.default.createElement(n.default,{icon:"cancel",color:o.colors.text,onPress:t.onClicked,style:o.styles.btnLg,labelStyle:o.styles.btnLg},"Cancel")}},961,[1,59,956,962]); -__d(function(g,r,i,a,m,e,d){var t=r(d[0]);Object.defineProperty(e,"__esModule",{value:!0}),e.styles=e.colors=void 0;var o=t(r(d[1])),n=r(d[2]),c=t(r(d[3])),l=t(r(d[4]));function u(t,o){var n=Object.keys(t);if(Object.getOwnPropertySymbols){var c=Object.getOwnPropertySymbols(t);o&&(c=c.filter(function(o){return Object.getOwnPropertyDescriptor(t,o).enumerable})),n.push.apply(n,c)}return n}function s(t){for(var n=1;n14e3}return!0};return l.default.createElement(u.View,{style:E.styles.settings},l.default.createElement(f.default,{style:{color:c.default.colors.text}},"Enter Line Count"),l.default.createElement(u.View,{style:{marginBottom:10}},l.default.createElement(s.default,{style:{color:c.default.colors.text}},"How many people are waiting in line?"),l.default.createElement(p.default,{label:"# of people",value:b,onChangeText:function(t){return L(t)},mode:"outlined",theme:c.default,keyboardType:"numeric"}),l.default.createElement(y.default,{type:"error",visible:I()},"Line count must be a whole number greater than 0."),l.default.createElement(v.default,{icon:"content-save",mode:"contained",color:E.colors.primary,style:{marginBottom:10},disabled:I(),onPress:function(){return t.onSave(parseInt(b,10))}},"Save"),l.default.createElement(v.default,{icon:"cancel",mode:"outlined",color:E.colors.primary,onPress:t.onCancel},"Cancel")))}},963,[12,1,17,59,5,915,964,958,965,977,956,962]); __d(function(g,r,i,a,m,e,d){var t=r(d[0]),n=r(d[1]);Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0;var l=n(r(d[2])),o=r(d[3]),u=t(r(d[4]));function c(){return(c=Object.assign||function(t){for(var n=1;n=0||Object.prototype.propertyIsEnumerable.call(t,n)&&(l[n]=t[n])}return l}function C(t,o){if(null==t)return{};var n,u,l={},s=Object.keys(t);for(u=0;u=0||(l[n]=t[n]);return l}function T(t,o,n){return o in t?Object.defineProperty(t,o,{value:n,enumerable:!0,configurable:!0,writable:!0}):t[o]=n,t}var F=180,E=150,S=(function(t){(0,s.default)(x,t);var o,b,L=(o=x,b=A(),function(){var t,n=(0,h.default)(o);if(b){var u=(0,h.default)(this).constructor;t=Reflect.construct(n,arguments,u)}else t=n.apply(this,arguments);return(0,f.default)(this,t)});function x(){var t;(0,n.default)(this,x);for(var o=arguments.length,u=new Array(o),s=0;s8)throw new Error('Invalid hex color: '+t);3!==o.length&&4!==o.length||(o=Array.prototype.concat.apply([],o.map(function(t){return[t,t]}))),6===o.length&&o.push('F','F');var n=parseInt(o.join(''),16);return{r:n>>24&255,g:n>>16&255,b:n>>8&255,a:255&n,hex:'#'+o.slice(0,6).join('')}}e.getOptions=function(o){o||(o={}),o.color||(o.color={});var n=void 0===o.margin||null===o.margin||o.margin<0?4:o.margin,l=o.width&&o.width>=21?o.width:void 0,f=o.scale||4;return{width:l,scale:l?4:f,margin:n,color:{dark:t(o.color.dark||'#000000ff'),light:t(o.color.light||'#ffffffff')},type:o.type,rendererOpts:o.rendererOpts||{}}},e.getScale=function(t,o){return o.width&&o.width>=t+2*o.margin?o.width/(t+2*o.margin):o.scale},e.getImageWidth=function(t,o){var n=e.getScale(t,o);return Math.floor((t+2*o.margin)*n)},e.qrToImageData=function(t,o,n){for(var l=o.modules.size,f=o.modules.data,h=e.getScale(l,n),c=Math.floor((l+2*n.margin)*h),s=n.margin*h,u=[n.color.light,n.color.dark],p=0;p=s&&w>=s&&p0&&f>0&&t[v-1]||(l+=u?n('M',f+h,.5+w+h):n('m',s,0),s=0,u=!1),f+1':'',p='',x="viewBox=\"0 0 "+f+' '+f+'"',M=''+w+p+'\n';return'function'==typeof s&&s(null,M),M}},1215,[1214]); __d(function(g,r,i,a,m,e,d){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0;e.default=function(n,t){var f=t/n.length,o='';return n.forEach(function(t,u){var c=!1;t.forEach(function(t,l){t?(c||(o+="M"+f*l+" "+(f/2+f*u)+" ",c=!0),c&&l===n.length-1&&(o+="L"+f*(l+1)+" "+(f/2+f*u)+" ")):c&&(o+="L"+f*l+" "+(f/2+f*u)+" ",c=!1)})}),{cellSize:f,path:o}}},1216,[]); -__d(function(g,r,i,a,m,e,d){var t=r(d[0]),n=r(d[1]);Object.defineProperty(e,"__esModule",{value:!0}),e.IdNumberInput=e.InputIdButton=e.ScanButton=e.Scanner=void 0;var l=n(r(d[2])),o=r(d[3]),c=t(r(d[4])),u=r(d[5]),s=n(r(d[6])),y=n(r(d[7])),f=n(r(d[8])),b=n(r(d[9])),E=n(r(d[10])),p=n(r(d[11])),h=r(d[12]);e.Scanner=function(t){return c.default.createElement(u.View,{style:h.styles.container},c.default.createElement(u.View,{style:h.styles.container},c.default.createElement(o.BarCodeScanner,{type:t.cameraType,onBarCodeScanned:t.onScanned,style:h.styles.fullScreen})),c.default.createElement(u.View,{style:h.styles.centerMiddle},c.default.createElement(u.View,{style:h.styles.captureBox})),c.default.createElement(u.Text,{style:h.styles.subtitle},"Hold your ID card up, with the barcode facing the camera. Keep the card in the green box."),c.default.createElement(u.View,{style:h.styles.centerMiddle},c.default.createElement(s.default,{mode:"text",color:h.colors.primary,icon:"cancel",onPress:t.onCancel,style:h.styles.btnWhite},"Cancel")))};e.ScanButton=function(t){return c.default.createElement(s.default,{icon:"camera",mode:"contained",color:h.colors.accent,onPress:t.onClicked,style:h.styles.btnLg,labelStyle:h.styles.btnLg},"Scan Barcode")};e.InputIdButton=function(t){return c.default.createElement(s.default,{icon:"keyboard",mode:"text",color:h.colors.onBackground,onPress:t.onClicked,style:{marginTop:30}},"Enter ID Number Manually")};e.IdNumberInput=function(t){var n=(0,c.useState)(''),o=(0,l.default)(n,2),I=o[0],S=o[1],B=/^[\d]{9}$/,v=function(){return!B.test(I)};return c.default.createElement(u.View,{style:h.styles.settings},c.default.createElement(p.default,{style:h.styles.headingInverse},"Manual ID # Entry"),c.default.createElement(u.View,{style:{marginBottom:10}},c.default.createElement(b.default,{style:{color:y.default.colors.text,marginBottom:60}},"Please double check that you have entered the number correctly. Entering an incorrect ID number will prevent patients from receiving their test results."),c.default.createElement(E.default,{label:"ID #",value:I,onChangeText:function(t){return S(t)},mode:"outlined",theme:y.default}),c.default.createElement(f.default,{type:"error",visible:v()},"ID number must be exactly 9 digits. No other characters are allowed."),c.default.createElement(s.default,{icon:"check",mode:"contained",color:h.colors.primary,style:{marginBottom:10},disabled:v(),onPress:function(){t.onScanned({type:'',data:I})}},"Submit"),c.default.createElement(s.default,{icon:"cancel",mode:"outlined",color:h.colors.primary,onPress:t.onCancel},"Cancel")))}},1217,[12,1,17,852,59,5,956,915,977,964,965,958,962]); +__d(function(g,r,i,a,m,e,d){var t=r(d[0]),n=r(d[1]);Object.defineProperty(e,"__esModule",{value:!0}),e.IdNumberInput=e.InputIdButton=e.ScanButton=e.Scanner=void 0;var l=n(r(d[2])),o=r(d[3]),c=t(r(d[4])),u=r(d[5]),s=n(r(d[6])),f=n(r(d[7])),y=n(r(d[8])),b=n(r(d[9])),E=n(r(d[10])),h=n(r(d[11])),p=r(d[12]);e.Scanner=function(t){return c.default.createElement(u.View,{style:p.styles.container},c.default.createElement(u.View,{style:p.styles.container},c.default.createElement(o.BarCodeScanner,{type:t.cameraType,onBarCodeScanned:t.onScanned,style:p.styles.fullScreen})),c.default.createElement(u.View,{style:p.styles.centerMiddle},c.default.createElement(u.View,{style:p.styles.captureBox}),c.default.createElement(b.default,{style:p.styles.shadow},"Place ID card with the barcode facing the camera. Keep the barcode in the green box.")),c.default.createElement(u.View,{style:p.styles.centerMiddle},c.default.createElement(s.default,{mode:"text",color:p.colors.primary,icon:"cancel",onPress:t.onCancel,style:p.styles.btnWhite},"Cancel")))};e.ScanButton=function(t){return c.default.createElement(s.default,{icon:"camera",mode:"contained",color:p.colors.accent,onPress:t.onClicked,style:p.styles.btnLg,labelStyle:p.styles.btnLg},"Scan Barcode")};e.InputIdButton=function(t){return c.default.createElement(s.default,{icon:"keyboard",mode:"text",color:p.colors.onBackground,onPress:t.onClicked,style:{marginTop:30}},"Enter ID Number Manually")};e.IdNumberInput=function(t){var n=(0,c.useState)(''),o=(0,l.default)(n,2),I=o[0],S=o[1],B=/^[\d]{9}$/,v=function(){return!B.test(I)};return c.default.createElement(u.View,{style:p.styles.settings},c.default.createElement(h.default,{style:p.styles.headingInverse},"Manual ID # Entry"),c.default.createElement(u.View,{style:{marginBottom:10}},c.default.createElement(b.default,{style:{color:f.default.colors.text,marginBottom:60}},"Please double check that you have entered the number correctly. Entering an incorrect ID number will prevent patients from receiving their test results."),c.default.createElement(E.default,{label:"ID #",value:I,onChangeText:function(t){return S(t)},mode:"outlined",theme:f.default}),c.default.createElement(y.default,{type:"error",visible:v()},"ID number must be exactly 9 digits. No other characters are allowed."),c.default.createElement(s.default,{icon:"check",mode:"contained",color:p.colors.primary,style:{marginBottom:10},disabled:v(),onPress:function(){t.onScanned({type:'',data:I})}},"Submit"),c.default.createElement(s.default,{icon:"cancel",mode:"outlined",color:p.colors.primary,onPress:t.onCancel},"Cancel")))}},1217,[12,1,17,852,59,5,956,915,977,964,965,958,962]); __d(function(g,r,i,a,m,e,d){var t=r(d[0]),l=r(d[1]);Object.defineProperty(e,"__esModule",{value:!0}),e.SettingsScreen=void 0;var o=l(r(d[2])),n=t(r(d[3])),u=r(d[4]),c=l(r(d[5])),f=l(r(d[6])),s=l(r(d[7])),y=l(r(d[8])),E=l(r(d[9])),v=l(r(d[10])),b=l(r(d[11])),h=l(r(d[12])),S=r(d[13]);e.SettingsScreen=function(t){var l=(0,n.useState)(t.cameraType),p=(0,o.default)(l,2),w=p[0],x=p[1],C=(0,n.useState)(t.locationStr),B=(0,o.default)(C,2),P=B[0],V=B[1],_=/^[\d]{4}$/,k=function(){return!_.test(P)};return n.default.createElement(u.View,{style:S.styles.settings},n.default.createElement(s.default,{style:{color:c.default.colors.text}},"Settings"),n.default.createElement(u.View,{style:{marginBottom:40}},n.default.createElement(f.default,{style:{color:c.default.colors.text}},"Camera to Use"),n.default.createElement(y.default.Group,{onValueChange:function(t){return x(t)},value:w},n.default.createElement(y.default.Item,{value:"front",label:"Front",theme:c.default}),n.default.createElement(y.default.Item,{value:"back",label:"Back",theme:c.default}))),n.default.createElement(u.View,{style:{marginBottom:10}},n.default.createElement(f.default,{style:{color:c.default.colors.text}},"Location Code"),n.default.createElement(E.default,{style:{color:c.default.colors.text}},"Please do NOT change this unless you know what you are doing. Entering an incorrect location number may prevent patients from getting accurate info about their test results."),n.default.createElement(v.default,{label:"Location #",value:P,onChangeText:function(t){return V(t)},mode:"outlined",theme:c.default}),n.default.createElement(b.default,{type:"error",visible:k()},"Location number must be exactly 4 digits. No other characters are allowed."),n.default.createElement(h.default,{icon:"content-save",mode:"contained",color:S.colors.primary,style:{marginBottom:10},disabled:k(),onPress:function(){return t.onSave(w,P)}},"Save"),n.default.createElement(h.default,{icon:"cancel",mode:"outlined",color:S.colors.primary,onPress:t.onCancel},"Cancel")))}},1218,[12,1,17,59,5,915,964,958,1219,1225,965,977,956,962]); __d(function(g,r,i,a,m,e,d){var t=r(d[0]),u=r(d[1]);Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0;var n=u(r(d[2])),f=u(r(d[3])),l=u(r(d[4])),o=u(r(d[5])),c=u(r(d[6])),s=t(r(d[7])),p=r(d[8]),v=u(r(d[9])),h=u(r(d[10])),y=u(r(d[11])),b=u(r(d[12])),R=r(d[13]);function P(){if("undefined"==typeof Reflect||!Reflect.construct)return!1;if(Reflect.construct.sham)return!1;if("function"==typeof Proxy)return!0;try{return Date.prototype.toString.call(Reflect.construct(Date,[],function(){})),!0}catch(t){return!1}}function _(t,u,n){return u in t?Object.defineProperty(t,u,{value:n,enumerable:!0,configurable:!0,writable:!0}):t[u]=n,t}var O=(function(t){(0,l.default)(R,t);var u,v,b=(u=R,v=P(),function(){var t,n=(0,c.default)(u);if(v){var f=(0,c.default)(this).constructor;t=Reflect.construct(n,arguments,f)}else t=n.apply(this,arguments);return(0,o.default)(this,t)});function R(){return(0,n.default)(this,R),b.apply(this,arguments)}return(0,f.default)(R,[{key:"render",value:function(){var t=p.Platform.select({default:h.default,ios:y.default});return s.createElement(t,this.props)}}]),R})(s.Component);_(O,"Group",v.default),_(O,"Android",h.default),_(O,"IOS",y.default),_(O,"Item",b.default);var j=(0,R.withTheme)(O);e.default=j},1219,[12,1,29,30,40,42,39,59,5,1220,1221,1223,1224,906]); __d(function(g,r,i,a,m,e,d){var t=r(d[0]),n=r(d[1]);Object.defineProperty(e,"__esModule",{value:!0}),e.default=e.RadioButtonContext=void 0;var u=n(r(d[2])),o=n(r(d[3])),l=n(r(d[4])),c=n(r(d[5])),f=n(r(d[6])),v=t(r(d[7]));function s(){if("undefined"==typeof Reflect||!Reflect.construct)return!1;if(Reflect.construct.sham)return!1;if("function"==typeof Proxy)return!0;try{return Date.prototype.toString.call(Reflect.construct(Date,[],function(){})),!0}catch(t){return!1}}var p=v.createContext(null);e.RadioButtonContext=p;var h,y,R,C=(function(t){(0,l.default)(R,t);var n,h,y=(n=R,h=s(),function(){var t,u=(0,f.default)(n);if(h){var o=(0,f.default)(this).constructor;t=Reflect.construct(u,arguments,o)}else t=u.apply(this,arguments);return(0,c.default)(this,t)});function R(){return(0,u.default)(this,R),y.apply(this,arguments)}return(0,o.default)(R,[{key:"render",value:function(){var t=this.props,n=t.value,u=t.onValueChange,o=t.children;return v.createElement(p.Provider,{value:{value:n,onValueChange:u}},o)}}]),R})(v.Component);R='RadioButton.Group',(y="displayName")in(h=C)?Object.defineProperty(h,y,{value:R,enumerable:!0,configurable:!0,writable:!0}):h[y]=R;var b=C;e.default=b},1220,[12,1,29,30,40,42,39,59]); diff --git a/android/app/version.properties b/android/app/version.properties index af02ff5..0842be5 100644 --- a/android/app/version.properties +++ b/android/app/version.properties @@ -1,4 +1,4 @@ -#Thu Sep 10 14:07:32 EDT 2020 -VERSION_NAME=1.0.1 -VERSION_BUILD=12 -VERSION_CODE=5 +#Thu Sep 10 15:14:20 EDT 2020 +VERSION_NAME=1.0.4 +VERSION_BUILD=13 +VERSION_CODE=8