Skip to content

Commit

Permalink
Design refresh with new navigator and colors (#418)
Browse files Browse the repository at this point in the history
* Refactor design with navigator and colors

* remove childList test data

* Update React Navigation and related packages

* Add `initials` to peopleHelpers

* remove unused tests

* change initials to first 2 letters of name

* update color scheme

* add mock for react-native-reanimated

* fix absence translation

* update design à la modern/rounded

* Add headerLargeTitle everywhere
  • Loading branch information
edenstrom committed Aug 13, 2021
1 parent 49328b4 commit 25f4ebc
Show file tree
Hide file tree
Showing 40 changed files with 1,382 additions and 1,209 deletions.
30 changes: 13 additions & 17 deletions packages/app/App.js
Original file line number Diff line number Diff line change
@@ -1,22 +1,21 @@
import React from 'react'
import { SafeAreaProvider } from 'react-native-safe-area-context'
import { ApplicationProvider, IconRegistry } from '@ui-kitten/components'
import { EvaIconsPack } from '@ui-kitten/eva-icons'
import * as eva from '@eva-design/eva'
import darkTheme from './design/dark.json'
import lightTheme from './design/light.json'
import { AppNavigator } from './components/navigation.component'
import init from '@skolplattformen/embedded-api'
import { ApiProvider } from '@skolplattformen/api-hooks'
import CookieManager from '@react-native-community/cookies'
import AsyncStorage from '@react-native-async-storage/async-storage'
import CookieManager from '@react-native-community/cookies'
import { ApiProvider } from '@skolplattformen/api-hooks'
import init from '@skolplattformen/embedded-api'
import { ApplicationProvider, IconRegistry } from '@ui-kitten/components'
import { EvaIconsPack } from '@ui-kitten/eva-icons'
import React from 'react'
import { StatusBar } from 'react-native'
import { useBackgroundBlur } from './utils/blur'
import { AppearanceProvider, useColorScheme } from 'react-native-appearance'
import { SafeAreaProvider } from 'react-native-safe-area-context'
import { AppNavigator } from './components/navigation.component'
import { LanguageProvider } from './context/language/languageContext'
import { default as customMapping } from './design/mapping.json'
import { darkTheme, lightTheme } from './design/themes'
import { useBackgroundBlur } from './utils/blur'
import { translations } from './utils/translation'
import { AppearanceProvider, useColorScheme } from 'react-native-appearance'
const api = init(fetch, CookieManager)
import { default as customMapping } from './design/mapping.json';

const reporter = __DEV__
? {
Expand Down Expand Up @@ -45,10 +44,7 @@ export default () => {
<ApplicationProvider
{...eva}
customMapping={customMapping}
theme={{
...(colorScheme === 'dark' ? eva.dark : eva.light),
...(colorScheme === 'dark' ? darkTheme : lightTheme),
}}
theme={colorScheme === 'dark' ? darkTheme : lightTheme}
>
<LanguageProvider cache={true} data={translations}>
<AppNavigator />
Expand Down
6 changes: 0 additions & 6 deletions packages/app/components/__tests__/Absence.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -37,12 +37,6 @@ beforeEach(() => {
AsyncStorage.clear()
})

test('renders title', () => {
const screen = setup()

expect(screen.getByText('Anmäl frånvaro')).toBeTruthy()
})

test('can fill out the form with full day absence', async () => {
const screen = setup()

Expand Down
11 changes: 1 addition & 10 deletions packages/app/components/__tests__/NewsItem.test.js
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
import { useApi, useNewsDetails } from '@skolplattformen/api-hooks'
import React from 'react'
import { render } from '../../utils/testHelpers'
import { NewsItem } from '../newsItem.component'
import { fireEvent } from '@testing-library/react-native'
import { useNewsDetails, useApi } from '@skolplattformen/api-hooks'

jest.mock('@skolplattformen/api-hooks')

Expand Down Expand Up @@ -89,11 +88,3 @@ test('renders an article without modified date if date is invalid', () => {
expect(screen.getByText('Publicerad: 15 feb 2021 10:13')).toBeTruthy()
expect(screen.queryByText('Uppdaterad: Invalid DateTime')).toBeFalsy()
})

test('handles navigating back to child view', () => {
const screen = setup()

fireEvent.press(screen.getByTestId('topNavBackToChild'))

expect(navigation.goBack).toHaveBeenCalled()
})
Loading

0 comments on commit 25f4ebc

Please sign in to comment.