Commit e89a101c2d3d2d87d2e97f18f7b93e504d680792
dx: update cycle-native-navigation
Andre Staltz committed on 1/4/2020, 2:37:13 PMParent: 05eda29680f83ea9762edc2b87a976dec7bbb2c2
Files changed
| package-lock.json | changed |
| package.json | changed |
| src/frontend/index.ts | changed |
| package-lock.json | ||
|---|---|---|
| The diff is too large to show. Use a local git client to view these changes. Old file size: 758698 bytes New file size: 758698 bytes |
| package.json | ||
|---|---|---|
| @@ -43,9 +43,9 @@ | ||
| 43 | 43 | "cycle-native-asyncstorage": "2.0.0", |
| 44 | 44 | "cycle-native-clipboard": "1.0.0", |
| 45 | 45 | "cycle-native-keyboard": "1.2.0", |
| 46 | 46 | "cycle-native-linking": "1.1.0", |
| 47 | - "cycle-native-navigation": "6.1.0", | |
| 47 | + "cycle-native-navigation": "7.0.0", | |
| 48 | 48 | "cycle-native-share": "1.1.0", |
| 49 | 49 | "cycle-native-toastandroid": "1.1.0", |
| 50 | 50 | "mdast-normalize-react-native": "3.2.x", |
| 51 | 51 | "nodejs-mobile-react-native": "0.5.0", |
| src/frontend/index.ts | ||
|---|---|---|
| @@ -57,8 +57,9 @@ | ||
| 57 | 57 | import {secretOutput} from './screens/secret-output/index'; |
| 58 | 58 | import {secretInput} from './screens/secret-input/index'; |
| 59 | 59 | import {Palette} from './global-styles/palette'; |
| 60 | 60 | import {Typography} from './global-styles/typography'; |
| 61 | +import {Options, Layout} from 'react-native-navigation'; | |
| 61 | 62 | |
| 62 | 63 | export const screens: {[k in Screens]?: (so: any) => any} = { |
| 63 | 64 | [Screens.Welcome]: withState(welcome), |
| 64 | 65 | [Screens.Central]: withState(central), |
| @@ -96,10 +97,9 @@ | ||
| 96 | 97 | splashscreen: makeSplashScreenDriver(), |
| 97 | 98 | exit: makeExitDriver(), |
| 98 | 99 | }; |
| 99 | 100 | |
| 100 | -export const welcomeLayout = { | |
| 101 | - root: { | |
| 101 | +export const welcomeLayout: Layout = { | |
| 102 | 102 | stack: { |
| 103 | 103 | id: 'mainstack', |
| 104 | 104 | children: [ |
| 105 | 105 | { |
| @@ -109,15 +109,13 @@ | ||
| 109 | 109 | }, |
| 110 | 110 | }, |
| 111 | 111 | ], |
| 112 | 112 | }, |
| 113 | - }, | |
| 114 | 113 | }; |
| 115 | 114 | |
| 116 | -export const centralLayout = { | |
| 115 | +export const centralLayout: Layout = { | |
| 117 | 116 | sideMenu: { |
| 118 | 117 | left: { |
| 119 | - visible: false, | |
| 120 | 118 | component: {name: Screens.Drawer}, |
| 121 | 119 | }, |
| 122 | 120 | center: { |
| 123 | 121 | stack: { |
| @@ -134,14 +132,19 @@ | ||
| 134 | 132 | }, |
| 135 | 133 | }, |
| 136 | 134 | }; |
| 137 | 135 | |
| 138 | -export const defaultNavOptions = { | |
| 136 | +export const defaultNavOptions: Options = { | |
| 139 | 137 | statusBar: { |
| 140 | 138 | visible: true, |
| 141 | 139 | backgroundColor: Palette.backgroundBrandStrong, |
| 142 | 140 | style: 'light', |
| 143 | 141 | }, |
| 142 | + sideMenu: { | |
| 143 | + left: { | |
| 144 | + shouldStretchDrawer: false, | |
| 145 | + }, | |
| 146 | + }, | |
| 144 | 147 | layout: { |
| 145 | 148 | backgroundColor: Palette.backgroundVoid, |
| 146 | 149 | orientation: ['portrait', 'landscape'], |
| 147 | 150 | }, |
| @@ -152,9 +155,9 @@ | ||
| 152 | 155 | animate: false, |
| 153 | 156 | height: 0, |
| 154 | 157 | borderHeight: 0, |
| 155 | 158 | elevation: 0, |
| 156 | - buttonColor: Palette.textForBackgroundBrand, | |
| 159 | + leftButtonColor: Palette.textForBackgroundBrand, | |
| 157 | 160 | background: { |
| 158 | 161 | color: Palette.backgroundBrand, |
| 159 | 162 | }, |
| 160 | 163 | title: { |
Built with git-ssb-web