Skip to content

Commit

Permalink
Merge branch 'master' into #6-About-Page
Browse files Browse the repository at this point in the history
  • Loading branch information
nrd26 authored Apr 15, 2022
2 parents 31f489a + 90ebadc commit 67971d0
Show file tree
Hide file tree
Showing 92 changed files with 1,476 additions and 61 deletions.
18 changes: 18 additions & 0 deletions .all-contributorsrc
Original file line number Diff line number Diff line change
Expand Up @@ -88,6 +88,24 @@
"contributions": [
"code"
]
},
{
"login": "Fredorixo",
"name": "Fredorixo",
"avatar_url": "/~https://avatars.githubusercontent.com/u/80041092?v=4",
"profile": "/~https://github.com/Fredorixo",
"contributions": [
"code"
]
},
{
"login": "Chitrakshi2531",
"name": "chitrakshi bohra",
"avatar_url": "/~https://avatars.githubusercontent.com/u/99464268?v=4",
"profile": "/~https://github.com/Chitrakshi2531",
"contributions": [
"code"
]
}
],
"contributorsPerLine": 7,
Expand Down
22 changes: 21 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@


<!-- ALL-CONTRIBUTORS-BADGE:START - Do not remove or modify this section -->
[![All Contributors](https://img.shields.io/badge/all_contributors-9-orange.svg?style=flat-square)](#contributors-)
[![All Contributors](https://img.shields.io/badge/all_contributors-11-orange.svg?style=flat-square)](#contributors-)
<!-- ALL-CONTRIBUTORS-BADGE:END -->
![Group 1](https://user-images.githubusercontent.com/55774240/155844381-bc4eb27d-c7aa-4325-b621-2164436cf9ac.png)
![Group 2](https://user-images.githubusercontent.com/55774240/155844384-0c9c4899-91c9-412e-81b9-818fc6f8ae9f.png)
Expand Down Expand Up @@ -97,6 +97,24 @@
<hr>
<!-- <img width="120" src="https://user-images.githubusercontent.com/55774240/149710423-cdd7b528-638c-45e1-bec5-80201827b8a0.png" > -->


## Stargazers over time

[![Stargazers over time](https://starchart.cc/Lakhankumawat/smart-home-app.svg)](https://starchart.cc/Lakhankumawat/smart-home-app)


## Project Maintainers ❤️
<br>
<table>
<tr>
<td align="center"><a href="http://lakhankumawat.me/"><img src="/~https://avatars.githubusercontent.com/u/55774240?v=4?s=100" width="100px;" alt=""/><br /><sub><b>LakhanKumawat ᵖ⁺</b></sub></a><br /><a href="/~https://github.com/Lakhankumawat/LearnCPP/commits?author=Lakhankumawat" title="Code">💻</a> <a href="/~https://github.com/Lakhankumawat/LearnCPP/pulls?q=is%3Apr+reviewed-by%3ALakhankumawat" title="Reviewed Pull Requests">👀</a> <a href="#projectManagement-Lakhankumawat" title="Project Management">📆</a></td>
<td align="center"><a href="/~https://github.com/chandan0000"><img src="/~https://avatars.githubusercontent.com/u/60910265?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Chandan kumar yadav</b></sub></a><br /><a href="/~https://github.com/Lakhankumawat/smart-home-app/pull/23#issuecomment-1060314965" title="Code">💻</a> <a href="/~https://github.com/Lakhankumawat/LearnCPP/pulls?q=is%3Apr+reviewed-by%3Achandan0000" title="Reviewed Pull Requests">👀 🚧</a></td>
</tr>
</table>

<br>
<br>

## Contributors ✨

Thanks goes to these wonderful people ([emoji key](https://allcontributors.org/docs/en/emoji-key)):
Expand All @@ -117,6 +135,8 @@ Thanks goes to these wonderful people ([emoji key](https://allcontributors.org/d
<tr>
<td align="center"><a href="http://rachanasolanki.in"><img src="/~https://avatars.githubusercontent.com/u/12000313?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Rachana Solanki</b></sub></a><br /><a href="/~https://github.com/Lakhankumawat/smart-home-app/commits?author=RanchoDbest" title="Code">💻</a></td>
<td align="center"><a href="/~https://github.com/Pavel401"><img src="/~https://avatars.githubusercontent.com/u/47685150?v=4?s=100" width="100px;" alt=""/><br /><sub><b>SK MABUD ALAM</b></sub></a><br /><a href="/~https://github.com/Lakhankumawat/smart-home-app/commits?author=Pavel401" title="Code">💻</a></td>
<td align="center"><a href="/~https://github.com/Fredorixo"><img src="/~https://avatars.githubusercontent.com/u/80041092?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Fredorixo</b></sub></a><br /><a href="/~https://github.com/Lakhankumawat/smart-home-app/commits?author=Fredorixo" title="Code">💻</a></td>
<td align="center"><a href="/~https://github.com/Chitrakshi2531"><img src="/~https://avatars.githubusercontent.com/u/99464268?v=4?s=100" width="100px;" alt=""/><br /><sub><b>chitrakshi bohra</b></sub></a><br /><a href="/~https://github.com/Lakhankumawat/smart-home-app/commits?author=Chitrakshi2531" title="Code">💻</a></td>
</tr>
</table>

Expand Down
Binary file modified android/app/src/main/res/drawable-hdpi/splash.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified android/app/src/main/res/drawable-mdpi/splash.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified android/app/src/main/res/drawable-xhdpi/splash.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified android/app/src/main/res/drawable-xxhdpi/splash.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified android/app/src/main/res/drawable-xxxhdpi/splash.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified android/app/src/main/res/mipmap-hdpi/ic_launcher.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified android/app/src/main/res/mipmap-mdpi/ic_launcher.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified android/app/src/main/res/mipmap-xhdpi/ic_launcher.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/fonts/ABeeZee-Italic.ttf
Binary file not shown.
Binary file added assets/fonts/ABeeZee-Regular.ttf
Binary file not shown.
Binary file added assets/fonts/Lexend-ExtraLight.ttf
Binary file not shown.
Binary file added assets/fonts/Lexend-Medium.ttf
Binary file not shown.
1 change: 1 addition & 0 deletions assets/icons/menu_icons/devices.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions assets/icons/menu_icons/faq.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions assets/icons/menu_icons/notifications.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
8 changes: 8 additions & 0 deletions assets/icons/menu_icons/savings.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions assets/icons/menu_icons/settings.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions assets/icons/menu_icons/stats.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading

0 comments on commit 67971d0

Please sign in to comment.