Skip to content

Commit

Permalink
Merge pull request #9 from MostafaGazar/develop
Browse files Browse the repository at this point in the history
Sort out a few issues with README and CONTRIBUTING files
  • Loading branch information
MostafaGazar authored Jul 10, 2019
2 parents f1619e5 + c993fad commit dff5d24
Show file tree
Hide file tree
Showing 7 changed files with 5 additions and 6 deletions.
2 changes: 1 addition & 1 deletion CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ We use [gitflow](https://www.atlassian.com/git/tutorials/comparing-workflows/git
Workflow
--------
If you would like to contribute to this project, please:
- Pick an [issue](https://github.com/SoftwareEngineeringDaily/software-engineering-daily-android/issues) to work on or create a [proposal](https://github.com/SoftwareEngineeringDaily/software-engineering-daily-android#feature-proposals) for a new feature.
- Pick an [issue](https://github.com/SoftwareEngineeringDaily/software-engineering-daily-android/issues) to work on or create a [proposal](https://github.com/SoftwareEngineeringDaily/software-engineering-daily-android/blob/master/CONTRIBUTING.md#feature-proposals) for a new feature.
- Fork this project.
- Create your feature branch based off the `develop` branch.
- Create a pull request to get your worked reviewed and merged back into the upstream `develop` branch.
Expand Down
9 changes: 4 additions & 5 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,10 @@ Getting Started
The app has 2 build types: debug and release with minor differences between both builds. [`Stetho`](http://facebook.github.io/stetho/) for example is only enabled for debug builds. And [`Timber`](https://github.com/JakeWharton/timber) to log warnings and errors as Crashlytics non-fatal crashes in release builds.

We also use different app icons for debug and release builds and you can keep both builds on your device and run them side by side.

![](screenshots/debug-release-icons.png)


The app is 100% [Kotlin](http://kotlinlang.org) and we think it is better to keep it this way.

We use [`Koin`](https://insert-koin.io) which is a lightweight dependency injection framework to manage all dependencies. And [`Kotlin Coroutines`](https://kotlinlang.org/docs/reference/coroutines-overview.html) for asynchronous work. We also use `Kotlin Coroutines` with [`Room`](https://developer.android.com/topic/libraries/architecture/room) and [`Retrofit`](https://square.github.io/retrofit/).
Expand All @@ -29,10 +31,7 @@ And then compile the project with Gradle using

Screenshots
-----------
![](screenshots/1.png)
![](screenshots/2.png)
![](screenshots/3.png)
![](screenshots/4.png)
![App screenshots](screenshots/app_screenshots.png)

Libraries Used
--------------
Expand Down Expand Up @@ -73,7 +72,7 @@ Libraries Used

Upcoming features
-----------------
Interested in seeing a particular feature implemented in this app? Please open a new [issue](https://github.com/SoftwareEngineeringDaily/software-engineering-daily-android/issues) with a [feature proposal](https://github.com/SoftwareEngineeringDaily/software-engineering-daily-android#feature-proposals).
Interested in seeing a particular feature implemented in this app? Please open a new [issue](https://github.com/SoftwareEngineeringDaily/software-engineering-daily-android/issues) with a [feature proposal](https://github.com/SoftwareEngineeringDaily/software-engineering-daily-android/blob/master/CONTRIBUTING.md#feature-proposals).

Contributing
------------
Expand Down
Binary file removed screenshots/1.png
Binary file not shown.
Binary file removed screenshots/2.png
Binary file not shown.
Binary file removed screenshots/3.png
Binary file not shown.
Binary file removed screenshots/4.png
Binary file not shown.
Binary file added screenshots/app_screenshots.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

0 comments on commit dff5d24

Please sign in to comment.