Skip to content

Commit 4f0b6be

Browse files
authored
Merge pull request #119 from shipt/development
Release 2.0.0
2 parents c7b2b4d + f654868 commit 4f0b6be

File tree

68 files changed

+18946
-3868
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

68 files changed

+18946
-3868
lines changed

.gitignore

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -51,15 +51,7 @@ npm-debug.log
5151
yarn-debug.log
5252
yarn-error.log
5353
.npmrc
54-
55-
# BUCK
56-
buck-out/
57-
\.buckd/
58-
android/app/libs
59-
android/keystores/debug.keystore
60-
61-
# Expo
62-
.expo/*
54+
example/node_modules/
6355

6456
# Jest
6557
coverage/

CHANGELOG.md

Lines changed: 19 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,29 @@
11
# Change Log
22

3-
## v1.1.0
3+
## 2.0.0
4+
5+
- **BREAKING CHANGES**
6+
7+
- Handle crashes when not a finite number (i.e., `NaN`, `Infinity`, or `-Infinity`) numeric props were passed to the component by overriding them with default values
8+
- Display new warning component in production, it can be overridden with new `dataErrorComponent` prop
9+
- Display warnings in dev mode
10+
- Return errors with new `onDataError` prop that accepts a callback function
11+
12+
- Fixes component height when `arcDegree` prop is more than 180 degrees
13+
- Update example project to latest React Native version 0.78
14+
15+
## 1.2.2
16+
17+
- Dependency updates
18+
- Maintenance
19+
20+
## v1.2.1
421

522
- Use arc calculations to render range values https://github.com/shipt/segmented-arc-for-react-native/pull/86
623
- Arc drawing fix https://github.com/shipt/segmented-arc-for-react-native/pull/87
724
- Readme updates
825

9-
## v1.1.0
26+
## v1.1.1
1027

1128
- Add a support for scaling the display scale of arc segments https://github.com/shipt/segmented-arc-for-react-native/pull/70
1229
- Dependency updates

README.md

Lines changed: 27 additions & 22 deletions
Large diffs are not rendered by default.

example/.gitignore

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ DerivedData
2020
*.hmap
2121
*.ipa
2222
*.xcuserstate
23-
ios/.xcode.env.local
23+
**/.xcode.env.local
2424

2525
# Android/IntelliJ
2626
#
@@ -33,6 +33,7 @@ local.properties
3333
.cxx/
3434
*.keystore
3535
!debug.keystore
36+
.kotlin/
3637

3738
# node.js
3839
#
@@ -56,11 +57,19 @@ yarn-error.log
5657
*.jsbundle
5758

5859
# Ruby / CocoaPods
59-
/ios/Pods/
60+
**/Pods/
6061
/vendor/bundle/
6162

6263
# Temporary files created by Metro to check the health of the file watcher
6364
.metro-health-check*
6465

6566
# testing
6667
/coverage
68+
69+
# Yarn
70+
.yarn/*
71+
!.yarn/patches
72+
!.yarn/plugins
73+
!.yarn/releases
74+
!.yarn/sdks
75+
!.yarn/versions

example/Gemfile

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,8 @@ source 'https://rubygems.org'
33
# You may use http://rbenv.org/ or https://rvm.io/ to install and use this version
44
ruby ">= 2.6.10"
55

6-
# Cocoapods 1.15 introduced a bug which break the build. We will remove the upper
7-
# bound in the template on Cocoapods with next React Native release.
8-
gem 'cocoapods', '>= 1.13', '< 1.15'
9-
gem 'activesupport', '>= 6.1.7.5', '< 7.1.0'
6+
# Exclude problematic versions of cocoapods and activesupport that causes build failures.
7+
gem 'cocoapods', '>= 1.13', '!= 1.15.0', '!= 1.15.1'
8+
gem 'activesupport', '>= 6.1.7.5', '!= 7.1.0'
9+
gem 'xcodeproj', '< 1.26.0'
10+
gem 'concurrent-ruby', '< 1.3.4'

example/Gemfile.lock

Lines changed: 36 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -5,23 +5,32 @@ GEM
55
base64
66
nkf
77
rexml
8-
activesupport (7.0.8.1)
9-
concurrent-ruby (~> 1.0, >= 1.0.2)
8+
activesupport (7.2.2.1)
9+
base64
10+
benchmark (>= 0.3)
11+
bigdecimal
12+
concurrent-ruby (~> 1.0, >= 1.3.1)
13+
connection_pool (>= 2.2.5)
14+
drb
1015
i18n (>= 1.6, < 2)
16+
logger (>= 1.4.2)
1117
minitest (>= 5.1)
12-
tzinfo (~> 2.0)
13-
addressable (2.8.6)
14-
public_suffix (>= 2.0.2, < 6.0)
18+
securerandom (>= 0.3)
19+
tzinfo (~> 2.0, >= 2.0.5)
20+
addressable (2.8.7)
21+
public_suffix (>= 2.0.2, < 7.0)
1522
algoliasearch (1.27.5)
1623
httpclient (~> 2.8, >= 2.8.3)
1724
json (>= 1.5.1)
1825
atomos (0.1.3)
1926
base64 (0.2.0)
27+
benchmark (0.4.0)
28+
bigdecimal (3.1.9)
2029
claide (1.1.0)
21-
cocoapods (1.14.3)
30+
cocoapods (1.15.2)
2231
addressable (~> 2.8)
2332
claide (>= 1.0.2, < 2.0)
24-
cocoapods-core (= 1.14.3)
33+
cocoapods-core (= 1.15.2)
2534
cocoapods-deintegrate (>= 1.0.3, < 2.0)
2635
cocoapods-downloader (>= 2.1, < 3.0)
2736
cocoapods-plugins (>= 1.0.0, < 2.0)
@@ -36,7 +45,7 @@ GEM
3645
nap (~> 1.0)
3746
ruby-macho (>= 2.3.0, < 3.0)
3847
xcodeproj (>= 1.23.0, < 2.0)
39-
cocoapods-core (1.14.3)
48+
cocoapods-core (1.15.2)
4049
activesupport (>= 5.0, < 8)
4150
addressable (~> 2.8)
4251
algoliasearch (~> 1.0)
@@ -56,47 +65,53 @@ GEM
5665
netrc (~> 0.11)
5766
cocoapods-try (1.2.0)
5867
colored2 (3.1.2)
59-
concurrent-ruby (1.2.3)
68+
concurrent-ruby (1.3.3)
69+
connection_pool (2.5.0)
70+
drb (2.2.1)
6071
escape (0.0.4)
6172
ethon (0.16.0)
6273
ffi (>= 1.15.0)
63-
ffi (1.16.3)
74+
ffi (1.17.1)
6475
fourflusher (2.3.1)
6576
fuzzy_match (2.0.4)
6677
gh_inspector (1.1.3)
67-
httpclient (2.8.3)
68-
i18n (1.14.4)
78+
httpclient (2.9.0)
79+
mutex_m
80+
i18n (1.14.7)
6981
concurrent-ruby (~> 1.0)
70-
json (2.7.1)
71-
minitest (5.22.3)
82+
json (2.10.1)
83+
logger (1.6.6)
84+
minitest (5.25.4)
7285
molinillo (0.8.0)
86+
mutex_m (0.3.0)
7387
nanaimo (0.3.0)
7488
nap (1.1.0)
7589
netrc (0.11.0)
7690
nkf (0.2.0)
7791
public_suffix (4.0.7)
78-
rexml (3.2.8)
79-
strscan (>= 3.0.9)
92+
rexml (3.4.1)
8093
ruby-macho (2.5.1)
81-
strscan (3.1.0)
94+
securerandom (0.4.1)
8295
typhoeus (1.4.1)
8396
ethon (>= 0.9.0)
8497
tzinfo (2.0.6)
8598
concurrent-ruby (~> 1.0)
86-
xcodeproj (1.24.0)
99+
xcodeproj (1.25.1)
87100
CFPropertyList (>= 2.3.3, < 4.0)
88101
atomos (~> 0.1.3)
89102
claide (>= 1.0.2, < 2.0)
90103
colored2 (~> 3.1)
91104
nanaimo (~> 0.3.0)
92-
rexml (~> 3.2.4)
105+
rexml (>= 3.3.6, < 4.0)
93106

94107
PLATFORMS
95108
ruby
96109

97110
DEPENDENCIES
98-
activesupport (>= 6.1.7.5, < 7.1.0)
99-
cocoapods (>= 1.13, < 1.15)
111+
activesupport (>= 6.1.7.5, != 7.1.0)
112+
cocoapods (>= 1.13, != 1.15.1, != 1.15.0)
113+
concurrent-ruby (< 1.3.4)
114+
xcodeproj (< 1.26.0)
100115

101116
RUBY VERSION
102117
ruby 3.1.4p223

example/README.md

Lines changed: 41 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -2,58 +2,76 @@ This is a new [**React Native**](https://reactnative.dev) project, bootstrapped
22

33
# Getting Started
44

5-
> **Note**: Make sure you have completed the [React Native - Environment Setup](https://reactnative.dev/docs/environment-setup) instructions till "Creating a new application" step, before proceeding.
5+
> **Note**: Make sure you have completed the [Set Up Your Environment](https://reactnative.dev/docs/set-up-your-environment) guide before proceeding.
66
7-
## Step 1: Start the Metro Server
7+
## Step 1: Start Metro
88

9-
First, you will need to start **Metro**, the JavaScript _bundler_ that ships _with_ React Native.
9+
First, you will need to run **Metro**, the JavaScript build tool for React Native.
1010

11-
To start Metro, run the following command from the _root_ of your React Native project:
11+
To start the Metro dev server, run the following command from the root of your React Native project:
1212

13-
```bash
14-
# using npm
13+
```sh
14+
# Using npm
1515
npm start
1616

1717
# OR using Yarn
1818
yarn start
1919
```
2020

21-
## Step 2: Start your Application
21+
## Step 2: Build and run your app
2222

23-
Let Metro Bundler run in its _own_ terminal. Open a _new_ terminal from the _root_ of your React Native project. Run the following command to start your _Android_ or _iOS_ app:
23+
With Metro running, open a new terminal window/pane from the root of your React Native project, and use one of the following commands to build and run your Android or iOS app:
2424

25-
### For Android
25+
### Android
2626

27-
```bash
28-
# using npm
27+
```sh
28+
# Using npm
2929
npm run android
3030

3131
# OR using Yarn
3232
yarn android
3333
```
3434

35-
### For iOS
35+
### iOS
3636

37-
```bash
38-
# using npm
37+
For iOS, remember to install CocoaPods dependencies (this only needs to be run on first clone or after updating native deps).
38+
39+
The first time you create a new project, run the Ruby bundler to install CocoaPods itself:
40+
41+
```sh
42+
bundle install
43+
```
44+
45+
Then, and every time you update your native dependencies, run:
46+
47+
```sh
48+
bundle exec pod install
49+
```
50+
51+
For more information, please visit [CocoaPods Getting Started guide](https://guides.cocoapods.org/using/getting-started.html).
52+
53+
```sh
54+
# Using npm
3955
npm run ios
4056

4157
# OR using Yarn
4258
yarn ios
4359
```
4460

45-
If everything is set up _correctly_, you should see your new app running in your _Android Emulator_ or _iOS Simulator_ shortly provided you have set up your emulator/simulator correctly.
61+
If everything is set up correctly, you should see your new app running in the Android Emulator, iOS Simulator, or your connected device.
62+
63+
This is one way to run your app — you can also build it directly from Android Studio or Xcode.
4664

47-
This is one way to run your app — you can also run it directly from within Android Studio and Xcode respectively.
65+
## Step 3: Modify your app
4866

49-
## Step 3: Modifying your App
67+
Now that you have successfully run the app, let's make changes!
5068

51-
Now that you have successfully run the app, let's modify it.
69+
Open `App.tsx` in your text editor of choice and make some changes. When you save, your app will automatically update and reflect these changes — this is powered by [Fast Refresh](https://reactnative.dev/docs/fast-refresh).
5270

53-
1. Open `App.tsx` in your text editor of choice and edit some lines.
54-
2. For **Android**: Press the <kbd>R</kbd> key twice or select **"Reload"** from the **Developer Menu** (<kbd>Ctrl</kbd> + <kbd>M</kbd> (on Window and Linux) or <kbd>Cmd ⌘</kbd> + <kbd>M</kbd> (on macOS)) to see your changes!
71+
When you want to forcefully reload, for example to reset the state of your app, you can perform a full reload:
5572

56-
For **iOS**: Hit <kbd>Cmd ⌘</kbd> + <kbd>R</kbd> in your iOS Simulator to reload the app and see your changes!
73+
- **Android**: Press the <kbd>R</kbd> key twice or select **"Reload"** from the **Dev Menu**, accessed via <kbd>Ctrl</kbd> + <kbd>M</kbd> (Windows/Linux) or <kbd>Cmd ⌘</kbd> + <kbd>M</kbd> (macOS).
74+
- **iOS**: Press <kbd>R</kbd> in iOS Simulator.
5775

5876
## Congratulations! :tada:
5977

@@ -62,11 +80,11 @@ You've successfully run and modified your React Native App. :partying_face:
6280
### Now what?
6381

6482
- If you want to add this new React Native code to an existing application, check out the [Integration guide](https://reactnative.dev/docs/integration-with-existing-apps).
65-
- If you're curious to learn more about React Native, check out the [Introduction to React Native](https://reactnative.dev/docs/getting-started).
83+
- If you're curious to learn more about React Native, check out the [docs](https://reactnative.dev/docs/getting-started).
6684

6785
# Troubleshooting
6886

69-
If you can't get this to work, see the [Troubleshooting](https://reactnative.dev/docs/troubleshooting) page.
87+
If you're having issues getting the above steps to work, see the [Troubleshooting](https://reactnative.dev/docs/troubleshooting) page.
7088

7189
# Learn More
7290

0 commit comments

Comments
 (0)