Skip to content

Commit

Permalink
Merge pull request CyBear-Jinni#472 from CyBear-Jinni/dev
Browse files Browse the repository at this point in the history
Dev
  • Loading branch information
guyluz11 authored Oct 4, 2022
2 parents 4f1befc + 0d29813 commit 6a104e5
Show file tree
Hide file tree
Showing 53 changed files with 3,401 additions and 497 deletions.
18 changes: 12 additions & 6 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -14,15 +14,15 @@

This repository is in charge of the CyBear Jinni App and is part of the [CyBear Jinni Smart Home](https://github.com/CyBear-Jinni/CBJ_Smart-Home.git) system.

The CyBear Jinni App lets you control the [CyBear Jinni Hub](https://github.com/CyBear-Jinni/CBJ_Smart-Device) that manage the smart devices from different vendors.
The CyBear Jinni App lets you control the [CyBear Jinni Hub](https://github.com/CyBear-Jinni/cbj_hub) that manage the smart devices from different vendors.


It is writen with [Flutter](https://flutter.dev) and let you control the CyBear Jinni Hub directly in the local Wi-Fi and remotely through [cbj remote pipes](https://github.com/CyBear-Jinni/cbj_remote-pipes) which transfer requests to the Hub without collecting any data.


<table align="middle">
<tr>
<td>
<td>
<p>
<a href="https://play.google.com/store/apps/details?id=com.cybear_jinni.smart_home">
<img border="0" align="middle" alt="Android Badge" src="https://user-images.githubusercontent.com/9304740/117003444-8b58a080-aced-11eb-94bc-bfb2505f515d.png" width=200>
Expand All @@ -43,8 +43,14 @@ To learn the coding guidelines check [this Wiki](https://github.com/CyBear-Jinni

# Social Media Links

[<img src = "https://cdn.icon-icons.com/icons2/1099/PNG/512/1485482199-linkedin_78667.png" height = "80" >](https://www.linkedin.com/company/cybear-jinni)
<a href="https://twitter.com/CyBearJinni">
<img align="left" alt="Twitter" width="45px" src="https://cdn.cdnlogo.com/logos/t/96/twitter-icon.svg" /></a>
<a href="https://www.instagram.com/cybearjinni/?igshid=rfllj6qbv6l8">
<img align="left" alt="Instagram" width="45px" src="https://cdn.icon-icons.com/icons2/1753/PNG/512/iconfinder-social-media-applications-3instagram-4102579_113804.png" /></a>
<a href="https://www.linkedin.com/company/cybear-jinni">
<img align="left" alt="Linkedin" width="45px" src="https://cdn.icon-icons.com/icons2/1099/PNG/512/1485482199-linkedin_78667.png" /></a>
<a href="https://discord.gg/mUXfwUY">
<img align="left" alt="Discord" width="45px" src="https://cdn.icon-icons.com/icons2/2108/PNG/512/discord_icon_130958.png" /></a>
<a href="https://github.com/CyBear-Jinni">
<img align="left" alt="Github" width="45px" src="https://seeklogo.com/images/G/github-colored-logo-FDDF6EB1F0-seeklogo.com.png" /></a>

If you have any questions feel free to ask in our Discord server

[<img src="https://cdn.icon-icons.com/icons2/2108/PNG/512/discord_icon_130958.png" height="80">](https://discord.gg/mUXfwUY)
2 changes: 1 addition & 1 deletion android/app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ android {
defaultConfig {
applicationId "com.cybear_jinni.smart_home"
minSdkVersion 19
targetSdkVersion 30
targetSdkVersion 33
versionCode flutterVersionCode.toInteger()
versionName flutterVersionName
multiDexEnabled true // Enable multidex for apps with over 64K methods
Expand Down
1 change: 1 addition & 0 deletions android/app/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@
android:theme="@style/LaunchTheme"
android:showWhenLocked="true"
android:turnScreenOn="true"
android:exported="true"
android:windowSoftInputMode="adjustResize">
<!-- Specifies an Android theme to apply to this Activity as soon as
the Android process has started. This theme is visible to the user
Expand Down
112 changes: 112 additions & 0 deletions assets/translations/am-ET.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,112 @@
{
"Create_new_account": "አዲስ መለያ ፍጠር",
"Actions_History": "የተግባር ታሪክ",
"Empty_history": "ባዶ ታሪክ",
"History_Settings_Page": "የታሪክ ቅንብሮች ገጽ",
"Lamps_Page": "የአምፖሎች ገጽ",
"Name:_": "ስም: {}",
"Room:_": "ክፍል: {}",
"Lamps_Settings_Page": "የአምፖሎች ቅንብሮች ገጽ",
"Welcome_to_your_Smart_Home": "እንኳን ወደ ስማርት ቤትዎ በደህና መጡ",
"Scene_Settings_Page": "የትዕይንት ቅንብሮች ገጽ",
"Move_to_blinds_full_settings_page": "ወደ መጋረጃ ሙሉ የቅንብሮች ገጽ ይሂዱ",
"Blinds_Page": "የመጋረጃ ገጽ",
"Down": "ወደ ታች",
"Stop": "አቁም",
"Up": "ወደ ላይ",
"Smart_Devices_Settings_Page": "የስማርት መገልገያዎች ቅንብሮች ገጽ",
"Air_Conditioners": "የአየር ማቀዝቀዣዎች",
"Blinds": "መጋረጃዎች",
"Medical_Device": "የህክምና መገልገያ",
"Medical_Devices": "የህክምና መገልገያዎች",
"Smart_Phone": "ስማርት ስልክ",
"Smart_Phones": "ስማርት ስልኮች",
"Smart_Speakers": "ስማርት ስፒከሮች",
"Smart_Devices_page": "የስማርት መገልገያዎች ገጽ",
"History": "ታሪክ",
"Scene": "ትዕይንት",
"Scenes": "ትዕይንቶች",
"Lamps": "መብራቶች",
"Devices": "መገልገያዎች",
"Email_is_required": "ኢሜል ያስፈልጋል",
"Email_cannot_contain_spaces": "ኢሜል ክፍተቶችን ሊይዝ አይችልም።",
"Email_is_invalid": "ኢሜል ልክ ያልሆነ ነው",
"Email": "ኢሜል",
"Password_is_required": "የይለፍ ቃል ያስፈልጋል",
"Password_cannot_contain_spaces": "የይለፍ ቃል ክፍተቶችን ሊይዝ አይችልም።",
"Password_must_be_bigger_than__characters": "የይለፍ ቃል ከ {} ፊደላት የበለጠ መሆን አለበት",
"Password": "የይለፍ ቃል",
"Log_In": "ግባ",
"Forgot_password": "የይለፍ ቃሉን ረሱ",
"Forgot_password?": "የይለፍ ቃል ረስተዋል?",
"title": "ርዕስ",
"number": "ቁጥር",
"IP_is_required": "አይፒ ያስፈልጋል",
"IP_syntax_is_incorrect": "የአይፒ አገባብ የተሳሳተ ነው",
"Add_Smart_Device": "ስማርት መገልገያን ጨምር",
"Cancel": "ሰርዝ",
"Add": "ጨምር",
"Light": "ብርሃን",
"Device_ip:_": "የመገልገያ አይፒ: {}",
"New_devices": "አዳዲስ መገልገያዎች",
"Add_devices": "መገልገያዎችን አክል",
"Device_type:_": "የመገልገያ ዓይነት: {}",
"Room_name_is_required": "የክፍሉ ስም ያስፈልጋል",
"Room_name:": "የክፍሉ ስም:",
"Device_name_is_required": "የመገልገያ ስም ያስፈልጋል",
"Device_name:": "የመገልገያ ስም:",
"Update": "አዘምን",
"IP": "አይፒ",
"This_is_firebase": "ይህ ፋየርቤዝ ነው",
"Device_with_ip:_": "መገልገያ ከአይ.ፒ: {}",
"Update_WiFi_configuration": "የዋይፋይ ውቅር ያዘምኑ",
"WiFi_name_is_required": "የዋይፋይ ስም ያስፈልጋል",
"WiFi_Name": "የዋይፋይ ስም",
"WiFi_password_is_required": "የዋይፋይ ይለፍ ቃል ያስፈልጋል",
"WiFi_Password": "የዋይፋይ ይለፍ ቃል",
"Insert_WiFi_Credentials": "የዋይፋይ መለያዎትን አስገባ",
"Conditioners": "የአየር ማቀዝቀዣዎች",
"Medical": "ሕክምና",
"Phones": "ስልኮች",
"Speakers": "ስፒከሮች",
"Send": "ላክ",
"All_Devices": "ሁሉም መገልገያዎች",
"Summary": "ማጠቃለያ",
"Switches": "መቀያየሪያዎች",
"Boilers": "ማሞቂያዎች",
"Lights": "መብራቶች",
"RGBw_Lights": "የተለያዩ መብራቶች",
"_Switches": "{} መቀያየሪያዎች",
"_SmartTvs": "{} ስማርት ቲቪዎች",
"_RGBW_Lights": "{} የተለያዩ መብራቶች",
"_Lights": "{} መብራቶች",
"_Boilers": "{} ማሞቂያዎች",
"_Blinds": "{} መጋረጃዎች",
"Rooms": "ክፍሎች",
"_device": "{} መገልገያ",
"_devices": "{} መገልገያዎች",
"_SmartPlugs": "{} ስማርት መሰኪያዎች",
"On": "አብራ",
"Off": "አጥፋ",
"Color": "ቀለም",
"White": "ነጭ",
"Area": "አካባቢ",
"Areas": "አካባቢዎች",
"Automations": "ራስ-ሰሮች",
"Scenes_In_Folder": "ትዕይንቶች በአቃፊ ውስጥ",
"Select": "ይምረጡ",
"Exist": "አለ",
"OK": "እሺ",
"Nothing": "ምንም",
"No_need_here": "እዚህ አያስፈልግም",
"Do_not_need": "አያስፈልግም",
"Finish": "ጨርስ",
"Select_Purposes_Of_The_Area": "የአከባቢውን ዓላማዎች ይምረጡ",
"Pulling_Up_all_blinds": "ሁሉንም መጋረጃዎች ወደ ላይ መክፈት",
"Stopping_all_blinds": "ሁሉንም መጋረጃዎች ማቆም",
"Pulling_down_all_blinds": "ሁሉንም መጋረጃዎች ወደ ታች መዝጋት",
"Turning_On_boiler": "ማሞቂያውን በማብራት ላይ",
"Turning_Off_boiler": "ማሞቂያውን በማጥፋት ላይ",
"Waiting_for_user_to_get_connected_to_WiFi": "ተጠቃሚ ወደ ዋይፋይ እስኪገናኝ በመጠበቅ ላይ",
"Can't_add_unsupported_device": "የማይደገፍ መ ማከል አይቻልም"
}
112 changes: 112 additions & 0 deletions assets/translations/bn-IN.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,112 @@
{
"Create_new_account": "নতুন একাউন্ট বানান",
"Actions_History": "কর্ম ইতিহাস",
"Empty_history": "শুন্য ইতিহাস",
"History_Settings_Page": "ইতিহাস সেটিং পেজ",
"Lamps_Page": "ল্যাম্প পেজ",
"Name:_": "নাম: {}",
"Room:_": "ঘর: {}",
"Lamps_Settings_Page": "ল্যাম্পস সেটিং পেজ",
"Welcome_to_your_Smart_Home": "আপনার স্মার্ট বাড়িতে স্বাগত",
"Scene_Settings_Page": "দৃশ্য সেটিং পেজ",
"Move_to_blinds_full_settings_page": "পূর্ণ সেটিং পেজ অন্ধ মোডে করুন",
"Blinds_Page": "অন্ধ পেজ",
"Down": "নিচ",
"Stop": "থামুন",
"Up": "উপর",
"Smart_Devices_Settings_Page": "স্মার্ট যন্ত্র সেটিং পেজ",
"Air_Conditioners": "বাতনুকূল যন্ত্র",
"Blinds": "অন্ধ",
"Medical_Device": "ঔষধি যন্ত্র",
"Medical_Devices": "ঔষধি যন্ত্রাবলী",
"Smart_Phone": "স্মার্টফোন",
"Smart_Phones": "স্মার্টফোনেগুলি",
"Smart_Speakers": "স্মার্ট স্পিকার",
"Smart_Devices_page": "স্মার্ট যন্ত্রবলির পেজ",
"History": "ইতিহাস",
"Scene": "দৃশ্য",
"Scenes": "দৃশ্যবলী",
"Lamps": "ল্যাম্পস",
"Devices": "যন্ত্রাবলী",
"Email_is_required": "ইমেইল প্রয়োজন",
"Email_cannot_contain_spaces": "ইমেইলে শূন্যস্থান থাকতে পারে না",
"Email_is_invalid": "ইমেইল অনুমোদিত নয়",
"Email": "ইমেইল",
"Password_is_required": "পাসওয়ার্ড প্রয়োজন",
"Password_cannot_contain_spaces": "পাসওয়ার্ডে শূন্যস্থান থাকতে পারে না",
"Password_must_be_bigger_than__characters": "পাসওয়ার্ডটা {}গুলি অক্ষর এর চেয়ে বড়ো হতে হবে",
"Password": "পাসওয়ার্ড",
"Log_In": "লগ ইন করুন",
"Forgot_password": "পাসওয়ার্ড ভুলে গেছি",
"Forgot_password?": "পাসওয়ার্ড ভুলে গেছেন?",
"title": "শীর্ষক",
"number": "সংখ্যা",
"IP_is_required": "আইপি প্রয়োজন",
"IP_syntax_is_incorrect": "আইপির বিন্যাস ভুল",
"Add_Smart_Device": "স্মার্ট যন্ত্র যোগ করুন",
"Cancel": "বাদ দিন",
"Add": "যোগ",
"Light": "লাইট",
"Device_ip:_": "যন্ত্রের আইপি: {}",
"New_devices": "নতুন যন্ত্রাবলী",
"Add_devices": "যন্ত্রাবলী যোগ করুন",
"Device_type:_": "যন্ত্রের প্রকৃতি: {}",
"Room_name_is_required": "ঘরোর নাম প্রয়োজন",
"Room_name:": "ঘরের নাম:",
"Device_name_is_required": "যন্ত্রের নাম প্রয়োজন",
"Device_name:": "যন্ত্রের নাম:",
"Update": "আপডেট",
"IP": "আইপি",
"This_is_firebase": "এটা ফায়ারবেস",
"Device_with_ip:_": "আইপি সহ যন্ত্র: {}",
"Update_WiFi_configuration": "ওয়াইফাই কনফিগারেশন আপডেট করুন",
"WiFi_name_is_required": "ওয়াইফাই এর নাম প্রয়োজন",
"WiFi_Name": "ওয়াইফাই এর নাম",
"WiFi_password_is_required": "ওয়াইফাই এর পাসওয়ার্ড প্রয়োজন",
"WiFi_Password": "ওয়াইফাই এর পাসওয়ার্ড",
"Insert_WiFi_Credentials": "ওয়াইফাই এর তথ্য দিন",
"Conditioners": "বাতনুকূলক",
"Medical": "ঔষধি",
"Phones": "ফোন",
"Speakers": "স্পিকার",
"Send": "সেন্ড করুন",
"All_Devices": "সকল যন্ত্রাবলী",
"Summary": "সংক্ষেপ",
"Switches": "সুইচ",
"Boilers": "বয়লার",
"Lights": "লাইটস",
"RGBw_Lights": "আরজিবিডাবলু লাইটস",
"_Switches": "{} গুলি সুইচ",
"_SmartTvs": "{} গুলি স্মার্ট টিভি",
"_RGBW_Lights": "{} গুলি আরজিবিডাবলু লাইটস",
"_Lights": "{} গুলি লাইটস",
"_Boilers": "{} গুলি বয়লার",
"_Blinds": "{} গুলি ব্লাইন্ডস",
"Rooms": "ঘরগুলি",
"_device": "{} গুলি যন্ত্র",
"_devices": "{} devices",
"_SmartPlugs": "{} গুলি স্মার্ট প্লাগ",
"On": "অন",
"Off": "অফ",
"Color": "রং",
"White": "সাদা",
"Area": "ক্ষেত্র",
"Areas": "ক্ষেত্রগুলি",
"Automations": "স্বয়ংক্রীয়তা",
"Scenes_In_Folder": "ফোল্ডারের দৃশ্য",
"Select": "সিলেক্ট করুন",
"Exist": "এক্সিস্ট",
"OK": "ওকে",
"Nothing": "কিছু না",
"No_need_here": "কোনো প্রয়োজন নেই",
"Do_not_need": "আমি চাই না ভাই",
"Finish": "খতম করুন",
"Select_Purposes_Of_The_Area": "এই ক্ষেত্রের কাজ বলুন",
"Pulling_Up_all_blinds": "সব ব্লাইন্ড তুলে ধরুন",
"Stopping_all_blinds": "সব ব্লাইন্ড থামিয়ে দিন",
"Pulling_down_all_blinds": "সব ব্লাইন্ড নামিয়ে দিন",
"Turning_On_boiler": "বয়লার অন করুন",
"Turning_Off_boiler": "বয়লার অফ করুন",
"Waiting_for_user_to_get_connected_to_WiFi": "ওয়াইফাই এর সাথে সংযোগের জন্য অপেক্ষা",
"Can't_add_unsupported_device": "আনসাপোর্টেড যন্ত্র যোগ করা যাবে না"
}
112 changes: 112 additions & 0 deletions assets/translations/de-AT.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,112 @@
{
"Create_new_account": "Neues Konto erstellen",
"Actions_History": "Verlauf",
"Empty_history": "Verlauf löschen",
"History_Settings_Page": "Verlaufseinstellungen",
"Lamps_Page": "Lampen-Seite",
"Name:_": "Name: {}",
"Room:_": "Raum: {}",
"Lamps_Settings_Page": "Lampen-Einstellungsseite",
"Welcome_to_your_Smart_Home": "Willkommen in deinem Smart Home",
"Scene_Settings_Page": "Szenen-Einstellungsseite",
"Move_to_blinds_full_settings_page": "Gehe zur Rollo-Einstellungsseite",
"Blinds_Page": "Rollo-Seite",
"Down": "Nach unten",
"Stop": "Stopp",
"Up": "Nach oben",
"Smart_Devices_Settings_Page": "Einstellungsseite Smarte Geräte",
"Air_Conditioners": "Klimaanlagen",
"Blinds": "Rollos",
"Medical_Device": "Medizinisches Gerät",
"Medical_Devices": "Medizinische Geräte",
"Smart_Phone": "Smartphone",
"Smart_Phones": "Smartphones",
"Smart_Speakers": "Smarter Lautsprecher",
"Smart_Devices_page": "Smarte Geräte Seite",
"History": "Verlauf",
"Scene": "Szene",
"Scenes": "Szenen",
"Lamps": "Lampen",
"Devices": "Geräte",
"Email_is_required": "E-Mail benötigt",
"Email_cannot_contain_spaces": "E-Mail darf keine Leerzeichen enthalten",
"Email_is_invalid": "E-Mail ist ungültig",
"Email": "E-Mail",
"Password_is_required": "Passwort benötigt",
"Password_cannot_contain_spaces": "Passwort darf keine Leerzeichen enthalten",
"Password_must_be_bigger_than__characters": "Passwort muss länger als {} Zeichen sein",
"Password": "Passwort",
"Log_In": "Login",
"Forgot_password": "Passwort vergessen",
"Forgot_password?": "Passwort vergessen?",
"title": "Titel",
"number": "Nummer",
"IP_is_required": "IP benötigt",
"IP_syntax_is_incorrect": "IP Syntax ist falsch",
"Add_Smart_Device": "Smartes Gerät hinzufügen",
"Cancel": "Abbrechen",
"Add": "Hinzufügen",
"Light": "Licht",
"Device_ip:_": "Gerät IP: {}",
"New_devices": "Neue Geräte",
"Add_devices": "Geräte hinzufügen",
"Device_type:_": "Gerätetyp: {}",
"Room_name_is_required": "Raumname muss angegeben werden",
"Room_name:": "Raumname:",
"Device_name_is_required": "Gerätename muss angegeben werden",
"Device_name:": "Gerätename:",
"Update": "Aktualisierung",
"IP": "IP",
"This_is_firebase": "Das ist Firebase",
"Device_with_ip:_": "Gerät mit der IP: {}",
"Update_WiFi_configuration": "WiFi Einstellungen updaten",
"WiFi_name_is_required": "WIFI Name muss angegeben werden",
"WiFi_Name": "WIFI Name",
"WiFi_password_is_required": "WIFI Passwort muss angegeben werden",
"WiFi_Password": "WIFI Passwort",
"Insert_WiFi_Credentials": "WIFI Zugangsdaten eingeben",
"Conditioners": "Spülungen",
"Medical": "Medizinisch",
"Phones": "Telefone",
"Speakers": "Lautsprecher",
"Send": "Senden",
"All_Devices": "Alle Geräte",
"Summary": "Zusammenfassung",
"Switches": "Schalter",
"Boilers": "Boiler",
"Lights": "Lichter",
"RGBw_Lights": "RGB Lichter",
"_Switches": "{} Schalter",
"_SmartTvs": "{} Smarte Fernseher",
"_RGBW_Lights": "{} RGBW Lichter",
"_Lights": "{} Lichter",
"_Boilers": "{} Boiler",
"_Blinds": "{} Rollos",
"Rooms": "Räume",
"_device": "{} Gerät",
"_devices": "{} Geräte",
"_SmartPlugs": "{} Smarte Steckdosen",
"On": "Ein",
"Off": "Aus",
"Color": "Farbe",
"White": "Weiß",
"Area": "Bereich",
"Areas": "Bereiche",
"Automations": "Automatisierungen",
"Scenes_In_Folder": "Szenen im Ordner",
"Select": "Auswählen",
"Exist": "Existtieren",
"OK": "OK",
"Nothing": "Nichts",
"No_need_here": "Nicht benötigt",
"Do_not_need": "Benötige ich nicht",
"Finish": "Fertigstellen",
"Select_Purposes_Of_The_Area": "Zweck für das Areal festlegen",
"Pulling_Up_all_blinds": "Alle Rollos öffnen",
"Stopping_all_blinds": "Alle Rollos stoppen",
"Pulling_down_all_blinds": "Alle Rollos schließen",
"Turning_On_boiler": "Boiler einschalten",
"Turning_Off_boiler": "Boiler ausschalten",
"Waiting_for_user_to_get_connected_to_WiFi": "Warten auf Verbindung des Users mit WIFI",
"Can't_add_unsupported_device": "Nicht unterstütztes Gerät kann nicht hinzugefügt werden"
}
Loading

0 comments on commit 6a104e5

Please sign in to comment.