diff --git a/apps/mobile/src/components/ActionSheetComponent/ActionSheetTagsSection.js b/apps/mobile/src/components/ActionSheetComponent/ActionSheetTagsSection.js index 9def51453..ce2782f51 100644 --- a/apps/mobile/src/components/ActionSheetComponent/ActionSheetTagsSection.js +++ b/apps/mobile/src/components/ActionSheetComponent/ActionSheetTagsSection.js @@ -255,10 +255,6 @@ export const ActionSheetTagsSection = ({item, close}) => { ref={tagsInputRef} placeholderTextColor={colors.icon} onFocus={() => { - if (!premiumUser) { - close('premium'); - return; - } setFocused(true); }} selectionColor={colors.accent} diff --git a/apps/mobile/src/components/ActionSheetComponent/index.js b/apps/mobile/src/components/ActionSheetComponent/index.js index e2a13c248..44482157c 100644 --- a/apps/mobile/src/components/ActionSheetComponent/index.js +++ b/apps/mobile/src/components/ActionSheetComponent/index.js @@ -1,23 +1,21 @@ -import React, { useEffect, useState } from 'react'; +import React, {useEffect, useState} from 'react'; import { ActivityIndicator, Clipboard, Dimensions, - - TouchableOpacity, - View + View, } from 'react-native'; import Share from 'react-native-share'; import Icon from 'react-native-vector-icons/MaterialCommunityIcons'; -import { useTracked } from '../../provider'; -import { Actions } from '../../provider/Actions'; -import { DDS } from '../../services/DeviceDetection'; +import {useTracked} from '../../provider'; +import {Actions} from '../../provider/Actions'; +import {DDS} from '../../services/DeviceDetection'; import { eSendEvent, openVault, sendNoteEditedEvent, - ToastEvent + ToastEvent, } from '../../services/EventManager'; import PremiumService from '../../services/PremiumService'; import { @@ -25,25 +23,25 @@ import { COLOR_SCHEME, COLOR_SCHEME_DARK, COLOR_SCHEME_LIGHT, - setColorScheme + setColorScheme, } from '../../utils/Colors'; -import { db } from '../../utils/DB'; +import {db} from '../../utils/DB'; import { eOpenLoginDialog, eOpenMoveNoteDialog, - eShowGetPremium + eShowGetPremium, } from '../../utils/Events'; -import { deleteItems } from '../../utils/functions'; -import { MMKV } from '../../utils/mmkv'; -import { opacity, ph, pv, SIZE } from '../../utils/SizeUtils'; -import { timeConverter } from '../../utils/TimeUtils'; -import { PremiumTag } from '../Premium/PremiumTag'; -import { PressableButton } from '../PressableButton'; -import { Toast } from '../Toast'; +import {deleteItems} from '../../utils/functions'; +import {MMKV} from '../../utils/mmkv'; +import {opacity, ph, pv, SIZE} from '../../utils/SizeUtils'; +import {timeConverter} from '../../utils/TimeUtils'; +import {PremiumTag} from '../Premium/PremiumTag'; +import {PressableButton} from '../PressableButton'; +import {Toast} from '../Toast'; import Heading from '../Typography/Heading'; import Paragraph from '../Typography/Paragraph'; -import { ActionSheetColorsSection } from './ActionSheetColorsSection'; -import { ActionSheetTagsSection } from './ActionSheetTagsSection'; +import {ActionSheetColorsSection} from './ActionSheetColorsSection'; +import {ActionSheetTagsSection} from './ActionSheetTagsSection'; const w = Dimensions.get('window').width; export const ActionSheetComponent = ({ @@ -326,20 +324,20 @@ export const ActionSheetComponent = ({ if (isPinnedToMenu) { await db.settings.unpin(note.id); } else { - if (item.type === 'notebook') { - await db.settings.pin(note.type, {id: note.id}); - } else if (item.type === 'topic') { + if (item.type === 'topic') { await db.settings.pin(note.type, { id: note.notebookId, topic: note.id, }); + } else { + await db.settings.pin(note.type, {id: note.id}); } } - + setIsPinnedToMenu( db.settings.pins.findIndex((i) => i.id === item.id) > -1, ); - dispatch({type:Actions.MENU_PINS}) + dispatch({type: Actions.MENU_PINS}); } catch (e) {} }, close: false, diff --git a/apps/mobile/src/components/Menu/TagsSection.js b/apps/mobile/src/components/Menu/TagsSection.js index cea49d838..dfbc95aa1 100644 --- a/apps/mobile/src/components/Menu/TagsSection.js +++ b/apps/mobile/src/components/Menu/TagsSection.js @@ -150,7 +150,10 @@ const PinItem = ({item, index, onPress}) => { ) : item.type === 'tag' ? ( ) : ( - + T )} diff --git a/apps/mobile/src/components/TagItem/index.js b/apps/mobile/src/components/TagItem/index.js index 63161dd4a..eac61f90b 100644 --- a/apps/mobile/src/components/TagItem/index.js +++ b/apps/mobile/src/components/TagItem/index.js @@ -1,9 +1,11 @@ import React from 'react'; -import {Text} from 'react-native'; +import {Text, View} from 'react-native'; import {PressableButton} from '../../components/PressableButton'; import {useTracked} from '../../provider'; import NavigationService from '../../services/Navigation'; import {SIZE, WEIGHT} from '../../utils/SizeUtils'; +import {ActionIcon} from '../ActionIcon'; +import { ActionSheetEvent } from '../DialogManager/recievers'; import Heading from '../Typography/Heading'; import Paragraph from '../Typography/Paragraph'; @@ -25,32 +27,55 @@ const TagItem = ({item, index}) => { customStyle={{ paddingHorizontal: 12, height: 80, - justifyContent: 'center', - alignItems: 'flex-start', + flexDirection: 'row', + alignItems: 'center', borderBottomWidth: 1.5, borderBottomColor: colors.nav, + width:"100%", + justifyContent:"space-between" }}> - - - # + + + + # + + {item.title} - {item.title} - - - {item && item.noteIds.length && item.noteIds.length > 1 - ? item.noteIds.length + ' notes' - : item.noteIds.length === 1 - ? item.noteIds.length + ' note' - : null} - + + {item && item.noteIds.length && item.noteIds.length > 1 + ? item.noteIds.length + ' notes' + : item.noteIds.length === 1 + ? item.noteIds.length + ' note' + : null} + + + + { + let rowItems = []; + let columnItems = ['Pin to Menu', 'Unpin from Menu']; + ActionSheetEvent(item, false, false, rowItems, columnItems); + }} + customStyle={{ + justifyContent: 'center', + height: 35, + width: 35, + borderRadius: 100, + alignItems: 'center', + }} + /> ); };