Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 2 additions & 2 deletions .github/actions/create-native-bundle/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,14 +16,14 @@ runs:
apt install curl -y
shell: bash
- name: "Download test project"
run: curl -L -o project.zip https://github.com/mendix/Native-Mobile-Resources/archive/refs/heads/mx/11.6.x.zip
run: curl -L -o project.zip https://github.com/mendix/Native-Mobile-Resources/archive/refs/heads/mx/11.6.1.zip
shell: bash
- name: "Extract test project"
uses: montudor/action-zip@0852c26906e00f8a315c704958823928d8018b28 # v1.0.0
with:
args: unzip -qq project.zip
- name: "Rename extracted folder"
run: mv Native-Mobile-Resources-mx-11.6.x NMR
run: mv Native-Mobile-Resources-mx-11.6.1 NMR
shell: bash
- name: "Extract deployment package"
uses: montudor/action-zip@0852c26906e00f8a315c704958823928d8018b28 # v1.0.0
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/NativePipeline.yml
Original file line number Diff line number Diff line change
Expand Up @@ -263,13 +263,13 @@ jobs:
apt update && apt upgrade -y
apt install curl -y
- name: "Download test project"
run: curl -L -o project.zip https://github.com/mendix/Native-Mobile-Resources/archive/refs/heads/mx/11.6.x.zip
run: curl -L -o project.zip https://github.com/mendix/Native-Mobile-Resources/archive/refs/heads/mx/11.6.1.zip
- name: "Extract test project"
uses: montudor/action-zip@0852c26906e00f8a315c704958823928d8018b28 # v1.0.0
with:
args: unzip -qq project.zip -d .
- name: "Rename extracted folder"
run: mv Native-Mobile-Resources-mx-11.6.x NMR
run: mv Native-Mobile-Resources-mx-11.6.1 NMR
- name: "Download resources artifact"
uses: actions/download-artifact@3e5f45b2cfb9172054b4087a40e8e0b5a5461e7c # v8.0.1
with:
Expand Down
2 changes: 1 addition & 1 deletion packages/jsActions/mobile-resources-native/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
},
"testProject": {
"githubUrl": "https://github.com/mendix/native-mobile-resources",
"branchName": "mx/11.6.x"
"branchName": "mx/11.6.1"
},
"scripts": {
"prestart": "rimraf dist",
Expand Down
2 changes: 1 addition & 1 deletion packages/jsActions/nanoflow-actions-native/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
},
"testProject": {
"githubUrl": "https://github.com/mendix/native-mobile-resources",
"branchName": "mx/11.6.x"
"branchName": "mx/11.6.1"
},
"scripts": {
"start": "rollup --config ../../../configs/jsactions/rollup.config.mjs --watch --configProject nanoflowcommons",
Expand Down
Original file line number Diff line number Diff line change
@@ -1,24 +1,18 @@
import { flattenStyles } from "@mendix/piw-native-utils-internal";
import { Component, JSX } from "react";
import { JSX } from "react";
import { ActivityIndicator as RNActivityIndicator, View } from "react-native";

import { ActivityIndicatorProps } from "../typings/ActivityIndicatorProps";
import { ActivityIndicatorStyle, defaultActivityStyle } from "./ui/Styles";

export type Props = ActivityIndicatorProps<ActivityIndicatorStyle>;

export class ActivityIndicator extends Component<Props> {
private readonly styles = flattenStyles(defaultActivityStyle, this.props.style);
export function ActivityIndicator(props: Props): JSX.Element {
const styles = flattenStyles(defaultActivityStyle, props.style);

render(): JSX.Element {
return (
<View style={this.styles.container}>
<RNActivityIndicator
testID={this.props.name}
size={this.styles.indicator.size}
color={this.styles.indicator.color}
/>
</View>
);
}
return (
<View style={styles.container}>
<RNActivityIndicator testID={props.name} size={styles.indicator.size} color={styles.indicator.color} />
</View>
);
}
Loading