Skip to content

Chore: Migrate ThemeView to Typescript #3522

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
diegolmello merged 3 commits into from
Dec 2, 2021
Merged

Chore: Migrate ThemeView to Typescript #3522

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
dc2245f
Chore: Migrate ThemeView to Typescript
reinaldonetof Nov 24, 2021
0676ecd
refactor: minor tweak
AlexAlexandre Nov 29, 2021
8f80755
Merge branch 'develop' into chore.ts-themeview
diegolmello Dec 2, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
39 changes: 25 additions & 14 deletions app/views/ThemeView.js → app/views/ThemeView.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import React from 'react';
import PropTypes from 'prop-types';
import { StackNavigationOptions } from '@react-navigation/stack';

import I18n from '../i18n';
import { withTheme } from '../theme';
Expand Down Expand Up @@ -51,18 +51,29 @@ if (supportSystemTheme()) {
const themeGroup = THEMES.filter(item => item.group === THEME_GROUP);
const darkGroup = THEMES.filter(item => item.group === DARK_GROUP);

class ThemeView extends React.Component {
static navigationOptions = () => ({
interface ITheme {
label: string;
value: string;
group: string;
}

interface IThemePreference {
currentTheme?: string;
darkLevel?: string;
}

interface IThemeViewProps {
theme: string;
themePreferences: IThemePreference;
setTheme(newTheme?: IThemePreference): void;
}

class ThemeView extends React.Component<IThemeViewProps> {
static navigationOptions = (): StackNavigationOptions => ({
title: I18n.t('Theme')
});

static propTypes = {
theme: PropTypes.string,
themePreferences: PropTypes.object,
setTheme: PropTypes.func
};

isSelected = item => {
isSelected = (item: ITheme) => {
const { themePreferences } = this.props;
const { group } = item;
const { darkLevel, currentTheme } = themePreferences;
Expand All @@ -74,11 +85,11 @@ class ThemeView extends React.Component {
}
};

onClick = item => {
onClick = (item: ITheme) => {
const { themePreferences } = this.props;
const { darkLevel, currentTheme } = themePreferences;
const { value, group } = item;
let changes = {};
let changes: IThemePreference = {};
if (group === THEME_GROUP && currentTheme !== value) {
logEvent(events.THEME_SET_THEME_GROUP, { theme_group: value });
changes = { currentTheme: value };
Expand All @@ -90,7 +101,7 @@ class ThemeView extends React.Component {
this.setTheme(changes);
};

setTheme = async theme => {
setTheme = async (theme: IThemePreference) => {
const { setTheme, themePreferences } = this.props;
const newTheme = { ...themePreferences, ...theme };
setTheme(newTheme);
Expand All @@ -102,7 +113,7 @@ class ThemeView extends React.Component {
return <List.Icon name='check' color={themes[theme].tintColor} />;
};

renderItem = ({ item }) => {
renderItem = ({ item }: { item: ITheme }) => {
const { label, value } = item;
return (
<>
Expand Down