Skip to content
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.

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

implemented touch feedback with ripple for views with a border radius #4

Merged
merged 1 commit into from
Jan 7, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
53 changes: 27 additions & 26 deletions src/components/Deck.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { makeStyles, Text } from '@rneui/themed';
import { TouchableHighlight, View } from 'react-native';
import { TouchableNativeFeedback, View } from 'react-native';
import React from 'react';
import { LinearProgress } from '@rneui/themed';
import { margins } from '../config';
Expand All @@ -20,40 +20,41 @@ const Deck = ({ name, progress, containerBgColor, pbColor, pbBackgroundColor, te
const styles = useStyles();

return (
<TouchableHighlight
onPress={onDeckPress}
underlayColor={'red'}
style={{ ...styles.container, backgroundColor: containerBgColor, marginTop: mt || 0, marginBottom: mb || 0 }}
>
<>
<Text style={{ color: textColor || styles.text.color }} head2>
{name}
</Text>
<LinearProgress
style={{ ...styles.progressBar, backgroundColor: pbBackgroundColor }}
color={pbColor}
value={progress}
variant="determinate"
/>
<View style={styles.progressStatusContainer}>
<Text body2 style={[styles.flex, { color: textColor || styles.text.color }]}>
Completion
</Text>
<Text style={{ color: textColor || styles.text.color }} body2>
{progress * 100}%
<View style={{ ...styles.container, backgroundColor: containerBgColor, marginTop: mt || 0, marginBottom: mb || 0 }}>
<TouchableNativeFeedback background={TouchableNativeFeedback.Ripple(pbBackgroundColor, false)} onPress={onDeckPress}>
<View style={styles.contentContainer}>
<Text style={{ color: textColor || styles.text.color }} head2>
{name}
</Text>
<LinearProgress
style={{ ...styles.progressBar, backgroundColor: pbBackgroundColor }}
color={pbColor}
value={progress}
variant="determinate"
/>
<View style={styles.progressStatusContainer}>
<Text body2 style={[styles.flex, { color: textColor || styles.text.color }]}>
Completion
</Text>
<Text style={{ color: textColor || styles.text.color }} body2>
{progress * 100}%
</Text>
</View>
</View>
</>
</TouchableHighlight>
</TouchableNativeFeedback>
</View>
);
};

const useStyles = makeStyles((theme) => ({
container: {
paddingHorizontal: 25,
paddingVertical: 20,
borderRadius: 15,
marginHorizontal: margins.window_hor,
overflow: 'hidden',
},
contentContainer: {
paddingHorizontal: 25,
paddingVertical: 20,
},
text: {
color: theme.colors.white,
Expand Down
30 changes: 0 additions & 30 deletions src/components/Touchable.tsx

This file was deleted.

5 changes: 4 additions & 1 deletion src/navigation/AppNavigator.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,10 @@ const RootStack = createNativeStackNavigator<NavParamList>();
export default function AppNavigator() {
const styles = useStyles();
return (
<RootStack.Navigator initialRouteName={NavRoutes.App} screenOptions={{ headerShown: false, animation: 'slide_from_right' }}>
<RootStack.Navigator
initialRouteName={NavRoutes.App}
screenOptions={{ animationDuration: 10, headerShown: false, presentation: 'transparentModal', animation: 'slide_from_right' }}
>
<RootStack.Screen name={NavRoutes.App} component={BottomNavigator} />
<RootStack.Screen name={NavRoutes.Sets} component={SetsScreen} options={styles} />
</RootStack.Navigator>
Expand Down
33 changes: 31 additions & 2 deletions src/views/SetsScreen.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import React from 'react';
import { View } from 'react-native';
import { TouchableNativeFeedback, View } from 'react-native';
import { makeStyles, Text, Button, useThemeMode, useTheme } from '@rneui/themed';
import { createBottomTabNavigator } from '@react-navigation/bottom-tabs';
import { NavProps } from '../config/routes';
Expand All @@ -18,7 +18,36 @@ export default function SetsScreen({ navigation }: NavProps) {
return (
<View>
<NavigationBar title="Sets" />
<Text head1>Sets</Text>
<View
style={{
overflow: 'hidden',
borderRadius: 10,
marginHorizontal: 30
}}
>
<TouchableNativeFeedback background={TouchableNativeFeedback.Ripple('#7C82FF', false)} onPress={() => console.log('hekk')}>
<View
style={{
paddingHorizontal: 50,
paddingVertical: 50,
}}
>
<Text>Click me</Text>
</View>
</TouchableNativeFeedback>
</View>
<Button
iconPosition="left"
buttonStyle={{
flexDirection: 'row',
justifyContent: 'flex-start',
alignItems: 'center',
padding: 0,
paddingHorizontal: 0,
}}
>
<Text>hello</Text>
</Button>
</View>
);
}
Expand Down
9 changes: 4 additions & 5 deletions src/views/SettingsScreen.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,10 @@ import { makeStyles, Text, ThemeMode, useTheme, useThemeMode } from '@rneui/them
import { Divider } from '@rneui/themed';
import { Switch } from '@rneui/themed';
import React, { useState } from 'react';
import { View } from 'react-native';
import { ColorValue, TouchableNativeFeedback, View } from 'react-native';
import Icon from 'react-native-vector-icons/MaterialIcons';

import ChangeLanguageDialog from '../components/ChangeLanguageDialog';
import TitleBar from '../components/TitleBar';
import Touchable from '../components/Touchable';
import { iconSize, margins } from '../config';
import { NavProps } from '../config/routes';
import { getAppState } from '../database';
Expand All @@ -23,9 +21,10 @@ type MenuProps = {

const Menu = ({ Icon1, title, subtitle, Icon2, onPress }: MenuProps) => {
const styles = useStyles();
const { theme } = useTheme();

return (
<Touchable onPress={onPress}>
<TouchableNativeFeedback background={TouchableNativeFeedback.Ripple(theme.colors.touchable as ColorValue, false)} onPress={onPress}>
<View style={styles.menuContainer}>
{Icon1}
<Text body1_bold style={styles.menuTitle}>
Expand All @@ -36,7 +35,7 @@ const Menu = ({ Icon1, title, subtitle, Icon2, onPress }: MenuProps) => {
</Text>
{Icon2}
</View>
</Touchable>
</TouchableNativeFeedback>
);
};

Expand Down