Skip to content

Commit

Permalink
v1.5 发布版
Browse files Browse the repository at this point in the history
1. 添加了网络图片加载指示器
2. 为通知模块增加了入场动画
3. 为日记模块增加了入场动画
4. 为个人模块增加了入场动画
5. 为登录页面增加了入场动画
6. 为注册页面增加了入场动画
7. 为匹配页、设置页、Partner页面等等页面都增加了入场动画
8. 添加了一个欢迎页
9. 修复了右滑手势退出到登录页的BUG
  • Loading branch information
airingursb committed Jun 14, 2017
1 parent cba08b9 commit f44a589
Show file tree
Hide file tree
Showing 26 changed files with 259 additions and 129 deletions.
Binary file not shown.
14 changes: 7 additions & 7 deletions ios/twolife/Info.plist
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
<key>CFBundlePackageType</key>
<string>APPL</string>
<key>CFBundleShortVersionString</key>
<string>1.4</string>
<string>1.5</string>
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleVersion</key>
Expand All @@ -26,6 +26,8 @@
<true/>
<key>NSAppTransportSecurity</key>
<dict>
<key>NSAllowsArbitraryLoads</key>
<true/>
<key>NSExceptionDomains</key>
<dict>
<key>localhost</key>
Expand All @@ -34,11 +36,13 @@
<true/>
</dict>
</dict>
<key>NSAllowsArbitraryLoads</key>
<true/>
</dict>
<key>NSCameraUsageDescription</key>
<string>双生请求调用您的相机权限,以便上传图片</string>
<key>NSLocationWhenInUseUsageDescription</key>
<string></string>
<key>NSPhotoLibraryUsageDescription</key>
<string>双生请求调用您的相册权限,以便上传图片</string>
<key>UIAppFonts</key>
<array>
<string>Entypo.ttf</string>
Expand Down Expand Up @@ -66,9 +70,5 @@
</array>
<key>UIViewControllerBasedStatusBarAppearance</key>
<false/>
<key>NSPhotoLibraryUsageDescription</key>
<string>双生请求调用您的相册权限,以便上传图片</string>
<key>NSCameraUsageDescription</key>
<string>双生请求调用您的相机权限,以便上传图片</string>
</dict>
</plist>
1 change: 1 addition & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
"react": "16.0.0-alpha.6",
"react-native": "0.43.2",
"react-native-action-button": "^2.6.9",
"react-native-animatable": "^1.2.2",
"react-native-calendars": "1.2.21",
"react-native-image-picker": "^0.26.3",
"react-native-image-progress": "^0.6.0",
Expand Down
Binary file removed res/images/icon1.png
Binary file not shown.
Binary file removed res/images/[email protected]
Binary file not shown.
Binary file removed res/images/[email protected]
Binary file not shown.
Binary file removed res/images/loginlogo1.png
Binary file not shown.
Binary file removed res/images/[email protected]
Binary file not shown.
Binary file removed res/images/[email protected]
Binary file not shown.
Binary file added res/images/welcome1.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added res/images/[email protected]
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added res/images/[email protected]
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
7 changes: 3 additions & 4 deletions src/common/AlertBox.js
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
import React, { Component } from 'react';
import {
Modal,
Text,
TouchableHighlight,
View ,
StyleSheet,
BackAndroid,
Image
} from 'react-native';
import { createAnimatableComponent, View, Text } from 'react-native-animatable';

import TextPingFang from './TextPingFang';

let Dimensions = require('Dimensions');
Expand Down Expand Up @@ -56,14 +56,13 @@ export default class AlertBox extends Component {
{this.props._dialogContent}
</Text>
</View>
<View style={styles.dialogUpBtnView}>
<View style={styles.dialogUpBtnView} animation="rubberBand">
<TouchableHighlight style={styles.dialogBtnViewItem} onPress={this.props._dialogLeftBtnAction}>
<Text style={styles.rightButton}>
{this.props._dialogRightBtnTitle}
</Text>
</TouchableHighlight>
</View>

</View>
</View>
</Modal>
Expand Down
17 changes: 11 additions & 6 deletions src/pages/AgendaScreen.js
Original file line number Diff line number Diff line change
@@ -1,16 +1,18 @@
import React, { Component } from 'react';
import {
Text,
View,
StyleSheet,
Image,
TouchableOpacity,
Dimensions,
Navigator,
AsyncStorage,
DeviceEventEmitter
DeviceEventEmitter,
TouchableWithoutFeedback
} from 'react-native';
import {Agenda} from 'react-native-calendars';
import * as Animatable from 'react-native-animatable';
import { createAnimatableComponent, View, Text } from 'react-native-animatable';

import ItemPage from './ItemPage';
import CommonNav from '../common/CommonNav';
import NavigationBar from "../common/NavigationBar";
Expand All @@ -37,7 +39,7 @@ export default class AgendaScreen extends Component {
var nowtimestamp = new Date().getTime();
var nowtime = this.timeToString(nowtimestamp);
return (
<View style={styles.container}>
<View style={styles.container} animation="fadeIn">
<NavigationBar
title={"日记"}
leftButton={
Expand Down Expand Up @@ -186,9 +188,12 @@ export default class AgendaScreen extends Component {
title: item.title,
content: item.content,
user: this.state.user
})
});
}}>
<View style={[item.male=='male'?styles.item_male:styles.item_female, {height: item.height}]}>
<View
animation="bounceInRight"
delay={100}
style={[item.male=='male'?styles.item_male:styles.item_female, {height: item.height}]}>
<TextPingFang style={item.male=='male'?styles.font_male_title:styles.font_female_title}>
{item.title}
</TextPingFang>
Expand Down
38 changes: 20 additions & 18 deletions src/pages/ConnectPage.js
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
import React, { Component } from 'react';
import {
StyleSheet,
Text,
View,
Image,
Navigator,
Dimensions,
Expand All @@ -12,6 +10,8 @@ import {
DeviceEventEmitter,
AsyncStorage
} from 'react-native';
import { createAnimatableComponent, View, Text } from 'react-native-animatable';

import CommonNav from '../common/CommonNav';
import TextPingFang from '../common/TextPingFang';
import {HOST} from '../util/config';
Expand Down Expand Up @@ -126,24 +126,26 @@ export default class ConnectPage extends Component {
<Text style={styles.title}>"Oh - Uh"</Text>
<TextPingFang style={styles.e_title}>快点匹配自己的另一半吧~</TextPingFang>
<TouchableOpacity
style={styles.online_login}
onPress={()=>{
this.connectByRandom();
}}>
<Text
style={styles.online_font}>
随机匹配
</Text>
onPress={()=>{
this.connectByRandom();
}}>
<View style={styles.online_login} delay={100} animation="bounceInRight">
<Text
style={styles.online_font}>
随机匹配
</Text>
</View>
</TouchableOpacity>
<TouchableOpacity
style={styles.online_register}
onPress={()=>{
this.connectById();
}}>
<Text
style={styles.online_font}>
定点匹配
</Text>
onPress={()=>{
this.connectById();
}}>
<View style={styles.online_register} delay={150} animation="bounceInRight">
<Text
style={styles.online_font}>
定点匹配
</Text>
</View>
</TouchableOpacity>
</View>
);
Expand Down
10 changes: 5 additions & 5 deletions src/pages/CreateNotePage.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
import React, {Component} from "react";
import {
View,
Text,
TextInput,
StyleSheet,
Dimensions,
Expand All @@ -10,9 +8,11 @@ import {
DeviceEventEmitter,
TouchableOpacity,
Image,
ActivityIndicator
ActivityIndicator,
} from "react-native";
import ImagePicker from 'react-native-image-picker';
import { createAnimatableComponent, View, Text } from 'react-native-animatable';

import RightButtonNav from "../common/RightButtonNav";
import HttpUtils from "../util/HttpUtils";
import {HOST, QINIU_UPHOST} from '../util/config';
Expand Down Expand Up @@ -144,7 +144,7 @@ export default class CreateNotePage extends Component {
this.props.navigator.pop();
}}
/>
<TouchableOpacity
{/*<TouchableOpacity
onPress={()=>{
ImagePicker.showImagePicker(options, (response) => {
console.log('Response = ', response);
Expand Down Expand Up @@ -174,7 +174,7 @@ export default class CreateNotePage extends Component {
size="small"
hidesWhenStopped={true}
/>
</TouchableOpacity>
</TouchableOpacity>*/}
<TextInput
underlineColorAndroid='transparent'
placeholder={"请输入日记标题"}
Expand Down
4 changes: 2 additions & 2 deletions src/pages/FeedBackPage.js
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
import React, {Component} from "react";
import {
View,
Text,
TextInput,
StyleSheet,
Dimensions,
AsyncStorage,
Alert
} from "react-native";
import { createAnimatableComponent, View, Text } from 'react-native-animatable';

import RightButtonNav from "../common/RightButtonNav";
import HttpUtils from "../util/HttpUtils";
import {HOST} from '../util/config';
Expand Down
4 changes: 2 additions & 2 deletions src/pages/ItemPage.js
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
import React, { Component } from 'react';
import {
StyleSheet,
Text,
View,
Image,
Navigator,
Dimensions,
TouchableOpacity,
Alert,
DeviceEventEmitter
} from 'react-native';
import { createAnimatableComponent, View, Text } from 'react-native-animatable';

import CommonNav from "../common/CommonNav";
import {HOST} from '../util/config';
import TextPingFang from '../common/TextPingFang';
Expand Down
32 changes: 18 additions & 14 deletions src/pages/LoginPage.js
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
import React, { Component } from 'react';
import {
View,
StyleSheet,
Text,
Navigator,
TouchableOpacity,
Image,
Expand All @@ -12,6 +10,9 @@ import {
Alert,
AsyncStorage
} from 'react-native';
import * as Animatable from 'react-native-animatable';
import { createAnimatableComponent, View, Text } from 'react-native-animatable';

import NavigationBar from '../common/NavigationBar';
import TextPingFang from "../common/TextPingFang";
import HomeScreen from './HomeScreen';
Expand Down Expand Up @@ -140,14 +141,14 @@ export default class LoginPage extends Component {
}
render() {
return (
<View style={styles.container}>
<View style={styles.container} animation="fadeIn">
<Image style={styles.bg} source={require("../../res/images/welcome_bg.png")}>
<Image style={styles.logo} source={require("../../res/images/ilo.png")}/>
<View style={styles.text}>
<TextPingFang style={styles.title}>双生</TextPingFang>
<TextPingFang style={styles.e_title}>今夕何夕 见此良人</TextPingFang>
</View>
<View style={styles.form}>
<View style={styles.form} animation="zoomIn" delay={100}>
<TextInput
underlineColorAndroid='transparent'
placeholder={"请输入您的手机号"}
Expand All @@ -171,27 +172,30 @@ export default class LoginPage extends Component {
<Text style={styles.remind}>很高兴 遇见你 :)</Text>

</View>
<TouchableOpacity
style={styles.online_login}
onPress={()=>{
this.onSubmit();
}}>
<Text
style={styles.online_font}>
登录
</Text>
</TouchableOpacity>
<TouchableOpacity style={styles.online_login}
onPress={()=>{
this.onSubmit();
}}>
<View animation="zoomIn" delay={100}>
<Text
style={styles.online_font}>
登录
</Text>
</View>
</TouchableOpacity>
<TouchableOpacity
style={styles.online_register}
onPress={()=>{
this.props.navigator.resetTo({
component: RegisterPage
})
}}>
<View animation="zoomIn" delay={100}>
<Text
style={styles.online_font}>
注册
</Text>
</View>
</TouchableOpacity>
</Image>
</View>
Expand Down
10 changes: 9 additions & 1 deletion src/pages/NotificationsPage.js
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,8 @@ import {
ListView,
ActivityIndicatorIOS
} from 'react-native';
import * as Animatable from 'react-native-animatable';
import { createAnimatableComponent} from 'react-native-animatable';

import NavigationBar from '../common/NavigationBar';
import TextPingFang from '../common/TextPingFang';
Expand All @@ -25,6 +27,8 @@ const WIDTH = Dimensions.get("window").width;
const INNERWIDTH = WIDTH - 16;
const HEIGHT = Dimensions.get("window").height;

const AnimatableListView = createAnimatableComponent(ListView);

const URL = HOST + 'users/show_notification';

export default class NotificationsPage extends Component {
Expand Down Expand Up @@ -91,9 +95,13 @@ export default class NotificationsPage extends Component {
title={"通知"}
navigator={this.props.navigator}
/>
<ListView
<AnimatableListView
duration={1000}
animation="bounceInUp"
delay={50}
dataSource={this.state.dataSource}
renderRow={this.renderNotificationsList}
removeClippedSubviews={false}
style={styles.listView}
/>
</View>
Expand Down
Loading

0 comments on commit f44a589

Please sign in to comment.