diff --git a/README.md b/README.md
index 896ba50..b913416 100644
--- a/README.md
+++ b/README.md
@@ -1,5 +1,11 @@
+> The vision of this project is to assist forest officials for tree census by tagging each tree with proper location (latitude and longitude), tree type, and other arguments. There is a further plan to apply data analysis over the collected data.
+
+### This project is based on:
+* Flutter-based app: In this app, the user can tag the tree by locating or going to the exact location and then feeding the latitude and longitude details along with the other parameters. Once the data is stored, it will generate a unique key and a QR code for the same, so that later on we can refer to that tree by that code itself.
+* A data analysis system with Web App interface to the collected data and applying a machine learning model to predict different aspects.
+=======
@@ -7,8 +13,6 @@
# 🌳Trees🌳
🔖Tagger🔖
App & Analysis Software
-> The vision of this project is to assist forest officials for tree census by tagging each tree with proper location (latitude and longitude), tree type, and other arguments. There is a further plan to apply data analysis over the collected data.
-
## Focused Area:🧐
@@ -17,10 +21,12 @@
* A data analysis system with Web App interface to the collected data and apply a machine learning model for prediction of different aspects.
+
## Tech Stack:⚙️
## Problem Statement:📋
+
* Digital transformation for maintaining the record of forest trees.
* QR code generation for unique identification of every tree.
* Data storage, which can be maintained easily over cloud storage or even local storage.
@@ -37,9 +43,11 @@ Either by watching tutorial [Trees Tagging App](https://youtu.be/1KWwgAF0LXY), o
2. Open Android Studio and select 'Import from version control' and enter the repo's git URL.
3. Navigate to any file which shows 'Missing class' errors, and click on the 'Get dependencies' button on the yellow ribbon at the top.
+
The repo's codebase is now setup on your local machine, and you can make changes to it and push them to the git repo.
+
## Contributors:👨🏻💻
### Credits goes to these people✨
diff --git a/assets/images/login.png b/assets/images/login.png
new file mode 100644
index 0000000..efb1a63
Binary files /dev/null and b/assets/images/login.png differ
diff --git a/assets/images/scan.png b/assets/images/scan.png
new file mode 100644
index 0000000..c4ab0c4
Binary files /dev/null and b/assets/images/scan.png differ
diff --git a/lib/components/WelComePage.dart b/lib/components/WelComePage.dart
index 93ee8c6..0affd6e 100644
--- a/lib/components/WelComePage.dart
+++ b/lib/components/WelComePage.dart
@@ -18,7 +18,7 @@ class _WelcomeState extends State {
children: [
Container(
margin: EdgeInsets.only(
- top: MediaQuery.of(context).size.height / 10),
+ top: MediaQuery.of(context).size.height / 15),
child: Image(
image: AssetImage("assets/images/palm-tree-outline.png"),
height: 200,
@@ -54,7 +54,9 @@ class _WelcomeState extends State {
fontSize: 18.0,
fontStyle: FontStyle.italic,
fontWeight: FontWeight.w500,
- color: Color.fromRGBO(0, 0, 200, 1),
+
+ color: Color(0xffFA1B5D),
+
letterSpacing: 1.0,
),
),
diff --git a/lib/components/homeScreen.dart b/lib/components/homeScreen.dart
index f087dba..46bdd87 100644
--- a/lib/components/homeScreen.dart
+++ b/lib/components/homeScreen.dart
@@ -184,7 +184,7 @@ class _HomeScreen extends State {
alignment: Alignment.center,
child: CircleAvatar(
radius: 100,
- backgroundColor: Colors.lightBlueAccent,
+ backgroundColor: Colors.black,
child: ClipOval(
child: SizedBox(
width: 192.0,
@@ -194,14 +194,18 @@ class _HomeScreen extends State {
),
),
),
- Container(
+ Container(
alignment: Alignment.center,
margin: EdgeInsets.only(top: 150, left: 173),
+
+ decoration: BoxDecoration(
+ color: Colors.black,
+ shape: BoxShape.circle,),
child: IconButton(
icon: Icon(
Icons.camera_alt_rounded,
size: 30.0,
- color: Colors.black54,
+ color: Colors.white,
),
onPressed: () {
print("Camera pressed");
diff --git a/lib/components/myflatButton.dart b/lib/components/myflatButton.dart
index c2eb435..444e46e 100644
--- a/lib/components/myflatButton.dart
+++ b/lib/components/myflatButton.dart
@@ -22,7 +22,9 @@ class MyFlatButton extends StatelessWidget {
child: Text(
text,
style:
- TextStyle(color: Colors.lightGreen, fontWeight: FontWeight.bold),
+
+ TextStyle(color: Colors.white, fontWeight: FontWeight.bold,letterSpacing: 1,fontSize: 16),
+
),
shape: RoundedRectangleBorder(
side: BorderSide(color: Colors.green, width: 3.0),
diff --git a/lib/components/scannerPage.dart b/lib/components/scannerPage.dart
index 23dd082..76ecb4b 100644
--- a/lib/components/scannerPage.dart
+++ b/lib/components/scannerPage.dart
@@ -20,6 +20,7 @@ class ScannerPageState extends State {
Widget build(BuildContext context) {
return Material(
child: Container(
+
child: Center(
child: Padding(
padding: const EdgeInsets.only(top: 40),
@@ -83,6 +84,7 @@ class ScannerPageState extends State {
endIndent: 0,
),
),
+
StreamBuilder(
stream: TreeProvider().getTrees().asStream(),
builder:
@@ -105,6 +107,7 @@ class ScannerPageState extends State {
},
)
],
+
),
),
),
diff --git a/pubspec.yaml b/pubspec.yaml
index f678e75..dcbd702 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -70,8 +70,11 @@ flutter:
- assets/images/sample_profile_image.jpg
- assets/images/palm-tree-outline.png
- assets/images/upload.png
+ - assets/images/login.png
+ - assets/images/scan.png
- assets/images/loading.gif
+
# An image asset can refer to one or more resolution-specific "variants", see
# https://flutter.dev/assets-and-images/#resolution-aware.