Merge pull request #1 from Radlet/http

http code added

Author: Pipe-Runner

lib/routes.dart

@@ -29,7 +29,7 @@ class Routes {
  body1: TextStyle(fontSize: 14.0, fontFamily: 'Hind'),
  ),
  ),
- initialRoute: '/',
+ initialRoute: '/discovery',
  routes: routes));
  }
 }

lib/screens/Discovery/Discovery.dart

@@ -1,5 +1,7 @@
 import 'package:flutter/material.dart';
 import './widgets/DeviceListItem.dart';
+import '../../util/apis/discovery.dart';
+import '../../util/data/Device.dart';
 
 class Discovery extends StatefulWidget {
  const Discovery({
@@ -16,18 +18,21 @@ class Discovery extends StatefulWidget {
 }
 
 class DiscoveryState extends State<Discovery> {
- List<Map<String, String>> devices;
+ List<Device> devices;
 
  @override
  void initState() {
- devices = new List<Map<String, String>>();
- devices.add({"id": "A"});
- devices.add({"id": "B"});
- devices.add({"id": "C"});
+ devices = new List<Device>();
  super.initState();
+
+ getDiscoveredList().then((fetchedDevices) {
+ updateDeviceList(fetchedDevices);
+ }).catchError((onError) {
+ print("Error fetching device list");
+ });
  }
 
- void updateDeviceList(List<Map<String, String>> newDeviceList) {
+ void updateDeviceList(List<Device> newDeviceList) {
  // TODO: Add a compasion mechanism
  setState(() {
  devices = newDeviceList;
@@ -42,7 +47,6 @@ class DiscoveryState extends State<Discovery> {
 
  @override
  Widget build(BuildContext context) {
-
  return Scaffold(
  appBar: AppBar(
  title: const Text("New devices"),
@@ -51,7 +55,7 @@ class DiscoveryState extends State<Discovery> {
  child: new ListView.builder(
  itemCount: devices.length,
  itemBuilder: (BuildContext context, int index) {
- return new DeviceListItem(deviceID: devices[index]["id"]);
+ return new DeviceListItem(deviceID: devices[index].id);
  })),
  );
  }

lib/util/apis/discovery.dart

@@ -1,6 +1,25 @@
+import 'dart:convert';
+
 import './helper.dart' as helper;
 import './urls.dart' as urls;
+import '../data/Device.dart';
+
+Future<List<Device>> getDiscoveredList([Map<String, String> data = const {}]) {
+ return helper.makeGetRequest(urls.DISCOVERY_ENDPOINT, data).then((response) {
+ if( response.statusCode != 200 ){
+ // Server responded with error code
+ throw Exception();
+ }
+ 
+ var parsedJson = jsonDecode(response.body);
 
-Future getDiscoveredList( Map<String,String> data ){
- return helper.makePostRequest(urls.DISCOVERY_URL, data);
-}
+ List<Device> devices = new List<Device>();
+ for (var item in parsedJson["deviceArray"]) {
+ devices.add(new Device(item["id"], item["name"]));
+ }
+ return devices;
+ }).catchError((onError){
+ // Connection failed
+ throw Exception();
+ });
+}

lib/util/apis/helper.dart

@@ -1,5 +1,10 @@
 import 'package:http/http.dart' as http;
+import './urls.dart';
 
-Future makePostRequest(String url, Map<String, String> data) {
- return http.post(url, body: data);
+Future makePostRequest(String endpoint, Map<String, String> data) {
+ return http.post(new Uri.http(SERVER_URL,endpoint), body: data);
+}
+
+Future makeGetRequest(String endpoint, Map<String, String> data) {
+ return http.get(new Uri.http(SERVER_URL,endpoint));
 }

lib/util/apis/urls.dart

@@ -1 +1,2 @@
-const String DISCOVERY_URL = "http://xyyz.com";
+const SERVER_URL = "192.168.100.15:8080";
+const String DISCOVERY_ENDPOINT = "/getavailabledevices";

lib/util/data/Device.dart

@@ -0,0 +1,6 @@
+class Device {
+ Device(this.id, this.name);
+
+ final String id;
+ final String name;
+}