Skip to content

Commit

Permalink
release v3.2.2
Browse files Browse the repository at this point in the history
  • Loading branch information
michaeldaineka committed Oct 20, 2020
1 parent ed79eb8 commit 1c9a23f
Show file tree
Hide file tree
Showing 13 changed files with 460 additions and 378 deletions.
Binary file added assets/images/drawer/blog.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 added assets/images/pages/blog.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 added assets/images/pages/login.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
11 changes: 11 additions & 0 deletions changelog.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,16 @@
# Changelog

## [3.2.2]

### Features
- Add blog link to the drawer.
- Add Blog/Login images to Pages.

### Fixed
- Fixed indents of Components page.
- Fixed bottom nav bar on IOS devices.
- Fixed touchable spacing of top nav Arrow/Burger button.

## [3.2.1]

Update some libs
Expand Down
2 changes: 0 additions & 2 deletions src/modules/calendar/CalendarState.js
Original file line number Diff line number Diff line change
Expand Up @@ -40,8 +40,6 @@ export function loadItems(day) {
newItems[key] = items[key];
});

console.log(newItems);

dispatch(itemsLoaded(newItems));
};
}
Expand Down
30 changes: 17 additions & 13 deletions src/modules/components/ComponentsView.js
Original file line number Diff line number Diff line change
@@ -1,12 +1,14 @@
import React from 'react';
import { StyleSheet, View, Text, ScrollView } from 'react-native';
import { useRoute } from '@react-navigation/native';

import Icon from 'react-native-vector-icons/Entypo';
import { colors, fonts } from '../../styles';

import { Button, RadioGroup, Dropdown } from '../../components';

export default function ComponentsScreen(props) {
const route = useRoute();
return (
<ScrollView
style={styles.container}
Expand Down Expand Up @@ -48,55 +50,55 @@ export default function ComponentsScreen(props) {

<View style={styles.demoButtonsContainer}>
<Button
style={styles.demoButton}
style={[styles.demoButton, {flexBasis: '47%'}]}
primary
caption="Button"
onPress={() => {}}
/>
<Button
style={styles.demoButton}
style={[styles.demoButton, {flexBasis: '47%'}]}
secondary
caption="Button"
onPress={() => {}}
/>
<Button
style={styles.demoButton}
style={[styles.demoButton, {flexBasis: '47%'}]}
primary
rounded
caption="Button"
onPress={() => {}}
/>
<Button
style={styles.demoButton}
style={[styles.demoButton, {flexBasis: '47%'}]}
secondary
rounded
caption="Button"
onPress={() => {}}
/>
<Button
style={styles.demoButton}
style={[styles.demoButton, {flexBasis: '47%'}]}
primary
bordered
caption="Button"
onPress={() => {}}
/>
<Button
style={styles.demoButton}
style={[styles.demoButton, {flexBasis: '47%'}]}
secondary
bordered
caption="Button"
onPress={() => {}}
/>
<Button
style={styles.demoButton}
style={[styles.demoButton, {flexBasis: '47%'}]}
primary
bordered
rounded
caption="Button"
onPress={() => {}}
/>
<Button
style={styles.demoButton}
style={[styles.demoButton, {flexBasis: '47%'}]}
secondary
bordered
rounded
Expand Down Expand Up @@ -325,7 +327,7 @@ export default function ComponentsScreen(props) {
</View>

<Button
style={[styles.demoButton, { width: 200, alignSelf: 'center' }]}
style={[styles.demoButton, { flex: 1 }]}
primary
bordered
caption="More Icons"
Expand All @@ -336,7 +338,7 @@ export default function ComponentsScreen(props) {
<Text style={styles.componentSectionHeader}>Dropdown</Text>

<Dropdown
style={{ width: 200, alignSelf: 'center' }}
style={{ width: '100%', alignSelf: 'center' }}
onSelect={() => {}}
items={['option 1', 'option 2']}
/>
Expand All @@ -354,14 +356,15 @@ const styles = StyleSheet.create({
},
componentsSection: {
backgroundColor: colors.white,
padding: 15,
paddingHorizontal: 16,
paddingVertical: 24,
marginBottom: 20,
borderRadius: 5,
},
componentSectionHeader: {
fontFamily: fonts.primaryRegular,
color: '#686868',
fontSize: 20,
fontSize: 24,
marginBottom: 20,
},
demoButtonsContainer: {
Expand All @@ -376,7 +379,8 @@ const styles = StyleSheet.create({
flexWrap: 'wrap',
flex: 1,
alignItems: 'center',
justifyContent: 'space-around',
justifyContent: 'space-between',
paddingHorizontal: 3,
marginBottom: 20,
},
demoButton: {
Expand Down
2 changes: 1 addition & 1 deletion src/modules/home/HomeView.js
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ export default function HomeScreen({ isExtended, setIsExtended }) {
<View style={styles.priceContainer}>
<View style={{ flexDirection: 'row' }}>
<Text white bold size={50} style={styles.price}>
{isExtended ? '$199.95' : '$49.95'}
{isExtended ? '$499' : '$99'}
</Text>
</View>
<TouchableOpacity
Expand Down
12 changes: 6 additions & 6 deletions src/modules/navigation/MainTabNavigator.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import * as React from 'react';
import { Text, View, Image, StyleSheet } from 'react-native';
import { Text, View, Image, StyleSheet, Platform } from 'react-native';
import { createBottomTabNavigator } from '@react-navigation/bottom-tabs';
import { colors } from '../../styles';

Expand All @@ -9,7 +9,7 @@ const Tab = createBottomTabNavigator();

export default function BottomTabs() {
return (
<Tab.Navigator>
<Tab.Navigator tabBarOptions={{style: {height: Platform.OS === 'ios' ? 90 : 50}}}>
{tabNavigationData.map((item, idx) => (
<Tab.Screen
key={`tab_item${idx+1}`}
Expand All @@ -25,8 +25,8 @@ export default function BottomTabs() {
/>
</View>
),
tabBarLabel: ({ focused }) => <Text style={{ fontSize: 12, color: focused ? colors.primary : colors.gray }}>{item.name}</Text>
}}
tabBarLabel: ({ focused }) => <Text style={{ fontSize: 12, color: focused ? colors.primary : colors.gray }}>{item.name}</Text>,
}}
/>
))}
</Tab.Navigator>
Expand All @@ -35,12 +35,12 @@ export default function BottomTabs() {

const styles = StyleSheet.create({
tabBarItemContainer: {
flex: 1,
alignItems: 'center',
justifyContent: 'center',
borderBottomWidth: 2,
borderBottomColor: colors.white,
paddingHorizontal: 10,
bottom: Platform.OS === 'ios' ? -5 : 0,
},
tabBarIcon: {
width: 23,
Expand All @@ -49,4 +49,4 @@ const styles = StyleSheet.create({
tabBarIconFocused: {
tintColor: colors.primary,
},
});
});
19 changes: 17 additions & 2 deletions src/modules/navigation/Navigator.js
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ const iconGrids = require('../../../assets/images/drawer/grids.png');
const iconPages = require('../../../assets/images/drawer/pages.png');
const iconComponents = require('../../../assets/images/drawer/components.png');
const iconSettings = require('../../../assets/images/drawer/settings.png');
const iconBlog = require('../../../assets/images/drawer/blog.png')

const drawerData = [
{
Expand Down Expand Up @@ -63,15 +64,28 @@ function CustomDrawerContent(props) {
style={styles.menuLabelFlex}>
<Image
style={{ width: 20, height: 20}}
source={iconHome}
source={item.icon}
/>
<Text style={styles.menuTitle}>{item.name}</Text>
</View>
)}
onPress={() => props.navigation.navigate(item.name)}
/>
/>
))}
<View style={styles.divider} />
<DrawerItem
label={() => (
<View style={styles.menuLabelFlex}>
<Image
style={{ width: 20, height: 20}}
source={iconBlog}
/>
<Text style={styles.menuTitle}>Blog</Text>
</View>
)}
onPress={() => props.navigation.navigate('Blog')}
/>
<View style={styles.divider} />
<DrawerItem
label={() => (
<View style={styles.menuLabelFlex}>
Expand All @@ -89,6 +103,7 @@ function CustomDrawerContent(props) {
}

export default function App() {

return (
<Drawer.Navigator
drawerStyle={{
Expand Down
5 changes: 3 additions & 2 deletions src/modules/navigation/RootNavigation.js
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,8 @@ export default function NavigatorView(props) {
<TouchableOpacity
onPress={() => props.navigation.toggleDrawer()}
style={{
paddingLeft: 10,
paddingHorizontal: 16,
paddingVertical: 12,
}}
>
<Image
Expand Down Expand Up @@ -62,4 +63,4 @@ const styles = StyleSheet.create({
width: 100 + '%',
height: Header.height,
},
});
});
16 changes: 14 additions & 2 deletions src/modules/navigation/stackNavigationData.js
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,8 @@ const headerLeftComponent = (props) => {
<TouchableOpacity
onPress={props.onPress}
style={{
paddingLeft: 10,
paddingHorizontal: 16,
paddingVertical: 12,
}}
>
<Image
Expand Down Expand Up @@ -58,6 +59,17 @@ const StackNavigationData = [
fontSize: 18,
},
},
{
name: 'Blog',
component: AvailableInFullVersion,
headerLeft: headerLeftComponent,
headerBackground: { source: headerBackground },
headerTitleStyle: {
fontFamily: fonts.primaryRegular,
color: colors.white,
fontSize: 18,
},
},
{
name: 'Gallery',
component: GalleryScreen,
Expand Down Expand Up @@ -126,4 +138,4 @@ const StackNavigationData = [
},
]

export default StackNavigationData;
export default StackNavigationData;
35 changes: 33 additions & 2 deletions src/modules/pages/PagesView.js
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,8 @@ const calendarIcon = require('../../../assets/images/pages/calendar.png');
const chatIcon = require('../../../assets/images/pages/chat.png');
const galleryIcon = require('../../../assets/images/pages/gallery.png');
const profileIcon = require('../../../assets/images/pages/profile.png');
const loginIcon = require('../../../assets/images/pages/login.png');
const blogIcon = require('../../../assets/images/pages/blog.png');

export default function PagesScreen(props) {
return (
Expand Down Expand Up @@ -70,15 +72,33 @@ export default function PagesScreen(props) {
/>
<Text style={styles.itemText}>Calendar</Text>
</TouchableOpacity>
<TouchableOpacity onPress={() => {}} style={styles.item}>
<TouchableOpacity
onPress={() => props.navigation.navigate('Auth')}
style={styles.item}
>
<Image
resizeMode="contain"
source={profileIcon}
source={loginIcon}
tintColor={colors.primary}
style={styles.itemImage}
/>
<Text style={styles.itemText}>Login</Text>
</TouchableOpacity>
</View>
<View style={styles.row}>
<TouchableOpacity
onPress={() => props.navigation.navigate('Blog')}
style={styles.blogItem}
>
<Image
resizeMode="contain"
source={blogIcon}
tintColor={colors.primary}
style={styles.itemImage}
/>
<Text style={styles.itemText}>Blog</Text>
</TouchableOpacity>
</View>
</View>
);
}
Expand All @@ -105,6 +125,17 @@ const styles = StyleSheet.create({
justifyContent: 'space-around',
marginHorizontal: 5,
},
blogItem: {
width: '31%',
height: 120,
paddingVertical: 20,
borderColor: colors.primaryLight,
borderWidth: 1,
borderRadius: 5,
alignItems: 'center',
justifyContent: 'space-around',
marginHorizontal: 5,
},
itemText: {
color: colors.primary,
fontFamily: fonts.primary,
Expand Down
Loading

0 comments on commit 1c9a23f

Please sign in to comment.