fix merge conflict in calendar detail

Author: drewvolz

modules/badge/index.js

@@ -0,0 +1,4 @@
+// @flow
+
+export {OutlineBadge} from './outline'
+export {SolidBadge} from './solid'

source/components/solid-badge.js renamed to modules/badge/outline.js

@@ -2,13 +2,14 @@
 import * as React from 'react'
 import {View, Text, StyleSheet} from 'react-native'
 import * as c from '@frogpond/colors'
+import tinycolor from 'tinycolor2'
 
-type PropsType = {
+type Props = {
 	text: string,
 	accentColor?: string,
 	textColor?: string,
-	style?: number | Object | Array<number | Object>,
-	textStyle?: number | Object | Array<number | Object>,
+	style?: any,
+	textStyle?: any,
 }
 
 let styles = StyleSheet.create({
@@ -24,24 +25,26 @@ let styles = StyleSheet.create({
 	},
 })
 
-export function SolidBadge({
+export function OutlineBadge({
 	text,
 	style,
 	textStyle,
 	accentColor = c.goldenrod,
 	textColor = 'hsl(26, 49%, 34%)',
-}: PropsType) {
-	const bgaccent = accentColor.replace('rgb', 'rgba').replace(')', ', 0.1)')
+}: Props) {
+	const bgaccent = tinycolor(accentColor)
+		.setAlpha(0.1)
+		.toRgbString()
 
 	return (
 		<View
 			style={[
 				styles.accessoryBadge,
-				style,
 				{backgroundColor: bgaccent, borderColor: accentColor},
+				style,
 			]}
 		>
-			<Text style={[styles.accessoryBadgeText, textStyle, {color: textColor}]}>
+			<Text style={[styles.accessoryBadgeText, {color: textColor}, textStyle]}>
 				{text}
 			</Text>
 		</View>

modules/badge/package.json

@@ -0,0 +1,17 @@
+{
+  "name": "@frogpond/badge",
+  "version": "1.0.0",
+  "description": "",
+  "main": "index.js",
+  "author": "",
+  "license": "ISC",
+  "scripts": {
+    "test": "jest"
+  },
+  "peerDependencies": {
+    "@frogpond/colors": "^1.0.0",
+    "react": "^16.0.0",
+    "tinycolor2": "^1.4.1",
+    "react-native": "^0.55.4"
+  }
+}

modules/badge/solid.js

@@ -0,0 +1,39 @@
+// @flow
+
+import * as React from 'react'
+import {View, Text, StyleSheet, Platform} from 'react-native'
+import * as c from '@frogpond/colors'
+
+type Props = {
+	status: string,
+	accentColor?: string,
+	textColor?: string,
+}
+
+export function SolidBadge(props: Props) {
+	const {status, accentColor = c.goldenrod, textColor = c.white} = props
+
+	return (
+		<View style={[styles.badge, {backgroundColor: accentColor}]}>
+			<Text style={[styles.badgeText, {color: textColor}]}>{status}</Text>
+		</View>
+	)
+}
+
+const styles = StyleSheet.create({
+	badge: {
+		marginTop: 20,
+		paddingHorizontal: 12,
+		paddingVertical: 4,
+		borderRadius: 5,
+		alignSelf: 'center',
+		...Platform.select({
+			android: {
+				marginBottom: 14,
+			},
+		}),
+	},
+	badgeText: {
+		fontSize: 18,
+	},
+})

package.json

@@ -18,7 +18,9 @@
     "ios:release": "react-native run-ios --configuration Release",
     "ios-simulator": "xcrun instruments -s devices | peco --select-1 --query 'Simulator iPhone' --on-cancel error | sed  's~.*\\[\\(.*\\)\\].*~\\1~' | xargs open -n -a Simulator --args -CurrentDeviceUDID",
     "lint": "eslint --report-unused-disable-directives --max-warnings=0 --cache source/ modules/ scripts/ *.js",
-    "prepare": "sed -i.bak 's/\\(_backedTextInputView.scrollEnabled = \\)YES;/\\1NO;/' node_modules/react-native/Libraries/Text/TextInput/Multiline/RCTMultilineTextInputView.m",
+    "prepare": "npm run prepareScrollEnabled && npm run preparePopover",
+    "preparePopover": "sed -i.bak '111s/\\(this.safeAreaViewReady = \\)false;/\\1true;/' node_modules/react-native-popover-view/src/Popover.js",
+    "prepareScrollEnabled": "sed -i.bak 's/\\(_backedTextInputView.scrollEnabled = \\)YES;/\\1NO;/' node_modules/react-native/Libraries/Text/TextInput/Multiline/RCTMultilineTextInputView.m",
     "prettier": "prettier --write '{source,modules,scripts,e2e}/**/*.{js,json}' 'data/**/*.css' '*.js'",
     "prettier:changed": "pretty-quick",
     "prettier:since-master": "pretty-quick",
@@ -127,7 +129,7 @@
     "react-native-keychain": "3.0.0",
     "react-native-linear-gradient": "2.4.2",
     "react-native-network-info": "4.0.0",
-    "react-native-onesignal": "3.2.6",
+    "react-native-onesignal": "3.2.7",
     "react-native-paper": "2.0.1",
     "react-native-popover-view": "1.0.8",
     "react-native-restart": "0.0.7",

source/components/outline-badge.js

@@ -108,6 +108,20 @@ export function hydrate(): ThunkAction<
 	}
 }
 
+export function refreshPushStatus(): ThunkAction<SetPermissionsAction> {
+	return dispatch => {
+		OneSignal.getPermissionSubscriptionState(permissions => {
+			dispatch({
+				type: SET_PERMISSIONS,
+				payload: {
+					enabled: permissions.notificationsEnabled,
+					hasPrompted: permissions.hasPrompted,
+				},
+			})
+		})
+	}
+}
+
 type DisableNotificationsAction = {|
 	type: 'notifications/DISABLE',
 |}

source/redux/parts/notifications.js

@@ -8,7 +8,7 @@ import moment from 'moment-timezone'
 import * as c from '@frogpond/colors'
 import {getShortBuildingStatus} from '../lib'
 
-import {OutlineBadge} from '../../../components/outline-badge'
+import {SolidBadge as Badge} from '@frogpond/badge'
 import {Header} from './header'
 import {ScheduleTable} from './schedule-table'
 import {ListFooter} from '@frogpond/lists'
@@ -37,6 +37,11 @@ type Props = {
 	onProblemReport: () => any,
 }
 
+const BGCOLORS = {
+	Open: c.moneyGreen,
+	Closed: c.salmon,
+}
+
 export class BuildingDetail extends React.Component<Props> {
 	shouldComponentUpdate(nextProps: Props) {
 		return (
@@ -63,7 +68,7 @@ export class BuildingDetail extends React.Component<Props> {
 				) : null}
 
 				<Header building={info} />
-				<OutlineBadge status={openStatus} />
+				<Badge accentColor={BGCOLORS[openStatus]} status={openStatus} />
 				<ScheduleTable
 					now={now}
 					onProblemReport={onProblemReport}

source/views/building-hours/detail/building.js

@@ -2,7 +2,7 @@
 
 import * as React from 'react'
 import {View, Text, StyleSheet} from 'react-native'
-import {SolidBadge} from '../../components/solid-badge'
+import {OutlineBadge as Badge} from '@frogpond/badge'
 import isEqual from 'lodash/isEqual'
 import type momentT from 'moment'
 import type {BuildingType} from './types'
@@ -122,7 +122,7 @@ export class BuildingRow extends React.Component<Props, State> {
 					</Title>
 
 					{!info.isNotice ? (
-						<SolidBadge
+						<Badge
 							accentColor={accentBg}
 							style={styles.accessoryBadge}
 							text={openStatus}

source/views/building-hours/row.js

@@ -3,10 +3,10 @@
 import * as React from 'react'
 import {AppState} from 'react-native'
 import {connect} from 'react-redux'
-import {hydrate} from '../../../../redux/parts/notifications'
+import {refreshPushStatus} from '../../../../redux/parts/notifications'
 
 type Props = {
-	rehydrate: () => any,
+	refreshPushStatus: () => any,
 }
 
 type State = {
@@ -33,7 +33,7 @@ class _CheckForPushSettingsOnResume extends React.Component<Props, State> {
 			currentAppState !== 'active' && nextAppState === 'active'
 
 		if (shouldRehydrate) {
-			this.props.rehydrate()
+			this.props.refreshPushStatus()
 		}
 
 		this.setState(() => ({appState: nextAppState}))
@@ -47,6 +47,6 @@ class _CheckForPushSettingsOnResume extends React.Component<Props, State> {
 export const CheckForPushSettingsOnResume = connect(
 	null,
 	(dispatch): Props => ({
-		rehydrate: () => dispatch(hydrate()),
+		refreshPushStatus: () => dispatch(refreshPushStatus()),
 	}),
 )(_CheckForPushSettingsOnResume)