Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/master'
Browse files Browse the repository at this point in the history
  • Loading branch information
vukan-markovic committed Oct 11, 2018
2 parents ac76315 + 34c7de1 commit 5a376a9
Show file tree
Hide file tree
Showing 5 changed files with 84 additions and 8 deletions.
28 changes: 28 additions & 0 deletions .github/ISSUE_TEMPLATE/bug_report.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
---
name: Bug report
about: Create a report to help me improve my Android application.

---

**Describe the bug**
A clear and concise description of what the bug is.

**To Reproduce**
Steps to reproduce the behavior:
1. Go to '...'
2. Click on '....'
3. Scroll down to '....'
4. See error

**Expected behavior**
A clear and concise description of what you expected to happen.

**Screenshots**
If applicable, add screenshots to help explain your problem.

**Smartphone (please complete the following information):**
- Device: [e.g. HTC Desire 620g dual sim]
- OS: [e.g. Android 4.4 KitKat]

**Additional context**
Add any other context about the problem here.
7 changes: 7 additions & 0 deletions .github/ISSUE_TEMPLATE/custom.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
---
name: Custom issue template
about: Describe this issue template's purpose here.

---


17 changes: 17 additions & 0 deletions .github/ISSUE_TEMPLATE/feature_request.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
---
name: Feature request
about: Suggest an idea for this project

---

**Is your feature request related to a problem? Please describe.**
A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]

**Describe the solution you'd like**
A clear and concise description of what you want to happen.

**Describe alternatives you've considered**
A clear and concise description of any alternative solutions or features you've considered.

**Additional context**
Add any other context or screenshots about the feature request here.
34 changes: 31 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,32 @@
# Chat_rooms
Android app with public chat rooms about different topics.
# Chat rooms :speech_balloon:

Amazon Appstore: http://a.co/d/dEEt6vL
![App icon](https://lh3.googleusercontent.com/lHJZNngwNMDTk1cmIhlH6msCIdr1u08fO5Q-PIXufc_zXyvVAjMcfE0VcvE1LaRbARU=s180-rw)

**Android app with public chat rooms about different topics.**

There is a lot of public chat rooms where people can discuss with others about different topics such as sport, technology, cryptocurrency, music, movie, series, art, games, and there is subcategories for every of this categories and chat rooms for every country too.
Application have support for Google, Facebook and Twitter sign-in.
You can create your account, update your username and profile picture, sign out and delete account.
There is also option to invite your friends to the app and share application with others.

[Link to the Amazon Appstore](http://a.co/d/dEEt6vL)

[Documentation](https://vukan-markovic.github.io/Chat_rooms/)

## Screenshots:

![Sign-in screen](https://lh3.googleusercontent.com/A-vUWdMoSl9phlMV6Gu9NZVTiEHcLv3hpWxfvkCy07116Al_ah9iWXcVim3Q9SNgVHY=w1280-h699-rw)

![Home screen](https://lh3.googleusercontent.com/Gc9gUte2QJAlBGEGjmK5hoQo5wA-xwETnx48rFWIflIMJmGc65lWlojyIJl-8qZsOOSN=w1280-h699-rw)

![Subcategories screen](https://lh3.googleusercontent.com/enoifiHOqj9WHXyMWaDw3TXLNkfNl2TJQkQvBH4NR51nM4sJ3BdGM63t3KFnPWAoJY8=w1280-h699-rw)

![Chat screen 1](https://lh3.googleusercontent.com/reWbCmx0Tx767_aDWCKHiaS4UUJjv_uEqpbNfw-Gf_XU4Sjk5rzPJayObUJXHZbr0t0=w1280-h699-rw)

![Chat screen 2](https://lh3.googleusercontent.com/YdG4KDkELNklA6mmfqu2stlNtO35sCCV5natTmYQ-U7Mesi5qzgrsMNzfiEs6PfdWzE=w1280-h699-rw)

![Menu](https://lh3.googleusercontent.com/3brS7IPkswAEwbzieR5I6rH38FOS4cluUUt73QASiOUhG6kvIQcvSUQyU-B8ThRv6Q=w1280-h699-rw)

![Update profile screen](https://lh3.googleusercontent.com/krxTfpPZOwvX5labDKtUfCIXVrl4k3_IOAeSiGHL3RPx-hQvmZVadW6McWpG2VLb_Q=w1280-h699-rw)

![Chat rules screen](https://lh3.googleusercontent.com/iOzxzWKnPdQDSXr5JVdqGNXIFYU-77rp_wHICzVtiPpj4JzC5wgXPDonGyPw1S8e9S0U=w1280-h699-rw)
6 changes: 1 addition & 5 deletions app/src/main/res/values/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -41,10 +41,6 @@
<string name="internet_connection">No internet connection!</string>
<string name="wi_fi">Turn on Wi-fi connection?</string>
<string name="update_profile_activity">Update profile</string>
<string name="twitter_consumer_key" translatable="false">Qdi72lFNQK0h3To4XqYAbt3fq</string>
<string name="twitter_consumer_secret" translatable="false">JtPXQZxxVYn5c5cJLFRmllD5DRM6zG7YlIxjBZnxXmSOny0HOt</string>
<string name="facebook_application_id" translatable="false">419069908499165</string>
<string name="facebook_login_protocol_scheme" translatable="false">fb419069908499165</string>
<string name="invitation_deep_link" translatable="false">https://vukan97.page.link/chat_rooms</string>
<string name="invite_friends_email_photo" translatable="false">https://www.idealizetecnologia.com.br/blog/wp-content/uploads/2018/03/chat-ecommerce-1024x867.jpg</string>
</resources>
</resources>

0 comments on commit 5a376a9

Please sign in to comment.