Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Release/rn 0.40 #209

Merged
merged 40 commits into from
May 14, 2017
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
40 commits
Select commit Hold shift + click to select a range
292a3da
upgraded to RN 0.43.4 with broken dependencies
shirbr510 May 9, 2017
533cec5
Fixed style issues cause by native-base in some components (will be f…
shirbr510 May 9, 2017
7f68602
deleted ‘home’ page (was not used anywhere)
shirbr510 May 9, 2017
b60f984
Removed some native-base redundant form components
shirbr510 May 9, 2017
d9d6211
handled some parts of sign-in and splash screen to be “native-base less”
shirbr510 May 9, 2017
ca0c505
Made BadNavigationScreen into a Functional Component
shirbr510 May 9, 2017
93244a0
Fixed native-base issues in activation page
shirbr510 May 10, 2017
112522a
fixed native-base issues in signup page
shirbr510 May 10, 2017
f9fca03
Replaced all the native-base view and text with react-native view and…
shirbr510 May 10, 2017
35bcd65
Animations look AWESOME
shirbr510 May 10, 2017
d1b46fa
Refactored most of the flow of uploadLook
shirbr510 May 10, 2017
fbf601f
tiny refactor for brands autocomplete
shirbr510 May 10, 2017
cd2645d
Fixed native-base style issues in uploadLook (all stages)
shirbr510 May 11, 2017
ffe5410
fixed native-base issues with profilescreen & settings screen
shirbr510 May 11, 2017
445ae70
Fixed broken react-native-video
shirbr510 May 11, 2017
806c278
fixed disappearing list views
shirbr510 May 11, 2017
5393df4
Merge branch 'master' into feature/RN-0.40
shirbr510 May 11, 2017
274cd62
Merge branch 'master' into feature/RN-0.40
shirbr510 May 11, 2017
8765d7b
Updated package son for RN0.43
May 11, 2017
c82492c
Removed duplicate permissions from AndroidManifest
shirbr510 May 12, 2017
a9e18da
fixed ‘next’ button style in uploadLookScreen
shirbr510 May 12, 2017
e24f6ac
Added missing binding in addItemScreen constructor
shirbr510 May 12, 2017
7d88bbb
fixed clear button
shirbr510 May 12, 2017
356a50e
Fixed gif issue (https://github.com/facebook/react-native/issues/13345)
shirbr510 May 12, 2017
2df7f46
Aligned Gllu.Button text
shirbr510 May 12, 2017
1e05802
aligned report and back button in profile screen
shirbr510 May 12, 2017
1ae8a99
fixed LikeView alignment
shirbr510 May 12, 2017
cbad2d5
Merge branch 'feature/RN-0.40' into release/RN-0.40
shirbr510 May 12, 2017
a42209b
Fixed incorrect styling of LikeView
shirbr510 May 14, 2017
4316cd5
fix look screen keys bug
shirbr510 May 14, 2017
a99b126
Removed weird gap in bottom of comments view
shirbr510 May 14, 2017
bbc116d
Merge branch 'feature/RN-0.40' into release/RN-0.40
shirbr510 May 14, 2017
6fb3c2d
ios changes for rn0.40
May 14, 2017
17d111d
Merge branch 'release/RN-0.40' of ssh://github.com/GLLU/mobile into r…
May 14, 2017
c555527
fixed empty view style issues in Notifications/Followers & Following …
shirbr510 May 14, 2017
9d8f3a3
Merge branch 'feature/RN-0.40' into release/RN-0.40
shirbr510 May 14, 2017
5342e1c
App loads react modules correctly. (Still have to deal with Flurry bug)
shirbr510 May 14, 2017
3b3ef11
Fixed iOS flurry bug (resolved react-native-config version straight f…
shirbr510 May 14, 2017
0a5a663
Merge branch 'feature/RN-0.40' into release/RN-0.40
shirbr510 May 14, 2017
520bbda
fixed missing config files in build.gradle
shirbr510 May 14, 2017
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions .babelrc
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
{
"presets": ["react-native"]
}
6 changes: 6 additions & 0 deletions .buckconfig
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@

[android]
target = Google Inc.:Google APIs:23

[maven_repositories]
central = https://repo1.maven.org/maven2
File renamed without changes.
File renamed without changes.
File renamed without changes.
47 changes: 47 additions & 0 deletions .flowconfig
Original file line number Diff line number Diff line change
@@ -0,0 +1,47 @@
[ignore]
; We fork some components by platform
.*/*[.]android.js

; Ignore "BUCK" generated dirs
<PROJECT_ROOT>/\.buckd/

; Ignore unexpected extra "@providesModule"
.*/node_modules/.*/node_modules/fbjs/.*

; Ignore duplicate module providers
; For RN Apps installed via npm, "Libraries" folder is inside
; "node_modules/react-native" but in the source repo it is in the root
.*/Libraries/react-native/React.js
.*/Libraries/react-native/ReactNative.js

[include]

[libs]
node_modules/react-native/Libraries/react-native/react-native-interface.js
node_modules/react-native/flow
flow/

[options]
emoji=true

module.system=haste

experimental.strict_type_args=true

munge_underscores=true

module.name_mapper='^[./a-zA-Z0-9$_-]+\.\(bmp\|gif\|jpg\|jpeg\|png\|psd\|svg\|webp\|m4v\|mov\|mp4\|mpeg\|mpg\|webm\|aac\|aiff\|caf\|m4a\|mp3\|wav\|html\|pdf\)$' -> 'RelativeImageStub'

suppress_type=$FlowIssue
suppress_type=$FlowFixMe
suppress_type=$FixMe

suppress_comment=\\(.\\|\n\\)*\\$FlowFixMe\\($\\|[^(]\\|(\\(>=0\\.\\(4[0-2]\\|[1-3][0-9]\\|[0-9]\\).[0-9]\\)? *\\(site=[a-z,_]*react_native[a-z,_]*\\)?)\\)
suppress_comment=\\(.\\|\n\\)*\\$FlowIssue\\((\\(>=0\\.\\(4[0-2]\\|[1-3][0-9]\\|[0-9]\\).[0-9]\\)? *\\(site=[a-z,_]*react_native[a-z,_]*\\)?)\\)?:? #[0-9]+
suppress_comment=\\(.\\|\n\\)*\\$FlowFixedInNextDeploy
suppress_comment=\\(.\\|\n\\)*\\$FlowExpectedError

unsafe.enable_getters_and_setters=true

[version]
^0.42.0
1 change: 1 addition & 0 deletions .gitattributes
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
*.pbxproj -text
33 changes: 22 additions & 11 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
# OSX
#
ios/pods
.DS_Store

# Xcode
Expand All @@ -21,29 +22,39 @@ DerivedData
*.ipa
*.xcuserstate
project.xcworkspace
*gradle.propeties
*build.gradle
*app.iml
# Android/IJ

# Android/IntelliJ
#
*gradle-wrapper.properties
*.iml
build/
.idea
.gradle
local.properties
android/local.properties

*.iml
android/app/libs
android/keystores/debug.keystore
/android/gradle.properties

# node.js
#
node_modules/
npm-debug.log
yarn-error.log

# BUCK
buck-out/
\.buckd/
android/app/libs
android/keystores/debug.keystore
*.keystore

# fastlane
#
# It is recommended to not store the screenshots in the git repo. Instead, use fastlane to re-generate the
# screenshots whenever they are needed.
# For more information about the recommended setup visit:
# https://github.com/fastlane/fastlane/blob/master/fastlane/docs/Gitignore.md

fastlane/report.xml
fastlane/Preview.html
fastlane/screenshots

ios/
my-release-key.keystore
/android/gradle.properties
Binary file removed Screenshots/iOS/blankPage.png
Binary file not shown.
Binary file removed Screenshots/iOS/demo.gif
Binary file not shown.
Binary file removed Screenshots/iOS/drawer.png
Binary file not shown.
Binary file removed Screenshots/iOS/home.png
Binary file not shown.
Binary file removed Screenshots/iOS/login-1.png
Binary file not shown.
Binary file removed Screenshots/iOS/login-2.png
Binary file not shown.
53 changes: 26 additions & 27 deletions android/app/BUCK
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
import re

# To learn about Buck see [Docs](https://buckbuild.com/).
# To run your application with Buck:
# - install Buck
Expand All @@ -11,56 +9,57 @@ import re
#

lib_deps = []

for jarfile in glob(['libs/*.jar']):
name = 'jars__' + re.sub(r'^.*/([^/]+)\.jar$', r'\1', jarfile)
name = 'jars__' + jarfile[jarfile.rindex('/') + 1: jarfile.rindex('.jar')]
lib_deps.append(':' + name)
prebuilt_jar(
name = name,
binary_jar = jarfile,
)

for aarfile in glob(['libs/*.aar']):
name = 'aars__' + re.sub(r'^.*/([^/]+)\.aar$', r'\1', aarfile)
name = 'aars__' + aarfile[aarfile.rindex('/') + 1: aarfile.rindex('.aar')]
lib_deps.append(':' + name)
android_prebuilt_aar(
name = name,
aar = aarfile,
)

android_library(
name = 'all-libs',
exported_deps = lib_deps
name = "all-libs",
exported_deps = lib_deps,
)

android_library(
name = 'app-code',
srcs = glob([
'src/main/java/**/*.java',
]),
deps = [
':all-libs',
':build_config',
':res',
],
name = "app-code",
srcs = glob([
"src/main/java/**/*.java",
]),
deps = [
":all-libs",
":build_config",
":res",
],
)

android_build_config(
name = 'build_config',
package = 'com.gllu',
name = "build_config",
package = "com.gllu",
)

android_resource(
name = 'res',
res = 'src/main/res',
package = 'com.gllu',
name = "res",
package = "com.gllu",
res = "src/main/res",
)

android_binary(
name = 'app',
package_type = 'debug',
manifest = 'src/main/AndroidManifest.xml',
keystore = '//android/keystores:debug',
deps = [
':app-code',
],
name = "app",
keystore = "//android/keystores:debug",
manifest = "src/main/AndroidManifest.xml",
package_type = "debug",
deps = [
":app-code",
],
)
17 changes: 10 additions & 7 deletions android/app/build.gradle
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
apply plugin: "com.android.application"

project.ext.envConfigFiles = [
debug: "config/.env.staging",
release: "config/.env.production",
staging: "config/.env.staging",
debug: ".env.staging",
release: ".env.production",
staging: ".env.staging",
]
apply from: project(':react-native-config').projectDir.getPath() + "/dotenv.gradle"

Expand Down Expand Up @@ -135,6 +135,9 @@ android {
applicationIdSuffix 'staging'
}
}
dexOptions {
jumboMode true
}
// applicationVariants are e.g. debug, release
applicationVariants.all { variant ->
variant.outputs.each { output ->
Expand All @@ -155,10 +158,10 @@ android {
dependencies {
compile project(':libs:cropper')
compile project(':react-native-image-crop-picker')
compile 'com.facebook.fresco:animated-base-support:0.11.0'
compile 'com.facebook.fresco:animated-gif:0.11.0'
compile 'com.facebook.fresco:animated-webp:0.11.0'
compile 'com.facebook.fresco:webpsupport:0.11.0'
compile 'com.facebook.fresco:animated-base-support:0.14.1'
compile 'com.facebook.fresco:animated-gif:0.14.1'
compile 'com.facebook.fresco:animated-webp:0.14.1'
compile 'com.facebook.fresco:webpsupport:0.14.1'
compile project(':react-native-google-analytics-bridge')
compile project(':react-native-flurry-analytics')
compile project(':react-native-fetch-blob')
Expand Down
9 changes: 9 additions & 0 deletions android/app/proguard-rules.pro
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,10 @@

-dontwarn com.facebook.react.**

# TextLayoutBuilder uses a non-public Android constructor within StaticLayout.
# See libs/proxy/src/main/java/com/facebook/fbui/textlayoutbuilder/proxy for details.
-dontwarn android.text.StaticLayout

# okhttp

-keepattributes Signature
Expand All @@ -75,3 +79,8 @@
-keepclasseswithmembers class * {
public (android.content.Context, android.util.AttributeSet, int);
}

# Animations Support
-keep class com.facebook.imagepipeline.animated.factory.AnimatedFactoryImpl {
public AnimatedFactoryImpl(com.facebook.imagepipeline.bitmaps.PlatformBitmapFactory, com.facebook.imagepipeline.core.ExecutorSupplier);
}
6 changes: 1 addition & 5 deletions android/app/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,17 +4,13 @@
android:versionName="1.0">

<uses-permission android:name="android.permission.INTERNET" />
<uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
<uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW" />
<uses-permission android:name="android.permission.CAMERA" />
<uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
<uses-permission android:name="android.permission.RECORD_AUDIO" />
<uses-permission android:name="android.permission.RECORD_VIDEO" />
<uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />

<uses-feature android:name="android.hardware.camera" />
<uses-feature android:name="android.hardware.camera.autofocus" />

Expand Down
Binary file modified android/app/src/main/assets/fonts/FontAwesome.ttf
Binary file not shown.
Binary file not shown.
Binary file modified android/app/src/main/assets/fonts/Octicons.ttf
Binary file not shown.
Empty file modified android/app/src/main/assets/fonts/Roboto.ttf
100755 → 100644
Empty file.
Empty file modified android/app/src/main/assets/fonts/Roboto_medium.ttf
100755 → 100644
Empty file.
Binary file not shown.
Binary file not shown.
Binary file added android/app/src/main/assets/fonts/Rubik-Bold.ttf
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
2 changes: 1 addition & 1 deletion android/app/src/main/java/com/gllu/MainApplication.java
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ protected String getJSBundleFile() {


@Override
protected boolean getUseDeveloperSupport() {
public boolean getUseDeveloperSupport() {
return BuildConfig.DEBUG;
}

Expand Down
Binary file modified android/app/src/main/res/mipmap-hdpi/ic_launcher.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 modified android/app/src/main/res/mipmap-mdpi/ic_launcher.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 modified android/app/src/main/res/mipmap-xhdpi/ic_launcher.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 modified android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 0 additions & 3 deletions android/app/src/main/res/values/strings.xml
Original file line number Diff line number Diff line change
@@ -1,7 +1,4 @@
<resources>



<string moduleConfig="true" name="reactNativeCodePush_androidDeploymentKey"></string>
<string name="app_name">gllu</string>
<string name="facebook_app_id">221848254918118</string>
Expand Down
3 changes: 1 addition & 2 deletions android/gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -13,12 +13,11 @@
# org.gradle.jvmargs=-Xmx2048m -XX:MaxPermSize=512m -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8

# When configured, Gradle will run in incubating parallel mode.
# This option should only be used with dsecoupled projects. More details, visit
# This option should only be used with decoupled projects. More details, visit
# http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
# org.gradle.parallel=true

android.useDeprecatedNdk=true

MYAPP_RELEASE_STORE_FILE=debug2.keystore
MYAPP_RELEASE_KEY_ALIAS=my-key-alias
MYAPP_RELEASE_STORE_PASSWORD=gllugllu
Expand Down
1 change: 0 additions & 1 deletion android/gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
#Wed Jan 11 12:55:29 IST 2017
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
Expand Down
12 changes: 6 additions & 6 deletions android/keystores/BUCK
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
keystore(
name = 'debug',
store = 'debug.keystore',
properties = 'debug.keystore.properties',
visibility = [
'PUBLIC',
],
name = "debug",
properties = "debug.keystore.properties",
store = "debug.keystore",
visibility = [
"PUBLIC",
],
)
32 changes: 32 additions & 0 deletions android/libs/cropper/build.gradle
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
apply plugin: 'com.android.library'
// https://docs.gradle.org/current/userguide/publishing_maven.html
// http://www.flexlabs.org/2013/06/using-local-aar-android-library-packages-in-gradle-builds


android {

compileSdkVersion 25
buildToolsVersion '25.0.2'
defaultConfig {
minSdkVersion 10
targetSdkVersion 25
versionCode 1
versionName "martin"
}
compileOptions {
sourceCompatibility JavaVersion.VERSION_1_7
targetCompatibility JavaVersion.VERSION_1_7
}
lintOptions {
abortOnError false
}
}


//apply from: 'https://raw.githubusercontent.com/ArthurHub/release-android-library/master/android-release-aar.gradle'

dependencies {
compile 'com.android.support:appcompat-v7:25.3.1'
compile "com.android.support:exifinterface:25.3.1"
}

4 changes: 4 additions & 0 deletions app.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
{
"name": "gllu",
"displayName": "gllu"
}
Empty file removed ios/Bolts.framework/Bolts
Empty file.
Loading