Skip to content

Commit 3dcf0c2

Browse files
Merge pull request #364 from myromr/363/Romar-Marcos
Add Romar Marcos details
2 parents b0f5fe3 + 5c8e825 commit 3dcf0c2

File tree

9 files changed

+30
-11
lines changed

9 files changed

+30
-11
lines changed

assets/data/devs.json

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -617,5 +617,20 @@
617617
"facebook": "https://www.facebook.com/Kyrie.Kills.2/",
618618
"linkedin": "https://www.linkedin.com/in/john-lester-4669511aa/"
619619
}
620+
},
621+
{
622+
"name": "Romar Marcos",
623+
"roles": [
624+
"Information Technology Student",
625+
"Web Developer",
626+
"Flutter Developer"
627+
],
628+
"about": "Your friendly flutterista",
629+
"username": "myromr",
630+
"socials": {
631+
"twitter": "https://twitter.com/_myromr",
632+
"facebook": "https://www.facebook.com/myromr/",
633+
"linkedin": "https://www.linkedin.com/in/romar-marcos"
634+
}
620635
}
621636
]

lib/core/datasource/devs_datasource.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,4 @@ import 'package:devs/core/models/dev.dart';
22

33
abstract class IDevsDataSource {
44
Future<List<Dev>> getDevs();
5-
}
5+
}

lib/core/datasource/memory/devs_memory_datasource.dart

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ import 'package:devs/core/models/dev.dart';
33

44
// FIXME: This seems redundant since streams stores the list internally
55
class DevsMemoryDataSource implements IDevsDataSource {
6-
76
List<Dev> _devList;
87

98
@override
@@ -13,5 +12,4 @@ class DevsMemoryDataSource implements IDevsDataSource {
1312

1413
// TODO: Add a memory datasource abstract class for better polymorphism
1514
void setCache(List<Dev> devList) => _devList = devList;
16-
1715
}

lib/core/repositories/devs_repository.dart

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ class DevsRepository implements IDevsRepository {
2020
List<Dev> local = await localDataSource.getDevs();
2121
memoryDataSource.setCache(local);
2222
return local;
23-
} else return memory;
23+
} else
24+
return memory;
2425
}
2526
}

lib/features/devboard/devboard_model.dart

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,4 @@ class DevBoardModel extends ChangeNotifier {
77
final Stream<List<Dev>> _devsStream;
88

99
Stream<List<Dev>> get devsStream => _devsStream;
10-
11-
1210
}

lib/features/devboard/devboard_page.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ class _DevboardPageState extends State<DevboardPage> {
3030
stream: devBoardModel.devsStream,
3131
builder: (context, data) {
3232
// TODO: Show a progress bar while data is null i.e loading data
33-
return DevsList(devs: data?.data ?? []);
33+
return DevsList(devs: data?.data ?? []);
3434
},
3535
),
3636
),

lib/main.dart

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,7 @@ class _DevsAppState extends State<DevsApp> {
2727
void initState() {
2828
devsLocalDataSource = DevsLocalDataSource();
2929
devsMemoryDataSource = DevsMemoryDataSource();
30-
devsRepository = DevsRepository(
31-
devsLocalDataSource, devsMemoryDataSource
32-
);
30+
devsRepository = DevsRepository(devsLocalDataSource, devsMemoryDataSource);
3331
super.initState();
3432
}
3533

lib/utils/utils.dart

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
extension CaseInsensitive on String {
22
bool containsIgnoreCase(String other) {
3-
return this == null ? false : this.toLowerCase().contains(other.toLowerCase());
3+
return this == null
4+
? false
5+
: this.toLowerCase().contains(other.toLowerCase());
46
}
57
}

pubspec.lock

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -233,6 +233,13 @@ packages:
233233
url: "https://pub.dartlang.org"
234234
source: hosted
235235
version: "4.3.3"
236+
rxdart:
237+
dependency: "direct main"
238+
description:
239+
name: rxdart
240+
url: "https://pub.dartlang.org"
241+
source: hosted
242+
version: "0.25.0"
236243
sky_engine:
237244
dependency: transitive
238245
description: flutter

0 commit comments

Comments
 (0)