Merge branch 'development' into cleanup/generalFinalization

.github/workflows/build.yml

@@ -16,10 +16,25 @@ jobs:
     steps:
       - name: Clone repository
         uses: actions/checkout@v4
+
+      - name: Set up JDK 17
+        uses: actions/setup-java@v2
+        with:
+          java-version: '17'
+          distribution: 'adopt'
+
       - name: Set up Flutter
         uses: subosito/flutter-action@v1
         with:
           channel: stable
-      - run: flutter build web
+
+      - name: Create .env file
+        run: |
+          echo "SPOTIFY_CLIENT=${{ secrets.SPOTIFY_CLIENT }}" >> ./frontend/assets/.env
+          echo "SPOTIFY_CLIENT_SECRET=${{ secrets.SPOTIFY_CLIENT_SECRET }}" >> ./frontend/assets/.env
+          echo "REDIRECT_URI=${{ secrets.REDIRECT_URI }}" >> ./frontend/assets/.env
+          echo "SPOTIFY_CLIENT_ID=${{ secrets.SPOTIFY_CLIENT_ID }}" >> ./frontend/assets/.env
+          echo "OPENAI_API_KEY=${{ secrets.OPENAI_API_KEY }}" >> ./frontend/assets/.env
+
+      - run: flutter build apk --debug
         working-directory: ./frontend
-

.github/workflows/lint.yml

@@ -1,4 +1,4 @@
-name: Lint
+name: Flutter Linting
 
 on:
   push:
@@ -11,21 +11,29 @@ on:
       - development
 
 jobs:
-  linter:
-        runs-on: ubuntu-latest
-
-        steps:
-          - uses: actions/checkout@v2
-          - uses: actions/setup-java@v1
-            with:
-              java-version: "12.x"
-          - name: Install Flutter
-            run: git clone https://github.com/flutter/flutter.git -b stable
-          - name: Run Flutter doctor
-            run: ./flutter/bin/flutter doctor
-          - name: Run Linter
-            run: ./flutter/bin/flutter analyze .
-
-
+  main:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Clone repository
+        uses: actions/checkout@v4
+      - name: Set up Flutter
+        uses: subosito/flutter-action@v1
+        with:
+          channel: stable
+
+      - name: Install dependencies
+        run: flutter pub get
+        working-directory: ./frontend  # Specify the working directory
+
+      - name: Create .env file
+        run: |
+          echo "SPOTIFY_CLIENT=${{ secrets.SPOTIFY_CLIENT }}" >> ./frontend/assets/.env
+          echo "SPOTIFY_CLIENT_SECRET=${{ secrets.SPOTIFY_CLIENT_SECRET }}" >> ./frontend/assets/.env
+          echo "REDIRECT_URI=${{ secrets.REDIRECT_URI }}" >> ./frontend/assets/.env
+          echo "SPOTIFY_CLIENT_ID=${{ secrets.SPOTIFY_CLIENT_ID }}" >> ./frontend/assets/.env
+          echo "OPENAI_API_KEY=${{ secrets.OPENAI_API_KEY }}" >> ./frontend/assets/.env
+
+      - name: Run Linter
+        run: flutter analyze
+        working-directory: ./frontend  # Specify the working directory
 
-

.github/workflows/test.yml

@@ -29,6 +29,14 @@ jobs:
       run: flutter pub get
       working-directory: ./frontend
 
+    - name: Create .env file
+      run: |
+          echo "SPOTIFY_CLIENT=${{ secrets.SPOTIFY_CLIENT }}" >> ./frontend/assets/.env
+          echo "SPOTIFY_CLIENT_SECRET=${{ secrets.SPOTIFY_CLIENT_SECRET }}" >> ./frontend/assets/.env
+          echo "REDIRECT_URI=${{ secrets.REDIRECT_URI }}" >> ./frontend/assets/.env
+          echo "SPOTIFY_CLIENT_ID=${{ secrets.SPOTIFY_CLIENT_ID }}" >> ./frontend/assets/.env
+          echo "OPENAI_API_KEY=${{ secrets.OPENAI_API_KEY }}" >> ./frontend/assets/.env
+
     - name: Run tests
       run: flutter test --coverage
       working-directory: ./frontend

README.md

@@ -125,7 +125,7 @@ everywhere. MoodMix allows us to do just that.
     <td style="vertical-align: top; width: auto; border: 0; padding: 10px;">
       <h2><b style="font-size: 18px;">James Hardy</b></h2>
       <b style="font-size: 16px;"> Backend , Middleware </b><br>
-    I possess a solid foundation in various programming languages and web technologies, allowing me to create efficient and innovative solutions. My analytical mindset and keen eye for detail enable me to tackle complex challenges with precision and creativity.Additionally, I am a collaborative team player who values open communication and is committed to delivering high-quality results. My dedication to excellence and passion for technology make me an ideal fit for your project.
+I am a dedicated third-year computer science student with a strong passion for backend development and working with databases. My academic journey has led me to explore a wide range of technical concepts, and I thrive in environments where I can dive deep into the logic and structure of systems. From managing data to implementing complex server-side functionalities, I enjoy the challenge of working on backend technologies and love solving problems that require innovative and efficient solutions.
     </td>
   </tr>
 </table>
@@ -159,8 +159,8 @@ everywhere. MoodMix allows us to do just that.
 
 ### [Architecure Specification](https://docs.google.com/document/d/1Hi7V8hVkYe0L3wJGn5eS4Etq8IF3EUGZHm_d-UjCNpI/edit#heading=h.128bbm5i2zl8)
 ### [Architecture Diagram](https://github.com/user-attachments/assets/e569e046-2967-4aff-b6ff-ef2367074c0f)
-
-
+### [Technical Installation Guide](https://drive.google.com/file/d/13CNTyzxTiLt4nUi-Wzo8l966d00QwfCm/view?usp=sharing)
+### [Architecture Diagram](https://github.com/user-attachments/assets/e569e046-2967-4aff-b6ff-ef2367074c0f)
 ### [User Manual](https://docs.google.com/document/d/1PkPDF9-MBdbb2HuwG-MHBuKvUYR4KeZKHMFj8wQJOh4/edit?usp=sharing)
 ### [Coding Standards](https://docs.google.com/document/d/1IbX4rgB84IaW2q_jtdrftmaUzSJtHxRVy9X0AykNLLo/edit?usp=sharing)
 ### [List of Contributions](https://docs.google.com/document/d/1QJBmAijUjG0CW4sEqz5YA2BgVcqFmoG37d2O7HAGUks/edit?usp=sharing)
@@ -175,6 +175,9 @@ everywhere. MoodMix allows us to do just that.
 ### [FiveDudes Demo1 - Video](https://drive.google.com/file/d/1R8_xJtMMwkNQBzKfzGCe3dQ-h7kFv6oP/view?usp=sharing)
 ### [FiveDudes Demo2 - Video](https://drive.google.com/file/d/10mGXSPh1HnOlnOBChIk5n_7b_jYJxM8m/view?usp=sharing)
 ### [FiveDudes Demo2 - Presentation](https://drive.google.com/file/d/1XD5HbM2SeHzq8POv9kWPFaLgjE00eVKU/view?usp=sharing)
+### [FiveDudes Demo3 - Video](https://drive.google.com/file/d/1woSAn3ruE7dNOLrIjZVPr_5M6C3a82Y3/view?usp=sharing)
+### [FiveDudes Demo3 - Presentation](https://drive.google.com/file/d/1vl7fNnv2O6iYVtco9Je34NYsqRhIVQfy/view?usp=sharing)
+
 
 
 

Readme.md

@@ -159,8 +159,6 @@ everywhere. MoodMix allows us to do just that.
 
 ### [Architecure Specification](https://docs.google.com/document/d/1Hi7V8hVkYe0L3wJGn5eS4Etq8IF3EUGZHm_d-UjCNpI/edit#heading=h.128bbm5i2zl8)
 ### [Architecture Diagram](https://github.com/user-attachments/assets/e569e046-2967-4aff-b6ff-ef2367074c0f)
-
-
 ### [User Manual](https://docs.google.com/document/d/1PkPDF9-MBdbb2HuwG-MHBuKvUYR4KeZKHMFj8wQJOh4/edit?usp=sharing)
 ### [Coding Standards](https://docs.google.com/document/d/1IbX4rgB84IaW2q_jtdrftmaUzSJtHxRVy9X0AykNLLo/edit?usp=sharing)
 ### [List of Contributions](https://docs.google.com/document/d/1QJBmAijUjG0CW4sEqz5YA2BgVcqFmoG37d2O7HAGUks/edit?usp=sharing)
@@ -175,6 +173,9 @@ everywhere. MoodMix allows us to do just that.
 ### [FiveDudes Demo1 - Video](https://drive.google.com/file/d/1R8_xJtMMwkNQBzKfzGCe3dQ-h7kFv6oP/view?usp=sharing)
 ### [FiveDudes Demo2 - Video](https://drive.google.com/file/d/10mGXSPh1HnOlnOBChIk5n_7b_jYJxM8m/view?usp=sharing)
 ### [FiveDudes Demo2 - Presentation](https://drive.google.com/file/d/1XD5HbM2SeHzq8POv9kWPFaLgjE00eVKU/view?usp=sharing)
+### [FiveDudes Demo3 - Video](https://drive.google.com/file/d/1woSAn3ruE7dNOLrIjZVPr_5M6C3a82Y3/view?usp=sharing)
+### [FiveDudes Demo3 - Presentation](https://drive.google.com/file/d/1vl7fNnv2O6iYVtco9Je34NYsqRhIVQfy/view?usp=sharing)
+
 
 
 

frontend/analysis_options.yaml

@@ -11,6 +11,8 @@ analyzer:
   errors:
     prefer_const_constructors: ignore
     prefer_const_literals_to_create_immutables: ignore
+    deprecated_member_use: ignore
+    unused_local_variable: ignore
 include: package:flutter_lints/flutter.yaml
 
 linter:
@@ -25,8 +27,10 @@ linter:
   # `// ignore_for_file: name_of_lint` syntax on the line or in the file
   # producing the lint.
   rules:
-    # avoid_print: false  # Uncomment to disable the `avoid_print` rule
+     avoid_print: false  # Uncomment to disable the `avoid_print` rule
+     prefer_const_declarations: ignore
     # prefer_single_quotes: true  # Uncomment to enable the `prefer_single_quotes` rule
 
+
 # Additional information about this file can be found at
 # https://dart.dev/guides/language/analysis-options

frontend/android/app/build.gradle

@@ -42,8 +42,8 @@ android {
 
 
     compileOptions {
-        sourceCompatibility = JavaVersion.VERSION_1_8
-        targetCompatibility = JavaVersion.VERSION_1_8
+        sourceCompatibility = JavaVersion.VERSION_17
+        targetCompatibility = JavaVersion.VERSION_17
     }
 
     defaultConfig {
@@ -78,6 +78,7 @@ android {
     }
 
 
+
     packagingOptions {
 
         exclude 'META-INF/native-image/ios-x86_64/jnijavacpp/reflect-config.json'
@@ -123,6 +124,11 @@ android {
     }
 
     dependencies {
+
+        implementation 'org.tensorflow:tensorflow-lite:2.12.0' // Use the latest version
+
+
+
         implementation (group: 'org.deeplearning4j', name: 'deeplearning4j-core', version: '1.0.0-beta6') {
             exclude group: 'org.bytedeco', module: 'opencv-platform'
             exclude group: 'org.bytedeco', module: 'leptonica-platform'