Skip to content

Commit

Permalink
Switched color scheme and logo to match new LedFx version
Browse files Browse the repository at this point in the history
  • Loading branch information
ShiromMakkad committed Mar 23, 2021
1 parent c7f57b9 commit 4fef83f
Show file tree
Hide file tree
Showing 14 changed files with 2,702 additions and 1,831 deletions.
2 changes: 1 addition & 1 deletion App.js
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ import Add from './App/Add'

global.theme = {
colors: {
primary: '#18BFD9',
primary: '#009688',
secondary: '#333333',
success: '#3CB479',
error: '#F44336',
Expand Down
14 changes: 8 additions & 6 deletions App/Devices.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import { SafeAreaView } from 'react-native-safe-area-context'
import produce from 'immer'
import { useBottomTabBarHeight } from '@react-navigation/bottom-tabs'
import { MaterialCommunityIcons } from '@expo/vector-icons';
import { ListItem } from 'react-native-elements'
import { ListItem, Icon } from 'react-native-elements'
import hexToRgba from 'hex-to-rgba';
import { useIsFocused, useNavigation } from '@react-navigation/native'
import { Platform } from 'react-native'
Expand Down Expand Up @@ -46,16 +46,18 @@ export default function Devices({ devices, setDevices, selectedDevice, setSelect
}

const renderItem = ({ item: device, index: i }) => (
// If anyone can fix the lag on this, please do. I've spent hours on it.
<TouchableWithoutFeedback onPress={() => setSelectedDevice(i)}>
<ListItem
title={device.name}
subtitle={device.ip}
rightIcon={isDeleting ? { name: 'trash-can', type: 'material-community', color: global.theme.colors.error, size: 33, onPress: () => deleteDevice(i) } : undefined}
bottomDivider
containerStyle={{ backgroundColor: selectedDevice == i ? hexToRgba(global.theme.colors.success, 0.25) : global.theme.colors.background }}
underlayColor={hexToRgba(global.theme.colors.success, 0.25)}
/>
>
<ListItem.Content underlayColor={hexToRgba(global.theme.colors.success, 0.25)}>
<ListItem.Title>{device.name}</ListItem.Title>
<ListItem.Subtitle>{device.ip}</ListItem.Subtitle>
</ListItem.Content>
{isDeleting ? <Icon name='trash-can' type='material-community' color={global.theme.colors.error} size={33} onPress={() => deleteDevice(i)} /> : undefined}
</ListItem>
</TouchableWithoutFeedback>
);

Expand Down
13 changes: 7 additions & 6 deletions app.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"expo": {
"name": "LedFx",
"slug": "LedFx",
"version": "1.0.0",
"version": "1.1.0",
"orientation": "portrait",
"icon": "./assets/icon.png",
"primaryColor": "#333333",
Expand All @@ -21,19 +21,20 @@
],
"ios": {
"supportsTablet": true,
"buildNumber": "1.0.0",
"buildNumber": "1.1.0",
"bundleIdentifier": "com.shirom.ledfx"
},
"android": {
"adaptiveIcon": {
"foregroundImage": "./assets/white-icon.png",
"foregroundImage": "./assets/android-icon-foreground.png",
"backgroundColor": "#333333"
},
"versionCode": 1,
"versionCode": 3,
"package": "com.shirom.ledfx"
},
"web": {
"favicon": "./assets/favicon.png"
"androidNavigationBar": {
"barStyle": "light-content",
"backgroundColor": "#333333"
}
}
}
Binary file added assets/android-icon-foreground.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file removed assets/black-icon.png
Binary file not shown.
Binary file removed assets/favicon.png
Binary file not shown.
Binary file added assets/gplay-feature-graphic.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified assets/icon.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file removed assets/qr-code.png
Binary file not shown.
Loading

0 comments on commit 4fef83f

Please sign in to comment.