mirror of
https://github.com/facebook/react-native.git
synced 2025-11-01 09:14:26 +00:00
f4de45800f
Summary: This Pull Request implements the PlatformColor proposal discussed at https://github.com/react-native-community/discussions-and-proposals/issues/126. The changes include implementations for iOS and Android as well as a PlatformColorExample page in RNTester. Every native platform has the concept of system defined colors. Instead of specifying a concrete color value the app developer can choose a system color that varies in appearance depending on a system theme settings such Light or Dark mode, accessibility settings such as a High Contrast mode, and even its context within the app such as the traits of a containing view or window. The proposal is to add true platform color support to react-native by extending the Flow type `ColorValue` with platform specific color type information for each platform and to provide a convenience function, `PlatformColor()`, for instantiating platform specific ColorValue objects. `PlatformColor(name [, name ...])` where `name` is a system color name on a given platform. If `name` does not resolve to a color for any reason, the next `name` in the argument list will be resolved and so on. If none of the names resolve, a RedBox error occurs. This allows a latest platform color to be used, but if running on an older platform it will fallback to a previous version. The function returns a `ColorValue`. On iOS the values of `name` is one of the iOS [UI Element](https://developer.apple.com/documentation/uikit/uicolor/ui_element_colors) or [Standard Color](https://developer.apple.com/documentation/uikit/uicolor/standard_colors) names such as `labelColor` or `systemFillColor`. On Android the `name` values are the same [app resource](https://developer.android.com/guide/topics/resources/providing-resources) path strings that can be expressed in XML: XML Resource: `@ [<package_name>:]<resource_type>/<resource_name>` Style reference from current theme: `?[<package_name>:][<resource_type>/]<resource_name>` For example: - `?android:colorError` - `?android:attr/colorError` - `?attr/colorPrimary` - `?colorPrimaryDark` - `android:color/holo_purple` - `color/catalyst_redbox_background` On iOS another type of system dynamic color can be created using the `IOSDynamicColor({dark: <color>, light:<color>})` method. The arguments are a tuple containing custom colors for light and dark themes. Such dynamic colors are useful for branding colors or other app specific colors that still respond automatically to system setting changes. Example: `<View style={{ backgroundColor: IOSDynamicColor({light: 'black', dark: 'white'}) }}/>` Other platforms could create platform specific functions similar to `IOSDynamicColor` per the needs of those platforms. For example, macOS has a similar dynamic color type that could be implemented via a `MacDynamicColor`. On Windows custom brushes that tint or otherwise modify a system brush could be created using a platform specific method. ## Changelog [General] [Added] - Added PlatformColor implementations for iOS and Android Pull Request resolved: https://github.com/facebook/react-native/pull/27908 Test Plan: The changes have been tested using the RNTester test app for iOS and Android. On iOS a set of XCTestCase's were added to the Unit Tests. <img width="924" alt="PlatformColor-ios-android" src="https://user-images.githubusercontent.com/30053638/73472497-ff183a80-433f-11ea-90d8-2b04338bbe79.png"> In addition `PlatformColor` support has been added to other out-of-tree platforms such as macOS and Windows has been implemented using these changes: react-native for macOS branch: https://github.com/microsoft/react-native/compare/master...tom-un:tomun/platformcolors react-native for Windows branch: https://github.com/microsoft/react-native-windows/compare/master...tom-un:tomun/platformcolors iOS |Light|Dark| |{F229354502}|{F229354515}| Android |Light|Dark| |{F230114392}|{F230114490}| {F230122700} Reviewed By: hramos Differential Revision: D19837753 Pulled By: TheSavior fbshipit-source-id: 82ca70d40802f3b24591bfd4b94b61f3c38ba829
105 lines
2.7 KiB
JavaScript
105 lines
2.7 KiB
JavaScript
/**
|
|
* Copyright (c) Facebook, Inc. and its affiliates.
|
|
*
|
|
* This source code is licensed under the MIT license found in the
|
|
* LICENSE file in the root directory of this source tree.
|
|
*
|
|
* @flow strict-local
|
|
* @format
|
|
*/
|
|
|
|
'use strict';
|
|
|
|
const React = require('react');
|
|
|
|
import ProgressBarAndroidNativeComponent from './ProgressBarAndroidNativeComponent';
|
|
|
|
import type {ViewProps} from '../View/ViewPropTypes';
|
|
import type {ColorValue} from '../../StyleSheet/StyleSheetTypes';
|
|
|
|
export type ProgressBarAndroidProps = $ReadOnly<{|
|
|
...ViewProps,
|
|
|
|
/**
|
|
* Style of the ProgressBar and whether it shows indeterminate progress (e.g. spinner).
|
|
*
|
|
* `indeterminate` can only be false if `styleAttr` is Horizontal, and requires a
|
|
* `progress` value.
|
|
*/
|
|
...
|
|
| {|
|
|
styleAttr: 'Horizontal',
|
|
indeterminate: false,
|
|
progress: number,
|
|
|}
|
|
| {|
|
|
typeAttr:
|
|
| 'Horizontal'
|
|
| 'Normal'
|
|
| 'Small'
|
|
| 'Large'
|
|
| 'Inverse'
|
|
| 'SmallInverse'
|
|
| 'LargeInverse',
|
|
indeterminate: true,
|
|
|},
|
|
/**
|
|
* Whether to show the ProgressBar (true, the default) or hide it (false).
|
|
*/
|
|
animating?: ?boolean,
|
|
/**
|
|
* Color of the progress bar.
|
|
*/
|
|
color?: ?ColorValue,
|
|
/**
|
|
* Used to locate this view in end-to-end tests.
|
|
*/
|
|
testID?: ?string,
|
|
|}>;
|
|
|
|
/**
|
|
* React component that wraps the Android-only `ProgressBar`. This component is
|
|
* used to indicate that the app is loading or there is activity in the app.
|
|
*
|
|
* Example:
|
|
*
|
|
* ```
|
|
* render: function() {
|
|
* var progressBar =
|
|
* <View style={styles.container}>
|
|
* <ProgressBar styleAttr="Inverse" />
|
|
* </View>;
|
|
|
|
* return (
|
|
* <MyLoadingComponent
|
|
* componentView={componentView}
|
|
* loadingView={progressBar}
|
|
* style={styles.loadingComponent}
|
|
* />
|
|
* );
|
|
* },
|
|
* ```
|
|
*/
|
|
const ProgressBarAndroid = (
|
|
props: ProgressBarAndroidProps,
|
|
forwardedRef: ?React.Ref<typeof ProgressBarAndroidNativeComponent>,
|
|
) => {
|
|
return <ProgressBarAndroidNativeComponent {...props} ref={forwardedRef} />;
|
|
};
|
|
|
|
const ProgressBarAndroidToExport = React.forwardRef(ProgressBarAndroid);
|
|
|
|
/* $FlowFixMe(>=0.89.0 site=react_native_android_fb) This comment suppresses an
|
|
* error found when Flow v0.89 was deployed. To see the error, delete this
|
|
* comment and run Flow. */
|
|
ProgressBarAndroidToExport.defaultProps = {
|
|
styleAttr: 'Normal',
|
|
indeterminate: true,
|
|
animating: true,
|
|
};
|
|
|
|
/* $FlowFixMe(>=0.89.0 site=react_native_android_fb) This comment suppresses an
|
|
* error found when Flow v0.89 was deployed. To see the error, delete this
|
|
* comment and run Flow. */
|
|
module.exports = (ProgressBarAndroidToExport: typeof ProgressBarAndroidNativeComponent);
|