Mirrors/notesnook
1
0
Fork 0
mirror of https://github.com/streetwriters/notesnook.git synced 2025-12-22 14:39:34 +01:00
Code Issues Packages Projects Releases Wiki Activity

allow bottom button to be hidden

Browse Source
This commit is contained in:
ammarahm-ed
2020-01-13 17:34:29 +05:00
parent 7aec61198b
commit 9c99b4989d
5 changed files with 20 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
apps/mobile/ios/Notes.xcodeproj/project.pbxproj
View File

@@ -50,6 +50,19 @@
}; };
/* End PBXContainerItemProxy section */ /* End PBXContainerItemProxy section */
/* Begin PBXCopyFilesBuildPhase section */
65424EB023CC4DE200B593D6 /* Embed Frameworks */ = {
isa = PBXCopyFilesBuildPhase;
buildActionMask = 2147483647;
dstPath = "";
dstSubfolderSpec = 10;
files = (
);
name = "Embed Frameworks";
runOnlyForDeploymentPostprocessing = 0;
};
/* End PBXCopyFilesBuildPhase section */
/* Begin PBXFileReference section */ /* Begin PBXFileReference section */
008F07F21AC5B25A0029DE68 /* main.jsbundle */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = main.jsbundle; sourceTree = "<group>"; }; 008F07F21AC5B25A0029DE68 /* main.jsbundle */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = main.jsbundle; sourceTree = "<group>"; };
00E356EE1AD99517003FC87E /* NotesTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = NotesTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; }; 00E356EE1AD99517003FC87E /* NotesTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = NotesTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
@@ -288,6 +301,7 @@
13B07F8E1A680F5B00A75B9A /* Resources */, 13B07F8E1A680F5B00A75B9A /* Resources */,
00DD1BFF1BD5951E006B06BC /* Bundle React Native code and images */, 00DD1BFF1BD5951E006B06BC /* Bundle React Native code and images */,
8190C2904E505A29F2953971 /* [CP] Copy Pods Resources */, 8190C2904E505A29F2953971 /* [CP] Copy Pods Resources */,
65424EB023CC4DE200B593D6 /* Embed Frameworks */,
); );
buildRules = ( buildRules = (
); );
@@ -744,6 +758,7 @@
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
CURRENT_PROJECT_VERSION = 1; CURRENT_PROJECT_VERSION = 1;
DEAD_CODE_STRIPPING = NO; DEAD_CODE_STRIPPING = NO;
"FRAMEWORK_SEARCH_PATHS[arch=*]" = "../node_modules/react-native-fast-storage/ios";
INFOPLIST_FILE = Notes/Info.plist; INFOPLIST_FILE = Notes/Info.plist;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
OTHER_LDFLAGS = ( OTHER_LDFLAGS = (
@@ -764,6 +779,7 @@
buildSettings = { buildSettings = {
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
CURRENT_PROJECT_VERSION = 1; CURRENT_PROJECT_VERSION = 1;
"FRAMEWORK_SEARCH_PATHS[arch=*]" = "../node_modules/react-native-fast-storage/ios";
INFOPLIST_FILE = Notes/Info.plist; INFOPLIST_FILE = Notes/Info.plist;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
OTHER_LDFLAGS = ( OTHER_LDFLAGS = (

1
apps/mobile/ios/Podfile
View File

@@ -34,6 +34,7 @@ target 'Notes' do
pod 'glog', :podspec => '../node_modules/react-native/third-party-podspecs/glog.podspec' pod 'glog', :podspec => '../node_modules/react-native/third-party-podspecs/glog.podspec'
pod 'Folly', :podspec => '../node_modules/react-native/third-party-podspecs/Folly.podspec' pod 'Folly', :podspec => '../node_modules/react-native/third-party-podspecs/Folly.podspec'
target 'NotesTests' do target 'NotesTests' do
inherit! :search_paths inherit! :search_paths
# Pods for testing # Pods for testing

2
apps/mobile/ios/Podfile.lock
View File

@@ -381,6 +381,6 @@ SPEC CHECKSUMS:
RNVectorIcons: 0bb4def82230be1333ddaeee9fcba45f0b288ed4 RNVectorIcons: 0bb4def82230be1333ddaeee9fcba45f0b288ed4
Yoga: ba3d99dbee6c15ea6bbe3783d1f0cb1ffb79af0f Yoga: ba3d99dbee6c15ea6bbe3783d1f0cb1ffb79af0f
PODFILE CHECKSUM: c7f3c4928c6d0c850545a0a28079ac3abeed60a4 PODFILE CHECKSUM: 7cd3068f3c42e6d85b0135aaebe910c2bb876b5d
COCOAPODS: 1.8.4 COCOAPODS: 1.8.4

4
apps/mobile/src/components/Container/index.js
View File

@@ -24,10 +24,10 @@ export const AnimatedSafeAreaView = Animatable.createAnimatableComponent(
); );
export const Container = ({ export const Container = ({
navigation,
children, children,
bottomButtonOnPress, bottomButtonOnPress,
bottomButtonText, bottomButtonText,
noBottomButton = false,
}) => { }) => {
// State // State
const {colors} = useAppContext(); const {colors} = useAppContext();
@@ -72,7 +72,7 @@ export const Container = ({
}}> }}>
{children} {children}
{buttonHide ? null : ( {buttonHide || noBottomButton ? null : (
<TouchableOpacity <TouchableOpacity
onPress={bottomButtonOnPress} onPress={bottomButtonOnPress}
activeOpacity={opacity} activeOpacity={opacity}

4
apps/mobile/src/views/Home/index.js
View File

@@ -20,7 +20,6 @@ export const Home = ({navigation}) => {
const {colors, setMenuOpen, selectionMode, notes} = useAppContext(); const {colors, setMenuOpen, selectionMode, notes} = useAppContext();
const [text, setText] = useState(''); const [text, setText] = useState('');
const [hideHeader, setHideHeader] = useState(false); const [hideHeader, setHideHeader] = useState(false);
const [buttonHide, setButtonHide] = useState(false);
const [keyword, setKeyword] = useState(''); const [keyword, setKeyword] = useState('');
const [searchResults, setSearchResults] = useState([]); const [searchResults, setSearchResults] = useState([]);
// Variables // Variables
@@ -141,9 +140,6 @@ export const Home = ({navigation}) => {
<NotesList <NotesList
isGrouped={true} isGrouped={true}
refresh={() => {
//fetchNotes();
}}
onScroll={onScroll} onScroll={onScroll}
isSearch={searchResults.length > 0 ? true : false} isSearch={searchResults.length > 0 ? true : false}
notes={searchResults.length > 0 ? searchResults : notes} notes={searchResults.length > 0 ? searchResults : notes}