Skip to content

Commit

Permalink
Merge pull request #720 from CyBear-Jinni/dev
Browse files Browse the repository at this point in the history
Dev
  • Loading branch information
guyluz11 authored Jan 6, 2024
2 parents c79a377 + 610f052 commit 68ea31b
Show file tree
Hide file tree
Showing 222 changed files with 4,999 additions and 5,616 deletions.
40 changes: 40 additions & 0 deletions .github/workflows/flutter_ci.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
name: Flutter CI

on:
push:
branches:
- master
- dev
pull_request:
branches:
- master
- dev

jobs:
build:
name: Build and Test
runs-on: ubuntu-latest

steps:
- name: Check out code
uses: actions/checkout@v2

- name: Set up Flutter
uses: subosito/flutter-action@@v2
with:
flutter-version: 3.13.6

- name: Install dependencies
run: flutter pub get

- name: Run tests
run: flutter test

- name: Build APK
run: flutter build apk

- name: Archive and upload artifacts
uses: actions/upload-artifact@v2
with:
name: build
path: build/app/outputs/flutter-apk/app-release.apk
3 changes: 1 addition & 2 deletions android/app/src/debug/AndroidManifest.xml
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="com.cybearjinni.app">
<manifest xmlns:android="http://schemas.android.com/apk/res/android">
<!-- Flutter needs it to communicate with the running application
to allow setting breakpoints, to provide hot reload, etc.
-->
Expand Down
3 changes: 1 addition & 2 deletions android/app/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
package="com.cybearjinni.app">
xmlns:tools="http://schemas.android.com/tools">

<uses-permission android:name="android.permission.INTERNET" />
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
Expand Down
3 changes: 1 addition & 2 deletions android/app/src/profile/AndroidManifest.xml
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="com.cybearjinni.app">
<manifest xmlns:android="http://schemas.android.com/apk/res/android">
<!-- Flutter needs it to communicate with the running application
to allow setting breakpoints, to provide hot reload, etc.
-->
Expand Down
222 changes: 111 additions & 111 deletions assets/translations/af-ZA.json
Original file line number Diff line number Diff line change
@@ -1,112 +1,112 @@
{
"Create_new_account": "Skep nuwe rekening",
"Actions_History": "Aksies Geskiedenis",
"Empty_history": "Leë geskiedenis",
"History_Settings_Page": "Geskiedenis-instellingsbladsy",
"Lamps_Page": "Lampe Bladsy",
"Name:_": "Naam: {}",
"Room:_": "Kamer: {}",
"Lamps_Settings_Page": "Lampe-instellingsbladsy",
"Welcome_to_your_Smart_Home": "Welkom by jou slimhuis",
"Scene_Settings_Page": "Toneelinstellingsbladsy",
"Move_to_blinds_full_settings_page": "Skuif na blindings se volledige instellingsbladsy",
"Blinds_Page": "Blindings Bladsy",
"Down": "Af",
"Stop": "Stop",
"Up": "Op",
"Smart_Devices_Settings_Page": "Smart Devices -instellingsbladsy",
"Air_Conditioners": "Lugversorgers",
"Blinds": "Blindings",
"Medical_Device": "Mediese toestel",
"Medical_Devices": "Mediese toestelle",
"Smart_Phone": "Slimfoon",
"Smart_Phones": "Slimfone",
"Smart_Speakers": "Slim luidsprekers",
"Smart_Devices_page": "Smart Devices -bladsy",
"History": "Geskiedenis",
"Scene": "Toneel",
"Scenes": "Tonele",
"Lamps": "Lampe",
"Devices": "Toestelle",
"Email_is_required": "E -pos is vereis",
"Email_cannot_contain_spaces": "E -pos kan nie ruimtes bevat nie",
"Email_is_invalid": "E -pos is ongeldig",
"Email": "E -pos",
"Password_is_required": "Wagwoord word benodig",
"Password_cannot_contain_spaces": "Wagwoord kan nie spasies bevat nie",
"Password_must_be_bigger_than__characters": "Wagwoord moet groter wees as {} karakters",
"Password": "Wagwoord",
"Log_In": "Teken aan",
"Forgot_password": "Wagwoord vergeet",
"Forgot_password?": "Wagwoord vergeet?",
"title": "titel",
"number": "nommer",
"IP_is_required": "IP word benodig",
"IP_syntax_is_incorrect": "IP -sintaksis is verkeerd",
"Add_Smart_Device": "Voeg slimtoestel by",
"Cancel": "Kanselleer",
"Add": "Byvoeg",
"Light": "Lig",
"Device_ip:_": "Toestel IP: {}",
"New_devices": "Nuwe toestelle",
"Add_devices": "Voeg toestelle by",
"Device_type:_": "Toesteltipe: {}",
"Room_name_is_required": "Kamernaam word benodig",
"Room_name:": "Kamernaam:",
"Device_name_is_required": "Toestelnaam is nodig",
"Device_name:": "Toestel naam:",
"Update": "Opdateer",
"IP": "Ip",
"This_is_firebase": "Dit is Firebase",
"Device_with_ip:_": "Toestel met IP: {}",
"Update_WiFi_configuration": "Update wifi -konfigurasie",
"WiFi_name_is_required": "Wifi -naam is vereis",
"WiFi_Name": "Wifi naam",
"WiFi_password_is_required": "WiFi -wagwoord is nodig",
"WiFi_Password": "WiFi -wagwoord",
"Insert_WiFi_Credentials": "Voeg wifi -geloofsbriewe in",
"Conditioners": "Opknapper",
"Medical": "Medies",
"Phones": "Telefone",
"Speakers": "Luidsprekers",
"Send": "Stuur",
"All_Devices": "Alle toestelle",
"Summary": "Opsomming",
"Switches": "Skakelaars",
"Boilers": "Kookpot",
"Lights": "Ligte",
"RGBw_Lights": "RGBW ligte",
"_Switches": "{} Skakelaars",
"_SmartTvs": "{} Slim TV's",
"_RGBW_Lights": "{} RGBW ligte",
"_Lights": "{} Ligte",
"_Boilers": "{} Kookpot",
"_Blinds": "{}Blindings",
"Rooms": "Kamers",
"_device": "{} toestel",
"_devices": "{} toestelle",
"_SmartPlugs": "{} slimProppe",
"On": "Op",
"Off": "Af",
"Color": "Kleur",
"White": "Wit",
"Area": "area",
"Areas": "Gebiede",
"Automations": "Outomatisering",
"Scenes_In_Folder": "Tonele in vouer",
"Select": "Uitkies",
"Exist": "Bestaan",
"OK": "Ok",
"Nothing": "Niks",
"No_need_here": "Geen behoefte hier nie",
"Do_not_need": "Hoef nie",
"Finish": "Voltooi",
"Select_Purposes_Of_The_Area": "kiesDoeleindesVanDieGebied",
"Pulling_Up_all_blinds": "Trek alle blindings op",
"Stopping_all_blinds": "Stop alle blindings",
"Pulling_down_all_blinds": "Trek alle blindings af",
"Turning_On_boiler": "Skakel die ketel aan",
"Turning_Off_boiler": "Skakel ketel uit",
"Waiting_for_user_to_get_connected_to_WiFi": "Wag vir die gebruiker om aan WiFi gekoppel te word",
"Can't_add_unsupported_device": "Kan nie onder ondersteunde toestel byvoeg nie"
}
"Create_new_account": "Skep nuwe rekening",
"Actions_History": "Aksies Geskiedenis",
"Empty_history": "Leë geskiedenis",
"History_Settings_Page": "Geskiedenis-instellingsbladsy",
"Lamps_Page": "Lampe Bladsy",
"Name:_": "Naam: {}",
"Area:_": "Kamer: {}",
"Lamps_Settings_Page": "Lampe-instellingsbladsy",
"Welcome_to_your_Smart_Home": "Welkom by jou slimhuis",
"Scene_Settings_Page": "Toneelinstellingsbladsy",
"Move_to_blinds_full_settings_page": "Skuif na blindings se volledige instellingsbladsy",
"Blinds_Page": "Blindings Bladsy",
"Down": "Af",
"Stop": "Stop",
"Up": "Op",
"Smart_Devices_Settings_Page": "Smart Devices -instellingsbladsy",
"Air_Conditioners": "Lugversorgers",
"Blinds": "Blindings",
"Medical_Device": "Mediese toestel",
"Medical_Devices": "Mediese toestelle",
"Smart_Phone": "Slimfoon",
"Smart_Phones": "Slimfone",
"Smart_Speakers": "Slim luidsprekers",
"Smart_Devices_page": "Smart Devices -bladsy",
"History": "Geskiedenis",
"Scene": "Toneel",
"Scenes": "Tonele",
"Lamps": "Lampe",
"Devices": "Toestelle",
"Email_is_required": "E -pos is vereis",
"Email_cannot_contain_spaces": "E -pos kan nie ruimtes bevat nie",
"Email_is_invalid": "E -pos is ongeldig",
"Email": "E -pos",
"Password_is_required": "Wagwoord word benodig",
"Password_cannot_contain_spaces": "Wagwoord kan nie spasies bevat nie",
"Password_must_be_bigger_than__characters": "Wagwoord moet groter wees as {} karakters",
"Password": "Wagwoord",
"Log_In": "Teken aan",
"Forgot_password": "Wagwoord vergeet",
"Forgot_password?": "Wagwoord vergeet?",
"title": "titel",
"number": "nommer",
"IP_is_required": "IP word benodig",
"IP_syntax_is_incorrect": "IP -sintaksis is verkeerd",
"Add_Smart_Device": "Voeg slimtoestel by",
"Cancel": "Kanselleer",
"Add": "Byvoeg",
"Light": "Lig",
"Device_ip:_": "Toestel IP: {}",
"New_devices": "Nuwe toestelle",
"Add_devices": "Voeg toestelle by",
"Device_type:_": "Toesteltipe: {}",
"Area_name_is_required": "Kamernaam word benodig",
"Area_name:": "Kamernaam:",
"Device_name_is_required": "Toestelnaam is nodig",
"Device_name:": "Toestel naam:",
"Update": "Opdateer",
"IP": "Ip",
"This_is_firebase": "Dit is Firebase",
"Device_with_ip:_": "Toestel met IP: {}",
"Update_WiFi_configuration": "Update wifi -konfigurasie",
"WiFi_name_is_required": "Wifi -naam is vereis",
"WiFi_Name": "Wifi naam",
"WiFi_password_is_required": "WiFi -wagwoord is nodig",
"WiFi_Password": "WiFi -wagwoord",
"Insert_WiFi_Credentials": "Voeg wifi -geloofsbriewe in",
"Conditioners": "Opknapper",
"Medical": "Medies",
"Phones": "Telefone",
"Speakers": "Luidsprekers",
"Send": "Stuur",
"All_Devices": "Alle toestelle",
"Summary": "Opsomming",
"Switches": "Skakelaars",
"Boilers": "Kookpot",
"Lights": "Ligte",
"RGBw_Lights": "RGBW ligte",
"_Switches": "{} Skakelaars",
"_SmartTvs": "{} Slim TV's",
"_RGBW_Lights": "{} RGBW ligte",
"_Lights": "{} Ligte",
"_Boilers": "{} Kookpot",
"_Blinds": "{}Blindings",
"Areas": "Kamers",
"_device": "{} toestel",
"_devices": "{} toestelle",
"_SmartPlugs": "{} slimProppe",
"On": "Op",
"Off": "Af",
"Color": "Kleur",
"White": "Wit",
"Area": "area",
"Areas": "Gebiede",
"Automations": "Outomatisering",
"Scenes_In_Folder": "Tonele in vouer",
"Select": "Uitkies",
"Exist": "Bestaan",
"OK": "Ok",
"Nothing": "Niks",
"No_need_here": "Geen behoefte hier nie",
"Do_not_need": "Hoef nie",
"Finish": "Voltooi",
"Select_Purposes_Of_The_Area": "kiesDoeleindesVanDieGebied",
"Pulling_Up_all_blinds": "Trek alle blindings op",
"Stopping_all_blinds": "Stop alle blindings",
"Pulling_down_all_blinds": "Trek alle blindings af",
"Turning_On_boiler": "Skakel die ketel aan",
"Turning_Off_boiler": "Skakel ketel uit",
"Waiting_for_user_to_get_connected_to_WiFi": "Wag vir die gebruiker om aan WiFi gekoppel te word",
"Can't_add_unsupported_device": "Kan nie onder ondersteunde toestel byvoeg nie"
}
10 changes: 5 additions & 5 deletions assets/translations/am-ET.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"History_Settings_Page": "የታሪክ ቅንብሮች ገጽ",
"Lamps_Page": "የአምፖሎች ገጽ",
"Name:_": "ስም: {}",
"Room:_": "ክፍል: {}",
"Area:_": "ክፍል: {}",
"Lamps_Settings_Page": "የአምፖሎች ቅንብሮች ገጽ",
"Welcome_to_your_Smart_Home": "እንኳን ወደ ስማርት ቤትዎ በደህና መጡ",
"Scene_Settings_Page": "የትዕይንት ቅንብሮች ገጽ",
Expand Down Expand Up @@ -51,8 +51,8 @@
"New_devices": "አዳዲስ መገልገያዎች",
"Add_devices": "መገልገያዎችን አክል",
"Device_type:_": "የመገልገያ ዓይነት: {}",
"Room_name_is_required": "የክፍሉ ስም ያስፈልጋል",
"Room_name:": "የክፍሉ ስም:",
"Area_name_is_required": "የክፍሉ ስም ያስፈልጋል",
"Area_name:": "የክፍሉ ስም:",
"Device_name_is_required": "የመገልገያ ስም ያስፈልጋል",
"Device_name:": "የመገልገያ ስም:",
"Update": "አዘምን",
Expand Down Expand Up @@ -82,7 +82,7 @@
"_Lights": "{} መብራቶች",
"_Boilers": "{} ማሞቂያዎች",
"_Blinds": "{} መጋረጃዎች",
"Rooms": "ክፍሎች",
"Areas": "ክፍሎች",
"_device": "{} መገልገያ",
"_devices": "{} መገልገያዎች",
"_SmartPlugs": "{} ስማርት መሰኪያዎች",
Expand All @@ -109,4 +109,4 @@
"Turning_Off_boiler": "ማሞቂያውን በማጥፋት ላይ",
"Waiting_for_user_to_get_connected_to_WiFi": "ተጠቃሚ ወደ ዋይፋይ እስኪገናኝ በመጠበቅ ላይ",
"Can't_add_unsupported_device": "የማይደገፍ መ ማከል አይቻልም"
}
}
Loading

0 comments on commit 68ea31b

Please sign in to comment.