Skip to content

Commit

Permalink
updates
Browse files Browse the repository at this point in the history
  • Loading branch information
shiwwamm committed Sep 9, 2022
1 parent 7289911 commit 2a09390
Show file tree
Hide file tree
Showing 11 changed files with 233 additions and 99 deletions.
1 change: 1 addition & 0 deletions android/app/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
<uses-permission android:name="android.permission.INTERNET" />
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
<application
android:usesClearTextTraffic = "true"
android:label="park_with_conscience"
android:name="${applicationName}"
android:icon="@mipmap/ic_launcher">
Expand Down
Binary file modified assets/gifs/plant information.gif
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified assets/pngs/ARJUN COMPLEX logo.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
75 changes: 63 additions & 12 deletions lib/data/drawerCategories.dart
Original file line number Diff line number Diff line change
Expand Up @@ -26,23 +26,74 @@ const allDrawerImages = [

], // NewsPaper Cuttings
[
"https://drive.google.com/uc?id=1ylhQAS39uqwXGXY2yFVM0WiGvP6yyOl6", // Justice PreetPal
"https://drive.google.com/uc?id=1-40dOX8YP1CxaAAUWpvg5PYuLT2XeTVK", // Roopa mishra d
"https://drive.google.com/uc?id=1G_plVk0XyKERJJoMCgDBjElUWrqMbKKb",
"https://drive.google.com/uc?id=1JR2ux1FFreSYYX4Z4TYFJiq8bdW-8YeQ",
"https://drive.google.com/uc?id=1U3EuL3opvcRLORFJyZPzyt5J_tlLmnJN",
"https://drive.google.com/uc?id=1NizWdq2iU_gDt44NVMY6qloNCWoO8sDC", // Mamta sharms dmc
"https://drive.google.com/uc?id=1IqB5FQ3hvwGa9Mv3B7mTpHxWtQBXJZ_r", //Residents
"https://drive.google.com/uc?id=1iIeml-YilphTPTV6bFt4a7mU8QfNAJv6", //Vaishali singh
"https://drive.google.com/uc?id=1mkcWfeqU2A0PQ4qIqMdhFiLX2GCd2YX-", // aashima kakkar

"https://drive.google.com/uc?id=1MKAv3GymtDg1X8aRZDzSY7EP8ReSl2B5",
"https://drive.google.com/uc?id=1LASToQ0hKz8qBZ43r9k1JrVk351AK_Nm",
"https://drive.google.com/uc?id=1AnZVG0iS5vyy_TPEa4mOmghjgGr3X59E",
"https://drive.google.com/uc?id=1plV5tpy1PzhBUi6frSgY6yw3AJAwXf1R",
"https://drive.google.com/uc?id=1x1ahvmLxrbdaEjmYBstI_zRYUL8bnjII",
"https://drive.google.com/uc?id=1qLPws-L2jjEMeZiRrfmxfM0iT6YiQ4fA",
"https://drive.google.com/uc?id=12vNVcHcUbW0upWBJCVTlw2S9WMcWcEdX",
"https://drive.google.com/uc?id=1LuclapKc_KW-TOPQ6JN_xEUeRzpF_xPO",
], // Visitors
[
"https://drive.google.com/uc?id=1DNaxdIR3-MYWnqSUI2BjW1L9Ol3CbcRN",
"https://drive.google.com/uc?id=1SLVdOuzotb6mr2fqbE6ReR56w8V4R5jq",
"https://drive.google.com/uc?id=1EMnOiNa1T-MVol3ONPh-sn9UYBpFbTVp",
"https://drive.google.com/uc?id=1904saMbhp1n0TvYUHoGR5HTgWTLCskRo",
"https://drive.google.com/uc?id=1-JD7EuxKEhN98wWRo0fhR5dZdpqIdM7u",
"https://drive.google.com/uc?id=1DNaxdIR3-MYWnqSUI2BjW1L9Ol3CbcRN",
], // Events
// playGrounds
], // Events - Facilitation Camp
[
"https://drive.google.com/uc?id=17B6N_pvXCTL_2e2jW0EMmCF04Xr0mJcE",
"https://drive.google.com/uc?id=1Bel8nlNxWFk1tw6YkEJeWm_O2hf-gN2R",
"https://drive.google.com/uc?id=1FU-I2nqnTPUF8cuyPw5afyXfT189dcC7",
"https://drive.google.com/uc?id=1IASImB3tRHl-2OxtjLaJ7ql1iDF0B_La",
"https://drive.google.com/uc?id=1JsCaEQ91ii-ODZ47c-hYLI6PAzYvvaRX",
"https://drive.google.com/uc?id=1KGM9X_f91jUTmOp2axzm_eLVLstd9jMq",
"https://drive.google.com/uc?id=1MkAHapbXNOKlWout4IxIGorCfPtgSrPs",
"https://drive.google.com/uc?id=1U3MfyLwCIqKYUaByWP5LR8SBaOBaHljE",
"https://drive.google.com/uc?id=1Ufv5jIzKt9F7UD1s5-Oc_qs-JT12lJ3d",
"https://drive.google.com/uc?id=1dLq24pabFQ0OvqGB_VadobuCwWbcIY9l",
"https://drive.google.com/uc?id=1nSQkT_NXTqiqHGvGeUgQPltxCDQ9IO3l",
"https://drive.google.com/uc?id=1q7dqqHn5nAsrA8-FFlfYx5ya_79HzJNn",
"https://drive.google.com/uc?id=1rEnXjFMZ5SO6hGxLsLIsNQwD7RJyqjB0",
"https://drive.google.com/uc?id=1u5VOFhbAocqrM67XT4Rhc8FRelzpKodp",
"https://drive.google.com/uc?id=1v-8b6h-77IxFfnRdyybecy_wvtnDJGMK",
"https://drive.google.com/uc?id=1vEA6qbh37D9fvOmbPUKERH89kfmxk-72",
], // Events - Recycle Crafting
[
"https://drive.google.com/uc?id=11hOeSze1-u1kiMvFukjia6kzWiTl9gRv",
"https://drive.google.com/uc?id=13mKWw4dc1XT9yhBU6s04H0e2e0RxKlDW",
"https://drive.google.com/uc?id=14WVFoHDVsbK2P-OghMwKiLgam46y0Chp",
"https://drive.google.com/uc?id=16jktxabxPhNkfS1MrfjLAqDbDEdtIL--",
"https://drive.google.com/uc?id=1BkmvtizoDM6eOI9-wNZXQN2PMnwy-Sr_",
"https://drive.google.com/uc?id=1Fcgawsv58PKI3tAwE6DfPa9vyQQgsggL",
"https://drive.google.com/uc?id=1HJAGzO70iR6rwN-Z2qgatV2-6mkpTux3",
"https://drive.google.com/uc?id=1JAlybRtro7Ii6N1pSGVT22RnrLATfGIU",
"https://drive.google.com/uc?id=1M2pLyLZ1DWgYuYleJ4Vr7Zdbfs1PoUiA",
"https://drive.google.com/uc?id=1RdNCkcIZ19CRPkTo8AeIFwlnmeBcqc-v",
"https://drive.google.com/uc?id=1nSsYv70cDs2UVHnH5TOGt-_pGoILD6l-",
], // playGrounds
[
"https://drive.google.com/uc?id=1RVoFEQUWN0sEZOivajngRRZh-eqB2Gt8",
"https://drive.google.com/uc?id=1RoW0gZ5dsbrVcmO0aiQ8TA9j5PPZI5yr",
"https://drive.google.com/uc?id=1WVU66jA97GahLD3rj0imY3Tcv_VuixfW",
"https://drive.google.com/uc?id=1_iolv1MEfiPAufDUyJfLgV2x5ACgBE8y",
"https://drive.google.com/uc?id=1a7fHpJlflZrl5tU20od2y73S6B0UAzMR",
"https://drive.google.com/uc?id=1iSzww_aeV7kCy8qyFSnXkM78ehkT0KY6"
], // Selfie point
[
"https://drive.google.com/uc?id=10rLuv6t3GeAHmY17LrfGCmihts0hmb__",
"https://drive.google.com/uc?id=13tSAotsBI7Egy38qyryb2FMLp9DxYemN",
"https://drive.google.com/uc?id=15TjUzA0lkuAVbTglUqgMwzZOQezQQyL1",
"https://drive.google.com/uc?id=1apFsR5hi1PPWV4x_GG0L64QobHMtyRKb",
], // yoga
[
"https://drive.google.com/uc?id=1Q0RhlgBcD897o2YBeWyuvm5yDbdikDBX",
"https://drive.google.com/uc?id=1Z9RcmunCHP8RCsGmvoyvX4BmRzSzygOi",
"https://drive.google.com/uc?id=1crmshaia0mUTPE1TczMTzZnwbMK4aVIR",
"https://drive.google.com/uc?id=1tvkDMsthOm60q9r7lof8154F4o4niEAr"
], // Tools


];
13 changes: 11 additions & 2 deletions lib/data/homeScreenCategories.dart
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ The second and third pit is filled in the meantime, thus ensuring that compost i
imageAddress: "assets/images/sprinklers.png",
screenName: CategoryScreen(
title: 'Sprinklers',
imagePath: 'assets/gifs/sprinklers (1).gif',
imagePath: 'assets/gifs/90° Water Sprinklers.gif',
aboutContent: """Water sprinkler
The high-quality adjustable spray arms with 4 forms nozzle can adjust the sprinkling angle to 45 degrees or 90 degrees to achieve large-area watering effects, or to achieve higher density watering effects.
Expand Down Expand Up @@ -82,7 +82,16 @@ This way this nursery also solves the problem of wastage and littering to some e
imagePath: "assets/gifs/plant information.gif",
aboutContent: """Plants Information Depiction System
The park is equipped with tiles and
The park is equipped with nameplates displaying Plant name and code.
Anyone can use this code to get plant Information from the Website and app.
The app shows you the photo and name of the plant on top.
Important plants information such as The amount of sunlight and water needed can be seen on centre of screen.
The app also shows you the method of propagation i.e How you can regrow the plant as well.
On the bottom, the app gives you general description and information of the plant.
""",
)
),
Expand Down
2 changes: 1 addition & 1 deletion lib/main.dart
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ class _SplashScreenState extends State<SplashScreen> {
Positioned(
child: SizedBox(
child: CircularProgressIndicator(
color: Colors.black,
color: Colors.green,
),
height: 500.0,
width: 300.0,
Expand Down
79 changes: 41 additions & 38 deletions lib/model/plant_information.dart
Original file line number Diff line number Diff line change
@@ -1,74 +1,77 @@
// To parse this JSON data, do
//
// final plantInfoModel = plantInfoModelFromJson(jsonString);
// final plant = plantFromJson(jsonString);

import 'package:meta/meta.dart';
import 'dart:convert';

PlantInfoModel plantInfoModelFromJson(String str, int index) => PlantInfoModel.fromJson(json.decode(str)[index]);
List<Plant> plantFromJson(String str) => List<Plant>.from(json.decode(str).map((x) => Plant.fromJson(x)));

String plantInfoModelToJson(PlantInfoModel data) => json.encode(data.toJson());
String plantToJson(List<Plant> data) => json.encode(List<dynamic>.from(data.map((x) => x.toJson())));

class PlantInfoModel {
PlantInfoModel({
class Plant {
Plant({
required this.srno,
required this.code,
required this.plantName,
required this.sunExposure,
required this.waterNeeds,
required this.propagation,
required this.season,
required this.lifeCycle,
required this.usesBenefits,
required this.uses,
required this.flowering,
required this.type,
required this.size,
required this.image,
required this.germs,
required this.about,
});

int srno;
String code;
String plantName;
String sunExposure;
String waterNeeds;
String propagation;
String season;
String lifeCycle;
String usesBenefits;
String uses;
String flowering;
String type;
String size;
String image;
String germs;
String about;

factory PlantInfoModel.fromJson(Map<String, dynamic> json) => PlantInfoModel(
code: json["Code"],
plantName: json["Plant Name:"],
sunExposure: json["Sun Exposure:"],
waterNeeds: json["Water Needs"],
propagation: json["Propagation:"],
season: json["Season:"],
lifeCycle: json["Life Cycle:"],
usesBenefits: json["Uses/benefits:"],
flowering: json["Flowering:"],
type: json["Type:"],
size: json["Size"],
image: json["Image"],
about: json["About"],
factory Plant.fromJson(Map<String, dynamic> json) => Plant(
srno: json["srno"],
code: json["code"],
plantName: json["plant_Name"],
sunExposure: json["sun_Exposure"],
waterNeeds: json["water_Needs"],
propagation: json["propagation"],
season: json["season"],
lifeCycle: json["life_Cycle"],
uses: json["uses"],
flowering: json["flowering"],
type: json["type"],
image: json["image"],
germs: json["germs"],
about: json["about"],
);

Map<String, dynamic> toJson() => {
"Code": code,
"Plant Name:": plantName,
"Sun Exposure:": sunExposure,
"Water Needs": waterNeeds,
"Propagation:": propagation,
"Season:": season,
"Life Cycle:": lifeCycle,
"Uses/benefits:": usesBenefits,
"Flowering:": flowering,
"Type:": type,
"Size": size,
"Image": image,
"About": about,
"srno": srno,
"code": code,
"plant_Name": plantName,
"sun_Exposure": sunExposure,
"water_Needs": waterNeeds,
"propagation": propagation,
"season": season,
"life_Cycle": lifeCycle,
"uses": uses,
"flowering": flowering,
"type": type,
"image": image,
"germs": germs,
"about": about,
};
}
}
Loading

0 comments on commit 2a09390

Please sign in to comment.