ecency/ecency-mobile
1
1
Fork 0
mirror of https://github.com/ecency/ecency-mobile.git synced 2024-12-24 13:53:23 +03:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/development' into nt/pin-encryption

Browse Source
This commit is contained in:
Nouman Tahir 2022-07-28 11:34:37 +05:00
commit 3062e91e02
12 changed files with 63 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
android/app/build.gradle
View File

@ -144,7 +144,7 @@ android {
minSdkVersion rootProject.ext.minSdkVersion
targetSdkVersion rootProject.ext.targetSdkVersion
versionCode versionMajor * 10000 + versionMinor * 100 + versionPatch
versionName "3.0.32"
versionName "3.0.33"
resValue "string", "build_config_package", "app.esteem.mobile.android"
multiDexEnabled true
// react-native-image-crop-picker

4
ios/Ecency-tvOS/Info.plist
View File

@ -15,11 +15,11 @@
<key>CFBundlePackageType</key>
<string>APPL</string>
<key>CFBundleShortVersionString</key>
<string>3.0.32</string>
<string>3.0.33</string>
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleVersion</key>
<string>2811</string>
<string>2812</string>
<key>LSRequiresIPhoneOS</key>
<true />
<key>NSAppTransportSecurity</key>

4
ios/Ecency-tvOSTests/Info.plist
View File

@ -15,10 +15,10 @@
<key>CFBundlePackageType</key>
<string>BNDL</string>
<key>CFBundleShortVersionString</key>
<string>3.0.32</string>
<string>3.0.33</string>
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleVersion</key>
<string>2811</string>
<string>2812</string>
</dict>
</plist>

4
ios/Ecency.xcodeproj/project.pbxproj
View File

@ -1132,7 +1132,7 @@
CODE_SIGN_IDENTITY = "iPhone Distribution";
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
CODE_SIGN_STYLE = Manual;
CURRENT_PROJECT_VERSION = 2811;
CURRENT_PROJECT_VERSION = 2812;
DEAD_CODE_STRIPPING = NO;
DEVELOPMENT_TEAM = 75B6RXTKGT;
EXCLUDED_ARCHS = "";
@ -1211,7 +1211,7 @@
CODE_SIGN_ENTITLEMENTS = Ecency/Ecency.entitlements;
CODE_SIGN_IDENTITY = "iPhone Developer";
CODE_SIGN_STYLE = Manual;
CURRENT_PROJECT_VERSION = 2811;
CURRENT_PROJECT_VERSION = 2812;
DEAD_CODE_STRIPPING = NO;
DEVELOPMENT_TEAM = 75B6RXTKGT;
EXCLUDED_ARCHS = "";

2
ios/Ecency/Info.plist
View File

@ -17,7 +17,7 @@
<key>CFBundlePackageType</key>
<string>APPL</string>
<key>CFBundleShortVersionString</key>
<string>3.0.32</string>
<string>3.0.33</string>
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleURLTypes</key>

4
ios/EcencyTests/Info.plist
View File

@ -15,10 +15,10 @@
<key>CFBundlePackageType</key>
<string>BNDL</string>
<key>CFBundleShortVersionString</key>
<string>3.0.32</string>
<string>3.0.33</string>
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleVersion</key>
<string>2811</string>
<string>2812</string>
</dict>
</plist>

4
ios/eshare/Info.plist
View File

@ -17,9 +17,9 @@
<key>CFBundlePackageType</key>
<string>$(PRODUCT_BUNDLE_PACKAGE_TYPE)</string>
<key>CFBundleShortVersionString</key>
<string>3.0.32</string>
<string>3.0.33</string>
<key>CFBundleVersion</key>
<string>2811</string>
<string>2812</string>
<key>NSExtension</key>
<dict>
<key>NSExtensionAttributes</key>

2
package.json
View File

@ -1,6 +1,6 @@
{
"name": "ecency",
"version": "3.0.32",
"version": "3.0.33",
"displayName": "Ecency",
"private": true,
"rnpm": {

8
src/components/formInput/view/formInputView.tsx
View File

@ -26,7 +26,6 @@ interface Props extends TextInputProps {
inputStyle:TextStyle;
isValid:boolean;
onChange?:(value:string)=>void;
handleFocus?:(value:boolean)=>void;
}
const FormInputView = ({
@ -45,7 +44,6 @@ const FormInputView = ({
isValid,
value,
onBlur,
handleFocus,
...props
}:Props) => {
const [_value, setValue] = useState(value || '');
@ -64,16 +62,10 @@ const FormInputView = ({
const _handleOnFocus = () => {
setInputBorderColor('#357ce6');
if(handleFocus){
handleFocus(true);
}
};
const _handleOnBlur = () => {
setInputBorderColor('#e7e7e7');
if(handleFocus){
handleFocus(false);
}
if (onBlur) {
onBlur();
}

33
src/components/loginHeader/view/loginHeaderView.js
View File

@ -1,5 +1,6 @@
import React, { PureComponent } from 'react';
import { View, Text, Image, SafeAreaView } from 'react-native';
import * as Animatable from 'react-native-animatable';
// Constants
// Components
@ -7,6 +8,7 @@ import { TextButton } from '../../buttons';
import { LineBreak } from '../../basicUIElements';
// Styles
import styles from './loginHeaderStyles';
import getWindowDimensions from '../../../utils/getWindowDimensions';
class LoginHeaderView extends PureComponent {
/* Props
@ -43,7 +45,10 @@ class LoginHeaderView extends PureComponent {
/>
</View>
</View>
{!isKeyboardOpen && (
<Animatable.View
animation={isKeyboardOpen ? hideAnimation : showAnimation}
duration={300}
>
<View style={styles.body}>
<View style={styles.titleText}>
<Text style={styles.title}>{title}</Text>
@ -51,7 +56,7 @@ class LoginHeaderView extends PureComponent {
</View>
<Image style={styles.mascot} source={require('../../../assets/love_mascot.png')} />
</View>
)}
</Animatable.View>
<LineBreak />
</View>
</SafeAreaView>
@ -60,3 +65,27 @@ class LoginHeaderView extends PureComponent {
}
export default LoginHeaderView;
const { height } = getWindowDimensions();
const bodyHeight = height / 3.9;
const showAnimation = {
from: {
opacity: 0,
height: 0,
},
to: {
opacity: 1,
height: bodyHeight,
},
};
const hideAnimation = {
from: {
opacity: 1,
height: bodyHeight,
},
to: {
opacity: 0,
height: 0,
},
};

22
src/screens/login/screen/loginScreen.js
View File

@ -1,5 +1,5 @@
import React, { PureComponent } from 'react';
import { View, StatusBar, Platform } from 'react-native';
import { View, StatusBar, Platform, Keyboard } from 'react-native';
import { KeyboardAwareScrollView } from 'react-native-keyboard-aware-scroll-view';
import ScrollableTabView from 'react-native-scrollable-tab-view';
import { injectIntl } from 'react-intl';
@ -41,6 +41,11 @@ class LoginScreen extends PureComponent {
};
}
componentWillUnmount() {
this.keyboardDidShowListener.remove();
this.keyboardDidHideListener.remove();
}
_handleOnPasswordChange = (value) => {
this.setState({ password: value });
};
@ -62,13 +67,20 @@ class LoginScreen extends PureComponent {
this.setState({ isModalOpen: !isModalOpen });
};
_handleFormInputFocus = (isFocused) => {
this.setState({ keyboardIsOpen: isFocused });
};
UNSAFE_componentWillMount() {
this.keyboardDidShowListener = Keyboard.addListener('keyboardDidShow', () =>
this.setState({ keyboardIsOpen: true }),
);
this.keyboardDidHideListener = Keyboard.addListener('keyboardDidHide', () =>
this.setState({ keyboardIsOpen: false }),
);
}
render() {
const { navigation, intl, handleOnPressLogin, handleSignUp, isLoading } = this.props;
const { username, isUsernameValid, keyboardIsOpen, password, isModalOpen } = this.state;
console.log('keyboardIsOpen : ', keyboardIsOpen);
return (
<View style={styles.container}>
<StatusBar hidden translucent />
@ -123,7 +135,6 @@ class LoginScreen extends PureComponent {
isFirstImage
value={username}
inputStyle={styles.input}
handleFocus={this._handleFormInputFocus}
/>
<FormInput
rightIconName="lock"
@ -138,7 +149,6 @@ class LoginScreen extends PureComponent {
type="password"
numberOfLines={1}
inputStyle={styles.input}
handleFocus={this._handleFormInputFocus}
/>
<InformationArea
description={intl.formatMessage({

6
src/screens/login/screen/loginStyles.js
View File

@ -27,9 +27,9 @@ export default EStyleSheet.create({
justifyContent: 'center',
alignItems: 'center',
alignSelf: 'flex-end',
marginRight: 10,
bottom: 24,
right: 24,
paddingRight: 24,
paddingBottom: 24,
backgroundColor: '$primaryBackgroundColor',
},
cancelButton: {
marginRight: 10,