status-im/react-native
2
0
Fork 0
mirror of https://github.com/status-im/react-native.git synced 2025-02-26 08:05:34 +00:00
Code Issues Projects Releases Wiki Activity

RTL support added for ToolbarAndroid via "rtl" property

Browse Source 
Summary: Closes https://github.com/facebook/react-native/pull/4378

Reviewed By: svcscm

Differential Revision: D2715052

Pulled By: mkonicek

fb-gh-sync-id: e24f5db230cd7329911797794e5ef150f6195c4a
This commit is contained in:
Sameer Rahmani 2015-12-03 04:38:07 -08:00 committed by facebook-github-bot-5
parent a68c731aca
commit c8eed6a361
2 changed files with 18 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Libraries/Components/ToolbarAndroid/ToolbarAndroid.android.js
View File

@ -125,6 +125,17 @@ var ToolbarAndroid = React.createClass({
* Sets the toolbar title color. * Sets the toolbar title color.
*/ */
titleColor: ReactPropTypes.string, titleColor: ReactPropTypes.string,
/**
* Used to set the toolbar direction to RTL.
* In addition to this property you need to add
*
* android:supportsRtl="true"
*
* to your application AndroidManifest.xml and then call
* `setLayoutDirection(LayoutDirection.RTL)` in your MainActivity
* `onCreate` method.
*/
rtl: ReactPropTypes.bool,
/** /**
* Used to locate this view in end-to-end tests. * Used to locate this view in end-to-end tests.
*/ */
@ -180,6 +191,7 @@ var toolbarAttributes = {
logo: true, logo: true,
navIcon: true, navIcon: true,
overflowIcon: true, overflowIcon: true,
rtl: true,
subtitle: true, subtitle: true,
subtitleColor: true, subtitleColor: true,
title: true, title: true,

6
ReactAndroid/src/main/java/com/facebook/react/views/toolbar/ReactToolbarManager.java
View File

@ -18,6 +18,7 @@ import android.content.res.Resources;
import android.content.res.TypedArray; import android.content.res.TypedArray;
import android.graphics.Color; import android.graphics.Color;
import android.os.SystemClock; import android.os.SystemClock;
import android.util.LayoutDirection;
import android.view.MenuItem; import android.view.MenuItem;
import android.view.View; import android.view.View;
@ -64,6 +65,11 @@ public class ReactToolbarManager extends ViewGroupManager<ReactToolbar> {
view.setOverflowIconSource(overflowIcon); view.setOverflowIconSource(overflowIcon);
} }
@ReactProp(name = "rtl")
public void setRtl(ReactToolbar view, boolean rtl) {
view.setLayoutDirection(rtl ? LayoutDirection.LTR : LayoutDirection.RTL);
}
@ReactProp(name = "subtitle") @ReactProp(name = "subtitle")
public void setSubtitle(ReactToolbar view, @Nullable String subtitle) { public void setSubtitle(ReactToolbar view, @Nullable String subtitle) {
view.setSubtitle(subtitle); view.setSubtitle(subtitle);