Fixed comment requirement

This commit is contained in:
Mustafa Buyukcelebi 2019-01-20 00:24:46 +03:00
parent 33ad063f25
commit d9addecfb8
12 changed files with 21 additions and 6 deletions

View File

@ -140,6 +140,7 @@ android {
} }
dependencies { dependencies {
compile project(':react-native-version-number')
compile project(':react-native-code-push') compile project(':react-native-code-push')
compile project(':realm') compile project(':realm')
compile project(':react-native-fast-image') compile project(':react-native-fast-image')

View File

@ -3,6 +3,7 @@ package app.esteem.mobile;
import android.app.Application; import android.app.Application;
import com.facebook.react.ReactApplication; import com.facebook.react.ReactApplication;
import com.apsl.versionnumber.RNVersionNumberPackage;
import com.microsoft.codepush.react.CodePush; import com.microsoft.codepush.react.CodePush;
import io.realm.react.RealmReactPackage; import io.realm.react.RealmReactPackage;
import com.dylanvann.fastimage.FastImageViewPackage; import com.dylanvann.fastimage.FastImageViewPackage;
@ -43,6 +44,7 @@ public class MainApplication extends Application implements ReactApplication {
protected List<ReactPackage> getPackages() { protected List<ReactPackage> getPackages() {
return Arrays.<ReactPackage>asList( return Arrays.<ReactPackage>asList(
new MainReactPackage(), new MainReactPackage(),
new RNVersionNumberPackage(),
new CodePush(getResources().getString(R.string.reactNativeCodePush_androidDeploymentKey), getApplicationContext(), BuildConfig.DEBUG), new CodePush(getResources().getString(R.string.reactNativeCodePush_androidDeploymentKey), getApplicationContext(), BuildConfig.DEBUG),
new RealmReactPackage(), new RealmReactPackage(),
new FastImageViewPackage(), new FastImageViewPackage(),

View File

@ -1,4 +1,6 @@
rootProject.name = 'eSteem' rootProject.name = 'eSteem'
include ':react-native-version-number'
project(':react-native-version-number').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-version-number/android')
include ':react-native-code-push' include ':react-native-code-push'
project(':react-native-code-push').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-code-push/android/app') project(':react-native-code-push').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-code-push/android/app')
include ':realm' include ':realm'

View File

@ -36,6 +36,8 @@ target 'eSteem' do
pod 'CodePush', :path => '../node_modules/react-native-code-push' pod 'CodePush', :path => '../node_modules/react-native-code-push'
pod 'react-native-version-number', :path => '../node_modules/react-native-version-number'
target 'eSteemTests' do target 'eSteemTests' do
inherit! :search_paths inherit! :search_paths
# Pods for testing # Pods for testing

View File

@ -14,7 +14,7 @@
<key>FLAnimatedImage.xcscheme_^#shared#^_</key> <key>FLAnimatedImage.xcscheme_^#shared#^_</key>
<dict> <dict>
<key>orderHint</key> <key>orderHint</key>
<integer>14</integer> <integer>67</integer>
</dict> </dict>
<key>Folly.xcscheme</key> <key>Folly.xcscheme</key>
<dict> <dict>
@ -82,7 +82,7 @@
<key>SDWebImage.xcscheme_^#shared#^_</key> <key>SDWebImage.xcscheme_^#shared#^_</key>
<dict> <dict>
<key>orderHint</key> <key>orderHint</key>
<integer>16</integer> <integer>69</integer>
</dict> </dict>
<key>glog.xcscheme</key> <key>glog.xcscheme</key>
<dict> <dict>
@ -94,7 +94,7 @@
<key>react-native-fast-image.xcscheme_^#shared#^_</key> <key>react-native-fast-image.xcscheme_^#shared#^_</key>
<dict> <dict>
<key>orderHint</key> <key>orderHint</key>
<integer>15</integer> <integer>68</integer>
</dict> </dict>
</dict> </dict>
<key>SuppressBuildableAutocreation</key> <key>SuppressBuildableAutocreation</key>

View File

@ -5,7 +5,6 @@
}; };
objectVersion = 46; objectVersion = 46;
objects = { objects = {
/* Begin PBXBuildFile section */ /* Begin PBXBuildFile section */
00C302E51ABCBA2D00DB3ED1 /* libRCTActionSheet.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 00C302AC1ABCB8CE00DB3ED1 /* libRCTActionSheet.a */; }; 00C302E51ABCBA2D00DB3ED1 /* libRCTActionSheet.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 00C302AC1ABCB8CE00DB3ED1 /* libRCTActionSheet.a */; };
00C302E71ABCBA2D00DB3ED1 /* libRCTGeolocation.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 00C302BA1ABCB90400DB3ED1 /* libRCTGeolocation.a */; }; 00C302E71ABCBA2D00DB3ED1 /* libRCTGeolocation.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 00C302BA1ABCB90400DB3ED1 /* libRCTGeolocation.a */; };

View File

@ -47,7 +47,7 @@
<key>NSCameraUsageDescription</key> <key>NSCameraUsageDescription</key>
<string>To access your photos, eSteem needs your permission to help you share your photos.</string> <string>To access your photos, eSteem needs your permission to help you share your photos.</string>
<key>NSLocationWhenInUseUsageDescription</key> <key>NSLocationWhenInUseUsageDescription</key>
<string></string> <string/>
<key>NSMainNibFile</key> <key>NSMainNibFile</key>
<string>LaunchScreen</string> <string>LaunchScreen</string>
<key>NSMicrophoneUsageDescription</key> <key>NSMicrophoneUsageDescription</key>

View File

@ -54,6 +54,7 @@
"react-native-restart": "0.0.6", "react-native-restart": "0.0.6",
"react-native-slider": "^0.11.0", "react-native-slider": "^0.11.0",
"react-native-vector-icons": "^6.0.2", "react-native-vector-icons": "^6.0.2",
"react-native-version-number": "^0.3.5",
"react-native-view-overflow": "0.0.3", "react-native-view-overflow": "0.0.3",
"react-navigation": "^2.18.3", "react-navigation": "^2.18.3",
"react-navigation-redux-helpers": "^2.0.8", "react-navigation-redux-helpers": "^2.0.8",

View File

@ -85,5 +85,6 @@ export default EStyleSheet.create({
}, },
versionText: { versionText: {
textAlign: 'center', textAlign: 'center',
color: '$iconColor',
}, },
}); });

View File

@ -5,6 +5,7 @@ import {
import { injectIntl } from 'react-intl'; import { injectIntl } from 'react-intl';
import LinearGradient from 'react-native-linear-gradient'; import LinearGradient from 'react-native-linear-gradient';
import ActionSheet from 'react-native-actionsheet'; import ActionSheet from 'react-native-actionsheet';
import VersionNumber from 'react-native-version-number';
// Components // Components
import { IconButton } from '../../buttons'; import { IconButton } from '../../buttons';
@ -87,6 +88,7 @@ class SideMenuView extends Component {
} = this.props; } = this.props;
const { menuItems, isAddAccountIconActive } = this.state; const { menuItems, isAddAccountIconActive } = this.state;
const { version } = PackageJson; const { version } = PackageJson;
const { buildVersion } = VersionNumber;
return ( return (
<View style={styles.container}> <View style={styles.container}>
@ -165,7 +167,7 @@ class SideMenuView extends Component {
)} )}
/> />
</View> </View>
<Text style={styles.versionText}>{`v ${version}`}</Text> <Text style={styles.versionText}>{`v${version} b${buildVersion}`}</Text>
<ActionSheet <ActionSheet
ref={o => (this.ActionSheet = o)} ref={o => (this.ActionSheet = o)}
options={[intl.formatMessage({ id: 'side_menu.logout' }), intl.formatMessage({ id: 'side_menu.cancel' })]} options={[intl.formatMessage({ id: 'side_menu.logout' }), intl.formatMessage({ id: 'side_menu.cancel' })]}

View File

@ -7088,6 +7088,11 @@ react-native-vector-icons@^6.0.2:
prop-types "^15.6.2" prop-types "^15.6.2"
yargs "^8.0.2" yargs "^8.0.2"
react-native-version-number@^0.3.5:
version "0.3.5"
resolved "https://registry.yarnpkg.com/react-native-version-number/-/react-native-version-number-0.3.5.tgz#90f1b49bcb5e72f801bdc22ed6bad6c7cbbc2222"
integrity sha512-iANHQrYyDSe5Yts2qVjAjFXpK5EHkJGSFAqnVa3Bu/UKBRUjhnMqvskc3EH+IIvvJH9N2Qpidm1KCq42BWa6jQ==
react-native-view-overflow@0.0.3: react-native-view-overflow@0.0.3:
version "0.0.3" version "0.0.3"
resolved "https://registry.yarnpkg.com/react-native-view-overflow/-/react-native-view-overflow-0.0.3.tgz#d7b08e8c1e5047a2cf07f3ece82025899f930674" resolved "https://registry.yarnpkg.com/react-native-view-overflow/-/react-native-view-overflow-0.0.3.tgz#d7b08e8c1e5047a2cf07f3ece82025899f930674"