fix actionsheet indicator color

This commit is contained in:
ammarahm-ed
2020-12-07 11:16:41 +05:00
parent 44dae5fa6d
commit 373491a679
5 changed files with 42 additions and 20 deletions

View File

@@ -1,11 +1,13 @@
import React, {Component} from 'react';
import {Dimensions, Platform} from 'react-native';
import React, { Component } from 'react';
import { Platform } from 'react-native';
import { DDS } from '../../services/DeviceDetection';
import {
eSendEvent,
eSubscribeEvent,
eUnSubscribeEvent,
openVault,
openVault
} from '../../services/EventManager';
import { hexToRGBA } from '../../utils/ColorUtils';
import {
eCloseActionSheet,
eCloseAddNotebookDialog,
@@ -22,14 +24,16 @@ import {
eOpenLoginDialog,
eOpenMoveNoteDialog,
eOpenPremiumDialog,
eOpenSimpleDialog,
eOpenSimpleDialog
} from '../../utils/Events';
import ActionSheet from '../ActionSheet';
import {ActionSheetComponent} from '../ActionSheetComponent';
import {AddNotebookDialog} from '../AddNotebookDialog';
import {AddTopicDialog} from '../AddTopicDialog';
import {Dialog} from '../Dialog';
import { ActionSheetComponent } from '../ActionSheetComponent';
import { GetPremium, translatePrem } from '../ActionSheetComponent/GetPremium';
import { AddNotebookDialog } from '../AddNotebookDialog';
import { AddTopicDialog } from '../AddTopicDialog';
import { Dialog } from '../Dialog';
import ExportDialog from '../ExportDialog';
import JumpToDialog from '../JumpToDialog';
import LoginDialog from '../LoginDialog';
import MergeEditor from '../MergeEditor';
import MoveNoteDialog from '../MoveNoteDialog';
@@ -39,16 +43,10 @@ import PremiumStatusDialog from '../Premium/PremiumStatusDialog';
import ProgressDialog from '../ProgressDialog';
import RecoveryKeyDialog from '../RecoveryKeyDialog';
import RestoreDialog from '../RestoreDialog';
import {VaultDialog} from '../VaultDialog';
import {TEMPLATE_DELETE, TEMPLATE_PERMANANT_DELETE} from './Templates';
import {hexToRGBA} from '../../utils/ColorUtils';
import {DDS} from '../../services/DeviceDetection';
import ResultDialog from '../ResultDialog';
import SortDialog from '../SortDialog';
import JumpToDialog from '../JumpToDialog';
import {GetPremium, translatePrem} from '../ActionSheetComponent/GetPremium';
import {sleep} from '../../utils/TimeUtils';
import { dHeight } from '../../utils';
import { VaultDialog } from '../VaultDialog';
import { TEMPLATE_DELETE, TEMPLATE_PERMANANT_DELETE } from './Templates';
export class DialogManager extends Component {
constructor(props) {

View File

@@ -1,8 +1,9 @@
import React, { createRef } from 'react';
import { View } from 'react-native';
import { Platform, View } from 'react-native';
import { DDS } from '../../services/DeviceDetection';
import { eSubscribeEvent, eUnSubscribeEvent } from '../../services/EventManager';
import { dWidth } from '../../utils';
import { hexToRGBA } from '../../utils/ColorUtils';
import { db } from '../../utils/DB';
import { eClosePendingDialog, eOpenPendingDialog } from '../../utils/Events';
import { SIZE } from '../../utils/SizeUtils';
@@ -56,6 +57,11 @@ class PendingDialog extends React.Component {
borderRadius: 10,
marginBottom: DDS.isTab ? 50 : 0,
}}
indicatorColor={
Platform.ios
? hexToRGBA(colors.accent + '19')
: hexToRGBA(colors.shade)
}
extraScroll={DDS.isTab ? 50 : 0}
gestureEnabled={true}
footerAlwaysVisible={DDS.isTab}

View File

@@ -1,10 +1,11 @@
import React, {createRef} from 'react';
import {ScrollView, View} from 'react-native';
import {Platform, ScrollView, View} from 'react-native';
import * as RNIap from 'react-native-iap';
import Icon from 'react-native-vector-icons/MaterialCommunityIcons';
import {DDS} from '../../services/DeviceDetection';
import {eSendEvent, ToastEvent} from '../../services/EventManager';
import {dHeight, dWidth, itemSkus} from '../../utils';
import { hexToRGBA } from '../../utils/ColorUtils';
import {db} from '../../utils/DB';
import {eOpenLoginDialog, eOpenPendingDialog} from '../../utils/Events';
import {SIZE} from '../../utils/SizeUtils';
@@ -95,6 +96,11 @@ class PremiumDialog extends React.Component {
borderBottomRightRadius: 0,
borderBottomLeftRadius: 0,
}}
indicatorColor={
Platform.ios
? hexToRGBA(colors.accent + '19')
: hexToRGBA(colors.shade)
}
onOpen={async () => {
try {
await this.getSkus();

View File

@@ -1,5 +1,5 @@
import React, { createRef } from 'react';
import { Clipboard, View } from 'react-native';
import { Clipboard, Platform, View } from 'react-native';
import QRCode from 'react-native-qrcode-svg';
import Icon from 'react-native-vector-icons/MaterialCommunityIcons';
import RNFetchBlob from 'rn-fetch-blob';
@@ -11,6 +11,7 @@ import {
ToastEvent
} from '../../services/EventManager';
import { dWidth } from '../../utils';
import { hexToRGBA } from '../../utils/ColorUtils';
import { db } from '../../utils/DB';
import { eOpenRecoveryKeyDialog, eOpenResultDialog } from '../../utils/Events';
import { SIZE } from '../../utils/SizeUtils';
@@ -145,6 +146,11 @@ class RecoveryKeyDialog extends React.Component {
alignSelf: 'center',
borderRadius: 10,
}}
indicatorColor={
Platform.ios
? hexToRGBA(colors.accent + '19')
: hexToRGBA(colors.shade)
}
closeOnTouchBackdrop={false}
onOpen={this.onOpen}
ref={this.actionSheetRef}

View File

@@ -1,5 +1,5 @@
import React, {createRef} from 'react';
import {TouchableOpacity, View} from 'react-native';
import {Platform, TouchableOpacity, View} from 'react-native';
import Icon from 'react-native-vector-icons/MaterialCommunityIcons';
import {notesnook} from '../../../e2e/test.ids';
import {Actions} from '../../provider/Actions';
@@ -8,6 +8,7 @@ import {DDS} from '../../services/DeviceDetection';
import {eSubscribeEvent, eUnSubscribeEvent} from '../../services/EventManager';
import SettingsService from '../../services/SettingsService';
import {dWidth, SORT, sortSettings} from '../../utils';
import { hexToRGBA } from '../../utils/ColorUtils';
import {eCloseSortDialog, eOpenSortDialog} from '../../utils/Events';
import {MMKV} from '../../utils/mmkv';
import {SIZE} from '../../utils/SizeUtils';
@@ -82,6 +83,11 @@ class SortDialog extends React.Component {
borderRadius: 10,
marginBottom: DDS.isTab ? 50 : 0,
}}
indicatorColor={
Platform.ios
? hexToRGBA(colors.accent + '19')
: hexToRGBA(colors.shade)
}
extraScroll={DDS.isTab ? 50 : 0}
gestureEnabled={true}
footerAlwaysVisible={DDS.isTab}