Merge pull request #695 from guyluz11/dev

to grpc

.github/ISSUE_TEMPLATE/bug.yaml

@@ -0,0 +1,18 @@
+name: 🐛 Bug
+description: Report an issue to help improve the project.
+labels: ['bug']
+body:
+  - type: textarea
+    id: description
+    attributes:
+      label: Description
+      description: A brief description of the question or issue, also include what you tried and what didn't work
+    validations:
+      required: true
+  - type: textarea
+    id: screenshots
+    attributes:
+      label: Screenshots
+      description: Please add screenshots if applicable
+    validations:
+      required: false

.github/ISSUE_TEMPLATE/feature_request.yml

@@ -0,0 +1,19 @@
+name: 💡 General Feature Request
+description: Have a new idea/feature? Please suggest!
+title: 'Feature: '
+labels: ['feature']
+body:
+  - type: textarea
+    id: description
+    attributes:
+      label: Description
+      description: Description of the enhancement you propose, also include what you tried and what worked.
+    validations:
+      required: true
+  - type: textarea
+    id: screenshots
+    attributes:
+      label: Screenshots
+      description: Screenshots if applicable
+    validations:
+      required: false

.github/workflows/CONTRIBUTING.md

@@ -1,10 +1,22 @@
 # Contributing to CyBear Jinni App
 
-🥳:tada: First off, thanks for taking the time to contribute! 🥳:tada:
+This documentation contains a set of guidelines to help you during the contribution process. We are happy to welcome all the contributions from anyone willing to improve/add new features to this project. Thank you for helping out, and remember, no contribution is too small.
 
-The following is a set of guidelines for contributing to CyBear Jinni App.
+## Submitting Contributions👩‍💻👨‍💻
+Below you will find the process and workflow used to review and merge your changes.
 
-These are mostly guidelines, not rules. Use your best judgment, and feel free to propose changes to
-this document in a pull request.
+## Working on an Issue
+If you're interested in working on an issue, simply let us know by commenting on it. No need to wait for an assignment. We welcome your contributions!
 
-## First rule, please open pull request to dev branch and not to master
+## Fork and Pull Request
+Please fork the repository and open your pull request from the `dev` branch. This helps us maintain a clean and organized contribution process.
+
+## Link to Associated Issues
+If your pull request addresses a specific issue, make sure to include a link to that issue in the pull request description. This helps us keep track of the context and purpose of your contribution.
+
+## Need more help?🤔
+
+For additional information, resources, and community discussions, you can join our [Discord server](https://discord.gg/mUXfwUY). It's a great place to connect with fellow contributors and get assistance with your contributions.
+
+## Tip from us😇
+Learning and understanding takes time, so don't worry if things seem challenging at first. So, do not worry at all. We know **you have got this**!💪

.github/workflows/dart.yml

@@ -9,7 +9,7 @@ on:
 
 env:
   flutter_channel: 'stable' # or: 'dev' or 'beta'
-  flutter_version: '3.7.7'
+  flutter_version: '3.13.6'
 
 jobs:
   build:

.github/workflows/dependabot.yaml

@@ -0,0 +1,13 @@
+version: 2
+updates:
+  # Enable version updates for flutter's pub package manager
+  - package-ecosystem: "pub"
+    # Look for `pubspec.yaml` and `pubspec.lock` files in the `root` directory
+    directory: "/"
+    # Check the pub.dev registry for updates every day (weekdays)
+    schedule:
+      interval: "monthly"
+    # # Add default reviewers
+    # reviewers:
+    #   - "guyluz11"
+

.github/workflows/pull_request_template.md

@@ -0,0 +1,21 @@
+### Description
+<!-- Provide a brief description of the changes in this pull request -->
+
+### Proposed Changes
+<!-- List the proposed changes introduced by this pull request -->
+
+## Fixes #(issue_no)
+
+Replace `issue_no` with the issue number which is fixed in this PR
+
+## Screenshots
+
+<!-- If applicable, add screenshots or images demonstrating the changes made -->
+
+## Checklist
+
+<!-- Mark the completed tasks with [x] -->
+- [ ] Tests have been added or updated to cover the changes
+- [ ] Documentation has been updated to reflect the changes
+- [ ] Code follows the established coding style guidelines
+- [ ] All tests are passing

CODE_OF_CONDUCT.md

@@ -0,0 +1,47 @@
+# CyBear-jinni Project Code of Conduct
+
+## Introduction
+
+Welcome to the "CyBear-jinni" project. We are committed to fostering a collaborative and inclusive community. This code of conduct outlines our expectations for behavior and interaction within the project. By participating, you agree to abide by this code of conduct.
+
+## Our Pledge
+
+We, as members of the CyBear-jinni community, pledge to make participation in this project a positive and harassment-free experience for everyone, regardless of age, body size, disability, ethnicity, gender identity and expression, level of experience, nationality, personal appearance, race, religion, or sexual identity and orientation.
+
+## Expected Behavior
+
+To contribute to a safe and welcoming environment, we expect all participants to:
+
+1. Be respectful and considerate of others.
+2. Use inclusive language and avoid offensive or derogatory remarks.
+3. Act professionally and be constructive in your interactions.
+4. Assume good intentions and give people the benefit of the doubt.
+5. Resolve disagreements or conflicts constructively and respectfully.
+
+## Unacceptable Behavior
+
+Unacceptable behavior includes, but is not limited to:
+
+1. Harassment, discrimination, or intimidation in any form.
+2. Verbal, written, or physical abuse or threats.
+3. Offensive or inappropriate comments, including slurs and jokes.
+4. Invasion of privacy, such as publishing someone's private information without their consent.
+5. Any form of trolling, spamming, or unconstructive disruption.
+6. Posting or discussing content that is sexually explicit, violent, or otherwise offensive.
+
+## Reporting and Enforcement
+
+If you witness or experience unacceptable behavior, please report it promptly to the project maintainers at email address - cybearjinni@gmail.com . All reports will be treated with confidentiality and will be taken seriously.
+
+The project maintainers will investigate the issue and may take appropriate action, such as warnings, temporary suspensions, or permanent bans, as deemed necessary. Our goal is to maintain a respectful and safe environment for everyone.
+
+## Attribution
+
+This code of conduct is inspired by the [Contributor Covenant](https://www.contributor-covenant.org/version/2/0/code_of_conduct.html). We appreciate their work in promoting an open and welcoming community.
+
+For answers to common questions about this code of conduct, see
+https://www.contributor-covenant.org/faq
+
+## Conclusion
+
+By participating in the CyBear-jinni project, you are agreeing to abide by this code of conduct. We are committed to upholding these guidelines to create a positive and inclusive environment for everyone involved.

analysis_options.yaml

@@ -26,6 +26,3 @@ linter:
     avoid_classes_with_only_static_members: false
 
     sort_constructors_first: true
-
-    # Good packages document everything
-    public_member_api_docs: true

android/app/build.gradle

@@ -33,7 +33,7 @@ apply plugin: 'kotlin-android'
 apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle"
 
 android {
-    compileSdkVersion 33
+    compileSdkVersion 34
 
     sourceSets {
         main.java.srcDirs += 'src/main/kotlin'
@@ -45,7 +45,7 @@ android {
 
     defaultConfig {
         applicationId "com.cybear_jinni.smart_home"
-        minSdkVersion 19
+        minSdkVersion 22
         targetSdkVersion 33
         versionCode flutterVersionCode.toInteger()
         versionName flutterVersionName

android/build.gradle

@@ -1,17 +1,17 @@
 buildscript {
-    ext.kotlin_version = '1.7.20'
+    ext.kotlin_version = '1.9.0'
     repositories {
         google()
         jcenter()
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:7.1.2'
+        classpath 'com.android.tools.build:gradle:7.2.0'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
 
         // Todo: as we are no longer using firestore we need to check if this line is needed,
         // it may be needed for the ads.
-        classpath 'com.google.gms:google-services:4.3.3' // For firestore
+        classpath 'com.google.gms:google-services:4.3.15' // For firestore
     }
 }
 
@@ -30,6 +30,6 @@ subprojects {
     project.evaluationDependsOn(':app')
 }
 
-task clean(type: Delete) {
+tasks.register("clean", Delete) {
     delete rootProject.buildDir
 }

assets/translations/id-ID.json

@@ -7,7 +7,7 @@
   "Name:_": "Nama: {}",
   "Room:_": "Ruang: {}",
   "Lamps_Settings_Page": "Halaman Pengaturan Lampu",
-  "Welcome_to_your_Smart_Home": "Selamat datang di Smart Home milikmu",
+  "Welcome_to_your_Smart_Home": "Selamat datang di Smart Home Anda",
   "Scene_Settings_Page": "Halaman Pengaturan Scene",
   "Move_to_blinds_full_settings_page": "Pindah ke halaman pengaturan penuh tirai",
   "Blinds_Page": "Halaman Tirai",
@@ -28,7 +28,7 @@
   "Scenes": "Scene",
   "Lamps": "Lampu",
   "Devices": "Perangkat",
-  "Email_is_required": "Email dibutuhkan",
+  "Email_is_required": "Email diperlukan",
   "Email_cannot_contain_spaces": "Email tidak boleh mengandung spasi",
   "Email_is_invalid": "Email tidak valid",
   "Email": "Email",
@@ -41,28 +41,28 @@
   "Forgot_password?": "Lupa kata sandi?",
   "title": "judul",
   "number": "angka",
-  "IP_is_required": "IP dibutuhkan",
+  "IP_is_required": "IP diperlukan",
   "IP_syntax_is_incorrect": "Sintaks IP salah",
   "Add_Smart_Device": "Tambahkan Smart Device",
   "Cancel": "Batal",
   "Add": "Tambah",
   "Light": "Cahaya",
   "Device_ip:_": "Ip perangkat: {}",
   "New_devices": "Perangkat baru",
-  "Add_devices": "Tambahkan perangkat",
+  "Add_devices": "Tambah perangkat",
   "Device_type:_": "Tipe Perangkat: {}",
-  "Room_name_is_required": "Nama ruang dibutuhkan",
+  "Room_name_is_required": "Nama ruang diperlukan",
   "Room_name:": "Nama Ruang:",
   "Device_name_is_required": "Nama perangkat dibutuhkan",
   "Device_name:": "Nama perangkat:",
   "Update": "Perbarui",
   "IP": "IP",
   "This_is_firebase": "Ini adalah firebase",
   "Device_with_ip:_": "Perangkat dengan ip: {}",
-  "Update_WiFi_configuration": "Update konfigurasi WiFi",
-  "WiFi_name_is_required": "Nama WiFi dibutuhkan",
+  "Update_WiFi_configuration": "Perbarui konfigurasi WiFi",
+  "WiFi_name_is_required": "Nama WiFi diperlukan",
   "WiFi_Name": "Nama WiFi",
-  "WiFi_password_is_required": "Kata sandi WiFi dibutuhkan",
+  "WiFi_password_is_required": "Kata sandi WiFi diperlukan",
   "WiFi_Password": "Kata sandi WiFi",
   "Insert_WiFi_Credentials": "Masukkan Kredensial WiFi",
   "Conditioners": "Kondisioner",
@@ -93,7 +93,7 @@
   "Area": "Area",
   "Areas": "Area",
   "Automations": "Otomatisasi",
-  "Scenes_In_Folder": "Scenes In Folder",
+  "Scenes_In_Folder": "Scenes di Folder",
   "Select": "Pilih",
   "Exist": "Ada",
   "OK": "OK",

lib/ad_state.dart

@@ -15,15 +15,15 @@ class AdState {
   BannerAdListener get adListener => _adListener;
 
   final BannerAdListener _adListener = AdManagerBannerAdListener(
-    onAdLoaded: (ad) => logger.v('Ad loaded: ${ad.adUnitId}.'),
-    onAdClosed: (ad) => logger.v('Ad closed: ${ad.adUnitId}.'),
+    onAdLoaded: (ad) => logger.t('Ad loaded: ${ad.adUnitId}.'),
+    onAdClosed: (ad) => logger.t('Ad closed: ${ad.adUnitId}.'),
     onAdFailedToLoad: (ad, error) =>
-        logger.v('Ad failed to load: ${ad.adUnitId}, $error.'),
-    onAdOpened: (ad) => logger.v('Ad opened: ${ad.adUnitId}.'),
+        logger.t('Ad failed to load: ${ad.adUnitId}, $error.'),
+    onAdOpened: (ad) => logger.t('Ad opened: ${ad.adUnitId}.'),
     onAppEvent: (ad, name, data) =>
-        logger.v('App event: ${ad.adUnitId}, $name, $data'),
-    onAdImpression: (ad) => logger.v('Ad impression: ${ad.adUnitId}.'),
+        logger.t('App event: ${ad.adUnitId}, $name, $data'),
+    onAdImpression: (ad) => logger.t('Ad impression: ${ad.adUnitId}.'),
     onAdWillDismissScreen: (ad) =>
-        logger.v('Ad dismiss screen: ${ad.adUnitId}.'),
+        logger.t('Ad dismiss screen: ${ad.adUnitId}.'),
   );
 }