Merge conflicts

This commit is contained in:
dkhamsing 2020-04-16 07:52:42 -07:00
commit 9ed25c8b49
3 changed files with 45 additions and 16 deletions

View File

@ -3,21 +3,21 @@
These are the 15 latest entries from the [main list](https://github.com/dkhamsing/open-source-ios-apps).
1. [ARbusters](https://github.com/pedrommcarrasco/ARbusters)
2. [reddit-swiftui](https://github.com/carson-katri/reddit-swiftui)
3. [Outline](https://github.com/Jigsaw-Code/outline-client)
4. [Tofu Authenticator](https://github.com/calleerlandsson/Tofu)
5. [Podverse](https://github.com/podverse/podverse-rn)
6. [FreeTimePicker](https://github.com/fromkk/FreeTimePicker)
7. [Fingerspelling](https://github.com/sloria/Fingerspelling-iOS)
8. [windmill](https://github.com/qnoid/windmill-ios)
9. [App Store Clone](https://github.com/VamshiIITBHU14/AppStoreClone)
10. [xFonts](https://github.com/manolosavi/xFonts)
11. [Messenger Clone](https://github.com/instamobile/messenger-iOS-chat-swift-firestore)
12. [Corona virus tracker](https://github.com/nploi/corona_tracker)
13. [covid19](https://github.com/dkhamsing/covid19.swift)
14. [Apollo](https://github.com/KhaosT/open-apollo)
15. [Coronavirus in Iran](https://github.com/soroushchehresa/iran-coronavirus)
1. [Delta: Math helper](https://github.com/GroupeMINASTE/Delta-iOS)
2. [ARbusters](https://github.com/pedrommcarrasco/ARbusters)
3. [reddit-swiftui](https://github.com/carson-katri/reddit-swiftui)
4. [Outline](https://github.com/Jigsaw-Code/outline-client)
5. [Tofu Authenticator](https://github.com/calleerlandsson/Tofu)
6. [Podverse](https://github.com/podverse/podverse-rn)
7. [FreeTimePicker](https://github.com/fromkk/FreeTimePicker)
8. [Fingerspelling](https://github.com/sloria/Fingerspelling-iOS)
9. [windmill](https://github.com/qnoid/windmill-ios)
10. [App Store Clone](https://github.com/VamshiIITBHU14/AppStoreClone)
11. [xFonts](https://github.com/manolosavi/xFonts)
12. [Messenger Clone](https://github.com/instamobile/messenger-iOS-chat-swift-firestore)
13. [Corona virus tracker](https://github.com/nploi/corona_tracker)
14. [covid19](https://github.com/dkhamsing/covid19.swift)
15. [Apollo](https://github.com/KhaosT/open-apollo)
## Thanks

View File

@ -6,7 +6,7 @@
A collaborative list of open-source `iOS`, `watchOS` and `tvOS` apps, your [contribution](https://github.com/dkhamsing/open-source-ios-apps/blob/master/.github/CONTRIBUTING.md) is welcome :smile:
![](https://img.shields.io/badge/Projects-941-green.svg) [![](https://img.shields.io/badge/Twitter-@opensourceios-blue.svg)](https://twitter.com/opensourceios) ![](https://img.shields.io/badge/Updated-April%2015,%202020-lightgrey.svg)
![](https://img.shields.io/badge/Projects-942-green.svg) [![](https://img.shields.io/badge/Twitter-@opensourceios-blue.svg)](https://twitter.com/opensourceios) ![](https://img.shields.io/badge/Updated-April%2016,%202020-lightgrey.svg)
Jump to
@ -1465,6 +1465,14 @@ Click ► to show more details
<a href='https://github.com/vermont42/Conjugar/blob/master/Conjugar/browse.png?raw=true'><code>Screenshot 1</code></a> <a href='https://github.com/vermont42/Conjugar/blob/master/Conjugar/verb.png?raw=true'><code>Screenshot 2</code></a> <a href='https://github.com/vermont42/Conjugar/blob/master/Conjugar/quiz.png?raw=true'><code>Screenshot 3</code></a> <a href='https://github.com/vermont42/Conjugar/blob/master/Conjugar/browseInfo.png?raw=true'><code>Screenshot 4</code></a> <a href='https://github.com/vermont42/Conjugar/blob/master/Conjugar/info.png?raw=true'><code>Screenshot 5</code></a>
</details>
- [Delta: Math helper](https://github.com/GroupeMINASTE/Delta-iOS): With Delta: Math helper, quickly solve any math problem with an algorithm. Save time checking your homework or studying for a test, its free!
<details>
<summary><code>swift</code> </summary>
Added April 15, 2020<br> License: [`gpl-3.0`](http://choosealicense.com/licenses/gpl-3.0/)<br>
<a href='https://is2-ssl.mzstatic.com/image/thumb/Purple123/v4/17/ec/5f/17ec5fa5-57ac-7504-65a8-dc007b6afb03/pr_source.png/460x0w.png'><code>Screenshot 1</code></a> <a href='https://is1-ssl.mzstatic.com/image/thumb/Purple123/v4/31/c1/74/31c174b5-5be4-b78d-dbb9-f55fa0c6a624/pr_source.png/460x0w.png'><code>Screenshot 2</code></a> <a href='https://is1-ssl.mzstatic.com/image/thumb/Purple113/v4/e8/38/1d/e8381dde-da9f-91e9-674f-25077cd6322e/pr_source.png/460x0w.png'><code>Screenshot 3</code></a> <a href='https://is1-ssl.mzstatic.com/image/thumb/Purple113/v4/63/e0/92/63e092f4-9a11-9936-d3ad-da8cc258afd8/pr_source.png/460x0w.png'><code>Screenshot 4</code></a>
</details>
- [Fingerspelling](https://github.com/sloria/Fingerspelling-iOS): Practice American Sign Language (ASL) fingerspelling
<details>
<summary><code>swift</code> <code>swiftui</code> <code>combine</code> </summary>

View File

@ -19076,6 +19076,27 @@
"date_added": "Apr 15 2020",
"suggested_by": "@dkhamsing",
"stars": 37
},
{
"title": "Delta: Math helper",
"category-ids": [
"education"
],
"description": "With Delta: Math helper, quickly solve any math problem with an algorithm. Save time checking your homework or studying for a test, its free!",
"source": "https://github.com/GroupeMINASTE/Delta-iOS",
"license": "gpl-3.0",
"stars": 0,
"tags": [
"swift"
],
"screenshots": [
"https://is2-ssl.mzstatic.com/image/thumb/Purple123/v4/17/ec/5f/17ec5fa5-57ac-7504-65a8-dc007b6afb03/pr_source.png/460x0w.png",
"https://is1-ssl.mzstatic.com/image/thumb/Purple123/v4/31/c1/74/31c174b5-5be4-b78d-dbb9-f55fa0c6a624/pr_source.png/460x0w.png",
"https://is1-ssl.mzstatic.com/image/thumb/Purple113/v4/e8/38/1d/e8381dde-da9f-91e9-674f-25077cd6322e/pr_source.png/460x0w.png",
"https://is1-ssl.mzstatic.com/image/thumb/Purple113/v4/63/e0/92/63e092f4-9a11-9936-d3ad-da8cc258afd8/pr_source.png/460x0w.png"
],
"date_added": "Apr 15 2020",
"suggested_by": "@NathanFallet"
}
]
}