Merge pull request #2 from Radlet/card-list

minor array check and cards added

Author: Pipe-Runner

lib/screens/Discovery/Discovery.dart

@@ -1,3 +1,5 @@
+import 'dart:async';
+
 import 'package:flutter/material.dart';
 import './widgets/DeviceListItem.dart';
 import '../../util/apis/discovery.dart';
@@ -6,11 +8,9 @@ import '../../util/data/Device.dart';
 class Discovery extends StatefulWidget {
  const Discovery({
  Key key,
- this.placeholder = "No device found",
  this.child,
  }) : super(key: key);
 
- final String placeholder;
  final Widget child;
 
  @override
@@ -19,19 +19,29 @@ class Discovery extends StatefulWidget {
 
 class DiscoveryState extends State<Discovery> {
  List<Device> devices;
+ var timer;
 
  @override
  void initState() {
  devices = new List<Device>();
  super.initState();
 
- getDiscoveredList().then((fetchedDevices) {
- updateDeviceList(fetchedDevices);
- }).catchError((onError) {
- print("Error fetching device list");
+ timer = Timer.periodic(const Duration(seconds: 3), (Timer timer) {
+ getDiscoveredList().then((fetchedDevices) {
+ updateDeviceList(fetchedDevices);
+ }).catchError((onError) {
+ print("Error fetching device list");
+ });
+ print("Fetch called");
  });
  }
 
+ @override
+ void dispose() {
+ super.dispose();
+ timer.cancel();
+ }
+
  void updateDeviceList(List<Device> newDeviceList) {
  // TODO: Add a compasion mechanism
  setState(() {
@@ -55,7 +65,9 @@ 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,
+ deviceName: devices[index].name);
  })),
  );
  }

lib/screens/Discovery/widgets/DeviceListItem.dart

@@ -1,16 +1,27 @@
 import 'package:flutter/material.dart';
 
 class DeviceListItem extends StatelessWidget {
- DeviceListItem({this.deviceID});
+ DeviceListItem({this.deviceID, this.deviceName});
 
  final String deviceID;
+ final String deviceName;
 
  @override
  Widget build(BuildContext context) {
- return Container(
- height: 50,
- color: Colors.amber[100],
- child: Center(child: new Text(deviceID)),
+ return Center(
+ child: Card(
+ child: InkWell(
+ onTap: () {
+ print("Your card has been tapped");
+ },
+ child: Column(mainAxisSize: MainAxisSize.min, children: <Widget>[
+ ListTile(
+ leading: Icon(Icons.album),
+ title: Text(this.deviceName),
+ subtitle: Text("Sample device description"))
+ ]),
+ ),
+ ),
  );
  }
 }

lib/util/apis/discovery.dart

@@ -6,20 +6,22 @@ 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 ){
+ if (response.statusCode != 200) {
  // Server responded with error code
  throw Exception();
  }
- 
+
  var parsedJson = jsonDecode(response.body);
 
  List<Device> devices = new List<Device>();
- for (var item in parsedJson["deviceArray"]) {
- devices.add(new Device(item["id"], item["name"]));
+ if (parsedJson["deviceArray"] is List) {
+ for (var item in parsedJson["deviceArray"]) {
+ devices.add(new Device(item["id"], item["name"]));
+ }
  }
+
  return devices;
- }).catchError((onError){
- // Connection failed
+ }).catchError((onError) {
  throw Exception();
  });
 }

lib/util/apis/helper.dart

@@ -7,4 +7,5 @@ Future makePostRequest(String endpoint, Map<String, String> data) {
 
 Future makeGetRequest(String endpoint, Map<String, String> data) {
  return http.get(new Uri.http(SERVER_URL,endpoint));
+ // TODO: catch connection failed exception
 }