Skip to content

Commit

Permalink
Merge pull request #76 from shipt/development
Browse files Browse the repository at this point in the history
Release v.1.1.0
  • Loading branch information
jkhusanov authored Apr 12, 2024
2 parents 82132f1 + 991ae7e commit d60e650
Show file tree
Hide file tree
Showing 64 changed files with 9,794 additions and 9,588 deletions.
13 changes: 1 addition & 12 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,16 +3,13 @@ version: 2.1
defaults: &defaults
working_directory: ~/segmented-arc-for-react-native
docker:
- image: cimg/node:14.17.6
- image: cimg/node:18.15.0

yarn_install: &yarn_install
run:
name: Install yarn
command: yarn install --frozen-lockfile

orbs:
codecov: codecov/[email protected]

jobs:
test:
<<: *defaults
Expand All @@ -33,14 +30,6 @@ jobs:
name: Run unit tests
command: |
yarn test:coverage
environment:
JEST_JUNIT_OUTPUT_DIR: ./reports/junit/
- store_test_results:
path: ./reports/junit/
- store_artifacts:
path: ./reports/junit/
- codecov/upload:
file: ./coverage/coverage-final.json
deploy:
<<: *defaults
steps:
Expand Down
2 changes: 1 addition & 1 deletion .eslintrc
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
"jest/globals": true
},
"extends": ["plugin:react/recommended", "plugin:react-native/all"],
"parser": "babel-eslint",
"parser": "@babel/eslint-parser",
"rules": {
"react-native/no-unused-styles": 2,
"react-native/split-platform-components": 2,
Expand Down
2 changes: 1 addition & 1 deletion .github/CODEOWNERS
Validating CODEOWNERS rules …
Original file line number Diff line number Diff line change
@@ -1 +1 @@
* @jkhusanov @ChiefoftheOwls @marquessv
* @jkhusanov @calebmackdavenport @rkyle35242 @chaceburnette @joshuakg @rykugur @kathrynnlester @taylorcore
5 changes: 5 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
# Change Log

## v1.1.0

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

## v1.0.1

- Minor dependency updates
Expand Down
24 changes: 22 additions & 2 deletions MAINTAINERS.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,28 @@

---

### [Elyon Olaniran](https://github.com/ChiefoftheOwls)
### [Caleb Davenport](https://github.com/calebmackdavenport)

---

### [Marquess Valdez](https://github.com/MarquessV)
### [Kyle Easterling](https://github.com/rkyle35242)

---

### [Chace Burnette](https://github.com/chaceburnette)

---

### [Josh Griffin](https://github.com/joshuakg)

---

### [Dusty Jerome](https://github.com/rykugur)

---

### [Kathryn Lester](https://github.com/kathrynnlester)

---

### [Taylor Core](https://github.com/taylorcore)
File renamed without changes.
6 changes: 0 additions & 6 deletions example/.buckconfig

This file was deleted.

2 changes: 2 additions & 0 deletions example/.bundle/config
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
BUNDLE_PATH: "vendor/bundle"
BUNDLE_FORCE_RUBY_PLATFORM: 1
3 changes: 0 additions & 3 deletions example/.editorconfig

This file was deleted.

4 changes: 4 additions & 0 deletions example/.eslintrc.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
module.exports = {
root: true,
extends: '@react-native',
};
65 changes: 0 additions & 65 deletions example/.flowconfig

This file was deleted.

3 changes: 0 additions & 3 deletions example/.gitattributes

This file was deleted.

26 changes: 16 additions & 10 deletions example/.gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ DerivedData
*.hmap
*.ipa
*.xcuserstate
ios/.xcode.env.local

# Android/IntelliJ
#
Expand All @@ -29,32 +30,37 @@ build/
local.properties
*.iml
*.hprof
.cxx/
*.keystore
!debug.keystore

# node.js
#
node_modules/
npm-debug.log
yarn-error.log

# BUCK
buck-out/
\.buckd/
*.keystore
!debug.keystore

# fastlane
#
# It is recommended to not store the screenshots in the git repo. Instead, use fastlane to re-generate the
# screenshots whenever they are needed.
# For more information about the recommended setup visit:
# https://docs.fastlane.tools/best-practices/source-control/

*/fastlane/report.xml
*/fastlane/Preview.html
*/fastlane/screenshots
**/fastlane/report.xml
**/fastlane/Preview.html
**/fastlane/screenshots
**/fastlane/test_output

# Bundle artifact
*.jsbundle

# CocoaPods
# Ruby / CocoaPods
/ios/Pods/
/vendor/bundle/

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

# testing
/coverage
7 changes: 7 additions & 0 deletions example/.prettierrc.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
module.exports = {
arrowParens: 'avoid',
bracketSameLine: true,
bracketSpacing: true,
singleQuote: true,
trailingComma: 'all',
};
3 changes: 2 additions & 1 deletion example/.ruby-version
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
ruby-2.7.4
ruby-3.1.4

17 changes: 9 additions & 8 deletions example/App.js
Original file line number Diff line number Diff line change
Expand Up @@ -11,26 +11,26 @@ const App = () => {
scale: 0.25,
filledColor: '#FF746E',
emptyColor: '#F2F3F5',
data: { label: 'Red' }
data: { label: 'Red' },
},
{
scale: 0.25,
filledColor: '#F5E478',
emptyColor: '#F2F3F5',
data: { label: 'Yellow' }
data: { label: 'Yellow' },
},
{
scale: 0.25,
filledColor: '#78F5CA',
emptyColor: '#F2F3F5',
data: { label: 'Green' }
data: { label: 'Green' },
},
{
scale: 0.25,
filledColor: '#6E73FF',
emptyColor: '#F2F3F5',
data: { label: 'Blue' }
}
data: { label: 'Blue' },
},
];

const ranges = ['10', '20', '30', '40', '50'];
Expand All @@ -47,11 +47,12 @@ const App = () => {
isAnimated={true}
animationDelay={1000}
showArcRanges={showArcRanges}
ranges={ranges}
>
ranges={ranges}>
{metaData => (
<Pressable onPress={_handlePress} style={{ alignItems: 'center' }}>
<Text style={{ fontSize: 16, paddingTop: 16 }}>{metaData.lastFilledSegment.data.label}</Text>
<Text style={{ fontSize: 16, paddingTop: 16 }}>
{metaData.lastFilledSegment.data.label}
</Text>
<Text style={{ lineHeight: 80, fontSize: 24 }}>More info</Text>
</Pressable>
)}
Expand Down
9 changes: 9 additions & 0 deletions example/Gemfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
source 'https://rubygems.org'

# You may use http://rbenv.org/ or https://rvm.io/ to install and use this version
ruby ">= 2.6.10"

# Cocoapods 1.15 introduced a bug which break the build. We will remove the upper
# bound in the template on Cocoapods with next React Native release.
gem 'cocoapods', '>= 1.13', '< 1.15'
gem 'activesupport', '>= 6.1.7.5', '< 7.1.0'
Loading

0 comments on commit d60e650

Please sign in to comment.