Skip to content

Commit

Permalink
Merge branch 'main' into #45-tabbar
Browse files Browse the repository at this point in the history
  • Loading branch information
mirrenil authored Dec 23, 2022
2 parents ee8320c + b5f3341 commit e87ff41
Show file tree
Hide file tree
Showing 7 changed files with 377 additions and 16 deletions.
19 changes: 19 additions & 0 deletions components/Rating.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
import React from 'react';
import { View, StyleSheet } from 'react-native';
import { Rating } from 'react-native-rating-element';

export const RatingDots = () => {

return (
<Rating
rated={1}
totalCount={5}
ratingColor="#FFFD54"
ratingBackgroundColor="rgba(51,51,51,0.7)"
size={24}
readonly // by default is false
icon="ios-star"
direction="row" // anyOf["row" (default), "row-reverse", "column", "column-reverse"]
/>
);
};
21 changes: 10 additions & 11 deletions navigation/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
* https://reactnavigation.org/docs/getting-started
*
*/
import { FontAwesome } from "@expo/vector-icons";
import { AntDesign, FontAwesome, Ionicons } from "@expo/vector-icons";
import { createBottomTabNavigator } from "@react-navigation/bottom-tabs";
import {
NavigationContainer,
Expand All @@ -24,15 +24,17 @@ import NotificationsScreen from "../screens/NotificationsScreen";
import SigninScreen from "../screens/SigninScreen";
import SignupScreen from "../screens/SignupScreen";
import ProfileScreen from "../screens/ProfileScreen";
import ForgotPassword from "../screens/ForgotPassword";

import {
RootStackParamList,
RootTabParamList,
RootTabScreenProps,
} from "../types";

import LinkingConfiguration from "./LinkingConfiguration";
import { Ionicons, AntDesign } from "@expo/vector-icons";
import ForgotPassword from "../screens/ForgotPassword";


export default function Navigation({
colorScheme,
Expand Down Expand Up @@ -94,6 +96,7 @@ function BottomTabNavigator() {
<BottomTab.Navigator
initialRouteName="Home"
screenOptions={{
headerStyle: { backgroundColor: "#1B1324", height: 100 },
tabBarActiveTintColor: "white",
tabBarInactiveTintColor: "gray",
tabBarStyle: { backgroundColor: "#1B1324", height: 100, padding: 15 },
Expand Down Expand Up @@ -159,12 +162,8 @@ function BottomTabNavigator() {
);
}

/**
* You can explore the built-in icon families and icons on the web at https://icons.expo.fyi/
*/
function TabBarIcon(props: {
name: React.ComponentProps<typeof FontAwesome>["name"];
color: string;
}) {
return <FontAwesome size={30} style={{ marginBottom: -3 }} {...props} />;
}
// function TabBarIcon(props: {
// name: React.ComponentProps<typeof FontAwesome>["name"];
// color: string;
// }) {
// return <FontAwesome size={30} style={{ marginBottom: -3 }} {...props} />;
Loading

0 comments on commit e87ff41

Please sign in to comment.