Skip to content

Commit

Permalink
Merge pull request #74 from hariks789/master
Browse files Browse the repository at this point in the history
Fixed require cycle warning
  • Loading branch information
RichardLindhout committed May 13, 2021
2 parents af92bd3 + 436d5c0 commit 7b80b97
Show file tree
Hide file tree
Showing 5 changed files with 8 additions and 6 deletions.
4 changes: 1 addition & 3 deletions src/Time/AnalogClock.tsx
Expand Up @@ -7,6 +7,7 @@ import {
} from 'react-native'
import { useTheme } from 'react-native-paper'
import {
circleSize,
clockTypes,
getAngle,
getHours,
Expand All @@ -24,9 +25,6 @@ import AnalogClockHours from './AnalogClockHours'
import AnimatedClockSwitcher from './AnimatedClockSwitcher'
import AnalogClockMinutes from './AnalogClockMinutes'

// 250? when bigger?
export const circleSize = 215

function AnalogClock({
hours,
minutes,
Expand Down
2 changes: 1 addition & 1 deletion src/Time/AnalogClockHours.tsx
@@ -1,7 +1,7 @@
import * as React from 'react'
import { View, StyleSheet } from 'react-native'
import { Text } from 'react-native-paper'
import { circleSize } from './AnalogClock'
import { circleSize } from './timeUtils'
import { useTextColorOnPrimary } from '../utils'

function AnalogClockHours({
Expand Down
2 changes: 1 addition & 1 deletion src/Time/AnalogClockMinutes.tsx
@@ -1,7 +1,7 @@
import * as React from 'react'
import { View, StyleSheet } from 'react-native'
import { Text } from 'react-native-paper'
import { circleSize } from './AnalogClock'
import { circleSize } from './timeUtils'
import { useTextColorOnPrimary } from '../utils'

function AnalogClockMinutes({ minutes }: { minutes: number }) {
Expand Down
3 changes: 2 additions & 1 deletion src/Time/TimePicker.tsx
Expand Up @@ -9,7 +9,8 @@ import {
toHourOutputFormat,
} from './timeUtils'

import AnalogClock, { circleSize } from './AnalogClock'
import AnalogClock from './AnalogClock'
import { circleSize } from './timeUtils'
import TimeInputs from './TimeInputs'

type onChangeFunc = ({
Expand Down
3 changes: 3 additions & 0 deletions src/Time/timeUtils.ts
Expand Up @@ -2,6 +2,9 @@ import * as React from 'react'
import Color from 'color'
import { useTheme } from 'react-native-paper'

// 250? when bigger?
export const circleSize = 215

export type PossibleHourTypes = 'am' | 'pm'
export type HourTypeMap = {
[hourType in PossibleHourTypes]: PossibleHourTypes
Expand Down

0 comments on commit 7b80b97

Please sign in to comment.