Fakultas Ilmu Komputer UI
Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
ppl-fasilkom-ui
PPL Sosial
bisago
bisago-fe
Commits
e9bff404
Commit
e9bff404
authored
Jun 07, 2021
by
Ardian Ghifari
Browse files
[RED] Solve conflicts
parent
67a7cd66
Changes
5
Hide whitespace changes
Inline
Side-by-side
lib/model/komentar.dart
View file @
e9bff404
...
...
@@ -16,7 +16,6 @@ class KomentarModel {
final
String
namaLokasi
;
final
String
deskripsi
;
final
String
creator
;
final
String
email
;
@JsonKey
(
name:
'date_time'
,
fromJson:
CustomSerializer
.
stringToDateTime
)
final
DateTime
dateTime
;
final
String
tag
;
...
...
lib/model/komentar.g.dart
View file @
e9bff404
...
...
@@ -27,7 +27,6 @@ KomentarModel _$KomentarModelFromJson(Map<String, dynamic> json) {
namaLokasi:
json
[
'nama_lokasi'
]
as
String
,
deskripsi:
json
[
'deskripsi'
]
as
String
,
creator:
json
[
'creator'
]
as
String
,
email:
json
[
'email'
]
as
String
,
dateTime:
CustomSerializer
.
stringToDateTime
(
json
[
'date_time'
]
as
String
),
tag:
json
[
'tag'
]
as
String
,
disabilitas:
...
...
@@ -46,7 +45,6 @@ Map<String, dynamic> _$KomentarModelToJson(KomentarModel instance) =>
'nama_lokasi'
:
instance
.
namaLokasi
,
'deskripsi'
:
instance
.
deskripsi
,
'creator'
:
instance
.
creator
,
'email'
:
instance
.
email
,
'date_time'
:
instance
.
dateTime
?.
toIso8601String
(),
'tag'
:
instance
.
tag
,
'disabilitas'
:
instance
.
disabilitas
,
...
...
lib/page/dashboard/dashboard.dart
View file @
e9bff404
...
...
@@ -26,6 +26,7 @@ import 'package:bisaGo/config/styles.dart';
import
'package:bisaGo/page/pencarian/pencarian.dart'
;
import
'package:google_maps_webservice/places.dart'
;
import
'package:shared_preferences/shared_preferences.dart'
;
import
'package:shimmer/shimmer.dart'
;
import
'../filter_fasilitas/postingan/detail_post.dart'
;
...
...
@@ -41,6 +42,18 @@ class DashboardState extends State<Dashboard> {
Geolocator
geolocator
;
LatLng
currentLocation
;
Set
<
Marker
>
markers
=
{};
final
mockKegiatan
=
KegiatanModel
.
fromJson
({
'id'
:
1
,
'place_id'
:
'asdfghjkl'
,
'creator'
:
'Jovi'
,
'nama_kegiatan'
:
'Jalan Sehat'
,
'penyelenggara'
:
'Gubernur'
,
'narahubung'
:
'Rafif (0880123456123456)'
,
'deskripsi'
:
'Jalan sehat keliling kota'
,
'time_start'
:
'16-05-2021 06:00:00'
,
'time_end'
:
''
,
'image'
:
''
,
});
LokasiResponseBloc
bloc
=
LokasiResponseBloc
();
KegiatanTerdekatBloc
blocKegiatanTerdekat
=
KegiatanTerdekatBloc
();
...
...
@@ -195,11 +208,12 @@ class DashboardState extends State<Dashboard> {
switch
(
snapshot
.
data
.
status
)
{
case
Status
.
loading
:
return
Container
(
child:
const
Center
(
child:
LinearProgressIndicator
(
valueColor:
AlwaysStoppedAnimation
<
Color
>(
greenPrimary
),
)));
child:
Shimmer
.
fromColors
(
baseColor:
Colors
.
grey
[
300
],
highlightColor:
Colors
.
grey
[
100
],
enabled:
true
,
child:
_buildKegiatanTerdekatWidget
(
mockKegiatan
)));
break
;
case
Status
.
completed
:
final
kegiatanTerdekat
=
snapshot
.
data
.
data
;
...
...
@@ -420,7 +434,7 @@ class DashboardState extends State<Dashboard> {
lokasi:
lokasi
,
komentar:
KomentarModel
(
creator:
fasilitas
.
creator
,
e
mail:
fasilitas
.
e
mail
,
creatorE
mail:
fasilitas
.
creatorE
mail
,
dateTime:
fasilitas
.
dateTime
,
deskripsi:
fasilitas
.
deskripsi
,
id:
fasilitas
.
id
,
...
...
lib/page/filter_fasilitas/postingan/detail_post.dart
View file @
e9bff404
...
...
@@ -263,10 +263,6 @@ class _DetailPostPageState extends State<DetailPostPage> {
fontStyle:
FontStyle
.
italic
,
),
),
onTap:
()
{
_navigateToProfilePage
(
context
,
widget
.
komentar
.
email
);
},
),
),
Text
(
...
...
pubspec.yaml
View file @
e9bff404
...
...
@@ -58,6 +58,7 @@ dependencies:
firebase_messaging
:
^8.0.0-dev.15
carousel_slider
:
^3.0.0
flushbar
:
^1.10.4
shimmer
:
^2.0.0
dev_dependencies
:
flutter_test
:
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment