Skip to content

Commit f0dcc71

Browse files
refacotred code a bit (nothing changed)
1 parent 9150e98 commit f0dcc71

File tree

13 files changed

+242
-263
lines changed

13 files changed

+242
-263
lines changed
Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import 'dart:convert';
22
import 'package:cloud_firestore/cloud_firestore.dart';
3-
import 'package:fetchingapp/provider/database.dart';
3+
import 'package:fetchingapp/backend/database.dart';
44
import 'package:http/http.dart' as http;
55
import 'package:flutter/foundation.dart' show kIsWeb;
66

@@ -19,12 +19,9 @@ class ApiProvider {
1919
if (value.isNotEmpty) {
2020
print('READING FROM DB, NUMBER OF ENTRIES: ${value.length}');
2121
callFirestore();
22-
2322
return value;
2423
} else {
2524
return callFirestore();
26-
27-
// return _getFromApi();
2825
}
2926
});
3027
}
@@ -72,7 +69,7 @@ class ApiProvider {
7269
return json.decode(req.body);
7370
}
7471
} catch (e) {
75-
// ginore
72+
// ignore
7673
}
7774
}
7875
}
Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import 'package:fetchingapp/model/data_model.dart';
2-
import 'package:fetchingapp/provider/sql_queries.dart';
2+
import 'package:fetchingapp/backend/sql_queries.dart';
33
import 'package:flutter/foundation.dart';
44
import 'package:path/path.dart';
55
import 'package:sqflite/sqflite.dart';
@@ -33,7 +33,6 @@ Future addBatchOfFirestore({required List<Map<String, dynamic>> list}) async {
3333
batch.insert('cache', item, conflictAlgorithm: ConflictAlgorithm.replace);
3434
}
3535
await batch.commit(noResult: true);
36-
print('batch insert complete');
3736
}
3837

3938
// add entry
@@ -48,7 +47,6 @@ Future addBatchOfEntries({required List<dynamic> entries}) async {
4847
conflictAlgorithm: ConflictAlgorithm.replace);
4948
}
5049
await batch.commit(noResult: true);
51-
print('batch insert complete');
5250
}
5351

5452
Future cleanDB() async {
Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,3 @@ class Queries {
2020
String dropCacheTable = 'DROP TABLE cache';
2121
String dropJsonTable = 'DROP TABLE jsoncache';
2222
}
23-
24-
void main() {
25-
print(Queries().createCacheTable + Queries().jsonCache);
26-
}

lib/main.dart

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
import 'package:fetchingapp/screen/home_page.dart';
2-
import 'package:fetchingapp/screen/login_page.dart';
1+
import 'package:fetchingapp/screens/home.dart';
2+
import 'package:fetchingapp/screens/login.dart';
33
import 'package:firebase_auth/firebase_auth.dart';
44
import 'package:flutter/material.dart';
55
import 'package:firebase_core/firebase_core.dart';

lib/screen/firestore_future.dart

Lines changed: 0 additions & 123 deletions
This file was deleted.

lib/screen/firestore_stream.dart

Lines changed: 0 additions & 103 deletions
This file was deleted.

lib/screens/firestore_future.dart

Lines changed: 83 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,83 @@
1+
import 'package:cloud_firestore/cloud_firestore.dart';
2+
import 'package:fetchingapp/backend/api.dart';
3+
import 'package:flutter/material.dart';
4+
5+
class FutureFireStore extends StatefulWidget {
6+
const FutureFireStore({Key? key}) : super(key: key);
7+
8+
@override
9+
_FutureFireStoreState createState() => _FutureFireStoreState();
10+
}
11+
12+
class _FutureFireStoreState extends State<FutureFireStore> {
13+
@override
14+
Widget build(BuildContext context) {
15+
return Scaffold(
16+
appBar: AppBar(
17+
title: const Text('Firestore Data'),
18+
),
19+
body: Column(
20+
children: [
21+
Expanded(
22+
child: list(),
23+
),
24+
inputField(),
25+
],
26+
),
27+
);
28+
}
29+
}
30+
31+
Widget list() {
32+
return Center(
33+
child: FutureBuilder(
34+
future: ApiProvider().getDataForFirestore(),
35+
builder: (context, snapshot) {
36+
if (!snapshot.hasData) {
37+
return const Center(child: CircularProgressIndicator());
38+
} else {
39+
// return Text(snapshot.data.toString());
40+
return ListView.builder(
41+
itemCount: (snapshot.data as dynamic).length,
42+
itemBuilder: (context, index) {
43+
final entry = (snapshot.data as dynamic)[index];
44+
return ListTile(
45+
title: Text(entry['name'].toString()),
46+
leading: const Icon(Icons.data_usage),
47+
);
48+
});
49+
}
50+
}),
51+
);
52+
}
53+
54+
Widget inputField() {
55+
final textController = TextEditingController();
56+
57+
void addEntry() {
58+
// if (textController.text == '') {
59+
// return;
60+
// }
61+
FirebaseFirestore.instance
62+
.collection('flutter-caching')
63+
.add({'name': textController.text});
64+
textController.clear();
65+
}
66+
67+
return TextField(
68+
controller: textController,
69+
onEditingComplete: () {
70+
addEntry();
71+
},
72+
decoration: InputDecoration(
73+
prefixIcon: const Icon(Icons.add_circle),
74+
labelText: "Input new value and click Save:",
75+
suffixIcon: IconButton(
76+
icon: const Icon(Icons.save),
77+
splashColor: Colors.blue,
78+
tooltip: "Post message",
79+
onPressed: () {
80+
addEntry();
81+
},
82+
)));
83+
}

0 commit comments

Comments
 (0)