mirror/mobile
1
0
Fork 0
mirror of https://github.com/standardnotes/mobile.git synced 2026-05-19 03:54:30 -04:00
Code Issues Packages Projects Releases Wiki Activity

Add moment.js

Browse Source
This commit is contained in:
Mo Bitar
2017-09-26 11:04:15 -05:00
parent 650c286e87
commit ccb87c09e5
18 changed files with 89 additions and 92 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
package.json
View File

@@ -11,6 +11,7 @@
"bugsnag-react-native": "^2.3.2",
"immutable": "^3.8.1",
"lodash": "^4.17.4",
"moment": "^2.18.1",
"react": "16.0.0-beta.5",
"react-native": "^0.48.4",
"react-native-keychain": "^1.2.1",

18
src/Styles.js
View File

@@ -250,7 +250,7 @@ export default class GlobalStyles {
flexContainer: {
flex: 1,
flexDirection: 'row',
flexDirection: 'column',
},
uiText: {
@@ -269,7 +269,6 @@ export default class GlobalStyles {
},
sectionHeader: {
color: constants.mainDimColor,
fontSize: constants.mainTextFontSize - 4,
paddingLeft: constants.paddingLeft,
paddingBottom: 10,
@@ -278,7 +277,6 @@ export default class GlobalStyles {
},
sectionHeaderAndroid: {
color: constants.mainDimColor,
fontSize: constants.mainTextFontSize - 2,
},
@@ -320,27 +318,27 @@ export default class GlobalStyles {
sectionedAccessoryTableCellLabel: {
fontSize: constants.mainTextFontSize,
color: constants.mainTextColor,
paddingTop: 12,
// paddingTop: 12,
},
buttonCell: {
paddingLeft: 0,
paddingTop: 0,
minHeight: 45,
flexGrow: 0,
paddingBottom: 0,
backgroundColor: constants.mainBackgroundColor,
flex: 1,
justifyContent: 'center',
alignItems: 'center'
},
buttonCellButton: {
textAlign: "center",
textAlignVertical: "center",
color: Platform.OS == "android" ? constants.mainTextColor : constants.mainTintColor,
fontSize: constants.mainTextFontSize,
height: "100%",
paddingTop: 13,
},
buttonCellButtonAndroid: {
paddingTop: 11
// paddingTop: 11
},
buttonCellButtonLeft: {

24
src/app.js
View File

@@ -7,7 +7,8 @@ import {
Platform,
StatusBar,
BackHandler,
DeviceEventEmitter
DeviceEventEmitter,
NativeModules
} from 'react-native';
import {Navigation, ScreenVisibilityListener} from 'react-native-navigation';
@@ -18,7 +19,7 @@ import Auth from './lib/auth'
import GlobalStyles from "./Styles"
import Icons from "./Icons"
import OptionsState from "./OptionsState"
var moment = require('moment/min/moment-with-locales.min.js');
import { Client } from 'bugsnag-react-native';
var _ = require('lodash');
@@ -52,16 +53,20 @@ export default class App {
this.readyObservers = [];
this.lockStatusObservers = [];
this.optionsState = new OptionsState();
this._isAndroid = Platform.OS === "android";
// Configure Moment locale
moment.locale(this.getLocale());
// Initialize Options (sort by, filter, selected tags, etc)
this.optionsState = new OptionsState();
this.optionsState.addChangeObserver((options) => {
if(!this.loading) {
options.persist();
}
})
// Screen visibility listener
this.listener = new ScreenVisibilityListener({
willAppear: ({screen, startTime, endTime, commandType}) => {
// This handles authentication for the initial app launch. We wait for the Notes component to be ready
@@ -75,6 +80,7 @@ export default class App {
});
this.listener.register();
// Listen to sign out event
this.signoutObserver = Auth.getInstance().addEventObserver([Auth.DidSignOutEvent, Auth.WillSignInEvent], function(event){
if(event == Auth.DidSignOutEvent) {
this.optionsState.reset();
@@ -82,6 +88,14 @@ export default class App {
}.bind(this));
}
getLocale() {
if (Platform.OS === 'android') {
return NativeModules.I18nManager.localeIdentifier;
} else {
return NativeModules.SettingsManager.settings.AppleLocale.replace(/_/, '-');
}
}
handleAppStateChange = (nextAppState) => {
console.log("handleAppStateChange|App.js", nextAppState, "starting app?", this.isStartingApp);
@@ -376,3 +390,5 @@ export default class App {
this.startApp();
}
}
export {moment}

13
src/components/ButtonCell.js
View File

@@ -1,23 +1,24 @@
import React, { Component } from 'react';
import {TouchableOpacity, Text} from 'react-native';
import {TouchableHighlight, Text} from 'react-native';
import SectionedTableCell from './SectionedTableCell'
import GlobalStyles from "../Styles"
export default class ButtonCell extends Component {
export default class ButtonCell extends SectionedTableCell {
rules() {
var rules = [GlobalStyles.stylesForKey("buttonCellButton")];
var rules = super.rules().concat([GlobalStyles.stylesForKey("buttonCellButton")]);
if(this.props.leftAligned) { rules.push(GlobalStyles.styles().buttonCellButtonLeft) }
if(this.props.bold) { rules.push(GlobalStyles.styles().bold) }
if(this.props.disabled) { rules.push({color: "gray", opacity: 0.6}) }
if(this.props.maxHeight) { rules.push({maxHeight: this.props.maxHeight}) }
return rules;
}
render() {
return (
<TouchableOpacity disabled={this.props.disabled} onPress={this.props.onPress}>
<TouchableHighlight style={GlobalStyles.styles().flexContainer} disabled={this.props.disabled} onPress={this.props.onPress}>
<Text style={this.rules()}>{this.props.title}</Text>
</TouchableOpacity>
</TouchableHighlight>
)
}
}

6
src/components/SectionedAccessoryTableCell.js
View File

@@ -48,7 +48,7 @@ export default class SectionedAccessoryTableCell extends SectionedTableCell {
if(Platform.OS == "android") {
iconSize -= 5;
iconStyles.paddingTop = left ? 11 : 4;
iconStyles.paddingTop = left ? 12 : 4;
color = GlobalStyles.constants().mainDimColor;
}
@@ -65,8 +65,8 @@ export default class SectionedAccessoryTableCell extends SectionedTableCell {
var textStyles = [GlobalStyles.styles().sectionedAccessoryTableCellLabel];
if(this.props.leftAlignIcon) {
textStyles.push({
position: "absolute",
left: iconStyles.left + iconStyles.width + 12,
// position: "absolute",
left: iconStyles.left + iconStyles.width + 3,
top: 0
});
}

1
src/components/SectionedTableCell.js
View File

@@ -7,7 +7,6 @@ export default class SectionedTableCell extends Component {
rules() {
var rules = [GlobalStyles.styles().sectionedTableCell];
if(this.props.buttonCell) { rules.push(GlobalStyles.styles().buttonCell); }
if(this.props.first) { rules.push(GlobalStyles.styles().sectionedTableCellFirst); }
if(this.props.textInputCell) {rules.push(GlobalStyles.styles().textInputCell); }
if(this.props.height) {rules.push({height: this.props.height})};

8
src/containers/ManageNote.js
View File

@@ -31,28 +31,28 @@ export default class SortSection extends Component {
<SectionedAccessoryTableCell
iconName={nameForIcon("flag")}
onPress={() => {this.onPress(pinAction.toLowerCase())}}
first={true} text={pinAction} buttonCell={true}
first={true} text={pinAction}
leftAlignIcon={true}
/>
<SectionedAccessoryTableCell
iconName={nameForIcon("archive")}
onPress={() => {this.onPress(archiveOption.toLowerCase())}}
text={archiveOption} buttonCell={true}
text={archiveOption}
leftAlignIcon={true}
/>
<SectionedAccessoryTableCell
iconName={nameForIcon("share")}
onPress={() => {this.onPress("share")}}
text={"Share"} buttonCell={true}
text={"Share"}
leftAlignIcon={true}
/>
<SectionedAccessoryTableCell
iconName={nameForIcon("trash")}
onPress={() => {this.onPress("delete")}}
text={"Delete"} buttonCell={true}
text={"Delete"}
leftAlignIcon={true}
/>
</TableSection>

12
src/containers/account/AuthSection.js
View File

@@ -94,18 +94,12 @@ export default class AuthSection extends AbstractComponent {
</SectionedTableCell>
}
<SectionedTableCell buttonCell={true}>
<ButtonCell title={this.state.signInButtonText} disabled={this.state.signingIn} bold={true} onPress={() => this.onSignInPress()} />
</SectionedTableCell>
<ButtonCell title={this.state.signInButtonText} disabled={this.state.signingIn} bold={true} onPress={() => this.onSignInPress()} />
<SectionedTableCell buttonCell={true}>
<ButtonCell title={this.state.registerButtonText} disabled={this.state.registering} bold={true} onPress={() => this.onRegisterPress()} />
</SectionedTableCell>
<ButtonCell title={this.state.registerButtonText} disabled={this.state.registering} bold={true} onPress={() => this.onRegisterPress()} />
{!this.state.showAdvanced &&
<SectionedTableCell buttonCell={true}>
<ButtonCell title="Advanced Options" onPress={() => this.showAdvanced()} />
</SectionedTableCell>
<ButtonCell title="Advanced Options" onPress={() => this.showAdvanced()} />
}

12
src/containers/account/CompanySection.js
View File

@@ -15,17 +15,11 @@ export default class CompanySection extends Component {
<SectionHeader title={this.props.title} />
<SectionedTableCell buttonCell={true} first={true}>
<ButtonCell leftAligned={true} title="Send Feedback" onPress={() => this.props.onAction("feedback")} />
</SectionedTableCell>
<ButtonCell first={true} leftAligned={true} title="Send Feedback" onPress={() => this.props.onAction("feedback")} />
<SectionedTableCell buttonCell={true}>
<ButtonCell leftAligned={true} title="Learn more about Standard Notes" onPress={() => this.props.onAction("learn_more")} />
</SectionedTableCell>
<ButtonCell leftAligned={true} title="Learn more about Standard Notes" onPress={() => this.props.onAction("learn_more")} />
<SectionedTableCell buttonCell={true}>
<ButtonCell leftAligned={true} title="Our Privacy Manifesto" onPress={() => this.props.onAction("privacy")} />
</SectionedTableCell>
<ButtonCell leftAligned={true} title="Our Privacy Manifesto" onPress={() => this.props.onAction("privacy")} />
</TableSection>
);

8
src/containers/account/OptionsSection.js
View File

@@ -16,14 +16,10 @@ export default class OptionsSection extends Component {
<SectionHeader title={this.props.title} />
{this.props.signedIn &&
<SectionedTableCell buttonCell={true} first={true}>
<ButtonCell leftAligned={true} title={`Sign out (${this.props.email})`} onPress={this.props.onSignOutPress} />
</SectionedTableCell>
<ButtonCell first={true} leftAligned={true} title={`Sign out (${this.props.email})`} onPress={this.props.onSignOutPress} />
}
<SectionedTableCell buttonCell={true} first={!this.props.signedIn}>
<ButtonCell leftAligned={true} title="Export Data" onPress={this.props.onExportPress} />
</SectionedTableCell>
<ButtonCell first={!this.props.signedIn} leftAligned={true} title="Export Data" onPress={this.props.onExportPress} />
</TableSection>
);

8
src/containers/account/PasscodeSection.js
View File

@@ -71,13 +71,9 @@ export default class PasscodeSection extends Component {
<SectionHeader title={this.props.title} />
<SectionedTableCell buttonCell={true} first={true}>
<ButtonCell leftAligned={true} title={passcodeTitle} onPress={passcodeOnPress} />
</SectionedTableCell>
<ButtonCell first={true} leftAligned={true} title={passcodeTitle} onPress={passcodeOnPress} />
<SectionedTableCell buttonCell={true}>
<ButtonCell disabled={!this.state.fingerprintAvailable} leftAligned={true} title={fingerprintTitle} onPress={fingerprintOnPress} />
</SectionedTableCell>
<ButtonCell disabled={!this.state.fingerprintAvailable} leftAligned={true} title={fingerprintTitle} onPress={fingerprintOnPress} />
{this.props.hasPasscode &&
<SectionedOptionsTableCell title={"Require Passcode"} options={passcodeOptions} onPress={this.onPasscodeOptionPress}/>

15
src/containers/account/RegistrationConfirmSection.js
View File

@@ -49,15 +49,14 @@ export default class RegistrationConfirmSection extends Component {
/>
</SectionedTableCell>
<SectionedTableCell buttonCell={true}>
<ButtonCell disabled={this.props.registering}
title={this.props.registering ? "Generating Keys..." : "Register"} bold={true}
onPress={() => this.onConfirmPress()} />
</SectionedTableCell>
<ButtonCell
disabled={this.props.registering}
title={this.props.registering ? "Generating Keys..." : "Register"}
bold={true}
onPress={() => this.onConfirmPress()}
/>
<SectionedTableCell buttonCell={true}>
<ButtonCell title="Cancel" onPress={() => this.onCancel()} />
</SectionedTableCell>
<ButtonCell title="Cancel" onPress={() => this.onCancel()} />
</TableSection>

2
src/containers/account/ThemesSection.js
View File

@@ -24,7 +24,6 @@ export default class ThemesSection extends Component {
key={theme.uuid}
first={i == 0}
selected={() => {return theme.active}}
buttonCell={true}
dimmed={theme.notAvailableOnMobile}
/>
)
@@ -34,7 +33,6 @@ export default class ThemesSection extends Component {
<SectionedAccessoryTableCell
onPress={() => Linking.openURL("https://standardnotes.org/extensions")}
text={"More Themes"}
buttonCell={true}
/>
}

24
src/models/api/item.js
View File

@@ -1,4 +1,5 @@
import Crypto from "../../lib/crypto"
import {moment} from "../../app"
var _ = require('lodash')
@@ -51,8 +52,8 @@ export default class Item {
_.merge(this, json);
if(this.created_at) {
this.created_at = new Date(this.created_at);
this.updated_at = new Date(this.updated_at);
this.created_at = moment(this.created_at);
this.updated_at = moment(this.updated_at);
} else {
this.created_at = new Date();
this.updated_at = new Date();
@@ -133,18 +134,21 @@ export default class Item {
return [];
}
createdAt() {
var date = this.created_at;
var string = date.toLocaleDateString() + ", " + date.toLocaleTimeString([], {hour: '2-digit', minute:'2-digit'});
return string;
createdAt(withTime) {
return this.dateToString(this.created_at, withTime);
}
updatedAt() {
var date = this.updated_at;
var string = date.toLocaleDateString() + ", " + date.toLocaleTimeString([], {hour: '2-digit', minute:'2-digit'});
return this.dateToString(this.updated_at, true);
}
return string;
dateToString(date, withTime) {
if(withTime) {
return moment(date).format('lll')
} else {
return moment(date).format('l')
}
// return this.created_at.fromNow()
}
doNotEncrypt() {

8
src/screens/Authenticate.js
View File

@@ -147,9 +147,7 @@ export default class Authenticate extends Abstract {
/>
</SectionedTableCell>
<SectionedTableCell buttonCell={true}>
<ButtonCell title={this.state.unlockButtonText} disabled={!this.state.unlockButtonEnabled} bold={true} onPress={() => this.onUnlockPress()} />
</SectionedTableCell>
<ButtonCell title={this.state.unlockButtonText} disabled={!this.state.unlockButtonEnabled} bold={true} onPress={() => this.onUnlockPress()} />
</View>
}
@@ -172,9 +170,7 @@ export default class Authenticate extends Abstract {
/>
</SectionedTableCell>
<SectionedTableCell buttonCell={true}>
<ButtonCell title={this.state.setupButtonText} disabled={!this.state.setupButtonEnabled} bold={true} onPress={() => this.onSavePress()} />
</SectionedTableCell>
<ButtonCell title={this.state.setupButtonText} disabled={!this.state.setupButtonEnabled} bold={true} onPress={() => this.onSavePress()} />
</View>
}

5
src/screens/Compose.js
View File

@@ -75,6 +75,10 @@ export default class Compose extends Abstract {
return;
}
if(!this.note.uuid) {
return;
}
var tagButton = {
title: "Manage",
id: 'tags',
@@ -162,6 +166,7 @@ export default class Compose extends Abstract {
if(!this.note.uuid) {
this.note.initUUID().then(function(){
this.save();
this.configureNavBar(true);
}.bind(this));
} else {
this.save();

3
src/screens/Filter.js
View File

@@ -363,7 +363,6 @@ class TagsSection extends Component {
key={tag.uuid}
first={i == 0}
selected={() => {return root.state.selected.includes(tag.uuid)}}
buttonCell={true}
/>
)
})}
@@ -394,7 +393,6 @@ class OptionsSection extends Component {
text={"Show only archived notes"}
first={true}
selected={() => {return this.props.archivedOnly}}
buttonCell={true}
/>
</TableSection>
@@ -431,7 +429,6 @@ class SortSection extends Component {
key={option.key}
first={i == 0}
selected={() => {return option.key == root.state.sortBy}}
buttonCell={true}
/>
)
})}

13
src/screens/InputModal.js
View File

@@ -21,8 +21,7 @@ export default class InputModal extends Abstract {
{
title: 'Cancel',
id: 'cancel',
showAsAction: 'ifRoom',
buttonColor: GlobalStyles.constants().mainTintColor,
showAsAction: 'ifRoom'
},
],
animated: false
@@ -37,6 +36,12 @@ export default class InputModal extends Abstract {
}
onSave = () => {
if(this.props.validate) {
if(!this.props.validate(this.state.text)) {
this.props.onError(this.state.text);
return;
}
}
this.props.onSave(this.state.text);
this.props.navigator.dismissModal({animationType: "slide-down"});
}
@@ -64,9 +69,7 @@ export default class InputModal extends Abstract {
/>
</SectionedTableCell>
<SectionedTableCell buttonCell={true}>
<ButtonCell title={"Save"} bold={true} onPress={() => this.onSave()} />
</SectionedTableCell>
<ButtonCell maxHeight={50} disabled={this.state.text.length == 0} title={"Save"} bold={true} onPress={() => this.onSave()} />
</TableSection>
</View>