added common function for starring and unstarring

Author: aayushis12

src/gists/gists.actiontype.js

@@ -4,7 +4,7 @@ export const fetchGistComments = createSagaActionSet('FETCH_GIST_COMMENTS');
 export const userGistsFetch = createSagaActionSet('FETCH_USER_GISTS');
 export const starredGistsFetch = createSagaActionSet('FETCH_USER_STARRED_GISTS');
 export const publicGistsFetch = createSagaActionSet('FETCH_PUBLIC_GISTS');
-export const starGist = createSagaActionSet('STAR_GIST');
+export const toggleFavoriteGist = createSagaActionSet('TOGGLE_FAVORITE_GIST');
 export const fetchInitialFavoriteValue = createSagaActionSet('INITIAL_FAVORITE_VALUE');
 export const UnstarGist = createSagaActionSet('UNSTAR_GIST');
 export const deleteComment = createSagaActionSet('DELETE_COMMENT');

src/gists/gists.reducer.js

@@ -46,14 +46,12 @@ const clearCache = () => ({
 
 const setGistComments = (state, { payload }) => {
 	const { data, error } = payload;
-	//	const initialComments = payload.data.slice(key - 6, key);
 
 	return {
 		...state,
 		inProgress: false,
 		error,
-		comments: data, // initialComments,
-	//	hasMoreComments: key !== data.length,
+		comments: data,
 	};
 };
 

src/gists/gists.saga.js

@@ -5,9 +5,8 @@ import {
 	starredGistsFetch,
 	publicGistsFetch,
 	fetchGistComments,
-	starGist,
+	toggleFavoriteGist,
 	fetchInitialFavoriteValue,
-	UnstarGist,
 	deleteComment,
 	addComment,
 } from './gists.actiontype';
@@ -91,12 +90,11 @@ function* fetchCommentsForGist(action) {
 	}
 }
 
-function* starAGist(action) {
+function* toggleGist(action) {
 	try {
 		const token = yield select(tokenSelector);
-
-		yield put(starGist.progress());
-		const status = yield call(requestStarGist, token, action.payload);
+		const requestUrl = (action.payload.type === 'star') ? requestStarGist : requestUnstarGist;
+		const status = yield call(requestUrl, token, action.payload.id);
 
 		if (status === 204) {
 			yield call(fetchStarredGists, { shouldRefresh: true });
@@ -110,27 +108,14 @@ function* getInitialFavoriteValue(action) {
 	try {
 		const token = yield select(tokenSelector);
 
+		yield put(fetchInitialFavoriteValue.progress());
 		yield call(checkStarredGistFavoriteValue, token, action.payload);
 		yield put(fetchInitialFavoriteValue.success({ value: true }));
 	} catch (err) {
 		yield put(fetchInitialFavoriteValue.success({ value: false }));
 	}
 }
 
-function* unstarAGist(action) {
-	try {
-		const token = yield select(tokenSelector);
-
-		const status = yield call(requestUnstarGist, token, action.payload);
-
-		if (status === 204) {
-			yield call(fetchStarredGists, { shouldRefresh: true });
-		}
-	} catch (err) {
-		console.log(err);
-	}
-}
-
 function* deleteAComment(action) {
 	try {
 		const token = yield select(tokenSelector);
@@ -172,9 +157,8 @@ export default function* gistsSaga() {
 		takeLatest(starredGistsFetch.actionType, fetchStarredGists),
 		takeLatest(publicGistsFetch.actionType, fetchPublicGists),
 		takeLatest(fetchGistComments.actionType, fetchCommentsForGist),
-		takeLatest(starGist.actionType, starAGist),
+		takeLatest(toggleFavoriteGist.actionType, toggleGist),
 		takeLatest(fetchInitialFavoriteValue.actionType, getInitialFavoriteValue),
-		takeLatest(UnstarGist.actionType, unstarAGist),
 		takeLatest(deleteComment.actionType, deleteAComment),
 		takeLatest(addComment.actionType, addAComment),
 	]);

src/gists/screens/gistComments.screen.js

@@ -15,7 +15,6 @@ import CardView from 'react-native-cardview';
 import TimeAgo from 'time-ago';
 import { fetchGistComments, deleteComment, addComment } from '../gists.actiontype';
 import ListEmptyComponent from './components/EmptyListComponent';
-// import { addComments } from '../../api';
 import { colors } from '../../config';
 import GistOptions from '../gistoptions.screen';
 

src/gists/screens/gistdetails.screen.js

@@ -9,7 +9,7 @@ import Header from './components/GistDetailHeader';
 import Toolbar from './components/Toolbar';
 import { processFiles } from '../../shared/processFiles';
 import GistFileItem from './components/GistFileItem';
-import { starGist, fetchInitialFavoriteValue, UnstarGist } from '../gists.actiontype';
+import { toggleFavoriteGist, fetchInitialFavoriteValue } from '../gists.actiontype';
 
 const HeaderProps = [
 	'avatal_url',
@@ -48,18 +48,13 @@ class GistDetails extends React.Component {
 
 	handleActionButtonClick = () => {
 		const { id } = this.props.navigation.getParam('gistData');
+		const action = (this.state.iconName === 'star') ?
+			{ type: 'unstar', iconName: 'star-o' } : { type: 'star', iconName: 'star' };
 
-		if (this.state.iconName === 'star') {
-			this.props.UnstarThisGist(id);
-			this.setState({
-				iconName: 'star-o',
-			});
-		} else {
-			this.props.starThisGist(id);
-			this.setState({
-				iconName: 'star',
-			});
-		}
+		this.props.toggleGist({ id, type: action.type });
+		this.setState({
+			iconName: action.iconName,
+		});
 	}
 
 	renderItem = ({ item }) => (
@@ -120,9 +115,8 @@ class GistDetails extends React.Component {
 }
 
 const mapDispatchToProps = dispatch => ({
-	starThisGist: id => dispatch(starGist.action(id)),
+	toggleGist: data => dispatch(toggleFavoriteGist.action(data)),
 	checkIfGistIsStarred: id => dispatch(fetchInitialFavoriteValue.action(id)),
-	UnstarThisGist: id => dispatch(UnstarGist.action(id)),
 });
 
 const mapStateToProps = ({ initialFavoriteValue }) =>

src/routes.js

@@ -73,13 +73,8 @@ const GistFileContentAndCommentsScreen = TabNavigator({
 		style: styles.tabStyle,
 		labelStyle: styles.labelStyle,
 	},
-
 });
 
-// GistFileContentAndCommentsScreen.navigationOptions = {
-// 	header: GistDetailsScreen,
-// };
-
 const MainScreen = StackNavigator({
 	MainTabs: {
 		screen: MainTabsScreen,