Merge branch 'main' of https://github.com/Rnbsov/celeste

Author: Rnbsov

.env.example

@@ -0,0 +1,4 @@
+SUPABASE_URL=https://your_supabase_url.supabase.co
+SUPABASE_ANON_KEY=your_supabase_anon_key_here
+OPENWEATHER_API_KEY=your_openweather_api_key_here
+API_URL=http://localhost:80

.gitignore

@@ -43,3 +43,10 @@ app.*.map.json
 /android/app/debug
 /android/app/profile
 /android/app/release
+
+# Environment variables
+.env
+.env.local
+.env.development
+.env.test
+.env.production

android/app/build.gradle.kts

@@ -6,11 +6,13 @@ plugins {
 }
 
 android {
-    namespace = "com.example.myapp"
+    namespace = "com.example.myapp"  // Replace with your actual package name
     compileSdk = flutter.compileSdkVersion
     ndkVersion = flutter.ndkVersion
 
     compileOptions {
+        // Enable desugaring
+        isCoreLibraryDesugaringEnabled = true
         sourceCompatibility = JavaVersion.VERSION_1_8
         targetCompatibility = JavaVersion.VERSION_1_8
     }
@@ -20,10 +22,7 @@ android {
     }
 
     defaultConfig {
-        // TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html).
-        applicationId = "com.example.myapp"
-        // You can update the following values to match your application needs.
-        // For more information, see: https://flutter.dev/to/review-gradle-config.
+        applicationId = "com.example.myapp"  // Replace with your actual package name
         minSdk = flutter.minSdkVersion
         targetSdk = flutter.targetSdkVersion
         versionCode = flutter.versionCode
@@ -42,3 +41,8 @@ android {
 flutter {
     source = "../.."
 }
+
+dependencies {
+    // Updated to the required version 2.0.3 (which is above the minimum required 2.1.4)
+    coreLibraryDesugaring("com.android.tools:desugar_jdk_libs:2.1.4")
+}

android/app/src/debug/AndroidManifest.xml

@@ -1,7 +1,20 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android">
+    <!-- Internet Permission -->
+    <uses-permission android:name="android.permission.INTERNET" />
+    <uses-permission android:name="android.permission.RECORD_AUDIO"/>
+    <!-- Location Permissions -->
+    <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
+    <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
     <!-- The INTERNET permission is required for development. Specifically,
          the Flutter tool needs it to communicate with the running application
          to allow setting breakpoints, to provide hot reload, etc.
     -->
-    <uses-permission android:name="android.permission.INTERNET"/>
+    <queries>
+        <intent>
+            <action android:name="android.intent.action.TTS_SERVICE" />
+        </intent>
+        <intent>
+            <action android:name="android.speech.RecognitionService" />
+        </intent>
+    </queries>
 </manifest>

android/app/src/main/AndroidManifest.xml

@@ -1,4 +1,8 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android">
+    <uses-permission android:name="android.permission.INTERNET"/>
+    <uses-permission android:name="android.permission.RECORD_AUDIO"/>
+    <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION"/>
+    <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION"/>
     <application
         android:label="myapp"
         android:name="${applicationName}"
@@ -41,5 +45,11 @@
             <action android:name="android.intent.action.PROCESS_TEXT"/>
             <data android:mimeType="text/plain"/>
         </intent>
+        <intent>
+            <action android:name="android.intent.action.TTS_SERVICE" />
+        </intent>
+        <intent>
+            <action android:name="android.speech.RecognitionService" />
+        </intent>
     </queries>
 </manifest>

android/app/src/profile/AndroidManifest.xml

@@ -4,4 +4,6 @@
          to allow setting breakpoints, to provide hot reload, etc.
     -->
     <uses-permission android:name="android.permission.INTERNET"/>
+    <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION"/>
+    <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION"/>
 </manifest>

assets/logos/splash_logo.svg

@@ -0,0 +1 @@
+Subproject commit 5420d421f3484ee82ae1069bf3995e6c6865f39e

backend

@@ -1,16 +1,21 @@
 import 'package:flutter/material.dart';
 import 'package:supabase_auth_ui/supabase_auth_ui.dart';
+import 'package:flutter_dotenv/flutter_dotenv.dart';
 
 import 'util.dart';
 import 'theme.dart';
-import 'screens/auth_screen.dart';
+import 'screens/splash_screen.dart';
 
 void main() async {
+  WidgetsFlutterBinding.ensureInitialized();
+
+  await dotenv.load();
+
   await Supabase.initialize(
-    url: 'https://jbpeszoljhnymgqhufmd.supabase.co',
-    anonKey:
-        'eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpc3MiOiJzdXBhYmFzZSIsInJlZiI6ImpicGVzem9samhueW1ncWh1Zm1kIiwicm9sZSI6ImFub24iLCJpYXQiOjE3NDMyNTAzMDIsImV4cCI6MjA1ODgyNjMwMn0.NX3h_DpXqnpabbla3wR-RHQTuZskM3aJeX2qU1HNUe0',
+    url: dotenv.env['SUPABASE_URL'] ?? '',
+    anonKey: dotenv.env['SUPABASE_ANON_KEY'] ?? '',
   );
+
   runApp(const MyApp());
 }
 
@@ -30,9 +35,9 @@ class MyApp extends StatelessWidget {
     MaterialTheme theme = MaterialTheme(textTheme);
     return MaterialApp(
       debugShowCheckedModeBanner: false,
-      title: 'Flutter Demo',
+      title: 'Celesta',
       theme: brightness == Brightness.light ? theme.light() : theme.dark(),
-      home: const AuthScreen(),
+      home: const SplashScreen(),
     );
   }
 }

lib/main.dart

@@ -0,0 +1,56 @@
+class WateringHistoryModel {
+  final int? id;
+  final int plantId;
+  final DateTime wateredAt;
+
+  WateringHistoryModel({
+    this.id,
+    required this.plantId,
+    required this.wateredAt,
+  });
+
+  /// Creates a WateringHistoryModel from a JSON object.
+  factory WateringHistoryModel.fromJson(Map<String, dynamic> json) {
+    return WateringHistoryModel(
+      id: json['id'],
+      plantId: json['plant_id'],
+      wateredAt:
+          json['watered_at'] is String
+              ? DateTime.parse(json['watered_at'])
+              : json['watered_at'],
+    );
+  }
+
+  Map<String, dynamic> toJson() {
+    return {
+      'id': id,
+      'plant_id': plantId,
+      'watered_at': wateredAt.toIso8601String(),
+    };
+  }
+
+  WateringHistoryModel copyWith({int? id, int? plantId, DateTime? wateredAt}) {
+    return WateringHistoryModel(
+      id: id ?? this.id,
+      plantId: plantId ?? this.plantId,
+      wateredAt: wateredAt ?? this.wateredAt,
+    );
+  }
+
+  @override
+  bool operator ==(Object other) {
+    if (identical(this, other)) return true;
+
+    return other is WateringHistoryModel &&
+        other.id == id &&
+        other.plantId == plantId &&
+        other.wateredAt == wateredAt;
+  }
+
+  @override
+  int get hashCode => id.hashCode ^ plantId.hashCode ^ wateredAt.hashCode;
+
+  @override
+  String toString() =>
+      'WateringHistoryModel(id: $id, plantId: $plantId, wateredAt: $wateredAt)';
+}