Commit graph

475 commits

Author SHA1 Message Date
bartronx7
2d6a9a9a8d redo xcode project for react-native 0.60 2019-09-21 12:21:05 -05:00
Bart Akeley
c1bc0be506 Merge branch '104-react-native-59' into 'master'
Resolve "64-bit apk for play store"

Closes #104

See merge request aretherecookies/ui-mobile!20
2019-09-21 15:45:08 +00:00
Bart Akeley
90b1d381ab Resolve "64-bit apk for play store" 2019-09-21 15:45:07 +00:00
Erick Clark
4573e28684 Web Site 2.0 2019-09-14 11:38:46 -05:00
Bart Akeley
51cb238d86 Merge branch '105-google-places-upgrade' into 'master'
Resolve "google places upgrade by end of July"

Closes #105

See merge request aretherecookies/ui-mobile!19
2019-07-06 16:05:39 +00:00
Bart Akeley
c0e5f6ae98 Resolve "google places upgrade by end of July" 2019-07-06 16:05:39 +00:00
Erick Clark
a59c86ba14 Auto stash before merge of "master" and "origin/master"
Updated icons in Adobe XD file
2019-06-29 18:50:28 -05:00
Bart Akeley
92ada00274 Merge branch '99-ios-top-bar' into 'master'
Resolve "iOS top bar"

Closes #99

See merge request aretherecookies/ui-mobile!18
2019-06-29 17:04:22 +00:00
Bart Akeley
57d9eea20b Resolve "iOS top bar" 2019-06-29 17:04:22 +00:00
Bart Akeley
0463b8edd6 Merge branch '103-login-breaks-the-back-button' into 'master'
Resolve "UI gated by login breaks the back button"

Closes #103

See merge request aretherecookies/ui-mobile!17
2019-06-29 15:45:04 +00:00
Bart Akeley
74edfd33ef routing to login screen is now a push route
we can't safely do a route replace since the createFoodItem scenario does a direct route from app.js
2019-06-29 10:43:34 -05:00
Erick Clark
58d08c9522 Merge remote-tracking branch 'origin/master' 2019-06-29 10:12:18 -05:00
Erick Clark
fccbd432d9 Updated illustrator logo file 2019-06-29 10:12:13 -05:00
Bart Akeley
c277cac0ae Merge branch 'master' of gitlab.com:aretherecookies/ui-mobile 2019-06-29 09:46:14 -05:00
Bart Akeley
baf5b43fc1 fix java compile errors on android 2019-06-29 09:44:29 -05:00
Erick Clark
e456325d2e Added iOS icons to Xcode project and design files folder 2019-06-22 16:34:21 -05:00
Erick Clark
bbc2a2c6dd Added logo SVG to design files 2019-06-22 16:17:20 -05:00
Erick Clark
87cbf58114 Merge remote-tracking branch 'origin/master' 2019-06-22 12:21:53 -05:00
Erick Clark
a0d39ace07 Updated icon design files 2019-06-22 12:21:12 -05:00
bartronx7
326528bbb4 Merge branch 'master' of gitlab.com:aretherecookies/ui-mobile 2019-06-22 12:10:41 -05:00
bartronx7
46e2f03838 fix full screen modal notch background 2019-06-22 12:10:34 -05:00
Erick Clark
a1f5cfc0ab Updated app launcher icons 2019-06-22 12:10:04 -05:00
Erick Clark
48ec0821e0 updated design files 2019-06-22 12:08:34 -05:00
bartronx7
e9cdfd35dc Merge branch 'master' of gitlab.com:aretherecookies/ui-mobile 2019-06-22 11:43:20 -05:00
bartronx7
4d292f29f2 remove firebase and update android launcher 2019-06-22 11:43:05 -05:00
Erick Clark
c1cbed351d Merge remote-tracking branch 'origin/master' 2019-06-22 11:16:15 -05:00
Erick Clark
952d9c191a updated design files 2019-06-22 11:16:08 -05:00
Bart Akeley
4ce85e15c0 Merge branch '98-make-modals-fullscreen' into 'master'
Resolve "make modals fullscreen"

Closes #98

See merge request aretherecookies/ui-mobile!16
2019-06-22 15:48:52 +00:00
Bart Akeley
5a2f55e97d Resolve "make modals fullscreen" 2019-06-22 15:48:52 +00:00
Erick Clark
3cbe296ee5 Updated Adobe XD mock-ups 2019-05-25 18:49:22 -05:00
Erick Clark
3183a421f1 Updated Adobe XD file 2019-05-25 12:11:35 -05:00
Erick Clark
e8b88dd40a Auto stash before merge of "master" and "origin/master"
Updated XD design file
2019-05-19 12:31:58 -05:00
Bart Akeley
e13b1791cb Merge branch '100-add-icon-bottom' into 'master'
Resolve "iOS show add icon in bottom tabs"

Closes #100

See merge request aretherecookies/ui-mobile!15
2019-05-19 16:39:49 +00:00
bartronx7
63d5b65951 move add button to nav and fix back button 2019-05-19 11:34:32 -05:00
Erick Clark
94301532f6 Working on updating the design in Adobe XD 2019-05-12 12:20:25 -05:00
bartronx7
a61a4e5334 styling to handle the notch on iphonex 2019-05-12 10:04:12 -05:00
bartronx7
542a31cd8f add roboto so UI loads on iOS 2019-05-05 12:16:58 -05:00
Erick Clark
e23936cf74 Merge remote-tracking branch 'origin/master' 2019-04-27 11:51:47 -05:00
Erick Clark
a900be9c74 Design file updates 2019-04-27 11:46:33 -05:00
Erick Clark
bf4af6bcf3 Design file changes 2019-04-27 11:35:21 -05:00
Bart Akeley
05a61859af Merge branch '101-get-app-dependencies-to-compile-in-xcode' into 'master'
Resolve "get app dependencies to compile in xcode"

Closes #101

See merge request aretherecookies/ui-mobile!14
2019-04-27 16:32:40 +00:00
Bart Akeley
8463d69ef3 get dummy ios app to compile 2019-04-27 11:31:19 -05:00
Erick Clark
9913aa3d03 updated the design fieles 2019-04-06 11:17:48 -05:00
Erick Clark
9b14ac1de6 Updated web page 2019-03-09 19:00:28 -06:00
Erick Clark
0dfdafbcaf Updated web site files 2019-03-09 18:14:16 -06:00
Erick Clark
377a43af0c Merge remote-tracking branch 'origin/master' 2019-03-02 11:30:44 -06:00
Erick Clark
7501a208f0 Updated website files 2019-03-02 11:30:37 -06:00
Bart Akeley
b7015eeb3f versionCode 61 2019-03-02 10:40:27 -06:00
Bart Akeley
06d0ebe6cf Merge branch '85-creating-food-item-bad-timestamp' into 'master'
Resolve "adding new item shows last update as unix epoch"

Closes #85

See merge request aretherecookies/ui-mobile!13
2019-03-02 16:39:08 +00:00
Bart Akeley
d44d5a9cab only create food item when logged in 2019-03-02 10:37:53 -06:00