Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion android/build.gradle
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
buildscript {
ext.kotlin_version = '1.3.50'
ext.kotlin_version = '1.6.10'
repositories {
google()
mavenCentral()
Expand Down
11 changes: 10 additions & 1 deletion lib/Screens/audio_screen.dart
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,16 @@ class _AudioScreenState extends State<AudioScreen> {
.collection("users")
.doc(id)
.collection(screenType.toString())
.add({"url": url, "type": "audio", "dateTime": DateTime.now()});
.add({
"url": url,
"type": "audio",
"dateTime": DateTime.now()
}).then((value) async => {
FirebaseFirestore.instance
.collection("users")
.doc(id)
.update({"dateTime": DateTime.now()})
});
}
uploading = false;
setState(() {});
Expand Down
4 changes: 2 additions & 2 deletions lib/Screens/equipment_screen.dart
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import 'package:agri/Screens/upload_images_screen.dart';
import 'package:cloud_firestore/cloud_firestore.dart';
import 'package:flutter/material.dart';
import 'package:cached_network_image/cached_network_image.dart';
import 'home_screen.dart' as home;
import 'package:agri/dashboard.dart' as dash;

class EquipmentScreen extends StatefulWidget {
const EquipmentScreen({Key? key}) : super(key: key);
Expand All @@ -16,7 +16,7 @@ class EquipmentScreen extends StatefulWidget {
}

class _EquipmentScreenState extends State<EquipmentScreen> {
final userId = home.userId;
final userId = dash.userId;

@override
Widget build(BuildContext context) {
Expand Down
42 changes: 2 additions & 40 deletions lib/Screens/home_screen.dart
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,11 @@ import 'package:agri/Models/file_model.dart';
import 'package:agri/Screens/audio_screen.dart';
import 'package:agri/Screens/reply_screen.dart';
import 'package:agri/Screens/upload_images_screen.dart';
import 'package:agri/dashboard.dart';
import 'package:cloud_firestore/cloud_firestore.dart';
import 'package:flutter/material.dart';
import 'package:uuid/uuid.dart';
import 'package:shared_preferences/shared_preferences.dart';
import 'package:cached_network_image/cached_network_image.dart';

String userId = "";

class HomeScreen extends StatefulWidget {
static const String routeName = '/HomeScreen';
const HomeScreen({Key? key}) : super(key: key);
Expand All @@ -20,47 +17,12 @@ class HomeScreen extends StatefulWidget {
}

class _HomeScreenState extends State<HomeScreen> {
bool isFirstLoad = true;

getUserId() async {
SharedPreferences prefs = await SharedPreferences.getInstance();
String id = prefs.getString('userId').toString();
// print(id);
if (id == "null") {
// print("Empty Id");
id = const Uuid().v4();
prefs.setString('userId', id);
userId = id;
// print(userId);
await FirebaseFirestore.instance.collection('users').doc(id).set({
"userId": id,
"dateTime": DateTime.now(),
});
} else {
// print(id);
userId = id;
// print(userId);
}
// await prefs.setInt('counter', counter);
setState(() {});
}

@override
void didChangeDependencies() {
if (isFirstLoad) {
getUserId();
}
isFirstLoad = false;

super.didChangeDependencies();
}

@override
Widget build(BuildContext context) {
// print(userId + "Printing User ID");
return Scaffold(
appBar: AppBar(
title: const Center(child: Text('వ్యాధి నిర్వహణ')),
title: const Center(child: Text('వ్యాధి నిర్వహణ')),
actions: [
IconButton(
icon: const Icon(Icons.message),
Expand Down
7 changes: 6 additions & 1 deletion lib/Screens/upload_images_screen.dart
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,12 @@ class _UploadImagesScreenState extends State<UploadImagesScreen> {
"type": "image",
"dateTime": DateTime.now()
});
});
}).then((value) async => {
FirebaseFirestore.instance
.collection("users")
.doc(id)
.update({"dateTime": DateTime.now()})
});
}
uploading = false;
setState(() {});
Expand Down
74 changes: 65 additions & 9 deletions lib/dashboard.dart
Original file line number Diff line number Diff line change
@@ -1,11 +1,17 @@
import 'package:agri/Screens/equipment_screen.dart';
import 'package:agri/Screens/home_screen.dart';
import 'package:agri/Utils/Utils.dart';
import 'package:agri/diseases.dart';
import 'package:agri/fert.dart';
import 'package:agri/irri.dart';
import 'package:agri/mark.dart';
import 'package:agri/types.dart';
import 'package:cloud_firestore/cloud_firestore.dart';
import 'package:flutter/material.dart';
import 'package:shared_preferences/shared_preferences.dart';
import 'package:uuid/uuid.dart';

String userId = "";

class Dash extends StatefulWidget {
const Dash({Key? key}) : super(key: key);
Expand All @@ -15,6 +21,54 @@ class Dash extends StatefulWidget {
}

class _DashState extends State<Dash> {
bool isFirstLoad = true;

getUserId() async {
SharedPreferences prefs = await SharedPreferences.getInstance();
String id = prefs.getString('userId').toString();
// print(id);
if (id == "null") {
// print("Empty Id");
DocumentSnapshot<Map<String, dynamic>> documentSnapshot =
await FirebaseFirestore.instance
.collection('UserIndex')
.doc("UserIndexDoc")
.get();

int userIndex = documentSnapshot.get("userIndex") as int;
id = const Uuid().v4();
prefs.setString('userId', id);
userId = id;
// print(userId);
await FirebaseFirestore.instance.collection('users').doc(id).set({
"userId": id,
"dateTime": DateTime.now(),
"userIndex": userIndex + 1
}).then((value) async => {
await FirebaseFirestore.instance
.collection('UserIndex')
.doc("UserIndexDoc")
.update({"userIndex": userIndex + 1})
});
} else {
// print(id);
userId = id;
// print(userId);
}
// await prefs.setInt('counter', counter);
setState(() {});
}

@override
void didChangeDependencies() {
if (isFirstLoad) {
getUserId();
}
isFirstLoad = false;

super.didChangeDependencies();
}

@override
Widget build(BuildContext context) {
return Scaffold(
Expand Down Expand Up @@ -74,7 +128,7 @@ class _DashState extends State<Dash> {
color: Color.fromRGBO(220, 220, 220, 50.0)),
child: InkWell(
onTap: () {
Navigator.push(
Navigator.push(
context,
MaterialPageRoute(builder: (context) => const Diseases()),
);
Expand Down Expand Up @@ -109,9 +163,10 @@ class _DashState extends State<Dash> {
color: Color.fromRGBO(220, 220, 220, 50.0)),
child: InkWell(
onTap: () {
Navigator.push(
Navigator.push(
context,
MaterialPageRoute(builder: (context) => const HomeScreen()),
MaterialPageRoute(
builder: (context) => const HomeScreen()),
);
},
child: Column(
Expand Down Expand Up @@ -144,9 +199,10 @@ class _DashState extends State<Dash> {
color: Color.fromRGBO(220, 220, 220, 50.0)),
child: InkWell(
onTap: () {
Navigator.push(
Navigator.push(
context,
MaterialPageRoute(builder: (context) => const EquipmentScreen()),
MaterialPageRoute(
builder: (context) => const EquipmentScreen()),
);
},
child: Column(
Expand Down Expand Up @@ -179,7 +235,7 @@ class _DashState extends State<Dash> {
color: Color.fromRGBO(220, 220, 220, 50.0)),
child: InkWell(
onTap: () {
Navigator.push(
Navigator.push(
context,
MaterialPageRoute(builder: (context) => const Fert()),
);
Expand Down Expand Up @@ -214,7 +270,7 @@ class _DashState extends State<Dash> {
color: Color.fromRGBO(220, 220, 220, 50.0)),
child: InkWell(
onTap: () {
Navigator.push(
Navigator.push(
context,
MaterialPageRoute(builder: (context) => const Irr()),
);
Expand Down Expand Up @@ -249,9 +305,9 @@ class _DashState extends State<Dash> {
color: Color.fromRGBO(220, 220, 220, 50.0)),
child: InkWell(
onTap: () {
Navigator.push(
Navigator.push(
context,
MaterialPageRoute(builder: (context) => const Mark()),
MaterialPageRoute(builder: (context) => const Mark()),
);
},
child: Column(
Expand Down
21 changes: 14 additions & 7 deletions pubspec.lock
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ packages:
name: async
url: "https://pub.dartlang.org"
source: hosted
version: "2.8.1"
version: "2.8.2"
boolean_selector:
dependency: transitive
description:
Expand Down Expand Up @@ -42,7 +42,7 @@ packages:
name: characters
url: "https://pub.dartlang.org"
source: hosted
version: "1.1.0"
version: "1.2.0"
charcode:
dependency: transitive
description:
Expand Down Expand Up @@ -302,7 +302,14 @@ packages:
name: matcher
url: "https://pub.dartlang.org"
source: hosted
version: "0.12.10"
version: "0.12.11"
material_color_utilities:
dependency: transitive
description:
name: material_color_utilities
url: "https://pub.dartlang.org"
source: hosted
version: "0.1.3"
meta:
dependency: transitive
description:
Expand Down Expand Up @@ -402,12 +409,12 @@ packages:
source: hosted
version: "3.7.0"
platform:
dependency: transitive
dependency: "direct main"
description:
name: platform
url: "https://pub.dartlang.org"
source: hosted
version: "3.0.2"
version: "3.1.0"
plugin_platform_interface:
dependency: transitive
description:
Expand Down Expand Up @@ -552,7 +559,7 @@ packages:
name: test_api
url: "https://pub.dartlang.org"
source: hosted
version: "0.4.2"
version: "0.4.8"
typed_data:
dependency: transitive
description:
Expand All @@ -573,7 +580,7 @@ packages:
name: vector_math
url: "https://pub.dartlang.org"
source: hosted
version: "2.1.0"
version: "2.1.1"
webview_flutter:
dependency: "direct main"
description:
Expand Down
1 change: 1 addition & 0 deletions pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,7 @@ dependencies:
cached_network_image:
permission_handler:
webview_flutter: ^2.3.1
platform: ^3.1.0



Expand Down