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

Feature/styling #307

Merged
merged 39 commits into from
Feb 15, 2017
Merged
Changes from 1 commit
Commits
Show all changes
39 commits
Select commit Hold shift + click to select a range
8c75378
Set to use old bridge for compatibility with 0.30+
explorigin Aug 16, 2016
dea1f29
Fixed crash occurring when tabBarBackgroundColor or tabBarButtonColor…
Aug 25, 2016
047b2ea
Merge branch 'fix/android-tab-color-crash'
Aug 26, 2016
4072678
Merge branch 'master' of github.com:wix/react-native-navigation
Aug 26, 2016
8a3d5c3
Merge branch 'master' of github.com:wix/react-native-navigation
Aug 26, 2016
ba006af
Merge branch 'master' of github.com:wix/react-native-navigation
Aug 30, 2016
cf8e024
Merge branch 'master' of github.com:wix/react-native-navigation
Aug 30, 2016
6d79c5c
Merge branch 'master' of github.com:wix/react-native-navigation
Aug 31, 2016
12699b8
Merge branch 'master' of github.com:wix/react-native-navigation
Sep 13, 2016
bdd8608
Adds setStyle property to index.js
simonmitchell Sep 13, 2016
ab036cd
Adds native code for setting style on RCCViewController
simonmitchell Sep 13, 2016
d836f16
Merge branch 'master' of github.com:wix/react-native-navigation
Sep 13, 2016
0196a85
Fixes setStyle function
simonmitchell Sep 13, 2016
e7bdbb4
Fixes setting style on navigator
simonmitchell Sep 13, 2016
e843ea3
Adds some styling to tab bar controller and fixes some bugs
simonmitchell Sep 13, 2016
97bba03
Adds ability to set modal presentation style
simonmitchell Sep 13, 2016
4996985
Makes sure autoAdjustScrollViewInsets isn't propagated through when p…
simonmitchell Sep 13, 2016
b456653
Changes import to reference controllers rather than react-native-cont…
simonmitchell Sep 13, 2016
69ef47c
Fixed to work with RN 33
Sep 13, 2016
c2c6b52
Merge branch 'master' of github.com:wix/react-native-navigation into …
Sep 13, 2016
d228896
Fixes updating title font styling with new RCCTitleViewHelper logic
simonmitchell Sep 13, 2016
ef018fb
Fixes subtitle being shown
simonmitchell Sep 13, 2016
7d78793
Merge feature/styling into feature/rn33
simonmitchell Sep 13, 2016
4d98695
Merge pull request #1 from wix/master
simonmitchell Sep 26, 2016
9902ba6
Merge master into feature/styling
simonmitchell Sep 26, 2016
c38001b
Merge branch 'feature/rn33'
Sep 26, 2016
f580fc1
Merge origin/master into feature/styling
simonmitchell Oct 13, 2016
5d8b188
Adds extendedLayoutIncludesOpaqueBars to navigation styling
simonmitchell Oct 13, 2016
9966233
Adds ability to add shadows to text in navigation bar / tab bar
simonmitchell Nov 2, 2016
a45d7da
Merge branch 'master' into feature/styling
simonmitchell Dec 20, 2016
8f1c4a6
Merge branch 'master' into feature/styling
simonmitchell Dec 20, 2016
6049d56
Fixed merged ReactGateway.java file
Dec 20, 2016
23753e1
Fixed issue with rightButtons getting ignored in preference for empty…
Dec 22, 2016
7e5c9b4
Merge remote-tracking branch 'wix/master'
simonmitchell Jan 25, 2017
5e03646
Merge master into feature/styling
simonmitchell Jan 25, 2017
4a2f816
Merge remote-tracking branch 'wix/master' into feature/styling
simonmitchell Feb 6, 2017
f10860c
Fixes compiler error
simonmitchell Feb 9, 2017
240ccf3
Merge branch 'master' into feature/styling
guyca Feb 10, 2017
6c5050e
Merge branch 'master' into feature/styling
guyca Feb 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
Prev Previous commit
Next Next commit
Merge branch 'master' of github.com:wix/react-native-navigation
Conflicts:
	android/app/src/main/java/com/reactnativenavigation/react/NavigationReactGateway.java
  • Loading branch information
Tim Matthews committed Sep 13, 2016
commit 12699b8a823a567b8032284015b30b037fc5940c
Original file line number Diff line number Diff line change
Expand Up @@ -106,14 +106,12 @@ private void addAdditionalReactPackagesIfNeeded(List<ReactPackage> list) {
return;
}

private ReactInstanceManager createReactInstanceManager() {
ReactInstanceManager.Builder builder = ReactInstanceManager.builder()
.setUseOldBridge(true)
.setApplication(NavigationApplication.instance)
.setJSMainModuleName(NavigationApplication.instance.getJsEntryFileName())
.setBundleAssetName(NavigationApplication.instance.getBundleAssetName())
.setUseDeveloperSupport(NavigationApplication.instance.isDebug())
.setInitialLifecycleState(LifecycleState.BEFORE_RESUME);
for (ReactPackage reactPackage : additionalReactPackages) {
if (reactPackage instanceof MainReactPackage)
throw new RuntimeException("Do not create a new MainReactPackage. This is created for you.");
if (reactPackage instanceof NavigationReactPackage)
throw new RuntimeException("Do not create a new NavigationReactPackage. This is created for you.");
}

list.addAll(additionalReactPackages);
}
Expand Down
You are viewing a condensed version of this merge commit. You can view the full changes here.