feat: add responsive layouts #273
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Binary file not shown.
Binary file not shown.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,82 @@ | ||
| import * as React from 'react'; | ||
| import { SafeAreaView, StyleSheet, View, Button, Text } from 'react-native'; | ||
| import Rive, { Fit } from 'rive-react-native'; | ||
|
|
||
| const resourceName = 'layout_test'; | ||
|
|
||
| export default function ResponsiveLayout() { | ||
| const [scaleFactor, setScaleFactor] = React.useState(4.0); | ||
|
|
||
| const increaseScale = () => setScaleFactor((prev) => prev + 0.5); | ||
| const decreaseScale = () => | ||
| setScaleFactor((prev) => Math.max(0.5, prev - 0.5)); | ||
|
|
||
| return ( | ||
| <SafeAreaView style={styles.safeAreaViewContainer}> | ||
| <Rive | ||
| autoplay={true} | ||
| style={styles.animation} | ||
| fit={Fit.Layout} | ||
| layoutScaleFactor={scaleFactor} // If you do not set this (or set equal to "-1.0"), Rive will automatically scale the layout to match the device pixel ratio | ||
| resourceName={resourceName} | ||
| artboardName={'Artboard'} | ||
| stateMachineName={'State Machine 1'} | ||
| /> | ||
| <View style={styles.controls}> | ||
| <Text style={styles.label}>Layout Scale Factor</Text> | ||
| <View style={styles.scaleControls}> | ||
| <Button title="-" onPress={decreaseScale} /> | ||
| <View style={styles.scaleText}> | ||
| <Text>{scaleFactor.toFixed(1)}x</Text> | ||
| </View> | ||
| <Button title="+" onPress={increaseScale} /> | ||
| </View> | ||
| </View> | ||
| </SafeAreaView> | ||
| ); | ||
| } | ||
|
|
||
| const styles = StyleSheet.create({ | ||
| safeAreaViewContainer: { | ||
| flex: 1, | ||
| }, | ||
| animation: { | ||
| width: '100%', | ||
| flex: 1, | ||
| }, | ||
| controls: { | ||
| padding: 16, | ||
| alignItems: 'center', | ||
| }, | ||
| picker: { | ||
| flex: 1, | ||
| width: '100%', | ||
| }, | ||
| pickerWrapper: { | ||
| borderWidth: 1, | ||
| borderColor: 'black', | ||
| borderRadius: 5, | ||
| alignItems: 'center', | ||
| margin: 16, | ||
| }, | ||
| pickersWrapper: { | ||
| flex: 1, | ||
| padding: 16, | ||
| alignSelf: 'stretch', | ||
| }, | ||
| scaleControls: { | ||
| flexDirection: 'row', | ||
| alignItems: 'center', | ||
| marginVertical: 16, | ||
| gap: 16, | ||
| }, | ||
| scaleText: { | ||
| minWidth: 50, | ||
| alignItems: 'center', | ||
| }, | ||
| label: { | ||
| fontSize: 16, | ||
| fontWeight: '500', | ||
| marginTop: 16, | ||
| }, | ||
| }); |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -41,6 +41,8 @@ class RiveReactNativeView: RCTView, RivePlayerDelegate, RiveStateMachineDelegate | |
|
|
||
| @objc var fit: String? | ||
|
|
||
| @objc var layoutScaleFactor: NSNumber = -1.0 // -1.0 will inform the iOS runtime to determine the correct scale factor automatically | ||
|
There was a problem hiding this comment. This type is a There was a problem hiding this comment. Double doesn't work for nullable(optional) values in these bindings: https://reactnative.dev/docs/legacy/native-modules-ios#argument-types |
||
|
|
||
| @objc var alignment: String? | ||
|
|
||
| @objc var autoplay: Bool | ||
|
|
@@ -99,6 +101,10 @@ class RiveReactNativeView: RCTView, RivePlayerDelegate, RiveStateMachineDelegate | |
| if (changedProps.contains("alignment")) { | ||
| viewModel?.alignment = convertAlignment(alignment) | ||
| } | ||
|
|
||
| if (changedProps.contains("layoutScaleFactor")) { | ||
| viewModel?.layoutScaleFactor = layoutScaleFactor.doubleValue | ||
|
There was a problem hiding this comment. Ah, usage is here as a double value. But, still curious! |
||
| } | ||
| } | ||
|
|
||
| private func convertFit(_ fit: String? = nil) -> RiveFit { | ||
|
|
@@ -143,6 +149,8 @@ class RiveReactNativeView: RCTView, RivePlayerDelegate, RiveStateMachineDelegate | |
| updatedViewModel = RiveViewModel(fileName: name, fit: convertFit(fit), alignment: convertAlignment(alignment), autoPlay: autoplay, artboardName: artboardName) | ||
| } | ||
|
|
||
| updatedViewModel.layoutScaleFactor = layoutScaleFactor.doubleValue | ||
|
|
||
| createNewView(updatedViewModel: updatedViewModel) | ||
| requiresLocalResourceReconfigure = false | ||
| } | ||
|
|
@@ -161,6 +169,8 @@ class RiveReactNativeView: RCTView, RivePlayerDelegate, RiveStateMachineDelegate | |
| } else { | ||
| updatedViewModel = RiveViewModel(webURL: url, fit: convertFit(fit), alignment: convertAlignment(alignment), autoPlay: autoplay, artboardName: artboardName) | ||
| } | ||
|
|
||
| updatedViewModel.layoutScaleFactor = layoutScaleFactor.doubleValue | ||
|
|
||
| createNewView(updatedViewModel: updatedViewModel) | ||
| } | ||
|
|
||
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Probably fine, just calling this out as a thing that's been committed.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Ah I forgot this, will remove