Merge branch 'main' into 580-on-smaller-screen-sizes-the-lowest-part-of-obscreate-is-not-reachable

This commit is contained in:
Angie Ta
2023-08-02 19:00:24 -07:00
52 changed files with 1799 additions and 673 deletions

View File

@@ -134,7 +134,9 @@ We're using Nativewind, a styling system for React Native based on Tailwind CSS.
We have a custom set of icons stored as SVG files and compiled into a font. New icons should be included with issues in a ready-to-use form, but some editing may be required.
1. Add / edit SVGs to / in `src/images/icons/` (`git add` any new icons)
1. Add / edit SVGs to / in `src/images/icons/` (`git add` any new icons). Icon SVGs must meet the following requirements
* `<svg>` element must have `width="24"` and `height="24"` attributes
* No paths with `fill-rule="evenodd"` attribute or `fill-rule: evenodd styles`
1. `npm run icons`
1. Rebuild the app (you'll have newly-linked assets that won't hot reload)

View File

@@ -123,8 +123,8 @@ android {
applicationId "com.inaturalistreactnative"
minSdkVersion rootProject.ext.minSdkVersion
targetSdkVersion rootProject.ext.targetSdkVersion
versionCode 49
versionName "0.7.0"
versionCode 50
versionName "0.8.1"
setProperty("archivesBaseName", applicationId + "-v" + versionName + "+" + versionCode)
// Detox Android setup
testBuildType System.getProperty('testBuildType', 'debug')

View File

Binary file not shown.

View File

@@ -3,7 +3,7 @@
"data": [
{
"path": "assets/fonts/INatIcon.ttf",
"sha1": "5ee81524df59ba0d7ef0efafdf940f528a8ee5af"
"sha1": "94ddb30161ddbd61eda2524a57b2c5eec804401e"
},
{
"path": "assets/fonts/Whitney-BookItalic-Pro.otf",

View File

Binary file not shown.

View File

@@ -0,0 +1,10 @@
NEW
* Basic AR camera (just names, using Seek model)
* Withdrawing IDs on ObsDetail
* StandardCamera zoom button
FIXED
* Bottom sheet appearing over camera from ObsEdit
* Importing photo shows evidence as complete
* MyObs header jitter on scroll in Android
* Several LocationPicker problems

View File

@@ -4,19 +4,19 @@ PODS:
- BVLinearGradient (2.6.2):
- React-Core
- DoubleConversion (1.1.6)
- FBLazyVector (0.71.8)
- FBReactNativeSpec (0.71.8):
- FBLazyVector (0.71.12)
- FBReactNativeSpec (0.71.12):
- RCT-Folly (= 2021.07.22.00)
- RCTRequired (= 0.71.8)
- RCTTypeSafety (= 0.71.8)
- React-Core (= 0.71.8)
- React-jsi (= 0.71.8)
- ReactCommon/turbomodule/core (= 0.71.8)
- RCTRequired (= 0.71.12)
- RCTTypeSafety (= 0.71.12)
- React-Core (= 0.71.12)
- React-jsi (= 0.71.12)
- ReactCommon/turbomodule/core (= 0.71.12)
- fmt (6.2.1)
- glog (0.3.5)
- hermes-engine (0.71.8):
- hermes-engine/Pre-built (= 0.71.8)
- hermes-engine/Pre-built (0.71.8)
- hermes-engine (0.71.12):
- hermes-engine/Pre-built (= 0.71.12)
- hermes-engine/Pre-built (0.71.12)
- libevent (2.1.12)
- Permission-LocationWhenInUse (3.8.0):
- RNPermissions
@@ -39,26 +39,26 @@ PODS:
- fmt (~> 6.2.1)
- glog
- libevent
- RCTRequired (0.71.8)
- RCTTypeSafety (0.71.8):
- FBLazyVector (= 0.71.8)
- RCTRequired (= 0.71.8)
- React-Core (= 0.71.8)
- React (0.71.8):
- React-Core (= 0.71.8)
- React-Core/DevSupport (= 0.71.8)
- React-Core/RCTWebSocket (= 0.71.8)
- React-RCTActionSheet (= 0.71.8)
- React-RCTAnimation (= 0.71.8)
- React-RCTBlob (= 0.71.8)
- React-RCTImage (= 0.71.8)
- React-RCTLinking (= 0.71.8)
- React-RCTNetwork (= 0.71.8)
- React-RCTSettings (= 0.71.8)
- React-RCTText (= 0.71.8)
- React-RCTVibration (= 0.71.8)
- React-callinvoker (0.71.8)
- React-Codegen (0.71.8):
- RCTRequired (0.71.12)
- RCTTypeSafety (0.71.12):
- FBLazyVector (= 0.71.12)
- RCTRequired (= 0.71.12)
- React-Core (= 0.71.12)
- React (0.71.12):
- React-Core (= 0.71.12)
- React-Core/DevSupport (= 0.71.12)
- React-Core/RCTWebSocket (= 0.71.12)
- React-RCTActionSheet (= 0.71.12)
- React-RCTAnimation (= 0.71.12)
- React-RCTBlob (= 0.71.12)
- React-RCTImage (= 0.71.12)
- React-RCTLinking (= 0.71.12)
- React-RCTNetwork (= 0.71.12)
- React-RCTSettings (= 0.71.12)
- React-RCTText (= 0.71.12)
- React-RCTVibration (= 0.71.12)
- React-callinvoker (0.71.12)
- React-Codegen (0.71.12):
- FBReactNativeSpec
- hermes-engine
- RCT-Folly
@@ -69,209 +69,209 @@ PODS:
- React-jsiexecutor
- ReactCommon/turbomodule/bridging
- ReactCommon/turbomodule/core
- React-Core (0.71.8):
- React-Core (0.71.12):
- glog
- hermes-engine
- RCT-Folly (= 2021.07.22.00)
- React-Core/Default (= 0.71.8)
- React-cxxreact (= 0.71.8)
- React-Core/Default (= 0.71.12)
- React-cxxreact (= 0.71.12)
- React-hermes
- React-jsi (= 0.71.8)
- React-jsiexecutor (= 0.71.8)
- React-perflogger (= 0.71.8)
- React-jsi (= 0.71.12)
- React-jsiexecutor (= 0.71.12)
- React-perflogger (= 0.71.12)
- Yoga
- React-Core/CoreModulesHeaders (0.71.8):
- React-Core/CoreModulesHeaders (0.71.12):
- glog
- hermes-engine
- RCT-Folly (= 2021.07.22.00)
- React-Core/Default
- React-cxxreact (= 0.71.8)
- React-cxxreact (= 0.71.12)
- React-hermes
- React-jsi (= 0.71.8)
- React-jsiexecutor (= 0.71.8)
- React-perflogger (= 0.71.8)
- React-jsi (= 0.71.12)
- React-jsiexecutor (= 0.71.12)
- React-perflogger (= 0.71.12)
- Yoga
- React-Core/Default (0.71.8):
- React-Core/Default (0.71.12):
- glog
- hermes-engine
- RCT-Folly (= 2021.07.22.00)
- React-cxxreact (= 0.71.8)
- React-cxxreact (= 0.71.12)
- React-hermes
- React-jsi (= 0.71.8)
- React-jsiexecutor (= 0.71.8)
- React-perflogger (= 0.71.8)
- React-jsi (= 0.71.12)
- React-jsiexecutor (= 0.71.12)
- React-perflogger (= 0.71.12)
- Yoga
- React-Core/DevSupport (0.71.8):
- React-Core/DevSupport (0.71.12):
- glog
- hermes-engine
- RCT-Folly (= 2021.07.22.00)
- React-Core/Default (= 0.71.8)
- React-Core/RCTWebSocket (= 0.71.8)
- React-cxxreact (= 0.71.8)
- React-Core/Default (= 0.71.12)
- React-Core/RCTWebSocket (= 0.71.12)
- React-cxxreact (= 0.71.12)
- React-hermes
- React-jsi (= 0.71.8)
- React-jsiexecutor (= 0.71.8)
- React-jsinspector (= 0.71.8)
- React-perflogger (= 0.71.8)
- React-jsi (= 0.71.12)
- React-jsiexecutor (= 0.71.12)
- React-jsinspector (= 0.71.12)
- React-perflogger (= 0.71.12)
- Yoga
- React-Core/RCTActionSheetHeaders (0.71.8):
- React-Core/RCTActionSheetHeaders (0.71.12):
- glog
- hermes-engine
- RCT-Folly (= 2021.07.22.00)
- React-Core/Default
- React-cxxreact (= 0.71.8)
- React-cxxreact (= 0.71.12)
- React-hermes
- React-jsi (= 0.71.8)
- React-jsiexecutor (= 0.71.8)
- React-perflogger (= 0.71.8)
- React-jsi (= 0.71.12)
- React-jsiexecutor (= 0.71.12)
- React-perflogger (= 0.71.12)
- Yoga
- React-Core/RCTAnimationHeaders (0.71.8):
- React-Core/RCTAnimationHeaders (0.71.12):
- glog
- hermes-engine
- RCT-Folly (= 2021.07.22.00)
- React-Core/Default
- React-cxxreact (= 0.71.8)
- React-cxxreact (= 0.71.12)
- React-hermes
- React-jsi (= 0.71.8)
- React-jsiexecutor (= 0.71.8)
- React-perflogger (= 0.71.8)
- React-jsi (= 0.71.12)
- React-jsiexecutor (= 0.71.12)
- React-perflogger (= 0.71.12)
- Yoga
- React-Core/RCTBlobHeaders (0.71.8):
- React-Core/RCTBlobHeaders (0.71.12):
- glog
- hermes-engine
- RCT-Folly (= 2021.07.22.00)
- React-Core/Default
- React-cxxreact (= 0.71.8)
- React-cxxreact (= 0.71.12)
- React-hermes
- React-jsi (= 0.71.8)
- React-jsiexecutor (= 0.71.8)
- React-perflogger (= 0.71.8)
- React-jsi (= 0.71.12)
- React-jsiexecutor (= 0.71.12)
- React-perflogger (= 0.71.12)
- Yoga
- React-Core/RCTImageHeaders (0.71.8):
- React-Core/RCTImageHeaders (0.71.12):
- glog
- hermes-engine
- RCT-Folly (= 2021.07.22.00)
- React-Core/Default
- React-cxxreact (= 0.71.8)
- React-cxxreact (= 0.71.12)
- React-hermes
- React-jsi (= 0.71.8)
- React-jsiexecutor (= 0.71.8)
- React-perflogger (= 0.71.8)
- React-jsi (= 0.71.12)
- React-jsiexecutor (= 0.71.12)
- React-perflogger (= 0.71.12)
- Yoga
- React-Core/RCTLinkingHeaders (0.71.8):
- React-Core/RCTLinkingHeaders (0.71.12):
- glog
- hermes-engine
- RCT-Folly (= 2021.07.22.00)
- React-Core/Default
- React-cxxreact (= 0.71.8)
- React-cxxreact (= 0.71.12)
- React-hermes
- React-jsi (= 0.71.8)
- React-jsiexecutor (= 0.71.8)
- React-perflogger (= 0.71.8)
- React-jsi (= 0.71.12)
- React-jsiexecutor (= 0.71.12)
- React-perflogger (= 0.71.12)
- Yoga
- React-Core/RCTNetworkHeaders (0.71.8):
- React-Core/RCTNetworkHeaders (0.71.12):
- glog
- hermes-engine
- RCT-Folly (= 2021.07.22.00)
- React-Core/Default
- React-cxxreact (= 0.71.8)
- React-cxxreact (= 0.71.12)
- React-hermes
- React-jsi (= 0.71.8)
- React-jsiexecutor (= 0.71.8)
- React-perflogger (= 0.71.8)
- React-jsi (= 0.71.12)
- React-jsiexecutor (= 0.71.12)
- React-perflogger (= 0.71.12)
- Yoga
- React-Core/RCTSettingsHeaders (0.71.8):
- React-Core/RCTSettingsHeaders (0.71.12):
- glog
- hermes-engine
- RCT-Folly (= 2021.07.22.00)
- React-Core/Default
- React-cxxreact (= 0.71.8)
- React-cxxreact (= 0.71.12)
- React-hermes
- React-jsi (= 0.71.8)
- React-jsiexecutor (= 0.71.8)
- React-perflogger (= 0.71.8)
- React-jsi (= 0.71.12)
- React-jsiexecutor (= 0.71.12)
- React-perflogger (= 0.71.12)
- Yoga
- React-Core/RCTTextHeaders (0.71.8):
- React-Core/RCTTextHeaders (0.71.12):
- glog
- hermes-engine
- RCT-Folly (= 2021.07.22.00)
- React-Core/Default
- React-cxxreact (= 0.71.8)
- React-cxxreact (= 0.71.12)
- React-hermes
- React-jsi (= 0.71.8)
- React-jsiexecutor (= 0.71.8)
- React-perflogger (= 0.71.8)
- React-jsi (= 0.71.12)
- React-jsiexecutor (= 0.71.12)
- React-perflogger (= 0.71.12)
- Yoga
- React-Core/RCTVibrationHeaders (0.71.8):
- React-Core/RCTVibrationHeaders (0.71.12):
- glog
- hermes-engine
- RCT-Folly (= 2021.07.22.00)
- React-Core/Default
- React-cxxreact (= 0.71.8)
- React-cxxreact (= 0.71.12)
- React-hermes
- React-jsi (= 0.71.8)
- React-jsiexecutor (= 0.71.8)
- React-perflogger (= 0.71.8)
- React-jsi (= 0.71.12)
- React-jsiexecutor (= 0.71.12)
- React-perflogger (= 0.71.12)
- Yoga
- React-Core/RCTWebSocket (0.71.8):
- React-Core/RCTWebSocket (0.71.12):
- glog
- hermes-engine
- RCT-Folly (= 2021.07.22.00)
- React-Core/Default (= 0.71.8)
- React-cxxreact (= 0.71.8)
- React-Core/Default (= 0.71.12)
- React-cxxreact (= 0.71.12)
- React-hermes
- React-jsi (= 0.71.8)
- React-jsiexecutor (= 0.71.8)
- React-perflogger (= 0.71.8)
- React-jsi (= 0.71.12)
- React-jsiexecutor (= 0.71.12)
- React-perflogger (= 0.71.12)
- Yoga
- React-CoreModules (0.71.8):
- React-CoreModules (0.71.12):
- RCT-Folly (= 2021.07.22.00)
- RCTTypeSafety (= 0.71.8)
- React-Codegen (= 0.71.8)
- React-Core/CoreModulesHeaders (= 0.71.8)
- React-jsi (= 0.71.8)
- RCTTypeSafety (= 0.71.12)
- React-Codegen (= 0.71.12)
- React-Core/CoreModulesHeaders (= 0.71.12)
- React-jsi (= 0.71.12)
- React-RCTBlob
- React-RCTImage (= 0.71.8)
- ReactCommon/turbomodule/core (= 0.71.8)
- React-cxxreact (0.71.8):
- React-RCTImage (= 0.71.12)
- ReactCommon/turbomodule/core (= 0.71.12)
- React-cxxreact (0.71.12):
- boost (= 1.76.0)
- DoubleConversion
- glog
- hermes-engine
- RCT-Folly (= 2021.07.22.00)
- React-callinvoker (= 0.71.8)
- React-jsi (= 0.71.8)
- React-jsinspector (= 0.71.8)
- React-logger (= 0.71.8)
- React-perflogger (= 0.71.8)
- React-runtimeexecutor (= 0.71.8)
- React-hermes (0.71.8):
- React-callinvoker (= 0.71.12)
- React-jsi (= 0.71.12)
- React-jsinspector (= 0.71.12)
- React-logger (= 0.71.12)
- React-perflogger (= 0.71.12)
- React-runtimeexecutor (= 0.71.12)
- React-hermes (0.71.12):
- DoubleConversion
- glog
- hermes-engine
- RCT-Folly (= 2021.07.22.00)
- RCT-Folly/Futures (= 2021.07.22.00)
- React-cxxreact (= 0.71.8)
- React-cxxreact (= 0.71.12)
- React-jsi
- React-jsiexecutor (= 0.71.8)
- React-jsinspector (= 0.71.8)
- React-perflogger (= 0.71.8)
- React-jsi (0.71.8):
- React-jsiexecutor (= 0.71.12)
- React-jsinspector (= 0.71.12)
- React-perflogger (= 0.71.12)
- React-jsi (0.71.12):
- boost (= 1.76.0)
- DoubleConversion
- glog
- hermes-engine
- RCT-Folly (= 2021.07.22.00)
- React-jsiexecutor (0.71.8):
- React-jsiexecutor (0.71.12):
- DoubleConversion
- glog
- hermes-engine
- RCT-Folly (= 2021.07.22.00)
- React-cxxreact (= 0.71.8)
- React-jsi (= 0.71.8)
- React-perflogger (= 0.71.8)
- React-jsinspector (0.71.8)
- React-logger (0.71.8):
- React-cxxreact (= 0.71.12)
- React-jsi (= 0.71.12)
- React-perflogger (= 0.71.12)
- React-jsinspector (0.71.12)
- React-logger (0.71.12):
- glog
- react-native-cameraroll (5.7.2):
- React-Core
@@ -311,90 +311,90 @@ PODS:
- React-Core
- react-native-webview (11.26.1):
- React-Core
- React-perflogger (0.71.8)
- React-RCTActionSheet (0.71.8):
- React-Core/RCTActionSheetHeaders (= 0.71.8)
- React-RCTAnimation (0.71.8):
- React-perflogger (0.71.12)
- React-RCTActionSheet (0.71.12):
- React-Core/RCTActionSheetHeaders (= 0.71.12)
- React-RCTAnimation (0.71.12):
- RCT-Folly (= 2021.07.22.00)
- RCTTypeSafety (= 0.71.8)
- React-Codegen (= 0.71.8)
- React-Core/RCTAnimationHeaders (= 0.71.8)
- React-jsi (= 0.71.8)
- ReactCommon/turbomodule/core (= 0.71.8)
- React-RCTAppDelegate (0.71.8):
- RCTTypeSafety (= 0.71.12)
- React-Codegen (= 0.71.12)
- React-Core/RCTAnimationHeaders (= 0.71.12)
- React-jsi (= 0.71.12)
- ReactCommon/turbomodule/core (= 0.71.12)
- React-RCTAppDelegate (0.71.12):
- RCT-Folly
- RCTRequired
- RCTTypeSafety
- React-Core
- ReactCommon/turbomodule/core
- React-RCTBlob (0.71.8):
- React-RCTBlob (0.71.12):
- hermes-engine
- RCT-Folly (= 2021.07.22.00)
- React-Codegen (= 0.71.8)
- React-Core/RCTBlobHeaders (= 0.71.8)
- React-Core/RCTWebSocket (= 0.71.8)
- React-jsi (= 0.71.8)
- React-RCTNetwork (= 0.71.8)
- ReactCommon/turbomodule/core (= 0.71.8)
- React-RCTImage (0.71.8):
- React-Codegen (= 0.71.12)
- React-Core/RCTBlobHeaders (= 0.71.12)
- React-Core/RCTWebSocket (= 0.71.12)
- React-jsi (= 0.71.12)
- React-RCTNetwork (= 0.71.12)
- ReactCommon/turbomodule/core (= 0.71.12)
- React-RCTImage (0.71.12):
- RCT-Folly (= 2021.07.22.00)
- RCTTypeSafety (= 0.71.8)
- React-Codegen (= 0.71.8)
- React-Core/RCTImageHeaders (= 0.71.8)
- React-jsi (= 0.71.8)
- React-RCTNetwork (= 0.71.8)
- ReactCommon/turbomodule/core (= 0.71.8)
- React-RCTLinking (0.71.8):
- React-Codegen (= 0.71.8)
- React-Core/RCTLinkingHeaders (= 0.71.8)
- React-jsi (= 0.71.8)
- ReactCommon/turbomodule/core (= 0.71.8)
- React-RCTNetwork (0.71.8):
- RCTTypeSafety (= 0.71.12)
- React-Codegen (= 0.71.12)
- React-Core/RCTImageHeaders (= 0.71.12)
- React-jsi (= 0.71.12)
- React-RCTNetwork (= 0.71.12)
- ReactCommon/turbomodule/core (= 0.71.12)
- React-RCTLinking (0.71.12):
- React-Codegen (= 0.71.12)
- React-Core/RCTLinkingHeaders (= 0.71.12)
- React-jsi (= 0.71.12)
- ReactCommon/turbomodule/core (= 0.71.12)
- React-RCTNetwork (0.71.12):
- RCT-Folly (= 2021.07.22.00)
- RCTTypeSafety (= 0.71.8)
- React-Codegen (= 0.71.8)
- React-Core/RCTNetworkHeaders (= 0.71.8)
- React-jsi (= 0.71.8)
- ReactCommon/turbomodule/core (= 0.71.8)
- React-RCTSettings (0.71.8):
- RCTTypeSafety (= 0.71.12)
- React-Codegen (= 0.71.12)
- React-Core/RCTNetworkHeaders (= 0.71.12)
- React-jsi (= 0.71.12)
- ReactCommon/turbomodule/core (= 0.71.12)
- React-RCTSettings (0.71.12):
- RCT-Folly (= 2021.07.22.00)
- RCTTypeSafety (= 0.71.8)
- React-Codegen (= 0.71.8)
- React-Core/RCTSettingsHeaders (= 0.71.8)
- React-jsi (= 0.71.8)
- ReactCommon/turbomodule/core (= 0.71.8)
- React-RCTText (0.71.8):
- React-Core/RCTTextHeaders (= 0.71.8)
- React-RCTVibration (0.71.8):
- RCTTypeSafety (= 0.71.12)
- React-Codegen (= 0.71.12)
- React-Core/RCTSettingsHeaders (= 0.71.12)
- React-jsi (= 0.71.12)
- ReactCommon/turbomodule/core (= 0.71.12)
- React-RCTText (0.71.12):
- React-Core/RCTTextHeaders (= 0.71.12)
- React-RCTVibration (0.71.12):
- RCT-Folly (= 2021.07.22.00)
- React-Codegen (= 0.71.8)
- React-Core/RCTVibrationHeaders (= 0.71.8)
- React-jsi (= 0.71.8)
- ReactCommon/turbomodule/core (= 0.71.8)
- React-runtimeexecutor (0.71.8):
- React-jsi (= 0.71.8)
- ReactCommon/turbomodule/bridging (0.71.8):
- React-Codegen (= 0.71.12)
- React-Core/RCTVibrationHeaders (= 0.71.12)
- React-jsi (= 0.71.12)
- ReactCommon/turbomodule/core (= 0.71.12)
- React-runtimeexecutor (0.71.12):
- React-jsi (= 0.71.12)
- ReactCommon/turbomodule/bridging (0.71.12):
- DoubleConversion
- glog
- hermes-engine
- RCT-Folly (= 2021.07.22.00)
- React-callinvoker (= 0.71.8)
- React-Core (= 0.71.8)
- React-cxxreact (= 0.71.8)
- React-jsi (= 0.71.8)
- React-logger (= 0.71.8)
- React-perflogger (= 0.71.8)
- ReactCommon/turbomodule/core (0.71.8):
- React-callinvoker (= 0.71.12)
- React-Core (= 0.71.12)
- React-cxxreact (= 0.71.12)
- React-jsi (= 0.71.12)
- React-logger (= 0.71.12)
- React-perflogger (= 0.71.12)
- ReactCommon/turbomodule/core (0.71.12):
- DoubleConversion
- glog
- hermes-engine
- RCT-Folly (= 2021.07.22.00)
- React-callinvoker (= 0.71.8)
- React-Core (= 0.71.8)
- React-cxxreact (= 0.71.8)
- React-jsi (= 0.71.8)
- React-logger (= 0.71.8)
- React-perflogger (= 0.71.8)
- React-callinvoker (= 0.71.12)
- React-Core (= 0.71.12)
- React-cxxreact (= 0.71.12)
- React-jsi (= 0.71.12)
- React-logger (= 0.71.12)
- React-perflogger (= 0.71.12)
- ReactNativeExceptionHandler (2.10.10):
- React-Core
- RealmJS (11.8.0):
@@ -702,28 +702,28 @@ SPEC CHECKSUMS:
boost: 57d2868c099736d80fcd648bf211b4431e51a558
BVLinearGradient: 34a999fda29036898a09c6a6b728b0b4189e1a44
DoubleConversion: 5189b271737e1565bdce30deb4a08d647e3f5f54
FBLazyVector: f637f31eacba90d4fdeff3fa41608b8f361c173b
FBReactNativeSpec: 0d9a4f4de7ab614c49e98c00aedfd3bfbda33d59
FBLazyVector: 4eb7ee83e8d0ad7e20a829485295ff48823c4e4c
FBReactNativeSpec: b24809f97ae83c786928d56b732957195b4fa390
fmt: ff9d55029c625d3757ed641535fd4a75fedc7ce9
glog: 04b94705f318337d7ead9e6d17c019bd9b1f6b1b
hermes-engine: 47986d26692ae75ee7a17ab049caee8864f855de
hermes-engine: b60ebc812e0179a612d8146ac54730d533c804a2
libevent: 4049cae6c81cdb3654a443be001fb9bdceff7913
Permission-LocationWhenInUse: 1c80e4797ae587642a83125e80b86686cefeba53
Permission-PhotoLibrary: 31787bbe77d0d3ae6a5267b8435e4a2e9ef78f1d
RCT-Folly: 424b8c9a7a0b9ab2886ffe9c3b041ef628fd4fb1
RCTRequired: 8af6a32dfc2b65ec82193c2dee6e1011ff22ac2a
RCTTypeSafety: bee9dd161c175896c680d47ef1d9eaacf2b587f4
React: d850475db9ba8006a8b875d79e1e0d6ac8a0f8b6
React-callinvoker: 6a0c75475ddc17c9ed54e4ff0478074a18fd7ab5
React-Codegen: 786571642e87add634e7f4d299c85314ec6cc158
React-Core: 1adfab153f59e4f56e09b97a153089f466d7b8aa
React-CoreModules: 958d236715415d4ccdd5fa35c516cf0356637393
React-cxxreact: 2e7a6283807ce8755c3d501735acd400bec3b5cd
React-hermes: 8102c3112ba32207c3052619be8cfae14bf99d84
React-jsi: dd29264f041a587e91f994e4be97e86c127742b2
React-jsiexecutor: 747911ab5921641b4ed7e4900065896597142125
React-jsinspector: c712f9e3bb9ba4122d6b82b4f906448b8a281580
React-logger: 342f358b8decfbf8f272367f4eacf4b6154061be
RCTRequired: 4db5e3e18b906377a502da5b358ff159ba4783ed
RCTTypeSafety: 6c1a8aed043050de0d537336c95cd1be7b66c272
React: 214e77358d860a3ed707fede9088e7c00663a087
React-callinvoker: 8fc1c79c26fbcadce2a5d4a3cb4b2ced2dec3436
React-Codegen: 1517e1a59c594e6b5661d3d054209e838baa4fa7
React-Core: ea541085ca5be10b2be289c7d82eba368b5c4900
React-CoreModules: d9680e1d551eef1dd764df736a473cf25f701070
React-cxxreact: 0792e80e291d086b2cf588410f6bc6e752bc1d83
React-hermes: 0b1bba58112cb7421f1166d527a1a05489f48dbc
React-jsi: 1e41088515c4273ef5b118575337df4671851430
React-jsiexecutor: 509cd947c28834614808ce056ee8eb700a0662aa
React-jsinspector: ec4dcbfb1f4e72f04f826a0301eceee5fa7ca540
React-logger: 35538accacf2583693fbc3ee8b53e69a1776fcee
react-native-cameraroll: 134805127580aed23403b8c2cb1548920dd77b3a
react-native-config: 5330c8258265c1e5fdb8c009d2cabd6badd96727
react-native-exif-reader: b2ad2175125a5d7dbd399ac6bd3bc4ba8753f85a
@@ -740,19 +740,19 @@ SPEC CHECKSUMS:
react-native-safe-area-context: 1d596539b05a78f2b346e954e7c577f6f9be7544
react-native-sensitive-info: d44e909d065f9c0e15734245e5dd6a24b82e3dcd
react-native-webview: 9f111dfbcfc826084d6c507f569e5e03342ee1c1
React-perflogger: d21f182895de9d1b077f8a3cd00011095c8c9100
React-RCTActionSheet: 0151f83ef92d2a7139bba7dfdbc8066632a6d47b
React-RCTAnimation: 5ec9c0705bb2297549c120fe6473aa3e4a01e215
React-RCTAppDelegate: 9895fd1b6d1176d88c4b10ddc169b2e1300c91f0
React-RCTBlob: f3634eb45b6e7480037655e1ca93d1136ac984dd
React-RCTImage: 3c12cb32dec49549ae62ed6cba4018db43841ffc
React-RCTLinking: 310e930ee335ef25481b4a173d9edb64b77895f9
React-RCTNetwork: b6837841fe88303b0c04c1e3c01992b30f1f5498
React-RCTSettings: 600d91fe25fa7c16b0ff891304082440f2904b89
React-RCTText: a0a19f749088280c6def5397ed6211b811e7eef3
React-RCTVibration: 43ffd976a25f6057a7cf95ea3648ba4e00287f89
React-runtimeexecutor: 7c51ae9d4b3e9608a2366e39ccaa606aa551b9ed
ReactCommon: 85c98ab0a509e70bf5ee5d9715cf68dbf495b84c
React-perflogger: 75b0e25075c67565a830985f3c373e2eae5389e0
React-RCTActionSheet: a0c3e916b327e297d124d9ebe8b0c721840ee04d
React-RCTAnimation: 3da7025801d7bf0f8cfd94574d6278d5b82a8b88
React-RCTAppDelegate: f74a567e0bc905aaff66d47ab30e6548f727549c
React-RCTBlob: 53252ebabe7777fd1c440a34546c64e16b162908
React-RCTImage: e230761bd34d71362dd8b3d51b5cd72674935aa0
React-RCTLinking: 3294b1b540005628168e5a341963b0eddc3932e8
React-RCTNetwork: 00c6b2215e54a9fb015c53a5e02b0a852dbb8568
React-RCTSettings: 2e7e4964f45e9b24c6c32ad30b6ab2ef4a7e2ffc
React-RCTText: a9c712b13cab90e1432e0ad113edc8bdbc691248
React-RCTVibration: a283fefb8cc29d9740a7ff2e87f72ad10f25a433
React-runtimeexecutor: 7902246857a4ead4166869e6c42d4df329ff721d
ReactCommon: a6d1c76b9e10b439e41db225263341240e1cda9f
ReactNativeExceptionHandler: b11ff67c78802b2f62eed0e10e75cb1ef7947c60
RealmJS: 27b8d695fa4bc9606a4a4a378de55511edc2084c
RNAudioRecorderPlayer: 6638283925b46808310c9fdf803ebabc3abdbadc
@@ -773,7 +773,7 @@ SPEC CHECKSUMS:
RNVectorIcons: fcc2f6cb32f5735b586e66d14103a74ce6ad61f8
VisionCamera: f41b08470c9ae0a01be0d5e48f9fdd61602aa51f
VisionCameraPluginInatVision: 79bb258db75218889c74d0897ecba676492c4def
Yoga: 065f0b74dba4832d6e328238de46eb72c5de9556
Yoga: 39310a10944fc864a7550700de349183450f8aaa
PODFILE CHECKSUM: 30369fa5e81b6ffd4950226cf0ef9275489616be

View File

@@ -11,8 +11,11 @@
13B07FBC1A68108700A75B9A /* AppDelegate.mm in Sources */ = {isa = PBXBuildFile; fileRef = 13B07FB01A68108700A75B9A /* AppDelegate.mm */; };
13B07FBF1A68108700A75B9A /* Images.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 13B07FB51A68108700A75B9A /* Images.xcassets */; };
13B07FC11A68108700A75B9A /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 13B07FB71A68108700A75B9A /* main.m */; };
19FA77402A787B8A00982F02 /* taxonomy.json in Resources */ = {isa = PBXBuildFile; fileRef = 19FA773E2A787B8A00982F02 /* taxonomy.json */; };
19FA77412A787B8A00982F02 /* cvmodel.mlmodel in Sources */ = {isa = PBXBuildFile; fileRef = 19FA773F2A787B8A00982F02 /* cvmodel.mlmodel */; };
374CB22F29943E63005885ED /* Whitney-BookItalic-Pro.otf in Resources */ = {isa = PBXBuildFile; fileRef = 374CB22E29943E63005885ED /* Whitney-BookItalic-Pro.otf */; };
4FB3B444D46A4115B867B9CC /* inaturalisticons.ttf in Resources */ = {isa = PBXBuildFile; fileRef = EE004FD2EC174086A7AB2908 /* inaturalisticons.ttf */; };
763319F15FC44DBF89C9DEB0 /* INatIcon.ttf in Resources */ = {isa = PBXBuildFile; fileRef = A96A8C1FA45F4C8692AAE36F /* INatIcon.ttf */; };
7F29616A6267D5F6EC5F67B7 /* libPods-iNaturalistReactNative.a in Frameworks */ = {isa = PBXBuildFile; fileRef = B935DA49196EBFE90895C8DD /* libPods-iNaturalistReactNative.a */; };
81AB9BB82411601600AC10FF /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 81AB9BB72411601600AC10FF /* LaunchScreen.storyboard */; };
8B65ED3129F575C10054CCEF /* MainInterface.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 8B65ED2F29F575C10054CCEF /* MainInterface.storyboard */; };
@@ -23,8 +26,6 @@
A252B2AEA64E47C9AC1D20E8 /* Whitney-Light-Pro.otf in Resources */ = {isa = PBXBuildFile; fileRef = BA9D41ECEBFA4C38B74009B3 /* Whitney-Light-Pro.otf */; };
BA2479FA3D7B40A7BEF7B3CD /* Whitney-Medium-Pro.otf in Resources */ = {isa = PBXBuildFile; fileRef = D09FA3A0162844FF80A5EF96 /* Whitney-Medium-Pro.otf */; };
D1A158A7F6C9E77B651BB4AA /* libPods-iNaturalistReactNative-ShareExtension.a in Frameworks */ = {isa = PBXBuildFile; fileRef = ADBDD0D061046941F61CA31D /* libPods-iNaturalistReactNative-ShareExtension.a */; };
F005F5581901496B8576FB4E /* BuildFile in Resources */ = {isa = PBXBuildFile; };
41DE3088F97E402FBC6E6DD8 /* INatIcon.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 63D7A2871FF24F76861F64DD /* INatIcon.ttf */; };
/* End PBXBuildFile section */
/* Begin PBXContainerItemProxy section */
@@ -70,6 +71,8 @@
13B07FB61A68108700A75B9A /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = Info.plist; path = iNaturalistReactNative/Info.plist; sourceTree = "<group>"; };
13B07FB71A68108700A75B9A /* main.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = main.m; path = iNaturalistReactNative/main.m; sourceTree = "<group>"; };
19A5877328F8E3310016D128 /* iNaturalistReactNative-Bridging-Header.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "iNaturalistReactNative-Bridging-Header.h"; sourceTree = "<group>"; };
19FA773E2A787B8A00982F02 /* taxonomy.json */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.json; path = taxonomy.json; sourceTree = "<group>"; };
19FA773F2A787B8A00982F02 /* cvmodel.mlmodel */ = {isa = PBXFileReference; lastKnownFileType = file.mlmodel; path = cvmodel.mlmodel; sourceTree = "<group>"; };
374CB22E29943E63005885ED /* Whitney-BookItalic-Pro.otf */ = {isa = PBXFileReference; lastKnownFileType = file; name = "Whitney-BookItalic-Pro.otf"; path = "../assets/fonts/Whitney-BookItalic-Pro.otf"; sourceTree = "<group>"; };
52305C33CFC262F17ADC692E /* Pods-iNaturalistReactNative.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-iNaturalistReactNative.release.xcconfig"; path = "Target Support Files/Pods-iNaturalistReactNative/Pods-iNaturalistReactNative.release.xcconfig"; sourceTree = "<group>"; };
81AB9BB72411601600AC10FF /* LaunchScreen.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; name = LaunchScreen.storyboard; path = iNaturalistReactNative/LaunchScreen.storyboard; sourceTree = "<group>"; };
@@ -83,6 +86,7 @@
8BF3756EB416D21D28518C7D /* Pods-iNaturalistReactNative.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-iNaturalistReactNative.debug.xcconfig"; path = "Target Support Files/Pods-iNaturalistReactNative/Pods-iNaturalistReactNative.debug.xcconfig"; sourceTree = "<group>"; };
8FE03BB92A5EFCB2001B35BA /* small_inception_tf1.mlmodel */ = {isa = PBXFileReference; lastKnownFileType = file.mlmodel; path = small_inception_tf1.mlmodel; sourceTree = "<group>"; };
8FE03BBA2A5EFCB2001B35BA /* small_export_tax.json */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.json; path = small_export_tax.json; sourceTree = "<group>"; };
A96A8C1FA45F4C8692AAE36F /* INatIcon.ttf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = INatIcon.ttf; path = ../assets/fonts/INatIcon.ttf; sourceTree = "<group>"; };
ADBDD0D061046941F61CA31D /* libPods-iNaturalistReactNative-ShareExtension.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-iNaturalistReactNative-ShareExtension.a"; sourceTree = BUILT_PRODUCTS_DIR; };
B935DA49196EBFE90895C8DD /* libPods-iNaturalistReactNative.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-iNaturalistReactNative.a"; sourceTree = BUILT_PRODUCTS_DIR; };
BA9D41ECEBFA4C38B74009B3 /* Whitney-Light-Pro.otf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = "Whitney-Light-Pro.otf"; path = "../assets/fonts/Whitney-Light-Pro.otf"; sourceTree = "<group>"; };
@@ -90,7 +94,6 @@
DEB901D3F8FB2DAE1CCED0CC /* Pods-iNaturalistReactNative-ShareExtension.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-iNaturalistReactNative-ShareExtension.release.xcconfig"; path = "Target Support Files/Pods-iNaturalistReactNative-ShareExtension/Pods-iNaturalistReactNative-ShareExtension.release.xcconfig"; sourceTree = "<group>"; };
ED297162215061F000B7C4FE /* JavaScriptCore.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = JavaScriptCore.framework; path = System/Library/Frameworks/JavaScriptCore.framework; sourceTree = SDKROOT; };
EE004FD2EC174086A7AB2908 /* inaturalisticons.ttf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = inaturalisticons.ttf; path = ../assets/fonts/inaturalisticons.ttf; sourceTree = "<group>"; };
63D7A2871FF24F76861F64DD /* INatIcon.ttf */ = {isa = PBXFileReference; name = "INatIcon.ttf"; path = "../assets/fonts/INatIcon.ttf"; sourceTree = "<group>"; fileEncoding = undefined; lastKnownFileType = unknown; explicitFileType = undefined; includeInIndex = 0; };
/* End PBXFileReference section */
/* Begin PBXFrameworksBuildPhase section */
@@ -140,6 +143,8 @@
13B07FAE1A68108700A75B9A /* iNaturalistReactNative */ = {
isa = PBXGroup;
children = (
19FA773F2A787B8A00982F02 /* cvmodel.mlmodel */,
19FA773E2A787B8A00982F02 /* taxonomy.json */,
8FE03BBA2A5EFCB2001B35BA /* small_export_tax.json */,
8FE03BB92A5EFCB2001B35BA /* small_inception_tf1.mlmodel */,
8B8BAD0429F54EB300CE5C9F /* iNaturalistReactNative.entitlements */,
@@ -228,7 +233,7 @@
D09FA3A0162844FF80A5EF96 /* Whitney-Medium-Pro.otf */,
374CB22E29943E63005885ED /* Whitney-BookItalic-Pro.otf */,
EE004FD2EC174086A7AB2908 /* inaturalisticons.ttf */,
63D7A2871FF24F76861F64DD /* INatIcon.ttf */,
A96A8C1FA45F4C8692AAE36F /* INatIcon.ttf */,
);
name = Resources;
sourceTree = "<group>";
@@ -352,14 +357,14 @@
buildActionMask = 2147483647;
files = (
81AB9BB82411601600AC10FF /* LaunchScreen.storyboard in Resources */,
19FA77402A787B8A00982F02 /* taxonomy.json in Resources */,
8FE03BBC2A5EFCB2001B35BA /* small_export_tax.json in Resources */,
374CB22F29943E63005885ED /* Whitney-BookItalic-Pro.otf in Resources */,
13B07FBF1A68108700A75B9A /* Images.xcassets in Resources */,
A252B2AEA64E47C9AC1D20E8 /* Whitney-Light-Pro.otf in Resources */,
BA2479FA3D7B40A7BEF7B3CD /* Whitney-Medium-Pro.otf in Resources */,
4FB3B444D46A4115B867B9CC /* inaturalisticons.ttf in Resources */,
F005F5581901496B8576FB4E /* BuildFile in Resources */,
41DE3088F97E402FBC6E6DD8 /* INatIcon.ttf in Resources */,
763319F15FC44DBF89C9DEB0 /* INatIcon.ttf in Resources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
@@ -520,6 +525,7 @@
buildActionMask = 2147483647;
files = (
13B07FBC1A68108700A75B9A /* AppDelegate.mm in Sources */,
19FA77412A787B8A00982F02 /* cvmodel.mlmodel in Sources */,
8FE03BBB2A5EFCB2001B35BA /* small_inception_tf1.mlmodel in Sources */,
13B07FC11A68108700A75B9A /* main.m in Sources */,
);
@@ -621,7 +627,7 @@
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
CLANG_ENABLE_MODULES = YES;
CODE_SIGN_ENTITLEMENTS = iNaturalistReactNative/iNaturalistReactNative.entitlements;
CURRENT_PROJECT_VERSION = 49;
CURRENT_PROJECT_VERSION = 50;
DEVELOPMENT_TEAM = N5J7L4P93Z;
ENABLE_BITCODE = NO;
"EXCLUDED_ARCHS[sdk=iphonesimulator*]" = arm64;
@@ -653,7 +659,7 @@
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
CLANG_ENABLE_MODULES = YES;
CODE_SIGN_ENTITLEMENTS = iNaturalistReactNative/iNaturalistReactNative.entitlements;
CURRENT_PROJECT_VERSION = 49;
CURRENT_PROJECT_VERSION = 50;
DEVELOPMENT_TEAM = N5J7L4P93Z;
"EXCLUDED_ARCHS[sdk=iphonesimulator*]" = arm64;
INFOPLIST_FILE = iNaturalistReactNative/Info.plist;
@@ -825,7 +831,7 @@
CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;
CODE_SIGN_ENTITLEMENTS = "iNaturalistReactNative-ShareExtension/iNaturalistReactNative-ShareExtension.entitlements";
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 49;
CURRENT_PROJECT_VERSION = 50;
DEBUG_INFORMATION_FORMAT = dwarf;
DEVELOPMENT_TEAM = N5J7L4P93Z;
"EXCLUDED_ARCHS[sdk=iphonesimulator*]" = "i386 arm64";
@@ -869,7 +875,7 @@
CODE_SIGN_ENTITLEMENTS = "iNaturalistReactNative-ShareExtension/iNaturalistReactNative-ShareExtension.entitlements";
CODE_SIGN_STYLE = Automatic;
COPY_PHASE_STRIP = NO;
CURRENT_PROJECT_VERSION = 49;
CURRENT_PROJECT_VERSION = 50;
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
DEVELOPMENT_TEAM = N5J7L4P93Z;
"EXCLUDED_ARCHS[sdk=iphonesimulator*]" = "i386 arm64";

View File

@@ -17,11 +17,11 @@
<key>CFBundlePackageType</key>
<string>APPL</string>
<key>CFBundleShortVersionString</key>
<string>0.7.0</string>
<string>0.8.1</string>
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleVersion</key>
<string>49</string>
<string>50</string>
<key>ITSAppUsesNonExemptEncryption</key>
<false/>
<key>LSRequiresIPhoneOS</key>

View File

@@ -15,10 +15,10 @@
<key>CFBundlePackageType</key>
<string>BNDL</string>
<key>CFBundleShortVersionString</key>
<string>0.7.0</string>
<string>0.8.1</string>
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleVersion</key>
<string>49</string>
<string>50</string>
</dict>
</plist>

View File

@@ -3,7 +3,7 @@
"data": [
{
"path": "assets/fonts/INatIcon.ttf",
"sha1": "5ee81524df59ba0d7ef0efafdf940f528a8ee5af"
"sha1": "94ddb30161ddbd61eda2524a57b2c5eec804401e"
},
{
"path": "assets/fonts/Whitney-BookItalic-Pro.otf",

1288
package-lock.json generated
View File

File diff suppressed because it is too large Load Diff

View File

@@ -1,6 +1,6 @@
{
"name": "inaturalistreactnative",
"version": "0.7.0",
"version": "0.8.1",
"private": true,
"scripts": {
"android": "react-native run-android",
@@ -70,7 +70,7 @@
"react": "18.2.0",
"react-dom": "18.2.0",
"react-i18next": "^12.2.2",
"react-native": "0.71.8",
"react-native": "0.71.12",
"react-native-animated-dots-carousel": "^1.0.2",
"react-native-audio-recorder-player": "^3.5.3",
"react-native-circular-progress-indicator": "^4.4.2",
@@ -111,7 +111,7 @@
"react-native-svg-transformer": "^1.0.0",
"react-native-uuid": "^2.0.1",
"react-native-vector-icons": "^9.1.0",
"react-native-vision-camera": "github:inaturalist/react-native-vision-camera#1544-sroske-orientation-fix",
"react-native-vision-camera": "github:inaturalist/react-native-vision-camera#our-main-fork",
"react-native-webview": "^11.26.1",
"react-tinder-card": "^1.6.2",
"realm": "^11.8.0",
@@ -161,7 +161,7 @@
"jest": "^29.5.0",
"jest-circus": "^29.5.0",
"metro-config": "0.73.9",
"metro-react-native-babel-preset": "0.73.9",
"metro-react-native-babel-preset": "0.73.10",
"nock": "^13.3.0",
"patch-package": "^7.0.0",
"prettier": "^2.4.1",

View File

@@ -126,19 +126,22 @@ const ARCamera = ( {
let prediction = null;
let predictions = [];
if ( Platform.OS === "ios" ) {
prediction = {
rank_level: cvResults[0].rank,
id: cvResults[0].taxon_id,
name: cvResults[0].name,
score: cvResults[0].score
};
if ( cvResults.length > 0 ) {
const finestPrediction = cvResults[cvResults.length - 1];
prediction = {
rank_level: finestPrediction.rank,
id: finestPrediction.taxon_id,
name: finestPrediction.name,
score: finestPrediction.score
};
}
} else {
predictions = cvResults.map( r => {
predictions = cvResults?.map( r => {
const rank = Object.keys( r )[0];
return r[rank][0];
} )
.sort( ( a, b ) => a.rank - b.rank );
prediction = {
prediction = predictions && predictions.length > 0 && {
rank_level: predictions[0].rank,
id: predictions[0].taxon_id,
name: predictions[0].name,

View File

@@ -27,7 +27,7 @@ type Props = {
// Johannes: when I copied over the native code from the legacy react-native-camera on Android
// this value had to be a string. On iOS I changed the API to also accept a string (was number).
// Maybe, the intention would look clearer if we refactor to use a number here.
const confidenceThreshold = "0.7";
const confidenceThreshold = "0.5";
const FrameProcessorCamera = ( {
cameraRef,
@@ -61,12 +61,12 @@ const FrameProcessorCamera = ( {
// Reminder: this is a worklet, running on the UI thread.
try {
const results = InatVision.inatVision(
frame,
dirModel,
dirTaxonomy,
const results = InatVision.inatVision( frame, {
version: "1.0",
modelPath: dirModel,
taxonomyPath: dirTaxonomy,
confidenceThreshold
);
} );
REA.runOnJS( onTaxaDetected )( results );
} catch ( classifierError ) {
console.log( `Error: ${classifierError.message}` );

View File

@@ -68,9 +68,11 @@ const CameraContainer = ( ): Node => {
const devices = useCameraDevices( );
const device = devices[cameraPosition];
const hasFlash = device?.hasFlash;
const initialPhotoOptions = hasFlash
? { flash: "off" }
: { };
const initialPhotoOptions = {
enableAutoStabilization: true,
qualityPrioritization: "quality",
...( hasFlash && { flash: "off" } )
};
const [takePhotoOptions, setTakePhotoOptions] = useState( initialPhotoOptions );
const { deviceOrientation } = useDeviceOrientation( );
const [showDiscardSheet, setShowDiscardSheet] = useState( false );

View File

@@ -155,6 +155,8 @@ const CameraView = ( {
: null}
ref={cameraRef}
device={device}
preset="photo"
enableHighQualityPhotos
// Props for ARCamera only
frameProcessor={frameProcessor}
frameProcessorFps={frameProcessorFps}

View File

@@ -1,12 +1,29 @@
// @flow
import classnames from "classnames";
import { View } from "components/styledComponents";
import type { Node } from "react";
import React from "react";
import { ActivityIndicator } from "react-native-paper";
const LoadingIndicator = ( ): Node => (
<View className="h-[80px] w-[80px] bg-white right-[40px] bottom-[40px] justify-center">
type Props = {
getShadow: Function,
theme: Object
};
const LoadingIndicator = ( { getShadow, theme }: Props ): Node => (
<View
style={getShadow( theme.colors.primary )}
className={classnames(
"h-[80px]",
"w-[80px]",
"bg-white",
"right-[40px]",
"bottom-[40px]",
"justify-center",
"rounded-full"
)}
>
<ActivityIndicator large />
</View>
);

View File

@@ -10,9 +10,10 @@ import { View } from "components/styledComponents";
import type { Node } from "react";
import React from "react";
import MapView from "react-native-maps";
import { useTheme } from "react-native-paper";
import { ActivityIndicator, useTheme } from "react-native-paper";
import useTranslation from "sharedHooks/useTranslation";
import { getShadowStyle } from "styles/global";
import colors from "styles/tailwindColors";
import CrosshairCircle from "./CrosshairCircle";
import DisplayLatLng from "./DisplayLatLng";
@@ -33,43 +34,45 @@ const getShadow = shadowColor => getShadowStyle( {
} );
type Props = {
showMap: boolean,
loading: boolean,
accuracyTest: string,
region: Object,
mapView: any,
updateRegion: Function,
locationName: ?string,
updateLocationName: Function,
accuracy: number,
returnToUserLocation: Function,
keysToUpdate: Object,
accuracyTest: string,
goBackOnSave: Function,
toggleMapLayer: Function,
fetchingLocation: boolean,
hidePlaceResults: boolean,
keysToUpdate: Object,
loading: boolean,
locationName: ?string,
mapType: string,
setMapReady: Function,
mapView: any,
region: Object,
returnToUserLocation: Function,
selectPlaceResult: Function,
hidePlaceResults: boolean
setMapReady: Function,
showMap: boolean,
toggleMapLayer: Function,
updateLocationName: Function,
updateRegion: Function,
};
const LocationPicker = ( {
showMap,
loading,
accuracyTest,
region,
mapView,
updateRegion,
locationName,
updateLocationName,
accuracy,
returnToUserLocation,
keysToUpdate,
accuracyTest,
goBackOnSave,
toggleMapLayer,
fetchingLocation,
hidePlaceResults,
keysToUpdate,
loading,
locationName,
mapType,
setMapReady,
mapView,
region,
returnToUserLocation,
selectPlaceResult,
hidePlaceResults
setMapReady,
showMap,
toggleMapLayer,
updateLocationName,
updateRegion
}: Props ): Node => {
const theme = useTheme( );
const { t } = useTranslation( );
@@ -98,7 +101,10 @@ const LocationPicker = ( {
getShadow={getShadow}
/>
</View>
<View className="top-1/2 left-1/2 absolute z-10">
<View
className="top-1/2 left-1/2 absolute z-10"
pointerEvents="none"
>
{showMap && (
<CrosshairCircle
accuracyTest={accuracyTest}
@@ -107,7 +113,7 @@ const LocationPicker = ( {
)}
</View>
<View className="top-1/2 left-1/2 absolute z-10">
{loading && <LoadingIndicator />}
{loading && <LoadingIndicator getShadow={getShadow} theme={theme} />}
</View>
<View className="flex-shrink">
{showMap
@@ -148,13 +154,28 @@ const LocationPicker = ( {
style={getShadow( theme.colors.primary )}
className="absolute bottom-3 bg-white right-3 rounded-full"
>
<INatIconButton
icon="location-crosshairs"
onPress={returnToUserLocation}
height={46}
width={46}
size={24}
/>
{
fetchingLocation
? (
<INatIconButton
disabled
height={46}
width={46}
size={24}
>
<ActivityIndicator color={colors.darkGrayDisabled} />
</INatIconButton>
)
: (
<INatIconButton
icon="location-crosshairs"
onPress={returnToUserLocation}
height={46}
width={46}
size={24}
/>
)
}
</View>
</View>
<Footer

View File

@@ -36,27 +36,32 @@ const initialState = {
longitudeDelta: DELTA
},
loading: true,
fetchingLocation: false,
hidePlaceResults: true
};
const reducer = ( state, action ) => {
console.log( action.type, "action type" );
switch ( action.type ) {
case "ESTIMATE_ACCURACY":
return {
...state,
positional_accuracy: estimatedAccuracy( state.region.longitudeDelta )
};
case "FETCH_CURRENT_LOCATION":
case "SET_CURRENT_LOCATION":
return {
...state,
loading: false,
fetchingLocation: false,
region: {
...state.region,
latitude: action.userLocation?.latitude,
longitude: action.userLocation?.longitude
}
};
case "SET_FETCHING_LOCATION":
return {
...state,
fetchingLocation: true
};
case "INITIALIZE_MAP":
return {
...state,
@@ -64,8 +69,10 @@ const reducer = ( state, action ) => {
locationName: action.currentObservation?.place_guess,
region: {
...state.region,
latitude: action.currentObservation?.latitude,
longitude: action.currentObservation?.longitude,
// This was causing a crash when getting to the location picker before
// current location was fetched in the observation viewer
latitude: action.currentObservation?.latitude || 0.0,
longitude: action.currentObservation?.longitude || 0.0,
latitudeDelta: DELTA,
longitudeDelta: DELTA
}
@@ -133,11 +140,12 @@ const LocationPickerContainer = ( { route }: Props ): Node => {
const {
accuracy,
accuracyTest,
fetchingLocation,
hidePlaceResults,
loading,
locationName,
mapType,
region,
hidePlaceResults
region
} = state;
const showMap = region.latitude !== 0.0;
@@ -188,17 +196,25 @@ const LocationPickerContainer = ( { route }: Props ): Node => {
};
const returnToUserLocation = async ( ) => {
dispatch( { type: "SET_LOADING", loading: false } );
dispatch( { type: "SET_FETCHING_LOCATION" } );
const userLocation = await fetchUserLocation( );
dispatch( { type: "FETCH_CURRENT_LOCATION", userLocation } );
mapView.current?.getCamera().then( cam => {
if ( Platform.OS === "android" ) {
cam.zoom = 20;
} else {
cam.altitude = 100;
}
mapView.current?.animateCamera( cam );
} );
dispatch( { type: "SET_CURRENT_LOCATION", userLocation } );
mapView.current?.getCamera( )
.then( cam => {
if ( Platform.OS === "android" ) {
cam.zoom = 20;
} else {
cam.altitude = 100;
}
mapView.current?.animateCamera( cam );
} )
.catch( getCameraError => {
if ( getCameraError.message.match( /AirMapView.map is not valid/ ) ) {
// This doesn't seem to have any ill effect
return;
}
throw getCameraError;
} );
dispatch( { type: "ESTIMATE_ACCURACY" } );
};
@@ -220,6 +236,10 @@ const LocationPickerContainer = ( { route }: Props ): Node => {
[navigation, currentObservation]
);
useEffect( ( ) => {
if ( !showMap ) dispatch( { type: "SET_LOADING", loading: false } );
}, [showMap] );
const setMapReady = ( ) => dispatch( { type: "SET_LOADING", loading: false } );
const selectPlaceResult = place => {
@@ -237,23 +257,24 @@ const LocationPickerContainer = ( { route }: Props ): Node => {
return (
<LocationPicker
showMap={showMap}
loading={loading}
accuracyTest={accuracyTest}
region={region}
mapView={mapView}
updateRegion={updateRegion}
locationName={locationName}
updateLocationName={updateLocationName}
accuracy={accuracy}
returnToUserLocation={returnToUserLocation}
keysToUpdate={keysToUpdate}
accuracyTest={accuracyTest}
goBackOnSave={goBackOnSave}
toggleMapLayer={toggleMapLayer}
mapType={mapType}
setMapReady={setMapReady}
selectPlaceResult={selectPlaceResult}
fetchingLocation={fetchingLocation}
hidePlaceResults={hidePlaceResults}
keysToUpdate={keysToUpdate}
loading={loading}
locationName={locationName}
mapType={mapType}
mapView={mapView}
region={region}
returnToUserLocation={returnToUserLocation}
selectPlaceResult={selectPlaceResult}
setMapReady={setMapReady}
showMap={showMap}
toggleMapLayer={toggleMapLayer}
updateLocationName={updateLocationName}
updateRegion={updateRegion}
/>
);
};

View File

@@ -19,6 +19,10 @@ const WarningText = ( { accuracyTest, getShadow }: Props ): Node => {
const theme = useTheme( );
const { t } = useTranslation( );
if ( accuracyTest === "pass" ) {
return null;
}
const displayWarningText = ( ) => {
if ( accuracyTest === "acceptable" ) {
return t( "Zoom-in" );
@@ -33,7 +37,6 @@ const WarningText = ( { accuracyTest, getShadow }: Props ): Node => {
<View
pointerEvents="none"
className={classnames( "p-4 rounded-xl", {
"bg-transparent": accuracyTest === "pass",
"bg-white": accuracyTest === "acceptable",
"bg-warningRed": accuracyTest === "fail"
} )}

View File

@@ -87,7 +87,7 @@ const ActivityHeader = ( {
const renderIcon = () => {
if ( idWithdrawn ) {
return <INatIcon name="withdraw-id" color={colors.primary} size={22} />;
return <INatIcon name="ban" color={colors.primary} size={22} />;
}
if ( item.vision ) return <INatIcon name="sparkly-label" size={22} />;
if ( flaggedStatus ) return <INatIcon name="flag" color={colors.warningYellow} size={22} />;

View File

@@ -10,7 +10,9 @@ import colors from "styles/tailwindColors";
type Props = {
accessibilityLabel?: string,
children?: any,
color?: string,
disabled?: boolean,
height?: number,
icon: string,
onPress: Function,
@@ -30,7 +32,9 @@ const MIN_ACCESSIBLE_DIM = 44;
// the icon with `size`
const INatIconButton = ( {
accessibilityLabel,
children,
color,
disabled = false,
height = 44,
icon,
onPress,
@@ -58,6 +62,8 @@ const INatIconButton = ( {
<Pressable
accessibilityLabel={accessibilityLabel}
accessibilityRole="button"
accessibilityState={{ disabled }}
disabled={disabled}
onPress={onPress}
style={( { pressed } ) => [
{
@@ -97,7 +103,15 @@ const INatIconButton = ( {
}}
/>
)}
<INatIcon name={icon} size={size} color={color || theme.colors.primary} />
{
children || (
<INatIcon
name={icon}
size={size}
color={color || theme.colors.primary}
/>
)
}
</View>
</Pressable>
);

View File

@@ -105,7 +105,7 @@ const DisplayTaxonName = ( {
);
} );
if ( rankLevel > 10 ) {
if ( rank && rankLevel > 10 ) {
scientificNameComponent.unshift( `${rank} ` );
}

View File

@@ -9,80 +9,94 @@
"arrow-up-circle-dots": 61704,
"arrow-up-small": 61705,
"arrow-up": 61706,
"binoculars": 61707,
"book": 61708,
"briefcase": 61709,
"camera": 61710,
"check": 61711,
"checkmark-circle-outline": 61712,
"checkmark-circle": 61713,
"chevron-left-circle": 61714,
"chevron-left": 61715,
"chevron-right-circle": 61716,
"circle-dots": 61717,
"clock-outline": 61718,
"close-bold": 61719,
"close": 61720,
"comments-outline": 61721,
"comments": 61722,
"compass-rose-outline": 61723,
"copyright": 61724,
"crop": 61725,
"door-exit": 61726,
"flag": 61727,
"flash-off": 61728,
"flash-on": 61729,
"flip": 61730,
"gallery": 61731,
"gear": 61732,
"globe-outline": 61733,
"grid-square": 61734,
"grid": 61735,
"hamburger-menu": 61736,
"heart": 61737,
"help-circle-outline": 61738,
"help-circle": 61739,
"help": 61740,
"id-agree": 61741,
"inaturalist": 61742,
"info-circle-outline": 61743,
"kebab-menu": 61744,
"label-outline": 61745,
"label": 61746,
"laptop": 61747,
"layers": 61748,
"leaf": 61749,
"list-square": 61750,
"location-crosshairs": 61751,
"magnifying-glass": 61752,
"map-marker-outline": 61753,
"microphone-circle": 61754,
"microphone": 61755,
"noevidence": 61756,
"notifications-bell": 61757,
"pause-circle": 61758,
"pencil-outline": 61759,
"pencil": 61760,
"person": 61761,
"photos-outline": 61762,
"photos": 61763,
"play-circle": 61764,
"play": 61765,
"plus-bold": 61766,
"plus": 61767,
"pot-outline": 61768,
"rotate-exclamation": 61769,
"rotate-right": 61770,
"rotate": 61771,
"sliders": 61772,
"sound-bold-outline": 61773,
"sound-outline": 61774,
"sounds": 61775,
"sparkly-label": 61776,
"star-bold-outline": 61777,
"star": 61778,
"trash-outline": 61779,
"trash": 61780,
"triangle-exclamation": 61781,
"withdraw-id": 61782
"ban": 61707,
"binoculars": 61708,
"book": 61709,
"briefcase": 61710,
"camera": 61711,
"check": 61712,
"checkmark-circle-outline": 61713,
"checkmark-circle": 61714,
"chevron-left-circle": 61715,
"chevron-left": 61716,
"chevron-right-circle": 61717,
"circle-dots": 61718,
"clock-outline": 61719,
"close-bold": 61720,
"close": 61721,
"comments-outline": 61722,
"comments": 61723,
"compass-rose-outline": 61724,
"copyright": 61725,
"crop": 61726,
"door-exit": 61727,
"flag": 61728,
"flash-off": 61729,
"flash-on": 61730,
"flip": 61731,
"gallery": 61732,
"gear": 61733,
"globe-outline": 61734,
"grid-square": 61735,
"grid": 61736,
"hamburger-menu": 61737,
"heart": 61738,
"help-circle-outline": 61739,
"help-circle": 61740,
"help": 61741,
"iconic-actinopterygii": 61742,
"iconic-amphibia": 61743,
"iconic-animalia": 61744,
"iconic-arachnida": 61745,
"iconic-aves": 61746,
"iconic-chromista": 61747,
"iconic-fungi": 61748,
"iconic-insecta": 61749,
"iconic-mammalia": 61750,
"iconic-mollusica": 61751,
"iconic-plantae": 61752,
"iconic-protozoa": 61753,
"iconic-reptilia": 61754,
"iconic-unknown": 61755,
"id-agree": 61756,
"inaturalist": 61757,
"info-circle-outline": 61758,
"kebab-menu": 61759,
"label-outline": 61760,
"label": 61761,
"laptop": 61762,
"layers": 61763,
"leaf": 61764,
"list-square": 61765,
"location-crosshairs": 61766,
"magnifying-glass": 61767,
"map-marker-outline": 61768,
"microphone-circle": 61769,
"microphone": 61770,
"noevidence": 61771,
"notifications-bell": 61772,
"pause-circle": 61773,
"pencil-outline": 61774,
"pencil": 61775,
"person": 61776,
"photos-outline": 61777,
"photos": 61778,
"play-circle": 61779,
"play": 61780,
"plus-bold": 61781,
"plus": 61782,
"pot-outline": 61783,
"rotate-exclamation": 61784,
"rotate-right": 61785,
"rotate": 61786,
"sliders": 61787,
"sound-bold-outline": 61788,
"sound-outline": 61789,
"sounds": 61790,
"sparkly-label": 61791,
"star-bold-outline": 61792,
"star": 61793,
"trash-outline": 61794,
"trash": 61795,
"triangle-exclamation": 61796
}

View File

Before

Width:  |  Height:  |  Size: 825 B

After

Width:  |  Height:  |  Size: 825 B

View File

@@ -1,4 +1,4 @@
<?xml version="1.0"?>
<svg width="24" height="24" viewBox="0 0 18 20">
<path clip-rule="evenodd" d="M11 0H2C1.46957 0 0.960859 0.210714 0.585786 0.585786C0.210714 0.960859 0 1.46957 0 2V18C0 18.5304 0.210714 19.0391 0.585786 19.4142C0.960859 19.7893 1.46957 20 2 20H11C11.5304 20 12.0391 19.7893 12.4142 19.4142C12.7893 19.0391 13 18.5304 13 18V17C13 16.7348 12.8946 16.4804 12.7071 16.2929C12.5196 16.1054 12.2652 16 12 16C11.7348 16 11.4804 16.1054 11.2929 16.2929C11.1054 16.4804 11 16.7348 11 17V18H2V2H11V3C11 3.26522 11.1054 3.51957 11.2929 3.70711C11.4804 3.89464 11.7348 4 12 4C12.2652 4 12.5196 3.89464 12.7071 3.70711C12.8946 3.51957 13 3.26522 13 3V2C13 1.46957 12.7893 0.960859 12.4142 0.585786C12.0391 0.210714 11.5304 0 11 0ZM14.115 14.2951C13.725 14.6851 13.095 14.6851 12.705 14.2951C12.5181 14.108 12.413 13.8543 12.4128 13.5898C12.4126 13.3253 12.5173 13.0715 12.704 12.8841L14.58 11.0001H5.91C5.64478 11.0001 5.39043 10.8948 5.20289 10.7072C5.01536 10.5197 4.91 10.2653 4.91 10.0001C4.91 9.73491 5.01536 9.48056 5.20289 9.29302C5.39043 9.10548 5.64478 9.00013 5.91 9.00013H14.58L12.704 7.11613C12.5322 6.92604 12.44 6.6772 12.4465 6.42106C12.4529 6.16491 12.5576 5.92104 12.7387 5.73987C12.9199 5.55869 13.1638 5.45405 13.4199 5.44758C13.6761 5.44112 13.9249 5.53332 14.115 5.70513L17.703 9.29313C17.8905 9.48065 17.9958 9.73496 17.9958 10.0001C17.9958 10.2653 17.8905 10.5196 17.703 10.7071L14.115 14.2951Z"/>
<path d="M11 0H2C1.46957 0 0.960859 0.210714 0.585786 0.585786C0.210714 0.960859 0 1.46957 0 2V18C0 18.5304 0.210714 19.0391 0.585786 19.4142C0.960859 19.7893 1.46957 20 2 20H11C11.5304 20 12.0391 19.7893 12.4142 19.4142C12.7893 19.0391 13 18.5304 13 18V17C13 16.7348 12.8946 16.4804 12.7071 16.2929C12.5196 16.1054 12.2652 16 12 16C11.7348 16 11.4804 16.1054 11.2929 16.2929C11.1054 16.4804 11 16.7348 11 17V18H2V2H11V3C11 3.26522 11.1054 3.51957 11.2929 3.70711C11.4804 3.89464 11.7348 4 12 4C12.2652 4 12.5196 3.89464 12.7071 3.70711C12.8946 3.51957 13 3.26522 13 3V2C13 1.46957 12.7893 0.960859 12.4142 0.585786C12.0391 0.210714 11.5304 0 11 0ZM14.115 14.2951C13.725 14.6851 13.095 14.6851 12.705 14.2951C12.5181 14.108 12.413 13.8543 12.4128 13.5898C12.4126 13.3253 12.5173 13.0715 12.704 12.8841L14.58 11.0001H5.91C5.64478 11.0001 5.39043 10.8948 5.20289 10.7072C5.01536 10.5197 4.91 10.2653 4.91 10.0001C4.91 9.73491 5.01536 9.48056 5.20289 9.29302C5.39043 9.10548 5.64478 9.00013 5.91 9.00013H14.58L12.704 7.11613C12.5322 6.92604 12.44 6.6772 12.4465 6.42106C12.4529 6.16491 12.5576 5.92104 12.7387 5.73987C12.9199 5.55869 13.1638 5.45405 13.4199 5.44758C13.6761 5.44112 13.9249 5.53332 14.115 5.70513L17.703 9.29313C17.8905 9.48065 17.9958 9.73496 17.9958 10.0001C17.9958 10.2653 17.8905 10.5196 17.703 10.7071L14.115 14.2951Z"/>
</svg>

Before

Width:  |  Height:  |  Size: 1.4 KiB

After

Width:  |  Height:  |  Size: 1.4 KiB

View File

@@ -1,4 +1,4 @@
<?xml version="1.0"?>
<svg width="24" height="24" viewBox="0 0 22 22">
<path fill-rule="nonzero" clip-rule="evenodd" d="M13.0003 1L13.0008 2.8648C13.0008 3.09288 13.1558 3.29041 13.3736 3.35799C13.8443 3.50404 14.2965 3.69239 14.7255 3.9186C14.9274 4.02501 15.1767 3.99486 15.3381 3.83351L16.6569 2.51472C17.0173 2.15423 17.5846 2.1265 17.9769 2.43152L18.0711 2.51472L19.4853 3.92893C19.8458 4.28941 19.8735 4.85664 19.5685 5.24893L19.4853 5.34314L18.1665 6.6619C18.0051 6.82325 17.975 7.07262 18.0814 7.27447C18.3077 7.70367 18.4961 8.15594 18.6421 8.62683C18.7097 8.8447 18.9073 8.99966 19.1354 8.99968L21 8.99989C21.5522 9.00006 22 9.44776 22 10V12C22 12.5522 21.5522 12.9999 21 13.0001L19.1354 13.0003C18.9073 13.0003 18.7097 13.1553 18.6421 13.3732C18.4961 13.8441 18.3077 14.2963 18.0814 14.7255C17.975 14.9274 18.0051 15.1767 18.1665 15.3381L19.4853 16.6569C19.8458 17.0173 19.8735 17.5846 19.5685 17.9769L19.4853 18.0711L18.0711 19.4853C17.7106 19.8458 17.1434 19.8735 16.7511 19.5685L16.6569 19.4853L15.3381 18.1665C15.1767 18.0051 14.9274 17.975 14.7255 18.0814C14.2963 18.3077 13.8441 18.4961 13.3732 18.6421C13.1553 18.7097 13.0003 18.9073 13.0003 19.1354L13.0001 21C12.9999 21.5522 12.5522 22 12 22H10C9.48716 22 9.06449 21.6142 9.00673 21.1168L9.0002 21L9.00057 19.1358C9.00061 18.9077 8.84561 18.71 8.62766 18.6424C8.15647 18.4963 7.70392 18.3078 7.27447 18.0814C7.07262 17.975 6.82325 18.0051 6.6619 18.1665L5.34314 19.4853C4.98266 19.8458 4.41543 19.8735 4.02314 19.5685L3.92893 19.4853L2.51472 18.0711C2.15423 17.7106 2.1265 17.1434 2.43152 16.7511L2.51472 16.6569L3.83351 15.3381C3.99486 15.1767 4.02501 14.9274 3.9186 14.7255C3.69233 14.2963 3.50393 13.8441 3.35787 13.3732C3.29028 13.1553 3.0927 13.0003 2.86459 13.0003L1 13.0001C0.447758 12.9999 0 12.5522 0 12V10C0 9.44776 0.447758 9.00006 1 8.99989L2.86459 8.99968C3.0927 8.99966 3.29028 8.8447 3.35787 8.62683C3.50393 8.15594 3.69233 7.70367 3.9186 7.27447C4.02501 7.07262 3.99486 6.82325 3.83351 6.6619L2.51472 5.34314C2.15423 4.98266 2.1265 4.41543 2.43152 4.02314L2.51472 3.92893L3.92893 2.51472C4.28941 2.15423 4.85664 2.1265 5.24893 2.43152L5.34314 2.51472L6.6619 3.83351C6.82325 3.99486 7.07262 4.02501 7.27447 3.9186C7.7038 3.69226 8.15621 3.50382 8.62724 3.35774C8.84516 3.29016 9.00014 3.09252 9.00013 2.86437L9.00004 1C8.99998 0.487164 9.386 0.0644759 9.88334 0.00668893L10 0H12C12.5522 0.000265457 12.9999 0.447819 13.0003 1ZM11 6.41667C8.46869 6.41667 6.41667 8.46869 6.41667 11C6.41667 13.5313 8.46869 15.5833 11 15.5833C13.5313 15.5833 15.5833 13.5313 15.5833 11C15.5833 8.46869 13.5313 6.41667 11 6.41667Z"/>
<path d="M13.0003 1L13.0008 2.8648C13.0008 3.09288 13.1558 3.29041 13.3736 3.35799C13.8443 3.50404 14.2965 3.69239 14.7255 3.9186C14.9274 4.02501 15.1767 3.99486 15.3381 3.83351L16.6569 2.51472C17.0173 2.15423 17.5846 2.1265 17.9769 2.43152L18.0711 2.51472L19.4853 3.92893C19.8458 4.28941 19.8735 4.85664 19.5685 5.24893L19.4853 5.34314L18.1665 6.6619C18.0051 6.82325 17.975 7.07262 18.0814 7.27447C18.3077 7.70367 18.4961 8.15594 18.6421 8.62683C18.7097 8.8447 18.9073 8.99966 19.1354 8.99968L21 8.99989C21.5522 9.00006 22 9.44776 22 10V12C22 12.5522 21.5522 12.9999 21 13.0001L19.1354 13.0003C18.9073 13.0003 18.7097 13.1553 18.6421 13.3732C18.4961 13.8441 18.3077 14.2963 18.0814 14.7255C17.975 14.9274 18.0051 15.1767 18.1665 15.3381L19.4853 16.6569C19.8458 17.0173 19.8735 17.5846 19.5685 17.9769L19.4853 18.0711L18.0711 19.4853C17.7106 19.8458 17.1434 19.8735 16.7511 19.5685L16.6569 19.4853L15.3381 18.1665C15.1767 18.0051 14.9274 17.975 14.7255 18.0814C14.2963 18.3077 13.8441 18.4961 13.3732 18.6421C13.1553 18.7097 13.0003 18.9073 13.0003 19.1354L13.0001 21C12.9999 21.5522 12.5522 22 12 22H10C9.48716 22 9.06449 21.6142 9.00673 21.1168L9.0002 21L9.00057 19.1358C9.00061 18.9077 8.84561 18.71 8.62766 18.6424C8.15647 18.4963 7.70392 18.3078 7.27447 18.0814C7.07262 17.975 6.82325 18.0051 6.6619 18.1665L5.34314 19.4853C4.98266 19.8458 4.41543 19.8735 4.02314 19.5685L3.92893 19.4853L2.51472 18.0711C2.15423 17.7106 2.1265 17.1434 2.43152 16.7511L2.51472 16.6569L3.83351 15.3381C3.99486 15.1767 4.02501 14.9274 3.9186 14.7255C3.69233 14.2963 3.50393 13.8441 3.35787 13.3732C3.29028 13.1553 3.0927 13.0003 2.86459 13.0003L1 13.0001C0.447758 12.9999 0 12.5522 0 12V10C0 9.44776 0.447758 9.00006 1 8.99989L2.86459 8.99968C3.0927 8.99966 3.29028 8.8447 3.35787 8.62683C3.50393 8.15594 3.69233 7.70367 3.9186 7.27447C4.02501 7.07262 3.99486 6.82325 3.83351 6.6619L2.51472 5.34314C2.15423 4.98266 2.1265 4.41543 2.43152 4.02314L2.51472 3.92893L3.92893 2.51472C4.28941 2.15423 4.85664 2.1265 5.24893 2.43152L5.34314 2.51472L6.6619 3.83351C6.82325 3.99486 7.07262 4.02501 7.27447 3.9186C7.7038 3.69226 8.15621 3.50382 8.62724 3.35774C8.84516 3.29016 9.00014 3.09252 9.00013 2.86437L9.00004 1C8.99998 0.487164 9.386 0.0644759 9.88334 0.00668893L10 0H12C12.5522 0.000265457 12.9999 0.447819 13.0003 1ZM11 6.41667C8.46869 6.41667 6.41667 8.46869 6.41667 11C6.41667 13.5313 8.46869 15.5833 11 15.5833C13.5313 15.5833 15.5833 13.5313 15.5833 11C15.5833 8.46869 13.5313 6.41667 11 6.41667Z"/>
</svg>

Before

Width:  |  Height:  |  Size: 2.5 KiB

After

Width:  |  Height:  |  Size: 2.5 KiB

View File

File diff suppressed because one or more lines are too long

Before

Width:  |  Height:  |  Size: 1.1 KiB

After

Width:  |  Height:  |  Size: 7.9 KiB

View File

@@ -0,0 +1,4 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<svg width="24" height="24" viewBox="0 0 24 24" version="1.1">
<path d="m 14.627283,3.1289069 c -0.117018,0 -0.234036,0 -0.409563,0 -2.106329,0 -3.920112,0.1755274 -5.8509129,1.1701825 2.2818559,1.34571 2.5744019,3.3935295 2.4573829,5.031785 C 10.707172,10.96913 10.297608,10.618075 9.6540079,12.724403 6.7285516,10.559565 3.6275678,11.495711 1.9461657e-6,11.320184 4.5637139,16.29346 8.8933893,14.187132 9.244444,22.904991 c 4.446693,-6.494513 0.5850913,-7.898731 2.69142,-7.138113 3.393529,1.287201 5.616876,1.34571 7.547677,-0.292546 0.819128,0.643601 2.164838,1.989311 2.515893,3.803094 1.9308,-4.505204 0.468073,-5.733895 -0.05851,-7.079605 0.409564,-0.760619 0.819128,-1.638256 1.228692,-2.5744007 2.866943,-7.196623 -2.106332,-5.9679313 -8.542337,-6.4945135 z m 4.73924,9.1274231 C 16.616594,11.378693 15.153866,9.7404383 14.627283,6.9905093 L 15.50492,6.8149819 c 0.468074,2.3988742 1.696765,3.8030931 4.095639,4.5637111 z M 19.249505,7.6341097 c -0.70211,0 -1.287201,-0.5850913 -1.287201,-1.2872009 0,-0.7021094 0.585091,-1.2872007 1.287201,-1.2872007 0.70211,0 1.2872,0.5850913 1.2872,1.2872007 0,0.7021096 -0.58509,1.2872009 -1.2872,1.2872009 z"/>
</svg>

After

Width:  |  Height:  |  Size: 1.2 KiB

View File

File diff suppressed because one or more lines are too long

After

Width:  |  Height:  |  Size: 5.2 KiB

View File

@@ -0,0 +1,4 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<svg width="24" height="24" viewBox="0 0 24 24" version="1.1">
<path d="M 16.646835,3.1931694 C 14.236046,3.3695687 12.94245,3.4283685 9.7084637,5.3099607 7.3564734,6.6035554 5.8276796,9.0143455 5.474881,11.542735 5.1220825,13.247928 4.6516844,14.894321 4.0636869,16.481915 3.29929,18.187108 1.3000982,18.775106 0.00650351,20.0687 c -0.11759952,0.1176 -0.05879975,0.411599 0.05879976,0.411599 1.41119423,0 3.05758743,-0.587998 4.40998183,-1.234796 1.3523945,-0.587997 2.1167913,0.823197 3.2339868,1.058396 1.5287937,0.411598 3.2339871,0.705597 4.7627811,0.1764 1.646392,-0.352799 3.057587,-1.352395 4.057183,-2.64599 1.293595,-1.646393 1.940391,-3.704384 2.057992,-5.762376 0.176398,-2.057992 0.293999,-3.7631846 1.411194,-5.0567793 C 21.115617,5.721559 21.762415,5.015962 24.055605,4.016366 24.173204,3.1931694 19.057625,3.0167701 16.646835,3.1931694 Z M 16.058838,7.661951 c -0.823197,0 -1.469994,-0.6467973 -1.469994,-1.4699939 0,-0.8231966 0.646797,-1.5287937 1.469994,-1.5287937 0.823196,0 1.528793,0.7055971 1.528793,1.5287937 0,0.8231966 -0.705597,1.4699939 -1.528793,1.4699939 z"/>
</svg>

After

Width:  |  Height:  |  Size: 1.1 KiB

View File

@@ -0,0 +1,4 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<svg width="24" height="24" viewBox="0 0 24 24" version="1.1">
<path d="m 22.188192,13.327696 c -0.361711,-0.301427 -0.723422,-0.542567 -1.024848,-0.723422 -0.180856,-0.663137 -1.085133,-1.507129 -2.35112,-1.929125 -0.120572,-0.06028 -0.301427,-0.120571 -0.421997,-0.180856 0.06027,0 0.06027,0 0.12057,-0.06029 1.145419,-0.6631365 1.86884,-1.5674139 1.989411,-2.2305506 0.602851,-0.2411406 1.446843,-0.783707 2.10998,-1.5071288 C 23.635036,5.6714809 23.996746,4.7069185 23.393895,4.5260629 22.791044,4.4054927 21.46477,5.1289145 20.439923,6.2140473 20.078211,6.5757582 19.837071,6.877184 19.656216,7.1786098 18.993079,7.1183248 18.028517,7.29918 17.063953,7.8417465 c -0.60285,0.3617109 -1.085132,0.783707 -1.446844,1.2057031 0.06029,-0.1205703 0.120572,-0.1808555 0.120572,-0.2411407 0.542565,-1.1454179 0.723422,-2.2305507 0.421995,-2.8936874 0.361712,-0.5425664 0.663137,-1.6879844 0.663137,-2.8334023 0,-1.4468436 -0.482282,-2.35112103 -1.024847,-2.0496952 -0.482282,0.3014258 -0.904277,1.7482694 -0.904277,3.1951131 0,0.4822814 0.06027,0.9042774 0.12057,1.2057032 -0.663137,0.2411406 -1.386559,1.0248476 -1.929126,2.0496953 -0.06027,0.1808554 -0.180855,0.3014257 -0.24114,0.4822812 -0.24114,-0.060285 -0.542567,-0.1205703 -0.843992,-0.1205703 -0.301426,0 -0.602852,0.060285 -0.843993,0.1205703 C 11.095723,7.7814612 10.975153,7.6608909 10.914868,7.4800355 10.372301,6.4551878 9.6488795,5.6714808 8.9857429,5.4303402 9.0460281,5.1289144 9.1063131,4.7069183 9.1063131,4.224637 c 0,-1.4468437 -0.421996,-2.8936873 -0.9042773,-3.1951131 -0.060285,-0.0602851 -0.1808554,-0.0602851 -0.2411406,-0.0602851 v 0 C 7.5388992,0.90895372 7.1771882,1.813231 7.1771882,3.0792192 c 0,1.1454179 0.3014258,2.2305507 0.6631367,2.8334023 -0.3014257,0.6631367 -0.1808555,1.7482695 0.4219961,2.8936874 0,0.060285 0,0.060285 0.060285,0.1205704 C 7.9608952,8.5651682 7.478614,8.1431721 6.9360476,7.8417463 5.9714851,7.2991799 5.0069225,7.1183245 4.3437859,7.1786097 4.1629305,6.8771839 3.9217898,6.5757581 3.5600789,6.2140472 2.5352312,5.1289144 1.269243,4.4054925 0.66639142,4.5260628 0.06353987,4.7069183 0.36496564,5.6714808 1.3898133,6.6963284 2.05295,7.4197503 2.8969422,7.9623167 3.4997937,8.2034573 3.620364,8.866594 4.3437859,9.7708714 5.4892039,10.434008 c 0.060285,0.06029 0.060285,0.06029 0.1205702,0.06029 -0.1205702,0.06028 -0.3014258,0.12057 -0.421996,0.180856 -1.2659883,0.421996 -2.1702657,1.265988 -2.3511211,1.929125 -0.3014258,0.180855 -0.6631367,0.421995 -1.0248476,0.723422 -1.08513282,0.904277 -1.86883984,2.170266 -1.80855468,2.773117 0.12057031,0.602851 1.08513278,0.361711 2.17026558,-0.602851 0.6631367,-0.542567 1.2057031,-1.205704 1.567414,-1.748271 0.5425664,0.120572 1.3262734,0.06029 2.1099805,-0.180855 -0.1205703,0.180855 -0.2411407,0.361712 -0.3617109,0.542567 -0.6631368,0.964562 -0.9042774,2.049695 -0.723422,2.712831 -0.1205702,0.241142 -0.2411406,0.542567 -0.3617108,0.843993 -0.4219962,1.386558 -0.4219962,2.893687 0,3.375969 0.421996,0.421996 1.0851328,-0.301426 1.5071288,-1.687985 0.1808555,-0.663136 0.3014258,-1.386558 0.3014258,-1.929125 0.6028515,-0.301425 1.2659883,-0.904277 1.8085547,-1.748269 0.4219961,-0.663137 0.6631367,-1.326274 0.7234219,-1.929126 0.3617108,0.482282 0.3617108,0.964564 0.421996,1.507129 -0.9042773,0.843993 -1.5071289,1.989411 -1.5071289,3.315685 0,2.411406 1.929125,4.461101 4.3405316,4.461101 2.411406,0 4.34053,-2.049695 4.34053,-4.461101 0,-1.326274 -0.60285,-2.471692 -1.507129,-3.315685 0,-0.60285 0.120572,-0.964562 0.421997,-1.446843 0.06027,0.542566 0.301425,1.205703 0.723422,1.86884 0.542567,0.843992 1.205702,1.446844 1.808554,1.748269 0,0.542567 0.12057,1.265989 0.301427,1.929125 0.421995,1.386559 1.085132,2.109981 1.507129,1.687985 0.421995,-0.482282 0.421995,-1.989411 0,-3.375969 -0.120572,-0.301426 -0.241142,-0.602851 -0.361712,-0.843993 0.180855,-0.663136 -0.06029,-1.748269 -0.723422,-2.712831 -0.12057,-0.180855 -0.24114,-0.361712 -0.36171,-0.542567 0.783707,0.241141 1.567414,0.301427 2.109979,0.180855 0.361712,0.542567 0.904278,1.205704 1.567415,1.748271 1.085133,0.964562 2.049695,1.205702 2.170265,0.602851 0.06027,-0.602851 -0.723422,-1.86884 -1.808554,-2.773117 z"/>
</svg>

After

Width:  |  Height:  |  Size: 4.1 KiB

View File

@@ -0,0 +1,6 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!-- Generator: Adobe Illustrator 19.1.0, SVG Export Plug-In . SVG Version: 6.00 Build 0) -->
<svg version="1.1" x="0px" y="0px" viewBox="0 0 24 24" space="preserve" width="24" height="24">
<path d="M 19.119111,8.8922616 C 18.153027,8.9659013 17.464512,9.0026158 16.590153,9.3002778 15.714221,7.6659345 15.398745,6.3459799 14.732712,5.1545722 14.045718,3.9258551 12.973515,2.7877778 10.479369,1.4778159 l -4.89e-4,-0.019931 c -0.174545,1.2534816 -0.246557,2.4066022 -0.233144,3.4665846 0.125506,0.099221 0.250904,0.1978438 0.378853,0.3003773 1.52665,1.3609027 2.129957,2.7720402 4.153255,4.530639 0.07115,0.05448 0.105629,0.145491 0.08992,0.234177 -0.01587,0.08967 -0.07886,0.1611322 -0.164716,0.1888832 -0.08587,0.02716 -0.179977,0 -0.244548,-0.05606 C 12.52136,8.7182076 11.639245,6.5878903 10.089873,5.4263834 7.4898132,3.3075005 3.5071755,2.3229398 1.0313621,1.6907573 1.1759842,2.5300322 3.8711245,3.723938 4.997091,4.2261236 c 0,0 -3.3853942,-0.7496125 -4.997090950112758,-0.7044826 C 1.9643726,4.6066051 5.541854,5.5725805 5.541854,5.5725805 c 0,0 -2.535855,-0.022484 -4.1874139,-0.1519536 2.0682636,1.3332057 4.2444372,1.4998225 4.2444915,1.4998225 0,0 -1.5019947,0.4662336 -2.7455923,0.4246338 1.2031925,0.9310553 3.1180906,1.0083899 3.1180906,1.0083899 0,0 -1.2358316,0.1728621 -2.1944754,0.3789061 0.8493219,0.5412336 2.309771,0.8261876 2.309771,0.8261876 0,0 -0.8355276,0.255845 -1.6699147,0.4535262 0.8414471,0.453524 2.1285454,0.563661 2.1285454,0.563661 0,0 -0.6221518,0.129688 -1.2542962,0.292558 0.6090093,0.49279 1.0820313,0.653703 1.0820313,0.653703 0,0 -0.010856,0.236512 -0.4383736,0.323025 0.493442,0.399597 0.7994673,0.341977 0.7994673,0.341977 0,0 -0.058002,0.279305 -0.3699458,0.186331 0.2369999,0.518749 0.5701791,0.415401 0.5701791,0.415401 0,0 0.010856,0.06718 -0.03921,0.164823 5.974e-4,3.8e-4 8.145e-4,7.62e-4 0.00131,0.0012 0.016618,0.01759 0.033943,0.024 0.050723,0.03671 2.02833,1.496756 4.6089347,2.155858 7.1001107,2.441033 0.133597,0.0176 0.23043,0.137671 0.215386,0.269748 -0.01504,0.134357 -0.136204,0.229505 -0.269857,0.214245 -0.873922,-0.09922 -1.695168,-0.234937 -2.468133,-0.413067 -0.189046,0.70899 -0.401226,1.412115 -0.637303,2.10427 -0.528145,1.119124 -1.8286566,1.511933 -2.6696152,2.331441 -0.096451,0.08809 -0.055448,0.297281 0.029054,0.295108 0.9393102,-0.024 2.0057002,-0.39395 2.9141092,-0.805876 0.86833,-0.393731 1.359002,0.504467 2.103238,0.686726 1.019469,0.249598 2.105139,0.458413 3.124444,0.113667 1.068509,-0.25818 2.019061,-0.878322 2.665761,-1.749586 0.860726,-1.06954 1.250548,-2.413064 1.332879,-3.753873 0.134249,-1.383767 0.187905,-2.465635 0.933771,-3.329675 0.74592,-0.864038 1.142856,-1.304693 2.678467,-1.9562252 0.04486,-0.5358023 -3.29899,-0.6684229 -4.880437,-0.5471531 z m 0.282076,2.5191284 c -0.461999,0 -0.836234,-0.375592 -0.836234,-0.837482 0,-0.462107 0.374235,-0.8363422 0.836234,-0.8363422 0.461998,0 0.837482,0.3742352 0.837482,0.8363422 0,0.461942 -0.375539,0.837482 -0.837482,0.837482 z"/>
<g/>
</svg>

After

Width:  |  Height:  |  Size: 3.0 KiB

View File

@@ -0,0 +1,4 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<svg width="24" height="24" viewBox="0 0 24 24" version="1.1">
<path d="m 16.102313,2.7327591 c -0.569217,0.056922 -1.479964,0.2276866 -1.821494,0.7399817 -1.252276,0.2276868 -2.561475,0.6830601 -4.5537336,1.8214937 v 0 l -0.056916,0.056922 C 5.5718032,8.1403187 5.2302732,12.92174 4.034918,16.450883 3.693388,17.077022 3.1241712,17.589316 2.4411111,18.04469 1.758051,18.556985 0.90422586,19.012359 0.22116575,19.695418 c -0.28460837,0.227688 -0.28460837,0.626139 -0.0569216,0.910747 0.28460837,0.227686 0.6830601,0.284608 0.96766845,0 0,0 0,0 0,0 0.512295,-0.512295 1.2522769,-0.967669 2.0491802,-1.479963 0.5122952,-0.341531 1.0815119,-0.796904 1.5368853,-1.366121 0.3984518,0.227688 1.0245901,0.227688 1.4799636,0.170766 0.3984517,-0.05691 0.6261385,-0.227688 0.7399817,-0.455374 0.1138434,0.05692 0.1707651,0.170765 0.2846084,0.227686 0.7969035,1.195355 1.4230419,2.789163 3.0737702,3.301458 1.252277,0.284608 1.650729,0.170765 2.504553,-0.05692 0.796904,-0.227687 2.447633,-0.853825 2.33379,-1.138434 -0.853826,-0.05692 -1.138434,-0.227687 -1.650729,-0.569216 -0.512295,-0.34153 -0.739982,-0.910747 -1.02459,-1.650729 -0.284608,-0.683061 -0.683061,-1.36612 -1.309199,-1.764572 -0.455373,-0.34153 -1.02459,-0.512295 -1.5938063,-0.455373 -0.5692168,0 -1.2522769,0.284608 -1.5368853,0.569217 C 7.7348268,16.16628 7.3363751,16.337045 6.994845,16.393968 6.82408,15.995515 6.4256283,15.710907 5.8564115,15.881672 c -0.1138434,0 -0.2276867,0.05692 -0.34153,0.05692 0.34153,-1.081511 0.6261384,-2.219945 0.9676685,-3.301457 0.512295,0.227687 1.2522768,0.284609 1.8214936,0.227687 0.5692167,-0.05692 0.853825,-0.34153 0.9676685,-0.683061 0.34153,0.05692 0.6261384,0.170765 0.8538249,0.455374 0.796904,1.309199 1.423042,3.130692 3.016849,3.642987 1.252277,0.341531 1.707651,0.170766 2.504553,-0.05692 0.796904,-0.227687 2.447633,-0.910747 2.33379,-1.252277 -0.910747,-0.05691 -1.138434,-0.284608 -1.650729,-0.626139 -0.512295,-0.341529 -0.739982,-0.967668 -1.02459,-1.764571 -0.284608,-0.796903 -0.683061,-1.536885 -1.309199,-1.992258 -0.455374,-0.398453 -1.02459,-0.569217 -1.593807,-0.512296 -0.569216,0 -1.195355,0.284608 -1.536885,0.683061 -0.284608,0.341529 -0.9107468,0.569216 -1.423042,0.512294 -0.056922,0 -0.1138433,0 -0.1138433,0 C 9.1578686,10.7018 8.6455736,10.246426 7.9625135,10.417191 7.7348268,10.474107 7.4502184,10.531029 7.16561,10.644872 7.7917485,9.1079867 8.7024953,7.6849448 10.182459,6.603433 c 0.113843,0.5692168 0.853825,1.0245901 1.423041,1.3091985 0.569218,0.2846084 1.024591,0.056922 1.3092,-0.34153 0.227686,0.1138433 0.455373,0.2276867 0.683059,0.4553733 0.626139,1.0815119 1.138433,2.6183972 2.504554,3.1306922 1.02459,0.284608 1.423042,0.170765 2.106102,0 0.683061,-0.170766 2.106102,-0.739982 1.992259,-0.967668 C 19.460692,10.075656 19.233005,9.9048904 18.834554,9.5633601 18.37918,9.2787517 18.208415,8.709535 17.980729,8.0264748 17.753041,7.4003365 17.411511,6.7741981 16.956139,6.3757463 16.557686,6.0342162 16.045392,5.8634513 15.590018,5.8634513 c -0.512295,0 -1.02459,0.2846083 -1.309199,0.5692166 -0.284608,0.2276868 -0.739982,0.3984518 -1.138433,0.3415302 0,-0.3984518 -0.227686,-0.7969035 -0.68306,-0.9107468 -0.170765,-0.056922 -0.455373,-0.1138435 -0.683061,-0.1707651 1.195356,-0.6261384 2.106103,-0.8538252 3.01685,-1.0245901 0.398451,0.2276867 0.910746,0.2846083 1.36612,0.2846083 0.455373,0 0.796904,-0.170765 0.910747,-0.5122951 0.05691,0 0.113843,0 0.113843,0 0.113843,0.1707651 0.227686,0.3415301 0.34153,0.5122951 0.05692,0.3984517 0.34153,0.9676685 0.739982,1.3091986 0.341529,0.3984517 0.796903,0.7399817 1.252276,0.9107468 0.569218,0.1707649 1.195355,0.1707649 1.707651,0 0.512294,-0.1138434 0.910747,-0.2276868 1.36612,-0.056922 0.512295,0.2276866 0.796903,0.34153 1.366121,0.853825 C 24.185191,7.9126315 23.445209,6.5465113 22.989836,5.9203729 22.591384,5.2373128 22.363697,4.8957828 21.396029,4.2127226 20.940656,3.9281142 20.542203,3.7573492 20.143752,3.6435059 20.029909,3.5865842 19.916066,3.4727408 19.745301,3.4727408 19.06224,3.1881325 18.151494,3.1312108 17.01306,3.1881325 16.842295,2.9035241 16.557686,2.6758373 16.102313,2.7327591 Z"/>
</svg>

After

Width:  |  Height:  |  Size: 4.1 KiB

View File

@@ -0,0 +1,4 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<svg width="24" height="24" viewBox="0 0 24 24" version="1.1">
<path d="M 17.466666,1.1833331 C 17.733333,1.4499997 17.866667,1.6499997 17.8,1.9166663 17.666667,2.4499997 16.6,2.583333 15.4,2.3166664 c -1.2,-0.3333334 -2.066667,-1 -1.933333,-1.46666668 0.06667,-0.2 0.266666,-0.33333334 0.533333,-0.46666668 -0.6,-0.0666667 -1.266667,-0.0666667 -1.933333,-0.0666667 -1.200001,0 -2.3333334,0.0666667 -3.4000002,0.26666667 0.6,0.0666667 1.0000001,0.26666667 1.1333334,0.60000005 C 10,1.8499998 8.9333334,2.7833332 7.3333335,3.3166665 5.8000001,3.8499998 4.3333334,3.7833332 4.0666667,3.1166664 4,2.7833332 4.1333334,2.383333 4.5333334,2.0499997 1.8000001,3.5166665 0,5.7833331 0,8.3833331 c 0,1.3333334 0.33333345,3.2666659 1.4000001,3.7999989 1.0666667,0.533334 6,-1.533333 10.5999999,-1.533333 4.6,0 9.4,2.333334 10.533333,1.6 C 23.666667,11.516666 24,9.8499998 24,8.4499998 24,5.3166664 21.333333,2.5166664 17.466666,1.1833331 Z M 3.7333334,7.1166665 c -0.4,0.6666667 -1,0.9333334 -1.3333333,0.5333334 C 2.0666668,7.3166664 2.1333334,6.4499997 2.5333334,5.7833331 c 0.4,-0.6666667 1,-0.9333333 1.3333333,-0.5333334 0.4,0.3333334 0.3333334,1.2 -0.1333333,1.8666668 z M 11.933334,6.3166664 c -0.866667,0 -1.600001,-0.6 -1.600001,-1.2666667 0,-0.6666666 0.733334,-1.1999999 1.600001,-1.1999999 0.933333,0 1.666667,0.5333333 1.666667,1.1999999 0,0.6666667 -0.733334,1.2666667 -1.666667,1.2666667 z m 9.733332,0.3333334 C 21.4,7.0499998 20.533334,6.7166664 19.733334,5.9833331 19,5.1833331 18.6,4.3166664 18.866667,3.9166665 c 0.266666,-0.4 1.133333,-0.066666 1.866667,0.6666666 0.799999,0.8 1.2,1.6666666 0.933332,2.0666667 z M 12,11.849999 c -2,-0.06666 -4.1333333,0.4 -5.9999999,0.8 -0.3333332,1.666667 -0.4666666,3.266667 -0.4666666,4.533334 0,8.666667 12.9333325,8.666667 12.9333325,0 0,-1.2 -0.133332,-2.800001 -0.399999,-4.4 C 16.2,12.316666 14,11.849999 12,11.849999 Z"/>
</svg>

After

Width:  |  Height:  |  Size: 1.9 KiB

View File

File diff suppressed because one or more lines are too long

After

Width:  |  Height:  |  Size: 6.2 KiB

View File

@@ -0,0 +1,4 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<svg width="24" height="24" viewBox="0 0 24 24" version="1.1">
<path d="m 22.669471,18.804377 c -0.235955,0 -0.707867,0 -1.297757,0 h -1.769669 c -0.58989,0 -1.238768,-0.05898 -1.71068,-0.117978 -0.176967,-0.05898 -0.353934,-0.05898 -0.471911,-0.117978 0.471911,-0.353933 0.884834,-0.766856 1.238768,-1.238768 1.0618,-1.356747 1.592702,-3.067426 1.769669,-4.778107 0.117978,0.117979 0.294945,0.294945 0.412923,0.530902 0.589889,0.884834 0.412923,1.828657 0.825845,2.654504 1.061802,0.530899 1.061802,-1.887648 0.825846,-2.477538 -0.412924,-0.943823 -1.297758,-1.238768 -1.356747,-1.946636 0.117979,0 0.235956,0.05898 0.412924,0.117978 0.943823,0.530902 1.179779,1.533713 1.887646,2.123603 1.238769,0 0.117977,-2.182591 -0.353933,-2.595514 C 22.19756,10.191988 21.135758,10.486933 20.840814,9.4251314 21.017781,8.7762528 21.312726,8.1273741 21.784636,7.5964736 24.793074,4.3520804 24.43914,3.9391576 18.71721,4.1751135 H 18.65823 C 18.894184,2.995334 18.59924,1.579599 17.714404,0.8127424 17.53743,0.69476446 17.419453,0.6357755 17.301474,0.6357755 v 0 c -0.766855,0.1769669 -1.002811,2.7134924 -1.0618,3.8342828 -0.235956,0.058989 -0.58989,0.1769669 -0.884834,0.2949448 C 15.295851,4.6470252 15.295851,4.5290472 15.236862,4.3520804 15.000906,3.6442127 14.76495,2.8183672 14.057083,2.1694886 13.05427,1.2256652 11.815501,0.4588086 11.579545,1.9335327 11.402579,3.172301 12.110446,4.5880362 13.231237,5.6498376 12.995281,5.8268045 12.759325,5.9447825 12.46438,6.1217493 10.399767,7.2425397 8.9840309,9.4251314 8.6890861,11.725701 7.8632404,20.33809 4.6778363,18.096509 1.9643438,13.259414 0.01770801,9.5431094 1.4334432,4.8239921 4.5008693,3.113312 5.0907591,2.8773561 5.6216598,2.7003893 6.0345825,2.7593783 6.4475053,2.8183672 6.6834612,2.9363451 6.9194171,3.2902789 7.4503176,3.9981466 7.5682956,5.7678155 6.3295274,8.7172638 v 0.058989 h -0.058989 v 0.117978 c -0.058989,0.2359559 0,0.4719116 0.1769669,0.5898896 C 6.6244722,9.6610873 6.8604281,9.7200763 7.0963839,9.6610873 7.3323398,9.6020983 7.4503176,9.4251314 7.5093066,9.2481646 L 7.5682956,9.1301867 V 9.0711977 C 8.866053,6.0037714 8.9250419,3.9391576 8.0991963,2.7003893 7.2733508,1.7565658 6.5654833,1.461621 5.5626708,1.6385879 -0.51319268,2.5824113 -0.92611546,10.781878 1.0795093,14.262227 c 0.5309008,1.238768 3.1854041,6.134852 6.7247422,4.424172 0.9438235,-0.471911 1.651691,0.235956 2.3595585,0.648879 0.117979,0.412922 0.353934,0.884834 0.766857,1.415735 0.648878,0.530901 1.592703,0.884835 2.123603,1.061801 1.297758,0.530902 2.595514,1.415735 3.775294,1.533714 1.238768,0.117977 2.24158,-0.353934 0.825846,-1.415735 -1.002814,-0.707868 -2.477538,-0.943824 -3.539338,-1.356746 -0.471912,-0.176968 -0.884835,-0.412924 -1.238769,-0.58989 0.707867,0.05898 1.415734,0 2.064614,-0.235957 0.235955,-0.05898 0.5309,-0.117977 0.707867,-0.235955 0.05899,0.05899 0.117978,0.117978 0.117978,0.117978 0.235956,0.176966 0.589889,0.412922 1.002814,0.471911 0.766855,0.235956 1.769669,0.235956 2.300568,0.235956 0.825846,0 1.651692,-0.05898 2.477538,0 0.294944,0 1.061801,0.117978 1.65169,0 0.353933,-0.05898 0.58989,-0.117978 0.648878,-0.235956 0.05898,0 0.11798,-0.05898 0.11798,-0.05898 0,-0.05898 0,-0.117977 -0.05898,-0.235956 -0.176971,-0.530904 -0.648884,-0.825849 -1.238773,-1.002816 z M 18.068332,5.5908486 c 0.707868,0 1.297757,0.5898896 1.297757,1.3567463 0,0.7078675 -0.589889,1.2977572 -1.297757,1.2977572 -0.766857,0 -1.356747,-0.5898897 -1.356747,-1.2977572 0,-0.7668567 0.58989,-1.3567463 1.356747,-1.3567463 z M 16.003718,17.50662 c -0.530901,-0.117979 -0.825846,-0.943824 -0.884834,-1.828659 v 0 c -0.117978,-1.297756 0.05898,-2.83147 0.412923,-3.303381 0.471911,-0.648879 1.061801,-0.05898 1.651691,-0.176967 0.5309,-0.05898 1.002812,-0.884835 1.592702,-0.707867 1.710679,0.5309 -0.58989,6.547774 -2.772482,6.016874 z"/>
</svg>

After

Width:  |  Height:  |  Size: 3.8 KiB

View File

@@ -0,0 +1,4 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<svg width="24" height="24" viewBox="0 0 24 24" version="1.1">
<path d="m 22.948027,7.251042 c -0.350658,0 -0.701316,0.2337718 -0.876644,0.5259866 -0.409102,-0.116886 -0.818202,-0.1753289 -1.16886,-0.2337718 -0.525986,-0.058442 -1.110416,-0.058442 -1.636403,0 C 18.564806,7.134156 18.097262,5.6730822 17.746604,5.0302096 17.688161,4.9717668 17.629718,4.8548809 17.571275,4.7964379 17.921932,4.621109 18.155704,4.2704513 18.155704,3.8613506 c 0,-0.5844295 -0.467543,-1.0519732 -1.051973,-1.0519732 -0.58443,0 -1.051972,0.4675437 -1.051972,1.0519732 0,0.4675437 0.292214,0.8182014 0.701314,0.9935303 0,0.2337717 0.05844,0.6428725 0,0.8182013 -0.116886,0.5259866 -0.292214,0.8766444 -0.525986,1.1688591 0.175328,0.2337718 0.292214,0.4675436 0.467544,0.7597584 1.987061,3.6819063 0.350658,8.4157853 -3.623463,10.5781743 -2.220833,1.227302 -4.675437,1.344188 -6.7793834,0.642874 -0.4675436,0.4091 -0.9935302,0.701314 -1.4610738,1.051972 -0.2922147,0.175329 -0.6428725,0.409101 -0.7597584,0.701316 -0.1753289,0.409101 0.9350873,0.233771 1.0519732,0.233771 0.7597584,-0.116886 1.4610739,-0.4091 2.1623893,-0.642872 0.7597584,-0.175329 1.5779597,-0.233772 2.2792752,0.292215 0.4675439,0.350657 1.1104159,0.525987 1.6948449,0.642873 1.227303,0.233772 2.629933,0 3.74035,-0.642873 1.051974,-0.58443 1.870174,-1.461074 2.454604,-2.513047 0.350658,-0.58443 0.642873,-1.227302 0.876645,-1.928618 0.175328,-0.642872 0.292214,-1.285745 0.350658,-1.928617 0.175328,-1.285745 0.4091,-2.571491 0.99353,-3.681907 0.350657,-0.5259858 0.759758,-1.0519726 1.285745,-1.3441874 0.350658,-0.1753289 0.642872,-0.2922148 0.99353,-0.4091007 0.116886,0.4091007 0.525986,0.7597584 0.99353,0.7597584 C 23.532456,9.4134313 24,8.8874447 24,8.3030152 24,7.7770286 23.532456,7.251042 22.948027,7.251042 Z M 12.837396,17.712331 c 3.740349,-1.98706 5.259866,-6.428725 3.389691,-9.8768595 -1.285745,-2.3377181 -3.740349,-3.6234632 -6.3118392,-3.5650202 -1.2273019,0 -2.513047,0.2922147 -3.6819061,0.9350872 2.0455034,-0.1753289 3.9741213,0.7013155 4.9676513,2.5130471 1.344188,2.5130474 0.233772,5.6689664 -2.4546042,7.1300404 -2.2792753,1.227303 -4.9092082,0.876645 -6.487168,-0.701316 0.1168859,0.350658 0.2337718,0.701316 0.4091006,0.993531 1.8701747,3.448135 6.4287251,4.616993 10.1690746,2.57149 z M 8.454174,14.381082 C 10.908778,13.036894 11.902309,10.17319 10.733449,8.0108004 9.9152478,6.5497266 8.395731,5.7315251 6.7593283,5.7315251 c -0.8182014,0 -1.6948456,0.1753289 -2.5130471,0.5844296 0.8182015,0.1753289 1.5779598,0.6428725 1.9870605,1.4026309 0.7597584,1.4610738 0.1168859,3.3312494 -1.4610739,4.2078934 -1.0519732,0.525986 -2.2792752,0.525986 -3.2143624,0 0.058442,0.292214 0.1753288,0.584429 0.3506577,0.818201 1.1688591,2.220832 4.0910068,2.980591 6.5456109,1.636402 z M 4.4800531,11.400492 C 5.824241,10.699177 6.3502276,9.1796594 5.7073551,8.0108004 5.2982544,7.251042 4.4800531,6.8419413 3.6034088,6.8419413 c -0.4675437,0 -0.9350874,0.1168859 -1.402631,0.3506577 C 1.967006,7.3094849 1.7332342,7.4848138 1.5579054,7.6601426 1.6747912,7.7185861 1.7916771,7.8354715 1.9085631,8.0692434 2.025449,8.3614581 1.9670055,8.7705588 1.8501196,9.1212166 1.7332336,9.4134313 1.4994619,9.705646 1.207247,9.9394176 1.0319182,9.9978589 0.91503227,10.056304 0.79814636,10.114747 c 0,0.175328 0.058443,0.292214 0.17532887,0.467544 0.58442957,1.168858 2.16238927,1.519516 3.50657787,0.818201 z M 1.4410194,8.7705588 c 0.058444,-0.1753288 0.058444,-0.2922147 0,-0.4091007 C 1.382577,8.2445722 1.3241335,8.1861292 1.1488046,8.1276863 c 0,0 -0.058443,0 -0.058443,0 -0.17532882,0 -0.35065769,0.058444 -0.5844295,0.1753289 C 0.33060328,8.4783441 0.15527442,8.7121158 0.09683146,8.8874447 -0.02005445,9.0627736 -0.02005445,9.2381024 0.0383885,9.3549884 c 0.05844296,0.058442 0.11688592,0.1753289 0.29221478,0.1753289 0.17532886,0 0.40910068,0 0.6428725,-0.1753289 C 1.2072476,9.1796594 1.3241335,9.0043307 1.4410194,8.7705588 Z"/>
</svg>

After

Width:  |  Height:  |  Size: 3.9 KiB

View File

@@ -0,0 +1,6 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<svg width="24" height="24" viewBox="0 0 24 24" version="1.1">
<g transform="matrix(0.05852372,0,0,0.05852372,-2.9794326,-2.9537834)">
<path d="m 121,332 c -13,29 -47,39 -69,61 -2,2 -1,7 1,7 24,0 52,-10 75,-21 23,-10 36,14 55,18 57.51709,14.22285 114.55538,2.76226 150,-42 C 410.47158,244.76283 330.03025,178.03474 461,120 243.72579,60.581397 121.97865,179.30209 121,332 Z m 182,-93 c 16,-5 32,-9 38,-22 l 10,5 c -8,18 -28,23 -45,28 -17,4 -29,8 -33,17 -1,4 -2,8 -4,13 v 0 0 c -3,7 -6,13 -11,20 -5,6 -10,11 -17,17 10,0 18,1 27,3 22,4 39,7 55,-16 l 10,7 c -21,28 -44,24 -67,20 -15,-3 -30,-5 -46,0 -13,7 -27,13 -44,19 l -3,-11 c 10,-3 19,-7 27,-11 v 0 c 1,0 2,-1 3,-1 18,-14 11,-28 -2,-52 -12,-21 -27,-47 -6,-71 l 9,7 c -16,19 -5,38 7,58 6,12 13,23 14,35 0,4 0,8 -1,11 19,-12 29,-25 34,-39 10,-41 -4,-59 -15,-74 -11,-14 -21,-28 0,-53 l 9,7 c -15,18 -10,25 0,39 6,8 13,17 17,30 7,-27 22,-55 86,-77 l 4,11 c -33,11 -54,24 -66,41 -11,14 -13,29 -16,46 v 2 c 7,-4 17,-7 26,-9 z"/>
</g>
</svg>

After

Width:  |  Height:  |  Size: 1.0 KiB

View File

@@ -0,0 +1,4 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<svg width="24" height="24" viewBox="0 0 24 24" version="1.1">
<path d="m 23.363586,9.4396767 c -0.484888,-0.415618 -1.108315,-0.692697 -1.731742,-0.623427 -0.06926,0 -0.13854,0 -0.207809,0 -0.831236,0 -1.662473,-0.06927 -2.078091,-0.692697 -0.415618,-0.831236 0.13854,-1.9395513 0.969776,-2.4244391 v 0 C 21.770383,4.5907987 21.978192,3.3439445 21.631844,2.4434386 21.216226,1.265854 19.900102,0.57315716 18.653248,0.91950556 17.822011,0.98877526 16.921506,1.1273147 16.159539,1.3351237 14.981954,1.6122024 13.80437,1.8892812 12.696055,1.7507418 12.557516,1.6122024 12.418976,1.4736631 12.211167,1.3351237 11.65701,0.85023596 10.964313,0.22680876 9.9945374,0.29607846 8.8169534,0.36534816 7.9164474,1.3351237 7.5008294,2.789787 7.2237504,3.6902929 6.2539754,4.3829897 5.2841995,4.3829897 h -0.06927 l -0.06927,0.06927 c -0.6926961,0.138539 -1.1775839,0.6234268 -1.3853929,1.3161236 -0.2078091,0.6926964 0,1.4546634 0.415618,2.0088204 0.2770788,0.346349 0.6234272,0.484888 0.9005059,0.623427 0.1385394,0.06927 0.2770787,0.13854 0.4156181,0.20781 0.2770787,0.277078 0.3463484,0.692696 0.2770787,1.108314 0,0.207809 -0.1385394,0.5541583 -0.4848878,0.7619673 -0.207809,0 -0.415618,0 -0.6234271,0.06926 -0.9697755,0.06926 -2.0780904,0.207809 -2.8400569,1.108315 -0.6926968,0.761967 -1.10831494,1.662472 -1.52393304,2.562978 -0.06927,0.207817 -0.1385394,0.346356 -0.207809,0.484895 v 0.06926 c -0.3463484,1.246854 0.3463484,2.632248 1.59320264,3.047866 0.4848878,0.207816 0.9697756,0.346355 1.4546633,0.484895 0.9005059,0.277079 1.7317421,0.554157 2.2858995,1.246854 0.2770787,0.415618 0.3463484,0.969776 0.4156181,1.593203 0.06927,0.554157 0.1385393,1.108315 0.4156184,1.662472 0.207809,0.484888 0.692696,0.831236 1.246854,0.831236 0.06927,0.06927 0.138539,0.06927 0.207809,0.06927 0.415618,0 0.831236,-0.207809 1.108315,-0.484888 0.415618,-0.484888 0.623427,-1.039045 0.761966,-1.593202 0.207809,-0.484888 0.346349,-0.969776 0.7619666,-1.316124 1.039045,-0.831237 2.632248,-0.554158 3.671293,0.138539 0.554157,0.346348 1.246854,0.554157 1.870281,0.484888 0.623427,-0.06926 1.177585,-0.346349 1.523933,-0.761967 v -0.06927 c 0.623427,-0.900506 0.277079,-1.870282 0,-2.632248 -0.06927,-0.13854 -0.138539,-0.277079 -0.138539,-0.415618 l -0.06926,-0.06926 c -0.207809,-0.554157 -0.13854,-1.177584 0.207809,-1.662472 v -0.06926 c 0.623427,-1.039046 2.14736,-2.14736 4.433259,-2.14736 v 0 c 1.039038,-0.138555 2.078083,-0.761982 2.147353,-1.870297 0.06926,-0.623427 -0.138539,-1.3161243 -0.623427,-1.8010113 z m -6.372811,0.207809 c -0.623427,0.8312363 -1.385393,2.2858993 -3.602023,2.0780903 -2.21663,-0.277079 -2.909327,-2.9093263 -2.909327,-4.2254503 0.207809,-1.108315 0.969776,-1.8702818 1.731742,-2.6322483 0.554158,-0.5541574 0.761967,-1.1083148 2.078091,-1.1083148 1.385393,-0.06927 1.177584,2.2858994 1.523933,3.2556751 0.346348,1.039045 2.00882,1.385393 1.177584,2.632248 z"/>
</svg>

After

Width:  |  Height:  |  Size: 2.9 KiB

View File

@@ -0,0 +1,4 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<svg width="24" height="24" viewBox="0 0 24 24" version="1.1">
<path d="m 23.064449,4.5172277 c 0.292358,-0.2923585 0.643188,-0.7016605 0.70166,-1.1109624 -0.05846,-0.1754151 -0.994019,1.0524907 -1.812623,0.994019 -0.292358,0 -0.643188,0.058472 -0.935547,0.1169434 -0.175415,-0.7016605 -0.935547,-1.1109624 -2.631227,-1.1694341 -0.175415,0 -0.409302,0 -0.584717,0.058472 -0.05847,0 -0.05847,0 -0.116943,0 0,0 -0.05847,0 -0.05847,0 -0.467773,0.058472 -0.818603,-0.7016604 -1.695679,-0.6431887 -0.05847,0 -0.116943,0 -0.175415,0 -0.760132,0.1169434 -0.818604,0.8186038 -1.052491,1.1109624 -0.70166,0.2338868 -1.520264,0.584717 -2.572755,1.2279057 -3.742188,3.4498304 -3.625245,7.835207 -5.6717544,8.829226 -3.0405285,0.877076 -4.0930192,0 -5.78869853,1.637208 -0.7601322,1.110962 -0.994019,2.104981 -0.058472,3.742189 C 1.5468643,21.006247 4.1196192,21.824851 7.2770912,20.538473 10.376095,19.193624 13.592039,10.656756 13.825926,10.247454 14.293699,8.7271904 19.439209,8.4933034 20.4917,6.5052656 20.667115,6.2129071 20.784058,5.9790203 20.901002,5.7451334 22.011964,4.9850013 23.824587,5.043473 24.000002,4.8095862 23.941537,4.6926428 23.5907,4.5756994 23.064455,4.5172277 Z m -5.905642,2.5727549 c -0.643189,0 -1.227906,-0.5262453 -1.227906,-1.2279058 0,-0.6431887 0.584717,-1.2279057 1.227906,-1.2279057 0.70166,0 1.227905,0.584717 1.227905,1.2279057 0,0.7016605 -0.526245,1.2279058 -1.227905,1.2279058 z m 2.982056,8.1275664 C 17.62658,14.57436 15.22924,14.22353 12.948844,14.106586 c -0.175415,0.409302 -0.409302,0.818604 -0.643189,1.286378 -0.643188,1.227905 -1.344849,2.455811 -2.104981,3.508302 -0.818603,0.994019 -1.637207,1.871094 -2.6312263,2.338868 -0.058472,0 -0.058472,0 -0.1169434,0 1.4617927,0 2.9820567,-0.116943 4.5023207,-0.35083 3.683717,-0.467774 7.133548,-1.286378 7.89368,-1.520265 0.70166,-0.233886 1.286377,-1.169434 1.344849,-2.104981 0.05847,-0.409302 0,-0.877075 -0.175415,-1.227906 -0.175415,-0.409302 -0.409302,-0.643188 -0.877076,-0.818603 z m -1.227905,-2.514284 c -1.344849,-0.643188 -2.982057,-1.169434 -4.677737,-1.520264 -0.116943,0.233887 -0.233886,0.584717 -0.409301,0.994019 -0.175416,0.409302 -0.350831,0.818604 -0.584717,1.344849 2.046509,0.175415 4.326906,0.467774 6.665774,1.052491 0.05846,-0.760132 -0.233887,-1.578736 -0.994019,-1.871095 z M 6.1076552,13.463397 c 0.7016604,-0.877075 1.169434,-1.871094 1.6372078,-2.982056 0.05847,-0.05847 0.05847,-0.116944 0.116943,-0.175416 -0.4093017,0 -0.8186036,0 -1.2279055,0 -0.058472,0 -0.1754151,0 -0.2338868,0 -1.4033209,0 -2.3973398,0.116944 -2.6896983,0.350831 -0.8186039,0.70166 -1.0524907,2.046509 -0.409302,2.923585 0.9355473,-0.05847 1.8710945,-0.116944 2.8066418,-0.116944 z M 6.2245986,9.6627374 C 4.9382211,8.1424733 5.0551645,6.6806807 4.7043343,6.6806807 4.5289192,6.8560958 4.5873909,8.4933034 4.8797494,9.7796804 5.347523,9.7212154 5.756825,9.7212154 6.2245986,9.6627374 Z"/>
</svg>

After

Width:  |  Height:  |  Size: 2.9 KiB

View File

@@ -0,0 +1,4 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<svg width="24" height="24" viewBox="0 0 24 24" version="1.1">
<path d="m 11.009709,21.098756 c -0.990292,0 -1.9805828,-0.23301 -2.679612,-0.407767 l 0.2912622,-1.339805 c 0.7572816,0.174757 1.6893208,0.349514 2.5631068,0.349514 l 0.05825,1.398058 c -0.116504,0 -0.174757,0 -0.233009,0 z M 0.81553398,20.807493 C 0.34951456,20.807493 0,20.399726 0,19.933708 0,19.642445 0.11650486,19.351184 0.29126214,19.176425 0.75728156,18.768658 1.2815534,18.419144 1.6893204,18.127883 l 0.7572816,1.165048 c -0.2912622,0.174757 -1.1067962,0.815534 -1.1067962,0.815534 -0.058253,0.05825 -0.058253,0.05825 -0.058253,0.05825 l -0.2330091,0.40777 z M 14.155339,20.341475 13.572815,19.118174 c 0.815534,-0.349516 1.456311,-0.873787 2.038835,-1.456311 l 0.990291,0.932038 c -0.640775,0.757283 -1.514562,1.339807 -2.446602,1.747574 z M 3.6116504,20.283222 3.145631,18.943417 C 3.669903,18.768658 4.1941748,18.593901 4.776699,18.30264 5.2427184,18.127883 5.7087378,18.06963 6.1747572,18.186134 l -0.3495144,1.339807 c -0.116505,-0.05825 -0.2912622,0 -0.4660194,0.05825 -0.5825244,0.291263 -1.223301,0.524273 -1.747573,0.699031 z M 4.776699,17.428853 3.7281554,16.555066 c 0.1165048,-0.174757 0.2330096,-0.349514 0.291262,-0.524271 0.2330098,-0.582524 0.407767,-1.165048 0.5825244,-1.805825 l 1.3398058,0.407767 c -0.1747574,0.640777 -0.407767,1.281554 -0.6407768,1.864078 v 0.05825 0.05825 C 5.184466,16.904586 5.0097088,17.137596 4.776699,17.428858 Z m 13.514563,-1.281554 -1.281554,-0.582524 c 0.349516,-0.757281 0.582526,-1.572815 0.69903,-2.504853 l 1.398058,0.233008 c -0.174757,1.048544 -0.407767,1.980584 -0.815534,2.854369 z M 6.6407766,11.894872 5.3009708,11.603611 v -0.174757 c 0.1747574,-0.873787 0.407767,-1.7475736 0.815534,-2.62136 L 7.3980582,9.3900182 C 7.0485436,10.1473 6.815534,10.904581 6.6990292,11.661862 v 0.05825 z M 19.398059,10.555067 17.999999,10.38031 c 0.116506,-0.9320394 0.349516,-1.980583 0.873787,-2.9126218 l 1.223301,0.699029 C 19.747573,8.7492416 19.514563,9.4482706 19.398059,10.555067 Z M 8.854369,7.3511832 7.8640776,6.360892 C 8.3883496,5.8366202 9.0291262,5.3706008 9.7281554,4.9628338 9.9029126,4.8463288 10.07767,4.7880764 10.252427,4.6715716 l 0.699029,1.223301 c -0.174757,0.058252 -0.349514,0.1747572 -0.582524,0.2912622 v 0 C 9.8446602,6.4773968 9.3203884,6.8851638 8.854369,7.3511832 Z M 21.786408,6.3026396 20.912621,5.1958434 C 21.553398,4.729824 22.310679,4.2638046 23.475729,3.7977852 L 24,5.0210862 c -1.048544,0.4660194 -1.689321,0.815534 -2.213592,1.2815534 z M 13.339805,4.7880764 12.873787,3.4482706 c 0.990291,-0.2912622 1.805825,-0.407767 2.91262,-0.5242718 L 15.902913,4.322057 C 14.912622,4.4385618 14.155339,4.4968144 13.339805,4.7880764 Z M 21.262135,4.322057 C 20.504854,4.2638046 19.514563,4.2055522 18.582525,4.2055522 V 2.807494 c 0.990291,0 1.980582,0.058253 2.854369,0.1165048 z M 12.815534,14.341474 H 11.53398 c -0.05825,-0.174757 -0.05825,-0.291261 -0.05825,-0.349514 0,-0.407767 0.116505,-0.757281 0.23301,-1.048544 0.116504,-0.23301 0.407767,-0.582524 0.815534,-0.873787 0.407767,-0.349514 0.699029,-0.582524 0.757281,-0.699028 0.116506,-0.174757 0.174757,-0.349514 0.174757,-0.524273 0,-0.291261 -0.116504,-0.524271 -0.349514,-0.699028 -0.174757,-0.23301 -0.46602,-0.2912627 -0.873787,-0.2912627 -0.349514,0 -0.640776,0.058248 -0.873785,0.2912627 -0.23301,0.23301 -0.407768,0.524271 -0.524273,0.932038 L 9.5534042,10.904581 c 0,-0.582524 0.2912622,-1.1067954 0.7572818,-1.5145628 0.466019,-0.407767 1.106795,-0.6407766 1.864078,-0.6407766 0.815534,0 1.456311,0.2330096 1.922329,0.6407766 0.524273,0.4077674 0.757283,0.9320388 0.757283,1.5145628 0,0.291263 -0.116506,0.582524 -0.291263,0.873787 -0.174757,0.291261 -0.524271,0.640777 -1.106797,1.106795 -0.291261,0.291263 -0.466018,0.46602 -0.582524,0.640777 -0.05825,0.116506 -0.05825,0.407767 -0.05825,0.815534 z m -1.281554,0.46602 h 1.398058 v 1.398058 H 11.53398 Z"/>
</svg>

After

Width:  |  Height:  |  Size: 3.8 KiB

View File

@@ -97,7 +97,7 @@ export const capitalizeCommonName = name => {
export const generateTaxonPieces = taxon => {
const taxonData = {};
taxonData.rank = capitalize( taxon.rank );
if ( taxon.rank ) taxonData.rank = capitalize( taxon.rank );
taxonData.rankLevel = taxon.rank_level;
// Logic follows the SplitTaxon component from web

View File

@@ -10,6 +10,9 @@ type Props = {
skipPlaceGuess?: bool
}
// Max time to wait while fetching current location
const CURRENT_LOCATION_TIMEOUT_MS = 30000;
const useUserLocation = ( { skipPlaceGuess = false }: Props ): Object => {
const [latLng, setLatLng] = useState( null );
const [isLoading, setIsLoading] = useState( true );
@@ -58,7 +61,11 @@ const useUserLocation = ( { skipPlaceGuess = false }: Props ): Object => {
setIsLoading( false );
};
const options = { enableHighAccuracy: true, maximumAge: 0 };
const options = {
enableHighAccuracy: true,
maximumAge: 0,
timeout: CURRENT_LOCATION_TIMEOUT_MS
};
Geolocation.getCurrentPosition( success, failure, options );
};

View File

@@ -36,7 +36,7 @@ exports[`ActivityCount renders reliably 1`] = `
]
}
>
</Text>
<Text
style={

View File

@@ -1,75 +1,6 @@
// Jest Snapshot v1, https://goo.gl/fbAQLP
exports[`CommentsCount renders default reliably 1`] = `
<View
accessibilityLabel="1 comment"
accessible={true}
style={
[
[
{
"flexDirection": "row",
},
{
"alignItems": "center",
},
],
]
}
>
<Text
allowFontScaling={false}
selectable={false}
style={
[
{
"color": "rgba(103, 80, 164, 1)",
"fontSize": 14,
},
undefined,
{
"fontFamily": "INatIcon",
"fontStyle": "normal",
"fontWeight": "normal",
},
{},
]
}
>
</Text>
<Text
style={
[
{
"fontFamily": "Whitney-Light",
},
[
{
"fontSize": 14,
"lineHeight": 18,
},
{
"fontWeight": "400",
},
{
"color": "#454545",
},
[
{
"marginLeft": 6,
},
],
],
]
}
>
1
</Text>
</View>
`;
exports[`CommentsCount renders filled reliably 1`] = `
<View
accessibilityLabel="1 comment"
accessible={true}
@@ -138,6 +69,75 @@ exports[`CommentsCount renders filled reliably 1`] = `
</View>
`;
exports[`CommentsCount renders filled reliably 1`] = `
<View
accessibilityLabel="1 comment"
accessible={true}
style={
[
[
{
"flexDirection": "row",
},
{
"alignItems": "center",
},
],
]
}
>
<Text
allowFontScaling={false}
selectable={false}
style={
[
{
"color": "rgba(103, 80, 164, 1)",
"fontSize": 14,
},
undefined,
{
"fontFamily": "INatIcon",
"fontStyle": "normal",
"fontWeight": "normal",
},
{},
]
}
>
</Text>
<Text
style={
[
{
"fontFamily": "Whitney-Light",
},
[
{
"fontSize": 14,
"lineHeight": 18,
},
{
"fontWeight": "400",
},
{
"color": "#454545",
},
[
{
"marginLeft": 6,
},
],
],
]
}
>
1
</Text>
</View>
`;
exports[`CommentsCount renders white reliably 1`] = `
<View
accessibilityLabel="1 comment"
@@ -174,7 +174,7 @@ exports[`CommentsCount renders white reliably 1`] = `
]
}
>
</Text>
<Text
style={

View File

@@ -36,7 +36,7 @@ exports[`IdentificationsCount renders default reliably 1`] = `
]
}
>
</Text>
<Text
style={
@@ -105,7 +105,7 @@ exports[`IdentificationsCount renders filled reliably 1`] = `
]
}
>
</Text>
<Text
style={
@@ -174,7 +174,7 @@ exports[`IdentificationsCount renders white reliably 1`] = `
]
}
>
</Text>
<Text
style={

View File

@@ -7,7 +7,7 @@ exports[`INatIconButton renders correctly 1`] = `
{
"busy": undefined,
"checked": undefined,
"disabled": undefined,
"disabled": false,
"expanded": undefined,
"selected": undefined,
}
@@ -75,7 +75,7 @@ exports[`INatIconButton renders correctly 1`] = `
]
}
>
</Text>
</View>
</View>

View File

@@ -174,7 +174,7 @@ exports[`InlineUser when offline renders reliably 1`] = `
}
testID="InlineUser.NoInternetPicture"
>
</Text>
</View>
<Text
@@ -285,7 +285,7 @@ exports[`InlineUser when user has no icon set renders reliably 1`] = `
}
testID="InlineUser.FallbackPicture"
>
</Text>
</View>
<Text

View File

@@ -167,7 +167,7 @@ exports[`UploadStatus displays progress bar when progress is less than 5% correc
]
}
>
</Text>
</View>
</View>

View File

@@ -20,6 +20,6 @@ exports[`INatIcon renders correctly 1`] = `
]
}
>
</Text>
`;